openSUSE Commits
Threads by month
- ----- 2024 -----
- 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-t for openSUSE:Factory checked in at 2020-05-29 21:19:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-t (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-t.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-t"
Fri May 29 21:19:12 2020 rev:39 rq:806930 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-t/texlive-specs-t.changes 2019-11-07 23:12:02.268239787 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-t.new.3606/texlive-specs-t.changes 2020-05-29 21:32:33.113788093 +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:
----
pst-spirograph.doc.tar.xz
pst-spirograph.tar.xz
pst-vue3d.doc.tar.xz
pst-vue3d.tar.xz
pstools.doc.tar.xz
pstools.tar.xz
ptex-manual.source.tar.xz
New:
----
pst-turtle.doc.tar.xz
pst-turtle.tar.xz
pythontex_p2top3.dif
qualitype.doc.tar.xz
qualitype.tar.xz
quantumarticle.doc.tar.xz
quantumarticle.tar.xz
quiz2socrative.doc.tar.xz
quiz2socrative.tar.xz
quran-ur.doc.tar.xz
ragged2e.doc.tar.xz
ragged2e.tar.xz
random.doc.tar.xz
random.tar.xz
refcount.doc.tar.xz
refcount.tar.xz
rerunfilecheck.doc.tar.xz
rerunfilecheck.tar.xz
rest-api.doc.tar.xz
rest-api.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-t.spec ++++++
++++ 15845 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-t/texlive-specs-t.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-t.new.3606/texlive-specs-t.spec
++++++ pst-pdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst-pdf/CHANGES new/texmf-dist/doc/latex/pst-pdf/CHANGES
--- old/texmf-dist/doc/latex/pst-pdf/CHANGES 2017-06-23 00:34:35.000000000 +0200
+++ new/texmf-dist/doc/latex/pst-pdf/CHANGES 2019-11-16 23:14:52.000000000 +0100
@@ -1,143 +1,150 @@
Changes to pst-pdf:
v1.0a
- General: Initial version.
+ General: Initial version.
v1.0b
- General: Some code and documentation cleaning. (RN)
+ General: Some code and documentation cleaning. (RN)
v1.0c
- General: New options “pstricks”, “nopstricks”, “draft” and
- “final”. (RN)
+ General: New options “pstricks”, “nopstricks”, “draft” and
+ “final”. (RN)
v1.0d
- General: Redefinition of \includegraphics in modes 0 und 1. Now
- using of eps graphics directly in pdfLaTeX is possible.
- (RN)
+ General: Redefinition of \includegraphics in modes 0 und 1. Now
+ using of eps graphics directly in pdfLaTeX is possible.
+ (RN)
v1.0e
- postscript: “trim” option added. (RN)
+ postscript: “trim” option added. (RN)
v1.0f
- \savepicture: New macro \savepspicture. (RN)
- \usepicture: New macro \usepspicture. Useful for putting a
- PSTricks graphic in a box or something else. (RN)
- General: Config file loading added. (RN)
+ \savepicture: New macro \savepspicture. (RN)
+ \usepicture: New macro \usepspicture. Useful for putting a
+ PSTricks graphic in a box or something else. (RN)
+ General: Config file loading added. (RN)
v1.0g
- \usepicture: Now \usepspicture does accept a numerical
- parameter. (RN)
- General: Definition of \PDFcontainer now with \edef. (RN)
+ \usepicture: Now \usepspicture does accept a numerical
+ parameter. (RN)
+ General: Definition of \PDFcontainer now with \edef. (RN)
v1.0h
- psmatrix: Based no more on the comment environment from the
- verbatim package. (RN)
+ psmatrix: Based no more on the comment environment from the
+ verbatim package. (RN)
v1.0i
- \ppf@is@pdfTeX@graphic: No more errors for given files without
- extensions. (RN)
+ \ppf@is@pdfTeX@graphic: No more errors for given files without
+ extensions. (RN)
v1.0j
- General: Check AtBeginDocument for package ‘pstricks’ even if
- “nopstricks” is given. (RN)
+ General: Check AtBeginDocument for package ‘pstricks’ even if
+ “nopstricks” is given. (RN)
+ For \includegraphics \usepicture and postscript the new
+ options “frame”, “framesep”, “framerule”, “linewidth”,
+ and “ignore” added. (RN)
v1.0k
- \Gin@setfile: Show also the pagenumber if exists. (RN)
- \Ginclude@graphics: Prevent division by zero. (RN)
+ \Gin@setfile: Show also the pagenumber if exists. (RN)
+ \Ginclude@graphics: Prevent division by zero. (RN)
v1.0l
- General: Options “framesep”, “framerule”, “linewidth” removed,
- “fname” and “innerframe” added. (RN)
+ General: Options “framesep”, “framerule”, “linewidth” removed,
+ “fname” and “innerframe” added. (RN)
v1.0m
- General: New package option “notightpage” added. (RN)
+ General: New package option “notightpage” added. (RN)
v1.0n
- General: Changed marcro names (\savepicture and \usepicture).
- (RN)
- Some code cleaning. (RN)
+ General: Changed marcro names (\savepicture and \usepicture).
+ (RN)
+ Some code cleaning. (RN)
v1.0o
- General: New code for “notightpage”. (RN)
- Option “fname” renamed to “showname”. (RN)
+ General: New code for “notightpage”. (RN)
+ Option “fname” renamed to “showname”. (RN)
v1.0p
- General: Some code and documentation cleaning. (RN)
+ General: Some code and documentation cleaning. (RN)
v1.0q
- \usepicture: Now \usepspicture works for all kind of graphics.
- (RN)
+ \usepicture: Now \usepspicture works for all kind of graphics.
+ (RN)
v1.0r
- \ppf@is@pdfTeX@graphic: Changed \ppf@is@known@graphic to
- \ppf@is@pdfTeX@graphic. Now pdfTEX graphics are
- prefered. (RN)
+ \ppf@is@pdfTeX@graphic: Changed \ppf@is@known@graphic to
+ \ppf@is@pdfTeX@graphic. Now pdfTeX graphics are
+ prefered. (RN)
v1.0s
- \Gin@ii: Rewritten. (RN)
- General: Scaling e.g. of PostScript pictures now only in
- extraction mode. Some code cleaning. (RN)
+ \Gin@ii: Rewritten. (RN)
+ General: Scaling e.g. of PostScript pictures now only in
+ extraction mode. Some code cleaning. (RN)
v1.1a
- General: Support for the internal PSTricks macro \pst@object.
- (HjG/RN)
+ General: Support for the internal PSTricks macro \pst@object.
+ (HjG/RN)
v1.1b
- General: Ignore the call of \nofiles inside of preview. (RN)
- Some code and documentation cleaning. (RN)
+ General: Ignore the call of \nofiles inside of preview. (RN)
+ Some code and documentation cleaning. (RN)
v1.1c
- General: New package option “tightpage” added. (RN)
- Special support for “tabularx”. (RN)
- Supress handling of pdfLaTeX graphic formats in DVI mode.
- (RN)
+ General: New package option “tightpage” added. (RN)
+ Special support for “tabularx”. (RN)
+ Supress handling of pdfLaTeX graphic formats in DVI mode.
+ (RN)
v1.1d
- postscript: Support for PSTricks environment “psmatrix”. (RN)
+ postscript: Support for PSTricks environment “psmatrix”. (RN)
v1.1e
- General: New option “displaymath” (see preview package).
- (HjG/RN)
+ General: New option “displaymath” (see preview package).
+ (HjG/RN)
v1.1f
- General: Package option “ignore” reimplemented. Now the
- compilation of the dtx file in LaTeX mode is possible.
- (RN)
+ General: Package option “ignore” reimplemented. Now the
+ compilation of the dtx file in LaTeX mode is possible.
+ (RN)
v1.1g
- postscript: “psmatrix” environment (preserve math mode).
- (RN/HjG)
- pspicture: pspicture environment must still parse its arguments.
- (RN/HjG)
+ postscript: “psmatrix” environment (preserve math mode).
+ (RN/HjG)
+ pspicture: pspicture environment must still parse its arguments.
+ (RN/HjG)
v1.1h
- \Ginclude@graphics: Check if inside of a PS-related environment
- (correct graphic inclusion). (RN)
+ \Ginclude@graphics: Check if inside of a PS-related environment
+ (correct graphic inclusion). (RN)
v1.1i
- \Ginclude@graphics: Correction of the inside check. (RN/HjG)
- General: \ifpr@outer must be predefined. (HjG/RN)
- Package option “final” also for “graphicx”. (RN)
+ \Ginclude@graphics: Correction of the inside check. (RN/HjG)
+ General: \ifpr@outer must be predefined. (HjG/RN)
+ Package option “final” also for “graphicx”. (RN)
v1.1k
- General: New environment pst-pdf-defs: Support for PSTricks
- environment “psmatrix” inside user definitions.
- (RN,HjG)
+ General: New environment pst-pdf-defs: Support for PSTricks
+ environment “psmatrix” inside user definitions.
+ (RN,HjG)
v1.1l
- General: Support for the package “psfragx”. (RN)
+ General: Support for the package “psfragx”. (RN)
v1.1m
- General: Merge english and german version of the documentation.
- (RN)
+ General: Merge english and german version of the documentation.
+ (RN)
v1.1n
- General: \nofiles added (suggestion of Torsten Bronger).
+ General: \nofiles added (suggestion of Torsten Bronger).
v1.1o
- \Gscale@@box: Disable scaling. (RN)
+ \Gscale@@box: Disable scaling. (RN)
v1.1p
- General: \nofiles makes \makeindex and \makeglossary to \relax.
- \@empty is better because of later \renewcommand’s.
-v1.1p1
- General: \let\output\@gobble before loading of “preview” added.
- (RN)
+ General: \let\output\@gobble before loading of “preview” added.
+ (RN)
+ \nofiles makes \makeindex and \makeglossary to \relax.
+ \@empty is better because of later \renewcommand’s.
v1.1q
- General: Problem with “tabularx” and “threeparttabel” solved.
- (RN)
+ General: Problem with “tabularx” and “threeparttabel” solved.
+ (RN)
v1.1r
- General: Fixed values for \PreviewBbAdjust because \paperwidth
- is not allways defined (suggested by Will Robertson).
+ General: Fixed values for \PreviewBbAdjust because \paperwidth
+ is not allways defined (suggested by Will Robertson).
v1.1s
- General: Dummy definition of the page key in DVI mode.
+ General: Dummy definition of the page key in DVI mode.
v1.1t
- General: Remove the line “\let\output\@gobble” because of bad
- side effects. (RN)
- postscript: Using environ the environment postscript is now
- simple and more robust. (RN)
+ General: Remove the line “\let\output\@gobble” because of bad
+ side effects. (RN)
+ postscript: Using environ the environment postscript is now
+ simple and more robust. (RN)
v1.1u
- General: \pdfoutput must be set when loading “pdftex.def” in DVI
- mode. (RN)
+ General: \pdfoutput must be set when loading “pdftex.def” in DVI
+ mode. (RN)
v1.1v
- \Gin@ii: Key settings only for pdf graphics. (RN)
- General: Local redefinition of \pdfoutput to be a counter. (RN)
+ \Gin@ii: Key settings only for pdf graphics. (RN)
+ General: Local redefinition of \pdfoutput to be a counter. (RN)
v1.2a
- General: Engine tests changed (RN)
+ General: Engine tests changed (RN)
v1.2b
- General: Loading packages ‘if*’ at wrong place (RN)
+ General: Loading packages ‘if*’ at wrong place (RN)
v1.2c
- General: “postscript” environment no more allowed before
- \begin{document} (changed example file).
+ General: “postscript” environment no more allowed before
+ \begin{document} (changed example file).
v1.2d
- General: \c@lor@to@ps must not be undefined before loading
- ‘PSTricks’
- Version parameter for ‘graphicx’ and rename \GPT@page to
- \Gin@page at several places
+ General: \c@lor@to@ps must not be undefined before loading
+ ‘PSTricks’
+ Version parameter for ‘graphicx’ and rename \GPT@page to
+ \Gin@page at several places
+v1.2e
+ \ppf@is@pdfTeX@graphic: Parameter #2 is detokenized when
+ expanded to \pdfTeXext
+ General: gobble optional argument for \makeindex, \makeglossary
+ and \printindex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pst-pdf/Makefile new/texmf-dist/doc/latex/pst-pdf/Makefile
--- old/texmf-dist/doc/latex/pst-pdf/Makefile 2017-04-26 00:31:00.000000000 +0200
+++ new/texmf-dist/doc/latex/pst-pdf/Makefile 2019-11-16 23:14:52.000000000 +0100
@@ -21,7 +21,7 @@
PDF_CONTAINER = $(EXAMPLE:.tex=-pics.pdf)
ARCHFILES = $(PACKAGE).dtx $(PACKAGE).ins $(ADDINPUTS) Makefile \
- README.md CHANGES CHANGES.tex \
+ README.md CHANGES \
$(PACKAGE).pdf $(PACKAGE)-DE.pdf $(EXAMPLE:.tex=.pdf) \
ps4pdf \
ps4pdf.bat \
@@ -43,7 +43,7 @@
$(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty
$(PDFLATEX) $<
-dist : doc doc-DE pdf example
+dist : doc doc-DE pdf example CHANGES
rm -rf $(PACKAGE)
mkdir $(PACKAGE)
cp -p $(ARCHFILES) $(PACKAGE)/
Binary files old/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf and new/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf differ
Binary files old/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf and new/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf differ
Binary files old/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf and new/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-pdf.doc.tlpobj new/tlpkg/tlpobj/pst-pdf.doc.tlpobj
--- old/tlpkg/tlpobj/pst-pdf.doc.tlpobj 2019-02-28 04:02:19.000000000 +0100
+++ new/tlpkg/tlpobj/pst-pdf.doc.tlpobj 2019-11-17 01:55:35.000000000 +0100
@@ -1,8 +1,8 @@
name pst-pdf.doc
category Package
-revision 44665
+revision 52819
shortdesc doc files of pst-pdf
-docfiles size=319
+docfiles size=299
texmf-dist/doc/latex/pst-pdf/CHANGES
texmf-dist/doc/latex/pst-pdf/Makefile
texmf-dist/doc/latex/pst-pdf/README.md
++++++ pst-pdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty new/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
--- old/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty 2017-06-23 00:34:35.000000000 +0200
+++ new/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty 2019-11-16 23:14:52.000000000 +0100
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pst-pdf}
- [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
+ [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)]
\newcommand*\ppf@TeX@mode{-1}
\newcommand*\ppf@draft{false}
\newif\if@ppf@PST@used\@ppf@PST@usedtrue
@@ -87,11 +87,10 @@
\newcommand*\ppf@is@pdfTeX@graphic[5]{%
\@ppf@pdftex@graphicfalse%
\begingroup
- \edef\pdfTeXext{#2}%
+ \edef\pdfTeXext{\detokenize\expandafter{#2}}%
\def\Gin@setfile##1##2##3{%
- \edef\@tempb{##2}%
- \@for\@tempa:=\pdfTeXext\do{%
- \ifx\@tempa\@tempb\global\@ppf@pdftex@graphictrue\fi}}%
+ \@expandtwoargs\in@{,\detokenize\expandafter{##2},}{,\pdfTeXext,}%
+ \ifin@\global\@ppf@pdftex@graphictrue\fi}%
\edef\Gin@extensions{#2,#3}%
\pr@outerfalse\ppf@Ginclude@graphics{#1}%
\endgroup
@@ -101,7 +100,10 @@
\PackageInfo{pst-pdf}{%
MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
\nofiles
- \let\makeindex\@empty \let\makeglossary\@empty
+ \let\makeindex\@empty \let\makeglossary\@empty \let\printindex\@empty
+ \renewcommand*\makeindex[1][]{}%
+ \renewcommand*\makeglossary[1][]{}%
+ \renewcommand*\printindex[1][]{}%
\AtBeginDocument{\overfullrule=\z@}%
\if@ppf@PST@used\RequirePackage{pstricks}\fi
\RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
@@ -222,7 +224,9 @@
\let\Gin@PS@raw\@gobble\let\Gin@PS@restored\@gobble
\@ifundefined{PSTricksLoaded}{}{%
\PSTricksOff
- \@ifundefined{c@lor@to@ps}{\def\c@lor@to@ps#1 #2\@@{}}{}}}%
+ \def\c@lor@to@ps#1 #2\@@{}
+ }%
+ }%
\the\@temptokena
\expandafter\AtBeginDocument\expandafter
{\the\@temptokena\@temptokena{}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-pdf.tlpobj new/tlpkg/tlpobj/pst-pdf.tlpobj
--- old/tlpkg/tlpobj/pst-pdf.tlpobj 2019-02-28 04:02:19.000000000 +0100
+++ new/tlpkg/tlpobj/pst-pdf.tlpobj 2019-11-17 01:55:35.000000000 +0100
@@ -1,6 +1,6 @@
name pst-pdf
category Package
-revision 44665
+revision 52819
shortdesc Make PDF versions of graphics by processing between runs
longdesc The package pst-pdf simplifies the use of graphics from
longdesc PSTricks and other PostScript code in PDF documents. As in
@@ -21,7 +21,7 @@
catalogue-contact-bugs https://github.com/rolfn/pst-pdf/issues
catalogue-contact-repository https://github.com/rolfn/pst-pdf
catalogue-ctan /macros/latex/contrib/pst-pdf
-catalogue-date 2018-09-15 13:05:45 +0200
+catalogue-date 2019-11-16 10:27:38 +0100
catalogue-license lppl1.2
catalogue-topics graphics-epspdf
-catalogue-version 1.2d
+catalogue-version 1.2e
++++++ pst-plot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-plot/Changes new/doc/generic/pst-plot/Changes
--- old/doc/generic/pst-plot/Changes 2018-09-01 00:11:28.000000000 +0200
+++ new/doc/generic/pst-plot/Changes 2019-07-16 23:13:16.000000000 +0200
@@ -1,4 +1,5 @@
----- pst-plot.tex
+1.92 2019-05-16 - fix for missing position test of special labels
1.91 2018-08-31 - fix for showorigin and triglabels
1.90 2018-03-28 - fix for showoriginfalse and yAxis=false
1.89 2018-02-18 - fix for trailing space in loglines=all
Binary files old/doc/generic/pst-plot/pst-plot-doc.pdf and new/doc/generic/pst-plot/pst-plot-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-plot/pst-plot-doc.tex new/doc/generic/pst-plot/pst-plot-doc.tex
--- old/doc/generic/pst-plot/pst-plot-doc.tex 2018-09-01 00:11:28.000000000 +0200
+++ new/doc/generic/pst-plot/pst-plot-doc.tex 2019-07-16 23:13:16.000000000 +0200
@@ -1,4 +1,4 @@
-% $Id: pst-plot-doc.tex 799 2018-08-31 16:27:35Z herbert $
+% $Id: pst-plot-doc.tex 1056 2019-05-17 07:39:59Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
@@ -205,7 +205,8 @@
\begin{BDef}
\Lcs{psplot}\OptArgs\Largb{$x_!\min@$}\Largb{$x_!\max@$}\Largb{function}\\
-\Lcs{parametricplot}\OptArgs\Largb{$t_!\min@$}\Largb{$t_!\max@$}\Largb{x(t) y(t)}
+\Lcs{parametricplot}\OptArgs\Largb{$t_!\min@$}\Largb{$t_!\max@$}\Largb{x(t) y(t)}\\
+\Lcs{parametricplot}\OptArg{algebraic,...}\Largb{$t_!\min@$}\Largb{$t_!\max@$}\Largb{x(t) | y(t)}
\end{BDef}
\Lcs{psplot} can be used to plot a function $f(x)$, if you know a little
@@ -227,7 +228,8 @@
\end{LTXexample}
\Lcs{parametricplot} is for a parametric plot of $(x(t),y(t))$. \Larg{function} is the PostScript
-code or algebraic expression for calculating the pair $x(t)$ $y(t)$.
+code or algebraic expression for calculating the pair $x(t)$ $y(t)$. For an algebraic expression they must be
+devided by a vertical rule.
For example,
\begin{LTXexample}[wide,width=4cm]
@@ -251,6 +253,20 @@
\end{LTXexample}
+\begin{LTXexample}[wide,width=6.5cm]
+\begin{pspicture}[showgrid,algebraic](-3,-3)(3,3)
+\psframe[dimen=m](-3,-3)(3,3)
+ \pscustom[fillstyle=hlines]{%
+ \psplot{-3}{3}{-x^2/3}
+ \psparametricplot{-3}{3}{t^2/3 | t}
+ \psplot{3}{-3}{x^2/3}
+ \psparametricplot{3}{-3}{-t^2/3 | t}
+}
+\end{pspicture}
+\end{LTXexample}
+
+
+
The number of points that the \Lcs{psplot} and \Lcs{parametricplot} commands
calculate is set by the
\LKeyset{plotpoints=<value>}
@@ -276,6 +292,7 @@
\begin{BDef}
\Lcs{psplot}\OptArgs\Largb{x0}\Largb{x1}\OptArg{PS commands}\Largb{function}\\
\Lcs{psparametricplot}\OptArgs\Largb{t0}\Largb{t1}\OptArg{PS commands}\Largb{x(t) y(t)}\\
+\Lcs{psparametricplot}\OptArg{algebraic,...}\Largb{t0}\Largb{t1}\OptArg{PS commands}\Largb{x(t) | y(t)}\\
\Lcs{psaxes}\OptArgs\OptArg*{\Largb{arrows}}\coord0\coord1\coord2\OptArg{Xlabel,Xangle}\OptArg{Ylabel,Yangle}
\end{BDef}
@@ -1005,7 +1022,8 @@
\begin{LTXexample}[width=.4\linewidth]
-\begin{psgraph}[Dx=2,Dy=2](0,0)(-4,-2.2)(4,2.2){.5\textwidth}{!}
+\begin{psgraph}[Dx=2,Dy=2,showorigin=false]%
+ (0,0)(-4,-2.2)(4,2.2){.5\textwidth}{!}
\psxTick[linecolor=red,labelsep=-20pt]{45}(1.25){x_0}
\psyTick[linecolor=blue](1){y_0}
\end{psgraph}
@@ -3286,7 +3304,7 @@
%--------------------------------------------------------------------------------------
With the setting \Lkeyset{plotstyle=ybar} the graph is set with horizontal bars instead
of vertical. For \Lkeyword{yLabels} see section~\ref{yLabels}.
-.
+
\begin{center}
\savedata{\data}[1 1 1 2 1 3 2 4 3 5 4 6 4 7 6 8 6 9 7 10 25 11 30 12 32 13]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-plot.doc.tlpobj new/tlpkg/tlpobj/pst-plot.doc.tlpobj
--- old/tlpkg/tlpobj/pst-plot.doc.tlpobj 2019-02-28 04:02:20.000000000 +0100
+++ new/tlpkg/tlpobj/pst-plot.doc.tlpobj 2020-03-04 23:53:25.000000000 +0100
@@ -1,9 +1,9 @@
name pst-plot.doc
category Package
-revision 48526
+revision 54080
shortdesc doc files of pst-plot
relocated 1
-docfiles size=597
+docfiles size=593
RELOC/doc/generic/pst-plot/Changes
RELOC/doc/generic/pst-plot/README
RELOC/doc/generic/pst-plot/data/Data.dat
++++++ pst-plot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-plot/pst-plot.tex new/tex/generic/pst-plot/pst-plot.tex
--- old/tex/generic/pst-plot/pst-plot.tex 2018-09-01 00:11:28.000000000 +0200
+++ new/tex/generic/pst-plot/pst-plot.tex 2019-07-16 23:13:16.000000000 +0200
@@ -1,4 +1,4 @@
-% $Id: pst-plot.tex 798 2018-08-31 14:47:43Z herbert $
+% $Id: pst-plot.tex 1056 2019-05-17 07:39:59Z herbert $
%%
%% BEGIN pst-plot.tex
%%
@@ -23,8 +23,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.91}
-\def\filedate{2018/08/31}
+\def\fileversion{1.92}
+\def\filedate{2019/05/16}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -714,15 +714,15 @@
\ifPst@valuesStar
Str stringwidth pop /yS \psk@fontscale def /xS ED
gsave newpath
- xO \ifPst@xvalues \pst@number\pslabelsep add \fi
- yO \ifPst@xvalues\else \pst@number\pslabelsep add \fi
+ xO \ifPst@xvalues \pst@number\pslabelsep add \fi
+ yO \ifPst@xvalues \psk@fontscale 4 div sub \else \pst@number\pslabelsep add \fi
moveto \ifx\psk@rot\@empty\else\psk@rot rotate \fi
xS 0 rlineto 0 yS rlineto xS neg 0 rlineto 0 yS neg rlineto
closepath 1 setgray fill stroke
grestore
\fi
xO \ifPst@xvalues \pst@number\pslabelsep add \fi
- yO \ifPst@xvalues\else \pst@number\pslabelsep add \fi
+ yO \ifPst@xvalues \psk@fontscale 4 div sub \else \pst@number\pslabelsep add \fi
moveto \ifx\psk@rot\@empty\else\psk@rot rotate \fi
Str show
grestore } repeat
@@ -934,11 +934,11 @@
\def\psplot{\def\pst@par{}\pst@object{psplot}}
\def\psplot@i#1#2{\@ifnextchar[{\psplot@x{#1}{#2}}{\psplot@x{#1}{#2}[]}}
\def\psplot@x#1#2[#3]#4{%
- \pst@killglue%
- \begingroup%
- \use@par%
+ \pst@killglue
+ \begingroup
+ \use@par
\@nameuse{beginplot@\psplotstyle}%
- \ifPst@polarplot%
+ \ifPst@polarplot
\addto@pscode{
\psplot@init
#3
@@ -1005,16 +1005,16 @@
/xy { x \pst@number\psxunit mul F@pstplot \pst@number\psyunit mul
% \ifPst@algebraic F@pstplot \else #4 \fi \pst@number\psyunit mul
} def}%
- \fi%
+ \fi
\gdef\psplot@init{}%
\ifx\pslinestyle\psls@@symbol
\psplot@iii
\else
- \@pstfalse%
+ \@pstfalse
\@nameuse{testqp@\psplotstyle}%
- \if@pst\psplot@ii\else\psplot@iii\fi%
- \fi%
- \endgroup%
+ \if@pst\psplot@ii\else\psplot@iii\fi
+ \fi
+ \endgroup
\ignorespaces}
%
\def\psplot@ii{%
@@ -1228,7 +1228,15 @@
\edef\psk@dy{\number\pst@dimg}}
\psset[pst-plot]{dy=0}
%
-\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{}
+\define@boolkey[psset]{pst-plot}[]{showXorigin}[true]{}
+\define@boolkey[psset]{pst-plot}[]{showYorigin}[true]{}
+\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{%
+ \ifshoworigin
+ \showXorigintrue\showYorigintrue
+ \else
+ \showXoriginfalse\showYoriginfalse
+ \fi
+}
\psset[pst-plot]{showorigin=true}
%
\long\def\psrotatebox#1#2{%
@@ -2016,7 +2024,7 @@
\ifPst@xAxis
\SpecialLabelsDonefalse
\begingroup
- \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi
+%%% \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi
\ifnum\psk@dx=\z@
\pst@dimg=\psk@Dx\psxunit
\ifdim\pst@dimg<\p@
@@ -2481,8 +2489,14 @@
\ifdim\pst@pmtempb pt < \z@ \def\pst@pmtempe{\pst@int{\pst@pmtempc}}\else\def\pst@pmtempe{\pst@int{\pst@pmtempd}}\fi
\multido{\nA=0+1,\rA=#3+\psk@Dy}{\pst@pmtempe}{%
\ifdim \nA pt < \z@ \def\nB{-\nA}\else \def\nB{\nA}\fi
- \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
- \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}}%
+ \ifnum\psk@ylabelPos=0
+ \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}%
+ \else
+ \uput{\psylabelsep}[0]{\pst@yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}%
+ \fi
+ }%
\SpecialLabelsDonetrue
\fi
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-plot.tlpobj new/tlpkg/tlpobj/pst-plot.tlpobj
--- old/tlpkg/tlpobj/pst-plot.tlpobj 2019-02-28 04:02:21.000000000 +0100
+++ new/tlpkg/tlpobj/pst-plot.tlpobj 2020-03-04 23:53:26.000000000 +0100
@@ -1,6 +1,6 @@
name pst-plot
category Package
-revision 48526
+revision 54080
shortdesc Plot data using PSTricks
relocated 1
longdesc The package provides plotting of data (typically from external
@@ -12,10 +12,9 @@
RELOC/tex/latex/pst-plot/pst-plot.sty
catalogue-also pgfplots
catalogue-contact-home https://www.tug.org/PSTricks/
-catalogue-contact-repository http://comedy.dante.de/~herbert/texnik/
+catalogue-contact-repository https://archiv.dante.de/~herbert/texnik/
catalogue-contact-support http://tug.org/mailman/listinfo/pstricks
catalogue-ctan /graphics/pstricks/contrib/pst-plot
-catalogue-date 2018-08-31 19:10:21 +0200
catalogue-license lppl
catalogue-topics data-import data-disp pstricks
-catalogue-version 1.91
+catalogue-version 1.92
++++++ pst-poker.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pst-poker/Changes new/doc/latex/pst-poker/Changes
--- old/doc/latex/pst-poker/Changes 2018-08-04 22:54:14.000000000 +0200
+++ new/doc/latex/pst-poker/Changes 2020-01-21 22:43:10.000000000 +0100
@@ -1,9 +1,10 @@
-%% $Id: Changes 792 2018-08-03 19:20:08Z herbert $
+%% $Id: Changes 1135 2020-01-21 16:44:55Z herbert $
%%
pst-poker.sty -----------
-0.03 2018-08-03 - load graphicx by default
-0.02 2017-08-23 - do not load txfonts by default
-0.01 2017-05-16 - first CTAN version
+0.03a 2020-01-21 - fix typo
+0.03 2018-08-03 - load graphicx by default
+0.02 2017-08-23 - do not load txfonts by default
+0.01 2017-05-16 - first CTAN version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pst-poker/pst-poker-doc.bib new/doc/latex/pst-poker/pst-poker-doc.bib
--- old/doc/latex/pst-poker/pst-poker-doc.bib 2017-08-20 19:59:45.000000000 +0200
+++ new/doc/latex/pst-poker/pst-poker-doc.bib 2020-01-21 22:43:10.000000000 +0100
@@ -20,7 +20,7 @@
edition = {7},
publisher = {DANTE -- Lehmanns},
year = {2016},
- address = {Heidelberg/Berlin}
+ address = {Heidelberg and Berlin}
}
@Book{PSTricks-E,
@@ -86,32 +86,18 @@
year = 1989,
}
-@Manual{pstricks,
+@online{pstricks,
Title = {PSTricks - {\PS} macros for generic {\TeX}},
Author = {{Timothy Van} Zandt},
- Organization = {},
Address = {\url{http://www.tug.org/application/PSTricks}},
- Note = {},
year = 1993
}
-@Manual{multido,
+@ctan{multido,
Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
Author = {{Timothy Van} Zandt},
- Organization = {},
- Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
- Note = {},
+ url = {/graphics/pstricks/generic/multido.tex},
year = 1997
}
-@online{wikipedia,
- author = {WikipediA},
- sortlabel = {Wikipedia},
- sortname = {Wikipedia},
- title = {Fidget spinner},
- date = {2017-05-11},
- urldate = {2017-05-11},
- url = {https://en.wikipedia.org/wiki/Fidget_spinner},
-}
-
-%% $Id: pst-spinner-doc.bib 452 2017-05-11 16:21:02Z herbert $
+%% $Id: pst-poker-doc.bib 1135 2020-01-21 16:44:55Z herbert $
Binary files old/doc/latex/pst-poker/pst-poker-doc.pdf and new/doc/latex/pst-poker/pst-poker-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pst-poker/pst-poker-doc.tex new/doc/latex/pst-poker/pst-poker-doc.tex
--- old/doc/latex/pst-poker/pst-poker-doc.tex 2018-08-04 22:54:14.000000000 +0200
+++ new/doc/latex/pst-poker/pst-poker-doc.tex 2020-01-21 22:43:10.000000000 +0100
@@ -1,13 +1,12 @@
-%% $Id: pst-poker-doc.tex 792 2018-08-03 19:20:08Z herbert $
+%% $Id: pst-poker-doc.tex 1135 2020-01-21 16:44:55Z herbert $
%
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
headexclude,footexclude,oneside]{pst-doc}
\listfiles
\usepackage{dtk-logos}
\usepackage[autostyle]{csquotes}
-\usepackage{biblatex}
+
\addbibresource{\jobname.bib}
-\usepackage[utf8]{inputenc}
\usepackage{pst-poker}
\let\belowcaptionskip\abovecaptionskip
%
@@ -215,7 +214,7 @@
\section{Usage}
To make the poker package available within a \LaTeX\ document you have to add
\begin{verbatim}
- \usepackage{poker}
+ \usepackage{pst-poker}
\end{verbatim}
to the preamble. Then you can change the options used with the command
\begin{verbatim}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-poker.doc.tlpobj new/tlpkg/tlpobj/pst-poker.doc.tlpobj
--- old/tlpkg/tlpobj/pst-poker.doc.tlpobj 2019-02-28 04:02:21.000000000 +0100
+++ new/tlpkg/tlpobj/pst-poker.doc.tlpobj 2020-01-22 03:13:02.000000000 +0100
@@ -1,9 +1,9 @@
name pst-poker.doc
category Package
-revision 48347
+revision 53482
shortdesc doc files of pst-poker
relocated 1
-docfiles size=611
+docfiles size=610
RELOC/doc/latex/pst-poker/Changes
RELOC/doc/latex/pst-poker/README
RELOC/doc/latex/pst-poker/pst-poker-doc.bib
++++++ pst-poker.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-poker/pst-poker.sty new/tex/latex/pst-poker/pst-poker.sty
--- old/tex/latex/pst-poker/pst-poker.sty 2018-08-04 22:54:14.000000000 +0200
+++ new/tex/latex/pst-poker/pst-poker.sty 2020-01-21 22:43:10.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pst-poker.sty 792 2018-08-03 19:20:08Z herbert $
+%% $Id: pst-poker.sty 1135 2020-01-21 16:44:55Z herbert $
%%
% pst-poker.sty - LaTeX poker package
% Copyright (C) 2018 Herbert Voß <hvoss(a)tug.org>
@@ -22,15 +22,16 @@
%%%
\NeedsTeXFormat{LaTeX2e}
+%
%\RequirePackage{txfonts}
\RequirePackage{pstricks,pst-blur,multido}
\RequirePackage{graphicx}
\RequirePackage[tiling]{pst-fill}
-\def\filedate{2018/08/03}
-\def\fileversion{0.03}
+\def\filedate{2020/01/21}
+\def\fileversion{0.03a}
\ProvidesFile{pst-poker}[\filedate\ v\fileversion\ [LaTeX poker package (HV)]
-%
+
% basic definitions
\pst@addfams{pst-poker}
%\newlength\xyunit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-poker.tlpobj new/tlpkg/tlpobj/pst-poker.tlpobj
--- old/tlpkg/tlpobj/pst-poker.tlpobj 2019-02-28 04:02:22.000000000 +0100
+++ new/tlpkg/tlpobj/pst-poker.tlpobj 2020-01-22 03:13:03.000000000 +0100
@@ -1,6 +1,6 @@
name pst-poker
category Package
-revision 48347
+revision 53482
shortdesc Drawing poker cards
relocated 1
longdesc This PSTricks related package can create poker cards in various
@@ -32,7 +32,6 @@
RELOC/tex/latex/pst-poker/Queen-spade-color.eps
RELOC/tex/latex/pst-poker/pst-poker.sty
catalogue-ctan /graphics/pstricks/contrib/pst-poker
-catalogue-date 2018-08-03 21:43:01 +0200
catalogue-license lgpl3
catalogue-topics pstricks games
-catalogue-version 0.03
+catalogue-version 0.03a
++++++ pst-spinner.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-spinner.doc.tlpobj new/tlpkg/tlpobj/pst-spinner.doc.tlpobj
--- old/tlpkg/tlpobj/pst-spinner.doc.tlpobj 2019-02-28 04:02:37.000000000 +0100
+++ new/tlpkg/tlpobj/pst-spinner.doc.tlpobj 2020-03-04 23:53:26.000000000 +0100
@@ -1,6 +1,6 @@
name pst-spinner.doc
category Package
-revision 44507
+revision 54080
shortdesc doc files of pst-spinner
relocated 1
docfiles size=373
++++++ pst-spinner.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-spinner.tlpobj new/tlpkg/tlpobj/pst-spinner.tlpobj
--- old/tlpkg/tlpobj/pst-spinner.tlpobj 2019-02-28 04:02:38.000000000 +0100
+++ new/tlpkg/tlpobj/pst-spinner.tlpobj 2020-03-04 23:53:27.000000000 +0100
@@ -1,6 +1,6 @@
name pst-spinner
category Package
-revision 44507
+revision 54080
shortdesc Drawing a fidget spinner
relocated 1
longdesc This package aims to propose a model of the fidget spinner
@@ -14,10 +14,9 @@
RELOC/tex/latex/pst-spinner/pst-spinner.sty
catalogue-contact-announce http://tug.org/PSTricks/
catalogue-contact-home http://tug.org/PSTricks/
-catalogue-contact-repository http://comedy.dante.de/~herbert/texnik/
+catalogue-contact-repository https://archiv.dante.de/~herbert/texnik/
catalogue-contact-support http://tug.org/mailman/listinfo/pstricks
catalogue-ctan /graphics/pstricks/contrib/pst-spinner
-catalogue-date 2017-06-06 19:56:03 +0200
catalogue-license lppl
catalogue-topics graphics pstricks
catalogue-version 1.02
++++++ pst-tools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-tools/Changes new/doc/generic/pst-tools/Changes
--- old/doc/generic/pst-tools/Changes 2017-12-03 23:19:10.000000000 +0100
+++ new/doc/generic/pst-tools/Changes 2020-03-24 21:51:28.000000000 +0100
@@ -1,4 +1,6 @@
..... pst-tools.tex
+0.10 2020-03-24 - added the random macros from random.tex which is no more
+ on TeXLive
0.09b 2017-12-03 - modified pro file
- added PostScript function list to the documentation
0.09a 2017-11-29 - modified pro file
@@ -20,6 +22,7 @@
2012-01-01 first version
+
---- pst-tools.pro
0.06 2017-11-30 - added function concatarray
0.05 2017-11-29 - added function concatstrings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-tools/README new/doc/generic/pst-tools/README
--- old/doc/generic/pst-tools/README 2017-10-02 23:58:12.000000000 +0200
+++ new/doc/generic/pst-tools/README 2020-03-24 21:51:28.000000000 +0100
@@ -23,3 +23,4 @@
%% $Id: README 286 2010-02-11 09:40:41Z herbert $
+hvoss(a)tug.org
\ No newline at end of file
Binary files old/doc/generic/pst-tools/pst-tools-doc.pdf and new/doc/generic/pst-tools/pst-tools-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-tools/pst-tools-doc.tex new/doc/generic/pst-tools/pst-tools-doc.tex
--- old/doc/generic/pst-tools/pst-tools-doc.tex 2017-12-03 23:19:10.000000000 +0100
+++ new/doc/generic/pst-tools/pst-tools-doc.tex 2020-03-24 21:51:28.000000000 +0100
@@ -1,6 +1,6 @@
-%% $Id: pst-tools-doc.tex 675 2017-12-03 08:39:12Z herbert $
+%% $Id: pst-tools-doc.tex 1163 2020-03-24 09:47:58Z herbert $
\documentclass[11pt,english,BCOR=10mm,DIV=13,toc=bibliography,parskip=false,
- headings=small, headinclude=false,footinclude=false,oneside]{pst-doc}
+ headings=small,headinclude=false,footinclude=false,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
\usepackage{pst-tools}
\let\pstToolsFV\fileversion
@@ -24,7 +24,7 @@
\begin{abstract}
This package defines some tools which are useful for all packages not only the PSTricks like packages.
-
+Since the version 0.10 it includes the macros from \texttt{random.tex}.
\vfill
\noindent
Thanks to:
@@ -188,7 +188,7 @@
\begin{lstlisting}
-\psRegisterList{Color}{violet,blue,green,red}% defines macro \Color
+\psRegisterList{Color}{yellow,blue,green,red}% defines macro \Color
\begin{pspicture}(-7,-4.5)(7,5.5)
\psaxes{->}(0,0)(-6.5,-4.5)(6.75,5)
\psset{plotpoints=400,algebraic,linewidth=1pt,fillstyle=solid,opacity=0.4}
@@ -201,7 +201,7 @@
\end{pspicture}
\end{lstlisting}
-\psRegisterList{Color}{violet,blue,green,red}% defines macro \Color
+\psRegisterList{Color}{yellow,blue,green,red}% defines macro \Color
\begin{pspicture}(-7,-4.5)(7,5.5)
\psaxes{->}(0,0)(-6.5,-4.5)(6.75,5)
\psset{plotpoints=400,algebraic,linewidth=1pt,fillstyle=solid,opacity=0.4}
@@ -213,6 +213,58 @@
\end{pspicture}
+
+\section{Random numbers}
+The file \LFile{random.tex} from Donald Arseneau is no more part of CTAN due to a missing licence statement.
+\LFile{pst-tools} at version 0.10 includes the code. The documentation was inside the package otself:
+
+Random integers are generated in the range 1 to 2147483646 by the
+macro \Lcs{nextrandom}. The result is returned in the counter \Lcs{randomi}.
+Do not change \Lcs{randomi} except, perhaps, to initialize it at some
+random value. If you do not initialize it, it will be initialized
+using the time and date. (This is a sparse initialization, giving
+fewer than a million different starting values, but you should use
+other sources of numbers if they are available--just remember that
+most of the numbers available to TeX are not at all random.)
+
+The \Lcs{nextrandom} command is not very useful by itself, unless you
+have exactly 2147483646 things to choose from. Much more useful
+is the \Lcs{setrannum} command which sets a given counter to a random
+value within a specified range. There are three parameters:
+
+\Lcs{setrannum\{<counter>\}\{<minimum>\}\{<maximum>\}}
+
+For example, to
+simulate a die-roll:
+
+\verb|\setrannum{\die}{1}{6}| \verb|\ifcase\die...| .
+
+If you need random numbers that are not integers, you will have to
+use dimen registers and \Lcs{setrandimen}. For example, to set a random
+page width:
+
+\Lcs{setrandimen} \Lcs{hsize\{3in\}\{6.5in\}}
+
+ The »\Lcs{pointless}« macro
+will remove the »pt« that TeX gives so you can use the dimensions
+as pure `real' numbers. In that case, specify the range in pt units.
+For example,
+
+ \verb|\setrandimen\answer{2.71828pt}{3.14159pt}|
+
+ The answer is \verb|\pointless\answer|.
+
+The random number generator is the one by Lewis, Goodman, and Miller
+(1969) and used as \texttt{ran0} in »Numerical Recipies« using Schrage's
+method for avoiding overflows. The multiplier is $16807 (7^5)$, the
+added constant is 0, and the modulus is $2147483647 (2^{31}-1)$. The
+range of integers generated is $1 - 2147483646$. A smaller range would
+reduce the complexity of the macros a bit, but not much--most of the
+code deals with initialization and type-conversion. On the other hand,
+the large range may be wasted due to the sparse seed initialization.
+
+
+
\section{List of the defined PostScript functions}
\footnotesize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-tools.doc.tlpobj new/tlpkg/tlpobj/pst-tools.doc.tlpobj
--- old/tlpkg/tlpobj/pst-tools.doc.tlpobj 2019-02-28 04:02:41.000000000 +0100
+++ new/tlpkg/tlpobj/pst-tools.doc.tlpobj 2020-03-25 16:13:16.000000000 +0100
@@ -1,9 +1,9 @@
name pst-tools.doc
category Package
-revision 45978
+revision 54518
shortdesc doc files of pst-tools
relocated 1
-docfiles size=35
+docfiles size=39
RELOC/doc/generic/pst-tools/Changes
RELOC/doc/generic/pst-tools/README
RELOC/doc/generic/pst-tools/pst-tools-doc.bib
++++++ pst-tools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-tools/pst-tools.tex new/tex/generic/pst-tools/pst-tools.tex
--- old/tex/generic/pst-tools/pst-tools.tex 2017-12-03 23:19:10.000000000 +0100
+++ new/tex/generic/pst-tools/pst-tools.tex 2020-03-24 21:51:28.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pst-tools.tex 674 2017-12-02 22:04:53Z herbert $
+%% $Id: pst-tools.tex 1163 2020-03-24 09:47:58Z herbert $
%%
%% This is file `pst-tools.tex',
%%
@@ -26,8 +26,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-tools}
%
-\def\fileversion{0.09b}
-\def\filedate{2017/12/03}
+\def\fileversion{0.10}
+\def\filedate{2020/03/24}
\message{`PST-tools' v\fileversion, \filedate\space (hv)}
%
\define@key[psset]{pst-tools}{decimalSeparator}[.]{\def\psk@decimalSeparator{#1}}%
@@ -131,6 +131,100 @@
\advance\pst@cnto by 1
}%
}
+% RANDOM.TEX v.1 (Donald Arseneau)
+% Generating "random" numbers in TeX.
+%
+% Random integers are generated in the range 1 to 2147483646 by the
+% macro \nextrandom. The result is returned in the counter \randomi.
+% Do not change \randomi except, perhaps, to initialize it at some
+% random value. If you do not initialize it, it will be initialized
+% using the time and date. (This is a sparse initialization, giving
+% fewer than a million different starting values, but you should use
+% other sources of numbers if they are available--just remember that
+% most of the numbers available to TeX are not at all random.)
+%
+% The \nextrandom command is not very useful by itself, unless you
+% have exactly 2147483646 things to choose from. Much more useful
+% is the \setrannum command which sets a given counter to a random
+% value within a specified range. There are three parameters:
+% \setrannum {<counter>} {<minimum>} {<maximum>}. For example, to
+% simulate a die-roll: \setrannum{\die}{1}{6} \ifcase\die... .
+%
+% If you need random numbers that are not integers, you will have to
+% use dimen registers and \setrandimen. For example, to set a random
+% page width: \setrandimen \hsize{3in}{6.5in}. The "\pointless" macro
+% will remove the "pt" that TeX gives so you can use the dimensions
+% as pure `real' numbers. In that case, specify the range in pt units.
+% For example,
+% \setrandimen\answer{2.71828pt}{3.14159pt}
+% The answer is \pointless\answer.
+%
+% The random number generator is the one by Lewis, Goodman, and Miller
+% (1969) and used as "ran0" in "Numerical Recipies" using Schrage's
+% method for avoiding overflows. The multiplier is 16807 (7^5), the
+% added constant is 0, and the modulus is 2147483647 (2^{31}-1). The
+% range of integers generated is 1 - 2147483646. A smaller range would
+% reduce the complexity of the macros a bit, but not much--most of the
+% code deals with initialization and type-conversion. On the other hand,
+% the large range may be wasted due to the sparse seed initialization.
+
+\newcount\randomi % the random number seed (while executing)
+\global\randomi\catcode`\@ % scratch variable during definitions
+\catcode`\@=11
+
+\def\nextrandom{\begingroup
+ \ifnum\randomi<\@ne % then initialize with time
+ \global\randomi\time
+ \global\multiply\randomi388 \global\advance\randomi\year
+ \global\multiply\randomi31 \global\advance\randomi\day
+ \global\multiply\randomi97 \global\advance\randomi\month
+ \message{Randomizer initialized to \the\randomi.}%
+ \nextrandom \nextrandom \nextrandom
+ \fi
+ \count@ii\randomi
+ \divide\count@ii 127773 % modulus = multiplier * 127773 + 2836
+ \count@\count@ii
+ \multiply\count@ii 127773
+ \global\advance\randomi-\count@ii % random mod 127773
+ \global\multiply\randomi 16807
+ \multiply\count@ 2836
+ \global\advance\randomi-\count@
+ \ifnum\randomi<\z@ \global\advance\randomi 2147483647\relax\fi
+ \endgroup
+}
+
+\countdef\count@ii=2 % use only in boxes!
+\ifx\@tempcnta\undefined \csname newcount\endcsname \@tempcnta \fi
+\ifx\@tempcntb\undefined \csname newcount\endcsname \@tempcntb \fi
+
+\def\setrannum#1#2#3{% count register, minimum, maximum
+ \@tempcnta#3\advance\@tempcnta-#2\advance\@tempcnta\@ne
+ \@tempcntb 2147483645 % = m - 2 = 2^{31} - 3
+ \divide\@tempcntb\@tempcnta
+ \getr@nval
+ \advance\ranval#2\relax
+ #1\ranval
+}
+
+\def\setrandim#1#2#3{% dimen register, minimum length, maximum length
+ \dimen@#2\dimen@ii#3\relax
+ \setrannum\ranval\dimen@\dimen@ii
+ #1\ranval sp\relax
+}
+
+\def\getr@nval{% The values in \@tempcnta and \@tempcntb are parameters
+ \nextrandom
+ \ranval\randomi \advance\ranval\m@ne \divide\ranval\@tempcntb
+ \ifnum\ranval<\@tempcnta\else \expandafter\getr@nval \fi
+}
+
+\def\pointless{\expandafter\PoinTless\the}
+{\catcode`p=12 \catcode`t=12
+\gdef\PoinTless#1pt{#1}}
+
+\catcode`\@=\randomi
+\global\randomi=0
+\newcount\ranval
\catcode`\@=\PstAtCode\relax
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-tools/pst-tools.sty new/tex/latex/pst-tools/pst-tools.sty
--- old/tex/latex/pst-tools/pst-tools.sty 2017-12-03 23:19:10.000000000 +0100
+++ new/tex/latex/pst-tools/pst-tools.sty 2020-03-24 21:51:28.000000000 +0100
@@ -9,4 +9,4 @@
\(a)addtofilelist{pst-tools.pro}}{}%
\endinput
-%% $Id: pst-tools.sty 606 2017-10-02 17:34:18Z herbert $
+%% $Id: pst-tools.sty 680 2017-12-05 12:22:55Z herbert $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-tools.tlpobj new/tlpkg/tlpobj/pst-tools.tlpobj
--- old/tlpkg/tlpobj/pst-tools.tlpobj 2019-02-28 04:02:41.000000000 +0100
+++ new/tlpkg/tlpobj/pst-tools.tlpobj 2020-03-25 16:13:16.000000000 +0100
@@ -1,16 +1,15 @@
name pst-tools
category Package
-revision 45978
+revision 54518
shortdesc PSTricks support functions
relocated 1
longdesc The package provides helper functions for other PSTricks
longdesc related packages.
-runfiles size=6
+runfiles size=7
RELOC/dvips/pst-tools/pst-tools.pro
RELOC/tex/generic/pst-tools/pst-tools.tex
RELOC/tex/latex/pst-tools/pst-tools.sty
catalogue-ctan /graphics/pstricks/contrib/pst-tools
-catalogue-date 2017-12-03 12:35:57 +0100
catalogue-license lppl
catalogue-topics graphics pstricks
-catalogue-version 0.09b
+catalogue-version 0.10
++++++ pstricks-add.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pstricks-add/Changes new/doc/generic/pstricks-add/Changes
--- old/doc/generic/pstricks-add/Changes 2019-01-13 00:06:35.000000000 +0100
+++ new/doc/generic/pstricks-add/Changes 2020-02-12 23:21:52.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: Changes 902 2019-01-12 10:06:35Z herbert $
+%% $Id: Changes 1142 2020-02-12 19:07:50Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -41,6 +41,9 @@
pstricks-add.tex ----------- (hv)
+ v 3.89a 2020-02-12 - modified documentation for \psbrace
+ v 3.89 2019-11-01 - added otion sngleline for \psbrace
+ v 3.88 2019-05-11 - fix for a trailing space after \psrotatet
v 3.87 2019-01-12 - added \psCallout
v 3.86 2018-12-08 - added some more options for \psCancel
v 3.85b 2018-02-04 - use LaTeX package pst-calculate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pstricks-add/README new/doc/generic/pstricks-add/README
--- old/doc/generic/pstricks-add/README 2018-12-09 23:37:09.000000000 +0100
+++ new/doc/generic/pstricks-add/README 2020-02-12 23:21:52.000000000 +0100
@@ -36,9 +36,8 @@
into $TEXMF/dvips/pstricks/
Then do not forget to run texhash to update this tree.
For more information see the documentation of your LaTeX distribution
-on installing packages into your local TeX system or read the
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
+on installing packages into your local TeX system.
+
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
Binary files old/doc/generic/pstricks-add/pstricks-add-doc.pdf and new/doc/generic/pstricks-add/pstricks-add-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pstricks-add/pstricks-add-doc.tex new/doc/generic/pstricks-add/pstricks-add-doc.tex
--- old/doc/generic/pstricks-add/pstricks-add-doc.tex 2019-01-13 00:06:35.000000000 +0100
+++ new/doc/generic/pstricks-add/pstricks-add-doc.tex 2020-02-12 23:21:52.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 887 2018-12-29 13:17:59Z herbert $
+%% $Id: pstricks-add-doc.tex 1142 2020-02-12 19:07:50Z herbert $
%
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,oneside]{pst-doc}
@@ -23,7 +23,6 @@
%\input{data/pstricks-add-doc.data}
-\usepackage[utf8]{inputenc}
%\usepackage{pstricks-add}
%\let\pstricksaddFV\fileversion
\usepackage{pst-eucl,pst-fun,pst-func,multirow}
@@ -206,6 +205,7 @@
\end{pspicture}
\end{LTXexample}
+
\clearpage
%--------------------------------------------------------------------------------------
@@ -340,6 +340,8 @@
of a circle must be given. The names of the calculates node names are \verb=CircleT1=
and \verb=CircleT2=.
+
+
\bigskip
\begin{pspicture}[showgrid](0,3)(10,10)
\psdot(2,4)\pscircle(7,7){2}
@@ -350,7 +352,6 @@
\uput[-80](CircleT1){T1}\uput[115](CircleT2){T2}
\end{pspicture}
-
\begin{lstlisting}
\begin{pspicture}[showgrid](0,3)(10,10)
\psdot(2,4)\pscircle(7,7){2}
@@ -370,6 +371,9 @@
\verb=CircleTI1=, \verb=CircleTI2=, \verb=CircleTI3=, and \verb=CircleTI4= for the
four nodes of the inner tangent lines.
+
+
+
\bigskip
\begin{pspicture}[showgrid](-2,-2)(10,10)
\pscircle(1,1){1}\pscircle(7,7){3}
@@ -757,6 +761,9 @@
%\pstVerb{ /m -3 -0.85 sub 4 0.6 sub div def }
+
+
+
\clearpage
%--------------------------------------------------------------------------------------
@@ -787,9 +794,37 @@
\end{pspicture}
\end{center}
+And with option \Lkeyword{singleline}:
+
+\begin{center}
+\begin{pspicture}[showgrid=true](0,1)(10,5)
+ \psbrace[braceWidthInner=1cm,singleline,
+ braceWidthOuter=1cm,bracePos=0.6,fillcolor=white,
+ nodesepA=10mm,nodesepB=10mm](0,5)(10,5){\fbox{Label}}
+\pcline{<->}(3,4)(3,5)\ncput*{\footnotesize\ttfamily braceWidthInner}
+\pcline{<->}(3,3)(3,4)\ncput*{\footnotesize\ttfamily braceWidthOuter}
+\pcline{<->}(6,2)(6,3)\ncput{\footnotesize\ttfamily nodesepB}
+\pcline{<->}(6,2)(7,2)\ncput*{\footnotesize\ttfamily A}
+\pcline{<->}(0,1.5)(6,1.5)\ncput*{\footnotesize\ttfamily bracePos}
+\psdot[dotscale=2](0,5)\uput[0](0,5){\textbf{A}}
+\psdot[dotscale=2](10,5)\uput[180](10,5){\textbf{B}}
+\end{pspicture}
+\end{center}
+
+With the option \Lkeyword{singleline} one can choose also a different linestyle which makes no sense otherwise:
+
+\begin{LTXexample}[width=4.5cm]
+\begin{pspicture}[showgrid](4,4)
+\pnode(0,0){A}
+\pnode(4,4){B}
+\psbrace[singleline,linestyle=dashed,ref=lC](A)(B){Text I}
+\psbrace[singleline,linestyle=dotted,ref=lC](3,4)(0,1){Text II}
+\end{pspicture}
+\end{LTXexample}
A positive value for \Lkeyword{nodesepA} and \Lkeyword{nodesepB} shifts the label to the upper right
and a negative value to the lower left. This does not depends on
-the value for the rotating of the label!
+the value for the rotating of the label! If both keywords have the same value, you can use \Lkeyword{nodesep}
+instead. It sets \Lkeyword{nodesepA} \emph{and} \Lkeyword{nodesepB} to the given value of \Lkeyword{nodesep}.
\begin{center}
\begin{tabular}{@{}l|l@{}}
@@ -800,12 +835,28 @@
\Lkeyword{bracePos} & relative position (default is $0.5$)\\
\Lkeyword{nodesepA} & x-separation (default is $0pt$)\\
\Lkeyword{nodesepB} & y-separation (default is $0pt$)\\
+\Lkeyword{nodesep} & x- and y-separation (default is $0pt$)\\
\Lkeyword{rot} & additional rotating for the text (default is $0$)\\
\Lkeyword{ref} & reference point for the text (default is c)\\
-\Lkeyword{fillcolor} & default is black
+\Lkeyword{fillcolor} & default is black\\
+\Lkeyword{singleline} & default is false
\end{tabular}
\end{center}
+
+\begin{LTXexample}[width=6.5cm]
+\begin{pspicture}[showgrid](-1,0)(4,5)
+\pnodes(0,1){A}(3,4){B}(-0.5,0.5){C}(3.5,4.5){D}
+\psdots(A)(B)(C)(D)
+\psbrace[singleline,linestyle=dashed,ref=lC,
+ linewidth=1pt,nodesep=5mm](C)(D){Text I}
+\psbrace[singleline,linestyle=dotted,ref=lC,
+ linewidth=1pt,nodesep=-10mm,rot=180](B)(A){Text II}
+\end{pspicture}
+\end{LTXexample}
+
+
+
By default the text is written perpendicular to the brace line and
can be changed with the \LPack{pstricks} option \Lkeyword{rot}=\ldots\ The
text parameter can take any object and may also be empty. The
@@ -868,6 +919,7 @@
\end{LTXexample}
+
\begin{LTXexample}[width=8cm]
\psset{unit=0.8}
\begin{pspicture}(10,11)
@@ -996,6 +1048,7 @@
\clearpage
+
%--------------------------------------------------------------------------------------
\section{Contour plots}
%--------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstricks-add.doc.tlpobj new/tlpkg/tlpobj/pstricks-add.doc.tlpobj
--- old/tlpkg/tlpobj/pstricks-add.doc.tlpobj 2019-02-28 04:02:51.000000000 +0100
+++ new/tlpkg/tlpobj/pstricks-add.doc.tlpobj 2020-02-13 01:54:42.000000000 +0100
@@ -1,9 +1,9 @@
name pstricks-add.doc
category Package
-revision 49680
+revision 53763
shortdesc doc files of pstricks-add
relocated 1
-docfiles size=2773
+docfiles size=2776
RELOC/doc/generic/pstricks-add/Changes
RELOC/doc/generic/pstricks-add/README
RELOC/doc/generic/pstricks-add/data/contourN.data
++++++ pstricks-add.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pstricks-add/pstricks-add.tex new/tex/generic/pstricks-add/pstricks-add.tex
--- old/tex/generic/pstricks-add/pstricks-add.tex 2019-01-13 00:06:35.000000000 +0100
+++ new/tex/generic/pstricks-add/pstricks-add.tex 2020-02-12 23:21:52.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 903 2019-01-12 17:16:09Z herbert $
+%% $Id: pstricks-add.tex 1142 2020-02-12 19:07:50Z herbert $
%%
%% This is file `pstricks-add.tex',
%%
@@ -31,8 +31,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\PSTmathLoaded\endinput\else \input pst-math \fi
%
-\def\fileversion{3.87}
-\def\filedate{2019/01/12}
+\def\fileversion{3.89a}
+\def\filedate{2020/02/12}
\let\pstricksaddFV\fileversion
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
@@ -107,7 +107,8 @@
[ax by cx dy ex fy] concat } \tx@TMChange
}%
\box\pst@hbox
- \pst@Verb{ \tx@TMRestore grestore }\endgroup}
+ \pst@Verb{ \tx@TMRestore grestore }\endgroup
+ \ignorespaces}
%
% [#1]: obtargs; (#2,#3): center; {#4}: factor; {#5}: object
\def\psHomothetie{\def\pst@par{}\pst@object{psHomothetie}}
@@ -164,6 +165,9 @@
\define@key[psset]{pstricks-add}{braceWidthInner}{\pst@getlength{#1}\psk@braceWidthInner}
\define@key[psset]{pstricks-add}{braceWidthOuter}{\pst@getlength{#1}\psk@braceWidthOuter}
%
+\define@boolkey[psset]{pstricks-add}[PST@]{singleline}[true]{}%use \ifPST@metricFunction
+\psset{singleline=false}
+
\def\psbrace{\def\pst@par{}\pst@object{psbrace}}
\def\psbrace@i(#1)(#2)#3{%
\addbefore(a)par{ref=lb,linewidth=0.01pt,fillstyle=solid,fillcolor=black}% default setting
@@ -194,21 +198,30 @@
Left radius2 neg Left radius1 add radius2 neg radius1 arcto pop4
Right radius2 sub radius1 sub 0 rlineto
Length radius2 neg Length 0 radius2 arcto pop4
+ \ifPST@singleline\else
% 0 Width neg rlineto
- Length radius2 Width add neg Length radius2 sub radius2 Width add neg radius2 arcto pop4
- Right radius2 sub radius1 sub neg 0 rlineto
- Left radius1 add Width radius1 add radius2 add neg radius1 90 180 arc
- Left radius1 sub Width radius1 add radius2 add neg radius1 0 90 arc
- Left radius2 sub radius1 sub neg 0 rlineto
- radius2 Width neg radius2 270 180 arcn
- 0 0 lineto
- \ifx\psk@fillstyle\relax\else
- gsave
- ifStar { \pst@usecolor\pslinecolor }{ \pst@usecolor\psfillcolor } ifelse
- fill
- grestore
- \fi
- \pst@number\pslinewidth setlinewidth \pst@usecolor\pslinecolor stroke
+ Length radius2 Width add neg Length radius2 sub radius2 Width add neg radius2 arcto pop4
+ Right radius2 sub radius1 sub neg 0 rlineto
+ Left radius1 add Width radius1 add radius2 add neg radius1 90 180 arc
+ Left radius1 sub Width radius1 add radius2 add neg radius1 0 90 arc
+ Left radius2 sub radius1 sub neg 0 rlineto
+ radius2 Width neg radius2 270 180 arcn
+ 0 0 lineto
+ \ifx\psk@fillstyle\relax\else
+ gsave
+ ifStar { \pst@usecolor\pslinecolor }{ \pst@usecolor\psfillcolor } ifelse
+ fill
+ grestore
+ \fi
+ \fi
+% \pst@number\pslinewidth setlinewidth \pst@usecolor\pslinecolor stroke
+ \ifx\pslinestyle\@none\else
+ \pst@number\pslinewidth SLW
+ \pst@usecolor\pslinecolor
+ \@nameuse{psls@\pslinestyle}
+ \tx@setStrokeTransparency
+ \fi
+ stroke
0 0 moveto
grestore
% now calculate the label pos
@@ -1960,29 +1973,30 @@
\def\psCircleTangents{\pst@object{psCircleTangents}}
\def\psCircleTangents@i(#1){\@ifnextchar({\psCircleTangents@ii(#1)}{\psCircleTangents@iii(#1)}}%
\def\psCircleTangents@ii(#1)(#2)#3{% (viewpoint) (circle) {radius}
- \pst@killglue%
- \begingroup%
- \pst@getlength{#3}\pst@LengthA%
+ \pst@killglue
+ \begingroup
+ \pst@getlength{#3}\pst@LengthA
\addbefore@par{basename=CircleT}%
- \use@par%
- \edef\@cmd{\noexpand\psEllipseTangentsN(#2)(! \pst@LengthA dup %
- \pst@number\psxunit div exch \pst@number\psyunit div )(#1){\psk@basename}}%
- \@cmd%
- \endgroup%
- \ignorespaces%
+ \use@par
+% \edef\@cmd{\noexpand\psEllipseTangentsN(#2)(! \pst@LengthA dup
+% \pst@number\psxunit div exch \pst@number\psyunit div )(#1){\psk@basename}}%
+% \@cmd
+ \psEllipseTangentsN(#2)(!\pst@LengthA dup \pst@number\psxunit div exch \pst@number\psyunit div )(#1){\psk@basename}%
+ \endgroup
+ \ignorespaces
}%
\def\psCircleTangents@iii(#1)#2(#3)#4{% two circles--- (Cntr1){radius1}(Cntr2){radius2}
- \pst@killglue%
- \begingroup%
+ \pst@killglue
+ \begingroup
\pst@getlength{#2}\pst@LengthA% radius1
\pst@getlength{#4}\pst@LengthB% radius2
\addbefore@par{basename=CircleT}%
- \use@par%
- \psLCNodeVar(#1)(#3)(! \pst@LengthA \pst@number\psrunit div dup \pst@LengthB %
+ \use@par
+ \psLCNodeVar(#1)(#3)(! \pst@LengthA \pst@number\psrunit div dup \pst@LengthB
\pst@number\psrunit div % r1 r1 r2 on stack
3 copy add div /tti ED sub dup 0 eq % r1 r1-r2 on stack
{ pop pop /ttx 1000 def }{ div dup abs 1000 gt % r1/(r1-r2) on stack
- { 0 gt { ttx 1000 def }{ ttx -1000 def } ifelse}{ /ttx ED } ifelse } ifelse %
+ { 0 gt { ttx 1000 def }{ ttx -1000 def } ifelse}{ /ttx ED } ifelse } ifelse
1 tti sub tti )% 1-tti tti on stack
{\psk@basename C1}%
% tti=r1/(r1+r2), ttx=r1/(r1-r2)
@@ -2011,14 +2025,16 @@
\def\psEllipseTangentsN(#1)(#2)(#3)#4{% (xe,ye)(a,b)(xP,yP){basename} % no optional arguments
\pst@killglue
% \pst@getcoor{#1}\pst@tempA
- \pnodes(#1){E@Cntr}(#2){@@TMP}(#3){@@@TMP}% (center)(semimajor, semiminor)(viewpt)
+ \pnode(#1){E@Cntr}%
+ \pnode(#2){@@TMP}%
+ \pnode(#3){@@@TMP}% (center)(semimajor, semiminor)(viewpt)
\pst@getcoor{#3}\my@tempC% external viewpoint
\AtoB(E@Cntr)(@@@TMP){@TMP}% center to viewpoint
\ifnum\Pst@Debug>0
\shownode(E@Cntr)%
\shownode(@TMP)%
\shownode(@@@TMP)%
- \fi%
+ \fi
\pnode(!
\psGetNodeCenter{E@Cntr}\space
/Xc E(a)Cntr.x def /Yc E(a)Cntr.y def
@@ -2154,8 +2170,9 @@
} repeat
} for
}%
-\end@SpecialObj%
+\end@SpecialObj
}
+
\newrgbcolor{OlympicRed}{0.87 0 0.14}
\newrgbcolor{OlympicGreen}{0 0.62 0.24}
\newrgbcolor{OlympicBlue}{0 0.52 0.78}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstricks-add.tlpobj new/tlpkg/tlpobj/pstricks-add.tlpobj
--- old/tlpkg/tlpobj/pstricks-add.tlpobj 2019-02-28 04:02:55.000000000 +0100
+++ new/tlpkg/tlpobj/pstricks-add.tlpobj 2020-02-13 01:54:46.000000000 +0100
@@ -1,6 +1,6 @@
name pstricks-add
category Package
-revision 49680
+revision 53763
shortdesc A collection of add-ons and bugfixes for PSTricks
relocated 1
longdesc Collects together examples that have been posted to the
@@ -17,7 +17,6 @@
RELOC/tex/generic/pstricks-add/pstricks-add.tex
RELOC/tex/latex/pstricks-add/pstricks-add.sty
catalogue-ctan /graphics/pstricks/contrib/pstricks-add
-catalogue-date 2019-01-12 19:39:00 +0100
catalogue-license lppl
catalogue-topics graphics-in-tex pstricks
-catalogue-version 3.87
+catalogue-version 3.89a
++++++ pstricks.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-t/pstricks.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-t.new.3606/pstricks.doc.tar.xz differ: char 1350241, line 5251
++++++ pstricks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pstricks/pstricks-tex.def new/tex/generic/pstricks/pstricks-tex.def
--- old/tex/generic/pstricks/pstricks-tex.def 2019-01-22 23:18:58.000000000 +0100
+++ new/tex/generic/pstricks/pstricks-tex.def 2019-05-12 22:17:14.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pstricks-tex.def 909 2019-01-14 16:06:51Z herbert $
+%% $Id: pstricks-tex.def 1044 2019-04-11 09:32:09Z herbert $
%% pstricks-tex.def
%% Copyright 2017- Herbert Voss
%
@@ -44,6 +44,7 @@
\fi
%
\newif\ifpst@psfonts \pst@psfontsfalse % defined in pstricks.sty
+ \newif\ifpst@useCalc \pst@useCalcfalse % defined in pstricks.sty
%
\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi}
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pstricks/pstricks.tex new/tex/generic/pstricks/pstricks.tex
--- old/tex/generic/pstricks/pstricks.tex 2019-02-23 23:17:17.000000000 +0100
+++ new/tex/generic/pstricks/pstricks.tex 2019-05-12 22:17:14.000000000 +0200
@@ -1,4 +1,3 @@
-%% $Id: pstricks.tex 934 2019-02-23 14:07:34Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -81,8 +80,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.96}
-\def\filedate{2019/02/23}
+\def\fileversion{2.97}
+\def\filedate{2019/05/11}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -718,13 +717,25 @@
}
\def\pssetxlength#1#2{%
\let\@psunit\psxunit
- \afterassignment\pstunit@off
- #1 #2\@psunit%
+ \ifpst@useCalc
+ \edef\@@temp{\pscalculate{#2}}%
+ \afterassignment\pstunit@off
+ #1 \@@temp\@psunit
+ \else
+ \afterassignment\pstunit@off
+ #1 #2\@psunit
+ \fi
}
\def\pssetylength#1#2{%
\let\@psunit\psyunit
- \afterassignment\pstunit@off
- #1 #2\@psunit%
+ \ifpst@useCalc
+ \edef\@@temp{\pscalculate{#2}}%
+ \afterassignment\pstunit@off
+ #1 \@@temp\@psunit
+ \else
+ \afterassignment\pstunit@off
+ #1 #2\@psunit
+ \fi
}
\define@key[psset]{pstricks}{unit}[1cm]{%
\pssetlength\psunit{#1}%
@@ -754,7 +765,7 @@
\def\pst@getcoors#1#2{%
\def\pst@aftercoors{\addto@pscode{#1 \pst@coors }#2}%
\def\pst@coors{}%
- \pst@@getcoors%
+ \pst@@getcoors
}
\def\pst@@getcoors(#1){%
\pst@@getcoor{#1}%
@@ -804,13 +815,13 @@
\def\SpecialCoor{%
\def\pst@@getcoor##1{%
\begingroup%
- \pst@activecoor%
+ \pst@activecoor
\xdef\pst@tempg{##1}%
- \endgroup%
+ \endgroup
\expandafter\special@coor\pst@tempg||\@nil}%
\def\pstCheckCoorType##1{%
- \begingroup%
- \pst@activecoor%
+ \begingroup
+ \pst@activecoor
\xdef\pst@tempg{##1}%
\endgroup
\psDEBUG[pstCheckCoorType]{:Checking coor \pst@tempg:}%
@@ -1055,7 +1066,7 @@
\def\Cartesian@(#1,#2){%
\pssetxlength\psxunit{#1}%
\pssetylength\psyunit{#2}%
- \ignorespaces%
+ \ignorespaces
}
\def\Polar{%
\def\psput@cartesian{\psput@special}%
@@ -1714,12 +1725,12 @@
% ------------------------- hv 1.10 end ------------------------
%
\def\begin@ClosedObj{%
- \leavevmode%
- \pst@killglue%
- \begingroup%
- \use@par%
- \solid@star%
- \ifpsdoubleline\pst@setdoublesep\fi%
+ \leavevmode
+ \pst@killglue
+ \begingroup
+ \use@par
+ \solid@star
+ \ifpsdoubleline\pst@setdoublesep\fi
\pst@addarrowdef% DG addition
\init@pscode}
%
@@ -1985,6 +1996,7 @@
\pst@stroke
\end@SpecialObj
\let\pst@ifcustom\iffalse
+ \ignorespaces
}
%
\let\pst@ifcustom\iffalse
@@ -2487,7 +2499,7 @@
\def\psline@i{%
\pst@getarrows{%
\begin@OpenObj
- \pst@getcoors[\psline@ii%
+ \pst@getcoors[\psline@ii
}%
}
\def\psline@ii{%
@@ -2519,8 +2531,8 @@
\psLine@ii}}
\def\psLine@ii(#1){\@ifnextchar({\psLine@iii(#1)}{\psLine@iii(0,0)(#1)}}%
\def\psLine@iii(#1)(#2){%
- \pst@getcoor{#1}\pst@tempA%
- \pst@getcoor{#2}\pst@tempB%
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
\addto@pscode{
\ifPst@noCurrentPoint\else\pst@cp\fi % current point?
[ % start for coordinate array
@@ -2543,8 +2555,8 @@
\init@pscode
\let\pst@linetype\pst@arrowtype
\pst@addarrowdef
- \pst@getcoor{#1}\pst@tempA%
- \pst@getcoor{#2}\pst@tempB%
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
\addto@pscode{
\ifPst@noCurrentPoint\else\pst@cp\fi % current point?
[ % start for coordinate array
@@ -2996,12 +3008,12 @@
\psset[pstricks]{boxsep}
%
\def\pst@useboxpar{%
- \use@par%
- \if@star%
- \let\pslinecolor\psfillcolor%
- \solid@star%
+ \use@par
+ \if@star
+ \let\pslinecolor\psfillcolor
+ \solid@star
\let\solid@star\relax
- \fi%
+ \fi
\ifpsdoubleline \pst@setdoublesep \fi}
%
\def\psframebox{\def\pst@par{}\pst@object{psframebox}}
@@ -3461,6 +3473,67 @@
\end@OpenObj
\fi
}
+%
+\def\psarcOA{\pst@object{psarcOA}}% \psarcOA[..](O)(A){angle1}{angle2}
+\def\psarcOA@i{\@ifnextchar({\psarcOA@iii}{\psarcOA@ii}}
+\def\psarcOA@ii#1{\addto@par{arrows=#1}\@ifnextchar(\psarcOA@iii{\psarcOA@iii(0,0)}}
+\def\psarcOA@iii(#1)(#2)#3#4{%
+ \pst@getangle{#3}\pst@tempa
+ \pst@getangle{#4}\pst@tempb
+ \ifx\pst@tempa\pst@tempb
+ \else
+ \begin@OpenObj
+ \pst@getcoor{#1}\pst@tempA
+ \pst@getcoor{#2}\pst@tempB
+ \addto@pscode{
+ \pst@tempA 2 copy /y ED /x ED \pst@tempB Pyth2 /r ED
+ x y translate
+ /c 57.2957 r \tx@Div def
+ /angleA
+ \pst@tempa
+ \psk@arcsepA c mul 2 div
+ \ifcase\psarc@type add \or sub \fi def
+ /angleB
+ \pst@tempb
+ \psk@arcsepB c mul 2 div
+ \ifcase\psarc@type sub \or add \fi def
+ \ifshowpoints\psarc@showpoints\fi
+ \ifx\psk@arrowA\@empty
+ \ifnum\psk@liftpen=2
+ r angleA \tx@PtoC moveto
+ \fi
+ \fi
+ /angleAtoB angleB angleA gt { true }{ false } ifelse def
+ 0 0 r
+ angleA
+ \ifx\psk@arrowA\@empty\else
+ { ArrowA CP }
+ r 0 gt \pslbrace
+ { \ifcase\psarc@type add \or sub \fi } \psrbrace\pslbrace
+ { \ifcase\psarc@type sub \or add \fi } \psrbrace ifelse
+% { \ifcase\psarc@type add \or sub \fi }
+ \tx@ArcArrow
+% dup AngleA gt AngleAtoB exor { neg } fi
+ \fi
+ angleB
+ \ifx\psk@arrowB\@empty\else
+ { ArrowB }
+ r 0 gt \pslbrace
+ { \ifcase\psarc@type sub \or add \fi } \psrbrace\pslbrace
+ { \ifcase\psarc@type add \or sub \fi } \psrbrace ifelse
+% { \ifcase\psarc@type sub \or add \fi }
+ \tx@ArcArrow
+ dup angleA gt angleAtoB xor { pop angleA } if
+ \fi
+ \ifcase\psarc@type arc \or arcn \fi
+ \ifPst@variableLW \pst@flattenpath \fi
+ x neg y neg translate
+ }%
+ \gdef\psarc@type{0}%
+ \showpointsfalse
+ \end@OpenObj
+ \fi
+}
\def\psarc@iv{%
\pst@coor /y ED /x ED
/r \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dima \fi def
@@ -3506,7 +3579,8 @@
\tx@ArcArrow
dup angleA gt angleAtoB xor { pop angleA } if
\fi
-\ifcase\psarc@type arc \or arcn \fi}
+ \ifcase\psarc@type arc \or arcn \fi
+}
% hv ----- 1.10 2005-05-05 ------------------------> end
%
\def\psarc@type{0}
@@ -3528,7 +3602,8 @@
\addbefore@par{psscale=1}% be sure, that it is defined
\pst@getarrows{%
\begin@OpenObj%
- \pst@getcoors{}\psarcAB@ii%
+ \pst@getcoors{}%
+ \psarcAB@ii
}%
}
\def\psarcAB@ii{%
@@ -3552,7 +3627,7 @@
y add exch x add exch moveto
\fi
\fi
- \psarc@v }%
+ \psarc@v}%
\gdef\psarc@type{0}%
\showpointsfalse%
\end@OpenObj%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pstricks/pstricks.sty new/tex/latex/pstricks/pstricks.sty
--- old/tex/latex/pstricks/pstricks.sty 2018-12-24 00:03:56.000000000 +0100
+++ new/tex/latex/pstricks/pstricks.sty 2019-05-12 22:17:14.000000000 +0200
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 872 2018-12-21 20:39:31Z herbert $
+% $Id: pstricks.sty 1044 2019-04-11 09:32:09Z herbert $
%%
%% This is file `pstricks.sty'.
%%
@@ -37,10 +37,12 @@
\def\pst@ColorPackage{xcolor}
\DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
%
+\newif\ifpst@useCalc \pst@useCalcfalse
\newif\ifpst@psfonts \pst@psfontsfalse
\newif\if@check@engine \@check@enginetrue
\newif\ifpst@xetex \pst@xetexfalse
+\DeclareOption{useCalc}{\pst@useCalctrue}
\DeclareOption{psfonts}{\pst@psfontstrue}
\DeclareOption{noEngineCheck}{\@check@enginefalse}
\DeclareOption{xetex}{\global\pst@xetextrue}
@@ -80,6 +82,9 @@
\RequirePackage{iftex}
\RequirePackage{shellesc}
+\ifpst@useCalc
+ \RequirePackage{pst-calculate}
+\fi
%\ifPDFTeX
% \ifpdfshellescape\else
% \@latex@error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pstricks.tlpobj new/tlpkg/tlpobj/pstricks.tlpobj
--- old/tlpkg/tlpobj/pstricks.tlpobj 2019-02-28 04:02:51.000000000 +0100
+++ new/tlpkg/tlpobj/pstricks.tlpobj 2020-03-04 23:53:30.000000000 +0100
@@ -1,6 +1,6 @@
name pstricks
category Package
-revision 50101
+revision 54080
catalogue pstricks-base
shortdesc PostScript macros for TeX
relocated 1
@@ -54,10 +54,9 @@
catalogue-alias pstricks
catalogue-also pstricks-add
catalogue-contact-home http://tug.org/PSTricks
-catalogue-contact-repository http://comedy.dante.de/~herbert/TeXnik/
+catalogue-contact-repository https://archiv.dante.de/~herbert/TeXnik/
catalogue-contact-support http://tug.org/mailman/listinfo/pstricks
catalogue-ctan /graphics/pstricks/base
-catalogue-date 2019-02-23 16:30:24 +0100
catalogue-license lppl1.3
catalogue-topics graphics-in-tex colour pstricks dvips-special xetex
-catalogue-version 2.96
+catalogue-version 2.97
++++++ ptex-base.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/ptex/ptex-base/LICENSE new/doc/ptex/ptex-base/LICENSE
--- old/doc/ptex/ptex-base/LICENSE 2019-04-03 23:37:56.000000000 +0200
+++ new/doc/ptex/ptex-base/LICENSE 2020-03-07 22:38:51.000000000 +0100
@@ -1,5 +1,5 @@
Copyright (C) 2010 ASCII MEDIA WORKS.
-Copyright (C) 2016-2019 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/ptex/ptex-base/README.md new/doc/ptex/ptex-base/README.md
--- old/doc/ptex/ptex-base/README.md 2019-04-03 23:37:56.000000000 +0200
+++ new/doc/ptex/ptex-base/README.md 2020-03-07 22:38:51.000000000 +0100
@@ -25,6 +25,6 @@
## Release Date
-2019-04-03
+2020-03-07
Japanese TeX Development Community
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex-base.doc.tlpobj new/tlpkg/tlpobj/ptex-base.doc.tlpobj
--- old/tlpkg/tlpobj/ptex-base.doc.tlpobj 2019-04-04 01:24:48.000000000 +0200
+++ new/tlpkg/tlpobj/ptex-base.doc.tlpobj 2020-03-08 01:33:46.000000000 +0100
@@ -1,6 +1,6 @@
name ptex-base.doc
category Package
-revision 50731
+revision 54153
shortdesc doc files of ptex-base
relocated 1
docfiles size=2
++++++ ptex-base.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/ptex/ptex-base/eptexdefs.lib new/tex/ptex/ptex-base/eptexdefs.lib
--- old/tex/ptex/ptex-base/eptexdefs.lib 2018-08-18 23:18:32.000000000 +0200
+++ new/tex/ptex/ptex-base/eptexdefs.lib 2020-03-07 22:38:51.000000000 +0100
@@ -1,4 +1,4 @@
-%% e-pTeXlib (2018/03/12)
+%% e-pTeXlib (2020/02/05)
%% derived from $TEXMF/tex/plain/etex/etexdefs.lib (V2.0;8 24-MAR-1998)
\module {grouptypes}
@@ -80,13 +80,16 @@
\etexifdef definedif = 18
\etexifdef csnameif = 19
\etexifdef fontcharif = 20
-\etexifdef tdirif = 21
-\etexifdef ydirif = 22
-\etexifdef ddirif = 23
-\etexifdef mdirif = 24
-\etexifdef tboxif = 25
-\etexifdef yboxif = 26
-\etexifdef dboxif = 27
-\etexifdef mboxif = 28
-\etexifdef pdfprimitiveif = 29
+\etexifdef incsnameif = 21
+\etexifdef pdfprimitiveif = 22
+\etexifdef tdirif = 23
+\etexifdef ydirif = 24
+\etexifdef ddirif = 25
+\etexifdef mdirif = 26
+\etexifdef tboxif = 27
+\etexifdef yboxif = 28
+\etexifdef dboxif = 29
+\etexifdef mboxif = 30
+\etexifdef jfontif = 31
+\etexifdef tfontif = 32
\endmodule
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex-base.tlpobj new/tlpkg/tlpobj/ptex-base.tlpobj
--- old/tlpkg/tlpobj/ptex-base.tlpobj 2019-04-04 01:24:48.000000000 +0200
+++ new/tlpkg/tlpobj/ptex-base.tlpobj 2020-03-08 01:33:46.000000000 +0100
@@ -1,6 +1,6 @@
name ptex-base
category Package
-revision 50731
+revision 54153
shortdesc Plain TeX format for pTeX and e-pTeX
relocated 1
longdesc The bundle contains the plain TeX format for pTeX and e-pTeX.
@@ -14,6 +14,5 @@
RELOC/tex/ptex/ptex-base/ptex.tex
catalogue-contact-repository https://github.com/texjporg/ptex-base
catalogue-ctan /language/japanese/ptex-base
-catalogue-date 2019-04-03 15:55:31 +0200
catalogue-license bsd3
catalogue-topics format japanese
++++++ ptex-fontmaps.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/ptex-fontmaps/README new/texmf-dist/doc/fonts/ptex-fontmaps/README
--- old/texmf-dist/doc/fonts/ptex-fontmaps/README 2019-03-18 22:15:14.000000000 +0100
+++ new/texmf-dist/doc/fonts/ptex-fontmaps/README 2020-02-17 23:17:48.000000000 +0100
@@ -1,7 +1,7 @@
ptex-fontmaps
=============
-Current release: 20190318.0
+Current release: 20200217.0
The files contained in this package contains font maps for dvipdfmx to
make various Japanese/Chinese/Korean fonts available for (u)ptex and
@@ -24,18 +24,21 @@
we don't provide macOS-specific map files in TeX Live. This also agrees
with the requirements that TeX Live includes only support for free
software. This package is split into two parts:
-* ptex-fontmaps : which contains most of the files and scripts,
+
+ * ptex-fontmaps : which contains most of the files and scripts,
as well as support files
-* ptex-fontmaps-macos : only the support (map) files for
+ * ptex-fontmaps-macos : only the support (map) files for
macOS-specific fonts
The package `ptex-fontmaps' (this package) is available in TeX Live,
while the package `ptex-fontmaps-macos` is *NOT* available directly from the
TeX Live package mirrors, but can be installed from the TLContrib
repository, by executing the following commands:
- tlmgr repository add http://texlive.texjp.org/current/tlcontrib tlcontrib
- tlmgr pinning add tlcontrib '*'
- tlmgr install ptex-fontmaps-macos
+
+ tlmgr repository add http://texlive.texjp.org/current/tlcontrib tlcontrib
+ tlmgr pinning add tlcontrib '*'
+ tlmgr install ptex-fontmaps-macos
+
After that updates for the ptex-fontmaps packages will be automatically
installed.
@@ -48,7 +51,7 @@
For following list of maps, the respective fonts are shipped in TeX Live
and are available for free:
-* Japanese: ipa, ipaex
+* Japanese: haranoaji, ipa, ipaex
* Simplified Chinese: arphic, fandol
* Traditional Chinese: arphic
* Korean: baekmuk, unfonts
@@ -63,7 +66,7 @@
All other fonts are non-free.
If in the following tables some fonts are marked with
- '(<= "...")
+ '(<= "...")
it means that the fonts are originally named as in given within
the parenthesis, but need to be renamed to the name given first.
@@ -89,6 +92,12 @@
MS-Mincho.ttf (<= "MS Mincho.ttf")
MS-Gothic.ttf (<= "MS Gothic.ttf")
+4 bizud - BIZ UD fonts by Morisawa Inc., bundled with Win 10
+ October 2018 Update.
+ BIZ-UDMinchoM.ttc
+ BIZ-UDGothicR.ttc
+ BIZ-UDGothicB.ttc
+
4 yu-win - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
bundled with Win 8.1.
yumin.ttf
@@ -145,9 +154,9 @@
FGCCARGM.TTC
O? hiragino - Hiragino fonts by Dainippon Screen Mfg. Co., Ltd.
- bundled with Mac OS X 10.5--10.10,
- or Japanese word processor Ichitaro 2012 Premium/Super-premium editions
- HiraMinPro-W2.otf (<= "ヒラギノ明朝 Pro W2.otf")
+ bundled with Mac OS X 10.5--10.10,
+ or Japanese word processor Ichitaro 2012 Premium/Super-premium editions
+ HiraMinPro-W2.otf (<= "ヒラギノ明朝 Pro W2.otf") <= not bundled
HiraMinPro-W3.otf (<= "ヒラギノ明朝 Pro W3.otf")
HiraMinPro-W6.otf (<= "ヒラギノ明朝 Pro W6.otf")
HiraKakuPro-W3.otf (<= "ヒラギノ角ゴ Pro W3.otf")
@@ -162,7 +171,7 @@
O hiragino-elcapitan-pron
O hiragino-elcapitan
- bundled with Mac OS X 10.11 El Capitan -- 10.12 Sierra
+ bundled with Mac OS X 10.11 El Capitan -- 10.12 Sierra
HiraginoSansR-W4.ttc (<= "ヒラギノ丸ゴ ProN W4.ttc")
HiraginoSans-W3.ttc (<= "ヒラギノ角ゴシック W3.ttc")
HiraginoSans-W6.ttc (<= "ヒラギノ角ゴシック W6.ttc")
@@ -172,7 +181,7 @@
O hiragino-highsierra-pron
O hiragino-highsierra
- bundled with Mac OS X 10.13 High Sierra
+ bundled with Mac OS X 10.13 High Sierra
HiraginoSansR-W4.ttc (<= "ヒラギノ丸ゴ ProN W4.ttc")
HiraginoSans-W3.ttc (<= "ヒラギノ角ゴシック W3.ttc")
HiraginoSans-W6.ttc (<= "ヒラギノ角ゴシック W6.ttc")
@@ -180,14 +189,14 @@
HiraginoSerif.ttc (<= "ヒラギノ明朝 ProN.ttc")
O toppanbunkyu-sierra
- bundled with macOS 10.12 Sierra
+ bundled with macOS 10.12 Sierra
ToppanBunkyuMincho-Regular.otf
ToppanBunkyuMidashiMincho-ExtraBold.otf
ToppanBunkyuGothic.ttc
ToppanBunkyuMidashiGothic-ExtraBold.otf
O toppanbunkyu-highsierra
- bundled with macOS 10.13 Sierra
+ bundled with macOS 10.13 High Sierra
ToppanBunkyuMinchoPr6N-Regular.otf
ToppanBunkyuMidashiMinchoStdN-ExtraBold.otf
ToppanBunkyuGothicPr6N.ttc
@@ -224,6 +233,15 @@
A-OTF-MidashiGoPr6N-MB31.otf
A-OTF-RyuminPr6N-Light.otf
+P haranoaji - Harano Aji Fonts from https://github.com/trueroad/HaranoAjiFonts
+ HaranoAjiMincho-Light.otf
+ HaranoAjiMincho-Regular.otf
+ HaranoAjiMincho-Bold.otf
+ HaranoAjiGothic-Regular.otf
+ HaranoAjiGothic-Medium.otf
+ HaranoAjiGothic-Bold.otf
+ HaranoAjiGothic-Heavy.otf
+
Simplified Chinese
==================
@@ -335,7 +353,7 @@
kanji-config-updmap.pl are licensed under the following terms:
Copyright 2004-2006 by KOBAYASHI Taizo
Copyright 2011-2016 by PREINING Norbert
- Copyright 2016- by Japanese TeX Development Community
+ Copyright 2016-2020 by Japanese TeX Development Community
Licensed under the GPL version 3 or any later version,
see the file for details.
Binary files old/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf and new/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.tex new/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.tex
--- old/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.tex 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,407 @@
+\documentclass{jlreq}
+\usepackage{array}
+\usepackage{multicol}
+\usepackage{ascmac}
+\usepackage{url}
+
+\makeatletter
+%%%%%
+%
+% ptex-fontmaps-data.dat などを読み込んでリストを出力するマクロ
+% -- \unless, \readline を使っているので e-TeX 必須
+%
+% prepare
+\newread\xx@myread
+%
+% main routine
+\def\loaddata#1{%
+ \def\xx@日本語list{}\def\xx@簡体中国語list{}%
+ \def\xx@繁体中国語list{}\def\xx@韓国語list{}%
+ % read database
+ \openin\xx@myread=#1\relax
+ \@whilesw\unless\ifeof\xx@myread\fi{%
+ \readline\xx@myread to \xx@dataline
+ % first: strip trailing LF
+ \expandafter\xx@striplf\xx@dataline\@nil
+ \ifx\xx@dataline\@empty\else
+ % second: strip comments starting from '#'
+ \expandafter\expandafter\expandafter\xx@stripcomment
+ \expandafter\xx@dataline\xx@number\@nil
+ \ifx\xx@dataline\@empty\else
+ % now, only effective database lines
+ \expandafter\xx@parseline\xx@dataline\@nil
+ \fi
+ \fi
+ }%
+ \closein\xx@myread
+ % output result
+ \@for\xx@lang:={日本語,簡体中国語,繁体中国語,韓国語}\do{%
+ \expandafter\let\expandafter\xx@langlist\csname xx@\xx@lang list\endcsname
+ \ifx\xx@langlist\@empty\else
+ \begin{itembox}[l]{\xx@lang}
+ \begin{multicols}{2}
+ \begin{itemize}
+ \@for\xx@item:=\xx@langlist\do{\item \command{\xx@item}}%
+ \end{itemize}
+ \end{multicols}
+ \end{itembox}
+ \fi}
+}%
+%
+% sub
+\begingroup
+ \catcode`\^^M=12 \gdef\xx@lf{^^M}%
+ \catcode`\#=12 \gdef\xx@number{#}%
+\endgroup
+\expandafter\def\expandafter\xx@striplf
+ \expandafter#\expandafter1\xx@lf\@nil{\def\xx@dataline{#1}}
+\expandafter\def\expandafter\xx@stripcomment
+ \expandafter#\expandafter1\xx@number#2\@nil{\def\xx@dataline{#1}}
+\def\xx@parseline#1: #2: #3\@nil{\xx@parselang#1\@nil{#2}}
+%
+% subsub
+\begingroup
+ \escapechar-1
+ \xdef\xx@JA{\string\JA}\xdef\xx@SC{\string\SC}
+ \xdef\xx@TC{\string\TC}\xdef\xx@KO{\string\KO}
+ \xdef\xx@AI{-\string\AI0}
+\endgroup
+\def\xx@parselang#1#2#3\@nil#4{%
+ \def\xx@tempa{#1#2}\def\xx@tempb{#3}%
+ \edef\xx@tempc{#4 \ifx\xx@tempb\xx@AI<AI0>\else#3\fi}%
+ \ifx\xx@tempa\xx@JA \xx@addtolist\xx@日本語list\xx@tempc \else
+ \ifx\xx@tempa\xx@SC \xx@addtolist\xx@簡体中国語list\xx@tempc \else
+ \ifx\xx@tempa\xx@TC \xx@addtolist\xx@繁体中国語list\xx@tempc \else
+ \ifx\xx@tempa\xx@KO \xx@addtolist\xx@韓国語list\xx@tempc \else
+ \@latex@error{Unknown language `\xx@tempa' in database}\@ehc
+ \fi\fi\fi\fi}
+\def\xx@addtolist#1#2{%
+ % #1: name of the list, #2: item
+ \ifx#1\@empty
+ \edef#1{#2}%
+ \else
+ \edef#1{#1,#2}%
+ \fi}
+%
+%%%%%
+%
+% ptex-fontmaps の README を読み込んでそのまま出力する
+% -- \unless, \readline を使っているので e-TeX 必須
+%
+% main routine
+\def\loadprint#1{%
+ \openin\xx@myread=#1\relax
+ \@whilesw\unless\ifeof\xx@myread\fi{%
+ \readline\xx@myread to \xx@dataline
+ % first: strip trailing LF
+ \expandafter\xx@striplf\xx@dataline\@nil
+ % empty line and indent should be kept
+ \leavevmode\null\xx@dataline\par
+ }%
+ \closein\xx@myread
+}
+%%%%%
+\makeatother
+
+%% misc
+\def\file#1{\texttt{#1}}
+\def\command#1{\texttt{#1}}
+\def\option#1{\texttt{-{}-#1}}
+\def\codechar#1{\ensuremath{\langle\mbox{\texttt{#1}}\rangle}}
+\def\TL{\TeX\ Live}
+\def\pTeX{p\kern-.15em\TeX}
+\def\upTeX{u\pTeX}
+
+\title{\command{kanji-config-updmap} --- 日本語フォント設定ツール}
+\author{日本語\TeX 開発コミュニティ}
+
+\begin{document}
+\maketitle
+
+\TL に収録されている\file{ptex-fontmaps}パッケージには,
+\command{kanji-config-updmap}というコマンドが付属しています。
+このコマンドは,\pTeX や\upTeX で生成したDVIを扱う下記のドライバが埋め込む
+日本語・中国語・韓国語フォントの設定を統一的に指定したり,
+確認したりできます。
+\begin{itemize}
+ \item dvipdfmx(PDFへの埋め込みフォント)
+ \item dvips(PostScriptで指定するフォント名)
+ %\item pxdvi(画面表示に使うフォント)\footnote{この機能はオプションです。}
+\end{itemize}
+
+\section{はじめに:システム用(\command{-sys})とユーザ用(\command{-user})}
+
+\command{kanji-config-updmap}には2種類のコマンド名があります。
+\begin{itemize}
+ \item \command{kanji-config-updmap-sys}: 全ユーザ向けのシステム共通設定
+ \item \command{kanji-config-updmap-user}: 現在のユーザ用の設定
+\end{itemize}
+これは他の「\command{-sys}」と「\command{-user}」の区別のあるコマンドにも
+言えることですが,特に理由のない限り,\emph{常に}「\command{-sys}」付きの
+コマンド\command{kanji-config-updmap-sys}を使用することをお勧めします。
+これは以下の理由によります。
+\begin{itemize}
+ \item 現在のユーザ用の設定は,システム共通設定より優先する。
+ \item \TL のアップデート時は,システム共通設定は更新されるが,
+ 現在のユーザ用の設定は更新されない。
+ \item 結果的に,\emph{たった一度でも}「\command{-user}」付きのコマンドを
+ 実行した環境では,\TL のアップデート時に設定更新が反映されない
+ という事故が起こる。
+\end{itemize}
+より詳細には,\url{http://tug.org/texlive/scripts-sys-user.html}を参照してください。
+
+なお,「管理者権限がなくて \command{-sys} 付きのコマンドを実行できない」などの
+理由がある場合は,\command{kanji-config-updmap-user}を使用してください。
+この場合は,\command{tlmgr}で\TL をアップデートすることもない(できない)
+でしょうから,上に述べたような不都合は起きないでしょう。
+
+以下では \command{-sys} の方で説明します。
+また,Windowsでは\command{sudo}(Unixで管理者権限に昇格するコマンド)を
+つける必要はありませんので省いて読んでください。
+
+
+\clearpage
+
+
+\section{現在の埋め込み設定を確認する}
+
+現在の日本語フォントの埋め込み設定を確認するには
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --ja status
+\end{verbatim}
+を実行します(オプション \option{ja} は省略可能です)。
+
+同様に,現在の簡体中国語・繁体中国語・韓国語フォントの埋め込み設定はそれぞれ
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --sc status
+ $ sudo kanji-config-updmap-sys --tc status
+ $ sudo kanji-config-updmap-sys --ko status
+\end{verbatim}
+で確認できます(オプション \option{sc}, \option{tc}, \option{ko} は省略不可)。
+
+実行例を下に示します。
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --ja status
+ CURRENT family for ja: ipaex (variant: <empty>)
+ Standby family : haranoaji
+ Standby family : ipa
+ Standby family : ms
+ Standby family : yu-win10
+\end{verbatim}
+この場合,現在設定されているプリセットは\command{ipaex}であり,
+他に4種類のプリセットが利用可能であることを示します。
+\command{CURRENT family}の末尾の表示されている
+\command{variant}は \command{<empty>} か \command{-04} のいずれかで,
+\textbf{JIS90字形とJIS2004字形の両方がサポートされるプリセットでJIS2004字形が
+選択されている場合}のみ \command{-04} となります
+(第\ref{jis2004}節を参照)。
+% kanji-config-updmap 20200217.0 で status に variant も表示するようにした
+
+なお,\TL を公式インストーラでフルインストールした場合は,デフォルトで
+表\ref{tldefault}の設定が適用された状態になっています。
+それぞれの値が実際にどのフォントに対応しているかは,\file{ptex-fontmaps}の
+\file{README}を参照してください。
+例えば,日本語フォントのデフォルト値\command{ipaex}は
+IPAex明朝・IPAexゴシックに対応しています。
+\begin{table}[h]
+ \centering
+ \caption{\TL の埋め込みフォントのデフォルト値}\label{tldefault}
+ \begin{tabular}{m{12zw}m{8zw}}
+ \hline
+ 変数名(言語) & デフォルト値 \\ \hline
+ \command{jaEmbed}(日本語) & \command{ipaex} \\
+ \command{scEmbed}(簡体中国語) & \command{arphic} \\
+ \command{tcEmbed}(繁体中国語) & \command{arphic} \\
+ \command{koEmbed}(韓国語) & \command{baekmuk} \\ \hline
+\end{tabular}
+\end{table}
+
+
+\clearpage
+
+
+\section{日本語フォントの埋め込み設定を変更する}
+
+日本語フォントの埋め込み設定を変更するには
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --ja <family>
+\end{verbatim}
+を実行します(ここでもオプション \option{ja} は省略可能です)。
+
+同様に,現在の簡体中国語・繁体中国語・韓国語フォントの埋め込み設定はそれぞれ
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --sc <family>
+ $ sudo kanji-config-updmap-sys --tc <family>
+ $ sudo kanji-config-updmap-sys --ko <family>
+\end{verbatim}
+で変更できます(オプション \option{sc}, \option{tc}, \option{ko} は省略不可)。
+
+なお,オプションの書式は \option{ja <family>} と \option{ja=<family>} のように,
+イコール(\command{=})を付けても付けなくても同じ意味になります。
+
+\subsection{利用可能なプリセット一覧}
+
+利用可能な \command{<family>} は以下のとおりです。
+実際に対応するフォントは,先ほどと同様に
+\file{ptex-fontmaps}の\file{README}を参照してください。
+このリストで,各値の末尾に付いている \command{(番号)} は,次節で説明する
+\command{auto}による自動選択の優先順位を表します。
+番号の前の \command{*} については,第\ref{jis2004}節で後述します。
+また \command{<AI0>} と付いているものは,Adobe-Identity0の
+フォントであることを示し,いくつかの制約事項があります(第\ref{ai0}節)。
+\loaddata{database/ptex-fontmaps-data.dat}
+
+さらに,TLContribリポジトリから\file{ptex-fontmaps-macos}パッケージを
+インストールすると,以下も追加で利用できます。
+\loaddata{database/ptex-fontmaps-macos-data.dat}
+
+複数の言語のフォント埋め込み設定を同時に変更することもできます。例えば
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --ja yu-win10 --sc fandol
+\end{verbatim}
+とすると,日本語フォントを\command{yu-win10}に,
+簡体中国語フォントを\command{fandol}に変更します。
+
+設定変更時には,その設定で使われるであろう代表的なフォントファイルが
+\emph{実在するかどうかを予めチェック}します(もし実在しなければ,
+第\ref{special-preset}節で後述する\command{auto}にフォールバックします)。
+オプション \option{force} を付けると,実在するかどうかにかかわらず
+強制的にそのプリセットを設定します(バージョン20190506.0の新機能)。
+
+\subsection{日本語フォントのJIS2004字形の使用}\label{jis2004}
+
+一部のプリセットでは,JIS90字形とJIS2004字形の両方をサポートしています。
+先ほどのリストで番号の前に \command{*} が\emph{付いていない}プリセットが該当し,
+現在すべてのOpenTypeフォントと一部のTrueTypeフォントが含まれます。
+これらのプリセットでは,\textbf{デフォルトではJIS90字形が使われます}が,
+オプション \option{jis2004} を指定するとJIS2004字形を使用する設定になります。例えば
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys haranoaji
+\end{verbatim}
+ではJIS90字形の「原ノ味フォント」が使われますが,
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --jis2004 haranoaji
+\end{verbatim}
+ではJIS2004字形の「原ノ味フォント」が使われます。
+
+一方 \command{*} が\emph{付いている}プリセットでは,
+JIS90字形とJIS2004字形の\textbf{どちらが出力されるかはフォント次第}です。
+このようなプリセットでは,オプション \option{jis2004} が指定されても
+\begin{verbatim}
+ WARNING: No -04 map available, option --jis2004 ignored!
+\end{verbatim}
+と警告して無視します。
+% 以前はオプションを無視せず -04 のマップファイルを使おうとして,
+% 結果的に kanjix.map からマッピングが消えていたが,
+% kanji-config-updmap 20200217.0 で --jis2004 を無視する仕様にした
+例えば
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys ipaex
+\end{verbatim}
+で使われる「IPAexフォント」はJIS2004字形でデザインされています。
+
+\subsection{特殊なプリセット}\label{special-preset}
+
+\emph{フォントを埋め込まない}場合は引数を\command{nofont}とします。
+例えば
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys nofont
+\end{verbatim}
+とすれば,日本語フォントが埋め込まれません。
+
+また,引数に\command{auto}を指定すると,上記のリストの中から \command{(番号)} が
+なるべく小さな\emph{実在するフォント}を自動的に選択します。
+ただし,現在設定されている(\command{nofont}以外の)プリセットが
+実在していて利用可能な場合は,現在の設定を維持します。
+例えば
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys auto
+\end{verbatim}
+では日本語フォントが\command{morisawa-pr6n}→\command{morisawa}→…の順に
+探され,最初に見つかったフォントを埋め込むように自動で設定されることになります。
+\begin{verbatim}
+ $ sudo kanji-config-updmap-sys --ja auto --sc auto --tc auto --ko auto
+\end{verbatim}
+とすれば,4つの言語全てが同様に自動設定されます。
+
+\subsection{カスタムプリセットの利用}
+
+[TODO] 作業中。
+マップファイルを用意すれば\command{kanji-config-updmap}で設定可能。
+
+
+\clearpage
+
+
+\section{特記事項}
+
+まず,一般的な注意点を挙げておきます。
+\begin{itemize}
+ \item 特定の文字が出力されるかどうかは,実際に使われるフォントに依ります。
+ フォントに収録されていない文字は出力されませんし,
+ JIS90字形かJIS2004字形のどちらか一方しか用意されていないフォントもあります。
+ \item 複数のウェイトが利用可能かどうかは,プリセットに依ります。
+ 例えば,\command{ipaex}が利用するIPAexフォントは明朝とゴシック
+ 各1ウェイトのみ配布されており,細字の明朝や太字のゴシックは利用できません。
+\end{itemize}
+
+その他,いくつかのプリセットには注意点があります。
+
+\subsection{Adobe-Identity0 (AI0)なフォントの制約事項}\label{ai0}
+
+\command{sourcehan}や\command{noto}などを埋め込む設定の注意点です。
+
+[TODO] 作業中。
+
+\begin{itemize}
+ \item \upTeX~+~dvipdfmx専用です。他の経路(\pTeX~+~dvipdfmx,
+ \pTeX~+~dvips,\upTeX~+~dvips)はサポートできないため,
+ \emph{フォントを埋め込まない}設定にフォールバックします。
+ \item \upTeX~+~dvipdfmxの経路でも,Adobe-Japan1などの従来のマッピングに
+ 依存する文字出力機能もサポートされません。具体的には以下の機能が該当し,
+ これらの文字も\emph{フォントを埋め込まない}設定にフォールバックします。
+ \begin{itemize}
+ \item \file{otf}パッケージが提供する \verb+\CID+ や
+ \file{ajmacros}(\verb+\aj...+命令など)の大半の命令
+ \item \file{otf}パッケージ使用時のクオート記号,
+ つまり\codechar{“}\codechar{”}\codechar{‘}\codechar{’}の4文字
+ \end{itemize}
+\end{itemize}
+
+\subsection{その他}
+
+その他,既知の注意点です。
+\file{ptex-fontmaps}はあくまで\pTeX や\upTeX が提供する共通のJFM(\file{ptex-fonts},
+\file{uptex-fonts}に収録)から参照される実フォントを切り替えるだけであり,
+個別のフォントに対する対処は行っていません。
+
+\begin{itemize}
+ \item \command{yu}, \command{yu-win10}はWindowsに付属する
+ TrueType形式の游フォントを埋め込みますが,
+ クオート記号\codechar{“}\codechar{”}\codechar{‘}\codechar{’}が
+ 全角幅より狭くデザインされているため,出力が異常になります。\\
+ 参考: \url{https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=2017}
+\end{itemize}
+
+
+%\section{内部処理}
+
+%\command{kanji-config-updmap-sys}は内部で\command{updmap-sys}を呼び出し,
+%\command{kanji-config-updmap-user}は内部で\command{updmap-user}を呼び出す。
+
+
+\clearpage
+\appendix
+
+
+\section{\file{ptex-fontmaps}の\file{README}}
+
+% \readline が和文文字をバイト列に変換しない e-pTeX 190908 以降が必要
+% https://github.com/texjporg/tex-jp-build/issues/88
+\ifnum\epTeXversion<190908\relax
+ \errhelp{Update e-pTeX.}\errmessage{e-pTeX 190908 required}
+\else
+ {\frenchspacing\ttfamily\footnotesize\loadprint{README}}
+\fi
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex-fontmaps.doc.tlpobj new/tlpkg/tlpobj/ptex-fontmaps.doc.tlpobj
--- old/tlpkg/tlpobj/ptex-fontmaps.doc.tlpobj 2019-03-19 02:26:34.000000000 +0100
+++ new/tlpkg/tlpobj/ptex-fontmaps.doc.tlpobj 2020-03-23 01:56:28.000000000 +0100
@@ -1,10 +1,12 @@
name ptex-fontmaps.doc
category Package
-revision 50446
+revision 54473
shortdesc doc files of ptex-fontmaps
-docfiles size=7
+docfiles size=55
texmf-dist/doc/fonts/ptex-fontmaps/README
texmf-dist/doc/fonts/ptex-fontmaps/examples/otf-sample-04.tex
texmf-dist/doc/fonts/ptex-fontmaps/examples/otf-sample.tex
texmf-dist/doc/fonts/ptex-fontmaps/examples/ptex-sample.tex
texmf-dist/doc/fonts/ptex-fontmaps/examples/series-compare.tex
+ texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf
+ texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.tex
++++++ ptex-fontmaps.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-bizud.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-bizud.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-bizud.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-bizud.map 2019-05-06 23:05:15.000000000 +0200
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminl-v V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminr-h H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminr-v V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminb-h H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminb-v V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hgothr-h H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+hgothr-v V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+hgothb-h H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hgothb-v V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hgotheb-h H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hgotheb-v V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hmgothr-h H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hmgothr-v V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+
+% TEXT, JIS04
+hminln-h H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminln-v V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminrn-h H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminrn-v V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminbn-h H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hminbn-v V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+hgothrn-h H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+hgothrn-v V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+hgothbn-h H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hgothbn-v V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hgothebn-h H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hgothebn-v V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hmgothrn-h H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+hmgothrn-v V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+
+% CID
+otf-cjml-h Identity-H :0:BIZ-UDMinchoM.ttc/AJ16 %!PS BIZ-UDMincho-Medium
+otf-cjml-v Identity-V :0:BIZ-UDMinchoM.ttc/AJ16 %!PS BIZ-UDMincho-Medium
+otf-cjmr-h Identity-H :0:BIZ-UDMinchoM.ttc/AJ16 %!PS BIZ-UDMincho-Medium
+otf-cjmr-v Identity-V :0:BIZ-UDMinchoM.ttc/AJ16 %!PS BIZ-UDMincho-Medium
+otf-cjmb-h Identity-H :0:BIZ-UDMinchoM.ttc/AJ16 %!PS BIZ-UDMincho-Medium
+otf-cjmb-v Identity-V :0:BIZ-UDMinchoM.ttc/AJ16 %!PS BIZ-UDMincho-Medium
+otf-cjgr-h Identity-H :0:BIZ-UDGothicR.ttc/AJ16 %!PS BIZ-UDGothic
+otf-cjgr-v Identity-V :0:BIZ-UDGothicR.ttc/AJ16 %!PS BIZ-UDGothic
+otf-cjgb-h Identity-H :0:BIZ-UDGothicB.ttc/AJ16 %!PS BIZ-UDGothic-Bold
+otf-cjgb-v Identity-V :0:BIZ-UDGothicB.ttc/AJ16 %!PS BIZ-UDGothic-Bold
+otf-cjge-h Identity-H :0:BIZ-UDGothicB.ttc/AJ16 %!PS BIZ-UDGothic-Bold
+otf-cjge-v Identity-V :0:BIZ-UDGothicB.ttc/AJ16 %!PS BIZ-UDGothic-Bold
+otf-cjmgr-h Identity-H :0:BIZ-UDGothicB.ttc/AJ16 %!PS BIZ-UDGothic-Bold
+otf-cjmgr-v Identity-V :0:BIZ-UDGothicB.ttc/AJ16 %!PS BIZ-UDGothic-Bold
+
+% Unicode 90JIS
+otf-ujml-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujml-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmr-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmr-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmb-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmb-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujgr-h UniJIS-UTF16-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+otf-ujgr-v UniJIS-UTF16-V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+otf-ujgb-h UniJIS-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujgb-v UniJIS-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujge-h UniJIS-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujge-v UniJIS-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujmgr-h UniJIS-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujmgr-v UniJIS-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+
+% Unicode JIS04
+otf-ujmln-h UniJIS2004-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmln-v UniJIS2004-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmrn-h UniJIS2004-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmrn-v UniJIS2004-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmbn-h UniJIS2004-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujmbn-v UniJIS2004-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+otf-ujgrn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+otf-ujgrn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+otf-ujgbn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujgbn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujgen-h UniJIS2004-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujgen-v UniJIS2004-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujmgrn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+otf-ujmgrn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-up-bizud.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-up-bizud.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-up-bizud.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-up-bizud.map 2019-05-06 23:05:15.000000000 +0200
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminl-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminr-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminr-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminb-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminb-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphgothr-h UniJIS-UTF16-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+uphgothr-v UniJIS-UTF16-V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+uphgothb-h UniJIS-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphgothb-v UniJIS-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphgotheb-h UniJIS-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphgotheb-v UniJIS-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphmgothr-h UniJIS-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphmgothr-v UniJIS-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminln-v UniJIS2004-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminrn-h UniJIS2004-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminrn-v UniJIS2004-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminbn-h UniJIS2004-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphminbn-v UniJIS2004-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uphgothrn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+uphgothrn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+uphgothbn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphgothbn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphgothebn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphgothebn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphmgothrn-h UniJIS2004-UTF16-H :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
+uphmgothrn-v UniJIS2004-UTF16-V :0:BIZ-UDGothicB.ttc %!PS BIZ-UDGothic-Bold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/ptex-bizud.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/ptex-bizud.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/ptex-bizud.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/ptex-bizud.map 2019-05-06 23:05:15.000000000 +0200
@@ -0,0 +1,4 @@
+rml H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+rmlv V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+gbm H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+gbmv V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/uptex-bizud.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/uptex-bizud.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/uptex-bizud.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/uptex-bizud.map 2019-05-06 23:05:15.000000000 +0200
@@ -0,0 +1,10 @@
+urml UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+urmlv UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+ugbm UniJIS-UTF16-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+ugbmv UniJIS-UTF16-V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+uprml-h UniJIS-UTF16-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+uprml-v UniJIS-UTF16-V :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+upgbm-h UniJIS-UTF16-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+upgbm-v UniJIS-UTF16-V :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
+uprml-hq UniJIS-UCS2-H :0:BIZ-UDMinchoM.ttc %!PS BIZ-UDMincho-Medium
+upgbm-hq UniJIS-UCS2-H :0:BIZ-UDGothicR.ttc %!PS BIZ-UDGothic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h H HaranoAjiMincho-Light.otf
+hminl-v V HaranoAjiMincho-Light.otf
+hminr-h H HaranoAjiMincho-Regular.otf
+hminr-v V HaranoAjiMincho-Regular.otf
+hminb-h H HaranoAjiMincho-Bold.otf
+hminb-v V HaranoAjiMincho-Bold.otf
+hgothr-h H HaranoAjiGothic-Regular.otf
+hgothr-v V HaranoAjiGothic-Regular.otf
+hgothb-h H HaranoAjiGothic-Bold.otf
+hgothb-v V HaranoAjiGothic-Bold.otf
+hgotheb-h H HaranoAjiGothic-Heavy.otf
+hgotheb-v V HaranoAjiGothic-Heavy.otf
+hmgothr-h H HaranoAjiGothic-Medium.otf
+hmgothr-v V HaranoAjiGothic-Medium.otf
+
+% TEXT, JIS04
+hminln-h H HaranoAjiMincho-Light.otf
+hminln-v V HaranoAjiMincho-Light.otf
+hminrn-h H HaranoAjiMincho-Regular.otf
+hminrn-v V HaranoAjiMincho-Regular.otf
+hminbn-h H HaranoAjiMincho-Bold.otf
+hminbn-v V HaranoAjiMincho-Bold.otf
+hgothrn-h H HaranoAjiGothic-Regular.otf
+hgothrn-v V HaranoAjiGothic-Regular.otf
+hgothbn-h H HaranoAjiGothic-Bold.otf
+hgothbn-v V HaranoAjiGothic-Bold.otf
+hgothebn-h H HaranoAjiGothic-Heavy.otf
+hgothebn-v V HaranoAjiGothic-Heavy.otf
+hmgothrn-h H HaranoAjiGothic-Medium.otf
+hmgothrn-v V HaranoAjiGothic-Medium.otf
+
+% CID
+otf-cjml-h Identity-H HaranoAjiMincho-Light.otf
+otf-cjml-v Identity-V HaranoAjiMincho-Light.otf
+otf-cjmr-h Identity-H HaranoAjiMincho-Regular.otf
+otf-cjmr-v Identity-V HaranoAjiMincho-Regular.otf
+otf-cjmb-h Identity-H HaranoAjiMincho-Bold.otf
+otf-cjmb-v Identity-V HaranoAjiMincho-Bold.otf
+otf-cjgr-h Identity-H HaranoAjiGothic-Regular.otf
+otf-cjgr-v Identity-V HaranoAjiGothic-Regular.otf
+otf-cjgb-h Identity-H HaranoAjiGothic-Bold.otf
+otf-cjgb-v Identity-V HaranoAjiGothic-Bold.otf
+otf-cjge-h Identity-H HaranoAjiGothic-Heavy.otf
+otf-cjge-v Identity-V HaranoAjiGothic-Heavy.otf
+otf-cjmgr-h Identity-H HaranoAjiGothic-Medium.otf
+otf-cjmgr-v Identity-V HaranoAjiGothic-Medium.otf
+
+% Unicode 90JIS
+otf-ujml-h UniJIS-UTF16-H HaranoAjiMincho-Light.otf
+otf-ujml-v UniJIS-UTF16-V HaranoAjiMincho-Light.otf
+otf-ujmr-h UniJIS-UTF16-H HaranoAjiMincho-Regular.otf
+otf-ujmr-v UniJIS-UTF16-V HaranoAjiMincho-Regular.otf
+otf-ujmb-h UniJIS-UTF16-H HaranoAjiMincho-Bold.otf
+otf-ujmb-v UniJIS-UTF16-V HaranoAjiMincho-Bold.otf
+otf-ujgr-h UniJIS-UTF16-H HaranoAjiGothic-Regular.otf
+otf-ujgr-v UniJIS-UTF16-V HaranoAjiGothic-Regular.otf
+otf-ujgb-h UniJIS-UTF16-H HaranoAjiGothic-Bold.otf
+otf-ujgb-v UniJIS-UTF16-V HaranoAjiGothic-Bold.otf
+otf-ujge-h UniJIS-UTF16-H HaranoAjiGothic-Heavy.otf
+otf-ujge-v UniJIS-UTF16-V HaranoAjiGothic-Heavy.otf
+otf-ujmgr-h UniJIS-UTF16-H HaranoAjiGothic-Medium.otf
+otf-ujmgr-v UniJIS-UTF16-V HaranoAjiGothic-Medium.otf
+
+% Unicode JIS04
+otf-ujmln-h UniJIS2004-UTF16-H HaranoAjiMincho-Light.otf
+otf-ujmln-v UniJIS2004-UTF16-V HaranoAjiMincho-Light.otf
+otf-ujmrn-h UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf
+otf-ujmrn-v UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf
+otf-ujmbn-h UniJIS2004-UTF16-H HaranoAjiMincho-Bold.otf
+otf-ujmbn-v UniJIS2004-UTF16-V HaranoAjiMincho-Bold.otf
+otf-ujgrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Regular.otf
+otf-ujgrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Regular.otf
+otf-ujgbn-h UniJIS2004-UTF16-H HaranoAjiGothic-Bold.otf
+otf-ujgbn-v UniJIS2004-UTF16-V HaranoAjiGothic-Bold.otf
+otf-ujgen-h UniJIS2004-UTF16-H HaranoAjiGothic-Heavy.otf
+otf-ujgen-v UniJIS2004-UTF16-V HaranoAjiGothic-Heavy.otf
+otf-ujmgrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf
+otf-ujmgrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H HaranoAjiMincho-Light.otf
+uphminl-v UniJIS-UTF16-V HaranoAjiMincho-Light.otf
+uphminr-h UniJIS-UTF16-H HaranoAjiMincho-Regular.otf
+uphminr-v UniJIS-UTF16-V HaranoAjiMincho-Regular.otf
+uphminb-h UniJIS-UTF16-H HaranoAjiMincho-Bold.otf
+uphminb-v UniJIS-UTF16-V HaranoAjiMincho-Bold.otf
+uphgothr-h UniJIS-UTF16-H HaranoAjiGothic-Regular.otf
+uphgothr-v UniJIS-UTF16-V HaranoAjiGothic-Regular.otf
+uphgothb-h UniJIS-UTF16-H HaranoAjiGothic-Bold.otf
+uphgothb-v UniJIS-UTF16-V HaranoAjiGothic-Bold.otf
+uphgotheb-h UniJIS-UTF16-H HaranoAjiGothic-Heavy.otf
+uphgotheb-v UniJIS-UTF16-V HaranoAjiGothic-Heavy.otf
+uphmgothr-h UniJIS-UTF16-H HaranoAjiGothic-Medium.otf
+uphmgothr-v UniJIS-UTF16-V HaranoAjiGothic-Medium.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H HaranoAjiMincho-Light.otf
+uphminln-v UniJIS2004-UTF16-V HaranoAjiMincho-Light.otf
+uphminrn-h UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf
+uphminrn-v UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf
+uphminbn-h UniJIS2004-UTF16-H HaranoAjiMincho-Bold.otf
+uphminbn-v UniJIS2004-UTF16-V HaranoAjiMincho-Bold.otf
+uphgothrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Regular.otf
+uphgothrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Regular.otf
+uphgothbn-h UniJIS2004-UTF16-H HaranoAjiGothic-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V HaranoAjiGothic-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H HaranoAjiGothic-Heavy.otf
+uphgothebn-v UniJIS2004-UTF16-V HaranoAjiGothic-Heavy.otf
+uphmgothrn-h UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf
+uphmgothrn-v UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,4 @@
+rml 2004-H HaranoAjiMincho-Regular.otf
+rmlv 2004-V HaranoAjiMincho-Regular.otf
+gbm 2004-H HaranoAjiGothic-Medium.otf
+gbmv 2004-V HaranoAjiGothic-Medium.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,4 @@
+rml H HaranoAjiMincho-Regular.otf
+rmlv V HaranoAjiMincho-Regular.otf
+gbm H HaranoAjiGothic-Medium.otf
+gbmv V HaranoAjiGothic-Medium.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,10 @@
+urml UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf
+urmlv UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf
+ugbm UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf
+ugbmv UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf
+uprml-h UniJIS2004-UTF16-H HaranoAjiMincho-Regular.otf
+uprml-v UniJIS2004-UTF16-V HaranoAjiMincho-Regular.otf
+upgbm-h UniJIS2004-UTF16-H HaranoAjiGothic-Medium.otf
+upgbm-v UniJIS2004-UTF16-V HaranoAjiGothic-Medium.otf
+uprml-hq UniJIS-UCS2-H HaranoAjiMincho-Regular.otf
+upgbm-hq UniJIS-UCS2-H HaranoAjiGothic-Medium.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map 2020-02-17 23:17:48.000000000 +0100
@@ -0,0 +1,10 @@
+urml UniJIS-UTF16-H HaranoAjiMincho-Regular.otf
+urmlv UniJIS-UTF16-V HaranoAjiMincho-Regular.otf
+ugbm UniJIS-UTF16-H HaranoAjiGothic-Medium.otf
+ugbmv UniJIS-UTF16-V HaranoAjiGothic-Medium.otf
+uprml-h UniJIS-UTF16-H HaranoAjiMincho-Regular.otf
+uprml-v UniJIS-UTF16-V HaranoAjiMincho-Regular.otf
+upgbm-h UniJIS-UTF16-H HaranoAjiGothic-Medium.otf
+upgbm-v UniJIS-UTF16-V HaranoAjiGothic-Medium.otf
+uprml-hq UniJIS-UCS2-H HaranoAjiMincho-Regular.otf
+upgbm-hq UniJIS-UCS2-H HaranoAjiGothic-Medium.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-up-yu-win.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-up-yu-win.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-up-yu-win.map 2017-01-14 07:01:42.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-up-yu-win.map 2020-02-17 23:17:48.000000000 +0100
@@ -4,8 +4,8 @@
uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
uphgothr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
uphgothr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
uphgothb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
@@ -20,8 +20,8 @@
uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
uphgothrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular
uphgothrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular
uphgothbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-yu-win.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-yu-win.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-yu-win.map 2017-01-14 07:01:42.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win/otf-yu-win.map 2020-02-17 23:17:48.000000000 +0100
@@ -4,8 +4,8 @@
hminl-v V yuminl.ttf %!PS YuMincho-Light
hminr-h H yumin.ttf %!PS YuMincho-Regular
hminr-v V yumin.ttf %!PS YuMincho-Regular
-hminb-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminb-v V yumindb.ttf %!PS YuMincho-DemiBold
+hminb-h H yumindb.ttf %!PS YuMincho-Demibold
+hminb-v V yumindb.ttf %!PS YuMincho-Demibold
hgothr-h H yugothic.ttf %!PS YuGothic-Regular
hgothr-v V yugothic.ttf %!PS YuGothic-Regular
hgothb-h H yugothib.ttf %!PS YuGothic-Bold
@@ -20,8 +20,8 @@
hminln-v V yuminl.ttf %!PS YuMincho-Light
hminrn-h H yumin.ttf %!PS YuMincho-Regular
hminrn-v V yumin.ttf %!PS YuMincho-Regular
-hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold
+hminbn-h H yumindb.ttf %!PS YuMincho-Demibold
+hminbn-v V yumindb.ttf %!PS YuMincho-Demibold
hgothrn-h H yugothic.ttf %!PS YuGothic-Regular
hgothrn-v V yugothic.ttf %!PS YuGothic-Regular
hgothbn-h H yugothib.ttf %!PS YuGothic-Bold
@@ -36,8 +36,8 @@
otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light
otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular
otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular
-otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
-otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
+otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-Demibold
+otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-Demibold
otf-cjgr-h Identity-H yugothic.ttf/AJ16 %!PS YuGothic-Regular
otf-cjgr-v Identity-V yugothic.ttf/AJ16 %!PS YuGothic-Regular
otf-cjgb-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
@@ -52,8 +52,8 @@
otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
otf-ujgr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
otf-ujgr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
otf-ujgb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
@@ -68,8 +68,8 @@
otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
otf-ujgrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular
otf-ujgrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular
otf-ujgbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-up-yu-win10.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-up-yu-win10.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-up-yu-win10.map 2017-01-14 07:01:42.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-up-yu-win10.map 2020-02-17 23:17:48.000000000 +0100
@@ -4,8 +4,8 @@
uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
uphgothr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
uphgothr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
uphgothb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
@@ -20,8 +20,8 @@
uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
uphgothrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
uphgothrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
uphgothbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-yu-win10.map new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-yu-win10.map
--- old/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-yu-win10.map 2017-01-14 07:01:42.000000000 +0100
+++ new/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/yu-win10/otf-yu-win10.map 2020-02-17 23:17:48.000000000 +0100
@@ -4,8 +4,8 @@
hminl-v V yuminl.ttf %!PS YuMincho-Light
hminr-h H yumin.ttf %!PS YuMincho-Regular
hminr-v V yumin.ttf %!PS YuMincho-Regular
-hminb-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminb-v V yumindb.ttf %!PS YuMincho-DemiBold
+hminb-h H yumindb.ttf %!PS YuMincho-Demibold
+hminb-v V yumindb.ttf %!PS YuMincho-Demibold
hgothr-h H :0:YuGothR.ttc %!PS YuGothic-Regular
hgothr-v V :0:YuGothR.ttc %!PS YuGothic-Regular
hgothb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
@@ -20,8 +20,8 @@
hminln-v V yuminl.ttf %!PS YuMincho-Light
hminrn-h H yumin.ttf %!PS YuMincho-Regular
hminrn-v V yumin.ttf %!PS YuMincho-Regular
-hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold
-hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold
+hminbn-h H yumindb.ttf %!PS YuMincho-Demibold
+hminbn-v V yumindb.ttf %!PS YuMincho-Demibold
hgothrn-h H :0:YuGothR.ttc %!PS YuGothic-Regular
hgothrn-v V :0:YuGothR.ttc %!PS YuGothic-Regular
hgothbn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
@@ -36,8 +36,8 @@
otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light
otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular
otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular
-otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
-otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
+otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-Demibold
+otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-Demibold
otf-cjgr-h Identity-H :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
otf-cjgr-v Identity-V :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
otf-cjgb-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
@@ -52,8 +52,8 @@
otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
otf-ujgr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
otf-ujgr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
otf-ujgb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
@@ -68,8 +68,8 @@
otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
-otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
-otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-Demibold
+otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-Demibold
otf-ujgrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
otf-ujgrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
otf-ujgbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/misc/ptex-fontmaps/ptex-fontmaps-data.dat new/texmf-dist/fonts/misc/ptex-fontmaps/ptex-fontmaps-data.dat
--- old/texmf-dist/fonts/misc/ptex-fontmaps/ptex-fontmaps-data.dat 2019-03-18 22:15:14.000000000 +0100
+++ new/texmf-dist/fonts/misc/ptex-fontmaps/ptex-fontmaps-data.dat 2020-02-17 23:17:48.000000000 +0100
@@ -1,23 +1,26 @@
# ptex-fontmaps-data.dat
+# With '*', no -04 map available
JA(10): morisawa-pr6n: A-OTF-RyuminPr6N-Light.otf
JA(20): morisawa: A-OTF-RyuminPro-Light.otf
JA(30): hiragino-pron: HiraMinProN-W3.otf
JA(40): hiragino: HiraMinPro-W3.otf
JA(50): kozuka-pr6n: KozMinPr6N-Regular.otf
-JA(60): kozuka-pr6: KozMinProVI-Regular.otf
-JA(70): kozuka: KozMinPro-Regular.otf
+JA(55): kozuka-pr6: KozMinProVI-Regular.otf
+JA(60): kozuka: KozMinPro-Regular.otf
+JA(70): haranoaji: HaranoAjiMincho-Regular.otf
+JA*(80): bizud: BIZ-UDMinchoM.ttc
JA(90): yu-osx: YuMin-Medium.otf
-JA(95): yu-win10: YuGothB.ttc
-JA(96): yu-win: yugothib.ttf
-JA(100): ms: msgothic.ttc
-JA(105): ms-osx: MS-Gothic.ttf
+JA*(95): yu-win10: YuGothB.ttc
+JA*(96): yu-win: yugothib.ttf
+JA*(100): ms: msgothic.ttc
+JA*(105): ms-osx: MS-Gothic.ttf
JA(110): moga-mobo-ex: mogam.ttc
JA(120): moga-mobo: mogam.ttc
-JA(130): ipaex: ipaexm.ttf
-JA(140): ipa: ipam.ttf
-JA(150): ume: ume-tmo3.ttf
-JA(160): canon: FGCCHMW3.TTC
+JA*(130): ipaex: ipaexm.ttf
+JA*(140): ipa: ipam.ttf
+JA*(150): ume: ume-tmo3.ttf
+JA*(160): canon: FGCCHMW3.TTC
JA-AI0: sourcehan-otc: SourceHanSerif-Regular.ttc
JA-AI0: sourcehan: SourceHanSerif-Regular.otf
JA-AI0: noto-otc: NotoSerifCJK-Regular.ttc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl new/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl
--- old/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl 2019-03-18 22:15:14.000000000 +0100
+++ new/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl 2020-02-17 23:17:48.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# kanji-config-updmap: setup Japanese font embedding
-# Version 20190318.0
+# Version 20200217.0
#
# formerly known as updmap-setup-kanji
#
@@ -22,7 +22,7 @@
use strict;
my $prg = "kanji-config-updmap";
-my $version = '20190318.0';
+my $version = '20200217.0';
my $updmap_real = "updmap";
my $updmap = $updmap_real;
@@ -33,6 +33,7 @@
my $opt_sys = 0;
my $opt_user = 0;
my $opt_old = 0;
+my $opt_force = 0;
my @opt_mode_list;
my $opt_mode_one;
my $opt_mode_ja;
@@ -52,6 +53,7 @@
"sys" => \$opt_sys,
"user" => \$opt_user,
"old" => \$opt_old,
+ "force" => \$opt_force,
"version" => sub { print &version(); exit(0); }, ) ) {
die "Try \"$0 --help\" for more information.\n";
}
@@ -213,6 +215,7 @@
a new updmap with --user option is assumed.
If this is not the case, explicitly use --old.
--old Makes $prg call `updmap' without --user argument in user mode.
+ --force Set up font embedding even if the font is not available.
--version Show version information and exit
EOF
@@ -252,6 +255,12 @@
next if ($l =~ m/^\s*$/); # skip empty line
next if ($l =~ m/^\s*#/); # skip comment line
$l =~ s/\s*#.*$//; # skip comment after '#'
+ if ($l =~ m/^JA\*\((\d+)\):\s*(.*):\s*(.*)$/) { # no -04 map
+ $representatives{'ja'}{$2}{'priority'} = $1;
+ $representatives{'ja'}{$2}{'file'} = $3;
+ $representatives{'ja'}{$2}{'nojis04'} = 1;
+ next;
+ }
if ($l =~ m/^JA\((\d+)\):\s*(.*):\s*(.*)$/) {
$representatives{'ja'}{$2}{'priority'} = $1;
$representatives{'ja'}{$2}{'file'} = $3;
@@ -272,6 +281,13 @@
$representatives{'ko'}{$2}{'file'} = $3;
next;
}
+ if ($l =~ m/^JA-AI0\*:\s*(.*):\s*(.*)$/) { # no -04 map
+ $representatives{'ja'}{$1}{'priority'} = 9999; # lowest
+ $representatives{'ja'}{$1}{'file'} = $2;
+ $representatives{'ja'}{$1}{'nojis04'} = 1;
+ $ai0flags{'ja'}{$1} = 1;
+ next;
+ }
if ($l =~ m/^JA-AI0:\s*(.*):\s*(.*)$/) {
$representatives{'ja'}{$1}{'priority'} = 9999; # lowest
$representatives{'ja'}{$1}{'file'} = $2;
@@ -308,10 +324,11 @@
sub kpse_miscfont {
my ($file) = @_;
- chomp(my $foo = `kpsewhich -format=miscfont $file`);
- # for GitHub repository diretory structure
+ my $foo = '';
+ # first, prioritize GitHub repository diretory structure
+ $foo = "database/$file" if (-f "database/$file");
if ($foo eq "") {
- $foo = "database/$file" if (-f "database/$file");
+ chomp($foo = `kpsewhich -format=miscfont $file`);
}
return $foo;
}
@@ -363,17 +380,32 @@
sub GetStatus {
my $opt_mode = shift;
- my $val = `$updmap_real --quiet --showoption ${opt_mode}Embed`;
- my $STATUS;
+ my $val;
+ my $STATUS = "";
+ my $VARIANT = "";
+
+ # fetch jaEmbed/scEmbed/tcEmbed/koEmbed
+ $val = `$updmap_real --quiet --showoption ${opt_mode}Embed`;
if ($val =~ m/^${opt_mode}Embed=([^()\s]*)(\s+\()?/) {
$STATUS = $1;
} else {
die "Cannot find status of current ${opt_mode}Embed setting via updmap --showoption!\n";
}
+ # fetch jaVariant
+ if ($opt_mode eq "ja") {
+ $val = `$updmap_real --quiet --showoption ${opt_mode}Variant`;
+ if ($val =~ m/^${opt_mode}Variant=([^()\s]*)(\s+\()?/) {
+ $VARIANT = $1; # should be '' or '-04'
+ } else {
+ die "Cannot find status of current ${opt_mode}Variant setting via updmap --showoption!\n";
+ }
+ }
- my $testmap = gen_mapfile($opt_mode, $STATUS);
+ my $testmap = gen_mapfile($opt_mode, "$STATUS$VARIANT");
+ $VARIANT = "<empty>" if ($VARIANT eq ""); # for printing
if (check_mapfile($testmap)) {
print "CURRENT family for $opt_mode: $STATUS";
+ print " (variant: $VARIANT)" if ($opt_mode eq "ja");
print " (AI0)" if ($ai0flags{$opt_mode}{$STATUS});
print "\n";
} else {
@@ -407,10 +439,16 @@
print " (AI0)" if ($ai0flags{$opt_mode}{$rep});
print " for $opt_mode\n";
system("$updmap --quiet --nomkmap --nohash --setoption ${opt_mode}Embed $rep");
- if ($opt_jis) {
- system("$updmap --quiet --nomkmap --nohash --setoption jaVariant -04");
- } else {
- system("$updmap --quiet --nomkmap --nohash --setoption jaVariant \"\"");
+ if ($opt_mode eq "ja") {
+ if ($opt_jis && $representatives{'ja'}{$rep}{'nojis04'}) {
+ print STDERR "WARNING: No -04 map available, option --jis2004 ignored!\n";
+ $opt_jis = 0;
+ }
+ if ($opt_jis) {
+ system("$updmap --quiet --nomkmap --nohash --setoption jaVariant -04");
+ } else {
+ system("$updmap --quiet --nomkmap --nohash --setoption jaVariant \"\"");
+ }
}
} else {
die "NOT EXIST $MAPFILE\n";
@@ -421,7 +459,7 @@
my $opt_mode = shift;
my $rep = shift;
if (defined($representatives{$opt_mode}{$rep})) {
- if ($representatives{$opt_mode}{$rep}{'available'}) {
+ if ($representatives{$opt_mode}{$rep}{'available'} || $opt_force) {
return SetupMapFile($opt_mode, $rep);
} else {
printf STDERR "$rep not available, falling back to auto!\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl new/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
--- old/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl 2019-03-18 22:15:14.000000000 +0100
+++ new/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl 2020-02-17 23:17:48.000000000 +0100
@@ -2,7 +2,7 @@
#
# kanji-fontmap-creator
# (c) 2012-2014 Norbert Preining
-# Version: 20190318.0
+# Version: 20200217.0
# Licenced under the GPLv2 or any higher version
#
# gui to create map files for (kanji-config-)updmap
@@ -41,7 +41,7 @@
my $opt_version = 0;
my $prg = "kanji-fontmap-creator";
-my $version = "20190318.0";
+my $version = "20200217.0";
#
# global vars configuring operation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex-fontmaps.tlpobj new/tlpkg/tlpobj/ptex-fontmaps.tlpobj
--- old/tlpkg/tlpobj/ptex-fontmaps.tlpobj 2019-03-19 02:26:34.000000000 +0100
+++ new/tlpkg/tlpobj/ptex-fontmaps.tlpobj 2020-03-23 01:56:28.000000000 +0100
@@ -1,6 +1,6 @@
name ptex-fontmaps
category Package
-revision 50446
+revision 54473
shortdesc Font maps and configuration tools for Japanese/Chinese/Korean fonts with (u)ptex
longdesc This package provides font maps and setup tools for Japanese,
longdesc Korean, Traditional Chinese, and Simplified Chinese. It is the
@@ -10,9 +10,9 @@
longdesc programs and formats.
depend arphic-ttf
depend baekmuk
-depend ipaex
+depend haranoaji
depend ptex-fontmaps.ARCH
-runfiles size=229
+runfiles size=241
texmf-dist/fonts/cmap/ptex-fontmaps/2004-H
texmf-dist/fonts/cmap/ptex-fontmaps/2004-V
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/adobe/otf-ko-adobe.map
@@ -29,6 +29,10 @@
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/arphic/uptex-tc-arphic.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/baekmuk/otf-ko-baekmuk.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/baekmuk/uptex-ko-baekmuk.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-bizud.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/otf-up-bizud.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/ptex-bizud.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/bizud/uptex-bizud.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/canon/otf-canon.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/canon/otf-up-canon.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/canon/ptex-canon.map
@@ -47,6 +51,12 @@
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/fandol/uptex-sc-fandol.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/founder/otf-sc-founder.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/founder/uptex-sc-founder.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-haranoaji.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/otf-up-haranoaji.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji-04.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/ptex-haranoaji.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji-04.map
+ texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/haranoaji/uptex-haranoaji.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/otf-hiragino-pron.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/otf-up-hiragino-pron.map
texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-pron/ptex-hiragino-pron-04.map
@@ -216,7 +226,6 @@
texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
catalogue-contact-repository https://github.com/texjporg/jfontmaps
catalogue-ctan /fonts/ptex-fontmaps
-catalogue-date 2019-03-18 14:57:35 +0100
-catalogue-license pdgpl3
+catalogue-license pd gpl3
catalogue-topics font-use japanese chinese korean
-catalogue-version 20190318.0
+catalogue-version 20200217.0
++++++ ptex-manual.doc.tar.xz ++++++
++++ 4296 lines of diff (skipped)
++++++ ptex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/eptex.man1.pdf and new/texmf-dist/doc/man/man1/eptex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/makejvf.man1.pdf and new/texmf-dist/doc/man/man1/makejvf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ppltotf.1 new/texmf-dist/doc/man/man1/ppltotf.1
--- old/texmf-dist/doc/man/man1/ppltotf.1 2019-03-30 22:37:28.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ppltotf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PPLTOTF 1 "15 March 2019" "Web2C 2019"
+.TH PPLTOTF 1 "15 March 2019" "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/ppltotf.man1.pdf and new/texmf-dist/doc/man/man1/ppltotf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ptex.1 new/texmf-dist/doc/man/man1/ptex.1
--- old/texmf-dist/doc/man/man1/ptex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ptex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PTEX 1 "27 May 2018" "Web2C 2019"
+.TH PTEX 1 "27 May 2018" "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/ptex.man1.pdf and new/texmf-dist/doc/man/man1/ptex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ptftopl.1 new/texmf-dist/doc/man/man1/ptftopl.1
--- old/texmf-dist/doc/man/man1/ptftopl.1 2019-03-30 22:37:28.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ptftopl.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PTFTOPL 1 "15 March 2019" "Web2C 2019"
+.TH PTFTOPL 1 "15 March 2019" "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/ptftopl.man1.pdf and new/texmf-dist/doc/man/man1/ptftopl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex.doc.tlpobj new/tlpkg/tlpobj/ptex.doc.tlpobj
--- old/tlpkg/tlpobj/ptex.doc.tlpobj 2019-04-01 02:25:01.000000000 +0200
+++ new/tlpkg/tlpobj/ptex.doc.tlpobj 2020-03-14 01:43:23.000000000 +0100
@@ -1,6 +1,6 @@
name ptex.doc
category Package
-revision 50664
+revision 54276
shortdesc doc files of ptex
docfiles size=54
texmf-dist/doc/man/man1/eptex.1
++++++ ptex2pdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/ptex2pdf/README.md new/texmf-dist/doc/latex/ptex2pdf/README.md
--- old/texmf-dist/doc/latex/ptex2pdf/README.md 2018-12-12 22:34:12.000000000 +0100
+++ new/texmf-dist/doc/latex/ptex2pdf/README.md 2020-03-08 22:42:32.000000000 +0100
@@ -17,18 +17,19 @@
## Usage ##
`````
-[texlua] ptex2pdf[.lua] { option | basename[.tex] } ...
-options: -v version
- -h help
- -help print full help (installation, TeXworks setup)
- -e use eptex class of programs
- -u use uptex class of programs
- -l use latex based formats
- -s stop at dvi
- -i retain intermediate files
- -ot '<opts>' extra options for TeX
- -od '<opts>' extra options for dvipdfmx
- -output-directory '<dir>' directory for created files
+[texlua] ptex2pdf[.lua] { option | basename[.tex] } ...
+options: -v version
+ -h help
+ -help print full help (installation, TeXworks setup)
+ -e use eptex class of programs
+ -u use uptex class of programs
+ -l use latex based formats
+ -ld use latex-dev based formats
+ -s stop at dvi
+ -i retain intermediate files
+ -ot '<opts>' extra options for TeX
+ -od '<opts>' extra options for dvipdfmx
+ -output-directory '<dir>' directory for created files
`````
## Installation ##
@@ -160,19 +161,23 @@
first replace all backslash chars to slash chars
- version 20170622.0
pass all non-optional arguments before filename to TeX engine
-- version 20180514.0
+- version 20180514.0
Windows: for uptex use command_line_encoding=utf8, for all other turn
it off (set to none)
-- version 20181212.0
+- version 20181212.0
support directories containing dots (thanks kn1cht)
+- version 20200119.0
+ check invalid PATH string beforehand on windows
+- version 20200307.0
+ add -ld option to run (u)platex-dev
## Copyright and License ##
Originally based on musixtex.lua from Bob Tennent.
-(c) Copyright 2016-2018 Japanese TeX Development Community
-(c) Copyright 2013-2018 Norbert Preining norbert(a)preining.info
-(c) Copyright 2012 Bob Tennent rdt(a)cs.queensu.ca
+(c) Copyright 2016-2020 Japanese TeX Development Community
+(c) Copyright 2013-2020 Norbert Preining norbert(a)preining.info
+(c) Copyright 2012 Bob Tennent rdt(a)cs.queensu.ca
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex2pdf.doc.tlpobj new/tlpkg/tlpobj/ptex2pdf.doc.tlpobj
--- old/tlpkg/tlpobj/ptex2pdf.doc.tlpobj 2019-02-28 04:03:36.000000000 +0100
+++ new/tlpkg/tlpobj/ptex2pdf.doc.tlpobj 2020-03-09 00:28:46.000000000 +0100
@@ -1,6 +1,6 @@
name ptex2pdf.doc
category Package
-revision 49396
+revision 54191
shortdesc doc files of ptex2pdf
docfiles size=7
texmf-dist/doc/latex/ptex2pdf/COPYING
++++++ ptex2pdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua new/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua
--- old/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua 2018-12-12 22:34:12.000000000 +0100
+++ new/texmf-dist/scripts/ptex2pdf/ptex2pdf.lua 2020-03-08 22:42:32.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env texlua
NAME = "ptex2pdf[.lua]"
-VERSION = "20181212.0"
+VERSION = "20200307.0"
AUTHOR = "Norbert Preining"
AUTHOREMAIL = "norbert(a)preining.info"
SHORTDESC = "Convert Japanese TeX documents to pdf"
@@ -13,25 +13,26 @@
by dvipdfmx.
]]
USAGE = [[
-[texlua] ptex2pdf[.lua] { option | basename[.tex] } ...
-options: -v version
- -h help
- -help print full help (installation, TeXworks setup)
- -e use eptex class of programs
- -u use uptex class of programs
- -l use latex based formats
- -s stop at dvi
- -i retain intermediate files
- -ot '<opts>' extra options for TeX
- -od '<opts>' extra options for dvipdfmx
- -output-directory '<dir>' directory for created files]]
+[texlua] ptex2pdf[.lua] { option | basename[.tex] } ...
+options: -v version
+ -h help
+ -help print full help (installation, TeXworks setup)
+ -e use eptex class of programs
+ -u use uptex class of programs
+ -l use latex based formats
+ -ld use latex-dev based formats
+ -s stop at dvi
+ -i retain intermediate files
+ -ot '<opts>' extra options for TeX
+ -od '<opts>' extra options for dvipdfmx
+ -output-directory '<dir>' directory for created files]]
LICENSECOPYRIGHT = [[
Originally based on musixtex.lua from Bob Tennent.
-(c) Copyright 2016-2018 Japanese TeX Development Community
-(c) Copyright 2013-2018 Norbert Preining norbert(a)preining.info
-(c) Copyright 2012 Bob Tennent rdt(a)cs.queensu.ca
+(c) Copyright 2016-2020 Japanese TeX Development Community
+(c) Copyright 2013-2020 Norbert Preining norbert(a)preining.info
+(c) Copyright 2012 Bob Tennent rdt(a)cs.queensu.ca
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
@@ -174,11 +175,15 @@
first replace all backslash chars to slash chars
- version 20170622.0
pass all non-optional arguments before filename to TeX engine
-- version 20180514.0
+- version 20180514.0
Windows: for uptex use command_line_encoding=utf8, for all other turn
it off (set to none)
-- version 20181212.0
+- version 20181212.0
support directories containing dots (thanks kn1cht)
+- version 20200119.0
+ check invalid PATH string beforehand on windows
+- version 20200307.0
+ add -ld option to run (u)platex-dev
]]
@@ -276,6 +281,7 @@
use_eptex = 0
use_uptex = 0
use_latex = 0
+use_latexdev = 0
outputdir = "."
prefilename = ""
filename = ""
@@ -313,6 +319,9 @@
use_uptex = 1
elseif this_arg == "-l" then
use_latex = 1
+ elseif this_arg == "-ld" then
+ use_latex = 1
+ use_latexdev = 1
elseif this_arg == "-s" then
dvipdf = ""
elseif this_arg == "-i" then
@@ -338,34 +347,34 @@
end
end --if this_arg == ...
narg = narg+1
-until narg > #arg
+until narg > #arg
whoami()
-if use_eptex == 1 then
+if use_latex == 1 then
if use_uptex == 1 then
- if use_latex == 1 then
- tex = "uplatex" -- uplatex already as etex extension
+ if use_latexdev == 1 then
+ tex = "uplatex-dev"
else
- tex = "euptex"
+ tex = "uplatex" -- uplatex already as etex extension
end
else
- if use_latex == 1 then
- tex = "platex" -- latex needs etex anyway
+ if use_latexdev == 1 then
+ tex = "platex-dev"
else
- tex = "eptex"
+ tex = "platex" -- latex needs etex anyway
end
end
else
- if use_uptex == 1 then
- if use_latex == 1 then
- tex = "uplatex"
+ if use_eptex == 1 then
+ if use_uptex == 1 then
+ tex = "euptex"
else
- tex = "uptex"
+ tex = "eptex"
end
else
- if use_latex == 1 then
- tex = "platex"
+ if use_uptex == 1 then
+ tex = "uptex"
else
tex = "ptex"
end
@@ -424,9 +433,17 @@
dvipdfopts = "-o \"" .. bname .. ".pdf\""
end
print("Processing ".. filename)
-if (os.execute(tex .. " " .. texopts .. prefilename .. " \"" .. filename .. "\"") == 0) and
- (dvipdf == "" or (os.execute(dvipdf .. " " .. dvipdfopts .. " \"" .. bname .. ".dvi" .. "\"") == 0)) then
- if dvipdf ~= "" then
+texcmd = tex .. " " .. texopts .. prefilename .. " \"" .. filename .. "\""
+tex_return = os.execute(texcmd)
+-- if os.execute(texcmd) returns -1 on Windows, then
+-- cmd.exe is not included in PATH, or some invalid string found before cmd.exe
+if os.type == 'windows' and tex_return == -1 then
+ print("Invalid PATH setting found. Please ensure that cmd.exe can be found.\n")
+end
+dvipdfcmd = dvipdf .. " " .. dvipdfopts .. " \"" .. bname .. ".dvi" .. "\""
+if tex_return == 0 and
+ (dvipdf == "" or (os.execute(dvipdfcmd) == 0)) then
+ if dvipdf ~= "" then
print(bname .. ".pdf generated by " .. dvipdf .. ".")
end
if intermediate == 1 then -- clean-up:
@@ -436,8 +453,8 @@
end
else
print("ptex2pdf processing of " .. filename .. " failed.\n")
- print_ifdebug("tex = " .. tex)
- print_ifdebug("dvipdf = " .. dvipdf)
+ print_ifdebug("tex = " .. texcmd)
+ print_ifdebug("dvipdf = " .. dvipdfcmd)
os.exit(2)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ptex2pdf.tlpobj new/tlpkg/tlpobj/ptex2pdf.tlpobj
--- old/tlpkg/tlpobj/ptex2pdf.tlpobj 2019-02-28 04:03:36.000000000 +0100
+++ new/tlpkg/tlpobj/ptex2pdf.tlpobj 2020-03-09 00:28:46.000000000 +0100
@@ -1,6 +1,6 @@
name ptex2pdf
category Package
-revision 49396
+revision 54191
shortdesc Convert Japanese TeX documents to PDF
longdesc The Lua script provides system-independent support of Japanese
longdesc typesetting engines in TeXworks. As TeXworks typesetting setup
@@ -16,7 +16,6 @@
catalogue-contact-home https://github.com/texjporg/ptex2pdf
catalogue-contact-repository https://github.com/texjporg/ptex2pdf.git
catalogue-ctan /language/japanese/ptex2pdf
-catalogue-date 2018-12-12 17:43:43 +0100
catalogue-license gpl2
catalogue-topics compilation japanese
-catalogue-version 20181212.0
+catalogue-version 20200307.0
++++++ pxchfon.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/pxchfon/LICENSE new/doc/platex/pxchfon/LICENSE
--- old/doc/platex/pxchfon/LICENSE 2019-01-23 22:25:01.000000000 +0100
+++ new/doc/platex/pxchfon/LICENSE 2020-02-01 23:13:57.000000000 +0100
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+Copyright (c) 2009-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/platex/pxchfon/README-ja.md new/doc/platex/pxchfon/README-ja.md
--- old/doc/platex/pxchfon/README-ja.md 2019-03-23 23:05:34.000000000 +0100
+++ new/doc/platex/pxchfon/README-ja.md 2020-02-01 23:13:57.000000000 +0100
@@ -33,9 +33,6 @@
- TDS 1.1 に従ったシステムでは、次のファイルを移動する。
* `*.sty` → $TEXMF/tex/platex/pxchfon/
- - W32TeX を `C:\usr\local` にインストールした場合の例。
- * `*.sty` → `C:\usr\local\share\texmf-local\tex\platex\pxchfon`
-
- もっと簡単に、TeX システムのディレクトリには手を加えずに、単に
文書ファイルと同じディレクトリに pxchfon.sty を置くだけでも使える。
@@ -45,17 +42,11 @@
設定を行う。
* TDS 1.1 に従ったシステムでは、各ファイルを次の場所に移動する。
- - `*.tfm` → $TEXMF/fonts/tfm/public/pxchfon/
- - `*.vf` → $TEXMF/fonts/vf/public/pxchfon/
+ - `tfm/*.tfm` → $TEXMF/fonts/tfm/public/pxchfon/
+ - `vf/*.vf` → $TEXMF/fonts/vf/public/pxchfon/
- `pxcjk0.sfd` → $TEXMF/fonts/sfd/pxchfon/
- `*.def` → $TEXMF/tex/platex/pxchfon/
- * W32TeX を `C:\usr\local` にインストールした場合の例。
- - `*.tfm` → `C:\usr\local\share\texmf-local\fonts\tfm\public\pxchfon`
- - `*.vf` → `C:\usr\local\share\texmf-local\fonts\vf\public\pxchfon`
- - `pxcjk0.sfd` → `C:\usr\local\share\texmf-local\fonts\sfd\pxchfon`
- - `*.def` → `C:\usr\local\share\texmf-local\tex\platex\pxchfon`
-
### ライセンス
MITライセンスの下で配布される。
@@ -63,6 +54,25 @@
更新履歴
--------
+ * Version 1.7b ‹2020/02/01›
+ - '\textdiruni' を頑強にする。
+ * Version 1.7a ‹2019/11/22›
+ - バグ修正。
+ * Version 1.7 ‹2019/11/19›
+ - ユーザレベルの追加プリセットに対応。
+ * Version 1.6a ‹2019/11/18›
+ - `\(text)diruni` を PDF 文字列で通るようにする。
+ - (試験的) PXchfon-extras の追加プリセットに対応。
+ - (試験的) ユーザレベルの追加プリセットに対応。
+ * Version 1.6 ‹2019/10/07›
+ - プリセット `haranoaji` を追加。
+ * Version 1.5a ‹2019/07/10›
+ - バグ修正。
+ * Version 1.5 ‹2019/05/15›
+ - TL2017 用の暫定設定である `unicode*` オプションを非推奨とする。
+ - `\asUTF` 命令を非推奨とする。
+ - 欧文置換用の VF を刷新した。TS1 エンコーディングをサポート。
+ - Unicode 直接モードでは非埋込のフォントに対して警告を出す。
* Version 1.4a ‹2019/03/24›
- 非置換のフォントに対して不具合が起こりうる設定を使う場合、
非置換のフォントがあると警告を出す。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/pxchfon/README.md new/doc/platex/pxchfon/README.md
--- old/doc/platex/pxchfon/README.md 2019-03-23 23:05:34.000000000 +0100
+++ new/doc/platex/pxchfon/README.md 2020-02-01 23:13:57.000000000 +0100
@@ -25,8 +25,8 @@
Move the files as follows (in a system compliant to TDS 1.1):
- `*.sty` → $TEXMF/tex/platex/pxchfon/
- - `*.tfm` → $TEXMF/fonts/tfm/public/pxchfon/
- - `*.vf` → $TEXMF/fonts/vf/public/pxchfon/
+ - `tfm/*.tfm` → $TEXMF/fonts/tfm/public/pxchfon/
+ - `vf/*.vf` → $TEXMF/fonts/vf/public/pxchfon/
- `pxcjk0.sfd` → $TEXMF/fonts/sfd/pxchfon/
- `*.def` → $TEXMF/tex/platex/pxchfon/
@@ -39,6 +39,26 @@
Revision History
----------------
+ * Version 1.7b ‹2020/02/01›
+ - Make '\textdiruni' robust.
+ * Version 1.7a ‹2019/11/22›
+ - Bug fix.
+ * Version 1.7 ‹2019/11/19›
+ - Support for user-defined custom presets.
+ * Version 1.6a ‹2019/11/18›
+ - Now `\(text)diruni` can be used in PDF strings.
+ * Version 1.6 ‹2019/10/07›
+ - Preset `haranoaji`.
+ * Version 1.5a ‹2019/07/10›
+ - Bug fix.
+ * Version 1.5 ‹2019/05/15›
+ - The `unicode*` option, which is a tentative setting for TL2017,
+ is now deprecated.
+ - The `\asUTF` command is now deprecated.
+ - The VFs of alphabetic fonts are refined; now TS1 encoding is
+ also supported.
+ - Issue a warning for unembedded font weights, if direct Unicode
+ mode is employed.
* Version 1.4a ‹2019/03/24›
- Issue a warning for unsubstituted font weights, if a setting
where unsubtituted fonts could cause problems is employed.
Binary files old/doc/platex/pxchfon/pxchfon.pdf and new/doc/platex/pxchfon/pxchfon.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/pxchfon/pxchfon.tex new/doc/platex/pxchfon/pxchfon.tex
--- old/doc/platex/pxchfon/pxchfon.tex 2019-03-23 23:05:34.000000000 +0100
+++ new/doc/platex/pxchfon/pxchfon.tex 2020-02-01 23:13:57.000000000 +0100
@@ -1,26 +1,26 @@
% 文字コードは UTF-8
% uplatex で組版する
\documentclass[uplatex,dvipdfmx,a4paper]{jsarticle}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern,textcomp}
\usepackage{color}
\definecolor{myblue}{rgb}{0,0,0.75}
\definecolor{mygreen}{rgb}{0,0.45,0}
\usepackage[colorlinks,hyperfootnotes=false]{hyperref}
\usepackage{pxjahyper}
\hypersetup{linkcolor=myblue,urlcolor=mygreen}
-\usepackage{metalogo}
+\usepackage{bxtexlogo}
+\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.4a}
-\newcommand{\PkgDate}{2019/03/24}
+\newcommand{\PkgVersion}{1.7b}
+\newcommand{\PkgDate}{2020/02/01}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
\newcommand{\Means}{:\ }
+\newcommand{\Zk}{\mbox{}}
\providecommand{\Strong}[1]{\textsf{#1}}
-\providecommand{\pTeX}{p\TeX}
-\providecommand{\pLaTeX}{p\LaTeX}
-\providecommand{\upTeX}{u\pTeX}
-\providecommand{\upLaTeX}{u\pLaTeX}
%-----------------------------------------------------------
\begin{document}
\title{\Pkg{pxchfon} パッケージ}
@@ -39,9 +39,10 @@
一度パッケージをインストールするだけで、
任意の日本語フォント(ただし等幅に限る)を使うことができる。
欧文部分を同じ日本語フォントで置き換えることも可能である。
-\Pkg{japanese-otf}\footnote{\Pkg{japanese-otf}パッケージ\Means
+\Pkg{japanese-otf}パッケージ%
+\footnote{\Pkg{japanese-otf}パッケージ\Means
https://www.ctan.org/pkg/japanese-otf}%
-パッケージにも対応している。
+にも対応している。
また、{(u)\pLaTeX}において広く行われているフォント設定
(IPAexフォントの使用等)をパッケージオプション一つで適用する機能
@@ -80,14 +81,21 @@
ただし、本パッケージの主要機能である
「フォントマップの文書内での指定」
がサポートされるのはdvipdfmxのみである。
+ \footnote{現状では、|dvipdfmx| 以外のドライバ指定は
+ 全て |nodvidriver| と等価である。}%
他のDVIウェアにおける動作については
\ref{sec:Other-Drivers}節を参照。
ドライバオプションの既定値は |dvipdfmx| である。
\item \Strong{プリセット指定オプション}(|ipaex|、|hiragino-pron| 等)
名前に対応するプリセット指定を有効にする。
\Note 詳細については\ref{sec:Preset}節を参照。
+\item \Strong{カスタムプリセット指定オプション}%
+ (|user:|\Zk\textgt{名前})
+ ユーザ定義のプリセット指定を有効にする。
+ \Note 詳細については\ref{sec:CustomPreset}節を参照。
\item \Strong{ファイルプリセット指定オプション}%
- (|+|\mbox{}\textgt{名前} または |*|\mbox{}\textgt{名前})
+ (|tl:|\Zk\textgt{名前} または |file:|\Zk\textgt{名前}%
+ \footnote{旧形式は |+|\Zk\textgt{名前} および |*|\Zk\textgt{名前}})
名前に対応するファイルプリセット指定を有効にする。
\Note 詳細については\ref{sec:FilePreset}節を参照。
\item |alphabet|\Means
@@ -141,14 +149,14 @@
\item |oneweight|\Means
\Pkg{japanese-otf}パッケージを単ウェイトで使用する場合に、
プリセット設定で使われるフォントの集合を{\pTeX}標準と同一にする。
- \footnote{小塚フォントのプリセットでは、{\pTeX}標準のゴシック
- (jisg等)にはMウェイト(Acrobatに付属のフォントの一つ)を
+ \footnote{多ウェイト用プリセット設定の一部において、
+ このオプションによりゴシックのウェイトが変更される。
+ 例えば、小塚フォントのプリセットでは、{\pTeX}標準のゴシック
+ (jisg等)にはMウェイトを
割り当てる一方で、\Pkg{japanese-otf}パッケージの3ウェイトのゴシックには
R、B、Hウェイトを割り当てている。
従って、\Pkg{japanese-otf}を単ウェイトで用いる時にMウェイトを使いたい
- 場合には \texttt{oneweight} オプションを指定すればよい。
- 現状では、小塚フォント以外のプリセットではこのオプションを
- 用いる必要はない。}
+ 場合には |oneweight| オプションを指定すればよい。}
\item |nooneweight|(既定)\Means
|oneweight| の否定。
\end{itemize}
@@ -164,20 +172,20 @@
\footnote{特に
「\texttt{\symbol{`\\}userelfont\symbol{`\\}selectfont}」
だけ実行すると、欧文が現在の和文と同じ書体になる。}
- (ただし適用すべき和文ファミリについて置換が設定されていない
- 場合は無効になる。)
+ \Note 置換が設定されていないウェイトについては無効になる。
\Note |alphabet|、|noalphabet|、|relfont| の3つのオプションは
排他である。
\item |everypage|\Means
- DVIの全ページにマップ設定を書き込む。
+ 出力DVIの全ページにフォントマップ設定を書き込む。
\Note 詳細については\ref{sec:PageSelection}節を参照。
\item |noeverypage|(既定)\Means
|everypage|の否定。
- DVIの先頭ページにのみマップ設定を書き込む。
+ 出力DVIの先頭ページにのみフォントマップ設定を書き込む。
\item \Strong{Unicode直接指定オプション}\Means
一部または全部のフォントについて、エンコーディング指定方式を
- “Cmap指定”から“Unicode直接指定”に変更する。
- |nodirectunicode|(既定)、|directunicode|、|directunicode*|、
+ “CMap指定”から“Unicode直接指定”に変更する。
+ |nounicode|(既定:CMap設定のまま)、
+ |directunicode|、|directunicode*|、
|unicode*|、|unicode| の5種類の指定がある。
\Note 詳細については\ref{sec:DirectUnicode}節を参照。
\Note 一部のプリセット指定(|sourcehan|等)は
@@ -209,15 +217,15 @@
%\item |nodirectunicode|(既定)\Means
% |directunicode| の否定。
\item |usecmapforalphabet|\Means
- |alphabet|(または |relfont|)を指定して日本語フォントの英数字部分を
+ |alphabet| または |relfont| を指定して日本語フォントの英数字部分を
欧文フォントとして使う際に、そのエンコーディング指定方式を
“CMap指定”にする。
% \Note “CMap指定”と“Unicode直接指定”の違いについては
% \ref{sec:DirectUnicode}節を参照。
\Note 半角英数字用の\texttt{UniJIS-UCS2-HW-H}というCMapが指定される。
- \Note 字形セットがAJ1であるOpenTypeフォントの場合、“Unicode直接指定”
- を使うと英数字がプロポーショナル幅のものになるがこれは
- サポートされない(|alphabet| オプションの説明を参照)ので、
+ \Note AJ1のグリフ集合をもつOpenTypeフォントの場合、既定では
+ \footnote{|unicode| オプションが指定されない場合。}%
+ 英数字がプロポーショナル幅のものになるがこれはサポートされないので、
このオプションを指定して半角幅のものを使う必要がある。
\item |nousecmapforalphabet|(既定)\Means
|usecmapforalphabet| の否定。
@@ -247,7 +255,7 @@
\item |nodumpmaptl|(既定)\Means
|dumpmaptl| の否定。
\item |strictcsi|\Means
- |Identity-H/V| のCMapが指定されたマップ行について、CSI指定は
+ |Identity-H|/|-V| のCMapが指定されたマップ行について、CSI指定を
(仕様に厳密に従って)フォントがTrueTypeグリフの場合にのみ出力する。
\Note 「CSI指定」とはフォントファイル名の直後に書く“|/AJ1|”の類の
ことで、本来は(グリフ集合情報を持たない)TrueTypeグリフのフォント
@@ -257,12 +265,15 @@
かかるため、既定では厳密な判定は行わない。
\item |nostrictcsi|(既定)\Means
|strictcsi| の否定。
- |Identity-H/V| に対するCSI指定は常に出力される。
+ |Identity-H|/|-V| に対するCSI指定は常に出力される。
\Note さすがにファイルに出力されたマップ行に不備があるのは
避けたいので、|dumpmap(tl)| が指定された場合は、
既定が |strictcsi| に変更される。
\item |expert|(既定)\Means
- Unicode直接指定の適用時に\Pkg{japanese-otf}の |expert| オプション
+ Unicode直接指定の適用時
+ \footnote{置換されていないウェイトはUnicode直接指定にならない。
+ (\ref{ssec:DirectUnicodeNotice}節の注意を参照。)}%
+ に\Pkg{japanese-otf}の |expert| オプション
の機能を(可能な範囲で)エミュレートする。
\Note \Pkg{japanese-otf}の |expert| が指定されない場合は無意味。
\item |noexpert|\Means
@@ -270,8 +281,10 @@
Unicode直接指定時には\Pkg{japanese-otf}の |expert| は無効になる。
\item |glyphid|\Means
GID指定入力(|\gid| 命令)の機能を有効にする。
- \Note エンジンが{\upTeX}でかつUnicode直接指定が有効の場合に
- のみ利用できる。
+ \Note エンジンが{\upTeX}でかつUnicode直接指定
+ \footnote{置換されていないウェイトはUnicode直接指定にならない。
+ (\ref{ssec:DirectUnicodeNotice}節の注意を参照。)}%
+ が有効の場合にのみ利用できる。
\item |noglyphid|(既定)\Means
|glyphid| の否定。
\end{itemize}
@@ -867,6 +880,20 @@
\setmarugothicfont{NotoSansJP-Medium.otf}
\end{verbatim}\end{quote}
+\item |haranoaji|\Means
+ 原ノ味フォント。
+
+\begin{quote}\small\begin{verbatim}
+\setminchofont{HaranoAjiMincho-Regular.otf}
+\setlightminchofont{HaranoAjiMincho-Light.otf}
+\setboldminchofont{HaranoAjiMincho-Bold.otf}
+\setgothicfont{HaranoAjiGothic-Medium.otf}
+\setmediumgothicfont{HaranoAjiGothic-Regular.otf}
+\setboldgothicfont{HaranoAjiGothic-Bold.otf}
+\setxboldgothicfont{HaranoAjiGothic-Heavy.otf}
+\setmarugothicfont{HaranoAjiGothic-Medium.otf}
+\end{verbatim}\end{quote}
+
\end{itemize}
%-------------------
@@ -928,12 +955,18 @@
ファイルプリセットの指定と見なされる。
\begin{itemize}
-\item |+|\mbox{}\textgt{名前}\Means
+\item |tl:|\Zk\textgt{名前}\Means
{\TeX} Live用ファイルプリセット。
-\item |*|\mbox{}\textgt{名前}\Means
+\item |file:|\Zk\textgt{名前}\Means
単純ファイルプリセット。
\end{itemize}
+\Note 1.6a版以前では、
+{\TeX} Live用が「|+|\Zk\textgt{名前}」、
+通常が「|*|\Zk\textgt{名前}」という形式であった。
+これらの古い形式も当面の間はサポートされるが、
+新しい形式の使用を推奨する。
+
\subsection{{\TeX} Live用ファイルプリセット機能}
{\TeX} Liveでは{(u)\pLaTeX}のフォントの設定を
@@ -943,8 +976,8 @@
対応したファイルをupdmapの機構を用いて有効化することで、
dvipdfmxの既定の設定を切り替えている。
-パッケージオプションとして |+| で始まる文字列
-(仮に |+NAME| とする)を与えると、
+パッケージオプションとして |tl:| で始まる文字列
+(仮に |tl:NAME| とする)を与えると、
kanji-config-updmap用のマップファイルの読込が指示される。
具体的には、以下の名前のマップファイルが読み込まれる。
@@ -954,7 +987,7 @@
\item |ptex-NAME.map|
\item |otf-NAME.map|
\end{itemize}
-\item {\upLaTeX}の場合、上記のものに加えて以下のもの:
+\item {\upLaTeX}の場合、\Strong{上記のものに加えて}以下のもの:
\begin{itemize}
\item |uptex-NAME.map|
\item |otf-up-NAME.map|
@@ -964,7 +997,7 @@
例えば、{\pLaTeX}文書において以下のようにパッケージを読み込んだとする。
\begin{quote}\small\begin{verbatim}
-\usepackage[+yu-win]{pxchfon}
+\usepackage[tl:yu-win]{pxchfon}
\end{verbatim}\end{quote}
この場合、|ptex-yu-win.map| と |otf-yu-win.map| の2つのマップファイル
@@ -972,23 +1005,73 @@
\subsection{単純ファイルプリセット機能}
-パッケージオプションとして |*| で始まる文字列
-(仮に |*NAME| とする)を与えると、
+パッケージオプションとして |file:| で始まる文字列
+(仮に |file:NAME| とする)を与えると、
|NAME.map| という名前のマップファイルの読込が指示される。
例えば、以下のようにパッケージを読み込んだとする。
\begin{quote}\small\begin{verbatim}
-\usepackage[*yu]{pxchfon}
+\usepackage[file:yu]{pxchfon}
\end{verbatim}\end{quote}
この場合、|yu.map| というマップファイル
-\footnote{例えばW32{\TeX}ではこの名前のマップファイルが
+\footnote{例えばW32{\TeX}では |yu.map| というマップファイルが
用意されている。}%
がdvipdfmx実行時に読み込まれる。
%===========================================================
+\section{カスタムプリセット機能}
+\label{sec:CustomPreset}
+
+1.7版で新設された「カスタムプリセット機能」とは、
+ユーザが独自にプリセットを用意するためのものである。
+ユーザが定義したプリセット(\Strong{カスタムプリセット})を
+「|pxchfon.cfg|」という名前の
+\Strong{カスタムプリセット定義ファイル}に記述して
+そのファイルを{\TeX}が読める場所に置くと、
+\Pkg{pxchfon}パッケージ読込時にオプションとして指定することで
+カスタムプリセットを利用できるようになる。
+
+カスタムプリセットを定義する命令は以下の通りである。
+これらの命令は |pxchfon.cfg| の中でのみ利用できる。
+\begin{itemize}
+\item |\pxchfonDeclareOneWeightPreset{|\Meta{名前}|}{|%
+ \Meta{明朝}|}{|\Meta{ゴシック}|}|\Means
+ 単ウェイトのカスタムプリセットを定義する。
+ プリセットの名前は\Meta{名前}の文字列の前に「|user:|」を
+ 前置したものになる。
+ 第2引数以降は使用するフォントファイル名
+ (TTC形式の場合は番号も含めて |:番号:ファイル名| の形式)
+ を指定する。
+\item |\pxchfonDeclareMultiWeightPreset{|\Meta{名前}|}{|%
+ \Meta{明朝・細}|}{|\Meta{明朝・中}|}{|\Meta{明朝・太}|}{|%
+ \Meta{ゴシック・中}|}{|\Meta{ゴシック・太}|}{|\Meta{ゴシック・極太}|}{|%
+ \Meta{ゴシック・単}|}{|\Meta{丸ゴシック}|}|\Means
+ 多ウェイトのカスタムプリセットを定義する。
+ 引数の意味は前項と同様である。
+ \Meta{ゴシック・単}は「|oneweight| オプション指定時のゴシック体」
+ を表す。
+\end{itemize}
+
+例えば、全ての和文フォントを(Microsoft Office付属の)
+「HG創英角ポップ体」に置き換えるような単ウェイトの
+カスタムプリセット |user:soeikakupoptai| を定義するには
+次の命令を実行する。
+\begin{quote}\small\begin{verbatim}
+\pxchfonDeclareOneWeightPreset{soeikakupoptai}
+ {:0:HGRPP1.TTC}{:0:HGRPP1.TTC}
+\end{verbatim}\end{quote}
+
+このカスタムプリセットを利用したい場合はパッケージ読込
+を以下のようにする。
+\begin{quote}\small\begin{verbatim}
+\usepackage[user:soeikakupoptai,...]{pxchfon}
+\end{verbatim}\end{quote}
+
+
+%===========================================================
\section{Unicode直接指定}
\label{sec:DirectUnicode}
@@ -1024,21 +1107,21 @@
\paragraph{“Unicode直接指定”オプション}
以下のパッケージオプションを指定することで
-Unicode直接指定が有効になる。
+Unicode直接指定の有効・無効を切り替えられる。
\begin{itemize}
\item |unicode|\Means
全般的にUnicode直接指定を利用する。
- 最も理想的な設定であるが、現存の{\TeX} Live 2017では利用できない。
- \Note dvipdfmxの20170918版以降({\TeX} Live 2018以降)が必要。
+ 最も理想的な設定であるが、\Strong{{\TeX} Live 2018以降のdvipdfmx}%
+ (20170918版以降)が必要である。
\item |unicode*|\Means
- |unicode| と同様だが、{\TeX} Live 2017のdvipdfmaに対応するために
- 妥協を入れた(過渡的な)設定。
- 一部の約物・記号の出力が異常になる可能性がある。
- \Note dvipdfmxの20170318版以降({\TeX} Live 2017以降)が必要。
+ {\TeX} Live 2017のdvipdfmx(20170318版)専用の\Strong{過渡的}な設定。
+ \Note 1.5版以降では\Strong{非推奨}であり、
+ 将来的に廃止される予定である。
\item |directunicode*|\Means
- |unicode| と同様だが、古い({\TeX} Live 2016以前の)dvipdfmaに
- 対応するために、OpenType属性の指定を全く行わない設定。
+ 全般的にUnicode直接指定を利用するが、
+ 古い({\TeX} Live 2016以前の)dvipdfmxに
+ 対応するために、OpenType属性の指定を全く行わない。
つまり、入力のUnicode文字に対する既定のグリフが常に出力され、
異体字の区別は全て無効になる。
\item |directunicode|\Means
@@ -1068,33 +1151,49 @@
\item |noto-jp|
\end{itemize}
-\paragraph{特殊プリセット指定\<(過渡的)}
+\paragraph{特殊プリセット指定\<(非推奨)}
+
+以下に挙げるプリセット設定は{\TeX} Live 2017%
+(dvipdfmx 20170318版)のために用意された特殊な設定である。
+
+1.5版においてこれらのプリセットは\Strong{非推奨}となった。
+将来的には廃止される予定である。
+そのため、これらのプリセットを利用している場合は、
+\Strong{{\TeX}システムを更新}(dvipdfmxを20170918版以降に)した上で、
+“本来の正しい設定”に移行することを推奨する。
-現状の{\TeX} Live 2017のdvipdfmxで |unicode| が使えない
-という問題に対処するため、
-一部のプリセット指定について、
-「|unicode| を指定した理想的な状態を模倣する」
-特殊なプリセット設定を用意した。
-これらの設定はdvipdfmxの20170318版以降({\TeX} Live 2017以降)
-において使用できる。
+\begin{itemize}
+\item |sourcehan+|、|sourcehan-otc+|、|noto+|、|noto-otc+|:\\
+ →代わりに|+|無しの名前(|sourcehan| 等)を指定する。
+ \Note 前述の通り、|unicode| は自動的に補われる。
+ \Note 日本語版以外のフォントはもはや不要である。
+
+\item |yu-win10+|:\\
+ →代わりに |yu-win10| と |unicode| を指定する。
+\end{itemize}
-本来使えないはずの設定を模倣するために、
-少々邪悪な細工を行ている。
+%-------------------
+\subsection{Unicode直接指定に関する注意事項}
+\label{ssec:DirectUnicodeNotice}
\begin{itemize}
-\item |sourcehan+|、|sourcehan-otc+|、
- |noto+|、|noto-otc+|\Means
- これらの特殊プリセット指定は、対応する(|+| 無しの)
- Unicode直接指定専用プリセットの設定を模倣する。
- 日本語用の一部のグリフを
- 日本語以外(繁体中国語等)のフォントに振り替えている。
- 従って、言語別OTF版のフォントファイルを利用する場合は、
- 原則的に全てのCJK言語の版を用意する必要がある。
-
-\item |yu-win10+|\Means
- |yu-win10| に |unicode| を加えた設定を模倣する。
- クオートの出力を正常にするため、クオートのグリフを
- 「Yu Gothic UI」フォントに振り替えている。
+\item プリセット指定または |\set...font| 命令で
+ フォントを置換していないウェイトについては、
+ Unicode直接指定は無効になる。
+ 従って、そのようなウェイトは想定する出力には
+ ならず、またUnicode直接指定を必要とする機能
+ (|expert| や |glyphid| の各オプション)
+ も使えない。
+\item 特に、|expert| については、
+ 非置換のウェイトの動作が非常に複雑で解りにくい。
+ 従って、|expert| を指定する場合は、全ファミリ・ウェイトについて
+ 置換を指定することを推奨する
+ (これに反する場合は警告が出る)。
+\item 非埋込を指定したウェイトについてはUnicode直接指定は
+ 無効になる。
+ この動作も非常に解りにくいため、
+ Unicode直接指定を用いる場合は、非埋込の指定をしないことを推奨する
+ (これに反する場合は警告が出る)。
\end{itemize}
@@ -1104,11 +1203,11 @@
dvipdfmxには元のDVI文書の一部のページだけを抜粋してPDF文書に変換する
機能がある(|-s| オプション)。
-ところが、本パッケージでは、ユーザ命令で指定されたフォントマップ情報を、
+ところが、本パッケージではユーザが指定したフォントマップ情報を
DVIの先頭ページに書き出すという処理方法をとっている
(すなわち「ページ独立性」を保っていない)ため、
先頭ページを含まない抜粋を行った場合は、
-フォント置換が効かないという現象が発生する。
+フォント置換が効かないという不具合が発生する。
この問題を解決するのが |everypage| パッケージオプションである。
このオプションが指定された場合は、
@@ -1122,15 +1221,9 @@
\label{sec:Mechanism-Alph}
指定された和文フォントの半角部分からなる欧文フォントファミリとして
-OT1/cfjar(明朝)、OT1/cfjas(ゴシック)、OT1/cfjam(丸ゴシック)
-の3つ(以下では\Strong{CFJAファミリ}と総称する)を定義している
-\footnote{1.4版からはT1エンコーディングにもCFJAファミリを定義する。
-現状で対応しているのはOT1とT1のみであるので、欧文フォントの置換
-(\texttt{alphabet}や\texttt{relfont}オプション)
-を利用する文書は、欧文エンコーディングがOT1かT1である必要がある。}。
+cfjar(明朝)、cfjas(ゴシック)、cfjam(丸ゴシック)
+の3つ(以下では\Strong{CFJAファミリ}と総称する)を定義している。
その上で、CFJAファミリに対するマップ指定を和文と同じ方法で行っている。
-なお、CFJAファミリは内部ではOT1として扱われるが、
-実際にはOT1の一部のグリフしか持っていない。
\paragraph{alphabetオプション指定時}
オプション |alphabet| を指定した場合、
@@ -1141,9 +1234,56 @@
\paragraph{relfontオプション指定時}
オプション |relfont| を指定した場合、
-CFJAファミリを和文ファミリの従属欧文フォントに
-(cfjarを |\mcfamily| に、cfjasを |\gtfamily| に、
-cfjamを |\mgfamily| に対して)設定する。
+CFJAファミリを和文ファミリの従属欧文フォントに設定する
+(cfjar→|\mcfamily|;cfjas→|\gtfamily|;cfjam→|\mgfamily|)。
+
+\paragraph{利用可能な欧文エンコーディング}
+現状で、CFJAファミリが対応している欧文エンコーディングは
+OT1、T1、TS1の3つである
+\footnote{1.4版でT1に“暫定対応”し、1.5版でT1とTS1に正式に対応した。}%
+(TS1は事前に\Pkg{textcomp}を読み込んだ場合にのみ有効)。
+このため、欧文フォントの置換
+(\texttt{alphabet}や\texttt{relfont}オプション)
+を利用する文書は、欧文エンコーディングがOT1かT1である必要がある
+\footnote{TS1は記号用のエンコーディングであり、本文の既定の
+エンコーディングとして使うものではない。}。
+
+何れのエンコーディングを用いる場合でも、様々な理由により、利用できる
+文字の種類が限られている。
+\begin{enumerate}
+\item AJ1対応のOpenTypeフォントを指定して、かつ |usecmapforalphabet|
+ オプションを指定した場合、
+ 以下の文字(でかつ当該の欧文エンコーディングに含まれるもの)が使える。
+ \Note AJ1対応フォント用のプリセット(|kozuka-pr6n| 等)を
+ 指定した場合は |usecmapforalphabet| は自動的に有効になる。
+ \begin{itemize}
+ \item[a)] ASCII文字
+ \footnote{出力される文字の話であることに注意。
+ 例えば、OT1やT1で \textsf{\textquotesingle}(U+0027)を
+ 入力したときに出力される文字は \textsf{\textquoteright}(U+2019)
+ であり、これはASCII文字ではない。
+ なお、TS1はU+0027を含む。}%
+ およびen-ダッシュ(\textsf{--})。
+ \Note これらは半角幅である。
+ \item[b)] クオート(\textsf{`` '' ` '})。
+ \Note これらは和文用の全角幅の字形を、空きを詰めて半角幅で出力する。
+ \item[c)] em-ダッシュ(\textsf{---})。
+ \Note これらはU+2015の全角幅の字形をそのまま全角幅で出力する。
+ \end{itemize}
+\item 1以外の場合、
+ 以下の文字(でかつ当該の欧文エンコーディングに含まれるもの)が使える。
+ \Note この場合、既定では欧文は |directunicode*| 相当の状態になる。
+ \begin{itemize}
+ \item 1項のa、b、cの文字はフォントが正しい幅
+ (aは\Strong{半角}、bとcは\Strong{全角})の字形を持っていれば使える。
+ \item それ以外でも、Unicode文字の大部分は、
+ フォントが\Strong{半角幅}の字形を持っていれば使える。
+ \Note 半角幅のまま出力される。
+ \item |unicode| オプションを指定すると、正しい幅の字形を優先して
+ 使おうとするため、既定の場合よりも多くの文字が使える。
+ \end{itemize}
+\end{enumerate}
+
%===========================================================
\section{注意事項}
@@ -1155,11 +1295,11 @@
(例えば jsarticle の標準設定ならJISメトリック)
\item 欧文部分を置き換えた場合、残念ながら欧文も等幅
(半角幅)になってしまう。
- さらに、アクセント付きの文字(\'e 等)や非英語文字
- ({\ss} 等)も使えない。
- 大抵の日本語用フォントにはその文字を出力するためのグリフがそもそも
- ないのであるが、例えあったとしても使えない。
-\item \Pkg{japanese-otf}/\Pkg{UTF}パッケージ使用時に |\UTF| や |\CID| で
+% さらに、アクセント付きの文字(\'e 等)や非英語文字
+% ({\ss} 等)も使えない。
+% 大抵の日本語用フォントにはその文字を出力するためのグリフがそもそも
+% ないのであるが、例えあったとしても使えない。
+\item \Pkg{japanese-otf}パッケージ使用時に |\UTF| や |\CID| で
指定した文字が出力されるかは、
指定したフォントがその文字を持っているかに依存する。
\item |deluxe| 付きの\Pkg{japanese-otf}パッケージと |alphabet| 付きの
@@ -1203,7 +1343,7 @@
\subsection{欧文フォントも置き換えた場合(\texttt{alphabet} 指定時)}
欧文フォントを置き換えたDVIファイルは、
-独自の欧文フォント(|r-cfja?-?-l0j| という形式の名前)
+独自の欧文フォント(|r-cfja*| という形式の名前)
を含んでいるので、
少なくともそれに関する設定をしない限りはdvipdfmx以外の
DVIウェアで処理することができない。
@@ -1225,6 +1365,7 @@
r-cfjas-r-@PXcjk0@ msgothic.ttc FontIndex=0
r-cfjas-b-@PXcjk0@ msgothic.ttc FontIndex=0
r-cfjas-x-@PXcjk0@ msgothic.ttc FontIndex=0
+r-cfjam-r-@PXcjk0@ msgothic.ttc FontIndex=0
\end{verbatim}\end{quote}
%===========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxchfon.doc.tlpobj new/tlpkg/tlpobj/pxchfon.doc.tlpobj
--- old/tlpkg/tlpobj/pxchfon.doc.tlpobj 2019-03-24 02:24:28.000000000 +0100
+++ new/tlpkg/tlpobj/pxchfon.doc.tlpobj 2020-02-02 01:58:19.000000000 +0100
@@ -1,9 +1,9 @@
name pxchfon.doc
category Package
-revision 50556
+revision 53629
shortdesc doc files of pxchfon
relocated 1
-docfiles size=90
+docfiles size=114
RELOC/doc/platex/pxchfon/LICENSE
RELOC/doc/platex/pxchfon/README-ja.md
RELOC/doc/platex/pxchfon/README.md
++++++ pxchfon.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/sfd/pxchfon/PXcjk0.sfd new/fonts/sfd/pxchfon/PXcjk0.sfd
--- old/fonts/sfd/pxchfon/PXcjk0.sfd 2012-12-11 03:26:25.000000000 +0100
+++ new/fonts/sfd/pxchfon/PXcjk0.sfd 2019-05-19 23:25:06.000000000 +0200
@@ -8,3 +8,29 @@
0x2018 0x0061_0x007A 124: 0x2015 0x02DD 0x007E 0x00A8 129: 0x0022 \
0x0027 0x003C 0x003E 0x005C 0x005F 0x0060 0x007B 0x007C 0x007D \
0x00A2_0x00A3 0x00A5 0x00AC 161: 0xFF61_0xFF9F
+l4j 18: 0x0060 0x00B4 33: 0x0021_0x007E 0x00A8 128: 0x2018_0x2019 \
+ 0x201C_0x201D 161: 0xFF61_0xFF9F
+l5j 13: 0x0027 0x00A1 0x00BF 0x0131 18: 0x0060 0x00B4 22: 0x00AF \
+ 25: 0x00DF 0x00E6 0x0153 0x00F8 0x00C6 0x0152 0x00D8 0x0020_0x0021 \
+ 0x201D 0x0023_0x0026 0x2019 0x0028_0x005B 0x201C 0x005D_0x005F \
+ 0x2018 0x0061_0x007A 124: 0x2015 126: 0x007E 0x00A8 \
+ 161: 0xFF61_0xFF9F
+t1 0x02CB 0x02CA 0x02C6 0x02DC 0x00A8 0x02DD 0x02DA 0x02C7 0x02D8 \
+ 0x02C9 0x02D9 0x00B8 0x02DB 0x201A 0x2039_0x203A 0x201C_0x201E \
+ 0x00AB 0x00BB 0x2013 0x2015 25: 0x0131 0x0237 32: 0x0020_0x0026 \
+ 0x2019 0x0028_0x005F 0x2018 0x0061_0x007E 128: 0x0102 0x0104 0x0106 \
+ 0x010C 0x010E 0x011A 0x0118 0x011E 0x0139 0x013D 0x0141 0x0143 \
+ 0x0147 0x014A 0x0150 0x0154 0x0158 0x015A 0x0160 0x015E 0x0164 \
+ 0x0162 0x0170 0x016E 0x0178_0x0179 0x017D 0x017B 0x0132 0x0130 \
+ 0x0111 0x00A7 0x0103 0x0105 0x0107 0x010D 0x010F 0x011B 0x0119 \
+ 0x011F 0x013A 0x013E 0x0142 0x0144 0x0148 0x014B 0x0151 0x0155 \
+ 0x0159 0x015B 0x0161 0x015F 0x0165 0x0163 0x0171 0x016F 0x00FF \
+ 0x017A 0x017E 0x017C 0x0133 0x00A1 0x00BF 0x00A3 0x00C0_0x00D6 \
+ 0x0152 0x00D8_0x00DE 224: 0x00E0_0x00F6 0x0153 0x00F8_0x00FE \
+ 0x00DF
+ts1 11: 0x00B8 0x02DB 36: 0x0024 39: 0x0027 42: 0x204E 44: 0x002C \
+ 46: 0x002E 0x2044 61: 0x2212 87: 0x2126 91: 0x301A 93: 0x301B \
+ 96: 0x0060 126: 0x02F7 128: 0x02D8 0x02C7 0x02DD 132: 0x2020_0x2021 \
+ 0x2016 0x2030 0x2022 0x2103 140: 0x0192 151: 0x2122 157: 0x212E \
+ 162: 0x00A2_0x00AA 172: 0x00AC 174: 0x00AE_0x00B7 \
+ 185: 0x00B9_0x00BA 188: 0x00BC_0x00BE 0x20AC 214: 0x00D7 246: 0x00F7
Binary files old/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm and new/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm and new/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm and new/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm and new/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm and new/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm and new/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm and new/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm and new/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm and new/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm and new/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm differ
Binary files old/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm and new/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm differ
Binary files old/fonts/vf/public/pxchfon/cfjam-r-l5j.vf and new/fonts/vf/public/pxchfon/cfjam-r-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjam-r-t1.vf and new/fonts/vf/public/pxchfon/cfjam-r-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjam-r-ts1.vf and new/fonts/vf/public/pxchfon/cfjam-r-ts1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-b-l5j.vf and new/fonts/vf/public/pxchfon/cfjar-b-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-b-t1.vf and new/fonts/vf/public/pxchfon/cfjar-b-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-b-ts1.vf and new/fonts/vf/public/pxchfon/cfjar-b-ts1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-l-l5j.vf and new/fonts/vf/public/pxchfon/cfjar-l-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-l-t1.vf and new/fonts/vf/public/pxchfon/cfjar-l-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-l-ts1.vf and new/fonts/vf/public/pxchfon/cfjar-l-ts1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-r-l5j.vf and new/fonts/vf/public/pxchfon/cfjar-r-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-r-t1.vf and new/fonts/vf/public/pxchfon/cfjar-r-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjar-r-ts1.vf and new/fonts/vf/public/pxchfon/cfjar-r-ts1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-b-l5j.vf and new/fonts/vf/public/pxchfon/cfjas-b-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-b-t1.vf and new/fonts/vf/public/pxchfon/cfjas-b-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-b-ts1.vf and new/fonts/vf/public/pxchfon/cfjas-b-ts1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-r-l5j.vf and new/fonts/vf/public/pxchfon/cfjas-r-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-r-t1.vf and new/fonts/vf/public/pxchfon/cfjas-r-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-r-ts1.vf and new/fonts/vf/public/pxchfon/cfjas-r-ts1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-x-l5j.vf and new/fonts/vf/public/pxchfon/cfjas-x-l5j.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-x-t1.vf and new/fonts/vf/public/pxchfon/cfjas-x-t1.vf differ
Binary files old/fonts/vf/public/pxchfon/cfjas-x-ts1.vf and new/fonts/vf/public/pxchfon/cfjas-x-ts1.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/pxchfon/pxchfon.sty new/tex/platex/pxchfon/pxchfon.sty
--- old/tex/platex/pxchfon/pxchfon.sty 2019-03-23 23:05:34.000000000 +0100
+++ new/tex/platex/pxchfon/pxchfon.sty 2020-02-01 23:13:57.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'pxchfon.sty'.
%%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,14 +10,9 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2019/03/24 v1.4a]
+\ProvidesPackage{pxchfon}[2020/02/01 v1.7b]
\def\pxcz@pkgname{pxchfon}
-%% preparations
-\def\pxcz@error{\PackageError\pxcz@pkgname}
-\def\pxcz@warn{\PackageWarning\pxcz@pkgname}
-\def\pxcz@info{\PackageInfo\pxcz@pkgname}
-
%--------------------------------------- general
%% variables
@@ -44,6 +39,9 @@
%% \pxcz@onlypreamble@def\CS
\def\pxcz@onlypreamble@def#1{%
\@onlypreamble#1\def#1}
+%% \pxcz@onlypreamble@let\CS
+\def\pxcz@onlypreamble@let#1{%
+ \@onlypreamble#1\let#1}
%% \pxcz@csuse@or{<csname>}{<default>}
\def\pxcz@csuse@or#1#2{%
@@ -88,6 +86,10 @@
\edef\pxcz@tmpa{\string\ucs}\edef\pxcz@tmpb{\meaning\ucs}
\ifx\pxcz@tmpa\pxcz@tmpb \pxcz@uptextrue \fi
+%% \pxcz@JYn
+\edef\pxcz@JYn{%
+ \ifpxcz@uptex JY2\else JY1\fi}
+
%% \ifpxcz@otf@deluxe
\newif\ifpxcz@otf@deluxe \pxcz@otf@deluxefalse
\@ifpackagewith{otf}{deluxe}{\pxcz@otf@deluxetrue}{}
@@ -115,6 +117,59 @@
\chardef\pxcz@pxufont@loaded=0
}
+%--------------------------------------- custom presets
+
+%% \pxcz@custom@presets
+\pxcz@onlypreamble@let\pxcz@custom@presets\@empty
+%% \pxcz@custom@apply@opt@unicode
+\pxcz@onlypreamble@let\pxcz@custom@apply@opt@unicode\@empty
+%% freeze
+\pxcz@onlypreamble@let\pxcz@custom\relax
+\let\pxcz@uniweight\relax
+\let\pxcz@multiweight\relax
+
+%% \pxcz@check@avail@custom@presets
+\pxcz@onlypreamble@let\pxcz@check@avail@custom@presets\relax
+\AtEndOfPackage{%
+ \def\pxcz@check@avail@custom@presets#1#2#3{%
+ \PackageError\pxcz@pkgname
+ {Custom presets cannot be registered after\MessageBreak
+ loading pxchfon package}%
+ {\@eha}}}
+
+%% \pxcz@declare@oneweight@preset{<name>}{<f-mc>}{<f-gt>}
+\pxcz@onlypreamble@def\pxcz@declare@oneweight@preset#1#2#3{%
+ \pxcz@check@avail@custom@presets
+ \xdef\pxcz@custom@presets{\pxcz@custom@presets
+ \pxcz@custom{#1}{\pxcz@uniweight{#2}{#3}}}}
+%% \pxcz@declare@multiweight@preset{<name>}{<f-1>}...{<f-8>}
+\pxcz@onlypreamble@def\pxcz@declare@multiweight@preset#1#2#3#4#5#6#7#8#9{%
+ \pxcz@check@avail@custom@presets
+ \xdef\pxcz@custom@presets{\pxcz@custom@presets
+ \pxcz@custom{#1}{\pxcz@multiweight{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}}}
+%%<+> \pxchfonDeclareOneWeightPreset{<name>}{<f-mc>}{<f-gt>}
+\@onlypreamble\pxchfonDeclareOneWeightPreset
+\newcommand*\pxchfonDeclareOneWeightPreset[1]{%
+ \pxcz@declare@oneweight@preset{user:#1}}
+%%<+> \pxchfonDeclareMultiWeightPreset{<name>}{<f-1>}...{<f-8>}
+\@onlypreamble\pxchfonDeclareMultiWeightPreset
+\newcommand*\pxchfonDeclareMultiWeightPreset[1]{%
+ \pxcz@declare@multiweight@preset{user:#1}}
+
+%% Load custom preset definitions
+\IfFileExists{pxchfon-extras.def}{% PXchfon-extras
+ \PackageInfo\pxcz@pkgname
+ {Extra preset settings are loaded\@gobble}%
+ \input{pxchfon-extras.def}%
+}{}
+\IfFileExists{pxchfon.cfg}{% of user
+ \PackageInfo\pxcz@pkgname
+ {Custom preset settings are loaded\@gobble}%
+ \begingroup
+ \makeatother\input{pxchfon.cfg}%
+ \endgroup
+}{}
+
%--------------------------------------- handle options
%% variables
@@ -220,6 +275,7 @@
hiragino-elcapitan-pro,hiragino-elcapitan-pron,%
morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-win10+,yu-osx,%
sourcehan-otc,sourcehan,sourcehan-jp,noto-otc,noto,noto-jp,%
+ haranoaji,%
sourcehan-otc+,sourcehan+,noto-otc+,noto+,%
%(alias)
hiragino,noto-otf,%
@@ -233,48 +289,55 @@
\expandafter\pxcz@do\expandafter{\pxcz@x}}
\@for\pxcz@x:=\pxcz@all@abolished@preset\do{%
\expandafter\pxcz@do\expandafter{\pxcz@x}}
+\def\pxcz@custom#1#2{\pxcz@do{#1}}
+\pxcz@custom@presets
% others
% The 'unicode' option means a Unicode-oriented mapping, and requires
% dvipdfmx of version 20170627 or later. The 'unicode-fwid' is a variant.
% The 'unicode*(-fwid)' option is a transitional (deteriorated) version
% of 'unicode(-fwid)' and can work with dvipdfmx of version 20170318.
-\@namedef{pxcz@POPT/unicode}{%
+\pxcz@onlypreamble@csdef{pxcz@POPT/unicode}{%
\let\pxcz@directunicode\pxcz@directunicode@full}
-\@namedef{pxcz@POPT/unicode*}{%
+\pxcz@onlypreamble@csdef{pxcz@POPT/unicode*}{%
\pxcz@uniquifytrue
\let\pxcz@directunicode\pxcz@directunicode@full}
-\@namedef{pxcz@POPT/unicode-fwid}{%
+\pxcz@onlypreamble@csdef{pxcz@POPT/unicode-fwid}{%
\pxcz@fullwidthtrue
\let\pxcz@directunicode\pxcz@directunicode@full}
-\@namedef{pxcz@POPT/unicode*-fwid}{%
+\pxcz@onlypreamble@csdef{pxcz@POPT/unicode*-fwid}{%
\pxcz@fullwidthtrue \pxcz@uniquifytrue
\let\pxcz@directunicode\pxcz@directunicode@full}
\DeclareOption*{%
\pxcz@csuse@or{pxcz@POPT/\CurrentOption}{%
\pxcz@parse@opt\CurrentOption
\ifpxcz@ok\else \@unknownoptionerror \fi}}
-\@onlypreamble\pxcz@parse@opt
-\def\pxcz@parse@opt#1{%
- \expandafter\pxcz@parse@opt@a#1\@nnil}
-\@onlypreamble\pxcz@parse@opt@a
-\def\pxcz@parse@opt@a{%
- \futurelet\pxcz@tok\pxcz@parse@opt@b}
-\@onlypreamble\pxcz@parse@opt@b
-\def\pxcz@parse@opt@b{%
+\pxcz@onlypreamble@def\pxcz@parse@opt#1{%
\pxcz@okfalse
- \let\pxcz@tmpa\remove@to@nnil
- \ifx+\pxcz@tok
- \pxcz@file@preset@tltrue \let\pxcz@tmpa\pxcz@parse@opt@c
- \else\ifx*\pxcz@tok
- \pxcz@file@preset@tlfalse \let\pxcz@tmpa\pxcz@parse@opt@c
- \fi\fi \pxcz@tmpa}
-\@onlypreamble\pxcz@parse@opt@c
-\def\pxcz@parse@opt@c#1#2\@nnil{%
- \pxcz@oktrue
- \edef\pxcz@file@preset{#2}}
+ \pxcz@parse@opt@a{+}{#1}{\pxcz@file@preset@tltrue}%
+ \pxcz@parse@opt@a{*}{#1}{\pxcz@file@preset@tlfalse}%
+ \pxcz@parse@opt@a{tl:}{#1}{\pxcz@file@preset@tltrue}%
+ \pxcz@parse@opt@a{file:}{#1}{\pxcz@file@preset@tlfalse}}
+\pxcz@onlypreamble@def\pxcz@parse@opt@a#1#2#3{%
+ \ifpxcz@ok\else
+ \pxcz@split{#1}{#2}\ifx\pxcz@pre\@empty
+ #3\let\pxcz@file@preset\pxcz@post \pxcz@oktrue
+ \fi
+ \fi}
% dispatch
\ProcessOptions*
+%% 'unicode*' and 'unicode*-fwid' are DEPRECATED
+\ifpxcz@uniquify
+ \PackageWarningNoLine\pxcz@pkgname
+ {IMPORTANT: Option 'unicode*\ifpxcz@fullwidth -fwid\fi'
+ is DEPRECATED!\MessageBreak
+ This option invokes a transitional setting that\MessageBreak
+ is specially tailored for TL2017, and will be\MessageBreak
+ abolished in near future.\MessageBreak
+ You should update to TL2018 or later and use\MessageBreak
+ option 'unicode\ifpxcz@fullwidth -fwid\fi' instead}
+\fi
+
%% 'everypage' needs 'atbegshi' package
\ifpxcz@everypage
\RequirePackage{atbegshi}
@@ -304,10 +367,11 @@
\else \pxcz@alphafalse
\fi\fi\fi\fi
\ifpxcz@alpha
- \IfFileExists{pxchfon0.def}{\relax}{%
- \pxcz@error{Option 'alphabet' not available in Lite edition}%
- {You must install full edition of PXchfon bundle, or specify
- 'noalphabet'\MessageBreak as package option.}%
+ \IfFileExists{pxchfon0.def}{}{%else
+ \PackageError\pxcz@pkgname
+ {Option 'alphabet' not available in Lite edition}%
+ {You must install full edition of PXchfon bundle, or specify
+ 'noalphabet'\MessageBreak as package option.}%
\pxcz@alphafalse}
\fi
@@ -316,9 +380,10 @@
\else \pxcz@relfalse
\fi
\ifpxcz@rel
- \IfFileExists{pxchfon0.def}{\relax}{%
- \pxcz@error{Option 'relfont' not available in Lite edition}%
- {You must install full edition of PXchfon bundle.}%
+ \IfFileExists{pxchfon0.def}{}{%else
+ \PackageError\pxcz@pkgname
+ {Option 'relfont' not available in Lite edition}%
+ {You must install full edition of PXchfon bundle.}%
\pxcz@relfalse}
\fi
@@ -359,11 +424,11 @@
%% variables
\newif\ifpxcz@warn@unless@all@defined
+\newif\ifpxcz@warn@unless@all@embedded
%% \pxcz@apply@opt@unicode
% Forces the 'unicode' setup (unless a directunicode option was given).
-\@onlypreamble\pxcz@apply@opt@unicode
-\def\pxcz@apply@opt@unicode{%
+\pxcz@onlypreamble@def\pxcz@apply@opt@unicode{%
\ifpxcz@directunicode@default % default -> unicode
\pxcz@warn@unicode
\let\pxcz@directunicode\pxcz@directunicode@full
@@ -377,8 +442,7 @@
%% \pxcz@apply@opt@unicodeP
% Forces the 'unicode+' setup, which is a 'unicode' with switch-font
% enabled on the width features.
-\@onlypreamble\pxcz@apply@opt@unicodeP
-\def\pxcz@apply@opt@unicodeP{%
+\pxcz@onlypreamble@def\pxcz@apply@opt@unicodeP{%
\pxcz@uniquifyfalse
\pxcz@switch@font@xwidtrue % 'unicode+'
\ifnum\pxcz@directunicode=\pxcz@directunicode@full\else
@@ -386,10 +450,9 @@
\let\pxcz@directunicode\pxcz@directunicode@full
\fi}
%% \pxcz@warn@unicode
-\@onlypreamble\pxcz@warn@unicode
-\def\pxcz@warn@unicode{%
+\pxcz@onlypreamble@def\pxcz@warn@unicode{%
\PackageWarningNoLine\pxcz@pkgname
- {The option 'unicode(*)' is enforced, because the\MessageBreak
+ {The option 'unicode' is enforced, because the\MessageBreak
preset '\pxcz@main@preset' is selected.}}
%% the setup
@@ -412,6 +475,11 @@
\pxcz@do{noto+}{\pxcz@apply@opt@unicodeP}
\pxcz@do{noto-otc+}{\pxcz@apply@opt@unicodeP}
\pxcz@do{yu-win10+}{\pxcz@apply@opt@unicodeP}
+\pxcz@custom@apply@opt@unicode
+% No-embed is not supported under the 'unicode' setup
+\ifnum\pxcz@directunicode=\pxcz@directunicode@full
+ \pxcz@warn@unless@all@embeddedtrue
+\fi
%% apply default for \pxcz@legacycode
\ifx\pxcz@legacycode\relax
@@ -507,11 +575,9 @@
\newcommand*\setschinesegothicfont{\pxcz@setfont{scg}}
\newcommand*\settchineseminchofont{\pxcz@setfont{tcm}}
\newcommand*\settchinesegothicfont{\pxcz@setfont{tcg}}
-\@onlypreamble\pxcz@setfont
-\def\pxcz@setfont#1{\@ifnextchar[%]
+\pxcz@onlypreamble@def\pxcz@setfont#1{\@ifnextchar[%]
{\pxcz@setfont@a{#1}}{\pxcz@setfont@a{#1}[0]}}
-\@onlypreamble\pxcz@setfont@a
-\def\pxcz@setfont@a#1[#2]#3{%
+\pxcz@onlypreamble@def\pxcz@setfont@a#1[#2]#3{%
\edef\pxcz@tmpa{#3}\pxcz@lower\pxcz@tmpa
\pxcz@split{?:}{?\pxcz@tmpa}%
\ifx\pxcz@pre\relax
@@ -521,8 +587,7 @@
\fi
\else \pxcz@setfont@b{#1}{#3}%
\fi}
-\@onlypreamble\pxcz@setfont@b
-\def\pxcz@setfont@b#1#2{%
+\pxcz@onlypreamble@def\pxcz@setfont@b#1#2{%
\@for\pxcz@tmpx:=#1\do{%
\@namedef{pxcz@FS/\pxcz@tmpx}{#2}}}
\@for\pxcz@x:=\pxcz@sym@list\do{%
@@ -539,12 +604,18 @@
}{}%
}
\def\pxcz@asutf@a#1{%
+ \pxcz@warn@depre@asutf
\kchardef\pxcz@tmpa=`#1\relax
\expandafter\pxcz@asutf@b\meaning\pxcz@tmpa\relax
}
\def\pxcz@asutf@b#1"#2\relax{%
\UTF{#2}%
}
+\def\pxcz@warn@depre@asutf{%
+ \PackageWarningNoLine\pxcz@pkgname
+ {Important: Command '\string\asUTF' is DEPRECATED}%
+ \global\let\pxcz@warn@depre@asutf\relax
+}
\fi
%--------------------------------------- fontmap internals
@@ -566,11 +637,9 @@
%%<*> \usecmapforalphabet/\nousecmapforalphabet
\newcommand*\usecmapforalphabet{%
- \global\let\pxcz@cmap@uni\pxcz@cmap@hwuni}
+ \global\pxcz@cmap@alphatrue}
\newcommand*\nousecmapforalphabet{%
- \global\let\pxcz@cmap@uni\pxcz@cmap@directuni}
-\ifpxcz@cmap@alpha \usecmapforalphabet
-\else \nousecmapforalphabet \fi
+ \global\pxcz@cmap@alphafalse}
%% \pxcz@NEF/<sym>
\def\pxcz@do#1#2{%
@@ -643,18 +712,17 @@
\let\pxcz@lopts\relax
\let\pxcz@mopts\relax
\let\pxcz@font@tribe\relax
+\newif\ifpxcz@noembed@used
%% \pxcz@@jpXX
\edef\pxcz@@jpXX{%
\ifpxcz@mmivjis jp04\else jp90\fi}
%% \pxcz@add@lopt
-\@onlypreamble\pxcz@add@lopt
-\def\pxcz@add@lopt#1{%
+\pxcz@onlypreamble@def\pxcz@add@lopt#1{%
\edef\pxcz@lopts{%
\ifx\pxcz@lopts\@empty\else \pxcz@lopts:\fi#1}}
%% \pxcz@uniquify@lopts
-\@onlypreamble\pxcz@uniquify@lopts
-\def\pxcz@uniquify@lopts#1#2{%
+\pxcz@onlypreamble@def\pxcz@uniquify@lopts#1#2{%
\pxcz@oktrue
\def\pxcz@tmpb{jp90}\ifx\pxcz@tmpb\pxcz@lopts\pxcz@okfalse\fi
\def\pxcz@tmpb{jp04}\ifx\pxcz@tmpb\pxcz@lopts\pxcz@okfalse\fi
@@ -664,17 +732,14 @@
\fi}
%% \pxcz@is@jis@cmap
-\@onlypreamble\pxcz@is@jis@cmap
-\def\pxcz@is@jis@cmap{%
+\pxcz@onlypreamble@def\pxcz@is@jis@cmap{%
\pxcz@okfalse
\expandafter\pxcz@is@jis@cmap@a\pxcz@cmap\pxcz@end}
-\@onlypreamble\pxcz@is@jis@cmap@a
-\def\pxcz@is@jis@cmap@a#1#2\pxcz@end{%
+\pxcz@onlypreamble@def\pxcz@is@jis@cmap@a#1#2\pxcz@end{%
\ifx\pxcz@mt#2\pxcz@mt \pxcz@oktrue \fi}
%% \pxcz@force@mmiv@cmap
-\@onlypreamble\pxcz@force@mmiv@cmap
-\def\pxcz@force@mmiv@cmap{%
+\pxcz@onlypreamble@def\pxcz@force@mmiv@cmap{%
\pxcz@is@jis@cmap \ifpxcz@ok
\edef\pxcz@cmap{\pxcz@pfx@jis\pxcz@cmap}%
\else
@@ -685,8 +750,7 @@
\fi}
%% \pxcz@inspect@font@tribe
-\@onlypreamble\pxcz@inspect@font@tribe
-\def\pxcz@inspect@font@tribe{%
+\pxcz@onlypreamble@def\pxcz@inspect@font@tribe{%
\let\pxcz@font@tribe\@empty
\ifx\pxcz@font\@empty
\else\ifx\pxcz@font\pxcz@noembed
@@ -711,8 +775,7 @@
{Font tribe is '\pxcz@font@tribe':\MessageBreak
\@spaces\pxcz@font\@gobble}%
\fi}
-\@onlypreamble\pxcz@inspect@font@tribe@a
-\def\pxcz@inspect@font@tribe@a#1#2#3{%
+\pxcz@onlypreamble@def\pxcz@inspect@font@tribe@a#1#2#3{%
\pxcz@split{#1}{?\pxcz@font}%
\ifx\pxcz@pre\relax\else
\pxcz@split{#2}{\pxcz@font?}%
@@ -723,8 +786,7 @@
%% \pxcz@switch@font@for{<feature>}
% Modifies \pxcz@font, assuming \pxcz@font@tribe is properly set.
-\@onlypreamble\pxcz@switch@font@for
-\def\pxcz@switch@font@for#1{%
+\pxcz@onlypreamble@def\pxcz@switch@font@for#1{%
\pxcz@csletcs{pxcz@tmpb}{pxcz@switch@font@@\pxcz@font@tribe @#1}%
\ifx\pxcz@tmpb\relax\else
%\typeout{#1:\pxcz@font-->\expandafter\pxcz@tmpb\pxcz@font}%
@@ -772,8 +834,7 @@
\fi
%% \pxcz@declare@entry@modifier{<name>}
-\@onlypreamble\pxcz@declare@entry@modifier
-\def\pxcz@declare@entry@modifier#1{%
+\pxcz@onlypreamble@def\pxcz@declare@entry@modifier#1{%
\pxcz@onlypreamble@csdef{pxcz@MEM/#1}}
%% entry modifiers
@@ -808,14 +869,16 @@
\pxcz@add@lopt{jp90}}
% HWid
\pxcz@declare@entry@modifier{HWid}{%
- \ifx\pxcz@font\pxcz@noembed
- \let\pxcz@cmap\pxcz@cmap@hwuni
- \else\ifnum\pxcz@directunicode=\pxcz@directunicode@full
+ \ifx\pxcz@font\pxcz@noembed \pxcz@okfalse
+ \else\ifnum\pxcz@directunicode=\pxcz@directunicode@full \pxcz@oktrue
+ \else\ifpxcz@cmap@alpha \pxcz@okfalse
+ \else \pxcz@oktrue
+ \fi\fi\fi
+ \ifpxcz@ok
\let\pxcz@cmap\pxcz@cmap@directuni
- \else
- \let\pxcz@cmap\pxcz@cmap@uni
\pxcz@switch@font@for{hwid}%
- \fi\fi
+ \else \let\pxcz@cmap\pxcz@cmap@hwuni
+ \fi
\pxcz@add@lopt{hwid}}
% FWid
\pxcz@declare@entry@modifier{FWid}{%
@@ -865,15 +928,13 @@
\let\pxcz@spec\@empty
%% \pxcz@addtospec{<id>}
-\@onlypreamble\pxcz@addtospec
-\def\pxcz@addtospec#1{%
+\pxcz@onlypreamble@def\pxcz@addtospec#1{%
\begingroup
\let\Entry\pxcz@Entry
\@nameuse{pxcz@ME/#1}%
\endgroup}
%% \Entry{<sym>}{<tfm>}{<cmap>}{<modify>,...}
-\@onlypreamble\pxcz@Entry
-\def\pxcz@Entry#1#2#3#4{%
+\pxcz@onlypreamble@def\pxcz@Entry#1#2#3#4{%
\def\pxcz@sym{#1}\def\pxcz@cmap{#3}%
\let\pxcz@csi\relax \let\pxcz@mopts\@empty \let\pxcz@lopts\@empty
\pxcz@retainfalse \pxcz@retain@csifalse \pxcz@vertfalse
@@ -887,6 +948,8 @@
% resolve no-embed font spec
\ifx\pxcz@font\pxcz@noembed
\edef\pxcz@font{!\@nameuse{pxcz@NEF/\pxcz@sym}}%
+ \pxcz@retaintrue
+ \global\pxcz@noembed@usedtrue
\fi
% apply layout options when using 'unicode'
\ifnum\pxcz@directunicode<\pxcz@directunicode@full\else
@@ -927,8 +990,7 @@
\fi\fi}
%% \pxcz@do@file@preset
-\@onlypreamble\pxcz@do@file@preset
-\def\pxcz@do@file@preset{%
+\pxcz@onlypreamble@def\pxcz@do@file@preset{%
\ifpxcz@file@preset@tl
\pxcz@do@file@preset@a{ptex-}%
\ifpxcz@uptex \pxcz@do@file@preset@a{uptex-}\fi
@@ -939,8 +1001,7 @@
\else
\pxcz@do@file@preset@a{}%
\fi}
-\@onlypreamble\pxcz@do@file@preset@a
-\def\pxcz@do@file@preset@a#1{%
+\pxcz@onlypreamble@def\pxcz@do@file@preset@a#1{%
\pxcz@addtospec@alt\pxcz@mapfile{#1\pxcz@file@preset.map}}
%% \pxcz@addtospec@alt
@@ -952,8 +1013,7 @@
%--------------------------------------- map entry definitions
%% \pxcz@mapentry{<id>}{<text>}
-\@onlypreamble\pxcz@mapentry
-\def\pxcz@mapentry#1{%
+\pxcz@onlypreamble@def\pxcz@mapentry#1{%
\pxcz@onlypreamble@csdef{pxcz@ME/#1}}
%% map entries
@@ -1207,14 +1267,30 @@
\fi
%%<*> \diruni
-\DeclareRobustCommand*{\diruni}{%
- \not@math@alphabet\diruni\relax
- \fontshape{diruni}\selectfont
-}
+\@ifdefinable{\diruni}{%
+ \DeclareRobustCommand*{\diruni}{%
+ \not@math@alphabet\diruni\relax
+ \ifx\cy@encoding\pxcz@JYn % if in standard Japanese encoding
+ \expandafter\let\csname UTF \endcsname\pxcz@du@UTF
+ \kanjishape{diruni}\selectfont
+ \fi
+ }}
%%<*> \textdiruni{<text>}
-\newcommand*{\textdiruni}[1]{%
- \relax\ifmmode\hbox\fi{\diruni#1}%
+\@ifdefinable{\textdiruni}{%
+ \DeclareRobustCommand*{\textdiruni}[1]{%
+ \relax\ifmmode\hbox\fi{\diruni#1}%
+ }}
+
+%% \pxcz@du@UTF
+\def\pxcz@du@UTF#1{%
+ \kchar"#1\relax}
+
+%% redefinition in PDF-strings
+\providecommand*\pdfstringdefPreHook{}
+\g@addto@macro\pdfstringdefPreHook{%
+ \let\diruni\@empty
+ \let\textdiruni\@firstofone
}
\ifpxcz@diruni@ok %---- <*diruni-ok>
@@ -1250,14 +1326,12 @@
\fi
%% \pxcz@du@decl@shape{<fam>}{<ser>}<sw>{<tfmname>}{<suffix>}
-\@onlypreamble\pxcz@du@decl@shape
-\def\pxcz@du@decl@shape#1#2#3#4#5{%
+\pxcz@onlypreamble@def\pxcz@du@decl@shape#1#2#3#4#5{%
\DeclareFontShape{JY2}{#1}{#2}{diruni}{<->%
\pxcz@du@shape@spec{#3}{#4}{#5}{h}}{}%
\DeclareFontShape{JT2}{#1}{#2}{diruni}{<->%
\pxcz@du@shape@spec{#3}{#4}{#5}{v}}{}}
-\@onlypreamble\pxcz@du@shape@spec
-\def\pxcz@du@shape@spec#1#2#3#4{%
+\pxcz@onlypreamble@def\pxcz@du@shape@spec#1#2#3#4{%
\if#1t%
s*[\pxcz@du@scale]#2\if t\pxcz@otf@mmivjis#3\fi-#4%
\else#2\fi}
@@ -1303,8 +1377,7 @@
\edef\pxcz@tmpb{{\f@encoding}{\pxcz@tmpa}{\pxcz@tmpb}}%
\expandafter\pxcz@do\pxcz@tmpb}}%
}
-\@onlypreamble\pxcz@force@load@font@fam
-\def\pxcz@force@load@font@fam#1{%
+\pxcz@onlypreamble@def\pxcz@force@load@font@fam#1{%
\begingroup
\edef\f@family{#1}\def\f@series{m}\def\f@shape{n}%
\xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
@@ -1321,16 +1394,18 @@
\kanjishape{dirgid}\selectfont
\kchar#1\relax
\endgroup}
+\def\pxcz@hy@gid#1{?}
+\g@addto@macro\pdfstringdefPreHook{%
+ \let\gid\pxcz@hy@gid
+}
%% \pxcz@dg@decl@shape{<fam>}{<ser>}<sw>{<tfmname>}
-\@onlypreamble\pxcz@dg@decl@shape
-\def\pxcz@dg@decl@shape#1#2#3#4{%
+\pxcz@onlypreamble@def\pxcz@dg@decl@shape#1#2#3#4{%
\DeclareFontShape{JY2}{#1}{#2}{dirgid}{<->%
\pxcz@dg@shape@spec{#3}{#4}{h}}{}%
\DeclareFontShape{JT2}{#1}{#2}{dirgid}{<->%
\pxcz@dg@shape@spec{#3}{#4}{v}}{}}
-\@onlypreamble\pxcz@dg@shape@spec
-\def\pxcz@dg@shape@spec#1#2#3{%
+\pxcz@onlypreamble@def\pxcz@dg@shape@spec#1#2#3{%
\if#1t%
s*[\pxcz@du@scale]#2-#3%
\else#2\fi}
@@ -1373,7 +1448,8 @@
You must use upLaTeX and load pxchfon after 'otf' package.}
\fi
\def\pxcz@err@diruni{%
- \pxcz@error{Command '\string\diruni' not available}%
+ \PackageError\pxcz@pkgname
+ {Command '\string\diruni' not available}%
{\pxcz@errhelp@diruni\MessageBreak\@ehc}%
\global\let\pxcz@err@diruni\relax}
\AtBeginDocument{%
@@ -1386,22 +1462,32 @@
%--------------------------------------- 'alphabet' option
+%% check for textcomp
+\newif\ifpxcz@textcomp
+\ifx\DeclareEncodingSubset\@undefined\else
+ \expandafter\ifx\csname T@TS1\endcsname\relax\else
+ \pxcz@textcomptrue
+\fi\fi
+
%% \pxcz@afont@enc@list
\def\pxcz@afont@enc@list{OT1,T1}
+\ifpxcz@textcomp \g@addto@macro\pxcz@afont@enc@list{,TS1}\fi
%% \pxcz@decl@family{<fam>}
-\@onlypreamble\pxcz@decl@family
-\def\pxcz@decl@family#1{%
+\pxcz@onlypreamble@def\pxcz@decl@family#1{%
+ \ifpxcz@textcomp \DeclareEncodingSubset{TS1}{#1}{3}\fi
\@for\pxcz@x:=\pxcz@afont@enc@list\do{%
\DeclareFontFamily{\pxcz@x}{#1}{}}}
%% \pxcz@decl@shape{<fam>}{<ser>}<sw>{<font>}
-\@onlypreamble\pxcz@decl@shape
-\def\pxcz@decl@shape#1#2#3#4{%
+\pxcz@onlypreamble@def\pxcz@decl@shape#1#2#3#4{%
\if s#3%
\@for\pxcz@x:=\pxcz@afont@enc@list\do{%
\DeclareFontShape{\pxcz@x}{#1}{#2}{n}{<->ssub*#4}{}}%
\else
- \DeclareFontShape{OT1}{#1}{#2}{n}{<->#4-l0j}{}%
- \DeclareFontShape {T1}{#1}{#2}{n}{<->#4-l0j}{}% FIXME
+ \DeclareFontShape{OT1}{#1}{#2}{n}{<->#4-l5j}{}%
+ \DeclareFontShape {T1}{#1}{#2}{n}{<->#4-t1}{}%
+ \ifpxcz@textcomp
+ \DeclareFontShape{TS1}{#1}{#2}{n}{<->#4-ts1}{}%
+ \fi
\fi
\@for\pxcz@x:=\pxcz@afont@enc@list\do{%
\DeclareFontShape{\pxcz@x}{#1}{#2}{it}{<->ssub*#1/#2/n}{}%
@@ -1435,11 +1521,11 @@
\pxcz@decl@family{cfjas}%
\pxcz@decl@shape{cfjas}{m}n{cfjas-r}%
\pxcz@decl@shape{cfjas}{bx}s{cfjas/m/n}%
-\@onlypreamble\pxcz@err@dxotf
-\def\pxcz@err@dxotf#1{%
- \pxcz@error{Loaded before '#1' with 'deluxe'}%
- {This package must be loaded after '#1' with 'deluxe' option
- when using both.}}
+\pxcz@onlypreamble@def\pxcz@err@dxotf#1{%
+ \PackageError\pxcz@pkgname
+ {Loaded before '#1' with 'deluxe'}%
+ {This package must be loaded after '#1' with 'deluxe' option
+ when using both.}}
\g@addto@macro\pxcz@check@extra{%
\expandafter\let\expandafter\pxcz@x\csname pxcz@FS/mnr\endcsname
\ifx\pxcz@x\@empty\else
@@ -1463,55 +1549,45 @@
\def\pxcz@mgfamily@hook{\romanfamily{cfjam}}
%% \pxcz@set@page@hook{<text>}
-\@onlypreamble\pxcz@set@page@hook
\ifpxcz@everypage
-\def\pxcz@set@page@hook#1{%
+\pxcz@onlypreamble@def\pxcz@set@page@hook#1{%
\AtBeginShipout{\setbox\AtBeginShipoutBox=\vbox{%
\baselineskip\z@skip\lineskip\z@skip\lineskiplimit\z@
#1\copy\AtBeginShipoutBox}}}
\else
-\def\pxcz@set@page@hook#1{%
+\pxcz@onlypreamble@def\pxcz@set@page@hook#1{%
% this is \AtBeginDvi with forcing of yoko-dir added
\global\setbox\@begindvibox\vbox{\yoko\unvbox\@begindvibox#1}}
\fi
%% \pxcz@check@alldefined{<sym>,...}
-\@onlypreamble\pxcz@check@alldefined
-\def\pxcz@check@alldefined#1{%
+\pxcz@onlypreamble@def\pxcz@check@alldefined#1{%
\pxcz@oktrue
\@for\pxcz@x:={#1}\do{%
\expandafter\ifx\csname pxcz@FS/\pxcz@x\endcsname\@empty
\pxcz@okfalse \fi}}
%% \pxcz@decl@relfont{<fam>}{<afam>}{<ser>,...}
-\@onlypreamble\pxcz@decl@relfont
-\def\pxcz@decl@relfont#1#2#3{%
+\pxcz@onlypreamble@def\pxcz@decl@relfont#1#2#3{%
\@for\pxcz@x:={#3}\do{%
\expandafter\ifx\csname\k@encoding/#1/\pxcz@x/n\endcsname\relax\else
\edef\pxcz@tmpa{\noexpand\DeclareRelationFont
{\k@encoding}{#1}{\pxcz@x}{}{\pxcz@afont@enc}{#2}{\pxcz@x}{}%
}\pxcz@tmpa
\fi}%
- \pxcz@info{Relation font set for \k@encoding/#1}}
+ \PackageInfo\pxcz@pkgname
+ {Relation font set for \k@encoding/#1}}
%% \pxcz@check@afont@enc
-\@onlypreamble\pxcz@check@afont@enc
-\def\pxcz@check@afont@enc{%
+\pxcz@onlypreamble@def\pxcz@check@afont@enc{%
\pxcz@oktrue % OT1 is always okay
- \def\pxcz@tmpa{OT1}\ifx\pxcz@tmpa\pxcz@afont@enc\else
- % otherwise, noembed must not be used
- \@for\pxcz@x:=\pxcz@sym@list\do{%
- \expandafter\ifx\csname pxcz@FS/\pxcz@x\endcsname\pxcz@noembed
- \pxcz@okfalse \fi}%
- \expandafter\ifx\csname\pxcz@afont@enc+cfjar\endcsname\relax
- \pxcz@okfalse \fi
- \fi
+ \expandafter\ifx\csname\pxcz@afont@enc+cfjar\endcsname\relax
+ \pxcz@okfalse \fi
% if not okay, use OT1 instead
\ifpxcz@ok\else \def\pxcz@afont@enc{OT1}\fi}
%% the begin-document hook
-\@onlypreamble\pxcz@doc@hook
-\def\pxcz@doc@hook{%
+\pxcz@onlypreamble@def\pxcz@doc@hook{%
\pxcz@user@hook
\ifx\pxcz@file@preset\relax\else
\pxcz@do@file@preset
@@ -1536,7 +1612,8 @@
% decide alphabet font encoding
\edef\pxcz@afont@enc{\encodingdefault}%
\pxcz@check@afont@enc\ifpxcz@ok\else
- \pxcz@warn{Default encoding is changed to 'OT1' because%
+ \PackageWarningNoLine\pxcz@pkgname
+ {Default encoding is changed to 'OT1' because%
\MessageBreak'alphabet' option is in effect}%
\renewcommand\encodingdefault{OT1}%
\fi
@@ -1593,10 +1670,17 @@
\ifpxcz@ok\else
\PackageWarningNoLine\pxcz@pkgname
{Some font weights are not substituted.\MessageBreak
- Thus some features of pxchfon might not work\MessageBreak
+ So some features of pxchfon might not work\MessageBreak
properly when applied to such weights}%
\fi
\fi
+ % warn if some weights are not embedded, and if necessaty
+ \ifpxcz@warn@unless@all@embedded \ifpxcz@noembed@used
+ \PackageWarningNoLine\pxcz@pkgname
+ {Some font weights have no-embed setting.\MessageBreak
+ So some features of pxchfon might not work\MessageBreak
+ properly when applied to such weights}%
+ \fi\fi
%
\pxcz@check@extra
\pxcz@addtospec{USR}%
@@ -1636,8 +1720,7 @@
%% \pxcz@insf@read@word{<offset>}
% Reads a 32-bit integer from \pxcz@insf@file at the given offset,
% and sets the value (or -1 on error) to \pxcz@cntr.
-\@onlypreamble\pxcz@insf@read@word
-\def\pxcz@insf@read@word#1{%
+\pxcz@onlypreamble@def\pxcz@insf@read@word#1{%
\pxcz@cntr=#1\relax
\edef\pxcz@tmpa{\pdffiledump offset\pxcz@cntr length1{\pxcz@insf@file}}%
\ifnum"0\pxcz@tmpa<"80
@@ -1652,8 +1735,7 @@
%% \pxcz@inspect@flavor{<path>}{<index>}
% Sets the result to \pxcz@cntr.
% 1=CFF, 0=TTF, <0 if error.
-\@onlypreamble\pxcz@inspect@flavor
-\def\pxcz@inspect@flavor#1#2{%
+\pxcz@onlypreamble@def\pxcz@inspect@flavor#1#2{%
\edef\pxcz@insf@file{#1}%
\mathchardef\pxcz@insf@idx=#2\relax
\pxcz@insf@read@word{0}% outer tag
@@ -1684,14 +1766,12 @@
%% \pxcz@kpse@dir@cache
% to spped up \pxcz@kpsewhich
-\@onlypreamble\pxcz@kpse@dir@cache
-\let\pxcz@kpse@dir@cache\@empty
+\pxcz@onlypreamble@let\pxcz@kpse@dir@cache\@empty
%% \pxcz@kpsewhich{<filename>}
% Sets to \pxcz@kpse@dir the directory where the file is found
% (or \relax if not found).
-\@onlypreamble\pxcz@kpsewhich
-\def\pxcz@kpsewhich#1{%
+\pxcz@onlypreamble@def\pxcz@kpsewhich#1{%
\edef\pxcz@tmpa{#1}\let\pxcz@kpse@dir\relax
\let\do\pxcz@kpsewhich@do \pxcz@kpse@dir@cache\relax
\ifx\pxcz@kpse@dir\relax
@@ -1708,15 +1788,13 @@
\fi
\endlinechar\pxcz@tmpz
\fi}
-\@onlypreamble\pxcz@kpsewhich@a
-\def\pxcz@kpsewhich@a#1/#2\pxcz@end{%
+\pxcz@onlypreamble@def\pxcz@kpsewhich@a#1/#2\pxcz@end{%
\ifx\pxcz@end#2\pxcz@end \expandafter\@gobble
\else \expandafter\@firstofone
\fi{%
\edef\pxcz@kpse@dir{\pxcz@kpse@dir#1/}%
\pxcz@kpsewhich@a#2\pxcz@end}}
-\@onlypreamble\pxcz@kpsewhich@do
-\def\pxcz@kpsewhich@do#1{%
+\pxcz@onlypreamble@def\pxcz@kpsewhich@do#1{%
\ifnum0\pdffilesize{#1\pxcz@tmpa}>\z@
\def\pxcz@kpse@dir{#1}%
\expandafter\pxcz@kpsewhich@do@a
@@ -1725,25 +1803,21 @@
%% \pxcz@inspect@flavor@all
% Sets \[pxcz@OT/<sym>].
-\@onlypreamble\pxcz@inspect@flavor@all
-\def\pxcz@inspect@flavor@all{%
+\pxcz@onlypreamble@def\pxcz@inspect@flavor@all{%
\@for\pxcz@tmpa:=\pxcz@sym@list\do{%
\edef\pxcz@tmpa{{\pxcz@tmpa}{\@nameuse{pxcz@FS/\pxcz@tmpa}}}%
\expandafter\pxcz@inspect@flavor@all@a\pxcz@tmpa}}
-\@onlypreamble\pxcz@inspect@flavor@all@a
-\def\pxcz@inspect@flavor@all@a#1#2{%
+\pxcz@onlypreamble@def\pxcz@inspect@flavor@all@a#1#2{%
\def\pxcz@tmpa{#2}%
\ifx\pxcz@tmpa\@empty
\else\ifx\pxcz@tmpa\pxcz@noembed
\@namedef{pxcz@OT/#1}{t}%
\else \pxcz@inspect@flavor@all@b#2\pxcz@end{#1}%
\fi\fi}
-\@onlypreamble\pxcz@inspect@flavor@all@b
-\def\pxcz@inspect@flavor@all@b#1#2\pxcz@end{%
+\pxcz@onlypreamble@def\pxcz@inspect@flavor@all@b#1#2\pxcz@end{%
\edef\pxcz@tmpa{\ifx:#1\else:0:\fi#1#2}%
\expandafter\pxcz@inspect@flavor@all@c\pxcz@tmpa\pxcz@end}
-\@onlypreamble\pxcz@inspect@flavor@all@c
-\def\pxcz@inspect@flavor@all@c:#1:#2\pxcz@end#3{%
+\pxcz@onlypreamble@def\pxcz@inspect@flavor@all@c:#1:#2\pxcz@end#3{%
\pxcz@kpsewhich{#2}%
\unless\ifx\pxcz@kpse@dir\relax
\pxcz@inspect@flavor{\pxcz@kpse@dir#2}{#1}%
@@ -1769,11 +1843,9 @@
\edef\pxcz@dump@text{\pxcz@dump@text#1}}
%% \pxcz@dump@special{<string>}
-\@onlypreamble\pxcz@dump@special
-\def\pxcz@dump@special#1{%
+\pxcz@onlypreamble@def\pxcz@dump@special#1{%
\pxcz@dump@special@a#1\bxcz@end}
-\@onlypreamble\pxcz@dump@special@a
-\def\pxcz@dump@special@a#1 #2\bxcz@end{%
+\pxcz@onlypreamble@def\pxcz@dump@special@a#1 #2\bxcz@end{%
\@nameuse{pxcz@dump@special@#1}\@gobble{#2}}
\@namedef{pxcz@dump@special@pdf:mapline}#1#2{%
\pxcz@add@to@dump@text{\pxcz@rmin#2^^J}}
@@ -1783,8 +1855,7 @@
\ifx-#1\@percentchar\else#1\fi}
%% \pxcz@dump@spec@to{<file-name>}
-\@onlypreamble\pxcz@dump@spec@to
-\def\pxcz@dump@spec@to#1{%
+\pxcz@onlypreamble@def\pxcz@dump@spec@to#1{%
\def\pxcz@dump@text{\@percentchar\space#1^^J}%
\let\special\pxcz@dump@special
\pxcz@spec \let\special\relax
@@ -1794,15 +1865,13 @@
\immediate\closeout\pxcz@fout}
%% \pxcz@do@dumpmap
-\@onlypreamble\pxcz@do@dumpmap
-\def\pxcz@do@dumpmap{%
+\pxcz@onlypreamble@def\pxcz@do@dumpmap{%
\begingroup
\pxcz@dump@spec@to{\jobname.map}%
\endgroup}
%% \pxcz@do@dumpmap@tl
-\@onlypreamble\pxcz@do@dumpmap@tl
-\def\pxcz@do@dumpmap@tl{%
+\pxcz@onlypreamble@def\pxcz@do@dumpmap@tl{%
\begingroup
\let\pxcz@spec@save\pxcz@spec
\pxcz@do@dumpmap@tl@a{STD}{ptex-\jobname}%
@@ -1811,8 +1880,7 @@
\pxcz@do@dumpmap@tl@a{UPOTF}{otf-up-\jobname}%
\global\let\pxcz@spec\pxcz@spec@save
\endgroup}
-\@onlypreamble\pxcz@do@dumpmap@tl@a
-\def\pxcz@do@dumpmap@tl@a#1#2{%
+\pxcz@onlypreamble@def\pxcz@do@dumpmap@tl@a#1#2{%
\global\let\pxcz@spec\@empty
\pxcz@addtospec{#1}%
\pxcz@dump@spec@to{#2.map}}
@@ -1821,16 +1889,13 @@
%--------------------------------------- preset japanese font mappings
%% \pxcz@declare@preset{<name>}{<text>}
-\@onlypreamble\pxcz@declare@preset
-\def\pxcz@declare@preset#1{%
+\pxcz@onlypreamble@def\pxcz@declare@preset#1{%
\pxcz@onlypreamble@csdef{pxcz@the@preset@#1}}
%% \pxcz@declare@preset@alias{<name1>}{<name2>}
-\@onlypreamble\pxcz@declare@preset@alias
-\def\pxcz@declare@preset@alias#1#2{%
- \expandafter\pxcz@decl@preset@alias@a\csname pxcz@the@preset@#1%
+\pxcz@onlypreamble@def\pxcz@declare@preset@alias#1#2{%
+ \expandafter\pxcz@onlypreamble@let\csname pxcz@the@preset@#1%
\expandafter\endcsname\csname pxcz@the@preset@#2\endcsname}
-\def\pxcz@decl@preset@alias@a#1#2{\@onlypreamble#1\let#1#2}
%% \pxcz@abolished@preset
\pxcz@onlypreamble@def\pxcz@abolished@preset{%
@@ -1841,14 +1906,12 @@
\pxcz@onlypreamble@csdef{pxcz@the@preset@\pxcz@x}{\pxcz@abolished@preset}}
%% \pxcz@uniweight{<font-mn>}{<font-gt>}
-\@onlypreamble\pxcz@uniweight
-\def\pxcz@uniweight#1#2{%
+\pxcz@onlypreamble@def\pxcz@uniweight#1#2{%
\setminchofont{#1}\setgothicfont{#2}\setmarugothicfont{#2}}
%% \pxcz@multiweight{<font-mnl>}{<font-mnr>}{<font-mnb>}
%% {<font-gtr>}{<font-gtb>}{<font-gtx>}{<font-gtu>}{<font-mgr>}
-\@onlypreamble\pxcz@multiweight
-\def\pxcz@multiweight#1#2#3#4#5#6#7#8{%
+\pxcz@onlypreamble@def\pxcz@multiweight#1#2#3#4#5#6#7#8{%
\setminchofont{#2}\setgothicfont{#7}\setmarugothicfont{#8}%
\ifpxcz@oneweight\else
\setlightminchofont{#1}\setboldminchofont{#3}%
@@ -1859,6 +1922,10 @@
\pxcz@onlypreamble@def\pxcz@use@preset#1{%
\csname pxcz@the@preset@#1\endcsname}
+%% Redefine \pxcz@custom
+\let\pxcz@custom\pxcz@declare@preset
+\pxcz@custom@presets
+
%% definitions of main preset mappings
\pxcz@declare@preset{noembed}{%
\pxcz@uniweight{*}{*}}
@@ -1993,6 +2060,13 @@
{NotoSansJP-Regular.otf}{NotoSansJP-Bold.otf}%
{NotoSansJP-Black.otf}{NotoSansJP-Medium.otf}%
{NotoSansJP-Medium.otf}}
+\pxcz@declare@preset{haranoaji}{%
+ \usecmapforalphabet
+ \pxcz(a)multiweight{HaranoAjiMincho-Light.otf}%
+ {HaranoAjiMincho-Regular.otf}{HaranoAjiMincho-Bold.otf}%
+ {HaranoAjiGothic-Regular.otf}{HaranoAjiGothic-Bold.otf}%
+ {HaranoAjiGothic-Heavy.otf}{HaranoAjiGothic-Medium.otf}%
+ {HaranoAjiGothic-Medium.otf}}
%(alias)
\pxcz@declare@preset@alias{hiragino}{hiragino-pro}
\pxcz@declare@preset@alias{noEmbed}{noembed}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/pxchfon/pxjafont.sty new/tex/platex/pxchfon/pxjafont.sty
--- old/tex/platex/pxchfon/pxjafont.sty 2019-01-23 22:25:01.000000000 +0100
+++ new/tex/platex/pxchfon/pxjafont.sty 2020-02-01 23:13:57.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjafont.sty'.
%%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxchfon.tlpobj new/tlpkg/tlpobj/pxchfon.tlpobj
--- old/tlpkg/tlpobj/pxchfon.tlpobj 2019-03-24 02:24:28.000000000 +0100
+++ new/tlpkg/tlpobj/pxchfon.tlpobj 2020-02-02 01:58:19.000000000 +0100
@@ -1,6 +1,6 @@
name pxchfon
category Package
-revision 50556
+revision 53629
shortdesc Japanese font setup for pLaTeX and upLaTeX
relocated 1
longdesc This package enables users to declare in their document which
@@ -13,42 +13,97 @@
longdesc fonts used in the japanese-otf package. System requirements:
longdesc TeX format: LaTeX. TeX engine: pTeX or upTeX. DVIware:
longdesc dvipdfmx. Prerequisite packages: atbegshi.
-runfiles size=49
+runfiles size=106
RELOC/fonts/sfd/pxchfon/PXcjk0.sfd
RELOC/fonts/tfm/public/pxchfon/cfjam-r-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/cfjar-b-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/cfjar-l-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/cfjar-r-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/cfjas-b-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/cfjas-r-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/cfjas-x-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjam-r-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjam-rz-l0j.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjar-b-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjar-bz-l0j.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjar-l-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjar-lz-l0j.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjar-r-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjar-rz-l0j.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjas-b-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjas-bz-l0j.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjas-r-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjas-rz-l0j.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjas-x-l0j.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm
+ RELOC/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm
RELOC/fonts/tfm/public/pxchfon/r-cfjas-xz-l0j.tfm
RELOC/fonts/vf/public/pxchfon/cfjam-r-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjam-r-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjam-r-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjam-r-ts1.vf
RELOC/fonts/vf/public/pxchfon/cfjar-b-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-b-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-b-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-b-ts1.vf
RELOC/fonts/vf/public/pxchfon/cfjar-l-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-l-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-l-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-l-ts1.vf
RELOC/fonts/vf/public/pxchfon/cfjar-r-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-r-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-r-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjar-r-ts1.vf
RELOC/fonts/vf/public/pxchfon/cfjas-b-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-b-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-b-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-b-ts1.vf
RELOC/fonts/vf/public/pxchfon/cfjas-r-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-r-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-r-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-r-ts1.vf
RELOC/fonts/vf/public/pxchfon/cfjas-x-l0j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-x-l5j.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-x-t1.vf
+ RELOC/fonts/vf/public/pxchfon/cfjas-x-ts1.vf
RELOC/tex/platex/pxchfon/pxchfon.sty
RELOC/tex/platex/pxchfon/pxchfon0.def
RELOC/tex/platex/pxchfon/pxjafont.sty
catalogue-contact-repository https://github.com/zr-tex8r/PXchfon
catalogue-ctan /language/japanese/pxchfon
-catalogue-date 2019-03-23 19:05:32 +0100
catalogue-license mit
catalogue-topics japanese font-supp
-catalogue-version 1.4a
+catalogue-version 1.7b
++++++ pxjahyper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/pxjahyper/LICENSE new/doc/platex/pxjahyper/LICENSE
--- old/doc/platex/pxjahyper/LICENSE 2018-01-15 23:20:58.000000000 +0100
+++ new/doc/platex/pxjahyper/LICENSE 2019-06-22 23:22:25.000000000 +0200
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2018 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/platex/pxjahyper/README-ja.md new/doc/platex/pxjahyper/README-ja.md
--- old/doc/platex/pxjahyper/README-ja.md 2018-07-15 23:14:16.000000000 +0200
+++ new/doc/platex/pxjahyper/README-ja.md 2019-11-23 22:21:19.000000000 +0100
@@ -35,6 +35,16 @@
更新履歴
--------
+ * Version 0.4a 〈2019/11/23〉
+ - (試験的) PDF 文字列中で japanese-otf の文字入力マクロをサポート
+ (`otfmacros` オプション)
+
+ * Version 0.4 〈2019/10/25〉
+ - PDF 文字列中で `\CID` をサポート(`otfcid` オプション)
+
+ * Version 0.3e 〈2019/06/20〉
+ - hyperref の `unicode` 指定が後から変更された場合はエラーを出す。
+
* Version 0.3d 〈2018/07/15〉
- バグ修正。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/pxjahyper/README.md new/doc/platex/pxjahyper/README.md
--- old/doc/platex/pxjahyper/README.md 2018-07-15 23:14:16.000000000 +0200
+++ new/doc/platex/pxjahyper/README.md 2019-11-23 22:21:19.000000000 +0100
@@ -16,11 +16,12 @@
* TeX engine: pTeX, upTeX, pTeX-ng.
* DVI-ware: dvipdfmx.
* Dependent packages:
+ - atbegshi
- hyperref
### Installation
- - `*.sty` → $TEXMF/tex/platex/PXjahyper
+ - `*.sty`, `*.def` → $TEXMF/tex/platex/PXjahyper
### License
@@ -36,6 +37,9 @@
Revision History
----------------
+ * Version 0.4a 〈2019/11/23〉
+ * Version 0.4 〈2019/10/25〉
+ * Version 0.3e 〈2019/06/20〉
* Version 0.3d 〈2018/07/15〉
* Version 0.3c 〈2018/01/25〉
* Version 0.3b 〈2018/01/13〉
Binary files old/doc/platex/pxjahyper/pxjahyper.pdf and new/doc/platex/pxjahyper/pxjahyper.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/pxjahyper/pxjahyper.tex new/doc/platex/pxjahyper/pxjahyper.tex
--- old/doc/platex/pxjahyper/pxjahyper.tex 2018-07-15 23:14:16.000000000 +0200
+++ new/doc/platex/pxjahyper/pxjahyper.tex 2019-10-25 23:02:06.000000000 +0200
@@ -3,8 +3,8 @@
\documentclass[a4paper]{jsarticle}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{0.3d}
-\newcommand{\PkgDate}{2018/07/15}
+\newcommand{\PkgVersion}{0.4}
+\newcommand{\PkgDate}{2019/10/25}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -64,6 +64,13 @@
{\upLaTeX} では使用不可。
\item |noout2uni|(既定)\Means
|out2uni| の否定。
+\item |otfcid|(既定)\Means
+ \Pkg{japanese-otf}パッケージの |\CID| をPDF文字列中で
+ 使えるようにする。
+ 具体的には、当該のAJ1のグリフに“対応”するUnicode文字が
+ あればそれを出力し、なければ(警告を出した上で)削除する。
+\item |nootfcid| \Means
+ |otfcid| の否定。
\item |bigcode|(既定)\Means
{\upTeX}でのToUnicode CMapとして既定のUTF8-UCSの代わりに\
UTF8-UTF16を用いる。
@@ -98,7 +105,7 @@
符号値は16進数で指定する。
-なお、\Pkg{OTF}パッケージの |\UTF| 命令は、PDF文字列中では
+なお、\Pkg{japanese-otf}パッケージの |\UTF| 命令は、PDF文字列中では
out2uni用の出力を行うように設計されているが、
本パッケージを {\upLaTeX} で用いた場合は、
|\UTF| も(PDF文字列中では)|\Ux| と同じ動作
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxjahyper.doc.tlpobj new/tlpkg/tlpobj/pxjahyper.doc.tlpobj
--- old/tlpkg/tlpobj/pxjahyper.doc.tlpobj 2019-02-28 04:03:39.000000000 +0100
+++ new/tlpkg/tlpobj/pxjahyper.doc.tlpobj 2019-11-24 01:54:16.000000000 +0100
@@ -1,9 +1,9 @@
name pxjahyper.doc
category Package
-revision 48207
+revision 52899
shortdesc doc files of pxjahyper
relocated 1
-docfiles size=29
+docfiles size=30
RELOC/doc/platex/pxjahyper/LICENSE
RELOC/doc/platex/pxjahyper/README-ja.md
RELOC/doc/platex/pxjahyper/README.md
++++++ pxjahyper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/pxjahyper/pxjahyper-ajm.def new/tex/platex/pxjahyper/pxjahyper-ajm.def
--- old/tex/platex/pxjahyper/pxjahyper-ajm.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/platex/pxjahyper/pxjahyper-ajm.def 2019-11-23 22:21:19.000000000 +0100
@@ -0,0 +1,793 @@
+%%
+%% This is file 'pxjahyper-ajm.def'.
+%%
+%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% GitHub: https://github.com/zr-tex8r
+%% Twitter: @zr_tex8r
+%%
+%% This package is distributed under the MIT License.
+%%
+%% このファイルは日本語文字を含みます.
+
+%% package declaration
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesFile{pxjahyper-ajm.def}[2019/11/23 v0.4a]
+
+%% avoid multiple loading
+\csname pxjahyperajmLoaded\endcsname
+\def\pxjahyperajmLoaded{\endinput}
+%% force UTF-8
+\ifx\epTeXinputencoding\@undefined\else
+ \epTeXinputencoding utf8
+\fi
+
+%--------------------------------------- general
+
+% Note: Here 'etoolbox' is already loaded.
+
+%% check engine
+\ifx\numexpr\@undefined \endinput \fi
+
+%% \pxhy@macro@name@list
+% The \do-list of the name of macros to be redefined.
+\let\pxhy@macro@name@list\@empty
+
+%% \pxhy@ : the prefix
+\def\pxhy@{pxhy@aj@@}
+
+%% \pxhy@cond\ifXXX...\fi{<yes>}{<no>}
+\@gobbletwo\if\if \def\pxhy@cond#1\fi{%
+ #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
+}
+
+%% \pxhy@cond@both\ifXXX...\fi\ifYYY...\fi{<yes>}{<no>}
+% Checks whether \ifXXX and \ifYYY both hold.
+\@gobbletwo\if\if\@gobbletwo\if\if \def\pxhy@cond@both#1\fi#2\fi{%
+ \bxju@cond{\if #1#2T\else F\fi\else F\fi T}\fi
+}
+
+%% \pxhy@if@star{<varient>}{<normal>}
+% Expands to <varient> if followed by *, otherwise to <normal>.
+\def\pxhy@if@star#1#2#3{% #3=next-arg
+ \expandafter\pxhy@if@star@a\detokenize{#3}@{#1}*@{#2{#3}}\pxhy@mk
+}
+\def\pxhy@if@star@a#1*@#2#3\pxhy@mk{#2}
+
+%% \pxhy@if@plus{<varient>}{<normal>}
+% Expands to <varient> if followed by +, otherwise to <normal>.
+\def\pxhy@if@plus#1#2#3{% #3=next-arg
+ \expandafter\pxhy@if@plus@a\detokenize{#3}@{#1}+@{#2{#3}}\pxhy@mk
+}
+\def\pxhy@if@plus@a#1+@#2#3\pxhy@mk{#2}
+
+%% \pxhy@shift{<x>}{<y>}
+% Expands to \pxhy@fast@CID with the value of x+y.
+\def\pxhy@shift#1#2{%
+ \expandafter\pxhy@shift@a\the\numexpr(#1)+(#2)\pxhy@mk
+}
+\def\pxhy@shift@a#1\pxhy@mk{%
+ \pxhy@fast@CID{#1}%
+}
+
+%% \pxhy@numeral{<number>}
+% Expands to the Western numeral.
+\def\pxhy@numeral#1{%
+ \expandafter\pxhy@numeral@a\number#1\pxhy@mk
+}% \pxhy@mk ensures termination
+\def\pxhy@numeral@a#1\pxhy@mk{#1}
+
+%% \pxhy@two@digits{<number>}
+% Expands to the Western numeral.
+\def\pxhy@two@digits#1{%
+ \expandafter\pxhy@two@digits@a\number#1\pxhy@mk
+}% \pxhy@mk ensures termination
+\def\pxhy@two@digits@a#1\pxhy@mk{%
+ \ifnum#1<10 0\fi #1%
+}
+
+%--------------------------------------- kanji numerals
+
+%% \pxhy@kdigit{<digit>}
+\def\pxhy@kdigit#1{%
+ \ifcase#1〇\or 一\or 二\or 三\or 四\or 五\or 六\or 七\or 八\or 九\fi
+}
+
+%% \pxhy@each@digit{<number>}\CScont
+% Expands to \CScont{<ten-digit>}{<one-digit>}.
+\def\pxhy@each@digit#1#2{%
+ \ifnum#1>\m@ne \ifnum#1<100
+ \expandafter\pxhy@each@digit@a\number#1..\pxhy@mk{#2}%
+ \fi\fi
+}
+\def\pxhy@each@digit@a#1#2#3\pxhy@mk#4{%
+ \if.#2#40#1\else#4#1#2\fi
+}
+
+%% \pxhy@knumeral{<number>}
+% Expands to the kanji numeral according to Japanese reading.
+\def\pxhy@knumeral#1{%
+ \pxhy@each@digit{#1}\pxhy@knumeral@a
+}
+\def\pxhy@knumeral@a#1#2{%
+ \ifnum#1#2=\z@ \pxhy@kdigit0%
+ \else
+ \ifcase#1 \or 十\else \pxhy@kdigit#1十\fi
+ \ifcase#2 \else \pxhy@kdigit#2\fi
+ \fi
+}
+
+%--------------------------------------- \pdfstringdef hook
+
+\pdfstringdefDisableCommands{%
+ % invoke the redefinitions
+ \def\do#1{\expandafter\let\csname aj#1\expandafter\endcsname
+ \csname \pxhy@#1\endcsname}%
+ \pxhy@macro@name@list
+}
+
+%=======================================
+% Macro Definitions
+\begingroup % entering a big group
+%--------------------------------------- helpers
+
+%% prepare
+\csuse{forcecjktoken}
+
+%% shorthands
+\catcode`\`=\active \let`\noexpand
+\def\@{\unexpanded}
+\def\@@{\expandonce}
+\def\CID{\pxhy@CID}
+
+%% \#{<number-expr>}
+% Expands to the value of the expression.
+\def\##1{\the\numexpr#1\relax\space}
+
+%% \pxhy@def{<macro-name>}...
+\def\pxhy@def#1{\csxdef{\pxhy@#1}}
+
+%% \pxhy@DeclareMacro{<macro-name>}...{<body>}
+% Declares (with \xdef) the pdfstring version of the aj-macro
+% \[aj<macro-name>].
+\def\pxhy@DeclareMacro#1{%
+ \xappto\pxhy@macro@name@list{`\do{#1}}%
+ \pxhy@def{#1}%
+}
+
+%% \pxhy@DeclareMacroVar{<macro-name>}...{<body-n>}{<body-v>}
+% Variant of \pxhy@DeclareMacro, where the *-variant of the macro
+% is declared. The parameter '...' will be shared with both forms.
+\def\pxhy@DeclareMacroVar#1{%
+ \xappto\pxhy@macro@name@list{`\do{#1}}%
+ \edef\pxhy@next{{\@nameuse{\pxhy@#1}}%
+ {\@nameuse{\pxhy@#1@N}}{\@nameuse{\pxhy@#1@V}}}%
+ \expandafter\pxhy@decl@macro@var@a\pxhy@next
+}
+\def\pxhy@decl@macro@var@a#1#2#3#4#{%
+ \gdef#1{\pxhy@if@star#3#2}%
+ \toks@{\xdef#3#4}\def\pxhy@next{\the\toks@}%
+ \afterassignment\pxhy@next \xdef#2#4%
+}
+
+%% \pxhy@DeclareAlias{<name1>}{<name2>}
+% Defines an alies.
+\def\pxhy@DeclareAlias#1#2{%
+ \xappto\pxhy@macro@name@list{`\do{#1}}%
+ \global\csletcs{\pxhy@#1}{\pxhy@#2}%
+}
+
+%% \pxhy@range{<ob-value>}{<limit>/<value>,...}
+% Expands to the code of a range switch.
+\def\pxhy@range#1#2{%
+ \pxhy@range@a{#1}#2/#1,*/*,\pxhy@mk
+}
+\def\pxhy@range@a#1#2/#3,#4\pxhy@mk{%
+ \ifstrempty{#4}{#1}{%else
+ `\ifnum##1<\#{#2}#1%
+ `\else\pxhy@range@a{#3}#4\pxhy@mk`\fi}%
+}
+
+%% \pxhy@rshift{<limit>/<shift>,...}
+% \pxhy@shift with a range switch.
+\def\pxhy@rshift#1{%
+ \pxhy@shift{##1}{\pxhy@range{-1000}{#1}}%
+}
+
+%% \pxhy@twirange{<shift1>}{<shift2>}
+% Special kind of range switch, used in \ajKaku etc.
+\def\pxhy@twirange#1#2{%
+ `\ifnum##1<\#{0}`\else`\ifnum##1<\#{10}\pxhy@shift{##1*2}{#1}%
+ `\else`\ifnum##1<\#{101}\pxhy@shift{##1}{#2}%
+ `\fi`\fi`\fi
+}
+
+%% \pxhy@fallback{<lbound>}{<fb-lbound>}{<ubound>}{<normal>}{<fallback>}
+\def\pxhy@fallback#1#2#3#4#5{%
+ `\ifnum##1<\#{#1}`\else`\ifnum##1>\#{#3}`\else
+ \ifnum\#{#1}=\#{#2}#5%
+ \else `\ifnum##1<\#{#2}#4`\else#5`\fi
+ \fi
+ `\fi`\fi
+}
+
+%% freeze 'em
+\let\UTF\relax
+\let\pxhy@CID\relax
+\let\pxhy@fast@CID\relax
+\let\pxhy@if@star\relax
+\let\pxhy@if@plus\relax
+\let\pxhy@shift\relax
+\let\pxhy@numeral\relax
+\let\pxhy@two@digits\relax
+\let\pxhy@knumeral\relax
+
+%--------------------------------------- the redefinitions
+
+% A text command invoked in PDF-sttings must be "string-OK".
+% Here a text command is "string-OK" if both:
+% - fully expandable, and
+% - comprised only of "Unicode-OK" glyphs.
+% Here a glyph is "unicode-OK" if either:
+% - representable as a single Unicode character, or
+% - well-substituted with a single Unicode character.
+% When the original definition of an aj-macro command is not string-OK
+% (marked as <!>), then the command must be redefeind.
+
+%%<!> \ajTsumesuji<var>{<string>}
+%%<!> \ajTsumesuji*{<string>}
+% Simply expands to the string.
+\pxhy@DeclareMacroVar{Tsumesuji}#1#2{#2}{}
+% \ajTsumesuji* takes only one argument.
+\pxhy@def{Tsumesuji@V}#1{#1}
+
+%-----------------------
+% Enclosed letters
+
+% None of the aj-macros for enclosed letters are fully expandable,
+% so they all must be redefined.
+% The glyphs for enclosed alphabet and kana letters are Unicode-OK
+% (\ajMaruKata{1} is U+32d0(㋐), and \ajMaruHira{1} fallbacks to plain
+% あ letter), but some of those for enclosed numbers are not Unicode-OK
+% (\ajMaru{51} does not have a good fallback), and thus should give an
+% alternative fallback string (\ajMaru{51}→“51”).
+% Note: for some enclosed numbers, glyphs with different enclosure are
+% used as fallback (e.g. \ajKuroMaru{21}→“㉑)”.
+
+%%<!> \ajMaru[*]{<number>}
+\pxhy@DeclareMacroVar{Maru}#1{%N
+ \pxhy@fallback{0}{51}{100}{%
+ \pxhy@rshift{0/8224,1/7554,21/8070,22/8080,32/10212,101}%
+ }{\pxhy@numeral{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@rshift{0/10234,10/7554,21/8070,22/8080,32/10212,101}%
+ }{`\ajMaru{#1}}%
+}
+%%<!> \ajKuroMaru[*]{<number>}
+\pxhy@DeclareMacroVar{KuroMaru}#1{%N
+ \pxhy@fallback{0}{21}{100}{%
+ \pxhy@rshift{0/10503,1/8285,10/10504,101}%
+ }{`\ajMaru{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@rshift{0/10504,101}%
+ }{`\ajKuroMaru{#1}}%
+}
+%%<!> \ajKaku[*]{<number>}
+\pxhy@DeclareMacroVar{Kaku}#1{%N
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{10764}{10774}%
+ }{`\ajMaru{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{10765}{10774}%
+ }{`\ajMaru{#1}}%
+}
+%%<!> \ajKuroKaku[*]{<number>}
+\pxhy@DeclareMacroVar{KuroKaku}#1{%N
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{11037}{11047}%
+ }{`\ajMaru{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{11038}{11047}%
+ }{`\ajMaru{#1}}%
+}
+%%<!> \ajMaruKaku[*]{<number>}
+\pxhy@DeclareMacroVar{MaruKaku}#1{%N
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{11307}{11317}%
+ }{`\ajMaru{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ `\ajMaru{#1}%fallback
+ \pxhy@twirange{11308}{11317}%
+ }{`\ajMaru{#1}}%
+}
+%%<!> \ajKuroMaruKaku[*]{<number>}
+\pxhy@DeclareMacroVar{KuroMaruKaku}#1{%N
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{11576}{11586}%
+ }{`\ajMaru{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@twirange{11577}{11586}%
+ }{`\ajMaru{#1}}%
+}
+%%<!> \ajKakko[*]{<number>}
+\pxhy@DeclareMacroVar{Kakko}#1{%N
+ \pxhy@fallback{0}{21}{100}{%
+ \pxhy@rshift{0/8227,1/8070,21/9873,101}%
+ }{(\pxhy@numeral{#1})}%
+}{%V
+ \pxhy@fallback{0}{0}{100}{%
+ \pxhy@rshift{0/9884,10/8070,21/9873,101}%
+ }{`\ajKakko{#1}}%
+}
+%%<!> \ajRoman[*]{<number>}
+\pxhy@DeclareMacroVar{Roman}#1{%N
+ \pxhy@fallback{1}{13}{15}{%
+ \pxhy@rshift{1/7574,11/8214,13/8282,16}%
+ }{`\@Roman{#1}}%
+}{%V
+ \pxhy@fallback{1}{1}{15}{%
+ \pxhy@rshift{1/7574,4/9879,5/7574,11/8214,13/8282,16}%
+ }{`\ifnum#1=\#{4}IIII`\else`\ajRoman{#1}`\fi}%
+}
+%%<!> \ajroman{<number>}
+\pxhy@DeclareMacro{roman}#1{%
+ \pxhy@fallback{1}{13}{15}{%
+ \pxhy@rshift{1/8091,11/8287,16}%
+ }{`\@roman{#1}}%
+}
+%%<!> \ajPeriod{<number>}
+\pxhy@DeclareMacro{Period}#1{%
+ \pxhy@fallback{0}{1}{11}{%
+ 0.%
+ }{\pxhy@rshift{0/8061,10/20577,12}}%
+}
+%%<!> \ajKakkoYobi{<number>}
+\pxhy@DeclareMacro{KakkoYobi}#1{\pxhy@rshift{1/8196,10}}
+%%<!> \ajKakkoroman{<number>}
+\pxhy@DeclareMacro{Kakkoroman}#1{%
+ \pxhy@fallback{1}{1}{15}{%
+ \pxhy@rshift{1/9973,16}%
+ }{(`\ajroman{#1})}%
+}
+%%<!> \ajKakkoRoman{<number>}
+\pxhy@DeclareMacro{KakkoRoman}#1{%
+ \pxhy@fallback{1}{1}{15}{%
+ \pxhy@rshift{1/9988,16}%
+ }{(`\ajRoman{#1})}%
+}
+%%<!> \ajKakkoalph{<number>}
+\pxhy@DeclareMacro{Kakkoalph}#1{\pxhy@rshift{1/8111,27}}
+%%<!> \ajKakkoAlph{<number>}
+\pxhy@DeclareMacro{KakkoAlph}#1{\pxhy@rshift{1/10003,27}}
+%%<!> \ajKakkoHira{<number>}
+\pxhy@DeclareMacro{KakkoHira}#1{%
+ \pxhy@fallback{1}{1}{48}{%
+ \pxhy@rshift{1/10029,49}%
+ }{(\pxhy@rshift{1/10029,49})}% with parens
+}
+%%<!> \ajKakkoKata{<number>}
+\pxhy@DeclareMacro{KakkoKata}#1{%
+ \pxhy@fallback{1}{1}{48}{%
+ \pxhy@rshift{1/10077,49}%
+ }{(\pxhy@rshift{1/10077,49})}% with parens
+}
+%%<!> \ajKakkoKansuji{<number>}
+\pxhy@DeclareMacro{KakkoKansuji}#1{%
+ \pxhy@fallback{1}{11}{20}{%
+ \pxhy@rshift{1/10125,21}%
+ }{(\pxhy@knumeral{#1})}%
+}
+%%<!> \ajMaruKansuji{<number>}
+\pxhy@DeclareMacro{MaruKansuji}#1{\pxhy@rshift{1/10460,11}}
+%%<!> \ajMarualph{<number>}
+\pxhy@DeclareMacro{Marualph}#1{\pxhy@rshift{1/10312,27}}
+%%<!> \ajMaruAlph{<number>}
+\pxhy@DeclareMacro{MaruAlph}#1{\pxhy@rshift{1/10338,27}}
+%%<!> \ajMaruHira{<number>}
+\pxhy@DeclareMacro{MaruHira}#1{\pxhy@rshift{1/10364,49}}
+%%<!> \ajMaruKata{<number>}
+\pxhy@DeclareMacro{MaruKata}#1{\pxhy@rshift{1/10412,49}}
+%%<!> \ajMaruYobi{<number>}
+\pxhy@DeclareMacro{MaruYobi}#1{%
+ \pxhy@rshift{1/10470,8/10484,9/10478,10}%
+}
+%%<!> \ajKuroMarualph{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMarualph}#1{`\ajMarualph{#1}}
+%%<!> \ajKuroMaruAlph{<number>}
+\pxhy@DeclareMacro{KuroMaruAlph}#1{\pxhy@rshift{1/10630,27}}
+%%<!> \ajKuroMaruHira{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMaruHira}#1{`\ajMaruHira{#1}}
+%%<!> \ajKuroMaruKata{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMaruKata}#1{`\ajMaruKata{#1}}
+%%<!> \ajKuroMaruYobi{<number>} : Fallback.
+% fallback to \ajKakuYobi, which is simpler.
+\pxhy@DeclareMacro{KuroMaruYobi}#1{`\ajKakuYobi{#1}}
+%%<!> \ajKakualph{<number>} : Fallback.
+\pxhy@DeclareMacro{Kakualph}#1{`\ajMarualph{#1}}
+%%<!> \ajKakuAlph{<number>}
+\pxhy@DeclareMacro{KakuAlph}#1{\pxhy@rshift{1/10900,27}}
+%%<!> \ajKakuHira{<number>} : Fallback.
+\pxhy@DeclareMacro{KakuHira}#1{`\ajMaruHira{#1}}
+%%<!> \ajKakuKata{<number>} : Fallback.
+\pxhy@DeclareMacro{KakuKata}#1{`\ajMaruKata{#1}}
+%%<!> \ajKakuYobi{<number>}
+\pxhy@DeclareMacro{KakuYobi}#1{\pxhy@rshift{1/11022,8}}
+%%<!> \ajKuroKakualph{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroKakualph}#1{`\ajMarualph{#1}}
+%%<!> \ajKuroKakuAlph{<number>}
+\pxhy@DeclareMacro{KuroKakuAlph}#1{\pxhy@rshift{1/11173,27}}
+%%<!> \ajKuroKakuHira{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroKakuHira}#1{`\ajMaruHira{#1}}
+%%<!> \ajKuroKakuKata{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroKakuKata}#1{`\ajMaruKata{#1}}
+%%<!> \ajKuroKakuYobi{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroKakuYobi}#1{`\ajKakuYobi{#1}}
+%%<!> \ajMaruKakualph{<number>} : Fallback.
+\pxhy@DeclareMacro{MaruKakualph}#1{`\ajMarualph{#1}}
+%%<!> \ajMaruKakuAlph{<number>}
+\pxhy@DeclareMacro{MaruKakuAlph}#1{\pxhy@rshift{1/11443,27}}
+%%<!> \ajMaruKakuHira{<number>} : Fallback.
+\pxhy@DeclareMacro{MaruKakuHira}#1{`\ajMaruHira{#1}}
+%%<!> \ajMaruKakuKata{<number>} : Fallback.
+\pxhy@DeclareMacro{MaruKakuKata}#1{`\ajMaruKata{#1}}
+%%<!> \ajMaruKakuYobi{<number>} : Fallback.
+\pxhy@DeclareMacro{MaruKakuYobi}#1{`\ajKakuYobi{#1}}
+%%<!> \ajKuroMaruKakualph{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMaruKakualph}#1{`\ajMarualph{#1}}
+%%<!> \ajKuroMaruKakuAlph{<number>}
+\pxhy@DeclareMacro{KuroMaruKakuAlph}#1{\pxhy@rshift{1/11712,27}}
+%%<!> \ajKuroMaruKakuHira{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMaruKakuHira}#1{`\ajMaruHira{#1}}
+%%<!> \ajKuroMaruKakuKata{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMaruKakuKata}#1{`\ajMaruKata{#1}}
+%%<!> \ajKuroMaruKakuYobi{<number>} : Fallback.
+\pxhy@DeclareMacro{KuroMaruKakuYobi}#1{`\ajKakuYobi{#1}}
+%%<!> \ajNijuMaru{<number>}
+\pxhy@DeclareMacro{NijuMaru}#1{\pxhy@rshift{1/16222,11}}
+%%<!> \ajRecycle{<number>}
+\pxhy@DeclareMacro{Recycle}#1{\pxhy@rshift{0/16314,12}}
+%%<!> \ajHasenKakuAlph{<number>}
+\pxhy@DeclareMacro{HasenKakuAlph}#1{\pxhy@rshift{1/20496,7}}
+%%<!> \ajCross{<number>}
+\pxhy@DeclareMacro{Cross}#1{%
+ \pxhy@fallback{0}{0}{9}{%
+ \pxhy@rshift{0/20523,10}%
+ }{\pxhy@numeral{#1}\UTF{00D7}}%
+}
+%%<!> \ajSlanted[*]{<number>}
+\pxhy@DeclareMacroVar{Slanted}#1{%N
+ \pxhy@fallback{0}{0}{59}{%
+ \pxhy@rshift{0/9460,10/20589,60}%
+ }{\pxhy@numeral{#1}}%
+}{%V
+ \pxhy@fallback{0}{0}{59}{%
+ \pxhy@rshift{0/20589,60}%
+ }{\pxhy@two@digits{#1}}%
+}
+%%<!> \ajApostrophe{<number>}
+%%<!> \ajYear{<number>} (alias)
+\pxhy@DeclareMacro{Apostrophe}#1{%
+ \pxhy@fallback{0}{0}{99}{%
+ \pxhy@rshift{0/20649,100}%
+ }{\UTF{2019}\pxhy@two@digits{#1}}%
+}
+\pxhy@DeclareAlias{Year}{Apostrophe}
+%%<!> \ajSquareMark[*]{<number>}
+% Note: +-variant is unsupported.
+\pxhy@DeclareMacroVar{SquareMark}#1{%N
+ \pxhy@rshift{1/12229,13}%
+}{%V
+ \pxhy@rshift{1/12241,10}%
+}
+%%<!> \ajHishi{<number>}
+\pxhy@DeclareMacro{Hishi}#1{\pxhy@rshift{1/12256,5}}
+
+%-----------------------
+
+% The choice of numerals (Western or kanji) depends on the rendering
+% of the original definition in yoko direction.
+
+%%<!> \ajTsumekakko{<number>}
+%%<!> \ajTumekakko{<number>} (alias)
+% Expands to "(number)".
+\pxhy@DeclareMacro{Tsumekakko}#1{%
+ (\pxhy@numeral{#1})%
+}
+\pxhy@DeclareAlias{Tumekakko}{Tsumekakko}
+
+%%<!> \ajNenrei<var>{<number>}
+\pxhy@DeclareMacro{Nenrei}#1{%
+ `\csname pxhy@ajNenrei/`\number#1`\endcsname
+}
+\csgdef{pxhy@ajNenrei/1}#1{%
+ (\pxhy@numeral{#1}\ifnum#1<10 つ\fi)%
+}
+\csgdef{pxhy@ajNenrei/2}#1{%
+ (\pxhy@numeral{#1}才)%
+}
+\csgdef{pxhy@ajNenrei/3}#1{% FIXME: the original is right?
+ (\pxhy@each@digit{#1}{\pxhy@knumeral@varA つ})%
+}
+\csgdef{pxhy@ajNenrei/4}#1{%
+ (\pxhy@knumeral{#1}才)%
+}
+
+%%<!> \ajnenrei<var>{<number>}
+\pxhy@DeclareMacro{nenrei}#1{%
+ `\csname pxhy@ajnenrei/`\number#1`\endcsname
+}
+\csgdef{pxhy@ajnenrei/1}#1{%
+ (\pxhy@each@digit{#1}{\pxhy@knumeral@varA つ})%
+}
+\csgdef{pxhy@ajnenrei/2}#1{%
+ (\pxhy@each@digit{#1}{\pxhy@knumeral@varB 才})%
+}
+\csgdef{pxhy@ajnenrei/3}#1{% FIXME: the original is right?
+ (\pxhy@each@digit{#1}{\pxhy@knumeral@varA ツ})%
+}
+\csgdef{pxhy@ajnenrei/4}#1{%
+ (\pxhy@each@digit{#1}{\pxhy@knumeral@varB コ})%
+}
+
+%%<!> \ajKosu{<number>}
+\pxhy@DeclareMacro{Kosu}#1{%
+ `\ajnenrei4{#1}%
+}
+
+%% some special kanji numeral forms
+\gdef\pxhy@knumeral@varA#1#2#3{%<tsu><ten><one>
+ % 8→八つ, 10→一〇, 16→一六, 20→二〇, 32→三二
+ \if0#2\pxhy@kdigit#3#1\else\pxhy@kdigit#2\pxhy@kdigit#3\fi
+}
+\gdef\pxhy@knumeral@varB#1#2#3{%<counter><ten><one>
+ % 8→八才, 10→十才, 16→十六, 20→二十, 32→三二
+ \ifcase#2 #2#1%
+ \or 十\ifcase#3 #1\else \pxhy@kdigit#3\fi
+ \else \pxhy@kdigit#2\ifcase#3 十\else \pxhy@kdigit#3\fi
+ \fi
+}
+
+%%<!> \ajFrac[*]{<numerator>}{<denominator>}
+\pxhy@DeclareMacroVar{Frac}#1#2{%N
+ `\pxhy@ajFrac{\pxhy@numeral{#1}}{\pxhy@numeral{#2}}%
+}{%V
+ `\pxhy@ajFrac{\pxhy@numeral{#1}}{\pxhy@numeral{#2}}%
+}
+\gdef\pxhy@ajFrac#1#2{%
+ \ifcsdef{pxhy@ucs@frac/#1/#2}{%
+ \csuse{pxhy@ucs@frac/#1/#2}%
+ }{#1/#2}%
+}
+%% \[pxhy@ucs@frac/<n>/<d>]
+% Alternative definitions for fractions.
+\def\do#1#2{\csgdef{pxhy@ucs@frac/#1}{\UTF{#2}}}
+\do{1/4}{00BC}
+\do{1/2}{00BD}
+\do{3/4}{00BE}
+\do{1/7}{2150}
+\do{1/9}{2151}
+\do{1/10}{2152}
+\do{1/3}{2153}
+\do{2/3}{2154}
+\do{1/5}{2155}
+\do{2/5}{2156}
+\do{3/5}{2157}
+\do{4/5}{2158}
+\do{1/6}{2159}
+\do{5/6}{215A}
+\do{1/8}{215B}
+\do{3/8}{215C}
+\do{5/8}{215D}
+\do{7/8}{215E}
+\do{0/3}{2189}
+
+%%<!> \aj半角{<string>}
+% Simply expands to the string.
+\pxhy@DeclareMacro{半角}#1{#1}{}
+
+%%<OK> \○ / \● / \□ / \■ / \◇ / \◆
+% Expands to \ajLig{} or \@ajNumber.
+% \@ajNumber{CMD}{<n>} seems to expand to \ajCMD{<n>}.
+
+%%<OK> \△ / \▽ / \゛ / \゜ / \!
+% Expands to \ajLig{}.
+
+%%<OK> \ajPICT{<name>}
+% Expands to \CID{}.
+
+%%<OK> \ajArrow{<name>}
+% Expands to \CID{}.
+
+%%<!> \ajKunten{<name>}
+% \ajKunten{?} (for single letters) expands to \CID{} and is string-OK.
+% \ajKunten{?|}, \ajKunten{|?}a and \ajKunten{?レ} need to be
+% redefined.
+\@tfor\x:={一}{上}{甲}{天}\do{% ?レ
+ \pxhy@DeclareMacro{訓点\x レ}{`\ajKunten{\x}`\ajKunten{レ}}%
+}
+\@tfor\x:={二}{三}{四}{中}{下}{乙}{丙}{丁}{地}{人}\do{% ?| |?
+ \pxhy@DeclareMacro{訓点\x |}{`\ajKunten{\x}\UTF{2013}}%
+ \pxhy@DeclareMacro{訓点|\x }{`\ajKunten{\x}\UTF{2013}}%
+}
+\pxhy@DeclareMacro{訓点 |}{\UTF{2013}}%
+\pxhy@DeclareMacro{訓点| }{\UTF{2013}}%
+
+%%<OK> \ajVar{<name>}
+% Expands to \CID{} or \UTF{}.
+
+%%<!> \ajLeader
+% Redefined to expand to two instances of the leader character.
+\pxhy@DeclareMacro{Leader}{%
+ `\pxhy@ajLeader
+}
+\gdef\pxhy@ajLeader#1{%
+ \pxhy@cond\ifx[#1\fi{\pxhy@ajLeader@a}{\pxhy@ajLeader@a]{#1}}%
+}
+\gdef\pxhy@ajLeader@a#1]#2{%
+ \pxhy@shift{12214}{#2*2}\pxhy@shift{12214}{#2*2}%
+}
+
+%%<!> \ajQuote
+% Redefined to be fully-expandable.
+\pxhy@DeclareMacro{Quote}{%
+ `\pxhy@ajQuote
+}
+\gdef\pxhy@ajQuote#1#2{%
+ \CID{\ifcase#1\or670\or672\or674\or676\or678\or680\or682\or
+ 684\or686\or688\or690\or7608\or12125\or12127\or12129\or
+ 12131\or12171\or16197\fi}%
+ #2%
+ \CID{\ifcase#1\or671\or673\or675\or677\or679\or681\or683\or
+ 685\or687\or689\or691\or7609\or12126\or12128\or12130\or
+ 12132\or12172\or16198\fi}%
+}
+
+%%<OK> Miscenallneous \ajXxx symbols
+% Most of them are string-OK; The exceptions are below.
+
+%% ad-hoc redefinitions
+\pxhy@DeclareMacro{DKunoji}{\UTF{3032}}
+\pxhy@DeclareMacro{KunojiwithBou}{\UTF{3032}}
+\pxhy@DeclareMacro{Kunoji}{\UTF{3031}}
+\pxhy@DeclareMacro{KunojiwithBou}{\UTF{3031}}
+\pxhy@DeclareMacro{Yusuriten}{\CID{16193}}
+\pxhy@DeclareMacro{varNinoji}{\CID{12107}}
+
+%----------------------
+% The \ajLig command
+
+%% \[pxhy@uok/<lig>]
+% If defined, then \ajLig{<lig>} is Unicode-OK.
+% Note: Baware of unification. For example, \ajLig{No.} and \ajLig{No}
+% can both be kind of U+2116(№), but probably \ajLig{AM} cannot be
+% kind of U+33C2(㏂).
+\@tfor\x:=%
+ {!!}{!!*}{!*}{!?}{!?*}{'S}{?!}{??}{F}{FAX}{GB}{HP}{Hz}{JIS}{K.K.}{KB}%
+ {MB}{No.}{No}{PR}{TEL}{Tel}{a.m.}{a/c}{c/o}{cal}{cc}{cm}{cm2}{cm3}{dB}%
+ {dl}{dl*}{euro}{g}{hPa}{in}{kcal}{kg}{kl}{kl*}{km}{km2}{km3}{l}{l*}{m}%
+ {m2}{m3}{mb}{mg}{mho}{microg}{microm}{micros}{ml}{ml*}{mm}{mm2}{mm3}{ms}%
+ {ns}{p.m.}{pH}{ppm}{ps}{tel}{tm}{◇HV}{◇MV}{◇News}{◇SS}{より}%
+ {アパート}{アルファ}{アンペア}{アール*}{アール}{イニング}{インチ}%
+ {インチ*}{ウォン}{エスクード}{エーカー}{オンス}{オーム}{カイリ}%
+ {カラット}{カロリー}{ガロン}{ガンマ}{キュリー}{キロ}{キログラム}%
+ {キロメートル}{キロワット}{ギガ}{ギニー}{ギルダー}{クルゼイロ}{クローネ}%
+ {グラム}{グラム*}{グラムトン}{ケース}{コト}{コルナ}{コーポ}{コーポ*}%
+ {サイクル}{サンチーム}{シリング}{センチ}{センチ*}{セント}{セント*}%
+ {ダース}{デシ}{トン}{ドル}{ナノ}{ノット}{ハイツ}{ハイツ*}{バーレル}%
+ {パーセント}{ビル}{ピアストル}{ピクル}{ピコ}{ファラッド}{フィート}%
+ {フラン}{ブッシェル}{ヘクタール}{ヘルツ}{ヘルツ*}{ベータ}{ペソ}{ペニヒ}%
+ {ペンス}{ページ}{ページ*}{ホン}{ホール}{ホーン}{ホーン*}{ボルト}%
+ {ポイント}{ポンド}{マイクロ}{マイル}{マッハ}{マルク}{マンション}%
+ {ミクロン}{ミリ}{ミリバール}{メガ}{メガトン}{メートル}{ヤード}{ヤード*}%
+ {ヤール}{ユアン}{リットル}{リラ}{ルピー}{ルーブル}{レム}{レントゲン}%
+ {ワット}{ワット*}{令和}{升}{大正}{平成}{明治}{昭和}{株式会社}%
+\do{\global\cslet{pxhy@uok/\x}{t}}
+
+% Note: Ligatures no*, euro*, mho*, ohm* are bad (proportional).
+
+%% \[pxhy@uokh/<char>]
+% If defined, then \ajLig{<char>?} is Unicode-OK, where '?' is
+% an arbitrary single character.
+\@tfor\x:=%
+ {■}{□}{△}{▽}{◆}{◇}{○}{●}
+\do{\global\cslet{pxhy@uokh/\x}{t}}
+
+%% ad-hoc redefinitions
+\def\do#1#2{\pxhy@DeclareMacro{Lig#1}{#2}%
+ \global\cslet{pxhy@uok/#1}{t}}
+\do{う゛}{\UTF{3094}}
+\do{か゜}{か\UTF{309A}}
+\do{き゜}{き\UTF{309A}}
+\do{く゜}{く\UTF{309A}}
+\do{け゜}{け\UTF{309A}}
+\do{こ゜}{こ\UTF{309A}}
+\do{カ゜}{カ\UTF{309A}}
+\do{キ゜}{キ\UTF{309A}}
+\do{ク゜}{ク\UTF{309A}}
+\do{ケ゜}{ケ\UTF{309A}}
+\do{コ゜}{コ\UTF{309A}}
+\do{セ゜}{セ\UTF{309A}}
+\do{ツ゜}{ツ\UTF{309A}}
+\do{ト゜}{ト\UTF{309A}}
+\do{ワ゛}{\UTF{30F7}}
+\do{ヰ゛}{\UTF{30F8}}
+\do{ヱ゛}{\UTF{30F9}}
+\do{ヲ゛}{\UTF{30FA}}
+\do{小か}{\UTF{3095}}
+\do{小け}{\UTF{3096}}
+\do{小こ}{こ}% fallback
+\do{小ク}{\UTF{31F0}}
+\do{小コ}{コ}% fallback
+\do{小シ}{\UTF{31F1}}
+\do{小ス}{\UTF{31F2}}
+\do{小ト}{\UTF{31F3}}
+\do{小ヌ}{\UTF{31F4}}
+\do{小ハ}{\UTF{31F5}}
+\do{小ヒ}{\UTF{31F6}}
+\do{小フ}{\UTF{31F7}}
+\do{小プ}{\UTF{31F7}\UTF{309A}}
+\do{小ヘ}{\UTF{31F8}}
+\do{小ホ}{\UTF{31F9}}
+\do{小ム}{\UTF{31FA}}
+\do{小ラ}{\UTF{31FB}}
+\do{小リ}{\UTF{31FC}}
+\do{小ル}{\UTF{31FD}}
+\do{小レ}{\UTF{31FE}}
+\do{小ロ}{\UTF{31FF}}
+
+%% redefine \ajLig
+\pxhy@DeclareMacro{Lig}#1{%
+ % use \csname, to full-expand the argument
+ \@{\expandafter\pxhy@uok@ajlig\csname}ajLig#1\@{\endcsname}%
+}
+\gdef\pxhy@uok@ajlig#1{%
+ \expandafter\pxhy@uok@ajlig@a\string#1\pxhy@mk#1%
+}
+\begingroup\catcode96=12 \lccode`\?=`\g \lowercase{\endgroup
+ \gdef\pxhy@uok@ajlig@a#1?#2\pxhy@mk}{%
+ \pxhy@uok@ajlig@b{#2}%
+}
+\gdef\pxhy@uok@ajlig@b#1#2{%{NAME}\ajNAME
+ % undefined name comes empty
+ \ifundef{#2}{}{%else
+ % if Unicode-OK then do it
+ \ifcsdef{pxhy@uok/#1}{#2}{%else
+ \pxhy@if@uok@head{#1}{#2}{%else
+ \pxhy@drop@trail@star{#1}%
+ }%
+ }%
+ }%
+}
+
+%% \pxhy@if@uok@head{<string>}{<yes>}{<no>}
+\gdef\pxhy@if@uok@head#1{%
+ \pxhy@if@uok@head@a#1@...\pxhy@mk
+}
+\gdef\pxhy@if@uok@head@a#1#2#3#4#5\pxhy@mk{%
+ \pxhy@cond\ifx#3@\fi{% two-letter
+ \ifcsdef{pxhy@uokh/#1}%
+ }{\pxhy@cond\ifx#4@\fi{% three-letter
+ \pxhy@cond@both\ifx#1(\fi\ifx#3)\fi{\@firstoftwo}{%else
+ \pxhy@cond@both\ifx#1□\fi\ifx#2:\fi
+ }%
+ }{\@secondoftwo}}%
+}
+
+%% \pxhy@drop@trail@star{<string>}
+\gdef\pxhy@drop@trail@star#1{%
+ \pxhy@drop@trail@star@a#1\pxhy@mk*\pxhy@mk\pxhy@end{#1}%
+}
+\gdef\pxhy@drop@trail@star@a#1*\pxhy@mk#2\pxhy@end#3{%
+ \ifstrempty{#2}{#3}{#1}%
+}
+
+%--------------------------------------- done
+\endgroup
+%=======================================
+\endinput
+%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/pxjahyper/pxjahyper.sty new/tex/platex/pxjahyper/pxjahyper.sty
--- old/tex/platex/pxjahyper/pxjahyper.sty 2018-07-15 23:14:16.000000000 +0200
+++ new/tex/platex/pxjahyper/pxjahyper.sty 2019-11-23 22:21:19.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper.sty'.
%%
-%% Copyright (c) 2018 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{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2018/07/15 v0.3d]
+\ProvidesPackage{pxjahyper}[2019/11/23 v0.4a]
%% error messages
\def\pxhy@pkgname{pxjahyper}
@@ -30,6 +30,7 @@
%% globals
\newif\ifpxhy@ptex
\newif\ifpxhy@uptex
+\newif\ifpxhy@etex
\let\pxhy@jcode\@undefined
\newif\ifpxhy@tounicode
\newif\ifpxhy@zerox
@@ -40,6 +41,8 @@
\let\pxhy@driver\@undefined
\newif\ifpxhy@hy@unicode
\newif\ifpxhy@jacommentline
+\newif\ifpxhy@otfcid
+\newif\ifpxhy@otfmacros
%--------------------------------------- Package options
@@ -82,6 +85,21 @@
\DeclareOption{nojacommentline}{%
\pxhy@jacommentlinefalse
}
+\pxhy@otfcidtrue
+\DeclareOption{otfcid}{%
+ \pxhy@otfcidtrue
+ \let\pxhy@otfcid@given=t
+}
+\DeclareOption{nootfcid}{%
+ \pxhy@otfcidfalse
+}
+\DeclareOption{otfmacros}{%
+ \pxhy@otfmacrostrue
+ \let\pxhy@otfcid@given=t
+}
+\DeclareOption{nootfmacros}{%
+ \pxhy@otfmacrosfalse
+}
\ExecuteOptions{%
auto,tounicode,noout2uni,jacommentline%
}
@@ -100,6 +118,19 @@
\csname iftrue\endcsname
\pxhy@hy@unicodetrue
\fi
+\AtBeginDocument{%
+ \@tempswafalse
+ \expandafter\ifx\csname ifHy@unicode\expandafter\endcsname
+ \csname iftrue\endcsname
+ \@tempswatrue
+ \fi
+ \ifnum0\ifpxhy@hy@unicode1\fi\if@tempswa1\fi=1
+ \PackageError\pxhy@pkgname
+ {You must not change the encoding setting (e.g.\MessageBreak
+ 'unicode) of hyperref after pxjahyper is loaded}%
+ {\@ehc}%
+ \fi
+}
%% Check hyperref driver.
\ifx\pxhy@driver\@undefined
@@ -112,11 +143,14 @@
\fi
%% Check the engine.
+\@onlypreamble\pxhy@check
\def\pxhy@check#1#2{%
\edef\pxhy@tmpa{\string#1}%
\edef\pxhy@tmpb{\meaning#1}%
\ifx\pxhy@tmpa\pxhy@tmpb #2\fi
}
+\pxhy@check\eTeXversion{%
+ \IfFileExists{etoolbox.sty}{\pxhy@etextrue}{}}
\pxhy@check\kanjiskip{\pxhy@ptextrue}
\pxhy@check\forcecjktoken{\pxhy@uptextrue}
\ifpxhy@ptex\else
@@ -169,6 +203,15 @@
\pxhy@fatal{hyperref 'unicode' mode is not supported}{}%
\expandafter\endinput
\fi
+% otfcid requires upTeX or out2uni.
+\ifpxhy@uptex\else\ifpxhy@zerox\else
+ \pxhy@otfcidfalse
+ \ifx t\pxhy@otfcid@given
+ \PackageWarningNoLine\pxhy@pkgname
+ {Option 'otfcid' is invalid unless upTeX is used\MessageBreak
+ or 'out2uni' is specified}
+ \fi
+\fi\fi
\iffalse
\typeout{%
@@ -183,8 +226,14 @@
%--------------------------------------- Helpers
-%% pxhy@end
+%% packages
+\ifpxhy@etex
+ \RequirePackage{etoolbox}[2011/01/03]%v2.1
+\fi
+
+%% unique tokens
\def\pxhy@end{\pxhy@end@}
+\let\pxhy@mk\indent % unexpandable
%% \pxhy@out@special{<text>}
\def\pxhy@out@special#1{%
@@ -388,6 +437,91 @@
%Note: if out2uni is off then \Ux remains undefined.
\fi\fi %</upTeX>
+%--------------------------------------- Support for 'otfcid'
+\ifpxhy@otfcid
+
+%% variables
+\@onlypreamble\pxhy@otfcid@disabled
+\let\pxhy@otfcid@disabled\relax
+
+%% preparation
+\ifpxhy@etex
+ % check if bxjatoucs is available
+ \IfFileExists{bxjatoucs.sty}{%
+ \let\bxjatoucsCheckAvail=t
+ \RequirePackage{bxjatoucs}[]
+ \undef\bxjatoucsCheckAvail
+ }{}
+ \ifundef\bxjaCidToUcs{%
+ \def\pxhy@otfcid@disabled{%
+ package 'bxjatoucs' is unavailable%
+ }%
+ }{}
+\else
+ \def\pxhy@otfcid@disabled{%
+ e-TeX extension (or 'etoolbox') is unavailable%
+ }
+\fi
+%% annihilate the ajmacros's own pdfstring process
+\ifpxhy@otfmacros\ifx\pxhy@otfcid@disabled\relax
+ \let\ajRedefine@ajCommands\relax
+ \AtBeginDocument{\let\ajRedefine@ajCommands\relax}
+\fi\fi
+
+%% \pxhy@CID{<cid>}
+\def\pxhy@CID#1{%
+ \expandafter\expandafter\expandafter\pxhy@cid@aux
+ \bxjaCidToUcsHex{#1}\pxhy@mk{\detokenize{#1}}%
+}
+%% \pxhy@fast@CID{<cid>}
+\def\pxhy@fast@CID#1{%
+ \expandafter\expandafter\expandafter\pxhy@cid@aux
+ \bxjaFastCidToUcsHex{#1}\pxhy@mk{\number#1}%
+}
+\def\pxhy@cid@aux#1\pxhy@mk#2{%
+ \ifnum"#1>\z@
+ \pxhy@uchex{#1}%
+ \else
+ \@nameuse{CID+#2}%
+ \fi
+}
+
+%% \pxhy@dispatch@otfcid
+\@onlypreamble\pxhy@dispatch@otfcid
+\def\pxhy@dispatch@otfcid{%
+ \pdfstringdefDisableCommands{%
+ \let\CID\pxhy@CID
+ }%
+ \ifpxhy@otfmacros
+ \ifx\ajSnowman\@undefined\else % ajmacros is loaded
+ \makeatletter
+ \InputIfFileExists{pxjahyper-ajm.def}{%
+ \PackageInfo\pxhy@pkgname
+ {Loaded 'pxjahyper-ajm.def'\@gobble}%
+ }{%
+ \PackageWarning\pxhy@pkgname
+ {File 'pxjahyper-ajm.def' not found\@gobble}%
+ }%
+ \makeatother
+ \fi
+ \fi
+}
+
+%% begin-document hook
+\AtBeginDocument{%
+ \@ifpackageloaded{otf}{%
+ \ifx\pxhy@otfcid@disabled\relax % available!
+ \pxhy@dispatch@otfcid
+ \else
+ \PackageWarningNoLine\pxhy@pkgname
+ {Option 'otfcid' is disabled, because\MessageBreak
+ \pxhy@otfcid@disabled}%
+ \pxhy@otfcidfalse
+ \fi
+ }{}%
+}
+
+\fi
%--------------------------------------- Redefine text commands for PD1
\ifnum\pxhy@driver=\pxhy@driver@dvipdfmx %<*dvipdfmx>
@@ -501,11 +635,22 @@
% Some ad-hoc redefinitions.
\DeclareTextCommand{\textfi}{PD1}{fi}
\DeclareTextCommand{\textfl}{PD1}{fl}
-\DeclareTextCommand{\IJ}{PD1}{IJ}
-\DeclareTextCommand{\ij}{PD1}{ij}
+\DeclareTextCommand{\IJ}{PD1}{IJ}% needed?
+\DeclareTextCommand{\ij}{PD1}{ij}% needed?
\DeclareTextCommand{\textspace}{PD1}{\040}
\DeclareTextCommand{\textquotesingle}{PD1}{\047}
+%% Some adjustments on accents.
+\DeclareTextAccent{\H}{PD1}{\texthungarumlaut}
+\DeclareTextCompositeCommand{\H}{PD1}{\@empty}{\texthungarumlaut}
+\DeclareTextCompositeCommand{\H}{PD1}{\ }{\texthungarumlaut}
+\DeclareTextAccent{\u}{PD1}{\textasciibreve}
+\DeclareTextCompositeCommand{\u}{PD1}{\@empty}{\textasciibreve}
+\DeclareTextCompositeCommand{\u}{PD1}{\ }{\textasciibreve}
+\DeclareTextAccent{\k}{PD1}{\textogonek}
+\DeclareTextCompositeCommand{\k}{PD1}{\@empty}{\textogonek}
+\DeclareTextCompositeCommand{\k}{PD1}{\ }{\textogonek}
+
%%[A] The characters in PdfDocEncoding (except ASCII).
\pxDeclarePdfTextCommand{\textasciibreve}{}{02D8}
\pxDeclarePdfTextCommand{\textasciicaron}{}{02C7}
@@ -669,6 +814,8 @@
\pxDeclarePdfTextCommand{\textflq}{}{2039}
\pxDeclarePdfTextCommand{\textfrq}{}{203A}
\pxDeclarePdfTextCommand{\textEuro}{}{20AC}
+\pxDeclarePdfTextCommand{\guillemetleft}{}{00AB}
+\pxDeclarePdfTextCommand{\guillemetright}{}{00BB}
%%
%%[C] The characters that are included both in JIS X 0213
@@ -818,6 +965,7 @@
\pxDeclarePdfTextComposite{\=}{O}{}{014C}
\pxDeclarePdfTextComposite{\=}{a}{}{0101}
\pxDeclarePdfTextComposite{\=}{i}{}{012B}
+\pxDeclarePdfTextComposite{\=}{\i}{}{012B}
\pxDeclarePdfTextComposite{\=}{u}{}{016B}
\pxDeclarePdfTextComposite{\=}{e}{}{0113}
\pxDeclarePdfTextComposite{\=}{o}{}{014D}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxjahyper.tlpobj new/tlpkg/tlpobj/pxjahyper.tlpobj
--- old/tlpkg/tlpobj/pxjahyper.tlpobj 2019-02-28 04:03:39.000000000 +0100
+++ new/tlpkg/tlpobj/pxjahyper.tlpobj 2019-11-24 01:54:16.000000000 +0100
@@ -1,16 +1,17 @@
name pxjahyper
category Package
-revision 48207
+revision 52899
shortdesc Hyperref support for pLaTeX
relocated 1
longdesc This package adjusts the behavior of hyperref on (u)pLaTeX so
longdesc that authors can properly create PDF documents that contain
longdesc document information in Japanese.
-runfiles size=8
+runfiles size=15
+ RELOC/tex/platex/pxjahyper/pxjahyper-ajm.def
RELOC/tex/platex/pxjahyper/pxjahyper.sty
catalogue-contact-repository https://github.com/zr-tex8r/PXjahyper
catalogue-ctan /language/japanese/pxjahyper
-catalogue-date 2018-07-15 12:53:48 +0200
+catalogue-date 2019-11-23 20:01:18 +0100
catalogue-license mit
catalogue-topics japanese hyper
-catalogue-version 0.3d
+catalogue-version 0.4a
++++++ pxjodel.doc.tar.xz ++++++
Binary files old/doc/latex/pxjodel/tfm/jodhgothb-hq.tfm and new/doc/latex/pxjodel/tfm/jodhgothb-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/jodhgotheb-hq.tfm and new/doc/latex/pxjodel/tfm/jodhgotheb-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/jodhgothr-hq.tfm and new/doc/latex/pxjodel/tfm/jodhgothr-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/jodhmgothe-hq.tfm and new/doc/latex/pxjodel/tfm/jodhmgothe-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/jodhminb-hq.tfm and new/doc/latex/pxjodel/tfm/jodhminb-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/jodhminl-hq.tfm and new/doc/latex/pxjodel/tfm/jodhminl-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/jodhminr-hq.tfm and new/doc/latex/pxjodel/tfm/jodhminr-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhgothb-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhgothb-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhgotheb-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhgotheb-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhgothr-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhgothr-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhmgothe-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhmgothe-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhminb-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhminb-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhminl-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhminl-hq.tfm differ
Binary files old/doc/latex/pxjodel/tfm/zu-jodhminr-hq.tfm and new/doc/latex/pxjodel/tfm/zu-jodhminr-hq.tfm differ
Binary files old/doc/latex/pxjodel/vf/jodhgothb-hq.vf and new/doc/latex/pxjodel/vf/jodhgothb-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/jodhgotheb-hq.vf and new/doc/latex/pxjodel/vf/jodhgotheb-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/jodhgothr-hq.vf and new/doc/latex/pxjodel/vf/jodhgothr-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/jodhmgothe-hq.vf and new/doc/latex/pxjodel/vf/jodhmgothe-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/jodhminb-hq.vf and new/doc/latex/pxjodel/vf/jodhminb-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/jodhminl-hq.vf and new/doc/latex/pxjodel/vf/jodhminl-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/jodhminr-hq.vf and new/doc/latex/pxjodel/vf/jodhminr-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhgothb-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhgothb-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhgotheb-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhgotheb-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhgothr-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhgothr-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhmgothe-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhmgothe-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhminb-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhminb-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhminl-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhminl-hq.vf differ
Binary files old/doc/latex/pxjodel/vf/zu-jodhminr-hq.vf and new/doc/latex/pxjodel/vf/zu-jodhminr-hq.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxjodel.doc.tlpobj new/tlpkg/tlpobj/pxjodel.doc.tlpobj
--- old/tlpkg/tlpobj/pxjodel.doc.tlpobj 2019-02-28 04:03:39.000000000 +0100
+++ new/tlpkg/tlpobj/pxjodel.doc.tlpobj 2019-06-15 01:39:30.000000000 +0200
@@ -1,38 +1,10 @@
name pxjodel.doc
category Package
-revision 50009
+revision 51379
shortdesc doc files of pxjodel
relocated 1
-docfiles size=63
+docfiles size=35
RELOC/doc/latex/pxjodel/LICENSE
RELOC/doc/latex/pxjodel/README.md
RELOC/doc/latex/pxjodel/pxjodel.pdf
RELOC/doc/latex/pxjodel/pxjodel.tex
- RELOC/doc/latex/pxjodel/tfm/jodhgothb-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/jodhgotheb-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/jodhgothr-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/jodhmgothe-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/jodhminb-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/jodhminl-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/jodhminr-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhgothb-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhgotheb-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhgothr-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhmgothe-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhminb-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhminl-hq.tfm
- RELOC/doc/latex/pxjodel/tfm/zu-jodhminr-hq.tfm
- RELOC/doc/latex/pxjodel/vf/jodhgothb-hq.vf
- RELOC/doc/latex/pxjodel/vf/jodhgotheb-hq.vf
- RELOC/doc/latex/pxjodel/vf/jodhgothr-hq.vf
- RELOC/doc/latex/pxjodel/vf/jodhmgothe-hq.vf
- RELOC/doc/latex/pxjodel/vf/jodhminb-hq.vf
- RELOC/doc/latex/pxjodel/vf/jodhminl-hq.vf
- RELOC/doc/latex/pxjodel/vf/jodhminr-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhgothb-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhgotheb-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhgothr-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhmgothe-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhminb-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhminl-hq.vf
- RELOC/doc/latex/pxjodel/vf/zu-jodhminr-hq.vf
++++++ pxjodel.tar.xz ++++++
Binary files old/fonts/tfm/public/pxjodel/jodhgothb-hq.tfm and new/fonts/tfm/public/pxjodel/jodhgothb-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/jodhgotheb-hq.tfm and new/fonts/tfm/public/pxjodel/jodhgotheb-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/jodhgothr-hq.tfm and new/fonts/tfm/public/pxjodel/jodhgothr-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/jodhmgothe-hq.tfm and new/fonts/tfm/public/pxjodel/jodhmgothe-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/jodhminb-hq.tfm and new/fonts/tfm/public/pxjodel/jodhminb-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/jodhminl-hq.tfm and new/fonts/tfm/public/pxjodel/jodhminl-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/jodhminr-hq.tfm and new/fonts/tfm/public/pxjodel/jodhminr-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhgothb-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhgothb-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhgotheb-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhgotheb-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhgothr-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhgothr-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhmgothe-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhmgothe-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhminb-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhminb-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhminl-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhminl-hq.tfm differ
Binary files old/fonts/tfm/public/pxjodel/zu-jodhminr-hq.tfm and new/fonts/tfm/public/pxjodel/zu-jodhminr-hq.tfm differ
Binary files old/fonts/vf/public/pxjodel/jodhgothb-hq.vf and new/fonts/vf/public/pxjodel/jodhgothb-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/jodhgotheb-hq.vf and new/fonts/vf/public/pxjodel/jodhgotheb-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/jodhgothr-hq.vf and new/fonts/vf/public/pxjodel/jodhgothr-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/jodhmgothe-hq.vf and new/fonts/vf/public/pxjodel/jodhmgothe-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/jodhminb-hq.vf and new/fonts/vf/public/pxjodel/jodhminb-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/jodhminl-hq.vf and new/fonts/vf/public/pxjodel/jodhminl-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/jodhminr-hq.vf and new/fonts/vf/public/pxjodel/jodhminr-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhgothb-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhgothb-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhgotheb-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhgotheb-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhgothr-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhgothr-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhmgothe-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhmgothe-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhminb-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhminb-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhminl-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhminl-hq.vf differ
Binary files old/fonts/vf/public/pxjodel/zu-jodhminr-hq.vf and new/fonts/vf/public/pxjodel/zu-jodhminr-hq.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxjodel.tlpobj new/tlpkg/tlpobj/pxjodel.tlpobj
--- old/tlpkg/tlpobj/pxjodel.tlpobj 2019-02-28 04:03:39.000000000 +0100
+++ new/tlpkg/tlpobj/pxjodel.tlpobj 2019-06-15 01:39:30.000000000 +0200
@@ -1,6 +1,6 @@
name pxjodel
category Package
-revision 50009
+revision 51379
shortdesc Help change metrics of fonts from japanese-otf
relocated 1
longdesc This package changes the setup of the japanese-otf package so
@@ -16,7 +16,35 @@
longdesc using japanese-otf. So pxjodel is really about japanese-otf's
longdesc "deluxe" option, hence the name. It is not related to yodel
longdesc singing, although some sense of word-play is intended.
-runfiles size=2
+runfiles size=30
+ RELOC/fonts/tfm/public/pxjodel/jodhgothb-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/jodhgotheb-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/jodhgothr-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/jodhmgothe-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/jodhminb-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/jodhminl-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/jodhminr-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhgothb-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhgotheb-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhgothr-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhmgothe-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhminb-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhminl-hq.tfm
+ RELOC/fonts/tfm/public/pxjodel/zu-jodhminr-hq.tfm
+ RELOC/fonts/vf/public/pxjodel/jodhgothb-hq.vf
+ RELOC/fonts/vf/public/pxjodel/jodhgotheb-hq.vf
+ RELOC/fonts/vf/public/pxjodel/jodhgothr-hq.vf
+ RELOC/fonts/vf/public/pxjodel/jodhmgothe-hq.vf
+ RELOC/fonts/vf/public/pxjodel/jodhminb-hq.vf
+ RELOC/fonts/vf/public/pxjodel/jodhminl-hq.vf
+ RELOC/fonts/vf/public/pxjodel/jodhminr-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhgothb-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhgotheb-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhgothr-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhmgothe-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhminb-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhminl-hq.vf
+ RELOC/fonts/vf/public/pxjodel/zu-jodhminr-hq.vf
RELOC/tex/latex/pxjodel/pxjodel.sty
catalogue-contact-repository https://github.com/zr-tex8r/PXjodel
catalogue-ctan /language/japanese/pxjodel
++++++ pxtxalfa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxtxalfa.doc.tlpobj new/tlpkg/tlpobj/pxtxalfa.doc.tlpobj
--- old/tlpkg/tlpobj/pxtxalfa.doc.tlpobj 2019-02-28 04:03:40.000000000 +0100
+++ new/tlpkg/tlpobj/pxtxalfa.doc.tlpobj 2020-03-04 23:53:36.000000000 +0100
@@ -1,6 +1,6 @@
name pxtxalfa.doc
category Package
-revision 23682
+revision 54080
shortdesc doc files of pxtxalfa
relocated 1
docfiles size=13
++++++ pxtxalfa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxtxalfa.tlpobj new/tlpkg/tlpobj/pxtxalfa.tlpobj
--- old/tlpkg/tlpobj/pxtxalfa.tlpobj 2019-02-28 04:03:40.000000000 +0100
+++ new/tlpkg/tlpobj/pxtxalfa.tlpobj 2020-03-04 23:53:36.000000000 +0100
@@ -1,11 +1,11 @@
name pxtxalfa
category Package
-revision 23682
+revision 54080
shortdesc Virtual maths alphabets based on pxfonts and txfonts
relocated 1
longdesc The package provides virtual math alphabets based on pxfonts
longdesc and txfonts, with LaTeX support files and adjusted metrics. The
-longdesc mathalfa package offers support for this collection.
+longdesc mathalpha package offers support for this collection.
execute addMap pxtx.map
runfiles size=28
RELOC/fonts/map/dvips/pxtxalfa/pxtx.map
@@ -37,7 +37,6 @@
RELOC/tex/latex/pxtxalfa/utx-frak.fd
RELOC/tex/latex/pxtxalfa/utx-of.fd
catalogue-ctan /fonts/pxtxalfa
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-maths font-virtual
catalogue-version 1
++++++ pxufont.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pxufont/README.md new/doc/latex/pxufont/README.md
--- old/doc/latex/pxufont/README.md 2019-03-12 22:55:25.000000000 +0100
+++ new/doc/latex/pxufont/README.md 2020-02-09 23:05:38.000000000 +0100
@@ -78,6 +78,9 @@
Revision History
----------------
+ * Version 0.6 〈2020/02/09〉
+ - Suuport for `b` series.
+
* Version 0.5 〈2019/02/28〉
- Support for the fonts of ruby notation forms.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxufont.doc.tlpobj new/tlpkg/tlpobj/pxufont.doc.tlpobj
--- old/tlpkg/tlpobj/pxufont.doc.tlpobj 2019-03-13 02:26:12.000000000 +0100
+++ new/tlpkg/tlpobj/pxufont.doc.tlpobj 2020-02-10 01:55:10.000000000 +0100
@@ -1,6 +1,6 @@
name pxufont.doc
category Package
-revision 50355
+revision 53733
shortdesc doc files of pxufont
relocated 1
docfiles size=2
++++++ pxufont.tar.xz ++++++
Binary files old/fonts/vf/public/pxufont/zu-cidjgb0-h.vf and new/fonts/vf/public/pxufont/zu-cidjgb0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb0-v.vf and new/fonts/vf/public/pxufont/zu-cidjgb0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb1-h.vf and new/fonts/vf/public/pxufont/zu-cidjgb1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb1-v.vf and new/fonts/vf/public/pxufont/zu-cidjgb1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb2-h.vf and new/fonts/vf/public/pxufont/zu-cidjgb2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb2-v.vf and new/fonts/vf/public/pxufont/zu-cidjgb2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb3-h.vf and new/fonts/vf/public/pxufont/zu-cidjgb3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb3-v.vf and new/fonts/vf/public/pxufont/zu-cidjgb3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb4-h.vf and new/fonts/vf/public/pxufont/zu-cidjgb4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb4-v.vf and new/fonts/vf/public/pxufont/zu-cidjgb4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb5-h.vf and new/fonts/vf/public/pxufont/zu-cidjgb5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgb5-v.vf and new/fonts/vf/public/pxufont/zu-cidjgb5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge0-h.vf and new/fonts/vf/public/pxufont/zu-cidjge0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge0-v.vf and new/fonts/vf/public/pxufont/zu-cidjge0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge1-h.vf and new/fonts/vf/public/pxufont/zu-cidjge1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge1-v.vf and new/fonts/vf/public/pxufont/zu-cidjge1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge2-h.vf and new/fonts/vf/public/pxufont/zu-cidjge2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge2-v.vf and new/fonts/vf/public/pxufont/zu-cidjge2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge3-h.vf and new/fonts/vf/public/pxufont/zu-cidjge3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge3-v.vf and new/fonts/vf/public/pxufont/zu-cidjge3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge4-h.vf and new/fonts/vf/public/pxufont/zu-cidjge4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge4-v.vf and new/fonts/vf/public/pxufont/zu-cidjge4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge5-h.vf and new/fonts/vf/public/pxufont/zu-cidjge5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjge5-v.vf and new/fonts/vf/public/pxufont/zu-cidjge5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr0-h.vf and new/fonts/vf/public/pxufont/zu-cidjgr0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr0-v.vf and new/fonts/vf/public/pxufont/zu-cidjgr0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr1-h.vf and new/fonts/vf/public/pxufont/zu-cidjgr1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr1-v.vf and new/fonts/vf/public/pxufont/zu-cidjgr1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr2-h.vf and new/fonts/vf/public/pxufont/zu-cidjgr2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr2-v.vf and new/fonts/vf/public/pxufont/zu-cidjgr2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr3-h.vf and new/fonts/vf/public/pxufont/zu-cidjgr3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr3-v.vf and new/fonts/vf/public/pxufont/zu-cidjgr3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr4-h.vf and new/fonts/vf/public/pxufont/zu-cidjgr4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr4-v.vf and new/fonts/vf/public/pxufont/zu-cidjgr4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr5-h.vf and new/fonts/vf/public/pxufont/zu-cidjgr5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjgr5-v.vf and new/fonts/vf/public/pxufont/zu-cidjgr5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb0-h.vf and new/fonts/vf/public/pxufont/zu-cidjmb0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb0-v.vf and new/fonts/vf/public/pxufont/zu-cidjmb0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb1-h.vf and new/fonts/vf/public/pxufont/zu-cidjmb1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb1-v.vf and new/fonts/vf/public/pxufont/zu-cidjmb1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb2-h.vf and new/fonts/vf/public/pxufont/zu-cidjmb2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb2-v.vf and new/fonts/vf/public/pxufont/zu-cidjmb2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb3-h.vf and new/fonts/vf/public/pxufont/zu-cidjmb3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb3-v.vf and new/fonts/vf/public/pxufont/zu-cidjmb3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb4-h.vf and new/fonts/vf/public/pxufont/zu-cidjmb4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb4-v.vf and new/fonts/vf/public/pxufont/zu-cidjmb4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb5-h.vf and new/fonts/vf/public/pxufont/zu-cidjmb5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmb5-v.vf and new/fonts/vf/public/pxufont/zu-cidjmb5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr0-h.vf and new/fonts/vf/public/pxufont/zu-cidjmgr0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr0-v.vf and new/fonts/vf/public/pxufont/zu-cidjmgr0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr1-h.vf and new/fonts/vf/public/pxufont/zu-cidjmgr1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr1-v.vf and new/fonts/vf/public/pxufont/zu-cidjmgr1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr2-h.vf and new/fonts/vf/public/pxufont/zu-cidjmgr2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr2-v.vf and new/fonts/vf/public/pxufont/zu-cidjmgr2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr3-h.vf and new/fonts/vf/public/pxufont/zu-cidjmgr3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr3-v.vf and new/fonts/vf/public/pxufont/zu-cidjmgr3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr4-h.vf and new/fonts/vf/public/pxufont/zu-cidjmgr4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr4-v.vf and new/fonts/vf/public/pxufont/zu-cidjmgr4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr5-h.vf and new/fonts/vf/public/pxufont/zu-cidjmgr5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmgr5-v.vf and new/fonts/vf/public/pxufont/zu-cidjmgr5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml0-h.vf and new/fonts/vf/public/pxufont/zu-cidjml0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml0-v.vf and new/fonts/vf/public/pxufont/zu-cidjml0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml1-h.vf and new/fonts/vf/public/pxufont/zu-cidjml1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml1-v.vf and new/fonts/vf/public/pxufont/zu-cidjml1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml2-h.vf and new/fonts/vf/public/pxufont/zu-cidjml2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml2-v.vf and new/fonts/vf/public/pxufont/zu-cidjml2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml3-h.vf and new/fonts/vf/public/pxufont/zu-cidjml3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml3-v.vf and new/fonts/vf/public/pxufont/zu-cidjml3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml4-h.vf and new/fonts/vf/public/pxufont/zu-cidjml4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml4-v.vf and new/fonts/vf/public/pxufont/zu-cidjml4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml5-h.vf and new/fonts/vf/public/pxufont/zu-cidjml5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjml5-v.vf and new/fonts/vf/public/pxufont/zu-cidjml5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr0-h.vf and new/fonts/vf/public/pxufont/zu-cidjmr0-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr0-v.vf and new/fonts/vf/public/pxufont/zu-cidjmr0-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr1-h.vf and new/fonts/vf/public/pxufont/zu-cidjmr1-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr1-v.vf and new/fonts/vf/public/pxufont/zu-cidjmr1-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr2-h.vf and new/fonts/vf/public/pxufont/zu-cidjmr2-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr2-v.vf and new/fonts/vf/public/pxufont/zu-cidjmr2-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr3-h.vf and new/fonts/vf/public/pxufont/zu-cidjmr3-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr3-v.vf and new/fonts/vf/public/pxufont/zu-cidjmr3-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr4-h.vf and new/fonts/vf/public/pxufont/zu-cidjmr4-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr4-v.vf and new/fonts/vf/public/pxufont/zu-cidjmr4-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr5-h.vf and new/fonts/vf/public/pxufont/zu-cidjmr5-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-cidjmr5-v.vf and new/fonts/vf/public/pxufont/zu-cidjmr5-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothb-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothb-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothbn-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothbn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothbn-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothbn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgotheb-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgotheb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgotheb-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgotheb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothebn-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothebn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothebn-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothebn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothr-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothr-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothrn-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothrn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlgothrn-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlgothrn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlmgothr-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlmgothr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlmgothr-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlmgothr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlmgothrn-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlmgothrn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlmgothrn-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlmgothrn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminb-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminb-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminbn-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminbn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminbn-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminbn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminl-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminl-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminl-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminl-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminln-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminln-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminln-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminln-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminr-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminr-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminrn-h.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminrn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upbrsgnmlminrn-v.vf and new/fonts/vf/public/pxufont/zu-upbrsgnmlminrn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothb-h.vf and new/fonts/vf/public/pxufont/zu-upnmlgothb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothb-v.vf and new/fonts/vf/public/pxufont/zu-upnmlgothb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothbn-h.vf and new/fonts/vf/public/pxufont/zu-upnmlgothbn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothbn-v.vf and new/fonts/vf/public/pxufont/zu-upnmlgothbn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgotheb-h.vf and new/fonts/vf/public/pxufont/zu-upnmlgotheb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgotheb-v.vf and new/fonts/vf/public/pxufont/zu-upnmlgotheb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothebn-h.vf and new/fonts/vf/public/pxufont/zu-upnmlgothebn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothebn-v.vf and new/fonts/vf/public/pxufont/zu-upnmlgothebn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothr-h.vf and new/fonts/vf/public/pxufont/zu-upnmlgothr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothr-v.vf and new/fonts/vf/public/pxufont/zu-upnmlgothr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothrn-h.vf and new/fonts/vf/public/pxufont/zu-upnmlgothrn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlgothrn-v.vf and new/fonts/vf/public/pxufont/zu-upnmlgothrn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlmgothr-h.vf and new/fonts/vf/public/pxufont/zu-upnmlmgothr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlmgothr-v.vf and new/fonts/vf/public/pxufont/zu-upnmlmgothr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlmgothrn-h.vf and new/fonts/vf/public/pxufont/zu-upnmlmgothrn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlmgothrn-v.vf and new/fonts/vf/public/pxufont/zu-upnmlmgothrn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminb-h.vf and new/fonts/vf/public/pxufont/zu-upnmlminb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminb-v.vf and new/fonts/vf/public/pxufont/zu-upnmlminb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminbn-h.vf and new/fonts/vf/public/pxufont/zu-upnmlminbn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminbn-v.vf and new/fonts/vf/public/pxufont/zu-upnmlminbn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminl-h.vf and new/fonts/vf/public/pxufont/zu-upnmlminl-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminl-v.vf and new/fonts/vf/public/pxufont/zu-upnmlminl-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminln-h.vf and new/fonts/vf/public/pxufont/zu-upnmlminln-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminln-v.vf and new/fonts/vf/public/pxufont/zu-upnmlminln-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminr-h.vf and new/fonts/vf/public/pxufont/zu-upnmlminr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminr-v.vf and new/fonts/vf/public/pxufont/zu-upnmlminr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminrn-h.vf and new/fonts/vf/public/pxufont/zu-upnmlminrn-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-upnmlminrn-v.vf and new/fonts/vf/public/pxufont/zu-upnmlminrn-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubygothb-h.vf and new/fonts/vf/public/pxufont/zu-uprubygothb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubygothb-v.vf and new/fonts/vf/public/pxufont/zu-uprubygothb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubygotheb-h.vf and new/fonts/vf/public/pxufont/zu-uprubygotheb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubygotheb-v.vf and new/fonts/vf/public/pxufont/zu-uprubygotheb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubygothr-h.vf and new/fonts/vf/public/pxufont/zu-uprubygothr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubygothr-v.vf and new/fonts/vf/public/pxufont/zu-uprubygothr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubymgothr-h.vf and new/fonts/vf/public/pxufont/zu-uprubymgothr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubymgothr-v.vf and new/fonts/vf/public/pxufont/zu-uprubymgothr-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubyminb-h.vf and new/fonts/vf/public/pxufont/zu-uprubyminb-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubyminb-v.vf and new/fonts/vf/public/pxufont/zu-uprubyminb-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubyminl-h.vf and new/fonts/vf/public/pxufont/zu-uprubyminl-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubyminl-v.vf and new/fonts/vf/public/pxufont/zu-uprubyminl-v.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubyminr-h.vf and new/fonts/vf/public/pxufont/zu-uprubyminr-h.vf differ
Binary files old/fonts/vf/public/pxufont/zu-uprubyminr-v.vf and new/fonts/vf/public/pxufont/zu-uprubyminr-v.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pxufont/pxufont-ruby.sty new/tex/latex/pxufont/pxufont-ruby.sty
--- old/tex/latex/pxufont/pxufont-ruby.sty 2019-03-12 22:55:25.000000000 +0100
+++ new/tex/latex/pxufont/pxufont-ruby.sty 2020-02-09 23:05:38.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'pxufont-ruby.sty'.
-%%
-%% Copyright (c) 2017-2019 Takayuki YATO (aka. "ZR")
+%%
+%% Copyright (c) 2017-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxufont-ruby}[2019/02/28 v0.5]
+\ProvidesPackage{pxufont-ruby}[2020/02/09 v0.6]
\def\pxuf@rb@pkgname{pxufont-ruby}
%--------------------------------------- main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pxufont/pxufont.sty new/tex/latex/pxufont/pxufont.sty
--- old/tex/latex/pxufont/pxufont.sty 2019-03-12 22:55:25.000000000 +0100
+++ new/tex/latex/pxufont/pxufont.sty 2020-02-09 23:05:38.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'pxufont.sty'.
-%%
-%% Copyright (c) 2017-2019 Takayuki YATO (aka. "ZR")
+%%
+%% Copyright (c) 2017-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxufont}[2019/02/28 v0.5]
+\ProvidesPackage{pxufont}[2020/02/09 v0.6]
\def\pxuf@pkgname{pxufont}
%
\providecommand\bxDebug[1]{}
@@ -45,7 +45,7 @@
\def\pxuf@split@c#1\pxuf@mt#2\pxuf@end#3{%
\def\pxuf@pre{#3}\def\pxuf@post{#1}}
-%% swutch 'pxuf@otf@used'
+%% switch 'pxuf@otf@used'
\newif\ifpxuf@otf@used
\@ifpackageloaded{otf}{%
\pxuf@otf@usedtrue
@@ -58,7 +58,7 @@
}
%% \pxuf@JY/\pxuf@JT
-\ifNativeupTeX
+\ifnativeupTeX
\def\pxuf@JY{JY2}\def\pxuf@JT{JT2}
\else
\def\pxuf@JY{JY1}\def\pxuf@JT{JT1}
@@ -156,20 +156,20 @@
\ifpxuf@otf@used
\@for\pxuf@w:={\pxuf@JY,\pxuf@JT}\do{%
\@for\pxuf@x:={hmc,hgt,mg,ruby,rubyg,rubymg}\do{%
- \@for\pxuf@y:={l,m,bx,eb}\do{%
+ \@for\pxuf@y:={l,m,b,bx,eb}\do{%
\expandafter\ifx\csname\pxuf@w/\pxuf@x/\pxuf@y/n\endcsname\relax\else
\expandafter\let\csname pxuf@DF/\pxuf@w/\pxuf@x\endcsname=t%
\pxuf@process@one{t}\pxuf@w\pxuf@x\pxuf@y{n}%
\fi}}}
\@for\pxuf@w:={\pxuf@JY,\pxuf@JT}\do{%
\@for\pxuf@x:={cidj,cidjg,cidjmg}\do{%
- \@for\pxuf@y:={l,m,bx,eb}\do{%
+ \@for\pxuf@y:={l,m,b,bx,eb}\do{%
\expandafter\ifx\csname\pxuf@w/\pxuf@x/\pxuf@y/0\endcsname\relax\else
\@tfor\pxuf@z:=012345\do{%
\pxuf@process@one{f}\pxuf@w\pxuf@x\pxuf@y\pxuf@z}%
\fi}}}
\fi
-\ifNativeupTeX\else
+\ifnativeupTeX\else
\@for\pxuf@w:={\pxuf@JY,\pxuf@JT}\do{%
\@for\pxuf@x:={\mcdefault,\gtdefault,mc,gt}\do{%
\expandafter\ifx\csname pxuf@DF/\pxuf@w/\pxuf@x\endcsname\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pxufont.tlpobj new/tlpkg/tlpobj/pxufont.tlpobj
--- old/tlpkg/tlpobj/pxufont.tlpobj 2019-03-13 02:26:12.000000000 +0100
+++ new/tlpkg/tlpobj/pxufont.tlpobj 2020-02-10 01:55:10.000000000 +0100
@@ -1,6 +1,6 @@
name pxufont
category Package
-revision 50355
+revision 53733
shortdesc Emulate non-Unicode Japanese fonts using Unicode fonts
relocated 1
longdesc The set of the Japanese logical fonts (JFMs) that are used as
@@ -513,7 +513,6 @@
RELOC/tex/latex/pxufont/pxufont.sty
catalogue-contact-repository https://github.com/zr-tex8r/PXufont
catalogue-ctan /language/japanese/pxufont
-catalogue-date 2019-03-12 08:30:26 +0100
catalogue-license mit
catalogue-topics japanese font-use font-cjk
-catalogue-version 0.5
+catalogue-version 0.6
++++++ pythontex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pythontex/NEWS.rst new/texmf-dist/doc/latex/pythontex/NEWS.rst
--- old/texmf-dist/doc/latex/pythontex/NEWS.rst 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/doc/latex/pythontex/NEWS.rst 2019-09-24 22:07:38.000000000 +0200
@@ -7,6 +7,57 @@
===============
+v0.17 (2019/09/22)
+------------------
+
+* Pygments syntax highlighting for the Python console (``pycon`` lexer) now
+ uses the ``python3`` option, and the default Python lexer is now
+ ``python3`` (#156).
+
+* Added support for JavaScript (#147; thanks to Nathan Carter).
+
+* Updated Julia support for Julia versions 0.6 (#107), and 0.7 and 1.0 (#126,
+ #130).
+
+* There are now meaningful error messages for the Julia console when Weave.jl
+ is not installed or raises errors (#131).
+
+* ``pythontexcustomcode`` and ``\pythontexcustomc`` now set
+ ``pytex.context`` (#65).
+
+* Added support for R. The ``R`` family of commands and environments
+ (``\R``, ``\Rc``, ``Rcode``, ...) executes code as a script.
+ There is currently no utilities class or equivalent. The ``Rcon`` family
+ (``Rconsole``) executes code to emulate an interactive R session (#121).
+
+* ``fancyvrb`` settings from ``\setpythontexfv`` and console
+ environments now work with Julia and R consoles.
+
+* ``pythontexcustomcode`` now works with ``juliacon``. There are now proper
+ ``juliaconcode`` and ``Rconcode`` environments that execute code but
+ typeset nothing, to parallel ``pyconcode`` (#134).
+
+* Added support for Perl with the ``perl`` and ``pl`` families of commands
+ and environments. There is currently no utilities class or equivalent.
+
+* Added support for Perl 6 with the ``perlsix`` and ``psix`` families of
+ commands and environments (#104). There is currently no utilities class or
+ equivalent.
+
+* Updated Rust support by using ``dyn`` with traits in utilities object.
+
+* Under Windows, capitalization of script paths in ``stderr`` is now
+ preserved.
+
+* Fixed a bug that prevented the ``sub`` environment from working with
+ ``depythontex`` (#155).
+
+* Fixed a bug in checking mtime of dependencies to see if they have been
+ modified while ``pythontex`` is running. The check failed for dependencies
+ that do not exist or were deleted before ``pythontex`` can read them
+ (#136).
+
+
v0.16 (2017/07/20)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pythontex/README new/texmf-dist/doc/latex/pythontex/README
--- old/texmf-dist/doc/latex/pythontex/README 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/doc/latex/pythontex/README 2019-09-24 22:07:38.000000000 +0200
@@ -3,15 +3,16 @@
===================================================================
:Author: Geoffrey Poore
-:Version: 0.16 (2017/07/20)
+:Version: 0.17 (2019/09/22)
:License: LPPL v1.3 or later (LaTeX code) and BSD 3-Clause (Python code)
:Development: https://github.com/gpoore/pythontex
:Requirements: Python 2.7 or 3.2+; Pygments
-The PythonTeX package allows you to enter Python code within a LaTeX
-document, execute the code, and access its output in the original document.
-It also supports the Ruby, Julia, Octave, Sage, Bash, and Rust languages.
+The PythonTeX package allows you to enter Python code within a LaTeX document,
+execute the code, and access its output in the original document. It also
+supports the Ruby, Julia, Octave, Sage, Bash, Rust, R, Perl, Perl 6, and
+JavaScript languages.
PythonTeX provides fast, user-friendly access to Python from within LaTeX.
Python code is only executed when it has been modified, or when it meets
Binary files old/texmf-dist/doc/latex/pythontex/pythontex.pdf and new/texmf-dist/doc/latex/pythontex/pythontex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pythontex.doc.tlpobj new/tlpkg/tlpobj/pythontex.doc.tlpobj
--- old/tlpkg/tlpobj/pythontex.doc.tlpobj 2019-02-28 04:03:53.000000000 +0100
+++ new/tlpkg/tlpobj/pythontex.doc.tlpobj 2019-09-25 01:54:00.000000000 +0200
@@ -1,8 +1,8 @@
name pythontex.doc
category Package
-revision 44860
+revision 52174
shortdesc doc files of pythontex
-docfiles size=403
+docfiles size=406
texmf-dist/doc/latex/pythontex/NEWS.rst
texmf-dist/doc/latex/pythontex/README
texmf-dist/doc/latex/pythontex/pythontex.pdf
++++++ pythontex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pythontex/depythontex2.py new/texmf-dist/scripts/pythontex/depythontex2.py
--- old/texmf-dist/scripts/pythontex/depythontex2.py 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/scripts/pythontex/depythontex2.py 2019-09-24 22:07:38.000000000 +0200
@@ -86,7 +86,7 @@
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
# Functions and parameters for customizing the script output
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pythontex/depythontex3.py new/texmf-dist/scripts/pythontex/depythontex3.py
--- old/texmf-dist/scripts/pythontex/depythontex3.py 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/scripts/pythontex/depythontex3.py 2019-09-24 22:07:38.000000000 +0200
@@ -86,7 +86,7 @@
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
# Functions and parameters for customizing the script output
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pythontex/pythontex2.py new/texmf-dist/scripts/pythontex/pythontex2.py
--- old/texmf-dist/scripts/pythontex/pythontex2.py 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/scripts/pythontex/pythontex2.py 2019-09-24 22:07:38.000000000 +0200
@@ -13,7 +13,7 @@
Licensed under the BSD 3-Clause License:
-Copyright (c) 2012-2017, Geoffrey M. Poore
+Copyright (c) 2012-2019, Geoffrey M. Poore
All rights reserved.
@@ -62,6 +62,7 @@
from pythontex_engines import *
import textwrap
import platform
+import itertools
if sys.version_info[0] == 2:
try:
@@ -77,7 +78,7 @@
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
@@ -1213,9 +1214,13 @@
# Must double-escape any backslashes so that they survive `shlex.split()`
script = basename
if os.path.isabs(os.path.expanduser(os.path.normcase(outputdir))):
- script_full = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(outputdir, basename))
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(orig_cwd, outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(orig_cwd, outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# `shlex.split()` only works with Unicode after 2.7.2
if (sys.version_info.major == 2 and sys.version_info.micro < 3):
exec_cmd = shlex.split(bytes(command.format(file=script.replace('\\', '\\\\'), File=script_full.replace('\\', '\\\\'))))
@@ -1275,7 +1280,11 @@
for key in code_dict:
family = key.split('#')[0]
# Uncomment the following for debugging, and comment out what follows
- '''run_code(encoding, outputdir, workingdir, code_dict[key],
+ '''run_code(encoding, outputdir,
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1287,9 +1296,12 @@
engine_dict[family].linenumbers,
engine_dict[family].lookbehind,
keeptemps, hashdependencies,
- pygments_settings)'''
+ pygments_settings]))'''
tasks.append(pool.apply_async(run_code, [encoding, outputdir,
- workingdir, code_dict[key],
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1412,7 +1424,7 @@
unresolved_sessions = []
for key in dependencies:
for dep, val in dependencies[key].items():
- if val[0] > start_time:
+ if val[0] is None or val[0] > start_time:
unresolved_dependencies = True
dependencies[key][dep] = (None, None)
unresolved_sessions.append(key.replace('#', ':'))
@@ -1474,7 +1486,8 @@
-def run_code(encoding, outputdir, workingdir, code_list, language, commands,
+def run_code(encoding, outputdir, workingdir,
+ cc_begin_list, code_list, cc_end_list, language, commands,
command_created, extension, makestderr, stderrfilename,
code_index, errorsig, warningsig, linesig, stderrlookbehind,
keeptemps, hashdependencies, pygments_settings):
@@ -1512,11 +1525,19 @@
err_file_name = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename + '.err')))
out_file = open(out_file_name, 'w', encoding=encoding)
err_file = open(err_file_name, 'w', encoding=encoding)
- script = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script = os.path.expanduser(os.path.join(outputdir, basename))
+ if platform.system() == 'Windows':
+ script = script.replace('/', '\\')
+ else:
+ script = script.replace('\\', '/')
if os.path.isabs(script):
script_full = script
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(os.getcwd(), outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(os.getcwd(), outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# #### Need to revise so that intermediate files can be detected and cleaned up
for f in command_created:
files.append(f.format(file=script, File=script_full))
@@ -1535,7 +1556,10 @@
# Add any created files due to the command
# This needs to be done before attempts to execute, to prevent orphans
try:
- proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=subprocess.STDOUT)
except WindowsError as e:
if e.errno == 2:
# Batch files won't be found when called without extension. They
@@ -1546,7 +1570,10 @@
# under Windows; a list is not required.
exec_cmd_string = ' '.join(exec_cmd)
exec_cmd_string = 'cmd /C "@echo off & call {0} & if errorlevel 1 exit 1"'.format(exec_cmd_string)
- proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=subprocess.STDOUT)
else:
raise
@@ -1567,15 +1594,21 @@
messages.append('* PythonTeX error')
messages.append(' Missing output file for ' + key_run.replace('#', ':'))
errors += 1
+ elif family == 'juliacon' and proc.returncode == 1:
+ messages.append('* PythonTeX error')
+ messages.append(' Running code for Julia console failed')
+ with open(err_file_name, encoding='utf8') as f:
+ messages.append(f.read())
+ errors += 1
else:
if family == 'juliacon':
with open(out_file_name.rsplit('.', 1)[0] + '.tex', 'r', encoding=encoding) as f:
tex_data_lines = f.readlines()
- inst = 0
+ code_iter = itertools.chain(cc_begin_list, code_list, cc_end_list)
for n, line in enumerate(tex_data_lines):
if line.rstrip() == '\\begin{juliaterm}':
- tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(inst)
- inst += 1
+ c = next(code_iter)
+ tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(c.instance)
if n != 0:
tex_data_lines[n-1] = ''
if line.rstrip() == '\\end{juliaterm}':
@@ -1583,6 +1616,29 @@
tex_data_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
with open(out_file_name, 'w', encoding=encoding) as f:
f.write(''.join(tex_data_lines))
+ elif family == 'Rcon':
+ with open(out_file_name, 'r', encoding=encoding) as f:
+ stdout_lines = f.readlines()
+ for n, line in enumerate(stdout_lines):
+ if line.startswith('> =>PYTHONTEX:'):
+ stdout_lines[n] = line[2:]
+ elif '> write("=>PYTHONTEX:' in line:
+ if line.startswith('> write("=>PYTHONTEX:'):
+ stdout_lines[n] = ''
+ else:
+ # cat() and similar functions can result in the
+ # prompt not being at the start of a new line. In
+ # that case, preserve the prompt to accurately
+ # emulate the console. If there is a following
+ # console environment, this effectively amounts
+ # to adding an extra empty line (pressing ENTER)
+ # between the two.
+ stdout_lines[n] = line.split('write("=>PYTHONTEX:', 1)[0]
+ while stdout_lines and (stdout_lines[-1].startswith('>') and not stdout_lines[-1][1:].strip(' \n')):
+ stdout_lines.pop()
+ stdout_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
+ with open(out_file_name, 'w', encoding=encoding) as f:
+ f.write(''.join(stdout_lines))
f = open(out_file_name, 'r', encoding=encoding)
out = f.read()
@@ -1640,7 +1696,7 @@
else:
dependencies[dep] = (os.path.getmtime(dep_file), '')
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
from pygments import highlight
from pygments.lexers import get_lexer_by_name
from pygments.formatters import LatexFormatter
@@ -1655,16 +1711,21 @@
for block in out.split('=>PYTHONTEX:STDOUT#')[1:]:
if block:
delims, content = block.split('#\n', 1)
+ if content and not content.endswith('\n'):
+ # Content might not end with a newline. For example,
+ # Rcon with something like cat() as the last function.
+ content += '\n'
instance, command = delims.split('#')
if content or command in ('s', 'sub'):
if instance.endswith('CC'):
- messages.append('* PythonTeX warning')
- messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
- messages.append(' This is not supported; use a normal code command or environment')
- messages.append(' The following content was written:')
- messages.append('')
- messages.extend([' ' + l for l in content.splitlines()])
- warnings += 1
+ if family not in ('juliacon', 'Rcon'):
+ messages.append('* PythonTeX warning')
+ messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
+ messages.append(' This is not supported; use a normal code command or environment')
+ messages.append(' The following content was written:')
+ messages.append('')
+ messages.extend([' ' + l for l in content.splitlines()])
+ warnings += 1
elif command == 'i':
content = r'\pytx@SVMCR{pytx@MCR@' + key_run.replace('#', '@') + '@' + instance + '}\n' + content.rstrip('\n') + '\\endpytx@SVMCR\n\n'
macros.append(content)
@@ -1682,7 +1743,7 @@
# Remove newline added by printing, prevent
# LaTeX from adding a space after content
content = content.rsplit('\n', 1)[0] + '\\endinput\n'
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
content = highlight(content, lexer[family], formatter[family])
f.write(content)
f.close()
@@ -1693,7 +1754,7 @@
messages.append('* PythonTeX error')
messages.append(' Missing stderr file for ' + key_run.replace('#', ':'))
errors += 1
- elif family == 'juliacon':
+ elif family in ('juliacon', 'Rcon'):
pass
else:
# Open error and code files.
@@ -1733,7 +1794,7 @@
index_next = index_now
start_errgobble = None
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
# or separate messages.
@@ -1779,7 +1840,7 @@
# both the error and warning patterns, default to
# error.
past_line = err_ud[index]
- if (index < n and basename in past_line):
+ if (index < n and basename in past_line and (family not in ('perlsix', 'psix') or '.p6:' in past_line or '.p6 line' in past_line)):
break
for pattern in warningsig:
if pattern in past_line:
@@ -1843,8 +1904,9 @@
index_now_last = index_now
index_next_last = index_next
err_key_last_int = -1
+ p6_sorry_search = False
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Determine the corresponding line number in the document
found = False
for pattern in linesig:
@@ -1906,6 +1968,35 @@
line = line.replace(fullbasename + '.' + extension, '<file>')
elif stderrfilename == 'genericscript':
line = line.replace(fullbasename + '.' + extension, '<script>')
+ if family in ('perlsix', 'psix'):
+ # Perl 6 "SORRY!" errors during compiling
+ # (before execution) need special processing,
+ # since they lack stderr delims and must
+ # include lines before the current one.
+ if p6_sorry_search: # Already handled
+ pass
+ else:
+ p6_sorry_search = True
+ p6_sorry_index = n - 1
+ while p6_sorry_index >= 0:
+ if not err_ud[p6_sorry_index].startswith('===SORRY!==='):
+ p6_sorry_index -= 1
+ continue
+ if errlinenum > index_now[1].lines_total + index_now[1].lines_input:
+ p6_linenum_offset = index_now[1].lines_total
+ else:
+ p6_linenum_offset = index_now[1].lines_total - index_now[1].lines_user + index_now[1].inline_count
+ p6_preceding_err_lines = [sub(r'line ([1-9][0-9]*)', lambda m: 'line {0}'.format(int(m.group(1)) - p6_linenum_offset), x) for x in err_ud[p6_sorry_index:n]]
+ if stderrfilename == 'full':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, basename)
+ elif stderrfilename == 'session':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, session)
+ elif stderrfilename == 'genericfile':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<file>')
+ elif stderrfilename == 'genericscript':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<script>')
+ err_dict[err_key].extend(p6_preceding_err_lines)
+ break
err_dict[err_key].append(line)
elif process:
err_dict[err_key].append(line)
@@ -1967,7 +2058,7 @@
# Never process delimiting info until it is used
# Rather, store the index of the last delimiter
last_delim = line
- elif basename in line:
+ elif basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found_basename = True
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
@@ -2122,7 +2213,7 @@
else:
process = True
err_key = basename + '_' + instance
- elif process and basename in line:
+ elif process and basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found = False
for pattern in linesig:
try:
@@ -2297,6 +2388,8 @@
if codetype != ':GLOBAL':
p = pygments_settings[codetype]['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings[codetype]['lexer'] == 'pycon':
+ p['python3'] = True
formatter[codetype] = LatexFormatter(**p)
lexer[codetype] = get_lexer_by_name(pygments_settings[codetype]['lexer'], **p)
@@ -2503,6 +2596,8 @@
from pygments.formatters import LatexFormatter
p = pygments_settings['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings['lexer'] == 'pycon':
+ p['python3'] = True
formatter = LatexFormatter(**p)
lexer = get_lexer_by_name(pygments_settings['lexer'], **p)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pythontex/pythontex3.py new/texmf-dist/scripts/pythontex/pythontex3.py
--- old/texmf-dist/scripts/pythontex/pythontex3.py 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/scripts/pythontex/pythontex3.py 2019-09-24 22:07:38.000000000 +0200
@@ -13,7 +13,7 @@
Licensed under the BSD 3-Clause License:
-Copyright (c) 2012-2017, Geoffrey M. Poore
+Copyright (c) 2012-2019, Geoffrey M. Poore
All rights reserved.
@@ -62,6 +62,7 @@
from pythontex_engines import *
import textwrap
import platform
+import itertools
if sys.version_info[0] == 2:
try:
@@ -77,7 +78,7 @@
# Script parameters
# Version
-__version__ = '0.16'
+__version__ = '0.17'
@@ -1213,9 +1214,13 @@
# Must double-escape any backslashes so that they survive `shlex.split()`
script = basename
if os.path.isabs(os.path.expanduser(os.path.normcase(outputdir))):
- script_full = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(outputdir, basename))
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(orig_cwd, outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(orig_cwd, outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# `shlex.split()` only works with Unicode after 2.7.2
if (sys.version_info.major == 2 and sys.version_info.micro < 3):
exec_cmd = shlex.split(bytes(command.format(file=script.replace('\\', '\\\\'), File=script_full.replace('\\', '\\\\'))))
@@ -1275,7 +1280,11 @@
for key in code_dict:
family = key.split('#')[0]
# Uncomment the following for debugging, and comment out what follows
- '''run_code(encoding, outputdir, workingdir, code_dict[key],
+ '''run_code(encoding, outputdir,
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1287,9 +1296,12 @@
engine_dict[family].linenumbers,
engine_dict[family].lookbehind,
keeptemps, hashdependencies,
- pygments_settings)'''
+ pygments_settings]))'''
tasks.append(pool.apply_async(run_code, [encoding, outputdir,
- workingdir, code_dict[key],
+ workingdir,
+ cc_dict_begin[family],
+ code_dict[key],
+ cc_dict_end[family],
engine_dict[family].language,
engine_dict[family].commands,
engine_dict[family].created,
@@ -1412,7 +1424,7 @@
unresolved_sessions = []
for key in dependencies:
for dep, val in dependencies[key].items():
- if val[0] > start_time:
+ if val[0] is None or val[0] > start_time:
unresolved_dependencies = True
dependencies[key][dep] = (None, None)
unresolved_sessions.append(key.replace('#', ':'))
@@ -1474,7 +1486,8 @@
-def run_code(encoding, outputdir, workingdir, code_list, language, commands,
+def run_code(encoding, outputdir, workingdir,
+ cc_begin_list, code_list, cc_end_list, language, commands,
command_created, extension, makestderr, stderrfilename,
code_index, errorsig, warningsig, linesig, stderrlookbehind,
keeptemps, hashdependencies, pygments_settings):
@@ -1512,11 +1525,19 @@
err_file_name = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename + '.err')))
out_file = open(out_file_name, 'w', encoding=encoding)
err_file = open(err_file_name, 'w', encoding=encoding)
- script = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename)))
+ script = os.path.expanduser(os.path.join(outputdir, basename))
+ if platform.system() == 'Windows':
+ script = script.replace('/', '\\')
+ else:
+ script = script.replace('\\', '/')
if os.path.isabs(script):
script_full = script
else:
- script_full = os.path.expanduser(os.path.normcase(os.path.join(os.getcwd(), outputdir, basename)))
+ script_full = os.path.expanduser(os.path.join(os.getcwd(), outputdir, basename))
+ if platform.system() == 'Windows':
+ script_full = script_full.replace('/', '\\')
+ else:
+ script_full = script_full.replace('\\', '/')
# #### Need to revise so that intermediate files can be detected and cleaned up
for f in command_created:
files.append(f.format(file=script, File=script_full))
@@ -1535,7 +1556,10 @@
# Add any created files due to the command
# This needs to be done before attempts to execute, to prevent orphans
try:
- proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=subprocess.STDOUT)
except WindowsError as e:
if e.errno == 2:
# Batch files won't be found when called without extension. They
@@ -1546,7 +1570,10 @@
# under Windows; a list is not required.
exec_cmd_string = ' '.join(exec_cmd)
exec_cmd_string = 'cmd /C "@echo off & call {0} & if errorlevel 1 exit 1"'.format(exec_cmd_string)
- proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ if family != 'Rcon':
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file)
+ else:
+ proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=subprocess.STDOUT)
else:
raise
@@ -1567,15 +1594,21 @@
messages.append('* PythonTeX error')
messages.append(' Missing output file for ' + key_run.replace('#', ':'))
errors += 1
+ elif family == 'juliacon' and proc.returncode == 1:
+ messages.append('* PythonTeX error')
+ messages.append(' Running code for Julia console failed')
+ with open(err_file_name, encoding='utf8') as f:
+ messages.append(f.read())
+ errors += 1
else:
if family == 'juliacon':
with open(out_file_name.rsplit('.', 1)[0] + '.tex', 'r', encoding=encoding) as f:
tex_data_lines = f.readlines()
- inst = 0
+ code_iter = itertools.chain(cc_begin_list, code_list, cc_end_list)
for n, line in enumerate(tex_data_lines):
if line.rstrip() == '\\begin{juliaterm}':
- tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(inst)
- inst += 1
+ c = next(code_iter)
+ tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(c.instance)
if n != 0:
tex_data_lines[n-1] = ''
if line.rstrip() == '\\end{juliaterm}':
@@ -1583,6 +1616,29 @@
tex_data_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
with open(out_file_name, 'w', encoding=encoding) as f:
f.write(''.join(tex_data_lines))
+ elif family == 'Rcon':
+ with open(out_file_name, 'r', encoding=encoding) as f:
+ stdout_lines = f.readlines()
+ for n, line in enumerate(stdout_lines):
+ if line.startswith('> =>PYTHONTEX:'):
+ stdout_lines[n] = line[2:]
+ elif '> write("=>PYTHONTEX:' in line:
+ if line.startswith('> write("=>PYTHONTEX:'):
+ stdout_lines[n] = ''
+ else:
+ # cat() and similar functions can result in the
+ # prompt not being at the start of a new line. In
+ # that case, preserve the prompt to accurately
+ # emulate the console. If there is a following
+ # console environment, this effectively amounts
+ # to adding an extra empty line (pressing ENTER)
+ # between the two.
+ stdout_lines[n] = line.split('write("=>PYTHONTEX:', 1)[0]
+ while stdout_lines and (stdout_lines[-1].startswith('>') and not stdout_lines[-1][1:].strip(' \n')):
+ stdout_lines.pop()
+ stdout_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n')
+ with open(out_file_name, 'w', encoding=encoding) as f:
+ f.write(''.join(stdout_lines))
f = open(out_file_name, 'r', encoding=encoding)
out = f.read()
@@ -1640,7 +1696,7 @@
else:
dependencies[dep] = (os.path.getmtime(dep_file), '')
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
from pygments import highlight
from pygments.lexers import get_lexer_by_name
from pygments.formatters import LatexFormatter
@@ -1655,16 +1711,21 @@
for block in out.split('=>PYTHONTEX:STDOUT#')[1:]:
if block:
delims, content = block.split('#\n', 1)
+ if content and not content.endswith('\n'):
+ # Content might not end with a newline. For example,
+ # Rcon with something like cat() as the last function.
+ content += '\n'
instance, command = delims.split('#')
if content or command in ('s', 'sub'):
if instance.endswith('CC'):
- messages.append('* PythonTeX warning')
- messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
- messages.append(' This is not supported; use a normal code command or environment')
- messages.append(' The following content was written:')
- messages.append('')
- messages.extend([' ' + l for l in content.splitlines()])
- warnings += 1
+ if family not in ('juliacon', 'Rcon'):
+ messages.append('* PythonTeX warning')
+ messages.append(' Custom code for "' + family + '" attempted to print or write to stdout')
+ messages.append(' This is not supported; use a normal code command or environment')
+ messages.append(' The following content was written:')
+ messages.append('')
+ messages.extend([' ' + l for l in content.splitlines()])
+ warnings += 1
elif command == 'i':
content = r'\pytx@SVMCR{pytx@MCR@' + key_run.replace('#', '@') + '@' + instance + '}\n' + content.rstrip('\n') + '\\endpytx@SVMCR\n\n'
macros.append(content)
@@ -1682,7 +1743,7 @@
# Remove newline added by printing, prevent
# LaTeX from adding a space after content
content = content.rsplit('\n', 1)[0] + '\\endinput\n'
- if family == 'juliacon':
+ if family in ('juliacon', 'Rcon'):
content = highlight(content, lexer[family], formatter[family])
f.write(content)
f.close()
@@ -1693,7 +1754,7 @@
messages.append('* PythonTeX error')
messages.append(' Missing stderr file for ' + key_run.replace('#', ':'))
errors += 1
- elif family == 'juliacon':
+ elif family in ('juliacon', 'Rcon'):
pass
else:
# Open error and code files.
@@ -1733,7 +1794,7 @@
index_next = index_now
start_errgobble = None
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
# or separate messages.
@@ -1779,7 +1840,7 @@
# both the error and warning patterns, default to
# error.
past_line = err_ud[index]
- if (index < n and basename in past_line):
+ if (index < n and basename in past_line and (family not in ('perlsix', 'psix') or '.p6:' in past_line or '.p6 line' in past_line)):
break
for pattern in warningsig:
if pattern in past_line:
@@ -1843,8 +1904,9 @@
index_now_last = index_now
index_next_last = index_next
err_key_last_int = -1
+ p6_sorry_search = False
for n, line in enumerate(err_ud):
- if basename in line:
+ if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
# Determine the corresponding line number in the document
found = False
for pattern in linesig:
@@ -1906,6 +1968,35 @@
line = line.replace(fullbasename + '.' + extension, '<file>')
elif stderrfilename == 'genericscript':
line = line.replace(fullbasename + '.' + extension, '<script>')
+ if family in ('perlsix', 'psix'):
+ # Perl 6 "SORRY!" errors during compiling
+ # (before execution) need special processing,
+ # since they lack stderr delims and must
+ # include lines before the current one.
+ if p6_sorry_search: # Already handled
+ pass
+ else:
+ p6_sorry_search = True
+ p6_sorry_index = n - 1
+ while p6_sorry_index >= 0:
+ if not err_ud[p6_sorry_index].startswith('===SORRY!==='):
+ p6_sorry_index -= 1
+ continue
+ if errlinenum > index_now[1].lines_total + index_now[1].lines_input:
+ p6_linenum_offset = index_now[1].lines_total
+ else:
+ p6_linenum_offset = index_now[1].lines_total - index_now[1].lines_user + index_now[1].inline_count
+ p6_preceding_err_lines = [sub(r'line ([1-9][0-9]*)', lambda m: 'line {0}'.format(int(m.group(1)) - p6_linenum_offset), x) for x in err_ud[p6_sorry_index:n]]
+ if stderrfilename == 'full':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, basename)
+ elif stderrfilename == 'session':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename, session)
+ elif stderrfilename == 'genericfile':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<file>')
+ elif stderrfilename == 'genericscript':
+ p6_preceding_err_lines[0] = p6_preceding_err_lines[0].replace(fullbasename + '.' + extension, '<script>')
+ err_dict[err_key].extend(p6_preceding_err_lines)
+ break
err_dict[err_key].append(line)
elif process:
err_dict[err_key].append(line)
@@ -1967,7 +2058,7 @@
# Never process delimiting info until it is used
# Rather, store the index of the last delimiter
last_delim = line
- elif basename in line:
+ elif basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found_basename = True
# Get the gobbleation. This is used to determine if
# other lines containing the basename are a continuation,
@@ -2122,7 +2213,7 @@
else:
process = True
err_key = basename + '_' + instance
- elif process and basename in line:
+ elif process and basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line):
found = False
for pattern in linesig:
try:
@@ -2297,6 +2388,8 @@
if codetype != ':GLOBAL':
p = pygments_settings[codetype]['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings[codetype]['lexer'] == 'pycon':
+ p['python3'] = True
formatter[codetype] = LatexFormatter(**p)
lexer[codetype] = get_lexer_by_name(pygments_settings[codetype]['lexer'], **p)
@@ -2503,6 +2596,8 @@
from pygments.formatters import LatexFormatter
p = pygments_settings['formatter_options'].copy()
p['commandprefix'] = 'PYG'
+ if pygments_settings['lexer'] == 'pycon':
+ p['python3'] = True
formatter = LatexFormatter(**p)
lexer = get_lexer_by_name(pygments_settings['lexer'], **p)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pythontex/pythontex_engines.py new/texmf-dist/scripts/pythontex/pythontex_engines.py
--- old/texmf-dist/scripts/pythontex/pythontex_engines.py 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/scripts/pythontex/pythontex_engines.py 2019-09-24 22:07:38.000000000 +0200
@@ -17,7 +17,7 @@
-Copyright (c) 2012-2017, Geoffrey M. Poore
+Copyright (c) 2012-2018, Geoffrey M. Poore
All rights reserved.
Licensed under the BSD 3-Clause License:
http://www.opensource.org/licenses/BSD-3-Clause
@@ -33,7 +33,8 @@
from collections import OrderedDict, namedtuple
-interpreter_dict = {k:k for k in ('python', 'ruby', 'julia', 'octave', 'bash', 'sage', 'rustc')}
+interpreter_dict = {k:k for k in ('python', 'ruby', 'julia', 'octave', 'bash',
+ 'sage', 'rustc', 'Rscript', 'perl', 'perl6')}
# The {file} field needs to be replaced by itself, since the actual
# substitution of the real file can only be done at runtime, whereas the
# substitution for the interpreter should be done when the engine is
@@ -194,7 +195,7 @@
if not isinstance(l, str):
raise TypeError('CodeEngine needs "linenumbers" to contain strings')
# Need to replace tags
- linenumbers = [l.replace('{number}', r'(\d+)') for l in linenumbers]
+ linenumbers = [r'(\d+)'.join(re.escape(x) for x in l.split('{number}')) if '{number}' in l else l for l in linenumbers]
self.linenumbers = linenumbers
# Type check lookbehind
@@ -950,7 +951,7 @@
# Currently, Julia only supports UTF-8
# So can't set stdout and stderr encoding
- type JuliaTeXUtils
+ mutable struct JuliaTeXUtils
id::AbstractString
family::AbstractString
session::AbstractString
@@ -983,8 +984,8 @@
function JuliaTeXUtils()
self = new()
self.self = self
- self._dependencies = Array(AbstractString, 0)
- self._created = Array(AbstractString, 0)
+ self._dependencies = AbstractString[]
+ self._created = AbstractString[]
self._context_raw = ""
function formatter(expr)
@@ -1095,7 +1096,7 @@
jltex.line = "{line}"
println("{stdoutdelim}")
- write(STDERR, "{stderrdelim}\\n")
+ write(stderr, "{stderrdelim}\\n")
jltex.before()
{code}
@@ -1267,6 +1268,7 @@
octave_template, octave_wrapper, 'disp({code})', octave_sub,
'error', 'warning', 'line {number}')
+
bash_template = '''
cd "{workingdir}"
{body}
@@ -1297,7 +1299,7 @@
use std::{{borrow, collections, fmt, fs, io, iter, ops, path}};
use self::OpenMode::{{ReadMode, WriteMode, AppendMode, TruncateMode, CreateMode, CreateNewMode}};
pub struct UserAction<'u> {{
- _act: Box<FnMut() + 'u>
+ _act: Box<dyn FnMut() + 'u>
}}
impl<'u> UserAction<'u> {{
pub fn new() -> Self {{
@@ -1323,8 +1325,8 @@
impl<'u, U: Into<UserAction<'u>> + 'u> ops::Add<U> for UserAction<'u> {{
type Output = UserAction<'u>;
fn add(self, f: U) -> Self::Output {{
- let mut self_act: Box<FnMut() + 'u> = self._act;
- let mut other_act: Box<FnMut() + 'u> = f.into()._act;
+ let mut self_act: Box<dyn FnMut() + 'u> = self._act;
+ let mut other_act: Box<dyn FnMut() + 'u> = f.into()._act;
Self::from(move || {{ self_act.as_mut()(); other_act.as_mut()(); }})
}}
}}
@@ -1335,7 +1337,7 @@
}}
}}
impl<'u> ops::Deref for UserAction<'u> {{
- type Target = FnMut() + 'u;
+ type Target = dyn FnMut() + 'u;
fn deref(&self) -> &Self::Target {{
&*self._act
}}
@@ -1346,7 +1348,7 @@
}}
}}
pub struct RustTeXUtils<'u> {{
- _formatter: Box<FnMut(&fmt::Display) -> String + 'u>,
+ _formatter: Box<dyn FnMut(&dyn fmt::Display) -> String + 'u>,
pub before: UserAction<'u>,
pub after: UserAction<'u>,
pub family: &'u str,
@@ -1410,7 +1412,7 @@
impl<'u> RustTeXUtils<'u> {{
pub fn new() -> Self {{
RustTeXUtils {{
- _formatter: Box::new(|x: &fmt::Display| format!("{{}}", x)),
+ _formatter: Box::new(|x: &dyn fmt::Display| format!("{{}}", x)),
before: UserAction::new(),
after: UserAction::new(),
family: "{family}",
@@ -1428,7 +1430,7 @@
pub fn formatter<A: fmt::Display>(&mut self, x: A) -> String {{
(self._formatter)(&x)
}}
- pub fn set_formatter<F: FnMut(&fmt::Display) -> String + 'u>(&mut self, f: F) {{
+ pub fn set_formatter<F: FnMut(&dyn fmt::Display) -> String + 'u>(&mut self, f: F) {{
self._formatter = Box::new(f);
}}
pub fn add_dependencies<SS: IntoIterator>(&mut self, deps: SS)
@@ -1541,3 +1543,208 @@
created='{File}.exe')
SubCodeEngine('rust', 'rs')
+
+
+r_template = '''
+ library(methods)
+ setwd("{workingdir}")
+ pdf(file=NULL)
+ {body}
+ write("{dependencies_delim}", stdout())
+ write("{created_delim}", stdout())
+ '''
+
+r_wrapper = '''
+ write("{stdoutdelim}", stdout())
+ write("{stderrdelim}", stderr())
+ {code}
+ '''
+
+r_sub = '''
+ write("{field_delim}", stdout())
+ write(toString({field}), stdout())
+ '''
+
+CodeEngine('R', 'R', '.R',
+ '{Rscript} "{file}.R"',
+ r_template, r_wrapper, 'write(toString({code}), stdout())', r_sub,
+ ['error', 'Error'], ['warning', 'Warning'],
+ 'line {number}')
+
+
+rcon_template = '''
+ options(echo=TRUE, error=function(){{}})
+ library(methods)
+ setwd("{workingdir}")
+ pdf(file=NULL)
+ {body}
+ '''
+
+rcon_wrapper = '''
+ write("{stdoutdelim}", stdout())
+ {code}
+ '''
+
+CodeEngine('Rcon', 'R', '.R',
+ '{Rscript} "{file}.R"',
+ rcon_template, rcon_wrapper, '', '',
+ ['error', 'Error'], ['warning', 'Warning'],
+ '')
+
+
+perl_template = '''
+ use v5.14;
+ use utf8;
+ use strict;
+ use autodie;
+ use warnings;
+ use warnings qw(FATAL utf8);
+ use feature qw(unicode_strings);
+ use open qw(:encoding(UTF-8) :std);
+ chdir("{workingdir}");
+ {body}
+ print STDOUT "{dependencies_delim}\\n";
+ print STDOUT "{created_delim}\\n";
+ '''
+
+perl_wrapper = '''
+ print STDOUT "{stdoutdelim}\\n";
+ print STDERR "{stderrdelim}\\n";
+ {code}
+ '''
+
+perl_sub = '''
+ print STDOUT "{field_delim}\\n";
+ print STDOUT "" . ({field});
+ '''
+
+CodeEngine('perl', 'perl', '.pl',
+ '{perl} "{file}.pl"',
+ perl_template, perl_wrapper, 'print STDOUT "" . ({code});', perl_sub,
+ ['error', 'Error'], ['warning', 'Warning'],
+ 'line {number}')
+
+SubCodeEngine('perl', 'pl')
+
+
+perl6_template = '''
+ use v6;
+ chdir("{workingdir}");
+ {body}
+ put "{dependencies_delim}";
+ put "{created_delim}";
+ '''
+
+perl6_wrapper = '''
+ put "{stdoutdelim}";
+ note "{stderrdelim}";
+ {code}
+ '''
+
+perl6_sub = '''
+ put "{field_delim}";
+ put ({field});
+ '''
+
+CodeEngine('perlsix', 'perl6', '.p6',
+ '{perl6} "{File}.p6"',
+ perl6_template, perl6_wrapper, 'put ({code});', perl6_sub,
+ ['error', 'Error', 'Cannot'], ['warning', 'Warning'],
+ ['.p6:{number}', '.p6 line {number}'], True)
+
+SubCodeEngine('perlsix', 'psix')
+
+javascript_template = '''
+ jstex = {{
+ before : function () {{ }},
+ after : function () {{ }},
+ _dependencies : [ ],
+ _created : [ ],
+ add_dependencies : function () {{
+ jstex._dependencies = jstex._dependencies.concat(
+ Array.prototype.slice.apply( arguments ) );
+ }},
+ add_created : function () {{
+ jstex._created = jstex._created.concat(
+ Array.prototype.slice.apply( arguments ) );
+ }},
+ cleanup : function () {{
+ console.log( "{dependencies_delim}" );
+ jstex._dependencies.map(
+ dep => console.log( dep ) );
+ console.log( "{created_delim}" );
+ jstex._dependencies.map(
+ cre => console.log( cre ) );
+ }},
+ formatter : function ( x ) {{
+ return String( x );
+ }},
+ escape : function ( x ) {{
+ return String( x ).replace( /_/g, '\\\\_' )
+ .replace( /\\$/g, '\\\\$' )
+ .replace( /\\^/g, '\\\\^' );
+ }},
+ docdir : process.cwd(),
+ context : {{ }},
+ _context_raw : '',
+ set_context : function ( expr ) {{
+ if ( expr != '' && expr != jstex._context_raw ) {{
+ jstex.context = {{ }};
+ expr.split( ',' ).map( pair => {{
+ const halves = pair.split( '=' );
+ jstex.context[halves[0].trim()] = halves[1].trim();
+ }} );
+ }}
+ }}
+ }};
+
+ try {{
+ process.chdir( "{workingdir}" );
+ }} catch ( e ) {{
+ if ( process.argv.indexOf( '--manual' ) == -1 )
+ console.error( e );
+ }}
+ if ( module.paths.indexOf( jstex.docdir ) == -1 )
+ module.paths.unshift( jstex.docdir );
+
+ {extend}
+
+ jstex.id = "{family}_{session}_{restart}";
+ jstex.family = "{family}";
+ jstex.session = "{session}";
+ jstex.restart = "{restart}";
+
+ {body}
+
+ jstex.cleanup();
+ '''
+
+javascript_wrapper = '''
+ jstex.command = "{command}";
+ jstex.set_context( "{context}" );
+ jstex.args = "{args}";
+ jstex.instance = "{instance}";
+ jstex.line = "{line}";
+
+ console.log( "{stdoutdelim}" );
+ console.error( "{stderrdelim}" );
+ jstex.before();
+
+ {code}
+
+ jstex.after();
+ '''
+
+javascript_sub = '''
+ console.log( "{field_delim}" );
+ console.log( {field} );
+ '''
+
+CodeEngine('javascript', 'javascript', '.js',
+ 'node "{file}.js"',
+ javascript_template, javascript_wrapper,
+ 'console.log( jstex.formatter( {code} ) )',
+ javascript_sub,
+ ['error', 'Error'], ['warning', 'Warning'],
+ ':{number}')
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/pythontex/pythontex.sty new/texmf-dist/tex/latex/pythontex/pythontex.sty
--- old/texmf-dist/tex/latex/pythontex/pythontex.sty 2017-07-22 00:00:53.000000000 +0200
+++ new/texmf-dist/tex/latex/pythontex/pythontex.sty 2019-09-24 22:07:38.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2012-2016 by Geoffrey M. Poore <gpoore(a)gmail.com>
+%% Copyright (C) 2012-2019 by Geoffrey M. Poore <gpoore(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,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pythontex}
- [2017/07/20 v0.16 execute and typeset Python code and other languages]
-
+ [2019/09/22 v0.17 execute and typeset Python code and other languages]
\newcommand{\pytx@packagename}{PythonTeX}
-\newcommand{\pytx(a)packageversion}{0.16}
+\newcommand{\pytx(a)packageversion}{0.17}
\RequirePackage{fvextra}
\RequirePackage{etoolbox}
\RequirePackage{xstring}
@@ -847,7 +846,7 @@
}%
\xdef\pytx@type{CC:#2:#1}%
\edef\pytx@cmd{c}%
- \def\pytx@context{}%
+ \pytx@SetContext
\def\pytx@group{none}%
\let\pytx@InlineShow\@empty
\let\pytx@InlineSave\pytx@InlineSaveCode
@@ -1038,6 +1037,22 @@
}%
{\end{VerbatimOut}%
\xdef\pytx@stdfile{\pytx@type_\pytx@session_\pytx@group_\arabic{\pytx@counter}}%
+ \ifcsname pytx@nonpyconsole@\pytx@type\endcsname
+ \ifcsname pytx@code@as@console\endcsname
+ \setcounter{FancyVerbLine}{\value{\pytx@linecount}}%
+ \pytx@FVSet
+ \ifdefstring{\pytx@fvopttmp}{}{}{\expandafter\fvset\expandafter{\pytx@fvopttmp}}%
+ \pytx@ConfigPygments
+ \InputIfFileExists{\pytx@outputdir/\pytx@stdfile.stdout}%
+ {\DepyFile{p:\pytx@outputdir/\pytx@stdfile.stdout}}%
+ {\par\textbf{??~\pytx@packagename~??}\par
+ \PackageWarning{\pytx@packagename}{Non-existent console content}}%
+ \setcounter{\pytx@linecount}{\value{FancyVerbLine}}%
+ \else
+ \fi
+ \let\pytx@EnvAutoprint\relax
+ \else
+ \fi
\setcounter{FancyVerbLine}{\value{pytx@FancyVerbLineTemp}}%
\stepcounter{\pytx@counter}%
\pytx@EnvAutoprint
@@ -1047,12 +1062,16 @@
\ifstrempty{#1}{\edef\pytx@session{default}}{\StrSubstitute{#1}{:}{-}[\pytx@session]}%
\xdef\pytx@counter{pytx@\pytx@type @\pytx@session @\pytx@group}%
\pytx@CheckCounter{\pytx@counter}%
+ \edef\pytx@linecount{\pytx@counter @line}%
+ \pytx@CheckCounter{\pytx@linecount}%
\pytx@WriteCodefileInfo
\begingroup
\obeylines
\@ifnextchar[{\endgroup\pytx@BeginCodeEnv@i}{\endgroup\pytx@BeginCodeEnv@i[]}%
}%
\def\pytx@BeginCodeEnv@i[#1]{%
+ \def\pytx@fvopttmp{#1}%
+ \def\pytx@argspprint{#1}%
\setcounter{pytx@FancyVerbLineTemp}{\value{FancyVerbLine}}%
\let\FVB@VerbatimOut\pytx@FVB@VerbatimOut
\let\FVE@VerbatimOut\pytx@FVE@VerbatimOut
@@ -1069,7 +1088,7 @@
}%
\xdef\pytx@type{CC:#2:#1}%
\edef\pytx@cmd{code}%
- \def\pytx@context{}%
+ \pytx@SetContext
\def\pytx@group{none}%
\pytx@BeginCodeEnv[none]}%
{\end{VerbatimOut}%
@@ -1079,7 +1098,7 @@
\newcommand{\pytx@MakeSubFV}[1]{%
\expandafter\newenvironment{#1sub}{%
\VerbatimEnvironment
- \Depythontex{env:#1sub:om|:p}%
+ \Depythontex{env:#1sub:oo|:p}%
\xdef\pytx@type{#1}%
\edef\pytx@cmd{sub}%
\pytx@SetContext
@@ -1266,6 +1285,27 @@
\newcounter{pytx@#2@default@default}%
}
\@onlypreamble\makepythontexfamily
+\newcommand{\makepythontexfamily@con}[2][text]{%
+ \pgfkeys{/PYTX/family, name=#2con, default, pyglexer=#1, console=true}%
+ \expandafter\xdef\csname pytx@macroformatter@#2con\endcsname{\pytx@tmp@pprinter}%
+ \expandafter\gdef\csname pytx@fvsettings@#2con\endcsname{}%
+ \expandafter\xdef\csname pytx@pyglexer@#2con\endcsname{\pytx@tmp@pyglexer}%
+ \expandafter\xdef\csname pytx@pygopt@#2con\endcsname{\pytx@tmp@pygopt}%
+ \expandafter\xdef\csname pytx@console@#2con\endcsname{\pytx@tmp@console}%
+ \AtEndDocument{\immediate\write\pytx@codefile{pygfamily=#2con|%
+ \csname pytx@pyglexer@#2con\endcsname|%
+ \csname pytx@pygopt@#2con\endcsname}%
+ }%
+ \pytx@MakeCodeFV{#2con}%
+ \expandafter\global\expandafter\let\csname pytx@nonpyconsole@#2con\endcsname\relax
+ \newenvironment{#2console}%
+ {\VerbatimEnvironment
+ \def\pytx@type{#2con}%
+ \let\pytx@code@as@console\relax
+ \begin{#2concode}}%
+ {\end{#2concode}}%
+}
+
\newcommand{\setpythontexpyglexer}[2][]{%
\Depythontex{cmd:setpythontexpyglexer:om:n}%
\ifstrempty{#1}{\def\pytx@pyglexer{#2}}{%
@@ -1308,34 +1348,17 @@
}%
}
\@onlypreamble\setpythontexprettyprinter
-\makepythontexfamily[pyglexer=python]{py}
+\makepythontexfamily[pyglexer=python3]{py}
\makepythontexfamily[pyglexer=pycon, console=true]{pycon}
-\makepythontexfamily[pyglexer=python]{sympy}
+\makepythontexfamily[pyglexer=python3]{sympy}
\makepythontexfamily[pyglexer=pycon, console=true]{sympycon}
-\makepythontexfamily[pyglexer=python]{pylab}
+\makepythontexfamily[pyglexer=python3]{pylab}
\makepythontexfamily[pyglexer=pycon, console=true]{pylabcon}
\renewcommand{\do}[1]{%
\ifstrequal{#1}{ruby}{\makepythontexfamily[pyglexer=ruby]{ruby}}{}%
\ifstrequal{#1}{rb}{\makepythontexfamily[pyglexer=ruby]{rb}}{}%
\ifstrequal{#1}{julia}{\makepythontexfamily[pyglexer=julia]{julia}}{}%
- \ifstrequal{#1}{juliacon}{\pgfkeys{/PYTX/family, name=juliacon, default, pyglexer=jlcon}%
- \expandafter\xdef\csname pytx@macroformatter@juliacon\endcsname{\pytx@tmp@pprinter}%
- \expandafter\gdef\csname pytx@fvsettings@juliacon\endcsname{}%
- \expandafter\xdef\csname pytx@pyglexer@juliacon\endcsname{\pytx@tmp@pyglexer}%
- \expandafter\xdef\csname pytx@pygopt@juliacon\endcsname{\pytx@tmp@pygopt}%
- \expandafter\xdef\csname pytx@console@juliacon\endcsname{\pytx@tmp@console}%
- \AtEndDocument{\immediate\write\pytx@codefile{pygfamily=juliacon|%
- \csname pytx@pyglexer@juliacon\endcsname|%
- \csname pytx@pygopt@juliacon\endcsname}%
- }%
- \pytx@MakeCodeFV{juliacon}%
- \newenvironment{juliaconsole}%
- {\VerbatimEnvironment
- \def\pytx@type{juliacon}%
- \pytx@ConfigPygments
- \begin{juliaconcode}}%
- {\end{juliaconcode}%
- \ifbool{pytx@opt@autoprint}{}{\printpythontex{}}}}{}%
+ \ifstrequal{#1}{juliacon}{\makepythontexfamily@con[jlcon]{julia}}{}%
\ifstrequal{#1}{jl}{\makepythontexfamily[pyglexer=julia]{jl}}{}%
\ifstrequal{#1}{matlab}{\makepythontexfamily[pyglexer=matlab]{matlab}}{}%
\ifstrequal{#1}{octave}{\makepythontexfamily[pyglexer=octave]{octave}}{}%
@@ -1343,6 +1366,14 @@
\ifstrequal{#1}{sage}{\makepythontexfamily[pyglexer=sage]{sage}}{}%
\ifstrequal{#1}{rust}{\makepythontexfamily[pyglexer=rust]{rust}}{}%
\ifstrequal{#1}{rs}{\makepythontexfamily[pyglexer=rust]{rs}}{}%
+ \ifstrequal{#1}{R}{\makepythontexfamily[pyglexer=r]{R}}{}%
+ \ifstrequal{#1}{Rcon}{\makepythontexfamily@con[rconsole]{R}}{}%
+ \ifstrequal{#1}{perl}{\makepythontexfamily[pyglexer=perl]{perl}}{}%
+ \ifstrequal{#1}{pl}{\makepythontexfamily[pyglexer=perl]{pl}}{}%
+ \ifstrequal{#1}{perlsix}{\makepythontexfamily[pyglexer=perl6]{perlsix}}{}%
+ \ifstrequal{#1}{psix}{\makepythontexfamily[pyglexer=perl6]{psix}}{}%
+ \ifstrequal{#1}{javascript}{\makepythontexfamily[pyglexer=js]{javascript}}{}%
+ \ifstrequal{#1}{js}{\makepythontexfamily[pyglexer=js]{js}}{}%
}
\expandafter\docsvlist\expandafter{\pytx@families}
\newbool{pytx@listingenv}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pythontex.tlpobj new/tlpkg/tlpobj/pythontex.tlpobj
--- old/tlpkg/tlpobj/pythontex.tlpobj 2019-02-28 04:03:54.000000000 +0100
+++ new/tlpkg/tlpobj/pythontex.tlpobj 2019-09-25 01:54:00.000000000 +0200
@@ -1,6 +1,6 @@
name pythontex
category Package
-revision 44860
+revision 52174
shortdesc Run Python from within a document, typesetting the results
longdesc The package allows you to enter Python code within a LaTeX
longdesc document, execute the code, and access its output in the
@@ -18,7 +18,7 @@
longdesc useful for journal submissions, sharing documents, and
longdesc conversion to other formats.
depend pythontex.ARCH
-runfiles size=149
+runfiles size=154
texmf-dist/scripts/pythontex/depythontex.py
texmf-dist/scripts/pythontex/depythontex2.py
texmf-dist/scripts/pythontex/depythontex3.py
@@ -33,7 +33,7 @@
catalogue-also perltex
catalogue-contact-repository https://github.com/gpoore/pythontex
catalogue-ctan /macros/latex/contrib/pythontex
-catalogue-date 2017-07-21 08:12:38 +0200
+catalogue-date 2019-09-24 06:33:07 +0200
catalogue-license lppl1.3
catalogue-topics callback
-catalogue-version 0.16
+catalogue-version 0.17
++++++ pythontex_p2top3.dif ++++++
---
texmf-dist/doc/latex/pythontex/syncpdb.py | 2 +-
texmf-dist/scripts/pythontex/depythontex.py | 2 +-
texmf-dist/scripts/pythontex/pythontex.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- texmf-dist/scripts/pythontex/depythontex.py
+++ texmf-dist/scripts/pythontex/depythontex.py 2020-04-27 06:50:32.466503766 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
'''
--- texmf-dist/scripts/pythontex/pythontex.py
+++ texmf-dist/scripts/pythontex/pythontex.py 2020-04-27 06:50:21.926703761 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
'''
--- texmf-dist/doc/latex/pythontex/syncpdb.py
+++ texmf-dist/doc/latex/pythontex/syncpdb.py 2020-04-27 07:49:15.051750705 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
'''
++++++ quantikz.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quantikz.doc.tlpobj new/tlpkg/tlpobj/quantikz.doc.tlpobj
--- old/tlpkg/tlpobj/quantikz.doc.tlpobj 2019-04-09 01:38:46.000000000 +0200
+++ new/tlpkg/tlpobj/quantikz.doc.tlpobj 2019-05-03 01:40:29.000000000 +0200
@@ -1,6 +1,6 @@
name quantikz.doc
category Package
-revision 50869
+revision 50934
shortdesc doc files of quantikz
relocated 1
docfiles size=139
++++++ quantikz.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/quantikz/tikzlibraryquantikz.code.tex new/tex/latex/quantikz/tikzlibraryquantikz.code.tex
--- old/tex/latex/quantikz/tikzlibraryquantikz.code.tex 2019-04-08 21:58:26.000000000 +0200
+++ new/tex/latex/quantikz/tikzlibraryquantikz.code.tex 2019-05-03 00:35:08.000000000 +0200
@@ -4,6 +4,8 @@
% If you find this library useful, please cite its usage in your work, using arXiv:1809.03842, and possibly the DOI: 10.17637/rh.7000520.
% Usage is at your own risk.
+%version 0.9.5:
+% fixed bug which meant multi-wire gates didn't work outside of an environment such as center.
%version 0.9.4:
% added nwires and cwires options to gate command to simulate qcircuit's nphantom and cphantom
% vertical text options for slice labels.
@@ -30,7 +32,7 @@
%version 0.9.0:
%original release.
-\ProvidesPackage{quantikz}[2019/03/18 typeset quantum circuit diagrams]
+\ProvidesPackage{quantikz}[2019/04/24 typeset quantum circuit diagrams]
% Package(s) to include
\RequirePackage{xargs,ifthen,xstring,xparse,etoolbox,mathtools}
@@ -97,12 +99,12 @@
\expandafter\@temp\endtikzcd
}
\def\temp{&} \catcode`&=\active \let&=\temp
-
+%
%commands for putting in text vertically
\protected\def\vvv#1{\leavevmode\bgroup\vbox\bgroup\xvvv#1\relax}
-
+%
\def\xvvv{\afterassignment\xxvvv\let\tmp= }
-
+%
\def\xxvvv{%
% \ifx\tmp\@sptoken\egroup\ \vbox\bgroup\let\next\xvvv
% \else
@@ -112,7 +114,7 @@
\let\next\xvvv\fi%\fi
\next}
%end of commands for putting text vertically
-
+%
\long\def\ifnodedefined#1#2#3{%
\@ifundefined{pgf@sh@ns@#1}{#3}{#2}%
}
@@ -126,63 +128,63 @@
%the main gate command
\DeclareExpandableDocumentCommand{\gate}{O{}O{1.5pt}O{1.5pt}m}{%optional parameter contains styling info. compulsory is gate text.
- |[inner sep=4pt,minimum width=#2,minimum height=#3]|
- \edef\n{\the\pgfmatrixcurrentrow} %the row
- \edef\m{\the\pgfmatrixcurrentcolumn} %the column
- %resent macros that are going to be set by the options
- \edef\options{row=\n,col=\m,#1}
- \def\toswap{0}%
- \def\DisableMinSize{0}%
- \pgfkeys{/quantikz,wires=1,style=,label style=,braces=}%
- %import options passed as parameters
- \pgfkeys{/quantikz,#1}%
- \pgfkeysgetvalue{/quantikz/wires}{\quantwires}
- \pgfkeysgetvalue{/quantikz/style}{\a}
- \pgfkeysgetvalue{/quantikz/label style}{\b}
- \pgfkeysgetvalue{/quantikz/cwires}{\mylist}
- \pgfkeysgetvalue{/quantikz/nwires}{\nowires}
- \ifthenelse{\toswap=1}{%if it's a swap gate...
- \def\quantwires{2}
- \phantom{wide}
- \settowidth{\myl}{$wide$}
- \settoheight{\myh}{$wide$}
- \settodepth{\myd}{$wide$}
- }{%not a swap gate
- \settowidth{\myl}{$#4$}
- \ifthenelse{\DisableMinSize=1}{%disable automatic size detection. Use $U$ instead.
- \phantom{U}
- \settoheight{\myh}{$U$}
- \settodepth{\myd}{$U$}
- }{%automatically get width and height of label
- \phantom{#4}
- \settoheight{\myh}{$#4$}
- \settodepth{\myd}{$#4$}
- }
- }
+ |[inner sep=4pt,minimum width=#2,minimum height=#3]|%
+ \edef\n{\the\pgfmatrixcurrentrow} %the row
+ \edef\m{\the\pgfmatrixcurrentcolumn} %the column
+ %reset macros that are going to be set by the options
+ \edef\options{row=\n,col=\m,#1}
+ \def\toswap{0}%
+ \def\DisableMinSize{0}%
+ \pgfkeys{/quantikz,wires=1,style=,label style=,braces=}%
+ %import options passed as parameters
+ \pgfkeys{/quantikz,#1}%
+ \pgfkeysgetvalue{/quantikz/wires}{\quantwires}
+ \pgfkeysgetvalue{/quantikz/style}{\a}
+ \pgfkeysgetvalue{/quantikz/label style}{\b}
+ \pgfkeysgetvalue{/quantikz/cwires}{\mylist}
+ \pgfkeysgetvalue{/quantikz/nwires}{\nowires}
+ \ifthenelse{\toswap=1}{%if it's a swap gate...
+ \def\quantwires{2}
+ \phantom{wide}
+ \settowidth{\myl}{$wide$}
+ \settoheight{\myh}{$wide$}
+ \settodepth{\myd}{$wide$}
+ }{%not a swap gate
+ \settowidth{\myl}{$#4$}
+ \ifthenelse{\DisableMinSize=1}{%disable automatic size detection. Use $U$ instead.
+ \phantom{U}
+ \settoheight{\myh}{$U$}
+ \settodepth{\myd}{$U$}
+ }{%automatically get width and height of label
+ \phantom{#4}
+ \settoheight{\myh}{$#4$}
+ \settodepth{\myd}{$#4$}
+ }
+ }
%
- \IfInList{1}{\mylist}{\cw}{\IfInList{1}{\nowires}{}{\qw}}%do we need classical, no wire, or quantum wire?
- \edef\k{\the\numexpr\n+\quantwires-1\relax}
- \edef\mn{\the\numexpr\m-1\relax}
- \ifthenelse{\quantwires=1}{}{%more than 1 wire on gate. iterate through each wire
- \foreach \i in {\the\numexpr\n+1\relax,...,\k} {
- \edef\newcom{\noexpand\vcwhexplicit{\i-\m}{\i-\mn}}
- \edef\newcomb{\noexpand\vqwexplicit{\i-\m}{\i-\mn}}
- \edef\val{\the\numexpr\i+1-\n\relax}
- \IfInList{\val}{\mylist}{\newcom}{\IfInList{\val}{\nowires}{}{\newcomb}}%do we need classical, no wire, or quantum wire?
- %apply auto width to the cell, and make sure we unset the setting so that it doesn't apply to later circuits.
- \globaldefs=1
- \edef\dotikzset{\noexpand\tikzset{row \i\space column \m/.append style={minimum width={max(\the\myl+8pt,#2)}}}}
- \dotikzset
- \edef\undotikzset{\noexpand\tikzset{row \i\space column \m/.style={}}}
- \expandafter\pgfutil@g@addto@macro\expandafter\tikzcd@atendglobals\expandafter{\undotikzset}
- }
- %apply auto height to last row only. unsetting already handled above.
- \globaldefs=1
- \edef\dotikzset{\noexpand\tikzset{row \k\space column \m/.append style={minimum height={max(\the\myh+\the\myd+8pt,#3)}}}}
- \dotikzset
-
- }
- %call deferred gate command.
+ \IfInList{1}{\mylist}{\cw}{\IfInList{1}{\nowires}{}{\qw}}%do we need classical, no wire, or quantum wire?
+ \edef\k{\the\numexpr\n+\quantwires-1\relax}
+ \edef\mn{\the\numexpr\m-1\relax}
+ \ifthenelse{\quantwires=1}{}{%more than 1 wire on gate. iterate through each wire
+ \foreach \i in {\the\numexpr\n+1\relax,...,\k} {
+ \edef\newcom{\noexpand\vcwhexplicit{\i-\m}{\i-\mn}}
+ \edef\newcomb{\noexpand\vqwexplicit{\i-\m}{\i-\mn}}
+ \edef\val{\the\numexpr\i+1-\n\relax}
+ \IfInList{\val}{\mylist}{\newcom}{\IfInList{\val}{\nowires}{}{\newcomb}}%do we need classical, no wire, or quantum wire?
+ %apply auto width to the cell, and make sure we unset the setting so that it doesn't apply to later circuits.
+ \globaldefs=1
+ \edef\dotikzset{\noexpand\tikzset{row \i\space column \m/.append style={minimum width={max(\the\myl+8pt,#2)}}}}
+ \dotikzset
+ \edef\undotikzset{\noexpand\tikzset{row \i\space column \m/.style={}}}
+ \expandafter\pgfutil@g@addto@macro\expandafter\tikzcd@atendglobals\expandafter{\undotikzset}
+ }
+ %apply auto height to last row only. unsetting already handled above.
+ \globaldefs=1
+ \edef\dotikzset{\noexpand\tikzset{row \k\space column \m/.append style={minimum height={max(\the\myh+\the\myd+8pt,#3)}}}}
+ \dotikzset
+%
+ }
+ %call deferred gate command.
\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\pgfutil@g@addto@macro\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\tikzcd@atendsavedpaths\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{%
\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\gate@end\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter{\expandafter\expandafter\expandafter\a\expandafter\expandafter\expandafter}\expandafter\expandafter\expandafter{\expandafter\b\expandafter}\expandafter{\options}{#4}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quantikz.tlpobj new/tlpkg/tlpobj/quantikz.tlpobj
--- old/tlpkg/tlpobj/quantikz.tlpobj 2019-04-09 01:38:46.000000000 +0200
+++ new/tlpkg/tlpobj/quantikz.tlpobj 2019-05-03 01:40:30.000000000 +0200
@@ -1,6 +1,6 @@
name quantikz
category Package
-revision 50869
+revision 50934
shortdesc Draw quantum circuit diagrams
relocated 1
longdesc The purpose of this package is to extend TikZ with the
@@ -9,7 +9,7 @@
RELOC/tex/latex/quantikz/tikzlibraryquantikz.code.tex
catalogue-also qcircuit
catalogue-ctan /graphics/pgf/contrib/quantikz
-catalogue-date 2019-04-08 18:50:41 +0200
+catalogue-date 2019-04-26 19:27:57 +0200
catalogue-license cc-by-4
catalogue-topics graphics pgf-tikz diagram-circ
-catalogue-version 0.9.4
+catalogue-version 0.9.5
++++++ quattrocento.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/quattrocento/README new/doc/fonts/quattrocento/README
--- old/doc/fonts/quattrocento/README 2019-04-03 23:18:18.000000000 +0200
+++ new/doc/fonts/quattrocento/README 2019-10-14 22:45:18.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the quattrocento package, version 2019-04-03.
+This is the README for the quattrocento package, version 2019-10-13.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Quattrocento and Quattrocento Sans families of fonts, designed by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quattrocento.doc.tlpobj new/tlpkg/tlpobj/quattrocento.doc.tlpobj
--- old/tlpkg/tlpobj/quattrocento.doc.tlpobj 2019-04-04 01:24:49.000000000 +0200
+++ new/tlpkg/tlpobj/quattrocento.doc.tlpobj 2020-03-24 02:03:28.000000000 +0100
@@ -1,6 +1,6 @@
name quattrocento.doc
category Package
-revision 50729
+revision 54512
shortdesc doc files of quattrocento
relocated 1
docfiles size=31
++++++ quattrocento.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/quattrocento/quattrocento.sty new/tex/latex/quattrocento/quattrocento.sty
--- old/tex/latex/quattrocento/quattrocento.sty 2019-04-03 23:18:18.000000000 +0200
+++ new/tex/latex/quattrocento/quattrocento.sty 2019-10-14 22:45:18.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesPackage{quattrocento}[%
- 2019/04/03 (Bob Tennent) Supports Quattrocento(Sans) fonts for all LaTeX engines. ]
+ 2019/10/13 (Bob Tennent) Supports Quattrocento(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -90,14 +90,14 @@
\def\quattrocentosffamily{QuattrocentoSans-TLF}
\ifquattrocento@rm
- \edef\bfseries@rm{bold}
- \edef\mdseries@rm{regular}
+ \edef\bfseries@rm{b}
+ \edef\mdseries@rm{m}
\renewcommand*\rmdefault{\quattrocentofamily}
\fi
\ifquattrocento@sf
- \edef\bfseries@sf{bold}
- \edef\mdseries@sf{regular}
+ \edef\bfseries@sf{b}
+ \edef\mdseries@sf{m}
\renewcommand*\sfdefault{\quattrocentosffamily}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quattrocento.tlpobj new/tlpkg/tlpobj/quattrocento.tlpobj
--- old/tlpkg/tlpobj/quattrocento.tlpobj 2019-04-04 01:24:49.000000000 +0200
+++ new/tlpkg/tlpobj/quattrocento.tlpobj 2020-03-24 02:03:28.000000000 +0100
@@ -1,6 +1,6 @@
name quattrocento
category Package
-revision 50729
+revision 54512
shortdesc LaTeX support for Quattrocento and Quattrocento Sans fonts
relocated 1
longdesc The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
@@ -253,6 +253,5 @@
RELOC/tex/latex/quattrocento/TS1QuattrocentoSans-TLF.fd
RELOC/tex/latex/quattrocento/quattrocento.sty
catalogue-ctan /fonts/quattrocento
-catalogue-date 2019-04-03 18:45:52 +0200
-catalogue-license ofllppl
+catalogue-license ofl lppl
catalogue-topics font font-body font-proportional font-sans font-serif font-t1enc font-type1 font-otf
++++++ quotchap.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/quotchap/README new/doc/latex/quotchap/README
--- old/doc/latex/quotchap/README 2012-10-23 01:24:56.000000000 +0200
+++ new/doc/latex/quotchap/README 2019-07-09 23:10:40.000000000 +0200
@@ -4,9 +4,9 @@
Jan Klever.
Copyright (C) 1998 - 2010 Karsten Tinnefeld.
-Copyright (C) 2011 - 2012 by Jan Klever.
+Copyright (C) 2011 - 2019 by Jan Klever.
-This version is 1.1 of 2012/10/20.
+This version is 1.2 of 2019/07/09.
The documentation is created by running `latex quotchap.dtx`. This
does not need the file quotchap.sty nor postscript fonts, but Frank
@@ -14,7 +14,7 @@
tools package to be found at CTAN.
The file document.tex produces a simple document that demonstrate the use
-of the new commands. This needs the files to be installed and the psnfss
+of the new commands. This needs the files to be installed and the psnfss
package and a postscript output device to be present.
See quotchap.dtx for installation instructions.
Binary files old/doc/latex/quotchap/quotchap.pdf and new/doc/latex/quotchap/quotchap.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quotchap.doc.tlpobj new/tlpkg/tlpobj/quotchap.doc.tlpobj
--- old/tlpkg/tlpobj/quotchap.doc.tlpobj 2019-02-28 04:03:57.000000000 +0100
+++ new/tlpkg/tlpobj/quotchap.doc.tlpobj 2019-07-10 01:53:52.000000000 +0200
@@ -1,9 +1,9 @@
name quotchap.doc
category Package
-revision 28046
+revision 51591
shortdesc doc files of quotchap
relocated 1
-docfiles size=75
+docfiles size=79
RELOC/doc/latex/quotchap/README
RELOC/doc/latex/quotchap/document.pdf
RELOC/doc/latex/quotchap/document.tex
++++++ quotchap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/quotchap/quotchap.sty new/tex/latex/quotchap/quotchap.sty
--- old/tex/latex/quotchap/quotchap.sty 2012-10-23 01:24:56.000000000 +0200
+++ new/tex/latex/quotchap/quotchap.sty 2019-07-09 23:10:40.000000000 +0200
@@ -40,7 +40,7 @@
%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
\ProvidesPackage{quotchap}
- [2012/10/20 v1.1 Decorative Chapter Headings with Quotes]
+ [2019/07/09 v1.2 Decorative Chapter Headings with Quotes]
\newif\if@usecolor\@usecolortrue
\DeclareOption{grey}{\@usecolortrue}
\DeclareOption{nogrey}{\@usecolorfalse}
@@ -91,10 +91,12 @@
\providecommand*{\chapterheadstartvskip}{\vspace*{2.3\baselineskip}}
\providecommand*{\chapterheadendvskip}{\vspace{1.7\baselineskip}}
\providecommand*{\sectfont}{\relax}
+ \providecommand*{\quotefont}{\slshape}
+ \providecommand*{\qauthorfont}{\upshape}
\@ifundefined{@mainmattertrue}{\newif\if@mainmatter\@mainmattertrue}{}}
\newenvironment{savequote}[1][10cm]{%
\begin{lrbox}{\@quotebox}
- \begin{minipage}[t]{#1}\footnotesize\slshape
+ \begin{minipage}[t]{#1}\footnotesize\quotefont
\ignorespaces}{%
\unskip\end{minipage}\end{lrbox}
\global\setbox\@quotebox\copy\@quotebox
@@ -102,7 +104,7 @@
\ignorespacesafterend}
\newcommand{\qauthor}[1]{%
\par\smallskip
- {\raggedleft\upshape #1\qquad\hbox{}\par}\bigskip}
+ {\raggedleft\qauthorfont #1\qquad\hbox{}\par}\bigskip}
\newcommand{\qsetcnfont}[1]{%
\renewcommand*{\@defaultcnfont}{#1}}
\newsavebox{\@quotebox}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quotchap.tlpobj new/tlpkg/tlpobj/quotchap.tlpobj
--- old/tlpkg/tlpobj/quotchap.tlpobj 2019-02-28 04:03:57.000000000 +0100
+++ new/tlpkg/tlpobj/quotchap.tlpobj 2019-07-10 01:53:52.000000000 +0200
@@ -1,6 +1,6 @@
name quotchap
category Package
-revision 28046
+revision 51591
shortdesc Decorative chapter headings
relocated 1
longdesc A package for creating decorative chapter headings with
@@ -9,7 +9,7 @@
runfiles size=2
RELOC/tex/latex/quotchap/quotchap.sty
catalogue-ctan /macros/latex/contrib/quotchap
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license gpl
+catalogue-date 2019-07-09 17:45:58 +0200
+catalogue-license gpl2
catalogue-topics headings
-catalogue-version 1.1
+catalogue-version 1.2
++++++ quran-de.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran-de/README new/doc/xelatex/quran-de/README
--- old/doc/xelatex/quran-de/README 2018-12-31 23:13:58.000000000 +0100
+++ new/doc/xelatex/quran-de/README 2020-03-08 22:54:28.000000000 +0100
@@ -1,6 +1,6 @@
_____________________
The quran-de package
-v0.14
+v0.2
The package is prepared for typesetting some of German translations of the Holy Quran.
The supported translations are done by `Abu Rida Muhammad ibn Ahmad ibn Rassoul',
@@ -8,12 +8,12 @@
For more information, please see the documentation.
-Current version release date: 2018/12/31
+Current version release date: 2020/03/07
___________________
Seiied-Mohammad-Javad Razvian
javadr(a)gmail.com
-Copyright © 2018
+Copyright © 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
Binary files old/doc/xelatex/quran-de/quran-de-doc.pdf and new/doc/xelatex/quran-de/quran-de-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran-de/quran-de-doc.tex new/doc/xelatex/quran-de/quran-de-doc.tex
--- old/doc/xelatex/quran-de/quran-de-doc.tex 2018-12-31 23:13:58.000000000 +0100
+++ new/doc/xelatex/quran-de/quran-de-doc.tex 2020-03-08 22:54:28.000000000 +0100
@@ -61,11 +61,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\title{\includegraphics[scale=.3]{quran.png}\\
-The \xpackage{quran-de} Package\footnote{To one having devoted his life to the Quran}\\
-\Large User documentation for \qurandeversion}
+The \xpackage{quran-de} Package\footnote{To one having devoted his life to the holy Quran}\\
+}
\author{Seiied Mohammad Javad Razavian\\\xemail{javadr(a)gmail.com}}
-\date{\qurandedate}
+\date{\qurandedate, Version \qurandeversion\footnote{First release: December 1st, 2018}}
\begin{document}
\maketitle
@@ -75,11 +75,11 @@
\section{Introduction}
The \xpackage{quran} package provides several macros for
-typesetting the whole or any parts of The Holy Quran based on its popular divisions. That package also develops
-commands for some translations of the Holy Quran including German, Engilsh, and Persian.
+typesetting the whole or any parts of the holy Quran based on its popular divisions. That package also develops
+commands for some translations of the holy Quran including German, Engilsh, and Persian.
Some people asked me to include the other translations into the \xpackage{quran} package,
but because of some technical issues I decided to create new packages for other translations.
-One of these variations is \xpackage{quran-de} including all German translations of the Holy Quran
+One of these variations is \xpackage{quran-de} including all German translations of the holy Quran
provided by \url{tanzil.net}, i.e. \emph{``Abu Rida Muhammad ibn Ahmad ibn Rassoul''},
\emph{``A. S. F. Bubenheim and N. Elyas''}, \emph{``Adel Theodor Khoury''},
and \emph{``Amir Zaidan.''}
@@ -91,27 +91,31 @@
After loading the package, it writes some information about itself to the
terminal and to the log file, too. The information is something like:
+\begin{quote}
\begin{lstlisting}[style=BashInputStyle, language=tex, escapechar={|}]
-Package: quran-de |\qurandedate| |\qurandeversion| German translations extension to the quran package.
+Package: quran-de |\qurandedate| v|\qurandeversion|
+German translations extension to the quran package.
\end{lstlisting}
+\end{quote}
\section{Options of The Package}\label{sec:qurantypesetting}
-There are four options by the names of \xpackage{aburida}, \xpackage{bubenheim}, \xpackage{khoury},
-and \xpackage{zaidan}.
-\marginpar{\ttfamily aburida\smallskip}\marginpar{\ttfamily bubenheim\smallskip}
-\marginpar{\ttfamily khoury}\marginpar{\ttfamily zaidan\smallskip}\marginpar{\ttfamily all\smallskip}
+There are four options by the names of \xoption{aburida}, \xoption{bubenheim}, \xoption{khoury},
+and \xoption{zaidan}.
+\marginpar{\xoption{aburida}\smallskip}\marginpar{\xoption{bubenheim}\smallskip}
+\marginpar{\xoption{khoury}}\marginpar{\xoption{zaidan}\smallskip}\marginpar{\xoption{all}\smallskip}
If you pass any combinations of these options, you will be enabled to typeset these translations in a way
that the \xpackage{quran} package does.
-There is also \xpackage{all} option which loads all German translations provided by the \xpackage{quran-de} package.
-The package loads \xpackage{aburida} option by default.
+There is also \xoption{all} option which loads all German translations provided by the \xpackage{quran-de} package.
+The package loads \xoption{aburida} option by default.
This package is completely built on top of the \xpackage{quran} package, therefore you can pass every options
defined in that package to the \xpackage{quran-de} package.
\section{Differences between \xpackage{quran} and \xpackage{quran-de}}
-At first glance, \xpackage{quran-de} offers all functionalities of \xpackage{quran}. Therefore in this case
-both are the same except that \xpackage{quran-de} adds three other German translations, namely `bubenheim', `khoury', and `zaidan'. All German translations
+At first glance, \xpackage{quran-de} offers all functionalities of \xpackage{quran}. Therefore,
+both packages are the same in this manner except one difference. The \xpackage{quran-de} extends the \xpackage{quran}
+by adding three other German translations, namely `bubenheim', `khoury', and `zaidan'. All German translations
provided by the package are shown in table~\ref{tab:detrans}.
\begin{table}[!htbp]
@@ -131,21 +135,21 @@
\subsection{How to Change the Current German Translation}
The \xpackage{quran-de} package uses aburida's translation by default.
- The following macro could be used to change the default German tranliteration.
+ The following macro could be used to change the default German translation.
\begin{declcs}{deSetTrans}\marg{index}
\end{declcs}
- The \textit{index} could be an integer or a name; both `order' and `option's name' columns
+ The \meta{index} could be an integer or a name; both ``order'' and ``option's name''
shown in Table~\ref{tab:detrans} are appliable. Both \cs{deSetTrans\{4\}} and \cs{deSetTrans\{zaidan\}}, for example,
have the same effect.
\subsection{How to Get the Name of Current German Translation}
\begin{declcs}{deGetTrans}
\end{declcs}
- The above macro returns the name of current German translation, i.e. one of `aburida', `bubenheim', `khoury', or `zaidan'.
+ The above macro returns the name of current German translation, i.e. one of ``aburida'', ``bubenheim'', ``khoury'', or ``zaidan''.
\subsection{How to Typeset the German Translation}
- It's completely similiar to the \xpackage{quran} package when \texttt{transde} option is enabled.
+ It's completely similiar to the \xpackage{quran} package when \xoption{transde} option is enabled.
All the following macros are usable.
\begin{multicols}{2}
@@ -173,6 +177,5 @@
\centerline{\mxf{deSetTrans\{zaidan\}\textbackslash{}quransurahde*}
{\setLTR\deSetTrans{zaidan}\quransurahde*}}
-
\end{document}
Binary files old/doc/xelatex/quran-de/quran-de-test.pdf and new/doc/xelatex/quran-de/quran-de-test.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran-de/quran-de-test.tex new/doc/xelatex/quran-de/quran-de-test.tex
--- old/doc/xelatex/quran-de/quran-de-test.tex 2018-12-31 23:13:58.000000000 +0100
+++ new/doc/xelatex/quran-de/quran-de-test.tex 2020-03-08 22:54:28.000000000 +0100
@@ -1,7 +1,9 @@
\documentclass{article}
\usepackage[margin=2cm]{geometry}
\usepackage{arabxetex} % for typesetting Arabic text in Rigth−To−Left direction
-\usepackage[all, trans={fa,en,de,lt}]{quran-de} % trans={fa,en,de,lt} option would be sent to quran package
+
+% trans={fa,en,de,lt} option would be sent to quran package
+\usepackage[all, trans={fa,en,de,lt}, wordwise]{quran-de}
\newcommand{\compare}[1]{%
\def\setTr##1{\par\deSetTrans{##1}\fbox{\makebox[2cm]{\deGetTrans}}}
@@ -14,21 +16,27 @@
}
\newcommand{\para}[2]{\noindent%
\begin{minipage}{.4\textwidth}
-%\baselineskip=1.4\baselineskip
-\begin{arab}#1\end{arab}
+\begin{arab}[utf]#1\end{arab}
\end{minipage}\hfill
\begin{minipage}{.55\textwidth}
-%\baselineskip=1.4\baselineskip
#2
\end{minipage}
}
\begin{document}
+\quranayahde[1][1][4]+
+
+\begin{arab}[utf]
+\quranayah[2][5][2]+
+\end{arab}
+
\para{\quranayah[Al-Ikhlas][1-4]}{\quranayahlt[Al-Ikhlas][1-4]}
\bigskip
\para{\quranayahfa[Al-Ikhlas][1-4]}{\quranayahen[Al-Ikhlas][1-4]}
+\quransurahde*
+
\compare{\quransurahde*}
\compare{\quranayahde[1][1]}
\ToggleBasmalah
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quran-de.doc.tlpobj new/tlpkg/tlpobj/quran-de.doc.tlpobj
--- old/tlpkg/tlpobj/quran-de.doc.tlpobj 2019-02-28 04:04:02.000000000 +0100
+++ new/tlpkg/tlpobj/quran-de.doc.tlpobj 2020-03-09 00:28:50.000000000 +0100
@@ -1,9 +1,9 @@
name quran-de.doc
category Package
-revision 49562
+revision 54191
shortdesc doc files of quran-de
relocated 1
-docfiles size=35
+docfiles size=37
RELOC/doc/xelatex/quran-de/README
RELOC/doc/xelatex/quran-de/quran-de-doc.pdf
RELOC/doc/xelatex/quran-de/quran-de-doc.tex
++++++ quran-de.tar.xz ++++++
++++ 56276 lines of diff (skipped)
++++++ quran.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/README new/doc/xelatex/quran/README
--- old/doc/xelatex/quran/README 2018-12-31 23:14:12.000000000 +0100
+++ new/doc/xelatex/quran/README 2020-03-15 22:33:09.000000000 +0100
@@ -1,19 +1,19 @@
_____________________
The quran package
-v1.5
+v1.63
-The package is prepared for typesetting the Holy Quran. This work is inspired
-by lipsum and ptext packages, provides several macros for typesetting the whole or
-any parts of The Holy Quran based on its popular divisions.
+The package is prepared for typesetting the holy Quran.
+This work provides several macros for typesetting the whole or
+any parts of the holy Quran based on its popular divisions.
For more information, please see the documentation.
-Current version release date: 2018/12/31
+Current version release date: 2020/03/14
___________________
Seiied-Mohammad-Javad Razvian
javadr(a)gmail.com
-Copyright © 2015-2018
+Copyright © 2015-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
Binary files old/doc/xelatex/quran/defaulttext.pdf and new/doc/xelatex/quran/defaulttext.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/defaulttext.tex new/doc/xelatex/quran/defaulttext.tex
--- old/doc/xelatex/quran/defaulttext.tex 2016-11-08 23:35:30.000000000 +0100
+++ new/doc/xelatex/quran/defaulttext.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-\documentclass{standalone}
-
-\usepackage{quran}
-\usepackage{xepersian}
-\settextfont{Scheherazade}
-
-\begin{document}
-
-\begin{minipage}{.45\textwidth}
-{\quransurah*[1]}
-\end{minipage}
-
-\end{document}
Binary files old/doc/xelatex/quran/quran-doc.pdf and new/doc/xelatex/quran/quran-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/quran-doc.tex new/doc/xelatex/quran/quran-doc.tex
--- old/doc/xelatex/quran/quran-doc.tex 2018-12-31 23:14:12.000000000 +0100
+++ new/doc/xelatex/quran/quran-doc.tex 2020-03-15 22:33:09.000000000 +0100
@@ -1,292 +1,323 @@
+%% This is file `quran-doc.tex',
+%%
+%% Copyright © 2015-2020
+%% Seiied-Mohammad-Javad Razavian <javadr(a)gmail.com>
+%%
+%% 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 has the LPPL maintenance status `maintained'.
+%%
+%% This work is “author-maintained” (as per LPPL maintenance status).
+%%
+%% The Current Maintainer of this work is Seiied-Mohammad-Javad Razavian.
+%%
+%% to one who has devoted his life to Quran
+%%
\documentclass{ltxdoc}
\usepackage{forloop}
-\usepackage{pgf}
-\usepackage{framed}
+\usepackage{booktabs}
+\usepackage{longtable}
\usepackage{holtxdoc}
+\usepackage{fancyvrb}
\usepackage{url}
-\usepackage{addlines}
\usepackage{listings}
\usepackage{tikz}
-\usetikzlibrary{calc}
+\usepackage[hang,flushmargin]{footmisc}
\usepackage{fontspec}
-\usepackage[trans={lt, de, en, fa}]{quran}
+\usepackage[toc]{multitoc}
+\usepackage{manfnt}
+
+\usepackage[trans={lt, de, en, fa}, wordwise]{quran}
\newfontfamily\quran[Script=Arabic]{Scheherazade}
+\newfontfamily\amiri[Script=Arabic]{Amiri}
\hypersetup{%
- plainpages=false,%
- bookmarksnumbered,%
- pdftitle={The quran Package},%
- pdfkeywords={quran, surah, ayah, juz, hizb, ruku, manzil},%
- pdfauthor={Seiied-Mohammad-Javad Razavian},%
- baseurl={http://mirrors.ctan.org/macros/xetex/latex/quran/doc/quran-doc.pdf…
+ plainpages=false,%
+ bookmarksnumbered,%
+ pdftitle={The quran Package},%
+ pdfkeywords={quran, surah, ayah, juz, hizb, ruku, manzil},%
+ pdfauthor={Seiied-Mohammad-Javad Razavian},%
+ baseurl={http://mirrors.ctan.org/macros/xetex/latex/quran/doc/quran-doc.pdf…
}
-% because of definition of \XeTeX and \XeLaTeX symbols in bidi, I should undef these macro that are also defined in holtxdoc package.
\makeatletter
+% because of definition of \XeTeX and \XeLaTeX symbols in bidi, I should undef these macro that are also defined in holtxdoc package.
\bidi@undef\XeTeX
\bidi@undef\XeLaTeX
-\makeatother
-\usepackage{bidi}
-\makeatletter
+% set fonr for quran text.
\bidi@preto\qurantext{\quran}
-\bidi@BeforeBeginEnvironment{declcs}{\vspace*{-4mm}}
-%\bidi@AfterEndEnvironment{declcs}{\vspace{-2mm}}
\makeatother
-
+\usepackage{bidi}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\def\boxcs#1{\leftline{\fbox{\mcs{#1}}}}
-\def\mcs#1{\lr{\texttt{\textbackslash{}#1}}}
-\def\tt#1{\lr{\texttt{#1}}}
+\def\tt#1{\LRE{\texttt{#1}}}
\lstdefinestyle{BashInputStyle}{
-% language=bash,
basicstyle=\footnotesize\sffamily,
-% numbers=left,
-% numberstyle=\tiny,
-% numbersep=3pt,
frame=tb,
columns=fullflexible,
backgroundcolor=\color{gray!10},
-% linewidth=0.9\linewidth,
-% xleftmargin=0.1\linewidth
-}
-\def\qp#1{
-\begin{minipage}{.6\textwidth}
- #1
-\end{minipage}
}
-
% Define box and box title style
\tikzstyle{mybox} = [draw=black, fill=gray!20, very thick,
rectangle, rounded corners, inner sep=10pt, inner ysep=20pt]
-\tikzstyle{fancytitle} =[fill=gray, text=white]
-
-\def\mx#1#2{\mybox{#1}{#2}{.45\textwidth}}
-\def\mxf#1#2{\mybox{#1}{#2}{\textwidth}}
+\tikzstyle{fancytitle} = [fill=gray, text=white]
-\def\mybox#1#2#3{
-\begin{tikzpicture}
-\setRTL
-\node [mybox] (box){%
- \begin{minipage}[t]{#3}
- #2
- \end{minipage}
-};
-\node (hole) [anchor=north east, left=5pt ] at (box.north east) { \tikz\fill[very thick,white] (0,0) circle (12pt); };
-\node[ ] at (hole.center) {\includegraphics[width=.05\textwidth]{quran.png}};
-\node[fancytitle, anchor=west, right=7pt] at (box.north west) {\small \cs{#1}};
-\end{tikzpicture}%
+\def\mx#1#2{\mybox{#1}{#2}[.46\textwidth]}
+\def\mxf#1#2{\mybox{#1}{#2}}
+\DeclareDocumentCommand{\mybox}{ s m m O{\textwidth} t{+} }{%
+ \begin{tikzpicture}
+ \IfBooleanTF{#5}{}{\setRTL}
+ \node [mybox] (box){%
+ \begin{minipage}[t]{#4}
+ #3
+ \end{minipage}
+ };
+ \node (hole) [anchor=north east, left=5pt ] at (box.north east) { \tikz\fill[very thick,white] (0,0) circle (12pt); };
+ \node[ ] at (hole.center) {\includegraphics[width=.05\textwidth]{quran.png}};
+ \node[fancytitle, anchor=west, right=7pt, rounded corners=2pt] at (box.north west) {\small \IfBooleanTF{#1}{#2}{\cs{#2}}};
+ \end{tikzpicture}%
}
-
+\renewenvironment{declcs}[1]{%
+% \par
+ \addvspace{1.5ex plus 1ex}%
+ \vskip -\parskip
+ \noindent
+ \hspace{1\leftmargini}%
+ \def\M##1{\texttt{\{}\meta{##1}\texttt{\}}}%
+ \def\*{\unskip\,\texttt{*}}%
+ \begin{tabular}{@{}l@{}}%
+ \toprule
+ \expandafter\SpecialUsageIndex\csname #1\endcsname
+ \cs{#1}%
+}{%
+ \\%
+ \bottomrule
+ \end{tabular}%
+ \nobreak
+ \par
+ \nobreak
+ \vspace{1ex}%
+ \vskip -\parskip
+ \noindent
+ \ignorespacesafterend
+}
+\def\none{\meta{number$_1$}}
+\def\ntwo{\meta{number$_2$}}
+\def\mgpar#1{\marginpar{\cs{#1}}}
+\def\xmgpar#1{\xoption{#1}\marginpar{\xoption{#1}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\title{\includegraphics[scale=.3]{quran.png}\\
-The \xpackage{quran} Package\footnote{To one having devoted his life to the Holy Quran}}
+The \xpackage{quran} Package\thanks{To one having devoted his life to the holy Quran}}
\author{Seiied Mohammad Javad Razavian\\\xemail{javadr(a)gmail.com}}
-\date{\qurandate\space\quranversion}
+\date{\qurandate,\space version \quranversion}
+
+\parindent=0pt
\begin{document}
-\maketitle
-%\begin{framed}
-%This manual is incomplete and the package is under development. \par
-%\centerline{\quranversion}
-%\end{framed}
+\maketitle{
+\centerline{\large\bfseries Abstract}
+\bigskip
+The \xpackage{quran} package\footnote{This work has been inspired by \xpackage{lipsum} and
+\xpackage{ptext} packages and released for the first time in June 2015 (Sha'ban 1436 AH).}
+has been prepared for typesetting the holy Quran.
+It provides several macros for typesetting not only the whole or any parts of the holy Quran based on its popular divisions,
+but also any chunks of an ayah.
+Three translations of the holy Quran in German, English, and Persian in addition to its transliteration are also supported.%
+\footnote{There are two packages, \xpackage{quran-de} and \xpackage{quran-ur}, in companion with, which provide several other translations in Deutsch and Urdu.}
+Please, report any issues including bugs, typos in the documentation
+or feature requests on \url{https://github.com/javadr/quran/issues}.
+ }
+
+ \null\vfill
+ \pagebreak
+\setlength{\columnseprule}{0.5pt}
\tableofcontents
-%\newpage
+\pagebreak
-\section{Introduction}
-This package is prepared for typesetting The Holy Quran%.
-. It provides several macros for
-typesetting the whole or any parts of The Holy Quran based on its popular division.\footnote{This work is inspired by \xpackage{lipsum} and
-\xpackage{ptext} packages.}
-%\footnote{
-By recent versions, the package can typeset some translations of The Holy Quran in
-German, English, and Persian. It also can typeset quran's transliteration.
-%}\addlines[1]
-\section{Loading Package}
-You can load the package in the ordinary way
-\cs{usepackage[option]\{quran\}}.
-After loading the package, it writes some information about itself to the
-terminal and to the log file, too. The information is something like:
+\thispagestyle{empty}
+\null\vfil
+\section*{Acknowledgments}
+I would like to express my very great appreciation to:
+\begin{enumerate}
+ \parskip=0pt
+ \item \emph{Vafa Khaligi} who paved the way for typesetting right-to-left in \XeTeX.
+ \item \emph{Hamid Zarrabi-Zadeh}, the creator of the invaluable website of \emph{Tanzil}
+ for providing the text of the holy Quran and some of its translations.
+ \item Parsi\LaTeX\ group that tested and commented on the package in advance.
+ \item Those who have \textbf{donated} to the \xpackage{quran} package--arranged in chronological order:
+ \begin{enumerate}
+ \item \emph{Atiyah Elsheikh}, Feburary 2020.
+ \end{enumerate}
+\end{enumerate}
+
+\newpage
-\begin{lstlisting}[style=BashInputStyle, escapechar={|}]
-Package: quran |\qurandate| |\quranversion| An easy way to typeset the whole or any part of The Holy Quran
+\section{Loading Package}
+The package can be loaded in the ordinary way
+\cs{usepackage[option]\{quran\}}. All \tt{option}s are explained in the section \ref{sec:options}.
+After loading the package, it writes some information about itself to the log file. The information is something like:
+
+\begin{quote}
+\begin{lstlisting}[style=BashInputStyle, escapechar={|},]
+Package: quran |\qurandate| v|\quranversion|
+An easy way to typeset the whole or any parts of the holy Quran
\end{lstlisting}
+\end{quote}
\section{Typesetting The Holy Quran}\label{sec:qurantypesetting}
-For typesetting any parts or whole of The Holy Quran there are several macros in the package.
+For typesetting any parts or whole of the holy Quran, several macros are provided in the package.
+These commands are responsible for typesetting all popular divisions of the holy Quran based on Uthmani script, including Surah, Ayah, Page, Juz, Hizb, Quarter, Ruku, and Manzil as well as any chunks of an a yah.
\subsection{Surah/Sovar}
-\begin{declcs}{quransurah}\oarg{m}
-\end{declcs}
-This macro can typeset any Surah of Quran. As you know there are 114 Sovar, so \textit{m} could
-be an integer between 1 to 114. The macro also could accept the transliteration of surah's name,
-e.g. both of \cs{quransurah[1]} and \cs{quransurah[Al-Fatiha]} have the same effect. For using
-surah's name instead of their order see table~\ref{tab1}.
-\marginpar{\cs{quransurah[1]}}\marginpar{\cs{quransurah[Al-Fatiha]}}
- \centerline{\hbox{\mx{quransurah[94]}{\quransurah[94]}\hfill
- \mx{quransurah[At-Tin]}{\quransurah[At-Tin]}}}
-
-\begin{declcs}{quransurah}\oarg{m-n}
+\begin{declcs}{quransurah}\oarg{surah range}\\
+\cs{quransurah*}\oarg{surah range}
\end{declcs}
-This acts like above but can typeset \textit{m}$^{th}$ Surah to \textit{n}$^{th}$ one.
+This macro can typeset any surah of Quran. A \meta{range} consists
+either of a single \meta{number} or two numbers separated by a dash (-),
+as in \none-\ntwo. In \cs{quransurah} and similar commands,
+if \meta{range} does not satisfy \none~<~\ntwo{} in addition to its domain,
+this might fail or make some undesired results. As you know there are 114 surahs, so \meta{range} could
+be an integer between 1 to 114.
+
+\cs{quransurah} terminates typesetting of every ayah using \cs{par} (depending on
+the package option) while \cs{quransurah*} uses a blank space for each ayah.
+As a simplified rule of thumb, \cs{quransurah} prints ayahs as multiple paragraphs while
+\cs{quransurah*} prints them as a single paragraph.
+All starred macros in the package act similar in this manner; see page~\pageref{starred} for more details.
+
+The macro also could accept the anglicized title of the surah's name,
+e.g. both of \cs{quransurah[19]} and \cs{quransurah[Maryam]} have the same effect.
+\mgpar{quransurah[19]}\mgpar{quransurah[Maryam]}
+See table~\ref{tab1} how to use the anglicized title of a surah instead of its order.
+As some anglicized titles include a dash (-), therefore
+\meta{range} has to be separated by two dashes (\tt{--}), e.g.\cs{quransurah[An-Nasr--An-Nas]}.
+
+\cs{quransurah} without its optional argument outputs the package's default surah, Al-Ikhlas,
+(as long as the default has not been overwritten, see below).
+
+\centerline{\mx{quransurah[94]}{\quransurah[94]} \hfill
+ \mx{quransurah[At-Tin]}{\quransurah[At-Tin]}}
+
+\centerline{\mxf{quransurah*[113-114]}{\quransurah*[113-114]}}
-\begin{declcs}{quransurah}\oarg{m{-}{-}n}
-\end{declcs}
-In this case m and n are transliterations of surah's names, e.g. \cs{quransurah[An-Nasr--An-Nas]}.
-\marginpar{\cs{quransurah[An-Nasr--An-Nas]}}
+\centerline{\mx{quransurah[109-110]}{\quransurah[109-110]} \hfill
+ \mx{quransurah[Al-Masadd--Al-Ikhlas]}{\quransurah[Al-Masadd--Al-Ikhlas]}}
- \centerline{\hbox{\mx{quransurah[109-110]}{\quransurah[109-110]}\hfill
- \mx{quransurah[Al-Masadd--Al-Ikhlas]}{\quransurah[Al-Masadd--Al-Ikhlas]}}}
+\centerline{\mx{quransurah*}{\quransurah*} \hfill\mx{quransurah}{\quransurah}}
+
+In order to change the default surah, apply \cs{setsurahdefault\{m\}}.
+As you've noticed the package's default is 112. \mgpar{setsurahdefault}
+After changing package's default surah to 107 by \cs{setsurahdefault\{107\}}, the output would be like below:
+
+\setsurahdefault{107}
+\centerline{\mxf{quransurah*}{\quransurah*}}
\newcounter{ct}
-\def\mycell#1{
- \surahname[\value{#1}]
- \addtocounter{#1}{38}
+\def\mycell#1{%
+ \surahname[\value{#1}]%
+ \addtocounter{ct}{38}%
}
-\begin{table}[tbhp]
+\begin{table}[!htb]
\centering
\fontsize{8}{10}\selectfont
\begin{tabular}{|*{3}{c|l|}}
\hline
- order & surahname & order & surahname & order & surahname \\
+ Order & Anglicized Title & Order & Anglicized Title & Order & Anglicized Title \\
\hline\hline%
\forloop{ct}{1}{\value{ct} < 38}{%
- \thect & \mycell{ct} & \thect & \mycell{ct} & \thect & \mycell{ct} \\
+ \ifnum\thect=1\phantom{.}\fi\thect & \mycell{ct} & \thect & \mycell{ct} & \thect & \mycell{ct}\\
\addtocounter{ct}{-114}
}%
\thect & \mycell{ct} & \thect & \mycell{ct} & \thect & \mycell{ct}\\%
\hline
\end{tabular}
- \protect\caption{Transliterations of Sovar's names.}\label{tab1}
+ \protect\caption{\scshape Anglicized Title of Surahs' Names}\label{tab1}
\end{table}
-
-
-\begin{declcs}{quransurah}
-\end{declcs}
-Using \cs{quransurah} without its optional argument typeset the default Surah--Al-Ikhlas.
-
-\centerline{\mx{quransurah}{\quransurah}}
-
-To change the default Surah use \cs{setsurahdefault\{m\}}, again m must be between 1 and 114.
-As you've noticed the package's default is 112.
-\marginpar{\cs{setsurahdefault}}
-
-After changing package's default surah to 107 by \cs{setsurahdefault\{107\}}, the output would be like below:
-
- \setsurahdefault{107}
- \centerline{\mx{quransurah}{\quransurah}}
-
-
\subsection{Ayah/Ayat}
-\begin{declcs}{quranayah}\oarg{l}\oarg{n}
+\begin{declcs}{quranayah}\oarg{surah range}\oarg{ayah range}\\
+\cs{quranayah*}\oarg{surah range}\oarg{ayah range}
\end{declcs}
-The above macro typeset the \textit{n}$^{th}$ Ayah of \textit{l}$^{th}$ Surah.
+\meta{range} is similar the one explained for \cs{quransurah} and this pattern is similar to all commands defined in the package.
+Therefore, this command typesets the \textit{n}$^{th}$ ayah of a surah or \textit{m}$^{th}$ to \textit{n}$^{th}$ ayahs of a s urah.
- \centerline{\hbox{\mx{quranayah[33][33]}{\quranayah[33][33]}\hfill
- \mx{quranayah[Al-Ahzab][33]}{\quranayah[Al-Ahzab][33]}}}
+\centerline{\mx{quranayah[33][33]}{\quranayah[33][33]} \hfill
+ \mx{quranayah[Al-Ahzab][33]}{\quranayah[Al-Ahzab][33]}}
-If you just typeset the first Ayah of any Surah, then the Basmalah will not be printed.
-In this case if you need Basmalah, then you can use the \cs{basmalah} macro before.
+The basmalah will not be printed if you want to typeset the first ayah of any surah per se.
+Using \cs{basmalah} macro prior to the ayah will solve this issue. See page~\pageref{sec:basmalah} for more information.
\marginpar{\cs{basmalah}}
- \centerline{\hbox{\mx{quranayah[Ibrahim][1]}{\quranayah[Ibrahim][1]}\hfill
- \mx{basmalah\textbackslash{}quranayah[14][1]}{\quran\basmalah\quranayah[14][1]}}}
+\centerline{\mx{quranayah[Ibrahim][1]}{\quranayah[Ibrahim][1]} \hfill
+ \mx{basmalah\textbackslash{}quranayah[14][1]}{\quran\basmalah\quranayah[14][1]}}
-\begin{declcs}{quranayah}\oarg{l}\oarg{m-n}
-\end{declcs}
-This macro typeset the \textit{m}$^{th}$ to \textit{n}$^{th}$ Ayat of \textit{l}$^{th}$ Surah.
+\centerline{\mx{quranayah*[Ash-Shura][22-26]}{\quranayah*[Ash-Shura][22-26]} \hfill
+ \mx{quranayah*[42][22-26]}{\quranayah*[42][22-26]}}
-\par
-\addvspace{4.5ex plus 1ex}%
-\vskip -\parskip
-\noindent The \textit{l} argument could be an integer less than or equal to 114. It also could be
-the transliteration of \textit{l}$^{th}$ Surah's name, see table~\ref{tab1}.
-The number \textit{n} is diffirent by every Surah and it relies on the number of the Surah's verses.
-The number \textit{m} should be between 1 and a number less than \textit{n}.
-
-In case of using transliteration of surah's name, both \cs{quransurah} and \cs{quranayah} are \emph{case-insensitive}, i.e.
-for example there is no differences between Al-Fatiha, al-fatiha, al-Fatiha,
- and any other possible combinations of lowercase and uppercase letters.
+Both \cs{quransurah} and \cs{quranayah} are \emph{case-insensitive} to the anglicized title of surah, i.e.
+there are, for example, no differences among Al-Fatiha, al-fatiha, or any other possible combinations of lowercase and uppercase letters.
- \centerline{\hbox{\mx{quranayah[Ash-Shura][22-26]}{\quranayah[Ash-Shura][22-26]}\hfill
- \mx{quranayah[42][22-26]}{\quranayah[42][22-26]}}}
+\centerline{\mx{quransurah*[Al-Fatiha]}{\quransurah*[Al-Fatiha]} \hfill
+ \mx{quransurah*[aL-fAtIhA]}{\quransurah*[aL-fAtIhA]}}
\subsection{Page/Pages}
-\begin{declcs}{quranpage}\oarg{n}
+\begin{declcs}{quranpage}\oarg{page range}\\
+\cs{quranpage*}\oarg{page range}
\end{declcs}
-Typeset the \textit{n}$^{th}$ page of Quran and the following macro typeset \textit{m}$^{th}$ to
-\textit{n}$^{th}$ pages of the Holy Quran.
-\begin{declcs}{quranpage}\oarg{m-n}
-\end{declcs}
-The numbers should be between $1$ to $604$, based on Uthmani text.
+Typesets the specified \meta{range} of page(s) of the holy Quran.
+The numbers in \meta{range} have to be between $1$ to $604$, based on the Medina Mushaf.
\centerline{\hboxR{\mx{quranpage*[249]}{\quranpage*[249]}
\hfill
\mx{quranpage*[250]}{\quranpage*[250]}}}
- * Starred version of macros will be explained in page~\pageref{starred}; concisely it means
- typesetting that part of the Holy Quran in one paragraph.
-
- \centerline{\mxf{quranpage*[1-3]}{\quranpage*[1-3]}}
+ \centerline{\mxf{quranpage*[603-604]}{\quranpage*[603-604]}}
\subsection{Juz/Ajza}
-%\vspace{-6mm}
-\begin{declcs}{quranjuz}\oarg{n}
+\begin{declcs}{quranjuz}\oarg{juz range}\\
+\cs{quranjuz*}\oarg{juz range}
\end{declcs}
-Above macro typesets the \textit{n}$^{th}$ juz of Quran and the next macro typesets m$^{th}$ to n$^{th}$ juzzes of Quran.
-\begin{declcs}{quranjuz}\oarg{m-n}
-\end{declcs}
-%\vspace{-6mm}
-The numbers should be between $1$ to $30$.
+This macro typesets the specified \meta{range} of juz(zes) of the holy Quran, ranging from $1$ to $30$.
\subsection{Hizb/Ahzab}
-Each juz of Quran is devided into two ahzab (group), so there are 60 ahzab.
-Following macros typeset hizb/ahzab of Quran.
+Each juz of the holy Quran is devided into two ahzab (groups), thus there are 60 hizbs (ahzab).
+Following macro typesets hizb/ahzab of the holy Quran.
-%\vspace{-6mm}
-\begin{declcs}{quranhizb}\oarg{n}
-\end{declcs}
-%\vspace{-14mm}
-\begin{declcs}{quranhizb}\oarg{m-n}
+\begin{declcs}{quranhizb}\oarg{hizb range}\\
+\cs{quranhizb*}\oarg{hizb range}
\end{declcs}
\subsection{Quarter/Quarters}
-Eash hizb of Quran is devided into four quarters, making eight quarters per juz, called maqra.
-There are 240 of these quarters (of hizb) in the Quran. These maqras are often used as sections for revision when memorizing the Quran.\footnote{\url{https://en.wikipedia.org/wiki/Juz'}}
+Eash hizb of the holy Quran is devided into four quarters, making eight quarters per juz, called maqra.
+There are 240 of these quarters (of hizb) in the holy Quran. These maqras are often used as sections for revision when memorizing the holy Quran.\footnote{\url{https://en.wikipedia.org/wiki/Juz'}}
-%\vspace{-6mm}
-\begin{declcs}{quranquarter}\oarg{n}
-\end{declcs}
-%\vspace{-14mm}
-\begin{declcs}{quranquarter}\oarg{m-n}
+\begin{declcs}{quranquarter}\oarg{quarter range}\\
+\cs{quranquarter*}\oarg{quarter range}
\end{declcs}
-Above macros typeset the \textit{n}$^{th}$ or m$^{th}$ to n$^{th}$ quarter(s) of Quran.
-
\centerline{\mxf{quranquarter*[110]}{\quranquarter*[110]}}
\subsection{Ruku/Rukus}
-``The term ruk\= u --- roughly translated to ``passage", ``pericope" or ``stanza" --- is also used to denote a group of thematically related verses in the Qur'an. Longer suras (chapters) in the Qur'an are usually divided into several ruk\= us, so that the reciters could identify when to make ruk\= u in Salat without breaking an ongoing topic in the Quranic text."\footnote{\url{https://en.wikipedia.org/wiki/Ruku}}
-
-The following macros can typeset rukus of The Holy Quran in the way the previous macros did.
+``The term ruk\= u --- roughly translated to ``passage", ``pericope" or ``stanza" --- is also used to denote a group of thematically related verses in the Qur'an. Longer suras (chapters) in the Qur'an are usually divided into several ruk\= us, so that the reciters could identify when to make ruk\= u in Salat without breaking an ongoing topic in the Quranic text."\footnote{\url{https://en.wikipedia.org/wiki/Ruku}} There are $556$ rukus.
-\begin{declcs}{quranruku}\oarg{n}
+\begin{declcs}{quranruku}\oarg{ruku range}\\
+\cs{quranruku*}\oarg{ruku range}
\end{declcs}
\centerline{\mxf{quranruku*[363]}{\quranruku*[363]}}
-\begin{declcs}{quranruku}\oarg{m-n}
-\end{declcs}
-The numbers should be between $1$ to $556$.
-
\centerline{\mxf{quranruku*[58-59]}{\quranruku*[58-59]}}
@@ -304,46 +335,41 @@
\item Qaf (chapter 50) through An-Nass (chapter 114) consisting of 65 surahs.''\footnote{\url{https://en.wikipedia.org/wiki/Manzil}}
\end{enumerate}
-Following macros typeset manzil/manazil of Quran.
-
-\begin{declcs}{quranmanzil}\oarg{n}
-\end{declcs}
-%\vspace{-12mm}
-\begin{declcs}{quranmanzil}\oarg{m-n}
+\begin{declcs}{quranmanzil}\oarg{manzil range}\\
+\cs{quranmanzil*}\oarg{manzil range}
\end{declcs}
+The above macro typesets manzil/manazil of the holy Quran.
+
\subsection{Text of Quran}
-The next macro is the heart of all macros typesetting any range of Quran. As you know there
-are $6236$ Ayat in Quran. This macro can typeset a specific Ayah or any range of Ayat.
+The next macro is the heart of all macros in the package typesetting any range of Quran. As you know, there
+are $6236$ ayahs in the holy Quran. This macro can typeset a specific ayah or any range of ayahs.
-\begin{declcs}{qurantext}\oarg{n}
+\begin{declcs}{qurantext}\oarg{index range}\\
+\cs{qurantext*}\oarg{index range}
\end{declcs}
-Typesets the \textit{n}$^{th}$ Ayah of Quran.
\centerline{\mxf{qurantext[1023]}{\begingroup\qurantext[1023]\endgroup}}
-\begin{declcs}{qurantext}\oarg{m-n}
-\end{declcs}
-Typesets any range of Ayat from the \textit{m}$^{th}$ to \textit{n}$^{th}$ Ayah.
-
- \centerline{\mxf{qurantext*[4111-4117]}{\begingroup\qurantext*[4111-4117]\endgroup}}
+\centerline{\mxf{qurantext*[4111-4117]}{\begingroup\qurantext*[4111-4117]\endgroup}}
-Using \cs{qurantext} without its optional argument uses [1-7] at its default argument--Al-Hamd. To
+Using \cs{qurantext} without its optional argument uses [1-7] at its default argument-- surah Al-Hamd. To
change the default text use \cs{setqurantextdefault\{m-n\}}
\marginpar{\cs{qurantext}}
- \centerline{\mx{qurantext}{\qurantext}}
+ \centerline{\mxf{qurantext*}{\qurantext*}}
- \noindent Below, the default is changed to \cs{setqurantextdefault\{4128-4147\}}:
- \marginpar{\cs{setqurantextdefault\{m-n\}}}
+ \noindent In the following example, \cs{setqurantextdefault\{4128-4137\}} has changed the default to index $4128$ to $4137$.
+ \mgpar{setqurantextdefault\{m-n\}}
- \setqurantextdefault{4128-4147}
+ \setqurantextdefault{4128-4137}
\centerline{\mxf{qurantext*}{\qurantext*}}
\subsection{Whole of The Holy Quran}
-The following macros can typeset whole of The Holy Quran:
+The following macros with the specified parameters can typeset whole of the holy Quran:
+\begin{multicols}{2}
\begin{itemize}
\item \cs{quransurah[1-114]}
\item \cs{quranjuz[1-30]}
@@ -353,72 +379,176 @@
\item \cs{quranquarter[1-240]}
\item \cs{quranruku[1-556]}
\item \cs{quranmanzil[1-7]}
+ \item \cs{quransurah*[1-114]}
+ \item \cs{quranjuz*[1-30]}
+ \item \cs{quranpage*[1-604]}
+ \item \cs{qurantext*[1-6236]}
+ \item \cs{quranhizb*[1-60]}
+ \item \cs{quranquarter*[1-240]}
+ \item \cs{quranruku*[1-556]}
+ \item \cs{quranmanzil*[1-7]}
\end{itemize}
+\end{multicols}
+\subsection{Chunks of an Ayah}\label{chunk}
+From ver 1.6 onward, the package is capable of typesetting not only a whole ayah but also any chunks of an ayah
+if the \xmgpar{wordwise} option has been loaded.\footnote{This new practical feature has been suggested and
+supported financially by \emph{Atiyah Elsheikh} in Feburary 2020.}
+ In this case, \cs{quranayah} and \cs{qurantext} macros have some other optional parameters to do that.
-\section{Miscellaneous}
+\begin{declcs}{quranayah}\oarg{surah range}\oarg{ayah range}\oarg{chunk range}\\
+\cs{quranayah}\oarg{surah range}\oarg{ayah range}\oarg{chunk range}\tt{+}
+\end{declcs}
-\subsection{Name of Surah}
-\begin{declcs}{surahname}\oarg{m}
+\begin{declcs}{qurantext}\oarg{index range}\oarg{chunk range}\\
+\cs{qurantext}\oarg{index range}\oarg{chunk range}\tt{+}
\end{declcs}
-This macro returns the transliteration of \textit{m}$^{th}$ Surah's name.
-\begin{declcs}{surahname*}\oarg{m}
+These commands separate words included in \meta{ayah range}/\meta{index range}
+by white spaces and then output specified \meta{chunk range}.
+If \meta{chunk range} includes just one number, the output will be from the
+\meta{number}\textsuperscript{th} word to the end of \meta{ayah range}.
+
+\centerline{\mx{quranayah[2][156][6]}{\quranayah[2][156][6]} \hfill
+ \mx{quranayah[2][286][31-43]}{\quranayah[2][286][31-43]}}
+
+The way the package enumerates the words of a specified \meta{range} could be shown in the footnote if these commands followed by \tt{+}.
+
+\centerline{\mxf{quranayah[Ar-Rad][23-24][10]+}{\quranayah[Ar-Rad][23-24][10]+}}
+
+\pagebreak[4]
+Fetching just one word from
+an ayah needs the \meta{chunck range} to have both \meta{number}s as the same.
+
+\centerline{\mx{quranayah[18][19][34-34]}{\quranayah[18][19][34-34]} }
+
+\section{Miscellaneous}
+
+\subsection{Name of Surah}
+\begin{declcs}{surahname}\oarg{index}\\
+\cs{surahname*}\oarg{index}
\end{declcs}
-This macro returns the arabic name of \textit{m}$^{th}$ Surah.
+These commands return the anglicized/arabic title of \textit{index}$^{th}$ surah of the holy Quran,
+as depicted in table~\ref{tab1} and table~\ref{tab2}
- \centerline{\hbox{\mx{surahname[19]}{\surahname[19]}
+ \centerline{\mx{surahname[19]}{\surahname[19]}
\hfill
- \mx{surahname*[19]}{\quran\surahname*[19]}}}
+ \mx{surahname*[19]}{\quran\surahname*[19]}}
+
+\def\mycell#1#2{%
+ \hboxR{\amiri\phantom{آح}\surahname*[\value{#1}]}%
+ \addtocounter{ct}{#2}%
+}
+\begin{table}[!hbt]
+ \centering
+% \fontsize{12}{14}\selectfont
+ \begin{RTL}
+ \begin{tabular}{|*{4}{@{\hspace{1mm}}c@{\hspace{1mm}}|r|}}
+ \hline
+ Order & \multicolumn{1}{c|@{\hspace{1mm}}}{Title} & Order & \multicolumn{1}{c|@{\hspace{1mm}}}{Title}
+ & Order & \multicolumn{1}{c|@{\hspace{1mm}}}{Title} & Order & \multicolumn{1}{c|}{Title} \\
+ \hline\hline%
+ \forloop{ct}{1}{\value{ct} < 29}{%
+ \ifnum\thect=1\phantom{..}\fi\thect & \mycell{ct}{29} & \thect & \mycell{ct}{29} & \thect & \mycell{ct}{28} & \thect & \mycell{ct}{28}\\
+ \addtocounter{ct}{-114}
+ }%
+ \thect & \mycell{ct}{29} & \thect & \mycell{ct}{29} & & & & \\%
+ \hline
+ \end{tabular}
+ \end{RTL}
+ \protect\caption{\scshape Arabic Titles of Surahs}\label{tab2}
+\end{table}
-\subsection{Basmalah}
-\begin{declcs}{basmalah}
-\end{declcs}
-It provides the basmalah in arabic text which every Surah is started by that.
+\subsection{Basmalah}\label{sec:basmalah}
+\begin{declcs}{basmalah}\\
+\cs{Basmalah}
+\end{declcs}
+It provides Basmalah (\RLE{\quran\Basmalah}) in arabic text. There is a subtle
+difference between \cs{Basmalah} and \cs{basmalah} -- the latter is sometimes followed by a \cs{par}
+(depending on the package option).
- \centerline{\mx{basmalah}{\quran\basmalah}}
+ \centerline{\mx{basmalah\textbackslash{}quranayah*[14][1]}{\quran\basmalah\quranayah*[14][1]} \hfill
+ \mx{Basmalah\textbackslash{}space\textbackslash{}quranayah*[14][1}{\quran\Basmalah\ \quranayah*[14][1]}}
\subsection{Index Converting}
\begin{declcs}{indexconvert}\marg{index}\marg{surah macro}\marg{ayah macro}
\end{declcs}
-This command converts an index number between 1 to 6236
-to its exact surah's index and ayah's index. The index must be a number or
-\TeX{} counter, the surah macro and ayah macro must be \TeX{} macro names. They
-will be set to numbers representing the surah and ayah of the given index in whole of Quran.
-
-\section{Options to The Package}
-All text generated by macros of this package will be separated by the macro \cs{par}. Sometimes,
-a version of text without \cs{par} is desired. Therefore the package provides the option
-\texttt{nopar}\marginpar{\texttt{nopar}}
-that causes no macros of the package terminated by \cs{par}.
-Another way for achieving this, is using the starred version of macros. All macros of the package
-has a starred version that omit the \cs{par} macro in typesetting the text of Quran.
-
-\label{starred}
-In some cases maybe user wants to typeset the Ayat without their following numbers visible in printed versions of The Holy Quran. The \texttt{nonumber}\marginpar{nonumber}
-option tells the package that print no number after ayah.
-But sometimes we want to typeset just some Ayat without theirs, so there is a \cs{ToggleAyahNumber} macro
-that can cause numbers will be omitted. With \texttt{nonumber} option this macro acts vice versa, it mean it
-causes that Ayat number will be printed.
+It converts an index number between 1 to 6236
+to its exact surah's index and ayah's index. The index must be either a number or a
+\TeX{} counter, and the surah macro and ayah would be defined as a \TeX{} counters if they are undefined. They
+will be set to the numbers representing the surah and ayah of the given index in text of the holy Quran.
+
+\begin{SaveVerbatim}{VerbEnv}
+\newcount\index \index=5678
+
+\indexconvert{\index}{\surahcount}{\ayahcount}
+
+Index \the\index\ belongs to ayah number \the\ayahcount\
+of surah number \the\surahcount\ (=\surahname[\the\surahcount]).
+
+\end{SaveVerbatim}
+
+\centerline{\mybox*{indexconvert}{
+\UseVerbatim{VerbEnv}
+\newcount\index \index=5678
+\indexconvert{\index}{\surahcount}{\ayahcount}
+Index \the\index\ belongs to ayah number \the\ayahcount\ of surah number \the\surahcount\ (=\surahname[\the\surahcount]).
+}+}
+
+\section{Options to The Package}\label{sec:options}
+All macros of the package, by default, will separate ayahs with \cs{par}.
+The \xmgpar{nopar} option is available to change this default behaviour.
+In this case, ayahs will be separated with space instead \cs{par}.
+Another way for achieving this, is using the starred version of macros. All macros of the package \marginpar{starred macros}
+have starred versions that omit the \cs{par} in typesetting ayahs of the holy Quran. \label{starred}
+With \xmgpar{nopar} option, starred macros act as if this option was not loaded.
+
+\medskip
+
+All surahs of the holy Quran are divided by ayahs which have their own indexes.
+By default, these numbers are typeset with text of each ayah. The \xmgpar{nonumber} option
+causes none of these numbers will be printed with ayahs.
+
+\begin{declcs}{ToggleAyahNumber}
+\end{declcs}
+This macro change the default behaviour of the package in typesetting of the index of ayahs whereever it called.
+It means that the macro can enable/disable the ayahs' index in output text.
\centerline{\mxf{ToggleAyahNumber\textbackslash{}quransurah*[89]}
{\ToggleAyahNumber\quransurah*[89]}}
+
+\medskip
-By default, the package typesets the text of The Holy Quran in simple script, but if you prefer the Uthmani script you can use \texttt{uthmani} \marginpar{uthmani}
-option. Compare the following texts to figure out the differences between ``default'' and ``uthmani'' script.
- \centerline{\hbox{
- \mx{quransurah*[1] (default)}{\includegraphics{defaulttext.pdf}}
- \hfill
- \mx{quransurah*[1] (uthmani)}{\includegraphics{uthmanitext.pdf}}
- }}
+The package, by default, typesets the text of the holy Quran in simple script,
+but \xmgpar{uthmani} changes the default to Uthmani script.
+Compare the following texts to figure out the differences between ``default'' and ``uthmani'' scripts.
-By version 1.3, the package can typeset the transliteration of The Holy Quran.
-This option will be useful for whom doesn't really know how to read the arabic text. By loading \texttt{translt}
-option all macros that defined in section~\ref{sec:qurantypesetting} will have an ``\texttt{lt}" version. In other words,
-this option will add the following macros:
-\marginpar{translt}
+ \centerline{\mxf{quransurah*[1] (default)}{\quransurah*[1]}}
+ \makeatletter\let\qt@newcmd\renewcommand
+ \input{qurantext-uthmani.def}%
+ \makeatother
+ \centerline{\mxf{quransurah*[1] (uthmani)}{\quransurah*[1]}}
+ \makeatletter\let\qt@newcmd\renewcommand
+ \input{qurantext-simple.def}%
+ \makeatother
-\begin{itemize}
+\medskip
+
+Version 1.6 comes wtih the \xmgpar{wordwise} option
+which makes the package capable of outputing any chunks of an ayah.
+See section~\ref{chunk} for more details.
+
+ \centerline{\mx{quranayah[9][111][1-23]}{\quranayah[9][111][1-23]}}
+
+
+\medskip
+
+By version 1.3, the package can typeset the transliteration of the holy Quran.
+This option will be useful for whom doesn't really know how to read the arabic text. By loading \xmgpar{translt}
+option all macros defined in section~\ref{sec:qurantypesetting} will have an ``\texttt{lt}" version. In other words,
+the following macros are added by this option:
+\begin{multicols}{3}
+\begin{itemize}
\item \cs{quransurahlt}
\item \cs{quranayahlt}
\item \cs{quranpagelt}
@@ -429,22 +559,22 @@
\item \cs{quranmanzillt}
\item \cs{qurantextlt}
\end{itemize}
+\end{multicols}
\centerline{\mx{quransurahlt[108]}{\setLTR\quransurahlt[108]}
\hfill
\mx{quransurah[108]}{\quransurah[108]}}
+\medskip
+
+By version 1.4, the package can typeset some translations of the holy Quran in other languages.
+These options were added because of some requests from users who had required the translation of the holy Quran in their languages.
+Loading \xmgpar{transde}, \xmgpar{transen}, or \xmgpar{transfa} brings some other macros for typesetting the translation in
+German, English, and Persian, respectively.
-
-By version 1.4, the package can typeset some translations of The Holy Quran in German, English, and Persian.
-\marginpar{transde}\marginpar{transen}\marginpar{transfa}%
-These options added because of some requests from users who need the translation of The Holy Quran in their languages.
-By loading \texttt{transde}, \texttt{transen}, and \texttt{transfa} the package can typeset the translation in
- German, English, and Persian, respectively.
-
-By loading each of these options, all macros that defined in section~\ref{sec:qurantypesetting} will have
+By loading each of these options, all macros defined in section~\ref{sec:qurantypesetting} will have
a ``\texttt{de}"/``\texttt{en}"/``\texttt{fa}" version. In other words,
-these will add the following macros:
+these options will add the following macros:
\begin{multicols}{3}
@@ -488,12 +618,13 @@
\end{itemize}
\end{multicols}
- All translations are from \url{tanzil.net}. For Germen, English, and Persian languages the ``Abu Rida Muhammad ibn Ahmad ibn Rassoul", ``Ahmed Ali", ``Mohammad Mahdi Fooladvand" is choosen respectively, by suggestion of the package's users.
+ All translations are from \url{tanzil.net}. For Germen, English, and Persian languages the ``Abu Rida Muhammad ibn Ahmad ibn Rassoul", ``Ahmed Ali", ``Mohammad Mahdi Fooladvand" have been chosen respectively, by suggestion of the package's users.
- Another option is defined that simplifies the usage of mutiple translations simultaneously. The \texttt{trans} option can get
- any permutation of ``\texttt{lt}", ``\texttt{de}", ``\texttt{en}", and ``\texttt{fa}". e.g. this document loaded the \texttt{quran}
- package with ``\texttt{trans=\{lt, de, en, fa\}}" option.
- \marginpar{trans}
+\medskip
+
+ The \xmgpar{trans} option has been prepared to simplify the usage of mutiple translations simultaneously. This option accepts
+ any permutation of ``\texttt{lt}", ``\texttt{de}", ``\texttt{en}", and ``\texttt{fa}", e.g. this document is loaded
+ with ``\xmgpar{trans=\{lt, de, en, fa\}}" option with some others.
\centerline{\mx{quransurahfa[108]}{\quransurahfa[108]}
\hfill
@@ -502,29 +633,25 @@
\hfill
\mx{quransurahde[108]}{\setLTR\small\quransurahde[108]}}
-
-\section{Acknowledgment}
-At first, I should appreciate Vafa Khaligi by preparing such adorable packages --\xpackage{bidi} and
-\xpackage{xepersian} for typesetting right-to-left text.
-Secondly, the costly website, \hbox{\url{http://tanzil.net/}}, for providing the text of The Holy Quran developed by Hamid Zarrabi-Zadeh. And finally, people in Parsi\LaTeX\footnote{\url{http://parsilatex.com/}}
-group who tested and commented this work in advance.
-
\section{Frequently Asked Questions}
\subsection{What is the best font for typesetting quran text?}
- We strongly recommend you to use "Scheherazade"%
+ ``Scheherazade"%
\footnote{\url{http://software.sil.org/scheherazade/}}
- or "Amiri"%
- \footnote{\url{http://www.amirifont.org/}} fonts.
-
- Scheherazade is released under the SIL Open Font License (OFL), version 1.1. Copyright (c) 2004-2015,
+ or ``Amiri"%
+ \footnote{\url{http://www.amirifont.org/}} fonts
+ are strongly recommend.
+ \begin{quote}
+ \emph{Scheherazade} is released under the SIL Open Font License (OFL), version 1.1. Copyright (c) 2004-2015,
SIL International (http://scripts.sil.org/) with Reserved Font Names "Scheherazade" and "SIL". Therefore
you can freely download it.
All examples in this document use this font.
-
- Amiri is a classical Arabic typeface in Naskh style for typesetting books and other running text.
+ \end{quote}
+ \begin{quote}
+ \emph{Amiri} is a classical Arabic typeface in Naskh style for typesetting books and other running text.
Amiri is a revival of the beautiful typeface pioneered in early 20$^{th}$ century by Bulaq Press in Cairo,
also known as Amiria Press, after which the font is named.
Amiri is a free, open source project that everyone is encouraged to use and modify.
+ \end{quote}
\subsection{How to use \xpackage{quran} package?}
As you've noticed, for typesetting quran text you need a package that can typeset text
@@ -537,6 +664,8 @@
ways work with \XeLaTeX. The \xpackage{arabxetex} and \xpackage{arabluatex} use Amiri font by default.
The following demonstrates some examples for all four approaches:
+\begin{quote}
+
\begin{lstlisting}[style=BashInputStyle, title=``example: with polyglossia{,}
fontspec{,} and bidi"]
\documentclass{article}
@@ -607,39 +736,349 @@
\end{document}
\end{lstlisting}
+
+\end{quote}
- \subsection{How to set quran default font?}
- If you want to automatically change the font of quran text in your document, you
- can put your willing font in precede of \cs{qurantext} like below:
-
- In case you are using \xpackage{xepersian}, put the following commands in the preamble:
+ \subsection{How to set a default font for text of quran?}
+ If you want to automatically change the font of quran text in your document,
+ precede the \cs{qurantext} with your willing font like below:
+ \begin{quote}
+
+ With \xpackage{fontspec}, put the commands below in the preamble:
\begin{lstlisting}[style=BashInputStyle]
-\defpersianfont\quran{Scheherazade}
+\newfontfamily\quran{Scheherazade}
\makeatletter
\bidi@preto\qurantext{\quran}
\makeatother
\end{lstlisting}
- In case you are using \xpackage{fontspec}, put the commands below in the preamble:
+ With \xpackage{xepersian}, put the following commands in the preamble:
+
\begin{lstlisting}[style=BashInputStyle]
-\usepackage{etoolbox}
-\newfontfamily\quran{Scheherazade}
-\preto\qurantext{\quran}
+\defpersianfont\quran{Scheherazade}
+\makeatletter
+\bidi@preto\qurantext{\quran}
+\makeatother
\end{lstlisting}
- By setting default font as above, if you want to use \cs{quratext}, you have to enclose it in curly braces. If you don't,
+
+\end{quote}
+
+ By setting default font the way mentioned above, if you want to use \cs{qurantext}, you have to enclose it in curly braces. If you don't,
it will affect the font of the following texts.
+\begin{quote}
\begin{lstlisting}[style=BashInputStyle]
{\qurantext[x-y]}
-\end{lstlisting}
- \subsection{How to typeset a portion of the Holy Quran in one paragraph
- with no ayah number without affecting the behaviour of \xpackage{quran} package
- in other cases?}
+\end{lstlisting}
+\end{quote}
- Just put the code that was describled on page~\pageref{starred} in a group like:
+ \subsection{How to typeset a portion of the holy Quran in one paragraph
+ with no ayah number without using \xoption{nopar} option?}
+
+ Just put the code that was describled on page~\pageref{starred} in a group like below:
+\begin{quote}
\begin{lstlisting}[style=BashInputStyle]
{\ToggleAyahNumber\quransurah*}
-\end{lstlisting}
+\end{lstlisting}
+\end{quote}
+
+\setsurahdefault{112}
+\mxf{quransurah* «\{\textbackslash{}ToggleAyahNumber\textbackslash{}quransurah*\}» \textbackslash{}quransurah*}
+{\quransurah* »{\ToggleAyahNumber\quransurah*}« \quransurah*}
+
+ \subsection{Why do I get the ``\tt{! TeX capacity exceeded}'' error?}
+
+ Invention of \TeX{} dates back to many years ago. Although we have great hardware nowadays,
+ \TeX{} engine has been designed so that to use a very small amount of computer hardware
+ due to the limitation of the computer at the time of its invention.
+ The \xpackage{quran} makes a plenty of macros which deplete the \TeX's memory and therefore, sometimes lead to compile error.
+ To solve this issue, you can expand \TeX's memory; see the section ``Memory Limitations'' in the \xpackage{pgfplots} manual.
+ However, that does not mean that expanding TeX's memory is the best solution.
+ Instead, I would recommend redesigning your document. For exmaple, if you use \xoption{wordwise}, most of starred
+ version of macros which output a large portion of quran text will cause ``\tt{! TeX capacity exceeded}''.
+ In this case, make a similar output with using some smaller chunks. For instance, you want to typseset 10 first juzzes with
+ \cs{quranjuz*[1-10]} command and you may get
+ \begin{quote}
+ \tt{! TeX capacity exceeded, sorry [main memory size=5000000]} \\or \\
+ \tt{! TeX capacity exceeded, sorry [parameter stack size=10000]}
+ \end{quote} errors. It would be better to typeset ecah juz
+ separately, or even each page of this range -- \cs{quranjuz*[1]} \cs{quranjuz*[2]} $\cdots$ \cs{quranjuz*[10]} or
+ \cs{quranpage*[1]} \cs{quranpage*[2]} $\cdots$ \cs{quranpage*[201]}.
+
+\makeatletter
+\bidi@patchcmd{\History}{\raggedright}{}{}{}
+\makeatother
+
+\begin{History}
+
+ \begin{Version}{2015/06/01 v0.1}
+ \item Initial release in Parsi\LaTeX\ group under the name of \xpackage{qurantext}.
+ \item \cs{qurantext} added.
+ \end{Version}
+
+ \begin{Version}{2015/06/02 v0.2}
+ \item Redefinition of \cs{do@qt} in a nonrecursive style. The old recursive version sometimes led to \TeX\ stack overflow.
+ Thanks to \emph{Masoud Yazdani} for suggesting a solution to this issue.
+ \end{Version}
+
+ \begin{Version}{2015/06/02 v0.3}
+ \item Ayah's number has been added to the end of each verse of the output.
+ Thanks to \emph{Mahmood AminToosi} for suggesting this feature.
+ \end{Version}
+
+ \begin{Version}{2015/06/04 v0.4} %relactant about date
+ \item \cs{surahname} added. It outputs the arabic/anglicized title of a surah based on text direction.
+ \item The package renamed to \xpackage{quran}.
+ \end{Version}
+
+ \begin{Version}{2015/06/24 v0.5}
+ \item Package renamed from \xpackage{qurantext} to \xpackage{quran}
+ \item \cs{quranayah} added. It outputs a \meta{range} of ayahs from a surah.
+ \item \cs{quransurah} added. It outputs a \meta{range} of surahs.
+ Thanks to \emph{Mahmood AminToosi} for suggesting this new feature.
+ \end{Version}
+
+ \begin{Version}{2015/06/28 v0.6}
+ \item \cs{quranjuz} added outputing a juz's range of the holy Quran.
+ \end{Version}
+
+ \begin{Version}{2015/06/30 v0.7}
+ \item \cs{quranpage} added outputing one or more pages of the holy Quran,
+ \end{Version}
+
+ \begin{Version}{2015/07/02 v0.71}
+ \item A \cs{par} was appended to the basmalah. Thanks to \emph{Mahmood AminToosi} for suggesting this feature.
+ \end{Version}
+
+ \begin{Version}{2015/07/02 v0.72}
+ \item \cs{basmalah} added which typesets basmalah -- \hboxR{\Basmalah}.
+ \end{Version}
+
+ \begin{Version}{2015/07/04 v0.8}
+ \item \cs{quranquarter} and \cs{quranruku} added.
+ \end{Version}
+
+ \begin{Version}{2015/07/07 v0.9}
+ \item \cs{quranhizb} and \cs{quranmanzil} added.
+ \item The package was uploaded to CTAN.
+ \end{Version}
+
+ \begin{Version}{2015/07/10 v0.91}
+ \item ``Al-Ikhlas'' was set as default option for \cs{quransurah}.
+ \end{Version}
+
+ \begin{Version}{2015/07/11 v0.94}
+ \item \cs{ChangeAyahNumber} and\cs{ChangeBasmalah} added.
+ These macros change the way ayah's number and basmalah will appear.
+ \item A minor bug in extra white spaces around one ayah is solved now. Thanks \emph{Masoud Yazdani} for reporting this issue.
+ \end{Version}
+
+ \begin{Version}{2015/07/11 v0.941}
+ \item Reducing the size of quran text file by moving \cs{qt@par} from the file to \cs{qurantext}.
+ \end{Version}
+
+ \begin{Version}{2016/02/05 v1.0}
+ \item Support for using anglicized title of surah instead its index in \cs{quransurah} and \cs{quranayah}.
+ \end{Version}
+
+
+ \begin{Version}{2016/02/09 v1.05}
+ \item \cs{ChangeBasmalah} and \cs{ChangeAyahNumber} renamed to \cs{ToggleBasmalah} and \cs{ToggleAyahNumber} respectively.
+ \item A minor bug in \cs{quransurah*} fixed -- unwanted extra spaces in the output. Thanks \emph{Hosein Behboody} for reporting this issue.
+ \end{Version}
+
+ \begin{Version}{2016/04/21 v1.1}
+ \item \cs{indexconvert} macro converts a number between 1 to 6236 to its exact surah and ayah number in
+ the whole text of Quran.
+ \end{Version}
+
+ \begin{Version}{2016/05/15 v1.14}
+ \item Documentation updates.
+ \end{Version}
+
+ \begin{Version}{2016/10/05 v1.2}
+ \item Supports Uthmani script via \xoption{uthmani} option. This option asked by one of the package's user.
+ \end{Version}
+
+ \begin{Version}{2016/11/07 v1.21}
+ \item Some minor bugs in uploading to CTAN
+ \end{Version}
+
+ \begin{Version}{2016/11/08 v1.22}
+ \item Sources of two pdf files used in the documentation appended to the bundle.
+ \end{Version}
+
+ \begin{Version}{2016/11/12 v1.24}
+ \item Documentation updates.
+ \item Pause marks (waqf symbols) were missed from the penultimate version of uthmani script.
+ \end{Version}
+
+ \begin{Version}{2016/11/15 v1.241}
+ \item Documentation updates.
+ \end{Version}
+
+ \begin{Version}{2016/12/25 v1.25}
+ \item Documentation updates.
+ \end{Version}
+ \begin{Version}{2016/12/25 v1.251}
+ \item Documentation updates.
+ \end{Version}
+
+ \begin{Version}{2017/02/28 v1.252}
+ \item Minor improvements.
+ \end{Version}
+
+ \begin{Version}{2017/08/22 v1.26}
+ \item Minor improvements
+ \item Bug in \cs{quranayah[x][y]}; fixed by enclosing in a group. Thanks to \emph{Sayyed Saieed Mosavi Nadooshani} for reporting this issue.
+ \item Documentation updates.
+ \end{Version}
+
+ \begin{Version}{2016/08/22 v1.261}
+ \item Documentation updates--a typo in version number.
+ \end{Version}
+
+ \begin{Version}{2017/10/22 v1.3}
+ \item Transliteration supported., now all macros have an ``lt" version for typesetting transliteration of the original macros.
+ Thanks to \emph{Hamidreza Ahmadian} for suggesting this new feature.
+ \end{Version}
+
+ \begin{Version}{2017/10/28 v1.4}
+ \item Persian, English, and Deutsch translations added and ``fa", ``en", and ``de" version of macros defined for them.
+ Three new options, the `transfa`, `transen`, `transde` are defined.
+ \item There is also a new option, `\xoption{trans}' which can get the
+ `lt', `en', `de', and `fa' as its value seperated by comma.
+ \end{Version}
+
+ \begin{Version}{2017/12/22 v1.41}
+ \item in previous versions, \cs{quransurah} and \cs{quranayah} macros were case-sensitive in case of using surah names,
+ but by this version both macros are case-insensitive, i.e. there in no diffirences between Al-Fatihda, al-fatiha, al-Fatiha,
+ and the other possible combinations of lower-uppercase letters.
+ \end{Version}
+
+ \begin{Version}{2017/12/22 v1.42}
+ \item \cs{quransurahX} and \cs{quranayahX} macros also act case-insensitive with anglicized title of surahs.
+ X stands for `en', `de', `fa', or `lt'.
+ \end{Version}
+
+ \begin{Version}{2017/12/22 v1.42a}
+ \item Documentation update--a typo fixed.
+ \item Some files were missed in the last update to CTAN.
+ \end{Version}
+
+ \begin{Version}{2018/11/29 v1.42b}
+ \item A typo in quran-transde.def.
+ \end{Version}
+
+ \begin{Version}{2018/12/01}
+ \item \xpackage{quran-de} package is released adding 3 more translations of the German language.
+ \end{Version}
+
+ \begin{Version}{2018/12/31 v1.5}
+ \item Minor bugs in \cs{ToggleBasmalah} and \cs{quransurah}.
+ \end{Version}
+
+ \begin{Version}{2019/05/03}
+ \item \xpackage{quran-ur} package is released adding 8 translations of the Urdu language.
+ \end{Version}
+
+ \begin{Version}{2019/05/04 v1.51}
+ \item A typo in quran-transde.def.
+ \end{Version}
+
+ \begin{Version}{2020/03/07 v1.6}
+ \item support for getting any chunks of an ayah with two extra optional arguments for \cs{qurantext} and \cs{quranayah}.
+ This feature has been suggested and supported financially by \emph{Atiyah Elsheikh}.
+ May God bless him.
+ \item \cs{Basmalah} outputs basmalah without any surrounding whitespaces.
+ \item Documentation revision.
+ \end{Version}
+
+ \begin{Version}{2020/03/09 v1.61}
+ \item Applying current font in footnote by \cs{qt@doqt} when \cs{quranayah}/\cs{qurantext} is called by its ``\tt{+}'' optional argument. In the last version it used Amiri font.
+ \end{Version}
+
+ \begin{Version}{2020/03/12 v1.62}
+ \item License update to LPPL Version 1.3c from LPPL Version 1.3
+ \end{Version}
+
+ \begin{Version}{2020/03/14 v1.63}
+ \item Pause marks (waqf symbols) have been removed from \cs{quranayah} and \cs{qurantext}
+ whenever \oarg{chunk range} optional parameter is used.
+ \end{Version}
+
+ \def\cb{{\tiny$\bullet$\space}}
+ \def\mrule{\leaders\vrule height 2.5pt depth -1.5pt \hfill}
+ \begin{small}
+ \begin{longtable}{|c|l|p{9cm}|}
+ \toprule
+ Date & Ver. & \multicolumn{1}{c|}{Feature} \\
+ \midrule
+ \endhead
+ \bottomrule
+ \multicolumn{3}{r}{\scriptsize continued on next page}\\
+ \endfoot
+ \multicolumn{3}{c}{}\\
+ \caption{Brief History of the \xpackage{quran} Development}
+ \endlastfoot
+ 2015/06/01 & 0.1 & \cb Initial release in Parsi\LaTeX, named \xpackage{qurantext} \par
+ \cb \cs{qurantext} \\
+ 2015/06/02 & 0.2 & \cb Implementation of \cs{do@qt} in a nonrecursive style \\
+ 2015/06/02 & 0.3 & \cb Provision of ayah's number.\\
+ 2015/06/04 & 0.4 & \cb \cs{surahname} outputing the arabic/anglicized title of a surah\par
+ \cb package renamed to \xpackage{quran}\\
+ 2015/06/24 & 0.5 & \cb \cs{quranayah} and \cs{quransurah} \\
+ 2015/06/28 & 0.6 & \cb \cs{quranjuz} \\
+ 2015/06/30 & 0.7 & \cb \cs{quranpage} \\
+ 2015/07/02 & 0.71 & \cb Basmalah was followed by \cs{par}\\
+ 2015/07/02 & 0.72 & \cb \cs{basmalah} -- \hboxR{\Basmalah} \\
+ 2015/07/04 & 0.8 & \cb \cs{quranquarter} and \cs{quranruku} \\
+ 2015/07/07 & 0.9 & \cb \cs{quranhizb} and \cs{quranmanzil}\par
+ \cb The package was uploaded to CTAN. \\
+ 2015/07/10 & 0.91 & \cb ``Al-Ikhlas'' as a default parameter for \cs{quransurah} \\
+ 2015/07/11 & 0.94 & \cb \cs{ChangeAyahNumber} and\cs{ChangeBasmalah} \par Resolving a minor bug \\
+ 2015/07/11 & 0.941 & \cb Improvement in \cs{qurantext} \\
+ 2016/02/05 & 1.0 & \cb \cs{quransurah} and \cs{quranayah} support anglicized title of surahs \\
+ 2016/02/09 & 1.05 & \cb \cs{ChangeBasmalah} and \cs{ChangeAyahNumber} renamed to
+ \cs{ToggleBasmalah} and \cs{ToggleAyahNumber}\par
+ \cb A minor bug in \cs{quransurah*} fixed\\
+ 2016/04/21 & 1.1 & \cb \cs{indexconvert} \\
+ 2016/05/15 & 1.14 & \cb Documentation updates \\
+ 2016/10/05 & 1.2 & \cb \xoption{uthmani} option supporting Uthmani script \\
+ 2016/11/07 & 1.21 & \cb Some minor bugs \\
+ 2016/11/08 & 1.22 & \cb Documentation updates \\
+ 2016/11/12 & 1.24 & \cb Documentation updates\par
+ \cb Pause marks (waqf symbols) were missed from uthmani script\\
+ 2016/11/15 & 1.241 & \cb Documentation updates \\
+ 2016/12/25 & 1.25 & \cb Documentation updates \\
+ 2016/12/25 & 1.251 & \cb Documentation updates \\
+ 2017/02/28 & 1.252 & \cb Minor improvements \\
+ 2017/08/22 & 1.26 & \cb Minor improvements\par
+ \cb Bug fix in \cs{quranayah[x][y]}\par
+ \cb Documentation updates \\
+ 2016/08/22 & 1.261 & \cb Documentation updates \\
+ 2017/10/22 & 1.3 & \cb Transliteration supported via \xoption{translt} option \\
+ 2017/10/28 & 1.4 & \cb Persian, English, and Deutsch translations via \xoption{transfa}, \xoption{transen}, and \xoption{transde} options\par
+ \cb \xoption{trans} option with `lt', `en', `de', and `fa' values \\
+ 2017/12/22 & 1.41 & \cb case-insensitive \cs{quransurah} and \cs{quranayah} \\
+ 2017/12/22 & 1.42 & \cb case-insensitive \cs{quransurahX} and \cs{quranayahX} \par\tt{X} $\in$ \{`en', `de', `fa', `lt'\} \\
+ 2017/12/22 & 1.42a & \cb Documentation updates \\
+ 2018/11/29 & 1.42b & \cb A typo in \tt{quran-transde.def}\\
+ 2018/12/01 & \multicolumn{2}{c|}{ \null \mrule {\space}First release of the \xpackage{quran-de} package \mrule \space\null}\\
+ 2018/12/31 & 1.5 & \cb Bug fix in \cs{ToggleBasmalah} and \cs{quransurah} \\
+ 2019/05/03 & \multicolumn{2}{c|}{ \null \mrule {\space}First release of the \xpackage{quran-ur} package \mrule \space\null}\\
+ 2019/05/04 & 1.51 & \cb A typo in \tt{quran-transde.def}\\
+ 2020/03/07 & 1.6 & \cb \cs{qurantext} and \cs{quranayah} support any chunks of an ayah\par
+ \cb \cs{Basmalah} \hfil \cb Documentation revision\\
+ 2020/03/09 & 1.61 & \cb Minor update in \cs{quranayah} and \cs{qurantext} \\
+ 2020/03/12 & 1.62 & \cb License update to LPPL Version 1.3c \\
+ 2020/03/14 & 1.63 & \cb Removing pause marks with \meta{chunk range} optional parameter\\
+ \bottomrule
+ \end{longtable}
+ \end{small}
+
+\end{History}
+
\end{document}
Binary files old/doc/xelatex/quran/quran-test.pdf and new/doc/xelatex/quran/quran-test.pdf differ
Binary files old/doc/xelatex/quran/quran-test1.pdf and new/doc/xelatex/quran/quran-test1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/quran-test1.tex new/doc/xelatex/quran/quran-test1.tex
--- old/doc/xelatex/quran/quran-test1.tex 2016-11-07 23:15:41.000000000 +0100
+++ new/doc/xelatex/quran/quran-test1.tex 2020-03-08 22:48:34.000000000 +0100
@@ -1,6 +1,6 @@
\documentclass[12pt]{article}
-\usepackage[uthmani]{quran}
+\usepackage[uthmani, wordwise]{quran}
%%% for typesetting arabic text
\usepackage{polyglossia}
\setotherlanguage{arabic}
@@ -12,7 +12,6 @@
\begin{document}
\setRTL
-\textarabic{\quranayah[2][10-20]}
-
-\textarabic{\quranayah*[2][10-20]}
+\textarabic{\quranayah[2][10-20][1-99]}
+\textarabic{\textbf{\quranayah*[2][10-20][100]}}
\end{document}
Binary files old/doc/xelatex/quran/quran-test2.pdf and new/doc/xelatex/quran/quran-test2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/quran-test2.tex new/doc/xelatex/quran/quran-test2.tex
--- old/doc/xelatex/quran/quran-test2.tex 2017-10-29 22:22:48.000000000 +0100
+++ new/doc/xelatex/quran/quran-test2.tex 2020-03-08 22:48:34.000000000 +0100
@@ -2,7 +2,7 @@
\documentclass{article}
\usepackage{forloop}
-\usepackage{quran}
+\usepackage[trans={lt,de,en,fa}]{quran}
%The xepersian package automatically load bidi, and I've loaded it because I want to set a font that supports Arabic letters
\usepackage{xepersian}
@@ -10,7 +10,7 @@
\settextfont[Scale=1.1]{Scheherazade}
\def\surna[#1]{\centerline{\hss\surahname*[#1]\hss\surahname[#1]\hss}}
-\def\test#1{
+\def\test#1{%
\par
\surna[#1]
\quransurah*[#1]
@@ -18,7 +18,15 @@
}
\begin{document}
+\quransurah*[1]
+\quranayah*[2][286][5-24]
+
+\quranayah*[1][1-7][3-4]
+
+\qurantext*[1-2][6]+
+
+\qurantext*[1-2][6-8]
% For typesetting بِسمِ اللَّهِ الرَّحمٰنِ الرَّحيمِ use below macro
%\centerline{\basmalah}
@@ -37,8 +45,8 @@
\quranayah*[76][1-22]
%%You can typeset whole of Holy Quran with below commands.
-%%\newcounter{ct}
-%%\forloop{ct}{1}{\value{ct} < 115} {\test{\value{ct}}}
+\newcounter{ct}
+\forloop{ct}{110}{\value{ct} < 115} {\test{\the\value{ct}}}
%%You can typeset whole of Holy Quran with below commands.
%%\newcounter{jz}
@@ -55,7 +63,7 @@
\hfill صفحة \arabic{pg} \par
\quranpage*[\value{pg}]\vfill}
-%\quranhizb*[117-120]
+%\quranhizb*[57-60]
%\quranquarter*[1-4]
%\quranquarter*[239-240]
Binary files old/doc/xelatex/quran/uthmanitext.pdf and new/doc/xelatex/quran/uthmanitext.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/quran/uthmanitext.tex new/doc/xelatex/quran/uthmanitext.tex
--- old/doc/xelatex/quran/uthmanitext.tex 2016-11-08 23:35:30.000000000 +0100
+++ new/doc/xelatex/quran/uthmanitext.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-\documentclass{standalone}
-
-\usepackage[uthmani]{quran}
-\usepackage{xepersian}
-\settextfont{Scheherazade}
-
-\begin{document}
-
-\begin{minipage}{.45\textwidth}
-{\quransurah*[1]}
-\end{minipage}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/quran.doc.tlpobj new/tlpkg/tlpobj/quran.doc.tlpobj
--- old/tlpkg/tlpobj/quran.doc.tlpobj 2019-02-28 04:03:58.000000000 +0100
+++ new/tlpkg/tlpobj/quran.doc.tlpobj 2020-03-16 02:21:38.000000000 +0100
@@ -1,12 +1,10 @@
name quran.doc
category Package
-revision 49563
+revision 54333
shortdesc doc files of quran
relocated 1
-docfiles size=123
+docfiles size=138
RELOC/doc/xelatex/quran/README
- RELOC/doc/xelatex/quran/defaulttext.pdf
- RELOC/doc/xelatex/quran/defaulttext.tex
RELOC/doc/xelatex/quran/quran-doc.pdf
RELOC/doc/xelatex/quran/quran-doc.tex
RELOC/doc/xelatex/quran/quran-test.pdf
@@ -16,5 +14,3 @@
RELOC/doc/xelatex/quran/quran-test2.pdf
RELOC/doc/xelatex/quran/quran-test2.tex
RELOC/doc/xelatex/quran/quran.png
- RELOC/doc/xelatex/quran/uthmanitext.pdf
- RELOC/doc/xelatex/quran/uthmanitext.tex
++++++ quran.tar.xz ++++++
++++ 114066 lines of diff (skipped)
++++++ ran_toks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/README.md new/doc/latex/ran_toks/README.md
--- old/doc/latex/ran_toks/README.md 2017-05-19 23:06:02.000000000 +0200
+++ new/doc/latex/ran_toks/README.md 2019-12-30 23:17:36.000000000 +0100
@@ -1,6 +1,6 @@
The ran_toks Package
Author: D. P. Story
-Dated: 2017/05/04
+Dated: 2019-12-28
This short package, with minimal requirements, defines macros for
randomizing a list of tokens. There are two approaches:
@@ -40,6 +40,9 @@
For users of AeB or eqexam, the latter structure can be used to randomize
the order of the questions on a quiz or exam.
+What's New (2019-12-28 ) Defined \rtVWHook to insert at the top of the
+rtVW environment. Also created an alternate package name of ran-toks.
+
What's new in v1.1: Added the convenience command \useTheseDBs to input files for
an application to constructing exams (using eqexam) from a series of DB files. Refer to the
new demo file mc-db.tex.
Binary files old/doc/latex/ran_toks/doc/rantoks_man.pdf and new/doc/latex/ran_toks/doc/rantoks_man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/doc/rantoks_man.tex new/doc/latex/ran_toks/doc/rantoks_man.tex
--- old/doc/latex/ran_toks/doc/rantoks_man.tex 2017-05-19 23:06:02.000000000 +0200
+++ new/doc/latex/ran_toks/doc/rantoks_man.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,683 +0,0 @@
-\documentclass{article}
-\usepackage[fleqn]{amsmath}
-\usepackage[
- web={centertitlepage,designv,forcolorpaper,
- latextoc,pro}, %tight,
- eforms,aebxmp
-]{aeb_pro}
-\usepackage{ran_toks}
-
-\useThisSeed{1441984427}
-%\useLastAsSeed
-%\useThisSeed{2001383846}
-
-%2001383846 % initializing seed value
-%1629639958 % last random number used
-
-\let\pkg\textsf
-\let\env\texttt
-
-%\rtdebugtrue
-%\ranToksOn
-%\ranToksOff
-
-
-%\usepackage{myriadpro}
-\usepackage[altbullet]{lucidbry}
-
-%\usepackage{makeidx}
-%\makeindex
-\usepackage{acroman}
-
-\makeatletter
-\def\eq@fititin#1{\noindent\unskip\nobreak\hfill\penalty50
- \hskip2em\hbox{}\nobreak\hfill#1}
-\def\fitit{\eq@fititin{\exrtnlabelformat}}
-\@mparswitchfalse\reversemarginpar
-\renewcommand{\paragraph}
- {\@startsection{paragraph}{4}{0pt}{6pt}{-3pt}
- {\normalfont\normalsize\bfseries}}
-\renewcommand{\subparagraph}
- {\@startsection{subparagraph}{5}{\parindent}{6pt}{-3pt}%
- {\normalfont\normalsize\bfseries}}
-\makeatother
-
-\def\anglemeta#1{$\langle\textit{\texttt{#1}}\rangle$}
-\let\ameta\anglemeta
-\def\meta#1{\textit{\texttt{#1}}}
-\def\darg#1{\texttt{\{#1\}}}
-\def\takeMeasure{\bgroup\obeyspaces\takeMeasurei}
-\def\takeMeasurei#1{\global\setbox\webtempboxi\hbox{\ttfamily#1}\egroup}
-\def\bxSize{\wd\webtempboxi+2\fboxsep+2\fboxrule}
-
-\usepackage[active]{srcltx}
-
-\let\amtIndent\leftmargini
-\def\SUB#1{${}_{\text{#1}}$}
-
-\newdimen\aebdimen \aebdimen\topsep
-\newcommand\bVerb[1][]{\begingroup#1\vskip\aebdimen\parindent0pt}%
-\def\eVerb{\vskip\aebdimen\endgroup\noindent}
-
-
-\urlstyle{rm}
-
-\DeclareDocInfo
-{
- university={\AcroTeX.Net},
- title={\texorpdfstring{The \textsf{ran\_toks}}{The manual for the ran\_toks}
- Package\texorpdfstring{\\[6pt]\large}{: }
- Randomizing the order of tokens},
- author={D. P. Story},
- email={dpstory(a)acrotex.net},
- subject=Documentation for the ran\_toks package,
- talksite={\url{www.acrotex.net}},
- version={1.1},
- Keywords={LaTeX,PDF,random, tokens, JavaScript,Adobe Acrobat},
- copyrightStatus=True,
- copyrightNotice={Copyright (C) \the\year, D. P. Story},
- copyrightInfoURL={http://www.acrotex.net}
-}
-\DeclareInitView{windowoptions={showtitle}}
-
-
-\def\dps{$\hbox{$\mathfrak D$\kern-.3em\hbox{$\mathfrak P$}%
- \kern-.6em \hbox{$\mathcal S$}}$}
-
-\universityLayout{fontsize=Large}
-\titleLayout{fontsize=LARGE}
-\authorLayout{fontsize=Large}
-\tocLayout{fontsize=Large,color=aeb}
-\sectionLayout{indent=-62.5pt,fontsize=large,color=aeb}
-\subsectionLayout{indent=-31.25pt,color=aeb}
-\subsubsectionLayout{indent=0pt,color=aeb}
-\subsubDefaultDing{\texorpdfstring{$\bullet$}{\textrm\textbullet}}
-
-\def\exSrc{\makebox[0pt][r]{\large{\Pisymbol{webd}{157}}\enspace}}
-
-%\pagestyle{empty}
-%\parindent0pt\parskip\medskipamount
-
-\chngDocObjectTo{\newDO}{doc}
-\begin{docassembly}
-var titleOfManual="The ran_toks Package";
-var manualfilename="Manual_BG_Print_rt.pdf";
-var manualtemplate="Manual_BG_Brown.pdf"; // Blue, Green, Brown
-var _pathToBlank="C:/Users/Public/Documents/ManualBGs/"+manualtemplate;
-var doc;
-var buildIt=false;
-if ( buildIt ) {
- console.println("Creating new " + manualfilename + " file.");
- doc = \appopenDoc({cPath: _pathToBlank, bHidden: true});
- var _path=this.path;
- var pos=_path.lastIndexOf("/");
- _path=_path.substring(0,pos)+"/"+manualfilename;
- \docSaveAs\newDO ({ cPath: _path });
- doc.closeDoc();
- doc = \appopenDoc({cPath: manualfilename, oDoc:this, bHidden: true});
- f=doc.getField("ManualTitle");
- f.value=titleOfManual;
- doc.flattenPages();
- \docSaveAs\newDO({ cPath: manualfilename });
- doc.closeDoc();
-} else {
- console.println("Using the current "+manualfilename+" file.");
-}
-var _path=this.path;
-var pos=_path.lastIndexOf("/");
-_path=_path.substring(0,pos)+"/"+manualfilename;
-\addWatermarkFromFile({
- bOnTop:false,
- bOnPrint:false,
- cDIPath:_path
-});
-\executeSave();
-\end{docassembly}
-
-%\definePath\bgPath{"C:/Users/Public/Documents/%
-% ManualBGs/Manual_BG_Print_AeB.pdf"}
-%\begin{docassembly}
-%\addWatermarkFromFile({%
-% bOnTop: false,
-% cDIPath: \bgPath
-%})
-%\executeSave()
-%\end{docassembly}
-
-\begin{document}
-
-\maketitle
-
-\selectColors{linkColor=black}
-\tableofcontents
-\selectColors{linkColor=webgreen}
-
-\section{Introduction}
-
-This is a short package for randomizing the order of tokens. The package
-is long overdue; users of \textbf{AeB} and of \textsf{eqexam} have long asked for a way to
-randomize the order of the problems in a test or quiz, or anything for
-that matter.
-
-\newtopic\noindent\exSrc The \texttt{examples} folder contains three demonstration files:
-\begin{enumerate}
- \item \texttt{ran\_toks.tex} reproduces the sample code of this manual.
- \item \texttt{random\_tst.tex} shows how to use \pkg{ran\_toks} to
- randomize the \emph{questions} of an exam document created by the
- \pkg{eqexam} package.
- \item \texttt{random\_tst\_qz.tex} shows how to randomize choices of a
- multiple choice field in a \env{quiz} environment of the
- \pkg{exerquiz} package, when the choices contain verbatim text.
- \item \texttt{mc-db.tex} is an \pkg{eqexam} file that draws from the
- database files \texttt{db1.tex}, \texttt{db2.tex},
- \texttt{db3.tex}, and \texttt{db4.tex}, to construct the questions
- of the exam. The questions are drawn at random from the DB files. Refer
- to \hyperref[s:DBConcept]{Section~\ref*{s:DBConcept}} for a few more details.
-
-\end{enumerate}
-
-\section{The Preamble and Package Options}
-
-The preamble for this package is
-\bVerb\takeMeasure{\string\usepackage\darg{ran\_toks}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single]
-\usepackage{ran_toks}
-\end{Verbatim}
-\end{minipage}\eVerb
-The package itself has no options.
-
-The requirements for \textsf{ran\_toks} are the \textsf{verbatim} package
-(part of the standard {\LaTeX} distribution, and the macro file
-\texttt{random.tex} by Donald Arseneau.
-
-
-\section{The main commands and environments}\label{rtmain}
-
-There are two styles for defining a series of tokens to be randomized,
-using either the \cs{ranToks} command or the \cs{bRTVToks}/\cs{eRTVToks}
-pair. Each of these is discussed in the next two subsections.
-
-\subsection{The \texorpdfstring{\protect\cs{ranToks}}{\CMD{ranToks}} command}
-
-The \cs{ranToks} command was the original concept; declare a series of
-tokens to be randomized.
-\bVerb\takeMeasure{\string\ranToks\darg{\meta{name}}\{\%\enspace}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\ranToks{!meta(name)}{%
- {!meta(token!SUB(1))}
- {!meta(token!SUB(2))}
- ...
- {!meta(token!SUB(n))}
-}
-\end{Verbatim}
-\end{minipage}\eVerb
-were \meta{token\SUB{k}} is any non-verbatim content;\footnote{Any token that
-can be in the argument of a command.} each token is enclosed in braces
-(\darg{}), this is required. The \meta{name} parameter is required, and
-must be unique for the document; it is used to build the names of internal
-macros. Of course several such \cs{ranToks} can be used in the document,
-either in the preamble or in the body of the document. Multiple
-\cs{ranToks} commands must have a different \meta{name} parameter.
-
-\emph{After} a \cs{ranToks} command has been executed, the number of tokens
-counted is accessible through the \cs{nToksFor} command,
-\bVerb\takeMeasure{\string\nToksFor\darg{\meta{name}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\nToksFor{!meta(name)}
-\end{Verbatim}
-\end{minipage}\eVerb
-The one argument is \meta{name}, and will expand to the total number
-of tokens listing as argument in the \cs{ranToks} command by the same
-name.
-
-The \cs{ranToks} command does not display the randomized tokens, for that
-the command \cs{useRanTok} is used.
-\bVerb\takeMeasure{\string\useRTName\darg{\meta{name}}}%
-\begin{minipage}{\bxSize}
-\begin{Verbatim}[frame=single,commandchars=!()]
-\useRanTok{!meta(num)}
-\useRTName{!meta(name)}
-\end{Verbatim}
-\end{minipage}\eVerb
-The argument of \cs{useRanTok} is a positive integer between 1 and
-\cs{nToksFor\darg{\meta{name}}}, the number of tokens declared by
-\cs{ranToks}, inclusive. There is no space created following the
-\cs{useRanTok} command, so if these are to be used ``inline'', enclose them
-in braces (\darg{}), for example, \darg{\cs{useRanTok\darg{1}}}. The use of
-\cs{useRTName} is optional unless the listing of the \cs{useRanTok} commands
-is separated from the \cs{ranToks} command that defined them by another
-\cs{ranToks} command of a different name. That should be clear!
-
-Consider this example.
-
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\ranToks{myPals}{%
- {Jim}{Richard}{Don}
- {Alex}{Tom}{J\"{u}rgen}
-}
-\end{Verbatim}
-\ranToks{myPals}{%
- {Jim}{Richard}{Don}
- {Alex}{Tom}{J\"{u}rgen}
-}
-I have {\nToksFor{myPals}} pals, they are \useRanTok{1}, \useRanTok{2},
-\useRanTok{3}, \useRanTok{4}, {\useRanTok{5}} and \useRanTok{6}. (Listed
-in the order of best friend to least best friend.)
-The verbatim listing is,
-\begin{Verbatim}[xleftmargin=\amtIndent]
-I have {\nToksFor{myPals}} pals, they are \useRanTok{1},
-\useRanTok{2}, \useRanTok{3}, \useRanTok{4}, {\useRanTok{5}}
-and \useRanTok{6}.
-\end{Verbatim}
-Notice that \cs{useRanToks} are not enclosed in braces for 1--4 because
-they are each followed by a comma; the fifth token, \texttt{\darg{\cs{useRanTok\darg{5}}}}, is
-enclosed in braces to generate a space following the insertion of the text.
-
-Repeating the sentence yields, ``I have {\nToksFor{myPals}} pals, they are
-\useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4},
-{\useRanTok{5}} and \useRanTok{6}'', which is the exact same random order. To
-obtain a different order, re-execute the \cs{ranToks} command with the same
-arguments.\footnote{{\ttfamily\string\ranToks\darg{myPals}\darg{\darg{Jim}\darg{Richard}\darg{Don}\darg{Alex}\darg{Tom}\darg{J\string\"\darg{u}rgen}}} in this example.} Doing just that, \ranToks{myPals}{{Jim}{Richard}{Don}
-{Alex}{Tom}{J\"{u}rgen}}we obtain, ``I have {\nToksFor{myPals}} pals, they
-are \useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4},
-{\useRanTok{5}} and \useRanTok{6}.'' A new order?
-An alternative to re-executing \cs{ranToks} is to use the \cs{reorderRanToks} command:
-\bVerb\takeMeasure{\string\reorderRanToks\darg{\meta{name}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\reorderRanToks{!meta(name)}
-\end{Verbatim}
-\end{minipage}\eVerb Now, executing \verb~\reorderRanToks{myPals}~ and compiling the sentence again yields,
-``I have {\nToksFor{myPals}} pals, they are
-\useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4},
-{\useRanTok{5}} and \useRanTok{6}.'' For most applications, re-randomizing
-the same token list in the same document is not very likely something you
-need to do.
-
-The \cs{reorderRanToks\darg{\meta{name}}} rearranges the list of tokens
-associated with \ameta{name}, which may not be what you want; the
-\cs{copyRanToks} command, on the other hand, makes a (randomized) copy of its
-first required argument \ameta{name\SUB1} and saves it as \ameta{name\SUB2}, without
-effecting the order of \ameta{name\SUB1}.
-\bVerb\takeMeasure{\string\copyRanToks\darg{\ameta{name\SUB1}}\darg{\ameta{name\SUB2}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\copyRanToks{!ameta(name!SUB1)}{!ameta(name!SUB2)}
-\end{Verbatim}
-\end{minipage}\eVerb Thus, if \verb!\copyRanToks{myPals}{myPals1}! is executed, the token list name
-\texttt{myPals1} contains the names of my pals in another randomized order,
-while maintaining the same order of \texttt{myPals}.
-
-
-\newtopic
-My original application for this, the one that motivated writing this
-package at long last, was the need to arrange several form buttons
-randomly on the page. My point is that the listing given in the argument
-of \cs{ranToks} can pretty much be anything that is allowed to be an
-argument of a macro; this would exclude verbatim text created by \cs{verb}
-and verbatim environments.
-
-\subsection{The
-\texorpdfstring{\protect\cs{bRTVToks}/\protect\cs{eRTVToks}}
- {\CMD{bRTVToks}/\CMD{eRTVToks}} pair of commands}\label{ss:RTVToks}
-
-Sometimes the content to be randomized is quite large or contains verbatim
-text. For this, it may be more convenient to use the
-\cs{bRTVToks}/\penalty0\cs{eRTVToks} command pair. The syntax is
-\bVerb\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad}%
-\edef\WIDTH{\the\wd\webtempboxi}%
-\def\1{\rlap{\hspace*{\WIDTH}\texttt{\% <-{\sffamily{ End token listing}}}}}%
-\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad\% <-{\sffamily{ Begin token listing}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\bRTVToks{!meta(name)}!quad% <-!sffamily( Begin token listing)
-\begin{rtVW}
-!qquad!ameta(content!SUB(1))
-\end{rtVW}
-...
-...
-\begin{rtVW}
-!qquad!ameta(content!SUB(n))
-\end{rtVW}
-!1\eRTVToks
-\end{Verbatim}
-\end{minipage}\eVerb
-The \cs{bRTVToks}\texttt{\{\meta{name}\}} command begins the (pseudo)
-environment and is ended by \cs{eRTVToks}. Between these two are a series of
-\texttt{rtVW} (random toks verbatim write) environments. When the document is
-compiled, the contents (\ameta{content\SUB{i}}) of each of these environments
-are written to the computer hard drive and saved under a different name
-(based on the parameter \meta{name}). Later, using the \cs{useRanTok}
-commands, they are input back into the document in a random order.
-
-The use of \cs{useRTName} and \cs{useRanTok} were explained and illustrated
-in the previous section. Let's go to the examples,
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\bRTVToks{myThoughts}
-\begin{rtVW}
-\begin{minipage}[t]{.67\linewidth}
-Roses are red and violets are blue,
-I've forgotten the rest, have you too?
-\end{minipage}
-\end{rtVW}
-\begin{rtVW}
-\begin{minipage}[t]{.67\linewidth}
-I gave up saying bad things like
-\verb!$#%%%^*%^&#$@#! when I was just a teenager.
-\end{minipage}
-\end{rtVW}
-\begin{rtVW}
-\begin{minipage}[t]{.67\linewidth}
-I am a good guy, pass it on! The code for this last sentence is,
-\begin{verbatim}
-%#$% I am a good guy, pass it on! ^&*&^*
-\end{verbatim}
-How did that other stuff get in there?
-\end{minipage}
-\end{rtVW}
-\eRTVToks
-\end{Verbatim}
-OK, now, let's display these three in random order. Here we place them in
-an \texttt{enumerate} environment.
-
-\bRTVToks{myThoughts}%
-\begin{rtVW}
-\begin{minipage}[t]{.67\linewidth}
-Roses are red and violets are blue,
-I've forgotten the rest, have you too?
-\end{minipage}
-\end{rtVW}
-\begin{rtVW}
-\begin{minipage}[t]{.67\linewidth}
-I gave up saying bad things like
-\verb!$#%%%^*%^&#$@#! when I was just a teenager.
-\end{minipage}
-\end{rtVW}
-\begin{rtVW}
-\begin{minipage}[t]{.67\linewidth}
-I am a good guy, pass it on! The code for this last sentence is,
-\begin{verbatim}
-%#$% I am a good guy, pass it on! ^&*&^*
-\end{verbatim}
-How did that other stuff get in there?
-\end{minipage}
-\end{rtVW}
-\eRTVToks
-\begin{enumerate}
- \item \useRanTok{1}
- \item \useRanTok{2}
- \item \useRanTok{3}
-\end{enumerate}
-The verbatim listing of the example above is
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\begin{enumerate}
- \item \useRanTok{1}
- \item \useRanTok{2}
- \item \useRanTok{3}
-\end{enumerate}
-\end{Verbatim}
-The \cs{reorderRanToks} works for lists created by the \cs{bRTVToks}/\penalty0\cs{bRTVToks} construct.
-If we say \cs{reorderRanToks\darg{myThoughts}} and reissue the above list, we obtain,
-\begin{enumerate}\ranToksOn\reorderRanToks{myThoughts}
- \displayListRandomly[\item]{myThoughts}
-\end{enumerate}
-The command \cs{copyRanToks} works for list created by
-\cs{bRTVToks}/\penalty0\cs{bRTVToks} as well.
-
-
-\paragraph*{On the \cs{displayListRandomly} command.}\label{para:DLR}
-In the enumerate example immediately above, the items in the list are
-explicitly listed as \cs{item \cs{useRanTok\darg{1}}} and so one; an
-alternate approach is to use the command \cs{displayListRandomly}, like so,
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\begin{enumerate}
- \displayListRandomly[\item]{myThoughts}
-\end{enumerate}
-\end{Verbatim}
-The full syntax for \cs{displayListRandomly} is displayed next.
-\bVerb\takeMeasure{\string\displayListRandomly[\ameta{prior}][\ameta{post}]\darg{\meta{name}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\displayListRandomly[!ameta(prior)][!ameta(post)]{!meta(name)}
-\end{Verbatim}
-\end{minipage}
-\eVerb The action of \cs{displayListRandomly} is to expand all tokens that
-are listed in the \meta{name} token list, each entry is displayed as
-\ameta{prior}\cs{useRanTok\darg{i}}\ameta{post}, where \texttt{i}
-goes from~1 to \cs{nToksFor\darg{\meta{name}}}. In the example above,
-\meta{prior} is \cs{item}, but normally, its default is empty. The defaults
-for \ameta{prior} and \ameta{post} are both empty.
-
-\subparagraph*{The optional arguments.} When only one optional argument is present,
-if is interpreted as \ameta{prior}. To obtain a \ameta{post} with no \ameta{prior}
-use the syntax,
-\begin{quote}
-\cs{displayListRandomly[][\ameta{post}]\darg{\ameta{name}}}
-\end{quote}
-Within \emph{each optional argument}, the four commands \cs{i},
-\cs{first}, \cs{last}, and \cs{lessone} are (locally) defined. The \cs{i} command is the index
-counter of the token currently being typeset; \cs{first} is the index of the
-first item; \cs{last} is the index of the last item; and \cs{lessone} is one
-less than \cs{last}. The two optional arguments and the four commands may use
-to perform logic on the token as it is being typeset. For example:
-\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small]
-List of pals: \displayListRandomly
- [\ifnum\i=\last and \fi]
- [\ifnum\i=\last.\else, \fi]{myPals}
-\end{Verbatim}
-yields,
-\begin{quote}
-List of pals: \displayListRandomly
- [\ifnum\i=\last and \fi]
- [\ifnum\i=\last.\else, \fi]{myPals}
-\end{quote}
-The optional arguments are wrapped to the next line to keep them within the margins, cool.
-
-The example above shows the list of my pals with an Oxford comma. How would
-you modify the optional argument to get the same listing without the Oxford
-comma? (\displayListRandomly[\ifnum\i=\last and \fi][\ifnum\i=\last.\else\ifnum\i=\lessone\relax\space\else, \fi\fi]{myPals})
-Hint: a solution involves the other command \cs{lessone}.
-
-
-
-\section{Additional arguments and commands}\label{AddCmds}
-
-The syntax given earlier for \cs{useRanTok} was not completely specified.
-It is
-\bVerb\takeMeasure{\string\useRanTok[\meta{name}]\darg{\meta{num}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\useRanTok[!meta(name)]{!meta(num)}
-\end{Verbatim}
-\end{minipage}\eVerb
-The optional first parameter specifies the \meta{name} of the list from
-which to draw a random token; \meta{num} is the number of the
-token in the range of 1 and \cs{nToksFor\darg{\meta{name}}},
-inclusive. The optional argument is useful in special circumstances when
-you want to mix two random lists together.
-
-\newtopic\noindent To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{2}
-
-\newtopic\noindent The verbatim listing is
-\begin{Verbatim}[xleftmargin=\amtIndent]
-To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{2}
-\end{Verbatim}
-The typeset version looks a little strange, but recall, the text of
-\texttt{myThoughts} were each put in a \texttt{minipage} of width \texttt{.67\cs{linewidth}}.
-Without the \texttt{minipage}, the text would wrap around normally.
-
-\paragraph*{Accessing the original order.} The original order of the list of tokens is not lost, you can retrieve
-them using the command \cs{rtTokByNum},
-\bVerb\takeMeasure{\string\rtTokByNum[\meta{name}]\darg{\meta{num}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\rtTokByNum[!meta(name)]{!meta(num)}
-\end{Verbatim}
-\end{minipage}\eVerb
-This command expands to the token declared in the list named \meta{name}
-that appears at the \meta{num} place in the list. (Rather awkwardly written.)
-For example, my really best pals are {\rtTokByNum[myPals]{3}} and
-\rtTokByNum[myPals]{4}, but don't tell them. The listing is,
-\begin{Verbatim}[xleftmargin=\amtIndent]
-For example, my really best pals are {\rtTokByNum[myPals]{3}}
-and \rtTokByNum[myPals]{4}, but don't tell them.
-\end{Verbatim}
-In some sense, \cs{rtTokByNum[\meta{name}]} acts like a simple array, the
-length of which is \cs{nToksFor\{\meta{name}\}}, and whose $k^{\text{th}}$
-element is \cs{rtTokByNum[\meta{name}]\{\meta{k}\}}.
-
-\paragraph*{Turning off randomization.} The randomization may be turned off
-using \cs{ranToksOff} or turned back on with \cs{ranToksOn}.
-\bVerb\takeMeasure{\string\ranToksOff\quad\string\ranToksOn}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\ranToksOff!quad\ranToksOn
-\end{Verbatim}
-\end{minipage}\eVerb
-This can be done globally in the preamble for the whole of the document,
-or in the body of the document just prior to either \cs{ranToks} or
-\cs{bRTVToks}. For example,
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\ranToksOff
-\ranToks{integers}{ {1}{2}{3}{4} }
-\ranToksOn
-\end{Verbatim}
-As a check, executing `$\cs{useRanTok\darg{3}} = \cs{rtTokByNum\darg{3}} = 3 $' yields
-`\ranToksOff\ranToks{integers}{ {1}{2}{3}{4}}\ranToksOn
-$\useRanTok{3} = \rtTokByNum{3} = 3 $'? As anticipated.
-
-To create a non-randomized list of tokens that already have been created (and randomized), use
-\cs{copyRanToks}:
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\ranToksOff\copyRanToks{myPals}{myOriginalPals}\ranToksOn
-\end{Verbatim}
-Then, using \cs{displayListRandomly} in a clever way,
-\begin{Verbatim}[xleftmargin=\amtIndent]
-\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~]
- [\ifnum\i=\last.\else,\fi\space]{myOriginalPals}
-\end{Verbatim}
-we obtain: \ranToksOff\copyRanToks{myPals}{myOriginalPals}\ranToksOn
-\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~][\ifnum\i=\last.\else,\fi\space]{myOriginalPals}
-The original list for \texttt{myPals} remains unchanged:
-\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~][\ifnum\i=\last.\else,\fi\space]{myPals}
-
-The \cs{useRanTok} command---whether it operates on a randomized token list
-or not---behaves similarly to an array. Thus, if we wanted the extract
-the third entry of the non-randomized token list (array)
-\texttt{myOriginalPals}, we do so by expanding the command
-\verb!\useRanTok[myOriginalPals]{3}! to produce
-\useRanTok[myOriginalPals]{3}.
-
-\subparagraph*{Document preparation.}
-The command \cs{ranToksOff} is probably best in the preamble to turn off
-all randomization while the rest of the document is being composed.
-
-\paragraph*{The \textsf{ran\_toks} auxiliary file.} The package writes to a file named
-\cs{jobname\_rt.sav}, below represents two typical lines in this file.
-\begin{Verbatim}[xleftmargin=\amtIndent]
-1604051353 % initializing seed value
-5747283528 % last random number used
-\end{Verbatim}
-The first line is the initializing seed value used for the last
-compilation of the document; the second line is the last value of the
-pseudo-random number generator used in the document.
-
-Normally, the pseudo-random number generator provided by
-\texttt{random.tex} produces a new initial seed value every minute. So if
-you recompile again before another minute, you'll get the same initial
-seed value.
-
-\paragraph*{Controlling the initial seed value.} To obtain a new initial seed
-value each time you compile, place \cs{useLastAsSeed} in the preamble.
-\bVerb\takeMeasure{\string\useLastAsSeed}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single]
-\useLastAsSeed
-\end{Verbatim}
-\end{minipage}\eVerb
-When the document is compiled, the initial seed value taken as the second
-line in the \cs{jobname\_rt.sav} file, as seen in the above example.
-With this command in the preamble, a new set of random numbers is
-generated on each compile. If the file \cs{jobname\_rt.sav} does not
-exist, the generator will be initialized by its usual method, using the time and date.
-
-The command \cs{useThisSeed} allows you to reproduce a previous
-pseudo-random sequence.
-\bVerb\takeMeasure{\string\useThisSeed\darg{\meta{init\_seed\_value}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\useThisSeed{!meta(init_seed_value)}
-\end{Verbatim}
-\end{minipage}\eVerb
-This command needs to be placed in the preamble. The value of
-\meta{init\_seed\_value} is an integer, normally taken from the
-first line of the \cs{jobname\_rt.sav} file.
-
-When creating tests (possibly using \textsf{eqexam}), the problems, or
-contiguous collections of problems, can be randomly ordered using the
-\cs{bRTVToks}/\penalty0\cs{eRTVToks} command pair paradigm. For example,
-suppose there are two classes and you want a random order (some of) the
-problems for each of the two classes. Proceed as follows:
-\begin{enumerate}
-\item Compile the document, open \cs{jobname\_rt.sav}, and copy the
- first line (in the above example, that would be
- \texttt{1604051353}).
-\item Place \cs{useThisSeed\darg{1604051353}} in the preamble. Compiling
- will bring back the same pseudo-random sequence very time.
-\item Comment this line out, and repeat the process (use
- \cs{useLastAsSeed} to generate new random sequences at each
- compile) until you get another distinct randomization, open
- \cs{jobname\_rt.sav}, and copy the first line again, say its \texttt{735794511}.
-\item Place \cs{useThisSeed\darg{735794511}} in the preamble.
-\item Label each
-\begin{Verbatim}
-%\useThisSeed{1604051353} % 11:00 class
-%\useThisSeed{735794511} % 12:30 class
-\end{Verbatim}
-To reproduce the random sequence for the class, just uncomment the random
-seed used for that class.
-\end{enumerate}
-If you are using \textsf{eqexam}, the process can be automated as follows:
-\begin{Verbatim}[xleftmargin=\amtIndent,commandchars=!()]
-\vA{\useThisSeed{1604051353}} % 11:00 class
-\vB{\useThisSeed{735794511}} % 12:30 class
-\end{Verbatim}
-Again, this goes in the preamble.
-
-\section{Commands to support a DB application}\label{s:DBConcept}
-
-One user wanted to create exams using \pkg{eqexam}, but wanted to randomly
-select questions from a series of `database' files. My thought was that
-\pkg{ran\_toks} would do the job for him. After setting up a demo for him, I
-added the new command \cs{useTheseDBs} to \pkg{ran\_toks}:
-\bVerb\takeMeasure{\string\useTheseDBs\darg{\ameta{db\SUB{1}},\ameta{db\SUB{2}},...,\ameta{db\SUB{n}}}}%
-\begin{minipage}{\bxSize}\kern0pt
-\begin{Verbatim}[frame=single,commandchars=!()]
-\useTheseDBs{!ameta(db!SUB(1)),!ameta(db!SUB(2)),...,!ameta(db!SUB(n))}
-\useProbDBs{!ameta(db!SUB(1)),!ameta(db!SUB(2)),...,!ameta(db!SUB(n))}
-\end{Verbatim}
-\end{minipage}\eVerb The argument of \cs{useTheseDBs} is a comma-delimited
-list of file names. Each file name contains a
-\cs{bRTVToks}/\penalty0\cs{eRTVToks} construct. Within this pair are
-\env{rtVW} environments, as described in
-\hyperref[ss:RTVToks]{Section~\ref*{ss:RTVToks}}. The \cs{useTheseDBs}
-command inputs the files listed in its comma-delimited argument; a warning is
-emitted if one or more of the files are not found. The default extension is
-\texttt{.tex}, \cs{useTheseDBs\darg{db1,db2}} inputs the files
-\texttt{db1.tex} and \texttt{db2.tex}, if they exist, while
-\cs{useTheseDBs\darg{db1.def,db2.db}} inputs the files \texttt{db1.def} and
-\texttt{db2.db}, if they exist. The command \cs{useProbDBs} is an alias for
-\cs{useTheseDBs}.
-
-The placement of \cs{useTheseDBs} is anywhere prior to the insertion of the
-problems into the document, usually in the preamble.
-
-Refer to the demonstration file \texttt{mc-db.tex} for an example.
-
-\newtopic\noindent
-Now, I simply must get back to my retirement. \dps
-
-\end{document}
Binary files old/doc/latex/ran_toks/docs/ran_toks.pdf and new/doc/latex/ran_toks/docs/ran_toks.pdf differ
Binary files old/doc/latex/ran_toks/docs/rantoks_man.pdf and new/doc/latex/ran_toks/docs/rantoks_man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/docs/rantoks_man.tex new/doc/latex/ran_toks/docs/rantoks_man.tex
--- old/doc/latex/ran_toks/docs/rantoks_man.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ran_toks/docs/rantoks_man.tex 2019-12-30 23:17:36.000000000 +0100
@@ -0,0 +1,689 @@
+\documentclass{article}
+\usepackage[fleqn]{amsmath}
+\usepackage[
+ web={centertitlepage,designv,forcolorpaper,
+ latextoc,pro}, %tight,
+ eforms,aebxmp
+]{aeb_pro}
+\usepackage{ran_toks}
+
+\useThisSeed{1441984427}
+%\useLastAsSeed
+%\useThisSeed{2001383846}
+
+%2001383846 % initializing seed value
+%1629639958 % last random number used
+
+\let\pkg\textsf
+\let\env\texttt
+
+%\rtdebugtrue
+%\ranToksOn
+%\ranToksOff
+
+
+%\usepackage{myriadpro}
+\usepackage[altbullet]{lucidbry}
+
+%\usepackage{makeidx}
+%\makeindex
+\usepackage{acroman}
+
+\makeatletter
+\def\eq@fititin#1{\noindent\unskip\nobreak\hfill\penalty50
+ \hskip2em\hbox{}\nobreak\hfill#1}
+\def\fitit{\eq@fititin{\exrtnlabelformat}}
+\@mparswitchfalse\reversemarginpar
+\renewcommand{\paragraph}
+ {\@startsection{paragraph}{4}{0pt}{6pt}{-3pt}
+ {\normalfont\normalsize\bfseries}}
+\renewcommand{\subparagraph}
+ {\@startsection{subparagraph}{5}{\parindent}{6pt}{-3pt}%
+ {\normalfont\normalsize\bfseries}}
+\makeatother
+
+\def\anglemeta#1{$\langle\textit{\texttt{#1}}\rangle$}
+\let\ameta\anglemeta
+\def\meta#1{\textit{\texttt{#1}}}
+\def\darg#1{\texttt{\{#1\}}}
+\def\takeMeasure{\bgroup\obeyspaces\takeMeasurei}
+\def\takeMeasurei#1{\global\setbox\webtempboxi\hbox{\ttfamily#1}\egroup}
+\def\bxSize{\wd\webtempboxi+2\fboxsep+2\fboxrule}
+
+\usepackage[active]{srcltx}
+
+\let\amtIndent\leftmargini
+\def\SUB#1{${}_{\text{#1}}$}
+
+\newdimen\aebdimen \aebdimen\topsep
+\newcommand\bVerb[1][]{\begingroup#1\vskip\aebdimen\parindent0pt}%
+\def\eVerb{\vskip\aebdimen\endgroup\noindent}
+
+
+\urlstyle{rm}
+
+\DeclareDocInfo
+{
+ university={\AcroTeX.Net},
+ title={\texorpdfstring{The \textsf{ran\_toks}}{The manual for the ran\_toks}
+ Package\texorpdfstring{\\[6pt]\large}{: }
+ Randomizing the order of tokens},
+ author={D. P. Story},
+ email={dpstory(a)acrotex.net},
+ subject=Documentation for the ran\_toks package,
+ talksite={\url{www.acrotex.net}},
+ version={1.2, 2019/12/28},
+ Keywords={LaTeX,PDF,random, tokens, JavaScript,Adobe Acrobat},
+ copyrightStatus=True,
+ copyrightNotice={Copyright (C) \the\year, D. P. Story},
+ copyrightInfoURL={http://www.acrotex.net}
+}
+\DeclareInitView{windowoptions={showtitle}}
+
+
+\def\dps{$\hbox{$\mathfrak D$\kern-.3em\hbox{$\mathfrak P$}%
+ \kern-.6em \hbox{$\mathcal S$}}$}
+
+\universityLayout{fontsize=Large}
+\titleLayout{fontsize=LARGE}
+\authorLayout{fontsize=Large}
+\tocLayout{fontsize=Large,color=aeb}
+\sectionLayout{indent=-62.5pt,fontsize=large,color=aeb}
+\subsectionLayout{indent=-31.25pt,color=aeb}
+\subsubsectionLayout{indent=0pt,color=aeb}
+\subsubDefaultDing{\texorpdfstring{$\bullet$}{\textrm\textbullet}}
+
+\def\exSrc{\makebox[0pt][r]{\large{\Pisymbol{webd}{157}}\enspace}}
+
+%\pagestyle{empty}
+%\parindent0pt\parskip\medskipamount
+
+\chngDocObjectTo{\newDO}{doc}
+\begin{docassembly}
+var titleOfManual="The ran_toks Package";
+var manualfilename="Manual_BG_Print_rt.pdf";
+var manualtemplate="Manual_BG_Brown.pdf"; // Blue, Green, Brown
+var _pathToBlank="C:/Users/Public/Documents/ManualBGs/"+manualtemplate;
+var doc;
+var buildIt=false;
+if ( buildIt ) {
+ console.println("Creating new " + manualfilename + " file.");
+ doc = \appopenDoc({cPath: _pathToBlank, bHidden: true});
+ var _path=this.path;
+ var pos=_path.lastIndexOf("/");
+ _path=_path.substring(0,pos)+"/"+manualfilename;
+ \docSaveAs\newDO ({ cPath: _path });
+ doc.closeDoc();
+ doc = \appopenDoc({cPath: manualfilename, oDoc:this, bHidden: true});
+ f=doc.getField("ManualTitle");
+ f.value=titleOfManual;
+ doc.flattenPages();
+ \docSaveAs\newDO({ cPath: manualfilename });
+ doc.closeDoc();
+} else {
+ console.println("Using the current "+manualfilename+" file.");
+}
+var _path=this.path;
+var pos=_path.lastIndexOf("/");
+_path=_path.substring(0,pos)+"/"+manualfilename;
+\addWatermarkFromFile({
+ bOnTop:false,
+ bOnPrint:false,
+ cDIPath:_path
+});
+\executeSave();
+\end{docassembly}
+
+%\definePath\bgPath{"C:/Users/Public/Documents/%
+% ManualBGs/Manual_BG_Print_AeB.pdf"}
+%\begin{docassembly}
+%\addWatermarkFromFile({%
+% bOnTop: false,
+% cDIPath: \bgPath
+%})
+%\executeSave()
+%\end{docassembly}
+
+\begin{document}
+
+\maketitle
+
+\selectColors{linkColor=black}
+\tableofcontents
+\selectColors{linkColor=webgreen}
+
+\section{Introduction}
+
+This is a short package for randomizing the order of tokens. The package
+is long overdue; users of \textbf{AeB} and of \textsf{eqexam} have long asked for a way to
+randomize the order of the problems in a test or quiz, or anything for
+that matter.
+
+\newtopic\noindent\exSrc The \texttt{examples} folder contains three demonstration files:
+\begin{enumerate}
+ \item \texttt{ran\_toks.tex} reproduces the sample code of this manual.
+ \item \texttt{random\_tst.tex} shows how to use \pkg{ran\_toks} to
+ randomize the \emph{questions} of an exam document created by the
+ \pkg{eqexam} package.
+ \item \texttt{random\_tst\_qz.tex} shows how to randomize choices of a
+ multiple choice field in a \env{quiz} environment of the
+ \pkg{exerquiz} package, when the choices contain verbatim text.
+ \item \texttt{mc-db.tex} is an \pkg{eqexam} file that draws from the
+ database files \texttt{db1.tex}, \texttt{db2.tex},
+ \texttt{db3.tex}, and \texttt{db4.tex}, to construct the questions
+ of the exam. The questions are drawn at random from the DB files. Refer
+ to \hyperref[s:DBConcept]{Section~\ref*{s:DBConcept}} for a few more details.
+
+\end{enumerate}
+
+\section{The Preamble and Package Options}
+
+The preamble for this package is
+\bVerb\takeMeasure{\string\usepackage\darg{ran\_toks}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single]
+\usepackage{ran_toks}
+\end{Verbatim}
+\end{minipage}\eVerb
+The package itself has no options.
+
+The requirements for \textsf{ran\_toks} are the \textsf{verbatim} package
+(part of the standard {\LaTeX} distribution, and the macro file
+\texttt{random.tex} by Donald Arseneau.
+
+
+\section{The main commands and environments}\label{rtmain}
+
+There are two styles for defining a series of tokens to be randomized,
+using either the \cs{ranToks} command or the \cs{bRTVToks}/\cs{eRTVToks}
+pair. Each of these is discussed in the next two subsections.
+
+\subsection{The \texorpdfstring{\protect\cs{ranToks}}{\CMD{ranToks}} command}
+
+The \cs{ranToks} command was the original concept; declare a series of
+tokens to be randomized.
+\bVerb\takeMeasure{\string\ranToks\darg{\meta{name}}\{\%\enspace}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\ranToks{!meta(name)}{%
+ {!meta(token!SUB(1))}
+ {!meta(token!SUB(2))}
+ ...
+ {!meta(token!SUB(n))}
+}
+\end{Verbatim}
+\end{minipage}\eVerb
+were \meta{token\SUB{k}} is any non-verbatim content;\footnote{Any token that
+can be in the argument of a command.} each token is enclosed in braces
+(\darg{}), this is required. The \meta{name} parameter is required, and
+must be unique for the document; it is used to build the names of internal
+macros. Of course several such \cs{ranToks} can be used in the document,
+either in the preamble or in the body of the document. Multiple
+\cs{ranToks} commands must have a different \meta{name} parameter.
+
+\emph{After} a \cs{ranToks} command has been executed, the number of tokens
+counted is accessible through the \cs{nToksFor} command,
+\bVerb\takeMeasure{\string\nToksFor\darg{\meta{name}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\nToksFor{!meta(name)}
+\end{Verbatim}
+\end{minipage}\eVerb
+The one argument is \meta{name}, and will expand to the total number
+of tokens listing as argument in the \cs{ranToks} command by the same
+name.
+
+The \cs{ranToks} command does not display the randomized tokens, for that
+the command \cs{useRanTok} is used.
+\bVerb\takeMeasure{\string\useRTName\darg{\meta{name}}}%
+\begin{minipage}{\bxSize}
+\begin{Verbatim}[frame=single,commandchars=!()]
+\useRanTok{!meta(num)}
+\useRTName{!meta(name)}
+\end{Verbatim}
+\end{minipage}\eVerb
+The argument of \cs{useRanTok} is a positive integer between 1 and
+\cs{nToksFor\darg{\meta{name}}}, the number of tokens declared by
+\cs{ranToks}, inclusive. There is no space created following the
+\cs{useRanTok} command, so if these are to be used ``inline'', enclose them
+in braces (\darg{}), for example, \darg{\cs{useRanTok\darg{1}}}. The use of
+\cs{useRTName} is optional unless the listing of the \cs{useRanTok} commands
+is separated from the \cs{ranToks} command that defined them by another
+\cs{ranToks} command of a different name. That should be clear!
+
+Consider this example.
+
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\ranToks{myPals}{%
+ {Jim}{Richard}{Don}
+ {Alex}{Tom}{J\"{u}rgen}
+}
+\end{Verbatim}
+\ranToks{myPals}{%
+ {Jim}{Richard}{Don}
+ {Alex}{Tom}{J\"{u}rgen}
+}
+I have {\nToksFor{myPals}} pals, they are \useRanTok{1}, \useRanTok{2},
+\useRanTok{3}, \useRanTok{4}, {\useRanTok{5}} and \useRanTok{6}. (Listed
+in the order of best friend to least best friend.)
+The verbatim listing is,
+\begin{Verbatim}[xleftmargin=\amtIndent]
+I have {\nToksFor{myPals}} pals, they are \useRanTok{1},
+\useRanTok{2}, \useRanTok{3}, \useRanTok{4}, {\useRanTok{5}}
+and \useRanTok{6}.
+\end{Verbatim}
+Notice that \cs{useRanToks} are not enclosed in braces for 1--4 because
+they are each followed by a comma; the fifth token, \texttt{\darg{\cs{useRanTok\darg{5}}}}, is
+enclosed in braces to generate a space following the insertion of the text.
+
+Repeating the sentence yields, ``I have {\nToksFor{myPals}} pals, they are
+\useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4},
+{\useRanTok{5}} and \useRanTok{6}'', which is the exact same random order. To
+obtain a different order, re-execute the \cs{ranToks} command with the same
+arguments.\footnote{{\ttfamily\string\ranToks\darg{myPals}\darg{\darg{Jim}\darg{Richard}\darg{Don}\darg{Alex}\darg{Tom}\darg{J\string\"\darg{u}rgen}}} in this example.} Doing just that, \ranToks{myPals}{{Jim}{Richard}{Don}
+{Alex}{Tom}{J\"{u}rgen}}we obtain, ``I have {\nToksFor{myPals}} pals, they
+are \useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4},
+{\useRanTok{5}} and \useRanTok{6}.'' A new order?
+An alternative to re-executing \cs{ranToks} is to use the \cs{reorderRanToks} command:
+\bVerb\takeMeasure{\string\reorderRanToks\darg{\meta{name}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\reorderRanToks{!meta(name)}
+\end{Verbatim}
+\end{minipage}\eVerb Now, executing \verb~\reorderRanToks{myPals}~ and compiling the sentence again yields,
+``I have {\nToksFor{myPals}} pals, they are
+\useRanTok{1}, \useRanTok{2}, \useRanTok{3}, \useRanTok{4},
+{\useRanTok{5}} and \useRanTok{6}.'' For most applications, re-randomizing
+the same token list in the same document is not very likely something you
+need to do.
+
+The \cs{reorderRanToks\darg{\meta{name}}} rearranges the list of tokens
+associated with \ameta{name}, which may not be what you want; the
+\cs{copyRanToks} command, on the other hand, makes a (randomized) copy of its
+first required argument \ameta{name\SUB1} and saves it as \ameta{name\SUB2}, without
+effecting the order of \ameta{name\SUB1}.
+\bVerb\takeMeasure{\string\copyRanToks\darg{\ameta{name\SUB1}}\darg{\ameta{name\SUB2}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\copyRanToks{!ameta(name!SUB1)}{!ameta(name!SUB2)}
+\end{Verbatim}
+\end{minipage}\eVerb Thus, if \verb!\copyRanToks{myPals}{myPals1}! is executed, the token list name
+\texttt{myPals1} contains the names of my pals in another randomized order,
+while maintaining the same order of \texttt{myPals}.
+
+
+\newtopic
+My original application for this, the one that motivated writing this
+package at long last, was the need to arrange several form buttons
+randomly on the page. My point is that the listing given in the argument
+of \cs{ranToks} can pretty much be anything that is allowed to be an
+argument of a macro; this would exclude verbatim text created by \cs{verb}
+and verbatim environments.
+
+\subsection{The
+\texorpdfstring{\protect\cs{bRTVToks}/\protect\cs{eRTVToks}}
+ {\CMD{bRTVToks}/\CMD{eRTVToks}} pair of commands}\label{ss:RTVToks}
+
+Sometimes the content to be randomized is quite large or contains verbatim
+text. For this, it may be more convenient to use the
+\cs{bRTVToks}/\penalty0\cs{eRTVToks} command pair. The syntax is
+\bVerb\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad}%
+\edef\WIDTH{\the\wd\webtempboxi}%
+\def\1{\rlap{\hspace*{\WIDTH}\texttt{\% <-{\sffamily{ End token listing}}}}}%
+\takeMeasure{\string\bRTVToks\darg{\meta{name}}\quad\% <-{\sffamily{ Begin token listing}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\bRTVToks{!meta(name)}!quad% <-!sffamily( Begin token listing)
+\begin{rtVW}
+!qquad!ameta(content!SUB(1))
+\end{rtVW}
+...
+...
+\begin{rtVW}
+!qquad!ameta(content!SUB(n))
+\end{rtVW}
+!1\eRTVToks
+\end{Verbatim}
+\end{minipage}\eVerb
+The \cs{bRTVToks}\texttt{\{\meta{name}\}} command begins the (pseudo)
+environment and is ended by \cs{eRTVToks}. Between these two are a series of
+\texttt{rtVW} (random toks verbatim write) environments. When the document is
+compiled, the contents (\ameta{content\SUB{i}}) of each of these environments
+are written to the computer hard drive and saved under a different name
+(based on the parameter \meta{name}). Later, using the \cs{useRanTok}
+commands, they are input back into the document in a random order.
+
+The \env{rtWVW} environment also writes the command
+\cs{RTVWHook}\marginpar{\small\itshape\flushright\cs{RTVWHook}} to the top of
+the file. Its initial value is \cs{relax}. It can be redefined using the convenience
+command \cs{rtVWHook\darg{\ameta{arg}}}, which expands to
+\verb|\def\RTVWHook{|\ameta{arg}\verb|}|.
+
+The use of \cs{useRTName} and \cs{useRanTok} were explained and illustrated
+in the previous section. Let's go to the examples,
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\bRTVToks{myThoughts}
+\begin{rtVW}
+\begin{minipage}[t]{.67\linewidth}
+Roses are red and violets are blue,
+I've forgotten the rest, have you too?
+\end{minipage}
+\end{rtVW}
+\begin{rtVW}
+\begin{minipage}[t]{.67\linewidth}
+I gave up saying bad things like
+\verb!$#%%%^*%^&#$@#! when I was just a teenager.
+\end{minipage}
+\end{rtVW}
+\begin{rtVW}
+\begin{minipage}[t]{.67\linewidth}
+I am a good guy, pass it on! The code for this last sentence is,
+\begin{verbatim}
+%#$% I am a good guy, pass it on! ^&*&^*
+\end{verbatim}
+How did that other stuff get in there?
+\end{minipage}
+\end{rtVW}
+\eRTVToks
+\end{Verbatim}
+OK, now, let's display these three in random order. Here we place them in
+an \texttt{enumerate} environment.
+
+\bRTVToks{myThoughts}%
+\begin{rtVW}
+\begin{minipage}[t]{.67\linewidth}
+Roses are red and violets are blue,
+I've forgotten the rest, have you too?
+\end{minipage}
+\end{rtVW}
+\begin{rtVW}
+\begin{minipage}[t]{.67\linewidth}
+I gave up saying bad things like
+\verb!$#%%%^*%^&#$@#! when I was just a teenager.
+\end{minipage}
+\end{rtVW}
+\begin{rtVW}
+\begin{minipage}[t]{.67\linewidth}
+I am a good guy, pass it on! The code for this last sentence is,
+\begin{verbatim}
+%#$% I am a good guy, pass it on! ^&*&^*
+\end{verbatim}
+How did that other stuff get in there?
+\end{minipage}
+\end{rtVW}
+\eRTVToks
+\begin{enumerate}
+ \item \useRanTok{1}
+ \item \useRanTok{2}
+ \item \useRanTok{3}
+\end{enumerate}
+The verbatim listing of the example above is
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\begin{enumerate}
+ \item \useRanTok{1}
+ \item \useRanTok{2}
+ \item \useRanTok{3}
+\end{enumerate}
+\end{Verbatim}
+The \cs{reorderRanToks} works for lists created by the \cs{bRTVToks}/\penalty0\cs{bRTVToks} construct.
+If we say \cs{reorderRanToks\darg{myThoughts}} and reissue the above list, we obtain,
+\begin{enumerate}\ranToksOn\reorderRanToks{myThoughts}
+ \displayListRandomly[\item]{myThoughts}
+\end{enumerate}
+The command \cs{copyRanToks} works for list created by
+\cs{bRTVToks}/\penalty0\cs{bRTVToks} as well.
+
+
+\paragraph*{On the \cs{displayListRandomly} command.}\label{para:DLR}
+In the enumerate example immediately above, the items in the list are
+explicitly listed as \cs{item \cs{useRanTok\darg{1}}} and so one; an
+alternate approach is to use the command \cs{displayListRandomly}, like so,
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\begin{enumerate}
+ \displayListRandomly[\item]{myThoughts}
+\end{enumerate}
+\end{Verbatim}
+The full syntax for \cs{displayListRandomly} is displayed next.
+\bVerb\takeMeasure{\string\displayListRandomly[\ameta{prior}][\ameta{post}]\darg{\meta{name}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\displayListRandomly[!ameta(prior)][!ameta(post)]{!meta(name)}
+\end{Verbatim}
+\end{minipage}
+\eVerb The action of \cs{displayListRandomly} is to expand all tokens that
+are listed in the \meta{name} token list, each entry is displayed as
+\ameta{prior}\cs{useRanTok\darg{i}}\ameta{post}, where \texttt{i}
+goes from~1 to \cs{nToksFor\darg{\meta{name}}}. In the example above,
+\meta{prior} is \cs{item}, but normally, its default is empty. The defaults
+for \ameta{prior} and \ameta{post} are both empty.
+
+\subparagraph*{The optional arguments.} When only one optional argument is present,
+if is interpreted as \ameta{prior}. To obtain a \ameta{post} with no \ameta{prior}
+use the syntax,
+\begin{quote}
+\cs{displayListRandomly[][\ameta{post}]\darg{\ameta{name}}}
+\end{quote}
+Within \emph{each optional argument}, the four commands \cs{i},
+\cs{first}, \cs{last}, and \cs{lessone} are (locally) defined. The \cs{i} command is the index
+counter of the token currently being typeset; \cs{first} is the index of the
+first item; \cs{last} is the index of the last item; and \cs{lessone} is one
+less than \cs{last}. The two optional arguments and the four commands may use
+to perform logic on the token as it is being typeset. For example:
+\begin{Verbatim}[xleftmargin=\amtIndent,fontsize=\small]
+List of pals: \displayListRandomly
+ [\ifnum\i=\last and \fi]
+ [\ifnum\i=\last.\else, \fi]{myPals}
+\end{Verbatim}
+yields,
+\begin{quote}
+List of pals: \displayListRandomly
+ [\ifnum\i=\last and \fi]
+ [\ifnum\i=\last.\else, \fi]{myPals}
+\end{quote}
+The optional arguments are wrapped to the next line to keep them within the margins, cool.
+
+The example above shows the list of my pals with an Oxford comma. How would
+you modify the optional argument to get the same listing without the Oxford
+comma? (\displayListRandomly[\ifnum\i=\last and \fi][\ifnum\i=\last.\else\ifnum\i=\lessone\relax\space\else, \fi\fi]{myPals})
+Hint: a solution involves the other command \cs{lessone}.
+
+
+
+\section{Additional arguments and commands}\label{AddCmds}
+
+The syntax given earlier for \cs{useRanTok} was not completely specified.
+It is
+\bVerb\takeMeasure{\string\useRanTok[\meta{name}]\darg{\meta{num}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\useRanTok[!meta(name)]{!meta(num)}
+\end{Verbatim}
+\end{minipage}\eVerb
+The optional first parameter specifies the \meta{name} of the list from
+which to draw a random token; \meta{num} is the number of the
+token in the range of 1 and \cs{nToksFor\darg{\meta{name}}},
+inclusive. The optional argument is useful in special circumstances when
+you want to mix two random lists together.
+
+\newtopic\noindent To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{2}
+
+\newtopic\noindent The verbatim listing is
+\begin{Verbatim}[xleftmargin=\amtIndent]
+To illustrate: \useRanTok[myPals]{1}, \useRanTok[myThoughts]{2}
+\end{Verbatim}
+The typeset version looks a little strange, but recall, the text of
+\texttt{myThoughts} were each put in a \texttt{minipage} of width \texttt{.67\cs{linewidth}}.
+Without the \texttt{minipage}, the text would wrap around normally.
+
+\paragraph*{Accessing the original order.} The original order of the list of tokens is not lost, you can retrieve
+them using the command \cs{rtTokByNum},
+\bVerb\takeMeasure{\string\rtTokByNum[\meta{name}]\darg{\meta{num}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\rtTokByNum[!meta(name)]{!meta(num)}
+\end{Verbatim}
+\end{minipage}\eVerb
+This command expands to the token declared in the list named \meta{name}
+that appears at the \meta{num} place in the list. (Rather awkwardly written.)
+For example, my really best pals are {\rtTokByNum[myPals]{3}} and
+\rtTokByNum[myPals]{4}, but don't tell them. The listing is,
+\begin{Verbatim}[xleftmargin=\amtIndent]
+For example, my really best pals are {\rtTokByNum[myPals]{3}}
+and \rtTokByNum[myPals]{4}, but don't tell them.
+\end{Verbatim}
+In some sense, \cs{rtTokByNum[\meta{name}]} acts like a simple array, the
+length of which is \cs{nToksFor\{\meta{name}\}}, and whose $k^{\text{th}}$
+element is \cs{rtTokByNum[\meta{name}]\{\meta{k}\}}.
+
+\paragraph*{Turning off randomization.} The randomization may be turned off
+using \cs{ranToksOff} or turned back on with \cs{ranToksOn}.
+\bVerb\takeMeasure{\string\ranToksOff\quad\string\ranToksOn}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\ranToksOff!quad\ranToksOn
+\end{Verbatim}
+\end{minipage}\eVerb
+This can be done globally in the preamble for the whole of the document,
+or in the body of the document just prior to either \cs{ranToks} or
+\cs{bRTVToks}. For example,
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\ranToksOff
+\ranToks{integers}{ {1}{2}{3}{4} }
+\ranToksOn
+\end{Verbatim}
+As a check, executing `$\cs{useRanTok\darg{3}} = \cs{rtTokByNum\darg{3}} = 3 $' yields
+`\ranToksOff\ranToks{integers}{ {1}{2}{3}{4}}\ranToksOn
+$\useRanTok{3} = \rtTokByNum{3} = 3 $'? As anticipated.
+
+To create a non-randomized list of tokens that already have been created (and randomized), use
+\cs{copyRanToks}:
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\ranToksOff\copyRanToks{myPals}{myOriginalPals}\ranToksOn
+\end{Verbatim}
+Then, using \cs{displayListRandomly} in a clever way,
+\begin{Verbatim}[xleftmargin=\amtIndent]
+\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~]
+ [\ifnum\i=\last.\else,\fi\space]{myOriginalPals}
+\end{Verbatim}
+we obtain: \ranToksOff\copyRanToks{myPals}{myOriginalPals}\ranToksOn
+\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~][\ifnum\i=\last.\else,\fi\space]{myOriginalPals}
+The original list for \texttt{myPals} remains unchanged:
+\displayListRandomly[\ifnum\i=\last\space and \fi(\the\i)~][\ifnum\i=\last.\else,\fi\space]{myPals}
+
+The \cs{useRanTok} command---whether it operates on a randomized token list
+or not---behaves similarly to an array. Thus, if we wanted the extract
+the third entry of the non-randomized token list (array)
+\texttt{myOriginalPals}, we do so by expanding the command
+\verb!\useRanTok[myOriginalPals]{3}! to produce
+\useRanTok[myOriginalPals]{3}.
+
+\subparagraph*{Document preparation.}
+The command \cs{ranToksOff} is probably best in the preamble to turn off
+all randomization while the rest of the document is being composed.
+
+\paragraph*{The \textsf{ran\_toks} auxiliary file.} The package writes to a file named
+\cs{jobname\_rt.sav}, below represents two typical lines in this file.
+\begin{Verbatim}[xleftmargin=\amtIndent]
+1604051353 % initializing seed value
+5747283528 % last random number used
+\end{Verbatim}
+The first line is the initializing seed value used for the last
+compilation of the document; the second line is the last value of the
+pseudo-random number generator used in the document.
+
+Normally, the pseudo-random number generator provided by
+\texttt{random.tex} produces a new initial seed value every minute. So if
+you recompile again before another minute, you'll get the same initial
+seed value.
+
+\paragraph*{Controlling the initial seed value.} To obtain a new initial seed
+value each time you compile, place \cs{useLastAsSeed} in the preamble.
+\bVerb\takeMeasure{\string\useLastAsSeed}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single]
+\useLastAsSeed
+\end{Verbatim}
+\end{minipage}\eVerb
+When the document is compiled, the initial seed value taken as the second
+line in the \cs{jobname\_rt.sav} file, as seen in the above example.
+With this command in the preamble, a new set of random numbers is
+generated on each compile. If the file \cs{jobname\_rt.sav} does not
+exist, the generator will be initialized by its usual method, using the time and date.
+
+The command \cs{useThisSeed} allows you to reproduce a previous
+pseudo-random sequence.
+\bVerb\takeMeasure{\string\useThisSeed\darg{\meta{init\_seed\_value}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\useThisSeed{!meta(init_seed_value)}
+\end{Verbatim}
+\end{minipage}\eVerb
+This command needs to be placed in the preamble. The value of
+\meta{init\_seed\_value} is an integer, normally taken from the
+first line of the \cs{jobname\_rt.sav} file.
+
+When creating tests (possibly using \textsf{eqexam}), the problems, or
+contiguous collections of problems, can be randomly ordered using the
+\cs{bRTVToks}/\penalty0\cs{eRTVToks} command pair paradigm. For example,
+suppose there are two classes and you want a random order (some of) the
+problems for each of the two classes. Proceed as follows:
+\begin{enumerate}
+\item Compile the document, open \cs{jobname\_rt.sav}, and copy the
+ first line (in the above example, that would be
+ \texttt{1604051353}).
+\item Place \cs{useThisSeed\darg{1604051353}} in the preamble. Compiling
+ will bring back the same pseudo-random sequence very time.
+\item Comment this line out, and repeat the process (use
+ \cs{useLastAsSeed} to generate new random sequences at each
+ compile) until you get another distinct randomization, open
+ \cs{jobname\_rt.sav}, and copy the first line again, say its \texttt{735794511}.
+\item Place \cs{useThisSeed\darg{735794511}} in the preamble.
+\item Label each
+\begin{Verbatim}
+%\useThisSeed{1604051353} % 11:00 class
+%\useThisSeed{735794511} % 12:30 class
+\end{Verbatim}
+To reproduce the random sequence for the class, just uncomment the random
+seed used for that class.
+\end{enumerate}
+If you are using \textsf{eqexam}, the process can be automated as follows:
+\begin{Verbatim}[xleftmargin=\amtIndent,commandchars=!()]
+\vA{\useThisSeed{1604051353}} % 11:00 class
+\vB{\useThisSeed{735794511}} % 12:30 class
+\end{Verbatim}
+Again, this goes in the preamble.
+
+\section{Commands to support a DB application}\label{s:DBConcept}
+
+One user wanted to create exams using \pkg{eqexam}, but wanted to randomly
+select questions from a series of `database' files. My thought was that
+\pkg{ran\_toks} would do the job for him. After setting up a demo for him, I
+added the new command \cs{useTheseDBs} to \pkg{ran\_toks}:
+\bVerb\takeMeasure{\string\useTheseDBs\darg{\ameta{db\SUB{1}},\ameta{db\SUB{2}},...,\ameta{db\SUB{n}}}}%
+\begin{minipage}{\bxSize}\kern0pt
+\begin{Verbatim}[frame=single,commandchars=!()]
+\useTheseDBs{!ameta(db!SUB(1)),!ameta(db!SUB(2)),...,!ameta(db!SUB(n))}
+\useProbDBs{!ameta(db!SUB(1)),!ameta(db!SUB(2)),...,!ameta(db!SUB(n))}
+\end{Verbatim}
+\end{minipage}\eVerb The argument of \cs{useTheseDBs} is a comma-delimited
+list of file names. Each file name contains a
+\cs{bRTVToks}/\penalty0\cs{eRTVToks} construct. Within this pair are
+\env{rtVW} environments, as described in
+\hyperref[ss:RTVToks]{Section~\ref*{ss:RTVToks}}. The \cs{useTheseDBs}
+command inputs the files listed in its comma-delimited argument; a warning is
+emitted if one or more of the files are not found. The default extension is
+\texttt{.tex}, \cs{useTheseDBs\darg{db1,db2}} inputs the files
+\texttt{db1.tex} and \texttt{db2.tex}, if they exist, while
+\cs{useTheseDBs\darg{db1.def,db2.db}} inputs the files \texttt{db1.def} and
+\texttt{db2.db}, if they exist. The command \cs{useProbDBs} is an alias for
+\cs{useTheseDBs}.
+
+The placement of \cs{useTheseDBs} is anywhere prior to the insertion of the
+problems into the document, usually in the preamble.
+
+Refer to the demonstration file \texttt{mc-db.tex} for an example.
+
+\newtopic\noindent
+Now, I simply must get back to my retirement. \dps
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ran_toks/examples/mc-db.tex new/doc/latex/ran_toks/examples/mc-db.tex
--- old/doc/latex/ran_toks/examples/mc-db.tex 2017-05-19 23:06:02.000000000 +0200
+++ new/doc/latex/ran_toks/examples/mc-db.tex 2019-12-30 23:17:36.000000000 +0100
@@ -34,7 +34,7 @@
Solve each without error. Passing is 100\%.
\medskip\noindent
-This part demonstrates how to not only randomly pull problems (two from each of the DB files) at random, but
+This part demonstrates how to not only randomly pull problems (two from each of the DB files), but
to randomize the order they are listed in the exam.
\end{instructions}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ran_toks.doc.tlpobj new/tlpkg/tlpobj/ran_toks.doc.tlpobj
--- old/tlpkg/tlpobj/ran_toks.doc.tlpobj 2019-02-28 04:04:07.000000000 +0100
+++ new/tlpkg/tlpobj/ran_toks.doc.tlpobj 2019-12-31 01:56:27.000000000 +0100
@@ -1,12 +1,13 @@
name ran_toks.doc
category Package
-revision 44429
+revision 53271
shortdesc doc files of ran_toks
relocated 1
-docfiles size=72
+docfiles size=99
RELOC/doc/latex/ran_toks/README.md
- RELOC/doc/latex/ran_toks/doc/rantoks_man.pdf
- RELOC/doc/latex/ran_toks/doc/rantoks_man.tex
+ RELOC/doc/latex/ran_toks/docs/ran_toks.pdf
+ RELOC/doc/latex/ran_toks/docs/rantoks_man.pdf
+ RELOC/doc/latex/ran_toks/docs/rantoks_man.tex
RELOC/doc/latex/ran_toks/examples/db1.tex
RELOC/doc/latex/ran_toks/examples/db2.tex
RELOC/doc/latex/ran_toks/examples/db3.tex
++++++ ran_toks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ran_toks/ran-toks.sty new/tex/latex/ran_toks/ran-toks.sty
--- old/tex/latex/ran_toks/ran-toks.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/ran_toks/ran-toks.sty 2019-12-30 23:17:36.000000000 +0100
@@ -0,0 +1,28 @@
+%%
+%% This is file `ran-toks.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ran_toks.dtx (with options: `copyright,altpkgname')
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% ran_toks package, %%
+%% Copyright (C) 1999-2019 D. P. Story %%
+%% dpstory(a)uakron.edu, dpstory(a)acrotex.net %%
+%% %%
+%% This program can 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. %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{ran-toks}
+ [2019/12/28 v1.0 ran-toks Alt-name (dps)]
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ran_toks}}
+\ProcessOptions
+\RequirePackage{ran_toks}[2019/12/28]
+\endinput
+%%
+%% End of file `ran-toks.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ran_toks/ran_toks.sty new/tex/latex/ran_toks/ran_toks.sty
--- old/tex/latex/ran_toks/ran_toks.sty 2017-05-19 23:06:02.000000000 +0200
+++ new/tex/latex/ran_toks/ran_toks.sty 2019-12-30 23:17:36.000000000 +0100
@@ -7,9 +7,9 @@
%% ran_toks.dtx (with options: `copyright,package')
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Web package, %%
-%% Copyright (C) 1999-2017 D. P. Story %%
-%% dpstory(a)uakron.edu %%
+%% ran_toks package, %%
+%% Copyright (C) 1999-2019 D. P. Story %%
+%% dpstory(a)uakron.edu, dpstory(a)acrotex.net %%
%% %%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
@@ -19,11 +19,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{ran_toks}
- [2017/05/04 v1.1 Randomizing tokens (dps)]
+ [2019/12/28 v1.2 Randomizing tokens (dps)]
\RequirePackage{verbatim}
\(a)ifundefined{nextrandom}{\input{random.tex}}{}
\def\nextrandom{\begingroup
- \ifnum\randomi<\@ne % then initialize with time
+ \ifnum\randomi<\@ne % then initialize with time
\global\randomi\time
\global\multiply\randomi388 \global\advance\randomi\year
\global\multiply\randomi31 \global\advance\randomi\day
@@ -61,120 +61,120 @@
\def\useLastAsSeed{\rt@useLastAsSeed}
\@onlypreamble\useLastAsSeed
\def\rt@useLastAsSeed{%
- \IfFileExists{\jobname_rt.sav}{%
- \PackageInfo{ran_toks}{Inputting \jobname_rt.sav}%
- \@ifundefined{readsavfile}{\newread\readsavfile}{}%
- \openin\readsavfile=\jobname_rt.sav
- \read\readsavfile to \InitSeedValue
- \read\readsavfile to \lastRandomNum
- \closein\readsavfile
- \randomi=\lastRandomNum
+ \IfFileExists{\jobname_rt.sav}{%
+ \PackageInfo{ran_toks}{Inputting \jobname_rt.sav}%
+ \@ifundefined{readsavfile}{\newread\readsavfile}{}%
+ \openin\readsavfile=\jobname_rt.sav
+ \read\readsavfile to \InitSeedValue
+ \read\readsavfile to \lastRandomNum
+ \closein\readsavfile
+ \randomi=\lastRandomNum
\xdef\InitSeedValue{\the\randomi}
- }{%
- \PackageInfo{ran_toks}{\jobname_rt.sav cannot
- be found, \MessageBreak
- using the random initializer}%
- }%
+ }{%
+ \PackageInfo{ran_toks}{\jobname_rt.sav cannot
+ be found, \MessageBreak
+ using the random initializer}%
+ }%
}
\@ifundefined{aeb@randomizeChoices}{%
\let\inputRandomSeed\useLastAsSeed
\let\useRandomSeed\useThisSeed}{}
\def\verbatimwrite{\@bsphack
- \let\do\@makeother\dospecials
- \catcode`\^^M\active \catcode`\^^I=12
- \def\verbatim@processline{%
- \immediate\write\verbatim@out
- {\the\verbatim@line}}%
- \verbatim@start}
+ \let\do\@makeother\dospecials
+ \catcode`\^^M\active \catcode`\^^I=12
+ \def\verbatim@processline{%
+ \immediate\write\verbatim@out
+ {\the\verbatim@line}}%
+ \verbatim@start}
\def\endverbatimwrite{\@esphack}
\def\rt@IWVO{\immediate\write\verbatim@out}
\def\InitSeedValue{\the\randomi}
\def\rt@writeSeedData{\ifsaveseed
- \@ifundefined{saveseedinfo}{\newwrite\saveseedinfo}{}
- \immediate\openout \saveseedinfo \jobname_rt.sav
- \let\verbatim@out\saveseedinfo
- \def\rt@msgi{initializing seed value}%
- \def\rt@msgii{last random number used}%
- \uccode`c=`\%\uppercase{%
- \rt@IWVO{\InitSeedValue\space c \rt@msgi}%
- \rt@IWVO{\the\randomi\space c \rt@msgii}}\immediate
- \closeout\saveseedinfo\fi}
+ \@ifundefined{saveseedinfo}{\newwrite\saveseedinfo}{}
+ \immediate\openout \saveseedinfo \jobname_rt.sav
+ \let\verbatim@out\saveseedinfo
+ \def\rt@msgi{initializing seed value}%
+ \def\rt@msgii{last random number used}%
+ \uccode`c=`\%\uppercase{%
+ \rt@IWVO{\InitSeedValue\space c \rt@msgi}%
+ \rt@IWVO{\the\randomi\space c \rt@msgii}}\immediate
+ \closeout\saveseedinfo\fi}
\AtEndDocument{\rt@writeSeedData}%
\def\rt@populateList#1{\rt@listIn={}\rt@nCnt\z@
- \@whilenum\rt@nCnt<#1\do{\advance\rt@nCnt\@ne
- \edef\rt@listInHold{\the\rt@listIn\noexpand\\{\the\rt@nCnt}}%
- \rt@listIn=\expandafter{\rt@listInHold}}}
+ \@whilenum\rt@nCnt<#1\do{\advance\rt@nCnt\@ne
+ \edef\rt@listInHold{\the\rt@listIn\noexpand\\{\the\rt@nCnt}}%
+ \rt@listIn=\expandafter{\rt@listInHold}}}
\def\rt@RandomizeList#1{\global
- \rt@listIn={}\global\rt@newListIn={}\global\rt@listOut={}%
- \rt@nMax=#1\relax\rt@populateList{\the\rt@nMax}%
- \ifwerandomize
- \expandafter\rt@randomizeList\else
- \global\rt@listOut=\expandafter{\the\rt@listIn}\fi
- \global\rt@nameedef{\rt@BaseName-List}{\the\rt@listOut}}
+ \rt@listIn={}\global\rt@newListIn={}\global\rt@listOut={}%
+ \rt@nMax=#1\relax\rt@populateList{\the\rt@nMax}%
+ \ifwerandomize
+ \expandafter\rt@randomizeList\else
+ \global\rt@listOut=\expandafter{\the\rt@listIn}\fi
+ \global\rt@nameedef{\rt@BaseName-List}{\the\rt@listOut}}
\def\rt@randomizeList{\let\\=\rt@processi
- \setrannum{\rt@getRanNum}{1}{\the\rt@nMax}%
+ \setrannum{\rt@getRanNum}{1}{\the\rt@nMax}%
\ifrtdebug\typeout{\string\rt@getRanNum=\the\rt@getRanNum}\fi
- \rt@nCnt\z@
+ \rt@nCnt\z@
\ifrtdebug\typeout{LISTING: \the\rt@listIn}\fi
- \the\rt@listIn
- \rt@loopTest
+ \the\rt@listIn
+ \rt@loopTest
}
\def\rt@loopTest{\advance\rt@nMax\m@ne
- \ifnum\rt@nMax>\z@
- \def\rt@next{%
- \rt@listIn=\expandafter{\the\rt@newListIn}%
- \rt@newListIn={}\rt@randomizeList}%
- \else
- \let\rt@next\relax
- \global\rt@listOut=\expandafter{\the\rt@listOut}%
-\ifrtdebug\typeout{Final Result: \string\rt@listOut=\the\rt@listOut}\fi
- \fi
- \rt@next
+ \ifnum\rt@nMax>\z@
+ \def\rt@next{%
+ \rt@listIn=\expandafter{\the\rt@newListIn}%
+ \rt@newListIn={}\rt@randomizeList}%
+ \else
+ \let\rt@next\relax
+ \global\rt@listOut=\expandafter{\the\rt@listOut}%
+ \ifrtdebug
+ \typeout{Final Result: \string\rt@listOut=\the\rt@listOut}\fi
+ \fi\rt@next
}
\def\rt@processi#1{\advance\rt@nCnt\@ne
- \ifnum\rt@nCnt=\rt@getRanNum
- \edef\rt@listOutHold{\the\rt@listOut}%
- \global\rt@listOut=\expandafter{\rt@listOutHold\\{#1}}%
-\ifrtdebug\typeout{Found it: \string\\{#1}}%
-\typeout{New \string\rt@listOut: \the\rt@listOut}\fi
- \else
- \edef\rt@listInHold{\the\rt@newListIn}%
- \rt@newListIn=\expandafter{\rt@listInHold\\{#1}}%
-\ifrtdebug\typeout{\string\rt@newListIn: \the\rt@newListIn}\fi
- \fi
+ \ifnum\rt@nCnt=\rt@getRanNum
+ \edef\rt@listOutHold{\the\rt@listOut}%
+ \global\rt@listOut=\expandafter{\rt@listOutHold\\{#1}}%
+ \ifrtdebug\typeout{Found it: \string\\{#1}}%
+ \typeout{New \string\rt@listOut: \the\rt@listOut}\fi
+ \else
+ \edef\rt@listInHold{\the\rt@newListIn}%
+ \rt@newListIn=\expandafter{\rt@listInHold\\{#1}}%
+ \ifrtdebug\typeout{\string\rt@newListIn: \the\rt@newListIn}\fi
+ \fi
}
\def\rt@modarith#1#2{\count\z@=#1\relax\count\tw@=#1\relax
- \advance\count\z@\m@ne\divide\count\z@ #2\relax
- \multiply\count\z@ #2\relax
- \advance\count\tw@-\count\z@
- \edef\rt@mod{\the\count\tw@}}
+ \advance\count\z@\m@ne\divide\count\z@ #2\relax
+ \multiply\count\z@ #2\relax
+ \advance\count\tw@-\count\z@
+ \edef\rt@mod{\the\count\tw@}}
\def\rt@badIndex#1#2{\PackageWarningNoLine{ran_toks}
- {The argument of \string\useRanTok{#1} on line
- \the\inputlineno\space is\MessageBreak
+ {The argument of \string\useRanTok{#1} on line
+ \the\inputlineno\space is\MessageBreak
greater than \string\nToksFor{#2} (\nToksFor{#2}),
- instead will use\MessageBreak
+ instead will use\MessageBreak
\string\useRanTok{\rt@mod}, obtained from modular
- arithmetic.\MessageBreak
+ arithmetic.\MessageBreak
You might want to fix this}
}
\def\rt@badTokName#1{%
- \PackageWarningNoLine{ran_toks}
- {The token list `#1' on line \the\inputlineno\space
- is undefined,\MessageBreak
+ \PackageWarningNoLine{ran_toks}
+ {The token list `#1' on line \the\inputlineno\space
+ is undefined,\MessageBreak
possibly simply mispelled; check spelling.\MessageBreak
If undefined, use \string\ranToks\space or \string\bRTVToks/%
- \string\eRTVToks\space\MessageBreak
+ \string\eRTVToks\space\MessageBreak
to define a list with the name `#1'}%
}
\def\rt@warnTokName#1{%
- \PackageWarningNoLine{ran_toks}
- {The token list `#1' on line \the\inputlineno\space
- is already defined,\MessageBreak
+ \PackageWarningNoLine{ran_toks}
+ {The token list `#1' on line \the\inputlineno\space
+ is already defined,\MessageBreak
will overwrite this list}%
}
\def\ranToks#1{\begingroup
- \useRTName{#1}%
- \r@nToks
+ \useRTName{#1}%
+ \r@nToks
}
\long\def\r@nToks#1{\rt@nMax\z@\r@ndToks#1\rt@NIL}
\def\rt@NIL{@nil}
@@ -182,120 +182,124 @@
\let\rt@BaseName\@empty
\newcommand{\bRTVToks}[1]{\rt@nCnt\z@\useRTName{#1}}
\newcommand{\eRTVToks}{\global
- \rt@nameedef{\rt@BaseName Cnt}{\the\rt@nCnt}%
- \expandafter\r@nVToks\expandafter{\rt@BaseName}}
+ \rt@nameedef{\rt@BaseName Cnt}{\the\rt@nCnt}%
+ \expandafter\r@nVToks\expandafter{\rt@BaseName}}
\def\reVerbEnd{\ifhmode\unskip\fi}
+\def\rtVWHook#1{\def\@rgi{#1}\ifx\@rgi\@empty
+ \let\RTVWHook\relax\else\def\RTVWHook{#1}\fi}
+\rtVWHook{}
\newenvironment{rtVW}{\global\advance\rt@nCnt\@ne
- \immediate\openout\rt@Verb@write
- \jobname_\rt@BaseName\the\rt@nCnt.cut
- \let\verbatim@out\rt@Verb@write
- \verbatimwrite
+ \immediate\openout\rt@Verb@write
+ \jobname_\rt@BaseName\the\rt@nCnt.cut
+ \let\verbatim@out\rt@Verb@write
+ \rt@IWVO{\string\RTVWHook}%
+ \verbatimwrite
}{%
- \endverbatimwrite
- \immediate\write\rt@Verb@write{\string\reVerbEnd}%
- \immediate\closeout\rt@Verb@write
+ \endverbatimwrite
+ \immediate\write\rt@Verb@write{\string\reVerbEnd}%
+ \immediate\closeout\rt@Verb@write
}
\def\r@nVToks#1{\begingroup
- \gdef\rt@BaseName{#1}%
- \expandafter\rt@nMax\@nameuse{#1Cnt}%
- \rt@listIn={}\rt@nCnt=0\relax\let\rt@listInHold\@empty
- \@whilenum\rt@nCnt<\rt@nMax\do{\advance\rt@nCnt\@ne
- \edef\rt@listInHold{%
- \the\rt@listIn{\noexpand\rt@inputVerb{#1\the\rt@nCnt}}}%
- \rt@listIn=\expandafter{\rt@listInHold}}\ifrtdebug
- \typeout{\string\r@nVToks: \the\rt@listIn}\fi
- \expandafter\r@nToks\expandafter{\the\rt@listIn}}
+ \gdef\rt@BaseName{#1}%
+ \expandafter\rt@nMax\@nameuse{#1Cnt}%
+ \rt@listIn={}\rt@nCnt=0\relax\let\rt@listInHold\@empty
+ \@whilenum\rt@nCnt<\rt@nMax\do{\advance\rt@nCnt\@ne
+ \edef\rt@listInHold{%
+ \the\rt@listIn{\noexpand\rt@inputVerb{#1\the\rt@nCnt}}}%
+ \rt@listIn=\expandafter{\rt@listInHold}}\ifrtdebug
+ \typeout{\string\r@nVToks: \the\rt@listIn}\fi
+ \expandafter\r@nToks\expandafter{\the\rt@listIn}}
\def\rt(a)inputVerb#1{\input{\jobname_#1.cut}}
\def\rt@PAR{\par}
\long\def\r@ndToks#1{\def\rt@rgi{#1}%
- \ifx\rt@rgi\rt@PAR\def\rt@next{\r@ndToks}\else
- \advance\rt@nMax\@ne
- \global\@namedef{rtTok\the\rt@nMax\rt@BaseName}{#1}%
- \def\rt@next{\@ifnextchar\rt@NIL
- {\rt@endToks\@gobble}{\r@ndToks}}\fi\rt@next}
+ \ifx\rt@rgi\rt@PAR\def\rt@next{\r@ndToks}\else
+ \advance\rt@nMax\@ne
+ \global\@namedef{rtTok\the\rt@nMax\rt@BaseName}{#1}%
+ \def\rt@next{\@ifnextchar\rt@NIL
+ {\rt@endToks\@gobble}{\r@ndToks}}\fi\rt@next}
\def\rt@performRanDefns#1{%
- \rt@RandomizeList{#1}\rt@nCnt\z@
- \let\\\rt@ssign\the\rt@listOut}
+ \rt@RandomizeList{#1}\rt@nCnt\z@
+ \let\\\rt@ssign\the\rt@listOut}
\def\rt@endToks{\global
- \rt@nameedef{nMax4\rt@BaseName}{\the\rt@nMax}%
- \rt@performRanDefns{\the\rt@nMax}\endgroup}
+ \rt@nameedef{nMax4\rt@BaseName}{\the\rt@nMax}%
+ \rt@performRanDefns{\the\rt@nMax}\endgroup}
\def\reorderRanToks#1{\begingroup\useRTName{#1}\expandafter
- \ifx\csname nMax4#1\endcsname\relax
- \rt@badTokName{#1}\else
- \rt@performRanDefns{\@nameuse{nMax4#1}}\fi
+ \ifx\csname nMax4#1\endcsname\relax
+ \rt@badTokName{#1}\else
+ \rt@performRanDefns{\@nameuse{nMax4#1}}\fi
\endgroup}
\newcommand\copyRanToks[2]{\begingroup\expandafter
- \ifx\csname nMax4#1\endcsname\relax
+ \ifx\csname nMax4#1\endcsname\relax
\rt@badTokName{#1}%
- \else\expandafter
- \ifx\csname nMax4#2\endcsname\relax
- \useRTName{#2}\global
- \rt@nameedef{nMax4#2}{\@nameuse{nMax4#1}}%
- \rt@nCnt=\csname nMax4#2\endcsname\relax
- \@whilenum\rt@nCnt>\z@\do{\global
- \rt@nameedef{rtTok\the\rt@nCnt#2}%
- {\noexpand\@nameuse{rtTok\the\rt@nCnt#1}}%
- \advance\rt@nCnt\m@ne}%
- \rt@performRanDefns{\@nameuse{nMax4#2}}\else
- \rt@warnTokName{#2}\fi
- \fi
+ \else\expandafter
+ \ifx\csname nMax4#2\endcsname\relax
+ \useRTName{#2}\global
+ \rt@nameedef{nMax4#2}{\@nameuse{nMax4#1}}%
+ \rt@nCnt=\csname nMax4#2\endcsname\relax
+ \@whilenum\rt@nCnt>\z@\do{\global
+ \rt@nameedef{rtTok\the\rt@nCnt#2}%
+ {\noexpand\@nameuse{rtTok\the\rt@nCnt#1}}%
+ \advance\rt@nCnt\m@ne}%
+ \rt@performRanDefns{\@nameuse{nMax4#2}}\else
+ \rt@warnTokName{#2}\fi
+ \fi
\endgroup}
\def\rt@ssign#1{\advance\rt@nCnt\@ne\global
- \rt@nameedef{rtRanTok\the\rt@nCnt\rt@BaseName}{\noexpand
- \@nameuse{rtTok#1\rt@BaseName}}}
+ \rt@nameedef{rtRanTok\the\rt@nCnt\rt@BaseName}{\noexpand
+ \@nameuse{rtTok#1\rt@BaseName}}}
\newcommand{\nToksFor}[1]{\expandafter
- \ifx\csname nMax4#1\endcsname\relax
- \textbf{??}\rt@badTokName{#1}\else
- \@nameuse{nMax4#1}\fi}
+ \ifx\csname nMax4#1\endcsname\relax
+ \textbf{??}\rt@badTokName{#1}\else
+ \@nameuse{nMax4#1}\fi}
\newcommand{\rtTokByNum}[2][\rt@BaseName]{\expandafter
- \ifx\csname nMax4#1\endcsname\relax
- \textbf{??}\rt@badTokName{#1}\else
- \@nameuse{rtTok#2#1}\expandafter\ignorespaces\fi}
+ \ifx\csname nMax4#1\endcsname\relax
+ \textbf{??}\rt@badTokName{#1}\else
+ \@nameuse{rtTok#2#1}\expandafter\ignorespaces\fi}
\newcommand{\useRanTok}[2][\rt@BaseName]{\bgroup
- \expandafter\ifx\csname nMax4#1\endcsname\relax
- \rt@badTokName{#1}\else
+ \expandafter\ifx\csname nMax4#1\endcsname\relax
+ \rt@badTokName{#1}\else
\ifnum#2>\nToksFor{#1}\rt@modarith{#2}{\nToksFor{#1}}%
- \rt@badIndex{#2}{#1}\@nameuse{rtRanTok\rt@mod#1}\else
- \@nameuse{rtRanTok#2#1}\fi\fi\egroup}
+ \rt@badIndex{#2}{#1}\@nameuse{rtRanTok\rt@mod#1}\else
+ \@nameuse{rtRanTok#2#1}\fi\fi\egroup}
\newcommand{\displayListRandomly}[1][]{\bgroup\def\rt@prior{#1}%
- \displ@yListRandomly}
+ \displ@yListRandomly}
\newcommand{\displ@yListRandomly}[2][]{\rt@nCnt\z@
- \expandafter\ifx\csname nMax4#2\endcsname\relax
- \rt@rgi\space\textbf{??}\rt@badTokName{#2}#1%
- \else
- \def\rt@post{#1}\useRTName{#2}\let\i\rt@nCnt
- \def\first{1}\edef\last{\@nameuse{nMax4#2}}%
- \@tempcnta\last \advance\@tempcnta\m@ne
- \edef\lessone{\the\@tempcnta}%
- \@whilenum\rt@nCnt<\last\advance\rt@nCnt\@ne
- \do{\rt@prior\useRanTok{\the\rt@nCnt}\rt@post}%
- \fi\egroup
-}
+ \expandafter\ifx\csname nMax4#2\endcsname\relax
+ \rt@rgi\space\textbf{??}\rt@badTokName{#2}#1%
+ \else
+ \def\rt@post{#1}\useRTName{#2}\let\i\rt@nCnt
+ \def\first{1}\edef\last{\@nameuse{nMax4#2}}%
+ \@tempcnta\last \advance\@tempcnta\m@ne
+ \edef\lessone{\the\@tempcnta}%
+ \@whilenum\rt@nCnt<\last\advance\rt@nCnt\@ne
+ \do{\rt@prior\useRanTok{\the\rt@nCnt}\rt@post}%
+ \fi
+\egroup}
\def\rt@gettonil#1\@nil{\def\to@nilarg{#1}}
\def\rt@ifspc{\ifx\@let@token\@sptoken
- \let\rt@next\rt@xifspc\else
- \let\rt@next\rt@gettonil\fi\rt@next}
+ \let\rt@next\rt@xifspc\else
+ \let\rt@next\rt@gettonil\fi\rt@next}
\begingroup
\def\:{\rt@xifspc}
\expandafter\gdef\: {\futurelet\@let@token\rt@ifspc}
\endgroup
\def\rt@strpspcs{\futurelet\@let@token\rt@ifspc}
\def\ProbDBWarningMsg#1{\filename@parse{#1}
- \PackageWarning{ran_toks}
- {The file \filename@area\filename@base.\ifx\filename@ext\relax
- tex\else\filename@ext\fi\space cannot be found}}
+ \PackageWarning{ran_toks}
+ {The file \filename@area\filename@base.\ifx\filename@ext\relax
+ tex\else\filename@ext\fi\space cannot be found}}
\def\useTheseDBs#1{\def\rt@dblist{#1}\ifx\rt@dblist\@empty\else
- \let\rt@DB@List\@empty
- \edef\temp@expand{\noexpand\@for\noexpand\@@tmp:=\rt@dblist}%
- \temp@expand\do{\ifx\@@tmp\@empty\else
- \expandafter\rt@strpspcs\@@tmp\@nil\edef\@@tmp{\to@nilarg}%
- \edef\rt@nextDB{\noexpand
- \InputIfFileExists{\@@tmp}{}{\noexpand
- \ProbDBWarningMsg{\@@tmp}}}%
- \toks\tw@=\expandafter{\rt@DB@List}%
- \toks@=\expandafter{\rt@nextDB}%
- \edef\rt@DB@List{\the\toks\tw@\space\the\toks@}\fi
- }\expandafter\rt@DB@List\fi}
+ \let\rt@DB@List\@empty
+ \edef\temp@expand{\noexpand\@for\noexpand\@@tmp:=\rt@dblist}%
+ \temp@expand\do{\ifx\@@tmp\@empty\else
+ \expandafter\rt@strpspcs\@@tmp\@nil\edef\@@tmp{\to@nilarg}%
+ \edef\rt@nextDB{\noexpand
+ \InputIfFileExists{\@@tmp}{}{\noexpand
+ \ProbDBWarningMsg{\@@tmp}}}%
+ \toks\tw@=\expandafter{\rt@DB@List}%
+ \toks@=\expandafter{\rt@nextDB}%
+ \edef\rt@DB@List{\the\toks\tw@\space\the\toks@}\fi
+ }\expandafter\rt@DB@List\fi}
\let\useProbDBs\useTheseDBs
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ran_toks.tlpobj new/tlpkg/tlpobj/ran_toks.tlpobj
--- old/tlpkg/tlpobj/ran_toks.tlpobj 2019-02-28 04:04:07.000000000 +0100
+++ new/tlpkg/tlpobj/ran_toks.tlpobj 2019-12-31 01:56:27.000000000 +0100
@@ -1,19 +1,19 @@
name ran_toks
category Package
-revision 44429
+revision 53271
shortdesc Randomise token strings
relocated 1
longdesc The package provides means of randomising lists of tokens, or
longdesc lists of chunks of tokens. Two mechanisms for defining chunks
-longdesc are provided: the macro \ranToks command accepts an argument
+longdesc are provided: the \ranToks command accepts an argument
longdesc containing tokens to be randomised; and the \bRTVToks/\eRTVToks
longdesc commands delimit a collection of tokens for randomising; each
longdesc group inside a rtVw constitutes one of these (typically larger)
longdesc token sets.
-runfiles size=3
+runfiles size=4
+ RELOC/tex/latex/ran_toks/ran-toks.sty
RELOC/tex/latex/ran_toks/ran_toks.sty
catalogue-ctan /macros/latex/contrib/ran_toks
-catalogue-date 2017-05-18 22:38:32 +0200
catalogue-license lppl1
catalogue-topics macro-supp
-catalogue-version 1.1
+catalogue-version 1.2
++++++ realhats.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/realhats/README.md new/doc/latex/realhats/README.md
--- old/doc/latex/realhats/README.md 2019-02-25 23:26:39.000000000 +0100
+++ new/doc/latex/realhats/README.md 2019-11-19 23:32:23.000000000 +0100
@@ -13,10 +13,18 @@
![Letters with hats on](readme_images/hats.png)
## Changelog
-### Version 2.0
+### Version 5.0 (2019-11-19)
+* Added Ash's hat
+### Version 4.0 (2019-11-02)
+* Vectorised the hats
+* Added dunce cap
+### Version 3.0 (2019-04-14)
+* Added optional parameters for `\hat` and `\usepackage` to control which hats are used.
+* Added crown
+### Version 2.0 (2019-02-25)
* Replaced tikz with stackengine
-* Added top hat, make LaTeX great again hat, fez, cowboy hat
-### Version 1.0
+* Added top hat, fez, cowboy hat
+### Version 1.0 (2019-02-05)
* First working version of package
* Added five hats
* Added documentation
Binary files old/doc/latex/realhats/readme_images/hats.png and new/doc/latex/realhats/readme_images/hats.png differ
Binary files old/doc/latex/realhats/realhats.pdf and new/doc/latex/realhats/realhats.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/realhats.doc.tlpobj new/tlpkg/tlpobj/realhats.doc.tlpobj
--- old/tlpkg/tlpobj/realhats.doc.tlpobj 2019-02-28 04:04:09.000000000 +0100
+++ new/tlpkg/tlpobj/realhats.doc.tlpobj 2019-11-20 01:54:34.000000000 +0100
@@ -1,9 +1,9 @@
name realhats.doc
category Package
-revision 50134
+revision 52865
shortdesc doc files of realhats
relocated 1
-docfiles size=949
+docfiles size=31
RELOC/doc/latex/realhats/README.md
RELOC/doc/latex/realhats/readme_images/hats.png
RELOC/doc/latex/realhats/realhats.pdf
++++++ realhats.tar.xz ++++++
Binary files old/tex/latex/realhats/hats/realhats-ash.pdf and new/tex/latex/realhats/hats/realhats-ash.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-beret.pdf and new/tex/latex/realhats/hats/realhats-beret.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-beret.png and new/tex/latex/realhats/hats/realhats-beret.png differ
Binary files old/tex/latex/realhats/hats/realhats-cowboy.pdf and new/tex/latex/realhats/hats/realhats-cowboy.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-cowboy.png and new/tex/latex/realhats/hats/realhats-cowboy.png differ
Binary files old/tex/latex/realhats/hats/realhats-crown.pdf and new/tex/latex/realhats/hats/realhats-crown.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-dunce.pdf and new/tex/latex/realhats/hats/realhats-dunce.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-fez.pdf and new/tex/latex/realhats/hats/realhats-fez.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-fez.png and new/tex/latex/realhats/hats/realhats-fez.png differ
Binary files old/tex/latex/realhats/hats/realhats-makelatexgreatagain.pdf and new/tex/latex/realhats/hats/realhats-makelatexgreatagain.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-makelatexgreatagain.png and new/tex/latex/realhats/hats/realhats-makelatexgreatagain.png differ
Binary files old/tex/latex/realhats/hats/realhats-santa.pdf and new/tex/latex/realhats/hats/realhats-santa.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-santa.png and new/tex/latex/realhats/hats/realhats-santa.png differ
Binary files old/tex/latex/realhats/hats/realhats-scottish.png and new/tex/latex/realhats/hats/realhats-scottish.png differ
Binary files old/tex/latex/realhats/hats/realhats-sombrero.pdf and new/tex/latex/realhats/hats/realhats-sombrero.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-sombrero.png and new/tex/latex/realhats/hats/realhats-sombrero.png differ
Binary files old/tex/latex/realhats/hats/realhats-tophat.pdf and new/tex/latex/realhats/hats/realhats-tophat.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-tophat.png and new/tex/latex/realhats/hats/realhats-tophat.png differ
Binary files old/tex/latex/realhats/hats/realhats-witch.pdf and new/tex/latex/realhats/hats/realhats-witch.pdf differ
Binary files old/tex/latex/realhats/hats/realhats-witch.png and new/tex/latex/realhats/hats/realhats-witch.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/realhats/realhats.sty new/tex/latex/realhats/realhats.sty
--- old/tex/latex/realhats/realhats.sty 2019-02-25 23:26:39.000000000 +0100
+++ new/tex/latex/realhats/realhats.sty 2019-11-19 23:32:23.000000000 +0100
@@ -28,38 +28,85 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{realhats}[2019/02/02 realhats]
+\ProvidesPackage{realhats}[2019/04/14 realhats 3.0]
\RequirePackage{amsmath}
\RequirePackage{graphicx}
\RequirePackage{ifthen}
-\RequirePackage[first=0, last=8]{lcg}
+\RequirePackage[first=0, last=9, counter=hat]{lcg}
\RequirePackage{calc}
\RequirePackage{stackengine}
\newcommand\myhat{}
+\newlength{\hatwidth} %hat width
\newlength{\hshif} %horizontal shift
\newlength{\vshif} %vertical shift
-\renewcommand{\hat}[1]{\rand\hatn{#1}{\arabic{rand}}}
+\global\def\hatused{-1}
+\DeclareOption{beret}{\global\def\hatused{beret}}
+\DeclareOption{santa}{\global\def\hatused{santa}}
+\DeclareOption{sombrero}{\global\def\hatused{sombrero}}
+\DeclareOption{witch}{\global\def\hatused{witch}}
+\DeclareOption{tophat}{\global\def\hatused{tophat}}
+\DeclareOption{ash}{\global\def\hatused{ash}}
+\DeclareOption{fez}{\global\def\hatused{fez}}
+\DeclareOption{cowboy}{\global\def\hatused{cowboy}}
+\DeclareOption{crown}{\global\def\hatused{crown}}
+\DeclareOption{dunce}{\global\def\hatused{dunce}}
+\ProcessOptions\relax
+
+\newcommand{\gethat}{%
+ \ifcase\thehat beret%
+ \or santa%
+ \or sombrero%
+ \or witch%
+ \or tophat%
+ \or ash%
+ \or fez%
+ \or cowboy%
+ \or crown%
+ \or dunce%
+ \fi
+}
+
+\renewcommand{\hat}[2][]{%
+ \ifthenelse{\equal{#1}{}}{%
+ \ifthenelse{\equal{\hatused}{-1}}%
+ {\rand\hatn{#2}{\gethat}}%
+ {\hatn{#2}{\hatused}}%
+ }{%
+ \ifthenelse{\equal{#1}{beret}}{\hatn{#2}{beret}}{}%
+ \ifthenelse{\equal{#1}{santa}}{\hatn{#2}{santa}}{}%
+ \ifthenelse{\equal{#1}{sombrero}}{\hatn{#2}{sombrero}}{}%
+ \ifthenelse{\equal{#1}{witch}}{\hatn{#2}{witch}}{}%
+ \ifthenelse{\equal{#1}{tophat}}{\hatn{#2}{tophat}}{}%
+ \ifthenelse{\equal{#1}{ash}}{\hatn{#2}{ash}}{}%
+ \ifthenelse{\equal{#1}{fez}}{\hatn{#2}{fez}}{}%
+ \ifthenelse{\equal{#1}{cowboy}}{\hatn{#2}{cowboy}}{}%
+ \ifthenelse{\equal{#1}{crown}}{\hatn{#2}{crown}}{}%
+ \ifthenelse{\equal{#1}{dunce}}{\hatn{#2}{dunce}}{}%
+ }%
+}
\newcommand{\hatn}[2]{\hatnoptions{#1}{#2}{0ex}{0ex}}
\newcommand{\hatnoptions}[4]{%
\setlength{\hshif}{1pt}
-\ifthenelse{\equal{#2}{0}}{\renewcommand\myhat{hats/realhats-beret}\setlength{\vshif}{-0.6ex} \setlength{\hshif}{0.5ex} }{}%
-\ifthenelse{\equal{#2}{1}}{\renewcommand\myhat{hats/realhats-santa}\setlength{\vshif}{-0.1ex} }{}%
-\ifthenelse{\equal{#2}{2}}{\renewcommand\myhat{hats/realhats-scottish}\setlength{\vshif}{-0.7ex} \setlength{\hshif}{0.6ex}}{}%
-\ifthenelse{\equal{#2}{3}}{\renewcommand\myhat{hats/realhats-sombrero}\setlength{\vshif}{-0.17ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{4}}{\renewcommand\myhat{hats/realhats-witch}\setlength{\vshif}{-0.12ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{5}}{\renewcommand\myhat{hats/realhats-tophat}\setlength{\vshif}{-0.6ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{6}}{\renewcommand\myhat{hats/realhats-makelatexgreatagain}\setlength{\vshif}{-0.6ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{7}}{\renewcommand\myhat{hats/realhats-fez}\setlength{\vshif}{-0.4ex} \addtolength{\hshif}{-1pt}}{}%
-\ifthenelse{\equal{#2}{8}}{\renewcommand\myhat{hats/realhats-cowboy}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\setlength{\hatwidth}{2ex}
+\ifthenelse{\equal{#2}{beret}}{\renewcommand\myhat{hats/realhats-beret}\setlength{\vshif}{-0.6ex} \setlength{\hshif}{0.5ex} }{}%
+\ifthenelse{\equal{#2}{santa}}{\renewcommand\myhat{hats/realhats-santa}\setlength{\vshif}{-0.1ex} }{}%
+\ifthenelse{\equal{#2}{sombrero}}{\renewcommand\myhat{hats/realhats-sombrero}\setlength{\vshif}{-0.17ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{witch}}{\renewcommand\myhat{hats/realhats-witch}\setlength{\vshif}{-0.12ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{tophat}}{\renewcommand\myhat{hats/realhats-tophat}\setlength{\vshif}{-0.4ex} \setlength{\hatwidth}{1.8ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{ash}}{\renewcommand\myhat{hats/realhats-ash}\setlength{\vshif}{-0.6ex} \setlength{\hatwidth}{1.8ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{fez}}{\renewcommand\myhat{hats/realhats-fez}\setlength{\vshif}{-0.4ex} \setlength{\hatwidth}{1ex} \addtolength{\hshif}{-1pt}}{}%
+\ifthenelse{\equal{#2}{cowboy}}{\renewcommand\myhat{hats/realhats-cowboy}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\ifthenelse{\equal{#2}{crown}}{\renewcommand\myhat{hats/realhats-crown}\setlength{\vshif}{-0.3ex} \setlength{\hshif}{0.2ex}}{}%
+\ifthenelse{\equal{#2}{dunce}}{\renewcommand\myhat{hats/realhats-dunce}\setlength{\vshif}{-0.3ex} \setlength{\hatwidth}{1.4ex}}{}%
\addtolength{\hshif}{#3}%
\addtolength{\vshif}{#4}%
\stackMath %
-\stackon[\vshif]{#1}{\hspace{\hshif}\includegraphics[width=2ex]{\myhat}}
+\stackon[\vshif]{#1}{\hspace{\hshif}\includegraphics[width=\hatwidth]{\myhat}}
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/realhats.tlpobj new/tlpkg/tlpobj/realhats.tlpobj
--- old/tlpkg/tlpobj/realhats.tlpobj 2019-02-28 04:04:10.000000000 +0100
+++ new/tlpkg/tlpobj/realhats.tlpobj 2019-11-20 01:54:34.000000000 +0100
@@ -1,24 +1,29 @@
name realhats
category Package
-revision 50134
+revision 52865
shortdesc Put real hats on symbols instead of ^
relocated 1
-longdesc This package makes \hat put real hats on symbols.
-runfiles size=973
- RELOC/tex/latex/realhats/hats/realhats-beret.png
- RELOC/tex/latex/realhats/hats/realhats-cowboy.png
- RELOC/tex/latex/realhats/hats/realhats-fez.png
- RELOC/tex/latex/realhats/hats/realhats-makelatexgreatagain.png
- RELOC/tex/latex/realhats/hats/realhats-santa.png
- RELOC/tex/latex/realhats/hats/realhats-scottish.png
- RELOC/tex/latex/realhats/hats/realhats-sombrero.png
- RELOC/tex/latex/realhats/hats/realhats-tophat.png
- RELOC/tex/latex/realhats/hats/realhats-witch.png
+longdesc This LaTeX package makes \hat put real hats on symbols. The
+longdesc package depends on amsmath, calc, graphicx, ifthen, lcg, and
+longdesc stackengine.
+runfiles size=18
+ RELOC/tex/latex/realhats/hats/realhats-ash.pdf
+ RELOC/tex/latex/realhats/hats/realhats-beret.pdf
+ RELOC/tex/latex/realhats/hats/realhats-cowboy.pdf
+ RELOC/tex/latex/realhats/hats/realhats-crown.pdf
+ RELOC/tex/latex/realhats/hats/realhats-dunce.pdf
+ RELOC/tex/latex/realhats/hats/realhats-fez.pdf
+ RELOC/tex/latex/realhats/hats/realhats-makelatexgreatagain.pdf
+ RELOC/tex/latex/realhats/hats/realhats-santa.pdf
+ RELOC/tex/latex/realhats/hats/realhats-sombrero.pdf
+ RELOC/tex/latex/realhats/hats/realhats-tophat.pdf
+ RELOC/tex/latex/realhats/hats/realhats-witch.pdf
RELOC/tex/latex/realhats/realhats.sty
catalogue-contact-bugs https://github.com/mscroggs/realhats/issues
-catalogue-contact-home https://github.com/mscroggs/realhats
-catalogue-ctan /graphics/pgf/contrib/realhats
-catalogue-date 2019-02-27 05:05:57 +0100
+catalogue-contact-home http://www.realhats.xyz
+catalogue-contact-repository https://github.com/mscroggs/realhats
+catalogue-ctan /macros/latex/contrib/realhats
+catalogue-date 2019-11-19 10:18:59 +0100
catalogue-license mit
-catalogue-topics pgf-tikz
-catalogue-version 2.0
+catalogue-topics amusements graphics graphics-incl
+catalogue-version 5.0
++++++ recipe.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/recipe.doc.tlpobj new/tlpkg/tlpobj/recipe.doc.tlpobj
--- old/tlpkg/tlpobj/recipe.doc.tlpobj 2019-02-28 04:04:12.000000000 +0100
+++ new/tlpkg/tlpobj/recipe.doc.tlpobj 2020-03-04 23:53:45.000000000 +0100
@@ -1,6 +1,6 @@
name recipe.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of recipe
relocated 1
docfiles size=11
++++++ recipe.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/recipe.tlpobj new/tlpkg/tlpobj/recipe.tlpobj
--- old/tlpkg/tlpobj/recipe.tlpobj 2019-02-28 04:04:12.000000000 +0100
+++ new/tlpkg/tlpobj/recipe.tlpobj 2020-03-04 23:53:45.000000000 +0100
@@ -1,16 +1,15 @@
name recipe
category Package
-revision 15878
+revision 54080
shortdesc A LaTeX class to typeset recipes
relocated 1
-longdesc The layout design is relative straightforward (and traditional:
-longdesc see 'sample output' under 'documentation'); the class needs
-longdesc uses the Bookman and BrushScript-Italic fonts.
+longdesc The layout design is relatively straightforward (and
+longdesc traditional: see 'sample output' under 'documentation'); the
+longdesc class uses the Bookman and the BrushScript-Italic fonts.
runfiles size=1
RELOC/tex/latex/recipe/recipe.cls
catalogue-also recipecard recipebook
catalogue-ctan /macros/latex/contrib/recipe
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics cooking
catalogue-version 0.9
++++++ register.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/register/README new/doc/latex/register/README
--- old/doc/latex/register/README 2018-05-20 01:28:36.000000000 +0200
+++ new/doc/latex/register/README 2020-03-22 21:50:14.000000000 +0100
@@ -10,9 +10,10 @@
digital hardware, i.e., registers. Such registers typically have many
fields and can be quite wide; they are thus a challenge to typeset in
a consistent manner. Register is similar in some aspects to the
-bytefield package. Anyone doing hardware documentation using LaTeX
-should examine both packages. Register requires version 2001/07/25 or
-newer of the float package.
+bytefield and bitpattern packages. Anyone doing hardware
+documentation using LaTeX should examine those packages.
+
+Register requires version 2001/07/25 or newer of the float package.
An example Perl module and script are provided, to convert the
register specifications into structures suitable for, say, a
@@ -38,7 +39,7 @@
Copyright and license
---------------------
-Copyright (C) 2001-2018 Matthew Lovell, lovells(a)gmail.com
+Copyright (C) 2001-2020 Matthew Lovell, lovells(a)gmail.com
This package may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3 of this
Binary files old/doc/latex/register/register.pdf and new/doc/latex/register/register.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/register.doc.tlpobj new/tlpkg/tlpobj/register.doc.tlpobj
--- old/tlpkg/tlpobj/register.doc.tlpobj 2019-02-28 04:04:15.000000000 +0100
+++ new/tlpkg/tlpobj/register.doc.tlpobj 2020-03-23 01:56:29.000000000 +0100
@@ -1,9 +1,9 @@
name register.doc
category Package
-revision 49581
+revision 54485
shortdesc doc files of register
relocated 1
-docfiles size=51
+docfiles size=83
RELOC/doc/latex/register/README
RELOC/doc/latex/register/Reg_macro.pm
RELOC/doc/latex/register/reg_list.pl
++++++ register.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/register/register.sty new/tex/latex/register/register.sty
--- old/tex/latex/register/register.sty 2019-01-02 23:39:10.000000000 +0100
+++ new/tex/latex/register/register.sty 2020-03-22 21:50:14.000000000 +0100
@@ -22,7 +22,7 @@
-\ProvidesPackage{register} [2019/01/01 v1.9 Register macros with
+\ProvidesPackage{register} [2020/03/22 v2.0 Register macros with
hyperref/LyX support]
\RequirePackage{ifthen}[1997/11/02]
@@ -34,22 +34,28 @@
\DeclareOption{TRflags}{\setboolean{RegisterTRFlags}{true}}
\DeclareOption{TRboxed}{\setboolean{RegisterTRBoxed}{true}}
\DeclareOption{color}{\setboolean{RegisterColors}{true}}
+\DeclareOption{botcaption}{\setboolean{RegisterBottom}{true}}
+\DeclareOption{nocaption}{\setboolean{RegisterNoCaption}{true}}
\DeclareOption*{% Emit a warning for other options
\PackageWarning{register}{Unknown option '\CurrentOption'}%
}
-\newboolean{RegisterLyX}
-\newboolean{RegisterHyperref}
-\newboolean{RegisterTRFlags}
-\newboolean{RegisterTRBoxed}
-\newboolean{RegisterColors}
+\newboolean{RegisterLyX}% Work with LyX
+\newboolean{RegisterHyperref}% Work with hyperref package
+\newboolean{RegisterTRFlags}% TR release flags
+\newboolean{RegisterTRBoxed}% Place frame around TR flags
+\newboolean{RegisterColors}% Permit color-filling register fields
+\newboolean{RegisterBottom}% Move caption location to beneath register
+\newboolean{RegisterNoCaption}% Disable environment's built-in caption
\setboolean{RegisterLyX}{false}
\setboolean{RegisterHyperref}{false}
\setboolean{RegisterTRFlags}{false}
\setboolean{RegisterTRBoxed}{false}
\setboolean{RegisterColors}{false}
+\setboolean{RegisterBottom}{false}
+\setboolean{RegisterNoCaption}{false}
\ProcessOptions\relax % Process package options
\ifthenelse{\boolean{RegisterColors}}{\RequirePackage{xcolor}[2007/01/21]}{}
@@ -59,7 +65,8 @@
\newcommand{\regListName}{List of Registers}
\newcommand{\regResetName}{Reset}
-\floatstyle{plaintop} \@ifundefined{chapter}
+\ifthenelse{\boolean{RegisterBottom}}{\floatstyle{plain}}{\floatstyle{plaintop}}
+\@ifundefined{chapter}
{\newfloat{Regfloat}{tbp}{rdf}[section]}
{\newfloat{Regfloat}{tbp}{rdf}[chapter]}
\floatname{Regfloat}{\regFloatName}
@@ -80,7 +87,7 @@
\newcommand{\regResetSize}{\scriptsize}
\newcommand{\regLabelSize}{\footnotesize}
\newcommand{\regLabelFamily}{\rmfamily}
-\newcommand{\regDescFamily}{\bf}
+\newcommand{\regDescFamily}{\bfseries}
\newlength{\regdescsep}
\newlength{\oldregdescsep}
\setlength{\regdescsep}{-\medskipamount}
@@ -136,9 +143,11 @@
\setlength{\partopsep}{0pt}%
\setlength{\topsep}{0pt}%
\setboolean{RegisterContext}{true}%
- \ifthenelse{\equal{#3}{}}%
- {\caption[#2]{\textsc{#2}}}% else
- {\caption[#2]{\textsc{#2} ({#3})}}%
+ \ifthenelse{\boolean{RegisterNoCaption}}{}%
+ {\ifthenelse{\equal{#3}{}}%
+ {\caption[#2]{\textsc{#2}}}% else
+ {\caption[#2]{\textsc{#2} ({#3})}}%
+ }%
\centering}
{% restore lengths
\leftskip\z@%
@@ -398,6 +407,10 @@
\@starttoc{\@nameuse{ext@Regfloat}}}}
\newcommand\l@Regfloat{\@dottedtocline{1}{1.5em}{2.3em}}
\@ifundefined{@mainmatter}{\newif\if@mainmatter \@mainmattertrue}{}
+\@ifclassloaded{memoir}{%
+\renewcommand{\memchapinfo}[4]{%
+ \addtocontents{rdf}{\protect\addvspace{10pt}}}
+}{%
\@ifundefined{chapter}{}
{% Adjust chapter definition slightly for Regfloats
\def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
@@ -422,7 +435,7 @@
\@makechapterhead{#2}%
\@afterheading
\fi}
-}
+}}
\newcommand\@GetTRSecondParam{}
\long\def\@GetTRSecondParam#1#2#3\@nil{#2}
\newcommand*{\GetTRPageRef}[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/register.tlpobj new/tlpkg/tlpobj/register.tlpobj
--- old/tlpkg/tlpobj/register.tlpobj 2019-02-28 04:04:15.000000000 +0100
+++ new/tlpkg/tlpobj/register.tlpobj 2020-03-23 01:56:29.000000000 +0100
@@ -1,22 +1,22 @@
name register
category Package
-revision 49581
+revision 54485
shortdesc Typeset programmable elements in digital hardware (registers)
relocated 1
longdesc This package is designed for typesetting the programmable
-longdesc elements in digital hardware, i.e. registers. Such registers
+longdesc elements in digital hardware, i.e., registers. Such registers
longdesc typically have many fields and can be quite wide; they are thus
longdesc a challenge to typeset in a consistent manner. Register is
-longdesc similar in some aspects to the bytefield package. Anyone doing
-longdesc hardware documentation using LaTeX should examine both
-longdesc packages. Register requires a fairly recent version of the
-longdesc float package. An example Perl module and a Perl script are
-longdesc provided to translate the register specifications into
-longdesc programmable data structures.
-runfiles size=4
+longdesc similar in some aspects to the bytefield and bitpattern
+longdesc packages. Anyone doing hardware documentation using LaTeX
+longdesc should examine those packages. Register requires version
+longdesc 2001/07/25 or newer of the float package. An example Perl
+longdesc module and script are provided, to convert the register
+longdesc specifications into structures suitable for, say, a pre-silicon
+longdesc test environment.
+runfiles size=5
RELOC/tex/latex/register/register.sty
catalogue-ctan /macros/latex/contrib/register
-catalogue-date 2019-01-01 23:34:54 +0100
catalogue-license lppl1.3
catalogue-topics engineering comp-sci comp-net
-catalogue-version 1.9
+catalogue-version 2.0
++++++ reledmac.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-t/reledmac.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-t.new.3606/reledmac.doc.tar.xz differ: char 26, line 1
++++++ reledmac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/reledmac/reledmac.sty new/tex/latex/reledmac/reledmac.sty
--- old/tex/latex/reledmac/reledmac.sty 2019-04-03 23:41:18.000000000 +0200
+++ new/tex/latex/reledmac/reledmac.sty 2020-03-08 22:48:18.000000000 +0100
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/04/03 v2.31.2 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/03/08 v2.32.5 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -139,6 +139,11 @@
\ifx\directlua\undefined\else%
\directlua{tex.enableprimitives("",{"textdir","pardir","bodydir"})}
\fi
+\ifluatex%
+ \ifnum\luatexversion<110%
+ \PackageWarning{reledmac}{You need to use LuaTeX 1.1.0 or higher}{\@ehc}%
+ \fi%
+\fi%
\newif\ifl@dmemoir
\@ifclassloaded{memoir}{\l@dmemoirtrue}{\l@dmemoirfalse}
@@ -165,8 +170,11 @@
\reledmac@error{Numbering was not started}{\@ehc}}
\newcommand*{\led@err@NumberingShouldHaveStarted}{%
\reledmac@error{Numbering should already have been started}{\@ehc}}
+\newcommand*{\led@err@samewordRTL}{%
+ \reledmac@error{You can't use \string\sameword \MessageBreak with XeLaTeX \MessageBreak when typesetting RTL text.\MessageBreak Please use LuaTeX instead.}{\@ehc}%
+}%
\newcommand*{\led@err@edtextoutsidepstart}{%
- \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
+ \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space ...\space\pend)}{\@ehc}}%
\newcommand{\led@err@PstartInEdtext}[1]{%
\reledmac@error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}%
@@ -213,7 +221,7 @@
\newcommand*{\led@err@PstartNotNumbered}{%
\reledmac@error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}%
+ (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}}%
\newcommand*{\led@err@PstartInPstart}{%
\reledmac@error{\string\pstart\space encountered while another
\string\pstart\space was in effect}{\@ehc}}
@@ -291,7 +299,7 @@
\newcommand*{\led@err@ReverseColumns}{%
\reledmac@error{Start column is greater than end column}{\@ehc}}
\newcommand{\led@err@toendnotes@outsidenumbering}{%
- \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}%
+ \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}%
}%
\newcommand{\led@err@EdtextWithoutFootnote}{%
\reledmac@error{edtext without Xfootnote. Check syntaxis}{\@ehc}%
@@ -321,7 +329,7 @@
\reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
\newcommand{\led@warn@edinde@outsidenumbering}{%
- \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
+ \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
\newcommand{\led@warning@hsizeX@deprecated}{%
\reledmac@warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}%
@@ -1339,6 +1347,7 @@
}%
\newcommand*{\new@line}{%
+ \set@this@c@page%
\ifnumberline%
\IfStrEq{\led@pb@setting}{after}%
{\xifinlist{\the\absline@num}{\l@prev@nopb}%
@@ -1346,9 +1355,9 @@
{\numgdef{\@next@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\@next@page][\@next@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}}%
{}%
\IfStrEq{\led@pb@setting}{before}%
{\numdef{\next@absline}{\the\absline@num+\@ne}%
@@ -1357,9 +1366,9 @@
{\numgdef{\nc@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\nc@page][\nc@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
{}%
\IfStrEqCase{\led@pb@setting}%
@@ -1367,18 +1376,19 @@
{before}{\relax}%
{after}{\relax}%
}[%
- \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}%
]%
\fi%
}
-\newcommand{\l@the@c@page}{%
+\newcount\@this@c@page%%
+\newcommand{\set@this@c@page}{%
\ifboolexpr{%
bool{sameparallelpagenumber}%
or bool{prevpgnotnumbered}%
}%
- {\the\c@par@page}%
- {\the\c@page}%
+ {\global\@this@c@page=\c@par@page}%
+ {\global\@this@c@page=\c@page}%
}%
\newif\if@noneed@Footnote%
@@ -1545,7 +1555,7 @@
\@edtext@level=0%
\newif\if@edtext@secondarg@%
\newcounter{edtext}
-\renewcommand{\theedtext}{edtxt@\arabic{edtext}}%
+\renewcommand{\theedtext}{edtxt@\the\c@edtext}%
\newcommand{\edtext}[2]{\leavevmode%
\ifnumberedpar@%
\@check@edtext@args{#1}{#2}%
@@ -1711,11 +1721,7 @@
\else%
\def\@tmpa##1{##1}%
\fi%
- \ifxetex%
- \@tmpa{\xdef\sw@txt{#1}}%
- \else%
- \@tmpa{\expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}}%
- \fi%
+ \@tmpa{\protected@xdef\sw@txt{#1}}%
\endgroup%
}%
\newcommand{\swnoexpands}{%
@@ -1740,6 +1746,11 @@
\fi%
}%
\newcommandx{\sameword}[2][1,usedefault]{%
+ \ifxetex%
+ \if@RTL%
+ \led@err@samewordRTL%
+ \fi%
+ \fi%
\leavevmode%
\get@sw@txt{#2}%
\unless\ifledRcol%
@@ -2111,6 +2122,7 @@
\add@penalties%
}
\def\print@eledsection{%
+ \disable@edindex%
\if@firstlineofpage%
\set@Xtxtbeforenotes%
\set@txtbeforenotesX%
@@ -2141,6 +2153,7 @@
\fi%
\vskip-\baselineskip%
\continuousnumberingwithcolumns@sync@linenumber@singletext%
+ \restore@edindex%
}
\newcommand*{\do@linehook}{}
\newcommand*{\do@insidelinehook}{}
@@ -2567,7 +2580,7 @@
\insert\csname ##1footins\endcsname%
\fi%
{%
- \nottoggle{Xparindent@##1}{\parindent=\z@}{}%
+ \Xsetparindent{##1}%
\ifcsdef{Xhsize\csuse{series@display##1}@##1}%
{\hsize \csuse{Xhsize\csuse{series@display##1}@##1}}%
{}%
@@ -2575,7 +2588,7 @@
\unvbox\@nameuse{mp##1footins}%
\fi%
\X@atbegininsertion{##1}%
- \ifcsstring{series@display##1}%
+ \ifcsstring{series@display##1}{normal}%
{%
\Xledsetnormalparstuff{##1}%
\rule\z@\splittopskip%
@@ -2953,7 +2966,7 @@
\newcommand*{\parafootstart}[1]{%
\rightskip=0pt \leftskip=0pt%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\ifdimequal{0pt}{\Xprenotes@}{}%
{%
\iftoggle{Xprenotes@}{%
@@ -2967,8 +2980,11 @@
\setXnoteswidthliketwocolumns@{#1}%
\setXnotespositionliketwocolumns@{#1}%
\print@Xfootnoterule{#1}%
+ \let\old@bidi@RTL@everypar\bidi@RTL@everypar%
\let\bidi@RTL@everypar\@empty%
- \noindent\leavevmode}
+ \noindent\leavevmode%
+ \let\bidi@RTL@everypar\old@bidi@RTL@everypar%
+}%
\newcommand*{\paravfootnote}[2]{%
\csuse{Xbeforeinserting@#1}%
\insert\csname #1footins\endcsname
@@ -3062,7 +3078,7 @@
\setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\unhbox0\par}}
\newcommand*{\makehboxofhboxes}{\setbox0=\hbox{}%
@@ -3156,6 +3172,7 @@
\prepare@Xgroupbyline{#1}{#2}{\threecolvfootnote@inserted}%
}%
{%
+ \let\bidi@RTL@everypar\relax%
\X@beforeinsertion{#1}%
\insert\csname #1footins\endcsname{%
\threecolvfootnote@inserted{#1}{#2}%
@@ -3185,7 +3202,7 @@
\nottoggle{Xgroupbyline@#1}%
{\hsize \csuse{Xhsizethreecol@#1}}%
{}%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\tolerance=5000%
\Xsethangindent{#1}%
\@tempdima=\parindent%
@@ -3253,6 +3270,7 @@
\iftoggle{Xgroupbyline@#1}{%
\prepare@Xgroupbyline{#1}{#2}{\twocolvfootnote@inserted}%
}{%
+ \let\bidi@RTL@everypar\relax%
\X@beforeinsertion{#1}%
\insert\csname #1footins\endcsname{%
\twocolvfootnote@inserted{#1}{#2}%
@@ -3279,8 +3297,10 @@
}%
\newcommand{\twocol@begin@insert}[1]{%
\normal@pars%
- \hsize \csuse{Xhsizetwocol@#1}%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \nottoggle{Xgroupbyline@#1}%
+ {\hsize \csuse{Xhsizetwocol@#1}}%
+ {}%
+ \Xsetparindent{#1}%
\tolerance=5000%
\Xsethangindent{#1}%
\@tempdima=\parindent%
@@ -3327,6 +3347,22 @@
\expandafter
\Xrigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}}
+\newcommand{\Xsetparindent}[1]{%
+ \nottoggle{Xparindent@#1}{%
+ \parindent=\z@%
+ }%
+ {%
+ \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}%
+ }%
+}%
+\newcommand{\setparindentX}[1]{%
+ \nottoggle{parindentX@#1}{%
+ \parindent=\z@%
+ }%
+ {%
+ \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}%
+ }%
+}%
\newcommand{\Xsethangindent}[1]{%
\if@RTL%
\hangindent=-\csuse{Xhangindent@#1}%
@@ -3637,6 +3673,31 @@
\fi%
\fi%
}{}%
+ \iftoggle{Xlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ and test{\ifcsequal{annot@end}{prevannot@end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot@start@print{%
+ \l@wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot@end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l@d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot@start@\@currentseries}{\annot@start}%
+ \global\cslet{prevannot@end@\@currentseries}{\annot@end}%
+ }%
+ {}%
}%
\newif\ifistwofollowinglines@%
\newcommand{\setistwofollowinglines}[4]{%
@@ -3659,10 +3720,6 @@
}%
\def\printlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup%
- \ifluatex%
- \edef\@tmp{\the\textdir}%
- \ifdefstring{\@tmp}{TLT}{}{\textdir TLT}%Test in order to prevent spurious space (bug #397)
- \fi%
\setprintlines{#1}{#2}{#3}{#4}{#5}{#6}%
\ifdimequal{\csuse{Xboxstartlinenum@\@currentseries}}{0pt}%
{\bgroup}%
@@ -3958,7 +4015,6 @@
\ifluatex%
\textdir\footnote@luatextextdir%
\pardir\footnote@luatexpardir%
- \par%
\fi%
\protected@edef\@currentlabel{%
\@nameuse{@thefnmark#1}%
@@ -4159,6 +4215,7 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{%
\beforeinsertion@X{#1}%
+ \let\bidi@RTL@everypar\relax%
\insert\csname footins#1\endcsname\bgroup%
\hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
\noindent\csuse{bhooknoteX@#1}%
@@ -4174,7 +4231,7 @@
\normal@pars%
\sethangindentX{#1}%
\hsize \csuse{hsizetwocolX@#1}%
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\tolerance=5000\relax%
\par%
\@tempdima=\parindent%
@@ -4243,6 +4300,7 @@
\multiply\dimen\csname mpfootins#1\endcsname by \thr@@}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{%
+ \let\bidi@RTL@everypar\relax%
\beforeinsertion@X{#1}%
\insert\csname footins#1\endcsname\bgroup%
\hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
@@ -4258,7 +4316,7 @@
\sethangindentX{#1}%
\normal@pars%
\hsize \csuse{hsizethreecolX@#1}%
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\tolerance=5000\relax%
\@tempdima=\parindent%
\csuse{colalignX@#1}%
@@ -4344,7 +4402,7 @@
}%
\leftskip=\z@
\rightskip=\z@
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\vskip\skip\@nameuse{footins#1}%
\setnoteswidthliketwocolumnsX@{#1}%
\setnotesXpositionliketwocolumns@{#1}%
@@ -4449,7 +4507,7 @@
\setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{bhookgroupX@#1}%
\csuse{notefontsizeX@#1}%
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\unhbox0\par}}
\newcommand{\insertparafootsepX}[1]{%
@@ -4505,12 +4563,14 @@
\newcommand*{\Xledsetnormalparstuff}[1]{%
\ledsetnormalparstuff@common%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{\hspace{\parindent}}%
+ \Xsetparindent{#1}%
+ \iftoggle{Xparindent@#1}{\hspace{\parindent}}{}%
}%
\newcommand*{\ledsetnormalparstuffX}[1]{%
\ledsetnormalparstuff@common%
- \nottoggle{parindentX@#1}{\parindent=\z@}{\hspace{\parindent}}%
+ \setparindentX{#1}%
+ \iftoggle{parindentX@#1}{\hspace{\parindent}}{}%
}%
\newdimen\old@hsize%
@@ -4658,9 +4718,15 @@
\csuse{Xendbhooknote@#4}%
\csuse{Xendnotefontsize@#4}%
\hangindent=\csuse{Xendhangindent@#4}%
+ \Xendstorelineinfo{#1}{#4}%
\ifXendinsertsep@%
\hskip\csuse{Xendafternote@#4}\relax%
- \csuse{Xendsep@#4}%
+ \ifcsdef{prevendline#4}%
+ {\ifcsequal{prevendline#4}{lineinfo@}%
+ {\ifcsempty{Xendsymlinenum@#4}{\csuse{Xendsep@#4}}{}}%
+ {\csuse{Xendsep@#4}}%
+ }%
+ {\csuse{Xendsep@#4}}%
\else%
\iftoggle{Xendparagraph@#4}%
{\global\Xendinsertsep@true}%
@@ -4704,14 +4770,16 @@
\let\l@d@section=\@gobble
-\newcommand{\printlineendnote}[2]{%
+\newcommand{\Xendstorelineinfo}[2]{%
\l@dp@rsefootspec#1|%
\iftoggle{Xendnumberonlyfirstintwolines@#2}{%
- \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}%
- }%
- {%
- \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}%
- }%
+ \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}%
+ }%
+ {%
+ \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}%
+ }%
+}%
+\newcommand{\printlineendnote}[2]{%
\ifboolexpr{%
togl {nonum@}%
or togl {Xendnonumber@#2}%
@@ -4927,6 +4995,31 @@
\fi%
\fi%
}{}%
+ \iftoggle{Xendlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ and test{\ifcsequal{annot@end}{prevannot@end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot@start@print{%
+ \l@wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot@end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l@d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot@start@\@currentseries}{\annot@start}%
+ \global\cslet{prevannot@end@\@currentseries}{\annot@end}%
+ }%
+ {}%
}%
\def\printendlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup
@@ -5096,10 +5189,15 @@
\csgdef{Xboxendlinenum@#1}{0pt}%
\csgdef{Xboxsymlinenum@#1}{0pt}%
- \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xgroupbyline@#1}%
\newtoggle{Xgroupbylineseparetwolines@#1}%
+
+ \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xnumberonlyfirstintwolines@#1}%
+
+ \newtoggle{Xlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xtwolines@#1}{}%
\csgdef{Xmorethantwolines@#1}{}%
\csgdef{Xsublinesep@#1}{\fullstop}%
@@ -5111,7 +5209,10 @@
\newtoggle{Xpstart@#1}%
\newtoggle{Xstanza@#1}%
\csgdef{Xstanzaseparator@#1}{}%
+
\csgdef{Xsymlinenum@#1}{}%
+ \csgdef{Xsymlinenumannotation@#1}{}%
+
\newtoggle{Xnonumber@#1}%
\csgdef{Xbeforenumber@#1}{0pt}%
\csgdef{Xtxtbeforenumber@#1}{}%
@@ -5170,7 +5271,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl@notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote@true%
\noexpand\prepare@Xprenotes{#1}%
@@ -5207,7 +5308,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl@notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote@true%
\noexpand\prepare@Xprenotes{#1}%
@@ -5327,18 +5428,22 @@
\expandafter\newcount\csname prevpage#1@num\endcsname%
\expandafter\newcount\csname prevpage#1@numR\endcsname%
\expandafter\gappto\expandafter\no@expands\expandafter{\expandafter\let\csname footnote#1\endcsname\@gobble}%
- \expandafter\newcommand\csname footnote#1mark\endcsname{%
+ \expandafter\newcommand\csname footnote#1mark\endcsname[1][]{%
\begingroup%
\prepare@prenotesX{#1}%
- \stepcounter{footnote#1}%
+ \ifstrempty{##1}{%
+ \stepcounter{footnote#1}%
+ }{%
+ \setcounter{footnote#1}{##1}%
+ }%
\protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
\csuse{@footnotemark#1}%
\m@mmf@prepare%
\endgroup%
}%
- \expandafter\newcommand\csname footnote#1text\endcsname[1]{%
+ \expandafter\newcommand\csname footnote#1text\endcsname[2][]{%
\begingroup%
- \csuse{vfootnote#1}{#1}{\expandonce{##1}}%
+ \csuse{vfootnote#1}{#1}{\expandonce{##2}}{##1}%
\endgroup%
}%
\arrangementX@normal{#1}%
@@ -5418,12 +5523,19 @@
\newtoggle{Xendnonumber@#1}%
\csgdef{Xendhangindent@#1}{0pt}%
+
\newtoggle{Xendnumberonlyfirstinline@#1}%
\newtoggle{Xendnumberonlyfirstintwolines@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xendbeforesymlinenum@#1}{\csuse{Xendbeforenumber@#1}}%
\csgdef{Xendaftersymlinenum@#1}{\csuse{Xendafternumber@#1}}%
+
\csgdef{Xendsymlinenum@#1}{}%
+ \csgdef{Xendsymlinenumannotation@#1}{}%
+
\csgdef{Xendboxsymlinenum@#1}{0pt}%
\csgdef{Xendbhooklinenumber@#1}{}%
@@ -5576,6 +5688,7 @@
\newhookcommand@series@reload{Xbhookgroup}{critical}
\newhookcommand@series{Xboxsymlinenum}%
\newhookcommand@series{Xsymlinenum}
+ \newhookcommand@series{Xsymlinenumannotation}%
\newhookcommand@series{Xbeforenumber}
\newhookcommand@series{Xtxtbeforenumber}
\newhookcommand@series{Xafternumber}
@@ -5591,6 +5704,8 @@
\newhookcommand@series@reload{Xafterrule}{critical}
\newhooktoggle@series{Xnumberonlyfirstinline}
\newhooktoggle@series{Xnumberonlyfirstintwolines}
+ \newhooktoggle@series{Xlinenumannotationonlyfirst}%
+ \newhooktoggle@series{Xlinenumannotationonlyfirstintwo}%
\newhooktoggle@series{Xgroupbyline}%
\newhooktoggle@series{Xgroupbylineseparetwolines}%
\newhooktoggle@series{Xnonumber}
@@ -5702,11 +5817,16 @@
\newhooktoggle@series{Xendnumberonlyfirstinline}%
\newhooktoggle@series{Xendnumberonlyfirstintwolines}%
+ \newhooktoggle@series{Xendlinenumannotationonlyfirst}%
+ \newhooktoggle@series{Xendlinenumannotationonlyfirstintwo}%
+
\newhookcommand@series{Xendsymlinenum}%
\newhookcommand@series{Xendbeforesymlinenum}%
\newhookcommand@series{Xendaftersymlinenum}%
\newhookcommand@series{Xendboxsymlinenum}%
+ \newhookcommand@series{Xendsymlinenumannotation}%
+
\newhookcommand@series{Xendbhooklinenumber}%
\newhookcommand@series{Xendahooklinenumber}%
\newhookcommand@series{Xendbhookinplaceofnumber}%
@@ -6358,6 +6478,9 @@
\newtoggle{Xlineflag@SEref}%
\toggletrue{Xlineflag@SEref}%%Here exception
+\newtoggle{Xlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintlines
+\newtoggle{Xlinenumannotationonlyfirst@appref}%Idem
+
\def\Xlinenumannotationposition@appref{after}%
\def\Xlinenumannotationposition@SEref{after}%
@@ -6403,6 +6526,9 @@
\newtoggle{Xendlineflag@SErefwithpage}
\toggletrue{Xendlineflag@SErefwithpage}%Here, exception
+\newtoggle{Xendlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintendlines
+\newtoggle{Xendlinenumannotationonlyfirst@appref}%Idem
+
\def\Xendlinenumannotationposition@apprefwithpage{after}%
\def\Xendlinenumannotationposition@apprefwithpage@SErefwithpage{after}%
@@ -7223,6 +7349,8 @@
{\led@error@fail@patch@makeindex}%
\newcommand{\edindex}[1]{\@bsphack\@esphack}
\newcommandx{\dummy@edindex}[2][1=\expandonce\jobname,usedefault]{}%
+\newcommand{\disable@edindex}{\let\old@edindex\edindex\let\edindex\dummy@edindex}%
+\newcommand{\restore@edindex}{\let\edindex\old@edindex}%
\newcommand{\hyperlinkformat}[3]{%
\ifstrempty{#1}%
{\hyperlink{#2}{#3}}%
@@ -7540,6 +7668,8 @@
\noexpand\instanzatrue\expandafter
\begingroup%
\catcode`\noexpand\&\active%
+ \unexpanded{\newdimen\parindent@beforestanza%
+ \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent
\global\stanza@count\@ne\stanza@modulo\@ne
\noexpand\ifnum\expandafter\noexpand
\csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax
@@ -7576,6 +7706,7 @@
{\before@every@stop@stanza\pend[#1][#2]}%
\endgroup%
\instanzafalse%
+ \global\undef\parindent@beforestanza%
}
\newcommand{\AtEveryStopStanza}[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/reledmac/reledpar.sty new/tex/latex/reledmac/reledpar.sty
--- old/tex/latex/reledmac/reledpar.sty 2019-01-22 23:19:50.000000000 +0100
+++ new/tex/latex/reledmac/reledpar.sty 2020-03-08 22:48:18.000000000 +0100
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2019/01/22 v2.22.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -146,7 +146,7 @@
Use instead #1R or #1* in your preamble.}%
}
\newcommand{\led@error@missing@numbering}[1]{%
- \reledpar@error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}%
+ \reledpar@error{Missing \string\pstart\space ...\space\string\pend\space inside `#1` environment}{\@ehc}%
}%
\providecommand*{\newnamebox}[1]{%
\expandafter\newbox\csname #1\endcsname}
@@ -768,13 +768,15 @@
}%
\newcommand*{\new@lineL}{%
+ \set@this@c@page%
\ifnumberline%
- \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}%
\fi%
}%
\newcommand*{\new@lineR}{%
+ \set@this@c@page%
\ifnumberline%
- \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}%
+ \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}%
\fi%
}%
@@ -904,6 +906,8 @@
\newif\ifinstanzaL
\newif\ifinstanzaR
+ \newif\ifinastanzaL%
+ \newif\ifinastanzaR%
\newenvironment{Leftside}{%
\expandafter\ifvoid\csname l@dLcolrawbox1\endcsname\else%
\led@err@Leftside@PreviousNotPrinted%
@@ -927,6 +931,8 @@
\newcommand*{\Rightsidehook}{}
\newcommand*{\Rightsidehookend}{}
+\newcommand*{\Rightpagehook}{}%
+\newcommand*{\Leftpagehook}{}%
\newenvironment{Rightside}{%
\expandafter\ifvoid\csname l@dRcolrawbox1\endcsname\else%
\led@err@Rightside@PreviousNotPrinted%
@@ -1308,6 +1314,7 @@
\l@drsn@te}}%
\def\print@eledsectionL{%%
+ \disable@edindex%
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
@@ -1333,6 +1340,7 @@
{\new@line \hbox{\l@dunhbox@line{\one@line}}}%
\fi%
\vskip\eledsection@correcting@skip%
+ \restore@edindex%
}
\newcommand{\add@apparatusL}{%
@@ -1451,6 +1459,7 @@
}
\def\print@eledsectionR{%
+ \disable@edindex%
\addtocounter{pstartR}{-1}%
\set@sectcountR%
\ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}%
@@ -1476,7 +1485,8 @@
\hspace{3\paperwidth}%
{\new@lineR \hbox{\l@dunhbox@line{\one@lineR}}}%
\fi%
- \vskip\eledsection@correcting@skip
+ \vskip\eledsection@correcting@skip%
+ \restore@edindex%
}
\newcommand{\add@apparatusR}{%
\if@firstlineofpageR%
@@ -2105,6 +2115,9 @@
\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
\@hangingsymbol%
\fi%
+ \ifinastanzaL%
+ \@hangingsymbol%
+ \fi%
\fi%
}%
\newcommand{\inserthangingsymbolR}{%
@@ -2114,6 +2127,9 @@
\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
\@hangingsymbol%
\fi%
+ \ifinastanzaR%
+ \@hangingsymbol%
+ \fi%
\fi%
}%
@@ -2121,8 +2137,15 @@
\catcode`\&=\active
\newenvironmentx{astanza}[2][1,2,usedefault]{%
+ \ifledRcol%
+ \global\inastanzaRtrue%
+ \else%
+ \global\inastanzaLtrue%
+ \fi%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
+ \newdimen\parindent@beforestanza%
+ \parindent@beforestanza=\parindent%Keep in memory the standard \parindent
\ifnum\usenamecount{sza@0@}=\z@
\let\stanza@hang\relax
\let\endlock\relax
@@ -2146,7 +2169,9 @@
{\pstart[#1][#2]\at@start@every@stanza}%
\@astanza@line
\let\par\relax\ignorespaces%No paragraph in verses
-}{}
+}{%
+ \global\undef\parindent@beforestanza%
+}%
\newcommandx{\@stopastanza}[2][1,2,usedefault]{%
\endlock\mbox{}%
@@ -2221,6 +2246,9 @@
}
{ \let\old@otherlanguage\otherlanguage%
\renewcommand{\otherlanguage}[2][]{%
+ \ifdefined\xpg@set@group@aux%
+ \xpg@set@group@aux%
+ \fi%
\selectlanguage[#1]{#2}%
\ifledRcol \gdef\theledlanguageR{#2}%
\else \gdef\theledlanguageL{#2}%
@@ -2775,6 +2803,7 @@
\checkraw@text%
{ \loop\ifaraw@text%
\checkpageL%
+ \Leftpagehook%
\l@duselanguage{\theledlanguageL}%
{ \loop\ifl@dsamepage%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}%
@@ -2834,6 +2863,7 @@
\parledgroup@correction@notespacing@init%
\clearl@dleftpage }%
\checkpageR%
+ \Rightpagehook%
\l@duselanguage{\theledlanguageR}%
{ \loop\ifl@dsamepage%
\set@sectcountR%
@@ -2911,6 +2941,8 @@
\global\l@dnumpstartsR=\z@%
\global\instanzaLfalse%
\global\instanzaRfalse%
+ \global\inastanzaLfalse%
+ \global\inastanzaRfalse%
\global\l@dprintingpagesfalse%
\ifnum\edtext@later=\edtext@now%
\else%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/reledmac.tlpobj new/tlpkg/tlpobj/reledmac.tlpobj
--- old/tlpkg/tlpobj/reledmac.tlpobj 2019-04-04 01:24:51.000000000 +0200
+++ new/tlpkg/tlpobj/reledmac.tlpobj 2020-03-09 00:29:05.000000000 +0100
@@ -1,6 +1,6 @@
name reledmac
category Package
-revision 50740
+revision 54191
shortdesc Typeset scholarly editions
relocated 1
longdesc A package for typesetting scholarly critical editions,
@@ -9,7 +9,7 @@
longdesc package supports indexing by page and by line numbers, and
longdesc simple tabular- and array-style environments. The package is
longdesc distributed with the related reledpar package.
-runfiles size=93
+runfiles size=94
RELOC/tex/latex/reledmac/reledmac.sty
RELOC/tex/latex/reledmac/reledpar.sty
catalogue-also ednotes poemscol ledmac eledmac
@@ -17,7 +17,6 @@
catalogue-contact-repository https://github.com/maieul/ledmac/
catalogue-contact-support http://geekographie.maieul.net/146
catalogue-ctan /macros/latex/contrib/reledmac
-catalogue-date 2019-04-03 15:10:43 +0200
catalogue-license lppl1.3
catalogue-topics crit-ed
-catalogue-version 2.31.2
+catalogue-version 2.32.5
++++++ repere.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/repere/README.md new/doc/metapost/repere/README.md
--- old/doc/metapost/repere/README.md 2017-11-14 00:49:06.000000000 +0100
+++ new/doc/metapost/repere/README.md 2019-06-11 23:01:20.000000000 +0200
@@ -1,4 +1,4 @@
-Package repere - Version 17.11.2 - November 12, 2017
+Package repere - Version 19.06 - June 11, 2019
This package provides MetaPost macros for drawing secondary school mathematics figures in a coordinate system :
- axis, grids
Binary files old/doc/metapost/repere/repere-doc.pdf and new/doc/metapost/repere/repere-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/metapost/repere/repere-doc.tex new/doc/metapost/repere/repere-doc.tex
--- old/doc/metapost/repere/repere-doc.tex 2017-11-14 00:49:06.000000000 +0100
+++ new/doc/metapost/repere/repere-doc.tex 2019-06-11 23:01:20.000000000 +0200
@@ -3,10 +3,10 @@
%http://melusine.eu.org/syracuse/poulecl/geometriesyr16/distrib/geometriesyr16-050408.tgz
% To compile:
-% (pdf)latex repere-doc.tex
-% mpost repere-doc.mp
-% mpost repere-doc.mp
-% (pdf)latex repere-doc.tex
+% pdflatex repere-doc.tex
+% mptopdf repere-doc.mp
+% mptopdf repere-doc.mp
+% pdflatex repere-doc.tex
\usepackage{calc,ifthen}
@@ -149,6 +149,7 @@
\IfFileExists{\jobname.\thenumfig}%
{\begin{minipage}[c]{\largeurfig}
\centering \includegraphics{\jobname.\thenumfig}\par
+% \centering a\includegraphics{reperedocfig2.mps}a\par
\end{minipage}}{}
\par}
@@ -239,6 +240,7 @@
\begin{codecache}
+%outputtemplate := "%j-%c.mps";
input geometriesyr16;
input repere;
\end{codecache}
@@ -592,7 +594,7 @@
\item[pointe(A,B,C...)] permet de marquer plusieurs points.
-\item[nomme.pos(A,nom)] marque le point et affiche son nom à la position \verb+pos+. \verb+nom+ peut être soit une chaîne de caractères, soit une expression du type \verb+btex ... etex+, soit une autre figure. Si \verb+nom+ est omis, le nom \verb+A+ est affiché. S'il s'agit d'un élément d'un tableau de points (\verb+A1+, \verb+A2+...), le nombre est affiché en indice.
+\item[nomme.pos(A,nom)] marque le point et affiche son nom à la position \verb+pos+ (qui peut être \verb|rt|, \verb|urt|, \verb|top|, \verb|ulft|...). \verb+nom+ peut être soit une chaîne de caractères, soit une expression du type \verb+btex ... etex+, soit une autre figure. Si \verb+nom+ est omis, le nom \verb+A+ est affiché. S'il s'agit d'un élément d'un tableau de points (\verb+A1+, \verb+A2+...), le nombre est affiché en indice.
\end{description}
@@ -618,7 +620,23 @@
fin;
\end{exemple}
+\begin{description}
+\item[nomme{[a]}(A,nom)] Il est possible d'obtenir un placement plus fin des étiquettes en remplaçant la position au sens de \MP{} (\verb|rt|, \verb|urt|...) par un nombre qui représente alors la position de l'étiquette par rapport au point en degrés.
+\end{description}
+\begin{exemple}[0.55]
+repere(-3,3.5,1cm,-3,3,1cm);
+ pair A,B,C[];
+ A=(-2,-1);B=(1,-2);
+ nomme[40](A);nomme[70](A);nomme[100](A);
+ nomme[-110](B);
+ for i=0 upto 8:
+ C[i]:= (1+1.5*cosd(40i),1+1.5*sind(40i));
+ nomme[40*i](C[i]) couleur pourpre;
+ endfor
+draw cadre;
+fin;
+\end{exemple}
\subsection{Vecteurs}
@@ -680,6 +698,28 @@
fin;
\end{exemple}
+\subsection{Demi-droites}
+\begin{description}
+\item[demidroite(A,B)] demi-droite $[AB)$.
+
+\item[demidroite(A,a)] demi-droite d'origine $A$ qui fait un angle $a$ avec la direction $(Ox)$.
+\end{description}
+
+
+\begin{exemple}
+repere(-4,4,0.9cm,-3,4,0.9cm);
+pair A,B,C;
+numeric a;
+A=(-1,1);B=(2,2);C=(-1,-2);
+draw axes(1,0);
+draw demidroite(A,B);
+nomme.llft(A);nomme.lrt(B);
+draw demidroite(C,0) dashed evenly;
+draw demidroite(C,120);
+nomme.llft(C);
+fin;
+\end{exemple}
+
\subsection{Courbes et fonctions}
\MP{} permet de définir simplement des fonctions (en utilisant par exemple la syntaxe suivante :
\verb|vardef f(expr x)=2x+1 enddef;|) et de définir des courbes passant par des points donnés (\verb+A..B..C+). Ces possibilités sont utilisées dans les macros qui suivent.
@@ -973,6 +1013,30 @@
fin;
\end{exemple}
+\begin{description}
+\item[spline(A,<y'A>,B,<y'B>,C,<y'C>...)()] Courbe passant par les points $A$, $B$, $C$ représentant une fonction cubique par morceaux telle que $f(x_A)=y_A$, $f(x_B)=y_B$... et, le cas échéant, $f'(x_A)=y'_A$, $f'(x_B)=y'_B$... sur l'intervalle définissant le repère.
+\item[spline(A,<y'A>,B,<y'B>,C,<y'C>...)(xmin,xmax)] Même courbe que précédemment mais sur l'intervalle $[xmin;xmax]$.
+\end{description}
+
+\begin{exemple}[0.55]
+repere.orth(-1,10,7cm,-1,10);
+pair A,B,C,D;
+A=(0,1);B=(3,7);C=(6,2);D=(9,6);
+path S,T;
+S=spline(A,B,C,D)();
+T=spline(A,0.5,B,C,0,D,-2)();
+draw quadrillage(1,1);
+draw axes(1,1);
+draw S epaisseur 1 couleur bleu;
+draw T epaisseur 1 couleur rouge;
+draw tangente.double(T,0) couleur rouge;
+draw tangente.double(T,6) couleur rouge;
+draw tangente.double(T,9) couleur rouge;
+nomme.lrt(A);nomme.top(B);
+nomme.llft(C);nomme.rt(D);
+fin;
+\end{exemple}
+
\section{Suites}
\begin{description}
@@ -1442,13 +1506,19 @@
\subsection{Codage des segments et des angles}
\begin{description}
-\item[marqueangle(A,O,B,n)] Figure formée de \verb|n| arcs de cercle de centre $O$ et de rayon moyen \verb|taille_marque_a| (qui vaut par défaut \verb|0.4cm|) permettant de marquer l'angle géométrique $\widehat{AOB}$. Les arcs son séparés de \verb|sep_marque_a| qui vaut par défaut \verb|1.5|.
+\item[taille\_marque\_a] Valeur numérique (qui vaut par défaut \verb|0.4cm|) donnant le rayon des arcs de cercles servant à marquer les angles.
+
+\item[sep\_marque\_a] Valeur numérique (qui vaut par défaut \verb|1.5bp|) donnant la différence de rayon entre les différents arcs servant à marquer les angles.
+
+\item[marqueangle(A,O,B,n)] Figure formée de \verb|n| arcs de cercle de centre $O$ et de rayon moyen \verb|taille_marque_a| permettant de marquer l'angle géométrique $\widehat{AOB}$. Les arcs (si \verb|n| est supérieur à 1) sont séparés de \verb|sep_marque_a|.
Il s'agit d'un chemin fermé qui peut donc être rempli.
\item[marqueangle(A,O,B)] Arc de cercle de centre \verb|O| et de rayon \verb|taille_marque_a| permettant de marquer l'angle orienté avec \verb|drawarrow|.
-\item[nomme.pos(A,O,B,texte)] Place le texte entre \verb|A| et \verb|B|, à une distance \verb|taille_marque_a| du centre, à la position \verb|pos|.
+\item[nomme.pos(A,O,B,texte)] Place le texte à la position \verb|pos| par rapport au point central de l'arc de cercle de centre $O$ et de rayon \verb|taille_marque_a|. \verb|pos| peut être \verb|rt|, \verb|urt|, \verb|top|, etc. ou un angle donné par rapport à la direction $(Ox)$.
+
+\item[nomme(A,O,B,texte)] Même chose que précédemment mais la position est calculée automatiquement en fonction de l'angle.
\end{description}
@@ -1464,7 +1534,8 @@
drawarrow marqueangle(A,C,B);
fill marqueangle(B,A,C,1) withcolor vert;
draw marqueangle(B,A,C,1);
-nomme.rt(B,A,C,"\ang{45}");
+nomme[20](B,A,C,"\ang{45}");
+nomme(C,B,A,"$\alpha$");
fin;
\end{exemple}
@@ -1491,7 +1562,7 @@
drawoptions(withcolor vertfonce);
draw vecteur.lrt(B,u);draw vecteur.lrt(C,u);
fin;
-\end{exemple}%
+\end{exemple}
\section{Divers}
\subsection{Composition des étiquettes}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/repere.doc.tlpobj new/tlpkg/tlpobj/repere.doc.tlpobj
--- old/tlpkg/tlpobj/repere.doc.tlpobj 2019-02-28 04:04:18.000000000 +0100
+++ new/tlpkg/tlpobj/repere.doc.tlpobj 2019-06-12 01:38:45.000000000 +0200
@@ -1,9 +1,9 @@
name repere.doc
category Package
-revision 45779
+revision 51363
shortdesc doc files of repere
relocated 1
-docfiles size=129
+docfiles size=135
RELOC/doc/metapost/repere/README.md
RELOC/doc/metapost/repere/repere-doc.pdf
RELOC/doc/metapost/repere/repere-doc.tex
++++++ repere.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metapost/repere/repere.mp new/metapost/repere/repere.mp
--- old/metapost/repere/repere.mp 2017-11-14 00:49:06.000000000 +0100
+++ new/metapost/repere/repere.mp 2019-06-11 23:01:20.000000000 +0200
@@ -2,7 +2,7 @@
%% repere.mp %%
%% Macros pour la construction de figures dans un repère %%
%% o.peault(a)posteo.net %%
-%% Version 17.11.2 (Novembre 2017) %%
+%% Version 19.06 (Juin 2019) %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% This work may be distributed and/or modified under the conditions of
@@ -12,6 +12,10 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Mars 2019 : changement spline
+% Juin 2019 : demi-droites, nomme[<angle>]
+% À faire : extratextx, extratexty
+
input format;
if not known mplib: input latexmp fi;
@@ -965,21 +969,50 @@
for p_ = t: if pair p_: MarquePoint(p_); fi endfor;
enddef;
+% Juin 2019 : placement fin des étiquettes (angle donné)
+vardef thelabelang@#(expr s,z)=
+ save tmpang,tmpfig,tmppt,tmppath,tmpstr;
+ string tmpstr;
+ numeric tmpang;
+ pair tmppt;
+ path tmppath;
+ save p; picture p;
+ tmpstr := str @#;
+ if picture s: p=s
+ else: p = LaTeX(s)
+ fi;
+ tmppath := llcorner p -- lrcorner p -- urcorner p -- ulcorner p -- cycle;
+ if ASCII tmpstr = 91:
+ tmpang := scantokens substring(1,length(tmpstr)-1) of tmpstr
+ else:
+ tmpang := scantokens tmpstr
+ fi;
+ tmppt := tmppath intersectionpoint (0.5urcorner p-- (0.5urcorner p + 100 * (dir (180+tmpang))));
+ p shifted (-tmppt + _cart(z) + labeloffset*(cosd(tmpang),sind(tmpang)) )
+enddef;
+
+def labelang = draw thelabelang enddef;
+
vardef nommepoint@#(text t)=
save $,ch,dess,latch;
pair $;
string ch,latch;
picture dess;
+ if (ASCII str @# < 58) or (ASCII str @# = 91):
+ def mylabel = labelang enddef
+ else:
+ def mylabel = label enddef
+ fi;
if long_texte(t)=1:
dess:=image(draw MarquePointFig(t);
ch:=_chaine(t);
- label@#("$" & ch & "$",t) withcolor coullabel)
+ mylabel@#("$" & ch & "$",t) withcolor coullabel)
else:
dess:=image(%
for PP=t:
if pair PP: MarquePoint(PP); $:=PP
- else: if string PP: label@#(PP,$) else: label@#(PP scaled defaultscale,$) fi withcolor coullabel
+ else: if string PP: mylabel@#(PP,$) else: mylabel@#(PP scaled defaultscale,$) fi withcolor coullabel
fi;
endfor)
fi;
@@ -987,6 +1020,8 @@
enddef;
+
+
vardef nommecourbe@#(suffix p)(text t)=
save A,ch,dess;
pair A;
@@ -1043,7 +1078,7 @@
elseif prefnomme="left": xpart A < xpart B
elseif prefnomme="top": ypart A > ypart B
elseif prefnomme="bottom": ypart A < ypart B
- elseif hide(errmessage "string 'prefnomme' should be set to left, right, top or bottom")
+ else: hide(errmessage "string 'prefnomme' should be set to left, right, top or bottom")
fi
enddef;
@@ -1053,6 +1088,7 @@
pair Pt,P[];
numeric nbint,pp,T[];
intercourbestimes(T)(cadre,p);
+ show T[1];
Pt:=_O;pp:=0;
if known T[1]:
Pt:= point T[1] of p;
@@ -1103,22 +1139,39 @@
nommeautoobjtex(p,"$" & _chaine(p) & "$")
enddef;
+vardef estcadree primary f =
+ show llcorner f; show llcorner cadre transformed _T;
+ show urcorner f; show urcorner cadre;
+ (xpart urcorner f <= xpart urcorner (cadre transformed _T))
+ and (ypart urcorner f <= ypart urcorner (cadre transformed _T))
+ and (xpart llcorner f >= xpart llcorner (cadre transformed _T))
+ and (ypart llcorner f >= ypart llcorner (cadre transformed _T))
+enddef;
+
% Avec label donné
vardef nommeautoobjtex(expr p,leg)=
- save ptA,pos,ttmp;
+ save ptA,pos,ttmp,tmpfig;
pair ptA;
+ picture tmpfig;
numeric ttmp;
string pos;
ttmp:=pointnommetime(p);
ptA:= point ttmp of p;
pos:=position(ptA,ttmp,p);
- if string leg:
- scantokens("thelabel." & pos)(leg,ptA)
- else:
- scantokens("thelabel." & pos)(leg scaled defaultscale,ptA)
- fi
+ for i=0 upto 120:
+ tmpfig :=
+ if string leg:
+ scantokens("thelabel." & pos)(leg,ptA)
+ else:
+ scantokens("thelabel." & pos)(leg scaled defaultscale,ptA)
+ fi;
+ exitif estcadree tmpfig;
+ ptA := point (ttmp + ((-1)**(i+1))*round((i+1)/2)*length(p)/60) of p;
+ endfor
+ tmpfig
enddef;
+
vardef nommeautoobj(text t)=
if long_texte(t)=1: nommeautoobjsuf(t)
else: nommeautoobjtex(t)
@@ -1420,6 +1473,7 @@
pp:=subpath(xpart(pp intersectiontimes q)+0.01,length pp) of pp;
%0.01(?!) pour que le point trouvé ne soit pas dans le sous-chemin...
i:=i+1;
+ exitif i=10;
endfor;
enddef;
@@ -1620,28 +1674,67 @@
enddef;
-% Novembre 2017
+%% Novembre 2017
+%vardef deriveesplinecubique(suffix k)(suffix xs,ys)(expr n)=
+%% renvoie les dérivées pour interpolation avec splines cubiques
+%% source : https://en.wikipedia.org/wiki/Spline_interpolation
+%% xs[] et ys[] sont des listes, n est le nombre de valeurs
+%% Renvoie les dérivées dans la liste k[]
+% (2k[0] + k[1])/(xs[1] - xs[0]) = 3(ys[1]-ys[0])/((xs[1]-xs[0])**2);
+% for i=1 upto n-1:
+% k[i-1]/(xs[i] - xs[i-1]) + 2k[i]/(xs[i] - xs[i-1]) + 2k[i]/(xs[i+1] - xs[i]) + k[i+1]/(xs[i+1] - xs[i]) = 3(ys[i] - ys[i-1])/((xs[i]-xs[i-1])**2) + 3(ys[i+1] - ys[i])/((xs[i+1]-xs[i])**2);
+% endfor
+% (k[n-1] + 2k[n])/(xs[n]-xs[n-1]) = 3(ys[n]-ys[n-1])/((xs[n]-xs[n-1])**2);
+%enddef;
+
+%Mars 2019
vardef deriveesplinecubique(suffix k)(suffix xs,ys)(expr n)=
% renvoie les dérivées pour interpolation avec splines cubiques
% source : https://en.wikipedia.org/wiki/Spline_interpolation
% xs[] et ys[] sont des listes, n est le nombre de valeurs
% Renvoie les dérivées dans la liste k[]
- (2k[0] + k[1])/(xs[1] - xs[0]) = 3(ys[1]-ys[0])/((xs[1]-xs[0])**2);
+ if not derex[0]:
+ (2k[0] + k[1])/(xs[1] - xs[0]) = 3(ys[1]-ys[0])/((xs[1]-xs[0])**2)
+ fi;
for i=1 upto n-1:
- k[i-1]/(xs[i] - xs[i-1]) + 2k[i]/(xs[i] - xs[i-1]) + 2k[i]/(xs[i+1] - xs[i]) + k[i+1]/(xs[i+1] - xs[i]) = 3(ys[i] - ys[i-1])/((xs[i]-xs[i-1])**2) + 3(ys[i+1] - ys[i])/((xs[i+1]-xs[i])**2);
+ if not derex[i]:
+ k[i-1]/(xs[i] - xs[i-1]) + 2k[i]/(xs[i] - xs[i-1]) + 2k[i]/(xs[i+1] - xs[i]) + k[i+1]/(xs[i+1] - xs[i]) = 3(ys[i] - ys[i-1])/((xs[i]-xs[i-1])**2) + 3(ys[i+1] - ys[i])/((xs[i+1]-xs[i])**2)
+ fi;
endfor
- (k[n-1] + 2k[n])/(xs[n]-xs[n-1]) = 3(ys[n]-ys[n-1])/((xs[n]-xs[n-1])**2);
+ if not derex[n]:
+ (k[n-1] + 2k[n])/(xs[n]-xs[n-1]) = 3(ys[n]-ys[n-1])/((xs[n]-xs[n-1])**2)
+ fi;
enddef;
-% Novembre 2017
+%% Novembre 2017
+%vardef splineinterpolfonct_pt(text t)(expr x)=
+%% t est la liste des points A,B,C...
+% save xa,ya,dd,n;
+% numeric xa[],ya[],dd[],n;
+% n:=-1;
+% for i=t:
+% n := n + 1;
+% xa[n] := xpart i; ya[n] := ypart i;
+% endfor
+% deriveesplinecubique(dd)(xa,ya)(n);
+% splinederfonct((xa[0],ya[0],dd[0]) for ii=1 upto n: , (xa[ii],ya[ii],dd[ii]) endfor)(x)
+%enddef;
+
+% Mars 2019
vardef splineinterpolfonct_pt(text t)(expr x)=
-% t est la liste des points A,B,C...
- save xa,ya,dd,n;
+% t est la liste A,[y'1,]B,[y'2,]C,[y'3,]...
+ save xa,ya,dd,n,derex;
numeric xa[],ya[],dd[],n;
+ boolean derex[];
n:=-1;
for i=t:
- n := n + 1;
- xa[n] := xpart i; ya[n] := ypart i;
+ if numeric i:
+ dd[n]:=i;derex[n]:=true;
+ else:
+ n := n + 1;
+ derex[n]:=false;
+ xa[n] := xpart i; ya[n] := ypart i
+ fi;
endfor
deriveesplinecubique(dd)(xa,ya)(n);
splinederfonct((xa[0],ya[0],dd[0]) for ii=1 upto n: , (xa[ii],ya[ii],dd[ii]) endfor)(x)
@@ -1827,6 +1920,31 @@
enddef;
+% demi-droites juin 2019
+vardef demidroitept(expr A,B)=
+ A--(_diag/abs(A-B))[A,B]
+enddef;
+
+vardef demidroiteangle(expr A,alpha)=
+ demidroitept(A,A + dir alpha)
+enddef;
+
+vardef demidroite(text t)=
+ save reptmp,repbool;
+ path reptmp;
+ boolean repbool;
+ repbool:=false;
+ for i=t:
+ if numeric i: repbool := true fi;
+ endfor
+ if repbool:
+ reptmp := demidroiteangle(t)
+ else:
+ reptmp := demidroitept(t)
+ fi;
+ reptmp
+enddef;
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%% DEMI-PLANS %%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2420,15 +2538,18 @@
vardef nommeangle@#(expr A,O,B,p)=
save P,a;pair P;path a;
+ save marque_p; string marque_p;
+ marque_p:="";
a:=arc_marqueangle(A,O,B,taille_marque_a);
P:= point (arctime 0.5*arclength a of a) of a;
- if string p: thelabel@#(p,P)
- else: thelabel@#(p scaled defaultscale,P)
+ if str @# = "":
+ nommepoint[angle (P-O)](P,p)
+ else:
+ nommepoint@#(P,p)
fi
enddef;
-
taille_marque_ad:=0.3cm;
vardef marqueangledroit(expr A,O,B)=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/repere.tlpobj new/tlpkg/tlpobj/repere.tlpobj
--- old/tlpkg/tlpobj/repere.tlpobj 2019-02-28 04:04:18.000000000 +0100
+++ new/tlpkg/tlpobj/repere.tlpobj 2019-06-12 01:38:45.000000000 +0200
@@ -1,6 +1,6 @@
name repere
category Package
-revision 45779
+revision 51363
shortdesc Diagrams for school mathematics
relocated 1
longdesc This package provides MetaPost macros for drawing secondary
@@ -8,10 +8,10 @@
longdesc points, vectors functions (curves, tangents, integrals,
longdesc sequences) statistic diagrams plane geometry (polygons,
longdesc circles)
-runfiles size=18
+runfiles size=19
RELOC/metapost/repere/repere.mp
catalogue-ctan /graphics/metapost/contrib/macros/repere
-catalogue-date 2017-11-12 22:58:02 +0100
+catalogue-date 2019-06-11 19:31:47 +0200
catalogue-license lppl1.3
catalogue-topics teaching
-catalogue-version 17.11.2
+catalogue-version 19.06
++++++ resphilosophica.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/README new/doc/latex/resphilosophica/README
--- old/doc/latex/resphilosophica/README 2019-03-15 22:16:18.000000000 +0100
+++ new/doc/latex/resphilosophica/README 2019-05-03 00:35:22.000000000 +0200
@@ -7,6 +7,8 @@
Changes
+ version 1.35 Changed margins
+
version 1.34 Deleted thin space before : in authors' addresses and
e-mails
Binary files old/doc/latex/resphilosophica/resphilosophica.pdf and new/doc/latex/resphilosophica/resphilosophica.pdf differ
Binary files old/doc/latex/resphilosophica/rpsample.pdf and new/doc/latex/resphilosophica/rpsample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/resphilosophica/rpsample.tex new/doc/latex/resphilosophica/rpsample.tex
--- old/doc/latex/resphilosophica/rpsample.tex 2016-12-17 21:39:05.000000000 +0100
+++ new/doc/latex/resphilosophica/rpsample.tex 2019-05-03 00:35:22.000000000 +0200
@@ -1,8 +1,8 @@
-\documentclass[screen]{resphilosophica}
+%\documentclass[screen]{resphilosophica}
%\documentclass[manuscript]{resphilosophica}
%\documentclass[preprint]{resphilosophica}
%\documentclass[forthcoming]{resphilosophica}
-%\documentclass{resphilosophica}
+\documentclass{resphilosophica}
\usepackage{kantlipsum}
\title[A Sample Paper: A Template]{A Sample Paper:\\ \emph{A
Template}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resphilosophica.doc.tlpobj new/tlpkg/tlpobj/resphilosophica.doc.tlpobj
--- old/tlpkg/tlpobj/resphilosophica.doc.tlpobj 2019-03-16 02:24:42.000000000 +0100
+++ new/tlpkg/tlpobj/resphilosophica.doc.tlpobj 2019-05-03 01:40:30.000000000 +0200
@@ -1,6 +1,6 @@
name resphilosophica.doc
category Package
-revision 50402
+revision 50935
shortdesc doc files of resphilosophica
relocated 1
docfiles size=138
++++++ resphilosophica.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/resphilosophica/resphilosophica.cls new/tex/latex/resphilosophica/resphilosophica.cls
--- old/tex/latex/resphilosophica/resphilosophica.cls 2019-03-15 22:16:18.000000000 +0100
+++ new/tex/latex/resphilosophica/resphilosophica.cls 2019-05-03 00:35:22.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{resphilosophica}
-[2019/03/14 v1.34 Typesetting articles for Res Philosophica]
+[2019/04/14 v1.35 Typesetting articles for Res Philosophica]
\RequirePackage{xkeyval}
\newif\ifRESP@fontauto
\RESP@fontautotrue
@@ -107,15 +107,15 @@
\fi
\setlength{\textwidth}{318pt}
\setlength{\textheight}{540pt}
-\setlength{\evensidemargin}{-10pt}
-\setlength{\oddsidemargin}{-26pt}
+\setlength{\evensidemargin}{-0.125in}
+\setlength{\oddsidemargin}{-0.25in}
\ifRESP@screen
-\setlength{\evensidemargin}{-18pt}
-\setlength{\oddsidemargin}{-18pt}
+\setlength{\evensidemargin}{-0.1875in}
+\setlength{\oddsidemargin}{-0.1875in}
\fi
\ifRESP@forthcoming
-\setlength{\evensidemargin}{-18pt}
-\setlength{\oddsidemargin}{-18pt}
+\setlength{\evensidemargin}{-0.1875in}
+\setlength{\oddsidemargin}{-0.1875in}
\fi
\setlength{\topmargin}{-48pt}
\listisep\medskipamount
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resphilosophica.tlpobj new/tlpkg/tlpobj/resphilosophica.tlpobj
--- old/tlpkg/tlpobj/resphilosophica.tlpobj 2019-03-16 02:24:42.000000000 +0100
+++ new/tlpkg/tlpobj/resphilosophica.tlpobj 2019-05-03 01:40:30.000000000 +0200
@@ -1,6 +1,6 @@
name resphilosophica
category Package
-revision 50402
+revision 50935
shortdesc Typeset articles for the journal Res Philosophica
relocated 1
longdesc The bundle provides a class for typesetting articles for the
@@ -10,7 +10,7 @@
RELOC/bibtex/bst/resphilosophica/resphilosophica.bst
RELOC/tex/latex/resphilosophica/resphilosophica.cls
catalogue-ctan /macros/latex/contrib/resphilosophica
-catalogue-date 2019-03-15 08:43:01 +0100
+catalogue-date 2019-04-25 23:11:30 +0200
catalogue-license lppl1.3
catalogue-topics journalpub class
-catalogue-version 1.34
+catalogue-version 1.35
++++++ resumecls.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/Makefile new/doc/xelatex/resumecls/Makefile
--- old/doc/xelatex/resumecls/Makefile 2013-03-18 23:32:39.000000000 +0100
+++ new/doc/xelatex/resumecls/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-# +-----------------------------------------------------------------------------
-# | File: Makefile
-# | Author: huxuan
-# | E-mail: i(at)huxuan.org
-# | Created: 2012-12-18
-# | Last modified: 2013-03-17
-# | Description:
-# | Makefile for resumecls
-# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
-# +-----------------------------------------------------------------------------
-
-PACKAGE=resumecls
-
-.PHONY: all cls doc clean distclean
-
-all: doc
-
-# cls
-
-cls: $(PACKAGE).cls
-
-$(PACKAGE).cls: $(PACKAGE).ins $(PACKAGE).dtx
- latex $(PACKAGE).ins
-
-# doc
-
-doc: $(PACKAGE).pdf
-
-$(PACKAGE).pdf: $(PACKAGE).cls
- 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
-
-# clean & distclean
-
-clean:
- -@rm -f \
- *~ \
- *.aux \
- *.bbl \
- *.blg \
- *.dvi \
- *.glo \
- *.gls \
- *.idx \
- *.ilg \
- *.ind \
- *.log \
- *.out
-
-distclean: clean
- -@rm -f \
- *.cls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/README.md new/doc/xelatex/resumecls/README.md
--- old/doc/xelatex/resumecls/README.md 2015-06-16 23:21:16.000000000 +0200
+++ new/doc/xelatex/resumecls/README.md 2020-04-16 23:00:35.000000000 +0200
@@ -1,18 +1,27 @@
-# resumecls / [CTAN mirror](http://www.ctan.org/pkg/resumecls)
+# resumecls
-A LaTeX cls to typeset resume both in English and Chinese
+A LaTeX document class to typeset a resume or cv both in English and Chinese with more ease and flexibility.
-# Usage / How to get it
+## Installation
-- [`resumecls`](http://www.ctan.org/pkg/resumecls) has already been included in [CTAN](http://www.ctan.org/) Mirror.
-- To get the cls file you only need to update local CTAN Packages.
-- For how to use it you can refer to [`resumecls-example`](https://github.com/huxuan/resumecls-example) repo.
+Since [`resumecls`](http://www.ctan.org/pkg/resumecls) is included in the CTAN.
+You can install it by any package managers.
-## Manual Compile
+Take `tlgmr` as example,
-To get the cls file and document manually, you can make it either by Makefile or LaTeX command
+```shell
+tlmgr install resumecls
+```
+
+## Usage / Examples
+
+please refer to [`resumecls-example`](https://github.com/huxuan/resumecls-example).
+
+## Compile manually
+
+To get the document class file and document manually, you can compile via Makefile or LaTeX commands.
-### Compile by Makefile (Recommended if your os supported)
+### Compile by Makefile
#### Get resumecls.cls
```shell
@@ -24,19 +33,17 @@
make doc
```
-#### Clean
-Clean all generated files except for cls and pdf
+#### Clean intermediate generated files
```shell
make clean
```
-#### DistClean
-Clean all generated files
+#### Clean for distribution
```shell
make distclean
```
-### Compile by LaTeX command
+### Compile by LaTeX commands
#### Get resumecls.cls
```shell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/Makefile new/doc/xelatex/resumecls/example/Makefile
--- old/doc/xelatex/resumecls/example/Makefile 2015-06-16 23:21:16.000000000 +0200
+++ new/doc/xelatex/resumecls/example/Makefile 2020-04-16 23:00:35.000000000 +0200
@@ -3,17 +3,19 @@
# | Author: huxuan
# | E-mail: i(at)huxuan.org
# | Created: 2012-12-18
-# | Last modified: 2013-03-16
+# | Last modified: 2020-04-16
# | Description:
# | Makefile for resumecls examples
# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+# | Copyrgiht (c) 2012-2020 by huxuan. All rights reserved.
# +-----------------------------------------------------------------------------
-include config.mk
-
.PHONY: resume resume-zh resume-en clean depclean
+RESUME=resume
+RESUMEZH=resume-zh
+RESUMEEN=resume-en
+
# resume
resume: resume-zh resume-en
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/README.md new/doc/xelatex/resumecls/example/README.md
--- old/doc/xelatex/resumecls/example/README.md 2013-03-18 23:32:39.000000000 +0100
+++ new/doc/xelatex/resumecls/example/README.md 2020-04-16 23:00:35.000000000 +0200
@@ -1,19 +1,18 @@
# resumecls-example
-Examples to typeset resume in both Chinese and English by using resumecls
+Examples to typeset resume both in Chinese and English with resumecls.
## Preview
-- [resume-en.pdf](https://github.com/huxuan/resumecls-example/blob/master/resu…
-- [resume-zh.pdf](https://github.com/huxuan/resumecls-example/blob/master/resu…
+An online version for preview is available on [overleaf](https://www.overleaf.com/read/yrtmzwhtzwtz).
## Workflow
```shell
git clone git://github.com/huxuan/resumecls-example.git
cd resumecls-example
-# Modify resume-en.tex resume-en.tex resume.bib (bib is optional)
-# Compile via Makefile or LaTeX command (More info below)
+# Modify resume-en.tex resume-en.tex resume.bib (bib is optional).
+# Compile via Makefile or LaTeX command (More info below).
```
## Compile
@@ -37,6 +36,6 @@
Notes:
-- To get English version, replace <resume> with 'resume-en'
-- To get Chinese version, replace <resume> with 'resume-zh'
-- If no bib info is needed, the first two steps can be passed
+- To get the English version, replace `<resume>` with 'resume-en'.
+- To get the Chinese version, replace `<resume>` with 'resume-zh'.
+- If no bib info is needed, the first two steps can be skipped.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/config-sample.mk new/doc/xelatex/resumecls/example/config-sample.mk
--- old/doc/xelatex/resumecls/example/config-sample.mk 2013-03-18 23:32:39.000000000 +0100
+++ new/doc/xelatex/resumecls/example/config-sample.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-# +-----------------------------------------------------------------------------
-# | File: config
-# | Author: huxuan
-# | E-mail: i(at)huxuan.org
-# | Created: 2012-12-18
-# | Last modified: 2013-03-16
-# | Description:
-# | Configuration for Makefile
-# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
-# +-----------------------------------------------------------------------------
-
-RESUME=resume
-RESUMEZH=resume-zh
-RESUMEEN=resume-en
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/config.mk new/doc/xelatex/resumecls/example/config.mk
--- old/doc/xelatex/resumecls/example/config.mk 2013-03-18 23:32:39.000000000 +0100
+++ new/doc/xelatex/resumecls/example/config.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-# +-----------------------------------------------------------------------------
-# | File: config
-# | Author: huxuan
-# | E-mail: i(at)huxuan.org
-# | Created: 2012-12-18
-# | Last modified: 2013-03-11
-# | Description:
-# | Configuration for Makefile
-# |
-# | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
-# +-----------------------------------------------------------------------------
-
-RESUME=resume
-RESUMEZH=resume-zh
-RESUMEEN=resume-en
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/resume-common.tex new/doc/xelatex/resumecls/example/resume-common.tex
--- old/doc/xelatex/resumecls/example/resume-common.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/resumecls/example/resume-common.tex 2020-04-16 23:00:35.000000000 +0200
@@ -0,0 +1,15 @@
+% !Mode:: "TeX:UTF-8"
+% +-----------------------------------------------------------------------------
+% | File: resume-common.tex
+% | Author: huxuan
+% | E-mail: i(at)huxuan.org
+% | Created: 2020-04-16
+% | Last modified: 2020-04-16
+% | Description:
+% | Common information to typeset resume with resumecls
+% |
+% | Copyright (c) 2020-2020 by huxuan. All rights reserved.
+% +-----------------------------------------------------------------------------
+\mobile{+XX XXX XXXX XXXX}
+\mail{i(a)example.com}
+\homepage{http://example.com}
Binary files old/doc/xelatex/resumecls/example/resume-en.pdf and new/doc/xelatex/resumecls/example/resume-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/resume-en.tex new/doc/xelatex/resumecls/example/resume-en.tex
--- old/doc/xelatex/resumecls/example/resume-en.tex 2015-09-21 23:59:00.000000000 +0200
+++ new/doc/xelatex/resumecls/example/resume-en.tex 2020-04-16 23:00:35.000000000 +0200
@@ -4,99 +4,88 @@
% | Author: huxuan
% | E-mail: i(at)huxuan.org
% | Created: 2012-12-18
-% | Last modified: 2013-03-16
+% | Last modified: 2020-04-16
% | Description:
% | A English Resume Example in LaTeX based on resumecls
% |
-% | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+% | Copyright (c) 2012-2020 by huxuan. All rights reserved.
% +-----------------------------------------------------------------------------
\documentclass[color]{resumecls}
-\ctexset{today=old}
+\include{resume-common}
\name{Name}
-\organization{unit, school or organization}
-\address{address, zip code}
-\mobile{+1 XXX XXXX XXXX}
-\mail{i(a)example.com}
-\homepage{http://example.com}
+\organization{School or Organization}
+\address{Address, Zip Code}
\leftfooter{Last Modified: \today}
\rightfooter{\url{http://example.com/resume-en.pdf}}
-\begin{document}
+\ctexset{today=old}
+\begin{document}
\begin{table}
-
\maketitle
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\heading{Education}
-\entry{2em}{Xrp{8em}}{%
- \heiti{School} & City & Time Period \\
+\heading{Experience (Compacted version)}
+\entry{0em}{Xlr}{{\bfseries Organization} \quad Department & Position & Time Period}
+\entry{2em}{X}{%
+ Description1 \\
+ Description2 \\
}
-\entry{4em}{lXX}{%
- Degree & College of XXX & Major in XX \\
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\heading{Education}
+\entry{0em}{Xrr}{{\bfseries School} & City & Time Period}
+\entry{2em}{lXX}{%
+ Degree1 & College1 & Major1 \\
+ Degree2 & College2 & Major2 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{Research Experience}
-\entry{2em}{Xp{8em}}{%
- \heiti{Insitute} & Time Period \\
+\entry{0em}{Xr}{{\bfseries Insitute} & Time Period}
+\entry{2em}{X}{Lab \quad Position}
+\entry{4em}{X}{%
+ Description \\
+ bibtex can be used here, like \cite{label} \\
}
-\entry{4em}{X}{Lab \quad Position}
-\entry{6em}{X}{%
- Research Fields and Specific Content \\
- Publication (You can also use bibtex, like \cite{label}, see end of doc) \\
-}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{Working Experience}
-\entry{2em}{Xp{8em}}{%
- \heiti{Unit} & Time Period \\
-}
-\entry{4em}{X}{Department \quad Position}
-\entry{6em}{X}{%
- Specific Issues Responsible for \\
- Specific Content of Your Work \\
+\entry{0em}{Xr}{{\bfseries Organization} & Time Period}
+\entry{2em}{X}{Department \quad Position}
+\entry{4em}{X}{%
+ Description \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{School Experience}
-\entry{2em}{Xp{8em}}{%
- Experience 1 & Time Period \\
- Experience 2 & Time Period \\
+\entry{0em}{Xr}{%
+ Experience1 & Time Period \\
+ Experience2 & Time Period \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{Awards}
-\entry{2em}{Xr}{%
- Award 1 & Time \\
- Award 2 & Time \\
+\entry{0em}{Xr}{%
+ Award1 & Time \\
+ Award2 & Time \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{Professional Skill}
-\entry{2em}{lX}{%
+\entry{0em}{lX}{%
Proficient in & XXX \\
Experienced in & XXX \\
Familiar with & XXX \\
Use & XXX \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{Other listings, such as hobby, network profile and so on}
-\entry{2em}{lX}{%
- Label 1 & Content 1 \\
- Label 2 & Content 2 \\
+\entry{0em}{lX}{%
+ Label1 & Content1 \\
+ Label2 & Content2 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% If there is no publications, just comment this part.
\heading{Appendix: Publications}
\vspace{-6em}
\bibliography{resume}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\end{table}
\end{document}
Binary files old/doc/xelatex/resumecls/example/resume-zh.pdf and new/doc/xelatex/resumecls/example/resume-zh.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/resumecls/example/resume-zh.tex new/doc/xelatex/resumecls/example/resume-zh.tex
--- old/doc/xelatex/resumecls/example/resume-zh.tex 2015-09-21 23:59:00.000000000 +0200
+++ new/doc/xelatex/resumecls/example/resume-zh.tex 2020-04-16 23:00:35.000000000 +0200
@@ -1,102 +1,91 @@
% !Mode:: "TeX:UTF-8"
% +-----------------------------------------------------------------------------
-% | File: resume-zh
+% | File: resume-zh.tex
% | Author: huxuan
% | E-mail: i(at)huxuan.org
% | Created: 2012-12-18
-% | Last modified: 2013-03-16
+% | Last modified: 2020-04-16
% | Description:
% | A Chinese Resume Example in LaTeX based on resumecls
% |
-% | Copyrgiht (c) 2012-2013 by huxuan. All rights reserved.
+% | Copyright (c) 2012-2020 by huxuan. All rights reserved.
% +-----------------------------------------------------------------------------
\documentclass[color]{resumecls}
-\ctexset{today=small}
+\include{resume-common}
\name{姓名}
\organization{单位、学校或组织}
\address{地址,邮编}
-\mobile{+86 XXX XXXX XXXX}
-\mail{i(a)example.com}
-\homepage{http://example.com}
\leftfooter{最后更新: \today}
\rightfooter{\url{http://example.com/resume-zh.pdf}}
-\begin{document}
+\ctexset{today=small}
+\begin{document}
\begin{table}
-
\maketitle
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\heading{教育经历}
-\entry{2em}{Xrp{8em}}{%
- \heiti{学校} & 城市 & 起止时间 \\
+\heading{经历(紧凑版)}
+\entry{0em}{Xlr}{{\bfseries 组织} \quad 部门 & 职位 & 起止时间}
+\entry{2em}{X}{%
+ 描述1 \\
+ 描述2 \\
}
-\entry{4em}{lXX}{%
- 学位 & XX学院 & XX专业 \\
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\heading{教育经历}
+\entry{0em}{Xrr}{{\bfseries 学校} & 城市 & 起止时间}
+\entry{2em}{lXX}{%
+ 学位1 & 学院1 & 专业1 \\
+ 学位2 & 学院2 & 专业2 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{科研经历}
-\entry{2em}{Xp{8em}}{%
- \heiti{地点} & 起止时间 \\
+\entry{0em}{Xr}{{\bfseries 地点} & 起止时间}
+\entry{2em}{X}{实验室 \quad 职位}
+\entry{4em}{X}{%
+ 描述 \\
+ 这里可以使用bibtex,如\cite{label} \\
}
-\entry{4em}{X}{实验室名称 \quad 职位}
-\entry{6em}{X}{%
- 研究方向和具体内容 \\
- 发表成果(亦可使用bibtex,像这样\cite{label},见文档最后注释内容) \\
-}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{工作经历}
-\entry{2em}{Xp{8em}}{%
- \heiti{单位名称} & 起止时间 \\
-}
-\entry{4em}{X}{部门 \quad 职位}
-\entry{6em}{X}{%
- 负责的具体事项 \\
- 工作的具体内容 \\
+\entry{0em}{Xr}{{\bfseries 组织} & 起止时间}
+\entry{2em}{X}{部门 \quad 职位}
+\entry{4em}{X}{%
+ 描述 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{校园经历}
-\entry{2em}{Xp{8em}}{%
+\entry{0em}{Xr}{%
经历1 & 起止时间 \\
经历2 & 起止时间 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{获得荣誉}
-\entry{2em}{Xr}{%
+\entry{0em}{Xr}{%
荣誉1 & 颁发时间 \\
荣誉2 & 颁发时间 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{专业技能}
-\entry{2em}{lX}{%
+\entry{0em}{lX}{%
精通 & XXX \\
熟悉 & XXX \\
掌握 & XXX \\
使用 & XXX \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\heading{其他列举事项-如个人爱好,网络资料等}
-\entry{2em}{lX}{%
+\entry{0em}{lX}{%
标签1 & 标签对应内容 \\
标签2 & 标签对应内容 \\
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% 如果不需要发表成果,注释这一段即可
\heading{附:发表成果}
\vspace{-6em}
\bibliography{resume}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\end{table}
\end{document}
Binary files old/doc/xelatex/resumecls/resumecls.pdf and new/doc/xelatex/resumecls/resumecls.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resumecls.doc.tlpobj new/tlpkg/tlpobj/resumecls.doc.tlpobj
--- old/tlpkg/tlpobj/resumecls.doc.tlpobj 2019-02-28 04:04:19.000000000 +0100
+++ new/tlpkg/tlpobj/resumecls.doc.tlpobj 2020-04-17 01:55:27.000000000 +0200
@@ -1,15 +1,13 @@
name resumecls.doc
category Package
-revision 38427
+revision 54768
shortdesc doc files of resumecls
relocated 1
-docfiles size=43
- RELOC/doc/xelatex/resumecls/Makefile
+docfiles size=45
RELOC/doc/xelatex/resumecls/README.md
RELOC/doc/xelatex/resumecls/example/Makefile
RELOC/doc/xelatex/resumecls/example/README.md
- RELOC/doc/xelatex/resumecls/example/config-sample.mk
- RELOC/doc/xelatex/resumecls/example/config.mk
+ RELOC/doc/xelatex/resumecls/example/resume-common.tex
RELOC/doc/xelatex/resumecls/example/resume-en.pdf
RELOC/doc/xelatex/resumecls/example/resume-en.tex
RELOC/doc/xelatex/resumecls/example/resume-zh.pdf
++++++ resumecls.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/resumecls/resumecls.cls new/tex/xelatex/resumecls/resumecls.cls
--- old/tex/xelatex/resumecls/resumecls.cls 2015-09-21 23:59:00.000000000 +0200
+++ new/tex/xelatex/resumecls/resumecls.cls 2020-04-16 23:00:35.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2012-2015 by huxuan <i(a)huxuan.org>
+%% Copyright (C) 2012-2020 by huxuan <i(a)huxuan.org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,17 +26,16 @@
%% and the derived file resumecls.cls.
%%
-\NeedsTeXFormat{LaTeX2e}[2011/06/27]
+\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{resumecls}
- [2015/09/21 v0.3.2 Welcome, contributors]
+ [2020/04/16 v0.4.0 Hello 2020]
\newif\ifrclscolor\rclscolorfalse
\DeclareOption{color}{\rclscolortrue}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexart}}
\ProcessOptions\relax
-\LoadClass[a4paper,12pt]{article}
+\LoadClass[a4paper,12pt]{ctexart}
\RequirePackage[top=.5in,bottom=.5in,left=.5in,right=.5in]{geometry}
\RequirePackage[xetex,unicode]{hyperref}
-\RequirePackage[noindent]{ctex}
\RequirePackage{tabularx}
\RequirePackage{color}
\RequirePackage{fancyhdr}
@@ -79,9 +78,9 @@
}
\renewcommand{\maketitle}{%
\entry{0em}{Xr}{%
- \bfseries\zihao{4}\rclsname & \rclsmobile \\
- \rclsorganization & \href{mailto:\rclsmail}{\rclsmail} \\
- \rclsaddress & \url{\rclshomepage} \\
+ \bfseries\zihao{4}\rclsname & \rclsmobile \\
+ \rclsorganization & \href{mailto:\rclsmail}{\rclsmail} \\
+ \rclsaddress & \url{\rclshomepage} \\
}
}
\pagestyle{fancy}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/resumecls.tlpobj new/tlpkg/tlpobj/resumecls.tlpobj
--- old/tlpkg/tlpobj/resumecls.tlpobj 2019-02-28 04:04:19.000000000 +0100
+++ new/tlpkg/tlpobj/resumecls.tlpobj 2020-04-17 01:55:27.000000000 +0200
@@ -1,15 +1,16 @@
name resumecls
category Package
-revision 38427
+revision 54768
shortdesc Typeset a resume both in English and Chinese
relocated 1
-longdesc This LaTeX class makes typeseting a resume or cv both in
-longdesc English and Chinese more easy.
+longdesc A LaTeX document class to typeset a resume or CV both in
+longdesc English and Chinese with more ease and flexibility.
runfiles size=1
RELOC/tex/xelatex/resumecls/resumecls.cls
-catalogue-contact-home http://huxuan.org/projects/resumecls/
+catalogue-contact-announce https://github.com/huxuan/resumecls/releases
+catalogue-contact-bugs https://github.com/huxuan/resumecls/issues
+catalogue-contact-home https://github.com/huxuan/resumecls
catalogue-ctan /macros/xetex/latex/resumecls
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics cv chinese class
-catalogue-version 0.3.2
+catalogue-version 0.4.0
++++++ rgltxdoc.doc.tar.xz ++++++
Binary files old/doc/latex/rgltxdoc/rgltxdoc.pdf and new/doc/latex/rgltxdoc/rgltxdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rgltxdoc.doc.tlpobj new/tlpkg/tlpobj/rgltxdoc.doc.tlpobj
--- old/tlpkg/tlpobj/rgltxdoc.doc.tlpobj 2019-02-28 04:04:23.000000000 +0100
+++ new/tlpkg/tlpobj/rgltxdoc.doc.tlpobj 2020-02-22 01:55:15.000000000 +0100
@@ -1,8 +1,8 @@
name rgltxdoc.doc
category Package
-revision 49684
+revision 53858
shortdesc doc files of rgltxdoc
relocated 1
-docfiles size=38
+docfiles size=42
RELOC/doc/latex/rgltxdoc/README.md
RELOC/doc/latex/rgltxdoc/rgltxdoc.pdf
++++++ rgltxdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/rgltxdoc/rgltxdoc.sty new/tex/latex/rgltxdoc/rgltxdoc.sty
--- old/tex/latex/rgltxdoc/rgltxdoc.sty 2019-01-13 00:08:55.000000000 +0100
+++ new/tex/latex/rgltxdoc/rgltxdoc.sty 2020-02-21 23:53:22.000000000 +0100
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{rgltxdoc}
- [2019/01/05 v1 Common documentation code used for Richard Grewe's packages]
+ [2019/12/21 v1.3 Common documentation code used for Richard Grewe's packages]
\RequirePackage{ifluatex}
\RequirePackage{etoolbox}
\ifbool{luatex}{
@@ -29,7 +29,8 @@
\setmainlanguage[variant=american]{english}
}{
\RequirePackage[utf8]{inputenc}
- \RequirePackage[english]{babel}
+ \@ifpackageloaded{babel}{}
+ {\RequirePackage[english]{babel}}
}
\RequirePackage[a4paper,twoside=false]{geometry}
\RequirePackage[DIV=9,BCOR=2.25cm]{typearea}
@@ -47,10 +48,11 @@
\DeclareFontShape{T1}{lmtt}{m}{it}{<->sub*lmtt/m/sl}{}
}
\RequirePackage{microtype}
-\RequirePackage{csquotes}
+\RequirePackage[autostyle=true]{csquotes}
\MakeOuterQuote{"}
-\RequirePackage{enumitem}
+\RequirePackage[inline]{enumitem}
\RequirePackage[columns=2]{idxlayout}
+\RequirePackage{amsmath}
\RequirePackage{varioref}
\RequirePackage{hypdoc}
\RequirePackage[capitalise,noabbrev,nameinlink]{cleveref}
@@ -72,11 +74,46 @@
{#1}{\SpecialEnvIndex}
\NewNiceDescription{Counter}{#1}{#1}
{\SpecialOtherIndex{counter}{counters}}
-\newcommand\SpecialOtherIndex[3]{\@bsphack
+\NewNiceDescription{Key}{#1\,\textrm{=}\,\null}
+ {\begingroup
+ \newcommand\vmeta[1]{{\normalfont\meta{##1}}}%
+ \setkeys[rgltxdoc]{DescOpt}{#1}%
+ \setbox\z@\hbox{\qquad\let\rgltxdoc@@sep\@empty
+ \rgltxdoc@opt{default}{\cmdrgltxdoc@DescOpt@def}%
+ \rgltxdoc@opt{initially}{\cmdrgltxdoc@DescOpt@init}}%
+ \parbox[t]{\linewidth-\wd\z@}{%
+ \raggedright\cmdrgltxdoc@DescOpt@vals}%
+ \box\z@\endgroup}
+ {\SpecialOtherIndex{option-key}{option-keys}}
+\usepackage{xkeyval,calc}
+\define@key[rgltxdoc]{DescOpt}{vals}{%
+ \def\cmdrgltxdoc@DescOpt@vals{}\let\rgltxdoc@@sep\@empty%
+ \def\do##1{%
+ \protected@eappto\cmdrgltxdoc@DescOpt@vals{\rgltxdoc@@sep\texttt{##1}}%
+ \def\rgltxdoc@@sep{, }}%
+ \docsvlist{#1}}
+\define@cmdkey[rgltxdoc]{DescOpt}{init}{}
+\define@cmdkey[rgltxdoc]{DescOpt}{def}{}
+\newcommand\rgltxdoc@opt[2]{\ifdef{#2}
+ {\rgltxdoc@@sep\textsl{#1: }\texttt{#2}%
+ \def\rgltxdoc@@sep{, }}
+ {}}
+\newcommand*\SpecialOtherIndex[3]{%
+ \@bsphack
+ \begingroup
+ \HD@target
+ \let\HDorg@encapchar\encapchar
+ \edef\encapchar usage{%
+ \HDorg@encapchar hdclindex{\the\c@HD@hypercount}{usage}%
+ }%
+ \rgltxdoc@nohyp@SpecialOtherIndex{#1}{#2}{#3}%
+ \endgroup
+ \@esphack}
+\newcommand\rgltxdoc@nohyp@SpecialOtherIndex[3]{%
\index{#3\actualchar{\protect\ttfamily#3}
(#1)\encapchar usage}%
\index{#2:\levelchar#3\actualchar
- {\protect\ttfamily#3}\encapchar usage}\@esphack}
+ {\protect\ttfamily#3}\encapchar usage}}
\RequirePackage{pbox}
\newcommand\rgltxdoc@Desc{\medskip\par\noindent\rgltxdoc@DescRec}
\newcommand\rgltxdoc@DescRec[4]{%
@@ -84,9 +121,8 @@
{\rgltxdoc@DescRec@i{#1}{#2}{#3}{#4}}%
{\rgltxdoc@DescRec@i{#1}{#2}{#3}{#4}[]}}
\def\rgltxdoc@DescRec@i#1#2#3#4[#5]#6#7{%
- \leavevmode\null\hbox to\z@{\hss%
- \pbox[t]{3\marginparwidth}{\ttfamily #1{#6}}%
- \ifstrempty{#7}{\quad}{}}%
+ \rgltxdoc@inmargin{\ttfamily #1{#6}}%
+ {\ifstrempty{#7}{\quad}{}}%
#2{#7}\relax
\ifstrempty{#5}%
{#3{#6}}%
@@ -94,6 +130,10 @@
\ifnumgreater{#4}{1}%
{\\\rgltxdoc@DescRec{#1}{#2}{#3}{#4-1}}%
{\ifstrempty{#7}{}{\smallskip\par\noindent}\ignorespaces}}
+\newcommand\rgltxdoc@inmargin[2]{%
+ \leavevmode\null\hbox to\z@{\hss%
+ \pbox[t]{3\marginparwidth}{#1}%
+ #2}}
\RequirePackage{keyvaltable}
\kvtSet{headbg=black!10,rowbg=white..black!5}
\NewKeyValTable{KeyDesc}{%
@@ -114,6 +154,9 @@
\IfFileExists{#1.sty}
{\textsf{#1}}
{\rgltxdoc@err{Package `#1' not found. Spelling?}}}
+\newcommand\pkgnames{%
+ \def\do##1{\pkgname{##1}\def\do####1{, \pkgname{####1}}}%
+ \docsvlist}
\newcommand\cmarg[1]{\mbox{\texttt{\string{#1\string}}}}
\newcommand\coarg[1]{\mbox{\texttt{[#1]}}}
\RequirePackage{hologo}
@@ -148,6 +191,7 @@
{\expandafter\rgltxdoc@curlbltype@i\cref@currentlabel\@nil}}
\def\rgltxdoc@curlbltype@i[#1][#2][#3]#4\@nil{#1}
\newcommand\rgltxdoc@SaveSecs{%
+ \def\addcontentsline##1##2##3{}%
\@for\SC:=chapter,section,subsection,subsubsection\do{%
\@ifundefined{c@\SC}{}
{\csedef{rgltx@@ctr@\SC}{\the\value{\SC}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rgltxdoc.tlpobj new/tlpkg/tlpobj/rgltxdoc.tlpobj
--- old/tlpkg/tlpobj/rgltxdoc.tlpobj 2019-02-28 04:04:23.000000000 +0100
+++ new/tlpkg/tlpobj/rgltxdoc.tlpobj 2020-02-22 01:55:15.000000000 +0100
@@ -1,6 +1,6 @@
name rgltxdoc
category Package
-revision 49684
+revision 53858
shortdesc Common code for documentation of the author's packages
relocated 1
longdesc This package combines several other packages and defines
@@ -14,7 +14,6 @@
catalogue-contact-bugs https://github.com/Ri-Ga/rgltxdoc/issues
catalogue-contact-repository https://github.com/Ri-Ga/rgltxdoc
catalogue-ctan /macros/latex/contrib/rgltxdoc
-catalogue-date 2019-01-13 08:19:28 +0100
catalogue-license lppl1.2
catalogue-topics doc-supp
-catalogue-version 1
+catalogue-version 1.3
++++++ rmpage.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rmpage.doc.tlpobj new/tlpkg/tlpobj/rmpage.doc.tlpobj
--- old/tlpkg/tlpobj/rmpage.doc.tlpobj 2019-02-28 04:04:24.000000000 +0100
+++ new/tlpkg/tlpobj/rmpage.doc.tlpobj 2020-03-04 23:53:45.000000000 +0100
@@ -1,6 +1,6 @@
name rmpage.doc
category Package
-revision 20002
+revision 54080
shortdesc doc files of rmpage
relocated 1
docfiles size=194
++++++ rmpage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rmpage.tlpobj new/tlpkg/tlpobj/rmpage.tlpobj
--- old/tlpkg/tlpobj/rmpage.tlpobj 2019-02-28 04:04:24.000000000 +0100
+++ new/tlpkg/tlpobj/rmpage.tlpobj 2020-03-04 23:53:45.000000000 +0100
@@ -1,6 +1,6 @@
name rmpage
category Package
-revision 20002
+revision 54080
shortdesc A package to help change page layout parameters in LaTeX
relocated 1
longdesc The package lets you change page layout parameters in small
@@ -17,7 +17,6 @@
RELOC/tex/latex/rmpage/rmpage.sty
RELOC/tex/latex/rmpage/rmpgen.cfg
catalogue-ctan /macros/latex/contrib/rmpage
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics geometry
catalogue-version 0.92
++++++ roboto.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/roboto/ChangeLogLaTeX.txt new/doc/fonts/roboto/ChangeLogLaTeX.txt
--- old/doc/fonts/roboto/ChangeLogLaTeX.txt 2019-04-06 23:04:13.000000000 +0200
+++ new/doc/fonts/roboto/ChangeLogLaTeX.txt 2019-05-03 20:26:42.000000000 +0200
@@ -1,3 +1,13 @@
+2019-04-20
+
+ Support for LGR encoding. Condensed fonts now accessible
+ using standard c series codes.
+
+2019-04-07
+
+ Support for standard NFSS series codes. New macros for
+ localized use of non-default weights and figure styles.
+
2019-03-01 and 2019-03-03:
FontFace and NFSSFamily declarations provided by Mario
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/roboto/README new/doc/fonts/roboto/README
--- old/doc/fonts/roboto/README 2019-04-06 23:04:13.000000000 +0200
+++ new/doc/fonts/roboto/README 2019-12-11 22:53:45.000000000 +0100
@@ -1,5 +1,5 @@
This is the README for the roboto package, version
-2019-04-05.
+2019-12-11.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the Roboto, RobotoCondensed, RobotoMono and
@@ -78,7 +78,7 @@
The default figure style is proportional-lining but the
following options may be used to get other styles (in
-Roboto, RobotoCondensed, and RobotoSlab):
+Roboto and RobotoCondensed):
oldstyle (or osf)
tabular (or t)
@@ -101,13 +101,13 @@
\robotoBold{...} \robotomonoBold{...}
\robotoBlack{...} \robotomonoBlack{...}
-Font encodings supported are OT1, T1, LY1 and TS1.
+Font encodings supported are OT1, T1, TS1, LY1 and LGR.
-Commands \roboto, \robotocondensed, \robotoslab, and
-\robotomono select the Roboto, RobotoCondensed, RobotoSlab
-and RobotoMono font family, respectively.
+Commands \roboto, \robotocondensed, \robotoboldcondensed,
+\robotoslab, \robotolgr, \robotoslablgr and \robotomono select
+those font families or series.
-The original fonts are available at
+The original truetype fonts are available at
http://www.google.com/webfonts and are licensed under the
Apache License, (version 2); the text may be found in the
doc directory. The opentype and type1 versions were created
Binary files old/doc/fonts/roboto/roboto-samples.pdf and new/doc/fonts/roboto/roboto-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/roboto/roboto-samples.tex new/doc/fonts/roboto/roboto-samples.tex
--- old/doc/fonts/roboto/roboto-samples.tex 2019-04-06 23:04:13.000000000 +0200
+++ new/doc/fonts/roboto/roboto-samples.tex 2019-05-03 20:26:42.000000000 +0200
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
+\usepackage[LGR,T1]{fontenc}
\usepackage[sfdefault]{roboto}
\usepackage{roboto-mono}
\usepackage{lipsum}
@@ -27,6 +27,10 @@
\textsc{\lipsum[1]}
+\subsection*{Italic Small Capitals}
+
+\textsc{\textit{\lipsum[2]}}
+
\subsection*{Default Numbers}
1234567890
@@ -39,40 +43,79 @@
\robotoTLF{1234567890}
-\robotocondensed
+\subsection*{Ligatures}
+
+
+Officially broken off. Often offline, find me flowerless.
+
+
+\section*{LGR}
+
+
+{\robotolgr\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\\
+}
+
\subsection*{Condensed Regular}
-\lipsum[1]
+{\robotocondensed\lipsum[1]}
\subsection*{Condensed Italic}
-\textit{\lipsum[2]}
+{\robotocondensed\textit{\lipsum[2]}}
\subsection*{Condensed Bold}
-\textbf{\lipsum[3]}
+{\robotoboldcondensed\lipsum[3]}
\subsection*{Condensed Bold Italic}
-\textbf{\textit{\lipsum[4]}}
+{\robotoboldcondensed\textit{\lipsum[4]}}
\subsection*{Condensed Small Capitals}
-\textsc{\lipsum[1]}
+{\robotocondensed\textsc{\lipsum[1]}}
+
+\subsection*{Ligatures}
+
+{\robotocondensed Officially broken off. Often offline, find me flowerless.}
+
+
+\section*{LGR Condensed}
+
+
+{\robotolgr\robotocondensed\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\\
+}
-\robotoslab
\subsection*{Slab Serif Regular}
-\lipsum[1]
+{\robotoslab\lipsum[1]}
\subsection*{Slab Serif Bold}
-\textbf{\lipsum[3]}
+{\robotoslab\textbf{\lipsum[3]}}
+
+\subsection*{Slab Ligatures}
+
+
+{\robotoslab Officially broken off. Often offline, find me flowerless.}
+
+
+\section*{Slab LGR}
+
+
+{\robotoslablgr\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\\
+}
\subsection*{Mono Regular}
@@ -91,5 +134,18 @@
\texttt{\textbf{\textit{\lipsum[4]}}}
+\subsection*{Mono Non-Ligatures}
+
+
+{\robotomono Officially broken off. Often offline, find me flowerless.}
+
+
+\section*{Mono LGR}
+
+
+{\robotomonolgr\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/roboto.doc.tlpobj new/tlpkg/tlpobj/roboto.doc.tlpobj
--- old/tlpkg/tlpobj/roboto.doc.tlpobj 2019-04-06 23:34:36.000000000 +0200
+++ new/tlpkg/tlpobj/roboto.doc.tlpobj 2020-03-24 02:03:30.000000000 +0100
@@ -1,9 +1,9 @@
name roboto.doc
category Package
-revision 50809
+revision 54512
shortdesc doc files of roboto
relocated 1
-docfiles size=114
+docfiles size=121
RELOC/doc/fonts/roboto/COPYRIGHT.txt
RELOC/doc/fonts/roboto/ChangeLogLaTeX.txt
RELOC/doc/fonts/roboto/DESCRIPTION.en_us.html
++++++ roboto.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-t/roboto.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-t.new.3606/roboto.tar.xz differ: char 25, line 1
1
0
Hello community,
here is the log from the commit of package texlive-specs-s for openSUSE:Factory checked in at 2020-05-29 21:18:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-s (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-s.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-s"
Fri May 29 21:18:59 2020 rev:39 rq:806929 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-s/texlive-specs-s.changes 2019-11-07 23:11:53.656230354 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-s.new.3606/texlive-specs-s.changes 2020-05-29 21:31:42.797638318 +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:
----
powerdot-FUBerlin.doc.tar.xz
powerdot-FUBerlin.tar.xz
New:
----
pmboxdraw.doc.tar.xz
pmboxdraw.tar.xz
pmhanguljamo.doc.tar.xz
pmhanguljamo.tar.xz
poiretone.doc.tar.xz
poiretone.tar.xz
powerdot-fuberlin.doc.tar.xz
powerdot-fuberlin.tar.xz
practicalreports.doc.tar.xz
practicalreports.tar.xz
proof-at-the-end.doc.tar.xz
proof-at-the-end.tar.xz
prtec.doc.tar.xz
prtec.tar.xz
ps2eps.doc.tar.xz
ps2eps.tar.xz
pseudo.doc.tar.xz
pseudo.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-s.spec ++++++
++++ 14770 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-s/texlive-specs-s.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-s.new.3606/texlive-specs-s.spec
++++++ platex-tools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/platex-tools/LICENSE new/doc/latex/platex-tools/LICENSE
--- old/doc/latex/platex-tools/LICENSE 2018-03-16 22:29:25.000000000 +0100
+++ new/doc/latex/platex-tools/LICENSE 2019-09-06 00:25:17.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/platex-tools/Makefile new/doc/latex/platex-tools/Makefile
--- old/doc/latex/platex-tools/Makefile 2018-11-25 23:08:38.000000000 +0100
+++ new/doc/latex/platex-tools/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: plarray.pdf plextarray.pdf plextdelarray.pdf \
- pxatbegshi.pdf pxftnright.pdf pxmulticol.pdf \
- pxeverysel.pdf pxeveryshi.pdf
-
-.SUFFIXES: .tex .dvi .pdf
-%.dvi: %.tex %.sty
- platex $(KANJI) $<
- platex $(KANJI) $<
- rm *.aux *.log
-.dvi.pdf:
- dvipdfmx $(FONTMAP) $<
-
-.PHONY: install clean
-install:
- mkdir -p ${TEXMF}/doc/platex/platex-tools
- cp ./Makefile ${TEXMF}/doc/platex/platex-tools/
- cp ./LICENSE ${TEXMF}/doc/platex/platex-tools/
- cp ./README.md ${TEXMF}/doc/platex/platex-tools/
- cp ./*.pdf ${TEXMF}/doc/platex/platex-tools/
- cp ./*.tex ${TEXMF}/doc/platex/platex-tools/
- mkdir -p ${TEXMF}/tex/platex/platex-tools
- cp ./*.sty ${TEXMF}/tex/platex/platex-tools/
-clean:
- rm -f *.dvi *.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/platex-tools/README.md new/doc/latex/platex-tools/README.md
--- old/doc/latex/platex-tools/README.md 2018-11-25 23:08:38.000000000 +0100
+++ new/doc/latex/platex-tools/README.md 2019-09-07 23:23:14.000000000 +0200
@@ -27,20 +27,25 @@
Patch for multicol.sty (latex-tools) to support
`\footnote` in vertical writing.
Can be used on pLaTeX/upLaTeX.
+- pxxspace.sty:
+ Patch for xspace.sty (latex-tools) to fix
+ interword spacing with Japanese characters.
+ Can be used on pLaTeX/upLaTeX.
+ Version 0.2 was written by Takayuki YATO in 2019
+ (https://gist.github.com/zr-tex8r/7de76036846e149bc28ec6399a683e3a),
+ and incorporated into this bundle by his courtesy.
- pxeverysel.sty:
Patch for everysel.sty (ms) to improve
compatibility with Japanese font selection in pLaTeX.
Can be used on pLaTeX/upLaTeX.
- Previous version of this package (v0.1) was written by
- Takayuki YATO in 2015
+ Version 0.1 was written by Takayuki YATO in 2015
(https://gist.github.com/zr-tex8r/48c6910bbbe2f41d72de),
and incorporated into this bundle by his courtesy.
- pxeveryshi.sty:
Patch for everyshi.sty (ms) to support
Japanese classes for vertical writing.
Can be used on pLaTeX/upLaTeX.
- Previous version of this package (v0.1) was written by
- Takayuki YATO in 2012
+ Version 0.1 was written by Takayuki YATO in 2012
(https://gist.github.com/zr-tex8r/2702969),
and incorporated into this bundle by his courtesy.
- pxatbegshi.sty:
@@ -78,6 +83,6 @@
## Release Date
-2018-11-25
+2019-09-07
Hironobu Yamashita
Binary files old/doc/latex/platex-tools/pxatbegshi.pdf and new/doc/latex/platex-tools/pxatbegshi.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/platex-tools/pxatbegshi.tex new/doc/latex/platex-tools/pxatbegshi.tex
--- old/doc/latex/platex-tools/pxatbegshi.tex 2018-09-21 23:06:46.000000000 +0200
+++ new/doc/latex/platex-tools/pxatbegshi.tex 2019-09-07 23:23:14.000000000 +0200
@@ -60,12 +60,12 @@
\section*{謝辞}
-本パッケージの実装には、Takayuki Yato (ZR) 氏による
-\textsf{bxpapersize}パッケージを参考にしました
-\footnote{2018/09/21 v0.3までは北川さん (Hironori Kitagawa) による
+本パッケージの実装は、北川さん(Hironori Kitagawa)さんによる
「\verb+\AtBegShi@Output+の処理を強引に横組でやらせるコード」
-をベースにしていましたが、v0.4で\verb+\AtBeginShipoutDiscard+へ
-対応させる改修を機に、書き直しました。}。
+をベースにしています\footnote{2018/09/21 v0.4では
+Takayuki Yato (ZR) 氏による\textsf{bxpapersize}パッケージを参考に
+していましたが、\textsf{multicol}パッケージで問題が起きるようなので
+v0.3以前と同様に北川さんのコードベースに戻しました。}。
\section*{References}
Binary files old/doc/latex/platex-tools/pxxspace.pdf and new/doc/latex/platex-tools/pxxspace.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/platex-tools/pxxspace.tex new/doc/latex/platex-tools/pxxspace.tex
--- old/doc/latex/platex-tools/pxxspace.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/platex-tools/pxxspace.tex 2019-09-06 00:25:17.000000000 +0200
@@ -0,0 +1,100 @@
+%# -*- coding: utf-8 -*-
+\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016)
+ \epTeXinputencoding utf8 % ensure utf-8 encoding for platex
+\fi
+
+\documentclass[a4paper]{jsarticle}
+\usepackage{doc}
+\usepackage{pxxspace}
+\GetFileInfo{pxxspace.sty}
+\title{Package \textsf{pxxspace} \fileversion}
+\author{Takayuki Yato}
+\date{\filedate}
+
+%%%%% BEGIN
+%
+% \RESTOREXSPACE: restore original behavior to show difference
+%
+\makeatletter\def\RESTOREXSPACE{%
+%
+%% patch \@xspace
+\patchcmd\@xspace{%from
+ \pxxs@precheck
+ \@xspace@lettoken@if@letter@TF
+}{%to
+ \@xspace@lettoken@if@letter@TF
+}{}{}
+%% patch \@xspace@eTeX@setup
+\patchcmd\@xspace@eTeX@setup{%from
+ \begingroup
+ \pxxs@forcecjktoken
+}{%to
+ \begingroup
+}{}{}
+%
+}\makeatother
+%
+%%%%% END
+
+\begin{document}
+
+\maketitle
+
+The command \verb+\xspace+ of package \textsf{xspace}
+(included in \textsf{latex-tools} bundle)
+results in wrong interword spacing when followed by
+a Japanese character.
+The package \textsf{pxxspace} provides a patch for \textsf{xspace}
+to correct interword spacing with Japanese characters.
+
+This package is part of \textsf{platex-tools} bundle:
+\begin{verbatim}
+ https://github.com/aminophen/platex-tools
+\end{verbatim}
+
+\bigskip
+
+\textsf{xspace}パッケージ(\textsf{latex-tools}バンドルの一つ)が
+提供する \verb+\xspace+ 命令は、その直後に和文文字を伴うときに
+その和文文字との間のスペーシングが正しくなりません。
+そこで、\textsf{pxxspace}パッケージを読み込めば
+和文文字との間のスペーシングが修正されます。
+
+以下に例を示します。
+\begin{verbatim}
+ % Sample code
+ \documentclass{article}
+ \usepackage{pxxspace}% or, \usepackage{xspace}
+ \newcommand\myTeX{\TeX\xspace}
+ \begin{document}
+ % ASCII-Kanji interword spacing should be 20pt.
+ % At the same time, no spacing before JP punctuations.
+ \xkanjiskip 20pt % visible
+ \myTeX is great!\par
+ \myTeX, it's awesome!\par
+ \myTeX は素晴らしい!\par
+ \myTeX、超スゴイ!\par
+ \end{document}
+\end{verbatim}
+
+\begin{quote}
+\begin{multicols}{2}
+ \xkanjiskip 20pt % visible
+ \newcommand\myTeX{\TeX\xspace}
+ \long\def\TEST{%
+ \myTeX is great!\par
+ \myTeX, it's awesome!\par
+ \myTeX は素晴らしい!\par
+ \myTeX、超スゴイ!\par
+ }
+ % 正しいスペーシング:
+ Correct with \verb+\usepackage{pxxspace}+\par
+ \TEST
+ % 誤ったスペーシング:
+ \RESTOREXSPACE
+ Wrong with \verb+\usepackage{xspace}+\par
+ \TEST
+\end{multicols}
+\end{quote}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/platex-tools.doc.tlpobj new/tlpkg/tlpobj/platex-tools.doc.tlpobj
--- old/tlpkg/tlpobj/platex-tools.doc.tlpobj 2019-02-28 03:59:48.000000000 +0100
+++ new/tlpkg/tlpobj/platex-tools.doc.tlpobj 2019-09-08 01:54:43.000000000 +0200
@@ -1,11 +1,10 @@
name platex-tools.doc
category Package
-revision 49250
+revision 52049
shortdesc doc files of platex-tools
relocated 1
-docfiles size=141
+docfiles size=152
RELOC/doc/latex/platex-tools/LICENSE
- RELOC/doc/latex/platex-tools/Makefile
RELOC/doc/latex/platex-tools/README.md
RELOC/doc/latex/platex-tools/plarray.pdf
RELOC/doc/latex/platex-tools/plarray.tex
@@ -23,3 +22,5 @@
RELOC/doc/latex/platex-tools/pxftnright.tex
RELOC/doc/latex/platex-tools/pxmulticol.pdf
RELOC/doc/latex/platex-tools/pxmulticol.tex
+ RELOC/doc/latex/platex-tools/pxxspace.pdf
+ RELOC/doc/latex/platex-tools/pxxspace.tex
++++++ platex-tools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/platex-tools/plarray.sty new/tex/latex/platex-tools/plarray.sty
--- old/tex/latex/platex-tools/plarray.sty 2018-10-27 23:38:32.000000000 +0200
+++ new/tex/latex/platex-tools/plarray.sty 2019-09-06 00:25:17.000000000 +0200
@@ -7,7 +7,7 @@
%
% This package is expected to be compatible with
% * array.sty in latex-tools
-% (2016/10/06 v2.4d -- 2018/09/13 v2.4i)
+% (2016/10/06 v2.4d -- 2018/11/13 v2.4j)
% * plcore.ltx in platex
% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/platex-tools/plextarray.sty new/tex/latex/platex-tools/plextarray.sty
--- old/tex/latex/platex-tools/plextarray.sty 2018-10-27 23:38:32.000000000 +0200
+++ new/tex/latex/platex-tools/plextarray.sty 2019-09-06 00:25:17.000000000 +0200
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * array.sty in latex-tools
-% (2016/10/06 v2.4d -- 2018/09/13 v2.4i)
+% (2016/10/06 v2.4d -- 2018/11/13 v2.4j)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/09/20 v1.2j)
+% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
% Largely based on lltjext.sty from LuaTeX-ja project.
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/platex-tools/plextdelarray.sty new/tex/latex/platex-tools/plextdelarray.sty
--- old/tex/latex/platex-tools/plextdelarray.sty 2018-09-21 23:06:46.000000000 +0200
+++ new/tex/latex/platex-tools/plextdelarray.sty 2019-09-06 00:25:17.000000000 +0200
@@ -9,7 +9,7 @@
% * delarray.sty in latex-tools
% (2014/10/28 v1.01)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/09/20 v1.2j)
+% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
%
\NeedsTeXFormat{pLaTeX2e}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/platex-tools/pxatbegshi.sty new/tex/latex/platex-tools/pxatbegshi.sty
--- old/tex/latex/platex-tools/pxatbegshi.sty 2018-09-21 23:06:46.000000000 +0200
+++ new/tex/latex/platex-tools/pxatbegshi.sty 2019-09-07 23:23:14.000000000 +0200
@@ -5,15 +5,26 @@
% This package is part of the platex-tools bundle.
% https://github.com/aminophen/platex-tools
%
-% Largely based on bxpapersize.sty by T. Yato.
-% Previous versions were largely based on H. Kitagawa's
-% code on GitHub:texjporg/tex-jp-build#21.
+% --------------------------------------------------------------------
+% [Note]
+% Previous version (2018/09/21 v0.4) was largely based on
+% "cope with tate-direction"
+% of bxpapersize.sty 2017/05/02 v0.3a by T. Yato.
+% -- concept: execute all hooks in temporary yoko direction,
+% -- by prepending \yoko and switching back to the original
+% However, it was problematic when used with multicol.sty.
+%
+% Thus, in newer version (2019/09/07 v0.5), I reverted back to
+% the original code (2018/09/21 v0.3), which was largely based on
+% H. Kitagawa's on GitHub:texjporg/tex-jp-build#21.
+% -- concept: execute all hooks inside yoko direction \vbox
+% --------------------------------------------------
%
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxatbegshi}
- [2018/09/21 v0.4 Patch to atbegshi for (u)pLaTeX]
+ [2019/09/07 v0.5 Patch to atbegshi for (u)pLaTeX]
%% preparations
\def\pxabgs@pkgname{pxatbegshi}
@@ -45,56 +56,51 @@
%---------------------------------------
-%% patch \AtBegShi@Output
-% concept: execute all hooks in temporary yoko direction,
-% by prepending \yoko and switching back to the original
-%
+% concept: execute all hooks inside yoko direction \vbox
+
% prepare
\let\pxabgs@AtBegShi@Output\AtBegShi@Output
-% first, check hooks inserted by bxpapersize.sty
-% -> if detected, nothing to do
+% try first patch
\pxabgs@patch@cmd\pxabgs@AtBegShi@Output
- {\bxpr@ABS@prehook}{\bxpr@ABS@prehook}%
-\ifx\pxabgs@fragment\relax\else % found
+ {\let\AtBegShi@OrgProtect\protect}%
+ {\setbox8\vbox\bgroup\yoko\let\AtBegShi@OrgProtect\protect}
+\ifx\pxabgs@fragment\relax % failure
+ \let\pxabgs@AtBegShi@Output\relax
+\else % success, try second patch
\pxabgs@patch@cmd\pxabgs@AtBegShi@Output
- {\bxpr@ABS@posthook}{\bxpr@ABS@posthook}%
- \ifx\pxabgs@fragment\relax\else % found
+ {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox}%
+ {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox\egroup}
+ \ifx\pxabgs@fragment\relax % failure
\let\pxabgs@AtBegShi@Output\relax
+ \else % success, try third patch
+ \pxabgs@patch@cmd\pxabgs@AtBegShi@Output{%
+ \begingroup
+ \setbox\AtBeginShipoutBox\box\AtBeginShipoutBox
+ \endgroup
+ \let\protect\AtBegShi@OrgProtect
+ }{%
+ \begingroup
+ \setbox\AtBeginShipoutBox\box\AtBeginShipoutBox
+ \endgroup
+ \let\protect\AtBegShi@OrgProtect
+ \egroup
+ }
+ \ifx\pxabgs@fragment\relax % failure
+ \let\pxabgs@AtBegShi@Output\relax
+ \fi
\fi
\fi
-% -> if not detected, prepend/append hooks
-\ifx\pxabgs@AtBegShi@Output\relax\else
- \expandafter\def\expandafter\pxabgs@AtBegShi@Output\expandafter{%
- \expandafter\pxabgs@ABS@prehook
- \pxabgs@AtBegShi@Output
- \pxabgs@ABS@posthook
- }
- % adjust for atbegshi.sty on non-e-TeX ...
- % (for e-TeX, this patch should fail but does nothing!)
- \pxabgs@patch@cmd\pxabgs@AtBegShi@Output
- {\pxabgs@ABS@prehook\egroup\endgroup}
- {\egroup\endgroup\pxabgs@ABS@prehook}%
- % commit the change
+% commit the change only when successful
+\ifx\pxabgs@AtBegShi@Output\relax
+ \pxabgs@warn{Failed in patching \string\AtBegShi@Output}
+\else
\global\let\AtBegShi@Output\pxabgs@AtBegShi@Output
\fi
-%
-%% done
-
-%--------------------------------------- done
\endgroup
%% internal macros are no longer effective
-%% hooks
-\let\pxabgs@restore@dir\relax
-\def\pxabgs@ABS@prehook{%
- \iftdir
- \yoko
- \let\pxabgs@restore@dir\tate
- \else
- \let\pxabgs@restore@dir\relax
- \fi}
-\def\pxabgs@ABS@posthook{\pxabgs@restore@dir}
+%--------------------------------------- done
\endinput
%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/platex-tools/pxmulticol.sty new/tex/latex/platex-tools/pxmulticol.sty
--- old/tex/latex/platex-tools/pxmulticol.sty 2018-11-25 23:08:38.000000000 +0100
+++ new/tex/latex/platex-tools/pxmulticol.sty 2019-09-06 00:25:17.000000000 +0200
@@ -12,7 +12,7 @@
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxmulticol}
- [2018/11/25 v0.2 footnote layout package for pLaTeX]
+ [2018/11/25 v0.2 multicol package for pLaTeX]
\RequirePackageWithOptions{multicol}
%% patching internal code for multicol.sty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/platex-tools/pxxspace.sty new/tex/latex/platex-tools/pxxspace.sty
--- old/tex/latex/platex-tools/pxxspace.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/platex-tools/pxxspace.sty 2019-09-06 00:25:17.000000000 +0200
@@ -0,0 +1,133 @@
+%
+% pxxspace.sty
+% written by Takayuki Yato (ZR)
+%
+% This package is distributed as part of the platex-tools bundle
+% maintained by Hironobu Yamashita
+% by courtesy of the original author.
+% https://github.com/aminophen/platex-tools
+%
+% Original copyright notice:
+% --------------------------------------------------
+% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+% GitHub: https://github.com/zr-tex8r
+% Twitter: @zr_tex8r
+%
+% This package is distributed under the MIT License.
+% --------------------------------------------------
+%
+% This package is expected to be compatible with
+% * xspace.sty in latex-tools
+% (2009/10/20 v1.13 -- 2014/10/28 v1.13)
+%
+
+%% package declaration
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{pxxspace}
+ [2019/04/30 v0.2 Patch for xspace for pLaTeX/upLaTeX]
+\def\pxxs@pkgname{pxxspace}
+
+%--------------------------------------- preparations
+
+%% e-TeX is required
+\RequirePackage{etoolbox}[2011/01/03]% v2.1
+\ifx\numdef\@undefined \endinput \fi
+
+%% packages
+\RequirePackage{xspace}[2009/10/20]% v1.13
+
+%% check if patchable
+\chardef\pxxs@tmpa=\@ne
+\ifpatchable\@xspace{%
+ \@xspace@lettoken@if@letter@TF
+}{}{\chardef\pxxs@tmpa=\z@}
+\ifpatchable\@xspace@eTeX@setup{%
+ \begingroup
+}{}{\chardef\pxxs@tmpa=\z@}
+\ifnum\pxxs@tmpa=\z@
+ \PackageError\pxxs@pkgname
+ {Failure in patching}%
+ {Package loading is aborted.\MessageBreak\@ehc}%
+\expandafter\endinput\fi\relax
+
+%--------------------------------------- helpers
+
+%% packages
+\RequirePackage{pdftexcmds}
+
+%% engine check
+\newif\ifpxxs@uptex
+\pdf@isprimitive\forcecjktoken\forcecjktoken{\pxxs@uptextrue}{}
+
+%% \pxxs@forcecjktoken
+\ifpxxs@uptex
+ \let\pxxs@forcecjktoken\forcecjktoken
+\else
+ \let\pxxs@forcecjktoken\relax
+\fi
+
+%--------------------------------------- adjustments to xspace
+
+%% \pxxs@jt@XXX : probe tokens
+\begingroup
+ \def\do#1#2#3{%
+ \kcatcode#2=#3\relax \kansujichar1=#2\relax
+ \edef\next{%
+ \global\let\noexpand#1=\scantokens\expandafter{\kansuji1}%
+ }\next}
+ \pxxs@forcecjktoken
+ \everyeof{\noexpand}% disable EOF marker
+ \do\pxxs@jt@kanji{\jis"3441}{16}%
+ \do\pxxs@jt@kana{\jis"2422}{17}%
+ \do\pxxs@jt@other{\jis"2123}{18}%
+ \ifpxxs@uptex
+ \do\pxxs@jt@hangul{\ucs"D55C}{19}%
+ \fi
+\endgroup
+
+%% \pxxs@lettoken@if@jachar{<true>}{<false>}
+% Checks if \@let@token is a ja-character token.
+% NB: Here \@let@token might be an \outer-token.
+\let\@let@token\relax
+\def\pxxs@tmpa#1#2{\unexpanded{%
+ \ifcat\noexpand\@let@token#1\expandafter\@firstoftwo
+ \else \expandafter#2\fi}}
+\edef\pxxs@lettoken@if@jachar{%
+ \pxxs@tmpa\pxxs@jt@kana\pxxs@lettoken@if@jachar@a}
+\edef\pxxs@lettoken@if@jachar@a{%
+ \pxxs@tmpa\pxxs@jt@kanji\pxxs@lettoken@if@jachar@b}
+\edef\pxxs@lettoken@if@jachar@b{%
+ \pxxs@tmpa\pxxs@jt@other\pxxs@lettoken@if@jachar@c}
+\edef\pxxs@lettoken@if@jachar@c{%
+ \pxxs@tmpa\pxxs@jt@hangul\@secondoftwo}
+\unless\ifpxxs@uptex
+ \let\pxxs@lettoken@if@jachar@c\@secondoftwo
+\fi
+
+%% \pxxs@precheck
+% Placed just before \@xspace@lettoken@if@letter@TF to modify the
+% behavior of \@xspace so that spaces are omitted if the following
+% token is a ja-character.
+\def\pxxs@precheck#1{%
+ \pxxs@lettoken@if@jachar{\@gobbletwo}{#1}%
+}
+
+%% patch \@xspace
+\patchcmd\@xspace{%from
+ \@xspace@lettoken@if@letter@TF
+}{%to
+ \pxxs@precheck
+ \@xspace@lettoken@if@letter@TF
+}{}{}
+
+%% patch \@xspace@eTeX@setup
+\patchcmd\@xspace@eTeX@setup{%from
+ \begingroup
+}{%to
+ \begingroup
+ \pxxs@forcecjktoken
+}{}{}
+
+%--------------------------------------- done
+\endinput
+%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/platex-tools.tlpobj new/tlpkg/tlpobj/platex-tools.tlpobj
--- old/tlpkg/tlpobj/platex-tools.tlpobj 2019-02-28 03:59:48.000000000 +0100
+++ new/tlpkg/tlpobj/platex-tools.tlpobj 2019-09-08 01:54:44.000000000 +0200
@@ -1,13 +1,13 @@
name platex-tools
category Package
-revision 49250
+revision 52049
shortdesc pLaTeX standard tools bundle
relocated 1
longdesc This bundle is an extended version of the latex-tools bundle
longdesc developed by the LaTeX team, mainly intended to support
longdesc pLaTeX2e and upLaTeX2e. Currently patches for the latex-tools
longdesc bundle and Martin Schroder's ms bundle are included.
-runfiles size=9
+runfiles size=10
RELOC/tex/latex/platex-tools/plarray.sty
RELOC/tex/latex/platex-tools/plextarray.sty
RELOC/tex/latex/platex-tools/plextdelarray.sty
@@ -16,8 +16,9 @@
RELOC/tex/latex/platex-tools/pxeveryshi.sty
RELOC/tex/latex/platex-tools/pxftnright.sty
RELOC/tex/latex/platex-tools/pxmulticol.sty
+ RELOC/tex/latex/platex-tools/pxxspace.sty
catalogue-contact-repository https://github.com/aminophen/platex-tools
catalogue-ctan /language/japanese/platex-tools
-catalogue-date 2018-11-25 13:41:24 +0100
+catalogue-date 2019-09-07 11:47:33 +0200
catalogue-license bsd3
catalogue-topics japanese collection
++++++ platex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/platex.man1.pdf and new/texmf-dist/doc/man/man1/platex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/LICENSE new/texmf-dist/doc/platex/base/LICENSE
--- old/texmf-dist/doc/platex/base/LICENSE 2019-04-07 01:20:14.000000000 +0200
+++ new/texmf-dist/doc/platex/base/LICENSE 2020-02-02 23:31:00.000000000 +0100
@@ -1,5 +1,5 @@
Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2019 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/README.md new/texmf-dist/doc/platex/base/README.md
--- old/texmf-dist/doc/platex/base/README.md 2019-04-07 01:20:14.000000000 +0200
+++ new/texmf-dist/doc/platex/base/README.md 2020-04-12 23:29:19.000000000 +0200
@@ -1,29 +1,39 @@
# platex
-The bundle provides pLaTeX2e and miscellaneous macros for pTeX and e-pTeX.
+The bundle provides pLaTeX2e format and miscellaneous macros
+for pTeX and e-pTeX.
+This is a community edition maintained by
+[Japanese TeX Development Community](http://texjp.org),
+which forked from the original ASCII edition (ptex-texmf-2.5).
-The bundle is a community edition forked from the original ASCII edition
-(ptex-texmf-2.5). The GitHub repository
+## Repository
-- https://github.com/texjporg/platex
+The bundle is maintained on GitHub:
+https://github.com/texjporg/platex
-is now maintained by [Japanese TeX Development Community](http://texjp.org).
+If you have issues, please let us know from the above page.
The original ASCII edition can be obtained from:
-- https://ctan.org/pkg/ptex-texmf
+- https://asciidwango.github.io/ptex/base/sources.html#platex
## Changes from the original ASCII edition
-See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) for more information.
+The original ASCII edition (pLaTeX2e 2006/11/10) was based on
+pTeX-3.1.10 and LaTeX2e 2005/12/01.
+The community edition (this package) has the following advantages:
-- Fix macros which are inconsistent with the latest e-pTeX
- (e.g. \footnote, tabular, \parbox, \underline).
- Fix several bugs in pLaTeX2e format and packages.
+- Fix macros which are inconsistent with the latest pTeX
+ (e.g. \footnote, tabular, \parbox, \underline).
+- Support LaTeX2e 2015/01/01 and later versions.
- Add platexrelease.sty. As with the latexrelease package, this
package enables us to use the old versions of pLaTeX2e (from
2006/11/10 the ASCII edition).
+See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf)
+for more information.
+
## Documentation
A brief exposition of pLaTeX2e is provided in platex.pdf.
@@ -47,13 +57,6 @@
are encoded in ISO-2022-JP. This is because ISO-2022-JP encoded
texts are most suitable for the traditional pTeX engine.
-## Repository
-
-The bundle is maintained on GitHub:
-https://github.com/texjporg/platex
-
-If you have issues, please let us know from the above page.
-
## License
The bundle may be distributed and/or modified under the terms of
@@ -61,6 +64,6 @@
## Release Date
-2019-04-06
+2020-04-12
Japanese TeX Development Community
Binary files old/texmf-dist/doc/platex/base/exppl2e.pdf and new/texmf-dist/doc/platex/base/exppl2e.pdf differ
Binary files old/texmf-dist/doc/platex/base/platex-en.pdf and new/texmf-dist/doc/platex/base/platex-en.pdf differ
Binary files old/texmf-dist/doc/platex/base/platex.pdf and new/texmf-dist/doc/platex/base/platex.pdf differ
Binary files old/texmf-dist/doc/platex/base/platexrelease.pdf and new/texmf-dist/doc/platex/base/platexrelease.pdf differ
Binary files old/texmf-dist/doc/platex/base/pldoc.pdf and new/texmf-dist/doc/platex/base/pldoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/platex.doc.tlpobj new/tlpkg/tlpobj/platex.doc.tlpobj
--- old/tlpkg/tlpobj/platex.doc.tlpobj 2019-04-07 01:38:05.000000000 +0200
+++ new/tlpkg/tlpobj/platex.doc.tlpobj 2020-04-16 01:57:04.000000000 +0200
@@ -1,8 +1,8 @@
name platex.doc
category Package
-revision 50831
+revision 54758
shortdesc doc files of platex
-docfiles size=396
+docfiles size=374
texmf-dist/doc/man/man1/platex.1
texmf-dist/doc/man/man1/platex.man1.pdf
texmf-dist/doc/platex/base/LICENSE
++++++ platex.tar.xz ++++++
++++ 3792 lines of diff (skipped)
++++++ plautopatch.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/plautopatch/LICENSE new/doc/latex/plautopatch/LICENSE
--- old/doc/latex/plautopatch/LICENSE 2018-08-21 23:51:42.000000000 +0200
+++ new/doc/latex/plautopatch/LICENSE 2020-02-25 23:00:24.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2018 Hironobu Yamashita
+Copyright (c) 2018-2020 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/plautopatch/Makefile new/doc/latex/plautopatch/Makefile
--- old/doc/latex/plautopatch/Makefile 2018-08-21 23:51:42.000000000 +0200
+++ new/doc/latex/plautopatch/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: plautopatch.pdf plautopatch-ja.pdf
-
-.SUFFIXES: .tex .dvi .pdf
-.tex.dvi:
- platex $(KANJI) $<
- platex $(KANJI) $<
- rm *.aux *.log
-.dvi.pdf:
- dvipdfmx $(FONTMAP) $<
-
-.PHONY: install clean
-install:
- mkdir -p ${TEXMF}/doc/platex/plautopatch
- cp ./Makefile ${TEXMF}/doc/platex/plautopatch/
- cp ./LICENSE ${TEXMF}/doc/platex/plautopatch/
- cp ./README.md ${TEXMF}/doc/platex/plautopatch/
- cp ./*.pdf ${TEXMF}/doc/platex/plautopatch/
- cp ./*.tex ${TEXMF}/doc/platex/plautopatch/
- mkdir -p ${TEXMF}/tex/platex/plautopatch
- cp ./*.sty ${TEXMF}/tex/platex/plautopatch/
-clean:
- rm -f *.dvi *.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/plautopatch/README.md new/doc/latex/plautopatch/README.md
--- old/doc/latex/plautopatch/README.md 2018-12-01 00:18:04.000000000 +0100
+++ new/doc/latex/plautopatch/README.md 2020-02-25 23:00:24.000000000 +0100
@@ -30,7 +30,10 @@
- atbegshi (oberdiek) -> pxatbegshi (platex-tools)
- ftnright (latex-tools) -> pxftnright (platex-tools)
- multicol (latex-tools) -> pxmulticol (platex-tools)
+- xspace (latex-tools) -> pxxspace (platex-tools)
+- textpos -> pxtextpos (maintained here!)
- pdfpages -> pxpdfpages (maintained here!)
+- stfloats (sttools) -> pxstfloats (pxsttools)
- pgfrcs (pgf) -> pxpgfrcs (maintained here!)
- pgfcore (pgf) -> pxpgfmark (by Takayuki YATO)
@@ -42,36 +45,39 @@
## Miscellaneous
This bundle may distribute some tiny patches
-together with the main package. Short information:
+together with the main package.
+All packages are meant for use with pLaTeX/upLaTeX.
+Short information:
- pldocverb.sty:
Patch for doc.sty (latex) to improve
compatibility with `\verb` redefinition in pLaTeX.
- Can be used on pLaTeX/upLaTeX.
- plextcolortbl.sty:
Patch for colortbl.sty (by David Carlisle) to improve
compatibility with plext.sty in pLaTeX.
- Can be used on pLaTeX/upLaTeX.
- plarydshln.sty:
Patch for arydshln.sty (by Hiroshi Nakashima) to improve
- compatibility with pLaTeX/upLaTeX kernels.
- Can be used on pLaTeX/upLaTeX.
+ compatibility with pLaTeX kernel.
- plextarydshln.sty:
Patch for arydshln.sty (by Hiroshi Nakashima) to improve
compatibility with plext.sty in pLaTeX.
- Can be used on pLaTeX/upLaTeX.
- plsiunitx.sty:
Patch for siunitx.sty (by Joseph Wright) to fix
conflict with plarray.sty (platex-tools).
- Can be used on pLaTeX/upLaTeX.
+- pxtextpos.sty:
+ Patch for textpos.sty (by Norman Gray) to support
+ Japanese-style crop marks (called 'tombow' in Japanese).
- pxpdfpages.sty:
Patch for pdfpages.sty (by Andreas Matthias) to support
Japanese-style crop marks (called 'tombow' in Japanese).
- Can be used on pLaTeX/upLaTeX.
- pxpgfrcs.sty:
Patch for pgfrcs.sty (part of PGF) to support
Japanese classes for vertical writing.
- Can be used on pLaTeX/upLaTeX.
+- pxstfloats.sty:
+ Patch for stfloats.sty (sttools) to improve
+ compatibility with pLaTeX kernel.
+ Actually part of pxsttols (https://github.com/aminophen/pxsttools)
+ but included here for convenience.
## Installation
@@ -90,6 +96,6 @@
## Release Date
-2018-11-25
+2020-02-25
Hironobu Yamashita
Binary files old/doc/latex/plautopatch/plautopatch-ja.pdf and new/doc/latex/plautopatch/plautopatch-ja.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/plautopatch/plautopatch-ja.tex new/doc/latex/plautopatch/plautopatch-ja.tex
--- old/doc/latex/plautopatch/plautopatch-ja.tex 2018-12-01 00:18:04.000000000 +0100
+++ new/doc/latex/plautopatch/plautopatch-ja.tex 2020-02-25 23:00:24.000000000 +0100
@@ -116,7 +116,10 @@
\ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools)
\ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools)
\ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools)
+\ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools)
+\ITEMxTx textpos -> pxtextpos (maintained here!)
\ITEMxTx pdfpages -> pxpdfpages (maintained here!)
+\ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools)
\ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!)
\ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO)
\end{itemize}
@@ -148,6 +151,9 @@
\item 2018/10/27 v0.8 \textsf{everysel}サポートの改良
\item 2018/11/03 v0.9 \textsf{siunitx}のサポート
\item 2018/11/25 v0.9b \textsf{multicol}と\textsf{doc}のサポート
+ \item 2019/06/06 v0.9c \textsf{siunitx}のパッチ改良
+ \item 2019/09/05 v0.9d \textsf{xspace}と\textsf{stfloats}のサポート
+ \item 2020/02/25 v0.9e \textsf{textpos}のサポート
\end{itemize}
\end{document}
Binary files old/doc/latex/plautopatch/plautopatch.pdf and new/doc/latex/plautopatch/plautopatch.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/plautopatch/plautopatch.tex new/doc/latex/plautopatch/plautopatch.tex
--- old/doc/latex/plautopatch/plautopatch.tex 2018-12-01 00:18:04.000000000 +0100
+++ new/doc/latex/plautopatch/plautopatch.tex 2020-02-25 23:00:24.000000000 +0100
@@ -115,7 +115,10 @@
\ITEMoTo atbegshi (oberdiek) -> pxatbegshi (platex-tools)
\ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools)
\ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools)
+\ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools)
+\ITEMxTx textpos -> pxtextpos (maintained here!)
\ITEMxTx pdfpages -> pxpdfpages (maintained here!)
+\ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools)
\ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!)
\ITEMoTx pgfcore (pgf) -> pxpgfmark (by Takayuki YATO)
\end{itemize}
@@ -150,6 +153,9 @@
\item 2018/10/27 v0.8 Better support for \textsf{everysel}
\item 2018/11/03 v0.9 Add support for \textsf{siunitx}
\item 2018/11/25 v0.9b Add support for \textsf{multicol} and \textsf{doc}
+ \item 2019/06/06 v0.9c Update patch for \textsf{siunitx}
+ \item 2019/09/05 v0.9d Add support for \textsf{xspace} and \textsf{stfloats}
+ \item 2020/02/25 v0.9e Add support for \textsf{textpos}
\end{itemize}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plautopatch.doc.tlpobj new/tlpkg/tlpobj/plautopatch.doc.tlpobj
--- old/tlpkg/tlpobj/plautopatch.doc.tlpobj 2019-02-28 03:59:49.000000000 +0100
+++ new/tlpkg/tlpobj/plautopatch.doc.tlpobj 2020-02-26 01:55:04.000000000 +0100
@@ -1,11 +1,10 @@
name plautopatch.doc
category Package
-revision 49288
+revision 53906
shortdesc doc files of plautopatch
relocated 1
-docfiles size=41
+docfiles size=40
RELOC/doc/latex/plautopatch/LICENSE
- RELOC/doc/latex/plautopatch/Makefile
RELOC/doc/latex/plautopatch/README.md
RELOC/doc/latex/plautopatch/plautopatch-ja.pdf
RELOC/doc/latex/plautopatch/plautopatch-ja.tex
++++++ plautopatch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/plarydshln.sty new/tex/latex/plautopatch/plarydshln.sty
--- old/tex/latex/plautopatch/plarydshln.sty 2018-10-27 23:38:45.000000000 +0200
+++ new/tex/latex/plautopatch/plarydshln.sty 2020-02-25 23:00:24.000000000 +0100
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * arydshln.sty
-% (2004/08/31 v1.71 -- 2018/09/26 v1.74)
+% (2004/08/31 v1.71 -- 2019/02/21 v1.76)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+% (2001/09/26 v1.2a -- 2019/02/08 v1.3b)
%
%% package declaration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/plautopatch.sty new/tex/latex/plautopatch/plautopatch.sty
--- old/tex/latex/plautopatch/plautopatch.sty 2018-12-01 00:18:04.000000000 +0100
+++ new/tex/latex/plautopatch/plautopatch.sty 2020-02-25 23:00:24.000000000 +0100
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose!
\ProvidesPackage{plautopatch}
- [2018/11/25 v0.9b Automated patches for pLaTeX/upLaTeX]
+ [2020/02/25 v0.9e Automated patches for pLaTeX/upLaTeX]
\ifx\pfmtname\@undefined
\PackageWarningNoLine{plautopatch}{%
@@ -189,12 +189,18 @@
\platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools
\platpc@patch@before{ftnright}{pxftnright}% platex-tools
\platpc@patch@after{multicol}{pxmulticol}% platex-tools
+\platpc@patch@after{xspace}{pxxspace}% platex-tools
+\platpc@patch@after{textpos}{pxtextpos}% (maintained here!)
\platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!)
+\platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!)
% for TikZ/PGF
\platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!)
% --- pxpgfmark is useful on e-(u)pTeX + dvipdfmx
% --- but does no harm for other conditions
+% --- [Update] pgf 2019-01-05 v3.1 (with \gdef\pgfversion{3.1})
+% ---- already supports inter-picture connections
+% ---- so pxpgfmark is no longer required
\platpc@patch@after{pgfcore}{pxpgfmark}% by Takayuki YATO (ZR)
% special case, mainly for problematic packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/pldocverb.sty new/tex/latex/plautopatch/pldocverb.sty
--- old/tex/latex/plautopatch/pldocverb.sty 2018-12-01 00:18:04.000000000 +0100
+++ new/tex/latex/plautopatch/pldocverb.sty 2020-02-25 23:00:24.000000000 +0100
@@ -9,7 +9,7 @@
% * doc.sty
% (2004/02/09 v2.1b -- 2018/09/25 v2.1i)
% * plcore.ltx in platex
-% (2001/09/26 v1.2a -- 2018/09/02 v1.3)
+% (2001/09/26 v1.2a -- 2019/02/08 v1.3b)
%
%% package declaration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/plextarydshln.sty new/tex/latex/plautopatch/plextarydshln.sty
--- old/tex/latex/plautopatch/plextarydshln.sty 2018-10-27 23:38:45.000000000 +0200
+++ new/tex/latex/plautopatch/plextarydshln.sty 2019-06-06 23:49:00.000000000 +0200
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * arydshln.sty
-% (2004/08/31 v1.71 -- 2018/09/26 v1.74)
+% (2004/08/31 v1.71 -- 2019/02/21 v1.76)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/09/20 v1.2j)
+% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
%
%% package declaration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/plextcolortbl.sty new/tex/latex/plautopatch/plextcolortbl.sty
--- old/tex/latex/plautopatch/plextcolortbl.sty 2018-09-21 23:07:02.000000000 +0200
+++ new/tex/latex/plautopatch/plextcolortbl.sty 2019-06-06 23:49:00.000000000 +0200
@@ -7,9 +7,9 @@
%
% This package is expected to be compatible with
% * colortbl.sty
-% (2012/06/21 v1.0b -- 2018/05/02 v1.0c)
+% (2012/06/21 v1.0b -- 2018/12/12 v1.0d)
% * plext.sty in platex
-% (2001/09/26 v1.2 -- 2018/09/20 v1.2j)
+% (2001/09/26 v1.2 -- 2018/10/07 v1.2k)
%
%% package declaration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/plsiunitx.sty new/tex/latex/plautopatch/plsiunitx.sty
--- old/tex/latex/plautopatch/plsiunitx.sty 2018-12-01 00:18:04.000000000 +0100
+++ new/tex/latex/plautopatch/plsiunitx.sty 2019-06-06 23:49:00.000000000 +0200
@@ -4,7 +4,7 @@
%
% This package is part of the plautopatch bundle.
% https://github.com/aminophen/plautopatch
-% (mostly based on lltjp-siunitx.sty 2018-11-02)
+% (mostly based on lltjp-siunitx.sty 2019-06-06)
%
% This package is expected to be compatible with
% * siunitx.sty
@@ -16,7 +16,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plsiunitx}
- [2018/11/04 v0.2 siunitx package for pLaTeX/upLaTeX]
+ [2019/06/06 v0.3 siunitx package for pLaTeX/upLaTeX]
\RequirePackageWithOptions{siunitx}
\RequirePackage{plarray}% siunitx requires array
@@ -27,22 +27,41 @@
%% inhibit JFM glue around tabular cell components (pLaTeX2e 2018/03/09)
\@ifl@t@r{\pfmtversion}{2017/07/29}{\@firstofone}{\@gobble}
{% = for pLaTeX2e 2017/07/29 or newer
+%
%% new table column: S and s
+\bool_new:N \l__platpc_siunitx_table_collect_relax_bool
+\cs_set_protected:Npn \__siunitx_table_collect_begin_s: {
+ \bool_set_false:N \l__platpc_siunitx_table_collect_relax_bool
+ \cs_set_eq:NN \__siunitx_table_collect_token:N
+ \__siunitx_table_collect_token_s:N
+ \cs_set_eq:NN \__siunitx_table_print: \__siunitx_table_print_s:
+ \__siunitx_table_collect_init_s:
+ \__siunitx_table_collect_get:
+}
+%
\@ifpackageloaded{mdwtab}{}{%
\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
{
- \token_if_eq_meaning:NNF #1 \relax {
- \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
- \token_if_eq_meaning:NNF #1 \removejfmglue {
- \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
- {
- \token_if_eq_meaning:NNF #1 \tex_unskip:D
- { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+ \token_if_eq_meaning:NNTF #1 \tex_relax:D {
+ \bool_if:NTF \l__platpc_siunitx_table_collect_relax_bool {
+ \__siunitx_table_collect_not_braced_aux_i:N #1
+ } {
+ \bool_set_true:N \l__platpc_siunitx_table_collect_relax_bool
}
- }}}
+ } {
+ \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
+ \token_if_eq_meaning:NNF #1 \removejfmglue {
+ \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
+ {
+ \token_if_eq_meaning:NNF #1 \tex_unskip:D
+ { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+ }
+ }}
+ }
\__siunitx_table_collect_next:
}
}
+%
}% =
%
%% done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/pxstfloats.sty new/tex/latex/plautopatch/pxstfloats.sty
--- old/tex/latex/plautopatch/pxstfloats.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/plautopatch/pxstfloats.sty 2019-09-06 00:25:35.000000000 +0200
@@ -0,0 +1,106 @@
+%
+% pxstfloats.sty
+% written by Hironobu Yamashita (@aminophen)
+%
+% This package is actually part of the pxsttools bundle, but
+% for now distributed as part of the plautopatch bundle.
+% https://github.com/aminophen/plautopatch
+%
+% This package `pxstfloats.sty' is based on:
+% * stfloats.sty in sttools (2016/06/28 v3.2)
+% Many thanks to lltjp-stfloats.sty in LuaTeX-ja project.
+%
+
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesPackage{pxstfloats}
+ [2017/02/19 v0.2 stfloats package for pLaTeX]
+\RequirePackage{stfloats}
+
+%% mostly based on \fn@makecol in stfloats.sty, and
+%% the additions for supporting pLaTeX are based on
+%% pLaTeX2e 2017/04/08 community ed.
+%% the code is essentially compatible with
+%% fnpos.sty (yafoot) 1999/07/14 v1.0
+%% |\makeFNmid| + |\makeFNbelow| status.
+\gdef\pxstfl@fnbelowfl@makecol{%
+ \setbox\@outputbox \box\@cclv
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \@combinefloats
+ \ifvoid\footins
+ \else
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \unvbox \@outputbox
+ \vskip \skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup
+ }%
+ \fi
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \setbox\@outputbox \vbox to\@colht {%
+ \@texttop
+ \dimen@ \dp\@outputbox
+ \unvbox \@outputbox
+ \iftdir\vbox{\hskip\z@}\fi %% for pLaTeX
+ \vskip -\dimen@
+ \@textbottom
+ }%
+ \fi
+ \global \maxdepth \@maxdepth
+}
+
+%% mostly based on \@makecol in latex.ltx, and
+%% the additions for supporting pLaTeX are based on
+%% pLaTeX2e 2017/04/08 community ed.
+%% the code is essentially compatible with
+%% fnpos.sty (yafoot) 1999/07/14 v1.0
+%% |\makeFNmid| + |\makeFNabove| status.
+\gdef\pxstfl@fnabovefl@makecol {%
+ \ifvoid\footins
+ \setbox\@outputbox \box\@cclv
+ \else
+ \setbox\@outputbox \vbox {%
+ \boxmaxdepth \@maxdepth
+ \unvbox \@cclv
+ \vskip \skip\footins
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \unvbox \footins
+ \color@endgroup
+ }%
+ \fi
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \@combinefloats
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \setbox\@outputbox \vbox to\@colht {%
+ \@texttop
+ \dimen@ \dp\@outputbox
+ \unvbox \@outputbox
+ \iftdir\vbox{\hskip\z@}\fi %% for pLaTeX
+ \vskip -\dimen@
+ \@textbottom
+ }%
+ \fi
+ \global \maxdepth \@maxdepth
+}
+
+%% the definition \fnunderfloat is unnecessary, as stfloats.sty
+%% has already defined it. others should be re-declared here
+\def\fnbelowfloat{\global\let\@makecol\pxstfl@fnbelowfl@makecol}
+\def\fnabovefloat{\global\let\@makecol\pxstfl@fnabovefl@makecol}
+
+%% all done
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/plautopatch/pxtextpos.sty new/tex/latex/plautopatch/pxtextpos.sty
--- old/tex/latex/plautopatch/pxtextpos.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/plautopatch/pxtextpos.sty 2020-02-25 23:00:24.000000000 +0100
@@ -0,0 +1,85 @@
+%
+% pxtextpos.sty
+% written by Hironobu Yamashita (@aminophen)
+%
+% This package is part of the plautopatch bundle.
+% https://github.com/aminophen/plautopatch
+%
+% This package is expected to be compatible with
+% * textpos.sty
+% 2005/10/13 v1.6a -- 2019/04/15 v1.9.1
+%
+
+%% package declaration
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{pxtextpos}
+ [2019/11/17 v0.2a Patch to textpos for (u)pLaTeX]
+
+%% preparations
+\def\pxtxtpos@pkgname{pxtextpos}
+\def\pxtxtpos@warn{\PackageWarningNoLine\pxtxtpos@pkgname}
+
+%% load it
+\RequirePackageWithOptions{textpos}
+
+%% check if \iftombow ... \fi is available
+\ifx\tombowtrue\@undefined
+ \pxtxtpos@warn{Tombow feature unavailable, aborting}
+ \expandafter\endinput
+\fi
+
+%% known definition
+\def\pxtxtpos@textblockorigin#1#2{%
+ \ifTP@abspos
+ \TP@ox=-1in \addtolength\TP@ox{#1}
+ \TP@oy=-1in \addtolength\TP@oy{#2}
+ \ifTP@chatter\typeout{TextBlockOrigin set to #1 x #2}\fi
+ \else
+ \PackageError{textpos}
+ {The \protect\textblockorigin\space command\MessageBreak
+ may only be used if the package was given\MessageBreak
+ the`absolute' option when it was invoked}
+ {If you want to use the \protect\textblockorigin\space command, then
+ \MessageBreak
+ invoke the package with the syntax\MessageBreak
+ \protect\usepackage[absolute]{textpos}}
+ \fi
+}
+\@onlypreamble\pxtxtpos@textblockorigin
+
+%% redefine it
+\ifx\textblockorigin\pxtxtpos@textblockorigin\else
+ \pxtxtpos@warn{%
+ Command \noexpand\textblockorigin is beyond my knowledge.\MessageBreak
+ I will apply the patch anyway, but it may break:\MessageBreak
+ Please report to the author of `\pxtxtpos(a)pkgname.sty'}
+\fi
+\def\textblockorigin#1#2{%
+ \ifTP@abspos
+ \TP@ox=-1in \addtolength\TP@ox{#1}
+ \TP@oy=-1in \addtolength\TP@oy{#2}
+ %%% addition
+ \iftombow
+ \addtolength\TP@ox{1in}\addtolength\TP@oy{1in}
+ \fi
+ %%%
+ \ifTP@chatter\typeout{TextBlockOrigin set to #1 x #2}\fi
+ \else
+ \PackageError{textpos}
+ {The \protect\textblockorigin\space command\MessageBreak
+ may only be used if the package was given\MessageBreak
+ the`absolute' option when it was invoked}
+ {If you want to use the \protect\textblockorigin\space command, then
+ \MessageBreak
+ invoke the package with the syntax\MessageBreak
+ \protect\usepackage[absolute]{textpos}}
+ \fi
+}
+
+%% reset
+\ifTP@abspos
+ \textblockorigin{0pt}{0pt}%
+\fi
+
+\endinput
+%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plautopatch.tlpobj new/tlpkg/tlpobj/plautopatch.tlpobj
--- old/tlpkg/tlpobj/plautopatch.tlpobj 2019-02-28 03:59:49.000000000 +0100
+++ new/tlpkg/tlpobj/plautopatch.tlpobj 2020-02-26 01:55:04.000000000 +0100
@@ -1,6 +1,6 @@
name plautopatch
category Package
-revision 49288
+revision 53906
shortdesc Automated patches for pLaTeX/upLaTeX
relocated 1
longdesc Japanese pLaTeX/upLaTeX formats and packages often conflict
@@ -12,7 +12,7 @@
longdesc necessary. This helps not only to simplify source files, but
longdesc also to make the appearance of working pLaTeX/upLaTeX sources
longdesc similar to those of ordinary LaTeX ones.
-runfiles size=9
+runfiles size=11
RELOC/tex/latex/plautopatch/plarydshln.sty
RELOC/tex/latex/plautopatch/plautopatch.sty
RELOC/tex/latex/plautopatch/pldocverb.sty
@@ -21,9 +21,10 @@
RELOC/tex/latex/plautopatch/plsiunitx.sty
RELOC/tex/latex/plautopatch/pxpdfpages.sty
RELOC/tex/latex/plautopatch/pxpgfrcs.sty
+ RELOC/tex/latex/plautopatch/pxstfloats.sty
+ RELOC/tex/latex/plautopatch/pxtextpos.sty
catalogue-contact-repository https://github.com/aminophen/plautopatch
catalogue-ctan /language/japanese/plautopatch
-catalogue-date 2018-11-25 16:57:26 +0100
catalogue-license bsd3
catalogue-topics japanese debug-supp bugfix
-catalogue-version 0.9b
+catalogue-version 0.9e
++++++ playfair.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/playfair/README new/doc/fonts/playfair/README
--- old/doc/fonts/playfair/README 2014-05-24 00:44:57.000000000 +0200
+++ new/doc/fonts/playfair/README 2019-10-16 22:55:15.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the playfair package, version 2014-05-23.
+This is the README for the playfair package, version 2019-10-15.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
for the PlayFairDisplay family of fonts, designed by Claus Eggers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/playfair.doc.tlpobj new/tlpkg/tlpobj/playfair.doc.tlpobj
--- old/tlpkg/tlpobj/playfair.doc.tlpobj 2019-02-28 03:59:49.000000000 +0100
+++ new/tlpkg/tlpobj/playfair.doc.tlpobj 2020-03-24 02:03:13.000000000 +0100
@@ -1,6 +1,6 @@
name playfair.doc
category Package
-revision 34236
+revision 54512
shortdesc doc files of playfair
relocated 1
docfiles size=30
++++++ playfair.tar.xz ++++++
++++ 6839 lines of diff (skipped)
++++++ plex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/plex/README new/doc/fonts/plex/README
--- old/doc/fonts/plex/README 2019-01-01 23:21:50.000000000 +0100
+++ new/doc/fonts/plex/README 2019-12-07 23:58:11.000000000 +0100
@@ -1,4 +1,4 @@
-This is the README for the plex package, version 2018-12-31.
+This is the README for the plex package, version 2019-12-06.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the IBMPlex families of fonts. Serif, Sans,
@@ -35,9 +35,9 @@
Option condensed for plex-sans selects the condensed
versions as the default. Commands \plexsans and
\plexsanscondensed allow for local use of the non-default
-sans family.
+sans family. Command \plexsanslgr activates the LGR encoding.
-Font encodings supported are OT1, T1, LY1 and TS1 (and LGR
+Font encodings supported are OT1, T1, TS1 and LY1 (and LGR
for plex-sans).
The following options select lighter bold fonts:
@@ -46,7 +46,7 @@
mb medium
tx text
-and the following options select lighter regular fonts
+and the following options select lighter regular fonts:
l light
el extralight
Binary files old/doc/fonts/plex/plex-samples.pdf and new/doc/fonts/plex/plex-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/plex/plex-samples.tex new/doc/fonts/plex/plex-samples.tex
--- old/doc/fonts/plex/plex-samples.tex 2018-03-27 23:24:05.000000000 +0200
+++ new/doc/fonts/plex/plex-samples.tex 2019-12-07 23:58:11.000000000 +0100
@@ -1,11 +1,10 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{plex-serif}
-\usepackage{plex-sans}
+\usepackage[LGR,T1]{fontenc}
+\usepackage[sb]{plex-sans}
+\usepackage[m]{plex-serif}
\usepackage{plex-mono}
\usepackage{lipsum}
\begin{document}
-
\section*{Plex Serif}
\subsection*{Regular}
@@ -28,11 +27,10 @@
1234567890
-
\clearpage
\section*{Plex Sans}
-\sf
+\plexsans
\subsection*{Regular}
\lipsum[1]
@@ -55,11 +53,20 @@
1234567890
+\subsection*{LGR}
+
+{\plexsanslgr\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\\
+}
+
+
\clearpage
\section*{Plex Sans Condensed}
\plexsanscondensed
+
\subsection*{Regular}
\lipsum[1]
@@ -83,7 +90,7 @@
\clearpage
\section*{Plex Mono}
-\tt
+\ttfamily
\subsection*{Regular}
\lipsum[1]
@@ -105,5 +112,10 @@
1234567890
+\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/plex.doc.tlpobj new/tlpkg/tlpobj/plex.doc.tlpobj
--- old/tlpkg/tlpobj/plex.doc.tlpobj 2019-02-28 03:59:50.000000000 +0100
+++ new/tlpkg/tlpobj/plex.doc.tlpobj 2020-03-24 02:03:15.000000000 +0100
@@ -1,9 +1,9 @@
name plex.doc
category Package
-revision 49583
+revision 54512
shortdesc doc files of plex
relocated 1
-docfiles size=20
+docfiles size=86
RELOC/doc/fonts/plex/LICENSE.txt
RELOC/doc/fonts/plex/README
RELOC/doc/fonts/plex/plex-samples.pdf
++++++ plex.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/plex.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new.3606/plex.tar.xz differ: char 26, line 1
++++++ pm-isomath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pm-isomath/README new/doc/latex/pm-isomath/README
--- old/doc/latex/pm-isomath/README 2018-01-21 23:32:31.000000000 +0100
+++ new/doc/latex/pm-isomath/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-The PM-ISOmath package, version 1.0.04 of 2018
-Original author: Claudio Beccari, 2017
-LaTeX Project Public Licence LPPL v.1.3c (or later)
-
-The PM-ISOmath name stands for "Poor Man ISO Math". In substance
- this package is a poor man solution to the task of typesetting
- math fulfilling the ISO regulations "for physical sciences and
- technology" (formerly regulations ISO 31/XI, now ISO\,80000).
- These regulations refer mostly to the family, series and shape
- of fonts to be used with symbols of various nature.
-
-This package gets inspiration from the ISOmath package by Günter
- Milde, but tries to get the same results without using any math
- [font] groups (or families). As pdfLaTeX users may recall, this
- typesetting program may see at maximum 16 math [font] groups (or
- math font families); sometimes this number results in an error
- that forbids the user to use the symbols s/he needs.
-
-The trick used in this package consists in employing text fonts
- within the \text command (defined by the amsmath package that,
- therefore, is a dependence to which pm-isomath is subjected) and
- chose text font families, series, and shapes to be used within
- that command argument.
-
-The commands are such as to fulfil some math requirements; for
- example while in the scope of the \boldmath declaration, the
- series is automatically set to bold without any user intervention.
- The font size is automatically taken care by \text, so that fonts
- have the correct size also while typesetting exponents or subscripts.
-
-Nevertheless, through proper advanced command options, the user
- remains the person principally responsible of using the right
- font for the right symbol in a document that must fulfil the
- ISO regulations.
-
-This package is usable only with pdfLaTeX; LuaLaTeX and XeLaTeX
- can access OpenType math fonts through the package unicode-math,
- and with the "math-style=ISO" option they have the math switching
- commands agree with the ISO regulations.
-
-pdfLATeX users have available some packages to fulfil the ISO
- requirements; principally the ISOmath package that is subject
- to a number of limitations due the the particular math environment
- of the user, and libertinust1math that produces a complete set-up
- with math fonts that match very well text fonts that are darker
- than the standard default Computer Modern ones (including the
- CM-super and the Latin Modern ones).
-
-This package works very well with the Latin Modern fonts; in
- practice in math mode it uses the same Latin text fonts, and
- the corresponding families, series, and shapes of the LGR
- encoded CBfonts; it may work also with the CM and the CM-super
- fonts, but the original author never uses them, therefore he
- cannot guarantee any suitable result.
-
-For installation of this package, simply run the pm-isomath.dtx
- through pdfLaTeX (and only pdfLaTeX); move the produced sty file
- to the .../tex/latex/pm-isomath/ folder; if it does not exist,
- create it; similarly move pm-isomath.dtx to .../source/latex/pm-isomath/
- and pm-isomath.pdf to .../doc/latex/pm-isomath/.
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pm-isomath/README.txt new/doc/latex/pm-isomath/README.txt
--- old/doc/latex/pm-isomath/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pm-isomath/README.txt 2020-04-20 00:12:52.000000000 +0200
@@ -0,0 +1,31 @@
+%%
+%% This is file `README.txt',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pm-isomath.dtx (with options: `txt')
+%% ______________________________________________________
+%% The PM-ISOmath bundle
+%% Copyright (C) 2017-2020 Claudio Beccari
+%% All rights reserved
+%%
+%% License information appended
+%%
+\ProvidesFile{README.txt}[%
+
+
+%%
+%%
+%% 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 "maintained"
+%%
+%% This work consists of this file pm-isomath.dtx, a README.txt file
+%% and the derived files:
+%% pm-isomath.sty, pm-isomath.pdf.
+%%
+%%
+%% End of file `README.txt'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pm-isomath/manifest.txt new/doc/latex/pm-isomath/manifest.txt
--- old/doc/latex/pm-isomath/manifest.txt 2018-01-21 23:32:31.000000000 +0100
+++ new/doc/latex/pm-isomath/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-This is the manifest.txt file that accompanies the package PM-ISOmath,
-version 1.0.04 of 2018
-
-Original author: Claudio Beccari, 2017-2018
-
-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 itself and every derived work are subject to the above
-licence.
-
-This work has the LPPL maintenance status "author-maintained".
-
-The actual maintainer (2018) is Claudio Beccari:
-claudio dot beccari at gmail dot com
-
-This work consists of the files listed in manifest.txt, that is:
- manifest.txt
- README
- pm-isomath.dtx
-
-The derived files are
- pm-isomath.pdf
- pm-isomath.sty
-
-The pm-isomath.dtx file is a self extracting and self documenting
-one; if you run pdflatex (and only pdflatex) on it you get at the
-same time the English documentation and the package file.
-
-The derived file pm-isomath.sty may be used only with pdflatex.
Binary files old/doc/latex/pm-isomath/pm-isomath.pdf and new/doc/latex/pm-isomath/pm-isomath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pm-isomath.doc.tlpobj new/tlpkg/tlpobj/pm-isomath.doc.tlpobj
--- old/tlpkg/tlpobj/pm-isomath.doc.tlpobj 2019-02-28 04:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/pm-isomath.doc.tlpobj 2020-04-20 01:55:53.000000000 +0200
@@ -1,9 +1,8 @@
name pm-isomath.doc
category Package
-revision 46402
+revision 54799
shortdesc doc files of pm-isomath
relocated 1
-docfiles size=147
- RELOC/doc/latex/pm-isomath/README
- RELOC/doc/latex/pm-isomath/manifest.txt
+docfiles size=146
+ RELOC/doc/latex/pm-isomath/README.txt
RELOC/doc/latex/pm-isomath/pm-isomath.pdf
++++++ pm-isomath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pm-isomath/pm-isomath.sty new/tex/latex/pm-isomath/pm-isomath.sty
--- old/tex/latex/pm-isomath/pm-isomath.sty 2018-01-21 23:32:31.000000000 +0100
+++ new/tex/latex/pm-isomath/pm-isomath.sty 2020-04-20 00:12:52.000000000 +0200
@@ -7,14 +7,14 @@
%% pm-isomath.dtx (with options: `style')
%% ______________________________________________________
%% The PM-ISOmath bundle
-%% Copyright (C) 2017 Claudio Beccari
+%% Copyright (C) 2017-2020 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
\NeedsTeXFormat{LaTeX2e}[2017/01/01]
\ProvidesPackage{pm-isomath}[%
-2018/01/12 v.1.0.04
+2020/04/18 v.1.0.05
Poor man package for typesetting ISO compliant math when using pdfLaTeX]
@@ -138,12 +138,14 @@
\csname mathit \endcsname\fi
\def\ISOsha{it}\expandafter\use@mathgroup
\csname M@OT1\endcsname{9}}
-\newcommand\mathbfit[1]{\MathLatin{#1}{lmr}[bx](it)}
-\newcommand\mathsfit[1]{\MathLatin{#1}{lmss}[m](sl)}
-\newcommand\mathsfbfit[1]{\MathLatin{#1}{lmss}[bx](sl)}
+\AtBeginDocument{%
+\providecommand\mathbfit[1]{\MathLatin{#1}{lmr}[bx](it)}
+\providecommand\mathsfit[1]{\MathLatin{#1}{lmss}[m](sl)}
+\providecommand\mathsfbfit[1]{\MathLatin{#1}{lmss}[bx](sl)}}
+\AtBeginDocument{%
\let\vectorsymbol\mathbfit
\let\matrixsymbol\mathbfit
-\let\tensorsymbol\mathsfbfit
+\let\tensorsymbol\mathsfbfit}
\newcommand\iunit{\MathLatin{i}(n)}
\newcommand\junit{\MathLatin{j}(n)}
\ifengineer
@@ -158,8 +160,8 @@
\providecommand*\diff{}
\renewcommand*\diff{\ensuremath{\mathop{}\!\MathLatin{d}(n)}}
\providecommand*\micro{}
-\renewcommand*\micro{\textormath{\ifcsdef{textmicro}%
-{\textmicro}{\ISOmu(rs)}}{\ISOmu(rs)}}
+\renewcommand*\micro{%
+\textormath{\ifcsdef{textmicro}{\textmicro}{\ISOmu(rs)}}{\ISOmu(rs)}}
\providecommand*\ohm{}
\AtBeginDocument{\@ifpackageloaded{textcomp}{%
\renewcommand*\ohm{\textormath{{\textohm}}{\ISOOmega(n)}}}%
@@ -180,16 +182,15 @@
\fi}
%%
-%% Copyright 2017 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 is "maintained"
%%
-%% This work consists of this file pm-isomath.dtx, a README file
-%% the manifest.txt file, and the derived files:
+%% This work consists of this file pm-isomath.dtx, a README.txt file
+%% and the derived files:
%% pm-isomath.sty, pm-isomath.pdf.
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pm-isomath.tlpobj new/tlpkg/tlpobj/pm-isomath.tlpobj
--- old/tlpkg/tlpobj/pm-isomath.tlpobj 2019-02-28 04:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/pm-isomath.tlpobj 2020-04-20 01:55:53.000000000 +0200
@@ -1,6 +1,6 @@
name pm-isomath
category Package
-revision 46402
+revision 54799
shortdesc Poor man ISO math for pdfLaTeX users
relocated 1
longdesc This small package realizes a poor man approximation of the ISO
@@ -12,7 +12,6 @@
runfiles size=2
RELOC/tex/latex/pm-isomath/pm-isomath.sty
catalogue-ctan /macros/latex/contrib/pm-isomath
-catalogue-date 2018-01-21 19:26:54 +0100
catalogue-license lppl1.3c
catalogue-topics maths physics
-catalogue-version 1.0.04
+catalogue-version 1.0.05
++++++ pmx.doc.tar.xz ++++++
++++ 12625 lines of diff (skipped)
++++++ pmx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pmx/pmx2pdf.lua new/texmf-dist/scripts/pmx/pmx2pdf.lua
--- old/texmf-dist/scripts/pmx/pmx2pdf.lua 2018-03-05 01:11:40.000000000 +0100
+++ new/texmf-dist/scripts/pmx/pmx2pdf.lua 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/usr/bin/env texlua
-
-print ("The pmx2pdf[.lua] script has been retired; please switch")
-print ("to the musixtex script, which now processes .pmx files.")
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/pmx/pmx.tex new/texmf-dist/tex/generic/pmx/pmx.tex
--- old/texmf-dist/tex/generic/pmx/pmx.tex 2018-03-05 01:11:40.000000000 +0100
+++ new/texmf-dist/tex/generic/pmx/pmx.tex 2020-03-04 00:20:40.000000000 +0100
@@ -4,7 +4,8 @@
%% %%
%%%%%%%%%%%%%%%%%%%%%%%
\ifx\pmxversion\undefined\else\endinput\fi
-\def\pmxversion{2.80}\def\pmxdate{15 Mar 17}
+\def\pmxversion{2.94}\def\pmxdate{23 Jan 20}
+% 2.94 add def'ns of \hbp, \hbpp
% 2.80 add def'n of \slx, real stemlength
% 2.73 4 Feb 16 Fix \pmxclefsym to include \smalltreblelowoct
% 2.73 Added \pmxlyr command.
@@ -765,8 +766,10 @@
% 160103 back to 3 args
%
\def\mbgap{\qsk\hqsk}%
+\def\mbrhgt{9}%
\def\mbrest#1#2#3{%
-\CenterBar{\ccn{9}{\meterfont#1}}{#2}{#3}%
+%\CenterBar{\ccn{9}{\meterfont#1}}{#2}{#3}%
+\CenterBar{\ccn{\mbrhgt}{\meterfont#1}}{#2}{#3}%
\CenterBar{%
\ifcase #1%
\relax%
@@ -850,7 +853,17 @@
%
\def\lk{\lyrlink}%
\def\at#1{\lyrraisehere{#1\internote}}%
-
+%
+% 190526 Items for short line enhancements
+%
+\let\wbnt\writebarno
+\def\nobarno{\gdef\writebarno{\global\let\writebarno\wbnt}}
+%
+% 200123 Open headed dotted chord notes
+%
+\def\hbp{\h@symbol\@qbp}%
+\def\hbpp{\h@symbol\@qbpp}%
+%
\catcode`\@=\catcodeat
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pmx.tlpobj new/tlpkg/tlpobj/pmx.tlpobj
--- old/tlpkg/tlpobj/pmx.tlpobj 2019-02-28 04:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/pmx.tlpobj 2020-03-23 01:56:28.000000000 +0100
@@ -1,6 +1,6 @@
name pmx
category Package
-revision 46823
+revision 54488
shortdesc Preprocessor for MusiXTeX
longdesc PMX provides a preprocessor for MusiXTeX. pmxab builds a TeX
longdesc input file based on a .pmx input file in a much simpler
@@ -10,12 +10,10 @@
longdesc proof-listening, pmxab will make a MIDI file of your score.
longdesc scor2prt is an auxiliary program that makes parts from a score.
depend pmx.ARCH
-runfiles size=9
- texmf-dist/scripts/pmx/pmx2pdf.lua
+runfiles size=8
texmf-dist/tex/generic/pmx/pmx.tex
catalogue-contact-home http://icking-music-archive.org/software/indexmt6.html
catalogue-ctan /support/pmx
-catalogue-date 2018-02-13 05:43:04 +0100
catalogue-license gpl2
catalogue-topics music
-catalogue-version 2.84
+catalogue-version 2.94
++++++ poemscol.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/poemscol/README new/doc/latex/poemscol/README
--- old/doc/latex/poemscol/README 2015-06-30 23:27:12.000000000 +0200
+++ new/doc/latex/poemscol/README 2019-08-03 23:57:48.000000000 +0200
@@ -1,6 +1,6 @@
POEMSCOL.STY
-(c) John Burt 2015
-Released under the LaTeX public license
+(c) John Burt 2002-2019
+Released under the LaTeX public license 1.3c
poemscol.sty is a set of LaTeX macros for typesetting critical editions of
poetry. Its features include automatic linenumbering, generation of
Binary files old/doc/latex/poemscol/poemscol.pdf and new/doc/latex/poemscol/poemscol.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poemscol.doc.tlpobj new/tlpkg/tlpobj/poemscol.doc.tlpobj
--- old/tlpkg/tlpobj/poemscol.doc.tlpobj 2019-02-28 04:00:06.000000000 +0100
+++ new/tlpkg/tlpobj/poemscol.doc.tlpobj 2019-10-30 01:55:55.000000000 +0100
@@ -1,9 +1,9 @@
name poemscol.doc
category Package
-revision 46433
+revision 52574
shortdesc doc files of poemscol
relocated 1
-docfiles size=177
+docfiles size=191
RELOC/doc/latex/poemscol/README
RELOC/doc/latex/poemscol/poemscol.pdf
RELOC/doc/latex/poemscol/poemscolcheatsheet.pdf
++++++ poemscol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/poemscol/poemscol.sty new/tex/latex/poemscol/poemscol.sty
--- old/tex/latex/poemscol/poemscol.sty 2018-01-24 22:51:12.000000000 +0100
+++ new/tex/latex/poemscol/poemscol.sty 2019-10-29 22:24:43.000000000 +0100
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{poemscol}
- [2018/01/11 v2.98 poemscol file]
+ [2019/10/29 v3.141 poemscol file]
%|\prosexyznote|
%%
@@ -89,17 +89,124 @@
\newcommand{\notessequenceclubpenalty}{\penalty-1500}
\newcommand{\notesvolumetitlepenalty}{\penalty-1500}
\hfuzz=2pt
-\newcommand{\verseindent}{\hspace{2em}}
+\newlength{\verseindentamount}
+\setlength{\verseindentamount}{2em}
+\newcount\l@@pcounter
+\newcommand{\repeatedindent}[1]{\l@@pcounter=#1%
+\loop%
+\ifnum\l@@pcounter>0%
+\hspace{\verseindentamount}%
+\advance \l@@pcounter -1
+\repeat}
+\newcommand{\verseindent}[1][]{%
+\ifthenelse{\equal{#1}{}}{\hspace{\verseindentamount}}{\repeatedindent{#1}}}
+\newlength{\indentedstanzaamount}
+\setlength{\indentedstanzaamount}{\verseindentamount}
+\newlength{\variablestanzaamount}
+\setlength{\variablestanzaamount}{\indentedstanzaamount}
+\newcommand{\adjustst@nzaindent}[1]{\l@@pcounter=#1%
+\loop%
+ \addtolength{\variablestanzaamount}{\indentedstanzaamount}%
+ \advance \l@@pcounter -1%
+\ifnum \l@@pcounter>0
+\repeat}
+\newif\ifinindentedverse
+\newenvironment{indentedverse}[1][]{%
+\inindentedversetrue%
+\ifthenelse{\equal{#1}{}}{\relax}{\adjustst@nzaindent{#1}}%
+\let\\=\@centercr%
+\list{}{\itemsep\z@ \itemindent -\runoverindentvalue\listparindent \itemindent
+\rightmargin 0sp\leftmargin 0sp\advance\leftmargin
+\variablestanzaamount}\item[]}
+{\endlist\inindentedversefalse\setlength{\variablestanzaamount}{\indentedstanzaamount}}
\setlength{\columnsep}{15pt}
-\newdimen\titleindentamount \titleindentamount=1pc
-\newdimen\titleindenttwoamount \titleindenttwoamount=2pc
-\newdimen\titleindentthreeamount \titleindentthreeamount=3pc
+\newlength{\titleindentamount}
+\setlength{\titleindentamount}{1pc}
+\newlength{\titleindenttwoamount}
+\setlength{\titleindenttwoamount}{2pc}
+\newlength{\titleindentthreeamount}
+\setlength{\titleindentthreeamount}{3pc}
\newcommand{\titleindent}{\hspace{\titleindentamount}}
-\setlength{\parindent}{\titleindentamount}
-\newcommand{\afterpoemtitleskip}{\smallskip}
-\newcommand{\afterpoemskip}{\bigskip}
-\newcommand{\aftersequencetitleskip}{\medskip}
-\newcommand{\stanzaskip}{\medskip}
+\setlength{\parindent}{1pc}
+\newlength{\volumetitleindentamount}
+\setlength{\volumetitleindentamount}{0pt}
+\newcommand{\volumetitleindent}{\relax}
+\newlength{\volumetitlesecondlineindentamount}
+\setlength{\volumetitlesecondlineindentamount}{0pt}
+\newcommand{\volumetitlesecondlineindent}{\relax}
+\newlength{\volumesubtitleindentamount}
+\setlength{\volumesubtitleindentamount}{\titleindentamount}
+\newcommand{\volumesubtitleindent}{\hspace{\volumesubtitleindentamount}}
+\newlength{\volumesubtitlesecondlineindentamount}
+\setlength{\volumesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\volumesubtitlesecondlineindent}{\hspace{\volumesubtitlesecondlineindentamount}}
+\newlength{\volumesectiontitleindentamount}
+\setlength{\volumesectiontitleindentamount}{0pt}
+\newcommand{\volumesectiontitleindent}{\relax}
+\newlength{\volumesectiontitlesecondlineindentamount}
+\setlength{\volumesectiontitlesecondlineindentamount}{0pt}
+\newcommand{\volumesectiontitlesecondlineindent}{\relax}
+\newlength{\poemtitleindentamount}
+\setlength{\poemtitleindentamount}{0pt}
+\newcommand{\poemtitleindent}{\relax}
+\newlength{\poemtitlesecondlineindentamount}
+\setlength{\poemtitlesecondlineindentamount}{0pt}
+\newcommand{\poemtitlesecondlineindent}{\relax}
+\newlength{\poemsubtitleindentamount}
+\setlength{\poemsubtitleindentamount}{\titleindentamount}
+\newcommand{\poemsubtitleindent}{\hspace{\poemsubtitleindentamount}}
+\newlength{\poemsectiontitleindentamount}
+\setlength{\poemsectiontitleindentamount}{\titleindentamount}
+\newcommand{\poemsectiontitleindent}{\hspace{\poemsectiontitleindentamount}}
+\newlength{\poemsectiontitlesecondlineindentamount}
+\setlength{\poemsectiontitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\poemsectiontitlesecondlineindent}{\hspace{\poemsectiontitlesecondlineindentamount}}
+\newlength{\poemsubsectiontitleindentamount}
+\setlength{\poemsubsectiontitleindentamount}{\titleindenttwoamount}
+\newcommand{\poemsubsectiontitleindent}{\hspace{\poemsectiontitleindentamount}}
+\newlength{\sequencetitleindentamount}
+\setlength{\sequencetitleindentamount}{0pt}
+\newcommand{\sequencetitleindent}{\relax}
+\newlength{\sequencetitlesecondlineindentamount}
+\setlength{\sequencetitlesecondlineindentamount}{0pt}
+\newcommand{\sequencetitlesecondlineindent}{\hspace{\relax}}
+\newlength{\sequencesubtitleindentamount}
+\setlength{\sequencesubtitleindentamount}{\titleindentamount}
+\newcommand{\sequencesubtitleindent}{\hspace{\sequencesubtitleindentamount}}
+\newlength{\sequencesubtitlesecondlineindentamount}
+\setlength{\sequencesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\sequencesubtitlesecondlineindent}{\hspace{\sequencesubtitlesecondlineindentamount}}
+\newlength{\sequencesectiontitleindentamount}
+\setlength{\sequencesectiontitleindentamount}{\titleindentamount}
+\newcommand{\sequencesectiontitleindent}{\hspace{\sequencesectiontitleindentamount}}
+\newlength{\sequencesectiontitlesecondlineindentamount}
+\setlength{\sequencesectiontitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\sequencesectiontitlesecondlineindent}{\hspace{\sequencesectiontitlesecondlineindentamount}}
+\newlength{\sequencesectionsubtitleindentamount}
+\setlength{\sequencesectionsubtitleindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesectionsubtitleindent}{\hspace{\sequencesectionsubtitleindentamount}}
+\newlength{\sequencesectionsubtitlesecondlineindentamount}
+\setlength{\sequencesectionsubtitlesecondlineindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesectionsubtitlesecondlineindent}{\hspace{\sequencesectionsubtitlesecondlineindentamount}}
+\newlength{\sequencesubsectiontitleindentamount}
+\setlength{\sequencesubsectiontitleindentamount}{\titleindenttwoamount}
+\newcommand{\sequencesubsectiontitleindent}{\hspace{\sequencesubsectiontitleindentamount}}
+\newlength{\sequencesubsubsectiontitleindentamount}
+\setlength{\sequencesubsubsectiontitleindentamount}{\titleindentthreeamount}
+\newcommand{\sequencesubsubsectiontitleindent}{\hspace{\sequencesubsubsectiontitleindentamount}}
+\newlength{\appendixtitleindentamount}
+\setlength{\appendixtitleindentamount}{0pt}
+\newcommand{\appendixtitleindent}{\relax}
+\newlength{\subappendixtitleindentamount}
+\setlength{\subappendixtitleindentamount}{0pt}
+\newcommand{\subappendixtitleindent}{\relax}
+\newlength{\forewordtitleindentamount}
+\setlength{\forewordtitleindentamount}{0pt}
+\newcommand{\forewordtitleindent}{\relax}
+\newlength{\notestitleindentamount}
+\setlength{\notestitleindentamount}{0pt}
+\newcommand{\notestitleindent}{\relax}
+
\newdimen\volumetitleshiftamount \volumetitleshiftamount=1pc
\newcommand{\volumetitleshift}{\hbox{\hspace{\volumetitleshiftamount}}}
\newdimen\voladditionalamount \voladditionalamount=2pc
@@ -113,10 +220,130 @@
\newcommand{\contentsindentfour}{\hspace{\contentsindentfouramount}}
\newdimen\contentsindentfiveamount \contentsindentfiveamount=80pt
\newcommand{\contentsindentfive}{\hspace{\contentsindentfiveamount}}
+\newlength{\contentsvolumetitleindentamount}
+\setlength{\contentsvolumetitleindentamount}{0pt}
+\newcommand{\contentsvolumetitleindent}{\relax}
+\newlength{\contentsvolumetitlesecondlineindentamount}
+\setlength{\contentsvolumetitlesecondlineindentamount}{0pt}
+\newcommand{\contentsvolumetitlesecondlineindent}{\relax}
+\newlength{\contentsvolumesubtitleindentamount}
+\setlength{\contentsvolumesubtitleindentamount}{\titleindentamount}
+\newcommand{\contentsvolumesubtitleindent}{\hspace{\contentsvolumesubtitleindentamount}}
+\newlength{\contentsvolumesubtitlesecondlineindentamount}
+\setlength{\contentsvolumesubtitlesecondlineindentamount}{\titleindentamount}
+\newcommand{\contentsvolumesubtitlesecondlineindent}{\hspace{\contentsvolumesubtitlesecondlineindentamount}}
+\newlength{\contentsvolumesectiontitleindentamount}
+\setlength{\contentsvolumesectiontitleindentamount}{0pt}
+\newcommand{\contentsvolumesectiontitleindent}{\hspace{\contentsvolumesectiontitleindentamount}}
+\newlength{\contentsvolumesectiontitlesecondlineindentamount}
+\setlength{\contentsvolumesectiontitlesecondlineindentamount}{0pt}
+\newcommand{\contentsvolumesectiontitlesecondlineindent}{\hspace{\contentsvolumesectiontitlesecondlineindentamount}}
+\newlength{\contentspoemtitleindentamount}
+\setlength{\contentspoemtitleindentamount}{\contentsindentoneamount}
+\newcommand{\contentspoemtitleindent}{\hspace{\contentspoemtitleindentamount}}
+\newlength{\contentspoemtitlesecondlineindentamount}
+\setlength{\contentspoemtitlesecondlineindentamount}{\contentspoemtitleindentamount}
+\newcommand{\contentspoemtitlesecondlineindent}{\hspace{\contentspoemtitlesecondlineindentamount}}
+\newlength{\contentspoemsubtitleindentamount}
+\setlength{\contentspoemsubtitleindentamount}{\contentspoemsubtitleindentamount}
+\newcommand{\contentspoemsubtitleindent}{\hspace{\contentspoemsubtitleindentamount}}
+\newlength{\contentspoemsectiontitleindentamount}
+\setlength{\contentspoemsectiontitleindentamount}{\contentsindenttwoamount}
+\newcommand{\contentspoemsectiontitleindent}{\hspace{\contentspoemsectiontitleindentamount}}
+\newlength{\contentspoemsectiontitlesecondlineindentamount}
+\setlength{\contentspoemsectiontitlesecondlineindentamount}{\contentspoemsectiontitleindentamount}
+\newcommand{\contentspoemsectiontitlesecondlineindent}{\hspace{\contentspoemsectiontitlesecondlineindentamount}}
+\newlength{\contentspoemsubsectiontitleindentamount}
+\setlength{\contentspoemsubsectiontitleindentamount}{\contentsindentthreeamount}
+\newcommand{\contentspoemsubsectiontitleindent}{\hspace{\contentsindentthreeamount}}
+\newlength{\contentssequencetitleindentamount}
+\setlength{\contentssequencetitleindentamount}{\contentsindentoneamount} %313
+ \newcommand{\contentssequencetitleindent}{\hspace{\contentssequencetitleindentamount}}
+\newlength{\contentssequencetitlesecondlineindentamount}
+\setlength{\contentssequencetitlesecondlineindentamount}{\contentsindentoneamount} %313
+ \newcommand{\contentssequencetitlesecondlineindent}{\hspace{\contentssequencetitlesecondlineindentamount}}
+\newlength{\contentssequencesubtitleindentamount}
+\setlength{\contentssequencesubtitleindentamount}{\contentsindenttwoamount} %313
+\newcommand{\contentssequencesubtitleindent}{\hspace{\contentssequencesubtitleindentamount}}
+\newlength{\contentssequencesubtitlesecondlineindentamount}
+\setlength{\contentssequencesubtitlesecondlineindentamount}{\contentsindenttwoamount} %313
+\newcommand{\contentssequencesubtitlesecondlineindent}{\hspace{\contentssequencesubtitlesecondlineindentamount}}
+\newlength{\contentssequencesectiontitleindentamount}
+\setlength{\contentssequencesectiontitleindentamount}{\contentsindenttwoamount} %313
+\newcommand{\contentssequencesectiontitleindent}{\hspace{\contentssequencesectiontitleindentamount}}
+\newlength{\contentssequencesectiontitlesecondlineindentamount}
+\setlength{\contentssequencesectiontitlesecondlineindentamount}{\contentsindenttwoamount} %313
+\newcommand{\contentssequencesectiontitlesecondlineindent}{\hspace{\contentssequencesectiontitlesecondlineindentamount}}
+\newlength{\contentssequencesectionsubtitleindentamount}
+\setlength{\contentssequencesectionsubtitleindentamount}{\contentsindentthreeamount} %313
+\newcommand{\contentssequencesectionsubtitleindent}{\hspace{\contentssequencesectionsubtitleindentamount}}
+\newlength{\contentssequencesectionsubtitlesecondlineindentamount}
+\setlength{\contentssequencesectionsubtitlesecondlineindentamount}{\contentsindentthreeamount}%313
+\newcommand{\contentssequencesectionsubtitlesecondlineindent}{\hspace{\contentssequencesectionsubtitlesecondlineindentamount}}
+\newlength{\contentssequencesubsectiontitleindentamount}
+\setlength{\contentssequencesubsectiontitleindentamount}{\contentsindentthreeamount}
+\newcommand{\contentssequencesubsectiontitleindent}{\hspace{\contentssequencesubsectiontitleindentamount}}
+\newlength{\contentssequencesubsubsectiontitleindentamount}
+\setlength{\contentssequencesubsubsectiontitleindentamount}{\contentsindentfouramount}
+\newcommand{\contentssequencesubsubsectiontitleindent}{\hspace{\contentssequencesubsubsectiontitleindentamount}}
+
+\newcommand{\afterpoemtitleskip}{\smallskip}
+\newcommand{\afterpoemskip}{\bigskip}
+\newcommand{\aftersequencetitleskip}{\medskip}
+\newcommand{\stanzaskip}{\medskip}
\newcommand{\poemtitlepenalty}{\penalty-1000}
\newcommand{\multilinetitlepenalty}{\penalty-3000}
\newcommand{\sequencetitlepenalty}{\penalty-3000}
\newcommand{\multilinesequencepenalty}{\penalty-3500}
+\newlength{\poemtitlewidth}
+\newif\iftitlescenteredonleftverseblock
+\newif\iftitlesatleftmarginofcenteredblock
+\newif\iftitlesatleftversemargin
+\newif\ifnormaltitleindentation
+\newcommand{\normaltitleindentationscheme}{%
+\normaltitleindentationtrue%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlesatleftversemarginscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemargintrue%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlescenteredonleftverseblockscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblocktrue%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesonfalse%
+}
+\newcommand{\titlesatleftmarginofcenteredblockscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblocktrue%
+\centertitlesonfalse%
+}
+\newcommand{\centertitlesscheme}{%
+\normaltitleindentationfalse%
+\titlesatleftversemarginfalse%
+\titlescenteredonleftverseblockfalse%
+\titlesatleftmarginofcenteredblockfalse%
+\centertitlesontrue%
+\centerepigraphsontrue%
+}
+\newlength{\lefttitleaddition}
+\setlength{\lefttitleaddition}{0pt}
+\newcommand{\l@ftc@ntertitleblock}{\rightmargin \z@%%
+\setlength{\lefttitleaddition}{\versewidth}%
+\addtolength{\lefttitleaddition}{-\poemtitlewidth}%
+\addtolength{\lefttitleaddition}{-0.5\lefttitleaddition}%
+\setlength{\lefttitlemargin}{\lefttitleaddition}%
+}
\def\makeatletter{\catcode`\@=11}
\def\makeatother{\catcode`\@=12 }
@@ -369,10 +596,21 @@
\let\\=\@centercr%
\list{}{\topsep\z@%
\partopsep\z@%
-\itemsep\z@ \itemindent -\titleentryoverrun\listparindent \itemindent
- \rightmargin 1sp\leftmargin 1sp\advance\leftmargin
- \titleentryoverrun}\item[]}{\endlist}
+\itemsep\z@ \itemindent -\titleentryoverrun%
+\listparindent \itemindent %
+\iftitlesatleftmarginofcenteredblock%
+\left@ligntitleblock%
+\rightmargin \z@\leftmargin \lefttitlemargin%
+\else%
+\iftitlescenteredonleftverseblock
+\l@ftc@ntertitleblock
+\rightmargin \z@\leftmargin \lefttitlemargin
+\else
+\rightmargin \z@\leftmargin \z@%
+\fi\fi%
+\advance\leftmargin \titleentryoverrun}\item[]}{\endlist}
\newlength{\versewidth}
+\setlength{\versewidth}{\linewidth}% default length for \versewidth
\newenvironment{poem}[1][\linewidth]
{\raggedright%
\language=255%no hyphenation in verse
@@ -632,14 +870,14 @@
\newcommand{\setendnotessectiontitledefaults}[6]{%
#2%
#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
\end{titleentryenvironment}%
#5%
\label{#6}
}
-\newcommand{\setendnotessectiontitle}[2]{
-\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink\begin{center}}{\backmatterheaderfont}
-{\relax}{\end{center}\lefthyphenmin=2\backmatterafterheadersink}{#2}}
+\newcommand{\setendnotessectiontitle}[2]{%
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\notestitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{#2}}
\newcommand{\contentsendnotesdefaults}[4]{\ifpoemcontentson
\immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
\literalcontents{#2{#3#1}}%
@@ -777,21 +1015,104 @@
\newcommand{\@poempagetotextnotes}[1]{%
\immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}\string\unskip}%
\@pagemarktotextnotes{#1}}
-\newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}}
+\newcommand{\@poemtitletotextnotes}[1]{%
+\ifputpagenumberinnotes%
+\literaltextnote{\textbf{#1}}%
+\else%
+\literaltextnote{\par}\literaltextnote{\textbf{#1}}%
+\fi}
+\newif\ifappendixincontents
+\appendixincontentstrue
+\newif\ifforewordincontents
+\forewordincontentstrue
+\newcommand{\appendixdividerpage}[1]{\flushbottom{\par\clearpage
+ {\pagestyle{volumetitlestyle}\cleardoublepage}
+\thispagestyle{volumetitlestyle}}
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[RO,LE]{\small\textrm{\thepage}}
+\fancyhead[CO]{\small{\em #1}}
+\fancyhead[CE]{#1}
+\fancyfoot[C]{}}
+\newcommand{\appendixtitle}[1]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\appendixtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{appdx#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifappendixincontents\contentsendnotestitle{#1}{appdx#1}\fi
+}
+\newcommand{\makeappendix}[1]{%
+\appendixdividerpage{#1}
+\appendixtitle{#1}
+}
+\newcommand{\contentsendnotessubtitle}[2]{
+\contentsendnotesdefaults{#1}{\contentsindenttwo}{\contentsendnotesfont}{#2}
+}
+\newcommand{\subappendixtitle}[1]{%
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\subappendixtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{appdx#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifappendixincontents\contentsendnotessubtitle{#1}{appdx#1}\fi
+}
+\newcommand{\makesubappendix}[1]{%
+\appendixdividerpage{#1}
+\subappendixtitle{#1}
+}
+\newcommand{\foreworddividerpage}[1]{\flushbottom{\par\clearpage
+ {\pagestyle{volumetitlestyle}\cleardoublepage}
+\thispagestyle{volumetitlestyle}}
+\fancyhead{}
+\fancyfoot{}
+\fancyhead[RO,LE]{\small\textrm{\thepage}}
+\fancyhead[CO]{\small{\em #1}}
+\fancyhead[CE]{#1}
+\fancyfoot[C]{}}
+\newcommand{\forewordtitle}[1]{
+\setendnotessectiontitledefaults{#1}{\poemtitlepenalty\backmattersink}{\backmatterheaderfont}
+{\forewordtitleindent}{\lefthyphenmin=2\backmatterafterheadersink}{foreword#1}
+\tolerance=500\language=0
+\normalfont \backmattertextfont
+\setlength{\parindent}{\noteindentation}
+\ifforewordincontents\contentsendnotestitle{#1}{foreword#1}\fi
+}
+\newcommand{\makeforeword}[1]{%
+\foreworddividerpage{#1}
+\forewordtitle{#1}
+}
+\newcommand{\pmclcontentsentrydefaults}[4]{
+\ifpoemcontentson
+\immediate\write\poemcontents{\string\begin\string{contentsentryenvironment\string}}%
+\literalcontents{#2{#3#1}}%
+ \ifputpagenumberincontents
+\immediate\write\poemcontents{\string\contentsleaders}%
+\literalcontents{#4}
+ \else
+ \literalcontents{\relax}%
+ \fi
+\immediate\write\poemcontents{\string\end\string{contentsentryenvironment\string}}%
+\immediate\write\poemcontents{\string\par}%
+\fi
+}
+\newcommand{\pmclcontentsentry}[3]{%
+\pmclcontentsentrydefaults{#1}{#2}{\contentsendnotesfont}{#3}%
+}
\newcommand{\wholebooktitle}[1]{{\Huge\begin{center}
\hbox{#1}\end{center}}
}
\newcommand{\booksection}[1]{\volumesection{#1}}
\newcommand{\volumetitle}[1]{%
\set@p@emtitle{#1}{\volumetitlesink\par}{\volumetitlefont}
- {\relax}{\nobreak\par\nobreak}{\z@}
+ {\volumetitleindent}{\nobreak\par\nobreak}{\z@}
\putpagenumberincontentsfalse
\putpagenumberinnotesfalse
- \literalcontents{\goodbreak}
- \c@ntentsinfo{#1}{\relax}{\contentsvolumefont}
- {\contentsindentoneamount}
- \literalcontents{\vspace{5pt}\par\nobreak}
+ \literalcontents{\par\goodbreak\bigskip}
+ \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+ {\contentsvolumetitleindentamount}
+ \literalcontents{\par\goodbreak\medskip}
\literaltextnote{\notesvolumetitlepenalty\bigskip\goodbreak\par}
\t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
\putpagenumberincontentstrue
@@ -799,42 +1120,45 @@
\newcommand{\volumetitlefirstline}[1]{\firstlinesettings%
\set@p@emtitle{#1}{\volumetitlesink\par}
{\volumetitlefont}
- {\relax}{\nobreak\par\nobreak}{\z@}
+ {\volumetitleindent}{\nobreak\par\nobreak}{\z@}
\putpagenumberincontentsfalse
\putpagenumberinnotesfalse
- \c@ntentsinfo{#1}{\relax}{\contentsvolumefont}
- {\contentsindentoneamount}
+\literalcontents{\par\goodbreak\bigskip}
+ \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+ {\contentsvolumetitleindentamount}
+ \literalcontents{\medskip\par\nobreak}
\t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
\putpagenumberincontentstrue
\putpagenumberinnotestrue}
\newcommand{\volumetitlemiddleline}[1]{\middlelinesettings%
\set@p@emtitle{#1}{\relax}
{\volumetitlefont}
- {\relax}{\nobreak\par\nobreak}{\z@}
+ {\volumetitlesecondlineindent}{\nobreak\par\nobreak}{\z@}
\putpagenumberincontentsfalse
\putpagenumberinnotesfalse
- \c@ntentsinfo{#1}{\contentsindentone}{\contentsvolumefont}
- {\contentsindenttwoamount}
+ \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+ {\contentsvolumetitleindentamount}
+ \literalcontents{\medskip\par\nobreak}
\t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
\putpagenumberincontentstrue
\putpagenumberinnotestrue}
\newcommand{\volumetitlelastline}[1]{\lastlinesettings%
\set@p@emtitle{#1}{\relax}
{\volumetitlefont}
- {\relax}{\nobreak\par\nobreak}{\z@}
+ {\volumetitlesecondlineindent}{\nobreak\par\nobreak}{\z@}
\putpagenumberincontentsfalse
\putpagenumberinnotesfalse
- \c@ntentsinfo{#1}{\contentsindentone}{\contentsvolumefont}
- {\contentsindenttwoamount}
- \literalcontents{\vspace{5pt}\par\nobreak}
+ \c@ntentsinfo{#1}{\contentsvolumetitleindent}{\contentsvolumefont}
+ {\contentsvolumetitleindentamount}
+ \literalcontents{\medskip\par\nobreak}
\t@xtnotesinfo{\backmattervolumefont #1 \backmattertextfont\nobreak}
\putpagenumberincontentstrue
\putpagenumberinnotestrue}
\newcommand{\volumesubtitle}[1]{{\volumesubtitlefont
-\volumetitleshift #1 \par}
+\volumetitleshift \volumesubtitleindent #1 \par}
\ifpoemcontentson
- \literalcontents{{\contentsvolumesubtitlefont
-#1\vspace{3pt}\par\nobreak}}
+ \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\medskip\nobreak}}
\fi
\iftextnoteson\iftextnotesatend
\immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
@@ -842,12 +1166,101 @@
\immediate\write\textnotes{\string\nobreak}
\fi\fi
}
-\newcommand{\volumesectiontitle}[1]
-{\clearpage\thispagestyle{volumefirststyle}
-\begin{center} {\volumesubtitlefont\textbf{#1}}
-\end{center} \bigskip\bigskip
+\newcommand{\volumesubtitlefirstline}[1]{{\firstlinesettings\volumesubtitlefont
+\volumetitleshift \volumesubtitlesecondlineindent #1 \par}
\ifpoemcontentson
- \literalcontents{\goodbreak{\contentsvolumesubtitlefont #1\par\nobreak}}
+ \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\nobreak}}
+ \fi
+ \iftextnoteson\iftextnotesatend
+ \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+ \immediate\write\textnotes{\string\par \string\backmattertextfont}
+ \immediate\write\textnotes{\string\nobreak}
+ \fi\fi
+}
+\newcommand{\volumesubtitlemiddleline}[1]{{\middlelinesettings\volumesubtitlefont
+\volumesubtitlesecondlineindent #1 \par}
+ \ifpoemcontentson
+ \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\nobreak}}
+ \fi
+ \iftextnoteson\iftextnotesatend
+ \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+ \immediate\write\textnotes{\string\par \string\backmattertextfont}
+ \immediate\write\textnotes{\string\nobreak}
+ \fi\fi
+}
+\newcommand{\volumesubtitlelastline}[1]{{\lastlinesettings\volumesubtitlefont
+\volumesubtitlesecondlineindent #1 \par}
+ \ifpoemcontentson
+ \literalcontents{{\contentsvolumesubtitlefont\contentsvolumesubtitleindent
+#1\par\medskip\nobreak}}
+ \fi
+ \iftextnoteson\iftextnotesatend
+ \immediate\write\textnotes{\string\backmattervolumesubtitlefont\ #1}
+ \immediate\write\textnotes{\string\par \string\backmattertextfont}
+ \immediate\write\textnotes{\string\nobreak}
+ \fi\fi
+}
+\newcommand{\volumesectiontitle}[1]{\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}}
+\fi\bigskip\bigskip
+ \ifpoemcontentson
+ \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+ \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+ \fi
+ \iftextnoteson\iftextnotesatend
+ \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+ \immediate\write\textnotes{\string\par \string\begin{bf}}
+ \immediate\write\textnotes{#1 \string\end{bf}}
+ \immediate\write\textnotes{\string\par}
+ \immediate\write\textnotes{\string\nobreak}
+ \fi\fi
+}
+\newcommand{\volumesectiontitlefirstline}[1]{\firstlinesettings\clearpage\thispagestyle{volumefirststyle}
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}\par}
+\fi% \bigskip\bigskip
+ \ifpoemcontentson
+ \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+ \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+ \fi
+ \iftextnoteson\iftextnotesatend
+ \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+ \immediate\write\textnotes{\string\par \string\begin{bf}}
+ \immediate\write\textnotes{#1 \string\end{bf}}
+ \immediate\write\textnotes{\string\par}
+ \immediate\write\textnotes{\string\nobreak}
+ \fi\fi
+}
+\newcommand{\volumesectiontitlemiddleline}[1]{\middlelinesettings
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}\par}
+\fi% \bigskip\bigskip
+ \ifpoemcontentson
+ \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+ \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
+ \fi
+ \iftextnoteson\iftextnotesatend
+ \immediate\write\textnotes{\string\notesvolumetitlepenalty}
+ \immediate\write\textnotes{\string\par \string\begin{bf}}
+ \immediate\write\textnotes{#1 \string\end{bf}}
+ \immediate\write\textnotes{\string\par}
+ \immediate\write\textnotes{\string\nobreak}
+ \fi\fi
+}
+\newcommand{\volumesectiontitlelastline}[1]{\lastlinesettings
+\ifcentertitleson\begin{center} {\volumesubtitlefont\textbf{#1}}
+\end{center}
+\else \volumesectiontitleindent {\volumesubtitlefont\textbf{#1}}
+\fi\bigskip\bigskip
+ \ifpoemcontentson
+ \literalcontents{\goodbreak{\ifcentertitleson\contentsvolumesubtitlefont #1\par\nobreak\else
+ \contentsvolumesectiontitleindent #1 \par\nobreak\fi}}
\fi
\iftextnoteson\iftextnotesatend
\immediate\write\textnotes{\string\notesvolumetitlepenalty}
@@ -898,15 +1311,31 @@
\newif\ifcentertitleson
\newcommand{\centertitles}{\centertitlesontrue\centerepigraphsontrue}
\makeatletter
-\newcommand{\set@p@emtitle}[6]{\setlength{\titleentryoverrun}{#6}%
+\newcommand{\set@p@emtitle}[6]{\iftitlesatleftversemargin%
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{#2 #3 #4 #1 #5} \end{pmclverse}}%
+\else%
+\setlength{\titleentryoverrun}{#6}%
{#2}%
{#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{{\ifnormaltitleindentation #4 #1%
+\else \ifcentertitleson \begin{center} #1 \end{center} \else #1\fi\fi}}%
\end{titleentryenvironment}}%
{#5}%
\m@kep@emlabel
\m@ken@teholder{#1}%
-\setlength{\titleentryoverrun}{\z@}}
+\setlength{\titleentryoverrun}{\z@}\fi}
+%%% special version for subtitles
+\newcommand{\set@p@emsubtitle}[6]{\iftitlesatleftversemargin%
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{#2 #3 #4 #1 #5} \end{pmclverse}}%
+\else%
+\setlength{\titleentryoverrun}{#6}%
+{#2}%
+{#3 \begin{titleentryenvironment}%
+{{\ifnormaltitleindentation #4 #1%
+\else \ifcentertitleson \begin{center} #1 \end{center} \else #1\fi\fi}}%
+\end{titleentryenvironment}}%
+{#5}%
+\setlength{\titleentryoverrun}{\z@}\fi}
\newcommand{\setcontentsleaders}[1]{%
\def\contentsleaders{#1\nobreak%
}}
@@ -941,25 +1370,34 @@
\fi
\fi\fi
}
+\newlength{\lefttitlemargin}
+\newcommand{\leftaligntitlespace}{\hspace{\lefttitlemargin}}
+\newif\ifleftaligntitles % title flush with left margin of centered poem
+\leftaligntitlesfalse % default value
+\newcommand{\left@ligntitleblock}{\rightmargin \z@%%
+ \setlength{\lefttitlemargin}{\linewidth}%
+ \addtolength{\lefttitlemargin}{-\versewidth}%
+ \addtolength{\lefttitlemargin}{-0.5\lefttitlemargin}
+}
\newcommand{\poemtitle}[1]{%
\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
\t@xtnotesinfo{#1}%
}
\newcommand{\poemtitlenocontents}[1]{%
\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
\t@xtnotesinfo{#1}%
}
\newcommand{\poemtitlebaretitle}[1]{%
-\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\set@p@emsubtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
}
\newcommand{\poemtitleonlycontents}[1]{%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
}
\newcommand{\poemtitleonlynotes}[1]{%
\m@kep@emlabel
@@ -968,9 +1406,9 @@
}
\newcommand{\poemtitlenonotes}[1]{%
\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
}
\newcommand{\poemtitleitalic}[2]{%
\poemtitle{#1}}
@@ -999,9 +1437,9 @@
\newcommand{\poemtitlefirstline}[1]{
\firstlinesettings
\set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+{\poemtitleindent}{\nobreak\par\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
+{\contentspoemtitleindentamount}%
\t@xtnotesinfo{#1}%
\restoresinglelinesettings
}
@@ -1009,54 +1447,54 @@
\newcommand{\poemtitlemiddleline}[1]{%
\middlelinesettings
\set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemtitlesecondlineindent}{\nobreak\par\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemtitlesecondlineindentamount}%
\t@xtnotesinfo{#1}%
\restoresinglelinesettings
}
\newcommand{\poemtitlelastline}[1]{%
\lastlinesettings
\set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}%
-{\relax}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemtitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\z@}%
+\c@ntentsinfo{#1}{\contentspoemtitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemtitlesecondlineindentamount}%
\t@xtnotesinfo{#1}%
\restoresinglelinesettings
}
\newcommand{\poemsectiontitle}[1]{%
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
\t@xtnotesinfo{#1}%
}
\newcommand{\poemsectiontitlefirstline}[1]{%
\firstlinesettings
\set@p@emtitle{#1}{\multilinetitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak}{\poemsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
\t@xtnotesinfo{#1}%
\restoresinglelinesettings
}
\newcommand{\poemsectiontitlemiddleline}[1]{%
\middlelinesettings
\set@p@emtitle{#1}{\relax}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsectiontitlesecondlineindent}{\nobreak\par\nobreak}{\poemsectiontitlesecondlineindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitlesecondlineindentamount}%
\t@xtnotesinfo{#1}%
\restoresinglelinesettings
}
\newcommand{\poemsectiontitlelastline}[1]{%
\lastlinesettings
\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}%
-{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsectiontitlesecondlineindent}{\nobreak\par\afterpoemtitleskip\nobreak}%
+{\poemsectiontitlesecondlineindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitlesecondlineindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitlesecondlineindentamount}%
\t@xtnotesinfo{#1}%
\restoresinglelinesettings
}
@@ -1064,16 +1502,16 @@
\sequencesubsectiontitlenocontents{#1}}%
\newcommand{\poemfirstsectiontitle}[1]{%
\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
\t@xtnotesinfo{#1}%
}
\newcommand{\poemfirstsectiontitlebaretitle}[1]{%
\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}}
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}}
\newcommand{\poemsectiontitlebaretitle}[1]{%
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
@@ -1081,16 +1519,16 @@
}
\newcommand{\poemsubsectiontitle}[1]{%
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindenttwoamount}%
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}%
-{\contentsindentfouramount}%
+{\poemsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsubsectiontitleindentamount}%
+\c@ntentsinfo{#1}{\contentspoemsubsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsubsectiontitleindentamount}%
\t@xtnotesinfo{#1}%
}
\newcommand{\poemtitlenotitle}[1]{%
\m@kep@emlabel
\m@ken@teholder{#1}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
+\c@ntentsinfo{#1}{\contentspoemtitleindent}{\contentspoemtitlefont}%
{\contentsindenttwoamount}%
\t@xtnotesinfo{#1}%
}
@@ -1098,10 +1536,10 @@
\poemtitlenotitle{1}}
\newcommand{\sequencetitle}[1]{
\set@p@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
+{\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}
\putpagenumberincontentsfalse
-\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
-{\contentsindenttwoamount}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
\putpagenumberincontentstrue
\t@xtnotesinfo{#1}
}
@@ -1109,106 +1547,133 @@
\newcommand{\sequencetitlefirstline}[1]{
\firstlinesettings
\set@p@emtitle{#1}{\multilinesequencepenalty}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}
-{\contentsindenttwoamount}
+{\sequencetitleindent}{\nobreak\par\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencetitlemiddleline}[1]{
\middlelinesettings
\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
-{\contentsindentthreeamount}
+{\sequencetitleindent}{\nobreak\par\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencetitlesecondlineindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencetitlelastline}[1]{
\lastlinesettings
\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+{\sequencetitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencetitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencetitlesecondlineindent}
+\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitle}[1]{
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitleindent}{\contentssequencetitlefont}
+{\contentssequencesubtitleindentamount}
+}
+\newcommand{\sequencesubtitlefirstline}[1]{\firstlinesettings
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
{\contentsindentthreeamount}
-\t@xtnotesinfo{#1}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitlemiddleline}[1]{\middlelinesettings
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencesubtitlesecondlineindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesubtitlelastline}[1]{\lastlinesettings
+\set@p@emsubtitle{#1}{\par\nobreak}{\sequencetitlefont}
+{\sequencesubtitlesecondlineindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
+\c@ntentsinfo{#1}{\contentssequencesubtitlesecondlineindent}{\contentssequencetitlefont}
+{\contentssequencesubtitlesecondlineindentamount}
\restoresinglelinesettings
}
\newcommand{\sequencesectiontitle}[1]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencefirstsectiontitle}[1]{
\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencetitlenonotes}[1]{
\set@p@emtitle{#1}{\par\nobreak}{\sequencetitlefont}
-{\relax}{\nobreak\par\aftersequencetitleskip\nobreak}{\z@}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentssequencetitlefont}
-{\contentsindentthreeamount}
+{\sequencetitleindent}{\nobreak\par\aftersequencetitleskip\nobreak}{\sequencetitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentssequencetitlefont}
+{\contentssequencetitleindentamount}
}
\newcommand{\sequencesectiontitlenonotes}[1]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
}
\newcommand{\sequencesectiontitlefirstline}[1]{
\firstlinesettings
\set@p@emtitle{#1}{\multilinetitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencesectiontitlemiddleline}[1]{
\middlelinesettings
\set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitlesecondlineindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencesectiontitlelastline}[1]{
\lastlinesettings
\set@p@emtitle{#1}{\par\nobreak}{\poemtitlefont}
-{\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesectiontitleindent}{\nobreak\par\afterpoemtitleskip\nobreak}{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitlesecondlineindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencefirstsectiontitlenocontents}[2]{
\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencesectiontitlenocontents}[2]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencefirstsectiontitlefirstline}[1]{
\firstlinesettings
\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
@@ -1220,16 +1685,32 @@
\newcommand{\sequencefirstsectiontitlenonotes}[1]{
\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentamount}
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}
-{\contentsindentthreeamount}
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesectiontitleindentamount}
}
-\newcommand{\sequencesectionsubtitle}[1]{\set@p@emtitle{#1}{\par\nobreak\afterpoemtitleskip}
-{\subsectiontitlefont}{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
+\newcommand{\sequencesectionsubtitle}[1]{\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+}
+\newcommand{\sequencesectionsubtitlefirstline}[1]{\firstlinesettings
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
}
-\newcommand{\poemsubtitle}[1]{\sequencesectionsubtitle{#1}
+\newcommand{\sequencesectionsubtitlemiddleline}[1]{\middlelinesettings
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\sequencesectionsubtitlelastline}[1]{\lastlinesettings
+\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\sequencesectionsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\sequencesectionsubtitleindentamount}
+\restoresinglelinesettings
+}
+\newcommand{\poemsubtitle}[1]{\set@p@emsubtitle{#1}{\par\nobreak\afterpoemtitleskip}
+{\subsectiontitlefont}{\poemsubtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\titleindentamount}
}
\newcommand{\sequencesectiontitleitalicnonotes}[2]
{\sequencesectiontitlenonotes{#1}
@@ -1246,88 +1727,86 @@
\newcommand{\sequencesubsectiontitle}[1]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencesubsectiontitlenocontents}[1]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencefirstsubsectiontitle}[1]
{\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencefirstsubsectiontitlenocontents}[1]
{\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencesubsectiontitlefirstline}[1]{
\firstlinesettings
\set@p@emtitle{#1}{\multilinetitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak}{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencesubsectiontitlemiddleline}[1]{
\middlelinesettings
\set@p@emtitle{#1}{\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsectiontitlesecondlineindent}{\nobreak\par\nobreak}{\sequencesubsectiontitlesecondlineindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitlesecondlineindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencesubsectiontitlelastline}[1]{
\lastlinesettings
\set@p@emtitle{#1}{\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\afterpoemtitleskip\nobreak}
-{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsectiontitleindent}{\nobreak\par\afterpoemtitleskip\nobreak}
+{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitlesecondlineindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitlesecondlineindentamount}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
\newcommand{\sequencesubsubsectiontitle}[1]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}
+{\sequencesubsubsectiontitleindent}
{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
-\c@ntentsinfo{#1}{\contentsindentfour}{\contentspoemtitlefont}
-{\contentsindentfiveamount}
+{\sequencesubsubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencesubsubsectiontitlenocontents}[1]{
\set@p@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
+{\sequencesubsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencefirstsubsubsectiontitlenocontents}[1]{
\set@p@emtitle{#1}{\nobreak\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
-{\titleindentthreeamount}
+{\sequencesubsubsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}
+{\sequencesubsubsectiontitleindentamount}
\t@xtnotesinfo{#1}
}
\newcommand{\sequencefirstsubsectiontitlefirstline}[1]{
\firstlinesettings
\set@p@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}
-{\titleindent\titleindent}{\nobreak\par\nobreak}{\titleindenttwoamount}
-\c@ntentsinfo{#1}{\contentsindentthree}{\contentspoemtitlefont}
-{\contentsindentfouramount}
+{\sequencesubsectiontitleindent}{\nobreak\par\nobreak}{\sequencesubsectiontitleindentamount}
+\c@ntentsinfo{#1}{\contentssequencesubsectiontitleindent}{\contentspoemtitlefont}
+{\contentssequencesubsectiontitleindent}
\t@xtnotesinfo{#1}
\restoresinglelinesettings
}
@@ -1353,10 +1832,17 @@
\m@kep@emlabel%
\m@ken@teholder{#1}%
\setlength{\titleentryoverrun}{\z@}}
-
+%% subtitle version
+\newcommand{\set@margp@emsubtitle}[7]{\setlength{\titleentryoverrun}{#6}%
+{#2}%
+{#3 \begin{titleentryenvironment}%
+{\ifcentertitleson\begin{center}#4 #1 #7\end{center}\else #4 #1
+#7\fi}\end{titleentryenvironment}}%
+{#5}%
+\setlength{\titleentryoverrun}{\z@}}
\newcommand{\setmargpoemtitle}[2]{%
\set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}{#2}%
\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
{\contentsindenttwoamount}%
\t@xtnotesinfo{#1}%
@@ -1364,19 +1850,19 @@
}
\newcommand{\JHpoemtitle}[2]{%
\set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentspoemtitlefont}%
+{\contentssequencetitleindentamount}%
\t@xtnotesinfo{#1}%
\sources{\label{#2}}%
}
\newcommand{\JHprosesectiontitle}[2]{%
\set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
-{\contentsindenttwoamount}%
+\c@ntentsinfo{#1}{\contentssequencetitleindent}{\contentspoemtitlefont}%
+{\contentssequencetitleindentamount}%
\t@xtnotesinfo{#1}%
\sources{\label{#2}}%
}
@@ -1384,7 +1870,7 @@
\marginpar{{\scriptsize{\the\margrefmarker~p.~\pageref{#1}}}}}
\newcommand{\JHsequencetitle}[2]{%
\set@margp@emtitle{#1}{\sequencetitlepenalty}{\sequencetitlefont}%
-{\relax}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}%
+{\sequencetitleindent}{\nobreak\par\nobreak\aftersequencetitleskip\nobreak}{\z@}%
{\JHlabel{#2}}%
\putpagenumberincontentsfalse%
\c@ntentsinfo{#1}{\contentsindentone}{\contentssequencetitlefont}%
@@ -1395,42 +1881,42 @@
}
\newcommand{\JHsequencesectiontitle}[2]{%
\set@margp@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\sequencesectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}%
{\contentsindentthreeamount}%
\t@xtnotesinfo{#1}%
\sources{\label{#2}}%
}
\newcommand{\JHsequencefirstsectiontitle}[2]{%
\set@margp@emtitle{#1}{\par\nobreak\afterpoemtitleskip}{\poemtitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\sequencesectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+\c@ntentsinfo{#1}{\contentssequencesectiontitleindent}{\contentspoemtitlefont}%
+{\contentssequencesectiontitleindentamount}%
\t@xtnotesinfo{#1}%
\sources{\label{#2}}%
}
\newcommand{\JHpoemsectiontitle}[2]{%
\set@margp@emtitle{#1}{\poemtitlepenalty}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\poemsectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentspoemsectiontitleindent}{\contentspoemtitlefont}%
+{\contentspoemsectiontitleindentamount}%
\t@xtnotesinfo{#1}%
\sources{\label{#2}}%
}
\newcommand{\JHpoemfirstsectiontitle}[2]{%
\set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
-{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
-{\titleindentamount}{\JHlabel{#2}}%
-\c@ntentsinfo{#1}{\contentsindenttwo}{\contentspoemtitlefont}%
-{\contentsindentthreeamount}%
+{\poemsectiontitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
+{\\poemsectiontitleindentamount}{\JHlabel{#2}}%
+\c@ntentsinfo{#1}{\contentsi\poemsectiontitleindent}{\contentspoemtitlefont}%
+{\contents\poemsectiontitleindentamount}%
\t@xtnotesinfo{#1}%
\sources{\label{#2}}%
}
\newcommand{\JHsequencesectionsubtitle}[2]{%
-\set@margp@emtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
+\set@margp@emsubtitle{#1}{\par\nobreak}{\subsectiontitlefont}%
{\titleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}%
{\titleindentamount}{\JHlabel{#2}}%
\sources{\label{#2}}%
@@ -1519,6 +2005,36 @@
{\small \emph{#1}}\end{volumetitlepagequote}}
\newenvironment{epigraphenvironment}{\nopagebreak\afterpoemtitleskip\testforcenterepigraph%
\begin{epigraphquote}\em}{\end{epigraphquote}\afterpoemtitleskip\nopagebreak}
+\newcommand{\set@short@pigraph}[1]{\iftitlesatleftversemargin%
+{\begin{pmclverse}\addtolength{\leftmargin}{-\leftmargini}{\nobreak \emph{#1} \afterpoemtitleskip} \end{pmclverse}}%
+\else%\iftitlesatleftversemargin
+{\nobreak}%
+\begin{titleentryenvironment}%
+\ifnormaltitleindentation
+\hspace{\normalepigraphindentation}\emph{#1}%
+\else % for the \ifnormaltitleindentation
+\ifcenterepigraphson
+\begin{center} \emph{#1}\end{center}
+\else \emph{#1}\fi % for ifcenterepigraphson
+\fi %\ifnormaltitleindentation
+\end{titleentryenvironment}
+{\afterpoemtitleskip}%
+\fi}% for the \iftitlesatleftversemargin
+\newcommand{\shortpoemepigraph}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}
+}
+\newcommand{\shortpoemdedication}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}
+}
+\newcommand{\shortpoemattribution}[1]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{{\small #1}}
+}
+\newcommand{\JHshortepigraph}[2]{\nopagebreak\afterpoemtitleskip%
+\set@short@pigraph{#1}\marginpar{{\scriptsize{\the\margrefmarker~p.~\pageref{#2}}}}
+\sources{\label{#2}}
+}
+\newcommand{\JHshortdedication}[2]{\JHshortepigraph{#1}{#2}}
+
\newlength{\dateindent}%
\setlength{\dateindent}{\leftmargin}%
\newcommand{\variabledateindent}{%
@@ -1652,7 +2168,7 @@
}
\newcommand{\tsaccidental}[1]{\iftextnoteson\ifincludetypescripts\accidental{#1}\fi\fi}
\newcommand{\tsentry}[1]{\iftextnoteson\ifincludetypescripts{\@ifnextchar,{\unskip}{%
-�\@ifnextchar;{\unskip}{}%
+Ê\@ifnextchar;{\unskip}{}%
}#1}\fi\fi\unskip}
\newcommand{\sources}[1]{%
\iftextnoteson
@@ -1790,7 +2306,7 @@
\fi%
\resetlemmacounters%
}
-\expandafter\newcommand\csname prose#1\endcsname[3][0]{%
+\expandafter\newcommand\csname prose#1\endcsname[3][0]{%
\unskip\proselinelabel{##2}%
\setproselemmarange{##2}{##1}%
\csname ifno#1yet\endcsname%
@@ -1805,7 +2321,7 @@
\fi%
\resetlemmacounters\unskip%
}
-\expandafter\newcommand\csname pm#1\endcsname[2][0]{%
+\expandafter\newcommand\csname pm#1\endcsname[2][0]{%
\setpmlemmarange{##1}%
\csname ifno#1yet\endcsname%
\csname first#1\endcsname%
@@ -2038,6 +2554,8 @@
\newif{\ifprosebysentence}
\newif{\ifrunningsentencenumbers}\runningsentencenumberstrue
\newif{\ifmarginsentencenumbers}\marginsentencenumberstrue
+\newif{\ifsuppressfirstpara}\suppressfirstparafalse
+\newif{\ifsuppressfirstsentence}\suppressfirstsentencefalse
\newtoks{\pmnoteheader}
@@ -2051,7 +2569,13 @@
\noexplainyettrue%
}{}
\newcommand{\runningsentencenumberformat}[1]{\nobreak%
-\textsuperscript{\scriptsize{#1}}\unskip\nobreak}
+\ifsuppressfirstsentence%
+\ifthenelse{\thepmsentencenumber=1}{\relax}{%
+\unskip\textsuperscript{\scriptsize{#1}}}%
+\unskip\nobreak%
+\else%
+\textsuperscript{\scriptsize{#1}}%\fi
+\unskip\nobreak}
\newcommand{\marginsentencenumberformat}[1]{\scriptsize{#1}}
\newcommand{\setpmmodulo}[1]{\setcounter{pmmodulo}{#1}%
\addtocounter{pmmodulo}{-1}%
@@ -2078,8 +2602,13 @@
\setlength{\marginparsep}{18pt}%
}
\newcommand{\putpmsentencenumber}{%
+\ifsuppressfirstsentence%
+\ifthenelse{\thepmsentencenumber=1}{\relax}{\putpmmarginnumber{\thepmsentencenumber}%
+{\marginsentencenumberformat}}%
+\else%
\putpmmarginnumber{\thepmsentencenumber}%
-{\marginsentencenumberformat}}
+{\marginsentencenumberformat}%
+\fi}
\newcommand{\putpmmarginnumber}[2]{%
\nolinebreak\begin{marginenvironment}%
\nolinebreak%
@@ -2105,8 +2634,8 @@
\addtocounter{pmindexcount}{1}%
\leavevmode%
\ifthenelse{\value{pmindexcount}>\value{pmmodulo}}%
-{ \putpmsentencenumber\nobreak%
- \setcounter{pmindexcount}{0}%
+{\putpmsentencenumber\nobreak%
+\setcounter{pmindexcount}{0}%
}{\relax}%
\fi%
\ifpmparas%
@@ -2201,9 +2730,20 @@
\newif{\ifpmsentencebypara}% reset sentence counter every paragraph
\pmsentencebyparatrue
\newcommand{\pmparmarformat}[1]{\textbf{{\small #1}}}
-\newcommand{\pmpararunningformat}[1]{\textbf{\small #1}}
+\newcommand{\pmpararunningformat}[1]{%
+\ifsuppressfirstpara%
+\ifthenelse{\thepmparagraph=1}{\relax}{\textbf{\small #1}~}%
+\else%
+\textbf{\small #1}~%
+\fi}
\newcommand{\putpmmarparanumber}{%
-\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}}
+\ifsuppressfirstpara%
+\ifthenelse{\thepmparagraph=1}{\relax}{\putpmmarginnumber{\llap{\thepmparagraph~~}}
+{\pmparmarformat}}%
+\else%
+\putpmmarginnumber{\llap{\thepmparagraph~~}}{\pmparmarformat}%
+\fi}
+
\newcommand{\pmpara}{\leavevmode%
\pmparastrue\addtocounter{pmparagraph}{1}%
\ifpmparainmar% put in marginal paragraph number
@@ -2700,7 +3240,7 @@
\relax\else%
\nolinebreak\incrementverselinenumber%
\fi%
-\speciallinelockfalse%
+\speciallinelockfalse%
\nobreak
\instanzafalse
@@ -2728,7 +3268,7 @@
\makeatletter
\newcommand{\versopoemtitle}[1]{%
\versoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
{\contentsindenttwoamount}%
}
@@ -2736,7 +3276,7 @@
\setlength{\titleentryoverrun}{#6}%
{#2}%
{#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
\end{titleentryenvironment}}%
{#5}%
\m@kep@emlabel
@@ -2775,14 +3315,14 @@
}%
\newcommand{\versopoemtitlenocontents}[1]{%
\versoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
}
\newcommand{\versotitleinnotescheck}{\ifparalleltexts\let\titletoothernotes=\versotitletoothernotes\fi}
\makeatother
\makeatletter
\newcommand{\rectopoemtitle}[1]{%
\rectoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
\c@ntentsinfo{#1}{\contentsindentone}{\contentspoemtitlefont}%
{\contentsindenttwoamount}%
}
@@ -2790,7 +3330,7 @@
\setlength{\titleentryoverrun}{#6}%
{#2}%
{#3 \begin{titleentryenvironment}%
-{\ifcentertitleson\begin{center}#4 #1\end{center}\else #4 #1\fi}%
+{\ifcentertitleson\begin{center}#1\end{center}\else #4 #1\fi}%
\end{titleentryenvironment}}%
{#5}%
\m@kep@emlabel
@@ -2829,7 +3369,7 @@
}%
\newcommand{\rectopoemtitlenocontents}[1]{%
\rectoset@p@emtitle{#1}{\poemtitlepenalty}{\poemtitlefont}%
-{\relax}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
+{\poemtitleindent}{\nobreak\par\nobreak\afterpoemtitleskip\nobreak}{\z@}%
}
\newcommand{\rectotitleinnotescheck}{\ifparalleltexts\let\titletoothernotes=\rectotitletoothernotes\fi}
\makeatother
@@ -3856,14 +4396,22 @@
\newlength{\epigraphquoterightmargin}
\setlength{\epigraphquoteleftmargin}{1.5em}
\setlength{\epigraphquoterightmargin}{1.5em}
-\newenvironment{epigraphquote}{\list{}{\rightmargin\epigraphquoterightmargin%
- \leftmargin\epigraphquoteleftmargin%
+\newif\ifleftalignepigraphs
+\leftalignepigraphsfalse
+\makeatletter
+\newenvironment{epigraphquote}{\list{}{%
+\ifleftalignepigraphs\left@ligntitleblock%
+\rightmargin 1sp\leftmargin \lefttitlemargin%
+\else
+\rightmargin\epigraphquoterightmargin%
+\leftmargin\epigraphquoteleftmargin%
+\fi
\topsep 0pt%
\partopsep 0pt%
\listparindent 0pt%
}%
\item\relax}
- {\endlist}
+ {\endlist}\makeatother
\newenvironment{volumetitlepagequote}{\list{}{\rightmargin \voladditionalamount%
\leftmargin \voladditionalamount%
\topsep 0pt%
@@ -3872,6 +4420,8 @@
}%
\item\relax}
{\endlist}
+\endinput
+--------------060108090809060900030409--
\endinput
%%
%% End of file `poemscol.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poemscol.tlpobj new/tlpkg/tlpobj/poemscol.tlpobj
--- old/tlpkg/tlpobj/poemscol.tlpobj 2019-02-28 04:00:06.000000000 +0100
+++ new/tlpkg/tlpobj/poemscol.tlpobj 2019-10-30 01:55:55.000000000 +0100
@@ -1,6 +1,6 @@
name poemscol
category Package
-revision 46433
+revision 52574
shortdesc Typesetting Critical Editions of Poetry
relocated 1
longdesc The package offers LaTeX macros for typesetting critical
@@ -11,11 +11,11 @@
longdesc breaks, running headers of the form 'Notes to pp. xx-yy' for
longdesc the notes sections, index of titles and first lines, and
longdesc automatic generation of a table of contents.
-runfiles size=31
+runfiles size=38
RELOC/tex/latex/poemscol/poemscol.sty
catalogue-also edmac ledmac ednotes verse
catalogue-ctan /macros/latex/contrib/poemscol
-catalogue-date 2018-01-24 05:32:51 +0100
-catalogue-license lppl1.3
+catalogue-date 2019-10-29 10:15:19 +0100
+catalogue-license lppl1.3c
catalogue-topics crit-ed
-catalogue-version 2.97
+catalogue-version 3.141
++++++ poetry.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/poetry/CHANGES new/doc/latex/poetry/CHANGES
--- old/doc/latex/poetry/CHANGES 2018-09-11 23:39:42.000000000 +0200
+++ new/doc/latex/poetry/CHANGES 2019-12-14 23:27:36.000000000 +0100
@@ -1,3 +1,14 @@
+12 Dec 1203 (14 Dec 2019): Protected the poemline counter
+definition to avoid a clash with memoir. Version 2.2.
+
+9 Nov 1203 (9 Nov 2019): Protected the index commands so
+that the package works with classes that don't include
+indices. Also removed two spurious "{"s. Thanks to David
+Carlisle for pointing out the issues to me. Version 2.1.
+
+2 May 1203 (2 May 2019): Added ability to arbitrarily label
+both the left and right sides of the line. Version 2.0.
+
X Sept 1202 (10 Sept 2018): Removed *requirement* for
hyperref by inserting a fake definition for \phantomsection,
which is the only hyperref command used.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/poetry/README new/doc/latex/poetry/README
--- old/doc/latex/poetry/README 2018-09-11 23:39:42.000000000 +0200
+++ new/doc/latex/poetry/README 2019-05-02 00:51:20.000000000 +0200
@@ -1,6 +1,6 @@
+AMDG
-This document is copyright 2018 by Donald P. Goodman, and is
+This document is copyright 2019 by Donald P. Goodman, and is
released publicly under the LaTeX Project Public License. The
distribution and modification of this work is constrained by the
conditions of that license. See
Binary files old/doc/latex/poetry/poetry.pdf and new/doc/latex/poetry/poetry.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poetry.doc.tlpobj new/tlpkg/tlpobj/poetry.doc.tlpobj
--- old/tlpkg/tlpobj/poetry.doc.tlpobj 2019-02-28 04:00:06.000000000 +0100
+++ new/tlpkg/tlpobj/poetry.doc.tlpobj 2019-12-15 01:53:41.000000000 +0100
@@ -1,6 +1,6 @@
name poetry.doc
category Package
-revision 48643
+revision 53129
shortdesc doc files of poetry
relocated 1
docfiles size=71
++++++ poetry.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/poetry/poetry.sty new/tex/latex/poetry/poetry.sty
--- old/tex/latex/poetry/poetry.sty 2018-09-11 23:39:42.000000000 +0200
+++ new/tex/latex/poetry/poetry.sty 2019-12-14 23:27:36.000000000 +0100
@@ -13,7 +13,7 @@
%% conditions of that license. See
%% http://www.latex-project.org/lppl.txt
%% for the text of the license. This document is released
-%% under version 1.3 of that license, and this work may be distributed
+%% under version 1.3c of that license, and this work may be distributed
%% or modified under the terms of that license or, at your option, any
%% later version.
%%
@@ -26,13 +26,20 @@
%% derived files poetry.sty and poetry.pdf.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{poetry}[2018/09/10 v1.1 support for typesetting poetry]
+\ProvidesPackage{poetry}[2019/05/02 v2.2 support for typesetting poetry]
-\ProvidesPackage{poetry}%
+\RequirePackage{modulus}%
+\@ifundefined{c@poemline}{%
\newcounter{poemline}%
+}{}
\newcount\poemlineno%
+\newcounter{poemrtline}%
+\newcount\poemrtlineno%
+\renewcommand\thepoemrtline{}%
\newcounter{verseline}%
\newcount\vslineno%
+\newcounter{stanzacount}%
+\newcount\stanzano%
\newcounter{abspoemno}%
\newcount\poem@abspoemno%
\newcounter{poemno}%
@@ -41,22 +48,43 @@
\newcount\poem@groupno\poem@groupno=0%
\newcounter{poemlinenumsevery}\setcounter{poemlinenumsevery}{1}%
\newcount\poem@linenumsevery\poem@linenumsevery=\value{poemlinenumsevery}%
+\newcounter{poemrtlinenumsevery}\setcounter{poemrtlinenumsevery}{1}%
+\newcount\poem@rt@linenumsevery\poem@rt@linenumsevery=\value{poemrtlinenumsevery}%
\newlength{\poemindent}\setlength{\poemindent}{0pt}%
-\newlength{\poemtopskip}{\setlength{\poemtopskip}{1em}%
-\newlength{\poembotskip}{\setlength{\poembotskip}{1em}%
+\newlength{\poemtopskip}\setlength{\poemtopskip}{1em}%
+\newlength{\poembotskip}\setlength{\poembotskip}{1em}%
\newdimen\poem@topskip\newdimen\poem@botskip%
\newdimen\poem@defleftskip\poem@defleftskip=\the\poemindent%
\newdimen\poem@maxlinewd%
\newlength{\poemmaxlinewd}\setlength{\poemmaxlinewd}{\textwidth}%
+\newdimen\poem@rt@maxlinewd%
+\newlength{\poemrtmaxlinewd}\setlength{\poemrtmaxlinewd}{\textwidth}%
\newdimen\poem@hinwd\poem@hinwd=1em%
\newlength{\poemhinwd}\setlength{\poemhinwd}{1em}%
\newif\ifpoemlinenums\poemlinenumstrue%
-\newif\ifpoemlinenumright\poemlinenumrightfalse%
+\newif\ifpoemrtlinenums\poemrtlinenumstrue%
+\def\poemlinenumright{%
+\renewcommand{\thepoemrtline}{\arabic{poemline}}%
+\renewcommand{\thepoemline}{}%
+}%
+\def\poemlinenumrighttrue{%
+\renewcommand{\thepoemrtline}{\arabic{poemline}}%
+\renewcommand{\thepoemline}{}%
+}%
+\def\poemlinenumrightfalse{%
+\renewcommand{\thepoemline}{\arabic{poemline}}%
+\renewcommand{\thepoemrtline}{}%
+}%
\newdimen\poem@linenumboxwd\poem@linenumboxwd=2em%
\newlength{\poemlinenumboxwd}\setlength{\poemlinenumboxwd}{2em}%
+\newdimen\poem@rt@linenumboxwd\poem@rt@linenumboxwd=2em%
+\newlength{\poemrtlinenumboxwd}\setlength{\poemrtlinenumboxwd}{2em}%
\newdimen\poem@linenumboxgap\poem@linenumboxgap=0pt%
\newlength{\poemlinenumboxgap}\setlength{\poemlinenumboxgap}{0pt}%
+\newdimen\poem@rt@linenumboxgap\poem@rt@linenumboxgap=0pt%
+\newlength{\poemrtlinenumboxgap}\setlength{\poemrtlinenumboxgap}{0pt}%
\def\poemlinenumstyle{}%
+\def\poemrtlinenumstyle{}%
\newdimen\poem@hangindent\poem@hangindent=1em%
\newlength{\poemhangindent}\setlength{\poemhangindent}{1em}%
\newcount\poem@indentevery\poem@indentevery=0%
@@ -65,12 +93,12 @@
\newlength{\poemverseskip}\setlength{\poemverseskip}{\baselineskip}%
\newdimen\poem@buff%
\newcount\poem@tmp%
+\def\loopcommand{\hin}%
\def\poem@expandvsloop#1{\poem@xvsloop#1\relax}%
\def\poem@xvsloop#1{%
\ifx\relax#1\else%
-\poem@tmp=#1%
-\ifnum\poem@tmp=\the\vslineno%
-\hin%
+\ifnum#1=\the\vslineno%
+\loopcommand\relax%
\fi%
\expandafter\poem@xvsloop%
\fi%
@@ -79,39 +107,47 @@
\newcommand{\poem@ifhyph}[1]{\@ifnextchar -{\@firstoftwo{#1}}}
\newcommand{\poem@ifstar}[1]{\@ifnextchar *{\@firstoftwo{#1}}}
\newcommand{\poem@ifques}[1]{\@ifnextchar ?{\@firstoftwo{#1}}}
-\newcount\poem@tmpa
-\def\modulo#1#2{%
-\poem@tmpa=#1%
-\divide\poem@tmpa by#2%
-\multiply\poem@tmpa by#2%
-\multiply\poem@tmpa by-1%
-\advance\poem@tmpa by#1\relax%
-}%
\def\poemvsindentlines{}%
-\def\poemlnindentlines{}%
+\def\poemnumlines{}%
+\def\poemrtnumlines{}%
\def\tlap#1{\vbox to0pt{\vss\hbox{#1}}}%
\def\blap#1{\vbox to0pt{\hbox{#1}\vss}}%
\def\placelineno{%
\setcounter{verseline}{\the\vslineno}%
\setcounter{poemline}{\the\poemlineno}%
+\setcounter{stanzacount}{\the\stanzano}%
+\setcounter{poemrtline}{\the\poemrtlineno}%
\poem@linenumsevery=\value{poemlinenumsevery}%
+\poem@rt@linenumsevery=\value{poemrtlinenumsevery}%
+\poem@indentevery=\value{poemindentevery}%
\poem@linenumboxgap=\the\poemlinenumboxgap%
\poem@linenumboxwd=\the\poemlinenumboxwd%
-\modulo{\the\poemlineno}{\the\poem@linenumsevery}%
+\poem@rt@linenumboxgap=\the\poemrtlinenumboxgap%
+\poem@rt@linenumboxwd=\the\poemrtlinenumboxwd%
\ifpoemlinenums%
-\ifnum\poem@tmpa=0%
-\ifpoemlinenumright%
-\hskip0pt\tlap{%
-\rlap{%
-\hskip\poem@maxlinewd%
-\hskip\poem@linenumboxgap%
-\hbox to\poem@linenumboxwd{%
-\hfil%
-\poemlinenumstyle\thepoemline%
-}%
-}%
+\def\loopcommand{\poem@putlineno}%
+\expandafter\poem@expandvsloop\expandafter{\poemnumlines}%
+\def\loopcommand{\poem@rt@putlineno}%
+\expandafter\poem@expandvsloop\expandafter{\poemrtnumlines}%
+\ifnum\poem@linenumsevery=0\relax\else%
+\modulo{\the\vslineno}{\the\poem@linenumsevery}%
+\ifnum\remainder=0\poem@putlineno\fi%
+\fi%
+\ifnum\poem@rt@linenumsevery=0\relax\else%
+\modulo{\the\vslineno}{\the\poem@rt@linenumsevery}%
+\ifnum\remainder=0\poem@rt@putlineno\fi%
+\fi%
+\fi%
+\ifnum\poem@indentevery=0\relax\else%
+\modulo{\the\vslineno}{\the\poem@indentevery}%
+\ifnum\remainder=0\hin\fi%
+\fi%
+\def\loopcommand{\hin}%
+\expandafter\poem@expandvsloop\expandafter{\poemvsindentlines}%
+\def\@currentlabel{\thepoemline}%
+\phantomsection%
}%
-\else%
+\def\poem@putlineno{%
\hskip-\poem@linenumboxgap%
\llap{%
\tlap{%
@@ -120,30 +156,26 @@
\hfil%
}\penalty10000%
}%
-}\penalty10000%
+}%
+\ifnum\poemlineno=1\relax\else%
+\ifnum\vslineno=1%
+\vskip-\baselineskip%
\fi%
-\else
-\hskip-\poem@linenumboxgap%
-\llap{\tlap{\hbox to\poem@linenumboxwd{\hfil}}}%
-\penalty10000%
\fi%
-\else
-\hskip-\poem@linenumboxgap%
-\llap{\tlap{\hbox to\poem@linenumboxwd{\hfil}}}%
\penalty10000%
-\fi%
-\par\vskip-\baselineskip%
-\poem@indentevery=\value{poemindentevery}%
-\ifnum\poem@indentevery=0%
-\else%
-\modulo{\the\poemlineno}{\the\poem@indentevery}%
-\ifnum\poem@tmpa=0%
-\hin%
-\fi%
-\fi%
-\expandafter\poem@expandvsloop\expandafter{\poemvsindentlines}%
-\def\@currentlabel{\thepoemline}%
-\phantomsection%
+}%
+\def\poem@rt@putlineno{%
+\hskip0pt\tlap{%
+\rlap{%
+\hskip\poem@maxlinewd%
+\hskip\poem@rt@linenumboxgap%
+\hbox to\poem@rt@linenumboxwd{%
+\hfil%
+\poemrtlinenumstyle\thepoemrtline%
+}%
+}%
+}%
+\vskip-\baselineskip%
}%
\def\poem@endline{%
\par%
@@ -170,6 +202,7 @@
\par%
\vslineno=1%
\advance\poemlineno by1%
+\advance\stanzano by1%
\poem@verseskip=\the\poemverseskip%
\vskip\poem@verseskip%
\leftskip=\poem@defleftskip%
@@ -217,6 +250,7 @@
\advance\hsize by\the\poem@maxlinewd%
\poemlineno=1%
\vslineno=1%
+\stanzano=1%
\poem@topskip=\the\poemtopskip%
\poem@botskip=\the\poembotskip%
\vskip\poem@topskip%
@@ -355,6 +389,7 @@
\else%
\def\phantomsection{\relax}%
\fi%
+\ifx\theindex\@undefined\else%
\RequirePackage{imakeidx}
\makeindex[intoc,columns=1,name={\jobname-iofl},title={\poemioflname}]
\def\poemioflname{Index of First Lines}%
@@ -368,6 +403,7 @@
\def\printiofl{%
\printindex[\jobname-iofl]%
}%
+\fi%
\endinput
%%
%% End of file `poetry.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poetry.tlpobj new/tlpkg/tlpobj/poetry.tlpobj
--- old/tlpkg/tlpobj/poetry.tlpobj 2019-02-28 04:00:06.000000000 +0100
+++ new/tlpkg/tlpobj/poetry.tlpobj 2019-12-15 01:53:41.000000000 +0100
@@ -1,9 +1,9 @@
name poetry
category Package
-revision 48643
+revision 53129
shortdesc Facilities for typesetting poetry and poetical structure
relocated 1
-longdesc The poetry package provides some macros and general doodads for
+longdesc This package provides some macros and general doodads for
longdesc typesetting poetry. There is, of course, already the excellent
longdesc verse package, and the poetrytex package provides some extra
longdesc functionality on top of it. But poetry provides much of the
@@ -13,7 +13,6 @@
runfiles size=3
RELOC/tex/latex/poetry/poetry.sty
catalogue-ctan /macros/latex/contrib/poetry
-catalogue-date 2018-09-11 08:47:20 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics verse
-catalogue-version 1.1
+catalogue-version 2.2
++++++ polexpr.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/polexpr/README.md new/doc/latex/polexpr/README.md
--- old/doc/latex/polexpr/README.md 2019-02-12 23:05:09.000000000 +0100
+++ new/doc/latex/polexpr/README.md 2020-02-01 23:17:01.000000000 +0100
@@ -4,7 +4,7 @@
License
-------
-Copyright (C) 2018-2019 Jean-François Burnol
+Copyright (C) 2018-2020 Jean-François Burnol
See documentation of package [xint](http://www.ctan.org/pkg/xint) for
contact information.
@@ -81,8 +81,10 @@
- 0.7.4 (2019/02/12)
Bugfix: 20000000000 is too big for \numexpr, shouldn't I know that?
Thanks to Jürgen Gilg for report.
+- 0.7.5 (2020/01/31)
+ Synced with xint 1.4. Requires it.
-Files of 0.7.4 release:
+Files of 0.7.5 release:
- README.md,
- polexpr.sty (package file),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/polexpr/polexpr.html new/doc/latex/polexpr/polexpr.html
--- old/doc/latex/polexpr/polexpr.html 2019-02-12 23:05:09.000000000 +0100
+++ new/doc/latex/polexpr/polexpr.html 2020-02-01 23:17:01.000000000 +0100
@@ -362,7 +362,7 @@
<body>
<div class="document" id="package-polexpr-documentation">
<h1 class="title">Package polexpr documentation</h1>
-<h2 class="subtitle" id="id1">0.7.4 (2019/02/12)</h2>
+<h2 class="subtitle" id="id1">0.7.5 (2020/01/31)</h2>
<!-- comment: -*- fill-column: 72; mode: rst; -*- -->
<div class="contents topic" id="contents">
@@ -2891,6 +2891,9 @@
</li>
</ul>
</li>
+<li><p class="first">v0.7.5 (2020/01/31)</p>
+<p>Synced with xint 1.4. Requires it.</p>
+</li>
</ul>
</div>
<div class="section" id="acknowledgments">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/polexpr/polexpr.txt new/doc/latex/polexpr/polexpr.txt
--- old/doc/latex/polexpr/polexpr.txt 2019-02-12 23:05:09.000000000 +0100
+++ new/doc/latex/polexpr/polexpr.txt 2020-02-01 23:17:01.000000000 +0100
@@ -4,7 +4,7 @@
Package polexpr documentation
===============================
-0.7.4 (2019/02/12)
+0.7.5 (2020/01/31)
==================
.. contents::
@@ -2567,6 +2567,11 @@
- 20000000000 is too big for ``\numexpr``, shouldn't I know that?
Thanks to Jürgen Gilg for report.
+- v0.7.5 (2020/01/31)
+
+ Synced with xint 1.4. Requires it.
+
+
Acknowledgments
---------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/polexpr.doc.tlpobj new/tlpkg/tlpobj/polexpr.doc.tlpobj
--- old/tlpkg/tlpobj/polexpr.doc.tlpobj 2019-02-28 04:00:07.000000000 +0100
+++ new/tlpkg/tlpobj/polexpr.doc.tlpobj 2020-02-02 01:58:19.000000000 +0100
@@ -1,6 +1,6 @@
name polexpr.doc
category Package
-revision 50013
+revision 53633
shortdesc doc files of polexpr
relocated 1
docfiles size=67
++++++ polexpr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/polexpr/polexpr.sty new/tex/latex/polexpr/polexpr.sty
--- old/tex/latex/polexpr/polexpr.sty 2019-02-12 23:05:09.000000000 +0100
+++ new/tex/latex/polexpr/polexpr.sty 2020-02-01 23:17:01.000000000 +0100
@@ -1,33 +1,178 @@
% author: Jean-François Burnol
% License: LPPL 1.3c (author-maintained)
\ProvidesPackage{polexpr}%
- [2019/02/12 v0.7.4 Polynomial expressions with rational coefficients (JFB)]%
-\RequirePackage{xintexpr}[2018/06/17]% xint 1.3c for \ifxintglobaldefs boolean
-\edef\POL@restorecatcodes
+ [2020/01/31 v0.7.5 Polynomial expressions with rational coefficients (JFB)]%
+\RequirePackage{xintexpr}[2020/01/31]% xint 1.4
+\edef\POL@restorecatcodes % TODO: think better about what is reasonable here
{\catcode`\noexpand\_ \the\catcode`\_ %
\catcode`\noexpand\! \the\catcode`\! %
\catcode`\noexpand\* \the\catcode`\* %
+ \catcode`\noexpand\~ \the\catcode`\~ %
+ \catcode`\noexpand\: \the\catcode`\: %
\catcode0 \the\catcode0\relax}%
\catcode`\_ 11 \catcode0 12 \catcode`\* 12
\long\def\xint_stop_atfirstoftwo #1#2{ #1}% not yet in xint 1.3c
\long\def\xint_stop_atsecondoftwo #1#2{ #2}%
-%% PATCH xintexpr TO AUTHORIZE ' IN NAMES (0.5.1)
-\catcode`\! 11
+%% 0.7.5 VERY SERIOUS TROUBLES TO GET polexpr TO WORK WITH xintexpr 1.4
+
+%% I hesitated about incorporating it directly into xint 1.4
+%% Don't do this at home, only xint gurus are allowed.
+\let\POL@originalXINT_expr_redefinemacros\XINT_expr_redefinemacros
+\def\XINT_expr_redefinemacros
+{%
+ \POL@originalXINT_expr_redefinemacros
+ \POL@activateNEhook
+}%
+%% Using \def's and not \let's to get better readable trace
+%% in case I need to debug but this never happens
+\def\POL@activateNEhook@xint % done in a group
+{%
+ \def\POL@NEhook@polfunc{\POL@NE@polfunc}%
+}%
+\def\POL@activateNEhook@pol
+{%
+ \def\POL@NEhook@polfunc{\POL@NP@polfunc}%
+}%
+\def\POL@activateNEhook{\POL@activateNEhook@xint}%
+%
+%
+\catcode`~ 12
+\catcode`! 11
+\catcode`: 11
+% We drop consideration of \XINT_global matters
+% because we have other more urgent and arduous problems
+\def\POL@defpolfunc #1#2%
+{%
+ \expandafter\POL@defpolfunc_a
+ \csname XINT_#2_func_#1\expandafter\endcsname
+ \csname XINT_#2_polfunc_#1\endcsname {#1}{#2}%
+}%
+\def\POL@defpolfunc_a #1#2#3#4%
+{%
+ \protected % xintexpr 1.4 does things such as \expandafter\xintAdd\expanded
+ \expandafter\def\expandafter#2\expandafter##\expandafter1\expandafter
+ {%
+ #2{##1}%
+ }%
+ \def#1##1##2##3%
+ {%
+ % put it directly at the correct level of bracing
+ % don't worry for now about minimizing how many times ##3 is grabbed
+ \expandafter##1\expandafter##2\expandafter{\expandafter
+ {\romannumeral`^^@\POL@NEhook@polfunc{XINT_#4_polfunc_#3}#2{##3}}}%
+ }%
+}%
+%
+\def\POL@polfunc@go #1#2#3{#2#3}% brace stripping intentional
+\def\POL@NEhook@polfunc{\POL@polfunc@go}% default for pure numerics
+%
+% Hook for expansion in \poldef
+\def\POL@NP@polfunc #1{%
+\def\POL@NP@polfunc ##1##2##3%
+{%
+ \if0\expandafter\XINT:NE:hastilde\detokenize{##3}~!\relax
+ \expandafter\XINT:NE:hashash\detokenize{##3}#1!\relax 0%
+ \expandafter\POL@polfunc@go
+ \else
+ \expandafter\POL:NP:polfunc:p
+ \fi {##1}{##2}{##3}%
+}}\expandafter\POL@NP@polfunc\string#%
+\def\POL:NP:polfunc:p #1#2#3%
+{%
+ ~romannumeral~POL:usepolfunc:pol{#1}{#3}%
+}%
+\def\POL:usepolfunc:pol #1%#2%
+{%
+% Here we are in the core of \poldef and we really
+% need to get rid of some \expanded tokens so
+% we accept being exposed to \expanded but arrange to
+% remain invariant. Then we will try to speed up
+% polynomial composition (at this time the \#1
+% is a nested Horner type macro) by «pre-expanding»
+% the argument, but this means using the \POL@get
+% methods inside an \hbox
+%
+% \POL@applypolfunc will be defined \protected
+%
+ \expandafter\xint_c_\expandafter\POL@applypolfunc
+% This will be \protected
+ \csname#1\endcsname
+% #2% brace stripping is deliberate
+}%
+%
+% Hook for expansion in \xintexpr
+\def\POL@NE@polfunc #1{%
+\def\POL@NE@polfunc ##1##2##3%
+{%
+ \if0\expandafter\XINT:NE:hastilde\detokenize{##3}~!\relax
+ \expandafter\XINT:NE:hashash\detokenize{##3}#1!\relax 0%
+ \expandafter\POL@polfunc@go
+ \else
+ \expandafter\POL:NE:polfunc:p
+ \fi {##1}{##2}{##3}%
+}}\expandafter\POL@NE@polfunc\string#%
+\def\POL:NE:polfunc:p #1#2#3%
+{%
+ ~romannumeral~POL:usepolfunc:xint{#1}{#3}%
+}%
+\def\POL:usepolfunc:xint #1%
+{%
+% This is done to overcome \protected and is useful
+% in case the polynomial function ends up nested
+% in some non-polynomial user declared function
+% as the latter (and other things) tries to pre-expand
+% its arguments (as they may be used multiple time)
+% using \expanded, but \#1 is protected.
+% And this works recursively. We are inside braces.
+% However we have a very big problem with constant
+% polynomial functions. We have to handle them
+% in a special way.
+ -`0\csname#1\expandafter\endcsname\expanded
+}%
+\catcode`~ 13
+\catcode`: 12
+
+
+%% Start defining some \protected ones here
+\protected\def\POL@empty{}%
+\newif\ifPOL@pol
+\protected\def\POL@polglobaltrue {\global\let\ifPOL@pol\iftrue}%
+\protected\def\POL@polglobalfalse{\global\let\ifPOL@pol\iffalse}%
+
+
+%% Patch xintexpr to authorize ' in names (0.5.1)
+%% Adapted 0.7.5 to follow-up on xintexpr 1.4 internal changes
+%% (much simpler than previous stuff...)
+%% This allows ' as a character in a polynomial name (not initial one)
\def\POL@XINT_expr_scanfunc_b #1%
{%
- \ifx !#1\xint_dothis{(_}\fi
- \ifcat \relax#1\xint_dothis{(_}\fi
- \if (#1\xint_dothis{\xint_firstoftwo{(`}}\fi
- \if '#1\xint_dothis \XINT_expr_scanfunc_a \fi
- \if @#1\xint_dothis \XINT_expr_scanfunc_a \fi
- \if _#1\xint_dothis \XINT_expr_scanfunc_a \fi
- \ifnum \xint_c_ix<1\string#1 \xint_dothis \XINT_expr_scanfunc_a \fi
- \ifcat a#1\xint_dothis \XINT_expr_scanfunc_a \fi
- \xint_orthat {(_}%
- #1%
+ \ifcat \relax#1\xint_dothis{\iffalse{\fi}(_#1}\fi
+ \if (#1\xint_dothis{\iffalse{\fi}(`}\fi
+ \if 1\ifcat a#10\fi
+ \ifnum\xint_c_ix<1\string#1 0\fi
+ \if @#10\fi
+ \if _#10\fi
+ \if '#10\fi
+ 1%
+ \xint_dothis{\iffalse{\fi}(_#1}\fi
+ \xint_orthat {#1\XINT_expr_scanfunc_a}%
}%
+
+%% Activate polexp's modified xintexpr (only during definitions
+%% of polynomials)
+\def\POL@hackxintexpr {%
+ \let\POL@originalXINT_expr_scanfunc_b\XINT_expr_scanfunc_b
+ \let\XINT_expr_scanfunc_b\POL@XINT_expr_scanfunc_b
+ \def\POL@activateNEhook{\POL@activateNEhook@pol}%
+}%
+\def\POL@restorexintexpr {%
+ \let\XINT_expr_scanfunc_b\POL@originalXINT_expr_scanfunc_b
+ \def\POL@activateNEhook{\POL@activateNEhook@xint}%
+}%
+
+
%% AUXILIARIES
\catcode`! 3
%% added at 0.7
@@ -46,7 +191,6 @@
\polexprsetup{norr=_norr, sqfnorr=_sqf_norr}
\newcount\POL@count
-\newif\ifPOL@pol
\newif\ifxintveryverbose
\newif\ifpoltypesetall
\newif\ifPOL@tosturm@makefirstprimitive
@@ -54,7 +198,7 @@
\newif\ifPOL@isolz@nextwillneedrefine
\newif\ifpoltoexprall
%% the main exchange structure (stored in macros \POLuserpol@<name>)
-%% is: degree.\empty{coeff0}{coeff1}....{coeffN}
+%% is: degree.\POL@empty{coeff0}{coeff1}....{coeffN}
%% (degree=N except zero polynomial recognized from degree set to -1
%% but it has always the {0/1[0]} coeff0.)
\def\POL@ifZero#1{\expandafter\POL@ifZero@aux#1;}%
@@ -67,13 +211,17 @@
%
\def\POL@resultfromarray #1{% ATTENTION, **MUST** be executed with
% \count@ set to 1 + degree (\count@ = 0 for zero polynomial)
- \edef\POL@result{\ifnum\count@>\z@
- \the\numexpr\count@-\@ne.\noexpand\empty
+% Attention to the \protected here at 0.7.5
+% They are many all over the place
+ \protected\edef\POL@result{\ifnum\count@>\z@
+ \the\numexpr\count@-\@ne.\POL@empty
\xintiloop [1+1]%
\expandafter\POL@braceit\csname POL@array#1\xintiloopindex\endcsname
\ifnum\xintiloopindex<\count@
\repeat
- \else-1.\noexpand\empty{0/1[0]}\fi}%
+% Attention to this \protected\POL@empty
+% They are many all over the place
+ \else-1.\POL@empty{0/1[0]}\fi}%
}%
\def\POL@braceit#1{{#1}}% needed as \xintiloopindex can not "see" through braces
@@ -85,12 +233,11 @@
\POL@restoresemicolon
\edef\POL@tmp{\ifxintverbose1\else0\fi}%
\unless\ifxintveryverbose\xintverbosefalse\fi
- \let\POL@originalXINT_expr_scanfunc_b\XINT_expr_scanfunc_b
- \let\XINT_expr_scanfunc_b\POL@XINT_expr_scanfunc_b
+ \POL@hackxintexpr
\xintdeffunc __pol(#2):=0+(#4);% force conversion to raw if a constant
+ \POL@restorexintexpr
\if1\POL@tmp\xintverbosetrue\fi
\edef\POL@polname{\xint_zapspaces #1 \xint_gobble_i}%
- \let\XINT_expr_scanfunc_b\POL@originalXINT_expr_scanfunc_b
\begingroup
\setbox0\hbox{%
\let\xintScalarAdd\xintAdd
@@ -107,48 +254,79 @@
\def\xintSub ##1##2{\xintAdd{##1}{\xintOpp{##2}}}%
% \xintAdd{0} to get \POL@result defined even if numerical only expression
% I could also test \ifPOL@pol, but this is anyhow small overhead
- \xintAdd{0}%
- {\csname XINT_expr_userfunc___pol\endcsname
- {\global\POL@poltrue\def\POL@result{1.\empty{0/1[0]}{1/1[0]}}}}%
+% Attention that xintexpr 1.4 has braces all over the place
+ \expandafter\xintAdd\expandafter{\expandafter0\expandafter}%
+ \romannumeral0\csname XINT_expr_userfunc___pol\endcsname
+ {\POL@polglobaltrue\protected\def\POL@result{1.\POL@empty{0/1[0]}{1/1[0]}}}%
\expandafter}\expandafter
\endgroup\expandafter
\def\csname POLuserpol@\POL@polname\expandafter\endcsname
\expandafter{\POL@result}%
\expandafter\POL@newpol\expandafter{\POL@polname}%
}%
-%%
+%
+
+
\def\POL@newpol#1{%
- \expandafter\POL@ifZero\csname POLuserpol@#1\endcsname
- {\@namedef{XINT_expr_userfunc_#1}##1{0/1[0]}}%
- {\POL@newpolhorner{#1}}%
- \expandafter\XINT_expr_defuserfunc
- \csname XINT_expr_func_#1\endcsname{#1}{expr}%
+%% We must handle specially constant polynomials because they must
+%% be made to work expandably in \poldef of other polynomials due
+%% to complicated matters having to do with the \POL@ifpol conditional
+ \ifnum\PolDegree{#1}<\@ne
+ % non-zero constant
+ % I am defining this one only for the Info message, no time now
+ \expandafter\edef\csname XINT_expr_polfunc_#1\endcsname
+ ##1{\PolNthCoeff{#1}{0}}%
+ % No hooks here!
+ \expandafter\edef\csname XINT_expr_func_#1\endcsname ##1##2##3%
+ {##1##2{{\PolNthCoeff{#1}{0}}}}%
+ \else
+ % polynomial of degree at least 1. This means that mechanism
+ % to get \POL@result will get activated and we must be very careful
+ % to never \edef when the Horner macro will be converted to
+ % a polynomial
+ \POL@newpolhorner{#1}%
+ \POL@defpolfunc{#1}{expr}%
+ \fi
\expandafter\let\csname XINT_flexpr_func_#1\endcsname\@undefined
\ifxintverbose\POL@info{#1}\fi
}%
\def\POL@newfloatpol#1{%
- \expandafter\POL@ifZero\csname POLuserpol@#1\endcsname
- {\@namedef{XINT_flexpr_userfunc_#1}##1{0[0]}}%
- {\POL@newfloatpolhorner{#1}}%
- \expandafter\XINT_expr_defuserfunc
- \csname XINT_flexpr_func_#1\endcsname{#1}{flexpr}%
+%% We must handle specially constant polynomials because they must
+%% be made to work expandably in \poldef of other polynomials due
+%% to complicated matters having to do with the \POL@ifpol conditional
+ \ifnum\PolDegree{#1}<\@ne
+ % non-zero constant
+ % I am defining this one only for the Info message, no time now
+ \expandafter\edef\csname XINT_flexpr_polfunc_#1\endcsname
+ ##1{\PolNthCoeff{#1}{0}}%
+ % No hooks here!
+ \expandafter\edef\csname XINT_flexpr_func_#1\endcsname ##1##2##3%
+ {##1##2{{\PolNthCoeff{#1}{0}}}}%
+ \else
+ % polynomial of degree at least 1. This means that mechanism
+ % to get \POL@result will get activated and we must be very careful
+ % to never \edef when the Horner macro will be converted to
+ % a polynomial
+ \POL@newfloatpolhorner{#1}%
+ \POL@defpolfunc{#1}{flexpr}%
+ \fi
\ifxintverbose\POL@floatinfo{#1}\fi
}%
\def\POL@info #1{%
\xintMessage {polexpr}{Info}%
{Function #1 for the \string\xintexpr\space parser is
- associated to \string\XINT_expr_userfunc_#1\space
+ associated to \string\XINT_expr_polfunc_#1\space
whose meaning uses Horner scheme:
\expandafter\meaning
- \csname XINT_expr_userfunc_#1\endcsname}%
+ \csname XINT_expr_polfunc_#1\endcsname}%
}%
\def\POL@floatinfo #1{%
\xintMessage {polexpr}{Info}%
{Function #1 for the \string\xintfloatexpr\space parser is
- associated to \string\XINT_flexpr_userfunc_#1\space
+ associated to \string\XINT_flexpr_polfunc_#1\space
whose meaning uses Horner scheme:
\expandafter\meaning
- \csname XINT_flexpr_userfunc_#1\endcsname}%
+ \csname XINT_flexpr_polfunc_#1\endcsname}%
}%
%
\def\POL@newpolhorner#1{%
@@ -162,7 +340,7 @@
\expandafter\POL@newpol@horner\POL@var@coeffs\relax
\expandafter
\endgroup
- \expandafter\def\csname XINT_expr_userfunc_#1\expandafter\endcsname
+ \expandafter\def\csname XINT_expr_polfunc_#1\expandafter\endcsname
\expandafter##\expandafter1\expandafter{\POL@tmp{##1}}%
}%
\def\POL@newfloatpolhorner#1{%
@@ -176,7 +354,7 @@
\expandafter\POL@newpol@floathorner\POL@var@coeffs\relax
\expandafter
\endgroup
- \expandafter\def\csname XINT_flexpr_userfunc_#1\expandafter\endcsname
+ \expandafter\def\csname XINT_flexpr_polfunc_#1\expandafter\endcsname
\expandafter##\expandafter1\expandafter{\POL@tmp{##1}}%
}%
\def\POL@newpol@horner#1{\let\xintAdd\relax\let\xintMul\relax
@@ -211,10 +389,9 @@
\def\POL@let#1#2{%
\expandafter\let\csname POLuserpol@#1\expandafter\endcsname
\csname POLuserpol@#2\endcsname
- \expandafter\let\csname XINT_expr_userfunc_#1\expandafter\endcsname
- \csname XINT_expr_userfunc_#2\endcsname
- \expandafter\XINT_expr_defuserfunc
- \csname XINT_expr_func_#1\endcsname{#1}{expr}%
+ \expandafter\let\csname XINT_expr_polfunc_#1\expandafter\endcsname
+ \csname XINT_expr_polfunc_#2\endcsname
+ \POL@defpolfunc{#1}{expr}%
\ifxintverbose\POL@info{#1}\fi
}%
\newcommand\PolGlobalLet[2]{\begingroup
@@ -259,7 +436,7 @@
\def\POL@getfromarray#1#2{%
\count@=#2{0} %<- intentional space
\ifnum\count@=\z@
- \def\POL(a)result{-1.\empty{0/1[0]}}% 0.5 fix for empty array
+ \protected\def\POL@result{-1.\POL@empty{0/1[0]}}% 0.5 fix for empty array
\else
\xintloop
\edef\POL@tmp{#2{\count@}}%
@@ -283,7 +460,7 @@
\repeat
\count@\count\tw@
\def\POL(a)tmp##1.{{\csname POL@tmparray##1\endcsname}}%
- \edef\POL@result{\the\numexpr\count@-\@ne.\noexpand\empty
+ \protected\edef\POL@result{\the\numexpr\count@-\@ne.\POL@empty
\xintiloop[1+1]%
\expandafter\POL(a)tmp\xintiloopindex.%
\ifnum\xintiloopindex<\count@
@@ -480,7 +657,7 @@
{\ifnum\POL@degB<\z@
\expandafter\xint_firstoftwo\else\expandafter\xint_secondoftwo
\fi
- {\def\POL(a)result{-1.\empty{0/1[0]}}}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
{\xintAssignArray\POL@polB\to\POL@arrayB
\POL@normalize{B}%
\POL@gcd@exit BA}}%
@@ -606,11 +783,11 @@
\expandafter\expandafter\expandafter\POL@split
\csname POLuserpol@#1\endcsname;\POL@var@deg\POL@var@coeffs
\ifnum\POL@var@deg<\@ne
- \@namedef{POLuserpol@#2}{-1.\empty{0/1[0]}}%
+ \@namedef{POLuserpol@#2}{-1.\POL@empty{0/1[0]}}%
\else
\edef\POL@var@coeffs{\expandafter\POL@diff\POL@var@coeffs\relax}%
\expandafter\edef\csname POLuserpol@#2\endcsname
- {\the\numexpr\POL@var@deg-\@ne.\noexpand\empty\POL@var@coeffs}%
+ {\the\numexpr\POL@var@deg-\@ne.\POL@empty\POL@var@coeffs}%
\fi
}%
% lazy way but allows to share with AntiDiff
@@ -666,11 +843,11 @@
\expandafter\expandafter\expandafter\POL@split
\csname POLuserpol@#1\endcsname;\POL@var@deg\POL@var@coeffs
\ifnum\POL@var@deg<\z@
- \@namedef{POLuserpol@#2}{-1.\empty{0/1[0]}}%
+ \@namedef{POLuserpol@#2}{-1.\POL@empty{0/1[0]}}%
\else
\edef\POL@var@coeffs{\expandafter\POL@antidiff\POL@var@coeffs\relax}%
\expandafter\edef\csname POLuserpol@#2\endcsname
- {\the\numexpr\POL@var@deg+\@ne.\noexpand\empty{0/1[0]}\POL@var@coeffs}%
+ {\the\numexpr\POL@var@deg+\@ne.\POL@empty{0/1[0]}\POL@var@coeffs}%
\fi
}%
@@ -737,7 +914,7 @@
\POL@count\z@
% if I applied the same as for positive degree, I should make it -1
% if constant is negative. I also don't worry if polynomial is zero.
- \@namedef{POLuserpol@\POL@sturmname _0}{0.\empty{1/1[0]}}%
+ \@namedef{POLuserpol@\POL@sturmname _0}{0.\POL@empty{1/1[0]}}%
\else
\ifPOL@tosturm@makefirstprimitive\POL@makeprimitive{\POL@sturmname _0_}\fi
\POL@tosturm@dosturm
@@ -793,7 +970,7 @@
\POL@mapcoeffs\POL@aux@toint{\POL@sturmname _\the\POL@count}%
\ifnum\POL@count>\z@
\repeat
- \@namedef{POLuserpol@\POL@sturmname _\POL@sturm@N}{0.\empty{1/1[0]}}%
+ \@namedef{POLuserpol@\POL@sturmname _\POL@sturm@N}{0.\POL@empty{1/1[0]}}%
\else % they are already normalized
\advance\POL@count\@ne % attention to include last one also
\xintloop
@@ -984,7 +1161,7 @@
\POL@findrat@xN\POL@findrat@xD\POl@_
% we can't move this to updatequotients because other branch will
% need to do the division first anyhow
- \edef\POLuserpol@_findrat@oneterm{1.\noexpand\empty
+ \edef\POLuserpol@_findrat@oneterm{1.\POL@empty
{\xintiiOpp\POL@findrat@xN/1[0]}{\POL@findrat@xD/1[0]}}%
\POL@divide{\POL@sturmname\POL@sqfnorr}{_findrat@oneterm}% the one without mult.
%\expandafter\POL@split\POL@R;\POL@degR\POL@polR
@@ -1118,7 +1295,7 @@
% zero should never occur here
\POL@findrat@ifnegative{\edef\POL@findrat@x{-\POL@findrat@x}}{}%
\POL@xintfrac@getNDE\POL@findrat@x\POL@findrat@xN\POL@findrat@xD\POL@_
- \edef\POLuserpol@_findrat@oneterm{1.\noexpand\empty
+ \edef\POLuserpol@_findrat@oneterm{1.\POL@empty
{\xintiiOpp{\POL@findrat@xN}/1[0]}{\POL@findrat@xD/1[0]}}%
\POL@divide{\POL@sturmname\POL@sqfnorr}{_findrat@oneterm}% the one without mult.
\expandafter\POL@split\POL@R;\POL@degR\POL@polR
@@ -1185,7 +1362,7 @@
% safer to do the edef as \POL@findrat@x used later in storeit
\edef\POL@findrat@x{\xintIrr{\xintDiv\POL@findrat@Num\POL@findrat@D}[0]}%
\POL@xintfrac@getNDE\POL@findrat@x\POL@findrat@xN\POL@findrat@xD\POL@_
- \edef\POLuserpol@_findrat@oneterm{1.\noexpand\empty
+ \edef\POLuserpol@_findrat@oneterm{1.\POL@empty
{\xintiiOpp{\POL@findrat@xN}/1[0]}{\POL@findrat@xD/1[0]}}%
\POL@divide{\POL@sturmname\POL@sqfnorr}{_findrat@oneterm}% the one without mult.
\expandafter\POL@split\POL@R;\POL@degR\POL@polR
@@ -1210,11 +1387,11 @@
\begingroup\xintglobaldefstrue
% skip some overhead of \xintdefvar...
\XINT_expr_defvar_one{\POL@sturmname L_\POL@findrat@index}%
- {\csname .=\POL@findrat@x\endcsname}%
+ {\POL@findrat@x}%
\XINT_expr_defvar_one{\POL@sturmname R_\POL@findrat@index}%
- {\csname .=\POL@findrat@x\endcsname}%
+ {\POL@findrat@x}%
\XINT_expr_defvar_one{\POL@sturmname Z_\POL@findrat@index _isknown}%
- {\csname .=1\endcsname}%
+ {1}%
\endgroup
}%
\def\POL@findrat@loop@updatequotients{%
@@ -1326,7 +1503,7 @@
\xintloop
% skip some overhead of \xintdefvar...
\XINT_expr_defvar_one{\POL@sturmname M_\x}%
- {\csname .=\csname POL_ZM\POL@sturmname*\x\endcsname\endcsname}%
+ {\csname POL_ZM\POL@sturmname*\x\endcsname}%
\edef\x{\the\numexpr\x-\@ne}%
\ifnum\x>\z@
\repeat
@@ -1901,17 +2078,16 @@
\begingroup\xintglobaldefstrue
% skip some overhead of \xintdefvar...
\XINT_expr_defvar_one{\POL@sturmname L_\POL@isolz@IntervalIndex}%
- {\csname .=\POL@IsoLeft@rawout\endcsname}%
+ {\POL@IsoLeft@rawout}%
\XINT_expr_defvar_one{\POL@sturmname R_\POL@isolz@IntervalIndex}%
- {\csname .=\POL@IsoRight@rawout\endcsname}%
+ {\POL@IsoRight@rawout}%
% added at 0.7
\XINT_expr_defvar_one{\POL@sturmname Z_\POL@isolz@IntervalIndex _isknown}%
- {\csname .=\ifnum\POL@IsoRightSign=\z@ 1\else 0\fi\endcsname}%
+ {\ifnum\POL@IsoRightSign=\z@ 1\else 0\fi}%
\endgroup
}%
%% \PolRefineInterval
-\def\POL@xintexprGetVar#1{\expandafter\expandafter\expandafter
- \XINT_expr_unlock\csname XINT_expr_var_#1\endcsname}%
+\def\POL@xintexprGetVar#1{\csname XINT_expr_varvalue_#1\endcsname}%
% attention, also used by \POL@findrat@loop@a
\def\POL@get@IsoLeft@rawin{%
\edef\POL@IsoLeft@rawin
@@ -2277,28 +2453,70 @@
%% The idea is to execute it with another meaning given to \xintAdd etc..,
%% so that it operates on "polynomials". This is a mixture of expandable
%% and non-expandable techniques.
+%%
+%% And it was complicated to let it work with xintexpr 1.4
+%%
\def\POL@get#1#2#3{%
- \global\POL@polfalse
+ \relax %!! part de la tambouille pour fonctionner en xint 1.4
+ \POL@polglobalfalse
\begingroup
- \def\POL@result{#3}%
+ \protected\def\POL@result{#3}%
#3%
\expandafter
\endgroup
\expandafter\def\expandafter#1\expandafter{\POL@result}%
\unless\ifPOL@pol
% avoid expanding more than twice #3
+ % #3 must be purely numerical or at least compatible with \edef
+ % this is why at 0.7.5 I had to handle especially constant
+ % polynomial functions to remove any protection from them
+ % (because the protection triggers the COMPOSITION when
+ % the polynomial is found as argument of another one and
+ % this is not expandable)
\edef#1{#3}%
\xintiiifZero{#1}%
- {\def#1{-1.\empty{0/1[0]}}}%
- {\edef#1{0.\noexpand\empty{#1}}}%
+ {\def#1{-1.\POL@empty{0/1[0]}}}%
+ {\edef#1{0.\POL@empty{#1}}}%
\fi
#2%
}%
+
+%% COMPOSITION
+%% This did not exist before 0.7.5 and is part of its adaptation to xint 1.4
+%% We thus took up this opportunity to speed up substantially composition.
+%% Very serious difficulties with constant polynomials. Had to handle them
+%% especially.
+%% OK, that was really tough, but advantage now is that composition
+%% at 0.7.5 should be more efficient than before. However when polynomials
+%% become big via composition, coefficients also are big and the time
+%% taken by arithmetic dominates. No time to test really, though, relieved
+%% I can release xint 1.4 at last. My basic polexpr test suite passes,
+%% but it goes back already to old releases.
+\protected\def\POL@applypolfunc#1#2%
+{%
+% This #2 may be also invoing \POL@applypolfunc...
+ \POL@get\POL@A\POL@applypolfunc@b#2#1%
+}%
+\def\POL@applypolfunc@b #1%
+{%
+% and now the have our Horner scheme nested macro
+% which hopefully will do its job with \POL@add, \POL@mul etc...
+ \POL@polglobalfalse
+ \expandafter#1\expanded
+ {{\POL@polglobaltrue\protected\def\noexpand\POL@result{\POL@A}}}%
+ \unless\ifPOL@pol
+ \odef\POL@result{#1{0}}%
+ \xintiiifZero{\POL@result}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
+ {\protected\edef\POL@result{0.\POL@empty{\POL@result}}}%
+ \fi
+}%
+
%% ADDITION
\def\POL@add {\POL@get\POL@A\POL@add@b}%
\def\POL@add@b{\POL@get\POL@B\POL@add@c}%
\def\POL@add@c{%
- \global\POL@poltrue
+ \POL@polglobaltrue
\POL@ifZero\POL@A
{\let\POL@result\POL@B}%
{\POL@ifZero\POL@B
@@ -2341,11 +2559,11 @@
\def\POL@mul {\POL@get\POL@A\POL@mul@b}%
\def\POL@mul@b{\POL@get\POL@B\POL@mul@c}%
\def\POL@mul@c{%
- \global\POL@poltrue
+ \POL@polglobaltrue
\POL@ifZero\POL@A
- {\def\POL(a)result{-1.\empty{0/1[0]}}}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
{\POL@ifZero\POL@B
- {\def\POL(a)result{-1.\empty{0/1[0]}}}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
{\POL@@mul}}%
}%
\def\POL@@mul{%
@@ -2436,9 +2654,9 @@
%% POWERS (SCALAR EXPONENT...)
\def\POL@pow #1#2{%
- \global\POL@polfalse
+ \POL@polglobalfalse
\begingroup
- \def\POL@result{#1}%
+ \protected\def\POL@result{#1}%
#1%
\expandafter
\endgroup
@@ -2446,39 +2664,39 @@
\unless\ifPOL@pol
\edef\POL@A{\xintScalarPow{#1}{#2}}% no error check
\xintiiifZero{\POL@A}%
- {\def\POL(a)result{-1.\empty{0/1[0]}}}%
- {\edef\POL@result{0.\noexpand\empty{\POL@A}}}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
+ {\protected\edef\POL@result{0.\POL@empty{\POL@A}}}%
\else
\edef\POL@B{\numexpr\xintNum{#2}\relax}% no check on exponent >= 0
\ifcase\POL@B
- \def\POL(a)result{0.\empty{1/1[0]}}%
+ \protected\def\POL@result{0.\POL@empty{1/1[0]}}%
\or
\let\POL@result\POL@A
\else
\POL@@pow@check
\fi
\fi
- \global\POL@poltrue
+ \POL@polglobaltrue
}%
\def\POL@@pow@check {%
% no problem here with leftover tokens!
% should I have used that I-don't-care technique more elsewhere?
\ifnum\@ne>\POL@A
- % polynomial is a constant, must get rid of dot and \empty
+ % polynomial is a constant, must get rid of dot and \empty (\POL@empty)
\edef\POL@A{\expandafter\xintScalarPow\romannumeral`^^@%
\expandafter\xint_gob_til_dot\POL@A{\POL@B}}%
\xintiiifZero{\POL@A}%
- {\def\POL(a)result{-1.\empty{0/1[0]}}}%
- {\edef\POL@result{0.\noexpand\empty{\POL@A}}}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
+ {\protected\edef\POL@result{0.\POL@empty{\POL@A}}}%
\else
\ifnum\@ne=\POL@A
% perhaps a constant times X, check constant term
\xintiiifZero
{\expandafter\xint_firstoftwo\romannumeral`^^@%
\expandafter\xint_gob_til_dot\POL@A}
- {\edef\POL@result
+ {\protected\edef\POL@result
{\the\POL(a)B.% here at least 2.
- \noexpand\empty
+ \POL@empty
\romannumeral\xintreplicate{\POL@B}{{0/1[0]}}%
{\xintScalarPow
{\expandafter\xint_secondoftwo\romannumeral`^^@%
@@ -2531,8 +2749,8 @@
{#2}%
\expandafter\POL@mul\expandafter
{\expandafter\def\expandafter\POL@result\expandafter
- {\POL@result}\global\POL@poltrue}%
- {\def\POL@result{#1}\global\POL@poltrue}%
+ {\POL@result}\POL@polglobaltrue}%
+ {\protected\def\POL@result{#1}\POL@polglobaltrue}%
}%
%% DIVISION
@@ -2540,7 +2758,7 @@
\def\POL@div {\POL@get\POL@A\POL@div@b}%
\def\POL@div@b{\POL@get\POL@B\POL@div@c}%
\def\POL@div@c{%
- \global\POL@poltrue
+ \POL@polglobaltrue
\expandafter\POL@split\POL@A;\POL@degA\POL@polA
\expandafter\POL@split\POL@B;\POL@degB\POL@polB
\ifnum\POL@degA<\POL@degB\space
@@ -2599,9 +2817,9 @@
%% MINUS SIGN AS UNARY OPERATOR
\def\POL@opp #1{%
- \global\POL@polfalse
+ \POL@polglobalfalse
\begingroup
- \def\POL@result{#1}%
+ \protected\def\POL@result{#1}%
#1%
\expandafter
\endgroup
@@ -2609,13 +2827,13 @@
\unless\ifPOL@pol
\edef\POL@A{\xintScalarOpp{#1}}%
\xintiiifZero{\POL@A}%
- {\def\POL(a)result{-1.\empty{0/1[0]}}}%
- {\edef\POL@result{0.\noexpand\empty{\POL@A}}}%
+ {\protected\def\POL@result{-1.\POL@empty{0/1[0]}}}%
+ {\protected\edef\POL@result{0.\POL@empty{\POL@A}}}%
\else
- \edef\POL(a)B{0.\noexpand\empty{-1/1[0]}}%
+ \edef\POL@B{0.\POL@empty{-1/1[0]}}%
\POL@@mul
\fi
- \global\POL@poltrue
+ \POL@polglobaltrue
}%
@@ -2626,9 +2844,9 @@
\At\PolEvalAtExpr\krof {#1}{#3}%
}%
\newcommand\PolEvalAt[2]
- {\xintpraw{\csname XINT_expr_userfunc_#1\endcsname{#2}}}%
+ {\xintpraw{\csname XINT_expr_polfunc_#1\endcsname{#2}}}%
\newcommand\POL@eval[2]
- {\csname XINT_expr_userfunc_#1\endcsname{#2}}%
+ {\csname XINT_expr_polfunc_#1\endcsname{#2}}%
\newcommand\PolEvalAtExpr[2]{\xinttheexpr #1(#2)\relax}%
%
\newcommand\PolEvalReduced[3]{\romannumeral`^^@\POL@eval@fork
@@ -2637,11 +2855,11 @@
}%
\newcommand\PolEvalReducedAt[2]{%
\xintpraw % in order not to print denominator if the latter equals 1
- {\xintIrr{\csname XINT_expr_userfunc_#1\endcsname{#2}}[0]}%
+ {\xintIrr{\csname XINT_expr_polfunc_#1\endcsname{#2}}[0]}%
}%
\newcommand\PolEvalReducedAtExpr[2]{%
\xintpraw
- {\xintIrr{\romannumeral`^^@\xintthebareeval#1(#2)\relax}[0]}%
+ {\expandafter\xintIrr\romannumeral`^^@\xintthebareeval#1(#2)\relax[0]}%
}%
%
\newcommand\PolFloatEval[3]{\romannumeral`^^@\POL@eval@fork
@@ -2649,7 +2867,7 @@
\At\PolFloatEvalAtExpr\krof {#1}{#3}%
}%
\newcommand\PolFloatEvalAt[2]
- {\xintpfloat{\csname XINT_flexpr_userfunc_#1\endcsname{#2}}}%
+ {\xintpfloat{\csname XINT_flexpr_polfunc_#1\endcsname{#2}}}%
\newcommand\PolFloatEvalAtExpr[2]{\xintthefloatexpr #1(#2)\relax}%
@@ -2898,12 +3116,12 @@
\expandafter#1%
\fi {#3}#2}%
%
-\def\POL@toexprA #1#2\empty#3{%
+\def\POL@toexprA #1#2\POL@empty#3{%
\ifpoltoexprall\expandafter\POL@toexprall@b
\else\expandafter\POL@toexpr@b
\fi {#3}#2{0}1.%
}%
-\def\POL@toexprD #1#2#3\relax{% #3 has \empty to prevent brace removal
+\def\POL@toexprD #1#2#3\relax{% #3 has \empty (\POL@empty) to prevent brace removal
\expandafter\POL@toexprD@a\expandafter#2%
\the\numexpr #1\expandafter.\romannumeral0\xintrevwithbraces{#3}\relax
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/polexpr.tlpobj new/tlpkg/tlpobj/polexpr.tlpobj
--- old/tlpkg/tlpobj/polexpr.tlpobj 2019-02-28 04:00:07.000000000 +0100
+++ new/tlpkg/tlpobj/polexpr.tlpobj 2020-02-02 01:58:19.000000000 +0100
@@ -1,6 +1,6 @@
name polexpr
category Package
-revision 50013
+revision 53633
shortdesc A parser for polynomial expressions
relocated 1
longdesc The package provides \poldef: a parser for polynomial
@@ -14,11 +14,10 @@
longdesc functions but additionally are also known to the package via
longdesc their coefficients. This allows dedicated macros to implement
longdesc polynomial algorithmics.
-runfiles size=28
+runfiles size=30
RELOC/tex/latex/polexpr/polexpr.sty
catalogue-also polynom
catalogue-ctan /macros/latex/contrib/polexpr
-catalogue-date 2019-02-12 20:32:28 +0100
catalogue-license lppl1.3c
-catalogue-topics maths
-catalogue-version 0.7.4
+catalogue-topics maths arithmetic calculation
+catalogue-version 0.7.5
++++++ polyglossia.doc.tar.xz ++++++
++++ 2710 lines of diff (skipped)
++++++ polyglossia.tar.xz ++++++
++++ 19158 lines of diff (skipped)
++++++ poormanlog.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/poormanlog/README new/doc/generic/poormanlog/README
--- old/doc/generic/poormanlog/README 2019-02-18 00:01:29.000000000 +0100
+++ new/doc/generic/poormanlog/README 2019-09-11 23:20:03.000000000 +0200
@@ -1,126 +1,77 @@
-DOCUMENTATION OF POORMANLOG (v0.04, 2019/02/17)
-===========================
+POORMANLOG (v0.05, 2019/04/22)
+==============================
-(see License at bottom of this file)
+poormanlog.tex provides (expandable) macros \PMLogZ and \PMPowTen
+for computing base 10 logarithms and powers of 10 with a bit less
+than 9 digits of precision.
-The poormanlog.tex file has no dependencies. It provides (expandable)
-macros for base 10 logarithms and powers of 10 with a bit less than 9
-digits of precision (\PMLogZ and \PMPowTen), but its main use will be
-in conjunction with xintexpr.sty, as it provides to the latter
-functions log10() and pow10() and does on-demand modification of the
-power operators ** or ^ to compute according to pow10(y*log10(x)).
+It can be used with TeX (\input poormanlog) and has a LaTeX interface
+(\usepackage{poormanlog}).
-This usage will become obsolete when xintexpr will natively implement
-in arbitrary precision the log10() and pow10() functions.
+Regarding TeX, it requires the e-TeX \numexpr primitive, thus etex
+or pdftex or other binaries with the e-TeX extensions are required.
-The file can be used with Plain TeX (\input poormanlog) or as a
-regular LaTeX package.
+Changes
+-------
-Example (with Plain TeX)
-------------------------
-
- \input xintexpr.sty
- \input poormanlog.tex
-
- \xinteval{log10(3.14159265), pow10(2.71828183)}
-
- \poormanloghack{**}
-
- \xinteval{3.14159265**2.71828183}
-
- \poormanloghack{^}
-
- \xinteval{3.14159265^2.71828183}
-
- \bye
-
-
-User interface
---------------
-
-\PMLogZ{#1} expands in two steps.
-
-input: #1 is a mantissa ddddddddd (it may be an f-expandable macro)
- with exactly 9 digits (the first one must not be zero)
-output: 9 digits xxxxxxxxx such that log10(d.dddddddd) is about 0.xxxxxxxxx
-
-It seems from testing that absolute error is not much more than 1 unit in
-the last place, and result differs from rounded mathematical value by at
-most 1 unit in the 9th digit. (attention not rigorously proven).
-
-\PMPowTen{#1} expands in two steps.
-
-input: #1 is (or expands to) exactly 9 digits ddddddddd representing
- 0.ddddddddd
-output: 9 digits xxxxxxxxx, first one not zero,
- such that 10^0.ddddddddd is about x.xxxxxxxx
-
-It seems from testing that absolute error is less than 2 units in
-the last place, and result differs from rounded mathematical value by at
-most 2 units in the 9th digit. (attention not rigorously proven).
-
-\PoorManLogBaseTen{#1}
-
- in presence of xintfrac this will accept input as recognized by xintfrac
- and produce the logarithm in base 10 with an error (believed to be at
- most) about 1 unit in the 9th (i.e. last) fractional digit.
-
- xintfrac may be loaded before or after.
-
-\PoorManPowerOfTen{#1}
-
- in presence of package xintfrac this will accept input as recognized by
- xintfrac and produce the 10^#1 with 9 digits of float precision, with an
- error (believed to be) at most 2 units in the last place. Of course for
- this the input must be precise enough to have 9 fractional digits of
- **fixed point** precision.
+- v0.04 (2019/02/17): initial release. The package has no
+ dependencies and alongside two macros \PMLogZ and \PMPowTen
+ also provides some specific additions to xint.
- xintfrac may be loaded before or after.
+- v0.05 (2019/04/22): the additions/patches to xint originally
+ provided by poormanlog.tex got moved into xint 1.3f itself.
-\PoorManPower{#1}{#2}
+ Thus, poormanlog now reduces to the sole two macros
+ \PMLogZ and \PMPowTen. It can be imported by other macro
+ files with no danger of conflicting with future releases of
+ xint in case of concurrent usage.
- in presence of package xintfrac computes #1 to the power #2
- xintfrac may be loaded before or after.
+Files
+-----
-log10()
+poormanlog.tex
+poormanlog.sty
+README
- the log10() function is made available, if xintexpr.sty is loaded, for
- usage within \xinteval and \xintfloateval. If a log10() function is
- already defined in xintexpr it will not be overwritten
- xintexpr may be loaded before or after.
+\PMLogZ{#1} computes base-10 logarithms:
+----------------------------------------
-pow10()
+expansion: the argument is submitted to f-expansion and the macro
+ itself expands fully in two steps.
- pow10() function is made available, if xintexpr.sty is loaded, for usage
- within \xinteval and \xintfloateval. If a pow10() function is already
- defined in xintexpr it will not be overwritten
+input: #1 must be (or f-expands to) a mantissa ddddddddd with exactly
+ 9 digits, standing for D = d.dddddddd, 1 <= D < 10
- xintexpr may be loaded before or after.
+output: 9 digits xxxxxxxxx standing for X = 0.xxxxxxxxx such that
+ log10(D) is about X
-modification of ** or ^ operators in \xintexpr and \xintfloatexpr
+precision: It seems from testing that absolute error is not much
+ more than 1 unit in the last place, and result X differs
+ from rounded mathematical value of log10(D) by at most
+ 1 unit in the last place.
+ (*attention estimate not rigorously proven*).
- \poormanloghack{**}
- \poormanloghack{^}
- They will now use pow10(y*log10(x)) formula to compute x to the power y
+\PMPowTen{#1} computes fractional powers of 10:
+-----------------------------------------------
- Of course this means drop of precision, but allows non-integer exponents.
- (half-integer exponents are already accepted in \xintfloatexpr natively).
+expansion: the argument is submitted to f-expansion and the macro
+ itself expands fully in two steps.
- ** xintexpr must have been loaded before **
+input: #1 must be (f-expands to) exactly 9 digits xxxxxxxxx, standing
+ for X = 0.xxxxxxxxx
-Example with LaTeX :
+output: 9 digits ddddddddd, such that D = d.dddddddd is about 10^X
+ The first digit of output is never zero (i.e. 1 <= D < 10)
- \documentclass{article}
- \usepackage{xintexpr}
- \usepackage{poormanlog}% makes log10() and pow10() available
- \poormanloghack{**} % modifies ** operator
- \begin{document}
- \xinteval{3.14159265**2.71828183, log10(3.14159265), pow10(2.71828)}
- \end{document}
+precision: It seems from testing that absolute error is less than
+ 2 units in the last place, and result D differs from
+ rounded mathematical value of 10^X by at most 2 units in
+ the last place.
+ (*attention estimate not rigorously proven*).
LICENSE
@@ -141,5 +92,5 @@
The Author of this Work is Jean-Francois Burnol.
-This Work consists of files poormanlog.tex, poormanlog.sty and the
+This Work consists of files poormanlog.tex, poormanlog.sty and this
README.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poormanlog.doc.tlpobj new/tlpkg/tlpobj/poormanlog.doc.tlpobj
--- old/tlpkg/tlpobj/poormanlog.doc.tlpobj 2019-02-28 04:00:20.000000000 +0100
+++ new/tlpkg/tlpobj/poormanlog.doc.tlpobj 2019-09-12 01:57:42.000000000 +0200
@@ -1,7 +1,7 @@
name poormanlog.doc
category Package
-revision 50052
+revision 52080
shortdesc doc files of poormanlog
relocated 1
-docfiles size=2
+docfiles size=1
RELOC/doc/generic/poormanlog/README
++++++ poormanlog.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/poormanlog/poormanlog.sty new/tex/generic/poormanlog/poormanlog.sty
--- old/tex/generic/poormanlog/poormanlog.sty 2019-02-18 00:01:29.000000000 +0100
+++ new/tex/generic/poormanlog/poormanlog.sty 2019-09-11 23:20:03.000000000 +0200
@@ -1,4 +1,4 @@
-%% poormanlog.sty v0.04, 2019/02/17
+%% poormanlog.sty v0.05, 2019/04/22
%%
%% Copyright (C) 2019, Jean-Francois Burnol
%%
@@ -12,6 +12,6 @@
%% This Work consists of files poormanlog.tex, poormanlog.sty and
%% the accompanying README
%%
-\ProvidesPackage{poormanlog}[2019/02/17 v0.04 log and powers with 9 digits (JFB)]
+\ProvidesPackage{poormanlog}[2019/04/22 v0.05 base 10 log and pow with 9 digits (JFB)]
\input{poormanlog.tex}% see README file for user documentation
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/poormanlog/poormanlog.tex new/tex/generic/poormanlog/poormanlog.tex
--- old/tex/generic/poormanlog/poormanlog.tex 2019-02-18 23:56:15.000000000 +0100
+++ new/tex/generic/poormanlog/poormanlog.tex 2019-09-11 23:20:03.000000000 +0200
@@ -1,4 +1,4 @@
-%% poormanlog.tex v0.04, 2019/02/17
+%% poormanlog.tex v0.05, 2019/04/22
%%
%% Copyright (C) 2019, Jean-Francois Burnol
%%
@@ -12,11 +12,6 @@
%% This Work consists of files poormanlog.tex, poormanlog.sty and the
%% README
%%
-%% ************ BARELY TESTED ****************
-%% >>>>>>> WARNING FOR LACK OF TIME I HAVE NOT YET VALIDATED FULLY <<<<<
-%% >>>>>>> NOR HAVE I MADE PRECISE ESTIMATES. USE AT YOUR OWN RISK <<<<<
-%% (bug reports welcome)
-%% ************ BARELY TESTED ****************
%
% Package macro private prefix: \PML@
%
@@ -35,7 +30,7 @@
\catcode`\noexpand\^ \the\catcode`\^ %
\catcode`\noexpand\: \the\catcode`\: %
\catcode`\noexpand\* \the\catcode`\* %
- \catcode`\noexpand\@ \the\catcode`\@ %
+ \catcode`\noexpand\@ \the\catcode`\@\relax
}%
\catcode`\@ 11 %
\if1\ifx\@namedef\JFBUundefined1\else\ifx\@namedef\relax1\else0\fi\fi
@@ -284,138 +279,5 @@
\the\numexpr1000000000+\expandafter\PML(a)\romannumeral-`0#1.\relax
}%
\def\PMPowTen#1{\the\numexpr\expandafter\PML(a)Pa\romannumeral-`0#1.\relax}%
-%%
-%%
-%% ADD-ONS TO XINTFRAC : \PoorManLogBaseTen{#1}, \PoorManPowerOfTen{#1}
-%% and \PoorManPower{#1}{#2}
-%% Does not matter if xintfrac loaded before or after.
-%%
-\def\PoorManLogBaseTen{\romannumeral0\poormanlogbaseten}%
-\def\poormanlogbaseten #1%
- {\expandafter\PML@logbaseten\romannumeral0\XINTinfloat[9]{#1}}%
-\def\PML@logbaseten#1[#2]%
-{%
- \xintiiadd{\xintDSx{-9}{\the\numexpr#2+8\relax}}{\the\numexpr\PML(a)#1.}%
- [-9]%
-}%
-%
-\def\PoorManPowerOfTen{\the\numexpr\poormanpoweroften}%
-\def\poormanpoweroften #1%
- {\expandafter\PML@powoften\romannumeral0\xintraw{#1}}%
-\catcode`\_ 11 %
-\def\PML@powoften#1{%
- \xint_UDzerominusfork
- #1-\PML@powoften@zero
- 0#1\PML@powoften@neg
- 0-\PML@powoften@pos
- \krof #1%
-}%
-\catcode`\_ 8 %
-\def\PML@powoften@zero 0{1\relax}%/1[0]
-\def\PML@powoften@pos#1[#2]{%
- \expandafter\PML@powoften@pos@a\romannumeral0\xintround{9}{#1[#2]}.%
-}%
-\def\PML@powoften@pos@a#1.#2.{\PML@Pa#2.\expandafter[\the\numexpr-8+#1]}%
-\def\PML@powoften@neg#1[#2]{%
- \expandafter\PML@powoften@neg@a\romannumeral0\xintround{9}{#1[#2]}.%
-}%
-\def\PML@powoften@neg@a#1.#2.{\ifnum#2=0 \xint_afterfi{1\relax/1[#1]}\else
- \expandafter\expandafter\expandafter
- \PML@Pa\expandafter\@gobble\the\numexpr2000000000-#2.%
- \expandafter[\the\numexpr-9+#1\expandafter]\fi
-}%
-%
-\def\PoorManPower#1#2% #1**#2
-{%
- \PoorManPowerOfTen{\xintMul{#2}{\PoorManLogBaseTen{#1}}}%
-}%
-%%
-%% ADD-ONS TO XINTEXPR :
-%%
-%% log10(), pow10()
-%%
-%% Does not matter if xintexpr loaded before or after.
-%%
-\catcode`\_ 11 \catcode`\: 11 %
-\unless\ifcsname XINT_expr_func_log10\endcsname
-\@namedef{XINT_expr_func_log10}#1#2#3%
-{%
- \expandafter #1\expandafter #2\csname.=%
- \XINT:NEhook:one\PoorManLogBaseTen{\XINT_expr_unlock #3}\endcsname
-}%
-\fi
-\unless\ifcsname XINT_flexpr_func_log10\endcsname
-\expandafter\let\csname XINT_flexpr_func_log10\expandafter\endcsname
- \csname XINT_expr_func_log10\endcsname
-\fi
-%
-\unless\ifcsname XINT_expr_func_pow10\endcsname
-\@namedef{XINT_expr_func_pow10}#1#2#3%
-{%
- \expandafter #1\expandafter #2\csname.=%
- \XINT:NEhook:one\PoorManPowerOfTen{\XINT_expr_unlock #3}\endcsname
-}%
-\fi
-\unless\ifcsname XINT_flexpr_func_pow10\endcsname
-\expandafter\let\csname XINT_flexpr_func_pow10\expandafter\endcsname
- \csname XINT_expr_func_pow10\endcsname
-\fi
-%%
-%% On-demand modification of ** or ^ operators in \xintexpr and \xintfloatexpr
-%%
-\catcode`\* 11 \catcode0 12 %
-%
-\def\poormanloghack**{%
-\def\XINT_expr_op_** ##1%
-{%
- \expandafter \XINT_expr_until_**_a
- \expandafter ##1\romannumeral`^^@\expandafter\XINT_expr_getnext
-}%
-\def\XINT_expr_until_**_a ##1{%
-\def\XINT_expr_until_**_a ####1####2%
-{%
- \xint_UDsignfork
- ####2{\expandafter \XINT_expr_until_**_a \expandafter ##1%
- \romannumeral`^^@##1}%
- -{\XINT_expr_until_**_b ####1####2}%
- \krof
-}}\expandafter\XINT_expr_until_**_a\csname XINT_expr_op_-ix\endcsname
-\def\XINT_expr_until_**_b ##1##2##3##4%
-{%
- \ifnum ##2>\XINT_expr_precedence_**
- \xint_afterfi
- {\expandafter \XINT_expr_until_**_a \expandafter ##1%
- \romannumeral`^^@\csname XINT_expr_op_##3\endcsname {##4}}%
- \else
- \xint_afterfi
- {\expandafter ##2\expandafter ##3%
- \csname .=\XINT:NEhook:two
- \PoorManPower{\XINT_expr_unlock ##1}{\XINT_expr_unlock ##4}\endcsname
- }%
- \fi
-}%
-\let\XINT_flexpr_op_** \XINT_expr_op_**
-\let\XINT_flexpr_until_**_a\XINT_expr_until_**_a
-\let\XINT_flexpr_until_**_b\XINT_expr_until_**_b
-}%
-\catcode`\^ 11 \catcode`\* 7 %
-\def\poormanloghack^{%
-\def\XINT_expr_until_^_b ##1##2##3##4%
-{%
- \ifnum ##2>\XINT_expr_precedence_^
- \xint_afterfi
- {\expandafter \XINT_expr_until_^_a \expandafter ##1%
- \romannumeral`**@\csname XINT_expr_op_##3\endcsname {##4}}%
- \else
- \xint_afterfi
- {\expandafter ##2\expandafter ##3%
- \csname .=\XINT:NEhook:two
- \PoorManPower{\XINT_expr_unlock ##1}{\XINT_expr_unlock ##4}\endcsname
- }%
- \fi
-}%
-\let\XINT_flexpr_until_^_b\XINT_expr_until_^_b
-}%
\@tempa
-\def\poormanloghack#1{\csname poormanloghack#1\endcsname}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/poormanlog.tlpobj new/tlpkg/tlpobj/poormanlog.tlpobj
--- old/tlpkg/tlpobj/poormanlog.tlpobj 2019-02-28 04:00:20.000000000 +0100
+++ new/tlpkg/tlpobj/poormanlog.tlpobj 2019-09-12 01:57:42.000000000 +0200
@@ -1,24 +1,24 @@
name poormanlog
category Package
-revision 50052
+revision 52080
shortdesc Logarithms and powers with (almost) 9 digits
relocated 1
-longdesc This small package (usable with Plain TeX, LaTeX, or others)
-longdesc provides macros for computing logarithms in base 10 and
-longdesc fractional powers of 10, achieving a bit less than 9 digits of
-longdesc precision. The package has no dependencies and can be used on
-longdesc its own, but becomes more user-friendly in the presence of the
-longdesc xintexpr package, as it then provides log10() and pow10()
-longdesc functions and optionally patches the ** or ^ power operators to
-longdesc use those. This usage will become obsolete if and when xintexpr
-longdesc will natively implement log10() and pow10() functions in
-longdesc arbitrary precision. The documentation is included in the
-longdesc README.
-runfiles size=5
+longdesc This small package (usable with Plain e-TeX, LaTeX, or others)
+longdesc with no dependencies provides two fast expandable macros
+longdesc computing logarithms in base 10 and fractional powers of 10.
+longdesc They handle arguments of 9 digit tokens which stand for either
+longdesc 1 <= d.dddddddd < 10 (for the log) or 0.xxxxxxxxx (for powers
+longdesc of 10). They achieve a precision of 1ulp for the logarithm and
+longdesc 2ulp for fractional powers of ten. Extension to other numerical
+longdesc ranges has to be done by user, via own macros or some math
+longdesc engine. The xintexpr package (at 1.3f) imports the poormanlog
+longdesc macros as core constituents of its log10(), pow10(), log(),
+longdesc exp() and pow() functions.
+runfiles size=4
RELOC/tex/generic/poormanlog/poormanlog.sty
RELOC/tex/generic/poormanlog/poormanlog.tex
catalogue-ctan /macros/generic/poormanlog
-catalogue-date 2019-02-19 04:58:07 +0100
+catalogue-date 2019-09-11 10:50:52 +0200
catalogue-license lppl1.3c
catalogue-topics calculation
-catalogue-version 0.04
+catalogue-version 0.05
++++++ prerex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/README new/doc/latex/prerex/README
--- old/doc/latex/prerex/README 2017-11-29 23:07:17.000000000 +0100
+++ new/doc/latex/prerex/README 2019-11-15 22:34:58.000000000 +0100
@@ -1,4 +1,4 @@
-prerex, version 2017-11-28. Macros for prerequisite charts, with
+prerex, version 2019-11-15. Macros for prerequisite charts, with
associated editor and viewer applications.
This package consists of
@@ -19,9 +19,7 @@
or Qt-5 and poppler-qt libraries.
See chart.{pdf,svg} for a small example of a prerequisite
-chart and real-life examples at
-
-http://www.cs.queensu.ca/students/undergraduate/prerequisites/
+chart.
Prerequisite charts are useful to students selecting courses and
planning their programs, and to faculty and staff advising students
@@ -71,8 +69,8 @@
of it automatically follow. To install on most Unix-like platforms,
including OS-X and Cygwin on Windows:
- tar zxvf prerex-6.5.4.tar.gz
- cd prerex-6.5.4
+ tar zxvf prerex-6.8.0.tar.gz
+ cd prerex-6.8.0
./configure [--prefix=$HOME]
make
make install (as root if necessary)
Binary files old/doc/latex/prerex/intro.pdf and new/doc/latex/prerex/intro.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/intro.tex new/doc/latex/prerex/intro.tex
--- old/doc/latex/prerex/intro.tex 2014-10-18 00:03:09.000000000 +0200
+++ new/doc/latex/prerex/intro.tex 2019-11-14 22:53:35.000000000 +0100
@@ -118,11 +118,6 @@
\subsection{Prerex-Formatted Prerequisite Charts}
-\subsubsection*{Where can I see prerex-formatted charts in use?}
-
-There are several charts for both specialized and multi-disciplinary programs
-on-line here: \myurl{http://www.cs.queensu.ca/undergraduate/prerequisites}.
-
\subsubsection*{What file formats are used for prerex-formatted charts?}
The charts themselves are best distributed in the Portable Document
Binary files old/doc/latex/prerex/prerex-6.5.4.tar.gz and new/doc/latex/prerex/prerex-6.5.4.tar.gz differ
Binary files old/doc/latex/prerex/prerex-6.8.0.tar.gz and new/doc/latex/prerex/prerex-6.8.0.tar.gz differ
Binary files old/doc/latex/prerex/prerex.pdf and new/doc/latex/prerex/prerex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/prerex.sty.7 new/doc/latex/prerex/prerex.sty.7
--- old/doc/latex/prerex/prerex.sty.7 2014-04-23 00:24:54.000000000 +0200
+++ new/doc/latex/prerex/prerex.sty.7 2019-11-15 22:34:58.000000000 +0100
@@ -191,7 +191,7 @@
.IR c= 0
will produce a
.I straight
-arrow. To change the default curvature, the user program may redefine the
+arrow. Negative curvatures are also allowed. To change the default curvature, the user program may redefine the
.B \eDefaultCurvature
command.
.SH WEB LINKS
Binary files old/doc/latex/prerex/prerex.sty.7.pdf and new/doc/latex/prerex/prerex.sty.7.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prerex/prerex.tex new/doc/latex/prerex/prerex.tex
--- old/doc/latex/prerex/prerex.tex 2017-11-29 23:07:17.000000000 +0100
+++ new/doc/latex/prerex/prerex.tex 2019-11-15 22:34:58.000000000 +0100
@@ -240,7 +240,8 @@
$c= 0$
will produce a
straight
-arrow. To change the default curvature for all arrows, the user program may redefine the
+arrow. Negative curvatures are also allowed.
+To change the default curvature for all arrows, the user program may redefine the
\verb|\DefaultCurvature|
command.
\subsection{Web Links}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/man/man5/prerex.5 new/doc/man/man5/prerex.5
--- old/doc/man/man5/prerex.5 2014-04-23 00:24:54.000000000 +0200
+++ new/doc/man/man5/prerex.5 2019-11-15 22:34:58.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PREREX 5 2012-03-21 "prerex_format" ""
+.TH PREREX 5 2019-11-15 "prerex_format" ""
.SH NAME
prerex_format -- a format for prerequisite-chart descriptions
.SH DESCRIPTION
@@ -159,7 +159,7 @@
.LP
where
.I c
-is an integer in the range 0-100 specifying the desired curvature; for example,
+is an integer in the range -100:100 specifying the desired curvature; for example,
.IR c= 0
will produce a
.I straight
Binary files old/doc/man/man5/prerex.man5.pdf and new/doc/man/man5/prerex.man5.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prerex.doc.tlpobj new/tlpkg/tlpobj/prerex.doc.tlpobj
--- old/tlpkg/tlpobj/prerex.doc.tlpobj 2019-02-28 04:00:25.000000000 +0100
+++ new/tlpkg/tlpobj/prerex.doc.tlpobj 2020-03-24 02:03:26.000000000 +0100
@@ -1,9 +1,9 @@
name prerex.doc
category Package
-revision 45940
+revision 54512
shortdesc doc files of prerex
relocated 1
-docfiles size=240
+docfiles size=263
RELOC/doc/latex/prerex/README
RELOC/doc/latex/prerex/chart.pdf
RELOC/doc/latex/prerex/chart.svg
@@ -13,7 +13,7 @@
RELOC/doc/latex/prerex/introFonts.png
RELOC/doc/latex/prerex/introchart1.tex
RELOC/doc/latex/prerex/introchart2.tex
- RELOC/doc/latex/prerex/prerex-6.5.4.tar.gz
+ RELOC/doc/latex/prerex/prerex-6.8.0.tar.gz
RELOC/doc/latex/prerex/prerex.pdf
RELOC/doc/latex/prerex/prerex.sty.7
RELOC/doc/latex/prerex/prerex.sty.7.pdf
++++++ prerex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/prerex/prerex.sty new/tex/latex/prerex/prerex.sty
--- old/tex/latex/prerex/prerex.sty 2014-04-23 00:24:54.000000000 +0200
+++ new/tex/latex/prerex/prerex.sty 2019-11-15 22:34:58.000000000 +0100
@@ -1,6 +1,6 @@
%% This is file 'prerex.sty'
%%
-%% Copyright (C) 2006-14 R. D. Tennent, rdt(a)cs.queensu.ca
+%% Copyright (C) 2006-19 R. D. Tennent, rdt(a)cs.queensu.ca
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -13,7 +13,7 @@
%% This work has the LPPL maintenance status "author-maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{prerex}[2014/03/22 v6.6.0 LaTeX style for prerequisite charts, pgf version]
+\ProvidesPackage{prerex}[2019/11/15 v6.8.0 LaTeX style for prerequisite charts, pgf version]
%
% Changelog is at the end of the file.
%
@@ -64,7 +64,7 @@
\definecolor{white}{rgb}{1.0,1.0,1.0} % not transparent, hides grid
\newcommand{\DefaultCurvature}{20}
-% where the argument should be in the range 0-100; 0 means no curvature.
+% where the argument should be in the range -100:100; 0 means no curvature.
\newcommand{\CourseURL}[3]{#3.html}
% where the arguments supplied at the call are the x and y coordinates
@@ -442,13 +442,24 @@
\def\@curved#1,#2,#3,#4;#5:{
- \setcounter{@dy}{#2-#4}
- \ifnum#3<#1
- \setcounter{@dx}{#1-#3}
- \setcounter{@myangle}{(-#5) * \the@dx * \the@dy * 2}
- \else
- \setcounter{@dx}{#3-#1}
- \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \ifnum#4<#2
+ \setcounter{@dy}{#2-#4}
+ \ifnum#3<#1
+ \setcounter{@dx}{#1-#3}
+ \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+ \else
+ \setcounter{@dx}{#3-#1}
+ \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \fi
+ \else
+ \setcounter{@dy}{#4-#2}
+ \ifnum#3<#1
+ \setcounter{@dx}{#1-#3}
+ \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+ \else
+ \setcounter{@dx}{#3-#1}
+ \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \fi
\fi
\setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
\setcounter{@inangle}{180 - \the@myangle}
@@ -474,13 +485,24 @@
}
\def\@curvedDashed#1,#2,#3,#4;#5:{
- \setcounter{@dy}{#2-#4}
- \ifnum#3<#1
- \setcounter{@dx}{#1-#3}
- \setcounter{@myangle}{(-#5) * \the@dx * \the@dy * 2}
- \else
- \setcounter{@dx}{#3-#1}
- \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \ifnum#4<#2
+ \setcounter{@dy}{#2-#4}
+ \ifnum#3<#1
+ \setcounter{@dx}{#1-#3}
+ \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+ \else
+ \setcounter{@dx}{#3-#1}
+ \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \fi
+ \else
+ \setcounter{@dy}{#4-#2}
+ \ifnum#3<#1
+ \setcounter{@dx}{#1-#3}
+ \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+ \else
+ \setcounter{@dx}{#3-#1}
+ \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \fi
\fi
\setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
\setcounter{@inangle}{180 - \the@myangle}
@@ -506,13 +528,24 @@
}
\def\@curvedDotted#1,#2,#3,#4;#5:{
- \setcounter{@dy}{#2-#4}
- \ifnum#3<#1
- \setcounter{@dx}{#1-#3}
- \setcounter{@myangle}{(-#5) * \the@dx * \the@dy * 2}
- \else
- \setcounter{@dx}{#3-#1}
- \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \ifnum#4<#2
+ \setcounter{@dy}{#2-#4}
+ \ifnum#3<#1
+ \setcounter{@dx}{#1-#3}
+ \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+ \else
+ \setcounter{@dx}{#3-#1}
+ \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \fi
+ \else
+ \setcounter{@dy}{#4-#2}
+ \ifnum#3<#1
+ \setcounter{@dx}{#1-#3}
+ \setcounter{@myangle}{-#5 * \the@dx * \the@dy * 2}
+ \else
+ \setcounter{@dx}{#3-#1}
+ \setcounter{@myangle}{#5 * \the@dx * \the@dy * 2}
+ \fi
\fi
\setcounter{@myangle}{\the@myangle / ((\the@dx + \the@dy) * (\the@dx + \the@dy))}
\setcounter{@inangle}{180 - \the@myangle}
@@ -600,6 +633,14 @@
%
% Changelog:
%
+% Vesrsion 6.8.0
+%
+% allow for negative curvatures
+%
+% Versin 6.7.0
+%
+% allow for curved upward arrows
+%
% Version 6.6.0
%
% remove code to generate \jobname.map and \jobname.sh files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prerex.tlpobj new/tlpkg/tlpobj/prerex.tlpobj
--- old/tlpkg/tlpobj/prerex.tlpobj 2019-02-28 04:00:25.000000000 +0100
+++ new/tlpkg/tlpobj/prerex.tlpobj 2020-03-24 02:03:27.000000000 +0100
@@ -1,6 +1,6 @@
name prerex
category Package
-revision 45940
+revision 54512
shortdesc Interactive editor and macro support for prerequisite charts
relocated 1
longdesc This package consists of prerex.sty, a LaTeX package for
@@ -14,7 +14,5 @@
runfiles size=6
RELOC/tex/latex/prerex/prerex.sty
catalogue-ctan /graphics/prerex
-catalogue-date 2017-12-03 06:19:13 +0100
-catalogue-license gpl
+catalogue-license gpl2 lppl
catalogue-topics graphics-prep
-catalogue-version a
++++++ preview.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/preview/README new/doc/latex/preview/README
--- old/doc/latex/preview/README 2007-01-15 01:54:14.000000000 +0100
+++ new/doc/latex/preview/README 2019-10-31 23:22:47.000000000 +0100
@@ -22,13 +22,13 @@
The preview package is being developed along and distributed with
AUCTeX. It can therefore be obtained as part of AUCTeX distribution
-files available at <URL:ftp://ftp.gnu.org/pub/gnu/auctex/> or its
+files available at <URL:https://ftp.gnu.org/pub/gnu/auctex/> or its
mirror at <CTAN:support/auctex>. CTAN also provides a standalone
version at <CTAN:macros/latex/contrib/preview>. The project page at
-<URL:http://savannah.gnu.org/projects/auctex/> offers downloads and
+<URL:https://savannah.gnu.org/projects/auctex/> offers downloads and
anonymous CVS access for cutting edge versions. For more information
about the preview package please refer to the home page of AUCTeX at
-<URL:http://www.gnu.org/software/auctex/>.
+<URL:https://www.gnu.org/software/auctex/>.
Installation
------------
Binary files old/doc/latex/preview/preview.pdf and new/doc/latex/preview/preview.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/preview.doc.tlpobj new/tlpkg/tlpobj/preview.doc.tlpobj
--- old/tlpkg/tlpobj/preview.doc.tlpobj 2019-02-28 04:00:31.000000000 +0100
+++ new/tlpkg/tlpobj/preview.doc.tlpobj 2019-11-01 02:04:46.000000000 +0100
@@ -1,6 +1,6 @@
name preview.doc
category Package
-revision 44883
+revision 52590
shortdesc doc files of preview
relocated 1
docfiles size=43
++++++ preview.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prauctex.cfg new/tex/latex/preview/prauctex.cfg
--- old/tex/latex/preview/prauctex.cfg 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prauctex.cfg 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\PreviewMacro*[[][#1{}]\footnote
\PreviewMacro*[?[{@{[]}}{}][#1]\item
\PreviewMacro*\emph
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prauctex.def new/tex/latex/preview/prauctex.def
--- old/tex/latex/preview/prauctex.def 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prauctex.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifPreview\else\expandafter\endinput\fi
\nofiles
\preview@delay{\nonstopmode}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prcounters.def new/tex/latex/preview/prcounters.def
--- old/tex/latex/preview/prcounters.def 2010-02-22 00:13:39.000000000 +0100
+++ new/tex/latex/preview/prcounters.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifPreview\else\expandafter\endinput\fi
\def\pr@eltprint#1{\expandafter\@gobble\ifnum\value{#1}=0%
\csname pr@c@#1\endcsname\else\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/preview.sty new/tex/latex/preview/preview.sty
--- old/tex/latex/preview/preview.sty 2017-07-24 22:54:21.000000000 +0200
+++ new/tex/latex/preview/preview.sty 2019-10-31 23:22:47.000000000 +0100
@@ -22,11 +22,11 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\NeedsTeXFormat{LaTeX2e} \def\reserved@a #1#2$#3:
#4${\xdef#1{\reserved@c #2#4 $}} \def\reserved@c #1 #2${#1}
\begingroup \catcode`\_=12
-\reserved@a\pr@version $Name: release_11_91 $ \ifx\pr@version\@empty
+\reserved@a\pr@version $Name: release_12_2 $ \ifx\pr@version\@empty
\reserved@a\pr@version CVS-$Revision: 1.126 $ \endgroup \else
\def\next release_{} \lccode`\_=`.
\edef\next{\lowercase{\endgroup
@@ -215,7 +215,7 @@
\ProcessOptions\relax
\ifPreview\else\expandafter\endinput\fi
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\newif\ifpr@outer
\pr@outertrue
\newcount\pr@snippet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prfootnotes.def new/tex/latex/preview/prfootnotes.def
--- old/tex/latex/preview/prfootnotes.def 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prfootnotes.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\PreviewMacro[[!]\footnote %]
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prlyx.def new/tex/latex/preview/prlyx.def
--- old/tex/latex/preview/prlyx.def 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prlyx.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifPreview\else\expandafter\endinput\fi
\pr@loadcfg{prlyx}
\g@addto@macro\pr@ship@end{\typeout{Preview:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prshowbox.def new/tex/latex/preview/prshowbox.def
--- old/tex/latex/preview/prshowbox.def 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prshowbox.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifPreview\else\expandafter\endinput\fi
\AtEndOfPackage{%
\showboxbreadth\maxdimen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prshowlabels.def new/tex/latex/preview/prshowlabels.def
--- old/tex/latex/preview/prshowlabels.def 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prshowlabels.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifPreview\else\expandafter\endinput\fi
\newbox\pr@labelbox
\def\pr@label#1{\pr@@label{#1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prtightpage.def new/tex/latex/preview/prtightpage.def
--- old/tex/latex/preview/prtightpage.def 2010-02-22 00:13:39.000000000 +0100
+++ new/tex/latex/preview/prtightpage.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifx\PreviewBorder\@undefined
\newdimen\PreviewBorder
\PreviewBorder=0.50001bp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/preview/prtracingall.def new/tex/latex/preview/prtracingall.def
--- old/tex/latex/preview/prtracingall.def 2007-01-15 01:54:14.000000000 +0100
+++ new/tex/latex/preview/prtracingall.def 2019-10-31 23:22:47.000000000 +0100
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% The preview style for extracting previews from LaTeX documents.
-%% Developed as part of AUCTeX <URL:http://www.gnu.org/software/auctex>.
+%% Developed as part of AUCTeX <URL:https://www.gnu.org/software/auctex/>.
\ifPreview\else\expandafter\endinput\fi
\pr@addto@front\pr@ship@start{\let\tracingonline\count@
\let\errorstopmode\@empty\tracingall}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/preview.tlpobj new/tlpkg/tlpobj/preview.tlpobj
--- old/tlpkg/tlpobj/preview.tlpobj 2019-02-28 04:00:32.000000000 +0100
+++ new/tlpkg/tlpobj/preview.tlpobj 2019-11-01 02:04:46.000000000 +0100
@@ -1,6 +1,6 @@
name preview
category Package
-revision 44883
+revision 52590
shortdesc Extract bits of a LaTeX source for output
relocated 1
longdesc The package is a free-standing part of the preview-latex
@@ -19,11 +19,14 @@
RELOC/tex/latex/preview/prshowlabels.def
RELOC/tex/latex/preview/prtightpage.def
RELOC/tex/latex/preview/prtracingall.def
+catalogue-contact-announce https://lists.gnu.org/mailman/listinfo/info-auctex
catalogue-contact-bugs https://debbugs.gnu.org/cgi/pkgreport.cgi?package=auctex
+catalogue-contact-development https://lists.gnu.org/mailman/listinfo/auctex-devel
catalogue-contact-home https://www.gnu.org/software/auctex/preview-latex.html
catalogue-contact-repository https://git.savannah.gnu.org/gitweb/?p=auctex.git
+catalogue-contact-support https://lists.gnu.org/mailman/listinfo/auctex
catalogue-ctan /macros/latex/contrib/preview
-catalogue-date 2018-01-06 12:14:59 +0100
+catalogue-date 2019-10-31 09:36:29 +0100
catalogue-license gpl3
catalogue-topics chunks
-catalogue-version 11.91
+catalogue-version 12.2
++++++ prftree.doc.tar.xz ++++++
Binary files old/doc/latex/prftree/prftreedoc.pdf and new/doc/latex/prftree/prftreedoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prftree/prftreedoc.tex new/doc/latex/prftree/prftreedoc.tex
--- old/doc/latex/prftree/prftreedoc.tex 2016-09-03 23:36:10.000000000 +0200
+++ new/doc/latex/prftree/prftreedoc.tex 2019-06-19 22:35:11.000000000 +0200
@@ -1,8 +1,9 @@
\documentclass{amsart}
\usepackage{color}
\usepackage{graphics}
-\usepackage[ND,SEQ]{prftree}
+\usepackage[ND,SEQ,EQ,ML]{prftree}
\usepackage{url}
+\usepackage{microtype}
\setlength{\fboxsep}{0pt}
@@ -54,7 +55,7 @@
% --------------------------
\clearpage
\section{Basic Commands}\label{sec:basic_commands}
-The package is invoked by putting \verb|\usepackage{prfree.sty}| in
+The package is invoked by putting \verb|\usepackage{prftree.sty}| in
the preamble of the document, and installation reduces to put the file
\texttt{prftree.sty} somewhere in the \LaTeX{} search
path.\vspace{2ex}
@@ -157,8 +158,7 @@
\verb|[noline,straight,d]| is the same as \verb|[noline]|.
The conjunction introduction rule illustrates the various line
-options\footnote{The reader is invited to look at the source code of
- the documentation to see how these examples have been implemented.}:
+options:
\begin{displaymath}
\begin{array}{lcc@{\qquad}l}
\mbox{default (single straight)} &
@@ -207,7 +207,14 @@
{A}{B}{A \wedge B} &
\texttt{[noline]}
\end{array}
-\end{displaymath}\vspace{1ex}
+\end{displaymath}
+These examples are implemented in an array whose cells have the form
+\begin{center}
+ \verb|\prftree[|\emph{option}\verb|]{A}{B}{A \wedge B} &|
+ \verb|\prftree[|\emph{option}\verb|,r]{$\scriptstyle\wedge\mathrm{I}$}|
+\end{center}
+in which the option part is the one on the right of the
+picture.\vspace{1ex}
An assumption is a special proof tree, built by the command:
\begin{displaymath}
@@ -967,42 +974,128 @@
The basic commands illustrated so far allow to control proof trees in
all aspects, but they tend to be verbose in practise. Thus, a number
of abbreviations are provided to make handier the writing of proofs.
-
Since they may collide with other packages, these macros are activated
-by suitable options. By loading the package as
-\verb|\usepackage[ND]{prftree.sty}|, the following abbreviations are
-available, which correspond to the inference rule of natural deduction
-calculi:
+by suitable options. Multiple options can be used at the same time.
+
+\subsection{Natural deduction}
+By loading the package with the \verb|ND| option, the following
+abbreviations are available, which correspond to the inference rules
+of natural deduction calculi:
\begin{itemize}
\item \verb|\NDA|: assumption;
\item \verb|\NDAL|: labelled assumption;
-\item \verb|\NDD|: bounded assumption;
-\item \verb|\NDDL|: labelled bounded assumption;
+\item \verb|\NDD|: discharged assumption;
+\item \verb|\NDDL|: labelled discharged assumption;
\item \verb|\NDP|: generic proof tree;
-\item \verb|\NDANDI|: conjunction introduction;
-\item \verb|\NDANDER|: conjunction elimination, right;
-\item \verb|\NDANDEL|: conjunction elimination, left;
-\item \verb|\NDANDE|: conjunction elimination, unspecified;
-\item \verb|\NDORIR|: disjunction introduction, right;
-\item \verb|\NDORIL|: disjunction introduction, left;
-\item \verb|\NDORI|: disjunction introduction, unspecified;
-\item \verb|\NDORE|: disjunction elimination;
-\item \verb|\NDOREL|: labelled disjunction elimination;
-\item \verb|\NDIMPI|: implication introduction;
-\item \verb|\NDIMPIL|: labelled implication introduction;
-\item \verb|\NDIMPE|: implication elimination;
-\item \verb|\NDNOTI|: negation introduction;
-\item \verb|\NDNOTIL|: labelled negation introduction;
-\item \verb|\NDNOTE|: negation elimination;
-\item \verb|\NDALLI|: universal quantifier introduction;
-\item \verb|\NDALLE|: universal quantifier elimination;
-\item \verb|\NDEXI|: existential quantifier introduction;
-\item \verb|\NDEXE|: existential quantifier elimination;
-\item \verb|\NDEXE|: labelled existential quantifier elimination;
-\item \verb|\NDTI|: truth introduction;
-\item \verb|\NDFE|: falsity elimination;
-\item \verb|\NDLEM|: law of Excluded Middle;
-\item \verb|\NDAX|: a generic axiom rule.
+\item \verb|\NDAX|: a generic axiom rule;
+ \begin{displaymath}
+ \vcenter{\NDAX{x = x}}\enspace;
+ \end{displaymath}
+\item \verb|\NDANDI|: conjunction introduction
+ \begin{displaymath}
+ \vcenter{\NDANDI{\NDA{A}}{\NDA{B}}{A \wedge B}}\enspace;
+ \end{displaymath}
+\item \verb|\NDANDER|, \verb|\NDANDEL|, \verb|\NDANDE|: conjunction
+ elimination right, left, and unspecified, respectively
+ \begin{displaymath}
+ \vcenter{\NDANDEL{\NDA{A \wedge B}}{\NDA{A}}} \quad
+ \vcenter{\NDANDER{\NDA{A \wedge B}}{\NDA{B}}}\enspace;
+ \end{displaymath}
+\item \verb|\NDORIR|, \verb|\NDORIL|, \verb|\NDORI|: disjunction
+ introduction right, left, and unspecified, respectively
+ \begin{displaymath}
+ \vcenter{\NDORIL{\NDA{A}}{\NDA{A \vee B}}} \quad
+ \vcenter{\NDORIR{\NDA{B}}{\NDA{A \vee B}}}\enspace;
+ \end{displaymath}
+\item \verb|\NDOREL|, \verb|\NDORE|: disjunction elimination, possibly
+ labelled
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDOREL{ndorel:1}{\NDA{A \vee B}}
+ {\prfsummary{\NDDL{ndorel:1}{A}}{C}}
+ {\prfsummary{\NDDL{[l]ndorel:1}{B}}{C}}{C}} \quad
+ \vcenter{\NDORE{\NDA{A \vee B}}{\prfsummary{\NDA{A}}{C}}
+ {\prfsummary{\NDA{B}}{C}}{C}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDIMPIL|, \verb|\NDIMPI|: implication introduction,
+ possibly labelled
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDIMPIL{ndimpil:1}
+ {\prfsummary{\NDDL{ndimpil:1}{A}}{B}}
+ {A \rightarrow B}} \quad
+ \vcenter{\NDIMPI{\prfsummary{\NDA{A}}{B}}{A \rightarrow B}}
+ \enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDIMPE|: implication elimination
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDIMPE{\NDA{A \rightarrow B}}{\NDA{A}}{B}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDNOTIL|, \verb|\NDNOTI|: negation introduction, possibly
+ labelled
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDNOTIL{ndnotil:1}
+ {\prfsummary{\NDDL{ndnotil:1}{A}}{\bot}}{\neg A}}\quad
+ \vcenter{\NDNOTI{\prfsummary{\NDA{A}}{\bot}}{\neg A}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDNOTE|: negation elimination
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDNOTE{\NDA{\neg A}}{\NDA{A}}{\bot}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDALLI|: universal quantifier introduction
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDALLI{\NDA{A}}{\forall x.\, A}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDALLE|: universal quantifier elimination
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDALLE{\NDA{\forall x.\, A}}{A[t/x]}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDEXI|: existential quantifier introduction
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDEXI{\NDA{A[t/x]}}{\exists x.\, A}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDEXEL|, \verb|\NDEXE|: existential quantifier
+ elimination, possibly labelled
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDEXEL{ndexel:1}{\NDA{\exists x.\, A}}
+ {\prfsummary{\NDDL{ndexel:1}{A}}{B}}{B}}\quad
+ \vcenter{\NDEXE{\NDA{\exists x.\, A}}
+ {\prfsummary{\NDA{A}}{B}}{B}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDTI|: truth introduction
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDTI{\top}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDFE|: falsity elimination
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDFE{\NDA{\bot}}{A}}\enspace;
+ \end{prfenv}
+ \end{displaymath}
+\item \verb|\NDLEM|: law of Excluded Middle
+ \begin{displaymath}
+ \begin{prfenv}
+ \vcenter{\NDLEM{A \vee \neg A}}\enspace.
+ \end{prfenv}
+ \end{displaymath}
\end{itemize}
The labels, when present, are the first argument, the rest being the
@@ -1033,36 +1126,127 @@
{\neg\neg A \supset A}
\end{verbatim}\vspace{2ex}
-Similarly, by loading the package as
-\verb|\usepackage[SEQ]{prftree.sty}|, the following abbreviations
-are available, which roughly correspond to the inference rule of
-sequent calculi:
+\subsection{Sequents}
+Similarly, by loading the package with the \verb|SEQ| option, the
+following abbreviations are available, which roughly correspond to the
+inference rule of sequent calculi:
\begin{itemize}
\item \verb|\SEQA|: assumption;
-\item \verb|\SEQD|: bounded assumption;
+\item \verb|\SEQD|: bounded assumption (not normally used, but handy
+ to have in case of fancy calculi);
\item \verb|\SEQP|: generic proof;
-\item \verb|\SEQAX|: axiom rule;
-\item \verb|\SEQLF|: left falsity;
-\item \verb|\SEQLW|: left weakening;
-\item \verb|\SEQRW|: right weakening;
-\item \verb|\SEQLC|: left contraction;
-\item \verb|\SEQRC|: right contraction;
-\item \verb|\SEQLAND|: left conjunction;
-\item \verb|\SEQRAND|: right conjunction;
-\item \verb|\SEQLOR|: left disjunction;
-\item \verb|\SEQROR|: right disjunction;
-\item \verb|\SEQLIMP|: left implication;
-\item \verb|\SEQRIMP|: right implication;
-\item \verb|\SEQLALL|: left universal quantification;
-\item \verb|\SEQRALL|: right universal quantification;
-\item \verb|\SEQLEX|: left existential quantification;
-\item \verb|\SEQREX|: right existential quantification;
-\item \verb|\SEQCUT|: cut rule.
+\item \verb|\SEQAX|: axiom rule
+ \begin{displaymath}
+ \vcenter{\SEQAX{A \Rightarrow A}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLF|: left falsity
+ \begin{displaymath}
+ \vcenter{\SEQLF{\bot \Rightarrow {}}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLW|, \verb|\SEQRW|: left and right weakening
+ \begin{displaymath}
+ \vcenter{\SEQLW{\Gamma \Rightarrow \Delta}{A, \Gamma \Rightarrow
+ \Delta}}\quad
+ \vcenter{\SEQLW{\Gamma \Rightarrow \Delta}{\Gamma \Rightarrow
+ \Delta, A}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLC|, \verb|\SEQRC|: left and right contraction
+ \begin{displaymath}
+ \vcenter{\SEQLC{A, A, \Gamma \Rightarrow \Delta}{A, \Gamma
+ \Rightarrow \Delta}}\quad
+ \vcenter{\SEQRC{\Gamma \Rightarrow \Delta, A, A}{\Gamma
+ \Rightarrow \Delta, A}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLAND|, \verb|\SEQLANDL|, \verb|\SEQLANDR|: left
+ conjunction; the \verb|L| and \verb|R| variants specify which side
+ of the conjunction is introduced
+ \begin{displaymath}
+ \vcenter{\SEQLANDL{A, \Gamma \Rightarrow \Delta}{A \wedge B, \Gamma
+ \Rightarrow \Delta}}\quad
+ \vcenter{\SEQLANDR{B, \Gamma \Rightarrow \Delta}{A \wedge B, \Gamma
+ \Rightarrow \Delta}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQRAND|: right conjunction
+ \begin{displaymath}
+ \vcenter{\SEQRAND{\Gamma \Rightarrow \Delta, A}{\Gamma \Rightarrow
+ \Delta, B}{\Gamma \Rightarrow \Delta, A \wedge B}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLOR|: left disjunction
+ \begin{displaymath}
+ \vcenter{\SEQLOR{A, \Gamma \Rightarrow \Delta}{B, \Gamma
+ \Rightarrow \Delta}{A \vee B, \Gamma \Rightarrow
+ \Delta}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQROR|, \verb|\SEQRORL|, \verb|\SEQRORR|: right
+ disjunction; the \verb|R| and \verb|L| variants specify which side
+ of the disjunction is introduced
+ \begin{displaymath}
+ \vcenter{\SEQRORL{\Gamma \Rightarrow \Delta, A}{\Gamma \Rightarrow
+ \Delta, A \vee B}}\quad
+ \vcenter{\SEQRORR{\Gamma \Rightarrow \Delta, B}{\Gamma \Rightarrow
+ \Delta, A \vee B}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLIMP|: left implication
+ \begin{displaymath}
+ \vcenter{\SEQLIMP{\Gamma \Rightarrow \Delta, A}{B, \Gamma
+ \Rightarrow \Delta}{A \rightarrow B, \Gamma \Rightarrow
+ \Delta}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQRIMP|: right implication
+ \begin{displaymath}
+ \vcenter{\SEQRIMP{A, \Gamma \Rightarrow \Delta, B}{\Gamma
+ \Rightarrow, \Delta, A \rightarrow B}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLALL|: left universal quantification
+ \begin{displaymath}
+ \vcenter{\SEQLALL{A[t/x], \Gamma \Rightarrow \Delta}{\forall x.\,
+ A, \Gamma \Rightarrow \Delta}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQRALL|: right universal quantification
+ \begin{displaymath}
+ \vcenter{\SEQRALL{\Gamma \Rightarrow \Delta, A}{\Gamma \Rightarrow
+ \Delta, \forall x.\, A}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQLEX|: left existential quantification
+ \begin{displaymath}
+ \vcenter{\SEQLEX{A, \Gamma \Rightarrow \Delta}{\exists x.\, A,
+ \Gamma \Rightarrow \Delta}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQREX|: right existential quantification
+ \begin{displaymath}
+ \vcenter{\SEQREX{\Gamma \Rightarrow \Delta, A[t/x]}{\Gamma
+ \Rightarrow \Delta, \exists x.\, A}}\enspace;
+ \end{displaymath}
+\item \verb|\SEQCUT|: cut rule
+ \begin{displaymath}
+ \vcenter{\SEQCUT{\Gamma \Rightarrow \Delta, A}{A, \Gamma'
+ \Rightarrow \Delta'}{\Gamma \Gamma' \Rightarrow \Delta
+ \Delta'}}\enspace.
+ \end{displaymath}
\end{itemize}
-One can load the package with both options at the same
-time.\vspace{2ex}
+\subsection{Equality}
+Invoking the \verb|EQ| option defines the following inference rules:
+\begin{itemize}
+\item \verb|\EQREFL|: reflexivity
+ \begin{displaymath}
+ \vcenter{\EQREFL{t = t}}\enspace;
+ \end{displaymath}
+\item \verb|\EQSYM|: symmetry
+ \begin{displaymath}
+ \vcenter{\EQSYM{t = s}{s = t}}\enspace;
+ \end{displaymath}
+\item \verb|\EQTRANS|: transitivity
+ \begin{displaymath}
+ \vcenter{\EQTRANS{t = s}{s = r}{t = r}}\enspace;
+ \end{displaymath}
+\item \verb|\EQSUBST|: the substitution rule
+ \begin{displaymath}
+ \vcenter{\EQSUBST{t = s}{A[t/x]}{A[s/x]}}\enspace.
+ \end{displaymath}
+\end{itemize}
+\subsection{Implication}
Since the implication symbol is usually represented either as
$\rightarrow$ or as $\supset$, the package allows to choose which
representation to use. By default, implication is $\rightarrow$, but
@@ -1071,10 +1255,402 @@
\verb|\prfIMPOptiontrue| (implication is $\supset$) and
\verb|prfIMPOptionfalse| (implication is $\rightarrow$).
+\subsection{Martin-L{\"o}f Type Theory and Homotopy Type Theory}
+Invoking the package with the \verb|ML| option enables the support for
+these type theories. This part is derived from Roberta Bonacina's PhD
+dissertation, which used this package in an essential way to develop
+proof trees in Homotopy Type Theory.
+
+Enabling the option \verb|ML| defines a number of symbols which are
+useful to have. However, since they may conflict with other packages,
+they can be disabled invoking the option \verb|MLnodef|. These
+operators are
+\begin{itemize}
+\item \verb|\type|: the symbol $\type$ correctly spaced as a
+ mathematical binary operation;
+\item \verb|\universe|: the symbol for universes;
+\item \verb|\judgementaldef| and \verb|\propositionaldef|: the symbols
+ $\judgementaldef$ and $\propositionaldef$ spaced as mathematical
+ binary operations;
+\item \verb|\emptytype| ($\emptytype$), \verb|\unittype|
+ ($\unittype$), \verb|\booleantype| ($\booleantype$): these symbols
+ are ordinary operators typeset in mathematical boldface font;
+\item \verb|\context| ($\context$), \verb|\identitytype|
+ ($\identitytype$), \verb|\refl| ($\refl$), \verb|\axiomofchoice|
+ ($\axiomofchoice$), \verb|\accessibility| ($\accessibility$),
+ \verb|\ap| ($\ap$), \verb|\apd| ($\apd$), \verb|\basepoint|
+ ($\basepoint$), \verb|\biinv| ($\biinv$), \verb|\cardtype|
+ ($\cardtype$), \verb|\cocone| ($\cocone$), \verb|\cons| ($\cons$),
+ \verb|\contr| ($\contr$), \verb|\equivtype| ($\equivtype$),
+ \verb|\ext| ($\ext$), \verb|\fiber| ($\fiber$), \verb|\funext|
+ ($\funext$), \verb|\glue| ($\glue$), \verb|\happly| ($\happly$),
+ \verb|\hom| ($\hom$), \verb|\id| ($\id$), \verb|\idtoeqv|
+ ($\idtoeqv$), \verb|\im| ($\im$), \verb|\idtoiso| ($\idtoiso$),
+ \verb|\ind| ($\ind$), \verb|\inj| ($\inj$), \verb|\inl| ($\inl$),
+ \verb|\inr| ($\inr$), \verb|\iscontr| ($\iscontr$), \verb|\isequiv|
+ ($\isequiv$), \verb|\ishae| ($\ishae$), \verb|\isotoid|
+ ($\isotoid$), \verb|\isprop| ($\isprop$), \verb|\isset| ($\isset$),
+ \verb|\ker| ($\ker$), \verb|\LEM| ($\LEM$), \verb|\linv| ($\linv$),
+ \verb|\listtype| ($\listtype$), \verb|\loopcons| ($\loopcons$),
+ \verb|\Map| ($\Map$), \verb|\merid| ($\merid$), \verb|\nil|
+ ($\nil$), \verb|\ordtype| ($\ordtype$), \verb|\pair| ($\pair$),
+ \verb|\pred| ($\pred$), \verb|\pr| ($\pr$), \verb|\Prop| ($\Prop$),
+ \verb|\qinv| ($\qinv$), \verb|\rec| ($\rec$), \verb|\rinv|
+ ($\rinv$), \verb|\seg| ($\seg$), \verb|\Set| ($\Set$), \verb|\Succ|
+ ($\Succ$), \verb|\sup| ($\sup$), \verb|\total| ($\total$),
+ \verb|\transport| ($\transport$), \verb|\ua| ($\ua$), \verb|\Wtype|
+ ($\Wtype$), \verb|\transportconst| ($\transportconst$): these
+ symbols are ordinary operators, typeset in the mathematical
+ sans-serif font; their graphical appearance is in brackets.
+\end{itemize}
+
+The large number of inference rules is listed below: they cover the
+structural part of the theories, plus most of the usual inductive
+types, comprehending also some higher-order inductive types. To each
+rule is associated a rule name, which is available as a command: the
+convention is that the rule name is obtained appending \verb|rule| to
+the name of the inference rule. In general, the command to typeset a
+rule conforms to the standard name in the book \emph{Homotopy Type
+ Theory}. The name as typeset, is shown in brackets:
+\begin{itemize}
+\item \verb|\MLctxEMP| $(\scriptstyle\MLctxEMPrule)$,\\ \verb|\MLctxEXT|
+ $(\scriptstyle\MLctxEXTrule)$: context manipulation;
+\item \verb|\MLVble| $(\scriptstyle\MLVblerule)$: variable
+ introduction;
+\item \verb|\MLSubst| $(\scriptstyle\MLSubstrule)$,
+ \verb|\MLWkg|
+ $(\scriptstyle\MLWkgrule)$: substitution and weakening;
+\item \verb|\MLEQrefl| $(\scriptstyle\MLEQreflrule)$,
+ \verb|\MLEQsym| $(\scriptstyle\MLEQsymrule)$,
+ \verb|\MLEQtrans| $(\scriptstyle\MLEQtransrule)$, \\
+ \verb|\MLEQsubst| $(\scriptstyle\MLEQsubstrule)$,
+ \verb|\MLEQsubsteq| $(\scriptstyle\MLEQsubsteqrule)$: structural
+ rules about judgemental equality;
+\item \verb|\MLUintro| $(\scriptstyle\MLUintrorule)$,
+ \verb|\MLUcumul| $(\scriptstyle\MLUcumulrule)$,
+ \verb|\MLUcumuleq| $(\scriptstyle\MLUcumuleqrule)$: type universe;
+\item \verb|\MLpiform| $(\scriptstyle\MLpiformrule)$,
+ \verb|\MLpiformeq| $(\scriptstyle\MLpiformeqrule)$, \\
+ \verb|\MLpiintro| $(\scriptstyle\MLpiintrorule)$,
+ \verb|\MLpiintroeq| $(\scriptstyle\MLpiintroeqrule)$, \\
+ \verb|\MLpielim| $(\scriptstyle\MLpielimrule)$,
+ \verb|\MLpielimeq| $(\scriptstyle\MLpielimeqrule)$, \\
+ \verb|\MLpicomp| $(\scriptstyle\MLpicomprule)$,
+ \verb|\MLpiuniq| $(\scriptstyle\MLpiuniqrule)$: dependent function
+ types;
+\item \verb|\MLKintro| $(\scriptstyle\MLKintrorule)$: generic rule for
+ constant introduction;
+\item \verb|\MLsigmaform| $(\scriptstyle\MLsigmaformrule)$,
+ \verb|\MLsigmaintro| $(\scriptstyle\MLsigmaintrorule)$,
+ \verb|\MLsigmaelim| $(\scriptstyle\MLsigmaelimrule)$, \\
+ \verb|\MLsigmacomp| $(\scriptstyle\MLsigmacomprule)$,
+ \verb|\MLsigmauniq| $(\scriptstyle\MLsigmauniqrule)$: dependent pair
+ types;
+\item \verb|\MLplusform| $(\scriptstyle\MLplusformrule)$,
+ \verb|\MLplusintrol| $(\scriptstyle\MLplusintrolrule)$,
+ \verb|\MLplusintror| $(\scriptstyle\MLplusintrorrule)$, \\
+ \verb|\MLpluselim| $(\scriptstyle\MLpluselimrule)$,
+ \verb|\MLpluscompl| $(\scriptstyle\MLpluscomplrule)$,
+ \verb|\MLpluscompr| $(\scriptstyle\MLpluscomprrule)$, \\
+ \verb|\MLplusuniq| $(\scriptstyle\MLplusuniqrule)$: coproduct types;
+\item \verb|\MLzeroform| $(\scriptstyle\MLzeroformrule)$,
+ \verb|\MLzeroelim| $(\scriptstyle\MLzeroelimrule)$,
+ \verb|\MLzerouniq| $(\scriptstyle\MLzerouniqrule)$: the empty type;
+\item \verb|\MLunitform| $(\scriptstyle\MLunitformrule)$,
+ \verb|\MLunitintro| $(\scriptstyle\MLunitintrorule)$,
+ \verb|\MLunitelim| $(\scriptstyle\MLunitelimrule)$, \\
+ \verb|\MLunitcomp| $(\scriptstyle\MLunitcomprule)$,
+ \verb|\MLunituniq| $(\scriptstyle\MLunituniqrule)$: the unit type;
+\item \verb|\MLnatform| $(\scriptstyle\MLnatformrule)$,
+ \verb|\MLnatintrozero| $(\scriptstyle\MLnatintrozerorule)$, \\
+ \verb|\MLnatintrosucc| $(\scriptstyle\MLnatintrosuccrule)$,
+ \verb|\MLnatelim| $(\scriptstyle\MLnatelimrule)$, \\
+ \verb|\MLnatcompzero| $(\scriptstyle\MLnatcompzerorule)$,
+ \verb|\MLnatcompsucc| $(\scriptstyle\MLnatcompsuccrule)$, \\
+ \verb|\MLnatuniq| $(\scriptstyle\MLnatuniqrule)$: the natural number
+ type;
+\item \verb|\MLidform| $(\scriptstyle\MLidformrule)$,
+ \verb|\MLidintro| $(\scriptstyle\MLidintrorule)$,
+ \verb|\MLidelim| $(\scriptstyle\MLidelimrule)$, \\
+ \verb|\MLidcomp| $(\scriptstyle\MLidcomprule)$,
+ \verb|\MLiduniq| $(\scriptstyle\MLiduniqrule)$: identity types;
+\item \verb|\MLwform| $(\scriptstyle\MLwformrule)$,
+ \verb|\MLwintro| $(\scriptstyle\MLwintrorule)$,
+ \verb|\MLwelim| $(\scriptstyle\MLwelimrule)$, \\
+ \verb|\MLwcomp| $(\scriptstyle\MLwcomprule)$,
+ \verb|\MLwuniq| $(\scriptstyle\MLwuniqrule)$: $\mathsf{W}$ types;
+\item \verb|\MLListform| $(\scriptstyle\MLListformrule)$,
+ \verb|\MLListintron| $(\scriptstyle\MLListintronrule)$,\\
+ \verb|\MLListintroc| $(\scriptstyle\MLListintrocrule)$,
+ \verb|\MLListelim| $(\scriptstyle\MLListelimrule)$,\\
+ \verb|\MLListcompn| $(\scriptstyle\MLListcompnrule)$,
+ \verb|\MLListcompc| $(\scriptstyle\MLListcompcrule)$,\\
+ \verb|\MLListuniq| $(\scriptstyle\MLListuniqrule)$:
+ $\mathsf{List}$ types;
+\item \verb|\MLfunext| $(\scriptstyle\MLfunextrule)$: function extensionality;
+\item \verb|\MLuniv| $(\scriptstyle\MLunivrule)$: univalence;
+\item \verb|\MLSform| $(\scriptstyle\MLSformrule)$,
+ \verb|\MLSintro| $(\scriptstyle\MLSintrorule)$,
+ \verb|\MLSelim| $(\scriptstyle\MLSelimrule)$,\\
+ \verb|\MLScomp| $(\scriptstyle\MLScomprule)$,
+ \verb|\MLSuniq| $(\scriptstyle\MLSuniqrule)$,
+ \verb|\MLSpeqintro| $(\scriptstyle\MLSpeqintrorule)$,\\
+ \verb|\MLSpeqcomp| $(\scriptstyle\MLSpeqcomprule)$: the
+ $\mathbb{S}^1$ circle type;
+\item \verb|\MLIform| $(\scriptstyle\MLIformrule)$,
+ \verb|\MLIintroa| $(\scriptstyle\MLIintroarule)$,
+ \verb|\MLIintrob| $(\scriptstyle\MLIintrobrule)$, \\
+ \verb|\MLIelim| $(\scriptstyle\MLIelimrule)$,
+ \verb|\MLIcompa| $(\scriptstyle\MLIcomparule)$,
+ \verb|\MLIcompb| $(\scriptstyle\MLIcompbrule)$, \\
+ \verb|\MLIuniq| $(\scriptstyle\MLIuniqrule)$,
+ \verb|\MLIpeqintro| $(\scriptstyle\MLIpeqintrorule)$,
+ \verb|\MLIpeqcomp| $(\scriptstyle\MLIpeqcomprule)$: the interval
+ type;
+\item \verb|\MLsigmaintroa| $(\scriptstyle\MLsigmaintroarule)$,
+ \verb|\MLsigmaintrob| $(\scriptstyle\MLsigmaintrobrule)$, \\
+ \verb|\MLsigmacompa| $(\scriptstyle\MLsigmacomparule)$,
+ \verb|\MLsigmacompb| $(\scriptstyle\MLsigmacompbrule)$, \\
+ \verb|\MLsigmapeqintro| $(\scriptstyle\MLsigmapeqintrorule)$,
+ \verb|\MLsigmapeqcomp| $(\scriptstyle\MLsigmapeqcomprule)$:
+ suspensions;
+\item \verb|\MLPOform| $(\scriptstyle\MLPOformrule)$,
+ \verb|\MLPOintroa| $(\scriptstyle\MLPOintroarule)$,
+ \verb|\MLPOintrob| $(\scriptstyle\MLPOintrobrule)$, \\
+ \verb|\MLPOelim| $(\scriptstyle\MLPOelimrule)$,
+ \verb|\MLPOcompa| $(\scriptstyle\MLPOcomparule)$,
+ \verb|\MLPOcompb| $(\scriptstyle\MLPOcompbrule)$, \\
+ \verb|\MLPOuniq| $(\scriptstyle\MLPOuniqrule)$,
+ \verb|\MLPOpeqintro| $(\scriptstyle\MLPOpeqintrorule)$,
+ \verb|\MLPOpeqcomp| $(\scriptstyle\MLPOpeqcomprule)$: pushouts;
+\item \verb|\MLTform| $(\scriptstyle\MLTformrule)$,
+ \verb|\MLTintro| $(\scriptstyle\MLTintrorule)$,
+ \verb|\MLTelim| $(\scriptstyle\MLTelimrule)$, \\
+ \verb|\MLTcomp| $(\scriptstyle\MLTcomprule)$,
+ \verb|\MLTuniq| $(\scriptstyle\MLTuniqrule)$,
+ \verb|\MLTpeqintro| $(\scriptstyle\MLTpeqintrorule)$, \\
+ \verb|\MLTpeqcomp| $(\scriptstyle\MLTpeqcomprule)$: truncations;
+\item \verb|\MLtorusform| $(\scriptstyle\MLtorusformrule)$,
+ \verb|\MLtorusintro| $(\scriptstyle\MLtorusintrorule)$,
+ \verb|\MLtoruselim| $(\scriptstyle\MLtoruselimrule)$,\\
+ \verb|\MLtoruscomp| $(\scriptstyle\MLtoruscomprule)$,
+ \verb|\MLtoruspeqintroa| $(\scriptstyle\MLtoruspeqintroarule)$, \\
+ \verb|\MLtoruspeqintrob| $(\scriptstyle\MLtoruspeqintrobrule)$,
+ \verb|\MLtoruspeqintroc| $(\scriptstyle\MLtoruspeqintrocrule)$, \\
+ \verb|\MLtoruspeqcompa| $(\scriptstyle\MLtoruspeqcomparule)$,
+ \verb|\MLtoruspeqcompb| $(\scriptstyle\MLtoruspeqcompbrule)$, \\
+ \verb|\MLtoruspeqcompc| $(\scriptstyle\MLtoruspeqcompcrule)$:
+ the torus type.
+\end{itemize}
+
+\subsection{Defining new inference rules}
Of course, the reader is encouraged to develop her own abbreviations
-starting from the provided ones.
+starting from the provided ones. To this aim two commands are
+provided. They share the same syntax: \verb|\prfMakeInferenceRule| and
+\verb|\prfMakeInferenceRuleRef| take two arguments, the first one is
+the name of the command associated to the inference rule, and the
+second one is used to write the rule name. For example,
+\begin{center}
+ \verb|\prfMakeInferenceRule{NDANDI}{\mathord{\wedge}\textup{I}}|
+\end{center}
+is how the conjunction introduction rule is defined, and
+\begin{center}
+ \verb| \prfMakeInferenceRuleRef{NDOREL}{\mathord{\vee}\textup{E}}|
+\end{center}
+is how the disjunction elimination rule is defined. The rules
+generated by the \verb|Ref| variant use their first argument as the
+reference to the assumption(s) they discharge.
+
+\subsection{Stacking proofs and assumptions}
+Sometimes, a proof is too large to fit into the text width. Although
+some strategies could be implemented to compress it, see the next
+section, they fail in extreme cases. For example, the elimination rule
+for the circle in Homotopy type theories is:
+\begin{displaymath}
+ \MLScomp
+ {\Gamma, x \type \mathbb{S}^1 \vdash C \type \universe_i}
+ {\Gamma \vdash b \type C[\basepoint/x]}
+ {\Gamma \vdash \ell \type b =_{\loopcons}^{C} b}
+ {\Gamma \vdash p \type \mathbb{S}^1}
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{displaymath}
+typeset by
+\begin{verbatim}
+ \MLScomp
+ {\Gamma, x \type \mathbb{S}^1 \vdash C \type \universe_i}
+ {\Gamma \vdash b \type C[\basepoint/x]}
+ {\Gamma \vdash \ell \type b =_{\loopcons}^{C} b}
+ {\Gamma \vdash p \type \mathbb{S}^1}
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{verbatim}
+It is clear that on an A5 paper, there is not enough space to write it
+down. In these cases, the package provides a way to \emph{stack} the
+premises of a rule, obtaining
+\begin{displaymath}
+ \MLScomp
+ {\prfStackPremises
+ {\Gamma, x \type \mathbb{S}^1 \vdash C \type \universe_i}
+ {\Gamma \vdash b \type C[\basepoint/x]} }
+ {\prfStackPremises
+ {\Gamma \vdash \ell \type b =_{\loopcons}^{C} b}
+ {\Gamma \vdash p \type \mathbb{S}^1} }
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{displaymath}
+The corresponding \LaTeX{} code is
+\begin{verbatim}
+ \MLScomp
+ {\prfStackPremises
+ {\Gamma, x \type \mathbb{S}^1 \vdash C \type \universe_i}
+ {\Gamma \vdash b \type C[\basepoint/x]}
+ }
+ {\prfStackPremises
+ {\Gamma \vdash \ell \type b =_{\loopcons}^{C} b}
+ {\Gamma \vdash p \type \mathbb{S}^1}
+ }
+ {\Gamma \vdash
+ \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint) \type C[p/x]}
+\end{verbatim}
+The command
+\verb|\prfStackPremises{|$a_1$\verb|}{|$\ldots$\verb|}{|$a_n$\verb|}|
+takes the arguments $a_1, \ldots, a_n$ and typeset them as a proof
+tree with no lines with $a_1$ on the top.
+
+Actually, stacking proofs is possible:
+\begin{displaymath}
+ \MLScomp
+ {\prfStackPremises
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma, x \type \mathbb{S}^1 \vdash \mathbb{S}^1 \type
+ \universe_i}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \basepoint \type \mathbb{S}^1}} }
+ {\prfStackPremises
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \ell \type \basepoint = \basepoint}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash p \type \mathbb{S}^1}} }
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{displaymath}
+has been typeset by
+\begin{verbatim}
+ \MLScomp
+ {\prfStackPremises
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma, x \type \mathbb{S}^1 \vdash \mathbb{S}^1 \type
+ \universe_i}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \basepoint \type \mathbb{S}^1}}
+ }
+ {\prfStackPremises
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \ell \type \basepoint = \basepoint}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash p \type \mathbb{S}^1}}
+ }
+ {\Gamma \vdash
+ \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint) \type C[p/x]}
+\end{verbatim}
-% -------------------------------------
+Since a stack is a proof tree, the parameters could be locally changed
+to control its appearance. For example
+\begin{displaymath}
+ \MLScomp
+ {\prfemptylinethickness20\prflinethickness
+ \prfStackPremises
+ {\Gamma, x \type \mathbb{S}^1 \vdash C \type \universe_i}
+ {\Gamma \vdash b \type C[\basepoint/x]} }
+ {\prfStackPremises
+ {\Gamma \vdash \ell \type b =_{\loopcons}^{C} b}
+ {\Gamma \vdash p \type \mathbb{S}^1} }
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{displaymath}
+makes the lines in the left stack far apart.
+\begin{verbatim}
+ \MLScomp
+ {\prfemptylinethickness20\prflinethickness
+ \prfStackPremises
+ {\Gamma, x \type \mathbb{S}^1 \vdash C \type \universe_i}
+ {\Gamma \vdash b \type C[\basepoint/x]} }
+ {\prfStackPremises
+ {\Gamma \vdash \ell \type b =_{\loopcons}^{C} b}
+ {\Gamma \vdash p \type \mathbb{S}^1} }
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{verbatim}
+
+Spacing in stacks of proofs is normally difficult to control: if
+really sophisticated formatting is needed, it is better to consider
+the following option:
+\begin{displaymath}
+ \MLScomp
+ {\prfassumption{
+ \begin{array}{@{}c@{\quad}c@{}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma, x \type \mathbb{S}^1 \vdash \mathbb{S}^1 \type
+ \universe_i}} &
+ {\Gamma \vdash \ell \type \basepoint = \basepoint} \\
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \basepoint \type \mathbb{S}^1}} &
+ {\Gamma \vdash p \type \mathbb{S}^1}
+ \end{array}}}
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{displaymath}
+which uses the \verb|array| environment
+\begin{verbatim}
+ \MLScomp
+ {\prfassumption{
+ \begin{array}{@{}c@{\quad}c@{}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma, x \type \mathbb{S}^1 \vdash \mathbb{S}^1 \type
+ \universe_i}} &
+ {\Gamma \vdash \ell \type \basepoint = \basepoint} \\
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \basepoint \type \mathbb{S}^1}} &
+ {\Gamma \vdash p \type \mathbb{S}^1}
+ \end{array}}}
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{verbatim}
+or similar ones, using the multitude of packages to format tables. By
+the way, the obvious solution using stacks is
+\begin{displaymath}
+ \MLScomp
+ {\prfStackPremises
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma, x \type \mathbb{S}^1 \vdash \mathbb{S}^1 \type
+ \universe_i}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \basepoint \type \mathbb{S}^1}} }
+ {\prfStackPremises
+ {\prfassumption
+ {\Gamma \vdash \ell \type \basepoint = \basepoint}}
+ {\prfassumption
+ {\Gamma \vdash p \type \mathbb{S}^1}} }
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{displaymath}
+\begin{verbatim}
+ \MLScomp
+ {\prfStackPremises{\prfsummary{\Gamma\;\context}
+ {\Gamma, x \type \mathbb{S}^1 \vdash \mathbb{S}^1 \type
+ \universe_i}}
+ {\prfsummary{\Gamma\;\context}
+ {\Gamma \vdash \basepoint \type \mathbb{S}^1}} }
+ {\prfStackPremises{\prfassumption
+ {\Gamma \vdash \ell \type \basepoint = \basepoint}}
+ {\prfassumption
+ {\Gamma \vdash p \type \mathbb{S}^1}} }
+ {\Gamma \vdash \ind_{\mathbb{S}^1}(x.\, C, b, \ell, \basepoint)
+ \type C[p/x]}
+\end{verbatim}
+
+%-------------------------------------
\clearpage
\section{Hints and Tricks}\label{sec:hints_and_tricks}
This section shows a few hints and tricks to use the package at its
@@ -1202,8 +1778,9 @@
\end{verbatim}
Of course, the result is not pleasant, because rows are far apart,
-which is unavoidable because of the height of the proof tree. The
-same principle applies also to arrays of proof trees:
+which is unavoidable because of the height of the proof tree.
+
+The same principle applies also to arrays of proof trees:
\begin{displaymath}
\begin{array}{lcccc}
\text{some text} &
@@ -1219,6 +1796,7 @@
\prfsummary<[l]proof:b4>{A}{B}{A \wedge B}}
\end{array}
\end{displaymath}
+which has been typeset by
\begin{verbatim}
\begin{array}{lcccc}
\text{some text} &
@@ -1284,21 +1862,21 @@
\setcounter{prfsummarycounter}{0}
\setcounter{prfassumptioncounter}{0}
\mbox{Let }
- \vcenter{\prfsummary<[f]s:abbrev>
+ \left(\vcenter{\prfsummary<[f]s:abbrev>
{\NDDL{s:notnotA}{\neg\neg A}}
{\NDAL{s:notA}{\neg A}}
- {\neg\neg A \supset A}}
+ {\neg\neg A \supset A}}\right)
\equiv
- \vcenter{\NDIMPIL{s:notnotA}
+ \left(\vcenter{\NDIMPIL{s:notnotA}
{\NDFE{\NDIMPE{\NDDL{[l]s:notnotA}{\neg\neg A}}
{\NDAL{[l]s:notA}{\neg A}}{\bot}}{A}}
- {\neg\neg A \supset A}}
+ {\neg\neg A \supset A}}\right)
\end{displaymath}
allowing to abbreviate the whole proof as
\begin{displaymath}
\NDOREL{s:notA}{\NDLEM{A \vee \neg A}}
{\NDIMPI{\NDDL{[l]s:notA}{A}}{\neg\neg A \supset A}}
- {\prfsummary<s:abbrev>
+ {\hspace{-1em}\prfsummary<s:abbrev>
{\NDDL{[l]s:notnotA}{\neg\neg A}}
{\NDDL{[l]s:notA}{\neg A}}
{\neg\neg A \supset A}}
@@ -1310,21 +1888,21 @@
\setcounter{prfsummarycounter}{0}
\setcounter{prfassumptioncounter}{0}
\mbox{Let }
- \vcenter{\prfsummary<[f]s:abbrev>
+ \left(\vcenter{\prfsummary<[f]s:abbrev>
{\NDDL{s:notnotA}{\neg\neg A}}
{\NDAL{s:notA}{\neg A}}
- {\neg\neg A \supset A}}
+ {\neg\neg A \supset A}}\right)
\equiv
- \vcenter{\NDIMPIL{s:notnotA}
+ \left(\vcenter{\NDIMPIL{s:notnotA}
{\NDFE{\NDIMPE{\NDDL{[l]s:notnotA}{\neg\neg A}}
{\NDAL{[l]s:notA}{\neg A}}{\bot}}{A}}
- {\neg\neg A \supset A}}
+ {\neg\neg A \supset A}}\right)
\end{verbatim}
for the definition of the proof summary, and
\begin{verbatim}
\NDOREL{s:notA}{\NDLEM{A \vee \neg A}}
{\NDIMPI{\NDDL{[l]s:notA}{A}}{\neg\neg A \supset A}}
- {\prfsummary<[l]s:abbrev>
+ {\hspace{-1em}\prfsummary<s:abbrev>
{\NDDL{[l]s:notnotA}{\neg\neg A}}
{\NDDL{[l]s:notA}{\neg A}}
{\neg\neg A \supset A}}
@@ -1467,37 +2045,39 @@
Proof that the Law of Excluded middle implies $\neg\neg A \supset A$:
\begin{displaymath}
- \prftree[r]{$\vee$E}
- {\prfbyaxiom{LEM}
+ \prfIMPOptiontrue
+ \NDORE
+ {\NDLEM
{A \vee \neg A}\hspace{.4em}}
- {\prftree[r]{$\supset$I}
- {\prfboundedassumption{A}}
+ {\NDIMPI
+ {\NDD{A}}
{\neg\neg A \supset A}}
- {\prftree[r]{$\supset$I}
- {\prftree[r]{$\bot$E}
- {\prftree[r]{$\supset$E}
- {\prfboundedassumption{\neg\neg A}}
- {\prfboundedassumption{\neg A}}
+ {\NDIMPI
+ {\NDFE
+ {\NDIMPE
+ {\NDD{\neg\neg A}}
+ {\NDD{\neg A}}
{\bot}}
{A}}
{\neg\neg A \supset A}}
{\neg\neg A \supset A}
+ \prfIMPOptionfalse
\end{displaymath}
Proof that the Law of Excluded middle implies $\neg\neg A \supset A$
with labels instead of rule names, except on axioms:
\begin{displaymath}
- \prftree[l]{$\vee$E}
- {\prfbyaxiom{LEM}
+ \prftree[l]{$\scriptstyle\vee\mathrm{E}$}
+ {\NDLEM
{A \vee \neg A}\hspace{.6em}}
- {\prftree[l]{$\supset$I}
- {\prfboundedassumption{A}}
+ {\prftree[l]{$\scriptstyle\supset\mathrm{I}$}
+ {\NDD{A}}
{\neg\neg A \supset A}}
- {\prftree[l]{$\supset$I}
- {\prftree[l]{$\bot$E}
- {\prftree[l]{$\supset$E}
- {\prfboundedassumption{\neg\neg A}}
- {\prfboundedassumption{\neg A}}
+ {\prftree[l]{$\scriptstyle\supset\mathrm{I}$}
+ {\prftree[l]{$\scriptstyle\bot\mathrm{E}$}
+ {\prftree[l]{$\scriptstyle\supset\mathrm{E}$}
+ {\NDD{\neg\neg A}}
+ {\NDD{\neg A}}
{\bot}}
{A}}
{\neg\neg A \supset A}}
@@ -1572,7 +2152,7 @@
\rightarrow B) \rightarrow (A \rightarrow C))}
\end{displaymath}
-Proof tree can be coloured, as kindly pointed out by Dominic Hughes:
+Proof trees can be coloured, as kindly pointed out by Dominic Hughes:
\begin{displaymath}
\begin{prfenv}
\color{green}\NDIMPIL{ex6:1}
@@ -1823,12 +2403,23 @@
difficulty is how to represent skylines and how to store them, since
\TeX{} provides no abstract data structures. Hence, the implementation
of this feature has been postponed to a remote future, or to the will
-of a real \TeX{} magician.
+of a real \TeX{} magician.\vspace{2ex}
+
+The abbreviated commands reflect their use by the author. It is quite
+possible that you want to define your own commands for inference rules
+of your interest. If you think they could be of general interest, send
+them by email to the author (see below) who will include them in a
+future release of the package, acknowledging your contribution.
\vfill
-Although the package has been tested for a long time, by now, it is
+Although the package has been tested for a long time by now, it is
possible that a few bugs are still present. To signal a bug, please,
write an email to the author (see below), possibly attaching a sample
document which exhibit the misbehaviour, to help tracking and fixing.
\vfill
\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prftree.doc.tlpobj new/tlpkg/tlpobj/prftree.doc.tlpobj
--- old/tlpkg/tlpobj/prftree.doc.tlpobj 2019-02-28 04:00:32.000000000 +0100
+++ new/tlpkg/tlpobj/prftree.doc.tlpobj 2020-03-04 23:53:23.000000000 +0100
@@ -1,9 +1,9 @@
name prftree.doc
category Package
-revision 41985
+revision 54080
shortdesc doc files of prftree
relocated 1
-docfiles size=87
+docfiles size=109
RELOC/doc/latex/prftree/README
RELOC/doc/latex/prftree/prftreedoc.pdf
RELOC/doc/latex/prftree/prftreedoc.tex
++++++ prftree.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/prftree/prftree.sty new/tex/latex/prftree/prftree.sty
--- old/tex/latex/prftree/prftree.sty 2016-09-03 23:36:10.000000000 +0200
+++ new/tex/latex/prftree/prftree.sty 2019-06-19 22:35:11.000000000 +0200
@@ -1,7 +1,7 @@
%
% prftree.sty
-% by Marco Benini - 3rd September 2016
-% v1.5
+% by Marco Benini - 19th June 2019
+% v1.6
%
% A package to typeset natural deduction proofs, or sequent proofs, or
% tableau proofs
@@ -10,18 +10,25 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{prftree}[2016/09/03 Natural Deduction Proofs]
+\ProvidesPackage{prftree}[2019/06/19 Natural Deduction Proofs]
% Package options: deactivated by default
\newif\ifprf@NDOption\prf@NDOptionfalse
\newif\ifprf@SEQOption\prf@SEQOptionfalse
\newif\ifprfIMPOption\prfIMPOptionfalse
+\newif\ifprf@EQOption\prf@EQOptionfalse
+\newif\ifprf@MLOption\prf@MLOptionfalse
+\newif\ifprf@MLnodefOption\prf@MLnodefOptionfalse
+% but the STRUT and STRUTlabel are on by default
\newif\ifprfSTRUToption\prfSTRUToptiontrue
\newif\ifprfSTRUTlabeloption\prfSTRUTlabeloptiontrue
\DeclareOption{ND}{\prf@NDOptiontrue}
\DeclareOption{SEQ}{\prf@SEQOptiontrue}
\DeclareOption{IMP}{\prfIMPOptiontrue}
+\DeclareOption{EQ}{\prf@EQOptiontrue}
+\DeclareOption{ML}{\prf@MLOptiontrue}
+\DeclareOption{MLnodef}{\prf@MLnodefOptiontrue}
\DeclareOption{Strut}{\prfSTRUToptionfalse}
\DeclareOption{StrutLabel}{\prfSTRUTlabeloptionfalse}
\ProcessOptions\relax
@@ -977,14 +984,42 @@
\hbox{$\box\prf@rulenamebox$}}
% -------------------------------------------------------------------
-% The following macros are used to simplify the writing of proofs in
-% natural deduction, and they roughly follow the format of proofs as
-% in Troelstra, Schwichtenberg "Basic Proof Theory".
-%
-% Since they may conflict with other packages, they are controlled by
-% options in the package.
+% Support macros to define new inference rules
+%
+% \prfMakeInferenceRule#1#2
+% \prfMakeInferenceRuleRef#1#2
+% #1: name of the command associated to the inference rule
+% #2: rule name
+% The plain version generates a command for typesetting a proof with
+% the inference rule; the Ref version uses the first parameter of the
+% rule as a reference that is appended to the rule name
% -------------------------------------------------------------------
+\def\prfMakeInferenceRule#1#2{%
+ \expandafter\def\csname #1\endcsname%
+ {\prftree[by]{$\scriptstyle{#2}$}}}
+\def\prfMakeInferenceRuleRef#1#2{%
+ \expandafter\def\csname #1\endcsname##1%
+ {\prftree[by]{$\scriptstyle{#2}^{\prfref<##1>}$}}}
+
+% -------------------------------------------------------------------
+% Macros to stack the premises of an inference rule
+%
+% \prfStackPremises{a_1}...{a_n} generates a vertical list containing
+% a_1 on the top and a_n on the bottom.
+% -------------------------------------------------------------------
+
+\def\prfStackPremises{\prf@StackPremises{}}
+\def\prf@StackPremises#1{\@ifnextchar\bgroup%
+ {\prf@@StackPremises{\prfassumption{#1}}}%
+ {\prfassumption{#1}}}
+\def\prf@@StackPremises#1#2{\@ifnextchar\bgroup%
+ {\prf@@@StackPremises{\prftree[noline]{#1}{#2}}}%
+ {\prftree[noline]{#1}{#2}}}
+\def\prf@@@StackPremises#1#2{\@ifnextchar\bgroup%
+ {\prf@@@StackPremises{\prftree[noline]{#1}{#2}}}
+ {\prftree[noline]{#1}{#2}}}
+
% -------------------------------------------------------------------
% Natural deduction systems
%
@@ -997,62 +1032,36 @@
\def\NDAL#1{\prfassumption<#1>}
\def\NDDL#1{\prfboundedassumption<#1>}
\def\NDP{\prftree}
- \def\NDANDI{\prftree[by]{$\scriptstyle\mathord{\wedge}%
- \textup{I}$}}
- \def\NDANDEL{\prftree[by]{$\scriptstyle\mathord{\wedge}%
- \textup{E}_1$}}
- \def\NDANDER{\prftree[by]{$\scriptstyle\mathord{\wedge}%
- \textup{E}_2$}}
- \def\NDANDE{\prftree[by]{$\scriptstyle\mathord{\wedge}%
- \textup{E}$}}
- \def\NDORIL{\prftree[by]{$\scriptstyle\mathord{\vee}%
- \textup{I}_1$}}
- \def\NDORIR{\prftree[by]{$\scriptstyle\mathord{\vee}%
- \textup{I}_2$}}
- \def\NDORI{\prftree[by]{$\scriptstyle\mathord{\vee}%
- \textup{I}$}}
- \def\NDORE{\prftree[by]{$\scriptstyle\mathord{\vee}%
- \textup{E}$}}
- \def\NDOREL#1{\prftree[by]{$\scriptstyle{\vee}%
- {\textup{E}}^{\prfref<#1>}$}}
+ \prfMakeInferenceRule{NDANDI}{\mathord{\wedge}\textup{I}}
+ \prfMakeInferenceRule{NDANDEL}{\mathord{\wedge}\textup{E}_1}
+ \prfMakeInferenceRule{NDANDER}{\mathord{\wedge}\textup{E}_2}
+ \prfMakeInferenceRule{NDANDE}{\mathord{\wedge}\textup{E}}
+ \prfMakeInferenceRule{NDORIL}{\mathord{\vee}\textup{I}_1}
+ \prfMakeInferenceRule{NDORIR}{\mathord{\vee}\textup{I}_2}
+ \prfMakeInferenceRule{NDORI}{\mathord{\vee}\textup{I}}
+ \prfMakeInferenceRule{NDORE}{\mathord{\vee}\textup{E}}
+ \prfMakeInferenceRuleRef{NDOREL}{\mathord{\vee}\textup{E}}
\ifprfIMPOption
- \def\NDIMPI{\prftree[by]{$\scriptstyle\mathord{\supset}%
- \textup{I}$}}
- \def\NDIMPE{\prftree[by]{$\scriptstyle\mathord{\supset}%
- \textup{E}$}}
- \def\NDIMPIL#1{\prftree[by]{$\scriptstyle\mathord{\supset}%
- \textup{I}^{\prfref<#1>}$}}
+ \prfMakeInferenceRule{NDIMPI}{\mathord{\supset}\textup{I}}
+ \prfMakeInferenceRule{NDIMPE}{\mathord{\supset}\textup{E}}
+ \prfMakeInferenceRuleRef{NDIMPIL}{\mathord{\supset}\textup{I}}
\else
- \def\NDIMPI{\prftree[by]{$\scriptstyle\mathord{\rightarrow}%
- \textup{I}$}}
- \def\NDIMPE{\prftree[by]{$\scriptstyle\mathord{\rightarrow}%
- \textup{E}$}}
- \def\NDIMPIL#1{%
- \prftree[by]{$\scriptstyle\mathord{\rightarrow}%
- \textup{I}^{\prfref<#1>}$}}\fi
- \def\NDNOTI{\prftree[by]{$\scriptstyle\mathord{\neg}%
- \textup{I}$}}
- \def\NDNOTIL#1{\prftree[by]{$\scriptstyle{\neg}%
- \textup{I}^{\prfref<#1>}$}}
- \def\NDNOTE{\prftree[by]{$\scriptstyle\mathord{\neg}%
- \textup{E}$}}
- \def\NDALLI{\prftree[by]{$\scriptstyle\mathord{\forall}%
- \textup{I}$}}
- \def\NDALLE{\prftree[by]{$\scriptstyle\mathord{\forall}%
- \textup{E}$}}
- \def\NDEXI{\prftree[by]{$\scriptstyle\mathord{\exists}%
- \textup{I}$}}
- \def\NDEXE{\prftree[by]{$\scriptstyle\mathord{\exists}%
- \textup{E}$}}
- \def\NDEXEL#1{%
- \prftree[by]{$\scriptstyle\mathord{\exists}%
- \textup{E}^{\prfref<#1>}$}}
- \def\NDTI{\prftree[by]{$\scriptstyle\mathord{\top}%
- \textup{I}$}}
- \def\NDFE{\prftree[by]{$\scriptstyle\mathord{\bot}%
- \textup{E}$}}
- \def\NDLEM{\prftree[by]{$\scriptstyle\textup{lem}$}}
- \def\NDAX{\prftree[by]{$\scriptstyle\textup{ax}$}}
+ \prfMakeInferenceRule{NDIMPI}{\mathord{\rightarrow}\textup{I}}
+ \prfMakeInferenceRule{NDIMPE}{\mathord{\rightarrow}\textup{E}}
+ \prfMakeInferenceRuleRef{NDIMPIL}{\mathord{\rightarrow}\textup{I}}
+ \fi
+ \prfMakeInferenceRule{NDNOTI}{\mathord{\neg}\textup{I}}
+ \prfMakeInferenceRuleRef{NDNOTIL}{\mathord{\neg}\textup{I}}
+ \prfMakeInferenceRule{NDNOTE}{\mathord{\neg}\textup{E}}
+ \prfMakeInferenceRule{NDALLI}{\mathord{\forall}\textup{I}}
+ \prfMakeInferenceRule{NDALLE}{\mathord{\forall}\textup{E}}
+ \prfMakeInferenceRule{NDEXI}{\mathord{\exists}\textup{I}}
+ \prfMakeInferenceRule{NDEXE}{\mathord{\exists}\textup{E}}
+ \prfMakeInferenceRuleRef{NDEXEL}{\mathord{\exists}\textup{E}}
+ \prfMakeInferenceRule{NDTI}{\mathord{\top}\textup{I}}
+ \prfMakeInferenceRule{NDFE}{\mathord{\bot}\textup{E}}
+ \prfMakeInferenceRule{NDLEM}{\textup{lem}}
+ \prfMakeInferenceRule{NDAX}{\textup{ax}}
\fi
% -------------------------------------------------------------------
@@ -1064,41 +1073,374 @@
\ifprf@SEQOption%
\def\SEQA{\prfassumption}
\def\SEQD{\prfboundedassumption}
- \def\SEQP{\prftree}
- \def\SEQAX{\prftree[by]{$\scriptstyle\textup{Ax}$}}
- \def\SEQLF{\prftree[by]{$\scriptstyle\textup{L}\bot$}}
- \def\SEQLW{\prftree[by]{$\scriptstyle\textup{LW}$}}
- \def\SEQRW{\prftree[by]{$\scriptstyle\textup{RW}$}}
- \def\SEQLC{\prftree[by]{$\scriptstyle\textup{LC}$}}
- \def\SEQRC{\prftree[by]{$\scriptstyle\textup{RC}$}}
- \def\SEQLAND{\prftree[by]{$\scriptstyle\textup{L}%
- \mathord{\wedge}$}}
- \def\SEQRAND{\prftree[by]{$\scriptstyle\textup{R}%
- \mathord{\wedge}$}}
- \def\SEQLOR{\prftree[by]{$\scriptstyle\textup{L}%
- \mathord{\vee}$}}
- \def\SEQROR{\prftree[by]{$\scriptstyle\textup{R}%
- \mathord{\vee}$}}
+ \def\SEQP{\prftree}
+ \prfMakeInferenceRule{SEQAX}{\textup{Ax}}
+ \prfMakeInferenceRule{SEQLF}{\textup{L}\mathord{\bot}}
+ \prfMakeInferenceRule{SEQLW}{\textup{LW}}
+ \prfMakeInferenceRule{SEQRW}{\textup{RW}}
+ \prfMakeInferenceRule{SEQLC}{\textup{LC}}
+ \prfMakeInferenceRule{SEQRC}{\textup{RC}}
+ \prfMakeInferenceRule{SEQLAND}{\textup{L}\mathord{\wedge}}
+ \prfMakeInferenceRule{SEQLANDL}{\textup{L}\mathord{\wedge}_1}
+ \prfMakeInferenceRule{SEQLANDR}{\textup{L}\mathord{\wedge}_2}
+ \prfMakeInferenceRule{SEQRAND}{\textup{R}\mathord{\wedge}}
+ \prfMakeInferenceRule{SEQLOR}{\textup{L}\mathord{\vee}}
+ \prfMakeInferenceRule{SEQROR}{\textup{R}\mathord{\vee}}
+ \prfMakeInferenceRule{SEQRORL}{\textup{R}\mathord{\vee}_1}
+ \prfMakeInferenceRule{SEQRORR}{\textup{R}\mathord{\vee}_2}
\ifprfIMPOption
- \def\SEQLIMP{\prftree[by]{$\scriptstyle\textup{L}%
- \mathord{\supset}$}}
- \def\SEQRIMP{\prftree[by]{$\scriptstyle\textup{R}%
- \mathord{\supset}$}}
+ \prfMakeInferenceRule{SEQLIMP}{\textup{L}\mathord{\supset}}
+ \prfMakeInferenceRule{SEQRIMP}{\textup{R}\mathord{\supset}}
\else
- \def\SEQLIMP{\prftree[by]{$\scriptstyle\textup{L}%
- \mathord{\rightarrow}$}}
- \def\SEQRIMP{\prftree[by]{$\scriptstyle\textup{R}%
- \mathord{\rightarrow}$}}
+ \prfMakeInferenceRule{SEQLIMP}{\textup{L}\mathord{\rightarrow}}
+ \prfMakeInferenceRule{SEQRIMP}{\textup{R}\mathord{\rightarrow}}
\fi
- \def\SEQLALL{\prftree[by]{$\scriptstyle\textup{L}%
- \mathord{\forall}$}}
- \def\SEQRALL{\prftree[by]{$\scriptstyle\textup{R}%
- \mathord{\forall}$}}
- \def\SEQLEX{\prftree[by]{$\scriptstyle\textup{L}%
- \mathord{\exists}$}}
- \def\SEQREX{\prftree[by]{$\scriptstyle\textup{R}%
- \mathord{\exists}$}}
- \def\SEQCUT{\prftree[by]{$\scriptstyle\textup{Cut}$}}
+ \prfMakeInferenceRule{SEQLALL}{\textup{L}\mathord{\forall}}
+ \prfMakeInferenceRule{SEQRALL}{\textup{R}\mathord{\forall}}
+ \prfMakeInferenceRule{SEQLEX}{\textup{L}\mathord{\exists}}
+ \prfMakeInferenceRule{SEQREX}{\textup{R}\mathord{\exists}}
+ \prfMakeInferenceRule{SEQCUT}{\textup{Cut}}
\fi
% -------------------------------------------------------------------
+% Equality rules
+%
+% Package option [EQ]
+% -------------------------------------------------------------------
+
+\ifprf@EQOption%
+ \prfMakeInferenceRule{EQREFL}{\textup{refl}}
+ \prfMakeInferenceRule{EQSYM}{\textup{sym}}
+ \prfMakeInferenceRule{EQTRANS}{\textup{trans}}
+ \prfMakeInferenceRule{EQSUBST}{\textup{subst}}
+\fi
+
+% -------------------------------------------------------------------
+% Martin-Lof and Homotopy Type Theory
+%
+% Package option [ML]
+% -------------------------------------------------------------------
+
+\ifprf@MLOption
+ \ifprf@MLnodefOption\relax\else
+ \def\type{\mathbin{:}}
+ \def\universe{\mathcal{U}}
+ \def\context{\mathsf{ctx}}
+ \def\judgementaldef{\mathbin{:\equiv}}
+ \def\propositionaldef{\mathbin{:=}}
+ \def\identitytype{\mathsf{Id}}
+ \def\refl{\mathsf{refl}}
+ \def\emptytype{\mathbf{0}}
+ \def\unittype{\mathbf{1}}
+ \def\booleantype{\mathbf{2}}
+ \def\axiomofchoice{\mathsf{AC}}
+ \def\accessibility{\mathsf{acc}}
+ \def\ap{\mathsf{ap}}
+ \def\apd{\mathsf{apd}}
+ \def\basepoint{\mathsf{base}}
+ \def\biinv{\mathsf{biinv}}
+ \def\cardtype{\mathsf{Card}}
+ \def\cocone{\mathsf{cocone}}
+ \def\cons{\mathsf{cons}}
+ \def\contr{\mathsf{contr}}
+ \def\equivtype{\mathsf{Equiv}}
+ \def\ext{\mathsf{ext}}
+ \def\fiber{\mathsf{fib}}
+ \def\funext{\mathsf{funext}}
+ \def\glue{\mathsf{glue}}
+ \def\happly{\mathsf{happly}}
+ \def\hom{\mathsf{hom}}
+ \def\id{\mathsf{id}}
+ \def\idtoeqv{\mathsf{idtoeqv}}
+ \def\idtoiso{\mathsf{idtoiso}}
+ \def\im{\mathsf{im}}
+ \def\ind{\mathsf{ind}}
+ \def\inj{\mathsf{inj}}
+ \def\inl{\mathsf{inl}}
+ \def\inr{\mathsf{inr}}
+ \def\iscontr{\mathsf{isContr}}
+ \def\isequiv{\mathsf{isequiv}}
+ \def\ishae{\mathsf{ishae}}
+ \def\isotoid{\mathsf{istoid}}
+ \def\isntype#1{\mathsf{is-}{#1}\mathsf{-type}}
+ \def\isprop{\mathsf{isProp}}
+ \def\isset{\mathsf{isSet}}
+ \def\ker{\mathsf{ker}}
+ \def\LEM{\mathsf{LEM}}
+ \def\linv{\mathsf{linv}}
+ \def\listtype{\mathsf{List}}
+ \def\loopcons{\mathsf{loop}}
+ \def\Map{\mathsf{Map}}
+ \def\merid{\mathsf{merid}}
+ \def\nil{\mathsf{nil}}
+ \def\ordtype{\mathsf{Ord}}
+ \def\pair{\mathsf{pair}}
+ \def\pred{\mathsf{pred}}
+ \def\pr{\mathsf{pr}}
+ \def\Prop{\mathsf{Prop}}
+ \def\qinv{\mathsf{qinv}}
+ \def\rec{\mathsf{rec}}
+ \def\rinv{\mathsf{rinv}}
+ \def\seg{\mathsf{seg}}
+ \def\Set{\mathsf{Set}}
+ \def\Succ{\mathsf{succ}}
+ \def\sup{\mathsf{sup}}
+ \def\total{\mathsf{total}}
+ \def\transport{\mathsf{transport}}
+ \def\transportconst{\mathsf{transportconst}}
+ \def\ua{\mathsf{ua}}
+ \def\Wtype{\mathsf{W}}
+ \fi
+
+ \def\MLctxEMPrule{\ensuremath{\mathsf{ctx}\mathsf{-EMP}}}
+ \def\MLctxEXTrule{\ensuremath{\mathsf{ctx}\mathsf{-EXT}}}
+ \def\MLVblerule{\ensuremath{\mathsf{Vble}}}
+ \def\MLSubstrule{\ensuremath{\mathsf{Subst}}}
+ \def\MLWkgrule{\ensuremath{\mathsf{Wkg}}}
+ \def\MLEQreflrule{\ensuremath{\mathord{\equiv}\mathsf{-refl}}}
+ \def\MLEQsymrule{\ensuremath{\mathord{\equiv}\mathsf{-sym}}}
+ \def\MLEQtransrule{\ensuremath{\mathord{\equiv}\mathsf{-trans}}}
+ \def\MLEQsubstrule{\ensuremath{\mathord{\equiv}\mathsf{-subst}}}
+ \def\MLEQsubsteqrule{\ensuremath{\mathord{\equiv}%
+ \mathsf{-subst}\mathsf{-eq}}}
+ \def\MLUintrorule{\ensuremath{\universe\mathsf{-intro}}}
+ \def\MLUcumulrule{\ensuremath{\universe\mathsf{-cumul}}}
+ \def\MLUcumuleqrule{\ensuremath{\universe%
+ \mathsf{-cumul}\mathsf{-eq}}}
+ \def\MLpiformrule{\ensuremath{\Pi\mathsf{-form}}}
+ \def\MLpiformeqrule{\ensuremath{\Pi\mathsf{-form}\mathsf{-eq}}}
+ \def\MLpiintrorule{\ensuremath{\Pi\mathsf{-intro}}}
+ \def\MLpiintroeqrule{\ensuremath{\Pi\mathsf{-intro}\mathsf{-eq}}}
+ \def\MLpielimrule{\ensuremath{\Pi\mathsf{-elim}}}
+ \def\MLpielimeqrule{\ensuremath{\Pi\mathsf{-elim}\mathsf{-eq}}}
+ \def\MLpicomprule{\ensuremath{\Pi\mathsf{-comp}}}
+ \def\MLpiuniqrule{\ensuremath{\Pi\mathsf{-uniq}}}
+ \def\MLKintrorule{\ensuremath{k\mathsf{-intro}}}
+ \def\MLsigmaformrule{\ensuremath{\Sigma\mathsf{-form}}}
+ \def\MLsigmaintrorule{\ensuremath{\Sigma\mathsf{-intro}}}
+ \def\MLsigmaelimrule{\ensuremath{\Sigma\mathsf{-elim}}}
+ \def\MLsigmacomprule{\ensuremath{\Sigma\mathsf{-comp}}}
+ \def\MLsigmauniqrule{\ensuremath{\Sigma\mathsf{-uniq}}}
+ \def\MLplusformrule{\ensuremath{\mathord{+}\mathsf{-form}}}
+ \def\MLplusintrolrule{\ensuremath{\mathord{+}\mathsf{-intro}_1}}
+ \def\MLplusintrorrule{\ensuremath{\mathord{+}\mathsf{-intro}_2}}
+ \def\MLpluselimrule{\ensuremath{\mathord{+}\mathsf{-elim}}}
+ \def\MLpluscomplrule{\ensuremath{\mathord{+}\mathsf{-comp}_1}}
+ \def\MLpluscomprrule{\ensuremath{\mathord{+}\mathsf{-comp}_2}}
+ \def\MLplusuniqrule{\ensuremath{\mathord{+}\mathsf{-uniq}}}
+ \def\MLzeroformrule{\ensuremath{\mathbf{0}\mathsf{-form}}}
+ \def\MLzeroelimrule{\ensuremath{\mathbf{0}\mathsf{-elim}}}
+ \def\MLzerouniqrule{\ensuremath{\mathbf{0}\mathsf{-uniq}}}
+ \def\MLunitformrule{\ensuremath{\mathbf{1}\mathsf{-form}}}
+ \def\MLunitintrorule{\ensuremath{\mathbf{1}\mathsf{-intro}}}
+ \def\MLunitelimrule{\ensuremath{\mathbf{1}\mathsf{-elim}}}
+ \def\MLunitcomprule{\ensuremath{\mathbf{1}\mathsf{-comp}}}
+ \def\MLunituniqrule{\ensuremath{\mathbf{1}\mathsf{-uniq}}}
+ \def\MLnatformrule{\ensuremath{\mathbb{N}\mathsf{-form}}}
+ \def\MLnatintrozerorule{\ensuremath{\mathbb{N}\mathsf{-intro}_1}}
+ \def\MLnatintrosuccrule{\ensuremath{\mathbb{N}\mathsf{-intro}_2}}
+ \def\MLnatelimrule{\ensuremath{\mathbb{N}\mathsf{-elim}}}
+ \def\MLnatcompzerorule{\ensuremath{\mathbb{N}\mathsf{-comp}_1}}
+ \def\MLnatcompsuccrule{\ensuremath{\mathbb{N}\mathsf{-comp}_2}}
+ \def\MLnatuniqrule{\ensuremath{\mathbb{N}\mathsf{-uniq}}}
+ \def\MLidformrule{\ensuremath{\mathord{=}\mathsf{-form}}}
+ \def\MLidintrorule{\ensuremath{\mathord{=}\mathsf{-intro}}}
+ \def\MLidelimrule{\ensuremath{\mathord{=}\mathsf{-elim}}}
+ \def\MLidcomprule{\ensuremath{\mathord{=}\mathsf{-comp}}}
+ \def\MLiduniqrule{\ensuremath{\mathord{=}\mathsf{-uniq}}}
+ \def\MLwformrule{\ensuremath{\mathsf{W}\mathsf{-form}}}
+ \def\MLwintrorule{\ensuremath{\mathsf{W}\mathsf{-intro}}}
+ \def\MLwelimrule{\ensuremath{\mathsf{W}\mathsf{-elim}}}
+ \def\MLwcomprule{\ensuremath{\mathsf{W}\mathsf{-comp}}}
+ \def\MLwuniqrule{\ensuremath{\mathsf{W}\mathsf{-uniq}}}
+ \def\MLListformrule{\ensuremath{\mathsf{List}\mathsf{-form}}}
+ \def\MLListintronrule{\ensuremath{\mathsf{List}\mathsf{-intro_1}}}
+ \def\MLListintrocrule{\ensuremath{\mathsf{List}\mathsf{-intro_2}}}
+ \def\MLListelimrule{\ensuremath{\mathsf{List}\mathsf{-elim}}}
+ \def\MLListcompnrule{\ensuremath{\mathsf{List}\mathsf{-comp_1}}}
+ \def\MLListcompcrule{\ensuremath{\mathsf{List}\mathsf{-comp_2}}}
+ \def\MLListuniqrule{\ensuremath{\mathsf{List}\mathsf{-uniq}}}
+ \def\MLfunextrule{\ensuremath{\Pi\mathsf{-ext}}}
+ \def\MLunivrule{\ensuremath{\universe_i\mathsf{-univ}}}
+ \def\MLSformrule{\ensuremath{\mathbb{S}^1\mathsf{-form}}}
+ \def\MLSintrorule{\ensuremath{\mathbb{S}^1\mathsf{-intro}}}
+ \def\MLSelimrule{\ensuremath{\mathbb{S}^1\mathsf{-elim}}}
+ \def\MLScomprule{\ensuremath{\mathbb{S}^1\mathsf{-comp}}}
+ \def\MLSuniqrule{\ensuremath{\mathbb{S}^1\mathsf{-uniq}}}
+ \def\MLSpeqintrorule{\ensuremath{\mathbb{S}^1\mathsf{-intro}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLSpeqcomprule{\ensuremath{\mathbb{S}^1\mathsf{-comp}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLIformrule{\ensuremath{I\mathsf{-form}}}
+ \def\MLIintroarule{\ensuremath{I\mathsf{-intro}_1}}
+ \def\MLIintrobrule{\ensuremath{I\mathsf{-intro}_2}}
+ \def\MLIelimrule{\ensuremath{I\mathsf{-elim}}}
+ \def\MLIcomparule{\ensuremath{I\mathsf{-comp}_1}}
+ \def\MLIcompbrule{\ensuremath{I\mathsf{-comp}_2}}
+ \def\MLIuniqrule{\ensuremath{I\mathsf{-uniq}}}
+ \def\MLIpeqintrorule{\ensuremath{I\mathsf{-intro}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLIpeqcomprule{\ensuremath{I\mathsf{-comp}{-}\mathsf{=}}}
+ \def\MLsigmaintroarule{\ensuremath{\Sigma\mathsf{-intro}_1}}
+ \def\MLsigmaintrobrule{\ensuremath{\Sigma\mathsf{-intro}_2}}
+ \def\MLsigmacomparule{\ensuremath{\Sigma\mathsf{-comp}_1}}
+ \def\MLsigmacompbrule{\ensuremath{\Sigma\mathsf{-comp}_2}}
+ \def\MLsigmapeqintrorule{\ensuremath{\Sigma\mathsf{-intro}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLsigmapeqcomprule{\ensuremath{\Sigma\mathsf{-comp}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLPOformrule{\ensuremath{\sqcup\mathsf{-form}}}
+ \def\MLPOintroarule{\ensuremath{\sqcup\mathsf{-intro}_1}}
+ \def\MLPOintrobrule{\ensuremath{\sqcup\mathsf{-intro}_2}}
+ \def\MLPOelimrule{\ensuremath{\sqcup\mathsf{-elim}}}
+ \def\MLPOcomparule{\ensuremath{\sqcup\mathsf{-comp}_1}}
+ \def\MLPOcompbrule{\ensuremath{\sqcup\mathsf{-comp}_2}}
+ \def\MLPOuniqrule{\ensuremath{\sqcup\mathsf{-uniq}}}
+ \def\MLPOpeqintrorule{\ensuremath{\sqcup\mathsf{-intro}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLPOpeqcomprule{\ensuremath{\sqcup%
+ \mathsf{-comp}\mathsf{-}\mathsf{=}}}
+ \def\MLTformrule{\ensuremath{||\cdot||\mathsf{-form}}}
+ \def\MLTintrorule{\ensuremath{||\cdot||\mathsf{-intro}}}
+ \def\MLTelimrule{\ensuremath{||\cdot||\mathsf{-elim}}}
+ \def\MLTcomprule{\ensuremath{||\cdot||\mathsf{-comp}}}
+ \def\MLTuniqrule{\ensuremath{||\cdot||\mathsf{-uniq}}}
+ \def\MLTpeqintrorule{\ensuremath{||\cdot||\mathsf{-intro}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLTpeqcomprule{\ensuremath{||\cdot||\mathsf{-comp}%
+ \mathsf{-}\mathsf{=}}}
+ \def\MLtorusformrule{\ensuremath{T^2\mathsf{-form}}}
+ \def\MLtorusintrorule{\ensuremath{T^2\mathsf{-intro}}}
+ \def\MLtoruselimrule{\ensuremath{T^2\mathsf{-elim}}}
+ \def\MLtoruscomprule{\ensuremath{T^2\mathsf{-comp}}}
+ \def\MLtoruspeqintroarule{\ensuremath{T^2\mathsf{-intro}%
+ \mathsf{-}\mathsf{=_p}}}
+ \def\MLtoruspeqintrobrule{\ensuremath{T^2\mathsf{-intro}%
+ \mathsf{-}\mathsf{=_q}}}
+ \def\MLtoruspeqintrocrule{\ensuremath{T^2\mathsf{-intro}%
+ \mathsf{-}\mathsf{=_t}}}
+ \def\MLtoruspeqcomparule{\ensuremath{T^2\mathsf{-comp}%
+ \mathsf{-}\mathsf{=_p}}}
+ \def\MLtoruspeqcompbrule{\ensuremath{T^2\mathsf{-comp}%
+ \mathsf{-}\mathsf{=_q}}}
+ \def\MLtoruspeqcompcrule{\ensuremath{T^2\mathsf{-comp}%
+ \mathsf{-}\mathsf{=_t}}}
+
+ \prfMakeInferenceRule{MLctxEMP}{\MLctxEMPrule}
+ \prfMakeInferenceRule{MLctxEXT}{\MLctxEXTrule}
+ \prfMakeInferenceRule{MLSubst}{\MLSubstrule}
+ \prfMakeInferenceRule{MLWkg}{\MLWkgrule}
+ \prfMakeInferenceRule{MLVble}{\MLVblerule}
+ \prfMakeInferenceRule{MLEQrefl}{\MLEQreflrule}
+ \prfMakeInferenceRule{MLEQsym}{\MLEQsymrule}
+ \prfMakeInferenceRule{MLEQtrans}{\MLEQtransrule}
+ \prfMakeInferenceRule{MLEQsubst}{\MLEQsubstrule}
+ \prfMakeInferenceRule{MLEQsubsteq}{\MLEQsubsteqrule}
+ \prfMakeInferenceRule{MLUintro}{\MLUintrorule}
+ \prfMakeInferenceRule{MLUcumul}{\MLUcumulrule}
+ \prfMakeInferenceRule{MLUcumuleq}{\MLUcumuleqrule}
+ \prfMakeInferenceRule{MLpiform}{\MLpiformrule}
+ \prfMakeInferenceRule{MLpiformeq}{\MLpiformeqrule}
+ \prfMakeInferenceRule{MLpiintro}{\MLpiintrorule}
+ \prfMakeInferenceRule{MLpiintroeq}{\MLpiintroeqrule}
+ \prfMakeInferenceRule{MLpielim}{\MLpielimrule}
+ \prfMakeInferenceRule{MLpielimeq}{\MLpielimeqrule}
+ \prfMakeInferenceRule{MLpicomp}{\MLpicomprule}
+ \prfMakeInferenceRule{MLpiuniq}{\MLpiuniqrule}
+ \prfMakeInferenceRule{MLKintro}{\MLKintrorule}
+ \prfMakeInferenceRule{MLsigmaform}{\MLsigmaformrule}
+ \prfMakeInferenceRule{MLsigmaintro}{\MLsigmaintrorule}
+ \prfMakeInferenceRule{MLsigmaelim}{\MLsigmaelimrule}
+ \prfMakeInferenceRule{MLsigmacomp}{\MLsigmacomprule}
+ \prfMakeInferenceRule{MLsigmauniq}{\MLsigmauniqrule}
+ \prfMakeInferenceRule{MLplusform}{\MLplusformrule}
+ \prfMakeInferenceRule{MLplusintrol}{\MLplusintrolrule}
+ \prfMakeInferenceRule{MLplusintror}{\MLplusintrorrule}
+ \prfMakeInferenceRule{MLpluselim}{\MLpluselimrule}
+ \prfMakeInferenceRule{MLpluscompl}{\MLpluscomplrule}
+ \prfMakeInferenceRule{MLpluscompr}{\MLpluscomprrule}
+ \prfMakeInferenceRule{MLplusuniq}{\MLplusuniqrule}
+ \prfMakeInferenceRule{MLzeroform}{\MLzeroformrule}
+ \prfMakeInferenceRule{MLzeroelim}{\MLzeroelimrule}
+ \prfMakeInferenceRule{MLzerouniq}{\MLzerouniqrule}
+ \prfMakeInferenceRule{MLunitform}{\MLunitformrule}
+ \prfMakeInferenceRule{MLunitintro}{\MLunitintrorule}
+ \prfMakeInferenceRule{MLunitelim}{\MLunitelimrule}
+ \prfMakeInferenceRule{MLunitcomp}{\MLunitcomprule}
+ \prfMakeInferenceRule{MLunituniq}{\MLunituniqrule}
+ \prfMakeInferenceRule{MLnatform}{\MLnatformrule}
+ \prfMakeInferenceRule{MLnatintrozero}{\MLnatintrozerorule}
+ \prfMakeInferenceRule{MLnatintrosucc}{\MLnatintrosuccrule}
+ \prfMakeInferenceRule{MLnatelim}{\MLnatelimrule}
+ \prfMakeInferenceRule{MLnatcompzero}{\MLnatcompzerorule}
+ \prfMakeInferenceRule{MLnatcompsucc}{\MLnatcompsuccrule}
+ \prfMakeInferenceRule{MLnatuniq}{\MLnatuniqrule}
+ \prfMakeInferenceRule{MLidform}{\MLidformrule}
+ \prfMakeInferenceRule{MLidintro}{\MLidintrorule}
+ \prfMakeInferenceRule{MLidelim}{\MLidelimrule}
+ \prfMakeInferenceRule{MLidcomp}{\MLidcomprule}
+ \prfMakeInferenceRule{MLiduniq}{\MLiduniqrule}
+ \prfMakeInferenceRule{MLwform}{\MLwformrule}
+ \prfMakeInferenceRule{MLwintro}{\MLwintrorule}
+ \prfMakeInferenceRule{MLwelim}{\MLwelimrule}
+ \prfMakeInferenceRule{MLwcomp}{\MLwcomprule}
+ \prfMakeInferenceRule{MLwuniq}{\MLwuniqrule}
+ \prfMakeInferenceRule{MLListform}{\MLListformrule}
+ \prfMakeInferenceRule{MLListintron}{\MLListintronrule}
+ \prfMakeInferenceRule{MLListintroc}{\MLListintrocrule}
+ \prfMakeInferenceRule{MLListelim}{\MLListelimrule}
+ \prfMakeInferenceRule{MLListcompn}{\MLListcompnrule}
+ \prfMakeInferenceRule{MLListcompc}{\MLListcompcrule}
+ \prfMakeInferenceRule{MLListuniq}{\MLListuniqrule}
+ \prfMakeInferenceRule{MLfunext}{\MLfunextrule}
+ \prfMakeInferenceRule{MLuniv}{\MLunivrule}
+ \prfMakeInferenceRule{MLSform}{\MLSformrule}
+ \prfMakeInferenceRule{MLSintro}{\MLSintrorule}
+ \prfMakeInferenceRule{MLSelim}{\MLSelimrule}
+ \prfMakeInferenceRule{MLScomp}{\MLScomprule}
+ \prfMakeInferenceRule{MLSuniq}{\MLSuniqrule}
+ \prfMakeInferenceRule{MLSpeqintro}{\MLSpeqintrorule}
+ \prfMakeInferenceRule{MLSpeqcomp}{\MLSpeqcomprule}
+ \prfMakeInferenceRule{MLIform}{\MLIformrule}
+ \prfMakeInferenceRule{MLIintroa}{\MLIintroarule}
+ \prfMakeInferenceRule{MLIintrob}{\MLIintrobrule}
+ \prfMakeInferenceRule{MLIelim}{\MLIelimrule}
+ \prfMakeInferenceRule{MLIcompa}{\MLIcomparule}
+ \prfMakeInferenceRule{MLIcompb}{\MLIcompbrule}
+ \prfMakeInferenceRule{MLIuniq}{\MLIuniqrule}
+ \prfMakeInferenceRule{MLIpeqintro}{\MLIpeqintrorule}
+ \prfMakeInferenceRule{MLIpeqcomp}{\MLIpeqcomprule}
+ \prfMakeInferenceRule{MLsigmaintroa}{\MLsigmaintroarule}
+ \prfMakeInferenceRule{MLsigmaintrob}{\MLsigmaintrobrule}
+ \prfMakeInferenceRule{MLsigmacompa}{\MLsigmacomparule}
+ \prfMakeInferenceRule{MLsigmacompb}{\MLsigmacompbrule}
+ \prfMakeInferenceRule{MLsigmapeqintro}{\MLsigmapeqintrorule}
+ \prfMakeInferenceRule{MLsigmapeqcomp}{\MLsigmapeqcomprule}
+ \prfMakeInferenceRule{MLPOform}{\MLPOformrule}
+ \prfMakeInferenceRule{MLPOintroa}{\MLPOintroarule}
+ \prfMakeInferenceRule{MLPOintrob}{\MLPOintrobrule}
+ \prfMakeInferenceRule{MLPOelim}{\MLPOelimrule}
+ \prfMakeInferenceRule{MLPOcompa}{\MLPOcomparule}
+ \prfMakeInferenceRule{MLPOcompb}{\MLPOcompbrule}
+ \prfMakeInferenceRule{MLPOuniq}{\MLPOuniqrule}
+ \prfMakeInferenceRule{MLPOpeqintro}{\MLPOpeqintrorule}
+ \prfMakeInferenceRule{MLPOpeqcomp}{\MLPOpeqcomprule}
+ \prfMakeInferenceRule{MLTform}{\MLTformrule}
+ \prfMakeInferenceRule{MLTintro}{\MLTintrorule}
+ \prfMakeInferenceRule{MLTelim}{\MLTelimrule}
+ \prfMakeInferenceRule{MLTcomp}{\MLTcomprule}
+ \prfMakeInferenceRule{MLTuniq}{\MLTuniqrule}
+ \prfMakeInferenceRule{MLTpeqintro}{\MLTpeqintrorule}
+ \prfMakeInferenceRule{MLTpeqcomp}{\MLTpeqcomprule}
+ \prfMakeInferenceRule{MLtorusform}{\MLtorusformrule}
+ \prfMakeInferenceRule{MLtorusintro}{\MLtorusintrorule}
+ \prfMakeInferenceRule{MLtoruselim}{\MLtoruselimrule}
+ \prfMakeInferenceRule{MLtoruscomp}{\MLtoruscomprule}
+ \prfMakeInferenceRule{MLtoruspeqintroa}{\MLtoruspeqintroarule}
+ \prfMakeInferenceRule{MLtoruspeqintrob}{\MLtoruspeqintrobrule}
+ \prfMakeInferenceRule{MLtoruspeqintroc}{\MLtoruspeqintrocrule}
+ \prfMakeInferenceRule{MLtoruspeqcompa}{\MLtoruspeqcomparule}
+ \prfMakeInferenceRule{MLtoruspeqcompb}{\MLtoruspeqcompbrule}
+ \prfMakeInferenceRule{MLtoruspeqcompc}{\MLtoruspeqcompcrule}
+\fi
+% -------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prftree.tlpobj new/tlpkg/tlpobj/prftree.tlpobj
--- old/tlpkg/tlpobj/prftree.tlpobj 2019-02-28 04:00:32.000000000 +0100
+++ new/tlpkg/tlpobj/prftree.tlpobj 2020-03-04 23:53:23.000000000 +0100
@@ -1,15 +1,14 @@
name prftree
category Package
-revision 41985
+revision 54080
shortdesc Macros for building proof trees
relocated 1
longdesc A package to typeset proof trees for natural deduction calculi,
longdesc sequent-like calculi, and similar.
-runfiles size=11
+runfiles size=15
RELOC/tex/latex/prftree/prftree.sty
catalogue-also proofs
catalogue-ctan /macros/latex/contrib/prftree
-catalogue-date 2016-09-03 12:05:13 +0200
catalogue-license gpl
catalogue-topics tree maths proof
-catalogue-version 1.5
+catalogue-version 1.6
++++++ procIAGssymp.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/procIAGssymp/TestPaper.tex new/doc/latex/procIAGssymp/TestPaper.tex
--- old/doc/latex/procIAGssymp/TestPaper.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/procIAGssymp/TestPaper.tex 2019-07-29 23:18:39.000000000 +0200
@@ -146,4 +146,4 @@
\end{document}
\endinput
%%
-%% End of file TestPaper.tex
+%% End of file TestPaper.tex
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/procIAGssymp.doc.tlpobj new/tlpkg/tlpobj/procIAGssymp.doc.tlpobj
--- old/tlpkg/tlpobj/procIAGssymp.doc.tlpobj 2019-02-28 04:00:32.000000000 +0100
+++ new/tlpkg/tlpobj/procIAGssymp.doc.tlpobj 2019-07-30 01:54:07.000000000 +0200
@@ -1,6 +1,6 @@
name procIAGssymp.doc
category Package
-revision 15878
+revision 51771
shortdesc doc files of procIAGssymp
relocated 1
docfiles size=2
++++++ procIAGssymp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/procIAGssymp/procIAGssymp.sty new/tex/latex/procIAGssymp/procIAGssymp.sty
--- old/tex/latex/procIAGssymp/procIAGssymp.sty 2006-01-13 01:03:23.000000000 +0100
+++ new/tex/latex/procIAGssymp/procIAGssymp.sty 2019-07-29 23:18:39.000000000 +0200
@@ -164,4 +164,4 @@
% can be used to put some space and a rule after the abstract
\newcommand{\linea}{\vskip1mm\noindent\rule{74mm}{.5pt}}
%
-% end end end
+% end end end
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/procIAGssymp.tlpobj new/tlpkg/tlpobj/procIAGssymp.tlpobj
--- old/tlpkg/tlpobj/procIAGssymp.tlpobj 2019-02-28 04:00:33.000000000 +0100
+++ new/tlpkg/tlpobj/procIAGssymp.tlpobj 2019-07-30 01:54:07.000000000 +0200
@@ -1,6 +1,6 @@
name procIAGssymp
category Package
-revision 15878
+revision 51771
shortdesc Macros for IAG symposium papers
relocated 1
longdesc This package provides (re-)definitions of some LaTeX commands
++++++ proofread.doc.tar.xz ++++++
Binary files old/doc/latex/proofread/example.pdf and new/doc/latex/proofread/example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/proofread/example.tex new/doc/latex/proofread/example.tex
--- old/doc/latex/proofread/example.tex 2018-07-31 22:54:36.000000000 +0200
+++ new/doc/latex/proofread/example.tex 2019-05-03 00:36:57.000000000 +0200
@@ -107,10 +107,10 @@
interpretatie van het verleden. Daaraan dienen we meteen toe te voegen dat een
dergelijk geheel niet onveranderlijk is. Integendeel, een canon mag en kan niet
worden gecanoniseerd. Essentieel is juist dat deze voortdurend onderwerp is van
-reflectie. Wie en wat verdienen een plek in de canon en waarom? Micha\"el Zeeman
+reflectie. Wie en wat verdienen een plek in de canon en waarom? \del{Micha\"el Zeeman
zei hierover eens: ``De canon leert geen vaststaande grootheden, de canon
onderwijst lezen, kijken en luisteren, dat is kritisch oordelen.'' De canon
-nodigt uit tot kritiek, tot aanvulling en in ieder geval tot gebruik.
+nodigt uit tot kritiek, tot aanvulling en in ieder geval tot gebruik.}
We hebben geprobeerd\com{a comment without highlighting} een beknopte canon te
formuleren voor de `Nederlandse' geschiedenis. Bij de samenstelling hebben drie
Binary files old/doc/latex/proofread/proofread.pdf and new/doc/latex/proofread/proofread.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/proofread/proofread.vmb new/doc/latex/proofread/proofread.vmb
--- old/doc/latex/proofread/proofread.vmb 2018-07-31 22:54:36.000000000 +0200
+++ new/doc/latex/proofread/proofread.vmb 2019-05-03 00:36:57.000000000 +0200
@@ -1,7 +1,7 @@
" Vimball Archiver by Charles E. Campbell, Jr., Ph.D.
UseVimball
finish
-plugin/visPlugin.vim [[[1
+vis/plugin/visPlugin.vim [[[1
60
" vis.vim:
" Function: Perform an Ex command on a visual highlighted block (CTRL-V).
@@ -63,7 +63,7 @@
" ---------------------------------------------------------------------
" Modelines: {{{1
" vim: fdm=marker
-autoload/vis.vim [[[1
+vis/autoload/vis.vim [[[1
339
" vis.vim:
" Function: Perform an Ex command on a visual highlighted block (CTRL-V).
@@ -404,7 +404,7 @@
" ------------------------------------------------------------------------------
" Modelines: {{{1
" vim: fdm=marker
-plugin/cecutil.vim [[[1
+vis/plugin/cecutil.vim [[[1
600
" cecutil.vim : save/restore window position
" save/restore mark position
@@ -1006,7 +1006,7 @@
" Modelines: {{{1
" ================
" vim: ts=4 fdm=marker
-doc/vis.txt [[[1
+vis/doc/vis.txt [[[1
247
*vis.txt* The Visual Block Tool Sep 07, 2016
@@ -1255,7 +1255,7 @@
==============================================================================
Modelines: {{{1
vim:tw=78:ts=8:ft=help:fdm=marker
-syntax/proofread.vim [[[1
+proofread/syntax/proofread.vim [[[1
17
" escape sequences for package proofread.sty
map <Esc>d s\del{}<Esc>hp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/proofread.doc.tlpobj new/tlpkg/tlpobj/proofread.doc.tlpobj
--- old/tlpkg/tlpobj/proofread.doc.tlpobj 2019-02-28 04:00:33.000000000 +0100
+++ new/tlpkg/tlpobj/proofread.doc.tlpobj 2019-05-03 01:40:14.000000000 +0200
@@ -1,6 +1,6 @@
name proofread.doc
category Package
-revision 48322
+revision 50938
shortdesc doc files of proofread
relocated 1
docfiles size=84
@@ -8,6 +8,5 @@
RELOC/doc/latex/proofread/README.txt
RELOC/doc/latex/proofread/example.pdf
RELOC/doc/latex/proofread/example.tex
- RELOC/doc/latex/proofread/proofread.hd
RELOC/doc/latex/proofread/proofread.pdf
RELOC/doc/latex/proofread/proofread.vmb
++++++ proofread.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/proofread/proofread.sty new/tex/latex/proofread/proofread.sty
--- old/tex/latex/proofread/proofread.sty 2018-07-31 22:54:36.000000000 +0200
+++ new/tex/latex/proofread/proofread.sty 2019-05-03 00:36:57.000000000 +0200
@@ -14,7 +14,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{proofread}
- [2018/07/31 v1.03 Commands for inserting annotations]
+ [2019/04/25 v1.04 Commands for inserting annotations]
\RequirePackage{marginnote}
\ifx\undefined\DoubleSpacing
@@ -127,7 +127,6 @@
}
\AtBeginDocument{\marginparpush2pt}
\ifx\undefined\marginparmargin\else\marginparmargin{outer}\fi
-\newbox\PR@soulbox
\newcount\PR@markerno\PR@markerno=1
\newcommand{\com}[1]{%
\marginnote{%
@@ -145,8 +144,7 @@
}
\newcommand{\del}[1]{%
\com{delete}%
- \sbox\PR@soulbox{\st{#1}}%
- \hilite[red]{{\usebox\PR@soulbox}}%
+ \hilite[red]{#1}%
}
\newcommand{\yel}[2][]{%
\com{#1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/proofread.tlpobj new/tlpkg/tlpobj/proofread.tlpobj
--- old/tlpkg/tlpobj/proofread.tlpobj 2019-02-28 04:00:33.000000000 +0100
+++ new/tlpkg/tlpobj/proofread.tlpobj 2019-05-03 01:40:15.000000000 +0200
@@ -1,6 +1,6 @@
name proofread
category Package
-revision 48322
+revision 50938
shortdesc Commands for inserting annotations
relocated 1
longdesc This package defines a few LaTeX commands that may be useful
@@ -21,7 +21,7 @@
runfiles size=2
RELOC/tex/latex/proofread/proofread.sty
catalogue-ctan /macros/latex/contrib/proofread
-catalogue-date 2018-07-31 13:24:40 +0200
+catalogue-date 2019-04-25 16:49:10 +0200
catalogue-license lppl1.3c
catalogue-topics editorial decoration
-catalogue-version 1.03
+catalogue-version 1.04
++++++ prooftrees.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prooftrees/README new/doc/latex/prooftrees/README
--- old/doc/latex/prooftrees/README 2017-02-11 00:29:24.000000000 +0100
+++ new/doc/latex/prooftrees/README 2019-09-30 23:46:12.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2017 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,7 +14,7 @@
%
% This work consists of all files listed in manifest.txt.
-This package supports drawing proof trees of the kind often used in
+This package supports drawing tableaux (proof trees) of the kind often used in
introductory logic classes, especially those aimed at students without strong
mathemtical backgrounds. Hodges (1991) is one example of a text which uses
this system. When teaching such a system it is especially useful to annotate
@@ -27,13 +27,13 @@
proof lines or branch closures.
prooftrees is based on Forest and, hence, TikZ. The package requires version
-2.0.3 of Forest for expected results and will not work with version 1.
+2.1+ of Forest for expected results and will not work with version 1.
The author is certain that some of her beliefs are false, but sure that her
belief that prooftrees has bugs is not among them.
Clea F. Rees
ReesC21 <at> cardiff <dot> ac <dot> uk
-2017/02/08
+2019/09/30
vim: set nospell:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prooftrees/manifest.txt new/doc/latex/prooftrees/manifest.txt
--- old/doc/latex/prooftrees/manifest.txt 2016-03-19 23:13:00.000000000 +0100
+++ new/doc/latex/prooftrees/manifest.txt 2019-09-30 23:46:12.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright 2016 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 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/prooftrees/prooftrees.pdf and new/doc/latex/prooftrees/prooftrees.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prooftrees/prooftrees.tex new/doc/latex/prooftrees/prooftrees.tex
--- old/doc/latex/prooftrees/prooftrees.tex 2017-02-11 00:29:24.000000000 +0100
+++ new/doc/latex/prooftrees/prooftrees.tex 2019-09-30 23:46:12.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2017 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,7 +20,7 @@
%%
\pdfminorversion=7
\RequirePackage{svn-prov}
-\ProvidesFileSVN{$Id: prooftrees.tex 5848 2017-02-09 02:15:38Z cfrees $}[v0.6 \revinfo]
+\ProvidesFileSVN{$Id: prooftrees.tex 8642 2019-09-30 00:20:55Z cfrees $}[v0.7 \revinfo]
\GetFileInfoSVN*
\let\prooftreesdocversion\fileversion
\let\prooftreesdocbase\filebase
@@ -291,7 +291,7 @@
% It could at least do us the favour of holding some of its much less defensible and much more inconvenient design decisions in equal contempt!!
\defbibheading{bibliography}[\refname]{%
\section*{#1}%
- \markboth{#1}{#1}}
+ \markboth{#1}{}}
\makeindex
@@ -315,7 +315,7 @@
\bigskip
\begin{figure}[!b]
-\begin{adjustwidth}{-2em}{-2em}
+\begin{adjustwidth}{-3em}{-5em}
\centering
\begin{minipage}[t]{.475\linewidth}
\begin{prooftree}
@@ -387,7 +387,7 @@
]
]
]
- \end{prooftree}
+ \end{prooftree}%
\end{minipage}\hfill
\begin{minipage}[t]{.525\linewidth}
\begin{prooftree}
@@ -441,8 +441,8 @@
]
]
]
- \end{prooftree}
- \end{minipage}
+ \end{prooftree}%
+ \end{minipage}%
\end{adjustwidth}
\end{figure}
@@ -1488,6 +1488,22 @@
The default values for the document can be set outside the \env{prooftree} environment using \cs{forestset}\marg{settings}.
If \emph{only} proof trees will be typeset, a default style can be configured using \pkg{forest}'s \keyname*[fkeylist]{default preamble}.
+\DescribeKeys[fregbool]{auto move, not auto move}\vals{true,false}\AfterLastParam
+\Default{true}
+Determines whether \pkg{prooftrees} will move lines automatically, where possible, to avoid combining different justifications when different branches are treated differently.
+The default is to avoid conflicts automatically where possible.
+Turning this off permits finer-grained control of what gets moved using \keyname[fstyle]{move by}.
+The following are equivalent to the default setting:
+\begin{latexcode}
+ auto move
+ auto move=true
+\end{latexcode}
+Either of the following will turn auto move off:
+\begin{latexcode}
+ not auto move
+ auto move=false
+\end{latexcode}
+
\DescribeKeys[fregbool]{line numbering, not line numbering}\vals{true,false}\AfterLastParam
\Default{true}
This determines whether lines should be numbered.
@@ -1558,6 +1574,12 @@
If the format of such annotations is changed with \keyname[fregkeylist]{close format}, this dimension may require adjustment.
\Example{close sep=\cs{baselineskip}}
+\DescribeKey[fregdim]{proof tree inner proof width}\val{dimension}\AfterLastParam
+\Default{0pt}
+
+\DescribeKey[fregdim]{proof tree inner proof midpoint}\val{dimension}\AfterLastParam
+\Default{0pt}
+
\DescribeKey[fregcount]{line no shift}\val{integer}\AfterLastParam
\Default{0}
This value increments or decrements the number used for the first line of the proof.
@@ -1862,6 +1884,18 @@
Additional \TikZ{} keys to apply to this proof line.
\Example{line options=\arg{draw, rounded corners}}
+\DescribeKey[fstyle]{line no override}\val{text}\AfterLastParam
+Substitute \meta{text} for the programmatically-assigned line number.
+\meta{text} will be wrapped by \keyname[macro]{\cs{linenumberstyle}}, so should not be anything which would not make sense in that context.
+\Example{line no override=\arg{n}}
+
+\DescribeKey[fstyle]{no line no}\AfterLastParam
+Do not typeset a line number for this line.
+Intended for use in trees where \keyname[foptbool]{line numbering} is activated, but some particular line should not have its number typeset.
+Note that the number for the line is still assigned and the node which would otherwise contain that number is still typeset.
+If the next line is automatically numbered, the line numbering will, therefore, ‘jump’, skipping the omitted number.
+\Example{no line no}
+
% END subsec:lo
% END sec:ops
@@ -1899,7 +1933,24 @@
\section{Version History}\label{sec:hanes}
% BEGIN sec:hanes
+\subsection*{0.7}\label{subsec:v0.7}
+
+% BEGIN subsec:v0.7
+
+Implement \keyname[fregbool]{auto move}.
+See \cref{subsec:go}.
+The main point of this option is to allow automatic moves to be switched off if one teaches students to first apply all available non-branching rules for the tableau as a whole, as opposed to all non-branching rules for the sub-tree.
+The automatic algorithm is consistent with the latter, but not former, approach.
+The algorithm favours compact trees, which are more likely to fit on \pkg{beamer} slides.
+Switching the algorithm off permits users to specify exactly how things should or should not be move.
+Thanks to Peter Smith for prompting this.
+
+Fix bug reported at \href{https://tex.stackexchange.com/q/479263/39222}{tex.stackexchange.com/q/479263/39222}.
+
+% END subsec:v0.7
+
\subsection*{0.6}\label{subsec:v0.6}
+
% BEGIN subsec:v0.6
Add compatibility option for use with \pkg{bussproofs}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/prooftrees/prooftrees_biber.bib new/doc/latex/prooftrees/prooftrees_biber.bib
--- old/doc/latex/prooftrees/prooftrees_biber.bib 2016-12-06 23:58:45.000000000 +0100
+++ new/doc/latex/prooftrees/prooftrees_biber.bib 2019-09-30 23:46:12.000000000 +0200
@@ -1,27 +1,27 @@
@BOOK{hodges-logic,
AUTHOR = {Hodges, Wilfred},
- ISBN = {0140136363},
PUBLISHER = {Penguin},
+ DATE = {1977, 1991},
+ ISBN = {0140136363},
TITLE = {Logic: An Introduction to Elementary Logic},
- YEAR = {1977, 1991},
-}
-
-@MANUAL{saso-forest-manual,
- AUTHOR = {Živanović, Sašo},
- DATE = {2016-03-04},
- EDITION = {2.0.2},
- KEYWORDS = {TeX, LaTeX, PGF, TikZ, Forest},
- TITLE = {Forest: A {PGF}/Ti\mkbibemph{k}{Z}-Based Package for Drawing Linguistic Trees},
- URL = {http://spj.ff.uni-lj.si/zivanovic/},
}
@MANUAL{tantau-tikz-pgf-manual,
AUTHOR = {Tantau, Till},
+ URL = {http://sourceforge.net/projects/pgf},
DATE = {2015-08-29},
EDITION = {3.0.1a},
- KEYWORDS = {TeX, LaTeX, PGF, TikZ},
+ KEYWORDS = {TeX,LaTeX,PGF,TikZ},
SUBTITLE = {Manual for Version 3.0.1a},
TITLE = {The {T}i\mkbibemph{k}{Z} and {PGF} Packages},
- URL = {http://sourceforge.net/projects/pgf},
+}
+
+@MANUAL{saso-forest-manual,
+ AUTHOR = {Živanović, Sašo},
+ URL = {http://spj.ff.uni-lj.si/zivanovic/},
+ DATE = {2016-03-04},
+ EDITION = {2.0.2},
+ KEYWORDS = {TeX,LaTeX,PGF,TikZ,Forest},
+ TITLE = {Forest: A {PGF}/Ti\mkbibemph{k}{Z}-Based Package for Drawing Linguistic Trees},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prooftrees.doc.tlpobj new/tlpkg/tlpobj/prooftrees.doc.tlpobj
--- old/tlpkg/tlpobj/prooftrees.doc.tlpobj 2019-02-28 04:00:33.000000000 +0100
+++ new/tlpkg/tlpobj/prooftrees.doc.tlpobj 2019-10-01 02:22:28.000000000 +0200
@@ -1,6 +1,6 @@
name prooftrees.doc
category Package
-revision 43184
+revision 52221
shortdesc doc files of prooftrees
relocated 1
docfiles size=236
++++++ prooftrees.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/prooftrees/prooftrees.sty new/tex/latex/prooftrees/prooftrees.sty
--- old/tex/latex/prooftrees/prooftrees.sty 2017-02-11 00:29:24.000000000 +0100
+++ new/tex/latex/prooftrees/prooftrees.sty 2019-09-30 23:46:12.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2017 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,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{svn-prov}
-\ProvidesPackageSVN{$Id: prooftrees.sty 5848 2017-02-09 02:15:38Z cfrees $}[v0.6 \revinfo]
+\ProvidesPackageSVN{$Id: prooftrees.sty 8641 2019-09-29 23:57:27Z cfrees $}[v0.7 \revinfo]
\RequirePackage{etoolbox}
% define \prooftrees@enw to hold the name of the environment
% default is to name the environment prooftree, this ensures backwards compatibility
@@ -44,18 +44,28 @@
not justifications,% default is for no line justifications (b/c there's no point in enabling this if the user doesn't specify any content)
declare boolean register={single branches},% single branches: explicitly drawn branches and a normal level distance between lone children and their parents
not single branches,% default is for lone children to be grouped with their parents
+ declare boolean register={auto move},% ble mae'n bosibl, symud pethau'n awtomatig
+ auto move,% default: symud yn awtomatig
declare dimen register={line no width},% default will be set to the width of 99 wrapped in the line numbering style
line no width'=0pt,% fallback default is 0pt
declare dimen register={just sep},% amount by which to shift justifications away from the main tree
just sep'=1.5em,% default is 1.5em
+ declare dimen register={just dist},% distance of justifications from centre of inner tree; overrides just sep
+ just dist'=0pt,
declare dimen register={line no sep},% amount by which to shift line numbers away from the main tree
line no sep'=1.5em,
+ declare dimen register={line no dist},% distance of line nos. from centre of inner tree; overrides line no sep
+ line no dist'=0pt,
declare dimen register={close sep},% distance between closure symbols and any following annotation
close sep'=.75\baselineskip,
declare dimen register={proof tree line no x},
proof tree line no x'=0pt,
declare dimen register={proof tree justification x},
proof tree justification x'=0pt,
+ declare dimen register={proof tree inner proof width},
+ proof tree inner proof width'=0pt,
+ declare dimen register={proof tree inner proof midpoint},
+ proof tree inner proof midpoint'=0pt,
declare count register={proof tree rhif lefelau},% count the levels in the proof tree
proof tree rhif lefelau'=0,
declare count register={proof tree lcount},% count the line numbers (on the left)
@@ -336,11 +346,28 @@
},
}{},
},
+ proof tree inner proof midpoint/.min={>{OOw2+d}{x}{min x}{##1+##2}}{fake=root,descendants},
+ proof tree inner proof width/.max={>{OOw2+d}{x}{max x}{##1+##2}}{fake=root,descendants},
+ proof tree inner proof width-/.register=proof tree inner proof midpoint,
+ proof tree inner proof midpoint+/.process={Rw+d{proof tree inner proof width}{##1/2}},
}{},
if line numbering={% get the x position of line numbers and adjust the location and alignment of the proof statement
proof tree line no x/.min={>{OOw2+d}{x}{min x}{##1+##2}}{fake=root,descendants},
+ if={%
+ > Rd= {line no dist}{0pt}%
+ }{%
+ proof tree line no x-/.register=line no sep,
+ }{%
+ tempdima/.register=proof tree inner proof width,
+ tempdima:=2,
+ if={%
+ > RR< {line no dist}{tempdima}%
+ }{}{%
+ proof tree line no x/.register=proof tree inner proof midpoint,
+ proof tree line no x-/.register=line no dist,
+ },
+ },
proof tree line no x-/.register=line no width,
- proof tree line no x-/.register=line no sep,
for root={%
tempdimc/.option=x,
x'+/.register=proof tree line no x,
@@ -360,7 +387,20 @@
}{},
if justifications={% get the x position of justifications and create the nodes which will hold the justification content, if required
proof tree justification x/.max={>{OOw2+d}{x}{max x}{##1+##2}}{fake=root,descendants},
- proof tree justification x+/.register=just sep,
+ if={%
+ > Rd= {just dist}{0pt}%
+ }{%
+ proof tree justification x+/.register=just sep,
+ }{%
+ tempdima/.register=proof tree inner proof width,
+ tempdima:=2,
+ if={%
+ > RR< {just dist}{tempdima}%
+ }{}{%
+ proof tree justification x/.register=proof tree inner proof midpoint,
+ proof tree justification x+/.register=just dist,
+ },
+ },
append={%
[,
proof tree line justification,
@@ -390,96 +430,100 @@
},
},
proof tree ffurf={% processed before proof tree symud auto: adjusts the alignment of lines when some levels of the tree are grouped together either whenever the number of children is only 1 or by applying the grouped style to particular nodes when specifying the tree
- if single branches={%
- where={%
- >{O! _O< O &&}{grouped}{2}{level}{proof tree rhifo}%
- }{%
- if={%
- >{_O= _O< &}{1}{!parent.n children}{1}{!parent,parent.n children}%
+ if auto move={%
+ if single branches={%
+ where={%
+ >{O! _O< O &&}{grouped}{2}{level}{proof tree rhifo}%
}{%
- not tempboola,
- for root/.process={Ow1}{level}{%
- for level={##1}{%
- if={%
- >{_O< _O= &}{1}{!parent.n children}{1}{n}%
- }{%
- tempboola,
- }{},
- },
- },
- if tempboola={%
- proof tree toing,
- }{},
- }{},
- }{},
- }{},
- where={%
- >{O _O< O &&}{grouped}{1}{level}{proof tree rhifo}%
- }{% this searches for certain kinds of structural asymmetry in the tree and attempts to move lines appropriately in such cases - the algorithm is intended to be relatively conservative (not in the sense of 'cautious' or 'safe' but in the sense of 'reflection of the overlapping consensus of reasonable users' / 'what would be rationally agreed behind the prooftrees veil of ignorance'; apologies for the inconvenience if you are an unreasonable user)
- not tempboola,
- for root/.process={Ow1}{level}{%
- for level={##1}{%
if={%
- >{_O< _O= &}{1}{!parent.n children}{1}{n}%
- }{%
- tempboola,
- }{},
- },
- },% Sašo: http://chat.stackexchange.com/transcript/message/27874731#27874731, see also http://chat.stackexchange.com/transcript/message/27874722#27874722
- if tempboola={%
- if n children=0{%
- if={>{OO|}{!parent.proof tree toing}{!parent.proof tree toing with}}{% we're already moving the parent and the child will move with the parent, so we can just mark this and do nothing else
- proof tree toing with,
+ >{_O= _O< &}{1}{!parent.n children}{1}{!parent,parent.n children}%
}{%
- for root/.process={Ow1}{level}{% don't move a terminal node even in case of asymmetry: instead, create a separate proof line for terminal nodes on this level which are only children, by moving children with siblings on this level down a proof line, without altering their physical location
- % this makes the tree more compact and stops it looking silly
+ not tempboola,
+ for root/.process={Ow1}{level}{%
for level={##1}{%
if={%
- >{_O< _O= &}{1}{!parent.n children}{1}{n}%
- }{% this just serves to keep the levels nice for the sub-tree and ensure things align. We need this because we want to skip a level here to allow room for the terminal node in the other branch
- for parent={%
- if proof tree rhiant cymysg={}{% we mark the parent to avoid increasing the line number of its descendants more than once
- proof tree rhiant cymysg,
- for descendants={%
- proof tree toing by'+=1,
- },
- },
- },
+ >{_O< _O= &}{1}{!parent.n children}{1}{n}%
+ }{%
+ tempboola,
}{},
},
- },% Sašo: http://chat.stackexchange.com/transcript/message/27874731#27874731, see also http://chat.stackexchange.com/transcript/message/27874722#27874722
+ },
+ if tempboola={%
+ proof tree toing,
+ }{},
+ }{},
+ }{},
+ }{},
+ where={%
+ >{O _O< O &&}{grouped}{1}{level}{proof tree rhifo}%
+ }{% this searches for certain kinds of structural asymmetry in the tree and attempts to move lines appropriately in such cases - the algorithm is intended to be relatively conservative (not in the sense of 'cautious' or 'safe' but in the sense of 'reflection of the overlapping consensus of reasonable users' / 'what would be rationally agreed behind the prooftrees veil of ignorance'; apologies for the inconvenience if you are an unreasonable user)
+ not tempboola,
+ for root/.process={Ow1}{level}{%
+ for level={##1}{%
+ if={%
+ >{_O< _O= &}{1}{!parent.n children}{1}{n}%
+ }{%
+ tempboola,
+ }{},
},
- no edge,
- }{%
- if={%
- >{_O= _O< &}{1}{!parent.n children}{1}{!parent,parent.n children}%
- }{% don't try to move if the node has more than 1 child or the grandparent has no more than that; otherwise, mark the node as one to move - we figure out where to move it later
- proof tree toing,
- }{no edge},
- },
- }{no edge},
+ },% Sašo: http://chat.stackexchange.com/transcript/message/27874731#27874731, see also http://chat.stackexchange.com/transcript/message/27874722#27874722
+ if tempboola={%
+ if n children=0{%
+ if={>{OO|}{!parent.proof tree toing}{!parent.proof tree toing with}}{% we're already moving the parent and the child will move with the parent, so we can just mark this and do nothing else
+ proof tree toing with,
+ }{%
+ for root/.process={Ow1}{level}{% don't move a terminal node even in case of asymmetry: instead, create a separate proof line for terminal nodes on this level which are only children, by moving children with siblings on this level down a proof line, without altering their physical location
+ % this makes the tree more compact and stops it looking silly
+ for level={##1}{%
+ if={%
+ >{_O< _O= &}{1}{!parent.n children}{1}{n}%
+ }{% this just serves to keep the levels nice for the sub-tree and ensure things align. We need this because we want to skip a level here to allow room for the terminal node in the other branch
+ for parent={%
+ if proof tree rhiant cymysg={}{% we mark the parent to avoid increasing the line number of its descendants more than once
+ proof tree rhiant cymysg,
+ for descendants={%
+ proof tree toing by'+=1,
+ },
+ },
+ },
+ }{},
+ },
+ },% Sašo: http://chat.stackexchange.com/transcript/message/27874731#27874731, see also http://chat.stackexchange.com/transcript/message/27874722#27874722
+ },
+ no edge,
+ }{%
+ if={%
+ >{_O= _O< &}{1}{!parent.n children}{1}{!parent,parent.n children}%
+ }{% don't try to move if the node has more than 1 child or the grandparent has no more than that; otherwise, mark the node as one to move - we figure out where to move it later
+ proof tree toing,
+ }{no edge},
+ },
+ }{no edge},
+ }{},
}{},
},
proof tree symud awto={% processed before typesetting nodes: if _this_ could be done during packing, that would be very nice, even if the previous stuff can't be
- proof tree aros'=0,
- for proof tree symud={%
- if proof tree toing={% this relies on an experimental feature of forest, which is anffodus
- for nodewalk={fake=parent,fake=sibling,descendants}{do dynamics},
- delay n={\foresteregister{proof tree aros}}{%
- tempcounta/.max={>{OOOOw4+n}{level}{proof tree toing by}{proof tree toooing}{proof tree rhifo}{(##1+##2+##3)*##4}}{parent,sibling,descendants},
- if tempcounta>=1{%
- if={%
- >{Rw1+n OOw2+n >}{tempcounta}{##1+1}{level}{proof tree toing by}{##1+##2}%
- }{%
- tempcounta-/.option=level,
- tempcounta'+=1,
- move by/.register=tempcounta,
+ if auto move={%
+ proof tree aros'=0,
+ for proof tree symud={%
+ if proof tree toing={% this relies on an experimental feature of forest, which is anffodus
+ for nodewalk={fake=parent,fake=sibling,descendants}{do dynamics},
+ delay n={\foresteregister{proof tree aros}}{%
+ tempcounta/.max={>{OOOOw4+n}{level}{proof tree toing by}{proof tree toooing}{proof tree rhifo}{(##1+##2+##3)*##4}}{parent,sibling,descendants},
+ if tempcounta>=1{%
+ if={%
+ >{Rw1+n OOw2+n >}{tempcounta}{##1+1}{level}{proof tree toing by}{##1+##2}%
+ }{%
+ tempcounta-/.option=level,
+ tempcounta'+=1,
+ move by/.register=tempcounta,
+ }{no edge},
}{no edge},
- }{no edge},
- },
- proof tree aros'+=4,
- }{},
- },
+ },
+ proof tree aros'+=4,
+ }{},
+ },
+ }{},
},
proof tree nodiadau={% processed after proof tree creu nodiadau and before before drawing tree: creates annotation content which may include cross-references, applies highlighting and additional TikZ keys to line numbers, justifications and to wffs where specified for entire proof lines
where proof tree crefs={}{}{% resolve cross-refs in closures
@@ -605,7 +649,16 @@
for tree={%
if={%
>{O _O< &}{grouped}{1}{level}%
- }{l'=\baselineskip}{},
+ }{% osgoi overlapping nodes, if posibl: cwestiwn https://tex.stackexchange.com/q/456254/
+ not tempboola,
+ tempcounta/.option=level,
+ tempcountb/.option=proof tree toing,
+ tempcountb+/.option=proof tree toooing,
+ for nodewalk={fake=root, descendants}{if={> RO= On> O! O! OOw2+nR= &&&&
+ {tempcounta}{level} {!u.n children}{1} {proof tree arweinydd} {proof tree phantom} {proof tree toing by} {proof tree toooing}{##1+##2} {tempcountb}
+ }{tempboola}{}},
+ if tempboola={}{l'=\baselineskip},
+ }{},
},
},
before drawing tree={% set final alignment for proof lines which have been moved by effectively grouping lead nodes and moving their subtrees accordingly - this requires that each line number and justification be the child of the previous one and that if justifications are used at all, then justifications exist for all proof lines, even if empty
@@ -654,6 +707,27 @@
}{},
},
}{},
+ if={%
+ > RR| {auto move}{single branches}%
+ }{}{%
+ where proof tree arweinydd={%
+ for nodewalk={%
+ save append={proof tree walk}{%
+ current,
+ do until={%
+ > O+t_+t=! {content}{}%
+ }{parent}%
+ }%
+ }{},
+ }{},
+ where level>=1{%
+ if grouped={%
+ if in saved nodewalk={current}{proof tree walk}{}{%
+ no edge,
+ },
+ }{},
+ }{},
+ },
},
},
move by/.style={% this implements both the automated moves prooftrees finds necessary and any additional moves requested by the user - more accurately, it implements initial moves, which may get corrected later (e.g. to avoid skipping numbers or creating empty proof lines, which we assume aren't wanted)
@@ -701,8 +775,8 @@
parent anchor=parent,
proof tree toing by=#1-2+proof_tree_cadw_toing_by,
proof tree phantom,
- edge path/.option=!last dynamic node.edge path,
- edge/.option=!last dynamic node.edge,
+ edge path/.option=!u.edge path,
+ edge/.option=!u.edge,
before drawing tree={%
if={>{RR|}{line numbering}{justifications}}{%
proof tree proof line no/.process={Ow1+n}{!n=1.proof tree proof line no}{##1-1},
@@ -746,6 +820,22 @@
},
proof tree rhestr rhifau llinellau+/.option=#1.proof tree proof line no,% works according to Sašo's anti-pgfmath version
},
+ line no override/.style={% 2018-02-19 ateb https://tex.stackexchange.com/a/416037/
+ before drawing tree={
+ for name/.process={Ow}{proof tree proof line no}{line no ##1}{
+ content=\linenumberstyle{#1},
+ typeset node,
+ },
+ },
+ },
+ no line no/.style={% 2018-02-19 gweler uchod
+ before drawing tree={
+ for name/.process={Ow}{proof tree proof line no}{line no ##1}{
+ content=,
+ typeset node,
+ },
+ },
+ },
proof tree dadfygio/.style={% style for use in debugging moves which displays information about nodes in the tree
before packing={%
for tree={%
@@ -760,6 +850,21 @@
},
},
},
+ proof tree alino/.style={% debugging / dangos dimension stuff
+ before drawing tree={%
+ tikz+/.process={%
+ RRRRw4{proof tree inner proof midpoint}{line no width}{line no dist}{just dist}
+ {
+ \begin{scope}[densely dashed]
+ \draw [darkgray] (##1,0) coordinate (a) -- (a |- current bounding box.south);
+ \draw [green] (current bounding box.west) -- ++(##2,0) coordinate (b);
+ \draw [blue] (b) -- ++(##3,0) coordinate (c);
+ \draw [magenta] (c) -- ++(##4,0);
+ \end{scope}
+ }%
+ },
+ },
+ },
}
\environbodyname\prooftreebody
\bracketset{action character=@}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/prooftrees.tlpobj new/tlpkg/tlpobj/prooftrees.tlpobj
--- old/tlpkg/tlpobj/prooftrees.tlpobj 2019-02-28 04:00:34.000000000 +0100
+++ new/tlpkg/tlpobj/prooftrees.tlpobj 2019-10-01 02:22:28.000000000 +0200
@@ -1,6 +1,6 @@
name prooftrees
category Package
-revision 43184
+revision 52221
shortdesc Forest-based proof trees (symbolic logic)
relocated 1
longdesc The package supports drawing proof trees of the kind often used
@@ -16,11 +16,11 @@
longdesc lines or branch closures. prooftrees is based on forest and,
longdesc hence, TikZ. The package requires version 2.0.2 of Forest for
longdesc expected results and will not work with version 1.
-runfiles size=10
+runfiles size=11
RELOC/tex/latex/prooftrees/prooftrees.sty
catalogue-also forest
catalogue-ctan /graphics/pgf/contrib/prooftrees
-catalogue-date 2017-02-09 05:21:50 +0100
+catalogue-date 2019-09-30 10:14:15 +0200
catalogue-license lppl1.3
catalogue-topics tree pgf-tikz logic
-catalogue-version 0.6
+catalogue-version 0.7 svn 8641
++++++ ps2pk.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/mag.man1.pdf and new/texmf-dist/doc/man/man1/mag.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/pfb2pfa.man1.pdf and new/texmf-dist/doc/man/man1/pfb2pfa.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/pk2bm.man1.pdf and new/texmf-dist/doc/man/man1/pk2bm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ps2pk.man1.pdf and new/texmf-dist/doc/man/man1/ps2pk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ps2pk.doc.tlpobj new/tlpkg/tlpobj/ps2pk.doc.tlpobj
--- old/tlpkg/tlpobj/ps2pk.doc.tlpobj 2019-03-27 02:26:09.000000000 +0100
+++ new/tlpkg/tlpobj/ps2pk.doc.tlpobj 2019-11-19 01:55:51.000000000 +0100
@@ -1,6 +1,6 @@
name ps2pk.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of ps2pk
docfiles size=27
texmf-dist/doc/man/man1/mag.1
++++++ pseudocode.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pseudocode.doc.tlpobj new/tlpkg/tlpobj/pseudocode.doc.tlpobj
--- old/tlpkg/tlpobj/pseudocode.doc.tlpobj 2019-02-28 04:00:38.000000000 +0100
+++ new/tlpkg/tlpobj/pseudocode.doc.tlpobj 2020-03-04 23:53:24.000000000 +0100
@@ -1,6 +1,6 @@
name pseudocode.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of pseudocode
relocated 1
docfiles size=43
++++++ pseudocode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pseudocode.tlpobj new/tlpkg/tlpobj/pseudocode.tlpobj
--- old/tlpkg/tlpobj/pseudocode.tlpobj 2019-02-28 04:00:38.000000000 +0100
+++ new/tlpkg/tlpobj/pseudocode.tlpobj 2020-03-04 23:53:24.000000000 +0100
@@ -1,13 +1,13 @@
name pseudocode
category Package
-revision 15878
+revision 54080
shortdesc LaTeX environment for specifying algorithms in a natural way
relocated 1
longdesc This package provides the environment "pseudocode" for
longdesc describing algorithms in a natural manner.
runfiles size=2
RELOC/tex/latex/pseudocode/pseudocode.sty
+catalogue-also pseudo
catalogue-ctan /macros/latex/contrib/pseudocode
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pseudocode
++++++ psnfss.doc.tar.xz ++++++
++++ 1620 lines of diff (skipped)
++++++ psnfss.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/psnfss/psnfss.map new/fonts/map/dvips/psnfss/psnfss.map
--- old/fonts/map/dvips/psnfss/psnfss.map 2014-05-10 00:39:48.000000000 +0200
+++ new/fonts/map/dvips/psnfss/psnfss.map 2020-04-12 20:27:45.000000000 +0200
@@ -2,47 +2,47 @@
%
eurmo10 EURM10 " .167 SlantFont" <eurm10.pfb
eurbo10 EURB10 " .167 SlantFont" <eurb10.pfb
-pagd8r AvantGarde-Demi "TeXBase1Encoding ReEncodeFont" <8r.enc
-pagdo8r AvantGarde-DemiOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-pagk8r AvantGarde-Book "TeXBase1Encoding ReEncodeFont" <8r.enc
-pagko8r AvantGarde-BookOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-pbkd8r Bookman-Demi "TeXBase1Encoding ReEncodeFont" <8r.enc
-pbkdi8r Bookman-DemiItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pagd8r AvantGarde-Demi "TeXBase1Encoding ReEncodeFont" <8r.enc
+pagdo8r AvantGarde-DemiOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+pagk8r AvantGarde-Book "TeXBase1Encoding ReEncodeFont" <8r.enc
+pagko8r AvantGarde-BookOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+pbkd8r Bookman-Demi "TeXBase1Encoding ReEncodeFont" <8r.enc
+pbkdi8r Bookman-DemiItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
pbkdo8r Bookman-Demi " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-pbkl8r Bookman-Light "TeXBase1Encoding ReEncodeFont" <8r.enc
-pbkli8r Bookman-LightItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pbkl8r Bookman-Light "TeXBase1Encoding ReEncodeFont" <8r.enc
+pbkli8r Bookman-LightItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
pbklo8r Bookman-Light " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrb8r Courier-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrbo8r Courier-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrr8r Courier "TeXBase1Encoding ReEncodeFont" <8r.enc
-pcrro8r Courier-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvb8r Helvetica-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvb8rn Helvetica-Narrow-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvbo8r Helvetica-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvbo8rn Helvetica-Narrow-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvr8r Helvetica "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvr8rn Helvetica-Narrow "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvro8r Helvetica-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-phvro8rn Helvetica-Narrow-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
-pncb8r NewCenturySchlbk-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-pncbi8r NewCenturySchlbk-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrb8r Courier-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrbo8r Courier-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrr8r Courier "TeXBase1Encoding ReEncodeFont" <8r.enc
+pcrro8r Courier-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvb8r Helvetica-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvb8rn Helvetica-Narrow-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvbo8r Helvetica-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvbo8rn Helvetica-Narrow-BoldOblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvr8r Helvetica "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvr8rn Helvetica-Narrow "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvro8r Helvetica-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+phvro8rn Helvetica-Narrow-Oblique "TeXBase1Encoding ReEncodeFont" <8r.enc
+pncb8r NewCenturySchlbk-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
+pncbi8r NewCenturySchlbk-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
pncbo8r NewCenturySchlbk-Bold " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-pncr8r NewCenturySchlbk-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
-pncri8r NewCenturySchlbk-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pncr8r NewCenturySchlbk-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
+pncri8r NewCenturySchlbk-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
pncro8r NewCenturySchlbk-Roman " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-pplb8r Palatino-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-pplbi8r Palatino-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pplb8r Palatino-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
+pplbi8r Palatino-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
pplbo8r Palatino-Bold " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-pplr8r Palatino-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
-pplri8r Palatino-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pplr8r Palatino-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
+pplri8r Palatino-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
pplro8r Palatino-Roman " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-psyr Symbol
+psyr Symbol
psyro Symbol " .167 SlantFont "
-ptmb8r Times-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmbi8r Times-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmb8r Times-Bold "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmbi8r Times-BoldItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
ptmbo8r Times-Bold " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmr8r Times-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
-ptmri8r Times-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmr8r Times-Roman "TeXBase1Encoding ReEncodeFont" <8r.enc
+ptmri8r Times-Italic "TeXBase1Encoding ReEncodeFont" <8r.enc
ptmro8r Times-Roman " .167 SlantFont TeXBase1Encoding ReEncodeFont" <8r.enc
-pzcmi8r ZapfChancery-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
-pzdr ZapfDingbats
+pzcmi8r ZapfChancery-MediumItalic "TeXBase1Encoding ReEncodeFont" <8r.enc
+pzdr ZapfDingbats
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/8rphv.fd new/tex/latex/psnfss/8rphv.fd
--- old/tex/latex/psnfss/8rphv.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/8rphv.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesFile{8rphv.fd}
- [2001/06/04 font definitions for 8r/phv.]
+ [2020/03/25 font definitions for 8r/phv.]
\expandafter\ifx\csname Hv@Scale\endcsname\relax
\let\Hv@@Scale\@empty
@@ -17,11 +17,11 @@
<-> \Hv@@Scale phvro8r
}{}
-\DeclareFontShape{8r}{phv}{mc}{n}{
+\DeclareFontShape{8r}{phv}{c}{n}{
<-> \Hv@@Scale phvr8rn
}{}
-\DeclareFontShape{8r}{phv}{mc}{sl}{
+\DeclareFontShape{8r}{phv}{c}{sl}{
<-> \Hv@@Scale phvro8rn
}{}
@@ -42,7 +42,7 @@
}{}
\DeclareFontShape{8r}{phv}{m}{it}{<->ssub * phv/m/sl}{}
-\DeclareFontShape{8r}{phv}{mc}{it}{<->ssub * phv/mc/sl}{}
+\DeclareFontShape{8r}{phv}{c}{it}{<->ssub * phv/c/sl}{}
\DeclareFontShape{8r}{phv}{bx}{n}{<->ssub * phv/b/n}{}
\DeclareFontShape{8r}{phv}{bx}{sl}{<->ssub * phv/b/sl}{}
\DeclareFontShape{8r}{phv}{b}{it}{<->ssub * phv/b/sl}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/8rpzc.fd new/tex/latex/psnfss/8rpzc.fd
--- old/tex/latex/psnfss/8rpzc.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/8rpzc.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,15 +1,13 @@
\ProvidesFile{8rpzc.fd}
- [2001/06/04 font definitions for 8r/pzc.]
+ [2020/03/25 font definitions for 8r/pzc.]
\DeclareFontFamily{8r}{pzc}{}
-\DeclareFontShape{8r}{pzc}{mb}{it}{
+\DeclareFontShape{8r}{pzc}{m}{it}{
<-> pzcmi8r
}{}
-\DeclareFontShape{8r}{pzc}{m}{it}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{8r}{pzc}{mb}{sl}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{8r}{pzc}{m}{sl}{<->ssub * pzc/mb/sl}{}
-\DeclareFontShape{8r}{pzc}{m}{n}{<->ssub * pzc/mb/it}{}
+\DeclareFontShape{8r}{pzc}{m}{sl}{<->ssub * pzc/m/it}{}
+\DeclareFontShape{8r}{pzc}{m}{n}{<->ssub * pzc/m/it}{}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/avant.sty new/tex/latex/psnfss/avant.sty
--- old/tex/latex/psnfss/avant.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/avant.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{avant}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(SPQR)
]
\renewcommand{\sfdefault}{pag}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/bookman.sty new/tex/latex/psnfss/bookman.sty
--- old/tex/latex/psnfss/bookman.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/bookman.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bookman}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(SPQR)
]
\renewcommand{\rmdefault}{pbk}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/chancery.sty new/tex/latex/psnfss/chancery.sty
--- old/tex/latex/psnfss/chancery.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/chancery.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{chancery}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(SPQR)
]
\renewcommand{\rmdefault}{pzc}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/charter.sty new/tex/latex/psnfss/charter.sty
--- old/tex/latex/psnfss/charter.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/charter.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{charter}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(P.Dyballa)
]
\renewcommand{\rmdefault}{bch}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/courier.sty new/tex/latex/psnfss/courier.sty
--- old/tex/latex/psnfss/courier.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/courier.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{courier}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(WaS)
]
\renewcommand{\ttdefault}{pcr}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/helvet.sty new/tex/latex/psnfss/helvet.sty
--- old/tex/latex/psnfss/helvet.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/helvet.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{helvet}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(WaS)
]
\RequirePackage{keyval}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/mathpazo.sty new/tex/latex/psnfss/mathpazo.sty
--- old/tex/latex/psnfss/mathpazo.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/mathpazo.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{mathpazo}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
Palatino w/ Pazo Math (D.Puga, WaS)
]
\let\s@ved@info\@font@info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/mathpple.sty new/tex/latex/psnfss/mathpple.sty
--- old/tex/latex/psnfss/mathpple.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/mathpple.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{mathpple}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
Palatino w/ Math (WaS)
]
\PackageWarningNoLine{mathpple}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/mathptm.sty new/tex/latex/psnfss/mathptm.sty
--- old/tex/latex/psnfss/mathptm.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/mathptm.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{mathptm}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
Times w/ Math (SPQR, WaS)
]
\PackageWarningNoLine{mathptm}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/mathptmx.sty new/tex/latex/psnfss/mathptmx.sty
--- old/tex/latex/psnfss/mathptmx.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/mathptmx.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{mathptmx}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
Times w/ Math, improved (SPQR, WaS)
]
\def\rmdefault{ptm}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/newcent.sty new/tex/latex/psnfss/newcent.sty
--- old/tex/latex/psnfss/newcent.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/newcent.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{newcent}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(SPQR)
]
\renewcommand{\rmdefault}{pnc}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/ot1phv.fd new/tex/latex/psnfss/ot1phv.fd
--- old/tex/latex/psnfss/ot1phv.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/ot1phv.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesFile{ot1phv.fd}
- [2001/06/04 scalable font definitions for OT1/phv.]
+ [2020/03/25 scalable font definitions for OT1/phv.]
\expandafter\ifx\csname Hv@scale\endcsname\relax
\let\Hv@@scale\@empty
\else
@@ -16,13 +16,13 @@
\DeclareFontShape{OT1}{phv}{m}{sl}{
<-> \Hv@@scale phvro7t
}{}
-\DeclareFontShape{OT1}{phv}{mc}{n}{
+\DeclareFontShape{OT1}{phv}{c}{n}{
<-> \Hv@@scale phvr7tn
}{}
-\DeclareFontShape{OT1}{phv}{mc}{sc}{
+\DeclareFontShape{OT1}{phv}{c}{sc}{
<-> \Hv@@scale phvrc7tn
}{}
-\DeclareFontShape{OT1}{phv}{mc}{sl}{
+\DeclareFontShape{OT1}{phv}{c}{sl}{
<-> \Hv@@scale phvro7tn
}{}
\DeclareFontShape{OT1}{phv}{b}{n}{
@@ -44,7 +44,7 @@
<-> \Hv@@scale phvbo7tn
}{}
\DeclareFontShape{OT1}{phv}{m}{it}{<->ssub * phv/m/sl}{}
-\DeclareFontShape{OT1}{phv}{mc}{it}{<->ssub * phv/mc/sl}{}
+\DeclareFontShape{OT1}{phv}{c}{it}{<->ssub * phv/c/sl}{}
\DeclareFontShape{OT1}{phv}{bx}{n}{<->ssub * phv/b/n}{}
\DeclareFontShape{OT1}{phv}{bx}{sc}{<->ssub * phv/b/sc}{}
\DeclareFontShape{OT1}{phv}{bx}{sl}{<->ssub * phv/b/sl}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/ot1pzc.fd new/tex/latex/psnfss/ot1pzc.fd
--- old/tex/latex/psnfss/ot1pzc.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/ot1pzc.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,15 +1,13 @@
\ProvidesFile{ot1pzc.fd}
- [2001/06/04 font definitions for OT1/pzc.]
+ [2020/03/25 font definitions for OT1/pzc.]
\DeclareFontFamily{OT1}{pzc}{}
-\DeclareFontShape{OT1}{pzc}{mb}{it}{
+\DeclareFontShape{OT1}{pzc}{m}{it}{
<-> pzcmi7t
}{}
-\DeclareFontShape{OT1}{pzc}{m}{it}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{OT1}{pzc}{mb}{sl}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{OT1}{pzc}{m}{sl}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{OT1}{pzc}{m}{n}{<->ssub * pzc/mb/it}{}
+\DeclareFontShape{OT1}{pzc}{m}{sl}{<->ssub * pzc/m/it}{}
+\DeclareFontShape{OT1}{pzc}{m}{n}{<->ssub * pzc/m/it}{}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/palatino.sty new/tex/latex/psnfss/palatino.sty
--- old/tex/latex/psnfss/palatino.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/palatino.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{palatino}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(SPQR)
]
\renewcommand{\rmdefault}{ppl}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/pifont.sty new/tex/latex/psnfss/pifont.sty
--- old/tex/latex/psnfss/pifont.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/pifont.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{pifont}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
Pi font support (SPQR)
]
\newcommand{\Pifont}[1]{\fontfamily{#1}\fontencoding{U}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/t1phv.fd new/tex/latex/psnfss/t1phv.fd
--- old/tex/latex/psnfss/t1phv.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/t1phv.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesFile{t1phv.fd}
- [2001/06/04 scalable font definitions for T1/phv.]
+ [2020/03/25 scalable font definitions for T1/phv.]
\expandafter\ifx\csname Hv@scale\endcsname\relax
\let\Hv@@scale\@empty
\else
@@ -15,13 +15,13 @@
\DeclareFontShape{T1}{phv}{m}{sl}{
<-> \Hv@@scale phvro8t
}{}
-\DeclareFontShape{T1}{phv}{mc}{n}{
+\DeclareFontShape{T1}{phv}{c}{n}{
<-> \Hv@@scale phvr8tn
}{}
-\DeclareFontShape{T1}{phv}{mc}{sc}{
+\DeclareFontShape{T1}{phv}{c}{sc}{
<-> \Hv@@scale phvrc8tn
}{}
-\DeclareFontShape{T1}{phv}{mc}{sl}{
+\DeclareFontShape{T1}{phv}{c}{sl}{
<-> \Hv@@scale phvro8tn
}{}
\DeclareFontShape{T1}{phv}{b}{n}{
@@ -43,7 +43,7 @@
<-> \Hv@@scale phvbo8tn
}{}
\DeclareFontShape{T1}{phv}{m}{it}{<->ssub * phv/m/sl}{}
-\DeclareFontShape{T1}{phv}{mc}{it}{<->ssub * phv/mc/sl}{}
+\DeclareFontShape{T1}{phv}{c}{it}{<->ssub * phv/c/sl}{}
\DeclareFontShape{T1}{phv}{bx}{n}{<->ssub * phv/b/n}{}
\DeclareFontShape{T1}{phv}{bx}{sc}{<->ssub * phv/b/sc}{}
\DeclareFontShape{T1}{phv}{bx}{sl}{<->ssub * phv/b/sl}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/t1pzc.fd new/tex/latex/psnfss/t1pzc.fd
--- old/tex/latex/psnfss/t1pzc.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/t1pzc.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,15 +1,13 @@
\ProvidesFile{t1pzc.fd}
- [2001/06/04 font definitions for T1/pzc.]
+ [2020/03/25 font definitions for T1/pzc.]
\DeclareFontFamily{T1}{pzc}{}
-\DeclareFontShape{T1}{pzc}{mb}{it}{
+\DeclareFontShape{T1}{pzc}{m}{it}{
<-> pzcmi8t
}{}
-\DeclareFontShape{T1}{pzc}{m}{it}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{T1}{pzc}{mb}{sl}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{T1}{pzc}{m}{sl}{<->ssub * pzc/mb/sl}{}
-\DeclareFontShape{T1}{pzc}{m}{n}{<->ssub * pzc/mb/it}{}
+\DeclareFontShape{T1}{pzc}{m}{sl}{<->ssub * pzc/m/it}{}
+\DeclareFontShape{T1}{pzc}{m}{n}{<->ssub * pzc/m/it}{}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/times.sty new/tex/latex/psnfss/times.sty
--- old/tex/latex/psnfss/times.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/times.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{times}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(SPQR)
]
\renewcommand{\sfdefault}{phv}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/ts1phv.fd new/tex/latex/psnfss/ts1phv.fd
--- old/tex/latex/psnfss/ts1phv.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/ts1phv.fd 2020-04-12 20:27:45.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesFile{ts1phv.fd}
- [2001/06/04 scalable font definitions for TS1/phv.]
+ [2020/03/25 scalable font definitions for TS1/phv.]
\expandafter\ifx\csname Hv@scale\endcsname\relax
\let\Hv@@scale\@empty
\else
@@ -12,10 +12,10 @@
\DeclareFontShape{TS1}{phv}{m}{sl}{
<-> \Hv@@scale phvro8c
}{}
-\DeclareFontShape{TS1}{phv}{mc}{n}{
+\DeclareFontShape{TS1}{phv}{c}{n}{
<-> \Hv@@scale phvr8cn
}{}
-\DeclareFontShape{TS1}{phv}{mc}{sl}{
+\DeclareFontShape{TS1}{phv}{c}{sl}{
<-> \Hv@@scale phvro8cn
}{}
\DeclareFontShape{TS1}{phv}{b}{n}{
@@ -31,7 +31,7 @@
<-> \Hv@@scale phvbo8cn
}{}
\DeclareFontShape{TS1}{phv}{m}{it}{<->ssub * phv/m/sl}{}
-\DeclareFontShape{TS1}{phv}{mc}{it}{<->ssub * phv/mc/sl}{}
+\DeclareFontShape{TS1}{phv}{c}{it}{<->ssub * phv/c/sl}{}
\DeclareFontShape{TS1}{phv}{bx}{n}{<->ssub * phv/b/n}{}
\DeclareFontShape{TS1}{phv}{bx}{sl}{<->ssub * phv/b/sl}{}
\DeclareFontShape{TS1}{phv}{b}{it}{<->ssub * phv/b/sl}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/ts1pzc.fd new/tex/latex/psnfss/ts1pzc.fd
--- old/tex/latex/psnfss/ts1pzc.fd 2006-01-13 01:03:49.000000000 +0100
+++ new/tex/latex/psnfss/ts1pzc.fd 2020-04-12 20:27:45.000000000 +0200
@@ -3,13 +3,11 @@
\DeclareFontFamily{TS1}{pzc}{}
-\DeclareFontShape{TS1}{pzc}{mb}{it}{
+\DeclareFontShape{TS1}{pzc}{m}{it}{
<-> pzcmi8c
}{}
-\DeclareFontShape{TS1}{pzc}{m}{it}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{TS1}{pzc}{mb}{sl}{<->ssub * pzc/mb/it}{}
-\DeclareFontShape{TS1}{pzc}{m}{sl}{<->ssub * pzc/mb/sl}{}
-\DeclareFontShape{TS1}{pzc}{m}{n}{<->ssub * pzc/mb/it}{}
+\DeclareFontShape{TS1}{pzc}{m}{sl}{<->ssub * pzc/m/it}{}
+\DeclareFontShape{TS1}{pzc}{m}{n}{<->ssub * pzc/m/it}{}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/psnfss/utopia.sty new/tex/latex/psnfss/utopia.sty
--- old/tex/latex/psnfss/utopia.sty 2006-08-27 20:14:13.000000000 +0200
+++ new/tex/latex/psnfss/utopia.sty 2020-04-12 20:27:45.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{utopia}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
(P.Dyballa)
]
\PackageWarningNoLine{utopia}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/psnfss.tlpobj new/tlpkg/tlpobj/psnfss.tlpobj
--- old/tlpkg/tlpobj/psnfss.tlpobj 2019-02-28 04:00:39.000000000 +0100
+++ new/tlpkg/tlpobj/psnfss.tlpobj 2020-04-13 01:55:00.000000000 +0200
@@ -1,6 +1,6 @@
name psnfss
category Package
-revision 33946
+revision 54694
shortdesc Font support for common PostScript fonts
relocated 1
longdesc Font definition files, macros and font metrics for
@@ -31,6 +31,8 @@
longdesc which uses Palatino as base font, with the mathpazo fonts. The
longdesc bundle as a whole is part of the LaTeX 'required' set of
longdesc packages.
+depend symbol
+depend zapfding
depend graphics
execute addMap charter.map
execute addMap fpls.map
@@ -145,7 +147,6 @@
RELOC/tex/latex/psnfss/utopia.sty
catalogue-also psnfssx
catalogue-ctan /macros/latex/required/psnfss
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp font-use
-catalogue-version 9.2a
+catalogue-version 9.3
++++++ pst-eucl.doc.tar.xz ++++++
++++ 4217 lines of diff (skipped)
++++++ pst-eucl.tar.xz ++++++
++++ 9495 lines of diff (skipped)
++++++ pst-fractal.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/pst-fractal.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new.3606/pst-fractal.doc.tar.xz differ: char 26, line 1
++++++ pst-fractal.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-fractal/pst-fractal.tex new/tex/generic/pst-fractal/pst-fractal.tex
--- old/tex/generic/pst-fractal/pst-fractal.tex 2018-12-01 23:47:30.000000000 +0100
+++ new/tex/generic/pst-fractal/pst-fractal.tex 2020-03-17 22:31:08.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pst-fractal.tex 846 2018-11-30 21:44:45Z herbert $
+%% $Id: pst-fractal.tex 1162 2020-03-16 19:18:15Z herbert $
%%
%% This is file `pst-fractal.tex',
%%
@@ -22,8 +22,8 @@
\ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{0.10}
-\def\filedate{2018/11/30}
+\def\fileversion{0.11a}
+\def\filedate{2020/03/16}
\message{`PST-fractal' v\fileversion, \filedate\space (hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -509,10 +509,10 @@
\def\psKochflake@i{\@ifnextchar({\psKochflake@ii}{\psKochflake@ii(0,0)}}
\def\psKochflake@ii(#1){{%
\addbefore(a)par{radius=0.25cm,maxIter=5}%
- \pst@getcoor{#1}\pst@tempA%
- \begin@SpecialObj%
+ \pst@getcoor{#1}\pst@tempA
+ \begin@SpecialObj
\addto@pscode{
- gsave ^^J%
+ gsave ^^J
\pst@tempA translate
\pst@usecolor\pslinecolor
\pst@fractal@angle rotate ^^J
@@ -523,8 +523,8 @@
tx@Kochflake end ^^J
}% end add@pscode
\psk@fillstyle
- \addto@pscode{stroke grestore }
- \end@SpecialObj%
+ \addto@pscode{stroke grestore }%
+ \end@SpecialObj
}}
%
\def\psAppolonius{\pst@object{psAppolonius}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-fractal/pst-fractal.sty new/tex/latex/pst-fractal/pst-fractal.sty
--- old/tex/latex/pst-fractal/pst-fractal.sty 2018-12-01 23:47:30.000000000 +0100
+++ new/tex/latex/pst-fractal/pst-fractal.sty 2020-03-11 22:16:29.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: pst-fractal-doc.tex 658 2017-11-26 16:55:41Z herbert $
+%% $Id: pst-fractal.sty 1154 2020-03-10 19:38:13Z herbert $
\RequirePackage{pstricks}
\ProvidesPackage{pst-fractal}[2007/09/25 package wrapper for
pst-fractal.tex (hv)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-fractal.tlpobj new/tlpkg/tlpobj/pst-fractal.tlpobj
--- old/tlpkg/tlpobj/pst-fractal.tlpobj 2019-02-28 04:01:13.000000000 +0100
+++ new/tlpkg/tlpobj/pst-fractal.tlpobj 2020-03-18 01:56:47.000000000 +0100
@@ -1,6 +1,6 @@
name pst-fractal
category Package
-revision 49295
+revision 54376
shortdesc Draw fractal sets using PSTricks
relocated 1
longdesc The package uses PSTricks to draw the Julia and Mandelbrot
@@ -14,7 +14,6 @@
RELOC/tex/generic/pst-fractal/pst-fractal.tex
RELOC/tex/latex/pst-fractal/pst-fractal.sty
catalogue-ctan /graphics/pstricks/contrib/pst-fractal
-catalogue-date 2018-11-30 23:09:54 +0100
catalogue-license lppl
catalogue-topics graphics-use pstricks
-catalogue-version 0.10
+catalogue-version 0.11a
++++++ pst-func.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-func/Changes new/doc/generic/pst-func/Changes
--- old/doc/generic/pst-func/Changes 2018-12-14 22:55:21.000000000 +0100
+++ new/doc/generic/pst-func/Changes 2019-05-17 22:56:26.000000000 +0200
@@ -1,4 +1,5 @@
..... pst-func.tex
+0.93 2019-05-17 - fix for missing end in a local dictionary (\psBinomialX)
0.92 2018-12-13 - allow algebraic mode for \pscumIntegral
0.91 2018-11-15 - new algorithm for sin/cos integral to prevent problems
with large values
Binary files old/doc/generic/pst-func/pst-func-doc.pdf and new/doc/generic/pst-func/pst-func-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.doc.tlpobj new/tlpkg/tlpobj/pst-func.doc.tlpobj
--- old/tlpkg/tlpobj/pst-func.doc.tlpobj 2019-02-28 04:01:13.000000000 +0100
+++ new/tlpkg/tlpobj/pst-func.doc.tlpobj 2020-03-04 23:53:24.000000000 +0100
@@ -1,9 +1,9 @@
name pst-func.doc
category Package
-revision 49413
+revision 54080
shortdesc doc files of pst-func
relocated 1
-docfiles size=1003
+docfiles size=1006
RELOC/doc/generic/pst-func/Changes
RELOC/doc/generic/pst-func/README.md
RELOC/doc/generic/pst-func/pst-func-doc.bib
++++++ pst-func.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-func/pst-func.tex new/tex/generic/pst-func/pst-func.tex
--- old/tex/generic/pst-func/pst-func.tex 2018-12-14 22:55:21.000000000 +0100
+++ new/tex/generic/pst-func/pst-func.tex 2019-05-17 22:56:26.000000000 +0200
@@ -31,8 +31,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-func}
%
-\def\fileversion{0.92}
-\def\filedate{2018/12/13}
+\def\fileversion{0.93}
+\def\filedate{2019/05/17}
\message{`PST-func' v\fileversion, \filedate\space (hv)}
%
\pstheader{pst-func.pro}
@@ -581,51 +581,56 @@
kOld scx 0 moveto % starting point#
%%----------------------------------------------------------------------------------------------------------------------------------------------------------------
%%-------------------- Code, der bei gro{\ss}em N \"{u}ber den Logarithmus arbeitet von Manuel Luque ---------------------------------------------
- /SumLog {% log(1) + log(2) + ... + log(n) = log(n!)
- 1 dict begin % Erwartet die Eingabe eines Wertes, n\"{a}mlich bis zu welchem Wert addiert werden soll ---> n
- /nV exch def % der \"{u}bergebene Wert wird in nV abgespeichert
- /iV 1 def % Startwert ist iV=1
- 0 nV { iV log add /iV iV 1 add def } repeat % 0 + log(1) + log(2) + ... + log(n) Die Null ist dazu n\"{o}tig um die erste Addition machen zu k\"{o}nnen
- end
- } def
- /binomial_comb{ % log(N!) - log(k!) - log((n-k)!) = log[N!/(k!*(n-k)!)]
- 2 dict begin
- /nV exch def
- /NV exch def
- NV SumLog nV SumLog sub
- NV nV sub SumLog sub
- end
- } def
- /PnN {
- 3 dict begin
- /pV exch def
- /nV exch def
- /NV exch def
- 10
- NV nV binomial_comb
- nV pV log mul
- NV nV sub 1 pV sub log mul add add
- exp
- } def
+ /SumLog {% log(1) + log(2) + ... + log(n) = log(n!)
+ 2 dict begin % Erwartet die Eingabe eines Wertes, n\"{a}mlich bis zu welchem Wert addiert werden soll ---> n
+ /nV exch def % der \"{u}bergebene Wert wird in nV abgespeichert
+ /iV 1 def % Startwert ist iV=1
+ 0 nV { iV log add /iV iV 1 add def } repeat % 0 + log(1) + log(2) + ... + log(n) Die Null ist dazu n\"{o}tig um die erste Addition machen zu k\"{o}nnen
+ end
+ } def
+ /binomial_comb{ % log(N!) - log(k!) - log((n-k)!) = log[N!/(k!*(n-k)!)]
+ 2 dict begin
+ /nV exch def
+ /NV exch def
+ NV SumLog nV SumLog sub
+ NV nV sub SumLog sub
+ end
+ } def
+ /PnN {
+ 3 dict begin
+ /pV exch def
+ /nV exch def
+ /NV exch def
+ 10
+ NV nV binomial_comb
+ nV pV log mul
+ NV nV sub 1 pV sub log mul add add
+ exp
+ end
+ } def
%%------------------------------------------------------------------------------------------------
%%------------------------------------------------------------------------------------------------
- N ValueSwitch2Log gt { } {%
- 0 1 m 1 sub {%
- /k exch def % save loop variable
- k 0 eq
- { /Y q N exp def }
- { /Y Y N k sub 1 add mul k div p mul q div def }
- ifelse
- } for
- } ifelse
- m 1 n {% % n-m+1 times
- /k exch def % save loop variable
- N ValueSwitch2Log gt { N k p PnN /Y exch def }
- { k 0 eq
- { /Y q N exp def }
- { /Y Y N k sub 1 add mul k div p mul q div def }
- ifelse
- } ifelse % recursive definition
+ N ValueSwitch2Log gt
+ { }
+ { 0 1 m 1 sub
+ {%
+ /k exch def % save loop variable
+ k 0 eq
+ { /Y q N exp def }
+ { /Y Y N k sub 1 add mul k div p mul q div def }
+ ifelse
+ } for
+ } ifelse
+ m 1 n {% % n-m+1 times
+ /k exch def % save loop variable
+ N ValueSwitch2Log gt
+ { N k p PnN /Y exch def }
+ { k 0 eq
+ { /Y q N exp def }
+ { /Y Y N k sub 1 add mul k div p mul q div def }
+ ifelse
+ }
+ ifelse % recursive definition
\ifx\psk@fillstylename\pst@alternateColors
newpath
kOld scx 0 moveto
@@ -725,7 +730,7 @@
\else\psBinomialF@iii{#1}{#2}{#3}{#5}\fi
\fi}%
\def\psBinomialF@iii#1#2#3#4{%
- \addbefore@par{valuewidth=15}%
+ \addbefore@par{valuewidth=15}%
\begin@OpenObj
\addto@pscode{%
/ValueSwitch2Log \psFunc@Switch2Log\space def
@@ -740,72 +745,75 @@
\ifPst@markZeros /kOld dx neg m add def \else
/kOld m def \fi
\psFunc@leftEnd 0 eq
- { }
- { kOld 0 eq
- { kOld \psFunc@leftEnd sub scx 0 moveto % starting point
- \ifPst@LineEnding
- kOld \psFunc@radiusout\pst@number\psxunit div sub scx 0 L stroke
- kOld scx 0 newpath \psFunc@radiusout 0 360 arc kOld scx 0 \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill \else
- kOld scx 0 L stroke \fi }
- { } ifelse } ifelse
+ { }
+ { kOld 0 eq
+ { kOld \psFunc@leftEnd sub scx 0 moveto % starting point
+ \ifPst@LineEnding
+ kOld \psFunc@radiusout\pst@number\psxunit div sub scx 0 L stroke
+ kOld scx 0 newpath \psFunc@radiusout 0 360 arc kOld scx 0
+ \psFunc@radiusinR 360 0 arcn closepath \pst@usecolor\psk@LineEndColorR fill
+ \else
+ kOld scx 0 L stroke
+ \fi
+ }{ } ifelse } ifelse
kOld scx 0 moveto % starting point
%%----------------------------------------------------------------------------------------------------------------------------------------------------------------
%%-------------------- Code, der bei gro{\ss}em N \"{u}ber den Logarithmus arbeitet von Manuel Luque ---------------------------------------------
- /SumLog {% log(1) + log(2) + ... + log(n) = log(n!)
- 1 dict begin % Erwartet die Eingabe eines Wertes, n\"{a}mlich bis zu welchem Wert addiert werden soll ---> n
- /nV exch def % der \"{u}bergebene Wert wird in nV abgespeichert
- /iV 1 def % Startwert ist iV=1
- 0 nV { iV log add /iV iV 1 add def } repeat % 0 + log(1) + log(2) + ... + log(n) Die Null ist dazu n\"{o}tig um die erste Addition machen zu k\"{o}nnen
- end
- } def
- /binomial_comb{ % log(N!) - log(k!) - log((n-k)!) = log[N!/(k!*(n-k)!)]
- 2 dict begin
- /nV exch def
- /NV exch def
- NV SumLog nV SumLog sub
- NV nV sub SumLog sub
- end
- } def
- /PnN {
- 3 dict begin
- /pV exch def
- /nV exch def
- /NV exch def
- 10
- NV nV binomial_comb
- nV pV log mul
- NV nV sub 1 pV sub log mul add add
- exp
- } def
+ /SumLog {% log(1) + log(2) + ... + log(n) = log(n!)
+ 2 dict begin % Erwartet die Eingabe eines Wertes, n\"{a}mlich bis zu welchem Wert addiert werden soll ---> n
+ /nV exch def % der \"{u}bergebene Wert wird in nV abgespeichert
+ /iV 1 def % Startwert ist iV=1
+ 0 nV { iV log add /iV iV 1 add def } repeat % 0 + log(1) + log(2) + ... + log(n) Die Null ist dazu n\"{o}tig um die erste Addition machen zu k\"{o}nnen
+ end
+ } def
+ /binomial_comb{ % log(N!) - log(k!) - log((n-k)!) = log[N!/(k!*(n-k)!)]
+ 2 dict begin
+ /nV exch def
+ /NV exch def
+ NV SumLog nV SumLog sub
+ NV nV sub SumLog sub
+ end
+ } def
+ /PnN {
+ 3 dict begin
+ /pV exch def
+ /nV exch def
+ /NV exch def
+ 10
+ NV nV binomial_comb
+ nV pV log mul
+ NV nV sub 1 pV sub log mul add add
+ exp
+ end
+ } def
%%------------------------------------------------------------------------------------------------
%%------------------------------------------------------------------------------------------------
- 0 1 m 1 sub {
- /k exch def % save loop variable
- N ValueSwitch2Log gt { k 0 eq
- { N k p PnN /Y exch def /F Y def }
- { N k p PnN /Y exch def /F F Y add def }
- ifelse }
- { k 0 eq
- { /Y q N exp def
- /F Y def }
- { /Y Y N k sub 1 add mul k div p mul q div def
- /F F Y add def
- } ifelse
- } ifelse
- } for
- m 1 n { % n-m+1 times
- /k exch def % save loop variable
- N ValueSwitch2Log gt { k 0 eq
- { N k p PnN /Y exch def /F Y def }
- { N k p PnN /Y exch def /F F Y add def } ifelse }
- { k 0 eq
- { /Y q N exp def
- /F Y def }
- { /Y Y N k sub 1 add mul k div p mul q div def
- /F F Y add def
- } ifelse
- } ifelse % recursive definition
- F 1 gt { /F 1 def } if
+ 0 1 m 1 sub {
+ /k exch def % save loop variable
+ N ValueSwitch2Log gt { k 0 eq
+ { N k p PnN /Y exch def /F Y def }
+ { N k p PnN /Y exch def /F F Y add def }
+ ifelse
+ }{ k 0 eq
+ { /Y q N exp def /F Y def }
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def
+ } ifelse
+ } ifelse
+ } for
+ m 1 n { % n-m+1 times
+ /k exch def % save loop variable
+ N ValueSwitch2Log gt
+ { k 0 eq
+ { N k p PnN /Y exch def /F Y def }
+ { N k p PnN /Y exch def /F F Y add def }
+ ifelse }
+ { k 0 eq
+ { /Y q N exp def /F Y def }
+ { /Y Y N k sub 1 add mul k div p mul q div def /F F Y add def
+ } ifelse
+ } ifelse % recursive definition
+ F 1 gt { /F 1 def } if
\ifPst@markZeros kOld scx F scy L k dx add scx F scy L k dx add scx 0 L kOld 1 add scx 0 L
\else
kOld scx F scy newpath \psFunc@radiusout 0 360 arc kOld scx F scy \psFunc@radiusinL 360 0 arcn closepath \pst@usecolor\psk@LineEndColorL fill
@@ -875,60 +883,58 @@
kOld scx 0 moveto % starting point
%%----------------------------------------------------------------------------------------------------------------------------------------------------------------
%%-------------------- Code, der bei gro{\ss}em N \"{u}ber den Logarithmus arbeitet von Manuel Luque ---------------------------------------------
- /SumLog {% log(1) + log(2) + ... + log(n) = log(n!)
- 1 dict begin % Erwartet die Eingabe eines Wertes, n\"{a}mlich bis zu welchem Wert addiert werden soll ---> n
- /nV exch def % der \"{u}bergebene Wert wird in nV abgespeichert
- /iV 1 def % Startwert ist iV=1
- 0 nV { iV log add /iV iV 1 add def } repeat % 0 + log(1) + log(2) + ... + log(n) Die Null ist dazu n\"{o}tig um die erste Addition machen zu k\"{o}nnen
- end
- } def
- /binomial_comb{ % log(N!) - log(k!) - log((n-k)!) = log[N!/(k!*(n-k)!)]
- 2 dict begin
- /nV exch def
- /NV exch def
- NV SumLog nV SumLog sub
- NV nV sub SumLog sub
- end
- } def
- /PnN {
- 3 dict begin
- /pV exch def
- /nV exch def
- /NV exch def
- 10
- NV nV binomial_comb
- nV pV log mul
- NV nV sub 1 pV sub log mul add add
- exp
- } def
-%%------------------------------------------------------------------------------------------------
+ /SumLog {% log(1) + log(2) + ... + log(n) = log(n!)
+ 2 dict begin % Erwartet die Eingabe eines Wertes, n\"{a}mlich bis zu welchem Wert addiert werden soll ---> n
+ /nV exch def % der \"{u}bergebene Wert wird in nV abgespeichert
+ /iV 1 def % Startwert ist iV=1
+ 0 nV { iV log add /iV iV 1 add def } repeat % 0 + log(1) + log(2) + ... + log(n) Die Null ist dazu n\"{o}tig um die erste Addition machen zu k\"{o}nnen
+ end
+ } def
+ /binomial_comb{ % log(N!) - log(k!) - log((n-k)!) = log[N!/(k!*(n-k)!)]
+ 2 dict begin
+ /nV exch def
+ /NV exch def
+ NV SumLog nV SumLog sub
+ NV nV sub SumLog sub
+ end
+ } def
+ /PnN {
+ 3 dict begin
+ /pV exch def
+ /nV exch def
+ /NV exch def
+ 10
+ NV nV binomial_comb
+ nV pV log mul
+ NV nV sub 1 pV sub log mul add add
+ exp
+ end
+ } def
%%------------------------------------------------------------------------------------------------
- 0 1 m 1 sub {
- /k exch def % save loop variable
- N ValueSwitch2Log gt { k 0 eq
- { N k p PnN /Y exch def /F Y def /FS 1 F sub def }
- { N k p PnN /Y exch def /F F Y add def /FS 1 F sub def }
- ifelse }
- { k 0 eq
- { /Y q N exp def
- /F Y def /FS 1 F sub def }
- { /Y Y N k sub 1 add mul k div p mul q div def
- /F F Y add def /FS 1 F sub def }
- ifelse } ifelse
- } for
- m 1 n { % n-m+1 times
- /k exch def % save loop variable
- N ValueSwitch2Log gt { k 0 eq
- { N k p PnN /Y exch def /F Y def /FS 1 F sub def }
- { N k p PnN /Y exch def /F F Y add def /FS 1 F sub def } ifelse }
- { k 0 eq
- { /Y q N exp def
- /F Y def /FS 1 F sub def }
- { /Y Y N k sub 1 add mul k div p mul q div def
- /F F Y add def /FS 1 F sub def }
- ifelse
- } ifelse % recursive definition
- FS 0 lt { /FS 0 def } if
+ 0 1 m 1 sub {
+ /k exch def % save loop variable
+ N ValueSwitch2Log gt { k 0 eq
+ { N k p PnN /Y exch def /F Y def /FS 1 F sub def }
+ { N k p PnN /Y exch def /F F Y add def /FS 1 F sub def }
+ ifelse }
+ { k 0 eq
+ { /Y q N exp def /F Y def /FS 1 F sub def }
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def /FS 1 F sub def }
+ ifelse } ifelse
+ } for
+ m 1 n { % n-m+1 times
+ /k exch def % save loop variable
+ N ValueSwitch2Log gt { k 0 eq
+ { N k p PnN /Y exch def /F Y def /FS 1 F sub def }
+ { N k p PnN /Y exch def /F F Y add def /FS 1 F sub def } ifelse }
+ { k 0 eq
+ { /Y q N exp def /F Y def /FS 1 F sub def }
+ { /Y Y N k sub 1 add mul k div p mul q div def
+ /F F Y add def /FS 1 F sub def }
+ ifelse
+ } ifelse % recursive definition
+ FS 0 lt { /FS 0 def } if
\ifPst@markZeros kOld scx FS scy L k dx add scx FS scy L k dx add scx 0 L kOld 1 add scx 0 L
\else
\ifPst@LineEnding
@@ -1033,6 +1039,7 @@
nV pV log mul
NV nV sub 1 pV sub log mul add add
exp
+ end
} def
%%------------------------------------------------------------------------------------------------
%%------------------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-func/pst-func.sty new/tex/latex/pst-func/pst-func.sty
--- old/tex/latex/pst-func/pst-func.sty 2018-12-14 22:55:21.000000000 +0100
+++ new/tex/latex/pst-func/pst-func.sty 2019-05-17 22:56:26.000000000 +0200
@@ -13,4 +13,4 @@
\ProvidesFile{pst-func.pro}[2018/12/13 v. 0.17, PostScript prologue file (hv)]
\(a)addtofilelist{pst-func.pro}}{}%
\endinput
-%% $Id: pst-func.sty 861 2018-12-13 20:40:06Z herbert $
+%% $Id: pst-func.sty 887 2018-12-29 13:17:59Z herbert $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-func.tlpobj new/tlpkg/tlpobj/pst-func.tlpobj
--- old/tlpkg/tlpobj/pst-func.tlpobj 2019-02-28 04:01:14.000000000 +0100
+++ new/tlpkg/tlpobj/pst-func.tlpobj 2020-03-04 23:53:25.000000000 +0100
@@ -1,6 +1,6 @@
name pst-func
category Package
-revision 49413
+revision 54080
shortdesc PSTricks package for plotting mathematical functions
relocated 1
longdesc The package is built for use with PSTricks. It provides macros
@@ -22,15 +22,14 @@
longdesc Vasicek function for describing the evolution of interest
longdesc rates; and implicit functions. The plots may be generated as
longdesc volumes of rotation about the X-axis, as well.
-runfiles size=24
+runfiles size=23
RELOC/dvips/pst-func/pst-func.pro
RELOC/tex/generic/pst-func/pst-func.tex
RELOC/tex/latex/pst-func/pst-func.sty
catalogue-contact-home http://pstricks.tug.org
-catalogue-contact-repository http://comedy.dante.de/~herbert/TeXnik/
+catalogue-contact-repository https://archiv.dante.de/~herbert/TeXnik/
catalogue-contact-support http://tug.org/mailman/listinfo/pstricks
catalogue-ctan /graphics/pstricks/contrib/pst-func
-catalogue-date 2018-12-13 23:22:32 +0100
catalogue-license lppl
catalogue-topics maths graphics-plotfn graphics-use pstricks
-catalogue-version 0.92
+catalogue-version 0.93
++++++ pst-ghsb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ghsb.doc.tlpobj new/tlpkg/tlpobj/pst-ghsb.doc.tlpobj
--- old/tlpkg/tlpobj/pst-ghsb.doc.tlpobj 2019-02-28 04:01:50.000000000 +0100
+++ new/tlpkg/tlpobj/pst-ghsb.doc.tlpobj 2020-03-04 23:53:25.000000000 +0100
@@ -1,6 +1,6 @@
name pst-ghsb.doc
category Package
-revision 45797
+revision 54074
shortdesc doc files of pst-ghsb
relocated 1
docfiles size=26
++++++ pst-ghsb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ghsb.tlpobj new/tlpkg/tlpobj/pst-ghsb.tlpobj
--- old/tlpkg/tlpobj/pst-ghsb.tlpobj 2019-02-28 04:01:50.000000000 +0100
+++ new/tlpkg/tlpobj/pst-ghsb.tlpobj 2020-03-04 23:53:25.000000000 +0100
@@ -1,6 +1,6 @@
name pst-ghsb
category Package
-revision 45797
+revision 54074
shortdesc HSB gradients via PSTricks
relocated 1
longdesc Usage modeled on pst-grad; superseded by pst-slpe.
++++++ pst-marble.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-s/pst-marble.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-s.new.3606/pst-marble.doc.tar.xz differ: char 25, line 1
++++++ pst-marble.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dvips/pst-marble/pst-marble.pro new/dvips/pst-marble/pst-marble.pro
--- old/dvips/pst-marble/pst-marble.pro 2019-02-27 22:55:03.000000000 +0100
+++ new/dvips/pst-marble/pst-marble.pro 2019-05-02 23:11:11.000000000 +0200
@@ -1,5 +1,7 @@
%%Copyright: 2018, 2019 Aubrey Jaffer
-%%CreationDate: 2019-02-20
+%%CreationDate: 2019-04-16
+
+% pst-marble-v1.6
% This program can redistributed and/or modified under the terms of
% the LaTeX Project Public License Distributed from CTAN archives in
@@ -11,9 +13,11 @@
/URL (http://people.csail.mit.edu/jaffer/Marbling) def
/pi 3.141592653589793 def
+/pio180 pi 180 div def
/e 2.718281828459045 def
/e^-1 1 e div def
/m4o3 -4 3.0 div def
+/p1o3 1 3 div def
% dps define max, if not already defined
systemdict /max known not {
@@ -29,6 +33,8 @@
/arcsin {neg dup dup mul neg 1 add sqrt neg atan 180 sub} bind def
} if
+/asin { dup dup mul 1 sub neg 0 max sqrt atan } bind def
+
/numeric? % x --> bool
{
type dup /realtype eq exch /integertype eq or
@@ -63,7 +69,8 @@
actions sdx get aload pop /ct exch def
ct /drop eq
{
- pop pop pop /cy exch def /cx exch def
+ % cx cy rad^2 bgc rgb sr^-2 gc
+ pop pop pop pop pop /cy exch def /cx exch def
cx cy sdx find-drop-background /bgc exch def
actions sdx get 3 bgc put
}
@@ -71,21 +78,29 @@
ct /rake eq
{pop pop pop pop pop pop}
{
- ct /wiggle eq
- {numeric? {pop pop pop} if pop}
+ ct /jiggle eq
+ {pop pop pop pop pop pop pop pop pop}
{
ct /offset eq
{pop pop}
{
- ct /vortex eq
- {pop pop pop pop}
+ ct /turn eq
+ {pop pop pop}
{
- ct /stir eq
- {pop pop pop pop pop}
+ ct /vortex eq
+ {pop pop pop pop}
{
- ct /stylus eq
- {pop pop pop pop pop pop pop pop pop pop}
- {(unrecognized token) = ct =} ifelse
+ ct /stir eq
+ {pop pop pop pop pop}
+ {
+ ct /wriggle eq
+ {pop pop pop pop pop pop pop}
+ {
+ ct /stylus eq
+ {pop pop pop pop pop pop pop pop pop pop pop}
+ {(unrecognized token) = ct =} ifelse
+ } ifelse
+ } ifelse
} ifelse
} ifelse
} ifelse
@@ -112,8 +127,8 @@
{
/idx exch def
spractions idx get aload pop /ct exch def
- ct /Gaussian-spray eq
- {Gaussian-spray-do}
+ ct /normal-spray eq
+ {normal-spray-do}
{
ct /uniform-spray eq
{uniform-spray-do}
@@ -139,24 +154,32 @@
/ct-dispatch
{
- ct /wiggle eq
- {wiggle-deformation}
+ ct /offset eq
+ {offset-deformation}
{
- ct /offset eq
- {offset-deformation}
+ ct /turn eq
+ {do-turn}
{
- ct /rake eq
- {rake-deformation}
+ ct /jiggle eq
+ {jiggle-deformation}
{
- ct /vortex eq
- {vortex-deformation}
+ ct /rake eq
+ {rake-deformation}
{
- ct /stir eq
- {stir-deformation}
+ ct /vortex eq
+ {vortex-deformation}
{
- ct /stylus eq
- {stylus-deformation}
- {(unrecognized token) = ct =} ifelse
+ ct /stir eq
+ {stir-deformation}
+ {
+ ct /wriggle eq
+ {wriggle-deformation}
+ {
+ ct /stylus eq
+ {stylus-deformation}
+ {(unrecognized token) = ct =} ifelse
+ } ifelse
+ } ifelse
} ifelse
} ifelse
} ifelse
@@ -174,7 +197,9 @@
actions cdx get aload pop /ct exch def
ct /drop eq
% movement due to drop.
- { % px py cx cy rad^2 bgc rgb
+ { % px py cx cy rad^2 bgc rgb sr^-2 gc
+ pop
+ pop
/rgb exch def
pop % /bgc exch def
/rad^2 exch def
@@ -203,26 +228,110 @@
dx add exch
} bind def
-/wiggle-deformation % px py dx dy period ofst depth --> px py
+/do-turn % cx cy [trv]
{
- dup numeric?
+ /trv exch def
+ /cy exch def /cx exch def
+ cy sub exch cx sub exch trv transform
+} bind def
+
+% /Round {0.5 add floor} bind def
+
+/symmod % x m --> x
+{
+ 2 copy div round mul sub
+} bind def
+
+% /cbrt % x --> x
+% {
+% /x exch def
+% x 0 lt { -1 } { 1 } ifelse x abs p1o3 exp mul
+% } bind def
+
+/g_1 % common code to compute inverse of non-linear deformation
+{
+ mdls 2 div
+ a 0 lt { neg } if
+ mf 0 gt
+ {1 1 af 180 div abs sub 0 max pw exp sub}
+ {af 180 div abs pw exp} ifelse
+ mul
+
+ %% one iteration of Newton-Raphson
+ %% g_1=g_0-(g_0-a+(m/2)*sin(g_0*f))/(1+pi*m*f/360*cos(g_0*f))
+ /g exch def
+ /gf g freq mul def
+ g
+ g a sub major gf sin mul add
+ 1 mf 2 div gf cos mul add
+ div
+ sub
+} bind def
+
+/wriggle-deformation % px py cx cy freq major minor mf mdls pw --> px py
+{
+ /pw exch def
+ /mdls exch def
+ /mf exch def
+ /minor exch def
+ /major exch def
+ /freq exch def
+ /cy exch def /cx exch def
+ /py exch def /px exch def
+ /rd px cx sub dup mul py cy sub dup mul add sqrt def
+ /a rd mdls symmod def
+ /af a freq mul def
+ 1e-6 rd lt
{
- /depth exch def
- /ofst exch def
- /period exch def
- /dy exch def /dx exch def
- /py exch def /px exch def
- /a py dx mul px dy mul sub period mul ofst add sin depth mul def
+ mf 0 ne
+ {
+ g_1
+
+ dup a sub exch
+ % find the minor axis displacement from the major axis value
+ % where it was moved from.
+ freq mul cos minor mul
+ }
+ {
+ af cos-sin exch neg
+ exch major mul exch minor mul
+ } ifelse
+ % on stack are radial and angular displacements from cx,cy
+ px cx sub py cy sub atan add /ang exch def
+ rd add /rd exch def
+ ang cos-sin rd mul cx add exch rd mul cy add
+ }
+ { px py } ifelse
+} bind def
+
+/jiggle-deformation % px py dx dy freq ofst [trv] major minor mf mdls pw --> px py
+{
+ /pw exch def
+ /mdls exch def
+ /mf exch def
+ /minor exch def
+ /major exch def
+ /trv exch def
+ /ofst exch def
+ /freq exch def
+ /dy exch def /dx exch def
+ /py exch def /px exch def
+ /a py dx mul px dy mul add ofst add mdls symmod def
+ /af a freq mul def
+ mf 0 ne
+ {
+ g_1
+
+ dup a sub exch
+ % find the minor axis displacement from the major axis value
+ % where it was moved from.
+ freq mul cos minor mul
}
{
- % old-style: px py ang {func} --> px py
- /func exch def /ang exch 90 sub def
- /dy ang cos def /dx ang sin def
- /py exch def /px exch def
- /a py dx mul px dy mul sub 1000 mul func exec
- 1e-3 mul oversample 0 gt {neg} if def
+ af cos-sin exch neg
+ % exch major mul exch minor mul
} ifelse
- px dx a mul add py dy a mul add
+ [ trv aload pop px py ] transform
} bind def
/tines % cnt spacing ofst
@@ -336,13 +445,8 @@
/rad^2 exch def /cy exch def /cx exch def
/py exch def /px exch def
/p-c^2 px cx sub dup mul py cy sub dup mul add def
- % p-c^2 rad^2 4096 mul gt
- % { px py }
- % {
- /a rad^2 p-c^2 div 1 add sqrt def
- py cy sub px cx sub a mul cx add exch a mul cy add
- % }
- % ifelse
+ /a rad^2 p-c^2 div 1 add sqrt def
+ py cy sub px cx sub a mul cx add exch a mul cy add
} bind def
%% Given x, y coordinates on stack, calculates movement due to
@@ -353,7 +457,7 @@
{
actions exch get aload pop /ct exch def
ct /drop eq
- {pop pop spread} % pop rgb-vectors
+ {pop pop pop pop spread} % pop sr^-2 gc and rgb-vectors
{ct-dispatch} ifelse
} for
} bind def
@@ -374,12 +478,12 @@
actions idx get aload pop /act exch def
/drop act eq
{
- aload pop setrgbcolor pop
- /rad exch sqrt def /Cy exch def /Cx exch def
- /eps 0.005 scl sqrt rad mul acnt idx sub 1 add log mul div def
+ pop pop aload pop setrgbcolor pop
+ /Rad exch sqrt def /Cy exch def /Cx exch def
+ /eps 0.005 scl sqrt Rad mul acnt idx sub 1 add log mul div def
- rad Cx add Cy composite-map moveto
- rad 0
+ Rad Cx add Cy composite-map moveto
+ Rad 0
{
dup /oy exch def
Minsky-circle 2 copy
@@ -415,10 +519,51 @@
res
} bind def
-/shade % v[3] pwr
+/do-tint % v[3] pwr
{
+ /pwr exch 2 exch sub def
+ { dup 1e-30 lt {} {pwr exp} ifelse } Vmap1
+} bind def
+/do-shade % v[3] pwr
+{
+ /pwr exch 2 exch sub def
+ { 1 exch sub dup 1e-30 lt {} {pwr exp} ifelse 1 exch sub } Vmap1
+} bind def
+
+/paper-shading % v[3] pwr
+{
+ % /pwr exch def
+ % {dup 1e-30 lt {} {pwr exp} ifelse} Vmap1
/pwr exch def
- {dup 1e-30 lt {} {pwr exp} ifelse} Vmap1
+ paper
+ {
+ /c2 exch def
+ /c1 exch def
+ % c2 pwr mul c1 2 pwr sub mul add 2 div
+ c2 c1 ge
+ { 1 1 c1 c2 div sub dup 1e-30 lt {} {pwr exp} ifelse sub c2 mul }
+ {
+ 1 c1 sub 1 c2 sub div dup
+ 1e-30 lt {} {2 pwr sub exp} ifelse 1 c2 sub mul 1 exch sub
+ } ifelse
+ } Vmap2
+} bind def
+
+% Exposed to user
+/tint % v[3] pwr
+{
+ dup 0 lt
+ { neg exch color-norm exch do-shade }
+ { exch color-norm exch do-tint }
+ ifelse
+} bind def
+% Exposed to user
+/shade % v[3] pwr
+{
+ dup 0 lt
+ { neg exch color-norm exch do-tint }
+ { exch color-norm exch do-shade }
+ ifelse
} bind def
/sharpen % 0<=x<=1
@@ -436,7 +581,9 @@
actions cdx get aload pop /ct exch def
ct /drop eq
% movement due to drop.
- { % px py cx cy rad^2 bgc rgb
+ { % px py cx cy rad^2 bgc rgb sr^-2 gc
+ /gc exch def
+ /sr^-2 exch def
/rgb exch def
/bgc exch def
/rad^2 exch def
@@ -446,12 +593,17 @@
/disc a^2 1e-10 lt {0} {1 rad^2 a^2 div sub} ifelse def
disc 0 le
{
- disc -0.001 le
- {rgb}
+ rgb gc 0 ne
+ {
+ e a^2 sr^-2 mul exp gc mul paper-shading
+ }
+ if
+ disc -0.001 gt
{
/a disc neg sqrt sharpen def
- rgb bgc {1 a sub mul exch a mul add} Vmap2}
- ifelse
+ bgc {1 a sub mul exch a mul add} Vmap2
+ }
+ if
exit
}
{
@@ -466,6 +618,61 @@
} loop
} bind def
+% At this point, fx and fy contain the raster coordinates;
+% [ r g b ] is on top of the stack.
+/do-shadings
+{
+ /scnt shadings length def
+ scnt 0 gt
+ {
+ 0 1 scnt -1 add
+ {
+ /idx exch def
+ shadings idx get aload pop /ct exch def
+ ct /jiggle-shade eq
+ {
+ % [ dx dy freq ofst major mf mdls pw ]
+ /pw exch def
+ /mdls exch def
+ /mf exch def
+ /major exch def
+ /ofst exch def
+ /freq exch def
+ /dy exch def /dx exch def
+ /a fy dx mul fx dy mul add ofst add mdls symmod def
+ /af a freq mul def
+ mf 0 ne
+ {
+ g_1
+ freq mul cos mf mul 1 add 0 max paper-shading
+ } if
+ }
+ {
+ ct /wriggle-shade eq
+ {
+ % [ cx cy freq ofst major mf mdls pw ]
+ /pw exch def
+ /mdls exch def
+ /mf exch def
+ /major exch def
+ /ofst exch def
+ /freq exch def
+ /cy exch def /cx exch def
+ /a fx cx sub dup mul fy cy sub dup mul add sqrt
+ ofst add mdls symmod def
+ /af a freq mul def
+ mf 0 ne
+ {
+ g_1
+ freq mul cos mf mul 1 add 0 max paper-shading
+ } if
+ }
+ {(unrecognized shade token) = ct =} ifelse
+ } ifelse
+ } for
+ } if
+} bind def
+
/do-raster
{
/sampleover 1 oversample div def
@@ -478,13 +685,9 @@
/ix exch def
/fx ix scl div def
fx fy actions2rgb
- % color modifications
- % fy dup mul fx dup mul add sqrt dup
- % riplim lt
- % {180. ripple div mul sin abs .75 mul 1 exch sub shade}
- % {pop}
- % ifelse
- % end color modifications
+
+ do-shadings % color modifications
+
aload pop setrgbcolor
newpath ix iy moveto sampleover 0 rlineto
0 sampleover rlineto sampleover neg 0 rlineto closepath FILL
@@ -492,13 +695,15 @@
} for
} bind def
-% [ cx cy rad^2 [ bgc ] [ rgb ] /drop ]
+% [ cx cy rad^2 bgc rgb sr^-2 gc /drop ]
% [ cx cy [ r ] th L^-1 /stir ]
% [ cx cy circ t /vortex ]
% [ bx by ex ey L tU rpts nx ny stpx stpy /stylus ]
% [ dx dy [ rs ] V tU L^-1 /rake ]
-% [ dx dy period ofst depth /wiggle ]
+% [ dx dy freq ofst [trv] major minor mf mdls pw /jiggle ]
+% [ cx cy freq major minor mf mdls pw /wriggle ]
% [ dx dy /offset ]
+% [ cx cy [trv] /turn ]
/concatstrings % (a) (b) -> (ab)
{ exch dup length
@@ -518,7 +723,13 @@
rgb 256 mod 255 div
] def
} if
- rgb {1 gt} forall or or { [ rgb {255 div} forall ] } { rgb } ifelse
+ rgb length 2 eq
+ { [ rgb aload pop color-norm ] }
+ {
+ rgb {1 gt} forall or or { [ rgb {255 div} forall ] } { rgb } ifelse
+ {1e-9 max 0.999 min} Vmap1
+ }
+ ifelse
} bind def
/color-norm*
@@ -528,13 +739,26 @@
[ clr* {color-norm} forall ]
} bind def
-/drop % cx cy rad^2 rgb
+/edgy-color
{
- /rgb exch def
+ exch color-norm 2 array astore
+} bind def
+
+/drop % cx cy rad rgb
+{
+ /rgb exch color-norm def
/rad^2 exch .001 mul dup mul def
/cy exch .001 mul def
/cx exch .001 mul def
- [ cx cy rad^2 -1 rgb color-norm /drop ]
+ /es rgb length 2 eq { rgb 0 get } { 0 } ifelse def
+ % [ cx cy rad^2 bgc rgb sr^-2 gc /drop ]
+ [ cx cy
+ rad^2
+ -1 % bgc
+ rgb length 2 eq { rgb 1 get } { rgb } ifelse % rgb
+ es rad^2 div % sr^-2
+ es 0 gt { e es exp 1 sub es div e es exp div } { 1 } ifelse % gc
+ /drop ]
} bind def
/vortex % cx cy circ tcoef
@@ -587,18 +811,105 @@
/wiggle % angle period ofst depth
{
- dup numeric?
- {
- /depth exch def
- /ofst exch def
- /period exch def
- /ang exch 90 sub def
- [ ang cos-sin exch
- 1000 360 div period mul
- ofst
- depth 1e-3 mul oversample 0 gt {neg} if /wiggle ] }
- { /wiggle 3 array astore }
- ifelse
+ /depth exch def
+ /ofst exch 90 add def
+ /period exch 360 dup mul exch div def
+ /ang exch def
+ ang period ofst 0.75 div depth 2 mul 0 exch jiggle
+} bind def
+
+/jiggle % angle period ofst major minor
+{
+ /minor exch -0.5e-3 mul def
+ /major exch 0.5e-3 mul def
+ /ofst exch 1e-3 mul def
+ /period exch def
+ /freq 360e3 period div def
+ /ang exch def
+ /mf oversample 0 le { 0 } { major freq mul pio180 mul } ifelse def
+ /pw 4 3 div 1 mf abs add div def
+ % [ dx dy freq ofst [trv] major minor mf mdls pw ]
+ [ ang cos-sin % dx, dy
+ freq
+ ofst
+ mf 0 ne
+ { [ ang cos-sin exch 2 copy neg exch ] }
+ { [ ang cos-sin major mul exch major mul
+ ang cos-sin minor mul exch minor mul
+ neg exch ] }
+ ifelse % [ trv ]
+ major
+ minor
+ mf
+ 360 freq div abs % mdls
+ pw
+ /jiggle ]
+} bind def
+
+/wriggle % cx cy period major minor
+{
+ /minor exch -0.5 mul def % is angular range
+ /major exch 0.5e-3 mul def
+ /period exch def
+ /freq 360e3 period div def
+ /cy exch 1e-3 mul def /cx exch 1e-3 mul def
+ /mf oversample 0 le { 0 } { major freq mul pio180 mul } ifelse def
+ /pw 4 3 div 1 mf abs add div def
+ % [ cx cy freq major minor mf mdls pw ]
+ [ cx
+ cy
+ freq
+ major
+ minor
+ mf
+ 360 freq div abs % mdls
+ pw
+ /wriggle ]
+} bind def
+
+/wriggle-shade % cx cy period ofst major
+{
+ /major exch 0.5e-3 mul def
+ /ofst exch 1e-3 mul def
+ /period exch def
+ /freq 360e3 period div def
+ /cy exch 1e-3 mul def /cx exch 1e-3 mul def
+ /mf major freq mul pio180 mul def
+ /pw 4 3 div 1 mf abs add div def
+ % [ cx cy freq ofst major mf mdls pw ]
+ [ cx
+ cy
+ freq
+ ofst
+ major
+ mf
+ 360 freq div abs % mdls
+ pw
+ /wriggle-shade ]
+} bind def
+
+/jiggle-shade % angle period ofst major
+{
+ /major exch 0.5e-3 mul def
+ /ofst exch 1e-3 mul def
+ /period exch def
+ /freq 360e3 period div def
+ /ang exch def
+ /mf major freq mul pio180 mul def
+ /pw 4 3 div 1 mf abs add div def
+ % [ dx dy freq ofst major mf mdls pw ]
+ [ ang cos-sin % dx, dy
+ freq
+ ofst
+ major
+ mf
+ 360 freq div abs % mdls
+ pw
+ /jiggle-shade ]
+} bind def
+/shading % angle period ofst major
+{
+ jiggle-shade
} bind def
/shift % angle r
@@ -610,6 +921,19 @@
[ dx dy /offset ]
} bind def
+/turn % cx cy angle
+{
+ /th exch def
+ /cy exch .001 mul def
+ /cx exch .001 mul def
+ % [ cx cy [ trv ] ]
+ [ cx
+ cy
+ [ th oversample 0 gt {neg} if neg cos-sin 2 copy neg exch cx cy ]
+ /turn
+ ]
+} bind def
+
/concentric-rings % xc yc thick [ color ] count
{
/cnt exch def
@@ -741,15 +1065,30 @@
/cnt exch def
/clra exch color-norm* def
/eccentricity exch sqrt def
+ /angle exch def
+ /r exch 2 mul def
+ /yc exch def
+ /xc exch def
+ xc yc
+ r eccentricity div r eccentricity mul
+ angle clra cnt drad normal-drops
+} bind def
+
+/normal-drops % xc yc L_x L_y angle [ rgb ] cnt drad
+{
+ /drad exch def
+ /cnt exch def
+ /clra exch color-norm* def
/angle exch neg def
- /r exch 2 sqrt div def
+ /R_y exch 8 sqrt div def
+ /R_x exch 8 sqrt div def
/yc exch def
/xc exch def
/nclr clra length def
/cdx 0 def
cnt
{
- random:normal2 eccentricity div r mul exch eccentricity mul r mul
+ random:normal2 R_x mul exch R_y mul
[ angle cos-sin 2 copy neg exch xc yc ] transform
drad clra cdx nclr mod get drop
/cdx cdx 1 add def
@@ -758,28 +1097,47 @@
/Gaussian-spray % xc yc r angle eccentricity [ rgb ] cnt drad
{
- /Gaussian-spray 9 array astore
+ /drad exch def
+ /cnt exch def
+ /clra exch color-norm* def
+ /eccentricity exch sqrt def
+ /angle exch def
+ /r exch 2 mul def
+ /yc exch def
+ /xc exch def
+ xc yc
+ r eccentricity div r eccentricity mul
+ angle clra cnt drad 1 3 div exp normal-spray
+} bind def
+
+/normal-spray % xc yc L_x L_y angle [ rgb ] cnt drad
+{
+ /normal-spray 9 array astore
} bind def
-/Gaussian-spray-do % xc yc r angle eccentricity [ rgb ] cnt drad
+/normal-spray-do % xc yc L_x L_y angle [ rgb ] cnt drad
{
/drad exch def
/cnt exch def
/clra exch color-norm* def
- /eccentricity exch sqrt def
/angle exch neg def
- /r exch 2 sqrt div def
- /yc exch def
- /xc exch def
+ /R_y exch 8 sqrt div .001 mul def
+ /R_x exch 8 sqrt div .001 mul def
+ /yc exch .001 mul def
+ /xc exch .001 mul def
/nclr clra length def
/cdx 0 def
cnt
{
- random:normal2 eccentricity div r mul exch eccentricity mul r mul
+ % random:normal2 eccentricity div r mul exch eccentricity mul r mul
+ random:normal2 R_x mul exch R_y mul
[ angle cos-sin 2 copy neg exch xc yc ] transform
+ /fy exch def /fx exch def
+ clra cdx nclr mod get
+ do-shadings aload pop setrgbcolor
newpath
- clra cdx nclr mod get aload pop setrgbcolor
- e random:normal2 pop drad log 3 mul add 3 div exp 0 360 arc fill
+ fx 1000 mul fy 1000 mul
+ e random:normal2 pop drad log 9 mul add 3 div exp 0 360 arc fill
/cdx cdx 1 add def
} repeat
} bind def
@@ -817,10 +1175,10 @@
/cnt exch def
/clra exch color-norm* def
/angle exch neg def
- /ysid exch def
- /xsid exch def
- /yc exch def
- /xc exch def
+ /ysid exch .001 mul def
+ /xsid exch .001 mul def
+ /yc exch .001 mul def
+ /xc exch .001 mul def
/nclr clra length def
/cdx 0 def
cnt
@@ -828,9 +1186,12 @@
random:uniform 0.5 sub xsid mul
random:uniform 0.5 sub ysid mul
[ angle cos-sin 2 copy neg exch xc yc ] transform
+ /fy exch def /fx exch def
+ clra cdx nclr mod get
+ do-shadings aload pop setrgbcolor
newpath
- clra cdx nclr mod get aload pop setrgbcolor
- e random:normal2 pop drad log 3 mul add 3 div exp 0 360 arc fill
+ fx 1000 mul fy 1000 mul
+ e random:normal2 pop drad log 9 mul add 3 div exp 0 360 arc fill
/cdx cdx 1 add def
} repeat
} bind def
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-marble/pst-marble.tex new/tex/generic/pst-marble/pst-marble.tex
--- old/tex/generic/pst-marble/pst-marble.tex 2019-02-27 22:55:03.000000000 +0100
+++ new/tex/generic/pst-marble/pst-marble.tex 2019-05-02 23:11:11.000000000 +0200
@@ -25,8 +25,8 @@
\let \PSTMARBLELoaded\endinput
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey.tex\fi
-\def\fileversion{1.4}
-\def\filedate{2019/02/25}
+\def\fileversion{1.6}
+\def\filedate{2019/03/20}
\message{`PST' v\fileversion, \filedate}
%
\pstheader{pst-marble.pro}
@@ -34,12 +34,14 @@
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-marble}
\define@key[psset]{pst-marble}{background}{\def\pst@marble@background{#1 }}
+\define@key[psset]{pst-marble}{paper}{\def\pst@marble@paper{#1 }}
\define@key[psset]{pst-marble}{viscosity}{\def\pst@marble@visc{#1 }}
\define@key[psset]{pst-marble}{oversample}{\def\pst@marble@oversample{#1 }}
\define@key[psset]{pst-marble}{overscan}{\def\pst@marble@overscan{#1 }}
\define@key[psset]{pst-marble}{seed}{\def\pst@marble@seed{#1}}
\define@key[psset]{pst-marble}{actions}{\def\pst@marble@actions{#1 }}
\define@key[psset]{pst-marble}{spractions}{\def\pst@marble@spractions{#1 }}
+\define@key[psset]{pst-marble}{shadings}{\def\pst@marble@shadings{#1 }}
% colors are red, green, and blue components between 0 and 1.
\define@key[psset]{pst-marble}{colors}{\def\pst@marble@colors{#1 }}
\define@boolkey[psset]{pst-marble}[Pst@]{drawcontours}[true]{}
@@ -49,6 +51,9 @@
background={
[1 1 1]
},
+ paper={
+ [1 1 1]
+ },
colors={
[0.275 0.569 0.796]
[0.965 0.882 0.302]
@@ -66,14 +71,15 @@
overscan=1,
actions={0 0 36 colors 35 concentric-rings},
spractions={},
+ shadings={},
drawcontours=false,
bckg=true
}
\psset[pstricks]{shapealpha=1}
-\def\psMarble{\def\pst@par{}\pst@object{psMarble}}
-\def\psMarble@i{\@ifnextchar({\psMarble@ii}{\psMarble@iii(-5,-5)(5,5)}}
-\def\psMarble@ii(#1,#2){\@ifnextchar({\psMarble@iii(#1,#2)}{\psMarble@iii(#1 -0.5 mul, #2 -0.5 mul)(#1 0.5 mul,#2 0.5 mul)}}
-\def\psMarble@iii(#1,#2)(#3,#4){
+\def\psMarble{\pst@object{psMarble}}
+\def\psMarble@i(#1,#2){
+\@ifnextchar({\psMarble@ii(#1,#2)}{\psMarble@ii(#1 -0.5 mul, #2 -0.5 mul)(#1 0.5 mul,#2 0.5 mul)}}
+\def\psMarble@ii(#1,#2)(#3,#4){
\begin@SpecialObj
\addto@pscode{
plotdict begin
@@ -81,6 +87,7 @@
/STROKE {\pst@number\pslinewidth 1000 div SLW \tx@setStrokeTransparency \tx@setBlendmode systemdict /stroke get exec} def
/cm {\pst@number\psunit mul } bind def
/background \pst@marble@background color-norm def
+/paper \pst@marble@paper color-norm def
/colors [\pst@marble@colors] def
/seed (\pst@marble@seed) rc4setkey def
/lox #1 cm cvi def
@@ -94,6 +101,8 @@
/acnt actions length def
/spractions [\pst@marble@spractions] def
/pcnt spractions length def
+/shadings [\pst@marble@shadings] def
+/scnt shadings length def
\ifPst@drawcontours /Contours {STROKE} def \else /Contours {FILL} def \fi
gsave
\ifPst@bckg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-marble/pst-marble.sty new/tex/latex/pst-marble/pst-marble.sty
--- old/tex/latex/pst-marble/pst-marble.sty 2019-02-27 22:55:03.000000000 +0100
+++ new/tex/latex/pst-marble/pst-marble.sty 2019-05-02 23:11:11.000000000 +0200
@@ -1,11 +1,11 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-marble}[2019/02/25 package wrapper for PSTricks pst-marble.tex]
+\ProvidesPackage{pst-marble}[2019/02/18 package wrapper for PSTricks pst-marble.tex]
\input pst-marble.tex
\ProvidesFile{pst-marble.tex}
[\filedate\space v\fileversion\space `PST-marble']
\IfFileExists{pst-marble.pro}{
\ProvidesFile{pst-marble.pro}
- [2019-02-25 v. 1.4, PostScript prologue file]
+ [2019-02-26 v. 1.6, PostScript prologue file]
\(a)addtofilelist{pst-marble.pro}}{}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-marble.tlpobj new/tlpkg/tlpobj/pst-marble.tlpobj
--- old/tlpkg/tlpobj/pst-marble.tlpobj 2019-02-28 04:02:08.000000000 +0100
+++ new/tlpkg/tlpobj/pst-marble.tlpobj 2019-05-03 01:40:29.000000000 +0200
@@ -1,16 +1,16 @@
name pst-marble
category Package
-revision 50146
-shortdesc A PSTricks package to draw marble-like pattern
+revision 50925
+shortdesc A PSTricks package to draw marble-like patterns
relocated 1
-longdesc This is a PSTricks package to draw marble-like pattern.
-runfiles size=8
+longdesc This is a PSTricks package to draw marble-like patterns.
+runfiles size=10
RELOC/dvips/pst-marble/pst-marble.pro
RELOC/tex/generic/pst-marble/pst-marble.tex
RELOC/tex/latex/pst-marble/pst-marble.sty
catalogue-contact-home http://people.csail.mit.edu/jaffer/Marbling/How-To
catalogue-ctan /graphics/pstricks/contrib/pst-marble
-catalogue-date 2019-02-26 22:16:24 +0100
+catalogue-date 2019-05-01 21:41:19 +0200
catalogue-license lppl1.3c
-catalogue-topics graphics-use pstricks
-catalogue-version 1.4
+catalogue-topics graphics graphics-use pstricks
+catalogue-version 1.6
++++++ pst-node.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/Changes new/doc/generic/pst-node/Changes
--- old/doc/generic/pst-node/Changes 2019-03-03 23:13:20.000000000 +0100
+++ new/doc/generic/pst-node/Changes 2020-04-12 00:54:50.000000000 +0200
@@ -1,4 +1,5 @@
----- pst-node.tex
+1.42a 2020-04-01 - fix typo in the documentation
1.42 2019-03-03 - bugfix for \rnode inside \psframebox*
1.41 2017-12-30 - added \psnpolygon
1.40a 2017-12-14 - modified documentation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/README new/doc/generic/pst-node/README
--- old/doc/generic/pst-node/README 2019-03-03 23:13:20.000000000 +0100
+++ new/doc/generic/pst-node/README 2020-04-12 00:54:50.000000000 +0200
@@ -4,10 +4,6 @@
Save the files pst-node.sty|.tex|.pro in a directory, which is part of your
local TeX node. Then do not forget to run texhash to update this node
if these packages are new to your TeX distribution.
-For more information see the documentation of your LaTeX distribution
-on installing packages into your LaTeX distribution or the
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
pst-node needs pstricks, which should be part of your
local TeX installation, otherwise get it from a CTAN server, f.ex.
@@ -20,3 +16,5 @@
%% 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.
+
+hvoss(a)tug.org
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/psmatrix-docDE.bib new/doc/generic/pst-node/psmatrix-docDE.bib
--- old/doc/generic/pst-node/psmatrix-docDE.bib 2013-09-19 00:21:57.000000000 +0200
+++ new/doc/generic/pst-node/psmatrix-docDE.bib 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-@Manual{pstricks2007,
- Title = {PSTricks - {\PS} macros for Generic TeX. Version 1.5},
- Author = {Timothy Van Zandt},
- Organization = {},
- Address =
- {\url{http://www.tug.org/tex-archive/graphics/pstricks/base/doc/pst-user.pdf}},
- Note = {},
- year = 2007,
-}
-
-
-@Manual{siart,
- Title = {Befehls\"ubersicht f\"ur \texttt{PSTricks} (Version
- 0.93},
- Author = {Uwe Siart},
- Organization = {},
- Address =
- {\url{http://www.siart.de/typografie/pstricks-referenz.pdf}},
- Note = {},
- year = 2009,
-}
-
-
-
-
-@Book{PSTricks2,
- author = {Herbert Vo\ss},
- title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {fünfte},
- publisher = {DANTE -- Lehmanns},
- year = {2008},
- address = {Heidelberg/Hamburg}
-}
-
-
Binary files old/doc/generic/pst-node/psmatrix-docDE.pdf and new/doc/generic/pst-node/psmatrix-docDE.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/psmatrix-docDE.tex new/doc/generic/pst-node/psmatrix-docDE.tex
--- old/doc/generic/pst-node/psmatrix-docDE.tex 2017-12-30 23:43:07.000000000 +0100
+++ new/doc/generic/pst-node/psmatrix-docDE.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,1155 +0,0 @@
-%% $Id: psmatrix-docDE.tex 696 2017-12-30 19:01:07Z herbert $
-\listfiles
-\documentclass[11pt,ngerman,a4paper,BCOR10mm,DIV12,bibliography=totoc,parskip,smallheadings,
- headexclude,footexclude,oneside]{pst-doc}
-\usepackage[utf8]{inputenc}
-\usepackage{babel}
-
-%\setlength{\parindent}{0pt}
-%\setlength{\parskip}{1ex plus 0.2ex minus 0.1ex}
-
-\usepackage{pst-node,pst-grad,pstricks-add,pst-blur,float}
-\def\tab#1{\tabular{@{}l@{}}#1\endtabular}
-\def\OptEinh{\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Einheit}}\kern1pt}
-
-\let\myFV\fileversion
-
-\usepackage{tabularx}
-\usepackage{longtable}
-
-\addbibresource{\jobname.bib}
-
-
-\lstset{explpreset={pos=l,rframe=},frame=,backgroundcolor=\color{white},literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
- {Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
- {ß}{\ss}1}
-
-
-\usepackage{bibgerm}
-
-%\psset{subgriddiv=0,gridlabels=7pt,gridcolor=black!15}
-%\hypersetup{pdfauthor={Christine Roemer},pdftitle={psmatrix}}
-%
-\def\bgImage{\hspace*{1cm}%
-\begin{psmatrix}[colsep=0.8cm,rowsep=0.4cm,mcol=c,emnode=r]
- & & semantische Ebene & &
- \psshadowbox[framearc=0.25]{Bedeutung}\\
- & & morphologische Ebene & & \\
-[name=A]\tab{pragmatische\\Ebene} & [name=B]& & & \\
- & & syntaktische Ebene & & \\
- & & \tab{phonetisch-phonologische Ebene\\graphische Ebene}
- & & \psshadowbox[framearc=0.25]{Formativ}
-\end{psmatrix}
-\psset{nodesep=3pt,arrowscale=1.5,arrows=->,
- armA=6mm,angleB=180}
-\ncline{A}{B}
-\ncangles{A}{1,3} \ncangles{A}{2,3}
-\ncangles{A}{4,3} \ncangles{A}{5,3}
-\ncline{1,3}{1,5} \ncline{5,3}{5,5}
-\ncline{<->}{1,5}{5,5}%
-}
-
-\lstset{basicstyle=\ttfamily\footnotesize}
-
-\begin{document}
-\author{Timothy van Zandt\\Herbert Vo\ss}
-\docauthor{Christine R\"omer}
-\date{\today}
-\title{Schematische \"Ubersichten mit \texttt{psmatrix}}
-
-\maketitle%
-
-\tableofcontents
-
-\clearpage
-\begin{abstract}
-Mit der
-\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} k\"onnen au{\ss}erhalb
-einer mathematischen
-Umgebung vielfältige schematische \"Ubersichten gesetzt werden. Das Makro \texttt{psmatrix}
-wird nicht extra geladen. Es ist in verschiedene Pakete des
-PSTricks-Verbundes\index{PSTricks-Verbund}
-(\texttt{pstricks,\\pst-node,pst-grad})\index{pstricks@\texttt{pstricks}}
-\index{pst-node@\texttt{pst-node}} \index{pst-grad@\texttt{pst-grad}} integriert
- und wird mit ihnen aufgerufen.
-
-\vfill\noindent
-Danke f\"ur die Unterst\"utzung bei der Erstellung dieser Dokumentation an Herbert Vo\ss.
-\end{abstract}
-
-
-\section{Einf\"uhrung}
-
-Mit der
-\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} k\"onnen
-au{\ss}erhalb einer mathematischen
-Umgebung schematische \"Ubersichten gesetzt werden. Sie basiert auf dem
-Tabellenmakro \texttt{array}\index{array@\texttt{array}} und gleicht ihm deshalb in der
-Syntax. Es hat jedoch nicht dessen
-Einschr\"ankungen bez\"uglich Verbindungen über die Zellen und Zeilen hinweg. Das Makro
-\texttt{psmatrix}
-wird nicht extra geladen. Es ist in verschiedene Pakete des
-PSTricks-Verbundes\index{PSTricks-Verbund}
-(\texttt{pstricks,\\pst-node,pst-grad})\index{pstricks@\texttt{pstricks}}
-\index{pst-node@\texttt{pst-node}} \index{pst-grad@\texttt{pst-grad}} integriert und
-wird mit ihnen aufgerufen.
-
-\section{Erstellen einer Matrix}
-\subsection{Einordnung}
-
-Das Makro \bs{\texttt{psmatrix}} arbeitet sowohl in einer \TeX - als auch
-\LaTeX-Umgebung:
-
-\begin{BDef}
-\Lcs{psmatrix}\OptArgs \ldots\ \Lcs{endpsmatrix} & \% TeX-Version\\
-\LBEG{psmatrix}\OptArgs \ldots \ \LEND{psmatrix} & \% LaTeX-Version
-\end{BDef}
-
-Da mit der \TeX-Version einige Einschr\"ankungen verbunden sind, wird nur auf
-die \LaTeX-Variante eingegangen. Das Grundprinzip des Strukturaufbaus
-stellt eine Knoten- und Knotenverbindungszuordnung dar. Diese kann mehrfach
-geschachtelt und sowohl bei der Knotenbelegung als auch
-Verbindungsdarstellung in verschiedener Weise ausgestalltet werden. Dazu
-stellt der PSTricksverbund zahlreiche Makros bereit.
-
-\subsection{Matrixgrundstruktur}\index{Matrixgrundstruktur}
-
-Die Knoten werden in der Art einer Tabelle innerhalb der
-\texttt{psmatrix}-Umgebung\index{psmatrix@\texttt{psmatrix}-Umgebung} angeordnet.
-
-\begin{LTXexample}[width=.3\linewidth]
-\begin{psmatrix}[rowsep=0.2cm]
-1 & 2 & 3 \\
-X & Y & Z
-\end{psmatrix}
-\end{LTXexample}
-
-
-\section{Zuordnung Knoten zu Verbindungen}
-
-Die Matrix entsteht durch die Zuordnung von Knoten zu Verbindungen. Die
-Knoten werden in die Zellen in der \texttt{psmatrix}-Umgebung eingetragen
-(siehe obiges Beispiel). Nach \bs{\texttt{end}}\{\texttt{psmatrix}\} werden die gew\"unschten
-Linien definiert. Grunds\"atzlich geschieht dies nach dem Schema
-
-\psframebox{\bs
-nc\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Verbindung}}
-[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
-\{Koordinaten ZelleA\}\{Koordinaten ZelleB\}}
-
-Die Koordinaten\index{Zellen-Koordinaten} werden, wenn den Zellen keine
-Namen gegeben werden (siehe
-Parameter \texttt{name}),
-durch abz\"ahlen gewonnen: jeweils erst die Zeile und danach durch Komma abgetrennt
-die Zelle.
-
-\vspace{4mm}
-\begin{LTXexample}[width=.3\linewidth]
-\begin{psmatrix}[rowsep=0.2cm]
-1 & 2 & 3 \\
-X & Y & Z
-\end{psmatrix}
-\ncline[linecolor=red]{1,1}{2,2}
-\ncline[linecolor=green]{1,3}{2,2}
-\ncline[linestyle=dotted]{<-}{1,2}{2,1}
-\ncline[linestyle=dashed]{->}{1,2}{2,3}
-\end{LTXexample}
-
-
-\section{Knotenparameter}
-\subsection{mnode}\index{mnode@\texttt{mnode}}
-
-Der Parameter \texttt{mnode=<Knotenart>} legt die Knotenart fest. Das kann lokal für
-einzelne Knoten oder global für die ganze Matrix erfolgen (siehe folgende
-Beispiele). Dazu muss neben
-dem Paket \texttt{pstricks}\index{pstricks@\texttt{pstricks}} auch
-\texttt{pst-node}\index{pst-node@\texttt{pst-node}} geladen werden.
-
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm]
-1 & 2 \\
-X & Y
-\end{psmatrix}
-\end{LTXexample}
-
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm]
-1 & 2 \\
-[mnode=dia] X & Y
-\end{psmatrix}
-\end{LTXexample}
-
-Folgende \textbf{Knotenarten}\index{Knotenarten} stehen zur Verf\"ugung. Ihr Aufruf erfolgt mit
-\texttt{mnode=} über die in Klammern angegebenen K\"urzel.
-
-\begin{compactitem}
- \item \texttt{Rnode} (R):\index{Rnode@\texttt{Rnode} (R)}
- Es wird damit das Eingetragene zur Basislinie
- positioniert. Mittels Optionen kann dies variiert werden.
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[rowsep=0.2cm,linecolor=blue,radius=0.5]
-X & [mnode=R,vref=0pt] Y
-\end{psmatrix}
-\ncline{1,1}{1,2}
-\end{LTXexample}
-
-\item \texttt{Cnode} (C):\index{Cnode@\texttt{Cnode} (C)} Ungef\"ullte Kreise werden gesetzt.
-Deren Radius mit dem Parameter \texttt{radius}\index{radius@\texttt{radius}} modifiziert
-werden kann. Es muss irgendetwas eingetragen werden, was dann aber nicht erscheint.
-\vspace{2mm}
-\begin{LTXexample}[width=.3\linewidth]
-\begin{psmatrix}[mnode=C,rowsep=0.2cm,linecolor=blue,radius=0.5]
- X & Y
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-\item \texttt{pnode} (p):\index{pnode@\texttt{pnode} (p)} Ein Knoten mit dem Radius Null, ein
-leerer Knoten (siehe folgendes Beispiel, wo der Knoten 1 leer gesetzt wird).
-
-\item \texttt{Circlenode}
-(Circle):\index{Circlenode@\texttt{Circlenode} (Circle)} Ein Knoten, der von einem Kreis
-umschlossen
-wird, dessen Umfang richtet sich nach dem Inhalt. Er kann mit der Option
-\texttt{radius} modifiziert werden (siehe obiges Beispiel).
-
-\vspace{2mm}
-\begin{LTXexample}[width=.42\linewidth]
-\begin{psmatrix}[mnode=Circle,radius=1cm,rowsep=0.2cm]
- X & Y \\
-[mnode=p] 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-\item \texttt{dianode} (dia):\index{dianode@\texttt{dianode} (dia)} Ein Knoten, der von
-einer Raute umschlossen
-wird, deren Umfang richtet sich nach dem Inhalt
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=dia,rowsep=0.2cm,colsep=0.7cm]
- X & Y \\
- 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-\item \texttt{dotnode} (dot):\index{Rnode@\texttt{dotnode} (dot)} Es wird im unmarkierten
-Fall ein gef\"ullter Kreisknoten gesetzt, der
-u.\,a. \"uber den Parameter \texttt{dotscale} gesteuert
-werden kann.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=dot,rowsep=0.2cm]
-[mnode=dot,dotscale=3] X & Y \\
-[mnode=dot,dotscale=2,dotstyle=triangle]1&2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-\item \texttt{rnode} (r):\index{Rnode@\texttt{rnode} (r)}
-Unterscheidet sich von \bs{rnode} (R) in der
-Festlegung des Knotenzentrums, das ohne optionale Parameter das Zentrum
-der umgebenden Box ist. Eingesetzter "`Text"' erscheint pur.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=r,rowsep=0.2cm]
- X & Y \\
- 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-
-
-\item \texttt{fnode} (f):\index{fnode@\texttt{fnode} (f)} Ein leerer
-Rahmen, dessen Gr\"o{"s}e \"uber
-\texttt{framesize=} und
-Koordinatenfestlegungen beeinflusst werden kann.%\footnote{Diese Funktion
-%ist bisher nur eingeschr\"ankt nutzbar, die K\"astchen einer Zeile werden nicht getrennt.
-%Mit "`Text"' gef\"ullte K\"astchen k\"onnen einfach mit \bs{\texttt{fbox}\{
-%\}} oder \bs{\texttt{psframebox}\{ \}} gesetzt werden.}
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=f,rowsep=0.2cm]
- X & Y \\
- 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-
-\item \texttt{circlenode}
-(circle):\index{circlenode@\texttt{circlenode} (circle)} Entspricht
-weitgehend \texttt{Circlenode}. Es
-kann aber nicht der Radius ge\"andert werden.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=circle,rowsep=0.2cm,colsep=1cm]
- X & Y \\
- 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-\item \texttt{ovalnode} (oval):\index{ovalnode@\texttt{ovalnode} (oval)} Ovaler Knoten,
-dessen Gr\"o"se aus dem Inhalt resultiert.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=oval,rowsep=0.2cm,colsep=0.7cm]
- XX & YY \\
- 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-
-\item \texttt{trinode} (tri):\index{trinode@\texttt{trinode} (tri)}
-Dreieck, dessen Gr\"o"se aus dem Inhalt resultiert.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[mnode=tri,rowsep=0.2cm,colsep=0.7cm]
- X & Y \\
- 1 & 2
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-Mit der Option \texttt{trimode}\index{trimode@\texttt{trimode}} kann die Lage der Dreiecke verändert
-werden. Die Sternversion verkleinert die Basis und erzeugt aus
-stumpfwinkligen (Winkel zwischen 90 und 180 Grad) spitzwinkelige (kleiner
-als 90 Grad) Dreiecke.
-\vspace{2mm}
-\begin{table}[H]
-\centering
-\caption{Ver\"anderung der Dreieckslage}
-\begin{tabular}{@{}ll@{}}
-Befehl & Lage des Dreiecks \\ \hline
-\texttt{trimode=U} & Spitze oben \\
-\texttt{trimode=D} & Spitze unten \\
-\texttt{trimode=R} & Spitze rechts \\
-\texttt{trimode=L} & Spitze links
-\end{tabular}
-\end{table}
-
-\vspace{2mm}
-\begin{LTXexample}[width=.25\linewidth]
-\begin{pspicture}(0,-2)(3,2)
-\begin{psmatrix}[mnode=tri,rowsep=0.2cm,colsep=0.7cm]
- [trimode=U] Dreieck \\
- [trimode=*D]Dreieck
-\end{psmatrix}
-\end{pspicture}
-\end{LTXexample}
-\vspace{2mm}
-
-
- \item \texttt{no node} (none):\index{no node@\texttt{no node} (none)} Ohne Knoten, was für das
- Einf\"ugen von Verbindungslinien sinnvoll sein kann.
-
-
-\end{compactitem}
-
-
-
-\subsection{emnode}\index{emnode@\texttt{emnode}}
-
-Mit \texttt{emnode} k\"onnen verschiedene Arten (Parameter wie bei
-\texttt{mnode} von Knoten für "`leere"' Zellen gesetzt
-werden. Es muss also nichts in die Zellen eingetragen werden. Wie
-nachfolgendes Beispiel auch belegt, kann es dabei auf der rechten Seite zu
-fehlerhaften Ausgaben kommen, weil
-\bs{pst-node}\index{pst-node@\texttt{pst-node}} da noch nicht v\"ollig korrekt
-arbeitet.
-
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[emnode=circle,rowsep=0.2cm,colsep=2cm]
- & \\
- &
-\end{psmatrix}
-\end{LTXexample}
-\vspace{2mm}
-
-\subsection{nodealign}\index{nodealign@\texttt{nodealign}}
-
-Der Parameter \texttt{nodealign} kann in [\texttt{nodealign=true}]
-abge\"andert werden, um das Zentrum des Knotens auf die Basisebene zu
-verschieben (vgl. \cite[S.\,259]{PSTricks2}).
-
-\section{Parameter zu Zellen und Zeilen}
-
-\subsection{name}\index{name@\texttt{name}}
-
-Der Parameter \texttt{name} erm\"oglicht es, jeder Zelle einen
-selbstgew\"ahlten Namen zu geben, der am Anfang einer Zelle eingef\"ugt werden
-muss. Dies kann beim Setzen von Linien die
-Arbeit erleichtern, man muss dann nicht die Positionen ausz\"ahlen.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=0.4cm,
- rowsep=0.4cm]
- & [name=A] Buch & \\
-[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->}
-\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
-\end{LTXexample}
-\vspace{2mm}
-
-
-Au"serdem ist es \"uber diese Zellenfestlegung m\"oglich, auch \Lcs{pcline} und
-\Lcs{psline} in einer Matrixumgebung zu benutzen. Diese nehmen die
-Koordinatenargumente (hier gleich Zellennamen) aber in runden Klammern, wie
-in dem folgenden Beispiel zu sehen ist.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.45\linewidth]
-\begin{psmatrix}[emnode=r,colsep=1cm,
- rowsep=0.4cm]
-[name=A]Buch \psspan{3} & \\[1cm]
-[name=B]Fachbuch & [name=C]Lehrbuch &
-[name=D]Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->,linecolor=red}
-\psline(A)(C)
-\pcline(A)(B)
-\nbput*[nrot=:D]{\footnotesize \texttt{pcline}}
-\ncline{A}{D}
-\naput*[nrot=:U]{\footnotesize \texttt{ncline}}
-\end{LTXexample}
-
-\Lcs{pcline} geht immer vom Zentrum aus und kann nicht an einer
-Umgebungsbox beginnen oder aufh\"oren. Sie kann deshalb von
-\texttt{nodesep} nicht beeinflusst werden. Andere Parameter --
-beispielsweise \texttt{offset=},\index{offset@\texttt{offset}} der eine vertikale Verschiebung
-erm\"oglicht, -- k\"onnen das aber schon. \Lcs{psline}
-reagiert wiederum darauf nicht.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.3\linewidth]
-\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm]
-[name=A]Fachbuch & \\[1cm]
- & [name=C]Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=<-,linecolor=red,offset=0.3cm}
-\pcline(A)(C)
-\pcline(C)(A)
-\end{LTXexample}
-
-\begin{LTXexample}[width=.3\linewidth]
-\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm]
- [name=A] Fachbuch & \\[1cm]
- & [name=C] Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->,linecolor=red,offset=1cm}
-\psline(A)(C)
-\psline(C)(A)
-\end{LTXexample}
-
-
-
-\subsection{mcol}\index{mcol@\texttt{mcol}}
-
-Mit \texttt{mcol} kann lokal und global der horizontale
-Zellenabstand\index{Zellenabstand!horizontal}
-mit den Optionen \texttt{l,r,c} modifiziert werden.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=0.4cm,
- rowsep=0.4cm,mcol=r]
- & [name=A] Buch & \\
-[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->}
-\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
-\end{LTXexample}
-\vspace{2mm}
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=0.4cm,
- rowsep=0.4cm,mcol=l]
- & [name=A]Buch & \\
-[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->}
-\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
-\end{LTXexample}
-
-\subsection{rowsep und colsep}\index{Abstand!Zellen und Zeilen}
-
-Mit \texttt{rowsep}\index{rowsep@\texttt{rowsep}} kann man den
-vertikalen und mit \texttt{colsep}\index{colsep@\texttt{colsep}}
-den horizontalen Abstand zwischen
-den Zeilen bzw. Zellen regulieren; welchen hinzuf\"ugen oder mit einem
-negativen Wert reduzieren (siehe Beispiele bei \texttt{name}).
-
-\subsection{mnodesize}\index{mnodesize@\texttt{mnodesize}}
-
-Im Defaultfall wird die Breite der Zellen\index{Zelle!Breite} von deren Inhalt bestimmt;
-innerhalb einer Zellenspalte von der mit dem gr\"o"sten Umfang. Mit
-\texttt{mnodesize=} kann allen Spalten dieselbe Breite gegeben werden.
-Dabei ist zu beachten, dass kein automatischen
-Zeilenumbruch\index{Zelle!Zeilenumbruch} in den Zellen
-erfolgt. Man kann in eine Zelle jedoch mehrere Zeilen über eine Tabelle
-einbringen.
-
-\begin{LTXexample}[width=.52\linewidth]
-\begin{psmatrix}[emnode=r,
-colsep=-0.4cm,rowsep=0.6cm,
-mnodesize=3cm]
-& [name=A]
- \begin{tabular}{c}Grafische\\Grundelemente\end{tabular} & \\
-[name=B]Linien & [name=C]Polygone &
-[name=D]Rahmen
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->}
-\ncline{A}{B} \ncline{A}{C}
-\ncline{A}{D}
-\end{LTXexample}
-
-Wenn der von \texttt{mnodesize=} festgelegte Raum nicht ausreichend ist
-erweitert sich einfach die Zelle.
-
-\subsection{psspan}\index{psspan@\texttt{psspan}}
-
-Mit \texttt{psspan\{n\}} k\"onnen Zellen analog zu
-\bs{multicolumn}\index{multicolumn@\texttt{\textbackslash{multicolumn}}} mehrere
-Zellen\index{Zellen!zusammenfassen} zusammengefasst werden.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=0.4cm,
-rowsep=0.4cm]
-[name=A]Buch \psspan{3} & \\
-[name=B]Fachbuch & [name=C]Lehrbuch & [name=D]Roman
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->}
-\ncline{A}{B} \ncline{A}{C} \ncline{A}{D}
-\end{LTXexample}
-
-
-\section{Knotenverbindungen}\index{Knotenverbindung}
-
-Die Knotenverbindungen beginnen in der Regel mit \texttt{nc} und haben die Syntax:
-
-\begin{BDef}
-\bs{Knotenverbindung}\OptArgs\{Pfeile\}\{KnotenA\}\{KnotenB\}
-\end{BDef}
-
-Sie gehen von einem Knoten zu einem anderen, wenn es nicht anders festgelegt
-wurde, ist die Zielorientierung die Knotenmitte.
-
-Die Knotenverbindungen können über eine Reihe von Parametern geändert
-werden (vgl. \cite[S.\,43\,f]{PSTricks2} und \cite{siart}). Einige, die für das Zeichnen von
-Strukturen besonders relevant sind, werden in der nachfolgenden Tabelle
-aufgelistet:\index{Knotenverbindung!Parameter}
-
-\begin{table}[H]
-\centering
-\caption{Parameter f\"ur Knotenverbindungen}
-\begin{tabular}{@{}lll@{}}
-Name & Werte & Vorgabe \\ \hline
-\texttt{linewidth} & <Wert>\OptEinh\ & 0.8pt \\
-\texttt{linecolor} & <Farbe> & black \\
-\texttt{linestyle} & none|solid|dotted|dashed & solid \\
-\texttt{shadow} & <an (true)/aus (false)> & false \\
-\texttt{shadowsize} & <Wert>\OptEinh\ & 3pt \\
-\texttt{shadowangle} & <Winkel> & $-$45 \\
-\texttt{shadowcolor} & <Farbe> & darkgray \\
-\texttt{arrows} & <Pfeiltyp> & -- \\
-\texttt{doubleline} & <true/false> & false
-\end{tabular}
-\end{table}
-
-\subsection{ncline}
-
-Mit \Lcs{ncline} wird eine direkte Linie von einem Knoten zum anderen
-gezogen\footnote{Wenn Sie das nächste Beispiel mit den
-folgenden Beispielen vergleichen, können Sie auch sehen, dass eine bessere
-Positionierung in einer einfachen Box über die Umgebung
-\bs{\texttt{pspicture}}
-m\"oglich ist. Zumal ohne diese Umgebung die Kurvenlinien \"uber die Box
-hinausragen w\"urden, wie dies im ersten Beispiel zu \texttt{ncdiag} der
-Fall ist.}.
-
-\begin{LTXexample}[width=.35\linewidth]
-\begin{psmatrix}[emnode=r,colsep=2cm]
- KnotenX & KnotenY
-\end{psmatrix}
-\ncline[linecolor=red]{1,1}{1,2}
-\end{LTXexample}
-
-
-\subsection{ncarc}\xLcs{ncarc}
-
-Eine Kurve verbindet die Knoten.
-
-\begin{LTXexample}[width=.35\linewidth]
-\begin{pspicture}(0,-0.5)(4,1)
-\begin{psmatrix}[emnode=r,colsep=2cm]
- KnotenX & KnotenY
-\end{psmatrix}
-\ncarc[linecolor=red]{<->}{1,1}{1,2}
-\end{pspicture}
-\end{LTXexample}
-
-Mit der Option \texttt{arcangle=}\index{arcangle@\texttt{arcangle}} kann der
-Steigungswinkel\index{Steigungswinkel} erh\"oht werden.
-
-\begin{LTXexample}[width=.35\linewidth]
-\begin{pspicture}(0,-0.5)(4,1)
-\begin{psmatrix}[emnode=r,colsep=2cm]
- KnotenX & KnotenY
-\end{psmatrix}
-\ncarc[arcangle=60,linecolor=red]{<->}{1,1}{1,2}
-\end{pspicture}
-\end{LTXexample}
-
-In der Sternchenversion wird der von der Kurve eingeschlossenen Raum mit
-der Linienfarbe ausgefüllt.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,-0.5)(4,1)
-\begin{psmatrix}[emnode=r,colsep=2cm]
- KnotenX & KnotenY
-\end{psmatrix}
-\ncarc*[arcangle=60,linecolor=red]{<->}{1,1}{1,2}
-\end{pspicture}
-\end{LTXexample}
-
-
-\subsection{ncdiag}
-
-Mit \Lcs{ncdiag} wird eine Linie in drei Segmente "`zerlegt"'. Man kann
-diese Zerlegung über die Winkelfestlegungen (siehe folgendes Beispiel)
-steuern.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=2cm]
- KnotenX & KnotenY
-\end{psmatrix}
-\ncdiag[angleA=90,angleB=-90,linecolor=red]{<->}{1,1}{1,2}
-\end{LTXexample}
-
-Die Angabe \texttt{arm=0}\index{arm@\texttt{arm}} erzwingt eine gerade Linie.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=2cm]
- KnotenX & KnotenY
-\end{psmatrix}
-\ncdiag[angleA=-90,angleB=90,arm=0,linecolor=red]{<->}{1,1}{1,2}
-\end{LTXexample}
-
-\subsection{ncdiagg}
-
-\Lcs{ncdiagg} ist \Lcs{ncdiag} \"ahnlich. Für den Ausgangsknoten wird aber
-nur eine Verbindung gezeichnet.
-
-\begin{LTXexample}[width=.3\linewidth]
-\usepackage{pstricks-add}
-\begin{pspicture}(-1,-1)(4,6)
- \circlenode{A}{A}\quad\circlenode{C}{C}
- \rput(0,4){\circlenode{B}{B}}
- \rput(1,5){\circlenode{D}{D}}
- {\psset{arrowscale=2,linearc=0.2,
- linecolor=red,armA=0.5,angleA=90}
- \ncdiagg[lineAngle=-160]{->}{A}{B}
- \ncput*[nrot=:U]{Linie I}
- \ncdiagg[lineAngle=-160]{->}{C}{D}
- \ncput*[nrot=:U]{Linie II}}
-\end{pspicture}
-\end{LTXexample}
-
-\subsection{ncbar}
-
-\Lcs{ncbar} arbeitet ähnlich wie \Lcs{ncdiag}. Zwei Knoten werden
-durch drei Linienteile verbunden.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,1)(4,-2)
-\begin{psmatrix}[emnode=r]
-\psset{arrowscale=2}
-Verbinde {\rnode{A}{KnotenX}} mit
-{\rnode{B}{KnotenY}}!
-\end{psmatrix}
-\ncbar[nodesep=3pt,angleA=-90,angleB=90,linecolor=red,arrows=<->,arrowscale=2,
-arm=0.8]{A}{B}
-\end{pspicture}
-\end{LTXexample}
-
-
-\subsection{ncbarr}
-
-\Lcs{ncbarr} verwendet f\"unf Liniensegmente und erstellt damit eine
-S-f\"ormige Verbindung.
-
-\begin{LTXexample}[width=.3\linewidth]
-\begin{psmatrix}
- & \circlenode{X}{X}\\[1cm]
- & \circlenode{Y}{Y}
-\end{psmatrix}
-\ncbarr[angleA=0,linecolor=red]{X}{Y}
-\end{LTXexample}
-
-
-\subsection{ncangle}
-
-\Lcs{ncangle} erm\"oglich genauer berechnete dreiteilige Linien. Es
-arbeitet analog zu \Lcs{ncdiag}.
-
-\begin{LTXexample}[width=.37\linewidth]
-\begin{pspicture}(0,1)(4,-1)
-\begin{psmatrix}[emnode=r,colsep=2cm,
- rowsep=0.5cm]
-KnotenX & KnotenY \\
-\end{psmatrix}
-\ncdiag[angleA=-90,angleB=135,armA=1cm,armB=1cm,
-linearc=.5,linecolor=red]{->}{1,1}{1,2}
-\end{pspicture}
-\end{LTXexample}
-
-\subsection{ncangles}
-
-\Lcs{ncangles} produziert viergliedrige Linien.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,1)(4,-2.3)
-\begin{psmatrix}[emnode=r,colsep=2cm,
- rowsep=0.5cm]
-\psframebox{\emph{KnotenX}} &
-\psframebox{\emph{KnotenY}}
-\end{psmatrix}
-\ncangles[angleA=-90,angleB=135,armA=1cm,
- armB=1cm,
-linearc=.15,linecolor=red]{->}{1,1}{1,2}
-\rput[bl](-5,-0.7){armA}
-\rput[rB](-0.4,0.5){armB}
-\end{pspicture}
-\end{LTXexample}
-
-\subsection{ncloop}
-
-\Lcs{ncloop} setzt f\"unfgliedrige Linien. Gegenüber \Lcs{ncangles}
-kommt noch die Option \texttt{loopsize}\index{loopsize@\texttt{loopsize}} hinzu, die die
-H\"ohe für einen Loop (eine Schlinge) vorgibt.
-
-
-\begin{LTXexample}[width=.45\linewidth]
-\begin{pspicture}(-1.5,-1)(4,2)
-\rnode[lB]{A}{\psframebox{Knoten mit Schlinge}}
-\ncloop[angleB=180,loopsize=1,arm=.5,
- linearc=.2,linecolor=red]{->}{A}{A}
-\ncput[npos=3.5,nrot=:U]{\psline{|<->|}%
- (0.5,-0.2)(-0.5,-0.2)}
-\nbput[npos=3.5,nrot=:D,labelsep=.35cm]{%
- {\small\texttt{loopsize}}}
-\end{pspicture}
-\end{LTXexample}
-
-\subsection{nccurve}
-
-\Lcs{nccurve} setzt eine B\`ezierkurve zwischen zwei Knoten, die über
-die Winkel \texttt{angleA} und \texttt{angleB} sowie den
-Kurvenparameter\index{Kurvenparameter}
-\texttt{ncurv}\index{nccurv@\texttt{nccurv}} gesteuert werden kann.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{psmatrix}[emnode=r,colsep=2cm,
-rowsep=0.5cm]
-{\rnode{A}{\psframebox{KnotenX}}} & \\
-& {\rnode{B}{\psframebox{KnotenY}}}
-\end{psmatrix}
-\nccurve[angleB=180,ncurv=0.9,
-linecolor=red]{A}{B}
-\end{LTXexample}
-
-\subsection{nccircle}
-
-\Lcs{nccircle} erzeugt \"uber einem Knoten einen ungef\"ullten oder gef\"ullten
-(Sternchenversion) Kreis.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.25\linewidth]
-\begin{pspicture}(-1,-1)(3,2)
-\begin{psmatrix}[emnode=r]
-\rnode{A}{herum}
-\end{psmatrix}
-\nccircle[nodesep=3pt,linecolor=red]{->}{A}{.8cm}
-\kern 5pt
-\end{pspicture}
-\end{LTXexample}
-
-\vspace{2mm}
-\begin{LTXexample}[width=.25\linewidth]
-\begin{pspicture}(-1,-1)(3,2)
-\begin{psmatrix}[emnode=r]
-\rnode{A}{dar\"uber}
-\end{psmatrix}
-\nccircle*[nodesep=3pt,linecolor=lightgray]{->}{A}{1cm}
-\kern 5pt
-\end{pspicture}
-\end{LTXexample}
-
-\subsection{offset}
-
-Die Option \texttt{offset}\index{offset@\texttt{offset}} verschiebt, wie
-schon bei den Erl\"auterungen zu dem Parameter \texttt{name} angesprochen,
-die Verbindungslinie parallel zum eigentlich festgelegten Verlauf. Dies ist
-besonders bei zwei Linien sinnvoll und effektiv.
-Wenn man jede Linien einzeln modifizieren m\"ochte, kann dies mit
-\texttt{offsetA}\index{offsetA@\texttt{offsetA}} und
-\texttt{offsetB}\index{offsetB@\texttt{offsetB}}
-geschehen. Beispielsweise, wenn von
-einem Knoten zwei Verbindungen ausgehen sollen.
-
-\vspace{2mm}
-\begin{LTXexample}[width=.2\linewidth]
-\begin{psmatrix}[emnode=r,colsep=1cm,rowsep=0.4cm]
-[name=A]Buch \\
-[name=B]Fachbuch \\
-[name=C]\LaTeX buch
-\end{psmatrix}
-\psset{nodesep=3pt,arrows=->,linecolor=red,offset=0.3cm}
-\pcline[offsetA=0.3cm](A)(B)
-\pcline[offsetB=-0.3cm](A)(C)
-\end{LTXexample}
-
-
-\section{Linien beschriften}\index{Linienbeschriftung}
-
-\subsection{Beschriftung einf\"ugen}
-
-\psframebox{\parbox{0.65\textwidth}{
-\bs ncput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*}
-[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
-\{Beschriftung auf der Linie\}\\
-\bs naput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*}
-[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
-\{Beschriftung \"uber der Linie\}\\
-\bs nbput\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{*}
-[\psframebox[framesep=2pt,fillstyle=solid,fillcolor=black!20,linecolor=black!20]{\texttt{Optionen}}]
-\{Beschriftung unter der Linie\}
-}}
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,1)(4,-2)
-\begin{psmatrix}[emnode=r]
-\psset{arrowscale=2}
-Verbinde {\rnode{A}{KnotenX}} mit
-{\rnode{B}{KnotenY}}!
-\end{psmatrix}
-\ncbar[nodesep=3pt,angleA=-90,angleB=90,
-linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
-{A}{B}
-\ncput*{auf}
-\naput*{\"uber}
-\nbput*{unter}
-\end{pspicture}
-\end{LTXexample}
-
-Die angegebene Sternchenversion ist besser geeignet, da sie die Linien
-überschreibt und damit die Beschriftungen besser sichtbar sind (vgl. mit
-der nachfolgenden Beispielversion ohne Sternchen). Das betrifft besonders
-die \texttt{naput}-Version.
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,1)(4,-2)
-\begin{psmatrix}[emnode=r]
-\psset{arrowscale=2}
-Verbinde {\rnode{A}{KnotenX}} mit
-{\rnode{B}{KnotenY}}!
-\end{psmatrix}
-\ncbar[nodesep=3pt,angleA=-90,angleB=90,
-linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
-{A}{B}
-\ncput{auf}
-\naput{\"uber}
-\nbput{unter}
-\end{pspicture}
-\end{LTXexample}
-
-Ohne die Angabe von Optionen wird die Beschriftung auf den sichtbaren
-Linienteil geschrieben. Sie orientiert sich dabei an der Linienmitte.
-Mit \texttt{npos=}\index{npos@\texttt{npos}} und
-\text{nrot=}\index{nrot@\texttt{nrot}} kann diese Orientierung ge\"andert werden.
-
-Mit \Lcs{psset}\{labelset=\} kann der Abstand zwischen Label und Linie
-reguliert werden. Wenn der Wert auf 0pt gesetzt wird (also direkt über oder
-unter der Linie, sollte f\"ur \Lcs{naput} bzw. \Lcs{nbput} nicht die
-Sternchenversion gew\"ahlt werden, die wahrscheinlich ohnehin nur f\"ur
-\Lcs{ncput} sinnvoll scheint. Die Nullversion ist immer dann zu nehmen,
-wenn es Probleme mit dem Sichtbarmachen des Labels gibt.
-
-\subsection{npos}
-
-\texttt{npos} ermöglicht die Platzierung der Beschriftung auf den
-verschiedenen Segmenten des entsprechenden Linientyps. Die Zahl gibt vor
-dem Punkt die Segmentnummer (0,1,2,\ldots) und nach dem Punkt den Abstand
-zum Segmentanfang an. Im folgenden Beispiel bekommt die Beschriftung den
-Wert 1.2 und steht damit auf dem zweiten Liniensegment 20\% vom
-Segmentanfang.
-
-\begin{table}[H]
-\centering
-\caption{Zusammenstellung der Kurzformen für die Drehwinkel}\label{tab:wind}
- \begin{tabular}{@{}l|*{8}{>{\ttfamily}c}@{}}
- \emph{Buchstabe} & U & L & D & R & N & W & S & E \\\hline
- \emph{Bedeutung} & Up& Left&Down&Right&North&West&South&East\\
- \emph{Enstprechung} &0&90&180&270&*0&*90&*180&*270
-%
-% \begin{tabular}{@{}>{\ttfamily}llr@{}}
-% \textrm{Buchstabe} & Bedeutung & Winkel\\\hline
-% U & Up & 0\\
-% L & Left & 90\\
-% D & Down & 180\\
-% R & Right & 270\\
-% N & North & *0\\
-% W & West & *90\\
-% S & South & *180\\
-% E & East & *270
- \end{tabular}
-\end{table}
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,1)(4,-2)
-\begin{psmatrix}[emnode=r]
-\psset{arrowscale=2}
-Verbinde {\rnode{A}{KnotenX}} mit
-{\rnode{B}{KnotenY}}!
-\end{psmatrix}
-\ncbar[nodesep=3pt,angleA=-90,angleB=90,
-linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
-{A}{B}
-\ncput*[npos=1.2]{auf}
-\end{pspicture}
-\end{LTXexample}
-
-
-\subsection{nrot}
-
-\texttt{nrot=:Winkel/K\"urzel} erm\"oglicht es die Beschriftung zu
-drehen:
-
-\begin{table}[htb]
-\centering\tabcolsep=3pt
-\caption{Vergleich der verschiedenen Knotenverbindungen bez\"uglich ihrer
-Segmentanzahl}\label{tab:segmente}
-\hspace*{-1em}
-\begin{tabular}{@{} lccc | lccc @{}}
-\emph{Verbindung} & \emph{Segm.} & \emph{Bereich} & \emph{Vorgabe} &
-\emph{Verbindung} & \emph{Segm.} & \emph{Bereich} & \emph{Vorgabe}\\\hline
- \Lcs{ncline} & $1$ & $0\leq npos\leq 1$ & $0.5$ &
- \Lcs{nccurve} & $1$ & $0\leq npos\leq 1$ & $0.5$\\
- \Lcs{ncarc} & $1$ & $0\leq npos\leq 1$ & $0.5$ &
- \Lcs{ncbar} & $3$ & $0\leq npos\leq 3$ & $1.5$\\
- \Lcs{ncdiag} & $3$ & $0\leq npos\leq 3$ & $1.5$ &
- \Lcs{ncdiagg} & $2$ & $0\leq npos\leq 2$ & $0.5$\\
- \Lcs{ncangle} & $3$ & $0\leq npos\leq 3$ & $1.5$ &
- \Lcs{ncangles} & $4$ & $0\leq npos\leq 4$ & $1.5$\\
- \Lcs{ncloop} & $5$ & $0\leq npos\leq 5$ & $2.5$ &
- \Lcs{nccircle} & $1$ & $0\leq npos\leq 1$ & $0.5$\\
-\end{tabular}
-\end{table}
-
-
-\begin{LTXexample}[width=.4\linewidth]
-\begin{pspicture}(0,1)(4,-2)
-\begin{psmatrix}[emnode=r]
-\psset{arrowscale=2}
-Verbinde {\rnode{A}{KnotenX}} mit
-{\rnode{B}{KnotenY}}!
-\end{psmatrix}
-\ncbar[nodesep=3pt,angleA=-90,angleB=90,
-linecolor=red,arrows=<->,arrowscale=2,arm=0.8]
-{A}{B}
-\ncput*[nrot=:L]{auf}
-\end{pspicture}
-\end{LTXexample}
-
-\section{Strukturbeispiele}
-
-
-
-Jetzt sollen noch einige wenige Beispiele von Struktur\"ubersichten
-vorgestellt werden, die von mir in der \texttt{pstmatrix}-Umgebung gesetzt wurden.
-
-\begin{figure}[H]\centering
-\begin{psmatrix}[colsep=0.8,rowsep=0.8]
-\psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]
-{$\left[\tabular{c}GF: /Pinguin/\\ WA: +N\endtabular\right]$}
- & \psframebox[fillcolor=yellow!40,fillstyle=solid]{Vogel} \\
-\psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{\tabular{l}aufrecht\\ gehend\endtabular}
- & \psshadowbox[fillcolor=red,fillstyle=solid,shadow=true,blur=true,shadowsize=5pt]{\textbf{Pinguin}} &
- \psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{flugunfähig}\\
- & \psframebox[fillcolor=green!40,fillstyle=solid]{Felsenpinguin}
-\end{psmatrix}
-\ncline{1,1}{2,2} \naput{s}
-\ncline{1,2}{2,2} \naput{ob}
-\ncline{2,1}{2,2} \naput{a}
-\ncline{2,2}{2,3} \naput{a}
-\ncline{2,2}{3,2} \naput{ub}
-\caption{Ein Frame}
-\end{figure}
-
-\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
-\usepackage{pst-node,pst-blur}
-\begin{psmatrix}[colsep=0.8,rowsep=0.8]
-\psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]
-{$\left[\tabular{c}GF: /Pinguin/\\ WA: +N\endtabular\right]$}
- & \psframebox[fillcolor=yellow!40,fillstyle=solid]{Vogel} \\
-\psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{\tabular{l}aufrecht\\ gehend\endtabular}
- & \psshadowbox[fillcolor=red,fillstyle=solid,shadow=true,blur=true,shadowsize=5pt]{\textbf{Pinguin}} &
- \psframebox[fillcolor=blue!40,fillstyle=solid,doubleline=true]{flugunfähig}\\
- & \psframebox[fillcolor=green!40,fillstyle=solid]{Felsenpinguin}
-\end{psmatrix}
-\ncline{1,1}{2,2} \naput{s}
-\ncline{1,2}{2,2} \naput{ob}
-\ncline{2,1}{2,2} \naput{a}
-\ncline{2,2}{2,3} \naput{a}
-\ncline{2,2}{3,2} \naput{ub}
-\end{lstlisting}
-
-
-\begin{figure}[H]\centering
-\begin{psmatrix}[colsep=0.8,rowsep=0.8]
-\psset{shortput=nab,framesep=10pt}
- \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Lebewesen} &
- \psframebox[fillcolor=yellow!40,fillstyle=solid]{allgemeine Kategorisierung}\\
- \psshadowbox[framearc=0.25,fillcolor=red!40,fillstyle=solid,doubleline=true]{\textbf{Löwe}}
-& \psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]{Basisebene}\\
- \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Höhlenlöwe}
-& \psframebox[fillcolor=green!30,fillstyle=solid]{spezielle Kategorisierung}
-\end{psmatrix}
-\psset{nodesep=2pt,arrows=->}
-\ncline[arrowscale=2]{1,1}{2,1}
-\ncline[arrowscale=2]{2,1}{3,1}
-\caption{Eine konzeptuelle Kategorisierung}
-\end{figure}
-
-\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
-\begin{psmatrix}[colsep=0.8,rowsep=0.8]
-\psset{shortput=nab,framesep=10pt}
- \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Lebewesen} &
- \psframebox[fillcolor=yellow!40,fillstyle=solid]{allgemeine Kategorisierung}\\
- \psshadowbox[framearc=0.25,fillcolor=red!40,fillstyle=solid,doubleline=true]{\textbf{Löwe}}
-& \psframebox[fillcolor=red!40,fillstyle=solid,doubleline=true]{Basisebene}\\
- \psshadowbox[framearc=0.25,fillcolor=blue!20,fillstyle=solid,doubleline=true]{Höhlenlöwe}
-& \psframebox[fillcolor=green!30,fillstyle=solid]{spezielle Kategorisierung}
-\end{psmatrix}
-\psset{nodesep=2pt,arrows=->}
-\ncline[arrowscale=2]{1,1}{2,1}
-\ncline[arrowscale=2]{2,1}{3,1}
-\end{lstlisting}
-
-\begin{figure}[H]\centering
-\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55}
-\begin{psmatrix}[colsep=0,rowsep=0.9]
- & & \psframebox[fillcolor=blue!30]{Synchronie}\\
- & \psframebox[fillcolor=red!30]{Sprache} & \\
- & & \psframebox[fillcolor=blue!30]{Diachronie} \\
-\psframebox[fillcolor=red!30]{Menschliche Rede} & & \\
- & \psframebox[fillcolor=red!30]{Sprechen} &
- \end{psmatrix}
- \psset{shadow=false}
-\ncline[arrows=->,arrowscale=2]{2,2}{1,3}
-\ncline[arrows=->,arrowscale=2]{2,2}{3,3}
-\ncline[arrows=->,arrowscale=2]{4,1}{2,2}
-\ncline[arrows=->,arrowscale=2]{4,1}{5,2}
-\caption{F. de Saussure zu Sprache}
-\end{figure}
-
-\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
-\psset{framearc=0.2,shadow=true,fillstyle=solid,shadowcolor=black!55}
-\begin{psmatrix}[colsep=0,rowsep=0.9]
- & & \psframebox[fillcolor=blue!30]{Synchronie}\\
- & \psframebox[fillcolor=red!30]{Sprache} & \\
- & & \psframebox[fillcolor=blue!30]{Diachronie} \\
-\psframebox[fillcolor=red!30]{Menschliche Rede} & & \\
- & \psframebox[fillcolor=red!30]{Sprechen} &
- \end{psmatrix}
- \psset{shadow=false}
-\ncline[arrows=->,arrowscale=2]{2,2}{1,3}
-\ncline[arrows=->,arrowscale=2]{2,2}{3,3}
-\ncline[arrows=->,arrowscale=2]{4,1}{2,2}
-\ncline[arrows=->,arrowscale=2]{4,1}{5,2}
-\end{lstlisting}
-
-\begin{figure}[H] \centering
-\begin{psmatrix}[emnode=r,colsep=0.5cm,rowsep=0.5cm,mcol=c]
- & & & & <Metall> & \\
- & & & [mnode=oval] 18 & &\\
- <WERKZEUG> & & & & & \\
- & & & &[mnode=tri] 12 &\\
- & & & & & <arbeiten> \\
- & & [mnode=C,linestyle=dashed,radius=0.5,mcol=l] & & &\\
- \fbox{12} & & & \fbox{51} & & \\
- & \fbox{36} & & & <Hammer> &\\
- <Feile> & & <Zange> & & &
-\end{psmatrix}
-\psset{arrowscale=2,labelsep=0pt}
-\ncline{->}{1,5}{2,4}
-\ncarc{->}{4,5}{2,4}\naput[npos=0.4]{OBJ}
-\ncarc{->}{6,3}{4,5}\naput[npos=0.4]{INSTR}
-\ncline{<->}{6,3}{3,1}
-\ncarc{->}{6,3}{7,1}\naput[npos=0.4]{UB}
-\ncarc{->}{6,3}{7,4}\naput[npos=0.4]{UB}
-\ncarc{->}{6,3}{8,2}\naput[npos=0.4]{UB}
-\ncarc{->}{9,1}{7,1} \ncarc{->}{9,3}{8,2}
-\ncarc{->}{8,5}{7,4} \ncline{->}{5,6}{4,5}
-\caption{Begriffliches Merkmalsnetz nach Hoffmann}
-\end{figure}
-
-\begin{lstlisting}[language={[LaTeX]TeX},basicstyle=\rmfamily\small,backgroundcolor={\color{yellow!20}},frame=single]
-\begin{psmatrix}[emnode=r,colsep=0.5cm,rowsep=0.5cm,mcol=c]
- & & & & <Metall> & \\
- & & & [mnode=oval] 18 & &\\
- <WERKZEUG> & & & & & \\
- & & & &[mnode=tri] 12 &\\
- & & & & & <arbeiten> \\
- & & [mnode=C,linestyle=dashed,radius=0.5,mcol=l] & & &\\
- \fbox{12} & & & \fbox{51} & & \\
- & \fbox{36} & & & <Hammer> &\\
- <Feile> & & <Zange> & & &
-\end{psmatrix}
-\psset{arrowscale=2,labelsep=0pt}
-\ncline{->}{1,5}{2,4}
-\ncarc{->}{4,5}{2,4}\naput[npos=0.4]{OBJ}
-\ncarc{->}{6,3}{4,5}\naput[npos=0.4]{INSTR}
-\ncline{<->}{6,3}{3,1}
-\ncarc{->}{6,3}{7,1}\naput[npos=0.4]{UB}
-\ncarc{->}{6,3}{7,4}\naput[npos=0.4]{UB}
-\ncarc{->}{6,3}{8,2}\naput[npos=0.4]{UB}
-\ncarc{->}{9,1}{7,1} \ncarc{->}{9,3}{8,2}
-\ncarc{->}{8,5}{7,4} \ncline{->}{5,6}{4,5}
-\end{lstlisting}
-
-\newpage
-\bgroup
-\appendix
-
-%\addcontentsline{toc}{section}{Literaturverzeichnis}
-
-\nocite{*}
-\raggedright
-
-\printbibliography
-\egroup
-\clearpage
-\addcontentsline{toc}{section}{Index}
-\printindex
-
-
-\end{document}
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/pst-node-doc.bib new/doc/generic/pst-node/pst-node-doc.bib
--- old/doc/generic/pst-node/pst-node-doc.bib 2017-12-11 23:23:56.000000000 +0100
+++ new/doc/generic/pst-node/pst-node-doc.bib 2020-04-12 00:54:50.000000000 +0200
@@ -3,7 +3,7 @@
@STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} }
@Book{companion,
- author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
+ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Voß},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
edition = {2},
@@ -50,7 +50,7 @@
}
@Book{PSTricks2,
- author = {Herbert Vo\ss{}},
+ author = {Herbert Voß},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
edition = {7},
publisher = {DANTE and Lehmanns Media},
@@ -59,7 +59,7 @@
}
@Book{PSTricksE,
- author = {Herbert Vo\ss{}},
+ author = {Herbert Voß},
title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
edition = {1},
publisher = {UIT},
@@ -68,7 +68,7 @@
}
@Book{LTXquick,
- author = {Herbert Vo\ss{}},
+ author = {Herbert Voß},
title = {{\LaTeX} quick reference},
edition = {1},
publisher = {UIT},
@@ -77,7 +77,7 @@
}
@Book{presentations,
- author = {Herbert Vo\ss},
+ author = {Herbert Voß},
title = {Presentations with \LaTeX},
edition = {2},
publisher = {DANTE and Lehmanns Media},
Binary files old/doc/generic/pst-node/pst-node-doc.pdf and new/doc/generic/pst-node/pst-node-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-node/pst-node-doc.tex new/doc/generic/pst-node/pst-node-doc.tex
--- old/doc/generic/pst-node/pst-node-doc.tex 2017-12-30 23:43:07.000000000 +0100
+++ new/doc/generic/pst-node/pst-node-doc.tex 2020-04-12 00:54:50.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: pst-node-doc.tex 696 2017-12-30 19:01:07Z herbert $
+%% $Id: pst-node-doc.tex 1164 2020-04-01 09:12:28Z herbert $
\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,oneside]{pst-doc}
\listfiles
@@ -73,7 +73,7 @@
\vfill
\noindent
-Thanks to: Marco Daniel; Denis Girou; Rolf Niepraschk; Sebastian Rahtz; Andi Setiawan;
+Thanks to: Marco Daniel; Denis Girou; Thomas Iyer; Rolf Niepraschk; Sebastian Rahtz; Andi Setiawan;
\end{abstract}
\clearpage
@@ -832,7 +832,7 @@
point is one-half \Lkeyword{ncurvA} times the distance between the two endpoints.)
\begin{BDef}
-\LcsStar{nccircle}\OptArgs\OptArg*{\Largb{arrows}}\Largb{nodeA}\Largb{nodeB}
+\LcsStar{nccircle}\OptArgs\OptArg*{\Largb{arrows}}\Largb{nodeA}\Largb{radius}
\end{BDef}
\Lcs{nccircle} draws a circle, or part of a circle, that, if complete, would
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.doc.tlpobj new/tlpkg/tlpobj/pst-node.doc.tlpobj
--- old/tlpkg/tlpobj/pst-node.doc.tlpobj 2019-03-04 02:24:05.000000000 +0100
+++ new/tlpkg/tlpobj/pst-node.doc.tlpobj 2020-04-12 01:55:41.000000000 +0200
@@ -1,14 +1,11 @@
name pst-node.doc
category Package
-revision 50215
+revision 54687
shortdesc doc files of pst-node
relocated 1
-docfiles size=259
+docfiles size=192
RELOC/doc/generic/pst-node/Changes
RELOC/doc/generic/pst-node/README
- RELOC/doc/generic/pst-node/psmatrix-docDE.bib
- RELOC/doc/generic/pst-node/psmatrix-docDE.pdf
- RELOC/doc/generic/pst-node/psmatrix-docDE.tex
RELOC/doc/generic/pst-node/pst-node-doc.bib
RELOC/doc/generic/pst-node/pst-node-doc.pdf
RELOC/doc/generic/pst-node/pst-node-doc.tex
++++++ pst-node.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-node/pst-node.tex new/tex/generic/pst-node/pst-node.tex
--- old/tex/generic/pst-node/pst-node.tex 2019-03-03 23:13:20.000000000 +0100
+++ new/tex/generic/pst-node/pst-node.tex 2020-04-12 00:54:50.000000000 +0200
@@ -1,4 +1,4 @@
-% $Id: pst-node.tex 940 2019-03-03 12:32:03Z herbert $
+% $Id: pst-node.tex 1164 2020-04-01 09:12:28Z herbert $
%%
%% BEGIN pst-node.tex
%%
@@ -6,7 +6,7 @@
%% This uses the header file `pst-node.pro'.
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz(a)nwu.edu.
-%% COPYRIGHT 2009-2018 by Herbert Voss, hvoss tug.org.
+%% COPYRIGHT 2009- by Herbert Voss, hvoss(a)tug.org.
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -18,8 +18,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.42}
-\def\filedate{2019/03/03}
+\def\fileversion{1.42a}
+\def\filedate{2020/04/01}
\message{ v\fileversion, \filedate}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -72,7 +72,7 @@
\define@key[psset]{pst-node}{NodeCoorPrefix}[]{\def\psk@NodeCoorPrefix{#1}}% if empty it is N-<Name>.x|y
\psset[pst-node]{saveNodeCoors=false,showNode=false,markNode=false,NodeCoorPrefix=}% <NodeCoorPrefix<Name>x|y>
%
-\def\pst@newnode#1#2#3#4{%
+\def\pst@newnode#1#2#3#4{% name type coors initcode
\pst@killglue
\leavevmode
\pst@getnode{#1}\pst@thenode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-node.tlpobj new/tlpkg/tlpobj/pst-node.tlpobj
--- old/tlpkg/tlpobj/pst-node.tlpobj 2019-03-04 02:24:05.000000000 +0100
+++ new/tlpkg/tlpobj/pst-node.tlpobj 2020-04-12 01:55:41.000000000 +0200
@@ -1,6 +1,6 @@
name pst-node
category Package
-revision 50215
+revision 54687
shortdesc Nodes and node connections in PSTricks
relocated 1
longdesc The package enables the user to connect information, and to
@@ -18,7 +18,6 @@
RELOC/tex/generic/pst-node/pst-node97.tex
RELOC/tex/latex/pst-node/pst-node.sty
catalogue-ctan /graphics/pstricks/contrib/pst-node
-catalogue-date 2019-03-03 15:57:10 +0100
catalogue-license lppl
catalogue-topics graphics-in-tex linguistic
-catalogue-version 1.42
+catalogue-version 1.42a
++++++ pst-ob3d.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-ob3d/Changes new/doc/generic/pst-ob3d/Changes
--- old/doc/generic/pst-ob3d/Changes 2007-10-28 00:41:30.000000000 +0200
+++ new/doc/generic/pst-ob3d/Changes 2020-03-24 21:50:01.000000000 +0100
@@ -1,4 +1,5 @@
pst-ob3d.dtx --------
+0.22 2020-03-24 Load pst-tools for the random macros (hv)
0.21 2007-08-22 Updated the style file (hv)
0.20 2006-11-25 First CTAN release
0.12 2004-09-29 small fix to the latex-wrapper part (hv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/pst-ob3d/README new/doc/generic/pst-ob3d/README
--- old/doc/generic/pst-ob3d/README 2007-10-28 00:41:30.000000000 +0200
+++ new/doc/generic/pst-ob3d/README 2020-03-24 21:50:01.000000000 +0100
@@ -10,5 +10,7 @@
* Run "latex" on pst-ob3d.dtx to generate the documentation
* This is a PSTricks (PostScript Tricks) package, which won't
- run with pdftex. In this case go to http://PSTricks.de/
+ run with pdftex. In this case go to http://PSTricks.tug.org/
for some help.
+
+hvoss(a)tug.org
\ No newline at end of file
Binary files old/doc/generic/pst-ob3d/pst-ob3d.pdf and new/doc/generic/pst-ob3d/pst-ob3d.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ob3d.doc.tlpobj new/tlpkg/tlpobj/pst-ob3d.doc.tlpobj
--- old/tlpkg/tlpobj/pst-ob3d.doc.tlpobj 2019-02-28 04:02:14.000000000 +0100
+++ new/tlpkg/tlpobj/pst-ob3d.doc.tlpobj 2020-03-25 16:13:16.000000000 +0100
@@ -1,9 +1,9 @@
name pst-ob3d.doc
category Package
-revision 15878
+revision 54514
shortdesc doc files of pst-ob3d
relocated 1
-docfiles size=50
+docfiles size=51
RELOC/doc/generic/pst-ob3d/Changes
RELOC/doc/generic/pst-ob3d/README
RELOC/doc/generic/pst-ob3d/pst-ob3d.pdf
++++++ pst-ob3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pst-ob3d/pst-ob3d.tex new/tex/generic/pst-ob3d/pst-ob3d.tex
--- old/tex/generic/pst-ob3d/pst-ob3d.tex 2007-10-28 00:41:30.000000000 +0200
+++ new/tex/generic/pst-ob3d/pst-ob3d.tex 2020-03-24 21:50:01.000000000 +0100
@@ -26,7 +26,7 @@
%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou(a)idris.fr>
%% Herbert Voss <hvoss(a)tug.org>
%%
-%% August 22, 2007
+%% Mar 24, 2020
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -36,15 +36,15 @@
%% `pst-ob3d' is a PSTricks package to draw basic three dimensional
%% objects with various customizations.
%%
-\def\fileversion{0.21}
-\def\filedate{2007/08/22}
+\def\fileversion{0.22}
+\def\filedate{2020/03/24}
\message{`Pst-Objects3d' v\fileversion, \filedate\space (DG,hv)}
\csname PstObjectsThreeDLoaded\endcsname
\let\PstObjectsThreeDLoaded\endinput
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
+\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi
\ifx\PSTthreeDLoaded\endinput\else\input pst-3d.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
-\input random.tex
+\ifx\PSTtoolsLoaded\endinput\else \input pst-tools \fi
\edef\PstAtCode{\the\catcode`\@}
\catcode`\@=11\relax
\pst@addfams{pst-ob3d}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pst-ob3d/pst-ob3d.sty new/tex/latex/pst-ob3d/pst-ob3d.sty
--- old/tex/latex/pst-ob3d/pst-ob3d.sty 2007-10-28 00:41:30.000000000 +0200
+++ new/tex/latex/pst-ob3d/pst-ob3d.sty 2020-03-24 21:50:01.000000000 +0100
@@ -26,7 +26,7 @@
%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou(a)idris.fr>
%% Herbert Voss <hvoss(a)tug.org>
%%
-%% August 22, 2007
+%% Mar 24, 2020
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pst-ob3d.tlpobj new/tlpkg/tlpobj/pst-ob3d.tlpobj
--- old/tlpkg/tlpobj/pst-ob3d.tlpobj 2019-02-28 04:02:14.000000000 +0100
+++ new/tlpkg/tlpobj/pst-ob3d.tlpobj 2020-03-25 16:13:16.000000000 +0100
@@ -1,6 +1,6 @@
name pst-ob3d
category Package
-revision 15878
+revision 54514
shortdesc Three dimensional objects using PSTricks
relocated 1
longdesc The package uses PSTricks to provide basic three-dimensional
@@ -11,7 +11,6 @@
RELOC/tex/generic/pst-ob3d/pst-ob3d.tex
RELOC/tex/latex/pst-ob3d/pst-ob3d.sty
catalogue-ctan /graphics/pstricks/contrib/pst-ob3d
-catalogue-date 2018-09-15 12:55:45 +0200
catalogue-license lppl
-catalogue-topics graphics-3d pstricks
-catalogue-version 0.21
+catalogue-topics graphics graphics-3d pstricks
+catalogue-version 0.22
1
0
Hello community,
here is the log from the commit of package texlive-specs-r for openSUSE:Factory checked in at 2020-05-29 21:18:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-r (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-r.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-r"
Fri May 29 21:18:47 2020 rev:38 rq:806927 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-r/texlive-specs-r.changes 2019-11-07 23:11:47.724223857 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-r.new.3606/texlive-specs-r.changes 2020-05-29 21:31:25.473586750 +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:
----
pdftools.doc.tar.xz
pdftools.tar.xz
New:
----
parsa.doc.tar.xz
parsa.tar.xz
pdfarticle.doc.tar.xz
pdfarticle.tar.xz
pdfcolmk.doc.tar.xz
pdfcolmk.tar.xz
pdfescape.doc.tar.xz
pdfescape.tar.xz
pdflscape.doc.tar.xz
pdflscape.tar.xz
pdfpc.doc.tar.xz
pdfpc.tar.xz
pdftexcmds.doc.tar.xz
pdftexcmds.tar.xz
pdftosrc.doc.tar.xz
pgfmorepages.doc.tar.xz
pgfmorepages.tar.xz
physconst.doc.tar.xz
physconst.tar.xz
physunits.doc.tar.xz
physunits.tar.xz
picture.doc.tar.xz
picture.tar.xz
pinoutikz.doc.tar.xz
pinoutikz.tar.xz
plainyr.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-r.spec ++++++
++++ 12027 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-r/texlive-specs-r.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-r.new.3606/texlive-specs-r.spec
++++++ overlock.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/overlock/README new/doc/fonts/overlock/README
--- old/doc/fonts/overlock/README 2014-06-25 17:20:57.000000000 +0200
+++ new/doc/fonts/overlock/README 2019-10-16 22:54:29.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the Overlock package, version 2014-05-24.
+This is the README for the Overlock package, version 2019-10-15.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
for the Overlock and OverlookSC families of fonts, designed by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/overlock.doc.tlpobj new/tlpkg/tlpobj/overlock.doc.tlpobj
--- old/tlpkg/tlpobj/overlock.doc.tlpobj 2019-02-28 03:58:13.000000000 +0100
+++ new/tlpkg/tlpobj/overlock.doc.tlpobj 2019-10-17 01:54:27.000000000 +0200
@@ -1,6 +1,6 @@
name overlock.doc
category Package
-revision 34409
+revision 52408
shortdesc doc files of overlock
relocated 1
docfiles size=14
++++++ overlock.tar.xz ++++++
++++ 1668 lines of diff (skipped)
++++++ overpic.doc.tar.xz ++++++
Binary files old/doc/latex/overpic/overpic.pdf and new/doc/latex/overpic/overpic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/overpic.doc.tlpobj new/tlpkg/tlpobj/overpic.doc.tlpobj
--- old/tlpkg/tlpobj/overpic.doc.tlpobj 2019-02-28 03:58:14.000000000 +0100
+++ new/tlpkg/tlpobj/overpic.doc.tlpobj 2020-02-25 01:54:54.000000000 +0100
@@ -1,9 +1,9 @@
name overpic.doc
category Package
-revision 48550
+revision 53889
shortdesc doc files of overpic
relocated 1
-docfiles size=87
+docfiles size=93
RELOC/doc/latex/overpic/README.de.md
RELOC/doc/latex/overpic/README.md
RELOC/doc/latex/overpic/overpic.pdf
++++++ overpic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/overpic/overpic.sty new/tex/latex/overpic/overpic.sty
--- old/tex/latex/overpic/overpic.sty 2018-09-02 23:15:59.000000000 +0200
+++ new/tex/latex/overpic/overpic.sty 2020-02-24 15:30:04.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 1997-2016 by Rolf Niepraschk <Rolf.Niepraschk(a)gmx.de>
+%% Copyright (C) 1997-... by Rolf Niepraschk <Rolf.Niepraschk(a)gmx.de>
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -19,7 +19,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{overpic}[2018/09/02 1.2 picture overlays (RN)]
+\ProvidesPackage{overpic}[2020/02/22 1.3 picture overlays (RN)]
\RequirePackage{graphicx,epic}
\newcommand*\OVP@scale{\z@}
\define@key{Gin}{rel}{%
@@ -87,6 +87,8 @@
}{\endpicture}
\newenvironment{Overpic}[2][]{%
\sbox\OVP@box{#2}%
+ \count@=\z@ \Gin@gridfalse
+ \setkeys{Gin}{#1}%
\OVP@picture{#1}%
}{\endpicture}
\newcommand*\OVP@picture[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/overpic.tlpobj new/tlpkg/tlpobj/overpic.tlpobj
--- old/tlpkg/tlpobj/overpic.tlpobj 2019-02-28 03:58:14.000000000 +0100
+++ new/tlpkg/tlpobj/overpic.tlpobj 2020-02-25 01:54:54.000000000 +0100
@@ -1,6 +1,6 @@
name overpic
category Package
-revision 48550
+revision 53889
shortdesc Combine LaTeX commands over included graphics
relocated 1
longdesc The overpic environment is a cross between the LaTeX picture
@@ -14,7 +14,6 @@
catalogue-contact-home https://github.com/rolfn/overpic
catalogue-contact-repository https://github.com/rolfn/overpic
catalogue-ctan /macros/latex/contrib/overpic
-catalogue-date 2018-09-02 16:18:17 +0200
catalogue-license lppl1.3
catalogue-topics graphics-text
-catalogue-version 1.2
+catalogue-version 1.3
++++++ parnotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/parnotes/README.md new/doc/latex/parnotes/README.md
--- old/doc/latex/parnotes/README.md 2016-08-16 23:45:47.000000000 +0200
+++ new/doc/latex/parnotes/README.md 2019-07-24 23:30:54.000000000 +0200
@@ -1,6 +1,6 @@
parnotes
========
-rev.3
+rev.3b (see notes below)
The parnotes package adds a new note type, `\parnote`. Parnotes are set as normal, running paragraphs and may be placed two ways: (1) automatically, at the end of the paragraph, or (2) manually, using the `\parnotes` command.
@@ -18,7 +18,7 @@
Contributing
------------
-The development repository and the bug tracker for this package are hosted [on GitHub](https://github.com/chelh/LaTeX-parnotes).
+The development repository and the bug tracker for this package are hosted [on GitHub](https://github.com/chelh/LaTeX-parnotes) but see notes below.
License
-------
@@ -31,3 +31,20 @@
This package was started due to a question at the TeX Stack Exchange: http://tex.stackexchange.com/questions/34746/
Thanks to Stack Exchange users Ahmed Musa, Bruno Le Floch, and David Carlisle.
+
+Current Status
+--------------
+
+The package appears to to be unmainted, i.e. the above address exists
+but is not monitored and the original author is not reachable.
+
+
+Small extensions in 2019 by Frank Mittelbach:
+
+ - option `reset` (alias for restart to match other packages)
+ - option `alph` (for alph style notes instead of arabic)
+ - option `symbol` (for fnsymbol style notes)
+
+The documentation has been changed use freely available fonts so that it
+can be typeset by everybody (the previsous release used commercial fonts).
+
Binary files old/doc/latex/parnotes/parnotes.pdf and new/doc/latex/parnotes/parnotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/parnotes/parnotes.tex new/doc/latex/parnotes/parnotes.tex
--- old/doc/latex/parnotes/parnotes.tex 2016-08-16 23:45:47.000000000 +0200
+++ new/doc/latex/parnotes/parnotes.tex 2019-07-24 23:30:54.000000000 +0200
@@ -1,19 +1,28 @@
+
+%!TEX program = lualatex
+
\documentclass[10pt]{article}
-\usepackage[USenglish,english]{babel}
-\selectlanguage{USenglish}
-\usepackage[no-math]{fontspec}
-\defaultfontfeatures{Ligatures=TeX}
-\def\MinionDefaults{%
- SizeFeatures = {
- {Size = -8.41, OpticalSize = 8, Numbers = Lining},
- {Size = 8.41-13.1, OpticalSize = 11},
- {Size = 13.1-20.0, OpticalSize = 19},
- {Size = 20.0-, OpticalSize = 72}},
- Numbers = {OldStyle,Monospaced}}
-\setmainfont[\MinionDefaults,
- BoldFont = {Minion Pro Semibold}]{Minion Pro}
-\setsansfont[Scale=MatchLowercase, BoldFont = {Myriad Pro Semibold}]{Myriad Pro}
-\setmonofont[Scale=MatchLowercase]{Consolas}
+%\usepackage[USenglish,english]{babel}
+\usepackage[USenglish]{babel}
+%\selectlanguage{USenglish}
+%\usepackage[no-math]{fontspec}
+\usepackage[oldstyle]{Alegreya}
+\usepackage[]{AlegreyaSans}
+\setmonofont[Scale=MatchLowercase]{IBM Plex Mono}
+
+%\defaultfontfeatures{Ligatures=TeX}
+%\def\MinionDefaults{%
+% SizeFeatures = {
+% {Size = -8.41, OpticalSize = 8, Numbers = Lining},
+% {Size = 8.41-13.1, OpticalSize = 11},
+% {Size = 13.1-20.0, OpticalSize = 19},
+% {Size = 20.0-, OpticalSize = 72}},
+% Numbers = {OldStyle,Monospaced}}
+%\setmainfont[\MinionDefaults,
+% BoldFont = {Minion Pro Semibold}]{Minion Pro}
+%\setsansfont[Scale=MatchLowercase, BoldFont = {Myriad Pro Semibold}]{Myriad Pro}
+%\setmonofont[Scale=MatchLowercase]{Consolas}
+
\usepackage{amsmath}
\usepackage{parnotes}
\usepackage{xcolor}
@@ -21,28 +30,32 @@
\hypersetup{allcolors=blue}
\usepackage{varwidth}
\usepackage{accsupp}
-\DeclareRobustCommand\squelch[1]{%
- \BeginAccSupp{method=plain,ActualText={}}#1\EndAccSupp{}}
-\def\squelchstyle{%
- \BeginAccSupp{method=plain,ActualText={}}%
- \aftergroup\aftersquelchstyle}
-\def\aftersquelchstyle{\EndAccSupp{}}
+
+%\DeclareRobustCommand\squelch[1]{%
+% \BeginAccSupp{method=plain,ActualText={}}#1\EndAccSupp{}}
+%\def\squelchstyle{%
+% \BeginAccSupp{method=plain,ActualText={}}%
+% \aftergroup\aftersquelchstyle}
+%\def\aftersquelchstyle{\EndAccSupp{}}
+
\usepackage{fancyhdr}
\fancypagestyle{plain}{%
\fancyhf{}%
- \fancyfoot[C]{\squelch{\thepage}}%
+% \fancyfoot[C]{\squelch{\thepage}}%
+ \fancyfoot[C]{\thepage}%
\renewcommand{\headrulewidth}{0pt}%
\renewcommand{\footrulewidth}{0pt}%
}
\pagestyle{plain}
\usepackage{listings}
-\lstset{numbers=left,basicstyle={\small\ttfamily},numberstyle={\squelchstyle\color{gray}}}
+%\lstset{numbers=left,basicstyle={\small\ttfamily},numberstyle={\squelchstyle\color{gray}}}
+\lstset{numbers=left,basicstyle={\scriptsize\ttfamily},numberstyle={\color{gray}}}
\usepackage{booktabs}
\usepackage{microtype}
-\title{The \textsf{parnotes} package\parnote{This is rev.~3, last modified 8/15/2016.}}
-\author{Chelsea Hughes\parnote{See \texttt{parnotes.sty} for copyright and contact details.}}
-\date{August 15, 2016}
+\title{The \textsf{parnotes} package\parnote{This is rev.~3b, last modified 2019/07/23.}}
+\author{Chelsea Hughes\parnote{See \texttt{parnotes.sty} for copyright details. The package has currently no maintainer.}}
+\date{July 23, 2019}
\renewcommand{\parnotefmt}[1]{\centerline{\colorbox{black!10}{\parbox{0.82\textwidth}{\footnotesize\sffamily\noindent #1}}}}
@@ -104,8 +117,11 @@
\noindent\begin{tabbing}
\texttt{restart}\hspace{0.75in}\=Reset the parnote number each time parnotes are placed.\\
+\texttt{reset}\>Alias name for \texttt{restart} to match what other packages use.\\
\texttt{roman}\>Use lowercase Roman numerals instead of Arabic numerals for\\
\>parnote marks. Specify this if you mix parnotes with footnotes.\\
+\texttt{alph}\>Use lowercase alphabet characters instead.\\
+\texttt{symbol}\>Use footnote symbols instead instead.\\
\texttt{breakwithin}\>Place a line break after every parnote.\\
\texttt{indentafter}\>Allow indentation in the paragraph following a parnote.\\
\texttt{narrower}\>Give parnotes an increased margin, like block quotes.\\
@@ -189,6 +205,11 @@
\section{Changelog}
{\raggedright
+\noindent\textbf{Revision 3b, released on July 23, 2019 (Frank Mittelbach)}
+\begin{itemize}
+\item Added options \texttt{reset}, \texttt{alph} and \texttt{symbol}.
+\item Changed documentation to use feely available fonts only.
+\end{itemize}
\noindent\textbf{Revision 3, released on Aug 15, 2016}
\begin{itemize}
\item Bug fix: Use \verb+\protected@edef+ to expand the parnote counter (fixes incompatibility with \textsf{BiocStyle})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parnotes.doc.tlpobj new/tlpkg/tlpobj/parnotes.doc.tlpobj
--- old/tlpkg/tlpobj/parnotes.doc.tlpobj 2019-02-28 03:58:30.000000000 +0100
+++ new/tlpkg/tlpobj/parnotes.doc.tlpobj 2019-07-25 01:53:14.000000000 +0200
@@ -1,9 +1,9 @@
name parnotes.doc
category Package
-revision 41868
+revision 51720
shortdesc doc files of parnotes
relocated 1
-docfiles size=37
+docfiles size=20
RELOC/doc/latex/parnotes/README.md
RELOC/doc/latex/parnotes/parnotes.pdf
RELOC/doc/latex/parnotes/parnotes.tex
++++++ parnotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/parnotes/parnotes.sty new/tex/latex/parnotes/parnotes.sty
--- old/tex/latex/parnotes/parnotes.sty 2016-08-16 23:45:47.000000000 +0200
+++ new/tex/latex/parnotes/parnotes.sty 2019-07-24 23:30:54.000000000 +0200
@@ -13,9 +13,19 @@
% http://tex.stackexchange.com/questions/34746/
%
% Thanks to Stack Exchange users Ahmed Musa, Bruno Le Floch, and David Carlisle.
+%
+% -----------------------------
+%
+% The package is currently unmainted, i.e. the above address exists but is not monitored
+%
+% Small extensions in 2019 by Frank Mittelbach:
+%
+% option reset (alias for restart to match other packages)
+% option alph (for alph style notes instead of arabic)
+% option symbol (for fnsymbol style notes)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{parnotes}[2016/08/15 rev. 3 Notes after every paragraph, or elsewhere]
+\ProvidesPackage{parnotes}[2019/07/23 rev. 3b Notes after every paragraph, or elsewhere]
%
% These are the user-modifiable format commands
@@ -54,10 +64,15 @@
%
\let\PN@reset@optional\relax
\DeclareOption{restart}{\def\PN@reset@optional{\parnotereset}}
+\DeclareOption{reset}{\def\PN@reset@optional{\parnotereset}} %FMi alternative name
%
% Parnote marks are arabic by default, but an option changes them to roman
%
\DeclareOption{roman}{\renewcommand\theparnotemark{\roman{parnotemark}}}
+%%FMi
+\DeclareOption{alph}{\renewcommand\theparnotemark{\alph{parnotemark}}}
+\DeclareOption{symbol}{\renewcommand\theparnotemark{\fnsymbol{parnotemark}}}
+%%FMi -- end
% breakwithin just changes \parnoteintercmd
\DeclareOption{breakwithin}{\renewcommand{\parnoteintercmd}{\\}}
% And indentafter just clears \PN@disable@indent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parnotes.tlpobj new/tlpkg/tlpobj/parnotes.tlpobj
--- old/tlpkg/tlpobj/parnotes.tlpobj 2019-02-28 03:58:30.000000000 +0100
+++ new/tlpkg/tlpobj/parnotes.tlpobj 2019-07-25 01:53:14.000000000 +0200
@@ -1,6 +1,6 @@
name parnotes
category Package
-revision 41868
+revision 51720
shortdesc Notes after every paragraph (or elsewhere)
relocated 1
longdesc The package provides the \parnote command. The notes are set as
@@ -9,7 +9,7 @@
runfiles size=3
RELOC/tex/latex/parnotes/parnotes.sty
catalogue-ctan /macros/latex/contrib/parnotes
-catalogue-date 2016-08-16 08:35:16 +0200
+catalogue-date 2019-07-23 22:24:03 +0200
catalogue-license lppl1.3
catalogue-topics notes
-catalogue-version 3
+catalogue-version 3b
++++++ parskip.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/parskip/changes.txt new/doc/latex/parskip/changes.txt
--- old/doc/latex/parskip/changes.txt 2019-01-16 23:27:54.000000000 +0100
+++ new/doc/latex/parskip/changes.txt 2020-01-23 18:54:03.000000000 +0100
@@ -1,3 +1,9 @@
+#### placed on CTAN as 2.0d ####
+
+ 2020-01-22 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * distribution cleanup no code change
+
2019-01-16 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
* parskip.dtx (subsubsection{Option handling}):
Binary files old/doc/latex/parskip/parskip-code.pdf and new/doc/latex/parskip/parskip-code.pdf differ
Binary files old/doc/latex/parskip/parskip.pdf and new/doc/latex/parskip/parskip.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parskip.doc.tlpobj new/tlpkg/tlpobj/parskip.doc.tlpobj
--- old/tlpkg/tlpobj/parskip.doc.tlpobj 2019-02-28 03:58:30.000000000 +0100
+++ new/tlpkg/tlpobj/parskip.doc.tlpobj 2020-01-24 01:57:17.000000000 +0100
@@ -1,6 +1,6 @@
name parskip.doc
category Package
-revision 49730
+revision 53503
shortdesc doc files of parskip
relocated 1
docfiles size=102
++++++ parskip.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/parskip/parskip.sty new/tex/latex/parskip/parskip.sty
--- old/tex/latex/parskip/parskip.sty 2019-01-16 23:27:54.000000000 +0100
+++ new/tex/latex/parskip/parskip.sty 2020-01-23 18:54:03.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 `parskip Bundle'.
%% -------------------------------------------------------------------
@@ -19,7 +19,7 @@
%% 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.
+%% version 2008 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% `parskip Bundle'. You may however distribute the `parskip Bundle'
@@ -35,12 +35,12 @@
%% File: parskip.dtx
%% (C) Copyright 1989 H.Partl, TU Wien
%% (C) Copyright 2001 Robin Fairbairns
-%% (C) Copyright 2018-2019 Frank Mittelbach
+%% (C) Copyright 2018-2020 Frank Mittelbach
\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\DeclareRelease {v1}{2001-04-09}{parskip-2001-04-09.sty}
\DeclareCurrentRelease{v2}{2018-08-24}
-\ProvidesPackage{parskip}[2019-01-16 v2.0c non-zero parskip adjustments]
+\ProvidesPackage{parskip}[2020-01-22 v2.0d non-zero parskip adjustments]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{family=parskip,prefix=parskip@}
\DeclareStringOption[0pt]{indent}[\parindent]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parskip.tlpobj new/tlpkg/tlpobj/parskip.tlpobj
--- old/tlpkg/tlpobj/parskip.tlpobj 2019-02-28 03:58:30.000000000 +0100
+++ new/tlpkg/tlpobj/parskip.tlpobj 2020-01-24 01:57:17.000000000 +0100
@@ -1,6 +1,6 @@
name parskip
category Package
-revision 49730
+revision 53503
shortdesc Layout with zero \parindent, non-zero \parskip
relocated 1
longdesc Simply changing \parskip and \parindent leaves a layout that is
@@ -9,10 +9,8 @@
runfiles size=3
RELOC/tex/latex/parskip/parskip-2001-04-09.sty
RELOC/tex/latex/parskip/parskip.sty
-catalogue-contact-bugs https://github.com/FrankMittelbach/fmitex/issues
catalogue-contact-repository https://github.com/FrankMittelbach/fmitex
catalogue-ctan /macros/latex/contrib/parskip
-catalogue-date 2019-01-16 16:42:25 +0100
catalogue-license lppl1.3c
catalogue-topics layout parshape
-catalogue-version 2.0c
+catalogue-version 2.0d
++++++ patgen.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/patgen.1 new/texmf-dist/doc/man/man1/patgen.1
--- old/texmf-dist/doc/man/man1/patgen.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/patgen.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PATGEN 1 "16 June 2015" "Web2C 2019"
+.TH PATGEN 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/patgen.man1.pdf and new/texmf-dist/doc/man/man1/patgen.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/patgen.doc.tlpobj new/tlpkg/tlpobj/patgen.doc.tlpobj
--- old/tlpkg/tlpobj/patgen.doc.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/patgen.doc.tlpobj 2020-03-04 23:53:06.000000000 +0100
@@ -1,6 +1,6 @@
name patgen.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of patgen
docfiles size=10
texmf-dist/doc/man/man1/patgen.1
++++++ pax.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pax.doc.tlpobj new/tlpkg/tlpobj/pax.doc.tlpobj
--- old/tlpkg/tlpobj/pax.doc.tlpobj 2019-02-28 03:58:33.000000000 +0100
+++ new/tlpkg/tlpobj/pax.doc.tlpobj 2020-03-24 02:03:04.000000000 +0100
@@ -1,6 +1,6 @@
name pax.doc
category Package
-revision 26112
+revision 54512
shortdesc doc files of pax
docfiles size=2
texmf-dist/doc/latex/pax/README
++++++ pax.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pax.tlpobj new/tlpkg/tlpobj/pax.tlpobj
--- old/tlpkg/tlpobj/pax.tlpobj 2019-02-28 03:58:33.000000000 +0100
+++ new/tlpkg/tlpobj/pax.tlpobj 2020-03-24 02:03:04.000000000 +0100
@@ -1,6 +1,6 @@
name pax
category Package
-revision 26112
+revision 54512
shortdesc Extract and reinsert PDF annotations with pdfTeX
longdesc If PDF files are included using pdfTeX, PDF annotations are
longdesc stripped. The pax project offers a solution without altering
@@ -18,7 +18,6 @@
texmf-dist/tex/latex/pax/pax.sty
catalogue-also pdftex
catalogue-ctan /macros/latex/contrib/pax
-catalogue-date 2016-12-28 10:23:26 +0100
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics pdf-feat
catalogue-version 0.1l
++++++ pdfbook2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdfbook2.1 new/texmf-dist/doc/man/man1/pdfbook2.1
--- old/texmf-dist/doc/man/man1/pdfbook2.1 2015-06-15 00:17:46.000000000 +0200
+++ new/texmf-dist/doc/man/man1/pdfbook2.1 2020-01-23 22:58:36.000000000 +0100
@@ -1,4 +1,4 @@
-.TH pdfbook2 1 "June 3, 2015" "" "pdfbook2 - transform pdf files to booklets"
+.TH pdfbook2 1 "January 22, 2020" "" "pdfbook2 - transform pdf files to booklets"
.SH NAME
pdfbook2 \- transform pdf files into booklets for double-sided printing
@@ -107,9 +107,9 @@
.BR pdfcrop (1)
.SH ABOUT
-pdfbook2 v1.2
+pdfbook2 v1.4 (https://github.com/jenom/pdfbook2)
.br
-(c) 2015 Johannes Neumann (http://www.neumannjo.de)
+(c) 2015 - 2020 Johannes Neumann (http://www.neumannjo.de)
.br
licensed under GPLv3 (http://www.gnu.org/licenses/gpl-3.0)
.br
Binary files old/texmf-dist/doc/man/man1/pdfbook2.man1.pdf and new/texmf-dist/doc/man/man1/pdfbook2.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/pdfbook2/README new/texmf-dist/doc/support/pdfbook2/README
--- old/texmf-dist/doc/support/pdfbook2/README 2015-06-15 00:17:46.000000000 +0200
+++ new/texmf-dist/doc/support/pdfbook2/README 2020-01-23 22:58:36.000000000 +0100
@@ -1,8 +1,8 @@
pdfbook2 - transform pdf files to booklets
==========================================
- pdfbook2 v1.2
- (c) 2015 Johannes Neumann (http://www.neumannjo.de)
+ pdfbook2 v1.4 (https://github.com/jenom/pdfbook2)
+ (c) 2015 - 2020 Johannes Neumann (http://www.neumannjo.de)
licensed under GPLv3 (http://www.gnu.org/licenses/gpl-3.0)
based on pdfbook by David Firth with help from Marco Pessotto
@@ -45,7 +45,7 @@
REQUIREMENTS
- python 2.7, pdfjam, pdfcrop and their dependencies.
+ python 3.6, pdfjam, pdfcrop and their dependencies.
EXAMPLES
@@ -115,6 +115,16 @@
CHANGELOG
+ 1.4 2020/01/20
+
+ - migration to Python 3
+ - fixed bug if the input document had only one page
+ - fix for signature option not working
+
+ 1.3 2019/08/12
+
+ - removed wait after popen to prevent deadlock with very large documents
+
1.2 2015/06/03
- added man page
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfbook2.doc.tlpobj new/tlpkg/tlpobj/pdfbook2.doc.tlpobj
--- old/tlpkg/tlpobj/pdfbook2.doc.tlpobj 2019-02-28 03:58:35.000000000 +0100
+++ new/tlpkg/tlpobj/pdfbook2.doc.tlpobj 2020-01-24 01:57:17.000000000 +0100
@@ -1,8 +1,8 @@
name pdfbook2.doc
category Package
-revision 37537
+revision 53521
shortdesc doc files of pdfbook2
-docfiles size=5
+docfiles size=9
texmf-dist/doc/man/man1/pdfbook2.1
texmf-dist/doc/man/man1/pdfbook2.man1.pdf
texmf-dist/doc/support/pdfbook2/README
++++++ pdfbook2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfbook2/pdfbook2 new/texmf-dist/scripts/pdfbook2/pdfbook2
--- old/texmf-dist/scripts/pdfbook2/pdfbook2 2015-06-15 00:17:46.000000000 +0200
+++ new/texmf-dist/scripts/pdfbook2/pdfbook2 2020-01-23 22:58:36.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
""" pdfbook2 - transform pdf files to booklets
This program is free software: you can redistribute it and/or modify
@@ -16,222 +16,303 @@
"""
-import sys
-import subprocess
import os
-from optparse import OptionParser, OptionGroup, HelpFormatter
import shutil
+import subprocess
+import sys
+from optparse import HelpFormatter, OptionGroup, OptionParser
-
-#===============================================================================
+# ===============================================================================
# Create booklet for file $name
-#===============================================================================
+# ===============================================================================
-def booklify( name, opts ):
- #------------------------------------------------------ Check if file exists
- print "\nProcessing", name
- if not os.path.isfile( name ):
- print "SKIP: file not found."
+
+def booklify(name, opts):
+ # ------------------------------------------------------ Check if file exists
+ print("\nProcessing", name)
+ if not os.path.isfile(name):
+ print("SKIP: file not found.")
return
- print "Getting bounds...",
+ print("Getting bounds...", end=" ")
sys.stdout.flush()
- #---------------------------------------------------------- useful constants
- bboxName = "%%HiResBoundingBox:"
+ # ---------------------------------------------------------- useful constants
+ bboxName = b"%%HiResBoundingBox:"
tmpFile = ".crop-tmp.pdf"
- #------------------------------------------------- find min/max bounding box
+ # ------------------------------------------------- find min/max bounding box
if opts.crop:
- p = subprocess.Popen( ["pdfcrop", "--verbose",
- "--resolution", repr( opts.resolution ),
- name, tmpFile],
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE )
- p.wait()
+ p = subprocess.Popen(
+ ["pdfcrop", "--verbose", "--resolution", repr(opts.resolution), name, tmpFile],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ )
out, err = p.communicate()
- if len( err ) != 0:
- print err
- print "\n\nABORT: Problem getting bounds"
- sys.exit( 1 )
+ if len(err) != 0:
+ print(err)
+ print("\n\nABORT: Problem getting bounds")
+ sys.exit(1)
lines = out.splitlines()
- bboxes = [s[len( bboxName ) + 1:] for s in lines if s.startswith( bboxName )]
- bounds = [[float( x ) for x in bbox.split()] for bbox in bboxes ]
- minLOdd = min( [bound[0] for bound in bounds[::2] ] )
- maxROdd = max( [bound[2] for bound in bounds[::2] ] )
- minLEven = min( [bound[0] for bound in bounds[1::2] ] )
- maxREven = max( [bound[2] for bound in bounds[1::2] ] )
- minT = min( [bound[1] for bound in bounds ] )
- maxB = max( [bound[3] for bound in bounds ] )
+ bboxes = [s[len(bboxName) + 1 :] for s in lines if s.startswith(bboxName)]
+ bounds = [[float(x) for x in bbox.split()] for bbox in bboxes]
+ minLOdd = min([bound[0] for bound in bounds[::2]])
+ maxROdd = max([bound[2] for bound in bounds[::2]])
+ if len(bboxes) > 1:
+ minLEven = min([bound[0] for bound in bounds[1::2]])
+ maxREven = max([bound[2] for bound in bounds[1::2]])
+ else:
+ minLEven = minLOdd
+ maxREven = maxROdd
+ minT = min([bound[1] for bound in bounds])
+ maxB = max([bound[3] for bound in bounds])
widthOdd = maxROdd - minLOdd
widthEven = maxREven - minLEven
- maxWidth = max( widthOdd, widthEven )
+ maxWidth = max(widthOdd, widthEven)
minLOdd -= maxWidth - widthOdd
maxREven += maxWidth - widthEven
- print "done"
+ print("done")
sys.stdout.flush()
- #--------------------------------------------- crop file to area of interest
- print "cropping...",
+ # --------------------------------------------- crop file to area of interest
+ print("cropping...", end=" ")
sys.stdout.flush()
- p = subprocess.Popen( ["pdfcrop",
- "--bbox-odd", "{L} {T} {R} {B}".format( L = minLOdd - opts.innerMargin / 2,
- T = minT - opts.topMargin,
- R = maxROdd + opts.outerMargin,
- B = maxB + opts.outerMargin ),
- "--bbox-even", "{L} {T} {R} {B}".format( L = minLEven - opts.outerMargin,
- T = minT - opts.topMargin,
- R = maxREven + opts.innerMargin / 2,
- B = maxB + opts.outerMargin ),
- "--resolution", repr( opts.resolution ),
- name,
- tmpFile],
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE )
- p.wait()
+ p = subprocess.Popen(
+ [
+ "pdfcrop",
+ "--bbox-odd",
+ "{L} {T} {R} {B}".format(
+ L=minLOdd - opts.innerMargin / 2,
+ T=minT - opts.topMargin,
+ R=maxROdd + opts.outerMargin,
+ B=maxB + opts.outerMargin,
+ ),
+ "--bbox-even",
+ "{L} {T} {R} {B}".format(
+ L=minLEven - opts.outerMargin,
+ T=minT - opts.topMargin,
+ R=maxREven + opts.innerMargin / 2,
+ B=maxB + opts.outerMargin,
+ ),
+ "--resolution",
+ repr(opts.resolution),
+ name,
+ tmpFile,
+ ],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ )
out, err = p.communicate()
- if len( err ) != 0:
- print err
- print "\n\nABORT: Problem with cropping"
- sys.exit( 1 )
- print "done"
+ if len(err) != 0:
+ print(err)
+ print("\n\nABORT: Problem with cropping")
+ sys.exit(1)
+ print("done")
sys.stdout.flush()
else:
- shutil.copy( name, tmpFile )
+ shutil.copy(name, tmpFile)
- #-------------------------------------------------------- create the booklet
- print "create booklet...",
+ # -------------------------------------------------------- create the booklet
+ print("create booklet...", end=" ")
sys.stdout.flush()
- pdfJamCallList = [ "pdfjam",
- "--booklet", "true",
- "--landscape",
- "--suffix", "book",
- "--signature", repr( opts.signature ),
- tmpFile ]
+ pdfJamCallList = [
+ "pdfjam",
+ "--landscape",
+ "--suffix",
+ "book",
+ tmpFile,
+ ]
+
+ # add option signature if it is defined else booklet
+ if opts.signature != 0:
+ pdfJamCallList.append("--signature")
+ pdfJamCallList.append(repr(opts.signature))
+ else:
+ pdfJamCallList.append("--booklet")
+ pdfJamCallList.append("true")
# add option --paper to call
if opts.paper is not None:
- pdfJamCallList.append( "--paper" )
- pdfJamCallList.append( opts.paper )
+ pdfJamCallList.append("--paper")
+ pdfJamCallList.append(opts.paper)
# add option --short-edge to call
if opts.shortedge:
# check if everyshi.sty exists as texlive recommends
- p = subprocess.Popen( ["kpsewhich", "everyshi.sty"],
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE )
- p.wait()
+ p = subprocess.Popen(
+ ["kpsewhich", "everyshi.sty"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+ )
out, err = p.communicate()
- if len( out ) == 0:
- print "\n\nABORT: The everyshi.sty latex package is needed for short-edge."
- sys.exit( 1 )
+ if len(out) == 0:
+ print("\n\nABORT: The everyshi.sty latex package is needed for short-edge.")
+ sys.exit(1)
else:
- pdfJamCallList.append( "--preamble" )
- pdfJamCallList.append( r"\usepackage{everyshi}\makeatletter\EveryShipout{\ifodd\c@page\pdfpageattr{/Rotate 180}\fi}\makeatother" )
+ pdfJamCallList.append("--preamble")
+ pdfJamCallList.append(
+ r"\usepackage{everyshi}\makeatletter\EveryShipout{\ifodd\c@page\pdfpageattr{/Rotate 180}\fi}\makeatother"
+ )
# run call to pdfJam to make booklet
- p = subprocess.Popen( pdfJamCallList,
- stdout = subprocess.PIPE,
- stderr = subprocess.PIPE )
- p.wait()
-
- #-------------------------------------------- move file and remove temp file
- os.rename( tmpFile[:-4] + "-book.pdf", name[:-4] + "-book.pdf" )
- os.remove( tmpFile )
- print "done"
+ p = subprocess.Popen(pdfJamCallList, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ out, err = p.communicate()
+
+ # -------------------------------------------- move file and remove temp file
+ os.rename(tmpFile[:-4] + "-book.pdf", name[:-4] + "-book.pdf")
+ os.remove(tmpFile)
+ print("done")
sys.stdout.flush()
-#===============================================================================
+# ===============================================================================
# Help formatter
-#===============================================================================
+# ===============================================================================
+
-class MyHelpFormatter ( HelpFormatter ):
+class MyHelpFormatter(HelpFormatter):
"""Format help with indented section bodies.
"""
- def __init__( self,
- indent_increment = 4,
- max_help_position = 16,
- width = None,
- short_first = 0 ):
- HelpFormatter.__init__(
- self, indent_increment, max_help_position, width, short_first )
+ def __init__(self, indent_increment=4, max_help_position=16, width=None, short_first=0):
+ HelpFormatter.__init__(self, indent_increment, max_help_position, width, short_first)
- def format_usage( self, usage ):
- return ( "USAGE\n\n%*s%s\n" ) % ( self.indent_increment, "", usage )
+ def format_usage(self, usage):
+ return ("USAGE\n\n%*s%s\n") % (self.indent_increment, "", usage)
- def format_heading( self, heading ):
- return "%*s%s\n\n" % ( self.current_indent, "", heading.upper() )
+ def format_heading(self, heading):
+ return "%*s%s\n\n" % (self.current_indent, "", heading.upper())
-#===============================================================================
+# ===============================================================================
# main programm
-#===============================================================================
+# ===============================================================================
if __name__ == "__main__":
- #------------------------------------------------------------ useful strings
+ # ------------------------------------------------------------ useful strings
usageString = "Usage: %prog [options] file1 [file2 ...]"
versionString = """
- %prog v1.2
- (c) 2015 Johannes Neumann (http://www.neumannjo.de)
+ %prog v1.4 (https://github.com/jenom/pdfbook2)
+ (c) 2015 - 2020 Johannes Neumann (http://www.neumannjo.de)
licensed under GPLv3 (http://www.gnu.org/licenses/gpl-3.0)
based on pdfbook by David Firth with help from Marco Pessotto\n"""
defaultString = " (default: %default)"
- #------------------------------------------------- create commandline parser
- parser = OptionParser( usage = usageString, version = versionString,
- formatter = MyHelpFormatter( indent_increment = 4 ) )
-
- generalGroup = OptionGroup( parser, "General" )
- generalGroup.add_option( "-p", "--paper", dest = "paper", type = "str", action = "store",
- metavar = "STR",
- help = "Format of the output paper dimensions as latex keyword (e.g. a4paper, letterpaper, legalpaper, ...)" )
- generalGroup.add_option( "-s", "--short-edge", dest = "shortedge", action = "store_true",
- help = "Format the booklet for short-edge double-sided printing",
- default = False )
- generalGroup.add_option( "-n", "--no-crop", dest = "crop", action = "store_false",
- help = "Prevent the cropping to the content area",
- default = True )
- parser.add_option_group( generalGroup )
-
- marginGroup = OptionGroup( parser, "Margins" )
- marginGroup.add_option( "-o", "--outer-margin", type = "int", default = 40,
- dest = "outerMargin", action = "store", metavar = "INT",
- help = "Defines the outer margin in the booklet" + defaultString )
- marginGroup.add_option( "-i", "--inner-margin", type = "int", default = 150,
- dest = "innerMargin", action = "store", metavar = "INT",
- help = "Defines the inner margin between the pages in the booklet" + defaultString )
- marginGroup.add_option( "-t", "--top-margin", type = "int", default = 30,
- dest = "topMargin", action = "store", metavar = "INT",
- help = "Defines the top margin in the booklet" + defaultString )
- marginGroup.add_option( "-b", "--bottom-margin", type = "int", default = 30, metavar = "INT",
- dest = "bottomMargin", action = "store",
- help = "Defines the bottom margin in the booklet" + defaultString )
- parser.add_option_group( marginGroup )
-
- advancedGroup = OptionGroup( parser, "Advanced" )
- advancedGroup.add_option( "--signature", dest = "signature", action = "store", type = "int",
- help = "Define the signature for the booklet handed to pdfjam, needs to be multiple of 4" + defaultString,
- default = 4, metavar = "INT" )
- advancedGroup.add_option( "--signature*", dest = "signature", action = "store", type = "int",
- help = "Same as --signature", metavar = "INT" )
- advancedGroup.add_option( "--resolution", dest = "resolution", action = "store", type = "int",
- help = "Resolution used by ghostscript in bp" + defaultString,
- metavar = "INT", default = 72 )
- parser.add_option_group( advancedGroup )
+ # ------------------------------------------------- create commandline parser
+ parser = OptionParser(
+ usage=usageString, version=versionString, formatter=MyHelpFormatter(indent_increment=4)
+ )
+
+ generalGroup = OptionGroup(parser, "General")
+ generalGroup.add_option(
+ "-p",
+ "--paper",
+ dest="paper",
+ type="str",
+ action="store",
+ metavar="STR",
+ help="Format of the output paper dimensions as latex keyword (e.g. a4paper, letterpaper, legalpaper, ...)",
+ )
+ generalGroup.add_option(
+ "-s",
+ "--short-edge",
+ dest="shortedge",
+ action="store_true",
+ help="Format the booklet for short-edge double-sided printing",
+ default=False,
+ )
+ generalGroup.add_option(
+ "-n",
+ "--no-crop",
+ dest="crop",
+ action="store_false",
+ help="Prevent the cropping to the content area",
+ default=True,
+ )
+ parser.add_option_group(generalGroup)
+
+ marginGroup = OptionGroup(parser, "Margins")
+ marginGroup.add_option(
+ "-o",
+ "--outer-margin",
+ type="int",
+ default=40,
+ dest="outerMargin",
+ action="store",
+ metavar="INT",
+ help="Defines the outer margin in the booklet" + defaultString,
+ )
+ marginGroup.add_option(
+ "-i",
+ "--inner-margin",
+ type="int",
+ default=150,
+ dest="innerMargin",
+ action="store",
+ metavar="INT",
+ help="Defines the inner margin between the pages in the booklet" + defaultString,
+ )
+ marginGroup.add_option(
+ "-t",
+ "--top-margin",
+ type="int",
+ default=30,
+ dest="topMargin",
+ action="store",
+ metavar="INT",
+ help="Defines the top margin in the booklet" + defaultString,
+ )
+ marginGroup.add_option(
+ "-b",
+ "--bottom-margin",
+ type="int",
+ default=30,
+ metavar="INT",
+ dest="bottomMargin",
+ action="store",
+ help="Defines the bottom margin in the booklet" + defaultString,
+ )
+ parser.add_option_group(marginGroup)
+
+ advancedGroup = OptionGroup(parser, "Advanced")
+ advancedGroup.add_option(
+ "--signature",
+ dest="signature",
+ action="store",
+ type="int",
+ help="Define the signature for the booklet handed to pdfjam, needs to be multiple of 4"
+ + defaultString,
+ default=0,
+ metavar="INT",
+ )
+ advancedGroup.add_option(
+ "--signature*",
+ dest="signature",
+ action="store",
+ type="int",
+ help="Same as --signature",
+ metavar="INT",
+ )
+ advancedGroup.add_option(
+ "--resolution",
+ dest="resolution",
+ action="store",
+ type="int",
+ help="Resolution used by ghostscript in bp" + defaultString,
+ metavar="INT",
+ default=72,
+ )
+ parser.add_option_group(advancedGroup)
opts, args = parser.parse_args()
- #------------------------------------ show help if started without arguments
- if len( args ) == 0:
+ # ------------------------------------ show help if started without arguments
+ if len(args) == 0:
parser.print_version()
parser.print_help()
- print ""
- sys.exit( 2 )
+ print("")
+ sys.exit(2)
- #------------------------------------------- run for each provided file name
+ # ------------------------------------------- run for each provided file name
parser.print_version()
for arg in args:
- booklify( arg, opts )
+ booklify(arg, opts)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfbook2.tlpobj new/tlpkg/tlpobj/pdfbook2.tlpobj
--- old/tlpkg/tlpobj/pdfbook2.tlpobj 2019-02-28 03:58:35.000000000 +0100
+++ new/tlpkg/tlpobj/pdfbook2.tlpobj 2020-01-24 01:57:17.000000000 +0100
@@ -1,6 +1,6 @@
name pdfbook2
category Package
-revision 37537
+revision 53521
shortdesc Create booklets from PDF files
longdesc This python program creates print-ready PDF files from some
longdesc input PDF files for booklet printing. The resulting files need
@@ -19,7 +19,6 @@
texmf-dist/scripts/pdfbook2/pdfbook2
catalogue-also pdfbook
catalogue-ctan /support/pdfbook2
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl3
catalogue-topics pdfprocess
-catalogue-version 1.2
+catalogue-version 1.4
++++++ pdfjam.doc.tar.xz ++++++
++++ 2106 lines of diff (skipped)
++++++ pdfjam.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdf180 new/texmf-dist/scripts/pdfjam/pdf180
--- old/texmf-dist/scripts/pdfjam/pdf180 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdf180 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-#!/bin/sh
-##
-## pdf180: A shell program to rotate pages of PDF files
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-exec pdfjam --suffix rotated180 --angle 180 --fitpaper true "$@"
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdf270 new/texmf-dist/scripts/pdfjam/pdf270
--- old/texmf-dist/scripts/pdfjam/pdf270 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdf270 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-#!/bin/sh
-##
-## pdf270: A shell program to rotate pages of PDF files
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##.
-exec pdfjam --suffix rotated270 --angle 270 --fitpaper true --rotateoversize true "$@"
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdf90 new/texmf-dist/scripts/pdfjam/pdf90
--- old/texmf-dist/scripts/pdfjam/pdf90 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdf90 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-#!/bin/sh
-##
-## pdf90: A shell program to rotate pages of PDF files
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-exec pdfjam --suffix rotated90 --angle 90 --fitpaper true --rotateoversize true "$@"
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfbook new/texmf-dist/scripts/pdfjam/pdfbook
--- old/texmf-dist/scripts/pdfjam/pdfbook 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfbook 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-#!/bin/sh
-##
-## pdfbook: Rearrange pages of one or more PDF files into 2-up signatures
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth), with help
-## from Marco Pessotto
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-case $1 in
- --short-edge)
- shortedge=true ;
- shift ;
- ;;
- *)
- ;;
-esac
-for arg
-do
- case $arg in
- --signature*)
- ## catches both --signature and --signature*
- signature=true ; break
- ;;
- *) ;;
- esac
-done
-##
-## If $signature is empty, we need to use a default:
-##
-if test -z "$signature" ; then
- signature="--signature 4"
-else
- signature=""
-fi
-##
-## Make the call to pdfjam:
-##
-if test -z "$shortedge"
-then
- exec pdfjam --booklet true --landscape --suffix book $signature "$@"
-else
- (kpsewhich everyshi.sty >/dev/null) || {
- echo "the 'everyshi' package is not installed."; exit 1
- }
- exec pdfjam --booklet true --landscape --suffix book $signature \
- --preamble '\usepackage{everyshi}
-\makeatletter
-\EveryShipout{\ifodd\c@page\pdfpageattr{/Rotate 180}\fi}
-\makeatother
-' "$@"
-fi
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfflip new/texmf-dist/scripts/pdfjam/pdfflip
--- old/texmf-dist/scripts/pdfjam/pdfflip 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfflip 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-#!/bin/sh
-##
-## pdfflip: A shell program to "flip over" the pages of PDF files
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-exec pdfjam --suffix flipped --reflect true --fitpaper true "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfjam new/texmf-dist/scripts/pdfjam/pdfjam
--- old/texmf-dist/scripts/pdfjam/pdfjam 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfjam 2019-11-19 01:11:53.000000000 +0100
@@ -1,16 +1,17 @@
#!/bin/sh
-version=2.08
+version=3.03
#########################################################################
## ##
## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ##
## ------ ##
## ##
-## Author: David Firth (http://go.warwick.ac.uk/dfirth) ##
+## Author: David Firth (http://warwick.ac.uk/dfirth) ##
## ##
-## Usage: see http://go.warwick.ac.uk/pdfjam or "pdfjam --help" ##
+## Usage: see https://github.com/DavidFirth/pdfjam ##
+## or "pdfjam --help" ##
## ##
## Relies on: ##
-## -- pdflatex ##
+## -- pdflatex (or xelatex or lualatex) ##
## -- the 'pdfpages' package for LaTeX (ideally version >= 0.4f) ##
## ##
## License: GPL version 2 or later. This software comes with ##
@@ -26,6 +27,197 @@
## ##
#########################################################################
##
+## HELP TEXT
+##
+## Defines the output of 'pdfjam --help'
+##
+helptext="
+pdfjam is a shell-script front end to the LaTeX 'pdfpages' package (for
+which, see http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages).
+
+Usage: pdfjam [OPTIONS] [--] [FILE1 [SEL1]] [FILE2 [SEL2]]...
+where
+* 'FILE1' etc. are PDF files (JPG and PNG files are also allowed). For
+ input from /dev/stdin, use the special name '/dev/stdin' in place of any
+ of FILE1, FILE2, etc: this can be mixed with 'real' files as needed, to
+ allow input through a pipe (note that if /dev/stdin is connected to tty,
+ an error results). If 'FILE1' is absent, pdfjam will use '/dev/stdin'
+ (and will use '-' for the page selection -- see next item).
+* 'SEL1' is a page selection for FILE1, etc.
+ To select all pages (the default) use '-'. See the pdfpages manual for
+ more details. An example:
+ ... file1 '{},2,4-6,9-' ...
+ makes an empty page, followed by pages 2,4,5,6 of file1, followed by pages
+ 9 onwards (up to the end of file1).
+ A page selection can be applied to more than one file, e.g.,
+ ... file1 file2 file3 1-7 ...
+ applies page selection '1-7' to all three files; but for example
+ ... file1 file2 2- file3 1-7 ...
+ would apply the page selection '2-' to file1 and file2, and '1-7'
+ to file3. A page selection applies to all the files *immediately*
+ preceding it in the argument list. A missing page selection defaults to
+ '-'; this includes the case where 'FILE1' is absent and so /dev/stdin gets
+ used by default.
+* 'options' are pdfpages specifications in the form '--KEY VALUE' (see
+ below), or
+ --help (or -h, or -u)
+ Output this text only; no processing of PDF files.
+ --configpath
+ Output the 'configpath' variable and exit immediately; no
+ processing of PDF files.
+ --version (or -V)
+ Output the version number of pdfjam and exit immediately; no
+ processing of PDF files.
+ --quiet (or -q)
+ Suppress verbose commentary on progress.
+ --batch
+ Run pdfjam sequentially on each input file in turn, and
+ produce a separate output file for each input, rather
+ than the default behaviour (which is a single run of
+ pdfjam on all of the input files, producing a single
+ output document). For the location of output
+ files, see '--outfile'. The --batch option cannot be
+ used in the case of input from stdin.
+ --outfile PATH (or -o PATH)
+ Specifies where the output file(s) will go. If PATH is an
+ existing directory, pdfjam will attempt to write its
+ output PDF file(s) there, with name(s) derived from the
+ input file name(s) and the --suffix option (see below).
+ Otherwise the output file will be PATH. If '/dev/stdin'
+ is the only or last input file, PATH cannot be a directory.
+ Your current default PATH for output is:
+ $outFile
+ --suffix STRING
+ Specifies a suffix for output file names, to be used when
+ --outfile is either (a) a directory, or
+ (b) not specified in a --batch call.
+ A good STRING should be descriptive: for example,
+ --suffix 'rotated'
+ would append the text '-rotated' to the name of the input
+ file in order to make the output file name, as in
+ 'myfile-rotated.pdf'. The STRING must not have zero
+ length.
+ [Default for you at this site: suffix=$suffix]
+ --checkfiles
+ --no-checkfiles
+ If the Unix 'file' utility is available, with options
+ -L and -b, the output of 'file -Lb FILE1' should be
+ 'PDF document...' where '...' gives version information.
+ If this is the case on your system you should use
+ '--checkfiles'; otherwise use '--no-checkfiles',
+ in which case all input PDF files must have .pdf or .PDF
+ as their name extension.
+ [Default for you at this site: checkfiles=$checkfiles]
+ --preamble STRING
+ Append the supplied STRING to the preamble of the LaTeX
+ source file(s), immediately before the '\begin{document}'
+ line. An example:
+ pdfjam --nup 2x2 myfile.pdf -o myfile-4up.pdf \\
+ --preamble '\usepackage{fancyhdr} \pagestyle{fancy}'
+ The '--preamble' option can be used, for example, to load
+ LaTeX packages and/or to set global options. If '--preamble'
+ is used more than once in the call, the supplied preamble
+ strings are simply concatenated. For a note on avoiding
+ clashes, see the PDFjam-README file (also available at
+ http://www.pdfjam.net).
+ --keepinfo
+ --no-keepinfo
+ Preserve (or not) Title, Author, Subject and Keywords
+ (from the last input PDF file, if more than one) in the
+ output PDF file. This requires the pdfinfo utility, from
+ the xpdf package, and the LaTeX 'hyperref' package; if
+ either of those is not available, '--keepinfo' is ignored.
+ [Default for you at this site: keepinfo=$keepinfo]
+ --pdftitle STRING
+ --pdfauthor STRING
+ --pdfsubject STRING
+ --pdfkeywords STRING
+ Provide text for the Title, Author, Subject and Keywords
+ in the output PDF file. Requires the LaTeX 'hyperref'
+ package. These options, individually, over-ride --keepinfo.
+ --landscape
+ --no-landscape
+ Specify landscape page orientation (or not) in the
+ output PDF file.
+ [Default for you at this site: landscape=$landscape]
+ --twoside
+ --no-twoside
+ Specify (or not) the 'twoside' document class option.
+ [Default for you at this site: twoside=$twoside]
+ --paper PAPERSPEC (or simply --PAPERSPEC)
+ Specify a LaTeX paper size, for example
+ '--paper a4paper' or simply '--a4paper' for ISO A4 paper.
+ If the LaTeX 'geometry' package is installed, a wider range
+ of paper sizes is available. For details see documentation
+ for LaTeX and/or the 'geometry' package.
+ [Default for you at this site: paper=$paper]
+ --papersize '{WIDTH,HEIGHT}'
+ Specify a custom paper size, e.g.,
+ --papersize '{10in,18cm}'
+ (Note the braces, and the comma!)
+ If the 'geometry' package is not found, this has no effect.
+ --pagecolor RGBSPEC
+ Specify a background colour for the output pages. The
+ RGBSPEC must be a comma-separated trio of integers
+ between 0 and 255. An example:
+ --pagecolor 150,200,150
+ [Default is no background colour]
+ --tidy
+ --no-tidy
+ Specify whether the temporary directory created by
+ pdfjam should be deleted. Use '--no-tidy' to help debug
+ most errors.
+ [Default for you at this site: tidy=$tidy]
+ --latex PATHTOLATEX
+ Specify the LaTeX engine to be used (one of pdflatex,
+ xelatex, lualatex). The PATHTOLATEX string must be
+ the full path to a suitable LaTeX executable (for example
+ /usr/bin/xelatex on many unix systems).
+ [Default for you at this site: latex=$latex]
+ --runs N
+ Run latex N times, for each output document made.
+ [Default for you at this site: runs=$runs]
+ --vanilla
+ Suppress the reading of any site-wide or user-specific
+ configuration files.
+ --KEY VALUE
+ Specify options to '\includepdfmerge', in the LaTeX
+ 'pdfpages' package. Here KEY is the name of any of the
+ many options for '\includepdfmerge', and VALUE is a
+ corresponding value. Examples are
+ --nup 2x1 (for 2-up side-by-side imposition)
+ --scale 0.7 (to scale all input pages to 70% size)
+ --offset '1cm 0.5cm'
+ (to offset all pages -- note the quotes!)
+ --frame true (to put a frame round each input page)
+ --trim '1cm 2cm 1cm 2cm' --clip true
+ (to trim those amounts from left, bottom,
+ right and top, respectively, of input
+ pages)
+ etc., etc. For more information see the manual for
+ the 'pdfpages' package, at
+ http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages
+* '--' can be used to signal that there are no more options to come.
+
+Defaults for the options '--suffix', '--keepinfo', '--paper', '--outfile',
+'--landscape', '--twoside', '--tidy', '--latex', '--runs', '--checkfiles'
+and '--preamble' can be set in site-wide or user-specific configuration files.
+The path that is searched for site-wide configuration files (named pdfjam.conf)
+at this installation is
+ $configpath
+This configuration path can be changed by editing the pdfjam script if
+necessary. Any user-specific configuration should be put in a file named
+.pdfjam.conf in your home directory. (All of these files are ignored
+if the '--vanilla' argument is used.)
+
+For more information, including a sample configuration file, see
+https://github.com/DavidFirth/pdfjam.
+"
+##
+## END OF HELP TEXT
+##
+#########################################################################
+##
## PRELIMINARIES
##
## First determine:
@@ -50,7 +242,8 @@
batch=true ;
;;
--help | -u | -h)
- help=true ;
+ printf "%s\n" "$helptext" ;
+ exit 0 ;
;;
--vanilla)
vanilla=true ;
@@ -73,11 +266,11 @@
##
## Record the full filename of the current working diractory
##
-pwd=`pwd`
+pwd=$(pwd)
##
## Trap interrupts so that they kill everything:
##
-trap 'IFS=$OIFS; exit 1' 1 2 9 15
+trap 'IFS=$OIFS; exit 1' 1 2 15
##
## The following will be useful for readability of the script:
##
@@ -95,7 +288,7 @@
prattle () { ## second argument here is non-null for continuation lines
if test $verbose = true; then
prefix1=" pdfjam:" ;
- prefix2=`printf "%s" "$prefix1" | sed 's/pdfjam:/ /'` ;
+ prefix2=$(printf "%s" "$prefix1" | sed 's/pdfjam:/ /') ;
indent="" ;
if test "$PDFJAM_CALL_NUMBER" -gt 0 &&
test "$batch" != true
@@ -106,7 +299,7 @@
lineCounter=0 ;
for line in ${1}
do
- lineCounter=`expr $lineCounter + 1` ;
+ lineCounter=$((lineCounter + 1)) ;
if test $lineCounter -eq 1 && test ! -n "${2}" ;
then
if test -w "$PDFJAM_MESSAGES_FILE"
@@ -149,22 +342,21 @@
## once, the last instance prevails.)
##
## An example configuration file can be found at
-## http://go.warwick.ac.uk/pdfjam
+## https://github.com/DavidFirth/pdfjam
##
## The path searched for site-wide configuration files can be changed
## by editing the variable 'configpath' at the top of this file.
##
##
-## First check whether 'pdflatex' is in the user's path:
-##
-pdflatex=pdflatex
-(hash pdflatex >/dev/null 2>&1) || pdflatex="not found"
+## First get the full path (if it exists) to pdflatex:
##
+latex=$(command -v pdflatex)
+if [ -z "$latex" ] ; then latex="not found" ; fi
##
-## Likewise for the pdfinfo utility (only needed for `--keepinfo'):
+## Likewise for the pdfinfo (only needed for `--keepinfo'):
##
-pdfinfo='pdfinfo'
-(hash pdfinfo >/dev/null 2>&1) || pdfinfo="not found"
+pdfinfo=$(command -v pdfinfo)
+if [ -z "$pdfinfo" ] ; then pdfinfo="not found"; fi
##
##
## Next a permitted location for temporary files on your system:
@@ -179,6 +371,8 @@
##
## A few more default settings for pdfjam:
##
+runs=1 ## Run latex just once
+##
tidy='true' ## Delete all temporary files at the end
##
keepinfo='false' ## Don't try to preserve "pdfinfo" data
@@ -193,7 +387,23 @@
##
preamble='' ## Default LaTeX preamble string.
##
-paper='a4paper' ## Default paper size is ISO A4.
+## Guess default paper size from locale if possible, otherwise A4
+##
+if command -v locale >/dev/null ; then
+ paperheight=$(locale -k LC_PAPER | sed -e '1!d' -e 's/.*=//') ;
+ case $paperheight in
+ 297)
+ paper='a4paper' ;
+ ;;
+ 279)
+ paper='letterpaper' ;
+ ;;
+ *)
+ paper='a4paper' ;
+ ;;
+ esac
+else paper='a4paper' ; ## fallback paper size is ISO A4
+fi
##
## END OF SETTINGS MADE DIRECTLY WITHIN THE SCRIPT
##
@@ -204,8 +414,8 @@
then
if test "$PDFJAM_CALL_NUMBER" = 0 ## not a secondary call to pdfjam
then
- configFiles=`printf "%s" "$configpath" | \
- sed 's/:/\/pdfjam.conf:/g; s/$/\/pdfjam.conf/'`
+ configFiles=$(printf "%s" "$configpath" | \
+ sed 's/:/\/pdfjam.conf:/g; s/$/\/pdfjam.conf/')
configFiles="${configFiles}:$HOME/.pdfjam.conf"
PDFJAM_CONFIG=""
prattle "Reading any site-wide or user-specific defaults..."
@@ -213,13 +423,13 @@
for d in $configFiles
do
if test -f "$d"; then
- change=`sed '/^ *#.*/d ; s/ *#.*//; s/^ *//' "$d"`
+ change=$(sed '/^ *#.*/d ; s/ *#.*//; s/^ *//' "$d")
comment="## ${newline}## From ${d}: ${newline}##"
PDFJAM_CONFIG="$PDFJAM_CONFIG$comment$newline$change$newline"
fi
done
IFS="$OIFS"
- PDFJAM_CONFIG=`printf "%s" "$PDFJAM_CONFIG" | sed 's/^/ /'`
+ PDFJAM_CONFIG=$(printf "%s" "$PDFJAM_CONFIG" | sed 's/^/ /')
if test "$batch" = true ; then export PDFJAM_CONFIG ; fi
if test -z "$PDFJAM_CONFIG"
then
@@ -236,207 +446,29 @@
prattle "files will be read." 1
fi
fi
+## For backwards compatibility, check here for a $pdflatex setting in the config file
+if [ -n "${pdflatex:-}" ] ; then latex="$pdflatex" ; fi
##
## END OF CONFIGURATION BLOCK
##
#########################################################################
##
-## HELP TEXT
-##
-## Defines the output of 'pdfjam --help'
-##
-helptext="
-pdfjam is a shell-script front end to the LaTeX 'pdfpages' package (for
-which, see http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages).
-
-Usage: pdfjam [OPTIONS] [--] [FILE1 [SEL1]] [FILE2 [SEL2]]...
-where
-* 'FILE1' etc. are PDF files (JPG and PNG files are also allowed). For
- input from /dev/stdin, use the special name '/dev/stdin' in place of any
- of FILE1, FILE2, etc: this can be mixed with 'real' files as needed, to
- allow input through a pipe (note that if /dev/stdin is connected to tty,
- an error results). If 'FILE1' is absent, pdfjam will use '/dev/stdin'
- (and will use '-' for the page selection -- see next item).
-* 'SEL1' is a page selection for FILE1, etc.
- To select all pages (the default) use '-'. See the pdfpages manual for
- more details. An example:
- ... file1 '{},2,4-5,9-' ...
- makes an empty page, followed by pages 2,4,5,6 of file1, followed by pages
- 9 onwards (up to the end of file1).
- A page selection can be applied to more than one file, e.g.,
- ... file1 file2 file3 1-7 ...
- applies page selection '1-7' to all three files; but for example
- ... file1 file2 2- file3 1-7 ...
- would apply the page selection '2-' to file1 and file2, and '1-7'
- to file3. A page selection applies to all the files *immediately*
- preceding it in the argument list. A missing page selection defaults to
- '-'; this includes the case where 'FILE1' is absent and so /dev/stdin gets
- used by default.
-* 'options' are pdfpages specifications in the form '--KEY VALUE' (see
- below), or
- --help (or -h, or -u)
- Output this text only; no processing of PDF files.
- --configpath
- Output the 'configpath' variable and exit immediately; no
- processing of PDF files.
- --version (or -V)
- Output the version number of pdfjam and exit immediately; no
- processing of PDF files.
- --quiet (or -q)
- Suppress verbose commentary on progress.
- --batch
- Run pdfjam sequentially on each input file in turn, and
- produce a separate output file for each input, rather
- than the default behaviour (which is a single run of
- pdfjam on all of the input files, producing a single
- output document). For the location of output
- files, see '--outfile'. The --batch option cannot be
- used in the case of input fron stdin.
- --outfile PATH (or -o PATH)
- Specifies where the output file(s) will go. If PATH is an
- existing directory, pdfjam will attempt to write its
- output PDF file(s) there, with name(s) derived from the
- input file name(s) and the --suffix option (see below).
- Otherwise the output file will be PATH. If '/dev/stdin'
- is the only or last input file, PATH cannot be a directory.
- Your current default PATH for output is:
- $outFile
- --suffix STRING
- Specifies a suffix for output file names, to be used when
- --outfile is either (a) a directory, or
- (b) not specified in a --batch call.
- A good STRING should be descriptive: for example,
- --suffix 'rotated'
- would append the text '-rotated' to the name of the input
- file in order to make the output file name, as in
- 'myfile-rotated.pdf'. The STRING must not have zero
- length.
- [Default for you at this site: suffix=$suffix]
- --checkfiles
- --no-checkfiles
- If the Unix 'file' utility is available, with options
- -L and -b, the output of 'file -Lb FILE1' should be
- 'PDF document...' where '...' gives version information.
- If this is the case on your system you should use
- '--checkfiles'; otherwise use '--no-checkfiles',
- in which case all input PDF files must have .pdf or .PDF
- as their name extension.
- [Default for you at this site: checkfiles=$checkfiles]
- --preamble STRING
- Append the supplied STRING to the preamble of the LaTeX
- source file(s), immediately before the '\begin{document}'
- line. An example:
- pdfjam --nup 2x2 myfile.pdf -o myfile-4up.pdf \\
- --preamble '\usepackage{fancyhdr} \pagestyle{fancy}'
- The '--preamble' option can be used, for example, to load
- LaTeX packages and/or to set global options. If '--preamble'
- is used more than once in the call, the supplied preamble
- strings are simply concatenated.
- --keepinfo
- --no-keepinfo
- Preserve (or not) Title, Author, Subject and Keywords
- (from the last input PDF file, if more than one) in the
- output PDF file. This requires the pdfinfo utility, from
- the xpdf package, and the LaTeX 'hyperref' package; if
- either of those is not available, '--keepinfo' is ignored.
- [Default for you at this site: keepinfo=$keepinfo]
- --pdftitle STRING
- --pdfauthor STRING
- --pdfsubject STRING
- --pdfkeywords STRING
- Provide text for the Title, Author, Subject and Keywords
- in the output PDF file. Requires the LaTeX 'hyperref'
- package. These options, individually, over-ride --keepinfo.
- --landscape
- --no-landscape
- Specify landscape page orientation (or not) in the
- output PDF file.
- [Default for you at this site: landscape=$landscape]
- --twoside
- --no-twoside
- Specify (or not) the 'twoside' document class option.
- [Default for you at this site: twoside=$twoside]
- --paper PAPERSPEC (or simply --PAPERSPEC)
- Specify a LaTeX paper size, for example
- '--paper a4paper' or simply '--a4paper' for ISO A4 paper.
- If the LaTeX 'geometry' package is installed, a wider range
- of paper sizes is available. For details see documentation
- for LaTeX and/or the 'geometry' package.
- [Default for you at this site: paper=$paper]
- --papersize '{WIDTH,HEIGHT}'
- Specify a custom paper size, e.g.,
- --papersize '{10in,18cm}'
- (Note the braces, and the comma!)
- If the 'geometry' package is not found, this has no effect.
- --pagecolor RGBSPEC
- Specify a background colour for the output pages. The
- RGBSPEC must be a comma-separated trio of integers
- between 0 and 255. An example:
- --pagecolor 150,200,150
- [Default is no background colour]
- --tidy
- --no-tidy
- Specify whether the temporary directory created by
- pdfjam should be deleted. Use '--no-tidy' to help debug
- most errors.
- [Default for you at this site: tidy=$tidy]
- --vanilla
- Suppress the reading of any site-wide or user-specific
- configuration files.
- --KEY VALUE
- Specify options to '\includepdfmerge', in the LaTeX
- 'pdfpages' package. Here KEY is the name of any of the
- many options for '\includepdfmerge', and VALUE is a
- corresponding value. Examples are
- --nup 2x1 (for 2-up side-by-side imposition)
- --scale 0.7 (to scale all input pages to 70% size)
- --offset '1cm 0.5cm'
- (to offset all pages -- note the quotes!)
- --frame true (to put a frame round each input page)
- --trim '1cm 2cm 1cm 2cm' --clip true
- (to trim those amounts from left, bottom,
- right and top, respectively, of input
- pages)
- etc., etc. For more information see the manual for
- the 'pdfpages' package, at
- http://www.ctan.org/tex-archive/macros/latex/contrib/pdfpages
-* '--' can be used to signal that there are no more options to come.
-
-Defaults for the options '--suffix', '--keepinfo', '--paper', '--outfile',
-'--landscape', '--twoside', '--tidy', '--checkfiles' and '--preamble' can be
-set in site-wide or user-specific configuration files. The path that is
-searched for site-wide configuration files (named pdfjam.conf) at this
-installation is
- $configpath
-This configuration path can be changed by editing the pdfjam script if
-necessary. Any user-specific configuration should be put in a file named
-.pdfjam.conf in your home directory. (All of these files are ignored
-if the '--vanilla' argument is used.)
-
-For more information, including an example configuration file, see
-http://go.warwick.ac.uk/pdfjam.
-"
-##
-## END OF HELP TEXT
-##
-#########################################################################
-##
## ERROR CODES
##
E_USAGE=64 # command line usage error
-E_DATAERR=65 # data format error
E_NOINPUT=66 # cannot open input
E_UNAVAILABLE=69 # service unavailable
E_SOFTWARE=70 # internal software error
+E_OSFILE=72 # file does not exist or cannot be opened
E_CANTCREATE=73 # can't create (user) output file
E_CONFIG=78 # configuration error
##
## Define a function to print an error message and exit:
##
error_exit () {
- if (test -r "$PDFJAM_MESSAGES_FILE")
+ if [ -r "$PDFJAM_MESSAGES_FILE" ]
then cat "$PDFJAM_MESSAGES_FILE" >&2
- else printf "$messages" 1>&2
+ else printf "%s" "$messages" 1>&2
fi
printf " pdfjam ERROR: %s\n" "$1" 1>&2 ;
exit "$2" ;
@@ -486,19 +518,20 @@
shift ;
continue ;
;;
- --help | -u | -h)
- printf "%s\n" "$helptext" ;
- exit 0;;
--configpath)
printf "%s\n" "$configpath" ;
exit 0;;
--* | -q | -o)
if test "$pageSpecAwaited" = true ; then
## fill in any missing page specs before continuing
- fileSpec=`printf "%s" "$fileSpec" | sed 's/|awaited/|-/g'`
+ fileSpec=$(printf "%s" "$fileSpec" | sed 's/|awaited/|-/g')
pageSpecAwaited=false
fi
case ${1} in
+ --latex)
+ latex="${2}" ;
+ callOptions="$callOptions --latex ${2}" ;
+ shift ;;
--batch)
batch=true ;
;;
@@ -513,7 +546,7 @@
outFile="${2}" ;
if test "$batch" = true
then
- outFile=`escape_chars "$outFile"`
+ outFile=$(escape_chars "$outFile")
fi
callOptions="$callOptions --outfile $outFile" ;
shift ;;
@@ -523,7 +556,7 @@
suffix="${2}" ;
if test "$batch" = true
then
- suffix=`escape_chars "$suffix"`
+ suffix=$(escape_chars "$suffix")
fi
callOptions="$callOptions --suffix $suffix"
shift
@@ -533,6 +566,16 @@
$E_USAGE ;
fi
;;
+ --runs)
+ runs="${2}" ;
+ ## check if the argument is a number > 0
+ if [ "$runs" -lt 1 ] 2> /dev/null; then
+ error_exit \
+ "'--runs' number must be at least 1" \
+ $E_USAGE ;
+ fi
+ callOptions="$callOptions --runs ${2}" ;
+ shift ;;
--tidy)
tidy=true ;
callOptions="$callOptions --tidy" ;
@@ -557,7 +600,7 @@
pdfTitle="${2}" ;
if test "$batch" = true
then
- pdfTitle=`escape_chars "$pdfTitle"`
+ pdfTitle=$(escape_chars "$pdfTitle")
fi
callOptions="$callOptions --pdftitle $pdfTitle" ;
shift ;;
@@ -565,7 +608,7 @@
pdfAuthor="${2}" ;
if test "$batch" = true
then
- pdfAuthor=`escape_chars "$pdfAuthor"`
+ pdfAuthor=$(escape_chars "$pdfAuthor")
fi
callOptions="$callOptions --pdfauthor $pdfAuthor" ;
shift ;;
@@ -573,7 +616,7 @@
pdfSubject="${2}" ;
if test "$batch" = true
then
- pdfSubject=`escape_chars "$pdfSubject"`
+ pdfSubject=$(escape_chars "$pdfSubject")
fi
callOptions="$callOptions --pdfsubject $pdfSubject" ;
shift ;;
@@ -581,7 +624,7 @@
pdfKeywords="${2}" ;
if test "$batch" = true
then
- pdfKeywords=`escape_chars "$pdfKeywords"`
+ pdfKeywords=$(escape_chars "$pdfKeywords")
fi
callOptions="$callOptions --pdfkeywords $pdfKeywords" ;
shift ;;
@@ -596,7 +639,7 @@
--a4paper | --a5paper | --b5paper | --letterpaper | \
--executivepaper | --legalpaper)
## standard LaTeX paper sizes
- paper=`printf "%s" "${1}" | sed 's/^--//'` ;
+ paper=$(printf "%s" "${1}" | sed 's/^--//') ;
callOptions="$callOptions ${1}" ;
;;
--a0paper | --a1paper | --a2paper | --a3paper | \
@@ -605,7 +648,7 @@
## the 'geometry' package is needed
if test "$geometry" != false ;
then
- paper=`printf "%s" "${1}" | sed 's/^--//'` ;
+ paper=$(printf "%s" "${1}" | sed 's/^--//') ;
callOptions="$callOptions ${1}" ;
geometry=true ;
fi ;
@@ -640,7 +683,7 @@
shift ;;
--*)
## options for \includepdfmerge
- argName=`printf "%s" "${1}" | sed 's/^--//'`;
+ argName=$(printf "%s" "${1}" | sed 's/^--//');
value="${2}"
miscOptions=$miscOptions,"$argName=$value" ;
## saved for possible use in LaTeX file
@@ -663,8 +706,8 @@
inputFromStdin=true ;;
-)
if test "$pageSpecAwaited" = true ; then
- fileSpec=`printf "%s" "$fileSpec" | \
- sed 's/|awaited/|-/g'`
+ fileSpec=$(printf "%s" "$fileSpec" | \
+ sed 's/|awaited/|-/g')
pageSpecAwaited=false
else
error_exit "no PDF/JPG/PNG file found at ${1}" \
@@ -674,10 +717,10 @@
## source files and page selections; if not, we'll quit
if test "$checkfiles" = true ; ## not always available
then
- case `file -Lb "${1}"` in
+ case $(file -Lb "${1}") in
"PDF document"*|"JPEG image data"*|"PNG image"*)
## it's a PDF file (or JPG/PNG) as expected
- fileSpec="$fileSpec${newline}"${1}"|awaited"
+ fileSpec="$fileSpec${newline}${1}|awaited"
pageSpecAwaited=true
;;
*)
@@ -691,8 +734,8 @@
*) ## if page spec needed, assume this is it;
## otherwise something is wrong
if test "$pageSpecAwaited" = true ; then
- fileSpec=`printf "%s" "$fileSpec" | \
- sed "s/|awaited/|$1/g"`
+ fileSpec=$(printf "%s" "$fileSpec" | \
+ sed "s/|awaited/|$1/g")
pageSpecAwaited=false
else
error_exit "no PDF/JPG/PNG file found at ${1}" \
@@ -715,8 +758,8 @@
*) ## if page spec needed, assume this is it;
## otherwise something is wrong
if test "$pageSpecAwaited" = true ; then
- fileSpec=`printf "%s" "$fileSpec" | \
- sed "s/|awaited/|$1/g"`
+ fileSpec=$(printf "%s" "$fileSpec" | \
+ sed "s/|awaited/|$1/g")
pageSpecAwaited=false
else
error_exit "no PDF/JPG/PNG file found at ${1}" \
@@ -733,7 +776,7 @@
##
## Use the default page spec for any that remain unspecified:
##
-fileSpec=`printf "%s" "$fileSpec" | sed '/^$/d; s/^ //; s/|awaited$/|-/'`
+fileSpec=$(printf "%s" "$fileSpec" | sed '/^$/d; s/^ //; s/|awaited$/|-/')
##
## Check whether input from stdin should be used by default:
if test $PDFJAM_CALL_NUMBER -eq 0 && test "$inputFromStdin" != true
@@ -749,14 +792,14 @@
##
## Delete leading comma from $miscOptions:
##
-miscOptions=`printf "%s" "$miscOptions" | sed 's/^,//'`
+miscOptions=$(printf "%s" "$miscOptions" | sed 's/^,//')
##
if test -n "$preamble"
then callOptions="$callOptions --preamble '$preamble'"
fi
## Delete leading space from $callOptions:
##
-callOptions=`printf "%s" "$callOptions" | sed 's/^ //'`
+callOptions=$(printf "%s" "$callOptions" | sed 's/^ //')
##
## Set up a document options variable:
##
@@ -787,7 +830,7 @@
esac
fi
documentOptions="$paper","$orientation","$twoside"
-documentOptions=`printf "%s" "$documentOptions" | sed 's/^,//' | sed 's/,$//'`
+documentOptions=$(printf "%s" "$documentOptions" | sed 's/^,//' | sed 's/,$//')
##
## END OF ARGUMENT PROCESSING
##
@@ -799,18 +842,16 @@
##
if test $PDFJAM_CALL_NUMBER -eq 0 ## not a secondary call
then
- ## Check whether there's a pdflatex, if "$pdflatex" is still unset:
- case $pdflatex in
+ ## Check whether there's a suitable latex to use:
+ case $latex in
"not found")
error_exit "can't find pdflatex!" $E_UNAVAILABLE
;;
- pdflatex)
- ;;
- *) ## $pdflatex was set in a configuration file
- if test ! -x "$pdflatex"
+ *) ##
+ if test ! -x "$latex"
then
error_exit \
- "configuration error, $pdflatex is not an executable file" \
+ "configuration error, $latex is not an executable file" \
$E_CONFIG
fi
;;
@@ -818,7 +859,7 @@
##
## Check that necessary LaTeX packages are installed:
##
- modifyPath=`printf "%s" "$pdflatex" | sed 's/\/[^\/]*$//'`
+ modifyPath=$(printf "%s" "$latex" | sed 's/\/[^\/]*$//')
if [ -n "$modifyPath" ] ; then
PATH="$modifyPath:$PATH"
export PATH
@@ -853,7 +894,7 @@
hyperref=false
fi
if test "$geometry" = true
- ## if, if the 'geometry' package is needed for paper size
+ ## ie, if the 'geometry' package is needed for paper size
then
(kpsewhich geometry.sty >/dev/null) || {
prattle "LaTeX package geometry.sty is not installed, so only the"
@@ -911,25 +952,22 @@
## Use mktemp if possible; otherwise fall back on mkdir,
## with random name to make file collisions less likely.
##
-original_umask=`umask`
+original_umask=$(umask)
umask 177
if test $PDFJAM_CALL_NUMBER = 0 ## don't repeat this work for secondary calls
then
PDFJAM_TEMP_DIR=''
trap 'IFS="$OIFS"; \
if test $tidy != false ; then cd "$pwd"; rm -rf "$PDFJAM_TEMP_DIR"; fi; exit 1' \
- 1 2 9 15
+ 1 2 15
trap 'IFS="$OIFS"; \
if test $tidy != false ; then cd "$pwd"; rm -rf "$PDFJAM_TEMP_DIR"; fi' 0
{
- PDFJAM_TEMP_DIR=`
- (umask 077 && mktemp -d "$tempfileDir/pdfjam-XXXXXX") 2>/dev/null
- ` &&
+ PDFJAM_TEMP_DIR=$( (umask 077 && mktemp -d "$tempfileDir/pdfjam-XXXXXX") 2>/dev/null) &&
test -n "$PDFJAM_TEMP_DIR" && test -d "$PDFJAM_TEMP_DIR"
} || {
## We'll use awk to make random number, for portability
- random=`
- awk 'END { srand(); printf ("%d\n", rand()*1000000); }' /dev/null`
+ random=$(awk 'END { srand(); printf ("%d\n", rand()*1000000); }' /dev/null)
PDFJAM_TEMP_DIR="$tempfileDir"/pdfjam"$$"-"$random"
(umask 077 && mkdir "$PDFJAM_TEMP_DIR")
} || exit $?
@@ -942,13 +980,17 @@
PDFJAM_MESSAGES_FILE="$PDFJAM_TEMP_DIR"/messages.txt
export PDFJAM_MESSAGES_FILE
## so that secondary calls can write messages there as well
- printf "$messages" > "$PDFJAM_MESSAGES_FILE" ## initial file contents
+ printf "%s" "$messages" > "$PDFJAM_MESSAGES_FILE" ## initial file contents
messages="" ## we won't be using this variable again!
else
- PDFJAM_TEMP_DIR="$PDFJAM_TEMP_DIR"/"file$PDFJAM_CALL_NUMBER"
+ PDFJAM_TEMP_DIR="$PDFJAM_TEMP_DIR/file$PDFJAM_CALL_NUMBER"
(umask 077 && mkdir "$PDFJAM_TEMP_DIR")
fi
-umask $original_umask
+umask "$original_umask"
+## Next is from the Cygwin patch contributed by Lucas
+case $(uname) in
+ *CYGWIN*) PDFJAM_TEMP_DIR=$(cygpath -w "$PDFJAM_TEMP_DIR");;
+esac
##
## TEMPORARY DIRECTORY ALL DONE
##
@@ -970,13 +1012,13 @@
fi
IFS="$newline"
for k in $fileSpec ; do
- sourcePath=`printf "%s" "$k" | sed 's/|[^|]*$//'`
- pageSpec=`printf "%s" $k | sed 's/.*|//'`
- callNumber=`expr $PDFJAM_CALL_NUMBER + 1`
+ sourcePath=$(printf "%s" "$k" | sed 's/|[^|]*$//')
+ pageSpec=$(printf "%s" $k | sed 's/.*|//')
+ callNumber=$((PDFJAM_CALL_NUMBER + 1))
prattle "--"
prattle "Processing file ${callNumber}, '$sourcePath'..."
prattle "Page spec is '$pageSpec'."
- sourcePath=`escape_chars "$sourcePath"`
+ sourcePath=$(escape_chars "$sourcePath")
PDFJAM_EFFECTIVE_CALL="$0 $callOptions -- $sourcePath $pageSpec"
export PDFJAM_EFFECTIVE_CALL
PDFJAM_CALL_NUMBER=$callNumber
@@ -984,7 +1026,7 @@
eval "$PDFJAM_EFFECTIVE_CALL"
## i.e., call pdfjam again with one input file
done
- if (test $verbose = true) then cat "$PDFJAM_MESSAGES_FILE" >&2 ; fi
+ if [ "$verbose" = "true" ]; then cat "$PDFJAM_MESSAGES_FILE" >&2 ; fi
IFS=$OIFS
exit 0
fi
@@ -1010,9 +1052,9 @@
for k in $fileSpec ; do
## Last substitution on next line is needed for silly characters in
## file names...
- sourcePath=`printf "%s" $k | sed 's/|[^|]*$//'`
- sourcePath=`escape_chars "$sourcePath"`
- pageSpec=`printf "%s" $k | sed 's/.*|//'`
+ sourcePath=$(printf "%s" $k | sed 's/|[^|]*$//')
+ sourcePath=$(escape_chars "$sourcePath")
+ pageSpec=$(printf "%s" $k | sed 's/.*|//')
filePageSpec="$filePageSpec$sourcePath $pageSpec "
done
IFS="$OIFS"
@@ -1024,7 +1066,7 @@
##
#########################################################################
##
-## NOW MAKE THE INPUT FILE ETC., READY FOR PDFLATEX
+## NOW MAKE THE INPUT FILE ETC., READY FOR LATEX
##
filePageList="" ## initialize a string to supply to \includepdfmerge
counter=0
@@ -1036,9 +1078,9 @@
IFS="$newline"
for k in ${fileSpec}
do
- counter=`expr $counter + 1`
- sourcePath=`printf "%s" "$k" | sed 's/|[^|]*$//'`
- pageSpec=`printf "%s" $k | sed 's/.*|//'`
+ counter=$((counter + 1))
+ sourcePath=$(printf "%s" "$k" | sed 's/|[^|]*$//')
+ pageSpec=$(printf "%s" $k | sed 's/.*|//')
## Check, though not exhaustively, for problems with the
## page spec: leading or trailing comma, double comma or
## double dash, alphabetic characters other than the word "last",
@@ -1065,22 +1107,26 @@
fi
;;
*)
- pdfName=`basename "$sourcePath"`
- sourceDir=`dirname "$sourcePath"` ## zsh on Mac OS 10.5 chokes here
+ pdfName=$(basename "$sourcePath")
+ sourceDir=$(dirname "$sourcePath") ## zsh on Mac OS 10.5 chokes here
cd "$sourceDir" || exit 1 ## just to get the full path
- sourceDir=`pwd`
+ sourceDir=$(pwd)
cd "$pwd" || exit 1
sourceFullPath="$sourceDir"/"$pdfName"
uniqueName="source-$counter.pdf"
uniqueName="$PDFJAM_TEMP_DIR"/"$uniqueName"
- ln -s "$sourceFullPath" "$uniqueName"
+ ## Next is from the Cygwin patch contributed by Lucas
+ case $(uname) in
+ *CYGWIN*) cp "$sourceFullPath" "$uniqueName";;
+ *) ln -s "$sourceFullPath" "$uniqueName";;
+ esac
;;
esac
filePageList="$filePageList","$uniqueName","$pageSpec"
done
IFS="$OIFS"
-filePageList=`printf "%s" "$filePageList" | \
- sed 's/^,//'` ## remove leading comma
+filePageList=$(printf "%s" "$filePageList" | \
+ sed 's/^,//') ## remove leading comma
##
## Do the pdfinfo stuff (if relevant)...
##
@@ -1089,19 +1135,19 @@
if test "$keepinfo" = true
then
prattle "Calling ${pdfinfo}..." ;
- PDFinfo=`pdfinfo "$uniqueName"`;
- pdftitl=`printf "%s" "$PDFinfo" | \
- grep -e '^Title:'| sed s/^Title:\\\s\*// | \
- sed -e 's/[#$%^&_{}~]/\\\&/g'`;
- pdfauth=`printf "%s" "$PDFinfo" | \
- grep -e '^Author:'| sed s/^Author:\\\s\*// | \
- sed -e 's/[#$%^&_{}~]/\\\&/g'`;
- pdfsubj=`printf "%s" "$PDFinfo" | \
- grep -e '^Subject:'| sed s/^Subject:\\\s\*// | \
- sed -e 's/[#$%^&_{}~]/\\\&/g'`;
- pdfkeyw=`printf "%s" "$PDFinfo" | \
- grep -e '^Keywords:'| sed s/^Keywords:\\\s\*// | \
- sed -e 's/[#$%^&_{}~]/\\\&/g'`;
+ PDFinfo=$(pdfinfo "$uniqueName");
+ pdftitl=$(printf "%s" "$PDFinfo" | \
+ grep -e '^Title:'| 'sed s/^Title:\\\s\*//' | \
+ sed -e 's/[#$%^&_{}~]/\\\&/g');
+ pdfauth=$(printf "%s" "$PDFinfo" | \
+ grep -e '^Author:'| sed 's/^Author:\\\s\*//' | \
+ sed -e 's/[#$%^&_{}~]/\\\&/g');
+ pdfsubj=$(printf "%s" "$PDFinfo" | \
+ grep -e '^Subject:'| sed 's/^Subject:\\\s\*//' | \
+ sed -e 's/[#$%^&_{}~]/\\\&/g');
+ pdfkeyw=$(printf "%s" "$PDFinfo" | \
+ grep -e '^Keywords:'| sed 's/^Keywords:\\\s\*//' | \
+ sed -e 's/[#$%^&_{}~]/\\\&/g');
fi
if test -n "$pdfTitle" ; then
pdftitl="$pdfTitle"
@@ -1117,12 +1163,16 @@
fi
fi
##
-## Now set up the files for pdflatex...
+## Now set up the files for latex...
##
fileName="$PDFJAM_TEMP_DIR"/a
texFile="$fileName".tex
msgFile="$fileName".msgs
tempFile="$PDFJAM_TEMP_DIR"/temp.tex
+## Next is adapted from the Cygwin patch sent by Lucas
+case $(uname) in
+ *CYGWIN*) filePageList=$(echo "$filePageList" | sed 's~\\~/~g') ;;
+esac
(cat <<EndTemplate
\batchmode
\documentclass[$documentOptions]{article}
@@ -1135,49 +1185,59 @@
\hypersetup{pdfsubject={$pdfsubj}}
\hypersetup{pdfkeywords={$pdfkeyw}}
\usepackage{pdfpages}
-$preamble
-\begin{document}
-\includepdfmerge[$miscOptions]{$filePageList}
-\end{document}
EndTemplate
- ) > $texFile
+ ) > "$texFile"
if test "$hyperref" = false; then ## we don't need hyperref
- cp $texFile $tempFile
- sed '/\\\usepackage{hyperref}/d' $tempFile | \
+ cp "$texFile" "$tempFile"
+ sed '/\\\usepackage{hyperref}/d' "$tempFile" | \
sed '/\\\hypersetup.*/d' > "${texFile}"
- rm $tempFile
+ rm "$tempFile"
fi
if test -z "$geometry" ; then geometry=false ; fi
if test "$geometry" = false; then ## geometry package is not to be used
- cp $texFile $tempFile
- cat $tempFile | sed '/\\\usepackage.*{geometry}/d' > $texFile
- rm $tempFile
+ cp "$texFile" "$tempFile"
+ sed '/\\\usepackage.*{geometry}/d' "$tempFile" > "$texFile"
+ rm "$tempFile"
fi
if test -z "$pagecolor"; then ## color package is not needed
- cp $texFile $tempFile
- cat $tempFile | sed '/\\\usepackage.*{color}/d' > $texFile
- rm $tempFile
+ cp "$texFile" "$tempFile"
+ sed '/\\\usepackage.*{color}/d' "$tempFile" > "$texFile"
+ rm "$tempFile"
fi
+(cat <<EndTemplate
+$preamble
+\begin{document}
+\includepdfmerge[$miscOptions]{$filePageList}
+\end{document}
+EndTemplate
+ ) >> "$texFile"
##
## INPUT FILES ARE ALL READY
##
#########################################################################
##
-## RUN PDFLATEX AND COPY THE RESULTING PDF FILE
+## RUN LATEX AND COPY THE RESULTING PDF FILE
##
-prattle "Calling ${pdflatex}..." ;
+if [ "$runs" -eq 1 ] ;
+then prattle "Calling ${latex}..."
+else prattle "Calling ${latex} $runs times..."
+fi
cd "$PDFJAM_TEMP_DIR" || exit 1
failureText=\
"FAILED.
-The call to 'pdflatex' resulted in an error.
+The call to $latex resulted in an error.
If '--no-tidy' was used, you can examine the
log file at
$fileName.log
to try to diagnose the problem."
-$pdflatex $texFile > $msgFile || {
- prattle "$failureText"
- error_exit "Output file not written" $E_SOFTWARE
-}
+i=1
+while [ "$i" -le "$runs" ] ; do
+ $latex "$texFile" > "$msgFile" || {
+ prattle "$failureText"
+ error_exit "Run $i: Output file not written" $E_SOFTWARE
+ }
+ i=$((i + 1))
+done
cd "$pwd" || exit 1
if test -f "$fileName".pdf ## if LaTeX didn't choke
then
@@ -1192,19 +1252,20 @@
fi
if test ! -w "$outFile"
then
- prattle "FAILED: no write permission in ${outFile}."
- continue
+ error_exit \
+ "FAILED: no write permission on ${outFile}." \
+ $E_OSFILE
fi
separator="-"
if test "$pageSpec" != "-"
then
separator=-"$pageSpec"-
fi
- outFile=`printf "%s" "$outFile" | sed 's/\/$//'`
+ outFile=$(printf "%s" "$outFile" | sed 's/\/$//')
## (delete any trailing slash)
- pdfName=`basename "$sourcePath"`
- pdfName=`printf "%s" "$pdfName" | \
- sed 's/\.[pP][dD][fF]$//'` ## strip extension
+ pdfName=$(basename "$sourcePath")
+ pdfName=$(printf "%s" "$pdfName" | \
+ sed 's/\.[pP][dD][fF]$//') ## strip extension
pdfName="$pdfName$separator$suffix".pdf
outFile="$outFile"/"$pdfName"
fi
@@ -1214,12 +1275,14 @@
then
error_exit "no write permission at ${outFile}" $E_CANTCREATE
fi
-#fileSize=`wc -c < "$fileName.pdf" | sed 's/^\ *//'`
-(cat "$fileName".pdf > "$outFile" 2>/dev/null) &&
- prattle "Finished. Output was to '${outFile}'." ||
- error_exit "cannot write output at ${outFile}" $E_CANTCREATE
-if (test "$PDFJAM_CALL_NUMBER" = "0") && ## not a secondary call
- (test $verbose = true)
+#fileSize=$(wc -c < "$fileName.pdf" | sed 's/^\ *//')
+if cat "$fileName".pdf > "$outFile" 2>/dev/null
+then
+ prattle "Finished. Output was written to '${outFile}'."
+else
+ error_exit "cannot write output at ${outFile}" $E_CANTCREATE
+fi
+if [ "$PDFJAM_CALL_NUMBER" = "0" ] && [ "$verbose" = "true" ]
then cat "$PDFJAM_MESSAGES_FILE" >&2
fi
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfjam-pocketmod new/texmf-dist/scripts/pdfjam/pdfjam-pocketmod
--- old/texmf-dist/scripts/pdfjam/pdfjam-pocketmod 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfjam-pocketmod 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-#!/bin/sh
-##
-## pdfjam-pocketmod: A shell program to make an 8-page PDF document
-## into an 8-up file with pages ordered and oriented for folding as
-## a pocket-sized booklet, as described at http://repocketmod.com/
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for (three runs of) pdfjam, version 2.08
-##
-##
-## It's hard (?) to set up this particular script to read from /dev/stdin,
-## so we'll just insist that the first argument is a file:
-##
-E_USAGE=64 ## for a command line usage error
-for arg
-do
- case $arg in
- --batch)
- printf "pdfjam-pocketmod ERROR: the --batch option is not allowed\n" 1>&2 ;
- exit "$E_USAGE" ;;
- --no-tidy)
- n='--no-tidy' ;;
- --quiet | -q)
- q='-q' ;;
- --vanilla)
- v='--vanilla' ;;
- --checkfiles)
- c='--checkfiles' ;;
- *)
- ;;
- esac
-done
-##
-sourceFile="$1" ;
-shift ;
-##
-## Some (very) minimal checking of the first argument:
-##
-if test ! -f "$sourceFile" ;
-then
- printf "pdfjam-pocketmod ERROR: first argument must be a PDF file\n" ;
- exit $E_USAGE ;
-fi
-##
-## That's all the argument checking!
-##
-pageSpec="1-8" ## the default page spec
-case ${1} in
- --* | "") ## no page spec was given
- ;;
- *) ## a page spec was given, so use it
- pageSpec="$1" ;
- shift ;;
-esac
-pdfjam $n $q $c $v -o /dev/stdout "$sourceFile" "$pageSpec" | pdfjam --angle 180 $n $q $v -o /dev/stdout /dev/stdin '1,8,7,6' | pdfjam --nup 4x2 --landscape --frame true "$sourceFile" '2-5' /dev/stdin "$@"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfjam-slides3up new/texmf-dist/scripts/pdfjam/pdfjam-slides3up
--- old/texmf-dist/scripts/pdfjam/pdfjam-slides3up 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfjam-slides3up 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-#!/bin/sh
-##
-## pdfjam-slides3up: A shell program to make a 3-up "handout"
-## of presentation slides, with space for side-notes
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-footskip=3.1cm ## default setting
-pagecommand='{\thispagestyle{empty}}' ## default setting
-case ${1} in
- --pagenumbering)
- case ${2} in
- false)
- continue ;;
- true)
- pagecommand='{\thispagestyle{plain}}' ;;
- *) ## a footskip dimension was supplied
- pagecommand='{\thispagestyle{plain}}' ;
- footskip="$2" ;;
- esac ;
- shift; shift ;;
- *)
- continue ;;
-esac
-exec pdfjam --suffix 3up --nup 1x3 --frame true --noautoscale false \
- --delta "0cm 0.2cm" --scale 0.87 --offset "-3.8cm 0cm" \
- --preamble "\footskip $footskip" --pagecommand "$pagecommand" "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfjam-slides6up new/texmf-dist/scripts/pdfjam/pdfjam-slides6up
--- old/texmf-dist/scripts/pdfjam/pdfjam-slides6up 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfjam-slides6up 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#!/bin/sh
-##
-## pdfjam-slides6up: A shell program to make a 6-up "handout"
-## of presentation slides
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-footskip=2.7cm ## default setting
-pagecommand='{\thispagestyle{empty}}' ## default setting
-case ${1} in
- --pagenumbering)
- case ${2} in
- false)
- continue ;;
- true)
- pagecommand='{\thispagestyle{plain}}' ;;
- *) ## a footskip dimension was supplied
- pagecommand='{\thispagestyle{plain}}' ;
- footskip="$2" ;;
- esac ;
- shift; shift ;;
- *)
- continue ;;
-esac
-exec pdfjam --suffix 6up --nup 2x3 --frame true --noautoscale false \
- --delta "0.2cm 0.3cm" --scale 0.95 --preamble "\footskip $footskip" \
- --pagecommand "$pagecommand" "$@"
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfjoin new/texmf-dist/scripts/pdfjam/pdfjoin
--- old/texmf-dist/scripts/pdfjam/pdfjoin 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfjoin 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-#!/bin/sh
-##
-## pdfjoin: A shell program to concatenate PDF files
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-E_USAGE=64 ## for a command line usage error
-for arg
-do
- case $arg in
- --batch)
- printf "pdfjoin ERROR: the --batch option is not allowed\n" 1>&2;
- exit "$E_USAGE" ;;
- --orient) ## this was allowed in previous versions of pdfjoin
- printf "pdfjoin ERROR: the --orient option is not allowed,\n" 1>&2;
- printf " use --landscape or --no-landscape to specify\n" 1>&2;
- printf " the output page orientation" 1>&2;
- exit "$E_USAGE" ;;
- *) continue ;;
- esac
-done
-exec pdfjam --fitpaper true --rotateoversize true --suffix joined "$@"
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfnup new/texmf-dist/scripts/pdfjam/pdfnup
--- old/texmf-dist/scripts/pdfjam/pdfnup 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfnup 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-#!/bin/sh
-##
-## pdfnup: A shell program to n-up pages of PDF files
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for pdfjam, version 2.08
-##
-E_USAGE=64 ## for a command line usage error
-for arg
-do
- case $arg in
- --orient) ## this was allowed in previous versions of pdfnup
- printf "pdfnup ERROR: the --orient option is not allowed,\n" 1>&2;
- printf " use --landscape or --no-landscape to specify\n" 1>&2;
- printf " the output page orientation" 1>&2;
- exit "$E_USAGE" ;;
- --pages) ## this was allowed in previous versions of pdfnup
- printf "pdfnup ERROR: the --pages option is not allowed,\n" 1>&2;
- printf " see 'pdfjam --help' or http://go.warwick.ac.uk/pdfjam\n" \
- 1>&2;
- printf " for page selection examples\n" 1>&2;
- exit "$E_USAGE" ;;
- *) continue ;;
- esac
-done
-exec pdfjam --suffix nup --nup 2x1 --landscape "$@"
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfjam/pdfpun new/texmf-dist/scripts/pdfjam/pdfpun
--- old/texmf-dist/scripts/pdfjam/pdfpun 2013-03-12 01:01:41.000000000 +0100
+++ new/texmf-dist/scripts/pdfjam/pdfpun 1970-01-01 01:00:00.000000000 +0100
@@ -1,73 +0,0 @@
-#!/bin/sh
-##
-## pdfpun: A shell program to n-up pages of a PDF file with
-## the n-upped pages ordered from right to left
-##
-## Author David Firth (http://go.warwick.ac.uk/dfirth)
-##
-## This is a simple wrapper for (three runs of) pdfjam, version 2.08
-##
-##
-E_USAGE=64 ## for a command line usage error
-##
-for arg
-do
- case $arg in
- --batch)
- printf "pdfpun ERROR: the --batch option is not allowed\n" 1>&2;
- exit "$E_USAGE" ;;
- --no-tidy)
- n='--no-tidy' ;;
- --quiet | -q)
- q='-q' ;;
- --checkfiles)
- c='--checkfiles' ;;
- *) continue ;;
- esac
-done
-sourceFile="$1" ;
-shift ;
-##
-## Some (very) minimal checking of the first argument:
-##
-if test ! -f "$sourceFile" ;
-then
- printf "pdfpun ERROR: first argument must be a PDF file\n" ;
- exit $E_USAGE ;
-fi
-if test "$sourceFile" = /dev/stdin ;
-then
- if tty -s ; then
- printf "pdfpun ERROR: tty is connected to connected to stdin, no PDF file found\n"
- exit $E_USAGE ;
- fi
-fi
-##
-## That's all the argument checking!
-##
-pageSpec="-" ## the default
-case ${1} in
- --* | "")
- ;;
- *) ## a page spec was given
- pageSpec="$1" ;
- shift ;;
-esac
-case ${1} in
- --outfile)
- outFile="$2" ;
- shift; shift ;;
- *)
- ;;
-esac
-if test -z "$outFile" ;
-then
- printf "pdfpun ERROR: no output file specified\n" 1>&2 ;
- exit "$E_USAGE" ;
-fi
-pdfjam --reflect true $n $q $c "$sourceFile" "$pageSpec" -o /dev/stdout | \
- pdfjam --landscape --nup 2x1 "$@" -o /dev/stdout | \
- pdfjam --suffix nup --reflect true --fitpaper true $n $q -o "$outFile"
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfjam.tlpobj new/tlpkg/tlpobj/pdfjam.tlpobj
--- old/tlpkg/tlpobj/pdfjam.tlpobj 2019-02-28 03:58:37.000000000 +0100
+++ new/tlpkg/tlpobj/pdfjam.tlpobj 2019-11-19 01:55:51.000000000 +0100
@@ -1,28 +1,23 @@
name pdfjam
category Package
-revision 29752
+revision 52857
shortdesc Shell scripts interfacing to pdfpages
-longdesc This is a collection of shell scripts which provide an
-longdesc interface to the pdfpages LaTeX package. They do such jobs as
-longdesc selecting pages, concatenating files, doing n-up formatting,
-longdesc and so on.
+longdesc The package makes available the pdfjam shell script that
+longdesc provides a simple interface to much of the functionality of the
+longdesc excellent pdfpages package (by Andreas Matthias) for LaTeX. The
+longdesc pdfjam script takes one or more PDF files (and/or JPG/PNG
+longdesc graphics files) as input, and produces one or more PDF files as
+longdesc output. It is useful for joining files together, selecting
+longdesc pages, reducing several source pages onto one output page,
+longdesc etc., etc.
depend pdfjam.ARCH
-runfiles size=21
- texmf-dist/scripts/pdfjam/pdf180
- texmf-dist/scripts/pdfjam/pdf270
- texmf-dist/scripts/pdfjam/pdf90
- texmf-dist/scripts/pdfjam/pdfbook
- texmf-dist/scripts/pdfjam/pdfflip
+runfiles size=11
texmf-dist/scripts/pdfjam/pdfjam
- texmf-dist/scripts/pdfjam/pdfjam-pocketmod
- texmf-dist/scripts/pdfjam/pdfjam-slides3up
- texmf-dist/scripts/pdfjam/pdfjam-slides6up
- texmf-dist/scripts/pdfjam/pdfjoin
- texmf-dist/scripts/pdfjam/pdfnup
- texmf-dist/scripts/pdfjam/pdfpun
-catalogue-contact-home http://go.warwick.ac.uk/pdfjam
+catalogue-contact-bugs https://github.com/DavidFirth/pdfjam/issues
+catalogue-contact-home https://github.com/DavidFirth/pdfjam
+catalogue-contact-repository https://github.com/DavidFirth/pdfjam
catalogue-ctan /support/pdfjam
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license gpl2
+catalogue-date 2019-11-18 16:07:51 +0100
+catalogue-license gpl2+
catalogue-topics pdfprocess
-catalogue-version 2.02
+catalogue-version 3.03
++++++ pdfoverlay.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfoverlay/README.md new/doc/latex/pdfoverlay/README.md
--- old/doc/latex/pdfoverlay/README.md 2018-05-10 00:20:11.000000000 +0200
+++ new/doc/latex/pdfoverlay/README.md 2019-11-03 23:42:14.000000000 +0100
@@ -47,31 +47,17 @@
```
Change to the `pdfoverlay` directory, and then the style file
-(`pdfoverlay.sty`) can be installed by running:
+(`pdfoverlay.sty`) and documentation (`pdfoverlay.pdf`) can be installed by
+running:
```
-l3build install
-```
-
-Documentation (`pdfoverlay.pdf`) can be compiled by running:
-
-```
-l3build doc
-```
-
-To install the documentation, copy `pdfoverlay.pdf` to
-`$TEXMFHOME/doc/latex/pdfoverlay/`.
-
-You can find `$TEXMFHOME` by running:
-
-```
-kpsewhich -var-value=TEXMFHOME
+l3build install --full
```
## Licence
```
-Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
This work may be distributed and/or modified under the conditions of
the LaTeX Project2 Public License, either version 1.3c of this license
Binary files old/doc/latex/pdfoverlay/pdfoverlay.pdf and new/doc/latex/pdfoverlay/pdfoverlay.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfoverlay.doc.tlpobj new/tlpkg/tlpobj/pdfoverlay.doc.tlpobj
--- old/tlpkg/tlpobj/pdfoverlay.doc.tlpobj 2019-02-28 03:58:38.000000000 +0100
+++ new/tlpkg/tlpobj/pdfoverlay.doc.tlpobj 2019-11-04 01:54:08.000000000 +0100
@@ -1,6 +1,6 @@
name pdfoverlay.doc
category Package
-revision 47657
+revision 52627
shortdesc doc files of pdfoverlay
relocated 1
docfiles size=134
++++++ pdfoverlay.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfoverlay/pdfoverlay.sty new/tex/latex/pdfoverlay/pdfoverlay.sty
--- old/tex/latex/pdfoverlay/pdfoverlay.sty 2018-05-10 00:20:11.000000000 +0200
+++ new/tex/latex/pdfoverlay/pdfoverlay.sty 2019-11-03 23:42:14.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project2 Public License, either version 1.3c of this license
@@ -25,7 +25,7 @@
%% and the derived files pdfoverlay.sty and pdfoverlay.pdf
%%
\RequirePackage{xparse}
-\ProvidesExplPackage{pdfoverlay}{2018/05/08}{1.0}
+\ProvidesExplPackage{pdfoverlay}{2019/11/03}{1.1}
{Overlay text on an existing PDF document (DCP)}
\RequirePackage{everypage,pdfpages}
\AddEverypageHook { \__pdfoverlay_output_pdf_page: }
@@ -73,7 +73,7 @@
{ \bool_not_p:n
{ \str_if_empty_p:N \g__pdfoverlay_pdf_file_name_str } }
{ \int_compare_p:n
- { \c_zero <= \g__pdfoverlay_page_int
+ { \c_zero_int <= \g__pdfoverlay_page_int
< \g__pdfoverlay_page_count_int } }
}
{
@@ -110,7 +110,7 @@
{
\int_compare:nTF
{
- \c_one <= #1 <= \g__pdfoverlay_page_count_int
+ \c_one_int <= #1 <= \g__pdfoverlay_page_count_int
}
{
\prg_return_true:
@@ -132,7 +132,7 @@
\edef \AM@currentdocname { #1 }
\AM@getpagecount
\int_gset_eq:NN \g__pdfoverlay_page_count_int \AM@pagecount
- \int_gset_eq:NN \g__pdfoverlay_page_int \c_zero
+ \int_gset_eq:NN \g__pdfoverlay_page_int \c_zero_int
\bool_gset_true:N \g__pdfoverlay_output_active_bool
\bool_gset_false:N \g__pdfoverlay_action_pending_bool
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfoverlay.tlpobj new/tlpkg/tlpobj/pdfoverlay.tlpobj
--- old/tlpkg/tlpobj/pdfoverlay.tlpobj 2019-02-28 03:58:38.000000000 +0100
+++ new/tlpkg/tlpobj/pdfoverlay.tlpobj 2019-11-04 01:54:08.000000000 +0100
@@ -1,6 +1,6 @@
name pdfoverlay
category Package
-revision 47657
+revision 52627
shortdesc A LaTeX style for overlaying text on a PDF
relocated 1
longdesc It is often desirable to take an exisiting PDF and easily add
@@ -19,9 +19,10 @@
longdesc xparse, everypage, and pdfpages.
runfiles size=2
RELOC/tex/latex/pdfoverlay/pdfoverlay.sty
+catalogue-contact-bugs https://github.com/dcpurton/pdfoverlay/issues
catalogue-contact-repository https://github.com/dcpurton/pdfoverlay
catalogue-ctan /macros/latex/contrib/pdfoverlay
-catalogue-date 2018-05-12 04:59:36 +0200
+catalogue-date 2019-11-03 14:46:06 +0100
catalogue-license lppl1.3c
catalogue-topics graphics-incl
-catalogue-version 1.0
+catalogue-version 1.1
++++++ pdfpages.doc.tar.xz ++++++
Binary files old/doc/latex/pdfpages/pdfpages.pdf and new/doc/latex/pdfpages/pdfpages.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpages.doc.tlpobj new/tlpkg/tlpobj/pdfpages.doc.tlpobj
--- old/tlpkg/tlpobj/pdfpages.doc.tlpobj 2019-02-28 03:58:38.000000000 +0100
+++ new/tlpkg/tlpobj/pdfpages.doc.tlpobj 2020-01-29 01:56:27.000000000 +0100
@@ -1,6 +1,6 @@
name pdfpages.doc
category Package
-revision 45659
+revision 53583
shortdesc doc files of pdfpages
relocated 1
docfiles size=88
++++++ pdfpages.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/pdfpages.sty new/tex/latex/pdfpages/pdfpages.sty
--- old/tex/latex/pdfpages/pdfpages.sty 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/pdfpages.sty 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfpages}
[\AM@Git@Date\space\AM@fileversion\space
@@ -97,6 +97,7 @@
\def\AM@ClearShipoutPicture{\ClearShipoutPicture}}
\let\Orig@AM@AddToShipoutPicture\AM@AddToShipoutPicture
\newif\ifAM@openright\AM@openrightfalse
+\newif\ifAM@openrighteach\AM@openrighteachfalse
\newif\ifAM@frame\AM@framefalse
\newif\ifAM@landscape\AM@landscapefalse
\newif\ifAM@turn\AM@turntrue
@@ -146,16 +147,22 @@
\newcommand*{\AM@picturecommandstar}{}
\newsavebox{\AM@pagebox}
\newif\ifAM@integer
-\begingroup
-\@makeother_
-\gdef\AM@checkinteger#1{%
- \ifcat _\ifnum9<1#1_\else A\fi
- \AM@integertrue
+\def\AM@checkinteger#1{%
+ \expandafter\AM@checkinteger@\expandafter{#1}}
+\def\AM@checkinteger@#1{%
+ \begingroup
+ \def\do##1{\uccode`##1=`\%}%
+ \do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9%
+ \makeatletter
+ \catcode`\%=9
+ \endlinechar\m@ne
+ \uppercase{\scantokens{\def\AM@temp{#1}}}%
+ \ifx\AM@temp\@empty
+ \global\AM@integertrue
\else
- \AM@integerfalse
+ \global\AM@integerfalse
\fi
-}
-\endgroup
+ \endgroup}
\newcommand*{\AM@findfile@i}[2]{%
\ifAM@pkg@demo
\else
@@ -196,11 +203,12 @@
}
\newcommand*{\includepdf}[2][]{%
\begingroup
+ \AM@pagecnt\@ne
\let\AM@threadname\relax
\def\AM@tmp{pdfpages}
\expandafter\AM@split@options
\expandafter\AM@tmp
- \expandafter{\the\AM@global@opts,#1}
+ \expandafter{\the\AM@global@opts,#1}%
\edef\AM@temp{{pdfpages}{\the\@temptokena}}%
\expandafter\setkeys\AM@temp
\ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
@@ -245,6 +253,7 @@
}
\newcommand*{\includepdfmerge}[2][]{%
\begingroup
+ \AM@pagecnt\@ne
\let\AM@currentdocname\relax
\def\AM@tmp{pdfpages}
\expandafter\AM@split@options
@@ -313,7 +322,7 @@
\let\AM@ynup\AM@temp}%
}{}%
\AM@setphantom
- \ifthenelse{\boolean{AM@openright}}
+ \ifthenelse{\boolean{AM@openright}\and\not\boolean{AM@openrighteach}}
{\AM@openright}{}%
\ifx\AM@signature\@empty\AM@filluppagelist
\else\AM@prepare@signature\AM@signaturetrue\AM@turnfalse\fi
@@ -731,16 +740,37 @@
\AM@resetRotate
}{}
}% AM@output
-\newif\ifAM@defaultone
+\newif\ifAM@default@range@added
\newcommand*{\AM@readlist}[1]{%
- \AM@defaultonefalse
+ \AM@default@range@addedtrue
\def\AM@pagelist{}%
\def\AM@doclist{}%
\AM@readlisti#1,\END,
- \ifAM@defaultone\AM@append{1}\fi
+ \AM@add@default@range
\edef\AM@doclist{\expandafter\@gobble\AM@doclist\@empty}%
\edef\AM@pagelist{\expandafter\@gobble\AM@pagelist\@empty}%
}
+\def\AM@add@default@range{%
+ \ifAM@default@range@added
+ \else
+ \expandafter\AM@read@defaultpages\AM@pagestemp,\END,
+ \fi
+ \AM@default@range@addedtrue
+}
+\def\AM@read@defaultpages#1,{%
+ \ifx\END#1
+ \else
+ \edef\AM@x{\AM@trim@space{#1}}%
+ \ifx\AM@x\@empty
+ \AM@append{}%
+ \AM@ReturnAfterElseFiFi\AM@read@defaultpages
+ \else
+ \expandafter\AM@checkrange\AM@x-\END
+ \AM@expand@range\AM@i\AM@ii
+ \AM@ReturnAfterFiFi\AM@read@defaultpages
+ \fi
+ \fi
+}
\newcommand{\AM@readlisti}{}
\def\AM@readlisti#1,{%
\ifx\AM@currentdocname\relax
@@ -750,80 +780,101 @@
\def\AM@temp{#1}%
\ifx\END#1
\else
- \AM@checkrange#1-\END
+ \AM@range@or@docname{#1}%
\expandafter\AM@readlisti
\fi
}
-\newcommand{\AM@checkrange}{}
-\def\AM@checkrange#1-#2\END{%
- \edef\AM@tempi{\AM@trim@space{#1}}%
- \ifx\\#2\\%
- \AM@checkinteger{\AM@tempi}%
- \ifAM@integer
- \AM@checkpagenumber{\AM@tempi}%
- \AM@append{\AM@tempi}%
- \else
- \expandafter\ifx\expandafter\\\AM@tempi\\\AM@append{}%
- \else\AM@setnewdocname{\AM@tempi}\fi
- \fi
+\def\AM@range@or@docname#1{%
+ \edef\AM@arg{\AM@trim@space{#1}}%
+ \ifx\AM@arg\@empty
+ \AM@append{}%
\else
- \expandafter\ifx\expandafter\\\AM@tempi\\%
- \@tempcnta=1\relax
- \AM@checklast#2\END
- \else
- \def\AM@cmp{last}%
- \ifx\AM@cmp\AM@tempi
- \@tempcnta=\AM@pagecount\relax
- \AM@checklast#2\END
+ \expandafter\AM@checkrange\AM@arg-\END
+ \ifAM@isrange
+ \ifx\AM@currentdocname\relax
+ \AM@setnewdocname{\AM@arg}%
\else
- \AM@checkinteger{\AM@tempi}%
- \ifAM@integer
- \@tempcnta=\AM@tempi\relax
- \AM@checkpagenumber{\the\@tempcnta}%
- \AM@checklast#2\END
- \else
- \AM@setnewdocname{\AM@temp}%
- \fi
+ \AM@expand@range\AM@i\AM@ii
+ \AM@default@range@addedtrue
\fi
+ \else
+ \AM@add@default@range
+ \AM@setnewdocname{\AM@arg}%
\fi
\fi
}
-\newcommand{\AM@checklast}{}
-\def\AM@checklast#1-\END{%
- \edef\AM@tempii{\AM@trim@space{#1}}%
- \expandafter\ifx\expandafter\\\AM@tempii\\
- \@tempcntb=\AM@pagecount\relax
- \ifAM@DVIoutput
- \ifnum\AM@pagecount=1
- \@tempcntb\@tempcnta
- \fi
- \fi
- \advance\@tempcntb\@ne
- \whiledo{\@tempcnta<\@tempcntb}{%
- \AM@append{\the\@tempcnta}%
- \advance\@tempcnta\@ne
- }%
+\def\AM@last{last}
+\def\AM@empty{}
+\newif\ifAM@isrange
+\def\AM@checkrange#1-#2\END{%
+ \AM@israngefalse
+ \AM@check@valid@pagenumber{#1}%
+ \ifx\\#1\\%
+ \def\AM@i{1}%
\else
- \def\AM@cmp{last}%
- \ifx\AM@cmp\AM@tempii
- \let\AM@tempii\AM@pagecount
- \fi
- \AM@checkinteger{\AM@tempii}%
- \ifAM@integer
- \@tempcntb=\AM@tempii\relax
- \AM@checkpagenumber{\the\@tempcntb}%
- \ifnum\@tempcnta<\@tempcntb \def\AM@rel{<}\def\AM@inc{\@ne}%
- \else \def\AM@rel{>}\def\AM@inc{\m@ne}\fi
- \advance\@tempcntb\AM@inc
- \whiledo{\@tempcnta\AM@rel\@tempcntb}{%
- \AM@append{\the\@tempcnta}%
- \advance\@tempcnta\AM@inc
- }%
+ \edef\AM@i{#1}%
+ \fi
+ \def\AM@ii{}%
+ \ifAM@isrange
+ \ifx\\#2\\%
\else
- \AM@setnewdocname{\AM@temp}%
+ \edef\AM@ii{\AM@strip@slash#2\END}%
+ \AM@check@valid@pagenumber{\AM@ii}%
+ \ifx\AM@ii\AM@empty
+ \let\AM@ii\AM@last
+ \fi
\fi
\fi
}
+\def\AM@expand@range#1#2{%
+ \edef\AM@i{#1}%
+ \edef\AM@ii{#2}%
+ \ifx\AM@i\AM@last
+ \let\AM@i\AM@lastpage
+ \let\AM@i\AM@pagecount
+ \fi
+ \ifx\AM@ii\AM@last
+ \let\AM@ii\AM@lastpage
+ \let\AM@ii\AM@pagecount
+ \fi
+ \ifx\AM@ii\AM@empty
+ \let\AM@ii\AM@i
+ \fi
+ \@tempcnta=\AM@i\relax
+ \@tempcntb=\AM@ii\relax
+ \ifnum\@tempcnta<\@tempcntb
+ \def\AM@rel{<}%
+ \let\AM@inc\@ne
+ \else
+ \def\AM@rel{>}%
+ \let\AM@inc\m@ne
+ \fi
+ \advance\@tempcntb\AM@inc
+ \whiledo{\@tempcnta\AM@rel\@tempcntb}{%
+ \AM@checkpagenumber{\the\@tempcnta}%
+ \AM@append{\the\@tempcnta}%
+ \advance\@tempcnta\AM@inc
+ }%
+}
+\def\AM@check@valid@pagenumber#1{%
+ \AM@checkinteger{#1}%
+ \ifAM@integer
+ \AM@israngetrue
+ \else
+ \AM@israngefalse
+ \fi
+ \edef\AM@tmp{#1}%
+ \ifx\AM@tmp\AM@last
+ \AM@israngetrue
+ \fi
+}
+\def\AM@strip@slash#1-#2\END{%
+ \ifx\\#2\\%
+ #1%
+ \else
+ #1-#2%
+ \fi
+}
\providecommand*{\AM@checkpagenumber}[1]{%
\ifnum#1>\AM@pagecount\relax
\ifthenelse{\boolean{AM@pkg@draft} \and \boolean{AM@survey}}{%
@@ -837,14 +888,19 @@
\fi
}
\newcommand*{\AM@setnewdocname}[1]{%
- \ifAM@defaultone
- \AM@append{1}%
+ \ifAM@openrighteach
+ \ifodd\AM@pagecnt
+ \AM@append{}
+ \fi
\fi
+ \AM@add@default@range
\edef\AM@temp{\AM@trim@space{#1}}%
\AM@findfile{\AM@temp}%
- \AM@defaultonetrue
+ \AM@default@range@addedfalse
}
+\newcount\AM@pagecnt
\newcommand*{\AM@append}[1]{%
+ \advance\AM@pagecnt\@ne
\edef\AM@doclist{\AM@doclist,\AM@currentdocname}%
\edef\AM@pagelist{\AM@pagelist,#1}%
\ifAM@doublepages
@@ -860,7 +916,6 @@
\edef\AM@pagelist{\AM@pagelist,#1}%
\repeat
\fi
- \AM@defaultonefalse
}
\newif\ifAM@endoflist\AM@endoflistfalse
\newcommand{\AM@getfirst}{}
@@ -890,6 +945,7 @@
}
\def\AM@ReturnAfterFi#1\fi{\fi#1}
\def\AM@ReturnAfterFiFi#1\fi\fi{\fi\fi#1}
+\def\AM@ReturnAfterElseFiFi#1\else#2\fi#3\fi{\fi\fi#1}
\newcommand{\AM@getlasti}{}
\def\AM@getlasti#1,#2\END{%
\ifx\\#2\\%
@@ -1071,6 +1127,7 @@
\equal{offset}{\AM@temp}\or
\equal{frame}{\AM@temp}\or
\equal{openright}{\AM@temp}\or
+ \equal{openrighteach}{\AM@temp}\or
\equal{pagecommand}{\AM@temp}\or
\equal{landscape}{\AM@temp}\or
\equal{turn}{\AM@temp}\or
@@ -1330,11 +1387,11 @@
\newtoks\AM@toc@title
\newcommand{\AM@parse@toclisti}{}
\def\AM@parse@toclisti#1,#2,#3,#4,#5,#6\END{%
- \def\AM@toc@page{\AM@trim@space{#1}}%
- \def\AM@toc@section{\AM@trim@space{#2}}%
- \def\AM@toc@level{\AM@trim@space{#3}}%
+ \edef\AM@toc@page{\AM@trim@space{#1}}%
+ \edef\AM@toc@section{\AM@trim@space{#2}}%
+ \edef\AM@toc@level{\AM@trim@space{#3}}%
\AM@toc@title{\ignorespaces #4}%
- \def\AM@toc@label{\AM@trim@space{#5}}%
+ \edef\AM@toc@label{\AM@trim@space{#5}}%
\AM@checkinteger{\AM@toc@page}%
\ifAM@integer\else
\PackageError{pdfpages}
@@ -1377,10 +1434,10 @@
}
\newcommand{\AM@parse@loflisti}{}
\def\AM@parse@loflisti#1,#2,#3,#4,#5\END{%
- \def\AM@lof@page{\AM@trim@space{#1}}%
- \def\AM@lof@list{\AM@trim@space{#2}}%
+ \edef\AM@lof@page{\AM@trim@space{#1}}%
+ \edef\AM@lof@list{\AM@trim@space{#2}}%
\def\AM@lof@heading{\ignorespaces #3}%
- \def\AM@lof@label{\AM@trim@space{#4}}%
+ \edef\AM@lof@label{\AM@trim@space{#4}}%
\AM@checkinteger{\AM@lof@page}%
\ifAM@integer\else
\PackageError{pdfpages}
@@ -1470,7 +1527,7 @@
\AtBeginDocument{\AM@TeXpower@hook}
\def\AM@CheckValue#1#2{%
\ifx\\#2\\\PackageError{pdfpages}
- {Option `#1' must have a non-empty value}%
+ {Option `#1' must have a non-empty value}{}%
\fi
}
\define@key{pdfpages}{page}{\PackageWarningNoLine{pdfpages}{%
@@ -1480,7 +1537,7 @@
\AM@CheckValue{pages}{#1}%
\def\AM@pagestemp{#1}}
\define@key{pdfpages}{pages}{\AM@CheckValue{pages}{#1}%
- \def\AM@pagestemp{#1}}
+ \edef\AM@pagestemp{#1}}
\define@key{pdfpages}{nup}{\AM@parse@nup#1x\END}
\define@key{pdfpages}{deltax}{\AM@parse@deltax#1 \\}
\define@key{pdfpages}{deltay}{\AM@parse@deltay#1 \\}
@@ -1488,6 +1545,7 @@
\define@key{pdfpages}{offset}{\AM@parse@offset#1 \\}
\define@key{pdfpages}{frame}[true]{\setboolean{AM@frame}{#1}}
\define@key{pdfpages}{openright}[true]{\setboolean{AM@openright}{#1}}
+\define@key{pdfpages}{openrighteach}[true]{\setboolean{AM@openrighteach}{#1}}
\define@key{pdfpages}{pagecommand}{\def\AM@pagecommand{#1}}
\define@key{pdfpages}{landscape}[true]{\setboolean{AM@landscape}{#1}}
\define@key{pdfpages}{turn}[true]{\setboolean{AM@turn}{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppdvipdfmx.def new/tex/latex/pdfpages/ppdvipdfmx.def
--- old/tex/latex/pdfpages/ppdvipdfmx.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/ppdvipdfmx.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppdvipdfmx.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvipdfmx (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppdvips.def new/tex/latex/pdfpages/ppdvips.def
--- old/tex/latex/pdfpages/ppdvips.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/ppdvips.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppdvips.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for dvips (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppluatex.def new/tex/latex/pdfpages/ppluatex.def
--- old/tex/latex/pdfpages/ppluatex.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/ppluatex.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppluatex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for LuaTeX (AM)]
@@ -82,9 +82,11 @@
\AM@findfile@ii{#1}%
}
\AtBeginDocument{%
-\@ifpackageloaded{grffile}{%
- \let\AM@IfFileExists\grffile@IfFileExists}{%
- \let\AM@IfFileExists\IfFileExists}%
+ \let\AM@IfFileExists\IfFileExists
+ \@ifpackageloaded{grffile}{%
+ \@ifundefined{grffile@IfFileExists}{}{%
+ \let\AM@IfFileExists\grffile@IfFileExists}%
+ }{}%
}
\def\AM@setRotate{\PLS@Rotate{90}}
\def\AM@resetRotate{\PLS@Rotate{0}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppnull.def new/tex/latex/pdfpages/ppnull.def
--- old/tex/latex/pdfpages/ppnull.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/ppnull.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,21 +24,20 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppnull.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages dummy driver (AM)]
\AM@DVIoutputtrue
\PackageWarningNoLine{pdfpages}{%
- I will use a dummy \string\includepdf\space command which\MessageBreak
- will insert empty pages instead of the actual PDF,\MessageBreak
- because we are running in
- \ifAM@pkg@demo `demo' mode%
+ I will use a dummy \string\includepdf\space command\MessageBreak
+ which will insert empty pages instead of the actual\MessageBreak
+ PDF file because we are running in \ifAM@pkg@demo `demo' mode%
\else DVI mode or with\MessageBreak dvips driver%
\fi}
\def\AM@findfile#1{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/pppdftex.def new/tex/latex/pdfpages/pppdftex.def
--- old/tex/latex/pdfpages/pppdftex.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/pppdftex.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{pppdftex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for pdfTeX (AM)]
@@ -99,9 +99,11 @@
\AM@findfile@ii{#1}%
}
\AtBeginDocument{%
-\@ifpackageloaded{grffile}{%
- \let\AM@IfFileExists\grffile@IfFileExists}{%
- \let\AM@IfFileExists\IfFileExists}%
+ \let\AM@IfFileExists\IfFileExists
+ \@ifpackageloaded{grffile}{%
+ \@ifundefined{grffile@IfFileExists}{}{%
+ \let\AM@IfFileExists\grffile@IfFileExists}%
+ }{}%
}
\def\AM@setRotate{\PLS@Rotate{90}}
\def\AM@resetRotate{\PLS@Rotate{0}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppvtex.def new/tex/latex/pdfpages/ppvtex.def
--- old/tex/latex/pdfpages/ppvtex.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/ppvtex.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppvtex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for VTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pdfpages/ppxetex.def new/tex/latex/pdfpages/ppxetex.def
--- old/tex/latex/pdfpages/ppxetex.def 2017-10-31 22:24:15.000000000 +0100
+++ new/tex/latex/pdfpages/ppxetex.def 2020-01-28 23:12:12.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This file is part of the pdfpages package.
%%
-%% Copyright (C) 2001-2017 Andreas MATTHIAS
+%% Copyright (C) 2001-2020 Andreas MATTHIAS
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c
@@ -24,12 +24,12 @@
%% Please send error reports and suggestions for improvements to
%% Andreas MATTHIAS <andreas.matthias(a)gmail.com>.
%%
-\def\AM(a)fileversion{v0.5l}
+\def\AM(a)fileversion{v0.5q}
\def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END}
\def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}}
\def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}}
-\AM@Git@Date@process$Date: 2017-10-31 14:12:08 +0100 $
-\AM@Git@SHA@process$SHA-1: 9deefd6c8c22356ce47773245098390089885925 $
+\AM@Git@Date@process$Date: 2020-01-28 18:31:23 +0100 $
+\AM@Git@SHA@process$SHA-1: 105b2fdadf38120b838b3393c5cf83a7db30724e $
\ProvidesFile{ppxetex.def}
[\AM@Git@Date\space\AM@fileversion\space
Pdfpages driver for XeTeX (AM)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfpages.tlpobj new/tlpkg/tlpobj/pdfpages.tlpobj
--- old/tlpkg/tlpobj/pdfpages.tlpobj 2019-02-28 03:58:39.000000000 +0100
+++ new/tlpkg/tlpobj/pdfpages.tlpobj 2020-01-29 01:56:27.000000000 +0100
@@ -1,6 +1,6 @@
name pdfpages
category Package
-revision 45659
+revision 53583
shortdesc Include PDF documents in LaTeX
relocated 1
longdesc This package simplifies the inclusion of external multi-page
@@ -12,7 +12,10 @@
longdesc even possible to use this package to insert PostScript files,
longdesc in addition to PDF files.
depend eso-pic
-runfiles size=24
+depend graphics
+depend oberdiek
+depend tools
+runfiles size=25
RELOC/tex/latex/pdfpages/pdfpages.sty
RELOC/tex/latex/pdfpages/ppdvipdfmx.def
RELOC/tex/latex/pdfpages/ppdvips.def
@@ -22,7 +25,6 @@
RELOC/tex/latex/pdfpages/ppvtex.def
RELOC/tex/latex/pdfpages/ppxetex.def
catalogue-ctan /macros/latex/contrib/pdfpages
-catalogue-date 2017-10-31 16:15:58 +0100
catalogue-license lppl1.3c
catalogue-topics graphics-incl
-catalogue-version 0.5l
+catalogue-version 0.5q
++++++ pdftex.doc.tar.xz ++++++
++++ 1674 lines of diff (skipped)
++++++ pdftex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftex.tlpobj new/tlpkg/tlpobj/pdftex.tlpobj
--- old/tlpkg/tlpobj/pdftex.tlpobj 2019-03-27 02:25:52.000000000 +0100
+++ new/tlpkg/tlpobj/pdftex.tlpobj 2020-03-10 23:59:51.000000000 +0100
@@ -1,6 +1,6 @@
name pdftex
category TLCore
-revision 50602
+revision 54227
shortdesc A TeX extension for direct creation of PDF
longdesc An extension of TeX which can be configured to directly
longdesc generate PDF documents instead of DVI. All current free TeX
@@ -12,14 +12,15 @@
depend cm
depend dehyph
depend etex
+depend hyph-utf8
depend hyphen-base
depend knuth-lib
depend plain
depend tex-ini-files
depend pdftex.ARCH
-execute AddFormat name=pdftex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini" fmttriggers=cm,dehyph,etex,hyphen-base,knuth-lib,plain,tex-ini-files
-execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini" fmttriggers=cm,dehyph,etex,hyphen-base,knuth-lib,plain
-execute AddFormat name=pdfetex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini" fmttriggers=cm,dehyph,etex,hyphen-base,knuth-lib,plain,tex-ini-files
+execute AddFormat name=pdftex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini" fmttriggers=cm,dehyph,etex,hyph-utf8,hyphen-base,knuth-lib,plain,tex-ini-files
+execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini" fmttriggers=cm,dehyph,etex,hyph-utf8,hyphen-base,knuth-lib,plain
+execute AddFormat name=pdfetex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini" fmttriggers=cm,dehyph,etex,hyph-utf8,hyphen-base,knuth-lib,plain,tex-ini-files
execute addMap dummy-space.map
runfiles size=65
texmf-dist/fonts/map/dvips/dummy-space/dummy-space.map
@@ -33,6 +34,5 @@
catalogue-contact-home http://www.pdftex.org
catalogue-contact-repository https://tug.org/svn/pdftex/branches/stable
catalogue-contact-support http://lists.tug.org/pdftex
-catalogue-date 2017-11-29 01:13:44 +0100
catalogue-license gpl
catalogue-topics engine
++++++ pdfwin.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfwin.doc.tlpobj new/tlpkg/tlpobj/pdfwin.doc.tlpobj
--- old/tlpkg/tlpobj/pdfwin.doc.tlpobj 2019-02-28 03:59:07.000000000 +0100
+++ new/tlpkg/tlpobj/pdfwin.doc.tlpobj 2020-03-04 23:53:12.000000000 +0100
@@ -1,6 +1,6 @@
name pdfwin.doc
category Package
-revision 45797
+revision 54074
shortdesc doc files of pdfwin
relocated 1
docfiles size=130
++++++ pdfwin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfwin.tlpobj new/tlpkg/tlpobj/pdfwin.tlpobj
--- old/tlpkg/tlpobj/pdfwin.tlpobj 2019-02-28 03:59:08.000000000 +0100
+++ new/tlpkg/tlpobj/pdfwin.tlpobj 2020-03-04 23:53:12.000000000 +0100
@@ -1,6 +1,6 @@
name pdfwin
category Package
-revision 45797
+revision 54074
shortdesc customizable windows for screen viewing of TeX documents
relocated 1
longdesc Inspired by the pdfscreen package.
++++++ pdfxup.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdfxup.1 new/texmf-dist/doc/man/man1/pdfxup.1
--- old/texmf-dist/doc/man/man1/pdfxup.1 2016-04-22 23:56:17.000000000 +0200
+++ new/texmf-dist/doc/man/man1/pdfxup.1 2020-01-07 22:34:25.000000000 +0100
@@ -1,8 +1,8 @@
.\" Manpage for pdfxup.
.\" Contact pdfxup(a)markey.fr to correct errors or typos.
-.TH man 1 "6 october 2015" "1.30" "pdfxup man page"
+.TH man 1 "06 january 2020" "1.51" "pdfxup man page"
.SH NAME
-pdfxup \- n-up PDF pages with reduced margins
+pdfxup \- n-up tool with reduced margins
.SH SYNOPSIS
pdfxup [OPTIONS] [FILE]
.SH DESCRIPTION
@@ -28,14 +28,19 @@
\fB\-y\fR n, \fB\-\-rows\fR n
sets the number of lines in the output file (default 1);
.TP
-\fB\-l\fR (0|1), \fB\-\-landscape\fR (0|1)
+\fB\-l\fR, \fB\-\-landscape\fR
sets orientation of paper (of final document) landscape;
.TP
-\fB\-b\fR (0|1|le|se), \fB\-\-booklet\fR (0|1|le|se)
-configure for printing as a booklet. '1' is equivalent to 'le', which
-assumes that two-sided printing is in 'long-edge' mode (you turn from
-one page to the next along the long edge of the paper). 'se' is
-the 'short-edge' option;
+\fB\-b\fR (le|se), \fB\-\-booklet\fR (le|se)
+configure for printing as a booklet. Value 'le' (which is the default
+value when \fB\-b\fR is used with no argument) means that two-sided
+printing is in 'long-edge' mode (you turn from one page to the next
+along the long edge of the paper). 'se' is the 'short-edge' option.
+.TP
+\fB\-c\fR, \fB\-\-clip\fR
+clip pages to the computed bounding box. By default, content is not
+clipped, which may result in overlap of neighbouring pages. With this
+option, anything outside the bounding box will not be displayed.
.TP
\fB\-o\fR file, \fB\-\-output\fR file
name of output file;
@@ -44,7 +49,8 @@
ask before overwriting output file;
.TP
\fB\-fw\fR d, \fB\-\-framewidth\fR d
-width of the frame around each page (default 0.4pt);
+width of the frame around each page (default 0.4pt). Set to 0pt to have no
+frame at all;
.TP
\fB\-im\fR d, \fB\-\-innermargins\fR d
inner margin between frame and page (default 5pt);
@@ -52,24 +58,38 @@
\fB\-m\fR d, \fB\-\-margins\fR d
margin of pages of the new document (default 5pt);
.TP
-\fB\-is\fR d, \fB\-\-intspacess\fR d
+\fB\-is\fR d, \fB\-\-intspaces\fR d
space between different pages (default 1pt);
.TP
-\fB\-p\fR a-b, \fB\-\-pages\fR a-b
-only consider pages a to b of input document;
+\fB\-p\fR list, \fB\-\-pages\fR list
+only consider sublist of pages of input document. List is a
+comma-separated list of pages or ranges pages of the form a-b; a can
+be omitted to start from first page, and b can be omitted to end at
+the last page. Therefore, "\fB\-p\fR -" (which is the default)
+includes all pages. Also allows modulo, so that "\fB\-p\fR 0%2" would
+include only even-numbered pages.
.TP
-\fB\-bb\fR a-b, \fB\-\-pages\fR a-b
-only consider pages a to b of input document for computing bounding box;
+\fB\-bb\fR list, \fB\-\-bb\fR list
+only consider sublist of pages of input document for computing bounding box;
.TP
-\fB\-nobb\fR a-b, \fB\-\-no-bb\fR a-b
-omit pages a to b of input document from computation of bounding box;
+\fB\-nobb\fR list, \fB\-\-no-bb\fR list
+omit list of pages of input document from computation of bounding box;
.TP
-\fB\-g\fR (0|1), \fB\-\-get-bb\fR (0|1)
+\fB\-g\fR, \fB\-\-get-bb\fR
only compute (and output) bounding box;
.TP
\fB\-s\fR x y W H, \fB\-\-set-bb\fR x y W H
set the bounding box to the given values;
.TP
+\fB\-w\fR file, \fB\-\-watermark\fR file
+use file as background watermark. file can be any format accepted by
+pdflatex (e.g. png or pdf). If file is a multipage PDF file, page n of
+the watermark file is used with page n of the input file, and the last
+page of the watermark file is repeated if the input file has more pages;
+.TP
+\fB\-wp\fR p, \fB\-\-watermark-period\fR p
+repeat the last p pages of the watermark file instead of only the last one;
+.TP
\fB\-d\fR, \fB\-\-debug\fR
debug mode: keep intermediary files;
.TP
@@ -77,17 +97,32 @@
select verbosity (default: 1);
.TP
\fB\-q\fR, \fB\-\-quiet\fR
-run quietly (equiv. '-V=0')
+run quietly (equiv. '-V=0');
.TP
\fB\-v\fR, \fB\-\-version\fR
print version number and exit;
.TP
\fB\-h\fR, \fB\-\-help\fR
print help message and exit.
-
+.SH EXAMPLES
+.TP
+\fB# pdfxup file.pdf\fR
+produces 2-up pdf file from file.pdf
+.TP
+\fB# pdfxup -bb 1-4 file.pdf\fR
+same behaviour, but computes the bounding box only using the
+first 4 pages (this saves time when processing long documents)
+.TP
+\fB# pdfxup -b -o booklet.pdf file.pdf\fR
+same behaviour, but creates a booklet (as booklet.pdf)
+.TP
+\fB# pdfxup -kbb -x1 -y2 -l0 beamer-frames.pdf\fR
+arranges 2 beamer frames per page (not reducing margins)
+.TP
+\fB# pdfxup -kbb -x2 -y2 -l beamer-frames.pdf:1-12,15-19\fR
+arranges 4 beamer frames per page (not reducing margins), including
+only frames 1 to 12 and 15 to 19.
.SH SEE ALSO
gs(1), pdflatex(1)
-.SH BUGS
-No known bugs.
.SH AUTHOR
Nicolas Markey (pdfxup(a)markey.fr)
Binary files old/texmf-dist/doc/man/man1/pdfxup.man1.pdf and new/texmf-dist/doc/man/man1/pdfxup.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/pdfxup/README new/texmf-dist/doc/support/pdfxup/README
--- old/texmf-dist/doc/support/pdfxup/README 2016-04-22 23:56:17.000000000 +0200
+++ new/texmf-dist/doc/support/pdfxup/README 2020-01-07 22:34:25.000000000 +0100
@@ -1,26 +1,24 @@
-PDFXUP -- v1.30 (2015/10/06)
+PDFXUP -- v1.51 (2020/01/06)
N. Markey <pdfxup(a)markey.fr>
-pdfxup is a unix/linux shell script that creates a PDF
-document where each page is obtained by combining several
-pages of a PDF file given as output. The important feature
-of pdfxup, compared to similar programs, is that it tries to
-compute the (global) bounding box of the input PDF file, in
-order to remove the margins and to keep the text only.
-Instead of having the font size divided by 2 (for the case
-of 2-up output), in some case you may end up with the same
-font size as in the original document (as is the case for a
-default 'article' document produced by LaTeX).
-
-pdfxup uses ghostscript for computing the maximal bounding
-box of (some of) the pages of the document, and then uses
-pdflatex (with graphicx package) in order to produce the new
-document.
+pdfxup is a bash shell script that creates a PDF document where each
+page is obtained by combining several pages of a PDF file given as
+output. The important feature of pdfxup, compared to similar programs,
+is that it tries to compute the (global) bounding box of the input PDF
+file, in order to remove the margins and to keep the text only.
+Instead of having the font size divided by 2 (for the case of 2-up
+output), in some case you may end up with the same font size as in the
+original document (as is the case for a default 'article' document
+produced by LaTeX).
+
+pdfxup uses ghostscript for computing the maximal bounding box of
+(some of) the pages of the document, and then uses pdflatex (with
+graphicx package) in order to produce the new document.
-%% (c) 2015/10/06 Nicolas Markey <pdfxup at markey dot fr>
+%% (c) 2020/01/06 Nicolas Markey <pdfxup at markey dot fr>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/pdfxup/RELEASES new/texmf-dist/doc/support/pdfxup/RELEASES
--- old/texmf-dist/doc/support/pdfxup/RELEASES 2016-04-22 23:56:17.000000000 +0200
+++ new/texmf-dist/doc/support/pdfxup/RELEASES 2020-01-07 22:34:25.000000000 +0100
@@ -23,3 +23,11 @@
- added options -g and -s for getting and then manually
- setting bounding box.
- created man page
+
+v1.50 (2019/12/31)
+ - added the -c option (to clip pages)
+ - corrected + improved option -p
+ - added watermarking
+
+v1.51 (2020/01/06)
+ - corrected bug in dimtopt() (conversion mm to pt)
\ No newline at end of file
Binary files old/texmf-dist/doc/support/pdfxup/pdfxup.pdf and new/texmf-dist/doc/support/pdfxup/pdfxup.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfxup.doc.tlpobj new/tlpkg/tlpobj/pdfxup.doc.tlpobj
--- old/tlpkg/tlpobj/pdfxup.doc.tlpobj 2019-02-28 03:59:10.000000000 +0100
+++ new/tlpkg/tlpobj/pdfxup.doc.tlpobj 2020-01-08 01:54:32.000000000 +0100
@@ -1,8 +1,8 @@
name pdfxup.doc
category Package
-revision 40690
+revision 53345
shortdesc doc files of pdfxup
-docfiles size=10
+docfiles size=32
texmf-dist/doc/man/man1/pdfxup.1
texmf-dist/doc/man/man1/pdfxup.man1.pdf
texmf-dist/doc/support/pdfxup/README
++++++ pdfxup.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pdfxup/pdfxup new/texmf-dist/scripts/pdfxup/pdfxup
--- old/texmf-dist/scripts/pdfxup/pdfxup 2016-04-22 23:56:17.000000000 +0200
+++ new/texmf-dist/scripts/pdfxup/pdfxup 2020-01-07 22:34:25.000000000 +0100
@@ -2,10 +2,11 @@
shopt -s extglob
shopt -s lastpipe
-VERSION="1.30"
-VDATE="2015/10/06"
+VERSION="1.50"
+VDATE="2019/12/31"
## see release notes at the end of this file.
+
: ${GS=`which gs`}
if [ ! $? ]; then
echo "ghostscript not found; aborting.";
@@ -17,8 +18,9 @@
exit 1;
fi
-declare -A BB NOBB;
-
+## default values for all options.
+## Can be modified from command line
+## For instance, run "VERB=4 pdfxup ..."
function defaultvalues()
{
: ${dfpdfxupCOLS=2}
@@ -26,6 +28,7 @@
: ${dfpdfxupLANDSC=1}
: ${dfpdfxupPAP="a4"}
: ${dfpdfxupBOOKLET=0}
+ : ${dfpdfxupCLIP=1}
: ${dfpdfxupOUTF="pdfxup.pdf"}
: ${dfpdfxupIHM="5pt"}
: ${dfpdfxupIVM="5pt"}
@@ -39,36 +42,41 @@
: ${dfpdfxupFW=".4pt"}
: ${dfpdfxupPAGES="-"}
: ${dfpdfxupBB="-"}
+ : ${dfpdfxupNOBB=""}
+ : ${dfpdfxupKBB="0"}
: ${dfpdfxupGBB="0"}
: ${dfpdfxupVERB=1}
: ${dfpdfxupDEBUG=0}
+ : ${dfpdfxupWMPERIOD=1}
}
+
function usage()
{
-defaultvalues;
-echo "pdfxup: n-up pages of a PDF document, preserving readability
-usage: `basename $0` [OPTIONS] file
+ defaultvalues;
+ echo "pdfxup: n-up pages of a PDF document, preserving readability
+usage: `basename $0` [OPTIONS] file
Available OPTIONS are:
-x n n columns per page [default: \"$dfpdfxupCOLS\"]
-y n n lines per page [default: \"$dfpdfxupROWS\"]
-l [0|1] landscape-mode [default: \"$dfpdfxupLANDSC\"]
-b [0|1|le|se] booklet-mode [default: \"$dfpdfxupBOOKLET\"]
+ -c [0|1] clip pages to bounding box [default: \"$dfpdfxupCLIP\"]
-im n inner margins [default: \"$dfpdfxupIM\"]
-m n margins [default: \"$dfpdfxupM\"]
-is n interm. spaces [default: \"$dfpdfxupIS\"]
-fw n frame width [default: \"$dfpdfxupFW\"]
-o file write output to file [default: \"$dfpdfxupOUTF\"]
- -p range restrict to range of pages [default: \"$dfpdfxupPAGES\"]
- -nobb range page range to omit for computing bbox [default: \"$dfpdfxupNOBB\"]
- -bb range page range to use for computing bbox [default: \"$dfpdfxupBB\"]
+ -p pages only include these pages [default: \"$dfpdfxupPAGES\" (all)]
+ -nobb pages pages to omit when computing b.box [default: \"$dfpdfxupNOBB\" (none)]
+ -bb pages pages to use for computing b.box [default: \"$dfpdfxupBB\" (all)]
-g [0|1] only computes bounding box [default: \"$dfpdfxupGBB\"]
-s x y X Y force bounding box [default: unset]
-V [0-3] select verbosity [default: \"$dfpdfxupVERB\"]
- -q run quietly (equiv. '-V=0')
+ -w file add watermarking [default: none]
+ -wp n repeat last n pages of watermark file [default: \"$dfpdfxupWMPERIOD\"]
-i ask before overwriting/removing files
-d debug mode: keep intermediary files
- -v show version number and exit
- -h show this help message";
+ -v show version number and exit";
##
## Some options are not presented, for the sake of brevity...
@@ -79,47 +87,93 @@
## -vm n vertical margin [default: \"$dfpdfxupVM\"]
## -ihs n interm. horizontal space [detault: \"$dfpdfxupIHS\"]
## -ivs n interm. vertical space [detault: \"$dfpdfxupIVS\"]
+## -kbb keep original bounding box [default: \"$dfpdfxupKBB\"]
## -ps s output paper size [default: \"$dfpdfxupPAP\"]
+## -q run quietly (equiv. '-V=0')
+## -h show this help message
##
##
##
-exit 0;
+ exit 0;
}
function setdefaultvalues()
{
- COLS=$dfpdfxupCOLS;
- ROWS=$dfpdfxupROWS;
- LANDSC=$dfpdfxupLANDSC;
- BOOKLET=$dfpdfxupBOOKLET;
- PAP=$dfpdfxupPAP;
- OUTF=$dfpdfxupOUTF
- IHM=$dfpdfxupIHM;
- IVM=$dfpdfxupIVM;
- IM=$dfpdfxupIM;
- HM=$dfpdfxupHM;
- VM=$dfpdfxupVM;
- M=$dfpdfxupM;
- IHS=$dfpdfxupIHS;
- IVS=$dfpdfxupIVS;
- IS=$dfpdfxupIS;
- FW=$dfpdfxupFW;
- VERB=$dfpdfxupVERB;
- DEBUG=$dfpdfxupDEBUG;
- nbNOBB=0;
- nbBB=0;
- GBB=$dfpdfxupGBB;
- SBB=0;
- x0=-1
- y0=-1
- h0=-1
- w0=-1
- ## the names for h and w should actually be X and Y: they are not width and height,
- ## but coordinates of upper right corner.
+ COLS=$dfpdfxupCOLS;
+ ROWS=$dfpdfxupROWS;
+ LANDSC=$dfpdfxupLANDSC;
+ BOOKLET=$dfpdfxupBOOKLET;
+ CLIP=$dfpdfxupCLIP;
+ PAP=$dfpdfxupPAP;
+ OUTF=$dfpdfxupOUTF
+ IHM=$dfpdfxupIHM;
+ IVM=$dfpdfxupIVM;
+ IM=$dfpdfxupIM;
+ HM=$dfpdfxupHM;
+ VM=$dfpdfxupVM;
+ M=$dfpdfxupM;
+ IHS=$dfpdfxupIHS;
+ IVS=$dfpdfxupIVS;
+ IS=$dfpdfxupIS;
+ FW=$dfpdfxupFW;
+ ## don't overwrite VERB if set on command line
+ : ${VERB=$dfpdfxupVERB};
+ DEBUG=$dfpdfxupDEBUG;
+ WATERMARK="";
+ WATERMARKPERIOD=$dfpdfxupWMPERIOD;
+ KBB=$dfpdfxupKBB;
+ GBB=$dfpdfxupGBB;
+ SBB=0;
+ x0=-1
+ y0=-1
+ h0=-1
+ w0=-1
+ ## the names for h and w should actually be X and Y: they are not width and height,
+ ## but coordinates of upper right corner.
+
+ ## Notice: PAGES, BB and NOBB will be set to default values if empty after
+ ## processing options
+}
+
+## myecho handles several levels of verbosity
+function myecho()
+{
+ ECHO=0;
+ case $1 in
+ +([0-9])\+)
+ if [[ $VERB -ge ${1%+} ]]; then ECHO=1; fi
+ ;;
+ +([0-9]))
+ if [[ $VERB -eq $1 ]]; then ECHO=1; fi
+ ;;
+ +([0-9])-)
+ if [[ $VERB -le ${1%-} ]]; then ECHO=1; fi
+ ;;
+ esac
+ if [[ $ECHO == 1 ]]; then
+ case $2 in
+ -*)
+ echo $2 "$3"
+ ;;
+ *)
+ echo "$2"
+ ;;
+ esac
+ fi
}
-function dimtopt()
+## function to debug option processing
+function showopts()
+{
+ if [[ OPTS -eq 0 ]]; then
+ OPTS=1;
+ fi
+ myecho 4+ " * $1"
+}
+
+## transforms given dimension (in cm, mm, in) in pt
+function dimtopt()
{
dim=$1;
case $dim in
@@ -127,19 +181,19 @@
;;
*mm)
dim=${dim%mm};
- eval dim=$((dim*2845/100))pt;
+ eval dim=$((dim*2845/1000))pt;
;;
*cm)
dim=${dim%cm};
- eval dim=$((dim*284/10))pt;
+ eval dim=$((dim*2845/100))pt;
;;
*in)
dim=${dim%in};
- eval dim=$((dim*723/10))pt;
+ eval dim=$((dim*7228/100))pt;
;;
*[!0-9]*)
## should not occur... has been filtered out by main 'case'
- echo "Illegal unit of measure in option '$3'; ignoring";
+ myecho 1+ " illegal unit of measure in option '$3'; ignoring";
dim=$2;
;;
*)
@@ -148,6 +202,7 @@
esac
}
+## check valid unit for given dimension
function testdim()
{
dim=$1;
@@ -158,74 +213,90 @@
dim=${dim}pt
;;
+([0-9])*)
- echo "Illegal unit of measure in option '$3'; ignoring";
+ echo " illegal unit of measure in option '$3'; ignoring";
dim=$2;
;;
*)
- echo "Not a valid dimension in option '$3'; ignoring";
+ echo " not a valid dimension in option '$3'; ignoring";
dim=$2;
;;
esac
}
-function testrange()
+## sets variable $in to 1 if $1 is in list of ranges $2
+function ifinrangelist()
{
- declare -a list=("${!2}");
-
- in=0;
- if [[ $3 -eq 0 ]]; then
- return;
- fi
n=$1;
- l=$3
- i=0;
- while ( true ); do
- if [[ $i -ge $l ]]; then break; fi
- case ${list[$i]} in
+ list=$2;
+ in=0;
+
+ for i in ${list//,/$IFS}; do
+ case $i in
+([0-9]))
- first=${list[$i]};
- last=${list[$i]};
- shift;;
+ first=$i;
+ last=$i;;
-+([0-9]))
first=1;
- last=${list[$i]:1};
- shift;;
+ last=`echo $i|tr -d -`;;
+([0-9])-)
- first=${list[$i]::-1};
- last=$nbp;
- shift;;
+ first=`echo $i|tr -d -`;
+ last=$nbp;;
+([0-9])-+([0-9]))
- first=${list[$i]%-*}
- last=${list[$i]#*-}
- shift;;
+ first=`echo $i|cut -d- -f1`;
+ last=`echo $i|cut -d- -f2`;;
+ -)
+ first=1;
+ last=$nbp;;
+ *)
+ myecho 1+ " error in range of pages (option '$3' contains '$i')";
esac
if [[ $n -ge $first && $n -le $last ]]; then
in=1;
return;
fi
- eval i=$(( i+1 ))
done
+ return;
}
-function myecho()
+## normalize list + count number of pages to be displayed
+function cleancslor()
{
- ECHO=0;
- case $1 in
- +([0-9])\+)
- if [[ $VERB -ge ${1%+} ]]; then ECHO=1; fi;;
- +([0-9]))
- if [[ $VERB -eq $1 ]]; then ECHO=1; fi;;
- +([0-9])-)
- if [[ $VERB -le ${1%-} ]]; then ECHO=1; fi;;
- esac
- if [[ $ECHO == 1 ]]; then
- case $2 in
- -*)
- echo $2 "$3";;
+ list=$1;
+ result="";
+ for i in ${list//,/$IFS}; do
+ case $i in
+ +([0-9]))
+ result+="$i,";
+ nbpages+=1;;
+ -+([0-9]))
+ result+="1$i,";
+ nbpages+=${i#-};;
+ +([0-9])-)
+ result+="$i$nbp,";
+ nbpages+=$(expr $nbp + 1 - ${i%-});;
+ +([0-9])-+([0-9]))
+ result+="$i,";
+ nbpages+=$(expr 1 + `echo $i|cut -d- -f2` - `echo $i|cut -d- -f1`);;
+ -)
+ result+="1-$nbp,";
+ nbpages+=$nbp;;
+ +([0-9])%+([0-9]))
+ ## explicitly list all values...
+ ## (simpler, but admitedly less efficient,
+ ## than handling real modulos)
+ declare -i cptr;
+ cptr=`echo $i|cut -d% -f1`;
+ step=`echo $i|cut -d% -f2`;
+ while [[ $cptr -le $nbp ]]; do
+ result+="$cptr,";
+ nbpages+=1;
+ cptr+=$step;
+ done;;
*)
- echo "$2";;
- esac
- fi
+ ## anything else is discarded
+ ;;
+ esac
+ done
}
ARGS=$@;
@@ -237,31 +308,36 @@
setdefaultvalues;
filename="temp-pdfxup-`date +%s`";
+OPTS=0;
+
+## go through all arguments and options
+myecho 4+ "-> processing options";
+myecho 4+ " selected options: ";
while [ $# != 0 ]; do
case $1 in
-x|--columns)
COLS=$2;
+ showopts "columns=$COLS";
shift 2;;
-x?(=)+([0-9]))
COLS=`echo $1|sed -re "s/-x=?//"`;
+ showopts "columns=$COLS";
shift;;
-y|--rows)
ROWS=$2;
+ showopts "rows=$ROWS";
shift 2;;
-y?(=)+([0-9]))
ROWS=`echo $1|sed -re "s/-y=?//"`;
+ showopts "rows=$ROWS";
shift;;
-l|--landscape)
case $2 in
- 0|1)
- LANDSC=$2;
- SHIFT=2;
- ;;
- yes|y)
+ 1|yes|y|true)
LANDSC=1;
SHIFT=2;
;;
- no|n)
+ 0|no|n|false)
LANDSC=0;
SHIFT=2;
;;
@@ -275,17 +351,19 @@
#echo "Assuming you want landscape outupt...";
SHIFT=1;
esac
+ if [[ $LANDSC -eq 1 ]]; then
+ showopts "landscape=true";
+ else
+ showopts "landscape=false";
+ fi
shift $SHIFT;;
-l*)
ANS=`echo $1|sed -re "s/-l=?//"`;
case $ANS in
- 0|1)
- LANDSC=$ANS;
- ;;
- yes|y)
+ 1|yes|y|true)
LANDSC=1;
;;
- no|n)
+ 0|no|n|false)
LANDSC=0;
;;
*)
@@ -293,21 +371,27 @@
#echo "Normal use of '$1' option is: '$1 [0|1]'";
#echo "Assuming you want landscape outupt...";
esac
+ if [[ $LANDSC -eq 1 ]]; then
+ showopts "landscape=true";
+ else
+ showopts "landscape=false";
+ fi
shift;;
-nl|--portrait|--no-landscape|--nolandscape)
LANDSC=0;
+ showopts "landscape=false";
shift;;
-b|--booklet)
case $2 in
- 0|1|le|se)
- BOOKLET=$2;
+ se|short-edge)
+ BOOKLET="se";
SHIFT=2;
;;
- yes|y)
+ 1|yes|y|true|le|long-edge)
BOOKLET=1;
SHIFT=2;
;;
- no|n)
+ 0|no|n|false)
BOOKLET=0;
SHIFT=2;
;;
@@ -323,18 +407,25 @@
esac
if [[ $BOOKLET != 0 ]]; then
FW=0pt
+ # this is the default, but can be changed by passing -fw option
+ fi
+ if [[ $BOOKLET -eq 1 ]]; then
+ showopts "booklet (long-edge)";
+ else if [[ $BOOKLET -eq "se" ]]; then
+ showopts "booklet (short edge)";
+ fi
fi
shift $SHIFT;;
- -b[^b]*)
- ANS=`echo $1|sed -re "s/-b=?//"`;
+ -b[^b]*|--booklet*)
+ ANS=`echo $1|sed -re "s/--?b(ooklet)?=?//"`;
case $ANS in
- 0|1|le|se)
- BOOKLET=$ANS;
+ se|short-edge)
+ BOOKLET="se";
;;
- yes|y)
+ 1|yes|y|true|le|long-edge)
BOOKLET=1;
;;
- no|n)
+ 0|no|n|false)
BOOKLET=0;
;;
*)
@@ -344,161 +435,263 @@
esac
if [[ $BOOKLET != 0 ]]; then
FW=0pt
+ # this is the default, but can be changed by passing -fw option
+ fi
+ if [[ $BOOKLET -eq 1 ]]; then
+ showopts "booklet (long-edge)";
+ else if [[ $BOOKLET -eq "se" ]]; then
+ showopts "booklet (short edge)";
+ fi
+ fi
+ shift;;
+ -c|--clip)
+ case $2 in
+ 1|yes|y|true)
+ CLIP=1;
+ SHIFT=2;
+ ;;
+ 0|no|n|false)
+ CLIP=0;
+ SHIFT=2;
+ ;;
+ *)
+ CLIP=1;
+ SHIFT=1;
+ esac
+ if [[ $CLIP -eq 1 ]]; then
+ showopts "clip=true";
+ else
+ showopts "clip=false";
+ fi
+ shift $SHIFT;;
+ -c*|--clip=*)
+ ANS=`echo $1|sed -re "s/--?c(lip)?=?//"`;
+ case $ANS in
+ 1|yes|y|true)
+ CLIP=1;
+ ;;
+ 0|no|n|false)
+ CLIP=0;
+ ;;
+ esac
+ if [[ $CLIP -eq 1 ]]; then
+ showopts "clip=true";
+ else
+ showopts "clip=false";
fi
shift;;
-ps|--paper|--paper-size)
PAP=$2;
+ showopts "paper size=$PAP";
shift 2;;
-ps=*|--paper=*|--paper-size=*)
## '=' is compulsory, as we expect a string...
ANS=`echo $1|sed -re "s/(-ps=|--paper=|--paper-size=)//"`;
PAP=$ANS;
+ showopts "paper size=$PAP";
shift;;
-p|--pages|--page)
- PAGES=$2;
+ PAGES+="$2,";
+ #showopts "pages=$PAGES";
shift 2;;
-p*|--page*)
- ANS=`echo $1|sed -re "s/(-p|--pages?)=?//"`;
- PAGES=$ANS;
- shift 2;;
+ ANS=`echo $1|sed -re "s/--?p(ages?)?=?//"`;
+ PAGES=+="$ANS,";
+ #showopts "pages=$PAGES";
+ shift;;
-o|--out|--output-file|--outfile)
OUTF=$2;
+ showopts "output file=$OUTF";
shift 2;;
- -o*)
- ANS=`echo $1|sed -re "s/-o=?//"`;
+ -o*|--out=*|--output-file=*|--outfile=*)
+ ANS=`echo $1|sed -re "s/--?o(ut(put-)?(file)?)?=?//"`;
OUTF=$ANS;
+ showopts "output file=$OUTF";
shift;;
-ihm|--innerhmargin)
dimtopt $2 $dfpdfxupIHM "$1 $2";
IHM=$dim;
+ showopts "inner horizontal margin=$IHM";
shift 2;;
-ihm?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-ihm=?//"`;
dimtopt $ANS $dfpdfxupIHM $1;
IHM=$dim;
+ showopts "inner horizontal margin=$IHM";
shift;;
-ivm|--innervmargin)
dimtopt $2 $dfpdfxupIVM "$1 $2";
IVM=$dim;
+ showopts "inner vertical margin=$IVM";
shift 2;;
-ivm?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-ivm=?//"`;
dimtopt $ANS $dfpdfxupIVM $1;
IVM=$dim;
+ showopts "inner vertical margin=$IVM";
shift;;
-im|--innermargins)
dimtopt $2 $dfpdfxupIM "$1 $2";
IHM=$dim;
IVM=$dim;
+ showopts "inner margins=$IHM";
shift 2;;
-im?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-im=?//"`;
dimtopt $ANS $dfpdfxupIM $1;
IHM=$dim;
IVM=$dim;
+ showopts "inner margins=$IHM";
shift;;
-hm|--hmargin)
testdim $2 $dfpdfxupHM "$1 $2";
HM=$dim;
+ showopts "horizontal margin=$HM";
shift 2;;
-hm?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-hm=?//"`;
testdim $ANS $dfpdfxupHM $1;
HM=$dim;
+ showopts "horizontal margin=$HM";
shift;;
-vm|--vmargin)
testdim $2 $dfpdfxupVM "$1 $2";
VM=$dim;
+ showopts "vertical margin=$VM";
shift 2;;
-vm?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-vm=?//"`;
testdim $ANS $dfpdfxupVM $1;
VM=$dim;
+ showopts "vertical margin=$VM";
shift;;
-m|--margins)
testdim $2 $dfpdfxupM "$1 $2";
HM=$dim;
VM=$dim;
+ showopts "margins=$HM";
shift 2;;
-m?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-m=?//"`;
testdim $ANS $dfpdfxupM $1;
HM=$dim;
VM=$dim;
+ showopts "margins=$HM";
shift;;
-ihs|--inthspace)
testdim $2 $dfpdfxupIHS "$1 $2";
IHS=$dim;
+ showopts "horizontal space=$IHS";
shift 2;;
-ihs?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-ihs=?//"`;
testdim $ANS $dfpdfxupIHS $1;
IHS=$dim;
+ showopts "horizontal space=$IHS";
shift;;
-ivs|--intvspace)
testdim $2 $dfpdfxupIVS "$1 $2";
IVS=$dim;
+ showopts "vertical space=$IVS";
shift 2;;
-ivs?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-ivs=?//"`;
testdim $ANS $dfpdfxupIVS $1;
IVS=$dim;
+ showopts "vertical space=$IVS";
shift;;
-is|--intspaces)
testdim $2 $dfpdfxupIS "$1 $2";
IHS=$dim;
IVS=$dim;
+ showopts "space=$IHS";
shift 2;;
-is?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-is=?//"`;
testdim $ANS $dfpdfxupIS $1;
IHS=$dim;
IVS=$dim;
+ showopts "space=$IHS";
shift;;
-fw|--framewidth)
testdim $2 $dfpdfxupFW "$1 $2";
FW=$dim;
+ showopts "frame rule width=$FW";
shift 2;;
-fw?(=)+([0-9])*)
ANS=`echo $1|sed -re "s/-fw=?//"`;
testdim $ANS $dfpdfxupFW $1;
FW=$dim;
+ showopts "frame rule width=$FW";
shift;;
-i)
MVopt="-i";
RMopt="-i";
+ showopts "interactive clean up: true";
shift;;
-nobb|--nobb|-no-bb|--no-bb)
- NOBB[$nbNOBB]=$2;
- eval nbNOBB=$(( nbNOBB+1 ));
+ NOBB+="$2,";
shift 2;;
- -nobb*|--nobb*|-no-bb*|--no-bb*)
+ -nobb*|--no-bb*)
ANS=`echo $1|sed -re "s/--?no-?bb=?//"`;
- NOBB[$nbNOBB]=$ANS;
- eval nbNOBB=$(( nbNOBB+1 ));
+ NOBB+="$ANS,";
shift;;
- -bb|--bb)
- BB[$nbBB]=$2;
- eval nbBB=$(( nbBB+1 ));
+ -bb|--bb|--bounding-box)
+ BB+="$2,";
shift 2;;
- -bb*|--bb*)
- ANS=`echo $1|sed -re "s/--?bb=?//"`;
- BB[$nbBB]=$ANS;
- eval nbBB=$(( nbBB+1 ));
+ -bb*|--bb*|--bounding-box)
+ ANS=`echo $1|sed -re "s/--?b(ounding-?)?b(ox)?=?//"`;
+ BB+="$ANS,";
shift;;
-
-
- -g|--get-bb|--getbb)
+ -kbb|--keepbb|--keep-bb|--original-bb)
case $2 in
- 0|1)
- GBB=$2;
+ 1|yes|y|true)
+ KBB=1;
+ SHIFT=2;
+ ;;
+ 0|no|n|false)
+ KBB=0;
SHIFT=2;
;;
- yes|y)
+ -*)
+ KBB=1;
+ SHIFT=1;
+ ;;
+ *)
+ KBB=1;
+ SHIFT=1;
+ esac
+ if [[ $KBB -eq 1 ]]; then
+ showopts "keep original bounding box=true";
+ else
+ showopts "keep original bounding box=false";
+ fi
+ shift $SHIFT;;
+ -kbb*|--keepbb*|--keep-bb*|--original-bb*)
+ ANS=`echo $1|sed -re "s/--?(k(eep-?)?bb|orig[^=]*bb)=?//"`;
+ case $ANS in
+ 1|yes|y|true)
+ KBB=1;
+ ;;
+ 0|no|n|false)
+ KBB=0;
+ ;;
+ *)
+ KBB=1;
+ esac
+ if [[ $KBB -eq 1 ]]; then
+ showopts "keep original bounding box=true";
+ else
+ showopts "keep original bounding box=false";
+ fi
+ shift;;
+ -g|--get-bb|--getbb)
+ case $2 in
+ 1|yes|y|true)
GBB=1;
SHIFT=2;
;;
- no|n)
+ 0|no|n|false)
GBB=0;
SHIFT=2;
;;
@@ -508,21 +701,21 @@
;;
*)
GBB=1;
- #echo "Normal use of '$1' option is: '$1 [0|1]'";
- #echo "Assuming you want landscape outupt...";
SHIFT=1;
esac
+ if [[ $GBB -eq 1 ]]; then
+ showopts "only compute bounding box=true";
+ else
+ showopts "only compute bounding box=false";
+ fi
shift $SHIFT;;
- -g*)
- ANS=`echo $1|sed -re "s/-g=?//"`;
+ -g*|--get-bb=*|--getbb=*)
+ ANS=`echo $1|sed -re "s/--?g(etbb|et-bb)?=?//"`;
case $ANS in
- 0|1)
- GBB=$ANS;
- ;;
- yes|y)
+ 1|yes|y|true)
GBB=1;
;;
- no|n)
+ 0|no|n|false)
GBB=0;
;;
*)
@@ -530,8 +723,12 @@
#echo "Normal use of '$1' option is: '$1 [0|1]'";
#echo "Assuming you want landscape outupt...";
esac
+ if [[ $GBB -eq 1 ]]; then
+ showopts "only compute bounding box=true";
+ else
+ showopts "only compute bounding box=false";
+ fi
shift;;
-
-s|--set-bb|--setbb)
case "$2$3$4$5" in
+([0-9]))
@@ -541,33 +738,61 @@
BBW=$4;
BBH=$5;;
esac
+ showopts "bounding box set to $2 $3 $4 $5";
shift 5;;
-
-V)
case $2 in
@(0|1|2|3))
- VERB=$2;
+ if [[ $VERB -lt $2 ]]; then
+ VERB=$2;
+ fi
SHIFT=2;;
*)
- VERB=2;
+ if [[ $VERB -lt 2 ]]; then
+ VERB=2;
+ fi
SHIFT=1;;
esac
shift $SHIFT;;
-V?(=)@(0|1|2|3))
- VERB=`echo $1|sed -re "s/-V=?//"`;
+ if [[ $VERB -lt `echo $1|sed -re "s/-V=?//"` ]]; then
+ VERB=`echo $1|sed -re "s/-V=?//"`;
+ fi
shift;;
-V?(=)+([0-9]))
VERB=9;
shift;;
- -VV)
- VERB=2;
+ -VV)
+ if [[ $VERB -lt 2 ]]; then
+ VERB=2;
+ fi
shift;;
-VVV)
- VERB=3;
+ if [[ $VERB -lt 3 ]]; then
+ VERB=3;
+ fi
shift;;
-q|--quiet)
VERB=0;
shift;;
+ -w|--watermark|--watermark-file)
+ WATERMARK=$2;
+ showopts "watermarking with file $WATERMARK";
+ shift 2;;
+ -w=*|--watermark=*|--watermark-file=*)
+ ANS=`echo $1|sed -re "s/--?w[^=]*=//"`;
+ WATERMARK=$ANS;
+ showopts "watermarking with file $WATERMARK";
+ shift;;
+ -wp|--wperiod|--watermark-period)
+ WATERMARKPERIOD=$2;
+ showopts "watermarking period=$WATERMARKPERIOD";
+ shift 2;;
+ -wp=*|--wperiod=*|--watermark-period=*)
+ ANS=`echo $1|sed -re "s/--?w[^=]*=//"`;
+ WATERMARKPERIOD=$ANS;
+ showopts "watermarking period=$WATERMARKPERIOD";
+ shift;;
-v|--version)
echo "pdfxup version $VERSION (released $VDATE)";
exit 0;;
@@ -576,10 +801,12 @@
shift;;
-*)
usage;;
- *:[0-9\-]*)
+ *:+([0-9\-,\%]))
ARG=$1;
- file=${ARG%:*}
- PAGES=${ARG#*:}
+ file=${ARG%:*};
+ PAGES+="${ARG#*:},";
+ ## only one file is allowed, and no options
+ ## should appear after the file name...
break;;
*)
file=$1;
@@ -589,206 +816,232 @@
esac;
done
+## this depends on verbosity, hence can only be announced *after* processing options...
+myecho 3- "-> processing options";
+
+## check input file
if [[ $file == "" ]]; then
- echo "pdfxup: no input file given; exiting.";
+ echo "pdfxup error: no input file given; exiting.";
exit 0;
fi
-if [[ ! -e $file && `basename $file .pdf` == $file ]]; then
- myecho 2+ "-> changing file name '$file' to '$file.pdf'";
- file="$file.pdf";
-fi;
-
if [[ ! -e $file ]]; then
- echo "pdfxup: file $file not found; exiting.";
+ echo "pdfxup error: file $file not found; exiting.";
exit 0;
fi
-## get number of pages
+## get number of pages of input file
nbp=`$GS -sDEVICE=bbox -dNOPAUSE -dQUIET -c "($file) (r) file runpdfbegin pdfpagecount = quit"`
+## now we can deal with ranges of pages (BB, NOBB, PAGES)
+declare -i nbpages;
+nbpages=0;
+if [[ ${BB} != "" ]]; then
+ BB=${BB%,};
+ cleancslor $BB;
+ BB=${result%,};
+ showopts "use for bounding-box computation: "${BB};
+else
+ if [[ ${PAGES} != "" ]]; then
+ BB=${PAGES%,};
+ cleancslor $BB;
+ BB=${result%,};
+ showopts "use for bounding-box computation: "${BB};
+ else
+ BB=$dfpdfxupBB;
+ fi
+fi
+if [[ ${NOBB} != "" ]]; then
+ NOBB=${NOBB%,};
+ cleancslor $NOBB;
+ NOBB=${result%,};
+ showopts "exclude from bounding-box computation: "${NOBB};
+else
+ NOBB=$dfpdfxupNOBB;
+fi
+if [[ ${PAGES} != "" ]]; then
+ PAGES=${PAGES%,};
+else
+ PAGES=$dfpdfxupPAGES;
+fi
+nbpages=0;
+cleancslor $PAGES;
+PAGES=${result%,};
+showopts "pages to display: ${PAGES} (${nbpages} pages)";
+
+
+## clipping option
+if [[ $CLIP != 0 ]]; then
+ myecho 2+ " clipping pages (anything outside bounding box will be dropped)";
+ CLIPOPT=",clip";
+else
+ myecho 2+ " not clipping pages (anything outside bounding box will be displayed)";
+ myecho 2+ " (pages may overlap)";
+ CLIPOPT="";
+fi
+
+
+## output file name
+if [[ ! -e $file && `basename $file .pdf` == $file ]]; then
+ myecho 2+ " changing file name '$file' to '$file.pdf'";
+ file="$file.pdf";
+fi;
+
+
+
+## special case: if booklet, we force the numbers of rows and cols
if [[ $BOOKLET != 0 ]]; then
if [[ $COLS != 2 || $ROWS != 1 || $LANDSC == 0 ]]; then
- echo "forcing booklet mode: 2 cols, 1 row, landscape";
+ echo " forcing booklet mode: 2 columns, 1 row, landscape mode";
COLS=2; ROWS=1; LANDSC=1;
fi
fi
-firstp=1;
-lastp=$nbp;
-if [[ $PAGES =~ ([0-9]+|[0-9]*-[0-9]*) ]]; then
- BB[$nbBB]=$PAGES;
- eval nbBB=$(( nbBB+1 ));
- case $PAGES in
- -)
- firstp=1;
- lastp=$nbp;;
- +([0-9]))
- firstp=${PAGES};
- lastp=${PAGES};;
- -+([0-9]))
- firstp=1;
- lastp=${PAGES:1};;
- +([0-9])-)
- firstp=${PAGES::-1};
- lastp=$nbp;;
- +([0-9])-+([0-9]))
- firstp=${PAGES%-*};
- lastp=${PAGES#*-};;
- esac
-fi
-if [[ $nbBB == 0 ]]; then
- BB[$nbBB]=$dfpdfxupBB;
- nbBB=1;
-fi
-if [[ $nbNOBB == 0 ]]; then
- NOBB[0]="";
+## check watermarking file
+nbwp=1; ## set even if no watemark
+if [[ $WATERMARK != "" ]]; then
+ if [[ ! -e $WATERMARK ]]; then
+ myecho 1+ " pdfxup: watermarking file not found. Omiting watermarking."
+ else
+ myecho 2+ " * using file $WATERMARK for watermarking";
+ if [[ `file -b $WATERMARK | grep "PDF"` ]]; then
+ ## get number of pages of WATERMARK (PDF) file
+ nbwp=`$GS -sDEVICE=bbox -dNOPAUSE -dQUIET -c "($WATERMARK) (r) file runpdfbegin pdfpagecount = quit"`
+ if [[ $WATERMARKPERIOD -gt $nbwp || $WATERMARKPERIOD -lt 1 ]]; then
+ WATERMARKPERIOD=$nbwp;
+ fi
+ fi
+ fi
fi
-
-if [[ $SBB == 0 ]]; then
- myecho 1+ -n "-> computing bounding box";
- myecho 2+ "";
-
- x=$x0
- y=$y0
- w=$w0
- h=$h0
- curr=0
- page=0
-
-# $GS -dNOPAUSE -dSAFER -dQUIET -dBATCH -sDEVICE=bbox $file 2>&1 |\
-# grep "%%BoundingBox" |\
-# sed "s/^.*Box: //" > $filename-bb.txt
-# for i in `cat $filename-bb.txt`; do
-# case $curr in
-# 0)
-# thisx=$i;
-# #if [[ $x -gt $i ]]; then x=$i; fi
-# ;;
-# 1)
-# thisy=$i;
-# #if [[ $y -gt $i ]]; then y=$i; fi
-# ;;
-# 2)
-# thisw=$i;
-# #if [[ $w -lt $i ]]; then w=$i; fi
-# ;;
-# 3)
-# thish=$i;
-# #if [[ $h -lt $i ]]; then h=$i; fi
-# if [[ $x -lt 0 || $x -gt $thisx && $thisx+$thisw -gt 0 ]]; then x=$thisx; fi
-# if [[ $y -lt 0 || $y -gt $thisy && $thisy+$thish -gt 0 ]]; then y=$thisy; fi
-# if [[ $w -lt 0 || $w -lt $thisw && $thisx+$thisw -gt 0 ]]; then w=$thisw; fi
-# if [[ $h -lt 0 || $h -lt $thish && $thisy+$thish -gt 0 ]]; then h=$thish; fi
-# ;;
-# esac
-# eval curr=$(( (curr+1) % 4 ));
-# done
-# rm $filename-bb.txt
-
- for (( b=0; b<$nbBB; b++ ))
- do
- case ${BB[$b]} in
- -)
- first=1;
- last=$nbp;;
- +([0-9]))
- first=${BB[$b]};
- last=${BB[$b]};;
- -+([0-9]))
- first=1;
- last=${BB[$b]:1};;
- +([0-9])-)
- first=${BB[$b]::-1};
- last=$nbp;;
- +([0-9])-+([0-9]))
- first=${BB[$b]%-*};
- last=${BB[$b]#*-};;
- esac
- myecho 3+ " > $GS -dNOPAUSE -dSAFER -dQUIET -dBATCH -dFirstPage=$first -dLastPage=$last -sDEVICE=bbox $file"
- $GS -dNOPAUSE -dSAFER -dQUIET -dBATCH -dFirstPage=$first -dLastPage=$last -sDEVICE=bbox $file 2>&1 |
- while IFS= read -r line; do
- bbox=`echo $line | grep "%%BoundingBox" | sed "s/^.*Box: //"`;
- if [[ $bbox != "" ]]; then
- for i in `echo $line | grep "%%BoundingBox" | sed "s/^.*Box: //"`; do
- if [[ $curr == 0 ]]; then
- eval page=$(( page+1 ));
- fi
- case $curr in
- 0)
- thisx=$i;
- #if [[ $x -gt $i ]]; then x=$i; fi
- ;;
- 1)
- thisy=$i;
- #if [[ $y -gt $i ]]; then y=$i; fi
- ;;
- 2)
- thisw=$i;
- #if [[ $w -lt $i ]]; then w=$i; fi
- ;;
- 3)
- thish=$i;
- #if [[ $h -lt $i ]]; then h=$i; fi
- testrange $page NOBB[@] $nbNOBB
- if [ $in == 0 ]; then
- if [[ $x -lt 0 || $x -gt $thisx && $thisx+$thisw -gt 0 ]]; then x=$thisx; fi
- if [[ $y -lt 0 || $y -gt $thisy && $thisy+$thish -gt 0 ]]; then y=$thisy; fi
- if [[ $w -lt 0 || $w -lt $thisw && $thisx+$thisw -gt 0 ]]; then w=$thisw; fi
- if [[ $h -lt 0 || $h -lt $thish && $thisy+$thish -gt 0 ]]; then h=$thish; fi
- myecho 1 -n "."
- myecho 2 -ne " bbox: x=$x y=$y X=$w Y=$h (page $page) \\r";
- myecho 3+ " bbox: x=$x y=$y X=$w Y=$h (page $page) ";
+## start computing bounding box
+x=$x0
+y=$y0
+w=$w0
+h=$h0
+curr=0
+page=0
+step=0
+
+if [[ $KBB == 0 ]]; then
+ if [[ $SBB == 0 ]]; then
+ myecho 1+ -n "-> computing bounding box";
+ myecho 2+ "";
+
+ for r in ${BB//,/$IFS};
+ do
+ case $r in
+ +([0-9]))
+ first=$r;
+ last=$r;;
+ -+([0-9]))
+ first=1;
+ last=`echo $r|tr -d -`;;
+ +([0-9])-)
+ first=`echo $r|tr -d -`;
+ last=$nbp;;
+ +([0-9])-+([0-9]))
+ first=`echo $r|cut -d- -f1`;
+ last=`echo $r|cut -d- -f2`;;
+ -)
+ first=1;
+ last=$nbp;;
+ esac
+ myecho 2+ " * $GS -dNOPAUSE -dSAFER -dQUIET -dBATCH -dFirstPage=$first -dLastPage=$last -sDEVICE=bbox $file"
+ $GS -dNOPAUSE -dSAFER -dQUIET -dBATCH -dFirstPage=$first -dLastPage=$last -sDEVICE=bbox $file 2>&1 |
+ while IFS= read -r line; do
+ bbox=`echo $line | grep "%%BoundingBox" | sed "s/^.*Box: //"`;
+ if [[ $bbox != "" ]]; then
+ for i in `echo $line | grep "%%BoundingBox" | sed "s/^.*Box: //"`; do
+ if [[ $curr == 0 ]]; then
+ eval page=$(( page+1 ));
fi
- ;;
- esac
- eval curr=$(( (curr+1) % 4 ));
- done
- fi
- done;
- done;
-else
- x=$BBX;
- y=$BBY;
- w=$BBW;
- h=$BBH;
+ case $curr in
+ 0)
+ thisx=$i;
+ #if [[ $x -gt $i ]]; then x=$i; fi
+ ;;
+ 1)
+ thisy=$i;
+ #if [[ $y -gt $i ]]; then y=$i; fi
+ ;;
+ 2)
+ thisw=$i;
+ #if [[ $w -lt $i ]]; then w=$i; fi
+ ;;
+ 3)
+ thish=$i;
+ #if [[ $h -lt $i ]]; then h=$i; fi
+ ifinrangelist $page $NOBB;
+ if [ $in == 0 ]; then
+ eval step=$(( step+1 ));
+ if [[ $x -lt 0 || $x -gt $thisx && $thisx+$thisw -gt 0 ]]; then x=$thisx; fi
+ if [[ $y -lt 0 || $y -gt $thisy && $thisy+$thish -gt 0 ]]; then y=$thisy; fi
+ if [[ $w -lt 0 || $w -lt $thisw && $thisx+$thisw -gt 0 ]]; then w=$thisw; fi
+ if [[ $h -lt 0 || $h -lt $thish && $thisy+$thish -gt 0 ]]; then h=$thish; fi
+ myecho 1 -n "."
+ myecho 2 -ne " bbox: x=$x y=$y X=$w Y=$h (step $step) \\r";
+ myecho 3+ " bbox: x=$x y=$y X=$w Y=$h (step $step) ";
+ fi
+ ;;
+ esac
+ eval curr=$(( (curr+1) % 4 ));
+ done
+ fi
+ done;
+ done;
+ else
+ x=$BBX;
+ y=$BBY;
+ w=$BBW;
+ h=$BBH;
+ fi
fi
-if [[ $x -eq $x0 &&
+EMPTYBB=$KBB;
+if [[ $KBB == 0 && $x -eq $x0 &&
$y -eq $y0 &&
$h -eq $h0 &&
- $w -eq $w0 ]]; then
- echo "empty bounding box; aborting."
- exit 1;
+ $w -eq $w0 ]]; then
+ myecho 1+ "";
+ myecho 1+ " * empty bounding box; keeping original margins";
+ EMPTYBB=1;
+ #exit 1;
fi
-if [[ $SBB == 0 ]]; then
+if [[ $SBB == 0 && $EMPTYBB == 0 ]]; then
myecho 1 -n "."
- myecho 2+ -ne " bbox: x=$x y=$y X=$w Y=$h (final) \\r";
-
+ myecho 2+ -ne " bbox: x=$x y=$y X=$w Y=$h (final) \\r";
+ myecho 3+ "";
+ myecho 3+ -ne " (processed $page pages) \\r";
myecho 1+ "";
fi
if [[ $GBB != 0 ]]; then
- myecho 1 "-> final bounding box: x=$x y=$y X=$w Y=$h";
+ myecho 1+ " final bounding box: x=$x y=$y X=$w Y=$h";
exit 0;
fi
+
+## compute options to pass to \includegraphics
IHM=${IHM%pt};
IVM=${IVM%pt};
-eval x=$((x-IHM))
-eval y=$((y-IVM))
-eval w=$((w+IHM))
-eval h=$((h+IVM))
-
-
+if [[ $EMPTYBB -eq 0 ]]; then
+ eval x=$((x-IHM))
+ eval y=$((y-IVM))
+ eval w=$((w+IHM))
+ eval h=$((h+IVM))
+ BBOPTION="viewport=$x $y $w $h";
+else
+ BBOPTION="trim=-$IHM -$IVM -$IHM -$IVM";
+fi
+## start writing .tex file
cat > $filename.tex <<EOF
\newif\ifbooklet
\newif\iflongedge
@@ -811,7 +1064,39 @@
\IfFileExists{grffile.sty}{\usepackage{grffile}}{}
\topskip=0pt
+ \makeatletter
+
+ %% \nthvalue#1#2 looks for #1-th value in list of intervals #2
+ \newcounter{result}%
+ \newif\iffound
+ \def\@parserange#1-#2-#3\@end#4\@end{%
+ \setcounter{result}{#4}%
+ \ifnum\value{result}=1\relax
+ \foundtrue
+ \setcounter{result}{#1}%
+ \else
+ \addtocounter{result}{-1}%
+ \ifx\relax#3\relax%% means that range contains no -
+ \else
+ \addtocounter{result}{#1}%
+ \ifnum#2<\value{result}\relax
+ \addtocounter{result}{-#2}%
+ \else
+ \foundtrue
+ \fi
+ \fi
+ \fi}
+ \def\parserange#1#2{\expandafter\@parserange#2-SINGLE-\@end#1\@end}
+ \def\@parsecsl#1,#2\@end#3\@end{%
+ \parserange{#3}{#1}%
+ \iffound\else
+ \ifx\relax#2\relax\else\@parsecsl#2\@end\value{result}\@end\fi\fi}
+ \def\nthvalue#1#2{\foundfalse\expandafter\@parsecsl#2,\@end#1\@end}
+ %%
+
\def\file{$file}
+ \def\pagelist{$PAGES}
+ \def\watermark{$WATERMARK}
\pdfximage{\file}
\parindent=0pt
@@ -826,8 +1111,7 @@
\newcounter{outpage}
\newcounter{lastpage}
%\setcounter{outpage}{\the\pdflastximagepages}
- \setcounter{outpage}{$lastp}
- \makeatletter
+ \setcounter{outpage}{$nbpages}
\addtocounter{outpage}{-1}
\divide\c@outpage by \nbhoriz
\divide\c@outpage by \nbvert
@@ -876,6 +1160,7 @@
\divide\vresult by \nbvert
% computing actual scale
+ \if0$EMPTYBB
\newcounter{origx}
\setcounter{origx}{$w}
\addtocounter{origx}{-$x}
@@ -898,6 +1183,7 @@
\immediate\write\scale{\the\finalx}
\fi
\immediate\closeout\scale
+ \fi
\begin{document}
%\tracingoutput=1
@@ -905,12 +1191,14 @@
%\tracingparagraphs=1
\makeatletter
\newcounter{curroutpage}
- \setcounter{curroutpage}{$firstp}
+ \setcounter{curroutpage}{1}
\addtocounter{curroutpage}{-1}
\newcounter{currpage}
\newcounter{currcol}
\newcounter{currline}
\newcounter{realout}
+ \newcounter{wmout}
+ \newcounter{wmoutaux}
%\showthe\value{outpage}
%\showthe\value{curroutpage}
\@whilenum \value{outpage}>\value{curroutpage} \do%
@@ -933,6 +1221,7 @@
\global\stepcounter{currcol}%
\global\stepcounter{currpage}%
\ifnum\value{currpage}>\value{lastpage}\else
+ %% computing page number corresponding to \currline and \currcol
\setcounter{realout}{\value{currpage}}%
\def\ang{0}%
\ifbooklet
@@ -981,12 +1270,40 @@
\fi
\fi
\fi
- \ifnum\value{realout}>$lastp
+ \ifnum\value{realout}>$nbpages\relax
+ %% if page above nb of pages, output blank page
\hskip\hresult\hskip2\fboxrule
- \else\fbox{\hbox to \hresult{\hfill
- \expandafter\includegraphics\expandafter[viewport=$x $y $w $h,%
+ \else
+ %% otherwise compute corresponding page to display
+ %% first keep realout for watermarking...
+ \setcounter{wmoutaux}{\value{realout}}%
+ \setcounter{wmout}{\value{realout}}%
+ \nthvalue{\value{realout}}{\pagelist}%
+ \iffound\setcounter{realout}{\value{result}}%
+ \else %% hmmm... problem
+ \message{I'm messed up counting pages...}%
+ \fi
+ %% compute watermarking page (should be original realout?)
+ \ifx\watermark\@empty\else
+ \ifnum$nbwp<\value{wmoutaux}\relax
+ \addtocounter{wmoutaux}{-$nbwp}%
+ \addtocounter{wmoutaux}{-1}%
+ \divide\c@wmoutaux by $WATERMARKPERIOD\relax
+ \stepcounter{wmoutaux}%
+ \multiply\c@wmoutaux by $WATERMARKPERIOD\relax
+ \addtocounter{wmout}{-\value{wmoutaux}}%
+ \fi
+ \vbox to \vresult{\vfill
+ \hbox to 0pt{\hfill
+ \expandafter\includegraphics\expandafter[keepaspectratio,%
+ height=\vresult,width=\hresult,angle=\ang,%
+ page=\value{wmout}$CLIPOPT]{$WATERMARK}\hss}\vfill}%
+ \fi
+ \fbox{\vbox to \vresult{\vfill
+ \hbox to \hresult{\hfill
+ \expandafter\includegraphics\expandafter[$BBOPTION,%
keepaspectratio,height=\vresult,width=\hresult,angle=\ang,%
- page=\value{realout}]{\file}\hfill}}%
+ page=\value{realout}$CLIPOPT]{\file}\hfill}\vfill}}%
\fi
\fi}}%
\clearpage%
@@ -998,17 +1315,30 @@
myecho 1+ "-> producing final file";
case $VERB in
0|1|2)
- $PDFLATEX -interaction=batchmode $filename.tex > /dev/null 2>&1;;
+ myecho 2+ " * $PDFLATEX -interaction=nonstopmode $filename.tex"
+ $PDFLATEX -interaction=batchmode $filename.tex > /dev/null 2>&1 || \
+ LATEXFAILED=1;;
*)
- myecho 3+ " > $PDFLATEX -interaction=nonstopmode $filename.tex"
- $PDFLATEX -interaction=nonstopmode $filename.tex;;
+ myecho 3+ " * $PDFLATEX -interaction=nonstopmode $filename.tex"
+ $PDFLATEX -interaction=nonstopmode $filename.tex || LATEXFAILED=1;;
esac
-myecho 1+ " final scale: "`cat $filename.scl | sed -e "s/pt$//"`"%";
+if [[ $LATEXFAILED -eq 1 ]]; then
+ myecho 1+ ": failed!"
+ if [[ $DEBUG == 0 ]]; then
+ myecho 1+ "-> cleaning";
+ myecho 2+ " * rm $RMopt $filename.*"
+ rm $RMopt $filename.*
+ fi
+ exit 0;
+fi
+if [[ $EMPTYBB -eq 0 ]]; then
+ myecho 1+ " final scale: "`cat $filename.scl | sed -e "s/pt$//"`"%"
+fi
+myecho 2+ " * mv $MVopt $filename.pdf $OUTF"
+mv $MVopt $filename.pdf $OUTF
if [[ $DEBUG == 0 ]]; then
myecho 1+ "-> cleaning";
- myecho 3+ " > mv $MVopt $filename.pdf $OUTF"
- mv $MVopt $filename.pdf $OUTF
- myecho 3+ " > rm $RMopt $filename.*"
+ myecho 2+ " * rm $RMopt $filename.*"
rm $RMopt $filename.*
fi
@@ -1046,16 +1376,18 @@
either the 'long-edge' or the 'short edge' of the paper.
'long-edge' seems to be the most commonly used, but using
'-b se' while produce a PDF booklet for 'short-edge'
- 2-sided printing.
- * '-p' can be used to only consider a range of pages of the
- input file. We do not handle unions of page ranges, so that
- only the last occurrence of '-p' will be used. The
- restriction applies both for the computation of the
- bounding box (and is compatible with the options '-bb' and
- '-nobb' below) and for creating the final document.
- Alternatively to '-p', the page range can be specified
- after the file name, writing 'file.pdf:n-m' in place of
- '-p n-m'.
+ 2-sided printing.
+ * '-c' clips pages to their bounding box: this is set by
+ default, so that any content outside bounding box will be
+ lost. Using "-c 0", anything outside the bounding box will
+ be displayed, and may overlap neighbouring pages.
+ * '-p' can be used to only consider a set of pages of the
+ input file. The set of pages to include is a comma-
+ separated list of pages, ranges of pages of the form
+ 'm-n', or sets of pages of the form "0%2" (all even-
+ numbered pages). Alternatively to '-p', the page range
+ can be specified after the file name, writing
+ 'file.pdf:<list>' in place of '-p <list>'.
* '-bb' can be used to list the pages to be taken into
account when computing the bounding box. This is
especially useful for large documents, because computing the
@@ -1078,3 +1410,39 @@
its included page.
* margins: margins of the final document
* spacing: spacing between frames
+ * '-w file' can be used to add watermarking to all pages. The
+ file can be anything that pdflatex can handle (eg. png, pdf).
+ If it is a PDF with several pages, page n of the watermarking
+ file will be used with page n of the input file. By default,
+ the last page will be repeated if the input file has more
+ pages than the watermarking file. This behaviour can be
+ modified with the '-wp n' options, which asks to repeat the
+ last n pages instead of only the last one. Setting `-wp 0`
+ will repeat all the pages of the watermarking file.
+
+##################################################################
+##
+## Examples
+##
+##################################################################
+
+# pdfxup file.pdf
+ -> creates pdfxup.pdf from file.pdf with default options
+ (2-up, margins=5mm)
+# pdfxup -bb 1-4 file.pdf
+ -> same behaviour, but computes the bounding box only using the
+ first 4 pages
+ (this saves time when processing long documents)
+# pdfxup -b file.pdf
+ -> same behaviour, but creates a booklet
+# pdfxup -kbb -b -o booklet.pdf file.pdf:3-25
+ -> creates a booklet from pages 3-25 of file.pdf, without
+ reducing margins (option '-kbb' disables bounding-box
+ computation; equivalent to e.g. '-bb 0');
+ name the resulting file booklet.pdf.
+# pdfxup -kbb -x1 -y2 -l0 beamer-frames.pdf
+ -> arranges 2 beamer frames per page (not reducing margins)
+# pdfxup -kbb -x2 -y2 -l1 beamer-frames.pdf
+ -> arranges 4 beamer frames per page (not reducing margins)
+# pdfxup -fw0 -w draft.png file.pdf
+ -> remove frame border; add 'draft' watermarking on all pages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfxup.tlpobj new/tlpkg/tlpobj/pdfxup.tlpobj
--- old/tlpkg/tlpobj/pdfxup.tlpobj 2019-02-28 03:59:10.000000000 +0100
+++ new/tlpkg/tlpobj/pdfxup.tlpobj 2020-01-08 01:54:32.000000000 +0100
@@ -1,15 +1,17 @@
name pdfxup
category Package
-revision 40690
+revision 53345
shortdesc Create n-up PDF pages with minimal margins
-longdesc pdfxup is a unix/linux shell script that creates a PDF document
+longdesc pdfxup is a Unix/Linux shell script that creates a PDF document
longdesc where each page is obtained by combining several pages of a PDF
-longdesc file given as output.
+longdesc file given as output. pdfxup uses ghostscript for computing the
+longdesc maximal bounding box of (some of) the pages of the document,
+longdesc and then uses pdflatex (with the graphicx package) in order to
+longdesc produce the new document.
depend pdfxup.ARCH
-runfiles size=7
+runfiles size=10
texmf-dist/scripts/pdfxup/pdfxup
catalogue-ctan /support/pdfxup
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics pdfprocess
-catalogue-version 1.30
+catalogue-version 1.51
++++++ perfectcut.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/perfectcut/README new/doc/latex/perfectcut/README
--- old/doc/latex/perfectcut/README 2017-05-03 23:29:26.000000000 +0200
+++ new/doc/latex/perfectcut/README 2019-07-26 22:48:47.000000000 +0200
@@ -16,6 +16,8 @@
Release notes:
+ 2.3 07/17: * When using scalerel, only use \ThisStyle for the outermost
+ command due to performance issues.
2.2 04/17: * By default, use the scalerel package instead of the mathstyle
package to compute the nested mathstyle.
* The option nomathstyle and the command \cutstyle are
@@ -28,10 +30,10 @@
2.0 11/14: * The package now offers general-purpose commands for
defining arbitrary nested delimiters that consistently
grow regardless of the contents (\perfectunary and
- \perfectbinary)
+ \perfectbinary)
* Added the behaviours CurrentHeight and
CurrentHeightPlusOne alongside the existing behaviour
- IncreaseHeight.
+ IncreaseHeight.
* Added the stock commands \perfectcase, \perfectparens,
and \perfectbrackets intended for use in the context
of abstract-machine-like calculi.
@@ -51,7 +53,7 @@
Author: Guillaume Munch-Maccagnoni
-https://github.com/gadmm/perfectcut
+https://gitlab.com/gadmm/perfectcut
This work may be distributed and/or modified under the conditions of
Binary files old/doc/latex/perfectcut/perfectcut.pdf and new/doc/latex/perfectcut/perfectcut.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/perfectcut/perfectcut.tex new/doc/latex/perfectcut/perfectcut.tex
--- old/doc/latex/perfectcut/perfectcut.tex 2017-05-03 23:29:26.000000000 +0200
+++ new/doc/latex/perfectcut/perfectcut.tex 2019-07-26 22:48:47.000000000 +0200
@@ -2,7 +2,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%
%%% Author: Guillaume Munch-Maccagnoni
-%%% https://github.com/gadmm/perfectcut
+%%% https://gitlab.com/gadmm/perfectcut
%%%
%%% This work may be distributed and/or modified under the conditions of
%%% the LaTeX Project Public License, either version 1.3 of this license
@@ -30,11 +30,12 @@
\global\long\def\mt{\bar{\mu}}
+
\title{\texttt{perfectcut.sty} documentation}
-\author{\noindent {\large{}Guillaume Munch-Maccagnoni}\thanks{\protect\href{https://github.com/gadmm/perfectcut}…
+\author{\noindent {\large{}Guillaume Munch-Maccagnoni}\thanks{\protect\href{https://gitlab.com/gadmm/perfectcut}…
-\date{23rd April 2017}
+\date{3rd September 2017}
\maketitle
@@ -117,7 +118,7 @@
\subsection{Using \texttt{\textbackslash left}, \texttt{\textbackslash middle}
and \texttt{\textbackslash right} instead}
-\global\long\def\fakecut#1#2{\left\langle #1\middle|\mkern-2mu \middle|#2\right\rangle }
+\global\long\def\fakecut#1#2{\left\langle #1\middle|\mkern-2mu \middle|#2\right\rangle }
\noindent \texttt{\footnotesize{}\textbackslash renewcommand\{\textbackslash cut\}{[}2{]}\{\textbackslash left\textbackslash langle
\#1\textbackslash middle|\textbackslash mkern-2mu\textbackslash middle|\#2\textbackslash right\textbackslash rangle\}}
@@ -168,9 +169,9 @@
sized if there are other \texttt{\textbackslash perfectcommands}
inside \texttt{\#1} and \texttt{\#2}.\medskip{}
-\texttt{\footnotesize{}\textbackslash def\textbackslash Set\#1\#2\{\textbackslash perfectbinary\{IncreaseHeight\}\textbackslash\{|\textbackslash\}\{\#1\textbackslash mathrel\{\}\}\{\textbackslash mathrel\{\}\#2\}\}}{\footnotesize \par}
+\texttt{\footnotesize{}\textbackslash def\textbackslash Set\#1\#2\{\textbackslash perfectbinary\{IncreaseHeight\}\textbackslash\{|\textbackslash\}\{\#1\textbackslash mathrel\{\}\}\{\textbackslash mathrel\{\}\#2\}\}}{\footnotesize\par}
-\texttt{\footnotesize{}\textbackslash{[}\textbackslash Set\{\textbackslash perfectparens\{a\}\}\{\textbackslash perfectparens\{b\}\}\textbackslash{]}}{\footnotesize \par}
+\texttt{\footnotesize{}\textbackslash{[}\textbackslash Set\{\textbackslash perfectparens\{a\}\}\{\textbackslash perfectparens\{b\}\}\textbackslash{]}}{\footnotesize\par}
\def\Set#1#2{\perfectbinary{IncreaseHeight}\{|\}{#1\mathrel{}}{\mathrel{}#2}}
@@ -178,6 +179,7 @@
\fbox{\ensuremath{\Set{\perfectparens{a}}{\perfectparens{b}}}}
\]
+
\subsection{Custom delimiters}
\begin{description}
\item [{\texttt{\textbackslash perfectunary\#1\#2\#3\#4}}] Displays \texttt{\#2}
@@ -221,10 +223,16 @@
With this option, the command \texttt{\textbackslash currentmathstyle}
from the package \texttt{mathstyle} is used instead of the command
\texttt{\textbackslash ThisStyle} from the \texttt{scalerel} package.
-The latter (default) uses \texttt{\textbackslash mathchoice} which
-has exponential time complexity in the number of nestings. The former
-does not use \texttt{\textbackslash mathchoice} but redefines many
-primitives and is therefore a source of incompatibilities.
+The latter (default) uses \texttt{\textbackslash mathchoice}, and
+in order to avoid an exponential time complexity in the number of
+nestings, it is only called for the outermost command. Concretely,
+with \texttt{mathstyle}, math style changes are taken into account
+both inside and outside of \texttt{\textbackslash perfectcommands},
+whereas without it, changes in math style are not obeyed inside a
+command. Moreover, using the \texttt{mathstyle} option speeds up compilation.
+The downside of using \texttt{mathstyle} is that it redefines many
+standard math commands, and is therefore a source of incompatibilities,
+notably with \texttt{xypic}.
\subsection{Option \texttt{realVert}}
@@ -294,15 +302,16 @@
\subsection{Example with \texttt{\textbackslash nthleft}}
-\texttt{\footnotesize{}\textbackslash nrthleft0(\textbackslash nthleft1(\textbackslash nthleft2(\textbackslash nthleft3(\textbackslash nthleft4(\textbackslash nthleft5(\textbackslash nthleft6(}{\footnotesize \par}
+\texttt{\footnotesize{}\textbackslash nrthleft0(\textbackslash nthleft1(\textbackslash nthleft2(\textbackslash nthleft3(\textbackslash nthleft4(\textbackslash nthleft5(\textbackslash nthleft6(}{\footnotesize\par}
\[
\nthleft0(\nthleft1(\nthleft2(\nthleft3(\nthleft4(\nthleft5(\nthleft6(
\]
+
\subsection{Example with \texttt{\textbackslash big},\texttt{\textbackslash Big},\texttt{\textbackslash bigg},\texttt{\textbackslash Bigg}}
-\texttt{\footnotesize{}(\textbackslash big(\textbackslash Big(\textbackslash bigg(\textbackslash Bigg(}{\footnotesize \par}
+\texttt{\footnotesize{}(\textbackslash big(\textbackslash Big(\textbackslash bigg(\textbackslash Bigg(}{\footnotesize\par}
\[
(\big(\Big(\bigg(\Bigg(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perfectcut.doc.tlpobj new/tlpkg/tlpobj/perfectcut.doc.tlpobj
--- old/tlpkg/tlpobj/perfectcut.doc.tlpobj 2019-02-28 03:59:12.000000000 +0100
+++ new/tlpkg/tlpobj/perfectcut.doc.tlpobj 2020-03-04 23:53:12.000000000 +0100
@@ -1,9 +1,9 @@
name perfectcut.doc
category Package
-revision 44175
+revision 54080
shortdesc doc files of perfectcut
relocated 1
-docfiles size=50
+docfiles size=45
RELOC/doc/latex/perfectcut/README
RELOC/doc/latex/perfectcut/perfectcut.pdf
RELOC/doc/latex/perfectcut/perfectcut.tex
++++++ perfectcut.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/perfectcut/perfectcut.sty new/tex/latex/perfectcut/perfectcut.sty
--- old/tex/latex/perfectcut/perfectcut.sty 2017-05-03 23:29:26.000000000 +0200
+++ new/tex/latex/perfectcut/perfectcut.sty 2019-07-26 22:48:47.000000000 +0200
@@ -9,7 +9,7 @@
%%% or (at your option) any later version. Refer to the README file.
%%%
%%%
-\ProvidesPackage{perfectcut}[04/22/2017 Perfect Cut v2.2]
+\ProvidesPackage{perfectcut}[06/23/2017 Perfect Cut v2.3]
%%% Option processing
\newif\ifcut@mathstyle@
\cut@mathstyle@false
@@ -32,7 +32,7 @@
\newmuskip\cutcasebarskip
\newif\ifcutdebug
%%% Exported commands
-%%See end of file for a more detailed description of the commands
+%%See end of file for a more detailed description of the commands
\newcommand{\perfectcut}[2]{\cut@{#1}{#2}}%% displays <#1||#2>
\newcommand{\perfectbra}[1]{\cut@bra{#1}}%% displays <#1|
\newcommand{\perfectket}[1]{\cut@ket{#1}}%% displays |#2>
@@ -89,7 +89,7 @@
\def\cut@setcurrentcutstyle{}
\else
\RequirePackage{scalerel}
- \def\cut@setcurrentcutstyle{\ThisStyle}
+ \def\cut@setcurrentcutstyle#1{{\ThisStyle{\let\ThisStyle\relax#1}}}
\def\cut@currentcutstyle{\SavedStyle}
\fi
@@ -250,7 +250,7 @@
%% Displays #1#2#3#4#5. Arguments #2 and #4 can contain other cut primitives.
%% Does not increase the current height computed by cut primitives inside #2
-%% and #4.
+%% and #4.
%% Arguments #1, #3 and #5 can access the current height in two different
%% forms via \cut@n and \count0.
\newcommand{\cut@computeBinary@CurrentHeight}[5]{\cut@setcurrentcutstyle{%
@@ -274,7 +274,7 @@
%% Displays #1#2#3#4#5. Arguments #2 and #4 can contain other cut primitives.
%% Does not increase the current height computed by cut primitives inside #2
-%% and #4 but the height to display is increased by 1.
+%% and #4 but the height to display is increased by 1.
%% Arguments #1, #3 and #5 can access the height height in two different
%% forms via \cut@n and \count0.
\newcommand{\cut@computeBinary@CurrentHeightPlusOne}[5]{\cut@setcurrentcutstyle{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perfectcut.tlpobj new/tlpkg/tlpobj/perfectcut.tlpobj
--- old/tlpkg/tlpobj/perfectcut.tlpobj 2019-02-28 03:59:12.000000000 +0100
+++ new/tlpkg/tlpobj/perfectcut.tlpobj 2020-03-04 23:53:12.000000000 +0100
@@ -1,26 +1,25 @@
name perfectcut
category Package
-revision 44175
-shortdesc Delimiters whose size adjusts to the nesting
+revision 54080
+shortdesc Nested delimiters that consistently grow regardless of the contents
relocated 1
longdesc This package defines the command \perfectcut#1#2 which displays
-longdesc a bracket <#1||#2>. Various delimiters are similarly defined.
-longdesc The effect of these commands is to let the delimiters grow
-longdesc according to the number of nested \perfectcommands (regardless
-longdesc of the size of the contents). The package is originally
-longdesc intended for solving a notational issue regarding the
-longdesc representation of abstract-machine-like calculi in proof theory
-longdesc and computer science. For general use, the package also defines
-longdesc commands for defining custom delimiters that behave in the same
-longdesc way. This package also offers a sound reimplementation of \big,
-longdesc \bigg, etc.
+longdesc a bracket <#1||#2>. Various other delimiters are similarly
+longdesc defined (parentheses, square brackets ...). The effect of these
+longdesc commands is to let the delimiters grow according to the number
+longdesc of nested \perfectcommands (regardless of the size of the
+longdesc contents). The package was originally intended for solving a
+longdesc notational issue for direct-style continuation calculi in proof
+longdesc theory. For general use, the package also defines commands for
+longdesc defining other sorts of delimiters which will behave in the
+longdesc same way (see example in the documentation). The package also
+longdesc offers a robust reimplementation of \big, \bigg, etc.
runfiles size=5
RELOC/tex/latex/perfectcut/perfectcut.sty
-catalogue-contact-bugs https://github.com/gadmm/perfectcut/issues
-catalogue-contact-home https://github.com/gadmm/perfectcut
-catalogue-contact-repository https://github.com/gadmm/perfectcut.git
+catalogue-contact-bugs https://gitlab.com/gadmm/perfectcut/issues
+catalogue-contact-home https://gitlab.com/gadmm/perfectcut
+catalogue-contact-repository https://gitlab.com/gadmm/perfectcut.git
catalogue-ctan /macros/latex/contrib/perfectcut
-catalogue-date 2017-05-03 14:02:24 +0200
catalogue-license lppl1.3
-catalogue-topics paren-mgmt comp-theory
-catalogue-version 2.2
+catalogue-topics paren-mgmt comp-theory maths
+catalogue-version 2.3
++++++ perltex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/perltex/README new/texmf-dist/doc/latex/perltex/README
--- old/texmf-dist/doc/latex/perltex/README 2010-09-13 18:20:48.000000000 +0200
+++ new/texmf-dist/doc/latex/perltex/README 2019-09-23 22:58:21.000000000 +0200
@@ -42,7 +42,7 @@
License
-------
-Copyright (C) 2010 Scott Pakin
+Copyright (C) 2003-2019 Scott Pakin
These files may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3c of this license or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/perltex/example.tex new/texmf-dist/doc/latex/perltex/example.tex
--- old/texmf-dist/doc/latex/perltex/example.tex 2010-09-13 18:20:48.000000000 +0200
+++ new/texmf-dist/doc/latex/perltex/example.tex 2019-09-23 22:58:21.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2010 Scott Pakin <scott+pt(a)pakin.org>
+%% Copyright (C) 2003-2019 Scott Pakin <scott+pt(a)pakin.org>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
Binary files old/texmf-dist/doc/latex/perltex/perltex.pdf and new/texmf-dist/doc/latex/perltex/perltex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/perltex.1 new/texmf-dist/doc/man/man1/perltex.1
--- old/texmf-dist/doc/man/man1/perltex.1 2010-09-13 18:20:48.000000000 +0200
+++ new/texmf-dist/doc/man/man1/perltex.1 2019-09-23 22:58:21.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -38,27 +38,36 @@
. ds PI \(*p
. ds L" ``
. ds R" ''
+. ds C`
+. ds C'
'br\}
.\"
.\" Escape single quotes in literal strings from groff's Unicode transform.
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
..
-. nr % 0
-. rr F
-.\}
-.el \{\
-. de IX
+.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
+. \}
+. \}
.\}
+.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.
@@ -124,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "PERLTEX 1"
-.TH PERLTEX 1 "2010-07-10" "v2.1" " "
+.TH PERLTEX 1 "2019-09-15" "v2.2" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -240,7 +249,7 @@
Specify the filename of the LaTeX compiler. The LaTeX compiler
defaults to ``\f(CW\*(C`latex\*(C'\fR''. The \f(CW\*(C`PERLTEX\*(C'\fR environment variable
overrides this default, and the \fB\-\-latex\fR command-line option (see
-\&\*(L"\s-1OPTIONS\s0\*(R") overrides that.
+\&\*(L"\s-1OPTIONS\*(R"\s0) overrides that.
.SH "FILES"
.IX Header "FILES"
While compiling \fIjobname.tex\fR, \fBperltex\fR makes use of the following
@@ -274,7 +283,7 @@
\&\fBperltex\fR's sandbox defaults to what Opcode calls ``\f(CW\*(C`:browse\*(C'\fR''.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
-\&\fIlatex\fR\|(1), \fIpdflatex\fR\|(1), \fIperl\fR\|(1), \fISafe\fR\|(3pm), \fIOpcode\fR\|(3pm)
+\&\fBlatex\fR\|(1), \fBpdflatex\fR\|(1), \fBperl\fR\|(1), \fBSafe\fR\|(3pm), \fBOpcode\fR\|(3pm)
.SH "AUTHOR"
.IX Header "AUTHOR"
Scott Pakin, \fIscott+pt(a)pakin.org\fR
Binary files old/texmf-dist/doc/man/man1/perltex.man1.pdf and new/texmf-dist/doc/man/man1/perltex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perltex.doc.tlpobj new/tlpkg/tlpobj/perltex.doc.tlpobj
--- old/tlpkg/tlpobj/perltex.doc.tlpobj 2019-02-28 03:59:12.000000000 +0100
+++ new/tlpkg/tlpobj/perltex.doc.tlpobj 2019-09-24 01:53:49.000000000 +0200
@@ -1,8 +1,8 @@
name perltex.doc
category Package
-revision 38719
+revision 52162
shortdesc doc files of perltex
-docfiles size=90
+docfiles size=83
texmf-dist/doc/latex/perltex/README
texmf-dist/doc/latex/perltex/example.tex
texmf-dist/doc/latex/perltex/perltex.pdf
++++++ perltex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/perltex/perltex.pl new/texmf-dist/scripts/perltex/perltex.pl
--- old/texmf-dist/scripts/perltex/perltex.pl 2010-09-13 18:20:48.000000000 +0200
+++ new/texmf-dist/scripts/perltex/perltex.pl 2019-09-23 22:58:21.000000000 +0200
@@ -15,7 +15,7 @@
#
# This is a generated file.
#
-# Copyright (C) 2010 Scott Pakin <scott+pt(a)pakin.org>
+# Copyright (C) 2003-2019 Scott Pakin <scott+pt(a)pakin.org>
#
# This file 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/texmf-dist/tex/latex/perltex/perltex.sty new/texmf-dist/tex/latex/perltex/perltex.sty
--- old/texmf-dist/tex/latex/perltex/perltex.sty 2010-09-13 18:20:48.000000000 +0200
+++ new/texmf-dist/tex/latex/perltex/perltex.sty 2019-09-23 22:58:21.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2010 Scott Pakin <scott+pt(a)pakin.org>
+%% Copyright (C) 2003-2019 Scott Pakin <scott+pt(a)pakin.org>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -22,12 +22,14 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{perltex}
- [2010/07/10 v2.1 LaTeX macros for use with PerlTeX]
-\newif\ifplmac@required \plmac@requiredtrue
-\DeclareOption{optional}{\plmac@requiredfalse} \ProcessOptions\relax
+ [2019/09/14 v2.2 LaTeX macros for use with PerlTeX]
+\newif\ifplmac@required
+\plmac@requiredtrue
+\DeclareOption{optional}{\plmac@requiredfalse}
+\ProcessOptions\relax
\newif\ifperl
\perltrue
-\@ifundefined{plmac@tag}{\perlfalse}{}
+\@ifundefined{plmac@tag}{\perlfalse\let\plmac@tag=\relax}{}
\@ifundefined{plmac@tofile}{\perlfalse}{}
\@ifundefined{plmac@fromfile}{\perlfalse}{}
\@ifundefined{plmac@toflag}{\perlfalse}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perltex.tlpobj new/tlpkg/tlpobj/perltex.tlpobj
--- old/tlpkg/tlpobj/perltex.tlpobj 2019-02-28 03:59:12.000000000 +0100
+++ new/tlpkg/tlpobj/perltex.tlpobj 2019-09-24 01:53:49.000000000 +0200
@@ -1,6 +1,6 @@
name perltex
category Package
-revision 38719
+revision 52162
shortdesc Define LaTeX macros in terms of Perl code
longdesc PerlTeX is a combination Perl script (perltex.pl) and LaTeX2e
longdesc package (perltex.sty) that, together, give the user the ability
@@ -19,7 +19,7 @@
texmf-dist/scripts/perltex/perltex.pl
texmf-dist/tex/latex/perltex/perltex.sty
catalogue-ctan /macros/latex/contrib/perltex
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-23 11:07:45 +0200
catalogue-license lppl
catalogue-topics callback
-catalogue-version 2.1
+catalogue-version 2.2
++++++ pgf-blur.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-blur.doc.tlpobj new/tlpkg/tlpobj/pgf-blur.doc.tlpobj
--- old/tlpkg/tlpobj/pgf-blur.doc.tlpobj 2019-02-28 03:59:23.000000000 +0100
+++ new/tlpkg/tlpobj/pgf-blur.doc.tlpobj 2020-03-24 02:03:13.000000000 +0100
@@ -1,6 +1,6 @@
name pgf-blur.doc
category Package
-revision 48446
+revision 54512
shortdesc doc files of pgf-blur
relocated 1
docfiles size=63
++++++ pgf-blur.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-blur.tlpobj new/tlpkg/tlpobj/pgf-blur.tlpobj
--- old/tlpkg/tlpobj/pgf-blur.tlpobj 2019-02-28 03:59:23.000000000 +0100
+++ new/tlpkg/tlpobj/pgf-blur.tlpobj 2020-03-24 02:03:13.000000000 +0100
@@ -1,6 +1,6 @@
name pgf-blur
category Package
-revision 48446
+revision 54512
shortdesc PGF/TikZ package for "blurred" shadows
relocated 1
longdesc The package adds blurred/faded/fuzzy shadows to PGF/TikZ
@@ -13,7 +13,6 @@
catalogue-contact-home https://github.com/norbusan/pgf-blur
catalogue-contact-repository https://github.com/norbusan/pgf-blur
catalogue-ctan /graphics/pgf/contrib/pgf-blur
-catalogue-date 2018-08-21 14:56:15 +0200
-catalogue-license lpplpd
+catalogue-license lppl pd
catalogue-topics graphics-subpic pgf-tikz
catalogue-version 1.02
++++++ pgf-cmykshadings.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pgf-cmykshadings/README.md new/doc/latex/pgf-cmykshadings/README.md
--- old/doc/latex/pgf-cmykshadings/README.md 2018-10-24 22:29:56.000000000 +0200
+++ new/doc/latex/pgf-cmykshadings/README.md 2019-11-04 23:15:41.000000000 +0100
@@ -1,5 +1,10 @@
# pgf-cmykshadings — Support for CMYK and grayscale shadings in PGF/TikZ
+> **Note: This package is now deprecated. Support for CMYK and grayscale
+> shadings was added to `pgf` in version 3.1.3. Attempting to load it with
+> recent versions of `pgf` only changes the default shading colour model with
+> the `xcolor` `natural` colour model to CMYK.**
+
The `pgf-cmykshadings` package provides support for CMYK and grayscale shadings
for the `pgf` package. By default `pgf` only supports RGB shadings.
`pgf-cmykshadings` attempts to produce shadings consistent with the currently
@@ -58,7 +63,7 @@
## Licence
```
-Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
This work may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3c of this license
Binary files old/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf and new/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-cmykshadings.doc.tlpobj new/tlpkg/tlpobj/pgf-cmykshadings.doc.tlpobj
--- old/tlpkg/tlpobj/pgf-cmykshadings.doc.tlpobj 2019-02-28 03:59:23.000000000 +0100
+++ new/tlpkg/tlpobj/pgf-cmykshadings.doc.tlpobj 2019-11-05 01:54:24.000000000 +0100
@@ -1,8 +1,8 @@
name pgf-cmykshadings.doc
category Package
-revision 48982
+revision 52635
shortdesc doc files of pgf-cmykshadings
relocated 1
-docfiles size=116
+docfiles size=129
RELOC/doc/latex/pgf-cmykshadings/README.md
RELOC/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf
++++++ pgf-cmykshadings.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty new/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty
--- old/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -42,9 +42,71 @@
%% shadings.
%%
\ProvidesPackage{pgf-cmykshadings}%
- [2018/10/24
+ [2019/11/05
CMYK and grayscale shadings support for PGF (DCP)]
\RequirePackage{pgf}
+\@ifpackagelater{pgf}{2019/05/14}{%
+ \PackageWarning{pgf-cmykshadings}{%
+ Package `pgf-cmykshadings' is now deprecated.}%
+ \newif\ifpgfcmykshadingdefault
+ \DeclareOption{cmyk}{%
+ \pgfcmykshadingdefaulttrue
+ }
+ \DeclareOption{rgb}{%
+ \pgfcmykshadingdefaultfalse
+ }
+ \ExecuteOptions{cmyk}
+ \ProcessOptions\relax
+ \def\pgf@setup@shading@model{%
+ \pgfshadingmodelrgbtrue
+ \pgfshadingmodelcmykfalse
+ \pgfshadingmodelgrayfalse
+ \XC@sdef\pgf@mod@test{\XC@tgt@mod{natural}}%
+ \def\pgf@shading@device{/DeviceRGB}%
+ \def\pgf@shading@ps@device{setrgbcolor}%
+ \def\pgf@shading@functional@range{0 1 0 1 0 1}%
+ \def\pgf@shading@model{rgb}%
+ \ifx\pgf@mod@test\XC@mod@natural
+ \ifpgfcmykshadingdefault
+ \def\pgf@shading@functional@range{0 1 0 1 0 1 0 1}%
+ \def\pgf@shading@device{/DeviceCMYK}%
+ \def\pgf@shading@ps@device{setcmykcolor}%
+ \def\pgf@shading@model{cmyk}%
+ \pgfshadingmodelrgbfalse
+ \pgfshadingmodelcmyktrue
+ \else
+ \def\pgf@shading@functional@range{0 1 0 1 0 1}%
+ \def\pgf@shading@device{/DeviceRGB}%
+ \def\pgf@shading@ps@device{setrgbcolor}%
+ \def\pgf@shading@model{rgb}%
+ \fi
+ \fi
+ \ifx\pgf@mod@test\XC@mod@cmyk
+ \def\pgf@shading@device{/DeviceCMYK}%
+ \def\pgf@shading@ps@device{setcmykcolor}%
+ \def\pgf@shading@functional@range{0 1 0 1 0 1 0 1}%
+ \def\pgf@shading@model{cmyk}%
+ \pgfshadingmodelrgbfalse
+ \pgfshadingmodelcmyktrue
+ \fi
+ \ifx\pgf@mod@test\XC@mod@gray
+ \def\pgf@shading@device{/DeviceGray}%
+ \def\pgf@shading@ps@device{setgray}%
+ \def\pgf@shading@functional@range{0 1}%
+ \def\pgf@shading@model{gray}%
+ \pgfshadingmodelrgbfalse
+ \pgfshadingmodelgraytrue
+ \fi
+ \edef\pgf@sys@driver@dvisvgm{pgfsys-dvisvgm.def}%
+ \ifx\pgfsysdriver\pgf@sys@driver@dvisvgm
+ \def\pgf@shading@model{rgb}%
+ \fi
+ \edef\pgf@sys@driver@texforht{pgfsys-tex4ht.def}%
+ \ifx\pgfsysdriver\pgf@sys@driver@texforht
+ \def\pgf@shading@model{rgb}%
+ \fi
+ }%
+ \endinput}{}
\def\pgf@parsefunc#1{%
\edef\temp{{#1}}%
\expandafter\pgf@convertstring\temp%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def
--- old/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def 2018-10-24 22:29:56.000000000 +0200
+++ new/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def 2019-11-04 23:15:41.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (c) 2018 David Purton <dcpurton(a)marshwiggle.net>
+%% Copyright (c) 2018-2019 David Purton <dcpurton(a)marshwiggle.net>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-cmykshadings.tlpobj new/tlpkg/tlpobj/pgf-cmykshadings.tlpobj
--- old/tlpkg/tlpobj/pgf-cmykshadings.tlpobj 2019-02-28 03:59:23.000000000 +0100
+++ new/tlpkg/tlpobj/pgf-cmykshadings.tlpobj 2019-11-05 01:54:25.000000000 +0100
@@ -1,13 +1,15 @@
name pgf-cmykshadings
category Package
-revision 48982
+revision 52635
shortdesc Support for CMYK and grayscale shadings in PGF/TikZ
relocated 1
longdesc This package provides support for CMYK and grayscale shadings
longdesc for the pgf package. By default pgf only supports RGB shadings.
longdesc The package attempts to produce shadings consistent with the
longdesc currently selected xcolor colour model. The rgb, cmyk, and gray
-longdesc colour models from the xcolor package are supported.
+longdesc colour models from the xcolor package are supported. Note: This
+longdesc package is deprecated since pgf version 3.1.3, since CMYK and
+longdesc grayscale shadings are now directly supported.
runfiles size=20
RELOC/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty
RELOC/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def
@@ -19,9 +21,10 @@
RELOC/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def
RELOC/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def
RELOC/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def
+catalogue-contact-bugs https://github.com/dcpurton/pgf-cmykshadings/issues
catalogue-contact-repository https://github.com/dcpurton/pgf-cmykshadings
catalogue-ctan /graphics/pgf/contrib/pgf-cmykshadings
-catalogue-date 2018-10-24 09:04:01 +0200
+catalogue-date 2019-11-04 17:38:55 +0100
catalogue-license lppl1.3c
catalogue-topics colour pgf-tikz
-catalogue-version 1.1a
+catalogue-version 1.2
++++++ pgf.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-r/pgf.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-r.new.3606/pgf.doc.tar.xz differ: char 25, line 1
++++++ pgf.tar.xz ++++++
++++ 67538 lines of diff (skipped)
++++++ pgfgantt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfgantt.doc.tlpobj new/tlpkg/tlpobj/pgfgantt.doc.tlpobj
--- old/tlpkg/tlpobj/pgfgantt.doc.tlpobj 2019-02-28 03:59:24.000000000 +0100
+++ new/tlpkg/tlpobj/pgfgantt.doc.tlpobj 2019-11-07 18:46:28.000000000 +0100
@@ -1,6 +1,6 @@
name pgfgantt.doc
category Package
-revision 46280
+revision 52662
shortdesc doc files of pgfgantt
relocated 1
docfiles size=231
++++++ pgfgantt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfgantt.tlpobj new/tlpkg/tlpobj/pgfgantt.tlpobj
--- old/tlpkg/tlpobj/pgfgantt.tlpobj 2019-02-28 03:59:25.000000000 +0100
+++ new/tlpkg/tlpobj/pgfgantt.tlpobj 2019-11-07 18:46:28.000000000 +0100
@@ -1,12 +1,13 @@
name pgfgantt
category Package
-revision 46280
+revision 52662
shortdesc Draw Gantt charts with TikZ
relocated 1
longdesc The package provides an environment for drawing Gantt charts
longdesc that contain various elements (titles, bars, milestones, groups
longdesc and links). Several keys customize the appearance of the chart
longdesc elements.
+depend pgf
runfiles size=12
RELOC/tex/latex/pgfgantt/pgfgantt.sty
catalogue-also pst-gantt
++++++ pgfornament-han.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pgfornament-han/README.md new/doc/latex/pgfornament-han/README.md
--- old/doc/latex/pgfornament-han/README.md 2018-05-21 23:14:42.000000000 +0200
+++ new/doc/latex/pgfornament-han/README.md 2019-08-11 22:36:54.000000000 +0200
@@ -1,4 +1,4 @@
-# pgfornament-han 2018/05/15
+# pgfornament-han 2019/08/10
A pgfornament library for Chinese traditional motifs and patterns.
以 pgfornament 宏包的机制,实现绘制汉风图纹。
Binary files old/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf and new/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pgfornament-han/heavenlyclouds-sample.tex new/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
--- old/doc/latex/pgfornament-han/heavenlyclouds-sample.tex 2018-05-21 23:14:42.000000000 +0200
+++ new/doc/latex/pgfornament-han/heavenlyclouds-sample.tex 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,4 @@
% !TEX program=xelatex
-% \documentclass[aspectratio=169]{ctexbeamer}
\documentclass{ctexbeamer}
\usetheme{HeavenlyClouds}
@@ -15,6 +14,7 @@
% \titlegraphic{\includegraphics[width=2cm]{example-grid-100x100pt}}
% \alttitlecircle %% 试试取消注释,有惊喜
+% \simpleprogressmarker %% 神马太过引人注目的话,可以用简单圆点取代。
\begin{document}
@@ -31,18 +31,21 @@
\item 每一页的背景的云彩纹样,位置、大小、深浅都是随机的
\item 所以如果内容很多页的话,编译时运算可能会比较花时间
\item 导言区加上 \verb|\alttitlecircle|,标题页的纹样会变化
+ \item 若觉得进度条上的神马太过引人注(侧)目,可以用 \verb|\simpleprogressmarker| 简单圆点取代。(默认值是\verb|\shenmaprogressmarker|)
\framebreak
- \item 标题页的寿字纹,可以用各自高校的标志代替。中国高校校徽很多都是圆形的。确保一下背景是透明色的 png 或 pdf 档就可以了
+ \item 标题页的寿字纹,可以用各自高校的标志代替。
+ \item 中国高校校徽很多都是圆形的。确保一下背景是透明色的png或pdf档。
\verb|\titlegraphic{\includegraphics[width=2cm]{logo}}|
- \medskip
-
- \item 浮云有了,神马呢?
- \begin{itemize}
- \item 以后如果做出来了马的简易图腾纹样,才考虑取代掉进度条的圆点吧
- \end{itemize}
+ % \medskip
+ %
+ % \item 浮云有了,神马呢?
+ % \begin{itemize}
+ % \item 以后如果做出来了马的简易图腾纹样,才考虑取代掉进度条的圆点吧
+ % \item 2019年8月,做出来了
+ % \end{itemize}
\end{itemize}
\end{frame}
@@ -82,4 +85,5 @@
\end{proof}
\end{frame}
+
\end{document}
Binary files old/doc/latex/pgfornament-han/pgfornament-han_manual.pdf and new/doc/latex/pgfornament-han/pgfornament-han_manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pgfornament-han/pgfornament-han_manual.tex new/doc/latex/pgfornament-han/pgfornament-han_manual.tex
--- old/doc/latex/pgfornament-han/pgfornament-han_manual.tex 2018-05-21 23:14:42.000000000 +0200
+++ new/doc/latex/pgfornament-han/pgfornament-han_manual.tex 2019-08-11 22:36:54.000000000 +0200
@@ -6,7 +6,7 @@
\setsansfont{Linux Biolinum O}
\usepackage{ragged2e}
-\usepackage[dvipsnames]{xcolor}
+\usepackage[svgnames]{xcolor}
\usepackage{pgfornament-han}
\usetikzlibrary{chains}
\usetikzlibrary{calc}
@@ -104,7 +104,7 @@
\title{汉风图纹 \texttt{pgfornament-han}}
\author{林莲枝、张晨南}
-\date{2018/05/15\\\url{https://github.com/liantze/pgfornament-han}}
+\date{2019/08/10\\\url{https://github.com/liantze/pgfornament-han}}
\begin{document}
@@ -485,6 +485,18 @@
\end{tikzpicture}\space\space
}
+\section{动物}
+
+\foreach \n in {78,...,78}{%
+ \begin{tikzpicture}
+ \fill[牙色](-1cm,-1cm) rectangle (1cm,1cm);
+ \node[inner sep=0pt] (element) {\pgfornamenthan[color=茜色,width=1.8cm]{\n}};
+ \node[inner sep=0pt,font=\footnotesize\bfseries\sffamily,color=紫檀] at (0.8cm,-0.8cm) {\n};
+ \node[anchor=west,text width=4em,font=\footnotesize] at (1.1cm,0) {\getpgfornamenthanDim{\n}};
+ \draw[color=牙色] (1cm,-1cm) rectangle (2.8cm,1cm);
+ \end{tikzpicture}\space\space
+}
+
\vfill
\begin{center}
@@ -934,6 +946,8 @@
\mintinline{latex}{\providecommand{\lishu}{\CJKfontspec{Libian SC}[BoldFont=Baoli SC,Scale=1.2]}}
+ \item 可以用 \mintinline{latex}{\simpleprogressmarker} 以简单圆点代替进度条上的神马。
+
\item 标题页的寿字纹,可以用各自高校的标志代替。中国高校校徽很多都是圆形的。确保一下背景是透明色的 png 或 pdf 档就可以了。
\mintinline{latex}{\titlegraphic{\includegraphics[width=2cm]{logo}}}
@@ -956,7 +970,6 @@
\node {\pgfornamenthan[width=1.25cm,color=殷红]{56}};
\end{tikzpicture} \emph{效果有可能有点狂,请视场合斟酌使用。}
-
\end{itemize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfornament-han.doc.tlpobj new/tlpkg/tlpobj/pgfornament-han.doc.tlpobj
--- old/tlpkg/tlpobj/pgfornament-han.doc.tlpobj 2019-02-28 03:59:27.000000000 +0100
+++ new/tlpkg/tlpobj/pgfornament-han.doc.tlpobj 2020-03-09 00:28:45.000000000 +0100
@@ -1,9 +1,9 @@
name pgfornament-han.doc
category Package
-revision 47789
+revision 54191
shortdesc doc files of pgfornament-han
relocated 1
-docfiles size=315
+docfiles size=1203
RELOC/doc/latex/pgfornament-han/README.md
RELOC/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf
RELOC/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
++++++ pgfornament-han.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty new/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty
--- old/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty 2018-05-21 23:14:42.000000000 +0200
+++ new/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty 2019-08-11 22:36:54.000000000 +0200
@@ -1,4 +1,4 @@
-% beamerthemeHeavenlyClouds.sty v1.0 2018/05/15
+% beamerthemeHeavenlyClouds.sty v1.1 2019/07/24
% by LianTze Lim (liantze(a)gmail.com)
\ProvidesPackage{beamerthemeHeavenlyClouds}
@@ -87,7 +87,30 @@
\newlength{\clouds@frametitle@rawwidth}%
\newlength{\clouds@frametitle@actualwidth}%
+\def\clouds@progressmarker{}
+\newcommand{\simpleprogressmarker}{%
+ \renewcommand{\clouds@progressmarker}{%
+ \clip (-1.25em,2em) rectangle (\paperwidth,0pt);
+ \fill[headline.fg] (\clouds(a)progressinheadfoot,1.25em) circle (2pt);
+ }%
+}
+\newbox{\clouds@shenma}
+\savebox{\clouds@shenma}{%
+ \usebeamercolor[fg]{headline}%
+ \tikzset{pgfornamentstyle/.style={line width=0pt}}%
+ \pgfornamenthan[width=2.5em]{78}%
+}
+\newcommand{\shenmaprogressmarker}{%
+ \renewcommand{\clouds@progressmarker}{%
+ \clip (-1.3em,4em) rectangle (\paperwidth,0pt);
+ \node[anchor=south,inner sep=1pt] at (\clouds(a)progressinheadfoot,1.25em)
+ {\usebox{\clouds@shenma}};
+ }
+}%
+
+
\AtBeginDocument{%
+ \shenmaprogressmarker
\newbox{\clouds@title@deco}
\savebox{\clouds@title@deco}{%
\usebeamercolor{headline}%
@@ -125,14 +148,15 @@
with { \node[transform shape]{\usebox{\clouds@smallhuiwen}}; }} ]
\path [postaction={decorate}] (0,0) -- (\paperwidth,0);
\draw[headline.fg!50,line width=0.6pt] (-1.25em,1.25em) -- (\paperwidth,1.25em);
- \clip (-1.25em,2em) rectangle (\paperwidth,0pt);
- \fill[headline.fg] (\clouds(a)progressinheadfoot,1.25em) circle (2pt);
+ \clouds@progressmarker
+ % \fill[headline.fg] (\clouds(a)progressinheadfoot,1.25em) circle (2pt); %<-- TODO
\end{tikzpicture}
}
}
\AtBeginSection{\begin{frame}\sectionpage\end{frame}}
\renewcommand{\thesection}{\chinese{section}}
+\newlength{\cloud@secname@height}
\setbeamertemplate{section page}{
\usebeamercolor{section title}\usebeamercolor{section name}
\newbox{\clouds@section@circle@elem}
@@ -140,7 +164,6 @@
\usebeamercolor{headline}%
\pgfornamenthan[width=1.0471cm,color=headline.fg!80!black]{59}%
}
-\newlength{\cloud@secname@height}
\settototalheight{\cloud@secname@height}{\usebeamerfont{section name}节}
\begin{tikzpicture}
\begin{scope}[decoration={markings, mark=between positions 0 and 1 step 1.0471cm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han1.pgf new/tex/latex/pgfornament-han/han/han1.pgf
--- old/tex/latex/pgfornament-han/han/han1.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han1.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han1.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han10.pgf new/tex/latex/pgfornament-han/han/han10.pgf
--- old/tex/latex/pgfornament-han/han/han10.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han10.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han10.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han11.pgf new/tex/latex/pgfornament-han/han/han11.pgf
--- old/tex/latex/pgfornament-han/han/han11.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han11.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han11.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han12.pgf new/tex/latex/pgfornament-han/han/han12.pgf
--- old/tex/latex/pgfornament-han/han/han12.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han12.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han12.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han13.pgf new/tex/latex/pgfornament-han/han/han13.pgf
--- old/tex/latex/pgfornament-han/han/han13.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han13.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han13.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han14.pgf new/tex/latex/pgfornament-han/han/han14.pgf
--- old/tex/latex/pgfornament-han/han/han14.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han14.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han14.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\m 0 200.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han15.pgf new/tex/latex/pgfornament-han/han/han15.pgf
--- old/tex/latex/pgfornament-han/han/han15.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han15.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han15.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han16.pgf new/tex/latex/pgfornament-han/han/han16.pgf
--- old/tex/latex/pgfornament-han/han/han16.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han16.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han16.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han17.pgf new/tex/latex/pgfornament-han/han/han17.pgf
--- old/tex/latex/pgfornament-han/han/han17.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han17.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han17.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han18.pgf new/tex/latex/pgfornament-han/han/han18.pgf
--- old/tex/latex/pgfornament-han/han/han18.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han18.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han18.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han19.pgf new/tex/latex/pgfornament-han/han/han19.pgf
--- old/tex/latex/pgfornament-han/han/han19.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han19.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han19.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han2.pgf new/tex/latex/pgfornament-han/han/han2.pgf
--- old/tex/latex/pgfornament-han/han/han2.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han2.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han2.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han20.pgf new/tex/latex/pgfornament-han/han/han20.pgf
--- old/tex/latex/pgfornament-han/han/han20.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han20.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han20.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han21.pgf new/tex/latex/pgfornament-han/han/han21.pgf
--- old/tex/latex/pgfornament-han/han/han21.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han21.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han21.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han22.pgf new/tex/latex/pgfornament-han/han/han22.pgf
--- old/tex/latex/pgfornament-han/han/han22.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han22.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han22.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han23.pgf new/tex/latex/pgfornament-han/han/han23.pgf
--- old/tex/latex/pgfornament-han/han/han23.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han23.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han23.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han24.pgf new/tex/latex/pgfornament-han/han/han24.pgf
--- old/tex/latex/pgfornament-han/han/han24.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han24.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han24.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han25.pgf new/tex/latex/pgfornament-han/han/han25.pgf
--- old/tex/latex/pgfornament-han/han/han25.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han25.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han25.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han26.pgf new/tex/latex/pgfornament-han/han/han26.pgf
--- old/tex/latex/pgfornament-han/han/han26.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han26.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han26.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han27.pgf new/tex/latex/pgfornament-han/han/han27.pgf
--- old/tex/latex/pgfornament-han/han/han27.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han27.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han27.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han28.pgf new/tex/latex/pgfornament-han/han/han28.pgf
--- old/tex/latex/pgfornament-han/han/han28.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han28.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han28.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han29.pgf new/tex/latex/pgfornament-han/han/han29.pgf
--- old/tex/latex/pgfornament-han/han/han29.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han29.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han29.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han3.pgf new/tex/latex/pgfornament-han/han/han3.pgf
--- old/tex/latex/pgfornament-han/han/han3.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han3.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han3.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han30.pgf new/tex/latex/pgfornament-han/han/han30.pgf
--- old/tex/latex/pgfornament-han/han/han30.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han30.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han30.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han31.pgf new/tex/latex/pgfornament-han/han/han31.pgf
--- old/tex/latex/pgfornament-han/han/han31.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han31.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han31.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han32.pgf new/tex/latex/pgfornament-han/han/han32.pgf
--- old/tex/latex/pgfornament-han/han/han32.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han32.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han32.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han33.pgf new/tex/latex/pgfornament-han/han/han33.pgf
--- old/tex/latex/pgfornament-han/han/han33.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han33.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han33.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han34.pgf new/tex/latex/pgfornament-han/han/han34.pgf
--- old/tex/latex/pgfornament-han/han/han34.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han34.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han34.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han35.pgf new/tex/latex/pgfornament-han/han/han35.pgf
--- old/tex/latex/pgfornament-han/han/han35.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han35.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han35.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han36.pgf new/tex/latex/pgfornament-han/han/han36.pgf
--- old/tex/latex/pgfornament-han/han/han36.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han36.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han36.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han37.pgf new/tex/latex/pgfornament-han/han/han37.pgf
--- old/tex/latex/pgfornament-han/han/han37.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han37.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han37.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han38.pgf new/tex/latex/pgfornament-han/han/han38.pgf
--- old/tex/latex/pgfornament-han/han/han38.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han38.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han38.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han39.pgf new/tex/latex/pgfornament-han/han/han39.pgf
--- old/tex/latex/pgfornament-han/han/han39.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han39.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han39.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han4.pgf new/tex/latex/pgfornament-han/han/han4.pgf
--- old/tex/latex/pgfornament-han/han/han4.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han4.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han4.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han40.pgf new/tex/latex/pgfornament-han/han/han40.pgf
--- old/tex/latex/pgfornament-han/han/han40.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han40.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han40.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han41.pgf new/tex/latex/pgfornament-han/han/han41.pgf
--- old/tex/latex/pgfornament-han/han/han41.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han41.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han41.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han42.pgf new/tex/latex/pgfornament-han/han/han42.pgf
--- old/tex/latex/pgfornament-han/han/han42.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han42.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han42.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han43.pgf new/tex/latex/pgfornament-han/han/han43.pgf
--- old/tex/latex/pgfornament-han/han/han43.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han43.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han43.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han44.pgf new/tex/latex/pgfornament-han/han/han44.pgf
--- old/tex/latex/pgfornament-han/han/han44.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han44.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han44.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han45.pgf new/tex/latex/pgfornament-han/han/han45.pgf
--- old/tex/latex/pgfornament-han/han/han45.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han45.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han45.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han46.pgf new/tex/latex/pgfornament-han/han/han46.pgf
--- old/tex/latex/pgfornament-han/han/han46.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han46.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han46.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han47.pgf new/tex/latex/pgfornament-han/han/han47.pgf
--- old/tex/latex/pgfornament-han/han/han47.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han47.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han47.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han48.pgf new/tex/latex/pgfornament-han/han/han48.pgf
--- old/tex/latex/pgfornament-han/han/han48.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han48.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han48.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han49.pgf new/tex/latex/pgfornament-han/han/han49.pgf
--- old/tex/latex/pgfornament-han/han/han49.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han49.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han49.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han5.pgf new/tex/latex/pgfornament-han/han/han5.pgf
--- old/tex/latex/pgfornament-han/han/han5.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han5.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han5.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han50.pgf new/tex/latex/pgfornament-han/han/han50.pgf
--- old/tex/latex/pgfornament-han/han/han50.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han50.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han50.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han51.pgf new/tex/latex/pgfornament-han/han/han51.pgf
--- old/tex/latex/pgfornament-han/han/han51.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han51.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han51.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han52.pgf new/tex/latex/pgfornament-han/han/han52.pgf
--- old/tex/latex/pgfornament-han/han/han52.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han52.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han52.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han53.pgf new/tex/latex/pgfornament-han/han/han53.pgf
--- old/tex/latex/pgfornament-han/han/han53.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han53.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han53.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han54.pgf new/tex/latex/pgfornament-han/han/han54.pgf
--- old/tex/latex/pgfornament-han/han/han54.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han54.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han54.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han55.pgf new/tex/latex/pgfornament-han/han/han55.pgf
--- old/tex/latex/pgfornament-han/han/han55.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han55.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han55.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han56.pgf new/tex/latex/pgfornament-han/han/han56.pgf
--- old/tex/latex/pgfornament-han/han/han56.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han56.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han56.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han57.pgf new/tex/latex/pgfornament-han/han/han57.pgf
--- old/tex/latex/pgfornament-han/han/han57.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han57.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han57.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han58.pgf new/tex/latex/pgfornament-han/han/han58.pgf
--- old/tex/latex/pgfornament-han/han/han58.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han58.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han58.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han59.pgf new/tex/latex/pgfornament-han/han/han59.pgf
--- old/tex/latex/pgfornament-han/han/han59.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han59.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han59.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han6.pgf new/tex/latex/pgfornament-han/han/han6.pgf
--- old/tex/latex/pgfornament-han/han/han6.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han6.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han6.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han60.pgf new/tex/latex/pgfornament-han/han/han60.pgf
--- old/tex/latex/pgfornament-han/han/han60.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han60.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han60.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetroundjoin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han61.pgf new/tex/latex/pgfornament-han/han/han61.pgf
--- old/tex/latex/pgfornament-han/han/han61.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han61.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han61.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
%\pgfsetmiterlimit{4}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han62.pgf new/tex/latex/pgfornament-han/han/han62.pgf
--- old/tex/latex/pgfornament-han/han/han62.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han62.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han62.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han63.pgf new/tex/latex/pgfornament-han/han/han63.pgf
--- old/tex/latex/pgfornament-han/han/han63.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han63.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han63.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han64.pgf new/tex/latex/pgfornament-han/han/han64.pgf
--- old/tex/latex/pgfornament-han/han/han64.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han64.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han64.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han65.pgf new/tex/latex/pgfornament-han/han/han65.pgf
--- old/tex/latex/pgfornament-han/han/han65.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han65.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han65.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han66.pgf new/tex/latex/pgfornament-han/han/han66.pgf
--- old/tex/latex/pgfornament-han/han/han66.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han66.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han66.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\r 10 10 395 175
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han67.pgf new/tex/latex/pgfornament-han/han/han67.pgf
--- old/tex/latex/pgfornament-han/han/han67.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han67.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han67.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\m 140.11 188.00
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han68.pgf new/tex/latex/pgfornament-han/han/han68.pgf
--- old/tex/latex/pgfornament-han/han/han68.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han68.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han68.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\r 0 10 400 165
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han69.pgf new/tex/latex/pgfornament-han/han/han69.pgf
--- old/tex/latex/pgfornament-han/han/han69.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han69.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han69.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\m 300.90 169.92
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han7.pgf new/tex/latex/pgfornament-han/han/han7.pgf
--- old/tex/latex/pgfornament-han/han/han7.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han7.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han7.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han70.pgf new/tex/latex/pgfornament-han/han/han70.pgf
--- old/tex/latex/pgfornament-han/han/han70.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han70.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han70.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\r 0 0 395 140
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han71.pgf new/tex/latex/pgfornament-han/han/han71.pgf
--- old/tex/latex/pgfornament-han/han/han71.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han71.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han71.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetmiterlimit{4.0}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han72.pgf new/tex/latex/pgfornament-han/han/han72.pgf
--- old/tex/latex/pgfornament-han/han/han72.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han72.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han72.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han73.pgf new/tex/latex/pgfornament-han/han/han73.pgf
--- old/tex/latex/pgfornament-han/han/han73.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han73.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han73.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han74.pgf new/tex/latex/pgfornament-han/han/han74.pgf
--- old/tex/latex/pgfornament-han/han/han74.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han74.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han74.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\m 21.69 309.04
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han75.pgf new/tex/latex/pgfornament-han/han/han75.pgf
--- old/tex/latex/pgfornament-han/han/han75.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han75.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han75.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\m 21.57 309.37
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han76.pgf new/tex/latex/pgfornament-han/han/han76.pgf
--- old/tex/latex/pgfornament-han/han/han76.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han76.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han76.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han77.pgf new/tex/latex/pgfornament-han/han/han77.pgf
--- old/tex/latex/pgfornament-han/han/han77.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han77.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han77.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han78.pgf new/tex/latex/pgfornament-han/han/han78.pgf
--- old/tex/latex/pgfornament-han/han/han78.pgf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/pgfornament-han/han/han78.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -0,0 +1,432 @@
+% han78.pgf
+% pgfornament-han v0.33 2019/08/10
+% Author: LIM LianTze
+
+\m 100.50 31.79
+\l 100.12 30.01
+\l 100.42 28.84
+\l 101.25 27.78
+\l 102.16 27.25
+\l 102.69 26.49
+\l 102.58 24.87
+\l 101.67 23.09
+\l 100.23 21.92
+\l 97.70 20.11
+\l 95.89 18.29
+\l 95.40 16.67
+\l 94.11 15.27
+\l 91.65 14.78
+\l 89.84 13.68
+\l 89.35 12.43
+\l 88.33 11.79
+\l 86.48 11.75
+\l 84.10 11.68
+\l 83.34 11.64
+\l 82.92 13.15
+\l 83.00 14.44
+\l 83.64 15.72
+\l 84.78 16.82
+\l 86.17 17.42
+\l 87.69 17.57
+\l 88.90 17.01
+\l 89.76 16.48
+\l 90.41 16.44
+\l 91.01 17.35
+\l 91.31 18.52
+\l 92.34 19.46
+\l 93.51 19.69
+\l 94.45 20.03
+\l 94.91 20.45
+\l 96.11 21.81
+\l 97.10 23.70
+\l 97.25 24.30
+\l 97.02 24.83
+\l 96.23 24.57
+\l 94.49 23.77
+\l 93.09 22.72
+\l 91.69 21.85
+\l 91.13 20.94
+\l 90.52 19.43
+\l 89.50 18.41
+\l 87.80 17.95
+\l 86.40 18.48
+\l 85.31 19.05
+\l 83.07 19.65
+\l 79.98 20.45
+\l 78.80 21.88
+\l 78.77 22.87
+\l 79.22 23.81
+\l 80.13 24.68
+\l 82.28 25.66
+\l 84.06 25.59
+\l 85.49 24.60
+\l 85.76 23.32
+\l 85.68 22.41
+\l 86.21 21.77
+\l 86.63 21.92
+\l 86.93 22.68
+\l 87.76 23.06
+\l 88.56 23.06
+\l 89.08 22.98
+\l 90.14 23.70
+\l 91.28 24.68
+\l 92.00 25.55
+\l 92.60 26.65
+\l 92.79 27.36
+\l 92.45 27.67
+\l 90.37 27.74
+\l 88.40 27.63
+\l 86.10 27.59
+\l 83.68 26.99
+\l 81.00 26.12
+\l 77.03 24.19
+\l 73.51 22.87
+\l 68.33 22.19
+\l 66.26 22.26
+\l 64.86 22.53
+\l 63.99 22.49
+\l 63.57 22.15
+\l 62.85 21.32
+\l 61.76 20.45
+\l 60.59 20.07
+\l 59.53 20.11
+\l 58.70 19.58
+\l 58.17 18.90
+\l 56.20 16.44
+\l 54.35 14.82
+\l 51.70 14.36
+\l 48.38 14.06
+\l 44.90 13.19
+\l 41.42 11.98
+\l 38.63 10.28
+\l 36.21 8.32
+\l 35.34 6.80
+\l 34.58 4.99
+\l 33.34 4.04
+\l 31.37 3.93
+\l 29.78 3.40
+\l 28.84 1.78
+\l 26.95 0.87
+\l 23.09 0.00
+\l 22.11 1.21
+\l 21.92 2.61
+\l 22.75 4.54
+\l 24.61 5.97
+\l 26.08 6.46
+\l 27.33 5.90
+\l 28.12 5.44
+\l 28.61 5.25
+\l 29.22 5.74
+\l 29.71 6.84
+\l 30.01 7.86
+\l 30.09 8.24
+\l 32.43 8.84
+\l 34.92 9.86
+\l 36.28 11.38
+\l 37.46 13.72
+\l 38.36 15.68
+\l 39.80 17.46
+\l 41.46 18.03
+\l 43.05 17.69
+\l 43.77 17.20
+\l 44.30 17.31
+\l 46.19 18.63
+\l 48.08 20.14
+\l 48.87 21.66
+\l 49.63 23.51
+\l 49.44 24.15
+\l 48.57 24.15
+\l 45.96 22.41
+\l 43.81 20.94
+\l 41.46 20.75
+\l 38.93 20.37
+\l 36.59 19.09
+\l 34.58 17.76
+\l 33.75 16.48
+\l 31.98 16.06
+\l 29.82 14.78
+\l 28.12 13.08
+\l 26.99 11.57
+\l 26.34 10.24
+\l 25.25 8.92
+\l 23.74 8.28
+\l 21.77 8.09
+\l 20.64 7.11
+\l 19.88 6.92
+\l 19.24 5.93
+\l 18.14 5.86
+\l 16.18 4.35
+\l 14.40 3.44
+\l 13.08 5.06
+\l 12.85 6.84
+\l 13.15 8.16
+\l 14.29 9.41
+\l 15.65 10.62
+\l 16.97 11.15
+\l 17.95 11.11
+\l 18.71 10.77
+\l 19.35 10.17
+\l 20.37 10.28
+\l 21.05 10.62
+\l 21.43 11.11
+\l 21.28 11.57
+\l 21.54 12.28
+\l 22.15 12.74
+\l 25.25 14.17
+\l 27.02 15.34
+\l 28.08 16.33
+\l 28.65 18.10
+\l 29.86 20.90
+\l 30.73 21.92
+\l 32.92 22.75
+\l 34.85 23.51
+\l 36.55 24.11
+\l 37.00 24.64
+\l 37.98 28.35
+\l 39.76 32.16
+\l 41.58 36.17
+\l 43.62 39.00
+\l 42.26 39.23
+\l 40.48 37.04
+\l 40.06 35.00
+\l 38.78 31.75
+\l 37.08 28.46
+\l 34.81 26.04
+\l 31.79 23.36
+\l 28.35 21.51
+\l 27.21 21.32
+\l 30.54 23.32
+\l 32.20 24.98
+\l 34.02 26.80
+\l 34.81 28.65
+\l 30.61 25.63
+\l 27.97 24.08
+\l 24.95 23.43
+\l 21.85 23.36
+\l 20.33 23.89
+\l 22.72 24.30
+\l 26.23 25.63
+\l 28.57 27.14
+\l 30.12 28.42
+\l 27.02 27.67
+\l 23.77 27.10
+\l 20.07 26.15
+\l 15.57 24.87
+\l 13.04 23.85
+\l 15.31 26.04
+\l 18.37 28.08
+\l 20.64 28.95
+\l 15.23 28.50
+\l 13.57 28.12
+\l 10.70 27.78
+\l 7.26 28.01
+\l 5.10 28.46
+\l 2.65 29.25
+\l 1.28 30.01
+\l 3.40 29.78
+\l 5.03 29.74
+\l 7.86 29.97
+\l 4.80 31.03
+\l 2.65 31.86
+\l 0.68 32.62
+\l -0 33.00
+\l 2.53 32.62
+\l 4.69 32.31
+\l 8.47 32.88
+\l 6.69 33.26
+\l 4.99 33.68
+\l 3.70 34.28
+\l 2.31 35.07
+\l 2.12 35.26
+\l 4.69 34.96
+\l 7.22 35.60
+\l 10.24 36.74
+\l 13.04 37.53
+\l 15.76 37.76
+\l 17.27 37.64
+\l 17.58 37.68
+\l 15.38 38.66
+\l 13.61 38.93
+\l 11.11 38.66
+\l 14.51 39.68
+\l 16.33 39.99
+\l 19.20 40.02
+\l 22.07 39.61
+\l 19.47 40.37
+\l 17.31 41.39
+\l 16.40 42.18
+\l 17.50 41.84
+\l 18.90 41.50
+\l 20.79 41.42
+\l 21.35 41.69
+\l 19.96 42.71
+\l 19.20 43.69
+\l 19.05 44.37
+\l 20.56 43.99
+\l 23.89 43.65
+\l 27.59 44.07
+\l 32.32 45.73
+\l 35.45 47.06
+\l 38.70 47.66
+\l 41.54 47.92
+\l 44.83 47.06
+\l 47.02 46.41
+\l 48.95 44.94
+\l 50.08 44.22
+\l 52.73 45.20
+\l 55.90 46.26
+\l 59.45 45.58
+\l 65.24 46.22
+\l 70.19 47.85
+\l 74.12 51.06
+\l 76.42 54.20
+\l 76.76 55.11
+\l 77.25 55.60
+\l 75.71 55.29
+\l 76.61 56.39
+\l 74.95 56.43
+\l 74.31 56.77
+\l 75.71 57.45
+\l 76.65 57.64
+\l 77.18 59.11
+\l 77.52 60.51
+\l 78.27 61.34
+\l 78.92 61.76
+\l 77.71 61.98
+\l 77.41 62.25
+\l 77.93 62.36
+\l 78.54 62.63
+\l 79.22 63.08
+\l 79.56 63.12
+\l 79.48 63.61
+\l 78.31 63.99
+\l 76.84 65.01
+\l 76.61 65.27
+\l 77.97 64.97
+\l 79.60 65.20
+\l 81.60 64.93
+\l 83.11 64.10
+\l 84.40 63.16
+\l 85.99 62.40
+\l 86.36 62.32
+\l 86.51 62.74
+\l 86.25 63.31
+\l 84.96 63.91
+\l 85.38 64.10
+\l 85.83 63.99
+\l 86.44 63.95
+\l 86.78 63.80
+\l 86.48 64.48
+\l 85.76 65.16
+\l 85.27 65.50
+\l 86.51 65.12
+\l 87.53 64.78
+\l 88.18 64.52
+\l 87.19 65.24
+\l 86.29 66.26
+\l 85.76 67.99
+\l 85.80 68.90
+\l 86.33 67.84
+\l 87.46 66.63
+\l 89.31 65.84
+\l 89.69 65.80
+\l 89.16 66.63
+\l 89.16 67.50
+\l 89.54 66.78
+\l 90.71 66.03
+\l 91.65 65.69
+\l 92.49 65.01
+\l 93.51 64.33
+\l 93.28 65.73
+\l 93.13 66.37
+\l 93.54 67.80
+\l 93.70 67.99
+\l 93.92 66.75
+\l 94.38 65.80
+\l 94.79 65.54
+\l 95.40 66.86
+\l 96.00 67.35
+\l 95.89 66.29
+\l 96.04 65.35
+\l 96.64 64.74
+\l 97.48 64.89
+\l 100.31 66.14
+\l 109.38 63.61
+\l 109.87 63.19
+\l 113.05 61.08
+\l 115.16 62.32
+\l 115.01 58.96
+\l 116.26 57.90
+\l 117.02 57.15
+\l 117.47 56.54
+\l 117.77 55.67
+\l 118.15 55.11
+\l 118.94 55.82
+\l 119.21 56.32
+\l 119.09 57.15
+\l 120.04 57.71
+\l 121.25 58.51
+\l 121.51 58.66
+\l 121.55 57.49
+\l 120.57 54.69
+\l 119.36 53.48
+\l 118.49 52.76
+\l 118.23 52.57
+\l 119.62 52.50
+\l 120.83 52.99
+\l 122.31 52.84
+\l 122.68 52.65
+\l 121.21 52.46
+\l 120.57 51.93
+\l 121.25 51.89
+\l 122.23 51.93
+\l 121.78 51.29
+\l 120.49 50.65
+\l 118.87 50.65
+\l 118.07 50.80
+\l 118.60 50.38
+\l 119.28 50.04
+\l 119.77 49.85
+\l 118.26 49.70
+\l 117.09 50.42
+\l 116.60 50.15
+\l 116.75 49.51
+\l 116.98 48.79
+\l 117.32 47.92
+\l 117.36 46.87
+\l 116.49 46.00
+\l 115.24 44.52
+\l 114.71 43.28
+\l 113.24 38.14
+\l 112.67 36.28
+\l 113.12 34.92
+\l 112.93 34.32
+\l 110.67 31.56
+\l 108.81 31.11
+\l 106.96 31.26
+\l 105.30 32.24
+\l 104.35 33.60
+\l 104.88 34.77
+\l 105.26 35.41
+\l 105.07 36.51
+\l 105.03 38.06
+\l 105.22 38.97
+\l 104.39 42.41
+\l 104.05 43.05
+\l 103.37 44.60
+\l 103.14 46.30
+\l 103.03 47.85
+\l 102.96 48.38
+\l 102.35 48.23
+\l 101.90 46.94
+\l 102.05 45.69
+\l 100.99 43.50
+\l 100.54 41.61
+\l 100.73 39.35
+\l 100.27 37.08
+\l 99.70 35.30
+\l 100.01 34.47
+\l 100.73 32.96
+
+\s
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han8.pgf new/tex/latex/pgfornament-han/han/han8.pgf
--- old/tex/latex/pgfornament-han/han/han8.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han8.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han8.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/han/han9.pgf new/tex/latex/pgfornament-han/han/han9.pgf
--- old/tex/latex/pgfornament-han/han/han9.pgf 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/han/han9.pgf 2019-08-11 22:36:54.000000000 +0200
@@ -1,5 +1,5 @@
% han9.pgf
-% pgfornament-han v0.32 2018/04/09
+% pgfornament-han v0.33 2019/08/10
% Author: LIM LianTze
\pgfsetrectcap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/pgflibraryhan.code.tex new/tex/latex/pgfornament-han/pgflibraryhan.code.tex
--- old/tex/latex/pgfornament-han/pgflibraryhan.code.tex 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/pgflibraryhan.code.tex 2019-08-11 22:36:54.000000000 +0200
@@ -1,4 +1,4 @@
-% pgflibraryhan.code.tex v0.32 2018/04/09
+% pgflibraryhan.code.tex v0.33 2019/08/10
% Authors: pgf and LaTeX code by LIM LianTze
% based on CAD drawing by ZHANG Chennan
@@ -82,6 +82,7 @@
\or\def\@pgfornamentX{300}\def\@pgfornamentY{300}% 75
\or\def\@pgfornamentX{120}\def\@pgfornamentY{122.5}% 76
\or\def\@pgfornamentX{120}\def\@pgfornamentY{122.5}% 77
+\or\def\@pgfornamentX{123}\def\@pgfornamentY{69}% 78
\fi%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament-han/pgfornament-han.sty new/tex/latex/pgfornament-han/pgfornament-han.sty
--- old/tex/latex/pgfornament-han/pgfornament-han.sty 2018-04-09 23:10:25.000000000 +0200
+++ new/tex/latex/pgfornament-han/pgfornament-han.sty 2019-08-11 22:36:54.000000000 +0200
@@ -1,4 +1,4 @@
-% pgfornamenthan.sty v0.32 2018/04/09
+% pgfornamenthan.sty v0.33 2019/08/10
% Authors: pgf and LaTeX code by LIM LianTze
% based on CAD drawing by ZHANG Chennan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfornament-han.tlpobj new/tlpkg/tlpobj/pgfornament-han.tlpobj
--- old/tlpkg/tlpobj/pgfornament-han.tlpobj 2019-02-28 03:59:28.000000000 +0100
+++ new/tlpkg/tlpobj/pgfornament-han.tlpobj 2020-03-09 00:28:46.000000000 +0100
@@ -1,6 +1,6 @@
name pgfornament-han
category Package
-revision 47789
+revision 54191
shortdesc pgfornament library for Chinese traditional motifs and patterns
relocated 1
longdesc This package provides a pgfornament library for Chinese
@@ -8,13 +8,13 @@
longdesc takes the same options as \pgfornament from the pgfornament
longdesc package, but renders Chinese traditional motifs instead. The
longdesc list of supported motifs, as well as some examples, can be
-longdesc found in the accompanying documentation. Yi pgfornament Hong
+longdesc found in the accompanying documentation. Yi pgfornament Hong
longdesc Bao De Ji Zhi ,Shi Xian Hui Zhi Yi Feng Tu Wen .
-longdesc \pgfornamenthan He \pgfornament De Can Shu Shi Yi Yang De
-longdesc ;Bian Yi De Chu Lai De Dang Ran Shi Yi Feng Wen Yang Liao .
-longdesc Hong Bao Shou Ce Li You Wan Zheng De Wen Yang Lie Biao Yi Ji
-longdesc Shi Yong Fan Li .
-runfiles size=128
+longdesc \pgfornamenthan He \pgfornament De Can Shu Shi Yi Yang De ;Bian
+longdesc Yi De Chu Lai De Dang Ran Shi Yi Feng Wen Yang Liao . Hong Bao
+longdesc Shou Ce Li You Wan Zheng De Wen Yang Lie Biao Yi Ji Shi Yong
+longdesc Fan Li .
+runfiles size=130
RELOC/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty
RELOC/tex/latex/pgfornament-han/beamerthemeXiaoshan.sty
RELOC/tex/latex/pgfornament-han/cncolours.sty
@@ -93,6 +93,7 @@
RELOC/tex/latex/pgfornament-han/han/han75.pgf
RELOC/tex/latex/pgfornament-han/han/han76.pgf
RELOC/tex/latex/pgfornament-han/han/han77.pgf
+ RELOC/tex/latex/pgfornament-han/han/han78.pgf
RELOC/tex/latex/pgfornament-han/han/han8.pgf
RELOC/tex/latex/pgfornament-han/han/han9.pgf
RELOC/tex/latex/pgfornament-han/pgflibraryhan.code.tex
@@ -100,6 +101,5 @@
catalogue-also pgfornament
catalogue-contact-repository https://github.com/liantze/pgfornament-han/
catalogue-ctan /graphics/pgf/contrib/pgfornament-han
-catalogue-date 2018-05-21 12:26:58 +0200
catalogue-license lppl1.3c
catalogue-topics pgf-tikz chinese graphics-symb presentation
++++++ pgfornament.doc.tar.xz ++++++
++++ 14686 lines of diff (skipped)
++++++ pgfornament.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfornament/vectorian/vectorian170.pgf new/tex/generic/pgfornament/vectorian/vectorian170.pgf
--- old/tex/generic/pgfornament/vectorian/vectorian170.pgf 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/generic/pgfornament/vectorian/vectorian170.pgf 2020-04-12 00:46:17.000000000 +0200
@@ -1,3 +1,5 @@
+\r 0 0 226 79
+\ubb
\m 14.0334 8.0432
\c 14.0334 8.0432 22.7896 12.6699 35.7457 10.1072
\c 48.7011 7.5453 55.1084 7.617 57.9539 10.9624
@@ -28,3 +30,4 @@
\c 33.6809 7.4742 33.112 17.2256 33.112 17.2256
\c 35.9595 6.0501 47.9177 0.4262 47.9177 0.4262
\s
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfornament/vectorian/vectorian176.pgf new/tex/generic/pgfornament/vectorian/vectorian176.pgf
--- old/tex/generic/pgfornament/vectorian/vectorian176.pgf 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/generic/pgfornament/vectorian/vectorian176.pgf 2020-04-12 00:46:17.000000000 +0200
@@ -102,4 +102,3 @@
\c 5.8466 20.5334 7.9524 21.6774 7.9524 21.6774
\o
\s
-} def
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfornament/vectorian/vectorian70.pgf new/tex/generic/pgfornament/vectorian/vectorian70.pgf
--- old/tex/generic/pgfornament/vectorian/vectorian70.pgf 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/generic/pgfornament/vectorian/vectorian70.pgf 2020-04-12 00:46:17.000000000 +0200
@@ -1,5 +1,3 @@
-\r 0 0 226 79
-\i
\m 199.0251 68.6723
\c 186.7051 68.4003 182.3083 62.8803 175.3723 56.0483
\c 168.4363 49.2323 167.6379 47.4083 164.9099 47.4083
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfornament/vectorian/vectorian87.pgf new/tex/generic/pgfornament/vectorian/vectorian87.pgf
--- old/tex/generic/pgfornament/vectorian/vectorian87.pgf 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/generic/pgfornament/vectorian/vectorian87.pgf 2020-04-12 00:46:17.000000000 +0200
@@ -1,4 +1,4 @@
-\r 79 0 356.5 44
+\r 79 0 356.5 45
\i
\m 430.7596 22.4588
\c 426.0989 22.5333 419.3224 21.888 415.6531 19.7041
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament/pgflibraryam.code.tex new/tex/latex/pgfornament/pgflibraryam.code.tex
--- old/tex/latex/pgfornament/pgflibraryam.code.tex 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/latex/pgfornament/pgflibraryam.code.tex 2020-04-12 00:46:17.000000000 +0200
@@ -1,6 +1,18 @@
-% utf8
-% author Alain Matthes d'après des travaux de F Fradin et H Voss sur un fichier
-% 21/01/2012
+% pgflibraryam.code.tex (utf8 encoding)
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+% Original idea of F Fradin and H Voss
+\typeout{2020/04/06 1.1 pgflibraryam.code.tex}
\makeatletter
% dimensions des motifs
@@ -8,6 +20,7 @@
\ifcase#1\relax%
\or\def\@pgfornamentX{136}\def\@pgfornamentY{107}% 1
\or\def\@pgfornamentX{133}\def\@pgfornamentY{48}% 2
+\or\def\@pgfornamentX{133}\def\@pgfornamentY{48}% 2
\fi%
}%
% appels des motifs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament/pgflibrarypgfhan.code.tex new/tex/latex/pgfornament/pgflibrarypgfhan.code.tex
--- old/tex/latex/pgfornament/pgflibrarypgfhan.code.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/pgfornament/pgflibrarypgfhan.code.tex 2020-04-12 00:46:17.000000000 +0200
@@ -0,0 +1,110 @@
+% pgflibraryhan.code.tex (utf8 encoding)
+% Copyright 2020 LIM LianTze,ZHANG Chennan and Alain Matthes
+% Based on the original file pgflibraryhan.code.tex v0.33 2019/08/10
+% pgflibraryhan.code.tex v0.33 2019/08/10
+% Authors: pgf and LaTeX code by LIM LianTze
+% based on CAD drawing by ZHANG Chennan
+%---------%---------%---------%---------%---------%---------%---------%---------
+% 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 Alain Matthes.
+%---------%---------%---------%---------%---------%---------%---------%---------
+% Original idea of F Fradin and H Voss
+\typeout{2020/04/03 1.0 pgflibraryhan.code.tex}
+%---------%---------%---------%---------%---------%---------%---------%---------
+% modification am \@pgfornamentDim#1 instead of pgfornamenthanDim#1
+%---------%---------%---------%---------%---------%---------%---------%---------
+\makeatletter
+\def\@pgfornamentDim#1{% dim in bp
+\ifcase#1\relax%
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 1
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 2
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 3
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 4
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 5
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 6
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 7
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 8
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 9
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 10
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 11
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 12
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 13
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 14
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 15
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 16
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 17
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 18
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 19
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 20
+\or\def\@pgfornamentX{260}\def\@pgfornamentY{260}% 21
+\or\def\@pgfornamentX{260}\def\@pgfornamentY{260}% 22
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 23
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 24
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 25
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 26
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 27
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 28
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{10}% 29
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{10}% 30
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{40}% 31
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{40}% 32
+\or\def\@pgfornamentX{75}\def\@pgfornamentY{60}% 33
+\or\def\@pgfornamentX{75}\def\@pgfornamentY{60}% 34
+\or\def\@pgfornamentX{100}\def\@pgfornamentY{60}% 35
+\or\def\@pgfornamentX{100}\def\@pgfornamentY{60}% 36
+\or\def\@pgfornamentX{125}\def\@pgfornamentY{110}% 37
+\or\def\@pgfornamentX{125}\def\@pgfornamentY{110}% 38
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{110}% 39
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{110}% 40
+\or\def\@pgfornamentX{115}\def\@pgfornamentY{60}% 41
+\or\def\@pgfornamentX{115}\def\@pgfornamentY{60}% 42
+\or\def\@pgfornamentX{140}\def\@pgfornamentY{60}% 43
+\or\def\@pgfornamentX{140}\def\@pgfornamentY{60}% 44
+\or\def\@pgfornamentX{130}\def\@pgfornamentY{60}% 45
+\or\def\@pgfornamentX{130}\def\@pgfornamentY{60}% 46
+\or\def\@pgfornamentX{155}\def\@pgfornamentY{60}% 47
+\or\def\@pgfornamentX{155}\def\@pgfornamentY{60}% 48
+\or\def\@pgfornamentX{360}\def\@pgfornamentY{360}% 49
+\or\def\@pgfornamentX{360}\def\@pgfornamentY{360}% 50
+\or\def\@pgfornamentX{360}\def\@pgfornamentY{360}% 51
+\or\def\@pgfornamentX{360}\def\@pgfornamentY{360}% 52
+\or\def\@pgfornamentX{360}\def\@pgfornamentY{360}% 53
+\or\def\@pgfornamentX{360}\def\@pgfornamentY{360}% 54
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 55
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 56
+\or\def\@pgfornamentX{200}\def\@pgfornamentY{200}% 57
+\or\def\@pgfornamentX{810}\def\@pgfornamentY{270}% 58
+\or\def\@pgfornamentX{810}\def\@pgfornamentY{270}% 59
+\or\def\@pgfornamentX{450}\def\@pgfornamentY{120}% 60
+\or\def\@pgfornamentX{450}\def\@pgfornamentY{120}% 61
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{180}% 62
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{180}% 63
+\or\def\@pgfornamentX{350}\def\@pgfornamentY{210}% 64
+\or\def\@pgfornamentX{350}\def\@pgfornamentY{210}% 65
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{180}% 66
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{180}% 67
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{170}% 68
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{170}% 69
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{140}% 70
+\or\def\@pgfornamentX{400}\def\@pgfornamentY{140}% 71
+\or\def\@pgfornamentX{300}\def\@pgfornamentY{300}% 72
+\or\def\@pgfornamentX{300}\def\@pgfornamentY{300}% 73
+\or\def\@pgfornamentX{300}\def\@pgfornamentY{300}% 74
+\or\def\@pgfornamentX{300}\def\@pgfornamentY{300}% 75
+\or\def\@pgfornamentX{120}\def\@pgfornamentY{122.5}% 76
+\or\def\@pgfornamentX{120}\def\@pgfornamentY{122.5}% 77
+\or\def\@pgfornamentX{123}\def\@pgfornamentY{69}% 78
+\fi%
+}%
+\makeatother
+\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament/pgflibraryvectorian.code.tex new/tex/latex/pgfornament/pgflibraryvectorian.code.tex
--- old/tex/latex/pgfornament/pgflibraryvectorian.code.tex 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/latex/pgfornament/pgflibraryvectorian.code.tex 2020-04-12 00:46:17.000000000 +0200
@@ -1,6 +1,18 @@
-% utf8
-% author Alain Matthes d'après des travaux de F Fradin et H Voss sur un fichier
-% 21/01/2012
+% pgflibraryvectorian.code.tex (utf8 encoding)
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+% Original idea of F Fradin and H Voss
+\typeout{2020/04/06 1.1 pgflibraryvectorian.code.tex}
\makeatletter
% dimensions des motifs
\def\@pgfornamentDim#1{% dim en bp
@@ -71,7 +83,7 @@
\or\def\@pgfornamentX{212}\def\@pgfornamentY{212}% 64
\or\def\@pgfornamentX{132}\def\@pgfornamentY{166}% 65
\or\def\@pgfornamentX{177}\def\@pgfornamentY{175}% 66
-\or\def\@pgfornamentX{80} \def\@pgfornamentY{155}% 67
+\or\def\@pgfornamentX{80}\def\@pgfornamentY{155}% 67
\or\def\@pgfornamentX{361}\def\@pgfornamentY{154}% 68
\or\def\@pgfornamentX{448}\def\@pgfornamentY{227}% 69
\or\def\@pgfornamentX{226}\def\@pgfornamentY{79}% 70
@@ -94,7 +106,7 @@
\or\def\@pgfornamentX{360}\def\@pgfornamentY{44}% 87
\or\def\@pgfornamentX{454}\def\@pgfornamentY{15}% 88
\or\def\@pgfornamentX{454}\def\@pgfornamentY{10}% 89
-\or\def\@pgfornamentX{30} \def\@pgfornamentY{30}% 90
+\or\def\@pgfornamentX{30}\def\@pgfornamentY{30}% 90
\or\def\@pgfornamentX{44}\def\@pgfornamentY{29}% 91
\or\def\@pgfornamentX{43}\def\@pgfornamentY{29}% 92
\or\def\@pgfornamentX{59}\def\@pgfornamentY{29}% 93
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament/pgfornament.sty new/tex/latex/pgfornament/pgfornament.sty
--- old/tex/latex/pgfornament/pgfornament.sty 2016-03-11 00:22:07.000000000 +0100
+++ new/tex/latex/pgfornament/pgfornament.sty 2020-04-12 00:46:17.000000000 +0200
@@ -1,41 +1,44 @@
-% utf8
-% ------------------------------------------------
-% Created by Alain Matthes le 2012-02-22.
-% Copyright (C) 2016 Alain Matthes
-% This file may be distributed and/or modified
+% pgfornament.sty (utf8 encoding)
+% Copyright 2020 Alain Matthes
+% 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.
%
-% 1. under the LaTeX Project Public License , either version 1.3
-% of this license or (at your option) any later version and/or
-% 2. under the GNU Public License.
-% ------------------------------------------------
-%% pgfornament.sty 0.2 du 05/03/2016 inspired from psvectorian P Fradin H Voss
-%% ------------------------------------------------
-% Les options de \pgfornament sont:
-%
-% scale : nombre (échelle, 1 par défaut)
-% width : nombre + unité (largeur, naturelle par défaut)
-% height : nombre + unité (hauteur, naturelle par défaut)
-% color : couleur ( par défaut couleur courante )
-% symmetry=h : true/false (symétrie horizontale, false par défaut)
-% symmetry=v : true/false (symétrie verticale, false par défaut)
-% symmetry=c : true/false (symétrie centrale h+v,false par défaut)
-\NeedsTeXFormat{LaTeX2e}%
-\RequirePackage{tikz,pgfopts}%
-\ProvidesPackage{pgfornament}[2016/03/05 v0.21 vector ornaments]%
+% This work has the LPPL maintenance status “maintained”.
+%
+% The Current Maintainer of this work is Alain Matthes.
+%---------%---------%---------%---------%---------%---------%---------%---------
+% First version created by Alain Matthes le 2012-02-22.
+%---------%---------%---------%---------%---------%---------%---------%---------
+% Inspired from psvectorian P Fradin H Voss
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{tikz,pgfopts}
+\ProvidesPackage{pgfornament}[2020/04/06 v1.1 vector ornaments]
\gdef\pgfOrnamentsObject{pgflibraryvectorian.code.tex}
\gdef\OrnamentsFamily{vectorian}
-\pgfkeys{
-/pgfOrnaments/object/.cd,
-/pgfOrnaments/object/.code = \gdef\pgfOrnamentsObject{pgflibrary#1.code.tex}
-\gdef\OrnamentsFamily{#1}
+\pgfkeys{%
+ /pgfOrnaments/object/.cd,
+ /pgfOrnaments/object/.code = \gdef\pgfOrnamentsObject{pgflibrary#1.code.tex}
+ \gdef\OrnamentsFamily{#1}%
}
\ProcessPgfOptions{/pgfOrnaments}
\input{\pgfOrnamentsObject}%
+%---------%---------%---------%---------%---------%---------%---------%--------
+% tools
+%---------%---------%---------%---------%---------%---------%---------%--------
\makeatletter
+\newenvironment{newfamily}[1][vectorian]{%
+ \global\let\SavedOrnamentsFamily\OrnamentsFamily
+ \newpgfornamentfamily{#1}
+ }{\newpgfornamentfamily{\SavedOrnamentsFamily}}%
-% appels des motifs
\def\pgf@@ornament#1{%
\begingroup
+\def\ubb{\pgfusepath{use as bounding box}}
\def\i{\pgfusepath{clip}}%
\def\k{\pgfusepath{stroke}}%
\let\o\pgfpathclose
@@ -49,33 +52,65 @@
\@@input \OrnamentsFamily#1.pgf%
\endgroup}%
+\newcommand{\callornament}[1]{%
+\begingroup
+\def\ubb{\pgfusepath{use as bounding box}}
+\def\i{\pgfusepath{clip}}%
+\let\o\pgfpathclose
+\let\s\pgfusepathqfillstroke
+\def\p ##1##2{\pgfqpoint{##1bp}{##2bp}}%
+\def\m ##1 ##2 {\pgfpathmoveto{\p{##1}{##2}}}%
+\def\l ##1 ##2 {\pgfpathlineto{\p{##1}{##2}}}%
+\def\r ##1 ##2 ##3 ##4 {\pgfpathrectangle{\p{##1}{##2}}{%
+ \p{##3}{##4}}}%
+\def\c ##1 ##2 ##3 ##4 ##5 ##6 {%
+\pgfpathcurveto{\p{##1}{##2}}{\p{##3}{##4}}{\p{##5}{##6}}}%
+\@@input #1\relax
+\endgroup}
+%---------%---------%---------%---------%---------%---------%---------%---------
+% Les options de \pgfornament sont:
+%
+% scale : nombre (échelle, 1 par défaut)
+% width : nombre + unité (largeur, naturelle par défaut)
+% height : nombre + unité (hauteur, naturelle par défaut)
+% color : couleur ( par défaut couleur courante )
+% symmetry=h : true/false (symétrie horizontale, false par défaut)
+% symmetry=v : true/false (symétrie verticale, false par défaut)
+% symmetry=c : true/false (symétrie centrale h+v,false par défaut)
+%---------%---------%---------%---------%---------%---------%---------%--------
\tikzset{pgfornamentstyle/.style={}}%
\pgfkeys{%
-/ornament/.cd,
-scale/.code = {\def\pgfornamentscale{#1}},
-width/.code = {\def\pgfornamentwidth{#1}},
-height/.code = {\def\pgfornamentheight{#1}},
-color/.code = {\def\pgfornamentcolor{#1}},
-opacity/.code = {\def\pgfornamentopacity{#1}},
-anchor/.code = {\def\pgfornamentanchor{#1}},
-ydelta/.code = {\def\pgfornamentydelta{#1}},
-symmetry/.is choice,
-symmetry/v/.code = {\tikzset{pgfornamentstyle/.append style={cm={-1,0,0,1,(0,0)}}}},
-symmetry/c/.code = {\tikzset{pgfornamentstyle/.append style={cm={-1,0,0,-1,(0,0)}}}},
-symmetry/h/.code = {\tikzset{pgfornamentstyle/.append style={cm={1,0,0,-1,(0,0)}}}},
-symmetry/none/.code = {\tikzset{pgfornamentstyle/.append style={cm={1,0,0,1,(0,0)}}}}}%
+ /ornament/.cd,
+ scale/.code = {\def\pgfornamentscale{#1}},
+ width/.code = {\def\pgfornamentwidth{#1}},
+ height/.code = {\def\pgfornamentheight{#1}},
+ color/.code = {\def\pgfornamentcolor{#1}},
+ opacity/.code = {\def\pgfornamentopacity{#1}},
+ anchor/.code = {\def\pgfornamentanchor{#1}},
+ ydelta/.code = {\def\pgfornamentydelta{#1}},
+ symmetry/.is choice,
+ symmetry/v/.code = {\tikzset{pgfornamentstyle/.append
+ style={cm={-1,0,0,1,(0,0)}}}},
+ symmetry/c/.code = {\tikzset{pgfornamentstyle/.append
+ style={cm={-1,0,0,-1,(0,0)}}}},
+ symmetry/h/.code = {\tikzset{pgfornamentstyle/.append
+ style={cm={1,0,0,-1,(0,0)}}}},
+ symmetry/none/.code = {\tikzset{pgfornamentstyle/.append style={cm={1,0,0,1,(0,0)}}}}%
+}%
+%---------%---------%---------%---------%---------%---------%---------%---------
\def\pgfornament{\pgfutil@ifnextchar[{\pgf@ornament}{\pgf@ornament[]}}%
\def\pgf@ornament[#1]#2{%
-\pgfkeys{/ornament/.cd,
- scale = 1,
- opacity = {},
- width = {},
- height = {},
- color = {},
- ydelta = 0 pt,
- symmetry = none ,
- anchor = center}%
-%
+\pgfkeys{%
+ /ornament/.cd,
+ scale = 1,
+ opacity = {},
+ width = {},
+ height = {},
+ color = {},
+ ydelta = 0 pt,
+ symmetry = none ,
+ anchor = center
+ }%
\pgfqkeys{/ornament}{#1}%
\ifx\pgfornamentcolor\empty
\tikzset{pgfornamentstyle/.append style={}}%
@@ -89,32 +124,36 @@
\fi
\ifx\pgfornamentwidth\empty
\else
- \@pgfornamentDim{#2}%
- \pgfmathsetmacro{\pgfornamentscale}{\pgfornamentwidth/\@pgfornamentX bp}%
+ \@pgfornamentDim{#2}
+ \pgfmathsetmacro{\pgfornamentscale}{\pgfornamentwidth/\@pgfornamentX bp}%
\fi
\ifx\pgfornamentheight\empty
\else
- \@pgfornamentDim{#2}%
- \pgfmathsetmacro{\pgfornamentscale}{\pgfornamentheight/\@pgfornamentY bp}%
+ \@pgfornamentDim{#2}
+ \pgfmathsetmacro{\pgfornamentscale}{\pgfornamentheight/\@pgfornamentY bp}%
\fi
\begin{tikzpicture}[%
- baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)},pgfornamentstyle]
+baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)},
+ pgfornamentstyle]
\pgftransformscale{\pgfornamentscale}%
\pgf@@ornament{#2}%
\end{tikzpicture}%
-\tikzset{pgfornamentstyle/.style={cm={1,0,0,1,(0,0)}}}%
-}%
+\tikzset{pgfornamentstyle/.style={cm={1,0,0,1,(0,0)}}}
+}% end pgfornament
+
\gdef\ornamenttopos{.5}
\gdef\ornamenttoanchor{center}
\gdef\ornamenttosymmetry{none}
-\tikzset{options default/.style={anchor=center,sloped,allow upside down,inner sep=0pt}}
-\tikzset{%
-ornament/at/.code={\def\ornamenttopos{#1}},
-options/.style={options default,#1},
-ornament symmetry/.code={\def\ornamenttosymmetry{#1}},
-node anchor/.code={\def\ornamenttoanchor{#1}},
-ornament/.style={%
-to path={%
+\tikzset{options default/.style={anchor=center,
+ sloped,
+ allow upside down,
+ inner sep=0pt}}
+\tikzset{ornament/at/.code={\def\ornamenttopos{#1}},
+ options/.style={options default,#1},
+ ornament symmetry/.code={\def\ornamenttosymmetry{#1}},
+ node anchor/.code={\def\ornamenttoanchor{#1}},
+ ornament/.style={%
+ to path={%
\pgfextra{%
\tikz@scan@one@point\pgfutil@firstofone(\tikztostart)\relax
\pgf@xa=\pgf@x
@@ -126,14 +165,15 @@
\advance\pgf@ya by-\pgf@yb
\pgfmathveclen{\pgf@xa}{\pgf@ya}%
\global\let\ornamentlen\pgfmathresult}
- -- node [pos=\ornamenttopos,options,
- anchor=\ornamenttoanchor]{%
+ -- node [pos=\ornamenttopos,options,
+ anchor=\ornamenttoanchor]{%
\pgfornament[width = \ornamentlen,
- symmetry=\ornamenttosymmetry]{#1}}
+ symmetry=\ornamenttosymmetry]{#1}}
(\tikztotarget)\tikztonodes %end pgfextra
}% end to path
}% end style
-}%
+}% end \tikzset
+
\def\pgfornamenthline#1#2#3#4{%
\pgfextractx{\pgf@x}{\pgfpointanchor{#1}{#3 east}}
\pgf@xa=\pgf@x
@@ -163,9 +203,27 @@
\pgfmathsetmacro{#1}{atan2(\pgf@x,\pgf@y)}%
}%
\makeatother
-
\newcommand{\resetpgfornamentstyle}{\tikzset{pgfornamentstyle/.style={}}}
-
-\endinput
-% End
+% 2020 Changing vector objects
+\def\newpgfornamentfamily#1{%
+ \edef\OrnamentsFamily{#1}
+ \gdef\pgfOrnamentsObject{pgflibrary\OrnamentsFamily.code.tex}
+ \input{\pgfOrnamentsObject}%
+ }%
+
+\makeatletter
+\pgfkeys{/ornamentline/.cd,
+ color/.store in = \ornamentcolor,
+ color = black,
+ /ornamentline/.search also={/tikz}}
+\def\pgfornamentline{\pgfutil@ifnextchar[{\pgf@ornamentline}{\pgf@ornamentline[]}}%
+\def\pgf@ornamentline[#1]#2#3#4#5{%
+
+\pgfqkeys{/ornamentline}{#1}%
+\pgfmathsetmacro\nbo{#4}
+\path (#2) -- (#3) foreach \i in {0,...,\nbo} {coordinate[pos=\i/\nbo] (p\i)}
+ [color=\ornamentcolor] foreach \i [count=\j] in {0,...,\number\numexpr\nbo-1} { (p\i) to [ornament=#5] (p\j)};
+}
+\makeatother
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgfornament/tikzrput.sty new/tex/latex/pgfornament/tikzrput.sty
--- old/tex/latex/pgfornament/tikzrput.sty 2016-03-08 23:40:14.000000000 +0100
+++ new/tex/latex/pgfornament/tikzrput.sty 2020-04-12 00:46:17.000000000 +0200
@@ -1,20 +1,21 @@
-% utf8
-% tikzrput.sty 0.3 du 05/03/2016 inspired from rput (pstricks)
-% ------------------------------------------------
-% Created by Alain Matthes le 2012-02-22.
-% Copyright (c) 2012 __AlterMundus__.
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License , either version 1.3
-% of this license or (at your option) any later version and/or
-% 2. under the GNU Public License.
-% ------------------------------------------------
-% Options are the same of /rput in pstricks
+% pgflibraryam.code.tex (utf8 encoding)
+% Copyright 2020 Alain Matthes
+% 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 Alain Matthes.
+
+\typeout{2020/04/06 1.1 pgflibraryam.code.tex}
\NeedsTeXFormat{LaTeX2e}%
-\RequirePackage{tikz,ifpdf}%
-\ProvidesPackage{tikzrput}[2016/03/05 v0.3 rput for tikz]%
+\RequirePackage{tikz,iftex}%
+\ProvidesPackage{tikzrput}[2020/04/04 v1.1 rput for tikz]%
\edef\tikzrputPtVirCode{\the\catcode`\;}
\edef\tikzrputAtCode{\the\catcode`\@}
\edef\tikzrputTwoPtCode{\the\catcode`\:}
@@ -62,17 +63,17 @@
\let\rput@pos@rb\rput@pos@br
\let\rput@pos@lb\rput@pos@bl
\newbox\mybox
-\ifpdf
+\ifpdf% Pablo 04/2020
\pgfutil@ifundefined{rput}{%
\tikzset{rput style/.style={}}
\def\rput{\pgfutil@ifnextchar[{\rput@i}{%
- \global\edef\opt@rput{}\rput@ii}}%
+ \global\edef\opt@rput{}\rput@ii}}%
\def\rput@i[#1]{\global\edef\opt@rput{#1}\rput@ii}%
\def\rput@ii{\pgfutil@ifnextchar({%
- \def\angle@rput{0}\rput@iv}{\rput@iii}}%
+ \def\angle@rput{0}\rput@iv}{\rput@iii}}%
\def\rput@iii#1{%
\ifx\rput@empty#1\rput@empty\def\angle@rput{0}\else%
- \def\angle@rput{#1}\fi%
+ \def\angle@rput{#1}\fi%
\pgfutil@ifnextchar({\rput@iv}{\rput@iv(0,0)}}%,
\def\rput@iv(#1){\def\pos@rput{#1}%
\rput@parsecoordinate{#1}%
@@ -81,25 +82,25 @@
\sbox\mybox{%
\pgfinterruptpicture#1\endpgfinterruptpicture}%
\begingroup
- \tikzifinpicture{%
- \let\begin@my@tikz@env\scope
- \let\end@my@tikz@env\endscope
- }{%
- \let\begin@my@tikz@env\tikzpicture
- \let\end@my@tikz@env\endtikzpicture
- }%
- \@nameuse{rput@pos@\opt@rput}%
- \begin{pgfinterruptboundingbox}%
- \begin@my@tikz@env[overlay]
- \path (0,0)--(\pos@rput);
- \protected@edef\rput@temp{%
- \noexpand\node[inner sep = 0pt,
- anchor = \rput@anchor,
- rotate = \angle@rput,
- rput style]}%
- \rput@temp at (\pos@rput){\box\mybox};
- \end@my@tikz@env
- \end{pgfinterruptboundingbox}%
+ \tikzifinpicture{%
+ \let\begin@my@tikz@env\scope
+ \let\end@my@tikz@env\endscope
+ }{%
+ \let\begin@my@tikz@env\tikzpicture
+ \let\end@my@tikz@env\endtikzpicture
+ }%
+ \@nameuse{rput@pos@\opt@rput}%
+ \begin{pgfinterruptboundingbox}%
+ \begin@my@tikz@env[overlay]
+ \path (0,0)--(\pos@rput);
+ \protected@edef\rput@temp{%
+ \noexpand\node[inner sep = 0pt,
+ anchor = \rput@anchor,
+ rotate = \angle@rput,
+ rput style]}%
+ \rput@temp at (\pos@rput){\box\mybox};
+ \end@my@tikz@env
+ \end{pgfinterruptboundingbox}%
\endgroup
\ignorespaces
}%
@@ -109,4 +110,4 @@
\catcode`\;=\tikzrputPtVirCode\relax
\catcode`\@=\tikzrputAtCode\relax
\catcode`\:=\tikzrputTwoPtCode\relax
-\endinput
\ No newline at end of file
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfornament.tlpobj new/tlpkg/tlpobj/pgfornament.tlpobj
--- old/tlpkg/tlpobj/pgfornament.tlpobj 2019-02-28 03:59:26.000000000 +0100
+++ new/tlpkg/tlpobj/pgfornament.tlpobj 2020-04-12 01:55:38.000000000 +0200
@@ -1,12 +1,12 @@
name pgfornament
category Package
-revision 39988
+revision 54670
shortdesc Drawing of Vectorian ornaments with PGF/TikZ
relocated 1
longdesc This package allows the drawing of Vectorian ornaments (196)
longdesc with PGF/TikZ. The documentation presents the syntax and
longdesc parameters of the macro "pgfornament".
-runfiles size=518
+runfiles size=521
RELOC/tex/generic/pgfornament/am/am1.pgf
RELOC/tex/generic/pgfornament/am/am2.pgf
RELOC/tex/generic/pgfornament/vectorian/vectorian1.pgf
@@ -206,12 +206,13 @@
RELOC/tex/generic/pgfornament/vectorian/vectorian98.pgf
RELOC/tex/generic/pgfornament/vectorian/vectorian99.pgf
RELOC/tex/latex/pgfornament/pgflibraryam.code.tex
+ RELOC/tex/latex/pgfornament/pgflibrarypgfhan.code.tex
RELOC/tex/latex/pgfornament/pgflibraryvectorian.code.tex
RELOC/tex/latex/pgfornament/pgfornament.sty
RELOC/tex/latex/pgfornament/tikzrput.sty
catalogue-also pgf
+catalogue-contact-home http://altermundus.fr
catalogue-ctan /macros/latex/contrib/tkz/pgfornament
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics graphics-plot decoration
-catalogue-version 0.21
+catalogue-version 1.1
++++++ pgfplots.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-r/pgfplots.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-r.new.3606/pgfplots.doc.tar.xz differ: char 26, line 1
++++++ pgfplots.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex new/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex
--- old/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex 2017-06-06 01:09:50.000000000 +0200
+++ new/tex/generic/pgfplots/libs/tikzlibrarypgfplots.patchplots.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -374,6 +374,76 @@
}%
}%
+% This is JUST a curveto operation! Nothing special.
+\pgfplotsdeclarepatchclass{bezier spline}{%
+ get dimension=\def\pgfplotsretval{1},
+ supports global path=\def\pgfplotsretval{1},
+ new=\def\pgfplotspatchclass@cspline@no{A},
+ set next vertex={%
+ % EXPECTED ORDERING: first 2 corners, then 2 control points
+ % (NOT interpolatory).
+ % defines \pgfplotspatchclass@cspline@A ... \pgfplotspatchclass@cspline@D (4 points)
+ \expandafter\edef\csname pgfplotspatchclass@cspline@\pgfplotspatchclass@cspline@no\endcsname{#1}%
+ \if D\pgfplotspatchclass@cspline@no
+ \def\pgfplotspatchclass@cspline@no{A}%
+ \pgfplotspatchready
+ \else
+ \expandafter\let\expandafter\pgfplotspatchclass@cspline@no\csname pgfpptchindexnext@\pgfplotspatchclass@cspline@no\endcsname
+ \fi
+ },
+ if current point can be first last={%
+ \pgfplots@loc@tmpfalse
+ \if B\pgfplotspatchclass@cspline@no
+ % Ah - the current point is the 'A' point (we have
+ % advanced the '@no' counter)
+ \pgfplots@loc@tmptrue
+ \fi
+ \if C\pgfplotspatchclass@cspline@no
+ % Ah - the current point is the 'B' point (we have
+ % advanced the '@no' counter)
+ \pgfplots@loc@tmptrue
+ \fi
+ \ifpgfplots@loc@tmp
+ #1\relax%
+ \else
+ #2\relax
+ \fi
+ },
+ first vertex=\expandafter\pgfplotspatchvertex\pgfplotspatchclass@cspline@A\endvertex,
+ foreach vertex={%
+ \expandafter\pgfplotspatchvertex\pgfplotspatchclass@cspline@A\endvertex #1%
+ \expandafter\pgfplotspatchvertex\pgfplotspatchclass@cspline@B\endvertex #1%
+ \expandafter\pgfplotspatchvertex\pgfplotspatchclass@cspline@C\endvertex #1%
+ \expandafter\pgfplotspatchvertex\pgfplotspatchclass@cspline@D\endvertex #1%
+ },
+ fill path={%
+ % Draw the patch boundary using a bezier curve.
+ \pgfplotsplothandlermesh@pathmoveto{\expandafter\pgfplotspointpatchvertex\pgfplotspatchclass@cspline@A\endvertex}%
+ \pgfpathcurveto {
+ \expandafter\pgfplotspointpatchvertex\pgfplotspatchclass@cspline@C\endvertex
+ }{
+ \expandafter\pgfplotspointpatchvertex\pgfplotspatchclass@cspline@D\endvertex
+ }{%
+ \expandafter\pgfplotspointpatchvertex\pgfplotspatchclass@cspline@B\endvertex
+ }%
+ \pgfplotsplothandlermesh@setlastpoint{\expandafter\pgfplotspointpatchvertex\pgfplotspatchclass@cspline@B\endvertex}%
+ },
+ triangulate class=\def\pgfplotsretval{line},
+ triangulate={%
+ \let\pgfplotsplothandlermesh@patchclass@=\pgfplotsplothandlermesh@patchclass
+ \def\pgfplotsplothandlermesh@patchclass{line}%
+ \pgfplotspatchclass{\pgfplotsplothandlermesh@patchclass}{new}%
+ % XXX : very poor quality ...
+ \expandafter\pgfplotsplothandlermesh@setnextvertex\expandafter{\pgfplotspatchclass@cspline@A}%
+ \expandafter\pgfplotsplothandlermesh@setnextvertex\expandafter{\pgfplotspatchclass@cspline@B}%
+ \let\pgfplotsplothandlermesh@patchclass=\pgfplotsplothandlermesh@patchclass@
+ },%
+ get pdf shading type=0,
+ get num vertices=\def\pgfplotsretval{4},
+}%
+
+
+
% make a linearized sequence around the edge of the quad.triangle.
% note the ordering: first 3 corners, then 3 mid nodes:
\def\pgfplots@qtri@next@A{D}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/libs/tikzlibrarypgfplots.smithchart.code.tex new/tex/generic/pgfplots/libs/tikzlibrarypgfplots.smithchart.code.tex
--- old/tex/generic/pgfplots/libs/tikzlibrarypgfplots.smithchart.code.tex 2014-08-07 00:47:59.000000000 +0200
+++ new/tex/generic/pgfplots/libs/tikzlibrarypgfplots.smithchart.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -598,6 +598,9 @@
}
\let\pgfplotspoint@initialisation@units@orig=\pgfplotspoint@initialisation@units
\def\pgfplotspoint@initialisation@units@smithchart{%
+ \ifpgfplots@smithchart@mirrored
+ \pgfplots@warning{The key 'smithchart mirrored' is based on a mistake of the author. It does NOT resemble Admittance Smith charts!}%
+ \fi
\pgfplotspoint@initialisation@units@orig
\def\pgfplotspointunity{%
\pgfplotspointouternormalvectorofaxisgetv{0v0}% x=0 (outer circle) and v varies (the yticks)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/numtable/pgfplotstable.code.tex new/tex/generic/pgfplots/numtable/pgfplotstable.code.tex
--- old/tex/generic/pgfplots/numtable/pgfplotstable.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/numtable/pgfplotstable.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -407,7 +407,7 @@
}%
},%
/pgfplots/table/verb string type/.style={%
- /pgfplots/table/text special chars={\#,\|},% FIXME: too limited ...
+ /pgfplots/table/text special chars={\#,\|,\_},% FIXME: too limited ...
/pgfplots/table/assign cell content/.code={%
\def\pgfplotstable@loc@TMPa{##1}%
% hm... this here might be more robust instead of the line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex new/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex
--- old/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/numtable/pgfplotstableshared.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -62,6 +62,7 @@
\newif\ifpgfplots@tableread@to@listener
\newif\ifpgfplots@tableread@use@begingroup
\newif\ifpgfplotstable@trimcells
+\newif\ifpgfplotstable@percent@is@letter
\newif\ifpgfplotstable@search@path@implicit@CWD
\pgfkeys{%
@@ -146,6 +147,7 @@
/pgfplots/table/ignore chars/.initial=,
/pgfplots/table/white space chars/.initial=,
/pgfplots/table/text special chars/.initial=,
+ /pgfplots/table/percent is letter/.is if=pgfplotstable@percent@is@letter,
/pgfplots/table/comment chars/.initial=,
/pgfplots/table/skip first n/.initial=0,
/pgfplots/table/trim cells/.is if=pgfplotstable@trimcells,
@@ -156,6 +158,7 @@
/pgfplots/table/read completely/auto/.code=\pgfplots@addplotimpl@readcompletelyfalse\def\pgfplots@addplotimpl@readcompletely@auto{1},
/pgfplots/table/read completely/.default=true,
/pgfplots/table/read completely=auto,
+ /pgfplots/table/text indicator/.initial=,
/pgfplots/table/col sep/.is choice,
/pgfplots/table/col sep/space/.code = {\def\pgfplotstableread@COLSEP@CASE{0}},
/pgfplots/table/col sep/comma/.code = {\def\pgfplotstableread@COLSEP@CASE{1}},
@@ -651,6 +654,7 @@
\noexpand\catcode`\noexpand\ =\the\catcode`\ \noexpand\space
\noexpand\catcode`\noexpand\;=\the\catcode`\;\noexpand\space
\noexpand\catcode`\noexpand\:=\the\catcode`\:\noexpand\space
+ \noexpand\catcode`\noexpand\%=\the\catcode`\%\noexpand\space
\noexpand\catcode`\noexpand\^^I=\the\catcode`\^^I\noexpand\space
\noexpand\let\noexpand\pgfplotstablereadrestorecatcodes=\noexpand\relax
}%
@@ -664,6 +668,10 @@
\fi
}
\let\pgfplotstablereadrestorecatcodes=\relax
+
+% ATTENTION: the following catcodes are ONLY useful for <inline tables>!
+% tables read from file need catcode adaptions as well; this is done
+% elsewhere!
\def\pgfplotstablereadpreparecatcodes@{%
\if0\pgfplotstableread@ROWSEP@CASE\relax
% row sep = newline
@@ -1052,6 +1060,10 @@
\else
\pgfplotstableinstallignorechars@\pgfplotstable@loc@TMPa{12}%
\fi
+ \ifpgfplotstable@percent@is@letter
+ \def\pgfplotstable@loc@TMPa{\%}%
+ \pgfplotstableinstallignorechars@\pgfplotstable@loc@TMPa{12}%
+ \fi
\ifx\pgfplotstableuninstallignorechars\pgfutil@empty
\else
\expandafter\def\expandafter\pgfplotstableuninstallignorechars\expandafter{%
@@ -1115,6 +1127,8 @@
\pgfplotstableread@countreset\pgfplotstableread@curcol
%
\pgfplotstableread@impl@prepare@DO
+ \pgfplotstableread@impl@prepare@DO@textindicator
+ %
\def\pgfplotstableread@isgnuplotformat{0}%
\global\pgfplotslistnewempty\pgfplotstable@colnames@glob
\pgfplotsscanlinelengthinitzero
@@ -1218,6 +1232,7 @@
%\pgfplots@message{EOF}%
\else
\read\r@pgfplots@reada to\pgfplotstable@LINE
+%\message{read with \the\catcode`\%: \meaning\pgfplotstable@LINE^^J}%
\ifeof\r@pgfplots@reada
\else
\pgfplotstableread@loop@processnextline
@@ -1310,7 +1325,10 @@
\fi
\ifnum\pgfplotstableread@curcol=\pgfplotstableread@numcols\relax
\else
- \pgfplotsthrow{table columns unbalanced}{input table '\pgfplotstableread@filename' has an unbalanced number of columns in row '\thepgfplotstableread@lineno' (expected '\thepgfplotstableread@numcols' cols; got '\thepgfplotstableread@curcol'). Maybe the input table is corrupted? If you need unbalanced data, consider using 'nan' in empty cells (perhaps combined with 'unbounded coords=jump')}\pgfeov%
+ \begingroup
+ \t@pgfplots@tokc=\expandafter{\pgfplotstable@LINE}%
+ \pgfplotsthrow{table columns unbalanced}{input table '\pgfplotstableread@filename' has an unbalanced number of columns in row '\thepgfplotstableread@lineno' (expected '\thepgfplotstableread@numcols' cols; got '\thepgfplotstableread@curcol'). Maybe the input table is corrupted? If you need unbalanced data, consider using 'nan' in empty cells (perhaps combined with 'unbounded coords=jump'). The offending line is \the\t@pgfplots@tokc}\pgfeov%
+ \endgroup
\fi
\ifpgfplots@tableread@to@listener
\ifpgfplotstableread@curline@contains@colnames
@@ -1437,8 +1455,10 @@
\else
\let\pgfplotstableread@impl@ITERATE@NEXT@=#1\relax
\fi
+ %
\expandafter\pgfplotstableread@impl@DO@\expandafter{#2}%
}
+
{%
\catcode`\ =10
\catcode`\;=12
@@ -1480,6 +1500,62 @@
\fi
}%
}%
+\def\pgfplotstableread@impl@prepare@DO@textindicator{%
+ %
+ \pgfkeysgetvalue{/pgfplots/table/text indicator}\pgfplots@loc@TMPa
+ \ifx\pgfplots@loc@TMPa\pgfutil@empty
+ % ok, nothing special.
+ \else
+ % protect the text indicator such that it won't be expanded:
+ \t@pgfplots@tokc=\expandafter{\pgfplots@loc@TMPa}%
+ %
+ % compile macros which handle 'text indicator':
+ \let\pgfplotstableread@impl@ITERATE@NEXT@aftertextindicator=\pgfplotstableread@impl@ITERATE@NEXT
+ \edef\pgfplotstableread@impl@ITERATE@NEXT{%
+ % check if the cell starts with a text indicator:
+ \noexpand\pgfplotstableread@impl@ITERATE@NEXT@checkindicator{\the\t@pgfplots@tokc}%
+ }%
+ \edef\pgfplots@loc@TMPb{%
+ % compile this macro which reads everything up to the next
+ % text indicator char:
+ \noexpand\def\noexpand\pgfplotstableread@impl@ITERATE@NEXT@collect@text####1\the\t@pgfplots@tokc{%
+ % append. we assume that 'tokc' has been reset before
+ % starting to collect the cell content.
+ \t@pgfplots@tokc=\noexpand\expandafter{\noexpand\the\t@pgfplots@tokc####1}%
+ \noexpand\pgfutil@ifnextchar{\the\t@pgfplots@tokc}{%
+ % ah - a doubled text indicator. gobble this one
+ % and collect the following one!
+ \noexpand\pgfplotstableread@impl@ITERATE@NEXT@collect@text@collect@one
+ }{%
+ % ok, we found the entire cell content.
+ \noexpand\pgfplotstableread@impl@ITERATE@NEXT@collect@text@finish
+ }%
+ }%
+ }%
+ \pgfplots@loc@TMPb
+ %
+ \ifcase\pgfplotstableread@COLSEP@CASE\relax
+ \let\pgfplotstableread@impl@ITERATE@NEXT@collect@text@finish=\pgfplotstableread@impl@ITERATE@NEXT@collect@text@finish@APPENDSPACE
+ \fi
+ \fi
+}
+
+\def\pgfplotstableread@impl@ITERATE@NEXT@collect@text@collect@one#1{%
+ \t@pgfplots@tokc=\expandafter{\the\t@pgfplots@tokc#1}%
+ \pgfplotstableread@impl@ITERATE@NEXT@collect@text
+}%
+\def\pgfplotstableread@impl@ITERATE@NEXT@collect@text@finish{%
+ % enclose the collected items into curly braces. This suppresses
+ % interpretation of extra chars:
+ \expandafter\pgfplotstableread@impl@ITERATE@NEXT@aftertextindicator\expandafter{\expandafter{\the\t@pgfplots@tokc}}%
+}%
+\def\pgfplotstableread@impl@ITERATE@NEXT@collect@text@finish@APPENDSPACE{%
+ % enclose the collected items into curly braces. This suppresses
+ % interpretation of extra chars:
+ \expandafter\pgfplotstableread@impl@ITERATE@NEXT@aftertextindicator\expandafter{\expandafter{\the\t@pgfplots@tokc}} %
+}%
+
+
\long\def\pgfplotstableread@impl@ITERATE{%
\pgfutil@ifnextchar\pgfplotstable@EOI{%
\pgfplotstableread@impl@gobble
@@ -1487,6 +1563,24 @@
\pgfplotstableread@impl@ITERATE@NEXT
}%
}%
+
+\def\pgfplotstableread@impl@ITERATE@NEXT@checkindicator#1{%
+ \pgfutil@ifnextchar{#1}{%
+ % Ah! Our cell starts with a text indicator! Assume it is
+ % enclosed by text indicators.
+ \pgfplotstableread@impl@ITERATE@NEXT@checkindicator@gobble@one%
+ }{%
+ % ok, Cell does not start with a text indicator. collect
+ % as-is, assuming that a text indicator does not simply occur
+ % within a cell which is not enclosed by text indicators:
+ \pgfplotstableread@impl@ITERATE@NEXT@aftertextindicator
+ }%
+}%
+\def\pgfplotstableread@impl@ITERATE@NEXT@checkindicator@gobble@one#1{%
+ \t@pgfplots@tokc={}%
+ \pgfplotstableread@impl@ITERATE@NEXT@collect@text%
+}%
+
\long\def\pgfplotstableread@impl@ITERATE@NEXT#1 {%
\pgfplotstableread@impl@ITERATE@NEXT@{#1}%
\pgfplotstableread@impl@ITERATE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_loader.code.tex new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_loader.code.tex
--- old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_loader.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_loader.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -113,8 +113,23 @@
}%
\fi
+\pgfutil@IfUndefined{pgfmathifexpression}{%
+ \def\pgfmathifexpression#1#2#3{%
+ \pgfmathparse{#1}%
+ \pgfmath@iftrue{#2}{#3}%
+ }
+ \def\pgfmath@iftrue{%
+ \ifdim\pgfmathresult pt=1.0pt %
+ \let\pgfmath@next=\pgfutil@firstoftwo
+ \else
+ \let\pgfmath@next=\pgfutil@secondoftwo
+ \fi
+ \pgfmath@next
+ }%
+ \gdef\pgfplots@glob@TMPa{1}%
+}{}%
-\pgfutil@ifundefined{pgfmathfloat@stack@push@operand@single@str}{
+\pgfutil@ifundefined{pgfmathfloat@iftrue@}{
\gdef\pgfplots@glob@TMPa{1}%
}
{}%
@@ -358,4 +373,8 @@
\input pgfplotsoldpgfsupp_leq.code.tex
}{}%
+\pgfutil@IfUndefined{pgfutilifstartswith}{%
+ \let\pgfutilifstartswith=\pgfplotsutilifstartswith
+}{}
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex
--- old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex 2017-06-06 01:09:50.000000000 +0200
+++ new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -87,26 +87,6 @@
\let\pgfutil@insertatbegincurrentpagefrombox=\pgfutil@insertatbegincurrentpagefrombox@FIXED
\fi
-% check if \endtikzpicture deals with layerlist:
-\expandafter\pgfutil@in@\expandafter\pgf@remember@layerlist@globally\expandafter{\endtikzpicture}%
-\ifpgfutil@in@
-\else
- \def\endtikzpicture{%
- \tikz@atend@picture%
- \global\let\pgf@shift@baseline@smuggle=\pgf@baseline%
- \global\let\pgf@trimleft@final@smuggle=\pgf@trimleft%
- \global\let\pgf@trimright@final@smuggle=\pgf@trimright%
- \global\let\pgf@remember@smuggle=\ifpgfrememberpicturepositiononpage%
- \pgf@remember@layerlist@globally
- \endscope%
- \let\pgf@baseline=\pgf@shift@baseline@smuggle%
- \let\pgf@trimleft=\pgf@trimleft@final@smuggle%
- \let\pgf@trimright=\pgf@trimright@final@smuggle%
- \let\ifpgfrememberpicturepositiononpage=\pgf@remember@smuggle%
- \pgf@restore@layerlist@from@global
- \endpgfpicture}
-\fi
-
% ======================================================
% compatibility with PGF 2.0
% ======================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex
--- old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -19,7 +19,7 @@
% with the deployment of this patch or partial content of PGF. Note that the author and/or maintainer of pgfplots has no obligation to fix anything:
% This file comes without any warranty as the rest of pgfplots; there is no obligation for help.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Date of this copy: Fr 10. Nov 17:18:26 CET 2017 %%%
+%%% Date of this copy: Mo 30. Apr 17:24:35 CEST 2018 %%%
@@ -95,9 +95,18 @@
% process. If 'scale results' is active, 'fixed' is assumed
% automatically.
fpu/output format/.is choice,
- fpu/output format/float/.code= {\let\pgfmathfloatparse@output=\relax},
- fpu/output format/sci/.code= {\def\pgfmathfloatparse@output{\pgfmathfloattosci@{\pgfmathresult}}},
- fpu/output format/fixed/.code= {\def\pgfmathfloatparse@output{\pgfmathfloattofixed@{\pgfmathresult}}},
+ fpu/output format/float/.code= {%
+ \def\pgfmathfloatparse@output@choice{Y}%
+ \let\pgfmathfloatparse@output=\relax
+ },
+ fpu/output format/sci/.code= {%
+ \def\pgfmathfloatparse@output@choice{S}%
+ \def\pgfmathfloatparse@output{\pgfmathfloattosci@{\pgfmathresult}}%
+ },
+ fpu/output format/fixed/.code= {%
+ \def\pgfmathfloatparse@output@choice{F}%
+ \def\pgfmathfloatparse@output{\pgfmathfloattofixed@{\pgfmathresult}}%
+ },
fpu/output format/float,
fpu/rel thresh/.code={%
\pgfmathfloatparsenumber{#1}%
@@ -108,6 +117,8 @@
\pgfmathfloatcreate{1}{1.0}{0}\let\pgfmathfloatscale=\pgfmathresult
+\let\pgfmathfloatone=\pgfmathresult
+
% This is the replacement parser invocation.
% It does two things which are different to \pgfmathparse:
% 1. it disables any dimension dependand scalings,
@@ -285,6 +296,7 @@
\pgfmathfloat@install\pgfmathcosh@=\pgfmathfloatcosh@
\pgfmathfloat@install\pgfmathsinh@=\pgfmathfloatsinh@
\pgfmathfloat@install\pgfmathtanh@=\pgfmathfloattanh@
+ \pgfmathfloat@install\pgfmath@iftrue=\pgfmathfloat@iftrue
\expandafter\pgfmathfloat@install\csname pgfmathatan2@\endcsname=\pgfmathfloatatantwo@
\pgfmathfloat@install@unimplemented{isprime}%
\pgfmathfloat@install@unimplemented{iseven}%
@@ -302,6 +314,38 @@
\pgfmathfloat@install\pgfmathscientific=\pgfmathfloatscientific%
}
+\def\pgfmathfloat@iftrue{%
+ \if Y\pgfmathfloatparse@output@choice
+ \let\pgfmathfloat@@iftrue@v=\pgfmathfloatone
+ \let\pgfmathfloat@@iftrue@next=\pgfmathfloat@iftrue@
+ \else
+ \if S\pgfmathfloatparse@output@choice
+ \def\pgfmathfloat@@iftrue@v{1.0e0}%
+ \let\pgfmathfloat@@iftrue@next=\pgfmathfloat@iftrue@
+ \else
+ \def\pgfmath(a)next{\pgfutilifstartswith{1.0}}%
+ \expandafter\pgfmath@next\expandafter{\pgfmathresult}{%
+ \ifdim\pgfmathresult pt=1.0pt %
+ \let\pgfmathfloat@@iftrue@next=\pgfutil@firstoftwo
+ \else
+ \let\pgfmathfloat@@iftrue@next=\pgfutil@secondoftwo
+ \fi
+ }{%
+ \let\pgfmathfloat@@iftrue@next=\pgfutil@secondoftwo
+ }%
+ \fi
+ \fi
+ \pgfmathfloat@@iftrue@next
+}%
+\def\pgfmathfloat@iftrue@{%
+ \ifx\pgfmathresult\pgfmathfloat@@iftrue@v
+ \let\pgfmath@next=\pgfutil@firstoftwo
+ \else
+ \let\pgfmath@next=\pgfutil@secondoftwo
+ \fi
+ \pgfmath@next
+}%
+
\def\pgfmathfloat@parser@install{%
\pgfmathfloat@plots@checkuninstallcmd
\pgfmathfloat@plots@install%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryluamath.code.tex new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryluamath.code.tex
--- old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryluamath.code.tex 2017-06-06 01:09:50.000000000 +0200
+++ new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryluamath.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -19,7 +19,7 @@
% with the deployment of this patch or partial content of PGF. Note that the author and/or maintainer of pgfplots has no obligation to fix anything:
% This file comes without any warranty as the rest of pgfplots; there is no obligation for help.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Date of this copy: Mi 8. Feb 20:49:06 CET 2017 %%%
+%%% Date of this copy: Mo 30. Apr 17:24:35 CEST 2018 %%%
@@ -33,7 +33,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
%
-% $Id: pgflibraryluamath.code.tex,v 1.20 2015/06/05 06:23:21 cfeuersaenger Exp $
+% $Id$
%
%
% This is a library for a LUA math parser and LUA math operations.
@@ -223,12 +223,16 @@
\else
\let\pgfluamath@pgfmathparse\pgfmathparse
\let\pgfmathparse\pgfluamathparse
+ \let\pgfmath@iftrue=\pgfmathluamath@iftrue
\pgfluamathparseractivetrue
\fi}
+\let\pgfmath@iftrue@basic=\pgfmath@iftrue
+
\def\pgfluamath@makeparserinactive{%
\ifpgfluamathparseractive
\let\pgfmathparse\pgfluamath@pgfmathparse
+ \let\pgfmath@iftrue=\pgfmath@iftrue@basic
\pgfluamathparseractivefalse
\fi}
@@ -320,6 +324,7 @@
\pgfluamath@install@function\pgfmathsubtract@=\pgfluamathsubtract@%
\pgfluamath@install@function\pgfmathneg@=\pgfluamathneg@%
\pgfluamath@install@function\pgfmathmultiply@=\pgfluamathmultiply@%
+ \pgfmathfloat@install\pgfmath@iftrue=\pgfmathluamath@iftrue
\pgfluamath@install@function\pgfmathdivide@=\pgfluamathdivide@%
% \pgfluamath@install@function\pgfmathdiv@=\pgfluamathdiv@%
\pgfluamath@install@function\pgfmathfactorial@=\pgfluamathfactorial@%
@@ -400,6 +405,25 @@
\def\pgfluamathgetresult#1{%
\edef\pgfmathresult{\pgfutil(a)directlua{tex.print(-1,#1)}}}
+\def\pgfmathluamath@iftrue{%
+ \if 0\pgfluamath@outputformat@choice
+ \let\pgfmathluamath@@iftrue@v=\pgfluamathone
+ \else
+ \let\pgfmathluamath@@iftrue@v=\pgfluamathfloatone
+ \fi
+ \pgfmathluamath@iftrue@
+}%
+\def\pgfluamathone{1.0}%
+\def\pgfluamathfloatone{1Y1.0e+00]}%
+\def\pgfmathluamath@iftrue@#1#2{%
+ \ifx\pgfmathresult\pgfmathluamath@@iftrue@v
+ \def\pgfmath@next{#1}%
+ \else
+ \def\pgfmath@next{#2}%
+ \fi
+ \pgfmath@next
+}%
+
\def\pgfluamathpi@{%
\pgfluamathgetresult{pgfluamathfunctions.pi()}}
\def\pgfluamathe@{%
@@ -543,15 +567,15 @@
\def\pgfluamathparse#1{%
\pgfluamathusedTeXfallbackfalse
\pgfutil(a)directlua{pgfluamathparser.texCallParser(
- "\pgfutil@luaescapestring{#1}",
- \pgfluamath@outputformat@choice,
- \ifpgfluamathshowerrormessage true\else false\fi)%
+ "\pgfutil@luaescapestring{#1}",
+ \pgfluamath@outputformat@choice,
+ \ifpgfluamathshowerrormessage true\else false\fi)%
}%
\ifx\pgfmathresult\pgfutil@empty
- \ifpgfluamathenableTeXfallback
- \pgfluamathusedTeXfallbacktrue
- \pgfluamath@pgfmathparse{#1}%
- \fi
+ \ifpgfluamathenableTeXfallback
+ \pgfluamathusedTeXfallbacktrue
+ \pgfluamath@pgfmathparse{#1}%
+ \fi
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex
--- old/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -19,7 +19,7 @@
% with the deployment of this patch or partial content of PGF. Note that the author and/or maintainer of pgfplots has no obligation to fix anything:
% This file comes without any warranty as the rest of pgfplots; there is no obligation for help.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Date of this copy: Fr 10. Nov 17:18:26 CET 2017 %%%
+%%% Date of this copy: Mo 30. Apr 17:24:35 CEST 2018 %%%
@@ -95,7 +95,7 @@
% [FLAGS] MANTISSE EXPONENT
% meaning
% [+-]X.XXXXXXX*10^C
-% where
+% where
% X.XXXXXX is a mantissa with first number != 0, C is an integer and
% FLAGS contains the sign and some other special cases.
%
@@ -103,7 +103,7 @@
% computation is COMPLETELY STRING BASED.
% This allows numbers such at 10000000 or 5.23e-10 to be represented
% properly, although TeX-registers would produce overflow/underflow
-% errors in these cases.
+% errors in these cases.
%
% It is to be used to compute logs, because log(X*10^Y) = log(X) + log(10)*Y
%
@@ -124,7 +124,7 @@
% where
% FLAGS is a number in [0-5] where
% 0 == '0' (the number is +- 0.0),
-% 1 == '+',
+% 1 == '+',
% 2 == '-',
% 3 == 'not a number'
% 4 == '+ infinity'
@@ -419,7 +419,7 @@
% Converts a float to an integer (in integer format).
%
-% @see \pgfmathfloatint
+% @see \pgfmathfloatint
\def\pgfmathfloattoint#1{%
\pgfmathfloattofixed{#1}%
\expandafter\pgfmathfloattoint@@\pgfmathresult\relax
@@ -521,7 +521,7 @@
}
-% Overloaded method.
+% Overloaded method.
%
% This variant always uses a FIXED number behind the period and fills
% in zeros if necessary.
@@ -707,7 +707,7 @@
% \else
% \pgfmath@error{INTERNAL ERROR in fixed style - The input sequence did not terminate as expected; which indicates a wrong exponent argument provided to \string\pgfmathprintnumber@fixed@style}{}%
% \fi
- %--------------------------------------------------
+ %--------------------------------------------------
\let\pgfmathprintnumber@fixed@styleDEFAULT@impl@noperiod@NEXT=\relax
\fi
\pgfmathprintnumber@fixed@styleDEFAULT@impl@noperiod@NEXT
@@ -782,7 +782,7 @@
% Arguments:
% #1#2#3e#4\relax
-% Input:
+% Input:
% #1 the fixed point number to be displayed (maybe a macro).
% #2#3e#4: the (possibly unformatted) floating point representation
% which belongs to #1. This format is returned (only!) by
@@ -791,7 +791,7 @@
\let\pgfmathprintnumber@fixed@style=\pgfmathprintnumber@fixed@styleDEFAULT
-% Rounds a normalized floating point number to \pgfmathfloat@round@precision
+% Rounds a normalized floating point number to \pgfmathfloat@round@precision
% digits precision and writes the result to \pgfmathresult.
%
% This method uses \pgfmathroundto for the mantissa.
@@ -836,7 +836,7 @@
% #2: mantissa
% #3: exponent
% #4: CODE to display if the mantissa is drawn.
-% This code will be shown just before the exponent.
+% This code will be shown just before the exponent.
% Example: #4=\cdot
% #5: CODE to display if the mantissa is NOT draw. (unused currently)
% Might be used to display '10^1' instead of '1*10^1'.
@@ -1160,7 +1160,7 @@
\if0\pgfmathprintnumber@RELATIVE@choice@roundtofixed
% relative round mode=mantissa
\def\b@round@fixed{0}%
- \else
+ \else
\if1\pgfmathprintnumber@RELATIVE@choice@roundtofixed
% relative round mode=fixed
\def\b@round@fixed{1}%
@@ -1196,7 +1196,7 @@
\fi
\edef\pgfmathresultX{%
\the\pgfmathfloat@a@S
- \the\pgfmathfloat@a@Mtok
+ \the\pgfmathfloat@a@Mtok
\ifpgfmathfloatroundhasperiod\else.0\fi
e\the\pgfmathfloat@a@E}%
% call another formatter for the result (but avoid rounding inside of it):
@@ -1235,7 +1235,7 @@
\fi
\edef\pgfmathresultX{%
\the\pgfmathfloat@a@S
- \the\pgfmathfloat@a@Mtok
+ \the\pgfmathfloat@a@Mtok
\ifpgfmathfloatroundhasperiod\else.0\fi
e\the\pgfmathfloat@a@E}%
\let\pgfmathfloat@round@precision@orig=\pgfmathfloat@round@precision
@@ -1705,7 +1705,7 @@
\pgfkeys{/pgf/number format/std}
%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+%
% IMPL
%
%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1747,7 +1747,7 @@
% \pgfmathroundto implementation in WORDS:
%
-% coarse idea:
+% coarse idea:
% 1. collect all digits/sign BEFORE the first period in REVERSE order
% 2. then, collect UP TO \prec digits after the period in REVERSE order
% Steps 1. and 2. lead to the digit [sign] sequence
@@ -1781,7 +1781,7 @@
% fi
% ++q
% if q=0
-% discard the period
+% discard the period
% fi
% end while
% if q = r+1
@@ -1991,7 +1991,7 @@
\fi
}
-% PRECONDITION:
+% PRECONDITION:
% \c@pgfmathroundto@lastzeros > 0
\def\pgfmathroundto@impl@discard@suffix@zeros@ITERATE#1{%
\advance\c@pgfmathroundto@lastzeros by-1
@@ -2183,7 +2183,7 @@
% \pgfmathfloattofixed@impl@collectmantissa#2\count\pgfmathfloat@a@E
% \edef\pgfmathresult{\the\pgfmathfloat@a@Mtok}%
% \fi
- %--------------------------------------------------
+ %--------------------------------------------------
\pgfmathfloat@a@Mtok{#1}%
\pgfmathfloattofixed@impl@pos#2000000000\pgfmathfloat@EOI
\edef\pgfmathresult{\the\pgfmathfloat@a@Mtok}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplots.code.tex new/tex/generic/pgfplots/pgfplots.code.tex
--- old/tex/generic/pgfplots/pgfplots.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/pgfplots.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -3187,59 +3187,14 @@
/pgfplots/scatter/true*,%
/pgfplots/set point meta if empty=f(x),%
scatter/@post marker code/.append code={%
- % determine default alignment:
- \pgfkeysgetvalue{/pgfplots/nodes near coords align}{\pgfplots@nodes@near@coords@align}%
- \edef\pgfplots@nodes@near@coords@align{\pgfplots@nodes@near@coords@align}%
- \def\pgfplots@loc@TMPa{auto}%
- \ifx\pgfplots@nodes@near@coords@align\pgfplots@loc@TMPa
- \def\pgfplots@loc@TMPa{x}%
- \ifx\pgfplotspointmetainputhandler\pgfplots@loc@TMPa%
- % point meta=x:
- \def\pgfplots@nodes@near@coords@align{horizontal}%
- \else
- \def\pgfplots@nodes@near@coords@align{vertical}%
- \fi
- \fi
- % check for sign-dependand alignment options:
- \def\pgfplots@loc@TMPa{horizontal}%
- \ifx\pgfplots@nodes@near@coords@align\pgfplots@loc@TMPa
- \if1\csname pgfpmeta@\pgfplotspointmetainputhandler @issymbolic\endcsname%
- \def\pgfplots@nodes@near@coords@align{above}%
- \else
- \pgfplotscoordmath{meta}{if is}{\pgfplotspointmeta}{-}{%
- % \pgfplotspointmeta < 0
- \def\pgfplots@nodes@near@coords@align{left}%
- }{%
- % \pgfplotspointmeta >= 0
- \def\pgfplots@nodes@near@coords@align{right}%
- }%
- \fi
- \else
- \def\pgfplots@loc@TMPa{vertical}%
- \ifx\pgfplots@nodes@near@coords@align\pgfplots@loc@TMPa
- \if1\csname pgfpmeta@\pgfplotspointmetainputhandler @issymbolic\endcsname%
- \def\pgfplots@nodes@near@coords@align{above}%
- \else
- \pgfplotscoordmath{meta}{if is}{\pgfplotspointmeta}{-}{%
- % \pgfplotspointmeta < 0
- \def\pgfplots@nodes@near@coords@align{below}%
- }{%
- % \pgfplotspointmeta >= 0
- \def\pgfplots@nodes@near@coords@align{above}%
- }%
- \fi
- \else
- \pgfutil@ifundefined{pgfplots@nodesnearcoordsalign@isanchor@\pgfplots@nodes@near@coords@align}
- {}%
- {%
- \t@pgfplots@toka=\expandafter{\pgfplots@nodes@near@coords@align}%
- \edef\pgfplots@nodes@near@coords@align{anchor=\the\t@pgfplots@toka}%
- }%
- \fi
- \fi
% ok, place the node.
- \expandafter\node\expandafter[\pgfplots@nodes@near@coords@align,%
- /pgfplots/every node near coord]
+ \t@pgfplots@tokb=\expandafter{\pgfplots@current@point@coordinatestyle}% see 'coordinate style'%
+ \edef\pgfplots@loc@TMPa{%
+ /pgfplots/nodes near coords/@@eval alignment,%
+ \the\t@pgfplots@tokb,%
+ /pgfplots/every node near coord%
+ }%
+ \expandafter\node\expandafter[\pgfplots@loc@TMPa]%
{%
\if1\csname pgfpmeta@\pgfplotspointmetainputhandler @issymbolic\endcsname%
% point meta=explicit symbolic
@@ -3359,7 +3314,7 @@
/pgfplots/scatter/@pre marker code/.append code={%
\edef\pgfplots@loc@TMPa{\noexpand\pgfutil@definecolor{mapped color}{#1}{\pgfplotspointmeta}}%
\pgfplots@loc@TMPa
- \scope[#2]%
+ \pgfplots@scope@with@coord@styles[#2]%
},%
/pgfplots/scatter/@post marker code/.prefix code={%
\endscope
@@ -3381,6 +3336,31 @@
/pgfplots/scatter cmyk*/.style={/pgfplots/scatter explicit color*={cmyk}{#1}},
/pgfplots/scatter cmyk*/.default={draw=mapped color!80!black,fill=mapped color},
%
+ %
+ % allows to specify something like
+ % coordinate style/.condition={x==4}{color=red},
+ % coordinate style/.condition={x > 5}{color=black, mark=*},
+ % it is only evaluated in specific plot handlers.
+ % Each conditionession is added to the available list.
+ /pgfplots/coordinate style/.condition/.code 2 args={%
+ \pgfplotsapplistXpushback{E}{#1}{#2},\to\pgfplots@coordinate@style@list
+ \def\b@has@pgfplots@colordinate@style{1}%
+ },
+ % example:
+ % coordinate style/.from={\thisrow{row with styles}},
+ /pgfplots/coordinate style/.from/.code={%
+ \pgfplotsapplistXpushback{V}{#1}{},\to\pgfplots@coordinate@style@list
+ \def\b@has@pgfplots@colordinate@style{1}%
+ },
+ % clears all such styles.
+ /pgfplots/coordinate style/.clear/.code={%
+ \pgfplotsapplistXnewempty{\pgfplots@coordinate@style@list}%
+ \def\b@has@pgfplots@colordinate@style{0}%
+ },
+ /pgfplots/coordinate style/.clear,%
+ %
+ %
+ %
/pgfplots/visualization depends on/list/.initial=,%
/pgfplots/visualization depends on/.style={%
/pgfplots/visualization depends on/list/.add={}{,{#1}}%
@@ -4110,7 +4090,7 @@
/pgfplots/const color of colormap/.code={%
\pgfplots@color@of@colormap{const color of colormap={#1}}%
},%
- /tikz/color of colormap/.style={/pgfplots/color of colormap={#1}},
+ /tikz/const color of colormap/.style={/pgfplots/const color of colormap={#1}},
% index of colormap={4}
% index of colormap={4 of viridis}
/pgfplots/index of colormap/.code={%
@@ -4174,7 +4154,7 @@
/pgfplots/scatter/use mapped color*/.style={
/pgfplots/scatter/@pre marker code/.append code={
\pgfplotscolormapdefinemappedcolor\pgfplotspointmetatransformed
- \scope[#1]%
+ \pgfplots@scope@with@coord@styles[#1]%
},
/pgfplots/scatter/@post marker code/.prefix code={\endscope}
},
@@ -4337,6 +4317,7 @@
/pgfplots/compat/anchors/1.14/.style= {/pgfplots/compat/anchors/1.13},%
/pgfplots/compat/anchors/1.15/.style= {/pgfplots/compat/anchors/1.13},%
/pgfplots/compat/anchors/1.16/.style= {/pgfplots/compat/anchors/1.13},%
+ /pgfplots/compat/anchors/1.17/.style= {/pgfplots/compat/anchors/1.13},%
/pgfplots/compat/anchors/default/.style={/pgfplots/compat/anchors/1.3},%
%
/pgfplots/compat/empty line/.is choice,
@@ -4356,6 +4337,7 @@
/pgfplots/compat/empty line/1.14/.style= {/pgfplots/compat/empty line/1.4},%
/pgfplots/compat/empty line/1.15/.style= {/pgfplots/compat/empty line/1.4},%
/pgfplots/compat/empty line/1.16/.style= {/pgfplots/compat/empty line/1.4},%
+ /pgfplots/compat/empty line/1.17/.style= {/pgfplots/compat/empty line/1.4},%
/pgfplots/compat/empty line/default/.style= {/pgfplots/compat/empty line/1.4},%
%
/pgfplots/compat/path replacement/.is choice,
@@ -4375,6 +4357,7 @@
/pgfplots/compat/path replacement/1.14/.style= {/pgfplots/compat/path replacement/1.5.1},
/pgfplots/compat/path replacement/1.15/.style= {/pgfplots/compat/path replacement/1.5.1},
/pgfplots/compat/path replacement/1.16/.style= {/pgfplots/compat/path replacement/1.5.1},
+ /pgfplots/compat/path replacement/1.17/.style= {/pgfplots/compat/path replacement/1.5.1},
/pgfplots/compat/path replacement/default/.style= {/pgfplots/compat/path replacement/pre 1.3},%
%
/pgfplots/compat/pgfpoint substitution/.is choice,
@@ -4394,6 +4377,7 @@
/pgfplots/compat/pgfpoint substitution/1.14/.style= {/pgfplots/compat/pgfpoint substitution/1.11},
/pgfplots/compat/pgfpoint substitution/1.15/.style= {/pgfplots/compat/pgfpoint substitution/1.11},
/pgfplots/compat/pgfpoint substitution/1.16/.style= {/pgfplots/compat/pgfpoint substitution/1.11},
+ /pgfplots/compat/pgfpoint substitution/1.17/.style= {/pgfplots/compat/pgfpoint substitution/1.11},
/pgfplots/compat/pgfpoint substitution/default/.style= {/pgfplots/compat/pgfpoint substitution/pre 1.3},%
%ellipse/.is if=pgfplots@path@replace@ellipse,
%
@@ -4423,6 +4407,7 @@
/pgfplots/compat/labels/1.14/.style= {/pgfplots/compat/labels/1.8},%
/pgfplots/compat/labels/1.15/.style= {/pgfplots/compat/labels/1.8},%
/pgfplots/compat/labels/1.16/.style= {/pgfplots/compat/labels/1.8},%
+ /pgfplots/compat/labels/1.17/.style= {/pgfplots/compat/labels/1.8},%
/pgfplots/compat/labels/default/.style= {/pgfplots/compat/labels/pre 1.3},% maintain backwards compatibility
%
/pgfplots/compat/bar nodes/.is choice,
@@ -4477,6 +4462,7 @@
/pgfplots/compat/bar nodes/1.14/.style= {/pgfplots/compat/bar nodes/1.13},%
/pgfplots/compat/bar nodes/1.15/.style= {/pgfplots/compat/bar nodes/1.13},%
/pgfplots/compat/bar nodes/1.16/.style= {/pgfplots/compat/bar nodes/1.13},%
+ /pgfplots/compat/bar nodes/1.17/.style= {/pgfplots/compat/bar nodes/1.13},%
/pgfplots/compat/bar nodes/default/.style= {/pgfplots/compat/bar nodes/pre 1.3},% maintain backwards compatibility
/pgfplots/compat/bar nodes/default,
%
@@ -4511,6 +4497,7 @@
/pgfplots/compat/scaling/1.14/.style={/pgfplots/compat/scaling/1.6},
/pgfplots/compat/scaling/1.15/.style={/pgfplots/compat/scaling/1.6},
/pgfplots/compat/scaling/1.16/.style={/pgfplots/compat/scaling/1.6},
+ /pgfplots/compat/scaling/1.17/.style={/pgfplots/compat/scaling/1.6},
/pgfplots/compat/scaling/default/.style={/pgfplots/compat/scaling/1.4},
%
/pgfplots/compat/scale mode/.is choice,
@@ -4530,6 +4517,7 @@
/pgfplots/compat/scale mode/1.14/.style={/pgfplots/compat/scale mode/1.6},
/pgfplots/compat/scale mode/1.15/.style={/pgfplots/compat/scale mode/1.6},
/pgfplots/compat/scale mode/1.16/.style={/pgfplots/compat/scale mode/1.6},
+ /pgfplots/compat/scale mode/1.17/.style={/pgfplots/compat/scale mode/1.6},
/pgfplots/compat/scale mode/default/.style={/pgfplots/compat/scale mode/1.5},
%
%
@@ -4550,6 +4538,7 @@
/pgfplots/compat/plot3graphics/1.14/.style= {/pgfplots/compat/plot3graphics/1.6},%
/pgfplots/compat/plot3graphics/1.15/.style= {/pgfplots/compat/plot3graphics/1.6},%
/pgfplots/compat/plot3graphics/1.16/.style= {/pgfplots/compat/plot3graphics/1.6},%
+ /pgfplots/compat/plot3graphics/1.17/.style= {/pgfplots/compat/plot3graphics/1.6},%
/pgfplots/compat/plot3graphics/default/.style= {/pgfplots/compat/plot3graphics/1.5},%
%
% ATTENTION: there is a compatibility issue which slipped through
@@ -4596,6 +4585,7 @@
/pgfplots/compat/bar width by units/1.14/.style= {/pgfplots/compat/bar width by units/1.7},
/pgfplots/compat/bar width by units/1.15/.style= {/pgfplots/compat/bar width by units/1.7},
/pgfplots/compat/bar width by units/1.16/.style= {/pgfplots/compat/bar width by units/1.7},
+ /pgfplots/compat/bar width by units/1.17/.style= {/pgfplots/compat/bar width by units/1.7},
/pgfplots/compat/bar width by units/default/.style={/pgfplots/compat/bar width by units/pre 1.3},
%
/pgfplots/compat/BB/.is choice,
@@ -4615,6 +4605,7 @@
/pgfplots/compat/BB/1.14/.style= {/pgfplots/compat/BB/1.8},%
/pgfplots/compat/BB/1.15/.style= {/pgfplots/compat/BB/1.8},%
/pgfplots/compat/BB/1.16/.style= {/pgfplots/compat/BB/1.8},%
+ /pgfplots/compat/BB/1.17/.style= {/pgfplots/compat/BB/1.8},%
/pgfplots/compat/BB/default/.style={/pgfplots/compat/BB/pre 1.3},
%
/pgfplots/compat/general/.is choice,
@@ -4630,6 +4621,7 @@
/pgfplots/colorbar=false,
/pgfplots/3d log sampling=false,
/pgfplots/clip limits compat=true,
+ /pgfplots/table/percent is letter=false,
},%
/pgfplots/compat/general/1.3/.style= {/pgfplots/compat/general/pre 1.3},
/pgfplots/compat/general/1.4/.style= {/pgfplots/compat/general/pre 1.3},%
@@ -4674,6 +4666,10 @@
/pgfplots/clip limits compat=false,
},%
/pgfplots/compat/general/1.16/.style= {/pgfplots/compat/general/1.15},%
+ /pgfplots/compat/general/1.17/.style= {
+ /pgfplots/compat/general/1.15,
+ %/pgfplots/table/percent is letter=true,
+ },%
/pgfplots/compat/general/default/.style={/pgfplots/compat/general/1.11},
%
/pgfplots/enable tick line clipping/.is if=pgfplots@enable@tick@line@clipping,
@@ -4691,7 +4687,7 @@
/pgfplots/compat/show suggested version/.is if=pgfplots@show@suggested@version,
/pgfplots/compat/show suggested version=true,
/pgfplots/compat/current/.initial=,
- /pgfplots/compat/mostrecent/.initial=1.16,
+ /pgfplots/compat/mostrecent/.initial=1.17,
/utils/exec={%
\pgfplotsutilforeachcommasep{%
/pgfplots/compat/current,%
@@ -4838,6 +4834,60 @@
\def\pgfplots@tickwidth{\pgfkeysvalueof{/pgfplots/major tick length}}%
\def\pgfplots@subtickwidth{\pgfkeysvalueof{/pgfplots/minor tick length}}%
+\pgfkeysdef{/pgfplots/nodes near coords/@@eval alignment}{%
+ % determine default alignment:
+ \pgfkeysgetvalue{/pgfplots/nodes near coords align}{\pgfplots@nodes@near@coords@align}%
+ \edef\pgfplots@nodes@near@coords@align{\pgfplots@nodes@near@coords@align}%
+ \def\pgfplots@loc@TMPa{auto}%
+ \ifx\pgfplots@nodes@near@coords@align\pgfplots@loc@TMPa
+ \def\pgfplots@loc@TMPa{x}%
+ \ifx\pgfplotspointmetainputhandler\pgfplots@loc@TMPa%
+ % point meta=x:
+ \def\pgfplots@nodes@near@coords@align{horizontal}%
+ \else
+ \def\pgfplots@nodes@near@coords@align{vertical}%
+ \fi
+ \fi
+ % check for sign-dependand alignment options:
+ \def\pgfplots@loc@TMPa{horizontal}%
+ \ifx\pgfplots@nodes@near@coords@align\pgfplots@loc@TMPa
+ \if1\csname pgfpmeta@\pgfplotspointmetainputhandler @issymbolic\endcsname%
+ \def\pgfplots@nodes@near@coords@align{above}%
+ \else
+ \pgfplotscoordmath{meta}{if is}{\pgfplotspointmeta}{-}{%
+ % \pgfplotspointmeta < 0
+ \def\pgfplots@nodes@near@coords@align{left}%
+ }{%
+ % \pgfplotspointmeta >= 0
+ \def\pgfplots@nodes@near@coords@align{right}%
+ }%
+ \fi
+ \else
+ \def\pgfplots@loc@TMPa{vertical}%
+ \ifx\pgfplots@nodes@near@coords@align\pgfplots@loc@TMPa
+ \if1\csname pgfpmeta@\pgfplotspointmetainputhandler @issymbolic\endcsname%
+ \def\pgfplots@nodes@near@coords@align{above}%
+ \else
+ \pgfplotscoordmath{meta}{if is}{\pgfplotspointmeta}{-}{%
+ % \pgfplotspointmeta < 0
+ \def\pgfplots@nodes@near@coords@align{below}%
+ }{%
+ % \pgfplotspointmeta >= 0
+ \def\pgfplots@nodes@near@coords@align{above}%
+ }%
+ \fi
+ \else
+ \pgfutil@ifundefined{pgfplots@nodesnearcoordsalign@isanchor@\pgfplots@nodes@near@coords@align}
+ {}%
+ {%
+ \t@pgfplots@toka=\expandafter{\pgfplots@nodes@near@coords@align}%
+ \edef\pgfplots@nodes@near@coords@align{anchor=\the\t@pgfplots@toka}%
+ }%
+ \fi
+ \fi
+ \expandafter\pgfkeysalso\expandafter{\pgfplots@nodes@near@coords@align}%
+}%
+
\begingroup
\pgfkeys{/pgfplots/colorbar pgfshading}
\pgfkeysgetvalue{/pgfplots/colorbar/draw/.@cmd}\pgfplots@loc@TMPa
@@ -4887,6 +4937,18 @@
\pgfplots@cmdkey@alias ztick style=z tick style;
+\def\pgfplots@scope@with@coord@styles[#1]{%
+ \if1\b@has@pgfplots@colordinate@style
+ \def\pgfplots@loc@TMPa{\scope[#1}%
+ \t@pgfplots@toka=\expandafter{\pgfplots@loc@TMPa}%
+ \t@pgfplots@tokb=\expandafter{\pgfplots@current@point@coordinatestyle}%
+ \edef\pgfplots@loc@TMPa{\the\t@pgfplots@toka,\the\t@pgfplots@tokb]}%
+ \else
+ \def\pgfplots@loc@TMPa{\scope[#1]}%
+ \fi
+ \pgfplots@loc@TMPa
+}%
+
% A backwards compatibility method which works as follows:
% if any user specified arguments exist for the 'domain' or 'samples
% at' or 'samples' keys, nothing is done.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplots.markers.code.tex new/tex/generic/pgfplots/pgfplots.markers.code.tex
--- old/tex/generic/pgfplots/pgfplots.markers.code.tex 2017-06-06 01:09:50.000000000 +0200
+++ new/tex/generic/pgfplots/pgfplots.markers.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -323,7 +323,7 @@
}{%
\expandafter\let\expandafter\pgfplots@loc@TMPa\csname pgfp@scatter@class@\pgfplotspointmeta\endcsname
}%
- \expandafter\scope\expandafter[\pgfplots@loc@TMPa]%
+ \expandafter\pgfplots@scope@with@coord@styles\expandafter[\pgfplots@loc@TMPa]%
}%
% validates 'mark layer' such that it can be queried afterwards.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplots.paths.code.tex new/tex/generic/pgfplots/pgfplots.paths.code.tex
--- old/tex/generic/pgfplots/pgfplots.paths.code.tex 2011-12-30 23:58:39.000000000 +0100
+++ new/tex/generic/pgfplots/pgfplots.paths.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -30,17 +30,39 @@
\def\pgfplots@install@path@replacements{%
\ifpgfplots@path@replace@ellipse
\let\tikz@do@circle=\pgfplots@path@@tikz@do@circle
+ \let\tikz@do@ellipse=\pgfplots@path@@tikz@do@ellipse
\expandafter\def\expandafter\pgfinterruptpicture\expandafter{\pgfinterruptpicture
\let\tikz@do@circle=\pgfplots@path@@tikz@do@circle@orig
+ \let\tikz@do@ellipse=\pgfplots@path@@tikz@do@ellipse@orig
}%
\fi
}%
\let\pgfplots@path@@tikz@do@circle@orig=\tikz@do@circle
+\let\pgfplots@path@@tikz@do@ellipse@orig=\tikz@do@ellipse
% This is a replacement for \tikz@do@circle which replaces the "xy"
% coordinate system by one which is compatible with pgfplots.
-\def\pgfplots@path@@tikz@do@circle#1#2{%
+\def\pgfplots@path@@tikz@do@circle#1{%
+ \begingroup
+ \ifpgfplots@usefpu
+ \pgfkeys{/pgf/fpu,/pgf/fpu/output format=fixed}%
+ \fi
+ \pgfmathparse{#1}%
+ \let\tikz@ellipse@x=\pgfmathresult%
+ \ifpgfmathunitsdeclared
+ \pgfpathellipse{\pgfpointorigin}%
+ {\pgfqpoint{\tikz@ellipse@x pt}{0pt}}%
+ {\pgfpoint{0pt}{\tikz@ellipse@x pt}}%
+ \else
+ \pgfpathellipse{\pgfpointorigin}%
+ {\pgfplotspointaxisdirectionxy{\tikz@ellipse@x}{0}}%
+ {\pgfplotspointaxisdirectionxy{0}{\tikz@ellipse@x}}%
+ \fi
+ \endgroup
+}
+
+\def\pgfplots@path@@tikz@do@ellipse#1#2{%
\begingroup
\ifpgfplots@usefpu
\pgfkeys{/pgf/fpu,/pgf/fpu/output format=fixed}%
@@ -69,3 +91,12 @@
\fi%
\endgroup
}
+
+% Older versions of TikZ did not define \tikz@do@ellipse but only
+% \tikz@do@circle which took the place of \tikz@do@ellipse, i.e. the same code
+% was used for both paths. In that case, we override the new circle code with
+% the ellipse code to retain the behaviour of using the same code on both
+% paths.
+\ifdefined\tikz@do@ellipse\else
+ \let\pgfplots@path@@tikz@do@circle=\pgfplots@path@@tikz@do@ellipse
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplots.revision.tex new/tex/generic/pgfplots/pgfplots.revision.tex
--- old/tex/generic/pgfplots/pgfplots.revision.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/pgfplots.revision.tex 2020-03-03 23:58:29.000000000 +0100
@@ -5,10 +5,10 @@
\catcode`\:=12
\catcode`\+=12
\catcode`\-=12
-\gdef\pgfplotsrevision{1.16}
-\gdef\pgfplotsversion{1.16}
-\gdef\pgfplotsversiondatetime{2018-03-28 20:42:04 +0200}
-\gdef\pgfplotsrevisiondatetime{2018-03-28 20:42:04 +0200}
+\gdef\pgfplotsrevision{1.17}
+\gdef\pgfplotsversion{1.17}
+\gdef\pgfplotsversiondatetime{2020-02-29 09:43:25 +0100}
+\gdef\pgfplotsrevisiondatetime{2020-02-29 09:43:25 +0100}
\gdef\pgfplots@glob@TMPa#1-#2-#3 #4\relax{#1/#2/#3}
\xdef\pgfplotsversiondate{\expandafter\pgfplots@glob@TMPa\pgfplotsversiondatetime\relax}
\xdef\pgfplotsrevisiondate{\expandafter\pgfplots@glob@TMPa\pgfplotsrevisiondatetime\relax}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex new/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex
--- old/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -2844,6 +2844,7 @@
\let\pgfplots@current@point@y=\pgfutil@empty
\let\pgfplots@current@point@z=\pgfutil@empty
\let\pgfplots@current@point@meta=\pgfutil@empty
+ \let\pgfplots@current@point@coordinatestyle=\pgfutil@empty
\let\pgfplots@current@point@error@x@plus=\pgfutil@empty
\let\pgfplots@current@point@error@x@minus=\pgfutil@empty
\let\pgfplots@current@point@error@y@plus=\pgfutil@empty
@@ -3286,6 +3287,10 @@
\E\pgfplots@errorbars@survey@point
\fi
%
+ \if1\b@has@pgfplots@colordinate@style
+ \E\pgfplots@get@matching@coordinate@styles@surveyphase
+ \fi
+ %
\ifpgfplots@collect@firstplot@astick
\ifnum\pgfplots@numplots=0
\E\ifx\E\pgfplots@firstplot@coords@x\E\pgfutil@empty
@@ -3818,6 +3823,11 @@
\fi
\fi
%
+ \if1\b@has@pgfplots@colordinate@style
+ \pgfplots@LUA@survey@log@deactivation{coordinate style currently unsupported}%
+ \pgfplots@LUA@backend@supportedfalse
+ \fi
+ %
\ifpgfplots@LUA@backend@supported
\edef\pgfplots@LUA@backend@plotnum{\pgfutil@directlua{tex.sprint(\pgfplotsHASH pgfplots.gca.plothandlers)}}%
\begingroup
@@ -4179,7 +4189,12 @@
\let\protect=\pgfplots@oldprotect
\t@pgfplots@toka=\expandafter{\pgfplotsaxisserializedatapoint@val}%
\t@pgfplots@tokb=\expandafter{\pgfplotsretval}%
- \edef\pgfplotsretval{{\the\t@pgfplots@tokb;\the\t@pgfplots@toka}}%
+ \if1\b@has@pgfplots@colordinate@style
+ \t@pgfplots@tokc\expandafter{\expandafter{\pgfplots@current@point@coordinatestyle}}%
+ \else
+ \t@pgfplots@tokc={}%
+ \fi
+ \edef\pgfplotsretval{{\the\t@pgfplots@tokb;\the\t@pgfplots@tokc\the\t@pgfplots@toka}}%
}%
\def\pgfplotsaxisserializedatapoint{%
@@ -4200,7 +4215,15 @@
% parts which can be read with
% \pgfplotsaxisdeserializedatapointfrom@private)
\def\pgfplotsaxisdeserializedatapointfrom#1{%
- \expandafter\pgfplotsaxisdeserializedatapointfrom@#1\pgfplots@EOI
+ \if1\b@has@pgfplots@colordinate@style
+ \expandafter\pgfplotsaxisdeserializedatapointfrom@@#1\pgfplots@EOI
+ \else
+ \expandafter\pgfplotsaxisdeserializedatapointfrom@#1\pgfplots@EOI
+ \fi
+}%
+\def\pgfplotsaxisdeserializedatapointfrom@@#1;#2#3\pgfplots@EOI{%
+ \pgfplotsaxisdeserializedatapointfrom@{#1};{#3}\pgfplots@EOI
+ \def\pgfplots@current@point@coordinatestyle{#2}%
}%
\def\pgfplotsaxisdeserializedatapointfrom@#1;#2\pgfplots@EOI{%
\def\pgfplotsaxisdeserializedatapointfrom@private@lastvalue{#1}%
@@ -9719,3 +9742,42 @@
\pgfplots@shellescape{sh #1.sh > #1.out}
\fi%
}
+
+% Defines \pgfplots@current@point@coordinatestyle to be the list of options resulting from the evaluation of all matching 'coordinate style' expressions.
+\def\pgfplots@get@matching@coordinate@styles@surveyphase{%
+ \let\pgfplots@current@point@coordinatestyle=\pgfutil@empty
+ % ##1: operation mode
+ % ##2: key
+ % ##3: value
+ \def\pgfplots@coordinate@style@process##1##2##3{%
+ \if E##1% Ah : an expression.
+ \pgfmathifexpression{##2}{%
+ \expandafter\def\expandafter\pgfplots@current@point@coordinatestyle\expandafter{\pgfplots@current@point@coordinatestyle,%
+ ##3%
+ }%
+ }{}%
+ \else
+ \if V##1% Ah : an .from
+ \edef\pgfplots@loc@TMPc{##2}%
+ \t@pgfplots@toka=\expandafter{\pgfplots@current@point@coordinatestyle}%
+ \t@pgfplots@tokb=\expandafter{\pgfplots@loc@TMPc}%
+ \edef\pgfplots@current@point@coordinatestyle{%
+ \the\t@pgfplots@toka,%
+ \the\t@pgfplots@tokb
+ }%
+ \else
+ \pgfplots@get@matching@coordinate@styles@surveyphase@err{##1}%
+ \fi
+ \fi
+ }%
+ \pgfplotsapplistXlet\pgfplots@loc@TMPb=\pgfplots@coordinate@style@list
+ \expandafter\pgfplotsutilforeachcommasep\pgfplots@loc@TMPb\as\pgfplots@loc@TMPa{%
+ \ifx\pgfplots@loc@TMPa\pgfutil@empty
+ \else
+ \expandafter\pgfplots@coordinate@style@process\pgfplots@loc@TMPa
+ \fi
+ }%
+}%
+\def\pgfplots@get@matching@coordinate@styles@surveyphase@err#1#2#3{%
+ \pgfplots@error{Encountered unexpected internal value of 'coordinate style: #1}%
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplotsplothandlers.code.tex new/tex/generic/pgfplots/pgfplotsplothandlers.code.tex
--- old/tex/generic/pgfplots/pgfplotsplothandlers.code.tex 2017-06-06 01:09:50.000000000 +0200
+++ new/tex/generic/pgfplots/pgfplotsplothandlers.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -427,6 +427,19 @@
%
\pgfplotsplothandlers@init@map@to@patched@versions
%
+ %
+% \pgfkeys{%
+% /pgf/at begin bar/.add={}{%
+% \if1\b@has@pgfplots@colordinate@style
+% \expandafter\pgfplots@bar@extra
+% \fi
+% },%
+% }%
+ %
+}%
+
+\def\pgfplots@bar@extra#1\pgfkeysvalueof#2{%
+ \expandafter\tikz\expandafter[\pgfplots@current@point@coordinatestyle] \pgfextra{#1};%
}%
\def\pgfplots@xbar@width{pgfplotsxbarwidth}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/pgfplotsticks.code.tex new/tex/generic/pgfplots/pgfplotsticks.code.tex
--- old/tex/generic/pgfplots/pgfplotsticks.code.tex 2018-04-08 21:45:42.000000000 +0200
+++ new/tex/generic/pgfplots/pgfplotsticks.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -2532,7 +2532,10 @@
% '#3' is some macro. Its input is '\pgfmathresult', its expected output is '\pgfmathresult'
\long\def\pgfplots@transform@csv@list#1\to#2\with#3{%
\let#2=\pgfutil@empty
- \foreach \pgfplots@loc@TMPb in {#1} {%
+ \begingroup
+ \pgfkeys{/pgf/fpu,/pgf/fpu/output format=float}%
+ % \pgfplotsforeachungrouped is more powerful than \foreach
+ \pgfplotsforeachungrouped \pgfplots@loc@TMPb in {#1} {%
\let\pgfmathresult=\pgfplots@loc@TMPb
#3%
\ifx#2\pgfutil@empty
@@ -2541,6 +2544,7 @@
\xdef#2{#2,\pgfmathresult}%
\fi
}%
+ \endgroup
%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/pgfplots/util/pgfplotsutil.code.tex new/tex/generic/pgfplots/util/pgfplotsutil.code.tex
--- old/tex/generic/pgfplots/util/pgfplotsutil.code.tex 2017-06-06 01:09:50.000000000 +0200
+++ new/tex/generic/pgfplots/util/pgfplotsutil.code.tex 2020-03-03 23:58:29.000000000 +0100
@@ -673,7 +673,7 @@
\pgfmathparse{(##4-##2)/\pgfplots@h + 1}%
\pgfmathfloattofixed\pgfmathresult
\afterassignment\pgfplotsforeachtodomain@@
- \c@pgf@counta=\pgfmathresult
+ \c@pgf@counta=\pgfmathresult\relax
}%
\edef\pgfplots@loc@TMPa{\noexpand\pgfplotsforeachungrouped \noexpand\x\space in{#1}{}}%
\pgfplots@loc@TMPa
@@ -699,6 +699,9 @@
\fi
}%
+\newif\ifpgfplotsforeachungroupedassumenumeric
+\pgfplotsforeachungroupedassumenumerictrue
+
\long\def\pgfplotsforeachungrouped@@#1#2#3#4{%
\pgfplots@for@reset@break{%
%
@@ -710,8 +713,27 @@
% \foreach #1 in {a,b,...,c} can be improved:
\pgfplotsforeachungroupeduniform@{#1}#3\relax{#4}%
\else
- % invoke \foreach #1 in {#3} and transport results:
- \pgfplotsforeachungroupednonuniform@#1{#3}{#4}%
+ \ifpgfplotsforeachungroupedassumenumeric
+ \pgfplotsforeachungrouped@isuniform@dist@one{#3}%
+ \ifpgfplots@loc@tmp
+ % special handling:
+ % \foreach #1 in {a,...,n} can be improved. Let us
+ % hope it is numeric ...
+ \pgfmathifexpression{\pgfplotsretval < \pgfplotsretvalb}{%
+ \edef\pgfplots@foreach@loc@TMPa{\pgfplotsretval,\pgfplotsretval+1,...,\pgfplotsretvalb}%
+ }{%
+ \edef\pgfplots@foreach@loc@TMPa{\pgfplotsretval,\pgfplotsretval-1,...,\pgfplotsretvalb}%
+ }%
+ \def\pgfplots@foreach@loc@TMPb{\pgfplotsforeachungroupeduniform@{#1}}%
+ \expandafter\pgfplots@foreach@loc@TMPb\pgfplots@foreach@loc@TMPa\relax{#4}%
+ \else
+ % invoke \foreach #1 in {#3} and transport results:
+ \pgfplotsforeachungroupednonuniform@#1{#3}{#4}%
+ \fi
+ \else
+ % invoke \foreach #1 in {#3} and transport results:
+ \pgfplotsforeachungroupednonuniform@#1{#3}{#4}%
+ \fi
\fi
\else
% invoke \foreach #1/#2 in {#3} and transport results:
@@ -889,6 +911,34 @@
\fi
}%
+% Sets \ifpgfplots@loc@tmp to true if and only if '#1' is of the form
+% #1 = <number1>,...,<number2>
+%
+% In that case, \pgfplotsretval = <number1> and \pgfplotsretvalb = <number2>
+\def\pgfplotsforeachungrouped@isuniform@dist@one#1{%
+ \edef\pgfplots@foreach@loc@TMPa{#1}%
+ \expandafter\pgfplotsforeachungrouped@isuniform@dist@one@\pgfplots@foreach@loc@TMPa,,,\relax
+}%
+\def\pgfplotsforeachungrouped@isuniform@dist@one@#1,#2,#3,#4\relax{%
+ \def\pgfplots@foreach@loc@TMPa{#4}%
+ \def\pgfplots@foreach@loc@TMPb{,,}%
+ \pgfplots@loc@tmpfalse
+ \ifx\pgfplots@foreach@loc@TMPa\pgfplots@foreach@loc@TMPb
+ \def\pgfplots@foreach@loc@TMPa{#2}%
+ \def\pgfplots@foreach@loc@TMPb{...}%
+ \ifx\pgfplots@foreach@loc@TMPa\pgfplots@foreach@loc@TMPb
+ \pgfutil@in@,{#3}%
+ \ifpgfutil@in@
+ \else
+ \pgfplots@loc@tmptrue
+ \def\pgfplotsretval{#1}%
+ \def\pgfplotsretvalb{#3}%
+ \fi
+ \fi
+ \fi
+}%
+
+
% A variant of \pgfplotsforeachungrouped ( or \foreach ) which
% *invokes* with #1 set to the current iterate.
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfplots.tlpobj new/tlpkg/tlpobj/pgfplots.tlpobj
--- old/tlpkg/tlpobj/pgfplots.tlpobj 2019-02-28 03:59:34.000000000 +0100
+++ new/tlpkg/tlpobj/pgfplots.tlpobj 2020-03-04 23:53:19.000000000 +0100
@@ -1,6 +1,6 @@
name pgfplots
category Package
-revision 47373
+revision 54080
shortdesc Create normal/logarithmic plots in two and three dimensions
relocated 1
longdesc PGFPlots draws high-quality function plots in normal or
@@ -12,7 +12,8 @@
longdesc plots, bar plots, area plots, mesh-- and surface plots and some
longdesc more. Pgfplots is based on PGF/TikZ (PGF); it runs equally for
longdesc LaTeX/TeX/ConTeXt.
-runfiles size=901
+depend pgf
+runfiles size=905
RELOC/scripts/pgfplots/matlab2pgfplots.m
RELOC/scripts/pgfplots/matlab2pgfplots.sh
RELOC/scripts/pgfplots/pgf2pdf.sh
@@ -125,7 +126,6 @@
catalogue-contact-repository http://pgfplots.sourceforge.net/
catalogue-contact-support https://sourceforge.net/projects/pgfplots/
catalogue-ctan /graphics/pgf/contrib/pgfplots
-catalogue-date 2018-04-07 06:21:57 +0200
-catalogue-license gpl3
-catalogue-topics graphics-plot pgf-tikz
-catalogue-version 1.16
+catalogue-license gpl3+
+catalogue-topics graphics graphics-plot pgf-tikz
+catalogue-version 1.17
++++++ phonenumbers.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/phonenumbers/README new/doc/latex/phonenumbers/README
--- old/doc/latex/phonenumbers/README 2018-08-05 23:02:09.000000000 +0200
+++ new/doc/latex/phonenumbers/README 2019-08-22 22:23:49.000000000 +0200
@@ -9,8 +9,8 @@
numbers using the hyperref package.
Package author: K. Wehr
-Version: 2.1
-Date: 5th August 2018
+Version: 2.2
+Date: 18th August 2019
The phonenumbers package is subject to the LaTeX Project Public License,
version 1.3 or later.
Binary files old/doc/latex/phonenumbers/phonenumbers-de.pdf and new/doc/latex/phonenumbers/phonenumbers-de.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/phonenumbers/phonenumbers-de.tex new/doc/latex/phonenumbers/phonenumbers-de.tex
--- old/doc/latex/phonenumbers/phonenumbers-de.tex 2018-08-05 23:02:09.000000000 +0200
+++ new/doc/latex/phonenumbers/phonenumbers-de.tex 2019-08-22 22:23:49.000000000 +0200
@@ -1,11 +1,12 @@
% phonenumbers package: German manual
-% Version 2.1
-% Datum: 5. August 2018
+% Version 2.2
+% Datum: 18. August 2019
\documentclass[numbers=noenddot]{scrreprt}
\usepackage[french,ngerman]{babel}
\usepackage{fontspec}
\usepackage[link=off]{phonenumbers}
\usepackage{biblatex}
+\usepackage{csquotes}
\usepackage{array}
\usepackage{enumitem}
\usepackage{scrlayer-scrpage}
@@ -191,7 +192,7 @@
\large
\smallskip
-\url{keno.wehr(a)abgol.de}
+\url{wehr(a)abgol.de}
\end{center}
\vfill
@@ -1177,6 +1178,11 @@
\item Ergänzung der neuen nordamerikanischen Vorwahlen 326, 521, 658 und 672
\item Entfernung der nordamerikanischen Vorwahl 456
\end{itemize}
+\item[2.2] \printdate{18.8.2019}
+\begin{itemize}
+\item Ermöglichung von Makros als Befehlsargumenten
+\item leichte Veränderung der Warnmeldungen
+\end{itemize}
\end{description}
\end{document}
Binary files old/doc/latex/phonenumbers/phonenumbers-en.pdf and new/doc/latex/phonenumbers/phonenumbers-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/phonenumbers/phonenumbers-en.tex new/doc/latex/phonenumbers/phonenumbers-en.tex
--- old/doc/latex/phonenumbers/phonenumbers-en.tex 2018-08-05 23:02:09.000000000 +0200
+++ new/doc/latex/phonenumbers/phonenumbers-en.tex 2019-08-22 22:23:49.000000000 +0200
@@ -1,11 +1,12 @@
% phonenumbers package: English manual
-% Version 2.1
-% Datum: 5. August 2018
+% Version 2.2
+% Datum: 18. August 2019
\documentclass[numbers=noenddot]{scrreprt}
\usepackage[french,UKenglish]{babel}
\usepackage{fontspec}
\usepackage[link=off]{phonenumbers}
\usepackage{biblatex}
+\usepackage{csquotes}
\usepackage{array}
\usepackage{enumitem}
\usepackage{scrlayer-scrpage}
@@ -191,7 +192,7 @@
\large
\smallskip
-\url{keno.wehr(a)abgol.de}
+\url{wehr(a)abgol.de}
\end{center}
\vfill
@@ -1177,6 +1178,11 @@
\item Addition of the new North American area codes 326, 521, 658, and 672
\item Removal of the North American area code 456
\end{itemize}
+\item[2.2] \printdate{18.8.2019}
+\begin{itemize}
+\item Making macros possible as command arguments
+\item Slight change of the warning messages
+\end{itemize}
\end{description}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/phonenumbers.doc.tlpobj new/tlpkg/tlpobj/phonenumbers.doc.tlpobj
--- old/tlpkg/tlpobj/phonenumbers.doc.tlpobj 2019-02-28 03:59:38.000000000 +0100
+++ new/tlpkg/tlpobj/phonenumbers.doc.tlpobj 2019-08-23 01:53:40.000000000 +0200
@@ -1,6 +1,6 @@
name phonenumbers.doc
category Package
-revision 48355
+revision 51933
shortdesc doc files of phonenumbers
relocated 1
docfiles size=952
++++++ phonenumbers.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/phonenumbers/phonenumbers.sty new/tex/latex/phonenumbers/phonenumbers.sty
--- old/tex/latex/phonenumbers/phonenumbers.sty 2018-08-05 23:02:09.000000000 +0200
+++ new/tex/latex/phonenumbers/phonenumbers.sty 2019-08-22 22:23:49.000000000 +0200
@@ -2,8 +2,8 @@
% LaTeX-Paket zur Formatierung von Telefonnummern
% LaTeX package for formatting telephone numbers
% Autor: K. Wehr
-% Version: 2.1
-% Datum: 5. August 2018
+% Version: 2.2
+% Datum: 18. August 2019
% 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 @@
\RequirePackage{xparse}
-\ProvidesExplPackage {phonenumbers} {2018/08/05} {2.1} {Telephone number package}
+\ProvidesExplPackage {phonenumbers} {2019/08/18} {2.2} {Telephone number package}
\RequirePackage{l3keys2e}
\RequirePackage{ltxcmds}
@@ -66,22 +66,22 @@
\cs_generate_variant:Nn \msg_warning:nnn {nnV}
-\msg_new:nnn {phonenumbers} {illegal~character}
+\msg_new:nnn {phonenumbers} {illegal character}
{
illegal~character~'#1'~in~phone~number~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {empty~input}
+\msg_new:nnn {phonenumbers} {empty input}
{
empty~phone~number~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {empty~extension}
+\msg_new:nnn {phonenumbers} {empty extension}
{
empty~extension~(Durchwahl)~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {illegal~extension}
+\msg_new:nnn {phonenumbers} {illegal extension}
{
extension~(Durchwahl)~of~
\phone_landesadjektiv:V \l_phone_land_str
@@ -90,7 +90,7 @@
\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {odd~extension}
+\msg_new:nnn {phonenumbers} {odd extension}
{
\phone_landesadjektiv:V \l_phone_land_str
\c_space_tl
@@ -98,7 +98,7 @@
\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {subscriber~number~too~short}
+\msg_new:nnn {phonenumbers} {subscriber number too short}
{
subscriber~number~(Teilnehmerrufnummer)~has~less~than~#1~digits~in~
\phone_landesadjektiv:V \l_phone_land_str
@@ -107,7 +107,7 @@
\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {subscriber~number~too~long}
+\msg_new:nnn {phonenumbers} {subscriber number too long}
{
subscriber~number~(Teilnehmerrufnummer)~has~more~than~#1~digits~in~
\phone_landesadjektiv:V \l_phone_land_str
@@ -116,52 +116,52 @@
\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {illegal~start~of~subscriber~number}
+\msg_new:nnn {phonenumbers} {illegal start of subscriber number}
{
subscriber~number~(Teilnehmerrufnummer)~starts~with~#1~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {missing~subscriber~number}
+\msg_new:nnn {phonenumbers} {missing subscriber number}
{
no~subscriber~number~(Teilnehmerrufnummer)~given~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {invalid~area~code}
+\msg_new:nnn {phonenumbers} {invalid area code}
{
unknown~area~code~(Vorwahl)~in~\phone_landesadjektiv:V \l_phone_land_str\ phone~number~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {number~too~short}
+\msg_new:nnn {phonenumbers} {number too short}
{
\phone_landesadjektiv:V \l_phone_land_str\ #1~number~has~less~than~#2~digits~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {number~too~long}
+\msg_new:nnn {phonenumbers} {number too long}
{
\phone_landesadjektiv:V \l_phone_land_str\ #1~number~has~more~than~#2~digits~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {home~country~set}
+\msg_new:nnn {phonenumbers} {home country set}
{
home~country~set~to~\l_phone_heimatland_str\ \msg_line_context:
}
-\msg_new:nnn {phonenumbers} {home~country~cleared}
+\msg_new:nnn {phonenumbers} {home country cleared}
{
home~country~\l_phone_heimatland_str\ has~been~deleted~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {home~area~code~set}
+\msg_new:nnn {phonenumbers} {home area code set}
{
Your~home~is~in~\tl_use:c {c_phone_\l_phone_heimatland_str _ortsname_#1_tl}~(area~code~#1)~according~to~line~\msg_line_number:.
}
-\msg_new:nnn {phonenumbers} {home~area~code~cleared}
+\msg_new:nnn {phonenumbers} {home area code cleared}
{
home~area~code~\l_phone_heimatvorwahl_str\ has~been~deleted~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {invalid~home~area~code}
+\msg_new:nnn {phonenumbers} {invalid home area code}
{
#1~unknown~as~
\phone_landesadjektiv:V \l_phone_heimatland_str
@@ -170,12 +170,12 @@
\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {invalid~country~code}
+\msg_new:nnn {phonenumbers} {invalid country code}
{
illegal~country~code~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {country~code~only}
+\msg_new:nnn {phonenumbers} {country code only}
{
phone~number~consists~of~a~country~code~only~\msg_line_context:
}
@@ -216,18 +216,18 @@
{
\str_if_empty:NF \l_phone_heimatland_str
{
- \msg_info:nn {phonenumbers} {home~country~cleared}
+ \msg_info:nn {phonenumbers} {home country cleared}
\str_clear:N \l_phone_heimatland_str
}
}
{
\str_set_eq:NN \l_phone_heimatland_str \l_keys_choice_tl
- \msg_info:nn {phonenumbers} {home~country~set}
+ \msg_info:nn {phonenumbers} {home country set}
}
\str_if_empty:NF \l_phone_heimatvorwahl_str
{
- \msg_info:nn {phonenumbers} {home~area~code~cleared}
+ \msg_info:nn {phonenumbers} {home area code cleared}
\str_clear:N \l_phone_heimatvorwahl_str
}
},
@@ -299,7 +299,7 @@
{
\str_if_empty:NF \l_phone_heimatvorwahl_str
{
- \msg_info:nn {phonenumbers} {home~area~code~cleared}
+ \msg_info:nn {phonenumbers} {home area code cleared}
\str_clear:N \l_phone_heimatvorwahl_str
}
}
@@ -307,14 +307,14 @@
\str_if_empty:NT \l_phone_heimatland_str
{
\str_set_eq:NN \l_phone_heimatland_str \l_phone_land_str
- \msg_info:nn {phonenumbers} {home~country~set}
+ \msg_info:nn {phonenumbers} {home country set}
}
\phone_heimatvorwahl_erlaubt:nT {#1}
{
% Auslassen der Vorwahl möglich, Heimatvorwahl setzen:
\str_set:Nn \l_phone_heimatvorwahl_str {#1}
- \msg_info:nnn {phonenumbers} {home~area~code~set} {#1}
+ \msg_info:nnn {phonenumbers} {home area code set} {#1}
}
}
},
@@ -340,7 +340,7 @@
{
\str_if_eq:nnTF {#1} {0508} { \prg_return_true: }
{
- \msg_warning:nnn {phonenumbers/FR} {illegal~home~area~code} {#1}
+ \msg_warning:nnn {phonenumbers} {FR/illegal home area code} {#1}
\prg_return_false:
}
}
@@ -354,7 +354,7 @@
{
\clist_if_in:cnTF {\l_tmpa_str} {#1}
{
- \msg_warning:onn {phonenumbers/\l_phone_heimatland_str} {illegal~home~area~code} {#1}
+ \msg_warning:onn {phonenumbers} {\l_phone_heimatland_str/illegal home area code} {#1}
\prg_return_false:
}
{
@@ -367,7 +367,7 @@
}
}
{
- \msg_warning:nnn {phonenumbers} {invalid~home~area~code} {#1}
+ \msg_warning:nnn {phonenumbers} {invalid home area code} {#1}
\prg_return_false:
}
}
@@ -440,7 +440,7 @@
{
\tl_if_blank:nTF {#1}
{
- \msg_warning:nn {phonenumbers} {empty~input}
+ \msg_warning:nn {phonenumbers} {empty input}
\bool_set_true:N \l_phone_eingabe_leer_bool
}
{
@@ -485,7 +485,7 @@
}
{
% keine Ziffer eingelesen
- \bool_lazy_and:nnTF {\l_phone_erstes_zeichen_bool} {\str_if_eq_p:nn {##1} {+}}
+ \bool_lazy_and:nnTF {\l_phone_erstes_zeichen_bool} { \str_if_eq_p:nn {##1} {+} }
{
% führendes + eingelesen
\bool_set_true:N \l_phone_auslandsnummer_bool
@@ -501,7 +501,7 @@
}
{
% unerlaubtes Zeichen (z. B. Buchstaben) eingelesen
- \msg_warning:nnx {phonenumbers} {illegal~character} {##1}
+ \msg_warning:nnx {phonenumbers} {illegal character} {##1}
}
}
}
@@ -622,12 +622,15 @@
\tl_remove_all:Nn \l_phone_bereinigte_nummer_str {-}
}
+\cs_generate_variant:Nn \phone_nummer_ueberpruefen:n {x}
+
+
% #1: eingebene Durchwahl
\cs_new:Npn \phone_durchwahl_ueberpruefen:n #1
{
\tl_if_blank:nTF {#1}
{
- \msg_warning:nn {phonenumbers} {empty~extension}
+ \msg_warning:nn {phonenumbers} {empty extension}
\bool_set_true:N \l_phone_durchwahl_leer_bool
}
{
@@ -643,7 +646,7 @@
\str_put_right:Nn \l_phone_bereinigte_durchwahl_str {##1}
}
{
- \msg_warning:nnx {phonenumbers} {illegal~character} {##1}
+ \msg_warning:nnx {phonenumbers} {illegal character} {##1}
}
}
}
@@ -741,7 +744,7 @@
\NewDocumentCommand \setphonenumbers {m}
{
- \keys_set:nn {phonenumbers} {#1}
+ \keys_set:no {phonenumbers} {#1}
}
\NewDocumentCommand \phonenumber {omo}
@@ -749,15 +752,15 @@
\group_begin:
\IfValueT {#1}
{
- \keys_set:nn {phonenumbers} {#1}
+ \keys_set:no {phonenumbers} {#1}
}
\IfValueT {#3}
{
- \phone_durchwahl_ueberpruefen:n {#3}
+ \phone_durchwahl_ueberpruefen:x {#3}
}
- \phone_nummer_ueberpruefen:n {#2}
+ \phone_nummer_ueberpruefen:x {#2}
\IfValueT {#3}
{
@@ -765,7 +768,7 @@
{
\bool_if:NF \l_phone_durchwahl_leer_bool
{
- \msg_warning:nn {phonenumbers} {illegal~extension}
+ \msg_warning:nn {phonenumbers} {illegal extension}
}
}
}
@@ -779,7 +782,7 @@
\group_begin:
\IfValueT {#1}
{
- \keys_set:nn {phonenumbers} {#1}
+ \keys_set:no {phonenumbers} {#1}
}
\phone_vorwahlliste_ausgeben:n {ortsvorwahlen}
@@ -791,7 +794,7 @@
\group_begin:
\IfValueT {#1}
{
- \keys_set:nn {phonenumbers} {#1}
+ \keys_set:no {phonenumbers} {#1}
}
\phone_vorwahlliste_ausgeben:n {sondervorwahlen}
@@ -953,12 +956,12 @@
\int_compare:nNnTF {\l_tmpa_int} < {#2}
{
- \msg_warning:nnnn {phonenumbers} {number~too~short} {#4} {#2}
+ \msg_warning:nnnn {phonenumbers} {number too short} {#4} {#2}
}
{
\int_compare:nNnTF {\l_tmpa_int} > {#3}
{
- \msg_warning:nnnn {phonenumbers} {number~too~long} {#4} {#3}
+ \msg_warning:nnnn {phonenumbers} {number too long} {#4} {#3}
}
{
\bool_set_true:N \l_phone_teilnehmerrufnummer_gueltig_bool
@@ -1152,7 +1155,7 @@
\int_compare:nNnTF {\l_tmpa_int} > {13}
{
% Gesamtnummer hat mehr als 13 Stellen
- \msg_warning:nnnn {phonenumbers} {number~too~long} {landline} {13}
+ \msg_warning:nnnn {phonenumbers} {number too long} {landline} {13}
}
{
\int_set:Nn \l_tmpa_int {\str_count:n {#2}}
@@ -1161,7 +1164,7 @@
\int_compare:nNnTF {\l_tmpa_int} < {3}
{
% Teilnehmerrufnummer hat weniger als 3 Stellen
- \msg_warning:nnn {phonenumbers} {subscriber~number~too~short} {3}
+ \msg_warning:nnn {phonenumbers} {subscriber number too short} {3}
}
{
\bool_set_true:N \l_phone_teilnehmerrufnummer_gueltig_bool
@@ -1178,13 +1181,13 @@
\int_compare:nNnTF {\l_tmpa_int} > {11}
{
% Gesamtnummer hat mehr als 11 Stellen
- \msg_warning:nnnn {phonenumbers} {number~too~long} {0137~(MABEZ)} {11}
+ \msg_warning:nnnn {phonenumbers} {number too long} {0137~(MABEZ)} {11}
}
{
\int_compare:nNnTF {\l_tmpa_int} < {11}
{
% Gesamtnummer hat weniger als 11 Stellen
- \msg_warning:nnnn {phonenumbers} {number~too~short} {0137~(MABEZ)} {11}
+ \msg_warning:nnnn {phonenumbers} {number too short} {0137~(MABEZ)} {11}
}
{
\bool_set_true:N \l_phone_teilnehmerrufnummer_gueltig_bool
@@ -1210,7 +1213,7 @@
% Festnetznummer
\str_if_eq:xnTF {\str_head:n {#2}} {0}
{
- \msg_warning:nnn {phonenumbers} {illegal~start~of~subscriber~number} {0}
+ \msg_warning:nnn {phonenumbers} {illegal start of subscriber number} {0}
}
{
\phone_DE_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1 {#2}
@@ -1261,7 +1264,7 @@
% Mobilfunk- und Sondernummern dürfen keine Durchwahl enthalten (ausgenommen MABEZ-Nummern)
\str_if_eq:xnF {\str_range:Nnn #1 {1} {4}} {0137}
{
- \msg_warning:nn {phonenumbers} {odd~extension}
+ \msg_warning:nn {phonenumbers} {odd extension}
}
}
}
@@ -1315,7 +1318,7 @@
\int_compare:nNnTF {\l_phone_DE_AT_vorwahllaenge_int} = {\l_phone_DE_AT_hauptnummerlaenge_int}
{
- \msg_warning:nn {phonenumbers} {missing~subscriber~number}
+ \msg_warning:nn {phonenumbers} {missing subscriber number}
}
{
\use:c {phone_\l_phone_land_str _teilnehmerrufnummer_schreiben:Nx} \l_phone_vorwahl_str
@@ -1325,7 +1328,7 @@
}
}
{
- \msg_warning:nn {phonenumbers} {invalid~area~code}
+ \msg_warning:nn {phonenumbers} {invalid area code}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_durchwahl_str
}
@@ -1355,7 +1358,7 @@
\int_compare:nNnTF {\l_tmpa_int} > {13}
{
% Gesamtnummer hat mehr als 13 Stellen
- \msg_warning:nnnn {phonenumbers} {number~too~long} {landline} {13}
+ \msg_warning:nnnn {phonenumbers} {number too long} {landline} {13}
}
{
\int_set:Nn \l_tmpa_int {\str_count:n {#2}}
@@ -1364,13 +1367,13 @@
\int_compare:nNnTF {\l_tmpa_int} < {5}
{
% Teilnehmerrufnummer hat weniger als 5 Stellen
- \msg_warning:nnn {phonenumbers} {subscriber~number~too~short} {5}
+ \msg_warning:nnn {phonenumbers} {subscriber number too short} {5}
}
{
\bool_lazy_and:nnTF {\str_if_eq_p:Vn #1 {01}} {\int_compare_p:nNn {\l_tmpa_int} < {7}}
{
% Wiener Teilnehmerrufnummer hat weniger als 7 Stellen
- \msg_warning:nnn {phonenumbers} {subscriber~number~too~short} {7}
+ \msg_warning:nnn {phonenumbers} {subscriber number too short} {7}
}
{
\bool_lazy_and:nnTF
@@ -1393,13 +1396,13 @@
}
{
% Teilnehmerrufnummer in bestimmten Ortsnetzen hat weniger als 6 Stellen
- \msg_warning:nnn {phonenumbers} {subscriber~number~too~short} {6}
+ \msg_warning:nnn {phonenumbers} {subscriber number too short} {6}
}
{
\int_compare:nNnTF {\l_tmpa_int} > {9}
{
% Teilnehmerrufnummer hat mehr als 9 Stellen
- \msg_warning:nnn {phonenumbers} {subscriber~number~too~long} {9}
+ \msg_warning:nnn {phonenumbers} {subscriber number too long} {9}
}
{
\bool_set_true:N \l_phone_teilnehmerrufnummer_gueltig_bool
@@ -1417,7 +1420,7 @@
\bool_lazy_or:nnTF {\str_if_eq_p:Vn \l_tmpa_str {0}} {\str_if_eq_p:Vn \l_tmpa_str {1}}
{
- \msg_warning:nnV {phonenumbers} {illegal~start~of~subscriber~number} \l_tmpa_str
+ \msg_warning:nnV {phonenumbers} {illegal start of subscriber number} \l_tmpa_str
}
{
\phone_AT_festnetzteilnehmerrufnummernlaenge_ueberpruefen:Nn #1 {#2}
@@ -1480,7 +1483,7 @@
\str_if_empty:NF \l_phone_bereinigte_durchwahl_str
{
- \msg_warning:nn {phonenumbers} {odd~extension}
+ \msg_warning:nn {phonenumbers} {odd extension}
}
}
@@ -1522,12 +1525,12 @@
\clist_new:N \c_phone_FR_vorwahlen_clist
\clist_concat:NNN \c_phone_FR_vorwahlen_clist \c_phone_FR_ortsvorwahlen_clist \c_phone_FR_sondervorwahlen_clist
-\msg_new:nnn {phonenumbers} {FR/illegal~home~area~code}
+\msg_new:nnn {phonenumbers} {FR/illegal home area code}
{
The~only~legal~home~area~code~in~France~is~0508~(Saint-Pierre-et-Miquelon).~#1~cannot~be~set~as~home~area~code~\msg_line_context:.
}
-\msg_new:nnn {phonenumbers} {FR/missing~zero}
+\msg_new:nnn {phonenumbers} {FR/missing zero}
{
French~phone~number~has~no~zero~in~the~beginning~\msg_line_context:
}
@@ -1640,13 +1643,13 @@
{
\int_compare:nNnTF {\l_phone_nummerlaenge_int} < {4}
{
- \msg_warning:nnnn {phonenumbers} {number~too~short} {short} {4}
+ \msg_warning:nnnn {phonenumbers} {number too short} {short} {4}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
{
\int_compare:nNnTF {\l_phone_nummerlaenge_int} > {4}
{
- \msg_warning:nnnn {phonenumbers} {number~too~long} {short} {4}
+ \msg_warning:nnnn {phonenumbers} {number too long} {short} {4}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
{
@@ -1656,14 +1659,14 @@
}
}
{
- \msg_warning:nnnn {phonenumbers} {number~too~short} {phone} {10}
+ \msg_warning:nnnn {phonenumbers} {number too short} {phone} {10}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
}
{
\int_compare:nNnTF {\l_phone_nummerlaenge_int} > {10}
{
- \msg_warning:nnnn {phonenumbers} {number~too~long} {phone} {10}
+ \msg_warning:nnnn {phonenumbers} {number too long} {phone} {10}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
{
@@ -1695,12 +1698,12 @@
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \msg_warning:nn {phonenumbers} {invalid~area~code}
+ \msg_warning:nn {phonenumbers} {invalid area code}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
}
{
- \msg_warning:nn {phonenumbers/FR} {missing~zero}
+ \msg_warning:nn {phonenumbers} {FR/missing zero}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
}
@@ -1716,12 +1719,12 @@
\clist_new:N \c_phone_UK_vorwahlen_clist
\clist_concat:NNN \c_phone_UK_vorwahlen_clist \c_phone_UK_ortsvorwahlen_clist \c_phone_UK_sondervorwahlen_clist
-\msg_new:nnn {phonenumbers} {UK/illegal~home~area~code}
+\msg_new:nnn {phonenumbers} {UK/illegal home area code}
{
National~dialling~is~required~in~\tl_use:c {c_phone_UK_ortsname_#1_tl}.~#1~cannot~be~set~as~home~area~code~\msg_line_context:.
}
-\msg_new:nnn {phonenumbers} {UK/national~dialling~required}
+\msg_new:nnn {phonenumbers} {UK/national dialling required}
{
British~subscriber~number~starting~with~0~or~1~requires~an~area~code~\msg_line_context:
}
@@ -1866,7 +1869,7 @@
{1} { }
}
{
- \msg_warning:nn {phonenumbers/UK} {national~dialling~required}
+ \msg_warning:nn {phonenumbers} {UK/national dialling required}
}
}
{
@@ -1957,7 +1960,7 @@
\int_compare:nNnTF {##1} = {\l_phone_nummerlaenge_int}
{
- \msg_warning:nn {phonenumbers} {missing~subscriber~number}
+ \msg_warning:nn {phonenumbers} {missing subscriber number}
}
{
\phone_UK_teilnehmerrufnummer_schreiben:Nx \l_phone_vorwahl_str {\str_range:Nnn \l_phone_bereinigte_nummer_str {##1 + 1} {-1}}
@@ -1969,7 +1972,7 @@
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \msg_warning:nn {phonenumbers} {invalid~area~code}
+ \msg_warning:nn {phonenumbers} {invalid area code}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
}
@@ -1987,17 +1990,17 @@
\clist_new:N \c_phone_US_vorwahlen_clist
\clist_concat:NNN \c_phone_US_vorwahlen_clist \c_phone_US_ortsvorwahlen_clist \c_phone_US_sondervorwahlen_clist
-\msg_new:nnn {phonenumbers} {US/illegal~home~area~code}
+\msg_new:nnn {phonenumbers} {US/illegal home area code}
{
10-digit~dialling~is~required~in~\tl_use:c {c_phone_US_ortsname_#1_tl}.~#1~cannot~be~set~as~home~area~code~\msg_line_context:.
}
-\msg_new:nnn {phonenumbers} {US/invalid~area~code}
+\msg_new:nnn {phonenumbers} {US/invalid area code}
{
unknown~area~code~#1~in~North~American~phone~number~\msg_line_context:
}
-\msg_new:nnn {phonenumbers} {US/invalid~central~office~code}
+\msg_new:nnn {phonenumbers} {US/invalid central office code}
{
invalid~central~office~code~#1~in~North~American~phone~number~\msg_line_context:
}
@@ -2207,7 +2210,7 @@
{1} { }
}
{
- \msg_warning:nnn {phonenumbers/US} {invalid~central~office~code} {#2}
+ \msg_warning:nnn {phonenumbers} {US/invalid central office code} {#2}
}
{
\bool_set_false:N \l_tmpa_bool % Regionalnummer?
@@ -2227,13 +2230,13 @@
{
\str_if_eq:xnT {\str_range:nnn {#2} {2} {3}} {11}
{
- \msg_warning:nnn {phonenumbers/US} {invalid~central~office~code} {#2}
+ \msg_warning:nnn {phonenumbers} {US/invalid central office code} {#2}
}
}
{
\str_if_eq:nnT {#2} {911}
{
- \msg_warning:nnn {phonenumbers/US} {invalid~central~office~code} {#2}
+ \msg_warning:nnn {phonenumbers} {US/invalid central office code} {#2}
}
}
}
@@ -2272,10 +2275,10 @@
{
\clist_if_in:NVTF \c_phone_US_vorwahlen_clist \l_phone_bereinigte_nummer_str
{
- \msg_warning:nn {phonenumbers} {missing~subscriber~number}
+ \msg_warning:nn {phonenumbers} {missing subscriber number}
}
{
- \msg_warning:nnV {phonenumbers/US} {invalid~area~code} \l_phone_bereinigte_nummer_str
+ \msg_warning:nnV {phonenumbers} {US/invalid area code} \l_phone_bereinigte_nummer_str
}
\phone_US_vorwahl_schreiben:VN \l_phone_bereinigte_nummer_str \c_false_bool
@@ -2292,7 +2295,7 @@
\clist_if_in:NVF \c_phone_US_vorwahlen_clist \l_tmpa_str
{
- \msg_warning:nnx {phonenumbers/US} {invalid~area~code} {\l_tmpa_str}
+ \msg_warning:nnx {phonenumbers} {US/invalid area code} {\l_tmpa_str}
}
\phone_US_vorwahl_schreiben:VN \l_tmpa_str \c_true_bool
@@ -2306,10 +2309,10 @@
{
\int_compare:nNnTF {\str_count:N \l_phone_bereinigte_nummer_str} < {10}
{
- \msg_warning:nnnn {phonenumbers} {number~too~short} {phone} {10}
+ \msg_warning:nnnn {phonenumbers} {number too short} {phone} {10}
}
{
- \msg_warning:nnnn {phonenumbers} {number~too~long} {phone} {10}
+ \msg_warning:nnnn {phonenumbers} {number too long} {phone} {10}
}
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
@@ -2341,7 +2344,7 @@
\int_compare:nNnTF {##1} = {\l_phone_nummerlaenge_int}
{
- \msg_warning:nn {phonenumbers} {country~code~only}
+ \msg_warning:nn {phonenumbers} {country code only}
}
{
\tl_put_right:NV \l_phone_ausgabetext_tl \c_space_tl
@@ -2357,7 +2360,7 @@
\bool_if:NF \l_phone_vorwahl_gefunden_bool
{
- \msg_warning:nnn {phonenumbers} {invalid~country~code}
+ \msg_warning:nnn {phonenumbers} {invalid country code}
\tl_put_right:NV \l_phone_ausgabetext_tl \c_phone_pluszeichen_tl
\tl_put_right:NV \l_phone_ausgabetext_tl \l_phone_bereinigte_nummer_str
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/phonenumbers.tlpobj new/tlpkg/tlpobj/phonenumbers.tlpobj
--- old/tlpkg/tlpobj/phonenumbers.tlpobj 2019-02-28 03:59:39.000000000 +0100
+++ new/tlpkg/tlpobj/phonenumbers.tlpobj 2019-08-23 01:53:41.000000000 +0200
@@ -1,6 +1,6 @@
name phonenumbers
category Package
-revision 48355
+revision 51933
shortdesc Typesetting telephone numbers with LaTeX
relocated 1
longdesc The phonenumbers package makes it possible to typeset telephone
@@ -26,7 +26,7 @@
RELOC/tex/latex/phonenumbers/phn-US_Vorwahlen.tex
RELOC/tex/latex/phonenumbers/phonenumbers.sty
catalogue-ctan /macros/latex/contrib/phonenumbers
-catalogue-date 2018-08-05 12:59:26 +0200
+catalogue-date 2019-08-19 08:40:21 +0200
catalogue-license lppl1.3
catalogue-topics addr-list numbers
-catalogue-version 2.1
+catalogue-version 2.2
++++++ pict2e.doc.tar.xz ++++++
Binary files old/doc/latex/pict2e/p2e-drivers.pdf and new/doc/latex/pict2e/p2e-drivers.pdf differ
Binary files old/doc/latex/pict2e/pict2e.pdf and new/doc/latex/pict2e/pict2e.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.doc.tlpobj new/tlpkg/tlpobj/pict2e.doc.tlpobj
--- old/tlpkg/tlpobj/pict2e.doc.tlpobj 2019-02-28 03:59:40.000000000 +0100
+++ new/tlpkg/tlpobj/pict2e.doc.tlpobj 2019-08-21 01:53:48.000000000 +0200
@@ -1,6 +1,6 @@
name pict2e.doc
category Package
-revision 39591
+revision 51918
shortdesc doc files of pict2e
relocated 1
docfiles size=196
++++++ pict2e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pict2e/pict2e.sty new/tex/latex/pict2e/pict2e.sty
--- old/tex/latex/pict2e/pict2e.sty 2016-02-06 00:35:03.000000000 +0100
+++ new/tex/latex/pict2e/pict2e.sty 2019-08-20 22:45:38.000000000 +0200
@@ -24,7 +24,7 @@
%% This work consists of all files listed in `manifest.txt'.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{pict2e}[2016/02/05 v0.3b Improved picture commands (HjG,RN,JT)]
+\ProvidesPackage{pict2e}[2019/08/20 v0.3c Improved picture commands (HjG,RN,JT)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -383,14 +383,14 @@
\newcommand*\pIIe@checkslopeargsvector[2]{%
\pIIe@checkslopeargs{#1}{#2}{1000}}
\newcommand*\pIIe@checkslopeargs[3]{%
- \def\@tempa{#1}\expandafter\pIIe@checkslopearg\@tempa.:{#3}%
- \def\@tempa{#2}\expandafter\pIIe@checkslopearg\@tempa.:{#3}%
+ \edef\@tempa{#1}\expandafter\pIIe@checkslopearg\@tempa.:{#3}%
+ \edef\@tempa{#2}\expandafter\pIIe@checkslopearg\@tempa.:{#3}%
\ifdim #1\p@=\z@ \ifdim #2\p@=\z@ \@badlinearg \fi\fi}
\def\pIIe@checkslopearg #1.#2:#3{%
\def\@tempa{#1}%
\ifx\@tempa\empty\def\@tempa{0}\fi
\ifx\@tempa\space\def\@tempa{0}\fi
- \ifnum\ifnum\@tempa<\z@-\fi\@tempa>#3\@badlinearg \fi}
+ \ifnum\ifnum\@tempa<\z@-\fi\@tempa>#3 \@badlinearg \fi}
\def\@badlinearg{\PackageError
{pict2e}{Bad \protect\line\space or \protect\vector\space argument}{}}
\def\line(#1,#2)#3{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.tlpobj new/tlpkg/tlpobj/pict2e.tlpobj
--- old/tlpkg/tlpobj/pict2e.tlpobj 2019-02-28 03:59:40.000000000 +0100
+++ new/tlpkg/tlpobj/pict2e.tlpobj 2019-08-21 01:53:48.000000000 +0200
@@ -1,6 +1,6 @@
name pict2e
category Package
-revision 39591
+revision 51918
shortdesc New implementation of picture commands
relocated 1
longdesc This package was described in the 2nd edition of 'LaTeX: A
@@ -10,8 +10,8 @@
longdesc error message. The new package extends the existing LaTeX
longdesc picture environment, using the familiar technique (cf. the
longdesc graphics and color packages) of driver files (at present,
-longdesc drivers for PostScript output from LaTeX, and for use with
-longdesc pdfLaTeX are available). The package documentation has a fair
+longdesc drivers for dvips, pdfTeX, LuaTeX, XeTeX, VTeX, dvipdfm, and
+longdesc dvipdfmx are available). The package documentation has a fair
longdesc number of examples of use, showing where things are improved by
longdesc comparison with the LaTeX picture environment.
runfiles size=18
@@ -28,8 +28,10 @@
RELOC/tex/latex/pict2e/pict2e.cfg
RELOC/tex/latex/pict2e/pict2e.sty
catalogue-also curve2e xpicture
+catalogue-contact-bugs https://github.com/rolfn/pict2e/issues
+catalogue-contact-home https://github.com/rolfn/pict2e
catalogue-ctan /macros/latex/contrib/pict2e
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-08-20 15:36:48 +0200
catalogue-license lppl1.3
catalogue-topics graphics-in-tex
-catalogue-version 0.3b
+catalogue-version 0.3c
++++++ pkuthss.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/README.txt new/doc/latex/pkuthss/README.txt
--- old/doc/latex/pkuthss/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pkuthss/README.txt 2019-11-17 23:30:56.000000000 +0100
@@ -0,0 +1,18 @@
+pkuthss: LaTeX template for dissertations in Peking University
+--------------------------------------------------------------
+
+Maintainer: Casper Ti. Vector <CasperVector(a)gmail.com>
+Homepage: <https://gitea.com/CasperVector/pkuthss>
+
+Licence:
+* New BSD Licence for `copy.tex' and `origin.tex'.
+* LaTeX Project Public Licence 1.3 or later for files in `tex/' and
+ `doc/readme/', except for those mentioned above.
+* Public domain for all other files.
+
+This package provides a simple, clear and flexible LaTeX template for
+dissertations in Peking University.
+
+This file (`README.txt') is *NOT* intended as the documentation for this
+package; please see the file `pkuthss.pdf' instead.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/Make.bat new/doc/latex/pkuthss/example/Make.bat
--- old/doc/latex/pkuthss/example/Make.bat 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/example/Make.bat 2019-11-15 22:37:15.000000000 +0100
@@ -1,32 +1,19 @@
@echo off
@rem Copyright (c) 2008-2009 solvethis
-@rem Copyright (c) 2010-2012 Casper Ti. Vector
+@rem Copyright (c) 2010-2012,2019 Casper Ti. Vector
@rem Public domain.
-set JOB=thesis
-@rem ���������ֵ����Ϊ latex��pdflatex �� xelatex��
-set LATEX=latex
-set BIBTEX=biber -l zh__pinyin --output-safechars
-set DVIPDF=dvipdfmx
-
-if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOB%
-) else (set DODVIPDF=echo No need to run %DVIPDF%.)
if "%1"=="" goto doc
if "%1"=="doc" goto doc
if "%1"=="clean" (goto clean) else (goto usage)
:doc
-%LATEX% %JOB%
-%BIBTEX% %JOB%
-%LATEX% %JOB%
-%LATEX% %JOB%
-%DODVIPDF%
+latexmk
goto end
:clean
-del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
-del missfont.log chap\*.aux
+latexmk -c
goto end
:usage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def new/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
--- old/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def 2019-11-15 22:37:15.000000000 +0100
@@ -36,13 +36,13 @@
}
{
\setCJKmainfont
- [ BoldFont = SimHei , ItalicFont = [ simkai.ttf ] ] { SimSun }
+ [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun }
\setCJKsansfont { SimHei }
- \setCJKmonofont { [ simfang.ttf ] }
+ \setCJKmonofont { FangSong }
\setCJKfamilyfont { zhsong } { SimSun }
\setCJKfamilyfont { zhhei } { SimHei }
- \setCJKfamilyfont { zhkai } { [ simkai.ttf ] }
- \setCJKfamilyfont { zhfs } { [ simfang.ttf ] }
+ \setCJKfamilyfont { zhkai } { KaiTi }
+ \setCJKfamilyfont { zhfs } { FangSong }
%\setCJKfamilyfont { zhli } { LiSu }
%\setCJKfamilyfont { zhyou } { YouYuan }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/latexmkrc new/doc/latex/pkuthss/example/latexmkrc
--- old/doc/latex/pkuthss/example/latexmkrc 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pkuthss/example/latexmkrc 2019-11-15 22:37:15.000000000 +0100
@@ -0,0 +1,14 @@
+# Copyright (c) 2019 Casper Ti. Vector
+# Public domain.
+
+@default_files = ('thesis');
+# 5:xelatex;3:latex(+ dvipdfmx);1:pdflatex。
+$pdf_mode = 5;
+# 用 latex 模式编译时,使用 dvipdfmx 而非默认的 dvipdf。
+$dvipdf = "dvipdfmx %O -o %D %S";
+# 此选项相关说明见 texdoc latexmk。
+$bibtex_use = 1.5;
+$biber = "biber -l zh__pinyin --output-safechars %O %S";
+# latexmk -c 时自动删除 .run.xml 文件。
+$clean_ext = "run.xml";
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/spine.tex new/doc/latex/pkuthss/example/spine.tex
--- old/doc/latex/pkuthss/example/spine.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/example/spine.tex 2019-11-15 22:37:15.000000000 +0100
@@ -1,13 +1,13 @@
-% Copyright (c) 2018 Casper Ti. Vector
+% Copyright (c) 2018-2019 Casper Ti. Vector
% Public domain.
-\documentclass[zihao = -4]{ctexart}
+\documentclass[UTF8, zihao = -4]{ctexart}
\usepackage{calc, geometry, graphicx}
\usepackage[defaultsups]{newtxtext}
\usepackage[cmintegrals, varg]{newtxmath}
\pagestyle{empty}
\newlength{\colpad}
-\newcommand{\colwidth}{\ccwd}
+\newcommand{\colwidth}{0.99\ccwd}
% 设定论文纸尺寸。
\geometry{paperwidth = 460mm, paperheight = 297mm, margin = 0cm}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/thesis.tex new/doc/latex/pkuthss/example/thesis.tex
--- old/doc/latex/pkuthss/example/thesis.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/example/thesis.tex 2019-11-15 22:37:15.000000000 +0100
@@ -1,5 +1,5 @@
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018-2019 Casper Ti. Vector
% Public domain.
%
% 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档,
@@ -9,12 +9,8 @@
% texdoc biblatex-caspervector
% 调出。
-% 采用了自定义的(包括大小写不同于原文件的)字体文件名,
-% 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项;
-% 其它用户不用加入 nofonts 选项,加入之后反而会产生错误。
\documentclass[UTF8]{pkuthss}
% 如果的确须要使脚注按页编号的话,可以去掉后面 footmisc 包的注释。
-% 注意:在启用此设定的情况下,可能要多编译一次以产生正确的脚注编号。
%\usepackage[perpage]{footmisc}
% 使用 biblatex 排版参考文献,并规定其格式(详见 biblatex-caspervector 的文档)。
Binary files old/doc/latex/pkuthss/example.pdf and new/doc/latex/pkuthss/example.pdf differ
Binary files old/doc/latex/pkuthss/pkuthss.pdf and new/doc/latex/pkuthss/pkuthss.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/ChangeLog.txt new/doc/latex/pkuthss/readme/ChangeLog.txt
--- old/doc/latex/pkuthss/readme/ChangeLog.txt 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/ChangeLog.txt 2019-11-17 23:30:56.000000000 +0100
@@ -1,3 +1,32 @@
+2019-11-17, v1.8.2
+
+ * Misc:
+ - CTAN now also wants README in the TDS archive.
+ - `README' -> `README.txt' do avoid collision with the `readme' directory.
+ - Fix ignored `\docversion' update.
+
+2019-11-15, v1.8.1
+
+ * Changes to example template:
+ - Migrate to latexmk (also for packaging).
+ - ctex-fontset-pkuthss.def: `[ simkai.ttf ]' etc is no longer supported.
+ - spine.tex: fix garbled characters and hbox warnings with pdflatex.
+
+ * Changes to package code:
+ - pkuthss.cls: work around the `\lvert already defined' error.
+ - pkuthss.cls: fix section title spacing below the page header.
+ - pkuthss.cls: adjust titlepage spacing.
+
+ * Changes to documentation:
+ - Synchronise with the current code.
+ - Use \mbox around \supercite by default.
+ - Improve verbatims.
+
+ * Misc:
+ - Completion of some previous commits.
+ - Migrate to Gitea, "for obvious reasons".
+ - Minor fixes and cosmetics.
+
2018-07-02, v1.8.0
* Changes to example template:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/Makefile new/doc/latex/pkuthss/readme/Makefile
--- old/doc/latex/pkuthss/readme/Makefile 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-# Copyright (c) 2008-2009 solvethis
-# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
-# Public domain.
-
-JOB = pkuthss
-BIBTEX = biber -l zh__pinyin --output-safechars
-DVIPDF = dvipdfmx
-MAKE = make
-RM = rm -f
-
-ifndef LATEX
- LATEX1 = latex
- LATEX2 = xelatex
-else
- LATEX1 = $(LATEX)
- LATEX2 = $(LATEX)
-endif
-
-ifeq ($(LATEX), latex)
- DODVIPDF = $(DVIPDF) $(JOB)
-endif
-
-doc:
- $(LATEX1) $(JOB)
- $(BIBTEX) $(JOB)
- $(LATEX2) $(JOB)
- $(LATEX2) $(JOB)
- $(DODVIPDF)
-
-clean:
- $(RM) $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi \
- $(JOB).lof $(JOB).log $(JOB).lot $(JOB).run.xml $(JOB).toc \
- $(JOB).out $(JOB).out.bak missfont.log texput.log chap/*.aux
-
-distclean: clean
- $(RM) $(JOB).pdf
-
-# vim:ts=4:sw=4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex new/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex
--- old/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex 2019-11-17 23:30:56.000000000 +0100
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-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
@@ -33,24 +33,23 @@
\begin{itemize}
\item 一个基本的 \hologo{TeX} 发行版。
\item CJK 或 XeCJK(供 \hologo{XeLaTeX} 使用)宏包。
- \item ctex\supercite{ctex} 宏包(提供了 ctexbook 文档类)。
+ \item ctex\cupercite{ctex} 宏包(提供了 ctexbook 文档类)。
\item 中文字体。
\item 如果要使用 biblatex 进行文献列表和引用的排版的话,
- 还需要 biblatex\supercite{biblatex} 宏包;
+ 还需要 biblatex\cupercite{biblatex} 宏包;
\item 如果要对中文文献进行按汉语拼音的排序的话,
- 还需要 biber\supercite{biber} 程序。
+ 还需要 biber\cupercite{biber} 程序。
\item 如果使用默认的文献列表和引用样式的话,还需要作者编写的 biblatex 样式
- (biblatex-caspervector\supercite{biblatex-caspervector}),
+ (biblatex-caspervector\cupercite{biblatex-caspervector}),
此样式要求使用 biber 程序。
- \item 如果须要使用 Makefile 来实现自动编译,还需要 Make 工具;
- 但如果使用由批处理实现的伪“Makefile”就不用了。
+ \item 如果须要使用 latexmk 来实现自动编译,还需要 latexmk 工具。
\end{itemize}
\myemph{最新}的\myemph{完全版} \hologo{TeX} Live 系统(\myemph{%
注:某些 Linux 发行版软件仓库中的 \hologo{TeX} Live 有问题,
建议使用独立安装版的 \hologo{TeX} Live%
\unemph{\footnote{\url{https://www.tug.org/texlive/}.}}。%
-})都已经包含除中文字体和 Make 之外所有要求的项目。%
+})都已经包含除中文字体之外所有要求的项目。%
\myemph{%
为了获得最好的支持,
我们建议用户使用最新、完全版的 \hologo{TeX} 系统和各宏包。%
@@ -66,22 +65,16 @@
这些字体是 GB18030 字符集的,不存在上述问题。%
}
-Linux 用户可以从软件源获得 GNU 的 make;
-其它类 UNIX 系统应该也会提供 make 工具,请参阅相应的文档以获得帮助。%
-Windows 用户可以从以下地址下载 Windows 下的 GNU make 工具:\\
-\hspace*{\parindent}%
-\url{http://gnuwin32.sourceforge.net/packages/make.htm}
-
\section{模版文件}\label{sec:doc-dir}
在正确安装 pkuthss 文档模版之后,在终端/命令提示符中执行
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
texdoc pkuthss
\end{Verbatim}
所打开的 pdf 文件所在的同一目录中包含两个子目录和相应的两个 pdf 文件,
其中 \verb|readme/| 为说明文档(即本文档)的源代码,%
\verb|example/| 为文档模版的源代码,%
-\verb|readme.pdf| 和 \verb|example.pdf|
+\verb|pkuthss.pdf| 和 \verb|example.pdf|
分别为说明文档和文档模版的 pdf 文件。
\verb|example/| 目录下的源代码使用的是 UTF-8 编码,
@@ -98,44 +91,32 @@
因此 pkuthss 文档模版的作者建议用户使用支持 LF 换行的文本编辑器编辑文件。%
}
-模版中的重要文件有:
+模版中的关键文件有:
\begin{itemize}
- \item \verb|Makefile|:
- 被 Make 工具调用的 Makefile,用于使编译工作自动化。
+ \item \verb|ctexopts.cfg|、\verb|ctex-fontset-pkuthss.def|:
+ 比较常用的字体配置,适用于 2.0 及以后版本的
+ ctex\cupercite{ctex} 宏包。
+ \item \verb|latexmkrc|:
+ 被 latexmk 工具读取的配置文件,用于使编译工作自动化。
\item \verb|Make.bat|:%
- Windows 下的伪“Makefile”,用 Windows 批处理实现。
+ 方便 Windows 用户使用的批处理文件,会调用 latexmk。
+ \item \verb|spine.tex|:书脊的源文件,具体用法请参考其中代码。
+ \item \verb|thesis.tex|:示例模版的主文件。
\item \verb|chap/|:目录,包含各章节内容:
\begin{itemize}
- \item \verb|copyright.tex|:版权声明部分。
- \item \verb|originauth.tex|:
- 原创性声明和使用授权说明部分\supercite{pku-originauth}。
+ \item \verb|copy.tex|:版权声明部分。
+ \item \verb|origin.tex|:
+ 原创性声明和使用授权说明部分\cupercite{pku-originauth}。
\end{itemize}
\myemph{%
- 注:pkuthss 文档模版支持排版学校要求的二维码,
- 请参考 \texttt{copyright.tex} 和
- \texttt{originauth.tex} 中的相关注释。%
+ 注:pkuthss 文档模版可排版学校要求的二维码,
+ 请参考 \texttt{copy.tex} 和 \texttt{origin.tex} 中的相关注释。%
}
-
- \item \verb|misc/|:
- 目录,目前包含比较常用的字体配置:
- \begin{itemize}
- \item \verb|ctexopts.cfg|、\verb|ctex-fontset-pkuthss.def|:
- 适用于 2.0 及以后版本的 ctex\supercite{ctex} 宏包。
- \item \verb|ctex-xecjk-windows.def|:
- 适用于 2.0 以前版本的 ctex 宏包。
- \end{itemize}
- 使用时,
- 请将和用户系统中 ctex 宏包版本相匹配的\myemph{所有}配置文件
- 复制到模版的主目录中。
\end{itemize}
\section{编译方式}\label{sec:compile}
-首次编译前,请将 \verb|misc/| 目录中和用户系统中
-ctex 宏包版本相匹配的配置文件复制到模版的主目录中,
-详见第 \ref{sec:doc-dir} 节。
-
pkuthss 文档模版支持三种编译方式,即
\begin{itemize}
\item \hologo{LaTeX} -- dvipdfmx 方式:\\
@@ -149,42 +130,36 @@
\verb|xelatex| 和 \verb|xelatex|。
\end{itemize}
\myemph{%
- 注意:\hologo{XeLaTeX} 对非 UTF-8 编码的支持不好,
+ 注意:在特定情形下,\texttt{latex}/\texttt{pdflatex}/\texttt{xelatex}
+ 步骤可能须要执行多于 2 次,而下文推荐的 latexmk 工具会自动处理这类情形。
+ 此外,\hologo{XeLaTeX} 对非 UTF-8 编码的支持不好,
因此 \hologo{XeLaTeX} 方式的编译不支持 GBK 编码。%
}
-pkuthss 文档模版附带的 Makefile 中已经对这三种编译方式进行了完整的配置。
-用户只须要在 Makefile 中通过设定变量 \verb|JOB| 的值指定被编译的主文件名,
-并通过设定变量 \verb|LATEX| 的值指定采用哪种编译方式,
-即可通过在主文件所在目录调用 Make 工具来实现自动编译:
-如果是在类 UNIX 环境下,则用户应该调用的命令名为 \verb|make|:
-\begin{Verbatim}[frame = single]
+pkuthss 文档模版附带的 \verb|latexmkrc| 中已经对这三种编译方式进行了完整的
+配置。用户只须要在 \verb|latexmkrc| 中通过设定变量 \verb|default_files|
+的值指定被编译的主文件名,并通过设定变量 \verb|pdf_mode| 的值指定采用
+哪种编译方式,即可通过在主文件所在目录调用 latexmk 工具来实现自动编译:
+类 UNIX 环境下大致如下
+\begin{Verbatim}
cd /path/to/directory/with/thesis.tex
-make
+latexmk
\end{Verbatim}
-而如果是在 Windows 环境下,则用户应该调用的命令名可能为 \verb|mingw32-make|:
-\begin{Verbatim}[frame = single]
+而在 Windows 环境下大致如下
+\begin{Verbatim}
cd \path\to\directory\with\thesis.tex
-mingw32-make
+latexmk
\end{Verbatim}
-用户如果不想配置 Windows 下的 GNU Make,
-则也可以使用由 Windows 批处理实现的伪“Makefile”,
-通过在主文件所在目录调用 \verb|make|\footnote{%
- Windows 将批处理文件作为可执行文件,调用时可以不显式地指出扩展名。%
-}:
-\begin{Verbatim}[frame = single]
-cd \path\to\directory\with\thesis.tex
-make
-\end{Verbatim}
-\myemph{%
+Windows 用户也可以使用批处理文件 \verb|Make.bat|:
+在主文件所在目录双击此文件,它便会调用 latexmk 进行编译。\myemph{%
注意:%
Windows 批处理对于 LF(\texttt{\string\n})换行的批处理文件支持有问题。
在命令提示符(cmd)下执行这些批处理文件时没有问题,
但双击文件图标执行时可能就会出错。
\hologo{TeX} Live 中安装的 \texttt{Make.bat} 和
CTAN 上提供的压缩包里的 \texttt{Make.bat}
- 有可能是 LF(\texttt{\string\n})换行的。%
+ 在正常情况下应该是 CRLF(\texttt{\string\r\string\n})换行的。%
}
% vim:ts=4:sw=4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex new/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex
--- old/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex 2019-11-17 23:30:56.000000000 +0100
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-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
@@ -46,7 +46,7 @@
}。
\item \textbf{\texttt{[no]pkufont}}:
- 是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
+ 是否根据学校对论文格式的要求\cupercite{pku-thesisstyle}%
将西文字体改为类似于 Times New Roman / Arial 的字体。
\item \textbf{\texttt{[no]pkufoot}}\footnote{%
@@ -54,7 +54,7 @@
\texttt{[no]footfmt} 选项;
更改名称是为了使文档类选项名更加规则。%
}:
- 是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
+ 是否根据学校对论文格式的要求\cupercite{pku-thesisstyle}%
修改和脚注相关的一些格式。
具体地说,启用 \verb|pkufoot| 选项后会进行以下几项设置:
\begin{itemize}
@@ -64,7 +64,7 @@
\end{itemize}
\item \textbf{\texttt{[no]pkuspace}}:
- 是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
+ 是否根据学校对论文格式的要求\cupercite{pku-thesisstyle}%
修改排版中的一些间距及相关设置。
具体地说,启用 \verb|pkuspace| 选项后会按
\parencite{pku-thesisstyle} 中的要求修改以下几项设置:
@@ -89,8 +89,6 @@
是否采用一些常用的调整间距的额外版式设定。
具体地说,启用 \verb|spacing| 选项后会进行以下几项设置:
\begin{itemize}
- \item 自动忽略 CJK 文字之间的空白而
- 保留(CJK 文字与西文之间等的)其它空白。
\item 调用 setspace 宏包以使某些细节处的空间安排更美观。
\item 采用比 \hologo{LaTeX} 默认设定更加紧密的枚举环境%
\footnote{%
@@ -100,6 +98,7 @@
启用 \texttt{spacing} 选项后,
将去掉这些环境中额外增加的(垂直)间隔。%
}。
+ \item 调整枚举环境的缩进,以适应中文排版中的习惯。
\end{itemize}
\item \textbf{\texttt{[no]spechap}}\footnote{%
@@ -139,13 +138,13 @@
例如,如果须要使用 UTF-8 编码撰写论文,
则应在载入 pkuthss 文档类时加上 \verb|UTF8| 选项:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\documentclass[UTF8, ...]{pkuthss} % “...”代表其它的选项。
\end{Verbatim}
又例如,文档默认情况下是双面模式,每章都从右页(奇数页)开始。
如果希望改成一章可以从任意页开始,可以这样设置:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\documentclass[openany, ...]{pkuthss} % 每章从任意页开始。
\end{Verbatim}
@@ -153,7 +152,7 @@
\subsection{设定文档信息的命令}
这一类命令的语法为
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\commandname{具体信息} % commandname 为具体命令的名称。
\end{Verbatim}
@@ -176,7 +175,7 @@
\end{itemize}
例如,如果要设定专业为“化学”(“Chemistry”),则可以使用以下命令:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\cmajor{化学}
\emajor{Chemistry}
\end{Verbatim}
@@ -184,7 +183,7 @@
\subsection{自身存储文档信息的命令}
这一类命令的语法为
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% commandname 为具体的命令名。
\renewcommand{\commandname}{具体信息}
\end{Verbatim}
@@ -202,7 +201,7 @@
例如,
如果要设定论文的类别为“本科生毕业论文”(“Undergraduate Thesis”),
则可以使用以下命令:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\renewcommand{\cthesisname}{本科生毕业论文}
\renewcommand{\ethesisname}{Undergraduate Thesis}
\end{Verbatim}
@@ -210,7 +209,7 @@
\subsection{以“key = value”格式设置文档信息}
用户可以通过 \verb|\pkuthssinfo| 命令集中设定文档信息,其语法为:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% key1、key2、value1、value2 等为具体文档信息的项目名和内容。
\pkuthssinfo{key1 = value1, key2 = value2, ...}
\end{Verbatim}
@@ -224,7 +223,7 @@
}
例如,前面提到的文档信息的设置可以集中地写成:
-\begin{Verbatim}[frame = single, tabsize = 4]
+\begin{Verbatim}
\pkuthssinfo{
..., % “...”代表其它的设定。
cthesisname = {本科生毕业论文},
@@ -260,46 +259,46 @@
\section{从其它文档类和宏包继承的功能}\label{sec:thirdparty}
-pkuthss 文档类建立在 ctexbook\supercite{ctex} 文档类之上,
-并调用了 geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr}、%
-hyperref\supercite{hyperref}、graphicx\supercite{graphicx}
-和 ulem\supercite{ulem} 等几个宏包。
+pkuthss 文档类建立在 ctexbook\cupercite{ctex} 文档类之上,
+并调用了 geometry\cupercite{geometry}、fancyhdr\cupercite{fancyhdr}、%
+hyperref\cupercite{hyperref}、graphicx\cupercite{graphicx}
+和 ulem\cupercite{ulem} 等几个宏包。
因此,ctexbook 文档类和这些宏包所提供的功能均可以使用。
例如,用户如果想将目录的标题改为“目{\quad\quad}录”,
则可以使用 ctexbook 文档类提供的 \verb|\ctexset| 命令:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\ctexset[contentsname = {目{\quad\quad}录}]
\end{Verbatim}
在默认的配置下,%
-pkuthss 文档模版使用作者编写的 biblatex\supercite{biblatex} 样式%
-\mbox{\supercite{biblatex-caspervector}}进行参考文献和引用的排版,
+pkuthss 文档模版使用作者编写的 biblatex\cupercite{biblatex} 样式%
+\cupercite{biblatex-caspervector}进行参考文献和引用的排版,
用户可以使用它以及 biblatex 本身所提供的功能。
例如,用户可以分别使用 \verb|\cite|、\verb|\parencite| 和 \verb|\supercite|
生成未格式化的、带方括号的和上标且带方括号的引用标记:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\cite{ctex},\parencite{ctex},\supercite{ctex}
\end{Verbatim}
在本文中将产生“\cite{ctex},\parencite{ctex},\supercite{ctex}”。
-就目前而言,在\myemph{除 3.0--3.3 之外版本的} biblatex 中,
-通过更复杂的设置,还可以满足例如被引用的文献按照引用顺序排序,
+就目前而言,在 biblatex 中,通过更复杂的设置,
+还可以满足例如被引用的文献按照引用顺序排序,
而未引用的文献按照西文文献在前、中文文献在后排序这样的需求,
-详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。
+详见 biblatex-caspervector 的文档\cupercite{biblatex-caspervector}。
除此之外,pkuthss 文档类还可能调用以下这些宏包:
\begin{itemize}
\item 启用 \verb|pkufont| 选项时会调用
- newtxtext 和 newtxmath\supercite{newtx} 宏包,
- 否则会调用 latexsym\supercite{latexsym} 宏包。
+ newtxtext 和 newtxmath\cupercite{newtx} 宏包,
+ 否则会调用 latexsym\cupercite{latexsym} 宏包。
\item 启用 \verb|pkufoot| 选项时会调用
- tikz\supercite{tikz} 和 scrextend\supercite{scrextend} 宏包。
+ tikz\cupercite{tikz} 和 scrextend\cupercite{scrextend} 宏包。
\item 启用 \verb|pkuspace| 选项时会调用
- tocloft\supercite{tocloft}、caption\supercite{caption} 和
- subcaption\supercite{subcaption} 宏包。
+ tocloft\cupercite{tocloft}、caption\cupercite{caption} 和
+ subcaption\cupercite{subcaption} 宏包。
\item 启用 \verb|spacing| 选项时会调用 setspace 和
- enumitem\supercite{enumitem} 宏包。
+ enumitem\cupercite{enumitem} 宏包。
\end{itemize}
因此在启用相应选项时,用户可以使用对应宏包所提供的功能。
@@ -311,7 +310,7 @@
通过修改 pkuthss 文档类的源文件进行自定义。
在目前常用的 \hologo{TeX} 系统中,
假设 pkuthss 的说明文档所在目录具有下述形式的路径:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
# 说明文档所在目录($TEXMFDIST 的形式见下面几行):
$TEXMFDIST/doc/latex/pkuthss/
# 若用户使用 Windows 下的 TeX Live 系统,则 $TEXMFDIST 一般类似于:
@@ -320,7 +319,7 @@
/usr/local/texlive/2015/texmf-dist
\end{Verbatim}
则其源文件所在目录应该位于以下目录:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
$TEXMFDIST/tex/latex/pkuthss/
\end{Verbatim}
@@ -340,16 +339,16 @@
此时,用户可以修改 \verb|pkuthss.cls| 里 \verb|\maketitle| 定义中
\verb|\thss@int@fillinblank| 宏的参数来改变
带下划线的空白的行数和行宽,其语法为:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\thss@int@fillinblank{行数}{行宽}{内容}
\end{Verbatim}
例如,如果“研究方向”一栏需要两行的空白,
可以将 \verb|pkuthss.cls| 里的
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\thss@int@fillinblank{1}{\thss@tmp@len}{\kaishu\@direction}
\end{Verbatim}
改为
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\thss@int@fillinblank{2}{\thss@tmp@len}{\kaishu\@direction}
\end{Verbatim}
当然,为了美观,可以将多于一行的部分移到封面中作者信息部分的最下方。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex new/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex
--- old/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex 2019-11-17 23:30:56.000000000 +0100
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-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
@@ -46,7 +46,7 @@
可能引起一些问题,详见第 \ref{sec:req} 节。
Windows 批处理对于 LF(\texttt{\string\n})换行的批处理文件支持有问题,
-解决方式见第 \ref{sec:compile} 节。
+诊断方式见第 \ref{sec:compile} 节。
Windows 的“记事本”程序在查看 LF(\texttt{\string\n})
换行的文本文件时存在着一些问题,
因此建议用户使用支持 LF 换行的文本编辑器编辑文件,
@@ -54,41 +54,22 @@
\section{上游宏包可能引起的问题}
-biblatex\supercite{biblatex} 宏包会自行设定 \verb|\bibname|,
+biblatex\cupercite{biblatex} 宏包会自行设定 \verb|\bibname|,
故会覆盖通过 \verb|\ctexset| 设定的参考文献列表标题。
使用 biblatex 的用户可以使用 \verb|\printbibliography| 的
\verb|title| 选项来手动设定参考文献列表的标题,例如:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\printbibliography[title = {文献}, ...] % “...”为其它选项。
\end{Verbatim}
-hyperref\supercite{hyperref} 宏包和一些宏包可能发生冲突。
+hyperref\cupercite{hyperref} 宏包和一些宏包可能发生冲突。
关于如何避免这些冲突,
可以参考 hyperref 宏包 README 文件中的“Package Compatibility”一节。
此文件通常和执行 \verb|texdoc hyperref|
时打开的 pdf 文件位于同一目录中。
-使用 \hologo{XeLaTeX} 的用户可能在已经安装字体的情况下遇到形如(其中
-\verb|xxxxxxxx| 为具体字体名)
-\begin{Verbatim}[frame = single, fontsize = {\small}]
-! fontspec error: "font-not-found"
-! The font "xxxxxxxx" cannot be found.
-! See the fontspec documentation for further information.
-! For immediate help type H <return>.
-\end{Verbatim}
-的错误。
-这种错误一般是(主要是非 Windows 平台的)用户采用了自定义的
-(包括大小写不同于原文件的)字体文件名,
-并改动 \verb|ctex.cfg| 等配置文件之后没有在调用
-pkuthss 文档类时加入 \verb|nofonts| 选项,
-又使用 \verb|xelatex| 编译造成的,使用
-\begin{Verbatim}[frame = single]
-\documentclass[nofonts, ...]{pkuthss} % “...”代表其它的选项。
-\end{Verbatim}
-即可解决此问题。
-
biber 运行时有一定概率出现形如(目录名可能稍有不同)
-\begin{Verbatim}[frame = single, fontsize = {\small}]
+\begin{Verbatim}
data source .../par-xxxxxxxx/cache-xxxxxxxx/
inc/lib/Biber/LaTeX/recode_data.xml not found in .
\end{Verbatim}
@@ -98,25 +79,29 @@
遇到这种情况时,删除掉上述临时目录及其所有内容,
再重新运行 biber 通常便可解决问题。
-caption\supercite{caption} 宏包对于其不认识的宏包均会提示
-\begin{Verbatim}[frame = single, fontsize = {\small}]
-Package caption Warning: Unsupported document class (or package) detected,
-(caption) usage of the caption package is not recommended.
-See the caption package documentation for explanation.
+就目前而言,amsthm\cupercite{amsthm} 宏包在后于 newtxmath\cupercite{newtx}
+宏包被调用时会导致以下的错误:
+\begin{Verbatim}
+! LaTeX Error: Command \openbox already defined.
+ Or name \end... illegal, see p.192 of the manual.
+\end{Verbatim}
+解决此问题的最简单方法是在通过
+\begin{Verbatim}
+\usepackage{amsthm}
+\end{Verbatim}
+调用 amsthm 宏包之前加入以下命令:
+\begin{Verbatim}
+\let\openbox\relax
\end{Verbatim}
-pkuthss 文档模版基于 ctexbook 文档类,而后者基于标准的 book 文档类,
-因此这个警告并不影响用户正常使用\footnote{%
- \url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.%
-}。
\section{文档格式可能存在的问题}
-学校对学位论文格式的规定\mbox{\supercite{pku-thesisstyle}}%
+学校对学位论文格式的规定\cupercite{pku-thesisstyle}%
显然没有考虑到非 MS Word 类排版工具的工作方式,
因此 pkuthss 文档模版只是对其要求的格式进行模仿,
而在一些小的细节上可能有所出入。
-biblatex-caspervector\supercite{biblatex-caspervector} 所实现的格式和
+biblatex-caspervector\cupercite{biblatex-caspervector} 所实现的格式和
\parencite{pku-thesisstyle} 的规定并不一致,
但其作者暂时没有精力也不愿意去实现后者所规定的比原格式更丑陋得多的格式。
@@ -124,7 +109,7 @@
关于 pkuthss 文档模版的意见和建议,
请在北大未名 BBS 的 MathTools 版或 pkuthss 项目主页的 issue tracker%
-\footnote{\url{https://gitlab.com/CasperVector/pkuthss/issues}.}%
+\footnote{\url{https://gitea.com/CasperVector/pkuthss/issues}.}%
上提出,
或通过电子邮件\footnote%
{\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex new/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
--- old/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex 2019-11-17 23:30:56.000000000 +0100
@@ -31,14 +31,14 @@
版权所有 \copyright\ 2008--2009 solvethis
\par
-版权所有 \copyright\ 2010--2017 Casper Ti. Vector
+版权所有 \copyright\ 2010--2019 Casper Ti. Vector
\vskip 1em
pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。
随 pkuthss 提供的模版源代码中,除以下文件
\begin{itemize}
- \item \verb|chap/copyright.tex|
- \item \verb|chap/originauth.tex|
+ \item \verb|chap/copy.tex|
+ \item \verb|chap/origin.tex|
\end{itemize}
以 New BSD License 发布,
以及参考文献和引用列表使用的样式文件版权声明见相应文件中说明以外,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex new/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
--- old/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex 2019-11-17 23:30:56.000000000 +0100
@@ -30,14 +30,10 @@
\raggedbottom
\section{1.3 版以后的更新记录}
-\VerbatimInput[
- tabsize = 4, fontsize = {\small}, baselinestretch = 1
-]{ChangeLog.txt}
+\VerbatimInput{ChangeLog.txt}
\section{1.3 及其以前版本的更新记录}
-\VerbatimInput[
- tabsize = 4, fontsize = {\small}, baselinestretch = 1.1
-]{ChangeLog-upto-1.3.txt}
+\VerbatimInput[baselinestretch = 1.1]{ChangeLog-upto-1.3.txt}
\flushbottom
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex new/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
--- old/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex 2019-11-17 23:30:56.000000000 +0100
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
+% Copyright (c) 2010-2012,2014-2015,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
@@ -33,7 +33,7 @@
pkuthss 文档模版由三部分构成:
\begin{itemize}
\item \textbf{pkuthss 文档类}:
- 其中根据学校的格式规范\mbox{\supercite{pku-thesisstyle}}%
+ 其中根据学校的格式规范\cupercite{pku-thesisstyle}%
实现了学位论文所需的基本格式要求,
主要包括对排版格式的设定和提供设置论文信息的命令;
此外也实现了学位论文中用户可能较多用到的一些额外功能,
@@ -43,7 +43,7 @@
说明文档即本文档,
在安装(见第 \ref{sec:req} 节)之后应该可以用 \hologo{TeX} 系统提供的
\verb|texdoc| 命令调出:
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
texdoc pkuthss
\end{Verbatim}
\item \textbf{论文模版}:
@@ -52,16 +52,16 @@
用户只须按照模版中的框架修改代码,即可写出自己的论文。
\end{itemize}
-在此之前,包括 dypang\supercite{dypang}、FerretL\supercite{FerretL}、%
-lwolf\supercite{lwolf}、Langpku\supercite{Langpku}、%
-solvethis\supercite{solvethis} 等的数位网友均做过学位论文模版的工作。
+在此之前,包括 dypang\cupercite{dypang}、FerretL\cupercite{FerretL}、%
+lwolf\cupercite{lwolf}、Langpku\cupercite{Langpku}、%
+solvethis\cupercite{solvethis} 等的数位网友均做过学位论文模版的工作。
本论文模版是 solvethis 的 pkuthss 模版的更新版本,
更新的重点是重构和对新文档类、宏包的支持。
pkuthss 文档模版现在的维护者是 Casper Ti. Vector\footnote%
{\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}。%
-pkuthss 文档模版目前托管在 GitLab 上,
+pkuthss 文档模版目前托管在 Gitea 上,
其项目主页是:\\
-\hspace*{\parindent}\url{https://gitlab.com/CasperVector/pkuthss}
+\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss}
% vim:ts=4:sw=4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/latexmkrc new/doc/latex/pkuthss/readme/latexmkrc
--- old/doc/latex/pkuthss/readme/latexmkrc 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/pkuthss/readme/latexmkrc 2019-11-17 23:30:56.000000000 +0100
@@ -0,0 +1,10 @@
+# Copyright (c) 2019 Casper Ti. Vector
+# Public domain.
+
+@default_files = ('pkuthss');
+$pdf_mode = 5;
+$dvipdf = "dvipdfmx %O -o %D %S";
+$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/doc/latex/pkuthss/readme/pkuthss-english.patch new/doc/latex/pkuthss/readme/pkuthss-english.patch
--- old/doc/latex/pkuthss/readme/pkuthss-english.patch 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/pkuthss-english.patch 2019-11-17 23:30:56.000000000 +0100
@@ -1,12 +1,12 @@
diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex
-index b930654..cfa6cd3 100644
+index 305792f..cfa6cd3 100644
--- a/doc/example/chap/abs.tex
+++ b/doc/example/chap/abs.tex
@@ -2,7 +2,7 @@
% Public domain.
\begin{cabstract}
-- \pkuthssffaq % 中文测试文字
+- \pkuthssffaq % 中文测试文字。
+ 中文摘要。
\end{cabstract}
@@ -100,13 +100,14 @@
-
% vim:ts=4:sw=4
diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
-index d7a575f..baed091 100644
+index 30e05de..4d6ee53 100644
--- a/doc/example/thesis.tex
+++ b/doc/example/thesis.tex
-@@ -14,53 +14,44 @@
- % 其它用户不用加入 nofonts 选项,加入之后反而会产生错误。
- \documentclass[UTF8]{pkuthss}
-
+@@ -16,54 +16,44 @@
+ % 如果的确须要使脚注按页编号的话,可以去掉后面 footmisc 包的注释。
+ % 注意:在启用此设定的情况下,可能要多编译一次以产生正确的脚注编号。
+ %\usepackage[perpage]{footmisc}
+-
-% 使用 biblatex 排版参考文献,并规定其格式(详见 biblatex-caspervector 的文档)。
-% 这里按照西文文献在前,中文文献在后排序(“sorting = ecnyt”);
-% 若须按照中文文献在前,西文文献在后排序,请设置“sorting = cenyt”;
@@ -116,10 +117,10 @@
+% 使用 biblatex 排版参考文献,并规定其格式(详见 biblatex 的文档)。
+\usepackage[backend = biber]{biblatex}
- % 按学校要求设定参考文献列表中的条目之内及之间的距离。
- \setlength{\bibitemsep}{3bp}
% 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss.cls。
\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
+ % 按学校要求设定参考文献列表的段间距。
+ \setlength{\bibitemsep}{3bp}
+\ctexset{
+ contentsname = {Contents},
@@ -180,21 +181,12 @@
\begin{document}
% 以下为正文之前的部分,默认不进行章节编号。
\frontmatter
-@@ -94,7 +85,7 @@
- \appendix
- % 排版参考文献列表。bibintoc 选项使“参考文献”出现在目录中;
- % 如果同时要使参考文献列表参与章节编号,可将“bibintoc”改为“bibnumbered”。
-- \printbibliography[heading = bibintoc]
-+ \printbibliography[heading = bibintoc, title = Reference]
- % 各附录。
- \include{chap/encl1}
-
diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index c2c951b..d453918 100644
+index b699685..e4e58b6 100644
--- a/tex/pkuthss-utf8.def
+++ b/tex/pkuthss-utf8.def
@@ -25,13 +25,13 @@
- [2017/03/01 v1.7.4 Labels and captions in UTF-8 encoding
+ [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
for the pkuthss document class]
-\def\label@ctitle{题目:}
@@ -215,10 +207,10 @@
\def\label@ckeywords{关键词:}
\def\label@ekeywords{KEYWORDS:\ }
diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index 6208799..a785d69 100644
+index 9e68dc3..4b8cb00 100644
--- a/tex/pkuthss.cls
+++ b/tex/pkuthss.cls
-@@ -300,7 +300,7 @@
+@@ -301,7 +301,7 @@
\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
\if@twoside
@@ -227,49 +219,49 @@
\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
\else
\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -349,13 +349,13 @@
- \zihao{1}%
- \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
- \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
-- {\bfseries{\cthesisname}}%
-+ {\bfseries{\ethesisname}}%
- }
- \vfill
- % Title of the thesis.
- {%
- \zihao{2}{\label@ctitle}%
-- \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
-+ \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}%
- }
- \vfill
- % Information about the author.
-@@ -363,19 +363,19 @@
- % Slightly adjust the line skip when using new font size.
- \zihao{3}\linespread{1.75}\selectfont
- \def\thss@tmp@len{0.56\textwidth}
-- \begin{tabular}{l(a){\extracolsep{0.2em}}c}
-- {\bfseries\label@cauthor} &
-- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor} \\
-- {\bfseries\label@studentid} &
-+ \begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c}
-+ {\bfseries\label@cauthor} & : &
-+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@eauthor} \\
-+ {\bfseries\label@studentid} & : &
- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid} \\
-- {\bfseries\label@school} &
-+ {\bfseries\label@school} & : &
- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school} \\
-- {\bfseries\label@cmajor} &
-- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor} \\
-- {\bfseries\label@direction} &
-+ {\bfseries\label@cmajor} & : &
-+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@emajor} \\
-+ {\bfseries\label@direction} & : &
- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\
-- {\bfseries\label@cmentor} &
-- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\
-+ {\bfseries\label@cmentor} & : &
-+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor} \\
- \end{tabular}%
- }
- \vfill
+@@ -347,13 +347,13 @@
+ \zihao{1}%
+ \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
+ \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
+- {\bfseries{\cthesisname}}%
++ {\bfseries{\ethesisname}}%
+ }
+ \vfill
+ % Title of the thesis.
+ {%
+ \zihao{2}{\label(a)ctitle}\linespread{1.6}\selectfont%
+- \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
++ \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}%
+ }
+ \vfill
+ % Information about the author.
+@@ -361,19 +361,19 @@
+ % Slightly adjust the line skip when using new font size.
+ \zihao{3}\linespread{1.75}\selectfont
+ \def\thss@tmp@len{0.56\textwidth}
+- \begin{tabular}{l(a){\extracolsep{0.2em}}c}
+- {\bfseries\label@cauthor} &
+- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor} \\
+- {\bfseries\label@studentid} &
++ \begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c}
++ {\bfseries\label@cauthor} & : &
++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@eauthor} \\
++ {\bfseries\label@studentid} & : &
+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid} \\
+- {\bfseries\label@school} &
++ {\bfseries\label@school} & : &
+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school} \\
+- {\bfseries\label@cmajor} &
+- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor} \\
+- {\bfseries\label@direction} &
++ {\bfseries\label@cmajor} & : &
++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@emajor} \\
++ {\bfseries\label@direction} & : &
+ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\
+- {\bfseries\label@cmentor} &
+- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\
++ {\bfseries\label@cmentor} & : &
++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor} \\
+ \end{tabular}%
+ }
+ \vfill
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/pkuthss.bib new/doc/latex/pkuthss/readme/pkuthss.bib
--- old/doc/latex/pkuthss/readme/pkuthss.bib 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/pkuthss.bib 2019-11-17 23:30:56.000000000 +0100
@@ -1,3 +1,14 @@
+@online{amsthm,
+ author = {{Publications Technical Group, American Mathematical Society}},
+ title = {Using the amsthm Package},
+ edition = {Ver.\ 2.20.3},
+ type = {M/OL},
+ date = {2017-09},
+ url = {https://ctan.org/pkg/amsthm},
+ urldate = {2019-11-15},
+ language = {english},
+}
+
@online{biber,
author = {Kime, Philip and Charette, Fran\c{c}ois},
title = {Biber: A backend bibliography processor for biblatex},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/pkuthss.tex new/doc/latex/pkuthss/readme/pkuthss.tex
--- old/doc/latex/pkuthss/readme/pkuthss.tex 2018-07-02 22:40:31.000000000 +0200
+++ new/doc/latex/pkuthss/readme/pkuthss.tex 2019-11-17 23:30:56.000000000 +0100
@@ -1,7 +1,7 @@
% Documentation for pkuthss.
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018 Casper Ti. Vector
+% Copyright (c) 2010-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
@@ -31,18 +31,25 @@
backend = biber, style = caspervector, utf8,
sorting = ecnyt, giveninits = true, sortgiveninits = true
]{biblatex}
-\usepackage{fancyvrb, hologo}
+\usepackage{iftex, fancyvrb, hologo}
-\setlength{\hfuzz}{3pt}
+\hypersetup{colorlinks = true, allcolors = blue}
\ctexset{linestretch = 2\ccwd}
-\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
+\setlength{\hfuzz}{3pt}
\setlength{\bibitemsep}{3bp}
+\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
-\hypersetup{colorlinks = true, allcolors = blue}
+\newcommand*{\cupercite}[1]{\supercite{#1}\mbox{}}
\newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
\newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}}
-\newcommand{\docversion}{v1.8.0}
+\RecustomVerbatimEnvironment{Verbatim}{Verbatim}%
+ {frame = single, tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}}
+\RecustomVerbatimCommand{\VerbatimInput}{VerbatimInput}{
+ fontsize = {\small}, baselinestretch = 1,
+ tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
+}
+\newcommand*{\docversion}{v1.8.2}
\pkuthssinfo{
cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
ctitle = {北京大学学位论文模版\\pkuthss \docversion},
@@ -53,7 +60,7 @@
cauthor = {盖茨波·钛·维克托},
eauthor = {Casper Ti.\ Vector},
studentid = {00910???},
- date = {\zhdigits{2018}年\zhnumber{7}月},
+ date = {\zhdigits{2019} 年 \zhnumber{11} 月},
school = {化学与分子工程学院},
cmajor = {化学(?)}, emajor = {Chemistry ... ?},
direction = {据说 Casper 自己也不知道},
Binary files old/doc/latex/pkuthss/readme.pdf and new/doc/latex/pkuthss/readme.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkuthss.doc.tlpobj new/tlpkg/tlpobj/pkuthss.doc.tlpobj
--- old/tlpkg/tlpobj/pkuthss.doc.tlpobj 2019-02-28 03:59:43.000000000 +0100
+++ new/tlpkg/tlpobj/pkuthss.doc.tlpobj 2020-03-24 02:03:13.000000000 +0100
@@ -1,9 +1,10 @@
name pkuthss.doc
category Package
-revision 48124
+revision 54512
shortdesc doc files of pkuthss
relocated 1
-docfiles size=165
+docfiles size=166
+ RELOC/doc/latex/pkuthss/README.txt
RELOC/doc/latex/pkuthss/example.pdf
RELOC/doc/latex/pkuthss/example/Make.bat
RELOC/doc/latex/pkuthss/example/Makefile
@@ -17,13 +18,13 @@
RELOC/doc/latex/pkuthss/example/chap/origin.tex
RELOC/doc/latex/pkuthss/example/ctex-fontset-pkuthss.def
RELOC/doc/latex/pkuthss/example/ctexopts.cfg
+ RELOC/doc/latex/pkuthss/example/latexmkrc
RELOC/doc/latex/pkuthss/example/spine.tex
RELOC/doc/latex/pkuthss/example/thesis.bib
RELOC/doc/latex/pkuthss/example/thesis.tex
- RELOC/doc/latex/pkuthss/readme.pdf
+ RELOC/doc/latex/pkuthss/pkuthss.pdf
RELOC/doc/latex/pkuthss/readme/ChangeLog-upto-1.3.txt
RELOC/doc/latex/pkuthss/readme/ChangeLog.txt
- RELOC/doc/latex/pkuthss/readme/Makefile
RELOC/doc/latex/pkuthss/readme/chap/origin.tex
RELOC/doc/latex/pkuthss/readme/chap/pkuthss-abs.tex
RELOC/doc/latex/pkuthss/readme/chap/pkuthss-ack.tex
@@ -34,6 +35,7 @@
RELOC/doc/latex/pkuthss/readme/chap/pkuthss-copy.tex
RELOC/doc/latex/pkuthss/readme/chap/pkuthss-encl1.tex
RELOC/doc/latex/pkuthss/readme/chap/pkuthss-intro.tex
+ RELOC/doc/latex/pkuthss/readme/latexmkrc
RELOC/doc/latex/pkuthss/readme/pkuthss-english.patch
RELOC/doc/latex/pkuthss/readme/pkuthss.bib
RELOC/doc/latex/pkuthss/readme/pkuthss.tex
++++++ pkuthss.tar.xz ++++++
Binary files old/tex/latex/pkuthss/pkulogo.pdf and new/tex/latex/pkuthss/pkulogo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-gbk.def new/tex/latex/pkuthss/pkuthss-gbk.def
--- old/tex/latex/pkuthss/pkuthss-gbk.def 2018-07-02 22:40:31.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss-gbk.def 2019-11-17 23:30:56.000000000 +0100
@@ -22,7 +22,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-gbk.def}
- [2018/07/02 v1.8.0 Labels and captions in GBK encoding
+ [2019/11/17 v1.8.2 Labels and captions in GBK encoding
for the pkuthss document class]
\def\label@ctitle{��Ŀ��}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-utf8.def new/tex/latex/pkuthss/pkuthss-utf8.def
--- old/tex/latex/pkuthss/pkuthss-utf8.def 2018-07-02 22:40:31.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss-utf8.def 2019-11-17 23:30:56.000000000 +0100
@@ -22,7 +22,7 @@
% pkuword.eps
\ProvidesFile{pkuthss-utf8.def}
- [2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
+ [2019/11/17 v1.8.2 Labels and captions in UTF-8 encoding
for the pkuthss document class]
\def\label@ctitle{题目:}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss.cls new/tex/latex/pkuthss/pkuthss.cls
--- old/tex/latex/pkuthss/pkuthss.cls 2018-07-02 22:40:31.000000000 +0200
+++ new/tex/latex/pkuthss/pkuthss.cls 2019-11-17 23:30:56.000000000 +0100
@@ -1,7 +1,7 @@
% Peking University dissertation document class
%
% Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-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 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{pkuthss}
- [2018/07/02 v1.8.0 Peking University dissertation document class]
+ [2019/11/17 v1.8.2 Peking University dissertation document class]
% eg. `\thss@int@boolopt{spacing}{true}' will expand to:
% \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -65,6 +65,9 @@
% Prevent fontspec (loaded by xeCJK) from interfering with newtxmath.
\ifthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
+% Work around the `\lvert already defined' error.
+% cf. <https://github.com/CTeX-org/ctex-kit/issues/454>.
+\ifthss@opt@pkufont\RequirePackage{amsmath}\fi
% pkuthss is based on ctexbook; we use `xiao 4' as default font size.
\LoadClass[zihao = -4]{ctexbook}[2014/03/06]
% ctex 2.x no longer loads ifpdf and ifxetex by itself.
@@ -123,7 +126,7 @@
}
% Use circled numbers as footnote symbols. Does not affect title page, but
% footnote is rarely used in dissertation covers ;)
- \renewcommand\thefootnote%
+ \renewcommand*{\thefootnote}%
{\protect\thss@int@circled{\arabic{footnote}}}
% Provides utility to modify footnote spacing.
% Option used to make sure it does not render interleaf pages totally blank.
@@ -167,7 +170,7 @@
\ifthss@opt@spechap
% This command is used to start a chapter without numbering, and correctly set
% up the headers and footers in the chapter.
- \newcommand\specialchap[1]{%
+ \newcommand{\specialchap}[1]{%
\chapter*{#1}\addcontentsline{toc}{chapter}{#1}
\markboth{#1}{}\phantomsection%
}
@@ -201,7 +204,7 @@
\let\thss@tmp@maketitle\maketitle
% NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might
% not act as expected.
- \renewcommand\maketitle{\setpdfproperties\thss@tmp@maketitle}
+ \renewcommand{\maketitle}{\setpdfproperties\thss@tmp@maketitle}
\fi
}
@@ -244,7 +247,7 @@
% Set up page layout.
\geometry{
a4paper, hmargin = 2.6cm, top = 2.92cm, bottom = 3.03cm,
- headheight = 0.45cm, headsep = 0.55cm, footskip = 1.05cm
+ headheight = 0.45cm, headsep = 0.59cm, footskip = 1.05cm
}
% Set up chapter/section/... captions.
@@ -259,11 +262,11 @@
beforeskip = {0bp}, afterskip = {18bp plus 0.2ex},
nameformat = {}, titleformat = {}
}, section =
- {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+ {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
subsection =
- {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+ {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
subsubsection =
- {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}
+ {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}}
}
\ifthss@opt@ugly
\ctexset{
@@ -341,7 +344,7 @@
\renewcommand{\maketitle}{%
\thss@int@pdfmark{\titlepagename}{titlepage}
% Make the title page centered.
- \begin{titlepage}\begin{center}
+ \begin{titlepage}\begingroup\centering
% Emblem and inscription of the university, and type of thesis.
{%
\zihao{1}%
@@ -379,7 +382,7 @@
\vfill
% Date.
{\zihao{-2}\@date}
- \end{center}\end{titlepage}%
+ \par\endgroup\end{titlepage}%
}
% Typeset the Chinese abstract.
Binary files old/tex/latex/pkuthss/pkuword.pdf and new/tex/latex/pkuthss/pkuword.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkuthss.tlpobj new/tlpkg/tlpobj/pkuthss.tlpobj
--- old/tlpkg/tlpobj/pkuthss.tlpobj 2019-02-28 03:59:43.000000000 +0100
+++ new/tlpkg/tlpobj/pkuthss.tlpobj 2020-03-24 02:03:13.000000000 +0100
@@ -1,6 +1,6 @@
name pkuthss
category Package
-revision 48124
+revision 54512
shortdesc LaTeX template for dissertations in Peking University
relocated 1
longdesc The package provides a simple, clear and flexible LaTeX
@@ -13,9 +13,8 @@
RELOC/tex/latex/pkuthss/pkuthss.cls
RELOC/tex/latex/pkuthss/pkuword.eps
RELOC/tex/latex/pkuthss/pkuword.pdf
-catalogue-contact-repository https://gitlab.com/CasperVector/pkuthss
+catalogue-contact-repository https://gitea.com/CasperVector/pkuthss
catalogue-ctan /macros/latex/contrib/pkuthss
-catalogue-date 2018-07-02 09:18:23 +0200
-catalogue-license other-free
+catalogue-license lppl1.3 bsd pd
catalogue-topics dissertation class chinese
-catalogue-version 1.8.0
+catalogue-version 1.8.2
++++++ plantuml.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/plantuml/CHANGELOG.md new/doc/lualatex/plantuml/CHANGELOG.md
--- old/doc/lualatex/plantuml/CHANGELOG.md 2018-06-04 22:52:57.000000000 +0200
+++ new/doc/lualatex/plantuml/CHANGELOG.md 2019-09-24 22:07:49.000000000 +0200
@@ -1,14 +1,22 @@
# Changelog
+
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [0.3.0] - 2019-09-23
+
+## Added
+
+- Added support for UTF-8 filenames.
+- Added `example-component-diagram.tex`. Refs [#2](https://github.com/latextemplates/plantuml/issues/9).
+
## [0.2.3] - 2018-06-04
## Added
-- Add `release.sh` to CTAN upload-
+- Add `release.sh` to CTAN upload
## Removed
@@ -43,7 +51,8 @@
Initial public release
-[unreleased]: https://github.com/latextemplates/plantuml/compare/0.2.3...HEAD
+[unreleased]: https://github.com/latextemplates/plantuml/compare/0.3.0...HEAD
+[0.3.0]: https://github.com/latextemplates/plantuml/compare/0.2.3...0.3.0
[0.2.3]: https://github.com/latextemplates/plantuml/compare/0.2.2...0.2.3
[0.2.2]: https://github.com/latextemplates/plantuml/compare/0.2.1...0.2.2
[0.2.1]: https://github.com/latextemplates/plantuml/compare/0.2.0...0.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/plantuml/README.md new/doc/lualatex/plantuml/README.md
--- old/doc/lualatex/plantuml/README.md 2018-06-04 22:52:57.000000000 +0200
+++ new/doc/lualatex/plantuml/README.md 2019-09-24 22:07:49.000000000 +0200
@@ -1,6 +1,6 @@
# plantuml
-Version 0.2.3
+Version 0.3.0
> A LuaLaTeX package for PlantUML in LaTeX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/plantuml/example-component-diagram.tex new/doc/lualatex/plantuml/example-component-diagram.tex
--- old/doc/lualatex/plantuml/example-component-diagram.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/plantuml/example-component-diagram.tex 2019-09-24 22:07:49.000000000 +0200
@@ -0,0 +1,32 @@
+\documentclass{scrartcl}
+\usepackage{graphics}
+
+% Enables inclusion of SVG graphics - 1:1 approach
+% This is NOT the approach of https://ctan.org/pkg/svg-inkscape
+% which allows text in SVG to be typeset using LaTeX.
+% We just include the SVG as is.
+\usepackage{epstopdf}
+\epstopdfDeclareGraphicsRule{.svg}{pdf}{.pdf}{%
+ inkscape -z --file=#1 --export-pdf=\OutputFile
+}
+
+\usepackage[output=svg]{plantuml}
+
+\begin{document}
+\begin{plantuml}
+@startuml
+() "Interface 2" as I2
+() "Interface 3" as I3
+
+[component 1] as c1
+[component 2] as c2
+[component 3] as c3
+
+c1 -- I2
+c1 -- I3
+
+I2 )-- c2
+I3 )-- c3
+@enduml
+\end{plantuml}
+\end{document}
Binary files old/doc/lualatex/plantuml/plantuml.pdf and new/doc/lualatex/plantuml/plantuml.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plantuml.doc.tlpobj new/tlpkg/tlpobj/plantuml.doc.tlpobj
--- old/tlpkg/tlpobj/plantuml.doc.tlpobj 2019-02-28 03:59:46.000000000 +0100
+++ new/tlpkg/tlpobj/plantuml.doc.tlpobj 2019-09-25 01:53:59.000000000 +0200
@@ -1,14 +1,15 @@
name plantuml.doc
category Package
-revision 47924
+revision 52175
shortdesc doc files of plantuml
relocated 1
-docfiles size=24
+docfiles size=25
RELOC/doc/lualatex/plantuml/CHANGELOG.md
RELOC/doc/lualatex/plantuml/README.md
RELOC/doc/lualatex/plantuml/example-class-relations--latex.tex
RELOC/doc/lualatex/plantuml/example-class-relations--svg.png
RELOC/doc/lualatex/plantuml/example-class-relations--svg.tex
+ RELOC/doc/lualatex/plantuml/example-component-diagram.tex
RELOC/doc/lualatex/plantuml/example-minimal.png
RELOC/doc/lualatex/plantuml/example-minimal.tex
RELOC/doc/lualatex/plantuml/plantuml.pdf
++++++ plantuml.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/plantuml/plantuml.lua new/tex/lualatex/plantuml/plantuml.lua
--- old/tex/lualatex/plantuml/plantuml.lua 2018-03-08 23:56:58.000000000 +0100
+++ new/tex/lualatex/plantuml/plantuml.lua 2019-09-24 22:07:49.000000000 +0200
@@ -22,7 +22,7 @@
end
texio.write("Executing PlantUML... ")
- local cmd = "java -jar " .. plantUmlJar .. " -t"
+ local cmd = "java -jar " .. plantUmlJar .. " -charset UTF-8 -t"
if (mode == "latex") then
cmd = cmd .. "latex:nopreamble"
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/plantuml/plantuml.sty new/tex/lualatex/plantuml/plantuml.sty
--- old/tex/lualatex/plantuml/plantuml.sty 2018-06-04 22:52:57.000000000 +0200
+++ new/tex/lualatex/plantuml/plantuml.sty 2019-09-24 22:07:49.000000000 +0200
@@ -24,6 +24,11 @@
\RequirePackage{adjustbox}
+% \jobname has a probrem of encodeing
+% if your latex filename include multibyte string
+% you need to redefine PlantUMLJobname to fix
+\def\PlantUMLJobname{\jobname}
+
\ExplSyntaxOn
\keys_define:nn { plantuml } {
output .choices:nn = {
@@ -68,12 +73,12 @@
}
\fi
\NewDocumentEnvironment{plantuml}{}{%
- \VerbatimOut{\jobname-plantuml.txt}}
+ \VerbatimOut{\PlantUMLJobname-plantuml.txt}}
{%
\endVerbatimOut
\ifluatex
\directlua{
- local jobname=\luastring{\jobname}
+ local jobname=\luastring{\PlantUMLJobname}
local plantUmlMode=\luastring{\PlantUmlMode}
require("plantuml.lua")
convertPlantUmlToTikz(jobname, plantUmlMode)
@@ -85,10 +90,10 @@
\fi
\ifthenelse{\equal{\PlantUmlMode}{latex}}{
\begin{adjustbox}{max width=\linewidth}
- \input{\jobname-plantuml.latex}
+ \input{\PlantUMLJobname-plantuml.latex}
\end{adjustbox}
}{
- \includegraphics[width=\maxwidth{\textwidth}]{\jobname-plantuml.\PlantUmlMode}
+ \includegraphics[width=\maxwidth{\textwidth}]{\PlantUMLJobname-plantuml.\PlantUmlMode}
}
}
\or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plantuml.tlpobj new/tlpkg/tlpobj/plantuml.tlpobj
--- old/tlpkg/tlpobj/plantuml.tlpobj 2019-02-28 03:59:46.000000000 +0100
+++ new/tlpkg/tlpobj/plantuml.tlpobj 2019-09-25 01:53:59.000000000 +0200
@@ -1,6 +1,6 @@
name plantuml
category Package
-revision 47924
+revision 52175
shortdesc Support for rendering UML diagrams using the syntax and tool of PlantUML
relocated 1
longdesc The package provides support for rendering UML diagrams using
@@ -10,11 +10,11 @@
runfiles size=2
RELOC/tex/lualatex/plantuml/plantuml.lua
RELOC/tex/lualatex/plantuml/plantuml.sty
-catalogue-contact-bugs https://github.com/latextemplates/plantuml/issues
-catalogue-contact-home https://latextemplates.github.io/plantuml/
-catalogue-contact-repository https://github.com/latextemplates/plantuml
+catalogue-contact-bugs https://github.com/koppor/plantuml/issues
+catalogue-contact-home https://koppor.github.io/plantuml/
+catalogue-contact-repository https://github.com/koppor/plantuml/
catalogue-ctan /macros/luatex/latex/plantuml
-catalogue-date 2018-06-04 06:15:17 +0200
+catalogue-date 2019-09-23 22:24:38 +0200
catalogue-license lppl1.3c
catalogue-topics uml luatex use-lua
-catalogue-version 0.2.3
+catalogue-version 0.3.0
1
0
Hello community,
here is the log from the commit of package texlive-specs-q for openSUSE:Factory checked in at 2020-05-29 21:18:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-q (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-q"
Fri May 29 21:18:42 2020 rev:40 rq:806925 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.changes 2019-11-07 23:11:40.172215585 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/texlive-specs-q.changes 2020-05-29 21:30:43.121460681 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <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:
----
nanicolle.doc.tar.xz
nanicolle.tar.xz
newcomputermodern.doc.tar.xz
newcomputermodern.tar.xz
newfloat.doc.tar.xz
newfloat.tar.xz
noto-emoji.doc.tar.xz
noto-emoji.tar.xz
nth.tar.xz
numberpt.doc.tar.xz
numberpt.tar.xz
optex.doc.tar.xz
optex.tar.xz
outerhbox.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-q.spec ++++++
++++ 40436 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/texlive-specs-q.spec
++++++ nameauth.doc.tar.xz ++++++
++++ 1934 lines of diff (skipped)
++++++ nameauth.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nameauth/nameauth.sty new/tex/latex/nameauth/nameauth.sty
--- old/tex/latex/nameauth/nameauth.sty 2017-03-23 22:29:07.000000000 +0100
+++ new/tex/latex/nameauth/nameauth.sty 2020-02-27 23:05:40.000000000 +0100
@@ -9,17 +9,18 @@
%% --------:| ----------------------------------------------------------------
%% nameauth:| Name authority mechanism for consistency in text and index
%% Author:| Charles P. Schaum
-%% E-mail:| charles dot schaum at comcast dot net
+%% E-mail:| charles dot schaum(a)comcast.net
%% License:| Released under the LaTeX Project Public License 1.3c or later
%% See:| http://www.latex-project.org/lppl.txt
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{nameauth}
- [2017/03/22 3.2 Name authority mechanism for consistency in text and index]
+ [2020/02/26 3.4 Name authority mechanism for consistency in text and index]
\newif\if@nameauth@InAKA
\newif\if@nameauth@InName
\newif\if@nameauth@Xref
\newif\if@nameauth@Lock
+\newif\if@nameauth@BigLock
\newif\if@nameauth@InHook
\newif\if@nameauth@DoIndex
\newif\if@nameauth@SkipIndex
@@ -29,6 +30,8 @@
\newif\if@nameauth@MainFormat
\newif\if@nameauth@AKAFormat
\newif\if@nameauth@LocalNames
+\newif\if@nameauth@OldReset
+\newif\if@nameauth@OldPass
\newif\if@nameauth@Forget
\newif\if@nameauth@Subvert
\newif\if@nameauth@FirstFormat
@@ -76,6 +79,8 @@
\DeclareOption{frontmatter}{\@nameauth@MainFormatfalse}
\DeclareOption{formatAKA}{\@nameauth@AKAFormattrue}
\DeclareOption{oldAKA}{\@nameauth@OldAKAtrue}
+\DeclareOption{oldreset}{\@nameauth@OldResettrue}
+\DeclareOption{oldpass}{\@nameauth@OldPasstrue}
\DeclareOption{index}{\@nameauth@DoIndextrue}
\DeclareOption{noindex}{\@nameauth@DoIndexfalse}
\DeclareOption{pretag}{\@nameauth@Pretagtrue}
@@ -187,8 +192,8 @@
}
\newcommand*\@nameauth@Error[2]
{%
- \edef\msga{#2 SNN field empty}%
- \edef\msgb{#2 SNN field malformed}%
+ \edef\msga{#2 SNN arg empty}%
+ \edef\msgb{#2 SNN arg malformed}%
\protected@edef\testname{\trim@spaces{#1}}%
\protected@edef\testroot{\@nameauth@Root{#1}}%
\ifx\testname\@empty
@@ -200,15 +205,26 @@
}
\newcommandx*\@nameauth@Name[3][1=\@empty, 3=\@empty]
{%
+ \if@nameauth@BigLock\@nameauth@Locktrue\fi
\unless\if@nameauth@Lock
\@nameauth@Locktrue%
\@nameauth@InNametrue%
\@nameauth@Error{#2}{macro \string\@nameauth@name}%
\if@nameauth@JustIndex
\IndexName[#1]{#2}[#3]%
- \@nameauth@InNamefalse%
- \@nameauth@Lockfalse%
- \@nameauth@JustIndexfalse%
+ \if@nameauth@OldPass
+ \@nameauth@JustIndexfalse%
+ \else
+ \if@nameauth@OldReset
+ \@nameauth@FullNamefalse%
+ \@nameauth@FirstNamefalse%
+ \@nameauth@JustIndexfalse%
+ \else
+ \global\@nameauth@FullNamefalse%
+ \global\@nameauth@FirstNamefalse%
+ \global\@nameauth@JustIndexfalse%
+ \fi
+ \fi
\else
\if@nameauth@Forget
\ForgetName[#1]{#2}[#3]%
@@ -225,28 +241,46 @@
\@nameauth@Parse[#1]{#2}[#3]{!NF}%
\fi
\unless\if@nameauth@SkipIndex\IndexName[#1]{#2}[#3]\fi
- \@nameauth@SkipIndexfalse%
- \@nameauth@Forgetfalse%
- \@nameauth@Subvertfalse%
- \@nameauth@Lockfalse%
- \@nameauth@InNamefalse%
- \@nameauth@NBSPfalse%
- \@nameauth@NBSPXfalse%
- \@nameauth@DoCapsfalse%
- \@nameauth@Accentfalse%
- \@nameauth@AllThisfalse%
- \@nameauth@ShowCommafalse%
- \@nameauth@NoCommafalse%
- \@nameauth@RevThisfalse%
- \@nameauth@RevThisCommafalse%
- \@nameauth@ShortSNNfalse%
- \@nameauth@EastFNfalse%
+ \if@nameauth@OldReset
+ \@nameauth@SkipIndexfalse%
+ \@nameauth@Forgetfalse%
+ \@nameauth@Subvertfalse%
+ \@nameauth@NBSPfalse%
+ \@nameauth@NBSPXfalse%
+ \@nameauth@DoCapsfalse%
+ \@nameauth@Accentfalse%
+ \@nameauth@AllThisfalse%
+ \@nameauth@ShowCommafalse%
+ \@nameauth@NoCommafalse%
+ \@nameauth@RevThisfalse%
+ \@nameauth@RevThisCommafalse%
+ \@nameauth@ShortSNNfalse%
+ \@nameauth@EastFNfalse%
+ \else
+ \global\@nameauth@SkipIndexfalse%
+ \global\@nameauth@Forgetfalse%
+ \global\@nameauth@Subvertfalse%
+ \global\@nameauth@NBSPfalse%
+ \global\@nameauth@NBSPXfalse%
+ \global\@nameauth@DoCapsfalse%
+ \global\@nameauth@Accentfalse%
+ \global\@nameauth@AllThisfalse%
+ \global\@nameauth@ShowCommafalse%
+ \global\@nameauth@NoCommafalse%
+ \global\@nameauth@RevThisfalse%
+ \global\@nameauth@RevThisCommafalse%
+ \global\@nameauth@ShortSNNfalse%
+ \global\@nameauth@EastFNfalse%
+ \fi
\fi
+ \@nameauth@Lockfalse%
+ \@nameauth@InNamefalse%
\fi
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
}
\newcommandx*\@nameauth@Parse[4][1=\@empty, 3=\@empty]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\let\ex\expandafter%
\protected@edef\arga{\trim@spaces{#1}}%
@@ -365,6 +399,7 @@
}
\newcommand*\@nameauth@NonWest[1]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\unless\ifcsname#1\endcsname
\@nameauth@FirstFormattrue%
@@ -411,12 +446,18 @@
\unless\ifcsname#1\endcsname
\unless\if@nameauth@InAKA\csgdef{#1}{}\fi
\fi
- \@nameauth@FullNamefalse%
- \@nameauth@FirstNamefalse%
+ \if@nameauth@OldReset
+ \@nameauth@FullNamefalse%
+ \@nameauth@FirstNamefalse%
+ \else
+ \global\@nameauth@FullNamefalse%
+ \global\@nameauth@FirstNamefalse%
+ \fi
\fi
}
\newcommand*\@nameauth@West[1]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\unless\ifcsname#1\endcsname
\@nameauth@FirstFormattrue%
@@ -459,12 +500,18 @@
\unless\ifcsname#1\endcsname
\unless\if@nameauth@InAKA\csgdef{#1}{}\fi
\fi
- \@nameauth@FullNamefalse%
- \@nameauth@FirstNamefalse%
+ \if@nameauth@OldReset
+ \@nameauth@FullNamefalse%
+ \@nameauth@FirstNamefalse%
+ \else
+ \global\@nameauth@FullNamefalse%
+ \global\@nameauth@FirstNamefalse%
+ \fi
\fi
}
\newcommand*\@nameauth@Hook[1]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\@nameauth@InHooktrue%
\protected@edef\test{#1}%
@@ -507,45 +554,124 @@
\fi
\fi
\fi
- \@nameauth@FirstFormatfalse%
+ \if@nameauth@OldReset
+ \@nameauth@FirstFormatfalse%
+ \else
+ \global\@nameauth@FirstFormatfalse%
+ \fi
\@nameauth@InHookfalse%
\fi
}
\newcommand*\@nameauth@Index[2]
{%
- \def\cseq{#1}%
\let\ex\expandafter%
- \ifcsname\cseq!TAG\endcsname
- \protected@edef\Tag{\csname#1!TAG\endcsname}%
- \ex\def\ex\ShortTag\ex{\ex\@nameauth@TrimTag\ex{\Tag}}%
- \fi
\if@nameauth@DoIndex
- \ifcsname\cseq!TAG\endcsname
- \ifcsname\cseq!PRE\endcsname
- \if@nameauth@Xref%
- \index%
- {\csname\cseq!PRE\endcsname#2\ShortTag}%
+ \ifcsname#1!TAG\endcsname
+ \protected@edef\Tag{\csname#1!TAG\endcsname}%
+ \ex\def\ex\ShortTag\ex{\ex\@nameauth@TrimTag\ex{\Tag}}%
+ \ifcsname#1!PRE\endcsname
+ \protected@edef\Pre{\csname#1!PRE\endcsname}%
+ \if@nameauth@Xref
+ \protected@edef\Entry{\Pre#2\ShortTag}%
\else
- \index%
- {\csname\cseq!PRE\endcsname#2\csname\cseq!TAG\endcsname}%
+ \protected@edef\Entry{\Pre#2\Tag}%
\fi
\else
\if@nameauth@Xref
- \index{#2\ShortTag}%
+ \protected@edef\Entry{#2\ShortTag}%
\else
- \index{#2\csname\cseq!TAG\endcsname}%
+ \protected@edef\Entry{#2\Tag}%
\fi
\fi
\else
- \ifcsname\cseq!PRE\endcsname
- \index{\csname\cseq!PRE\endcsname#2}%
+ \ifcsname#1!PRE\endcsname
+ \protected@edef\Pre{\csname#1!PRE\endcsname}%
+ \protected@edef\Entry{\Pre#2}%
\else
- \index{#2}%
+ \protected@edef\Entry{#2}%
\fi
\fi
+ \ex\index\ex{\Entry}%
\fi
}
\newcommand*\@nameauth@Actual{@}
+\newcommandx*\@nameauth@Debug[3][1=\@empty, 3=\@empty]
+{%
+ \bgroup%
+ \def\index##1{##1}%
+ \@nameauth@DoIndextrue%
+ \protected@edef\arga{\trim@spaces{#1}}%
+ \protected@edef\argc{\trim@spaces{#3}}%
+ \protected@edef\suffb{\@nameauth@Suffix{#2}}%
+ \def\csb{\@nameauth@Clean{#2}}%
+ \def\csbc{\@nameauth@Clean{#2,#3}}%
+ \def\csab{\@nameauth@Clean{#1!#2}}%
+ \@nameauth@Error{#2}{macro \string\@nameauth@Debug}%
+ \ifx\arga\@empty
+ \ifx\argc\@empty
+ \ifdefined\ShortIdxEntry
+ \csundef{\csb!PRE}%
+ \csundef{\csb!TAG}%
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csb%
+ \fi
+ \fi
+ \else
+ \ifx\suffb\@empty
+ \ifdefined\ShortIdxEntry
+ \csundef{\csbc!PRE}%
+ \csundef{\csbc!TAG}%
+ \csundef{\csbc!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csbc!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csbc%
+ \fi
+ \fi
+ \else
+ \ifdefined\ShortIdxEntry
+ \csundef{\csb!PRE}%
+ \csundef{\csb!TAG}%
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csb%
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ifdefined\ShortIdxEntry
+ \csundef{\csab!PRE}%
+ \csundef{\csab!TAG}%
+ \csundef{\csab!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csab!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csab%
+ \fi
+ \fi
+ \fi
+ \global\undef{\LongIdxEntry}%
+ \global\undef{\ShortIdxEntry}%
+ \egroup%
+}
\newcommand*\CapThis{\@nameauth@DoCapstrue}
\newcommand*\AccentCapThis%
{\@nameauth@Accenttrue\@nameauth@DoCapstrue}
@@ -617,6 +743,11 @@
\newcommand*\IndexActual[1]
{\global\renewcommand*\@nameauth@Actual{#1}}
\newcommand*\SeeAlso{\@nameauth@SeeAlsotrue}
+\newcommand*\ShowPattern{\@nameauth@Debug}
+\newcommand*\ShowIdxPageref%
+ {\def\LongIdxEntry{}\ShowPattern}
+\WithSuffix{\newcommand*}\ShowIdxPageref*%
+ {\def\ShortIdxEntry{}\ShowPattern}
\newcommand*\NameParser
{%
\if@nameauth@InHook
@@ -705,6 +836,11 @@
\newcommand\FName{\@nameauth@FirstNametrue\NameauthFName}
\WithSuffix{\newcommand*}\FName*%
{\@nameauth@FirstNametrue\NameauthFName}
+\newcommand*\IndexProtect
+{%
+ \@nameauth@DoIndexfalse%
+ \@nameauth@BigLocktrue%
+}
\newcommandx*\IndexName[3][1=\@empty, 3=\@empty]
{%
\protected@edef\arga{\trim@spaces{#1}}%
@@ -796,9 +932,11 @@
\fi
\else
\if@nameauth@SeeAlso
- \@nameauth@Index{\csb}{\rootb\space\suffb|seealso{\target}}%
+ \@nameauth@Index{\csb}%
+ {\rootb\space\suffb|seealso{\target}}%
\else
- \@nameauth@Index{\csb}{\rootb\space\suffb|see{\target}}%
+ \@nameauth@Index{\csb}%
+ {\rootb\space\suffb|see{\target}}%
\fi
\fi
\csgdef{\csb!PN}{}%
@@ -865,8 +1003,12 @@
\csgdef{\csab!PN}{}%
\fi
\fi
- \@nameauth@SeeAlsofalse%
\@nameauth@Xreffalse%
+ \if@nameauth@OldReset
+ \@nameauth@SeeAlsofalse%
+ \else
+ \global\@nameauth@SeeAlsofalse%
+ \fi
}
\newcommandx*\ExcludeName[3][1=\@empty, 3=\@empty]
{%
@@ -913,7 +1055,7 @@
\ifcsname\csbc!PN\endcsname
\if@nameauth@Verbose
\PackageWarning{nameauth}%
- {macro \ExcludeName: Xref: #2 exists}%
+ {macro \ExcludeName: Xref: #2 #3 exists}%
\fi
\else
\csgdef{\csbc!PN}{!}%
@@ -953,7 +1095,7 @@
\ifcsname\csab!PN\endcsname
\if@nameauth@Verbose
\PackageWarning{nameauth}%
- {macro \ExcludeName: Xref: #2 exists}%
+ {macro \ExcludeName: Xref: #1 #2 exists}%
\fi
\else
\csgdef{\csab!PN}{!}%
@@ -973,25 +1115,49 @@
\ifx\argc\@empty
\ifcsname\csb!PN\endcsname
\edef\testex{\csname\csb!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csb!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csb!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #2 exists}%
+ \fi
+ \fi
\fi
\else
\ifx\suffb\@empty
\ifcsname\csbc!PN\endcsname
\edef\testex{\csname\csbc!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csbc!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csbc!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #2 #3 exists}%
+ \fi
+ \fi
\fi
\else
\ifcsname\csb!PN\endcsname
\edef\testex{\csname\csb!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csb!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csb!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #2 exists}%
+ \fi
+ \fi
\fi
\fi
\fi
\else
\ifcsname\csab!PN\endcsname
\edef\testex{\csname\csab!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csab!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csab!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #1 #2 exists}%
+ \fi
+ \fi
\fi
\fi
}
@@ -1170,19 +1336,21 @@
\def\csb{\@nameauth@Clean{#2}}%
\def\csbc{\@nameauth@Clean{#2,#3}}%
\def\csab{\@nameauth@Clean{#1!#2}}%
- \@nameauth@Error{#2}{macro \string\NameQueryInfo}%
- \ifx\arga\@empty
- \ifx\argc\@empty
- \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
- \else
- \ifx\Suff\@empty
- \ifcsname\csbc!DB\endcsname\csname\csbc!DB\endcsname\fi
- \else
+ \unless\if@nameauth@BigLock
+ \@nameauth@Error{#2}{macro \string\NameQueryInfo}%
+ \ifx\arga\@empty
+ \ifx\argc\@empty
\ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
+ \else
+ \ifx\Suff\@empty
+ \ifcsname\csbc!DB\endcsname\csname\csbc!DB\endcsname\fi
+ \else
+ \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
+ \fi
\fi
+ \else
+ \ifcsname\csab!DB\endcsname\csname\csab!DB\endcsname\fi
\fi
- \else
- \ifcsname\csab!DB\endcsname\csname\csab!DB\endcsname\fi
\fi
}
\newcommandx*\NameClearInfo[3][1=\@empty, 3=\@empty]
@@ -1409,47 +1577,68 @@
}
\newcommandx*\AKA[5][1=\@empty, 3=\@empty, 5=\@empty]
{%
+ \if@nameauth@BigLock\@nameauth@Locktrue\fi
\unless\if@nameauth@Lock
- \@nameauth@Locktrue%
- \@nameauth@JustIndexfalse%
- \@nameauth@InAKAtrue%
- \@nameauth@Error{#2}{macro \string\AKA}%
- \@nameauth@Error{#4}{macro \string\AKA}%
- \leavevmode\hbox{}%
- \protected@edef\argi{\trim@spaces{#1}}%
- \protected@edef\rooti{\@nameauth@Root{#2}}%
- \protected@edef\suffi{\@nameauth@Suffix{#2}}%
- \@nameauth@Parse[#3]{#4}[#5]{!PN}%
- \unless\if@nameauth@SkipIndex
- \ifx\argi\@empty
- \ifx\suffi\@empty
- \IndexRef[#3]{#4}[#5]{\rooti}%
- \else
- \IndexRef[#3]{#4}[#5]{\rooti\space\suffi}%
- \fi
- \else
- \ifx\suffi\@empty
- \IndexRef[#3]{#4}[#5]{\rooti,\space\argi}%
- \else
- \IndexRef[#3]{#4}[#5]{\rooti,\space\argi,\space\suffi}%
+ \@nameauth@Locktrue%
+ \@nameauth@InAKAtrue%
+ \if@nameauth@OldReset
+ \@nameauth@JustIndexfalse%
+ \else
+ \global\@nameauth@JustIndexfalse%
+ \fi
+ \@nameauth@Error{#2}{macro \string\AKA}%
+ \@nameauth@Error{#4}{macro \string\AKA}%
+ \leavevmode\hbox{}%
+ \protected@edef\argi{\trim@spaces{#1}}%
+ \protected@edef\rooti{\@nameauth@Root{#2}}%
+ \protected@edef\suffi{\@nameauth@Suffix{#2}}%
+ \@nameauth@Parse[#3]{#4}[#5]{!PN}%
+ \unless\if@nameauth@SkipIndex
+ \ifx\argi\@empty
+ \ifx\suffi\@empty
+ \IndexRef[#3]{#4}[#5]{\rooti}%
+ \else
+ \IndexRef[#3]{#4}[#5]{\rooti\space\suffi}%
+ \fi
+ \else
+ \ifx\suffi\@empty
+ \IndexRef[#3]{#4}[#5]{\rooti,\space\argi}%
+ \else
+ \IndexRef[#3]{#4}[#5]{\rooti,\space\argi,\space\suffi}%
+ \fi
\fi
\fi
- \fi
- \@nameauth@SkipIndexfalse%
- \@nameauth@Lockfalse%
- \@nameauth@InAKAfalse%
- \@nameauth@AltAKAfalse%
- \@nameauth@NBSPfalse%
- \@nameauth@NBSPXfalse%
- \@nameauth@DoCapsfalse%
- \@nameauth@Accentfalse%
- \@nameauth@AllThisfalse%
- \@nameauth@ShowCommafalse%
- \@nameauth@NoCommafalse%
- \@nameauth@RevThisfalse%
- \@nameauth@RevThisCommafalse%
- \@nameauth@ShortSNNfalse%
- \@nameauth@EastFNfalse%
+ \if@nameauth@OldReset
+ \@nameauth@SkipIndexfalse%
+ \@nameauth@AltAKAfalse%
+ \@nameauth@NBSPfalse%
+ \@nameauth@NBSPXfalse%
+ \@nameauth@DoCapsfalse%
+ \@nameauth@Accentfalse%
+ \@nameauth@AllThisfalse%
+ \@nameauth@ShowCommafalse%
+ \@nameauth@NoCommafalse%
+ \@nameauth@RevThisfalse%
+ \@nameauth@RevThisCommafalse%
+ \@nameauth@ShortSNNfalse%
+ \@nameauth@EastFNfalse%
+ \else
+ \global\@nameauth@SkipIndexfalse%
+ \global\@nameauth@AltAKAfalse%
+ \global\@nameauth@NBSPfalse%
+ \global\@nameauth@NBSPXfalse%
+ \global\@nameauth@DoCapsfalse%
+ \global\@nameauth@Accentfalse%
+ \global\@nameauth@AllThisfalse%
+ \global\@nameauth@ShowCommafalse%
+ \global\@nameauth@NoCommafalse%
+ \global\@nameauth@RevThisfalse%
+ \global\@nameauth@RevThisCommafalse%
+ \global\@nameauth@ShortSNNfalse%
+ \global\@nameauth@EastFNfalse%
+ \fi
+ \@nameauth@Lockfalse%
+ \@nameauth@InAKAfalse%
\fi
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
}
@@ -1482,78 +1671,86 @@
\ifcsname\@arga\endcsname
\PackageWarning{nameauth}%
{environment nameauth: Shorthand macro already exists}%
- \fi
- \ifx\@testd\@empty
+ \fi
+ \ifx\@testd\@empty
\ifx\@testb\@empty
- \ex\csgdef\ex{\ex\@arga\ex}\ex{\ex\NameauthName\ex{%
- \the\@nameauth@etoksc}}%
- \ex\csgdef\ex{\ex L\ex\@arga\ex}\ex{%
- \ex\@nameauth@FullNametrue%
+ \ex\csgdef\ex{\ex\@arga\ex}%
+ \ex{\ex\NameauthName\ex{\the\@nameauth@etoksc}}%
+ \ex\csgdef\ex{\ex L\ex\@arga\ex}%
+ \ex{\ex\@nameauth@FullNametrue%
\ex\NameauthLName\ex{\the\@nameauth@etoksc}}%
- \ex\csgdef\ex{\ex S\ex\@arga\ex}\ex{%
- \ex\@nameauth@FirstNametrue%
+ \ex\csgdef\ex{\ex S\ex\@arga\ex}%
+ \ex{\ex\@nameauth@FirstNametrue%
\ex\NameauthFName\ex{\the\@nameauth@etoksc}}%
\else
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex\@arga\ex\ex\ex}%
- \ex\ex\ex{\ex\ex\ex\NameauthName\ex\ex\ex[%
- \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+ \ex\ex\ex{\ex\ex\ex\NameauthName%
+ \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+ \ex{\the\@nameauth@etoksc}}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex L\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FullNametrue%
- \ex\ex\ex\NameauthLName\ex\ex\ex[%
- \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+ \ex\ex\ex\NameauthLName%
+ \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+ \ex{\the\@nameauth@etoksc}}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex S\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FirstNametrue%
- \ex\ex\ex\NameauthFName\ex\ex\ex[%
- \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+ \ex\ex\ex\NameauthFName%
+ \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+ \ex{\the\@nameauth@etoksc}}%
\fi
\else
\ifx\@testb\@empty
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex\@arga\ex\ex\ex}%
- \ex\ex\ex{\ex\ex\ex\NameauthName\ex\ex\ex{%
- \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+ \ex\ex\ex{\ex\ex\ex\NameauthName%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex L\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FullNametrue%
- \ex\ex\ex\NameauthLName\ex\ex\ex{%
- \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+ \ex\ex\ex\NameauthLName%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex S\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FirstNametrue%
- \ex\ex\ex\NameauthFName\ex\ex\ex{%
- \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+ \ex\ex\ex\NameauthFName%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\else
\ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex\@arga\ex\ex\ex\ex\ex\ex\ex}%
\ex\ex\ex\ex\ex\ex\ex{\ex\ex\ex\ex\ex\ex\ex\NameauthName%
- \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb%
- \ex\ex\ex]\ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
- \the\@nameauth@etoksd]}%
+ \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the%
+ \ex\ex\ex\@nameauth@etoksb\ex\ex\ex]%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex L\ex\ex\ex\ex\ex\ex\ex\@arga%
\ex\ex\ex\ex\ex\ex\ex}\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex\@nameauth@FullNametrue%
- \ex\ex\ex\ex\ex\ex\ex\NameauthLName\ex\ex\ex\ex\ex\ex\ex[%
- \ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb%
- \ex\ex\ex]\ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
- \the\@nameauth@etoksd]}%
+ \ex\ex\ex\ex\ex\ex\ex\NameauthLName%
+ \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex%
+ \@nameauth@etoksb\ex\ex\ex]%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex S\ex\ex\ex\ex\ex\ex\ex\@arga%
\ex\ex\ex\ex\ex\ex\ex}\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex\@nameauth@FirstNametrue%
- \ex\ex\ex\ex\ex\ex\ex\NameauthFName\ex\ex\ex\ex\ex\ex\ex[%
- \ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb\ex\ex\ex]%
- \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
- \the\@nameauth@etoksd]}%
+ \ex\ex\ex\ex\ex\ex\ex\NameauthFName%
+ \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex%
+ \@nameauth@etoksb\ex\ex\ex]%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\fi
- \fi
- \ignorespaces%
+ \fi\ignorespaces%
}\ignorespaces%
}{\endgroup\ignorespaces}
%%
-%% Copyright (C) 2017 by Charles P. Schaum <charles dot schaum at comcast dot net>
+%% Copyright (C) 2020 by Charles P. Schaum <charles dot schaum(a)comcast.net>
%%
-%% This work may be distributed and/or modified under the
+%% This work may be distributed and / or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
+%% version. The latest version of this license is in the file:
%%
%% http://www.latex-project.org/lppl.txt
%%
@@ -1561,9 +1758,8 @@
%% Charles P. Schaum.
%%
%% This work consists of the files nameauth.dtx, examples.tex, and a Makefile.
-%% Running "make" generates the derived files README, nameauth.pdf and
-%% nameauth.sty. Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
+%% These files generate README.txt / README, nameauth.ins, nameauth.sty, and
+%% nameauth.pdf, with other intermediate files, as a part of this work. See
+%% the README.txt or README for more information.
%%
%% End of file `nameauth.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nameauth.tlpobj new/tlpkg/tlpobj/nameauth.tlpobj
--- old/tlpkg/tlpobj/nameauth.tlpobj 2019-02-28 03:55:21.000000000 +0100
+++ new/tlpkg/tlpobj/nameauth.tlpobj 2020-02-28 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name nameauth
category Package
-revision 43586
+revision 53940
shortdesc Name authority mechanism for consistency in body text and index
relocated 1
longdesc Publications, that reference many names, require editors and
@@ -9,10 +9,9 @@
longdesc compilers to normalize occurrences of names, variant name
longdesc forms, and pen names in the text and index. This may help
longdesc minimize writing and production time and cost.
-runfiles size=12
+runfiles size=13
RELOC/tex/latex/nameauth/nameauth.sty
catalogue-ctan /macros/latex/contrib/nameauth
-catalogue-date 2017-03-22 22:56:13 +0100
catalogue-license lppl1.3
catalogue-topics editorial editorial-consistency
-catalogue-version 3.2
+catalogue-version 3.4
++++++ ncctools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ncctools/changes.txt new/doc/latex/ncctools/changes.txt
--- old/doc/latex/ncctools/changes.txt 2018-07-03 23:02:29.000000000 +0200
+++ new/doc/latex/ncctools/changes.txt 2019-08-03 23:57:36.000000000 +0200
@@ -4,10 +4,16 @@
=======================================================================
+August 3, 2019 (Release 3.5.3)
+
+ manyfoot: Fix multicol compatibility issues.
+
+
+=======================================================================
+
June 24, 2018 (Release 3.5.2)
extdash: Add more em-dash configuring options.
-
=======================================================================
Jan 20, 2006
Binary files old/doc/latex/ncctools/manyfoot.pdf and new/doc/latex/ncctools/manyfoot.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ncctools.doc.tlpobj new/tlpkg/tlpobj/ncctools.doc.tlpobj
--- old/tlpkg/tlpobj/ncctools.doc.tlpobj 2019-02-28 03:55:49.000000000 +0100
+++ new/tlpkg/tlpobj/ncctools.doc.tlpobj 2019-08-04 01:53:31.000000000 +0200
@@ -1,9 +1,9 @@
name ncctools.doc
category Package
-revision 48127
+revision 51810
shortdesc doc files of ncctools
relocated 1
-docfiles size=753
+docfiles size=778
RELOC/doc/latex/ncctools/README
RELOC/doc/latex/ncctools/README.source
RELOC/doc/latex/ncctools/afterpackage.pdf
++++++ ncctools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ncctools/manyfoot.sty new/tex/latex/ncctools/manyfoot.sty
--- old/tex/latex/ncctools/manyfoot.sty 2006-01-13 01:00:29.000000000 +0100
+++ new/tex/latex/ncctools/manyfoot.sty 2019-08-03 23:57:36.000000000 +0200
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1993/12/01]
\ProvidesPackage{manyfoot}
- [2005/09/11 v1.10 Many Footnote Levels Package (NCC)]
+ [2019/08/03 v1.11 Many Footnote Levels Package (NCC)]
\RequirePackage{nccfoots}
\newcommand{\extrafootnoterule}{}
\DeclareOption{ruled}{\def\extrafootnoterule{\defaultfootnoterule}}
@@ -312,9 +312,9 @@
\csname MFL@process#4\endcsname #5%
\ifvoid\footins
\let\footnoterule\MFL@currule
- \setbox\footins\vbox{#3\unvbox#5}%
+ \global\setbox\footins\vbox{#3\unvbox#5}%
\else
- \setbox\footins\vbox{%
+ \global\setbox\footins\vbox{%
\unvbox\footins\MFL@skip\MFL@currule#3\unvbox#5%
}%
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ncctools.tlpobj new/tlpkg/tlpobj/ncctools.tlpobj
--- old/tlpkg/tlpobj/ncctools.tlpobj 2019-02-28 03:55:50.000000000 +0100
+++ new/tlpkg/tlpobj/ncctools.tlpobj 2019-08-04 01:53:32.000000000 +0200
@@ -1,6 +1,6 @@
name ncctools
category Package
-revision 48127
+revision 51810
shortdesc A collection of general packages for LaTeX
relocated 1
longdesc The NCCtools bundle contains many packages for general use
@@ -47,7 +47,7 @@
RELOC/tex/latex/ncctools/topsection.sty
RELOC/tex/latex/ncctools/watermark.sty
catalogue-ctan /macros/latex/contrib/ncctools
-catalogue-date 2018-07-03 18:43:47 +0200
+catalogue-date 2019-08-03 11:40:31 +0200
catalogue-license lppl
catalogue-topics collection
-catalogue-version 3.5.2
+catalogue-version 3.5.3
++++++ newpx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newpx/ChangesInV1.4.txt new/doc/fonts/newpx/ChangesInV1.4.txt
--- old/doc/fonts/newpx/ChangesInV1.4.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/newpx/ChangesInV1.4.txt 2019-10-09 23:55:55.000000000 +0200
@@ -0,0 +1,49 @@
+Files changed in Newpx as of version 1.4 (2019/09/09)
+
+MATH
+
+NewPXMI.{pfb,afm,tfm} : math italics, LPPL licensed (new)
+NewPXBMI.{pfb,afm,tfm} : bold math italics, LPPL licensed (new)
+NewPXMI_gnu.{pfb,afm,tfm} : math italics, GNU licensed (new)
+NewPXBMI_gnu.{pfb,afm,tfm} : bold math italics, GNU licensed (new)
+stsscr.{pfb,afm,tfm} : old STIX script alphabets OFL (new)
+txmiaSTbb.{pfb,afm,tfm} : old STIX BBB alphabet OFL (new)
+txbmiaSTbb.{pfb,afm,tfm} : old STIX bold BBB alphabet OFL (new)
+px[b]miaX.{pfb,afm,tfm} : extended and modified px[b]mia
+px[b]sys.{pfb,afm,tfm} : modified px[b]sys
+zpl[b]mi.{tfm,vf} : letters
+zpl[b[sy.{tfm,vf} : symbols
+zpl[b]mia.{tfm,vf} : lettersA
+
+TEXT
+
+The npxsups*.tfm were completely revised so as to pass PDF/A-1b validation.
+npxsups-Regular.{pfb,afm} LPPL (New)
+npxsups-Italic.{pfb,afm} LPPL (New)
+npxsups-Bold.{pfb,afm} LPPL (New)
+npxsups-BoldItalic.{pfb,afm} LPPL (New)
+npxsups_OT1.enc (New)
+npxsups_T1.enc (New)
+npxsups_LY1.enc (New)
+
+The tfm files were generated using
+
+afm2tfm npxsups-Regular -a -T npxsups_OT1.enc -v npxsups-Regular-ot1 npxsups-Regular-ot1
+afm2tfm npxsups-Regular -a -T npxsups_T1.enc -v npxsups-Regular-t1 npxsups-Regular-t1
+afm2tfm npxsups-Regular -a -T npxsups_LY1.enc -v npxsups-Regular-ly1 npxsups-Regular-ly1
+afm2tfm npxsups-Italic -a -T npxsups_OT1.enc -v npxsups-Italic-ot1 npxsups-Italic-ot1
+afm2tfm npxsups-Italic -a -T npxsups_T1.enc -v npxsups-Italic-t1 npxsups-Italic-t1
+afm2tfm npxsups-Italic -a -T npxsups_LY1.enc -v npxsups-Italic-ly1 npxsups-Italic-ly1
+afm2tfm npxsups-Bold -a -T npxsups_OT1.enc -v npxsups-Bold-ot1 npxsups-Bold-ot1
+afm2tfm npxsups-Bold -a -T npxsups_T1.enc -v npxsups-Bold-t1 npxsups-Bold-t1
+afm2tfm npxsups-Bold -a -T npxsups_LY1.enc -v npxsups-Bold-ly1 npxsups-Bold-ly1
+afm2tfm npxsups-BoldItalic -a -T npxsups_OT1.enc -v npxsups-BoldItalic-ot1 npxsups-BoldItalic-ot1
+afm2tfm npxsups-BoldItalic -a -T npxsups_T1.enc -v npxsups-BoldItalic-t1 npxsups-BoldItalic-t1
+afm2tfm npxsups-BoldItalic -a -T npxsups_LY1.enc -v npxsups-BoldItalic-ly1 npxsups-BoldItalic-ly1
+#
+for f in npxsups*.vpl; do /bin/cp -fp $f ${f%.*}.pl; done
+for f in npxsups*.pl; do pltotf $f ${f%.*}.tfm; done
+
+MAP
+
+newpx.map was revised to relect the changes above.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newpx/README new/doc/fonts/newpx/README
--- old/doc/fonts/newpx/README 2018-12-17 22:30:58.000000000 +0100
+++ new/doc/fonts/newpx/README 2020-02-15 23:13:17.000000000 +0100
@@ -1,10 +1,55 @@
This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt
-Current version: 1.33 2018-12-16
+Current version: 1.410 2020-02-15
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.410
+1. Made some corrections to the subspace offsets in symbol fonts to provide better alignment of subscripts and superscripts.
+2. Reworked the dot positions for the five letters i, j, ij, iogonek and idotbelow, restoring the positions used in the original URW fonts and in earlier commercial versions, so that the top of the dot position aligns with the cap-height, allowing for curvature effects. (Thanks to Daniel Benjamin MIller for reporting this discrepancy.)
+
+Changes in version 1.409
+Changed some \Declare... macros to \re@Declare... in newpxmath.sty, matching recent changes in newtxmath.sty.
+
+Changes in version 1.408
+Other minor corrections.
+
+Changes in version 1.407
+Changed digits in NewPXBMI to bold tabular.
+
+Changes in version 1.406
+Fixed the footnote issues. Some files were missing from the distribution in previous versions.
+
+Changes in version 1.405
+Corrected the capitalization errors in newpx.map that were introduced in 1.404.
+
+Changes in version 1.404
+Corrected the entries in newpx.map, replacing the old sups lines with the versions that are corrext for the newest version of newpx.
+
+Changes in version 1.403
+Corrected codes for \forall and \exists, which are now in their default positions in symbols.
+
+Changes in version 1.402
+Corrected newpx.map and added the correct version of the npxsups encoding files.
+
+Changes in version 1.401
+1. Changed name of file newpx.subs to newpx-subs.tex.
+2. Placed the \pdfglyphtounicode lines in a conditional block in newpxmath.sty so it could continue to be used with other engines. (Thanks Hironobu Yamashita.)
+
+Changes in version 1.40
+1. Reworked the math italics to improve the rendering of some subscripts and superscripts, where formerly, overlaps could occur with superscripts like j, f, p and y with base shapes, such as D, that are round on the right. Increasing the left side-bearing of j, etc, helps with superscripts but makes those letters leave a large gap when used as subscripts.
+2. Corrected and enhanced the subscriptcorrection option to newpxmath so that it now fixes the above problem. I regret that this option is incompatible with xy-pic, both depending on making _ an active character but with very different behaviors. Newpxmath will detect if xy is loaded and disable subscriptcorrection if so.
+3. Added new script alphabets to math italics by extending the encoding from oml to full 256 slots, so they can be used without wasting math families.
+4. Rearranged npxmia and zplsy. The user should not notice this, unless I have erred somewhere.
+5. Provided an adaptive vector accent which matches the normal vector accent but extends as needed over its accentee. I've followed the usage of the esvect package, but changed its implementation.
+6. Many small corrections to spacing and accent positioning.
+7. Revised the superior letters fonts so they have appropriate unicode values.
+8. As a result of these changes, documents generated using newpxmath and appropriate settings will validate PDF/A-1b. (Thanks to Ross Moore for providing the necessary files and details on this.) See the updated documentation to newpx for details.
+9. Fixed error in lmxnpxexx.fd re fontdimens. (Thanks Ruixi Zhang.)
+10. Added option fracspacing that modifies fontdimens 8 and 11 of the symbol font to values more appropriate to the newpx fonts. (Thanks Ruixi Zhang.)
+11. Corrected AMS replacement font npxsym to fix \dalath, \mathbb{k}, \circledR and \circledS.
+
Changes in version 1.33
Modified newpxmath.sty to correct the macros involving selection of Blackboard Bold alphabets.
Binary files old/doc/fonts/newpx/newpxdoc.pdf and new/doc/fonts/newpx/newpxdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newpx/newpxdoc.tex new/doc/fonts/newpx/newpxdoc.tex
--- old/doc/fonts/newpx/newpxdoc.tex 2017-06-05 01:49:32.000000000 +0200
+++ new/doc/fonts/newpx/newpxdoc.tex 2019-10-03 23:06:58.000000000 +0200
@@ -2,6 +2,15 @@
\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
+\pdfmapfile{=newtx.map}
+\pdfmapfile{=newpx.map}
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage{fonttable}
\usepackage{amsthm}
\newtheoremstyle{oldplain}
{\topsep} % ABOVESPACE
@@ -376,4 +385,126 @@
For further information on the changes made to \texttt{newpxmath} 1.3, see the appendix to the documentation for \texttt{newtxmath} 1.5.
+\def\jj{\mkern-3mu j}
+
+\section{Appendix 1: Changes made in version 1.40}
+Versions of {\tt newpx} dated from September, 2019 (1.40 for {\tt newpxmath} make some quite substantial changes, mostly to math mode.
+
+\section{Goals}
+Spurred by work of Ross Moore to provide means of generating archivable pdf using {\tt pdflatex}, the main goal was to change {\tt newpx} and {\tt newtx} to meet the requirements for satisfying the {\tt PDF/A-1b} standards by using an appropriate preamble involving the {\tt pdfx} package and other unicode mapping files. Making these changes gave me the opportunity to organize the source files to make them more manageable in future revisions.
+
+A further goal whose time seemed ripe was to rework the spacing of math letters, both Roman and Greek, so they behaved better in superscripts and subscripts. This did not turn out to be so easy. The problem is illustrated by math italic j. If you don't give it enough extra space on the left, it will likely collide with the D in rendering \verb|$D^j$|. On the other hand, if you do give it enough space on the left, it will look bad as a subscript, appearing too far right.
+
+A final goal was to make better use of the remaining space in some of the math fonts by placing some math alphabets in them, avoiding perhaps a waste of those precious sixteen math families.
+
+\section{The important changes}
+The following changes were made to both {\tt newtx} and {\tt newpx}.
+
+\subsection{Archivability}
+Some of the individual font files from which the math fonts are built turned out to have some fairly minor structural issues. These have all been corrected. The more major issue was the lack of unicode mapping for all characters in the fonts. For the symbol and math extension fonts, this issue was largely solved by Ross Moore's {\tt glyphtounicode} files that are now accessible as part of TeXLive and MiKTeX. The main problem was the math alphabets like math italic, bold math italic, upright Greek and slanted Greek, all of which have now been assigned their own unicode points. For all of these, I constructed new fonts using unicode names for the glyphs, then made \textsf{fontinst} scripts that renamed those unicode values to the original simple names as used in the encoding files so that I could use my old encoding and adjustment files. This exercise has now been carried out for {\tt newtxmath}, {\tt newpxmath}, {\tt newtxmath/libertine} and {\tt newtxmath/xcharter.} Each of these can now be considered to have an ``enhanced'' status that allows them to share all the new assets described below. The other packages which may be specified as an option to {\tt newtxmath} (e.g., {\tt cochineal, baskervillef}) must be considered for the moment to be ``unenhanced'' and able to share only some of the new assets. In particular, only the enhanced items can generate archivable pdf.
+
+Also modified were the {\tt sups} fonts in {newpxtext}, where the main issue was unicode mapping. Superior number and some superior letters do have assigned unicode values, but in may cases a more creative approach was needed, and provided once again by Ross Moore. I rebuilt the superior font files using those unicode names, solving that particular problem.
+
+Here is a sample preamble showing the elements you will need to specify to generate a pdf satisfying the PDF/A-1b standards, as verified by Adobe Acrobat Pro. (Other verification processes may yield different outcomes.)
+\begin{verbatim}
+\documentclass[noamsfonts]{amsart} % save 2 math families
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage{newpxtext} %T1 is default encoding
+\usepackage[scaled=0.95]{inconsolata} % typewriter
+%\usepackage[leqno]{amsmath}
+\usepackage{amsthm}
+\usepackage[vvarbb]{newpxmath} % vvarbb gives STIX Bbb
+\end{verbatim}
+
+Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix is now available and will become part of the upcoming {\tt pdfx} v1.6.4.
+
+\subsection{Glyph spacing changes} I reworked the math italics to improve the rendering of some superscripts. This affects (a) parentheses, brackets and braces to inhibit clashes; (b) glyphs like j, f, p, y, \verb|\rho|, \verb|\beta| and \verb|\mu| where a long tail could pose problems intersecting with other glyphs; (c) glyphs like such as D, Q and \verb|\Phi| that are round on the right, where interference is most likely to occur with a superscript. Increasing the left side-bearing of j, etc., helps with superscripts but creates an ugly gap when used as subscripts.
+
+
+ The {\tt subscriptcorrection} option to {\tt newpxmath} has been corrected and enhanced so that it now offers a partial solution the subscript spacing problem. I regret that this option is incompatible with xy-pic, both depending on redefining \verb|_| as an active character. {\tt Newpxmath} will detect if the {\tt xy} package is loaded and disable {\tt subscriptcorrection} if so. You would have to correct such issues by manually inserting a negative \verb|\mkern|. For example, you might put in your preamble something like
+ \begin{verbatim}
+\def\jj{\mkern-3mu j}
+\end{verbatim}
+and then use \verb|$x_{\jj}$| instead of \verb|$x_j$|, turning $x_j$ into $x_{\jj}$.
+
+If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, {\tt newpx-subs.tex}. There is already such a file located in the {\tt newpx} distribution in the \verb|tex/latex/newpx| folder. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) The entries in the file are lines like
+\begin{verbatim}
+{j}{-3}
+\end{verbatim}
+each of which will have the same effect as the above macro if the first item in the subscript is j. You can also specify Greek letters with lines like
+\begin{verbatim}
+{\beta}{-1.5}
+\end{verbatim}
+
+\subsection{New glyphs added} Math family 1 {\tt (letters)} has been extended from 128 slots to 256, retaining the {\tt OML} encoding of the first 128. Most of additional slots have been allocated to a script font from the old STIX collection and an upright modification of that font.
+By default, \verb|$\mathscr{F}$| will produce $\mathscr{F}$.\\
+$\bullet$ option {\tt uprightscript} changes the output to {\usefont{OML}{ntxmi}{m}{it}\char201}.\\
+In both cases, there are full upper-case and lower-case and {\tt dotlessi}, {\tt dotlessj}. To insert the latter, you can write either \verb|$\mathscr{\imath}$| or \verb|$\imathscr$|, rendered as $\mathscr{\imath}$ in the slanted script case.
+
+The secondary letters font {\tt (lettersA)} and math family 2 {\tt(symbols)} have been rearranged. The first of these continues to have a Fraktur alphabet, but it a modification of its original one, having wider vertical stems and a blacker appearance more in keeping with the weight Times. {\tt Dotlessi} and {\tt dotlessj} have been added and can be specified in math mode by \verb|$\imathfrak$| and \verb|$\jmathfrak$|---\verb|$\mathfrak{\imath}$| also works. There are in addition two subsidiary Bbb alphabets in {\tt lettersA}, specified by the respective options {\tt vmathbb}, {\tt vvmathbb}, and there are corresponding {\tt dotlessi}, {\tt dotlessj} activated by \verb|$\imathbb$|, \verb|$\jmathbb$|, which always render as $\imathbb$, $\jmathbb$ mo matter the choice of which Blackboard Bold Alphabet. If you select one of the options {\tt vmathbb}, {\tt vvmathbb}, you will have Bbb digits 0..9 using, e.g., \verb|$\mathbb{1}$| to get~$\mathbb{1}$.
+
+Among the new symbols added are:\\
+$\bullet$ \verb|\hslash|, \verb|\hbar|, \verb|\lambdaslash|, \verb|\lambdabar|, \verb|\Zbar|, \verb|\Angstrom| are now constructed from the native glyphs.\\
+$\bullet$ Euler's constant \verb|$\Euler$| ($\Euler$).\\
+$\bullet$ Hermitian transpose \verb|\hermtransp| or \verb|\htransp| is used like \verb|$\mathbf{A}^{\htransp}$| ($\mathbf{A}^{\htransp}$). This usage is similar to simple transpose \verb|$\mathbf{A}^{\transp}$| ($\mathbf{A}^{\transp}$).\\
+$\bullet$ Independence can use \verb|\Perp|, $\Perp$, and there is a new \verb|\nPerp|, $\nPerp$ for the negation.
+
+\subsection{Adaptive vector accent} The \LaTeX\ macro \verb|\overrightarrow| provides a right arrow with adaptive width, but not matching the vector head of {\tt newpxmath}. Likewise, the {\tt esvect} provides a similar service with a choice of vector heads, none of which match {\tt newpxmath}. I've added code to provide a matching adaptive vector accent and which uses the same macro name, \verb|\vv|, as {\tt esvect}.
+For a comparison of these vector accents, \verb|$\vec{XY} \vv{XY} \overrightarrow{XY}$| renders as\\
+$\vec{XY} \vv{XY} \overrightarrow{XY}$.\\
+$\bullet$ \verb|$\vv{AB}$| renders as $\vv{AB}$.\\
+$\bullet$ \verb|$\vv*{AB}{x}$| renders as $\vv*{AB}{x}$. This provides better horizontal spacing of subscripts than \verb|$\vv{AB}_{x}$|, $\vv{AB}_{x}$.\\
+$\bullet$ You can also do \verb|$\vv*{AB}{\vv{CD}}$|, which renders as $\vv*{AB}{\vv{CD}}$.\\
+$\bullet$ You can change the vertical space between the arrow and the accentee by means of the package option {\tt vecsep}, whose default value is {\tt .25ex}.
+
+\subsection{Miscellaneous Changes}
+\begin{itemize}
+\item
+The superior letters fonts in {\tt newpx}
+have been extended and all glyphs now have appropriate unicode mappings.
+\item
+The AMS fonts replacement, {\tt zplsym} corrects the former misplacement of \verb|\kbbb|, \verb|\daleth|, \verb|\circledR| and \verb|\circledS|.)
+\end{itemize}
+\newpage
+\section{Changed Font Tables}
+\subsection{letters}
+\fonttable{zplmi}
+\newpage
+\subsection{lettersA}
+\fonttable{zplmia}
+\newpage
+\subsection{symbols}
+\fonttable{zplsy}
+\newpage
+\subsection{A sample newpx-subs.tex}
+You may either copy the entire block below, starting with the line \verb|\begin{...| and ending after the line beginning \verb|\end{|
+and pasting it into the top of your document before the \verb|\documentclass...| line, which will allow for easy editing and will write the file to the same folder as your document, or make your own file, omitting those outer two lines.
+
+\begin{verbatim}
+\begin{filecontents*}{newpx-subs.tex}
+{f}{-2.5}
+{j}{-1.5}
+{p}{-1}
+{y}{-1}
+{A}{-1.5}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{\rho}{-1.5}
+{\mu}{-1}
+\end{filecontents*}
+
+\end{verbatim}
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newpx.doc.tlpobj new/tlpkg/tlpobj/newpx.doc.tlpobj
--- old/tlpkg/tlpobj/newpx.doc.tlpobj 2019-02-28 03:55:54.000000000 +0100
+++ new/tlpkg/tlpobj/newpx.doc.tlpobj 2020-02-16 01:54:28.000000000 +0100
@@ -1,9 +1,10 @@
name newpx.doc
category Package
-revision 49438
+revision 53792
shortdesc doc files of newpx
relocated 1
-docfiles size=89
+docfiles size=216
+ RELOC/doc/fonts/newpx/ChangesInV1.4.txt
RELOC/doc/fonts/newpx/MANIFEST-newpx.txt
RELOC/doc/fonts/newpx/README
RELOC/doc/fonts/newpx/newpxdoc.pdf
++++++ newpx.tar.xz ++++++
++++ 82555 lines of diff (skipped)
++++++ newtx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtx/README new/doc/fonts/newtx/README
--- old/doc/fonts/newtx/README 2018-05-31 23:31:36.000000000 +0200
+++ new/doc/fonts/newtx/README 2020-03-03 23:02:56.000000000 +0100
@@ -1,10 +1,92 @@
This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
-Current version: 1.554 2018-05-30
+Current version: 1.625 2020-03-02
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.625
+1. Made some corrections to the subscript offsets in symbol fonts to provide better alignment of subscripts and superscripts.
+2. Reworked the dot positions for the five letters i, j, ij, iogonek and idotbelow, restoring the positions used in the original URW fonts and in commercial versions of Times, so that the top of the dot position aligns with the cap-height, allowing for curvature effects. (Thanks to Daniel Benjamin Miller for reporting this discrepancy.)
+3. Corrected a bug in newtxmath.sty handling of the choice between the three mathbb versions available and the resulting definition of \Bbbk. (Thanks again to Daniel Benjamin Miller who reported this error.)
+4. Added denominator figures in Regular weight only, and added a \textfrac macro that uses the superior and denominator figures to construct, e.g, seven eightieths using \textfrac{7}{80}. The denominator figures themselves are invoked by, e.g., \textin{345}.
+
+Changes in version 1.624
+Corrected problems with option varg in bold math italic and with the non-functional macros \varg, \varv, \varw, \vary. (Thanks Dave Green.)
+
+Changes in version 1.623
+Corrected code which prevented use of the frenchmath option to newtxmath.
+
+Changes in version 1.622
+Fixed a bad bug inadvertently introduced in 1.621.
+Changes in version 1.621
+Changes to newtxmath.sty to resolve conflicts with icdthesis.cls.
+
+Changes in version 1.62
+1. Changed the definition of \Bbbk to point to the lower-case K in the selected Blackboard Bold alphabet.
+2. Added New Century Schoolbook (option NC) to the list of fonts with enhanced math support in newtxmath.
+3. Reworked superior letters and figures unicode mappings in both ntxsups and in the otf TeXGyreTermesX otf files.
+4. Adjusted some math accent placements.
+5. Removed an unwanted ij ligature in the theorem font.
+
+Changes in version 1.612
+Corrected LibertineMath italic 7pt g. (Wrong shape of g.)
+
+Changes in version 1.611
+Added option alty to newtxmath/charter, offering a rounder math italic y shape.
+
+Changes in version 1.61
+Corrected a bug in newtxmath.sty affecting users of a non-enhanced font who also used the option nosymbolsC.
+
+Changes in version 1.609
+Small corrections related to newtxmath/erewhon.
+
+Changes in version 1.608
+1. Added support for utopia option to newtxmath with enhanced status.
+2. This version really does include the new names for slanted Greek letters.
+
+Changes in version 1.607
+1. Modified txmiaX.{pfb,tfm}, changing Delta, Sigma and epsilon1 (lunate epsilon symbol) so they would relate better to the bold, italic and bold italic versions.
+2. Reworked the sixteen tfm files ntx-*f-ot1.tfm, renaming them to replace "ot1" with "ot1r", and then regenerating the sixteen as virtual fonts based on the ot1r versions but with capital Greek taken from tx[b]miaX abd NewTX[B]MI. These now serve as the the ot1 font versions having capital Greeks in the first eleven slots.
+3. The slanted greek letters may now be specified as, e.g., \itGamma, as well as the existing \Gammit.
+(Thanks to Holger Gerhardt, who spotted the inconsistencies these modifications address.)
+
+Changes in version 1.606
+Changed handling of figures to honor change of math alphabet.
+
+Changes in version 1.605
+1. Added the missing pieces (fd files, map entries) of the math support files for ebgaramond.
+2. Modified zut[b]mi.{tfm,vf} so that math support for {utopia, heuristica, erewhon} is declared to be of enhanced, though not 100%. Exceptions are (i) you cannot reliably generate pdf/A-1b; (ii) the added symbols are from Times, not Utopia.
+
+Changes in version 1.604
+Removed the files ntxsts2* that are now located in the stickstoo package.
+
+Changes in version 1.603
+1. Corrected the sups lookup in the otf fonts to include 1,2,3.
+2. Added ae.superior to the otf fonts.
+3. Adjusted some figure shapes to blend better with {1,2,3}.superior (otf only, so far.)
+
+Changes in version 1.602
+1. Newtxmath.sty no longer requires the trimspaces package.
+2. Corrected newtx.map so that the ntxsups encoding names are now all in lowercase, matching the actual filenames.
+3. Added the changes needed for stix2 option to work as an enhanced option, able to generate conformant PDF/A-1b pdf output.
+
+Changes in version 1.601
+1. 1. Changed name of file newtx.subs to newtx-subs.tex, with similar changes for other such files.
+2. Placed the \pdfglyphtounicode lines in a conditional block in newpxmath.sty so it could continue to be used with other engines. (Thanks Hironobu Yamashita.)
+3. Added option ebgaramond to substitute ebgaramond Roman and Greek Letters for Times in math.
+
+Changes in version 1.60
+1. Reworked the math italics to improve the rendering of some subscripts and superscripts, where formerly, overlaps could occur with superscripts like j, f, p and y with base shapes, such as D, that are round on the right. Increasing the left side-bearing of j, etc, helps with superscripts but makes those letters leave a large gap when used as subscripts.
+2. Corrected and enhanced the subscriptcorrection option to newtxmath so that it now fixes the above problem. I regret that this option is incompatible with xy-pic, both depending on making _ an active character but with very different behaviors. Newtxmath will detect if xy is loaded and disable subscriptcorrection if so.
+3. Added new script alphabets to math italics by extending the encoding from oml to full 256 slots, so they can be used without wasting math families.
+4. Rearranged ntxmia and ntxsy. The user should not notice this, unless I have erred somewhere.
+5. Provided an adaptive vector accent which matches the normal vector accent but extends as needed over its accentee. I've followed the usage of the esvect package, but changed its implementation.
+6. Many small corrections to spacing and accent positioning.
+7. Revised the superior letters fonts so they have appropriate unicode values.
+8. As a result of these changes, documents generated using newpxmath and appropriate settings will validate PDF/A-1b. (Thanks to Ross Moore for providing the necessary files and details on this.) See the updated documentation to newtx for details.
+9. Corrected AMS replacement font ntxsym to fix \dalath, \mathbb{k}, \circledR and \circledS.
+
Changes in version 1.554
1. Removed some map lines from newtx.map that were duplicates of some in stickstootext.map.
2. Fixed a number of problems that had crept into the libertime math italic alphabets, which were in some cases not operating as documented with option libaltvw. Now they do.
Binary files old/doc/fonts/newtx/newtxdoc.pdf and new/doc/fonts/newtx/newtxdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtx/newtxdoc.tex new/doc/fonts/newtx/newtxdoc.tex
--- old/doc/fonts/newtx/newtxdoc.tex 2018-05-12 23:23:43.000000000 +0200
+++ new/doc/fonts/newtx/newtxdoc.tex 2020-03-03 23:02:56.000000000 +0100
@@ -2,12 +2,20 @@
\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
+\pdfmapfile{=newtx.map}
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
\usepackage{graphicx}
\usepackage{url}
\usepackage{trace}
+\usepackage{fonttable}
%SetFonts
% newtxtext text and newtxmath
-\usepackage{amsthm}
+\usepackage{amsmath,amsthm}
\newtheoremstyle{oldplain}
{\topsep} % ABOVESPACE
{\topsep} % BELOWSPACE
@@ -22,7 +30,7 @@
\theoremstyle{plain}
\newtheorem{thm}{Theorem}[section]
%\pdfmapfile{=newtx.map}
-\usepackage[osf,largesc,theoremfont]{newtxtext}
+\usepackage[osf,p,largesc,theoremfont]{newtxtext}
\usepackage[T1]{fontenc}
\usepackage[varqu,varl]{zi4}
%\traceon
@@ -45,11 +53,13 @@
\section{Introduction}
This package is meant to be a replacement for Young Ryu's {\tt txfonts}. It is a complete text ({\tt newtxtext}) and math ({\tt newtxmath}) package with roman text font provided by a Times clone, sans serif based on a \textsf{Helvetica} clone, typewriter faces, plus math symbol fonts whose math italic letters are from a Times Italic clone. As of version 1.4, {\tt newtxtext} no longer depends on {\tt txfonts} but is based on the richer source \textsf{TeXGyre Termes}, but {\tt newtxmath} continues to use the {\tt txfonts} math glyphs with many metric adjustments and some wholesale modifications.
-\textsc{Very Important:} The math package changed substantially as of version 1.5, changing a number of glyphs, adding an option to reduce the sizes of large operators, and changing the integral signs to a choice of upright and slanted forms, each available in twelve variants. The new options are {\tt upint} (upright integrals) and {\tt smallerops} (smaller large operators.) Some previously available options may no longer have any effect. The changes are described in detail in the section on math mode options. A summary of the changes in version 1.5 is given in the Appendix.
+\textsc{Very Important:} The math package changed substantially as of version 1.5, changing a number of glyphs, adding an option to reduce the sizes of large operators, and changing the integral signs to a choice of upright and slanted forms, each available in twelve variants. The new options are {\tt upint} (upright integrals) and {\tt smallerops} (smaller large operators.) Some previously available options may no longer have any effect. The changes are described in detail in the section on math mode options. A summary of the changes in version 1.5 is given in Appendix 1.
+
+Version 1.60 likewise has many additions and changes that are summarized in Appendix 2. Most important is that {\tt newtx} is now able to output a PDF/A-1b compliant pdf using {\tt pdflatex}.
-This math package works, after possibly replacing its math Roman and Greek letters, with fonts other than Times that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the newly released {\tt STIX2} text fonts.
+This math package works, after possibly replacing its math Roman and Greek letters, with fonts other than Times that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the {\tt STIX2} text fonts.
The {\tt newtx} package differs from {\tt txfonts} in the following ways:
\begin{itemize}
@@ -137,6 +147,8 @@
Option {\tt defaultsups} (same effect as {\tt defaultsups=true}) forces the package to use the \LaTeX\ default footnote markers (or, at least, those in force when the package is loaded) instead of those preferred by the package---Times Roman superior figures instead of spindly ordinary Times lining figures reduced to about 70\%. (Footnote markers in minipages use the default lowercase italic alphabetic characters, unless otherwise specified by redefining \verb|\thempfootnote|.) For better control over position and size of footnote markers, use the {\tt superiors} package after loading {\tt newtxtext}. The \verb|\sustyle| font switch and its related \verb|\textsu| macro know not only about figures, but also the lower case letters, including \texttt{egrave}, so that traditional French expressions like \textlf{1}\textsu{i\`ere} may be typeset correctly.
+As of version 1.625, there are now denominator figures (aligned to the text baseline) which may be called either with \verb|{\infigures 12345}| {\infigures 12345} or \verb|\textin{6789}| \textin{6789}. Currently, these are available only in regular weight, upright shape. There is a new macro \verb|\textfrac| that builds a fraction from superior figures and denominator figures: e.g., \verb|\textlf{5}\,\textfrac{7}{80}| renders as \textlf{5}\,\textfrac{7}{80}.
+
Option \texttt{largesc} changes the small cap glyphs from the default petite caps defined in TeXGyre Termes (same size as in txfonts) to a larger size that, in upright shapes, is metrically compatible with Adobe's small caps. These are about 10\% larger than petite caps. For a comparison, \textsc{Small Caps}, {\usefont{T1}{qtm}{m}{sc}Petite Caps}, and \textsc{\textit{Italic Small Caps}}, {\usefont{T1}{qtm}{m}{scit}Italic Petite Caps}.
Option \texttt{adobesc} is only for those who own licenses for \textsf{Adobe Times Small Caps} and install them into the \texttt{ptmsc} package downloaded from \textsc{ctan}. This option loads \texttt{largesc} and substitutes the Adobe glyphs, where available, including their larger Regular and Bold tabular oldstyle figures.
@@ -151,7 +163,7 @@
This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$].
\end{oldthm}
-If you are using another theorem package (e.g., ntheorem, theorem) you will have to add your own descriptors as specified in the its documentation and set the body font to \verb|\slshape|.
+If you are using another theorem package (e.g., ntheorem, theorem) you will have to add your own descriptors as specified in its documentation and set the body font to \verb|\slshape|.
\section{Spacing issues}
This new version of {\tt newtxtext} has spacing that is a little different, in its default state, from that of the old {\tt newtxtext}. In small part this is due to the finer kerning of TeXGyre Termes, but mostly because the three parameters that govern inter-word spacing are not the same.
@@ -211,13 +223,22 @@
\item {\tt varvw} causes the math italic letters \verb|v,w| to be replaced by versions which are more distinctive---eg, useful for distinguishing math italic \verb|v| from \verb|\nu|;
\item {\tt libertine} loads different versions of math italic and bold math italic based on \textsf{Libertine} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default;
\item (new in version 1.55) {\tt stix2} loads different versions of math italic and bold math italic based on \textsf{StixTwoMath} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the documentation to the {\tt SticksToo} package, which contains more details and some math samples.
+\item (new in version 1.60) {\tt ebgaramond} loads different versions of math italic and bold math italic based on \textsf{EBGaramond} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the end of Appendix 2 for an example of a preamble.
+\item (new in version 1.62) {\tt nc, ncf} load different versions of math italic and bold math italic based on \textsf{ScholaX} (\textsf{New Century Schoolbook}) rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. The difference is that o[tion {\tt nc} loads math Greek letters from {\tt newtxmath}, while option {\tt ncf} loads math greek from an adaptation of {\tt fourier} Greek.
\item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default---see the extended discussion below;
\item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
\item {\tt baskervaldx} (or {\tt Baskervaldx}) loads different versions of math italic and bold math italic based on \textsf{Baskervaldx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
\item {\tt baskerville} (or {\tt Baskerville}, or {\tt baskervillef} or {\tt BaskervilleF}) loads different versions of math italic and bold math italic based on \textsf{BaskervilleF} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
\item {\tt charter} (or {\tt xcharter}) loads different versions of math italic and bold math italic based on \textsf{XCharter} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. \textbf{As of version 1.53, Greek letters in all styles are taken from new alphabets constructed to match the Charter style.}
+\item {\tt alty} is new as of version 1.611, and applies only when math mode uses Charter alphabets. It causes math italic y to be rendered using a rounder shape that is less problematic than the default shape because it lacks the long tail of the XCharter Italic {\usefont{T1}{XCharter-TLF}{m}{it}y}.
\item {\tt noxchvw} (or {\tt noXchvw} is new as of version 1.54, and applies only when math mode uses Charter alphabets. It causes math italic v and w to be rendered using Charter italic glyphs. Use this only if you don't care if math italic v is hard to distinguish from Greek \verb|\nu|.
-\item {\tt cochineal} loads different versions of math italic and bold math italic based on \textsf{cochineal} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case.
+
+\item {\tt cochineal} loads different versions of math italic and bold math italic based on \textsf{cochineal} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. There are two additional options specific to {\tt cochineal}.
+\begin{itemize}
+\item
+Option {\tt cochf} replaces the default short math italic f with the long italic f used in text.
+\item Option {\tt cochrho} replaces the default short form of \verb|\rho| with the the long form used in text.
+\end{itemize}
\item {\tt utopia} (or {\tt heuristica} or {\tt erewhon}) loads different versions of math italic and bold math italic based on \textsf{Utopia} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. The Heuristica or Erewhon font package must be installed to use this option. (Erewhon is based on Heuristica, but is 6\% smaller and has more complete figures styles and small cap styles, as well as a variety of smaller figures---superior, inferior, numerator, denominator.) For example:
\begin{verbatim}
\usepackage[osf]{erewhon} %extension of Utopia
@@ -225,7 +246,7 @@
\usepackage[scaled=.95]{cabin} % sans serif
\usepackage[utopia,vvarbb]{newtxmath}
\end{verbatim}
-\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt stix2} and {\tt cochineal};
+\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt ebgaramond}, {\tt stix2}, {\tt xcharter} and {\tt cochineal};
\item
{\tt cmintegrals} instructs \textsf{newtxmath} to load a thicker version of the Computer Modern integral in place of the \textsf{newtxmath} default---the txfonts integral (identical to the integral in the Wolfram fonts), which is not to everyone's taste---a consequence is that none of the special forms of \textsf{txfonts} integrals are available;
\textbf{as of version 1.5, this option does nothing, as the new default is slanted integrals.}
@@ -318,7 +339,7 @@
\usepackage[T1]{fontenc} % best for Western European languages
\usepackage{textcomp} % required to get special symbols
\usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
\usepackage[libertine,vvarbb]{newtxmath}
\usepackage[scr=rsfso]{mathalfa}
\usepackage{bm}% load after all math to give access to bold math
@@ -350,7 +371,7 @@
\usepackage[T1]{fontenc}
\usepackage[scaled=.85]{beramono}% used only by \mathtt
\usepackage[type1]{cabin}% used only by \mathsf
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
\usepackage[libertine]{newtxmath}
% loads minlibertine because no other Roman text package was specified
% so that \mathrm and \mathbf also use minlibertine
@@ -370,7 +391,7 @@
\renewcommand{\rmdefault}{fbb-LF}% Roman font for use in math mode
\usepackage[scaled=.85]{beramono}% used only by \mathtt
\usepackage[type1]{cabin}% used only by \mathsf
-\usepackage{amsthm}% load before newtxmath
+\usepackage{amsmath,amsthm}% load before newtxmath
\usepackage[libertine,vvarbb]{newtxmath}
% does not load minlibertine because another Roman text package was specified
\usepackage[scr=rsfso]{mathalfa}
@@ -507,7 +528,7 @@
\item the original variant form called with the macro \verb|\varmathbb| is better, but the macro conflicts with \verb|\bm|. (In fact, the bold version is identical to the regular version, but it is still not right that it conflicts with them.) The problem stems from the part of the definition of \verb|\varmathbb| which allows you to insert an argument with more than one character, like \verb|\varmathbb{ABC}|. Another problem with \verb|\varmathbb| is that it conflicts with {\tt hyperref}---if you use the macro in a moveable argument such as a section heading, you will provoke a \LaTeX\ error message. The solution is to use macros that take a single character as argument, like \verb|\vmathbb{A}| and \verb|\vvmathbb{A}|, which both cooperate with {\tt hyperref}.
\item the third, new, alphabet is borrowed from the STIX fonts---it is sharp and quite clear, geometric in design. The macro \verb|\vvmathbb| provided to access this alphabet. The new option {\tt vvarbb} effectively makes \verb|\mathbb| mean the same as \verb|\vvmathbb|.
(The reason for including these in the \textsf{newtx} package rather than calling them from the \textsf{mathalfa} package is that \textsf{newtx} leaves very little space for new math symbol fonts and math alphabets, and this way requires no additional such resources.
-\item \textbf{Important note:} Under the option {\tt stix2}, there are still three blackboard fonts but the macro \verb|\vmathbb| now points to glyphs from {\tt DSSerif}, a serifed double-struck family that replaces the original variant that is still available under other options.
+\item \textbf{Important note:} Under the option {\tt stix2}, there are still three blackboard fonts but the macro \verb|\vmathbb| now points to glyphs from {\tt DSSerif}, a serifed double-struck family that replaces the original variant that is still available under other options. With {\tt stix2}, the {\tt dotlessi} and {\tt dotlessj} glyphs from the {\tt DSSerif} font are available as \verb|$\imathbbs$| and \verb|$\jmathbbs$|, no matter which blackboard bold option you chose.
\end{itemize}
One interesting feature of the new alphabet is that it contains blackboard bold numbers, of which $0$ and $1$ will likely be the most useful, perhaps as operator names. I find $\vvmathbb{1}$=\verb|$\vvmathbb{1}$| useful in specifying an indicator, AKA characteristic function. Here are some examples:
@@ -638,7 +659,7 @@
The last two entries provide us with a way to access custom-encoded versions of {\tt fxlri.pfb} and {\tt fxlbi.map} in order to access some of the unencoded alternate characters---eg, Greek letters, {\tt J.alt} and {\tt v.alt}. The font file \textsf{LibertineTheta-Regular.pfb} was created from the Theta symbol in {\tt fxlri.pfb}, which requires some FontForge help to look correct.
This version contains optical versions of the math italic and symbol fonts at 7\texttt{pt} and 5\texttt{pt}, allowing better rendering in \verb|\scriptstyle| and \verb|\scriptscriptstyle|.
-\section{Appendix: Changes made in version 1.5}
+\section{Appendix 1: Changes made in version 1.5}
\begin{itemize}
\item
The large delimiters have been modified so match the heights in common usage by \texttt{cmex10} and other packages. (Those formerly used by \texttt{newtxmath} were somewhat shorter, resulting in unexpected behavior of \verb|\Big|, \verb|\bigg|, etc.)
@@ -716,4 +737,159 @@
\item New macros \verb|\setSYdimens| and \verb|\setEXdimens| allow experts to modify some math font dimensions.
\end{itemize}
+
+\def\jj{\mkern-3mu j}
+
+\section{Appendix 2: Changes made in version 1.60}
+Versions of {\tt newtx} dated from September, 2019 (1.60 for {\tt newtxmath} make some quite substantial changes, mostly to math mode.
+
+\section{Goals}
+Spurred by work of Ross Moore to provide means of generating archivable pdf using {\tt pdflatex}, the main goal was to change {\tt newtx} and {\tt newpx} to meet the requirements for satisfying the {\tt PDF/A-1b} standards by using an appropriate preamble involving the {\tt pdfx} package and other unicode mapping files. Making these changes gave me the opportunity to organize the source files to make them more manageable in future revisions.
+
+A further goal whose time seemed ripe was to rework the spacing of math letters, both Roman and Greek, so they behaved better in superscripts and subscripts. This did not turn out to be so easy. The problem is illustrated by math italic j. If you don't give it enough extra space on the left, it will likely collide with the D in rendering \verb|$D^j$|. On the other hand, if you do give it enough space on the left, it will look bad as a subscript, appearing too far right.
+
+A final goal was to make better use of the remaining space in some of the math fonts by placing some math alphabets in them, avoiding perhaps a waste of those precious sixteen math families.
+
+\section{The important changes}
+The following changes were made to both {\tt newtx} and {\tt newpx}.
+
+\subsection{Archivability}
+Some of the individual font files from which the math fonts are built turned out to have some fairly minor structural issues. These have all been corrected. The more major issue was the lack of unicode mapping for all characters in the fonts. For the symbol and math extension fonts, this issue was largely solved by Ross Moore's {\tt glyphtounicode} files that are now accessible as part of TeXLive and MiKTeX. The main problem was the math alphabets like math italic, bold math italic, upright Greek and slanted Greek, all of which have now been assigned their own unicode points. For all of these, I constructed new fonts using unicode names for the glyphs, then made \textsf{fontinst} scripts that renamed those unicode values to the original simple names as used in the encoding files so that I could use my old encoding and adjustment files. This exercise has now been carried out for {\tt newtxmath}, {\tt newpxmath}, {\tt newtxmath/libertine}, {\tt newtxmath/cochineal}, {\tt newtxmath/stix2}, {\tt newtxmath/xcharter} and {\tt newtxmath/erewhon.} Each of these can now be considered to have an ``enhanced'' status that allows them to share all the new assets described below.
+ The other packages which may be specified as an option to {\tt newtxmath} (e.g., {\tt baskervaldx, baskervillef}) must be considered for the moment to be ``unenhanced'' and able to share only some of the new assets. In particular, only the enhanced items can generate archivable pdf.
+
+Also modified were the {\tt sups} fonts in {newtxtext}, where the main issue was unicode mapping. Superior number and some superior letters do have assigned unicode values, but in may cases a more creative approach was needed, and provided once again by Ross Moore. I rebuilt the superior font files using those unicode names, solving that particular problem.
+
+Here is a sample preamble showing the elements you will need to specify to generate a pdf satisfying the PDF/A-1b standards, as verified by Adobe Acrobat Pro. (Other verification processes may yield different outcomes.)
+\begin{verbatim}
+\documentclass[noamsfonts]{amsart} % save 2 math families
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage{newtxtext} %T1 is default encoding
+\usepackage[scaled=0.95]{inconsolata} % typewriter
+%\usepackage[leqno]{amsmath}
+\usepackage{amsthm}
+\usepackage[vvarbb]{newtxmath} % vvarbb gives STIX Bbb
+\end{verbatim}
+
+Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix is now available and will become part of the upcoming {\tt pdfx} v1.6.4.
+
+\subsection{Glyph spacing changes} \textbf{(For enhanced packages only)}I reworked the math italics to improve the rendering of some superscripts. This affects (a) parentheses, brackets and braces to inhibit clashes; (b) glyphs like j, f, p, y, \verb|\rho|, \verb|\beta| and \verb|\mu| where a long tail could pose problems intersecting with other glyphs; (c) glyphs like such as D, Q and \verb|\Phi| that are round on the right, where interference is most likely to occur with a superscript. Increasing the left side-bearing of j, etc., helps with superscripts but creates an ugly gap when used as subscripts.
+
+
+ The {\tt subscriptcorrection} option to {\tt newtxmath} has been corrected and enhanced so that it now offers a partial solution the subscript spacing problem. I regret that this option is incompatible with xy-pic, both depending on making \verb|_| an active character. {\tt Newtxmath} will detect if the {\tt xy} package is loaded and disable {\tt subscriptcorrection} if so. You would have to correct such issues by manually inserting a negative \verb|\mkern|. For example, you might put in your preamble something like
+ \begin{verbatim}
+\def\jj{\mkern-3mu j}
+\end{verbatim}
+and then use \verb|$x_{\jj}$| instead of \verb|$x_j$|, turning $x_j$ into $x_{\jj}$.
+
+If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, e.g., {\tt newtx-subs.tex} if you are using the {\tt newtx} default math letters. There is already such a file located in the {\tt newtx} distribution in the \verb|/tex/latex/| folder. If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. The entries in the file are lines like
+\begin{verbatim}
+{j}{-3}
+\end{verbatim}
+each of which will have the same effect as the above macro if the first item in the subscript is j. You can also specify Greek letters with lines like
+\begin{verbatim}
+{\beta}{-1.5}
+\end{verbatim}
+The complete list of file names recognized for specifying subscript corrections is:
+\begin{verbatim}
+newtx-subs.tex
+newtx-libertine-subs.tex
+newtx-xcharter-subs.tex
+newtx-cochineal-subs.tex
+newtx-baskervillef-subs.tex
+newtx-stickstoo-subs.tex
+newtx-garamond-subs.tex
+newtx-ebgaramond-subs.tex
+newtx-baskervald-subs.tex
+newtx-erewhon-subs.tex
+newtx-minion-subs.tex
+newtx-nc-subs.tex
+newtx-ncf-subs.tex
+\end{verbatim}
+
+\subsection{New glyphs added} \textbf{(For enhanced packages only)} Math family 1 {\tt (letters)} has been extended from 128 slots to 256, retaining the {\tt OML} encoding of the first 128. Most of additional slots have been allocated to a script font from the old STIX collection and an upright modification of that font.
+By default, \verb|$\mathscr{F}$| will produce $\mathscr{F}$.\\
+$\bullet$ option {\tt uprightscript} changes the output to {\usefont{OML}{ntxmi}{m}{it}\char201}.\\
+In both cases, there are full upper-case and lower-case and {\tt dotlessi}, {\tt dotlessj}. To insert the latter, you can write either \verb|$\mathscr{\imath}$| or \verb|$\imathscr$|, rendered as $\mathscr{\imath}$ in the slanted script case.
+
+The secondary letters font {\tt (lettersA)} and math family 2 {\tt(symbols)} have been rearranged. The first of these continues to have a Fraktur alphabet, but it a modification of its original one, having wider vertical stems and a blacker appearance more in keeping with the weight Times. {\tt Dotlessi} and {\tt dotlessj} have been added and can be specified in math mode by \verb|$\imathfrak$| and \verb|$\jmathfrak$|---\verb|$\mathfrak{\imath}$| also works. There are in addition two subsidiary Bbb alphabets in {\tt lettersA}, specified by the respective options {\tt vmathbb}, {\tt vvmathbb}, and there are corresponding {\tt dotlessi}, {\tt dotlessj} activated by \verb|$\imathbb$|, \verb|$\jmathbb$|, which always render as $\imathbb$, $\jmathbb$ mo matter the choice of which Blackboard Bold Alphabet. If you select one of the options {\tt varbb}, {\tt vvarbb}, you will have Bbb digits 0..9 using, e.g., \verb|$\mathbb{1}$| to get~$\vvmathbb{1}$.
+
+Among the new symbols added are:\\
+$\bullet$ \verb|\hslash|, \verb|\hbar|, \verb|\lambdaslash|, \verb|\lambdabar|, \verb|\Zbar|, \verb|\Angstrom| are now constructed from the native glyphs, but only in the enhanced families.\\
+$\bullet$ Euler's constant \verb|$\Euler$| ($\Euler$).\\
+$\bullet$ Hermitian transpose \verb|\hermtransp| or \verb|\htransp| is used like \verb|$\mathbf{A}^{\htransp}$| ($\mathbf{A}^{\htransp}$). This usage is similar to simple transpose \verb|$\mathbf{A}^{\transp}$| ($\mathbf{A}^{\transp}$).\\
+$\bullet$ Independence (in the probabilistic sense) can use \verb|\Perp|, $\Perp$, and there is a new \verb|\nPerp|, $\nPerp$ for the negation.
+
+\subsection{Adaptive vector accent} The \LaTeX\ macro \verb|\overrightarrow| provides a right arrow with adaptive width, but not matching the vector head of {\tt newtxmath}. Likewise, the {\tt esvect} provides a similar service with a choice of vector heads, none of which match {\tt newtxmath}. I've added code to provide a matching adaptive vector accent and which uses the same macro name, \verb|\vv|, as {\tt esvect}.
+For a comparison of these vector accents, \verb|$\vec{XY} \vv{XY} \overrightarrow{XY}$| renders as\\
+$\vec{XY} \vv{XY} \overrightarrow{XY}$.\\
+$\bullet$ \verb|$\vv{AB}$| renders as $\vv{AB}$.\\
+$\bullet$ \verb|$\vv*{AB}{x}$| renders as $\vv*{AB}{x}$. This provides better horizontal spacing of subscripts than \verb|$\vv{AB}_{x}$|, $\vv{AB}_{x}$.\\
+$\bullet$ You can also do \verb|$\vv*{AB}{\vv{CD}}$|, which renders as $\vv*{AB}{\vv{CD}}$.\\
+$\bullet$ You can change the vertical space between the arrow and the accentee by means of the package option {\tt vecsep}, whose default value is {\tt .25ex}.
+
+\subsection{Miscellaneous Changes}
+\begin{itemize}
+\item
+The superior letters fonts in {\tt newtx}
+have been extended and all glyphs now have appropriate unicode mappings.
+\item
+The AMS fonts replacement, {\tt ntxsym} corrects the former misplacement of \verb|\kbbb|, \verb|\daleth|, \verb|\circledR| and \verb|\circledS|.)
+\end{itemize}
+\newpage
+\section{Changed Font Tables}
+\subsection{letters}
+\fonttable{ntxmi}
+\newpage
+\subsection{lettersA}
+\fonttable{ntxmia}
+\newpage
+\subsection{symbols}
+\fonttable{ntxsy}
+\newpage
+
+\subsection{A sample newtx-subs.tex}
+You may either copy the entire block below, starting with the line \verb|\begin{...| and ending after the line beginning \verb|\end{|
+and pasting it into the top of your document before the \verb|\documentclass...| line, which will allow for easy editing and will write the file to the same folder as your document, or make your own file, omitting those outer two lines.
+
+\begin{verbatim}
+\begin{filecontents*}{newtx-subs.tex}
+{f}{-3}
+{j}{-3}
+{p}{-1}
+{y}{-1}
+{A}{-3}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{\rho}{-1.5}
+{\mu}{-1}
+\end{filecontents*}
+\end{verbatim}
+\subsection*{The {\tt ebgaramond} option to newtxmath}
+As {\tt ebgaramond} has an x-height considerably smaller than {\tt newtx}, some amount of scaling is useful to bridge the gap. In making the replacement letters, I increased the size of the EBGaramond letters by 5\%, so make some scaling combination that compensates for this. The weights of {\tt ebgaramond} used in the substitutions were regular and semibold. This dictates one of the options used for {\tt ebgaramond}.
+
+\textsc{Example preamble:}\\
+\begin{verbatim}
+\usepackage[lining,semibold,scaled=1.05]{ebgaramond}
+% Latex BOLD renders with ebgaramond semibold
+\usepackage[T1]{fontenc} % best for Western European languages
+\usepackage{textcomp} % required to get special symbols
+\usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
+\usepackage[ebgaramond,vvarbb,subscriptcorrection]{newtxmath} % STIX Bbb
+\usepackage{bm}% load after all math to give access to bold math
+\end{verbatim}
+
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newtx.doc.tlpobj new/tlpkg/tlpobj/newtx.doc.tlpobj
--- old/tlpkg/tlpobj/newtx.doc.tlpobj 2019-02-28 03:55:58.000000000 +0100
+++ new/tlpkg/tlpobj/newtx.doc.tlpobj 2020-03-04 23:52:58.000000000 +0100
@@ -1,9 +1,9 @@
name newtx.doc
category Package
-revision 47889
+revision 54080
shortdesc doc files of newtx
relocated 1
-docfiles size=236
+docfiles size=418
RELOC/doc/fonts/newtx/MANIFEST-newtx.txt
RELOC/doc/fonts/newtx/README
RELOC/doc/fonts/newtx/implementation.pdf
++++++ newtx.tar.xz ++++++
++++ 182336 lines of diff (skipped)
++++++ newtxtt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtxtt/README new/doc/fonts/newtxtt/README
--- old/doc/fonts/newtxtt/README 2017-06-06 23:55:40.000000000 +0200
+++ new/doc/fonts/newtxtt/README 2020-02-16 23:06:12.000000000 +0100
@@ -1,7 +1,7 @@
This small package provides a means of accessing all features (plus scaling) of an extension of the txfont typewriter fonts as a typewriter font family to accompany any other chosen font packages. These are serifed typewriter faces that are taller and heavier than Latin Modern Typewriter and much heavier than Courier.
-Current version: 1.055
+Current version: 1.056, 2020-02-15
As the fonts on which these were based are licensed under GPL 3.0, so are the fonts in
@@ -19,6 +19,10 @@
http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.056
+1. Corrected the fd files so as to be useable without loading the package. (Thanks Jean-Francois Burnol.)
+2. Added documentation about how to do this.
+
Changes in version 1.055
Corrected word-spacing parameters, broken in the prior version. (Thanks Yudai Nakata.)
Binary files old/doc/fonts/newtxtt/newtxtt-doc.pdf and new/doc/fonts/newtxtt/newtxtt-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtxtt/newtxtt-doc.tex new/doc/fonts/newtxtt/newtxtt-doc.tex
--- old/doc/fonts/newtxtt/newtxtt-doc.tex 2015-07-04 23:45:16.000000000 +0200
+++ new/doc/fonts/newtxtt/newtxtt-doc.tex 2020-02-16 23:06:12.000000000 +0100
@@ -103,4 +103,23 @@
\textttz{TX Typewriter: This is just a line to illustrate typewriter 0123456789. (ttz)}
\textsc{Notes:} The first two are standard monospaced with the same spacing---the : is considered to be the end of a sentence---while the words in the third are spaced more compactly, it would hyphenate if necessary, and lacks the extra space at the end of a ``sentence''.
+
+\textbf{Using the fonts without using the package:} If you wish to use these fonts without making one of the them the \verb|\ttdefault|, you may call them directly from the {\tt fd}:
+\begin{verbatim}
+{\fontfamily{newtxtt}\selectfont ...} % or newtxttz
+\end{verbatim}
+or, for finer control of the \textsc{nfss} parameters,
+\begin{verbatim}
+{\usefont{T1}{newtxtt}{b}{n} ...} % or {newtxttz}{m}{sc}, etc
+\end{verbatim}
+For further control, you may add in your preamble lines like the following to select the zero style (five choices, a to e) and the shape of quotes:
+\begin{verbatim}
+\makeatletter
+\edef\newtxtt@fig{c} % one of a--e to determine the zerostyle, defaults to a
+\newif\iftxtt@upq\txtt@upqtrue % same effect as option straightquotes
+% remove the \txtt@upqtrue for not straightquotes, the default
+\makeatother
+
+\end{verbatim}
+
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newtxtt.doc.tlpobj new/tlpkg/tlpobj/newtxtt.doc.tlpobj
--- old/tlpkg/tlpobj/newtxtt.doc.tlpobj 2019-02-28 03:56:03.000000000 +0100
+++ new/tlpkg/tlpobj/newtxtt.doc.tlpobj 2020-03-24 02:00:55.000000000 +0100
@@ -1,9 +1,9 @@
name newtxtt.doc
category Package
-revision 44510
+revision 54512
shortdesc doc files of newtxtt
relocated 1
-docfiles size=22
+docfiles size=45
RELOC/doc/fonts/newtxtt/README
RELOC/doc/fonts/newtxtt/newtxtt-doc.pdf
RELOC/doc/fonts/newtxtt/newtxtt-doc.tex
++++++ newtxtt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/newtxtt/t1newtxtt.fd new/tex/latex/newtxtt/t1newtxtt.fd
--- old/tex/latex/newtxtt/t1newtxtt.fd 2014-12-25 00:20:46.000000000 +0100
+++ new/tex/latex/newtxtt/t1newtxtt.fd 2020-02-16 23:06:12.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{t1newtxtt.fd}
- [2014/12/23 Font definitions for T1/newtxtt.]
+ [2020/02/15 Font definitions for T1/newtxtt.]
\expandafter\ifx\csname newtxtt@scale\endcsname\relax
\let\newtxtt@@scale\@empty
@@ -14,8 +14,11 @@
\fi
\let\newtxtt@@upq\@empty
-\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
-\else
+\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
+\csname iftrue\endcsname
+% fix proposed by Jean Francois Burnol to prevent "extra \fi"
+% error when using newtxtt directly from fd.
+\else
\iftxtt@upq\def\newtxtt@@upq{q}\fi
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/newtxtt/t1newtxttz.fd new/tex/latex/newtxtt/t1newtxttz.fd
--- old/tex/latex/newtxtt/t1newtxttz.fd 2014-12-25 00:20:46.000000000 +0100
+++ new/tex/latex/newtxtt/t1newtxttz.fd 2020-02-16 23:06:12.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{t1newtxttz.fd}
- [2014/05/30 Font definitions for T1/newtxttz.]
+ [2020/02/15 Font definitions for T1/newtxttz.]
\expandafter\ifx\csname newtxtt@scale\endcsname\relax
\let\newtxtt@@scale\@empty
@@ -14,8 +14,11 @@
\fi
\let\newtxtt@@upq\@empty
-\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
-\else
+\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
+\csname iftrue\endcsname
+% fix proposed by Jean Francois Burnol to prevent "extra \fi"
+% error when using newtxtt directly from fd.
+\else
\iftxtt@upq\def\newtxtt@@upq{q}\fi
\fi
@@ -68,3 +71,4 @@
%}{}
\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newtxtt.tlpobj new/tlpkg/tlpobj/newtxtt.tlpobj
--- old/tlpkg/tlpobj/newtxtt.tlpobj 2019-02-28 03:56:03.000000000 +0100
+++ new/tlpkg/tlpobj/newtxtt.tlpobj 2020-03-24 02:00:55.000000000 +0100
@@ -1,6 +1,6 @@
name newtxtt
category Package
-revision 44510
+revision 54512
shortdesc Enhancement of typewriter fonts from newtx
relocated 1
longdesc The package provides enhanced fonts with LaTeX support files
@@ -154,7 +154,6 @@
RELOC/tex/latex/newtxtt/ts1newtxtt.fd
RELOC/tex/latex/newtxtt/ts1newtxttz.fd
catalogue-ctan /fonts/newtxtt
-catalogue-date 2017-05-22 18:08:04 +0200
-catalogue-license gpl3lppl
-catalogue-topics font font-type1 font-mono font-t1enc
-catalogue-version 1.055
+catalogue-license gpl3 lppl
+catalogue-topics font font-type1 font-mono font-supp font-t1enc
+catalogue-version 1.056
++++++ newverbs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/newverbs/README new/doc/latex/newverbs/README
--- old/doc/latex/newverbs/README 2012-05-09 00:31:55.000000000 +0200
+++ new/doc/latex/newverbs/README 2019-09-10 23:45:21.000000000 +0200
@@ -1,6 +1,6 @@
The 'newverbs' LaTeX package
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2012 by Martin Scharrer <martin(a)scharrer-online.de>
+Copyright (c) 2010-2019 by Martin Scharrer <martin(a)scharrer-online.de>
Code repository: https://bitbucket.org/martin_scharrer/newverbs
This package allows the definition of \verb variants which add TeX code before
Binary files old/doc/latex/newverbs/newverbs.pdf and new/doc/latex/newverbs/newverbs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newverbs.doc.tlpobj new/tlpkg/tlpobj/newverbs.doc.tlpobj
--- old/tlpkg/tlpobj/newverbs.doc.tlpobj 2019-02-28 03:56:04.000000000 +0100
+++ new/tlpkg/tlpobj/newverbs.doc.tlpobj 2019-09-11 01:55:18.000000000 +0200
@@ -1,8 +1,8 @@
name newverbs.doc
category Package
-revision 26258
+revision 52074
shortdesc doc files of newverbs
relocated 1
-docfiles size=46
+docfiles size=55
RELOC/doc/latex/newverbs/README
RELOC/doc/latex/newverbs/newverbs.pdf
++++++ newverbs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/newverbs/newverbs.sty new/tex/latex/newverbs/newverbs.sty
--- old/tex/latex/newverbs/newverbs.sty 2012-05-09 00:31:55.000000000 +0200
+++ new/tex/latex/newverbs/newverbs.sty 2019-09-10 23:45:21.000000000 +0200
@@ -20,7 +20,7 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% Copyright (C) 2012 by Martin Scharrer <martin(a)scharrer-online.de>
+%% Copyright (C) 2012-2019 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.3
@@ -37,19 +37,33 @@
%% This work consists of the files newverbs.dtx and newverbs.ins
%% and the derived file newverbs.sty.
\ProvidesPackage{newverbs}[%
- 2012/05/08
- v1.3a
+ 2019/09/09
+ v1.4
Define new 'verb' commands and short verb. characters]
\newcommand*\newverbcommand{\new@verbcommand\newcommand}
\newcommand*\renewverbcommand{\new@verbcommand\renewcommand}
\newcommand*\provideverbcommand{\new@verbcommand\providecommand}
-\def\new@verbcommand#1#2#3#4{%
+\def\new@verbcommand#1#2{%
+ \@ifnextchar[%
+ {\new@@verbcommand{#1}{#2}}%
+ {\new@@verbcommand{#1}{#2}[\verb]}%
+}
+\let\newverbs@end\@empty
+\def\new@@verbcommand#1#2[#3]#4#5{%
#1*#2{%
- \begingroup
+ \bgroup
\newverbcommand@settings
- \def\verb@egroup{\verb@orig@egroup#4\endgroup}%
- \def\newverbs@txend{#4\endgroup}%
- #3\verb
+ \ifx\newverbs@end\@empty
+ \expandafter\def\expandafter\verb@egroup\expandafter{\verb@egroup\newverbs@end}%
+ \fi
+ \begingroup\def\@tempa{#5}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\newverbs@end
+ \expandafter\expandafter\expandafter{\expandafter\@tempa\newverbs@end\egroup}%
+ \def\newverbs@txend{#5\egroup}%
+ \verbatim@font\let\verbatim@font\relax
+ #4#3%
}%
}
\def\newverbs@tabularxsupport{%
@@ -84,20 +98,43 @@
}
\provideverbcommand{\qverb}{\qverbbeginquote}{\qverbendquote}
\@ifundefined{openinnerquote}{%
- \def\qverbbeginquote{`}%
- \def\qverbendquote{'}%
+ \def\qverbbeginquote{``}%
+ \def\qverbendquote{''}%
}{%
- \def\qverbbeginquote{\openinnerquote}%
- \def\qverbendquote{\closeinnerquote}%
+ \def\qverbbeginquote{\openautoquote}%
+ \def\qverbendquote{\closeautoquote}%
}
\newverbcommand{\fverb}
{\setbox\verbbox\hbox\bgroup\color@setgroup}
{\color@endgroup\egroup\fbox{\box\verbbox}}
-\newcommand*\MakeSpecialShortVerb[1]{%
+\RequirePackage{shortvrb}
+\def\MakeShortVerb{%
+ \@ifstar
+ {\newverbs@MakeShortVerb*}%
+ {\newverbs@MakeShortVerb{}}%
+}
+\def\newverbs@MakeShortVerb#1{%
+ \@ifnextchar[%
+ {\newverbs@@MakeShortVerb{#1}}%
+ {\@MakeSpecialShortVerb{#1}{\verb}}%
+}
+\def\newverbs@@MakeShortVerb#1[#2]{%
+ \@MakeSpecialShortVerb{#1}{#2}%
+}
+\def\@MakeSpecialShortVerb#1#2#3{%
+ %\expandafter\ifx\csname cc\string#3\endcsname\relax
+ %\else
+ % \DeleteShortVerb{#3}%
+ %\fi
+ \def\@shortvrbdef{#2#1}%
+ \@MakeShortVerb{#3}%
+}
+\newcommand*\MakeSpecialShortVerb{%
\@ifstar
- {\def\@shortvrbdef{#1*}\@MakeShortVerb}%
- {\def\@shortvrbdef{#1}\@MakeShortVerb}%
+ {\@MakeSpecialShortVerb{*}}%
+ {\@MakeSpecialShortVerb{}}%
}
+%% \subsection{Collect verbatim argument}
\newcommand*\collectverb{%
\begingroup
\verbatim@font
@@ -246,19 +283,6 @@
)%
|gdef|misj(|def^^M(^^J))%
|endgroup%
-\newcommand\newverbenvironment{}
-\long\def\newverbenvironment#1#2#{%
- \@newverbenvironment{#1}{#2}%
-}
-\long\def\@newverbenvironment#1#2#3#4{%
- \newenvironment{#1}#2{%
- \begingroup
- \newverb@catcodes
- \obeyspaces
- #3%
- \expandafter\@@Collectverbenv\expandafter{\@currenvir}{\long\def\BODY}%
- }{#4}%
-}
\newcommand\newverbsfont{%
\verbatim@font
\frenchspacing
@@ -268,9 +292,20 @@
{\@Verbdef*}%
{\@Verbdef{}}%
}
-\newcommand*\@Verbdef[2]{%
+\def\@Verbdef#1#2{%
\Collectverb#1{\def#2}%
}
+\providecommand*\verbdef{%
+ \@ifstar
+ {\newverbs@verbdef*}%
+ {\newverbs@verbdef{}}%
+}
+\def\newverbs@verbdef#1#2{%
+ \Collectverb#1{\newverbs@@verbdef{#2}}%
+}
+\def\newverbs@@verbdef#1#2{%
+ \DeclareRobustCommand{#1}{{\newverbsfont#2}}%
+}
\endinput
%%
%% End of file `newverbs.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newverbs.tlpobj new/tlpkg/tlpobj/newverbs.tlpobj
--- old/tlpkg/tlpobj/newverbs.tlpobj 2019-02-28 03:56:05.000000000 +0100
+++ new/tlpkg/tlpobj/newverbs.tlpobj 2019-09-11 01:55:18.000000000 +0200
@@ -1,6 +1,6 @@
name newverbs
category Package
-revision 26258
+revision 52074
shortdesc Define new versions of \verb, including short verb versions
relocated 1
longdesc The package allows the definition of \verb variants which add
@@ -17,7 +17,7 @@
catalogue-also shortvrb
catalogue-contact-repository https://bitbucket.org/martin_scharrer/newverbs
catalogue-ctan /macros/latex/contrib/newverbs
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2019-09-10 14:37:06 +0200
catalogue-license lppl1.3
catalogue-topics verbatim
-catalogue-version 1.3a
+catalogue-version 1.4
++++++ nicematrix.doc.tar.xz ++++++
++++ 2896 lines of diff (skipped)
++++++ nicematrix.tar.xz ++++++
++++ 4444 lines of diff (skipped)
++++++ nihbiosketch.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nihbiosketch.doc.tlpobj new/tlpkg/tlpobj/nihbiosketch.doc.tlpobj
--- old/tlpkg/tlpobj/nihbiosketch.doc.tlpobj 2019-02-28 03:56:08.000000000 +0100
+++ new/tlpkg/tlpobj/nihbiosketch.doc.tlpobj 2020-03-09 00:28:45.000000000 +0100
@@ -1,6 +1,6 @@
name nihbiosketch.doc
category Package
-revision 39460
+revision 54191
shortdesc doc files of nihbiosketch
relocated 1
docfiles size=22
++++++ nihbiosketch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nihbiosketch.tlpobj new/tlpkg/tlpobj/nihbiosketch.tlpobj
--- old/tlpkg/tlpobj/nihbiosketch.tlpobj 2019-02-28 03:56:08.000000000 +0100
+++ new/tlpkg/tlpobj/nihbiosketch.tlpobj 2020-03-09 00:28:45.000000000 +0100
@@ -1,24 +1,23 @@
name nihbiosketch
category Package
-revision 39460
+revision 54191
shortdesc A class for NIH biosketches based on the 2015 updated format
relocated 1
longdesc This LaTeX document class tries to adhere to the Biographical
longdesc Sketch formatting requirements outlined in NIH Notice
longdesc [NOT-OD-15-032]
-longdesc (http://grants.nih.gov/grants/guide/notice-files/NOT-OD-15-032.
-longdesc html). This new format is required for applications submitted
-longdesc for due dates on or after May 25, 2015. The package tries to
-longdesc mimic the example documents provided on the [SF 424 (R&R) Forms
-longdesc and Applications page]
-longdesc (http://grants.nih.gov/grants/funding/424/index.htm#format) as
-longdesc closely as possible. The author has used this class for his own
-longdesc grant submissions; however he offers no guarantee of conformity
-longdesc to NIH requirements.
+longdesc (grants.nih.gov/grants/guide/notice-files/NOT-OD-15-032.html).
+longdesc This new format is required for applications submitted for due
+longdesc dates on or after May 25, 2015. The package tries to mimic the
+longdesc example documents provided on the [SF 424 (R&R) Forms and
+longdesc Applications page]
+longdesc (grants.nih.gov/grants/funding/424/index.htm#format) as closely
+longdesc as possible. The author has used this class for his own grant
+longdesc submissions; however he offers no guarantee of conformity to
+longdesc NIH requirements.
runfiles size=2
RELOC/tex/latex/nihbiosketch/nihbiosketch.cls
catalogue-also nih
catalogue-ctan /macros/latex/contrib/nihbiosketch
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cv
++++++ nimbus15.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/nimbus15/README new/doc/fonts/nimbus15/README
--- old/doc/fonts/nimbus15/README 2018-09-22 22:59:39.000000000 +0200
+++ new/doc/fonts/nimbus15/README 2020-01-30 23:20:11.000000000 +0100
@@ -10,7 +10,14 @@
for the details of that license.
The support files for Latin characters are quite meager compared to those in other Times text packages (no small caps, no old-style figures, no proportional figures), and it is recommended to use these fonts only as a supplement providing Greek and Cyrillic. See the documentation for examples.
-Current version 1.011 2018-09-21
+Current version 1.013 2020-01-29
+
+Changes in version 1.013
+1. Added U+0300 .. U+0303 to zco-{Regular, Oblique, Bold, BoldOblique} and zcoB-{Regular,Oblique}. Fontspec seems to require three of these to be present.
+2. Added psili accent to the same fonts, as well as U_1E9E (Capital sharp S) and U+1F48 (Omicronpsili).
+
+Changes in version 1.012
+Modified some sty files to prevent warnings due to mweights in use by another package.
Changes in version 1.011
Documentation corrections and additions to allow comparisons of typewriter fonts.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nimbus15.doc.tlpobj new/tlpkg/tlpobj/nimbus15.doc.tlpobj
--- old/tlpkg/tlpobj/nimbus15.doc.tlpobj 2019-02-28 03:56:08.000000000 +0100
+++ new/tlpkg/tlpobj/nimbus15.doc.tlpobj 2020-03-24 02:00:56.000000000 +0100
@@ -1,6 +1,6 @@
name nimbus15.doc
category Package
-revision 48734
+revision 54512
shortdesc doc files of nimbus15
relocated 1
docfiles size=205
++++++ nimbus15.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-Bold.afm new/fonts/afm/public/nimbus15/zco-Bold.afm
--- old/fonts/afm/public/nimbus15/zco-Bold.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-Bold.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:03:12 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:52:10 2020
FontName zco-Bold
FullName zco Bold
FamilyName zco
Weight Bold
Notice (Copyright (URW)++,Copyright 2014 by (URW)++ Design & Development. Copyright 2015 by Michael Sharpe, AGPL)
ItalicAngle 0
-IsFixedPitch true
+IsFixedPitch false
UnderlinePosition -87
UnderlineThickness 77
Version 1.00
@@ -17,7 +17,7 @@
XHeight 437
Ascender 623
Descender -205
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 220 -15 381 638 ;
C 34 ; WX 600 ; N quotedbl ; B 136 312 464 602 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 250 -208 463 0 ;
C -1 ; WX 600 ; N tilde ; B 115 523 485 656 ;
C -1 ; WX 600 ; N hungarumlaut ; B 125 496 475 694 ;
+C -1 ; WX 600 ; N gravecomb ; B 125 496 350 696 ;
+C -1 ; WX 600 ; N acutecomb ; B 250 496 475 696 ;
+C -1 ; WX 600 ; N uni0302 ; B 125 497 476 696 ;
+C -1 ; WX 600 ; N tildecomb ; B 115 523 485 656 ;
C -1 ; WX 600 ; N tonos ; B 204 491 393 656 ;
C -1 ; WX 600 ; N dieresistonos ; B 106 473 490 674 ;
C -1 ; WX 600 ; N Alphatonos ; B -18 0 617 583 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 0 0 600 696 ;
C -1 ; WX 600 ; N Wdieresis ; B -10 0 610 798 ;
C -1 ; WX 600 ; N wdieresis ; B 0 0 600 654 ;
+C -1 ; WX 600 ; N uni1E9E ; B 8 -16 588 626 ;
C -1 ; WX 600 ; N Ygrave ; B 21 0 579 839 ;
C -1 ; WX 600 ; N ygrave ; B 21 -205 579 696 ;
+C -1 ; WX 600 ; N uni1F48 ; B -29 -14 579 598 ;
+C -1 ; WX 600 ; N uni1FBF ; B 251 350 384 598 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 42 229 558 329 ;
C -1 ; WX 600 ; N emdash ; B -29 229 629 329 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-BoldOblique.afm new/fonts/afm/public/nimbus15/zco-BoldOblique.afm
--- old/fonts/afm/public/nimbus15/zco-BoldOblique.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-BoldOblique.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:04:13 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:52:18 2020
FontName zco-BoldOblique
FullName zco Bold Oblique
FamilyName zco
Weight Bold
Notice (Copyright (URW)++,Copyright 2014 by (URW)++ Design & Development. Copyright 2015 by Michael Sharpe, AGPL)
ItalicAngle -12
-IsFixedPitch true
+IsFixedPitch false
UnderlinePosition -87
UnderlineThickness 77
Version 1.00
@@ -17,7 +17,7 @@
XHeight 437
Ascender 623
Descender -205
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 234 -15 501 638 ;
C 34 ; WX 600 ; N quotedbl ; B 243 312 592 602 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 222 -208 433 0 ;
C -1 ; WX 600 ; N tilde ; B 233 523 619 656 ;
C -1 ; WX 600 ; N hungarumlaut ; B 237 496 616 694 ;
+C -1 ; WX 600 ; N gravecomb ; B 264 496 464 696 ;
+C -1 ; WX 600 ; N acutecomb ; B 362 496 616 696 ;
+C -1 ; WX 600 ; N uni0302 ; B 237 497 590 696 ;
+C -1 ; WX 600 ; N tildecomb ; B 233 523 619 656 ;
C -1 ; WX 600 ; N tonos ; B 281 491 486 650 ;
C -1 ; WX 600 ; N dieresistonos ; B 150 491 575 650 ;
C -1 ; WX 600 ; N Alphatonos ; B -54 0 584 583 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 82 0 684 689 ;
C -1 ; WX 600 ; N Wdieresis ; B 98 0 725 793 ;
C -1 ; WX 600 ; N wdieresis ; B 82 0 684 654 ;
+C -1 ; WX 600 ; N uni1E9E ; B 18 -16 646 626 ;
C -1 ; WX 600 ; N Ygrave ; B 128 0 694 839 ;
C -1 ; WX 600 ; N ygrave ; B -13 -205 662 696 ;
+C -1 ; WX 600 ; N uni1F48 ; B 56 -14 660 598 ;
+C -1 ; WX 600 ; N uni1FBF ; B 336 351 492 598 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 101 229 619 329 ;
C -1 ; WX 600 ; N emdash ; B 30 229 690 329 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-Oblique.afm new/fonts/afm/public/nimbus15/zco-Oblique.afm
--- old/fonts/afm/public/nimbus15/zco-Oblique.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-Oblique.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 19:59:58 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:55:01 2020
FontName zco-Oblique
FullName zco Oblique
FamilyName zco
Weight Regular
Notice (Copyright (URW)++,Copyright 2014 by (URW)++ Design & Development. Copyright 2015 by Michael Sharpe, AGPL)
ItalicAngle -12
-IsFixedPitch true
+IsFixedPitch false
UnderlinePosition -100
UnderlineThickness 50
Version 1.00
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 234 -15 474 641 ;
C 34 ; WX 600 ; N quotedbl ; B 254 315 582 604 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 246 -166 452 23 ;
C -1 ; WX 600 ; N tilde ; B 246 504 590 617 ;
C -1 ; WX 600 ; N hungarumlaut ; B 252 478 588 645 ;
+C -1 ; WX 600 ; N gravecomb ; B 274 478 441 651 ;
+C -1 ; WX 600 ; N acutecomb ; B 376 478 588 651 ;
+C -1 ; WX 600 ; N uni0302 ; B 252 478 566 654 ;
+C -1 ; WX 600 ; N tildecomb ; B 246 504 590 617 ;
C -1 ; WX 600 ; N tonos ; B 288 479 500 651 ;
C -1 ; WX 600 ; N dieresistonos ; B 180 479 542 651 ;
C -1 ; WX 600 ; N Alphatonos ; B -18 0 581 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 102 0 667 654 ;
C -1 ; WX 600 ; N Wdieresis ; B 109 0 708 774 ;
C -1 ; WX 600 ; N wdieresis ; B 102 0 667 623 ;
+C -1 ; WX 600 ; N uni1E9E ; B 20 -16 623 616 ;
C -1 ; WX 600 ; N Ygrave ; B 142 0 677 804 ;
C -1 ; WX 600 ; N ygrave ; B 10 -198 646 651 ;
+C -1 ; WX 600 ; N uni1F48 ; B 64 -16 664 589 ;
+C -1 ; WX 600 ; N uni1FBF ; B 325 342 462 589 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 120 249 600 314 ;
C -1 ; WX 600 ; N emdash ; B 48 249 670 314 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-Regular.afm new/fonts/afm/public/nimbus15/zco-Regular.afm
--- old/fonts/afm/public/nimbus15/zco-Regular.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-Regular.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:02:12 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:52:50 2020
FontName zco-Regular
FullName zco Regular
FamilyName zco
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 228 -15 372 641 ;
C 34 ; WX 600 ; N quotedbl ; B 146 315 454 604 ;
@@ -82,33 +82,33 @@
C 93 ; WX 600 ; N bracketright ; B 144 -136 332 616 ;
C 94 ; WX 600 ; N asciicircum ; B 102 342 498 633 ;
C 95 ; WX 600 ; N underscore ; B -24 -137 624 -63 ;
-C 96 ; WX 600 ; N grave ; B 144 478 332 651 ;
-C 97 ; WX 600 ; N a ; B 60 -16 552 443 ;
-C 98 ; WX 600 ; N b ; B 10 -16 552 616 ;
-C 99 ; WX 600 ; N c ; B 72 -16 546 443 ;
-C 100 ; WX 600 ; N d ; B 52 -16 594 616 ;
-C 101 ; WX 600 ; N e ; B 52 -16 532 443 ;
-C 102 ; WX 600 ; N f ; B 94 0 552 616 ;
-C 103 ; WX 600 ; N g ; B 52 -199 574 443 ;
-C 104 ; WX 600 ; N h ; B 32 0 562 616 ;
+C 96 ; WX 600 ; N grave ; B 206 478 394 651 ;
+C 97 ; WX 600 ; N a ; B 54 -16 546 443 ;
+C 98 ; WX 600 ; N b ; B 29 -16 571 616 ;
+C 99 ; WX 600 ; N c ; B 63 -16 537 443 ;
+C 100 ; WX 600 ; N d ; B 29 -16 571 616 ;
+C 101 ; WX 600 ; N e ; B 60 -16 540 443 ;
+C 102 ; WX 600 ; N f ; B 71 0 529 616 ;
+C 103 ; WX 600 ; N g ; B 39 -199 561 443 ;
+C 104 ; WX 600 ; N h ; B 35 0 565 616 ;
C 105 ; WX 600 ; N i ; B 80 0 520 636 ;
-C 106 ; WX 600 ; N j ; B 136 -199 471 636 ;
-C 107 ; WX 600 ; N k ; B 52 0 553 616 ;
+C 106 ; WX 600 ; N j ; B 133 -199 468 636 ;
+C 107 ; WX 600 ; N k ; B 50 0 551 616 ;
C 108 ; WX 600 ; N l ; B 80 0 520 616 ;
C 109 ; WX 600 ; N m ; B 0 0 604 443 ;
-C 110 ; WX 600 ; N n ; B 42 0 552 443 ;
+C 110 ; WX 600 ; N n ; B 45 0 555 443 ;
C 111 ; WX 600 ; N o ; B 60 -16 540 443 ;
-C 112 ; WX 600 ; N p ; B 10 -198 552 443 ;
-C 113 ; WX 600 ; N q ; B 52 -198 594 443 ;
-C 114 ; WX 600 ; N r ; B 72 0 552 439 ;
+C 112 ; WX 600 ; N p ; B 29 -198 571 443 ;
+C 113 ; WX 600 ; N q ; B 29 -198 571 443 ;
+C 114 ; WX 600 ; N r ; B 60 0 540 439 ;
C 115 ; WX 600 ; N s ; B 92 -16 508 443 ;
-C 116 ; WX 600 ; N t ; B 32 -16 510 578 ;
-C 117 ; WX 600 ; N u ; B 32 -16 552 429 ;
+C 116 ; WX 600 ; N t ; B 61 -16 539 578 ;
+C 117 ; WX 600 ; N u ; B 40 -16 560 429 ;
C 118 ; WX 600 ; N v ; B 18 0 581 429 ;
C 119 ; WX 600 ; N w ; B 18 0 581 429 ;
-C 120 ; WX 600 ; N x ; B 40 0 562 429 ;
+C 120 ; WX 600 ; N x ; B 39 0 561 429 ;
C 121 ; WX 600 ; N y ; B 40 -198 561 429 ;
-C 122 ; WX 600 ; N z ; B 104 0 501 429 ;
+C 122 ; WX 600 ; N z ; B 102 0 499 429 ;
C 123 ; WX 600 ; N braceleft ; B 186 -136 414 616 ;
C 124 ; WX 600 ; N bar ; B 268 -136 332 616 ;
C 125 ; WX 600 ; N braceright ; B 186 -136 414 616 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 268 -167 448 12 ;
C -1 ; WX 600 ; N tilde ; B 134 504 466 616 ;
C -1 ; WX 600 ; N hungarumlaut ; B 144 478 456 645 ;
+C -1 ; WX 600 ; N gravecomb ; B 206 478 394 651 ;
+C -1 ; WX 600 ; N acutecomb ; B 268 478 456 651 ;
+C -1 ; WX 600 ; N uni0302 ; B 144 478 456 654 ;
+C -1 ; WX 600 ; N tildecomb ; B 134 504 466 616 ;
C -1 ; WX 600 ; N tonos ; B 206 479 394 651 ;
C -1 ; WX 600 ; N dieresistonos ; B 120 479 480 651 ;
C -1 ; WX 600 ; N Alphatonos ; B 24 0 625 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 18 0 581 654 ;
C -1 ; WX 600 ; N Wdieresis ; B 8 0 591 773 ;
C -1 ; WX 600 ; N wdieresis ; B 18 0 581 623 ;
+C -1 ; WX 600 ; N uni1E9E ; B 14 -16 588 616 ;
C -1 ; WX 600 ; N Ygrave ; B 40 0 560 804 ;
C -1 ; WX 600 ; N ygrave ; B 40 -198 561 651 ;
+C -1 ; WX 600 ; N uni1F48 ; B -19 -16 595 589 ;
+C -1 ; WX 600 ; N uni1FBF ; B 251 341 364 589 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 60 249 540 314 ;
C -1 ; WX 600 ; N emdash ; B -10 249 610 314 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zcoN-Oblique.afm new/fonts/afm/public/nimbus15/zcoN-Oblique.afm
--- old/fonts/afm/public/nimbus15/zcoN-Oblique.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zcoN-Oblique.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Fri Jan 8 12:44:39 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 13:38:51 2020
FontName zcoN-Oblique
FullName zco Narrow Oblique
FamilyName zcoN
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
C 33 ; WX 500 ; N exclam ; B 186 -15 425 641 ;
C 34 ; WX 500 ; N quotedbl ; B 213 314 516 604 ;
@@ -358,6 +358,10 @@
C -1 ; WX 500 ; N ogonek ; B 147 -168 333 12 ;
C -1 ; WX 500 ; N tilde ; B 198 503 540 616 ;
C -1 ; WX 500 ; N hungarumlaut ; B 227 477 511 645 ;
+C -1 ; WX 500 ; N gravecomb ; B 284 477 453 651 ;
+C -1 ; WX 500 ; N acutecomb ; B 270 487 473 667 ;
+C -1 ; WX 500 ; N uni0302 ; B 202 477 518 654 ;
+C -1 ; WX 500 ; N tildecomb ; B 198 503 540 616 ;
C -1 ; WX 500 ; N tonos ; B 265 478 475 651 ;
C -1 ; WX 500 ; N dieresistonos ; B 193 478 532 651 ;
C -1 ; WX 500 ; N Alphatonos ; B 6 0 507 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 500 ; N wacute ; B 85 0 585 660 ;
C -1 ; WX 500 ; N Wdieresis ; B 78 0 610 773 ;
C -1 ; WX 500 ; N wdieresis ; B 85 0 585 623 ;
+C -1 ; WX 500 ; N uni1E9E ; B -3 -16 566 616 ;
C -1 ; WX 500 ; N Ygrave ; B 98 0 611 804 ;
C -1 ; WX 500 ; N ygrave ; B -6 -199 584 651 ;
+C -1 ; WX 500 ; N uni1F48 ; B 69 -16 552 589 ;
+C -1 ; WX 500 ; N uni1FBF ; B 289 342 427 589 ;
C -1 ; WX 500 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 500 ; N endash ; B 108 248 511 313 ;
C -1 ; WX 500 ; N emdash ; B 50 248 569 313 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zcoN-Regular.afm new/fonts/afm/public/nimbus15/zcoN-Regular.afm
--- old/fonts/afm/public/nimbus15/zcoN-Regular.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zcoN-Regular.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:13:29 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 13:39:04 2020
FontName zcoN-Regular
FullName zco Narrow Regular
FamilyName zcoN
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
C 33 ; WX 500 ; N exclam ; B 178 -15 322 641 ;
C 34 ; WX 500 ; N quotedbl ; B 112 314 388 604 ;
@@ -358,6 +358,10 @@
C -1 ; WX 500 ; N ogonek ; B 170 -168 330 12 ;
C -1 ; WX 500 ; N tilde ; B 85 503 415 616 ;
C -1 ; WX 500 ; N hungarumlaut ; B 120 477 380 645 ;
+C -1 ; WX 500 ; N gravecomb ; B 156 478 344 651 ;
+C -1 ; WX 500 ; N acutecomb ; B 218 478 406 651 ;
+C -1 ; WX 500 ; N uni0302 ; B 94 478 406 654 ;
+C -1 ; WX 500 ; N tildecomb ; B 85 503 415 616 ;
C -1 ; WX 500 ; N tonos ; B 157 478 343 651 ;
C -1 ; WX 500 ; N dieresistonos ; B 83 478 417 651 ;
C -1 ; WX 500 ; N Alphatonos ; B -10 0 499 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 500 ; N wacute ; B 2 0 498 660 ;
C -1 ; WX 500 ; N Wdieresis ; B 10 0 492 773 ;
C -1 ; WX 500 ; N wdieresis ; B 2 0 498 623 ;
+C -1 ; WX 500 ; N uni1E9E ; B -9 -16 491 616 ;
C -1 ; WX 500 ; N Ygrave ; B 6 0 494 804 ;
C -1 ; WX 500 ; N ygrave ; B 1 -199 499 651 ;
+C -1 ; WX 500 ; N uni1F48 ; B -14 -16 480 589 ;
+C -1 ; WX 500 ; N uni1FBF ; B 216 341 329 589 ;
C -1 ; WX 500 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 500 ; N endash ; B 50 248 450 313 ;
C -1 ; WX 500 ; N emdash ; B -8 248 508 313 ;
Binary files old/fonts/opentype/public/nimbus15/zco-Bold.otf and new/fonts/opentype/public/nimbus15/zco-Bold.otf differ
Binary files old/fonts/opentype/public/nimbus15/zco-BoldOblique.otf and new/fonts/opentype/public/nimbus15/zco-BoldOblique.otf differ
Binary files old/fonts/opentype/public/nimbus15/zco-Oblique.otf and new/fonts/opentype/public/nimbus15/zco-Oblique.otf differ
Binary files old/fonts/opentype/public/nimbus15/zco-Regular.otf and new/fonts/opentype/public/nimbus15/zco-Regular.otf differ
Binary files old/fonts/opentype/public/nimbus15/zcoN-Oblique.otf and new/fonts/opentype/public/nimbus15/zcoN-Oblique.otf differ
Binary files old/fonts/opentype/public/nimbus15/zcoN-Regular.otf and new/fonts/opentype/public/nimbus15/zcoN-Regular.otf differ
Binary files old/fonts/type1/public/nimbus15/zco-Bold.pfb and new/fonts/type1/public/nimbus15/zco-Bold.pfb differ
Binary files old/fonts/type1/public/nimbus15/zco-BoldOblique.pfb and new/fonts/type1/public/nimbus15/zco-BoldOblique.pfb differ
Binary files old/fonts/type1/public/nimbus15/zco-Oblique.pfb and new/fonts/type1/public/nimbus15/zco-Oblique.pfb differ
Binary files old/fonts/type1/public/nimbus15/zco-Regular.pfb and new/fonts/type1/public/nimbus15/zco-Regular.pfb differ
Binary files old/fonts/type1/public/nimbus15/zcoN-Oblique.pfb and new/fonts/type1/public/nimbus15/zcoN-Oblique.pfb differ
Binary files old/fonts/type1/public/nimbus15/zcoN-Regular.pfb and new/fonts/type1/public/nimbus15/zcoN-Regular.pfb differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbusmono.sty new/tex/latex/nimbus15/nimbusmono.sty
--- old/tex/latex/nimbus15/nimbusmono.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbusmono.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbusmono}
- [2015/09/19 Style file for NimbusMono (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbusmono}[\filedate\space v\fileversion]
+\message{`nimbusmono' v\fileversion, \filedate\space Style file for NimbusMono (msharpe)}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbusmononarrow.sty new/tex/latex/nimbus15/nimbusmononarrow.sty
--- old/tex/latex/nimbus15/nimbusmononarrow.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbusmononarrow.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,9 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbusmononarrow}
- [2016/01/04 Style file for NimbusMonoNarrow (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbusmononarrow}[\filedate\space v\fileversion]
+\message{`nimbusmononarrow' v\fileversion, \filedate\space Style file for NimbusMonoNarrow (msharpe)}
+
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -18,6 +21,8 @@
\ProcessOptionsX\relax
+\edef\bfseries@tt{b}
+\edef\mdseries@tt{m}
\renewcommand*{\ttdefault}{NimbusMonoN}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbussans.sty new/tex/latex/nimbus15/nimbussans.sty
--- old/tex/latex/nimbus15/nimbussans.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbussans.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbussans}
- [2015/09/19 Style file for NimbusSans (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbussans}[\filedate\space v\fileversion]
+\message{`nimbussans' v\fileversion, \filedate\space Style file for NimbusSans (msharpe)}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -18,6 +20,9 @@
\ProcessOptionsX\relax
+\edef\bfseries@sf{b}
+\edef\mdseries@sf{m}
+
\renewcommand*{\sfdefault}{NimbusSans}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbusserif.sty new/tex/latex/nimbus15/nimbusserif.sty
--- old/tex/latex/nimbus15/nimbusserif.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbusserif.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbusserif}
- [2015/09/19 Style file for NimbusSerif (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbusserif}[\filedate\space v\fileversion]
+\message{`nimbusserif' v\fileversion, \filedate\space Style file for NimbusSerif (msharpe)}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -18,6 +20,8 @@
\ProcessOptionsX\relax
+\edef\bfseries@rm{b}
+\edef\mdseries@rm{m}
\renewcommand*{\rmdefault}{NimbusSerif}
\renewcommand*{\familydefault}{\rmdefault}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nimbus15.tlpobj new/tlpkg/tlpobj/nimbus15.tlpobj
--- old/tlpkg/tlpobj/nimbus15.tlpobj 2019-02-28 03:56:09.000000000 +0100
+++ new/tlpkg/tlpobj/nimbus15.tlpobj 2020-03-24 02:00:56.000000000 +0100
@@ -1,16 +1,17 @@
name nimbus15
category Package
-revision 48734
+revision 54512
shortdesc Support files for Nimbus 2015 Core fonts
relocated 1
longdesc The Nimbus 2015 Core fonts added Greek and Cyrillic glyphs.
-longdesc This package may be best suited as an add-on the a
+longdesc This package may be best suited as an add-on to the
longdesc comprehensive Times package, providing support for Greek and
longdesc Cyrillic. A new intermediate weight of NimbusMono (AKA Courier)
longdesc is provided, along with a narrower version which may be useful
longdesc for rendering code.
+depend fontools
execute addMap nimbus15.map
-runfiles size=2045
+runfiles size=2049
RELOC/fonts/afm/public/nimbus15/zco-Bold.afm
RELOC/fonts/afm/public/nimbus15/zco-BoldOblique.afm
RELOC/fonts/afm/public/nimbus15/zco-Light.afm
@@ -306,7 +307,6 @@
RELOC/tex/latex/nimbus15/zhv.fontspec
RELOC/tex/latex/nimbus15/ztm.fontspec
catalogue-ctan /fonts/nimbus15
-catalogue-date 2018-09-21 21:32:03 +0200
-catalogue-license other-free
-catalogue-topics font font-ttf font-type1 font-otf
-catalogue-version 1.011
+catalogue-license other-free lppl1.3
+catalogue-topics font font-body font-proportional font-multilingual font-greek font-cyrillic font-type1 font-otf font-supp font-t1enc
+catalogue-version 1.013
++++++ nlctdoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nlctdoc.doc.tlpobj new/tlpkg/tlpobj/nlctdoc.doc.tlpobj
--- old/tlpkg/tlpobj/nlctdoc.doc.tlpobj 2019-02-28 03:56:13.000000000 +0100
+++ new/tlpkg/tlpobj/nlctdoc.doc.tlpobj 2020-02-14 01:55:02.000000000 +0100
@@ -1,6 +1,6 @@
name nlctdoc.doc
category Package
-revision 44353
+revision 53768
shortdesc doc files of nlctdoc
relocated 1
docfiles size=1
++++++ nlctdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nlctdoc/nlctdoc.cls new/tex/latex/nlctdoc/nlctdoc.cls
--- old/tex/latex/nlctdoc/nlctdoc.cls 2017-05-15 00:41:32.000000000 +0200
+++ new/tex/latex/nlctdoc/nlctdoc.cls 2020-02-13 23:11:15.000000000 +0100
@@ -4,7 +4,7 @@
% copy the code here to another file and modify it for your own purposes.
% There's no guarantee that it will work with other packages.
%
-% Copyright 2017 Nicola Talbot
+% Copyright 2013-2020 Nicola Talbot
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{nlctdoc}[2017/05/13 v1.06 (NLCT)]
+\ProvidesClass{nlctdoc}[2020/02/12 v1.07 (NLCT)]
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
% tex4ht stopped working with koma during TL2013.
@@ -85,7 +85,11 @@
\DeclareOption{widecs}{\widecstrue}
\DeclareOption*{%
\PassOptionsToClass {\CurrentOption}{\@nlctdoc@class}}
+\newif\ifwbprompt
+\wbpromptfalse
+\DeclareOption{wbprompt}{\wbprompttrue}
\ProcessOptions
+
\@nlctdoc@if@usingtexht
{%
\LoadClass{\@nlctdoc@class}
@@ -97,6 +101,7 @@
\LoadClass[captions=tableheading,abstract=true]{\@nlctdoc@class}
\fi
}%
+
\RequirePackage{xcolor}
\ifxetex
\else
@@ -131,13 +136,38 @@
\@noligs
\let\do\@makeother \dospecials}
+% make it easier to configure index
+
+\begin{filecontents}{nlctdoc.ist}
+actual '='
+quote '!'
+level '>'
+preamble "\n \\begin{theindex} \n \\makeatletter\\scan@allowedfalse\n"
+postamble "\n\n \\end{theindex}\n"
+item_x1 "\\efill \n \\subitem "
+item_x2 "\\efill \n \\subsubitem "
+delim_0 "\\pfill "
+delim_1 "\\pfill "
+delim_2 "\\pfill "
+lethead_prefix "\\letterheading{"
+lethead_suffix "}\\nopagebreak\n"
+lethead_flag 1
+heading_prefix "\\letterheading{"
+heading_suffix "}\\nopagebreak\n"
+headings_flag 1
+\end{filecontents}
+
+\ifdef\chapter
+{\newcommand{\letterheading}[1]{\pdfbookmark[1]{#1}{index.#1}\textbf{\hfil#1\hfil}}}
+{\newcommand{\letterheading}[1]{\pdfbookmark[2]{#1}{index.#1}\textbf{\hfil#1\hfil}}}
+
\newcommand*{\nlctdocmarginfmt}{\raggedleft}
\nlct@setupmargin
\def\@@doxdescribe#1#2{%
\endgroup%
\ifdox@noprint\else%
- \marginpar{\nlctdocmarginfmt\@nameuse{PrintDescribe#1}{#2}}%
+ \nlctdocmargin{\@nameuse{PrintDescribe#1}{#2}}%
\fi%
\ifdox@noindex\else%
\@nameuse{Special#1Index}{#2}%
@@ -145,8 +175,14 @@
\endgroup%
\@esphack\ignorespaces}
+\newcommand{\nlctdocmargin}[1]{\marginpar{\nlctdocmarginfmt#1}}
+\newcommand{\nlctdocmarginwide}[1]{%
+ \marginpar{\parbox[b][2\baselineskip]{\marginparwidth}{\nlctdocmarginfmt#1\vfill\par}}%
+}
+
+\newrobustcmd\cs[1]{\texttt{\char`\\#1}}
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\newrobustcmd*{\mgroup}[1]{\texttt{\char`\{#1\char`\}}}
\providecommand\marg[1]{%
\allowbreak{\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
@@ -163,10 +199,13 @@
\def\main#1{\underline{\hyperpage{#1}}}
\def\usage#1{\textit{\hyperpage{#1}}}
-\def\SortIndex#1#2{\index{#1\actualchar#2\encapchar hyperpage}}
+\newcommand{\nlctdocmainencap}{\encapchar main}
+\newcommand{\nlctdochyperencap}{\encapchar hyperpage}
+
+\def\SortIndex#1#2{\index{#1\actualchar#2\nlctdochyperencap}}
\newcommand*{\SpecialPageIndex}[1]{\@bsphack
- \index{#1\encapchar hyperpage}\@esphack}
+ \index{#1\nlctdochyperencap}\@esphack}
\renewcommand*\PageIndex{\makeindex
\codeline@indexfalse
@@ -256,8 +295,6 @@
\PageIndex
\CodelineNumbered
-\newcommand{\importantsymbol}{\bfseries\Huge\danger}
-
\newcommand\Describe@Wide@Macro[1]{%
\endgroup
\marginpar{\raggedright\hbox to\marginparwidth{\PrintDescribeMacro{#1}}\par}%
@@ -267,6 +304,16 @@
\newlength\macrowidth
+\newcommand{\promptsymbol}{\BeginAccSupp{ActualText={}}\$\EndAccSupp{}}
+
+\newcommand{\importantfmt}{\raggedright}
+\newcommand{\importantsymbolfont}[1]{\textbf{\Huge#1}}
+
+\newcommand{\importantpar}[1][-3]{%
+ \def\@nlct@importantparafter{#1}%
+ \@importantpar
+}
+
\@nlctdoc@if@usingtexht
{%
\newenvironment{definition}[1][]{%
@@ -275,19 +322,30 @@
\HCode{</div><hr>}\par\noindent
}
- \newcommand{\importantpar}[1][-3]{\importantsymbol\space}
-
+ \newcommand{\importantsymbol}{\HCode{<span class="warningsymbol">&\#9888;</span>}}
+ \newcommand{\@importantpar}[1][]{\importantsymbol\space}
\newenvironment{important}{%
\par\HCode{<div class="important" title="Important Note">}\noindent
}{%
\HCode{</div>}\par\noindent
}
- \newenvironment{prompt}{%
- \HCode{<spacer type=vertical size=10>}\begin{ttfamily}\obeylines\ignorespaces
- }{%
- \end{ttfamily}\HCode{<spacer type=vertical size=10>}\noindent
- }
+ \ifwbprompt
+ \AtBeginDocument{\Css{
+ pre.prompt {color: white; background: black; font-weight:
+bold; padding-bottom: 2ex; padding-left: 1em; padding-right: 1em;}
+ }}
+
+ \newenvironment{prompt}%
+ {\par\HCode{<spacer type=vertical size=10><pre class="prompt">}%
+ \obeylines\ignorespaces}%
+ {\HCode{</pre><spacer type=vertical size=10>}\par\noindent}
+
+ \else
+ \newenvironment{prompt}%
+ {\HCode{<spacer type=vertical size=10>}\begin{ttfamily}\obeylines\ignorespaces}%
+ {\end{ttfamily}\HCode{<spacer type=vertical size=10>}\noindent}
+ \fi
\newenvironment{display}{%
\HCode{<spacer type=vertical size=10>}\obeylines\ignorespaces
@@ -312,20 +370,18 @@
\setlength\defwidth\linewidth
\addtolength\defwidth{-2\fboxrule}%
\addtolength\defwidth{-2\fboxsep}%
- \begin{minipage}{\defwidth}\flushleft\ttfamily
+ \begin{minipage}[t]{\defwidth}\raggedright\ttfamily
}{%
\end{minipage}
\end{lrbox}%
\vskip10pt
\noindent
\ifwidecs
- \let\Describe@Macro\Describe@Wide@Macro
- \defarg
- \nopagebreak\mbox{}\nopagebreak
- \par\nopagebreak\vspace{0.5ex plus 0.25ex minus 0.1ex}\nopagebreak\noindent
+ \let\nlctdocmargin\nlctdocmarginwide
+ \par\bigskip\par\noindent
\else
- \defarg
\fi
+ \strut\nopagebreak\defarg\nopagebreak
\fcolorbox{black}{defbackground}{\usebox\defsbox}%
\vskip10pt
\noindent
@@ -335,16 +391,22 @@
\newlength\tmpwidth
\newlength\tmpheight
- \newcommand{\importantpar}[1][-3]{%
- \settoheight{\tmpheight}{\importantsymbol}%
- \settowidth{\tmpwidth}{\importantsymbol}%
+ \newcommand{\importantsymbol}{\warning}
+
+ \newsavebox\@nlctdoc@tmpsbox
+ \newcommand{\@importantpar}[1][0pt]{%
+ \sbox\@nlctdoc@tmpsbox{\importantsymbolfont{\importantsymbol}}%
+ \settoheight{\tmpheight}{\usebox\@nlctdoc@tmpsbox}%
+ \settowidth{\tmpwidth}{\usebox\@nlctdoc@tmpsbox}%
+ \advance\tmpheight by #1\relax
\advance\tmpwidth by .5em\relax
\par\noindent
\hangindent=\tmpwidth
- \hangafter=#1\relax
+ \hangafter=\@nlct@importantparafter\relax
\makebox[0pt][l]{\hspace*{-\tmpwidth}%
- \smash{\raisebox{-\tmpheight}{\importantsymbol}}%
+ \smash{\raisebox{-\tmpheight}{\usebox\@nlctdoc@tmpsbox}}%
}%
+ \ignorespaces
}
\newenvironment{important}{%
@@ -354,7 +416,7 @@
\addtolength\defwidth{-2\fboxrule}%
\begin{lrbox}{\defsbox}%
\begin{minipage}{\defwidth}%
- \raggedright
+ \importantfmt
\setlength\parindent{1em}%
\noindent\ignorespaces
}{%
@@ -365,14 +427,33 @@
\noindent\ignorespacesafterend
}
- \newenvironment{prompt}{%
- \par\vskip\baselineskip
- \begin{ttfamily}\obeylines\noindent\ignorespaces
- }{%
- \end{ttfamily}%
- \par\vskip\baselineskip
+ \ifwbprompt
+ \newenvironment{prompt}%
+ {%
+ \setlength\defwidth{\linewidth}%
+ \addtolength\defwidth{-2\fboxsep}%
+ \begin{lrbox}{\defsbox}%
+ \begin{minipage}[t]{\defwidth}%
+ \ttfamily\color{white}\bfseries
+ \everypar{\promptsymbol\ }%
+ \obeylines\raggedright\frenchspacing\ignorespaces%
+ }%
+ {%
+ \end{minipage}%
+ \end{lrbox}\par\noindent\colorbox{black}{\usebox\defsbox}%
+ \everypar{}\par\medskip
\noindent\ignorespacesafterend
- }
+ }
+ \else
+ \newenvironment{prompt}{%
+ \par\vskip\baselineskip
+ \begin{ttfamily}\frenchspacing\obeylines\noindent\ignorespaces
+ }{%
+ \end{ttfamily}%
+ \par\vskip\baselineskip
+ \noindent\ignorespacesafterend
+ }
+ \fi
\newenvironment{display}{%
\par\vskip\baselineskip\noindent
@@ -406,117 +487,308 @@
}
}%
+\newcommand*{\idxmarker}{\textsuperscript{\textdagger}}
+\newcommand*{\doidxmarker}{\strut\llap{\idxmarker}}
+
\newcommand*{\appfmt}[1]{\texttt{#1}}
-\DeclareRobustCommand*{\iapp}[1]{\index{#1=\appfmt{#1}\encapchar hyperpage}}
-\DeclareRobustCommand*{\app}[1]{\appfmt{#1}\iapp{#1}}
+\newrobustcmd*{\iapp}{\@ifstar\s@iapp\@iapp}
+
+\newcommand*{\s@iapp}[1]{\index{#1=\doidxmarker\appfmt{#1}\nlctdochyperencap}}
+\newcommand*{\@iapp}[1]{\index{#1=\appfmt{#1}\nlctdochyperencap}}
+
+\newrobustcmd*{\app}[1]{\appfmt{#1}\iapp{#1}}
\newcommand*{\qt}[1]{``#1''}
-\DeclareRobustCommand*{\termdef}[1]{\emph{#1}\iterm{#1}}
-\DeclareRobustCommand*{\term}[1]{#1\iterm{#1}}
-\DeclareRobustCommand*{\iterm}[1]{\index{#1|main}}
+\newrobustcmd*{\termdef}[1]{\emph{#1}\iterm{#1}}
+\newrobustcmd*{\term}[1]{#1\iterm{#1}}
+\newrobustcmd*{\iterm}[1]{\index{#1\nlctdocmainencap}}
\newcommand*{\tableref}[1]{\hyperref[#1]{table~\ref*{#1}}}
\newcommand*{\Tableref}[1]{\hyperref[#1]{Table~\ref*{#1}}}
-\newcommand*{\ics}[1]{\cs{#1}\SpecialMainIndex{#1}}
+\renewcommand{\SpecialMainIndex}[1]{\@bsphack \SpecialIndex@ {#1}{\nlctdocmainencap}\@esphack}
+
+\newcommand{\idxmarker@SpecialMainIndex}[1]{%
+ \@bsphack \idxmarker@SpecialIndex@ {#1}{\nlctdocmainencap}\@esphack
+}
+
+\newcommand\idxmarker@SpecialIndex@[2]{%
+ \@SpecialIndexHelper@#1\@nil
+ \def\@tempb{ }%
+ \ifcat \@tempb\@gtempa
+ \special@index{\quotechar\space\actualchar
+ \doidxmarker\string\verb\quotechar*\verbatimchar
+ \quotechar\bslash\quotechar\space\verbatimchar#2}%
+ \else
+ \def\@tempb##1##2\relax{\ifx\relax##2\relax
+ \def\@tempc{\special@index{\quotechar##1\actualchar
+ \doidxmarker\string\verb\quotechar*\verbatimchar
+ \quotechar\bslash\quotechar##1\verbatimchar#2}}%
+ \else
+ \def\@tempc{\special@index{##1##2\actualchar
+ \doidxmarker\string\verb\quotechar*\verbatimchar
+ \bslash##1##2\verbatimchar#2}}%
+ \fi}%
+ \expandafter\@tempb\@gtempa\relax
+ \@tempc
+ \fi}
+
+\newcommand{\dequals}{%
+ \texorpdfstring
+ {\discretionary{}{}{}\texttt{=}\discretionary{}{}{}}%
+ {=}%
+}
+
+\newcommand{\dcomma}{%
+ \texorpdfstring
+ {\discretionary{}{}{}\texttt{,}\discretionary{}{}{}}%
+ {,}%
+}
+
+\newcommand{\dhyphen}{%
+ \texorpdfstring
+ {\discretionary{}{}{}\texttt{-}\discretionary{}{}{}}%
+ {-}%
+}
+
+
+\newcommand{\idxmarkedfont}[1]{#1}
+
+\newcommand*{\nlctdoc@ifplus}[1]{\@ifnextchar+{\@firstoftwo {#1}}}
+
+\newrobustcmd{\ics}{\@ifstar\s@ics\@ics}
+
+\newcommand*{\s@ics}[1]{\idxmarkedfont{\cs{#1}}\idxmarker@SpecialMainIndex{#1}}
+\newcommand*{\@ics}[1]{\cs{#1}\SpecialMainIndex{#1}}
-\newcommand*{\icsopt}[2]{\index{#1 options\actualchar\cs{#1} options\levelchar#2\actualchar\textsf{#2}\encapchar hyperpage}}
+\newrobustcmd{\csmeta}{\@ifstar\s@csmeta\@csmeta}
-\newcommand*{\csopt}[2]{%
- \textsf{#2}%
+\newcommand*{\s@csmeta}[3]{\idxmarkedfont{\cs{#1\meta{#2}#3}}\index{#1#2#3=\protect\doidxmarker\protect\cs{#1\meta{#2}#3}\nlctdochyperencap}}
+\newcommand*{\@csmeta}[3]{\cs{#1\meta{#2}#3}\index{#1#2#3=\protect\cs{#1\meta{#2}#3}\nlctdochyperencap}}
+
+\newrobustcmd{\csmetameta}{\@ifstar\s@csmetameta\@csmetameta}
+
+\newcommand*{\s@csmetameta}[5]{\idxmarkedfont{\cs{#1\meta{#2}#3\meta{#4}#5}}\index{#1#2#3#4#5=\protect\doidxmarker\protect\cs{#1\meta{#2}#3\meta{#4}#5}\nlctdochyperencap}}
+\newcommand*{\@csmetameta}[5]{\cs{#1\meta{#2}#3\meta{#4}#5}\index{#1#2#3#4#5=\protect\cs{#1\meta{#2}#3\meta{#4}#5}\nlctdochyperencap}}
+
+\newcommand*{\csoptfmt}[1]{\textsf{#1}}
+
+\newrobustcmd*{\icsopt}{\@ifstar\s@icsopt\ns@icsopt}
+
+\newcommand*{\ns@icsopt}{\nlctdoc@ifplus\p@icsopt\@icsopt}
+
+\newcommand*{\s@icsopt}[2]{%
+ \index{#1 options\actualchar\cs{#1} options\levelchar#2\actualchar\doidxmarker\csoptfmt{#2}\nlctdochyperencap}}
+
+\newcommand*{\p@icsopt}[2]{%
+ \index{#1 options\actualchar\doidxmarker\cs{#1} options\levelchar#2\actualchar\csoptfmt{#2}\nlctdochyperencap}}
+
+\newcommand*{\@icsopt}[2]{%
+ \index{#1 options\actualchar\cs{#1} options\levelchar#2\actualchar\csoptfmt{#2}\nlctdochyperencap}}
+
+\newrobustcmd*{\csopt}{\@ifstar\s@csopt\@csopt}
+
+\newcommand*{\s@csopt}[2]{%
+ \idxmarkedfont{\csoptfmt{#2}}%
\@for\@thiscmd:=#1\do{%
- \icsopt{\@thiscmd}{#2}%
+ \s@icsopt{\@thiscmd}{#2}%
}%
}
+\newcommand*{\@csopt}[2]{%
+ \csoptfmt{#2}%
+ \@for\@thiscmd:=#1\do{%
+ \@icsopt{\@thiscmd}{#2}%
+ }%
+}
+
+% Package options
\newcommand*{\pkgoptfmt}[1]{\textsf{#1}}
+% \ipkgopt{option}
% \ipkgopt[value]{option}
-\newcommand*{\ipkgopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \index{package options:>#2=\pkgoptfmt{#2}|main}%
- \else
- \index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}|main}%
-\fi
+% \ipkgopt*{option} <- mark option
+% \ipkgopt*[value]{option} <- mark value
+% \ipkgopt+{value}{option} <- mark option
+
+\newrobustcmd*{\ipkgopt}{\@ifstar\s@ipkgopt\ns@ipkgopt}
+
+\newcommand*{\ns@ipkgopt}{\nlctdoc@ifplus\p@ipkgopt\@ipkgopt}
+
+\newcommand*{\s@ipkgopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{package options:>#2=\doidxmarker\pkgoptfmt{#2}\nlctdocmainencap}}%
+ {\index{package options:>#2=\pkgoptfmt{#2}>#1=\doidxmarker\pkgoptfmt{#1}\nlctdocmainencap}}%
}
-\newcommand*{\pkgopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \pkgoptfmt{#2}\index{package options:>#2=\pkgoptfmt{#2}|main}%
- \else
- \pkgoptfmt{#2=#1}%
- \index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}|main}%
-\fi
+\newcommand*{\p@ipkgopt}[2]{%
+ \index{package options:>#2=\doidxmarker\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}\nlctdocmainencap}%
}
-% \pkgoptval{value}{option}
-\newcommand*{\pkgoptval}[2]{%
- \pkgoptfmt{#1}%
- \index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}|main}%
+\newcommand*{\@ipkgopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{package options:>#2=\pkgoptfmt{#2}\nlctdocmainencap}}%
+ {\index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}\nlctdocmainencap}}%
}
-\newcommand*{\clsoptfmt}[1]{\textsf{#1}}
+\newrobustcmd*{\ideprecatedpkgopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{package options:>#2=\pkgoptfmt{#2} (deprecated)\nlctdocmainencap}}%
+ {\index{package options:>#2=\pkgoptfmt{#2} (deprecated)>#1=\pkgoptfmt{#1}\nlctdocmainencap}}%
+}
+
+\newrobustcmd*{\pkgopt}{\@ifstar\s@pkgopt\ns@pkgopt}
+
+\newcommand*{\ns@pkgopt}{\nlctdoc@ifplus\p@pkgopt\@pkgopt}
+
+\newcommand*{\s@pkgopt}[2][]{%
+ \idxmarkedfont{\ifstrempty{#1}{\pkgoptfmt{#2}}{\pkgoptfmt{#2\dequals#1}}}%
+ \s@ipkgopt[#1]{#2}%
+}
+
+\newcommand*{\p@pkgopt}[2]{%
+ \idxmarkedfont{\pkgoptfmt{#2\dequals#1}}\p@ipkgopt{#1}{#2}%
+}
+
+\newcommand*{\@pkgopt}[2][]{%
+ \ifstrempty{#1}{\pkgoptfmt{#2}}{\pkgoptfmt{#2\dequals#1}}%
+ \@ipkgopt[#1]{#2}%
+}
+
+\newrobustcmd*{\deprecatedpkgopt}[2][]{%
+ \ifstrempty{#1}{\pkgoptfmt{#2}}{\pkgoptfmt{#2\dequals#1}}%
+ \ideprecatedpkgopt[#1]{#2}%
+}
+
+\newrobustcmd*{\pkgoptval}{\@ifstar\s@pkgoptval\ns@pkgoptval}
+
+\newcommand*{\ns@pkgoptval}{\nlctdoc@ifplus\p@pkgoptval\@pkgoptval}
+
+\newcommand*{\s@pkgoptval}[2]{\idxmarkedfont{\pkgoptfmt{#1}}\s@ipkgopt[#1]{#2}}
+
+\newcommand*{\p@pkgoptval}[2]{\idxmarkedfont{\pkgoptfmt{#1}}\p@ipkgopt[#1]{#2}}
+
+\newcommand*{\@pkgoptval}[2]{\pkgoptfmt{#1}\@ipkgopt[#1]{#2}}
+% Class options
+
+% \iclsopt{option}
% \iclsopt[value]{option}
-\newcommand*{\iclsopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \index{class options:>#2=\clsoptfmt{#2}|main}%
- \else
- \index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}|main}%
-\fi
+% \iclsopt*{option} <- mark option
+% \iclsopt*[value]{option} <- mark value
+% \iclsopt+{value}{option} <- mark option
+
+\newcommand*{\clsoptfmt}[1]{\textsf{#1}}
+
+\newrobustcmd*{\iclsopt}{\@ifstar\s@iclsopt\ns@iclsopt}
+
+\newcommand*{\ns@iclsopt}{\@ifnextchar+\p@iclsopt\@iclsopt}
+
+\newcommand*{\s@iclsopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{class options:>#2=\doidxmarker\clsoptfmt{#2}\nlctdocmainencap}}%
+ {\index{class options:>#2=\clsoptfmt{#2}>#1=\doidxmarker\clsoptfmt{#1}\nlctdocmainencap}}%
}
-\newcommand*{\clsopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \clsoptfmt{#2}\index{class options:>#2=\clsoptfmt{#2}|main}%
- \else
- \clsoptfmt{#2=#1}%
- \index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}|main}%
-\fi
+\newcommand*{\p@iclsopt}[2]{%
+ \index{class options:>#2=\doidxmarker\clsoptfmt{#2}>#1=\clsoptfmt{#1}\nlctdocmainencap}%
+}
+
+\newcommand*{\@iclsopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{class options:>#2=\clsoptfmt{#2}\nlctdocmainencap}}%
+ {\index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}\nlctdocmainencap}}%
+}
+
+\newrobustcmd*{\ideprecatedclsopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{class options:>#2=\clsoptfmt{#2} (deprecated)\nlctdocmainencap}}%
+ {\index{class options:>#2=\clsoptfmt{#2} (deprecated)>#1=\clsoptfmt{#1}\nlctdocmainencap}}%
+}
+
+\newrobustcmd*{\clsopt}{\@ifstar\s@clsopt\ns@clsopt}
+
+\newcommand*{\ns@clsopt}{\nlctdoc@ifplus\p@clsopt\@clsopt}
+
+\newcommand*{\s@clsopt}[2][]{%
+ \idxmarkedfont{\ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}}%
+ \s@iclsopt[#1]{#2}%
+}
+
+\newcommand*{\p@clsopt}[2]{%
+ \idxmarkedfont{\ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}}%
+ \p@iclsopt{#1}{#2}%
+}
+
+\newcommand*{\@clsopt}[2][]{%
+ \ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}%
+ \@iclsopt[#1]{#2}%
}
-% \clsoptval{value}{option}
-\newcommand*{\clsoptval}[2]{%
- \clsoptfmt{#1}%
- \index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}|main}%
+\newrobustcmd*{\deprecatedclsopt}[2][]{%
+ \ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}%
+ \ideprecatedclsopt[#1]{#2}%
}
+\newrobustcmd*{\clsoptval}{\@ifstar\s@clsoptval\ns@clsoptval}
+
+\newcommand*{\ns@clsoptval}{\nlctdoc@ifplus\p@clsoptval\@clsoptval}
+
+\newcommand*{\s@clsoptval}[2]{\idxmarkedfont{\clsoptfmt{#1}\s@iclsopt[#1]{#2}}}
+
+\newcommand*{\p@clsoptval}[2]{\idxmarkedfont{\clsoptfmt{#1}\p@iclsopt[#1]{#2}}}
+
+\newcommand*{\@clsoptval}[2]{\clsoptfmt{#1}\@iclsopt[#1]{#2}}
+
\newcommand*{\filetypefmt}[1]{\texttt{#1}}
\newcommand*{\ifiletype}[1]{\index{file
- types>#1=\filetypefmt{#1}|hyperpage}}
+ types>#1=\filetypefmt{#1}\nlctdochyperencap}}
\newcommand*{\filetype}[1]{\filetypefmt{#1}\ifiletype{#1}}
\newcommand*{\styfmt}[1]{\textsf{#1}}
-\newcommand*{\isty}[1]{\index{#1 package=\styfmt{#1}
- package|hyperpage}}
-\newcommand*{\sty}[1]{\styfmt{#1}\isty{#1}}
+\newrobustcmd{\isty}{\@ifstar\s@isty\@isty}
+
+\newcommand*{\@isty}[1]{\index{#1 package=\styfmt{#1}
+ package\nlctdocmainencap}}
+\newcommand*{\s@isty}[1]{\index{#1 package=\doidxmarker\styfmt{#1}
+ package\nlctdocmainencap}}
+
+\newrobustcmd{\sty}{\@ifstar\s@sty\@sty}
+
+\newcommand*{\@sty}[1]{\styfmt{#1}\@isty{#1}}
+\newcommand*{\s@sty}[1]{\idxmarkedfont{\styfmt{#1}}\s@isty{#1}}
\newcommand*{\clsfmt}[1]{\textsf{#1}}
-\newcommand*{\icls}[1]{\index{#1 class=\clsfmt{#1} class|hyperpage}}
-\newcommand*{\cls}[1]{\clsfmt{#1}\icls{#1}}
+\newrobustcmd{\icls}{\@ifstar\s@icls\@icls}
+
+\newcommand*{\@icls}[1]{\index{#1 class=\clsfmt{#1}
+ class\nlctdocmainencap}}
+\newcommand*{\s@icls}[1]{\index{#1 class=\doidxmarker\clsfmt{#1}
+ class\nlctdocmainencap}}
+
+\newrobustcmd{\cls}{\@ifstar\s@cls\@cls}
+
+\newcommand*{\@cls}[1]{\clsfmt{#1}\@icls{#1}}
+\newcommand*{\s@cls}[1]{\idxmarkedfont{\clsfmt{#1}}\s@icls{#1}}
\newcommand*{\envfmt}[1]{\textsf{#1}}
\newcommand*{\ienv}[1]{\SpecialMainEnvIndex{#1}}
\newcommand*{\env}[1]{\envfmt{#1}\ienv{#1}}
\newcommand*{\ctrfmt}[1]{\textsf{#1}}
-\newcommand*{\ictr}[1]{\index{#1={\protect\ttfamily#1} (counter)|hyperpage}}
+\newcommand*{\ictr}[1]{\index{#1={\protect\ttfamily#1} (counter)\nlctdochyperencap}}
\newcommand*{\ctr}[1]{\ctrfmt{#1}\ictr{#1}}
\newcommand*{\boolfmt}[1]{\textsf{#1}}
-\newcommand*{\ibool}[1]{\index{#1={\ttfamily#1} (boolean variable)|hyperpage}}
+\newcommand*{\ibool}[1]{\index{#1={\ttfamily#1} (boolean variable)\nlctdochyperencap}}
\newcommand*{\bool}[1]{\boolfmt{#1}\ibool{#1}}
\newcommand*{\bstfmt}[1]{\textsf{#1}}
\newcommand*{\ibst}[1]{\index{#1 bibliography style=\bstfmt{#1}
-bibliography style|hyperpage}}
+bibliography style\nlctdochyperencap}}
\newcommand*{\bst}[1]{\bstfmt{#1}\ibst{#1}}
\newcommand*{\menu}[1]{\textsf{#1}}
@@ -545,13 +817,17 @@
\newcommand*{\toTop}{\par\noindent\hyperlink{top}{Top}}
+ \AtBeginDocument{%
+ \Css{.warningsymbol { color: red; font-weight: bold;}}%
+ \Css{div.important { border : solid red; }}%
+ \Css{div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} }%
+ }
+
\@ifundefined{chapter}
{%
\AtBeginDocument{%
\Configure{section}{\toTop\HCode{<h2 class="sectionHead">}}{}{}{}%
\Configure{subsection}{\toTop\HCode{<h3 class="subsectionHead">}}{}{}{}%
- \Css{div.important { border : solid red; }}%
- \Css{div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} }%
}
}%
{%
@@ -563,8 +839,6 @@
{\HCode{<h2 class="chapterHead">}\thechapter. }{\HCode{</h2>}}%
\Configure{section}{\toTop\HCode{<h3 class="sectionHead">}}{}{}{}%
\Configure{subsection}{\toTop\HCode{<h4 class="subsectionHead">}}{}{}{}%
- \Css{div.important { border : solid red; }}%
- \Css{div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} }%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nlctdoc.tlpobj new/tlpkg/tlpobj/nlctdoc.tlpobj
--- old/tlpkg/tlpobj/nlctdoc.tlpobj 2019-02-28 03:56:13.000000000 +0100
+++ new/tlpkg/tlpobj/nlctdoc.tlpobj 2020-02-14 01:55:02.000000000 +0100
@@ -1,16 +1,15 @@
name nlctdoc
category Package
-revision 44353
+revision 53768
shortdesc Package documentation class
relocated 1
longdesc The class provides support for the documentation of the
longdesc author's packages, using koma-script. This class is provided
longdesc "as is" solely for the benefit of anyone who wants to compile
longdesc the documentation of those packages.
-runfiles size=5
+runfiles size=7
RELOC/tex/latex/nlctdoc/nlctdoc.cls
catalogue-ctan /macros/latex/contrib/nlctdoc
-catalogue-date 2019-01-12 10:21:49 +0100
catalogue-license lppl
catalogue-topics doc-supp class
-catalogue-version 1.06
+catalogue-version 1.07
++++++ nomencl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/nomencl/README new/doc/latex/nomencl/README
--- old/doc/latex/nomencl/README 2019-02-09 23:21:04.000000000 +0100
+++ new/doc/latex/nomencl/README 2020-03-03 23:58:00.000000000 +0100
@@ -10,7 +10,7 @@
COPYING AND MODIFICATION
-Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
+Copyright 1996-2020 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
Radhakrishnan, Brian Elmegaard
@@ -35,3 +35,11 @@
v5.1 2019/02/08 Compatibility changes for KOMA-Script
Bugs fixes
+ v5.2 2019/05/05 More compatibility changes: tocbasic call
+ is now optional
+
+ v5.3 2019/11/23 Documentation updates
+ Slovene option
+
+ v5.4 2020/03/01 Norwegian (norwegian-bokmaal, norwegian-nynorsk)
+ options
\ No newline at end of file
Binary files old/doc/latex/nomencl/nomencl.pdf and new/doc/latex/nomencl/nomencl.pdf differ
Binary files old/doc/latex/nomencl/sample01.pdf and new/doc/latex/nomencl/sample01.pdf differ
Binary files old/doc/latex/nomencl/sample02.pdf and new/doc/latex/nomencl/sample02.pdf differ
Binary files old/doc/latex/nomencl/sample03.pdf and new/doc/latex/nomencl/sample03.pdf differ
Binary files old/doc/latex/nomencl/sample04.pdf and new/doc/latex/nomencl/sample04.pdf differ
Binary files old/doc/latex/nomencl/sample05.pdf and new/doc/latex/nomencl/sample05.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nomencl.doc.tlpobj new/tlpkg/tlpobj/nomencl.doc.tlpobj
--- old/tlpkg/tlpobj/nomencl.doc.tlpobj 2019-02-28 03:56:20.000000000 +0100
+++ new/tlpkg/tlpobj/nomencl.doc.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,9 +1,9 @@
name nomencl.doc
category Package
-revision 49987
+revision 54080
shortdesc doc files of nomencl
relocated 1
-docfiles size=160
+docfiles size=163
RELOC/doc/latex/nomencl/README
RELOC/doc/latex/nomencl/nomencl.pdf
RELOC/doc/latex/nomencl/sample01.pdf
++++++ nomencl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nomencl/nomencl.sty new/tex/latex/nomencl/nomencl.sty
--- old/tex/latex/nomencl/nomencl.sty 2019-02-09 23:21:04.000000000 +0100
+++ new/tex/latex/nomencl/nomencl.sty 2020-03-03 23:58:00.000000000 +0100
@@ -16,17 +16,16 @@
%% version 1.2 of the license, or (at your option) any later version.
%%
\ProvidesPackage{nomencl}%
- [2019/02/08 v5.1 Nomenclature package]
+ [2020/03/01 v5.4 Nomenclature package]
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
-\RequirePackage{tocbasic}
-\addtotoclist[nomencl]{nlo}
-\addtotoclist[nomencl]{nls}
\newif\if@printeqref
\newif\if@printpageref
\newif\if@intoc
\newif\if@compatibilitymode
+\newif\if@nomencl@tocbasic
+\@nomencl@tocbasictrue
\DeclareOptionX{refeq}{\@printeqreftrue}
\DeclareOptionX{norefeq}{\@printeqreffalse}
\DeclareOptionX{refpage}{\@printpagereftrue}
@@ -35,6 +34,8 @@
\DeclareOptionX{notintoc}{\@intocfalse}
\DeclareOptionX{compatible}{\@compatibilitymodetrue}
\DeclareOptionX{noncompatible}{\@compatibilitymodefalse}
+\DeclareOptionX{tocbasic}{\@nomencl@tocbasictrue}
+\DeclareOptionX{notocbasic}{\@nomencl@tocbasicfalse}
\DeclareOptionX{prefix}{\def\nomprefix{a}}
\DeclareOptionX{noprefix}{\def\nomprefix{}}
\newif\if@nomentbl
@@ -94,6 +95,22 @@
\def\nomGname{Lettere greche}%
\def\nomXname{Apici}%
\def\nomZname{Indici}}
+\DeclareOptionX{norwegian-bokmaal}{%
+ \def\eqdeclaration##1{, se ligning\nobreakspace(##1)}%
+ \def\pagedeclaration##1{, side\nobreakspace##1}%
+ \def\nomname{Nomenklatur}%
+ \def\nomAname{Romerske bokstaver}%
+ \def\nomGname{Greske bokstaver}%
+ \def\nomXname{Hevet skrift}%
+ \def\nomZname{Senket skrift}}
+\DeclareOptionX{norwegian-nynorsk}{%
+ \def\eqdeclaration##1{, se likning\nobreakspace(##1)}%
+ \def\pagedeclaration##1{, side\nobreakspace##1}%
+ \def\nomname{Nomenklatur}%
+ \def\nomAname{Romarske bokstavar}%
+ \def\nomGname{Greske bokstavar}%
+ \def\nomXname{Hevd skrift}%
+ \def\nomZname{Senka skrift}}
\DeclareOptionX{polish}{%
\def\eqdeclaration##1{, porownaj rownanie\nobreakspace(##1)}%
\def\pagedeclaration##1{, strona\nobreakspace##1}%
@@ -124,6 +141,14 @@
\cyri\cyrn\cyrd\cyre\cyrk\cyrs\cyrery}%
\def\nomZname{\CYRP\cyro\cyrd\cyrs\cyrt\cyrr\cyro\cyrch\cyrn\cyrery\cyre\
\cyri\cyrn\cyrd\cyre\cyrk\cyrs\cyrery}}
+\DeclareOptionX{slovene}{%
+ \def\eqdeclaration##1{, glej ena\v{c}bo\nobreakspace(##1)}%
+ \def\pagedeclaration##1{, stran\nobreakspace##1}%
+ \def\nomname{Seznam simbolov}%
+ \def\nomAname{Latinske \v{c}rke}%
+ \def\nomGname{Gr\v{s}ke \v{c}rke}%
+ \def\nomXname{Eksponenti}%
+ \def\nomZname{Indeksi}}
\DeclareOptionX{spanish}{%
\def\eqdeclaration##1{, v\'ease la ecuaci\'on\nobreakspace(##1)}%
\def\pagedeclaration##1{, p\'agina\nobreakspace##1}%
@@ -144,13 +169,20 @@
\def\nomXname{\CYRV\cyre\cyrr\cyrh\cyrn\cyrii\
\cyrii\cyrn\cyrd\cyre\cyrk\cyrs\cyri}%
\def\nomZname{\CYRII\cyrn\cyrd\cyre\cyrk\cyrs\cyri}}
-\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups}
+\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups,tocbasic}
\ProcessOptionsX\relax
\if@nomentbl
\RequirePackage{array,longtable, siunitx}
\fi
+\if@nomencl@tocbasic
+ \RequirePackage{tocbasic}
+ \addtotoclist[nomencl]{nlo}
+ \addtotoclist[nomencl]{nls}
+\fi
\if@intoc
-\setuptoc{nls}{totoc}
+ \if@nomencl@tocbasic
+ \setuptoc{nls}{totoc}
+ \fi
\fi
\if@compatibilitymode%
\def\(a)outputfileextension{.glo}%
@@ -251,9 +283,22 @@
\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l}
\def\thenomenclature{%
\providecommand*{\listofnlsname}{\nomname}%
- \let\list@fname\listofnlsname
- \def\@currext{nls}%
- \tocbasic@listhead{\list@fname}%
+ \if@nomencl@tocbasic
+ \let\list@fname\listofnlsname
+ \def\@currext{nls}%
+ \tocbasic@listhead{\list@fname}%
+ \else
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \@mkboth{\nomname}{\nomname}%
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+ \fi
\nompreamble
\if@nomentbl
\let\itemOrig=\item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nomencl.tlpobj new/tlpkg/tlpobj/nomencl.tlpobj
--- old/tlpkg/tlpobj/nomencl.tlpobj 2019-02-28 03:56:20.000000000 +0100
+++ new/tlpkg/tlpobj/nomencl.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,6 +1,6 @@
name nomencl
category Package
-revision 49987
+revision 54080
shortdesc Produce lists of symbols as in nomenclature
relocated 1
longdesc Produces lists of symbols using the capabilities of the
@@ -13,7 +13,6 @@
catalogue-contact-home https://github.com/borisveytsman/nomencl
catalogue-contact-repository https://github.com/borisveytsman/nomencl
catalogue-ctan /macros/latex/contrib/nomencl
-catalogue-date 2019-02-09 07:47:28 +0100
catalogue-license lppl
catalogue-topics glossary
-catalogue-version 5.1
+catalogue-version 5.4
++++++ notes2bib.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/README new/doc/latex/notes2bib/README
--- old/doc/latex/notes2bib/README 2013-07-12 01:22:25.000000000 +0200
+++ new/doc/latex/notes2bib/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-notes2bib - Integrating notes into the bibliography
-===================================================
-
-The `notes2bib` package defines a new type of note, bibnote,
-which will always be added to the bibliography. The package
-allows footnotes and endnotes to be moved into the bibliography
-in the same way. The package can be used with natbib and
-biblatex as well as plain LaTeX citations. Both sorted and
-unsorted bibliography styles are supported.
-
-Installation
-------------
-
-The package is supplied in `.dtx` format and as a pre-extracted
-`.zip` file, `notes2bib.tds.zip`. The later is most convenient
-for most users: simply unzip this in your local `texmf`
-directory. If you want to unpack the `.dtx` yourself, running
-`tex notes2bib.dtx` will extract the package whereas `latex
-notes2bib.dtx` will extract it and also typeset the
-documentation.
-
-The package requires LaTeX3 support as provided in the
-`l3kernel` and `l3packages` bundles. Both of these are available
-on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
-files. Suitable versions are available in MiKTeX 2.9 and TeX
-Live 2012 (updating the relevant packages online may be
-necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
-extensions: these are available on all modern TeX systems.
-
-Typesetting the documentation requires a number of packages in
-addition to those needed to use the package. This is mainly
-because of the number of demonstration items included in the
-text. To compile the documentation without error, you will
-need the packages:
- - `csquotes`
- - `helvet`
- - `mathpazo`
- - `listings`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/README.md new/doc/latex/notes2bib/README.md
--- old/doc/latex/notes2bib/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/notes2bib/README.md 2019-09-30 23:52:12.000000000 +0200
@@ -0,0 +1,38 @@
+notes2bib - Integrating notes into the bibliography
+===================================================
+
+The `notes2bib` package defines a new type of note, bibnote,
+which will always be added to the bibliography. The package
+allows footnotes and endnotes to be moved into the bibliography
+in the same way. The package can be used with natbib and
+biblatex as well as plain LaTeX citations. Both sorted and
+unsorted bibliography styles are supported.
+
+Installation
+------------
+
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `notes2bib.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex notes2bib.dtx` will extract the package whereas `latex
+notes2bib.dtx` will extract it and also typeset the
+documentation.
+
+The package requires LaTeX3 support as provided in the
+`l3kernel` and `l3packages` bundles. Both of these are available
+on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
+files. Suitable versions are available in MiKTeX 2.9 and TeX
+Live 2012 (updating the relevant packages online may be
+necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
+extensions: these are available on all modern TeX systems.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly
+because of the number of demonstration items included in the
+text. To compile the documentation without error, you will
+need the packages:
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `listings`
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/README.txt new/doc/latex/notes2bib/README.txt
--- old/doc/latex/notes2bib/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/notes2bib/README.txt 2019-09-30 23:52:12.000000000 +0200
@@ -0,0 +1,39 @@
+notes2bib - Integrating notes into the bibliography
+===================================================
+
+The `notes2bib` package defines a new type of note, bibnote,
+which will always be added to the bibliography. The package
+allows footnotes and endnotes to be moved into the bibliography
+in the same way. The package can be used with natbib and
+biblatex as well as plain LaTeX citations. Both sorted and
+unsorted bibliography styles are supported.
+
+Installation
+------------
+
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `notes2bib.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex notes2bib.dtx` will extract the package whereas `latex
+notes2bib.dtx` will extract it and also typeset the
+documentation.
+
+The package requires LaTeX3 support as provided in the
+`l3kernel` and `l3packages` bundles. Both of these are available
+on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
+files. Suitable versions are available in MiKTeX 2.9 and TeX
+Live 2012 (updating the relevant packages online may be
+necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
+extensions: these are available on all modern TeX systems.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly
+because of the number of demonstration items included in the
+text. To compile the documentation without error, you will
+need the packages:
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `listings`
+ %\section{Introduction}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/notes2bib-notes2bib.bib new/doc/latex/notes2bib/notes2bib-notes2bib.bib
--- old/doc/latex/notes2bib/notes2bib-notes2bib.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/notes2bib/notes2bib-notes2bib.bib 2019-09-30 23:52:12.000000000 +0200
@@ -0,0 +1,40 @@
+% This is an auxiliary file used by the 'notes2bib' package.
+% This file may safely be deleted.
+% It will be recreated as required.
+
+@misc{Note1,
+ note = {Note for the first example},
+ key = {Note1},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{labelled,
+ note = {Note for the second example},
+ key = {labelled},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{Note2,
+ note = {Some \texttt {\textbackslash verb}-like output},
+ key = {Note2},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{Note3,
+ note = {Text for the fourth example},
+ key = {Note3},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{named,
+ note = {More text for the fourth example},
+ key = {named},
+ keywords = {note},
+ presort = {mm},
+}
+
+
Binary files old/doc/latex/notes2bib/notes2bib.pdf and new/doc/latex/notes2bib/notes2bib.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notes2bib.doc.tlpobj new/tlpkg/tlpobj/notes2bib.doc.tlpobj
--- old/tlpkg/tlpobj/notes2bib.doc.tlpobj 2019-02-28 03:56:23.000000000 +0100
+++ new/tlpkg/tlpobj/notes2bib.doc.tlpobj 2019-10-01 02:22:27.000000000 +0200
@@ -1,8 +1,10 @@
name notes2bib.doc
category Package
-revision 31162
+revision 52231
shortdesc doc files of notes2bib
relocated 1
-docfiles size=50
- RELOC/doc/latex/notes2bib/README
+docfiles size=62
+ RELOC/doc/latex/notes2bib/README.md
+ RELOC/doc/latex/notes2bib/README.txt
+ RELOC/doc/latex/notes2bib/notes2bib-notes2bib.bib
RELOC/doc/latex/notes2bib/notes2bib.pdf
++++++ notes2bib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/notes2bib/notes2bib.sty new/tex/latex/notes2bib/notes2bib.sty
--- old/tex/latex/notes2bib/notes2bib.sty 2013-07-12 01:22:25.000000000 +0200
+++ new/tex/latex/notes2bib/notes2bib.sty 2019-09-30 23:52:12.000000000 +0200
@@ -14,22 +14,22 @@
%% ---------------------------------------------------------------
%%
\RequirePackage{xparse}
-\ProvidesExplPackage
- {notes2bib} {2013/07/11} {2.0k}
+ %\section{Introduction}
+\ProvidesExplPackage {notes2bib} {2019-09-28} {2.0m}
{Integrating notes into the bibliography}
\RequirePackage{l3keys2e}
-\tl_new:N \c__notestobib_file_message_tl
-\tl_set:Nn \c__notestobib_file_message_tl {
- \iow_char:N \% ~
- This~is~an~auxiliary~file~used~by~the~'notes2bib'~package.
- \iow_newline:
- \iow_char:N \% ~
- This~file~may~safely~be~deleted.
- \iow_newline:
- \iow_char:N \% ~
- It~will~be~recreated~as~required.
- \iow_newline:
-}
+\tl_const:Nn \c__notestobib_file_message_tl
+ {
+ \iow_char:N \% ~
+ This~is~an~auxiliary~file~used~by~the~'notes2bib'~package.
+ \iow_newline:
+ \iow_char:N \% ~
+ This~file~may~safely~be~deleted.
+ \iow_newline:
+ \iow_char:N \% ~
+ It~will~be~recreated~as~required.
+ \iow_newline:
+ }
\clist_new:N \g__notestobib_after_clist
\clist_new:N \g__notestobib_before_clist
\clist_new:N \g__notestobib_all_after_clist
@@ -43,476 +43,492 @@
\tl_new:N \g__notestobib_notes_tl
\tl_new:N \l__notestobib_sortkey_field_tl
\int_new:N \g__notestobib_total_notes_int
-\cs_new_nopar:Npn \__notestobib_cite:w { }
-\keys_define:nn { notes2bib } {
- cite-function .code:n =
- { \AtBeginDocument { \cs_set_eq:NN \__notestobib_cite:w #1 } } ,
- file-name .tl_gset_x:N = \g__notestobib_filename_tl ,
- convert-endnotes .choice: ,
- convert-endnotes
- / false .code:n =
- { \AtBeginDocument { \__notestobib_from_bibnote:n { endnote } } } ,
- convert-endnotes
- / true .code:n =
- { \AtBeginDocument { \__notestobib_to_bibnote:n { endnote } } } ,
- convert-footnotes .choice: ,
- convert-footnotes
- / false .code:n =
- { \AtBeginDocument { \__notestobib_from_bibnote:n { footnote } } } ,
- convert-footnotes
- / true .code:n =
- { \AtBeginDocument { \__notestobib_to_bibnote:n { footnote } } } ,
- keyword-entry .tl_set:N = \l__notestobib_keyword_tl ,
- note-field .tl_set:N = \l__notestobib_note_field_tl ,
- note-name .tl_set:N = \l__notestobib_note_name_tl ,
- placement .choice: ,
- placement
- / after .code:n =
- {
- \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_after:n
- \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_after_tl
- \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_after_tl
- },
- placement
- / before .code:n =
- {
- \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_before:n
- \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_before_tl
- \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_before_tl
- },
- placement
- / mixed .code:n =
- {
- \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_mixed:n
- \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_mixed_tl
- \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_mixed_tl
- },
- presort-after .tl_set:N = \l__notestobib_presort_after_tl ,
- presort-before .tl_set:N = \l__notestobib_presort_before_tl ,
- presort-mixed .tl_set:N = \l__notestobib_presort_mixed_tl ,
- record-type .tl_set:N = \l__notestobib_record_type_tl ,
- refsection-name .tl_set:N = \l__notestobib_refsection_name_tl ,
- refsection-separator .tl_set:N = \l__notestobib_refsection_sep_tl ,
- sort-key-after .tl_set:N = \l__notestobib_sortkey_before_tl ,
- sort-key-before .tl_set:N = \l__notestobib_sortkey_after_tl ,
- sort-key-mixed .tl_set:N = \l__notestobib_sortkey_mixed_tl ,
- use-sort-key .bool_set:N = \l__notestobib_write_sortkey_bool ,
-}
-\keys_set:nn { notes2bib } {
- cite-function = \cite ,
- file-name = notes2bib-\jobname ,
- keyword-entry = note ,
- note-field = note ,
- note-name = Note ,
- presort-after = mn ,
- presort-before = ml ,
- presort-mixed = mm ,
- record-type = misc ,
- refsection-name = Refsection ,
- refsection-separator = - ,
- sort-key-after = zzz ,
- sort-key-before = aaa ,
- use-sort-key = true
-}
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \@ifpackagelater { biblatex } { 2011/01/08 }
- {
- \keys_set:nn { notes2bib }
- { record-type = bibnote }
- \DeclareBibliographyDriver { bibnote }
- {
- \usebibmacro { begentry }
- \printfield { note }
- \setunit { \bibpagerefpunct }
- \newblock
- \usebibmacro { pageref }
- \usebibmacro { finentry }
- }
- }
- { }
- }
- { }
- \keys_define:nn { notes2bib }
- {
- cite-function .code:n =
- { \cs_set_eq:NN \__notestobib_cite:w #1 } ,
- file-name .code:n =
- { \msg_info:nnn { notes2bib } { preamble-only } { file-name } },
- convert-endnotes / false .code:n =
- { \__notestobib_from_bibnote:n { endnote } } ,
- convert-endnotes / true .code:n =
- { \__notestobib_to_bibnote:n { endnote } } ,
- convert-footnotes / false .code:n =
- { \__notestobib_from_bibnote:n { footnote } } ,
- convert-footnotes / true .code:n =
- { \__notestobib_to_bibnote:n { footnote } } ,
- }
+\cs_new:Npn \__notestobib_cite:w { }
+\keys_define:nn { notes2bib }
+ {
+ cite-function .code:n =
+ { \AtBeginDocument { \cs_set_eq:NN \__notestobib_cite:w #1 } } ,
+ file-name .tl_gset_x:N = \g__notestobib_filename_tl ,
+ convert-endnotes .choice: ,
+ convert-endnotes
+ / false .code:n =
+ { \AtBeginDocument { \__notestobib_from_bibnote:n { endnote } } } ,
+ convert-endnotes
+ / true .code:n =
+ { \AtBeginDocument { \__notestobib_to_bibnote:n { endnote } } } ,
+ convert-footnotes .choice: ,
+ convert-footnotes
+ / false .code:n =
+ { \AtBeginDocument { \__notestobib_from_bibnote:n { footnote } } } ,
+ convert-footnotes
+ / true .code:n =
+ { \AtBeginDocument { \__notestobib_to_bibnote:n { footnote } } } ,
+ keyword-entry .tl_set:N = \l__notestobib_keyword_tl ,
+ note-field .tl_set:N = \l__notestobib_note_field_tl ,
+ note-name .tl_set:N = \l__notestobib_note_name_tl ,
+ placement .choice: ,
+ placement
+ / after .code:n =
+ {
+ \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_after:n
+ \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_after_tl
+ \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_after_tl
+ },
+ placement
+ / before .code:n =
+ {
+ \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_before:n
+ \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_before_tl
+ \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_before_tl
+ },
+ placement
+ / mixed .code:n =
+ {
+ \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_mixed:n
+ \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_mixed_tl
+ \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_mixed_tl
+ },
+ presort-after .tl_set:N = \l__notestobib_presort_after_tl ,
+ presort-before .tl_set:N = \l__notestobib_presort_before_tl ,
+ presort-mixed .tl_set:N = \l__notestobib_presort_mixed_tl ,
+ record-type .tl_set:N = \l__notestobib_record_type_tl ,
+ refsection-name .tl_set:N = \l__notestobib_refsection_name_tl ,
+ refsection-separator .tl_set:N = \l__notestobib_refsection_sep_tl ,
+ sort-key-after .tl_set:N = \l__notestobib_sortkey_before_tl ,
+ sort-key-before .tl_set:N = \l__notestobib_sortkey_after_tl ,
+ sort-key-mixed .tl_set:N = \l__notestobib_sortkey_mixed_tl ,
+ use-sort-key .bool_set:N = \l__notestobib_write_sortkey_bool
+ }
+\keys_set:nn { notes2bib }
+ {
+ cite-function = \cite ,
+ file-name = notes2bib-\jobname ,
+ keyword-entry = note ,
+ note-field = note ,
+ note-name = Note ,
+ presort-after = mn ,
+ presort-before = ml ,
+ presort-mixed = mm ,
+ record-type = misc ,
+ refsection-name = Refsection ,
+ refsection-separator = - ,
+ sort-key-after = zzz ,
+ sort-key-before = aaa ,
+ use-sort-key = true
}
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \@ifpackagelater { biblatex } { 2011/01/08 }
+ {
+ \keys_set:nn { notes2bib } { record-type = bibnote }
+ \DeclareBibliographyDriver { bibnote }
+ {
+ \usebibmacro { begentry }
+ \printfield { note }
+ \setunit { \bibpagerefpunct }
+ \newblock
+ \usebibmacro { pageref }
+ \usebibmacro { finentry }
+ }
+ }
+ { }
+ }
+ { }
+ \keys_define:nn { notes2bib }
+ {
+ cite-function .code:n =
+ { \cs_set_eq:NN \__notestobib_cite:w #1 } ,
+ file-name .code:n =
+ { \msg_info:nnn { notes2bib } { preamble-only } { file-name } } ,
+ convert-endnotes / false .code:n =
+ { \__notestobib_from_bibnote:n { endnote } } ,
+ convert-endnotes / true .code:n =
+ { \__notestobib_to_bibnote:n { endnote } } ,
+ convert-footnotes / false .code:n =
+ { \__notestobib_from_bibnote:n { footnote } } ,
+ convert-footnotes / true .code:n =
+ { \__notestobib_to_bibnote:n { footnote } }
+ }
+ }
\msg_new:nnn { notes2bib } { preamble-only }
{ The~option~'#1'~can~only~be~used~in~the~preamble. }
-\cs_new_nopar:Npn \__notestobib_insert_refsection: { }
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \cs_set_nopar:Npn \__notestobib_insert_refsection:
- {
- \int_compare:nNnT { \value { refsection } } > { 0 }
- {
- \tl_use:N \l__notestobib_refsection_name_tl
- \arabic { refsection }
- \tl_use:N \l__notestobib_refsection_sep_tl
+\cs_new:Npn \__notestobib_insert_refsection: { }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \cs_set:Npn \__notestobib_insert_refsection:
+ {
+ \int_compare:nNnT { \value { refsection } } > { 0 }
+ {
+ \tl_use:N \l__notestobib_refsection_name_tl
+ \arabic { refsection }
+ \tl_use:N \l__notestobib_refsection_sep_tl
}
- }
- }
- { }
-}
-\keys_define:nn { notes2bib } {
- cite .code:n =
- {
- \use:x
- { \keys_set:nn { notes2bib } { cite-function = \exp_not:c {#1} } }
- } ,
- debug .code:n = { } ,
- endnotes .meta:n = { convert-footnotes = #1 } ,
- etex .code:n = { } ,
- field .meta:n = { note-field = #1 } ,
- footnotes .meta:n = { convert-footnotes = #1 } ,
- head .meta:n = { placement = before } ,
- keyhead .meta:n = { sort-key-before = #1 } ,
- keytail .meta:n = { sort-key-after = #1 } ,
- keynone .meta:n = { sort-key-mixed = #1 } ,
- keyword .meta:n = { keyword-entry = #1 } ,
- log .meta:n = { } ,
- name .meta:n = { note-name = #1 } ,
- prefix .meta:n = { file-name = #1 \jobname } ,
- presorthead .meta:n = { presort-before = #1 } ,
- presorttail .meta:n = { presort-after = #1 } ,
- presortnone .meta:n = { presort-mixed = #1 } ,
- record .meta:n = { record-type = #1 } ,
- sort .choice: ,
- sort / head .meta:n = { placement = before } ,
- sort / none .meta:n = { placement = after } ,
- sort / tail .meta:n = { placement = mixed } ,
- tail .meta:n = { placement = after } ,
- writekey .meta:n = { use-sort-key = #1 }
-}
-\cs_new_nopar:Npn \__notestobib_note_name: {
- \__notestobib_insert_refsection:
- \tl_use:N \l__notestobib_note_name_tl
- \int_compare:nNnT \g__notestobib_previous_notes_int > \c_nine
- { \int_compare:nNnT \g__notestobib_note_int < \c_ten { 0 } }
- \int_to_arabic:n { \g__notestobib_note_int }
-}
-\cs_new_nopar:Npn \__notestobib_filesw: { }
-\cs_new:Npn \__notestobib_mark_note:n #1 { }
+ }
+ }
+ { }
+ }
+\keys_define:nn { notes2bib }
+ {
+ cite .code:n =
+ {
+ \use:x
+ { \keys_set:nn { notes2bib } { cite-function = \exp_not:c {#1} } }
+ } ,
+ debug .code:n = { } ,
+ endnotes .meta:n = { convert-footnotes = #1 } ,
+ etex .code:n = { } ,
+ field .meta:n = { note-field = #1 } ,
+ footnotes .meta:n = { convert-footnotes = #1 } ,
+ head .meta:n = { placement = before } ,
+ keyhead .meta:n = { sort-key-before = #1 } ,
+ keytail .meta:n = { sort-key-after = #1 } ,
+ keynone .meta:n = { sort-key-mixed = #1 } ,
+ keyword .meta:n = { keyword-entry = #1 } ,
+ log .meta:n = { } ,
+ name .meta:n = { note-name = #1 } ,
+ prefix .meta:n = { file-name = #1 \jobname } ,
+ presorthead .meta:n = { presort-before = #1 } ,
+ presorttail .meta:n = { presort-after = #1 } ,
+ presortnone .meta:n = { presort-mixed = #1 } ,
+ record .meta:n = { record-type = #1 } ,
+ sort .choice: ,
+ sort / head .meta:n = { placement = before } ,
+ sort / none .meta:n = { placement = after } ,
+ sort / tail .meta:n = { placement = mixed } ,
+ tail .meta:n = { placement = after } ,
+ writekey .meta:n = { use-sort-key = #1 }
+ }
+\cs_new:Npn \__notestobib_note_name:
+ {
+ \__notestobib_insert_refsection:
+ \tl_use:N \l__notestobib_note_name_tl
+ \int_compare:nNnT \g__notestobib_previous_notes_int > 9
+ { \int_compare:nNnT \g__notestobib_note_int < { 10 } { 0 } }
+ \int_to_arabic:n { \g__notestobib_note_int }
+ }
+\cs_new_eq:NN \__notestobib_filesw: \tex_iftrue:D
+\cs_new_protected:Npn \__notestobib_mark_note:n #1 { }
\cs_generate_variant:Nn \__notestobib_mark_note:n { x }
-\cs_new_protected:Npn \__notestobib_mark_note_after:n #1 {
- \int_gincr:N \g__notestobib_total_notes_int
- \clist_gput_right:Nx \g__notestobib_after_clist {#1}
- \__notestobib_mark_note_after_aux:n {#1}
-}
-\cs_new:Npn \__notestobib_mark_note_after_aux:n #1 { }
-\cs_new_protected:Npn \__notestobib_mark_note_before:n #1 {
- \int_gincr:N \g__notestobib_total_notes_int
- \clist_gput_right:Nx \g__notestobib_before_clist {#1}
- \__notestobib_cite:w {#1}
-}
-\cs_new_protected:Npn \__notestobib_mark_note_mixed:n #1 {
- \int_gincr:N \g__notestobib_total_notes_int
- \__notestobib_cite:w {#1}
-}
-\cs_new:Npn \__notestobib_write_field:nn #1#2 {
- \c_space_tl \c_space_tl #1 \c_space_tl = \c_space_tl {#2} ,
- \iow_newline:
-}
+\cs_new_protected:Npn \__notestobib_mark_note_after:n #1
+ {
+ \int_gincr:N \g__notestobib_total_notes_int
+ \clist_gput_right:Nx \g__notestobib_after_clist {#1}
+ \__notestobib_mark_note_after_aux:n {#1}
+ }
+\cs_new_protected:Npn \__notestobib_mark_note_after_aux:n #1 { }
+\cs_new_protected:Npn \__notestobib_mark_note_before:n #1
+ {
+ \int_gincr:N \g__notestobib_total_notes_int
+ \clist_gput_right:Nx \g__notestobib_before_clist {#1}
+ \__notestobib_cite:w {#1}
+ }
+\cs_new_protected:Npn \__notestobib_mark_note_mixed:n #1
+ {
+ \int_gincr:N \g__notestobib_total_notes_int
+ \__notestobib_cite:w {#1}
+ }
+\cs_new:Npn \__notestobib_write_field:nn #1#2
+ {
+ \c_space_tl \c_space_tl #1 \c_space_tl = \c_space_tl {#2} ,
+ \iow_newline:
+ }
\cs_generate_variant:Nn \__notestobib_write_field:nn { V }
-\cs_new_protected_nopar:Npn \__notestobib_write_note:nn {
- \if@filesw
- \exp_after:wN \__notestobib_write_note_aux:nn
- \else:
- \exp_after:wN \use_none:nn
- \fi:
-}
-\cs_new_protected:Npn \__notestobib_write_note_aux:nn #1#2 {
- \tl_gput_right:Nx \g__notestobib_notes_tl
- {
- @ \l__notestobib_record_type_tl
- {
- #1 , \iow_newline:
- \__notestobib_write_field:Vn \l__notestobib_note_field_tl { \exp_not:n {#2} }
- \bool_if:NT \l__notestobib_write_sortkey_bool
- {
- \__notestobib_write_field:Vn \l__notestobib_sortkey_field_tl
- { \l__notestobib_sortkey_tl #1 }
- }
- \__notestobib_write_field:nn { keywords } { \l__notestobib_keyword_tl }
- \__notestobib_write_field:nn { presort } { \l__notestobib_presort_tl }
- }
- \iow_newline:
- \iow_newline:
- }
-}
-\cs_generate_variant:Nn \__notestobib_write_note:nn { x }
-\cs_new_protected_nopar:Npn \__notestobib_record_notes: {
- \if@filesw
- \exp_after:wN \__notestobib_flush_notes_aux:
- \fi
-}
-\cs_new_protected_nopar:Npn \__notestobib_flush_notes_aux: {
- \clist_if_empty:NF \g__notestobib_before_clist
- {
- \iow_now:Nx \@auxout
- { \NotesBeforeCitations { \exp_not:V \g__notestobib_before_clist } }
- \clist_gput_right:NV \g__notestobib_all_before_clist \g__notestobib_before_clist
- \clist_gclear:N \g__notestobib_before_clist
- }
- \clist_if_empty:NF \g__notestobib_after_clist
- {
- \iow_now:Nx \@auxout
- { \NotesAfterCitations { \exp_not:V \g__notestobib_after_clist } }
- \exp_args:NV \nocite \g__notestobib_after_clist
- \clist_gput_right:NV \g__notestobib_all_after_clist \g__notestobib_after_clist
- \clist_gclear:N \g__notestobib_after_clist
- }
-}
-\cs_new_protected_nopar:Npn \__notestobib_to_bibnote:n #1 {
- \cs_set_eq:cN {#1} \bibnote
- \cs_set_eq:cN { #1 mark } \bibnotemark
- \cs_set_eq:cN { #1 text } \bibnotetext
-}
-\cs_new_protected_nopar:Npn \__notestobib_from_bibnote:n #1 {
- \cs_set_eq:cc {#1} { __notestobib_ #1 :w }
- \cs_set_eq:cc { #1 mark } { __notestobib_ #1 mark:w }
- \cs_set_eq:cc { #1 text } { __notestobib_ #1 text:w }
-}
-\AtBeginDocument {
- \cs_set_eq:NN \__notestobib_endnote:w \endnote
- \cs_set_eq:NN \__notestobib_endnotemark:w \endnotemark
- \cs_set_eq:NN \__notestobib_endnotetext:w \endnotetext
- \cs_set_eq:NN \__notestobib_footnote:w \footnote
- \cs_set_eq:NN \__notestobib_footnotemark:w \footnotemark
- \cs_set_eq:NN \__notestobib_footnotetext:w \footnotetext
-}
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \cs_new_protected_nopar:Npn \__notestobib_print_notes:
- {
- \cs_set_nopar:Npx \__notestobib_create_print_notes:
- {
- \printbibliography
- [ keyword = \exp_not:V \l__notestobib_keyword_tl ]
- }
- \__notestobib_create_print_notes:
- }
- }
- {
- \cs_new_protected_nopar:Npn \__notestobib_print_notes:
- { \exp_args:NV \__notestobib_bibliography:n \g__notestobib_filename_tl }
- }
-}
-\cs_new_nopar:Npn \__notestobib_create_print_notes: { }
-\cs_new_nopar:Npn \__notestobib_attach_bibliography: {
- \@ifpackageloaded { biblatex }
- {
- \@ifpackagelater { biblatex } { 2011/01/08 }
- {
- \@ifpackagelater { biblatex } { 2011/02/12 }
- {
+\cs_new_protected:Npn \notestobib_write_note:nn
+ {
+ \if@filesw
+ \exp_after:wN \__notestobib_write_note:nn
+ \else:
+ \exp_after:wN \use_none:nn
+ \fi:
+ }
+\cs_generate_variant:Nn \notestobib_write_note:nn { x }
+\cs_new_protected:Npn \__notestobib_write_note:nn #1#2
+ {
+ \tl_gput_right:Nx \g__notestobib_notes_tl
+ {
+ @ \l__notestobib_record_type_tl
+ {
+ #1 , \iow_newline:
+ \__notestobib_write_field:Vn \l__notestobib_note_field_tl { \exp_not:n {#2} }
+ \bool_if:NT \l__notestobib_write_sortkey_bool
+ {
+ \__notestobib_write_field:Vn \l__notestobib_sortkey_field_tl
+ { \l__notestobib_sortkey_tl #1 }
+ }
+ \__notestobib_write_field:nn { keywords } { \l__notestobib_keyword_tl }
+ \__notestobib_write_field:nn { presort } { \l__notestobib_presort_tl }
+ }
+ \iow_newline:
+ \iow_newline:
+ }
+ }
- \exp_args:No \addglobalbib
- { \g__notestobib_filename_tl .bib }
- }
- { \exp_args:NNV \bibliography * \g__notestobib_filename_tl }
- }
- { \exp_args:NV \bibliography \g__notestobib_filename_tl }
- }
- {
- \cs_new_eq:NN \__notestobib_bibliography:n \bibliography
- \RenewDocumentCommand \bibliography { m }
- {
- \int_compare:nNnTF \g__notestobib_total_notes_int = \c_zero
- { \__notestobib_bibliography:n {##1} }
- {
- \cs_set_nopar:Npx \__notestobib_attach_bibliography:
- {
- \exp_not:N \__notestobib_bibliography:n
- {
- \exp_not:n {##1} , \exp_not:V \g__notestobib_filename_tl
- }
- }
- \__notestobib_attach_bibliography:
- }
- }
- }
-}
+\cs_new_protected:Npn \__notestobib_record_notes:
+ {
+ \if@filesw
+ \exp_after:wN \__notestobib_flush_notes_aux:
+ \fi
+ }
+\cs_new_protected:Npn \__notestobib_flush_notes_aux:
+ {
+ \clist_if_empty:NF \g__notestobib_before_clist
+ {
+ \iow_now:Nx \@auxout
+ { \NotesBeforeCitations { \exp_not:V \g__notestobib_before_clist } }
+ \clist_gput_right:NV \g__notestobib_all_before_clist \g__notestobib_before_clist
+ \clist_gclear:N \g__notestobib_before_clist
+ }
+ \clist_if_empty:NF \g__notestobib_after_clist
+ {
+ \iow_now:Nx \@auxout
+ { \NotesAfterCitations { \exp_not:V \g__notestobib_after_clist } }
+ \exp_args:NV \nocite \g__notestobib_after_clist
+ \clist_gput_right:NV \g__notestobib_all_after_clist \g__notestobib_after_clist
+ \clist_gclear:N \g__notestobib_after_clist
+ }
+ }
+\cs_new_protected:Npn \__notestobib_to_bibnote:n #1
+ {
+ \cs_set_eq:cN {#1} \bibnote
+ \cs_set_eq:cN { #1 mark } \bibnotemark
+ \cs_set_eq:cN { #1 text } \bibnotetext
+ }
+\cs_new_protected:Npn \__notestobib_from_bibnote:n #1
+ {
+ \cs_set_eq:cc {#1} { __notestobib_ #1 :w }
+ \cs_set_eq:cc { #1 mark } { __notestobib_ #1 mark:w }
+ \cs_set_eq:cc { #1 text } { __notestobib_ #1 text:w }
+ }
+\AtBeginDocument
+ {
+ \cs_new_eq:NN \__notestobib_endnote:w \endnote
+ \cs_new_eq:NN \__notestobib_endnotemark:w \endnotemark
+ \cs_new_eq:NN \__notestobib_endnotetext:w \endnotetext
+ \cs_new_eq:NN \__notestobib_footnote:w \footnote
+ \cs_new_eq:NN \__notestobib_footnotemark:w \footnotemark
+ \cs_new_eq:NN \__notestobib_footnotetext:w \footnotetext
+ }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \cs_new_protected:Npn \__notestobib_print_notes:
+ {
+ \cs_set:Npx \__notestobib_create_print_notes:
+ {
+ \printbibliography
+ [ keyword = \exp_not:V \l__notestobib_keyword_tl ]
+ }
+ \__notestobib_create_print_notes:
+ }
+ }
+ {
+ \cs_new_protected:Npn \__notestobib_print_notes:
+ { \exp_args:NV \__notestobib_bibliography:n \g__notestobib_filename_tl }
+ }
+ }
+\cs_new_protected:Npn \__notestobib_create_print_notes: { }
+\cs_new_protected:Npn \__notestobib_attach_bibliography:
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \@ifpackagelater { biblatex } { 2011/01/08 }
+ {
+ \@ifpackagelater { biblatex } { 2011/02/12 }
+ { \exp_args:No \addglobalbib { \g__notestobib_filename_tl .bib } }
+ { \exp_args:NNV \bibliography * \g__notestobib_filename_tl }
+ }
+ { \exp_args:NV \bibliography \g__notestobib_filename_tl }
+ }
+ {
+ \cs_new_eq:NN \__notestobib_bibliography:n \bibliography
+ \RenewDocumentCommand \bibliography { m }
+ {
+ \int_compare:nNnTF \g__notestobib_total_notes_int = 0
+ { \__notestobib_bibliography:n {##1} }
+ {
+ \cs_set:Npx \__notestobib_attach_bibliography:
+ {
+ \exp_not:N \__notestobib_bibliography:n
+ { \exp_not:n {##1} , \exp_not:V \g__notestobib_filename_tl }
+ }
+ \__notestobib_attach_bibliography:
+ }
+ }
+ }
+ }
\@ifpackageloaded { biblatex }
{
\@ifpackagelater { biblatex } { 2011/01/08 }
{
\@ifpackagelater { biblatex } { 2011/02/12 }
- {
-
- \exp_args:No \addglobalbib
- { \g__notestobib_filename_tl .bib }
- }
+ { \exp_args:No \addglobalbib { \g__notestobib_filename_tl .bib } }
{ \exp_args:NNV \bibliography * \g__notestobib_filename_tl }
}
{ \exp_args:NV \bibliography \g__notestobib_filename_tl }
}
{ \AtBeginDocument { \__notestobib_attach_bibliography: } }
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- { \tl_set:Nn \l__notestobib_sortkey_field_tl { sortkey } }
- { \tl_set:Nn \l__notestobib_sortkey_field_tl { key } }
-}
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \cs_set:Npn \__notestobib_mark_note_after_aux:n #1
- {
- \AtNextCite { \@fileswfalse }
- \__notestobib_cite:w {#1}
- }
- }
- {
- \cs_set:Npn \__notestobib_mark_note_after_aux:n #1
- {
- \cs_set_eq:NN \__notestobib_filesw: \if@filesw
- \@fileswfalse
- \__notestobib_cite:w {#1}
- \cs_set_eq:NN \if@filesw \__notestobib_filesw:
- }
- }
-}
-\AtBeginDocument {
- \@ifpackageloaded { cite }
- {
- \cs_set:Npn \__notestobib_mark_note_after_aux:n #1
- {
- \cs_set_eq:NN \__notestobib_filesw: \if@filesw
- \@fileswfalse
- \cs_set_nopar:Npn \__notestobib_aux_hook:
- {
- \cs_set_eq:NN \if@filesw \__notestobib_filesw:
- \cs_set_nopar:Npn \__notestobib_aux_hook: { }
- }
- \__notestobib_cite:w {#1}
- }
- \cs_new_nopar:Npn \__notestobib_aux_hook: { }
- \tl_gput_right:Nn \g__notestobib_document_hook_tl
- {
- \cs_if_exist:NF \@restore@auxhandle
- { \tl_new:N \@restore@auxhandle }
- \tl_put_right:Nn \@restore@auxhandle { \__notestobib_aux_hook: }
- }
- }
- { }
-}
-\NewDocumentCommand \bibnote { o +m } {
- \IfNoValueTF {#1}
- {
- \int_gincr:N \g__notestobib_note_int
- \__notestobib_bibnote:xn { \__notestobib_note_name: } {#2}
- }
- { \__notestobib_bibnote:xn { \__notestobib_insert_refsection: #1 } {#2} }
-}
-\cs_new_protected:Npn \__notestobib_bibnote:nn #1#2 {
- \__notestobib_write_note:nn {#1} {#2}
- \__notestobib_mark_note:n {#1}
-}
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ { \tl_set:Nn \l__notestobib_sortkey_field_tl { sortkey } }
+ { \tl_set:Nn \l__notestobib_sortkey_field_tl { key } }
+ }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \cs_set_protected:Npn \__notestobib_mark_note_after_aux:n #1
+ {
+ \AtNextCite { \@fileswfalse }
+ \__notestobib_cite:w {#1}
+ }
+ }
+ {
+ \cs_set_protected:Npn \__notestobib_mark_note_after_aux:n #1
+ {
+ \cs_set_eq:NN \__notestobib_filesw: \if@filesw
+ \@fileswfalse
+ \__notestobib_cite:w {#1}
+ \cs_set_eq:NN \if@filesw \__notestobib_filesw:
+ }
+ }
+ }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { cite }
+ {
+ \cs_set_protected:Npn \__notestobib_mark_note_after_aux:n #1
+ {
+ \cs_set_eq:NN \__notestobib_filesw: \if@filesw
+ \@fileswfalse
+ \cs_set:Npn \__notestobib_aux_hook:
+ {
+ \cs_set_eq:NN \if@filesw \__notestobib_filesw:
+ \cs_set:Npn \__notestobib_aux_hook: { }
+ }
+ \__notestobib_cite:w {#1}
+ }
+ \cs_new:Npn \__notestobib_aux_hook: { }
+ \tl_gput_right:Nn \g__notestobib_document_hook_tl
+ {
+ \cs_if_exist:NF \@restore@auxhandle
+ { \tl_new:N \@restore@auxhandle }
+ \tl_put_right:Nn \@restore@auxhandle { \__notestobib_aux_hook: }
+ }
+ }
+ { }
+ }
+\NewDocumentCommand \bibnote { o +m }
+ {
+ \IfNoValueTF {#1}
+ {
+ \int_gincr:N \g__notestobib_note_int
+ \__notestobib_bibnote:xn { \__notestobib_note_name: } {#2}
+ }
+ { \__notestobib_bibnote:xn { \__notestobib_insert_refsection: #1 } {#2} }
+ }
+\cs_new_protected:Npn \__notestobib_bibnote:nn #1#2
+ {
+ \notestobib_write_note:nn {#1} {#2}
+ \__notestobib_mark_note:n {#1}
+ }
\cs_generate_variant:Nn \__notestobib_bibnote:nn { x }
-\NewDocumentCommand \bibnotemark { o } {
- \IfNoValueTF {#1}
- {
- \int_gincr:N \g__notestobib_note_int
- \__notestobib_mark_note:x { \__notestobib_note_name: }
- }
- { \__notestobib_mark_note:x { \__notestobib_insert_refsection: #1 } }
-}
-\NewDocumentCommand \bibnotetext { o +m } {
- \IfNoValueTF {#1}
- { \__notestobib_write_note:xn { \__notestobib_note_name: } {#2} }
- { \__notestobib_write_note:xn { \__notestobib_insert_refsection: #1 } {#2} }
-}
-\NewDocumentCommand \recordnotes { } {
- \__notestobib_record_notes:
-}
-\NewDocumentCommand \bibnotesetup { m } {
- \keys_set:nn { notes2bib } {#1}
-}
-\NewDocumentCommand \printbibnotes { } {
- \__notestobib_print_notes:
-}
-\NewDocumentCommand \citenote { m } {
- \__notestobib_mark_note:n {#1}
-}
+\NewDocumentCommand \bibnotemark { o }
+ {
+ \IfNoValueTF {#1}
+ {
+ \int_gincr:N \g__notestobib_note_int
+ \__notestobib_mark_note:x { \__notestobib_note_name: }
+ }
+ { \__notestobib_mark_note:x { \__notestobib_insert_refsection: #1 } }
+ }
+\NewDocumentCommand \bibnotetext { o +m }
+ {
+ \IfNoValueTF {#1}
+ { \notestobib_write_note:xn { \__notestobib_note_name: } {#2} }
+ { \notestobib_write_note:xn { \__notestobib_insert_refsection: #1 } {#2} }
+ }
+\NewDocumentCommand \recordnotes { }
+ { \__notestobib_record_notes: }
+\NewDocumentCommand \bibnotesetup { m }
+ { \keys_set:nn { notes2bib } {#1} }
+\NewDocumentCommand \printbibnotes { }
+ { \__notestobib_print_notes: }
+\NewDocumentCommand \citenote { m }
+ { \__notestobib_mark_note:n {#1} }
\cs_new_eq:NN \flushnotestack \recordnotes
\cs_new_eq:NN \niibsetup \bibnotesetup
-\cs_new_protected_nopar:Npn \NotesAfterCitations #1 {
- \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1}
-}
-\cs_new_protected_nopar:Npn \NotesBeforeCitations #1 {
- \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1}
- \tl_gput_right:Nn \g__notestobib_document_hook_tl { \nocite {#1} }
-}
-\cs_new_protected_nopar:Npn \TotalNotes #1 {
- \int_gset:Nn \g__notestobib_previous_notes_int {#1}
-}
+\cs_new_protected:Npn \NotesAfterCitations #1
+ { \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1} }
+\cs_new_protected:Npn \NotesBeforeCitations #1
+ {
+ \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1}
+ \tl_gput_right:Nn \g__notestobib_document_hook_tl { \nocite {#1} }
+ }
+\cs_new_protected:Npn \TotalNotes #1
+ { \int_gset:Nn \g__notestobib_previous_notes_int {#1} }
\tl_gput_right:Nn \document { \g__notestobib_document_hook_tl }
\tl_new:N \g__notestobib_document_hook_tl
\AtEndDocument { \__notestobib_record_notes: }
-\AtEndDocument {
- \tl_if_eq:NNTF \g__notestobib_all_before_clist \g__notestobib_previous_before_clist
- {
- \tl_if_eq:NNF \g__notestobib_all_after_clist \g__notestobib_previous_after_clist
- { \msg_info:nn { notes2bib } { rerun } }
- }
- { \msg_info:nn { notes2bib } { rerun } }
-}
-\msg_new:nnn { notes2bib } { rerun } {
- To~get~notes~in~the~correct~order,~please~run: \\%
- \c_space_tl 1)~LaTeX \\
- \c_space_tl 2)~BibTeX \\
- \c_space_tl 3)~LaTeX
-}
-\AtEndDocument {
- \if@filesw
- \exp_after:wN \__notestobib_write_note_file:
- \fi:
-}
-\cs_new_protected_nopar:Npn \__notestobib_write_note_file: {
- \tl_if_empty:NF \g__notestobib_notes_tl {
- \iow_open:Nn \g__notestobib_file_iow { \g__notestobib_filename_tl .bib }
- \iow_now:Nx \g__notestobib_file_iow { \c__notestobib_file_message_tl }
- \iow_now:Nx \g__notestobib_file_iow
- { \exp_not:V \g__notestobib_notes_tl }
- \iow_close:N \g__notestobib_file_iow
+\AtEndDocument
+ {
+ \tl_if_eq:NNTF \g__notestobib_all_before_clist \g__notestobib_previous_before_clist
+ {
+ \tl_if_eq:NNF \g__notestobib_all_after_clist \g__notestobib_previous_after_clist
+ { \msg_info:nn { notes2bib } { rerun } }
+ }
+ { \msg_info:nn { notes2bib } { rerun } }
+ }
+\msg_new:nnn { notes2bib } { rerun }
+ {
+ To~get~notes~in~the~correct~order,~please~run: \\%
+ \c_space_tl 1)~LaTeX \\
+ \c_space_tl 2)~BibTeX \\
+ \c_space_tl 3)~LaTeX
+ }
+\AtEndDocument
+ {
+ \if@filesw
+ \exp_after:wN \__notestobib_write_note_file:
+ \fi:
+ }
+\cs_new_protected:Npn \__notestobib_write_note_file:
+ {
+ \tl_if_empty:NF \g__notestobib_notes_tl
+ {
+ \iow_open:Nn \g__notestobib_file_iow { \g__notestobib_filename_tl .bib }
+ \iow_now:Nx \g__notestobib_file_iow { \c__notestobib_file_message_tl }
+ \iow_now:Nx \g__notestobib_file_iow { \exp_not:V \g__notestobib_notes_tl }
+ \iow_close:N \g__notestobib_file_iow
+ }
}
-}
\iow_new:N \g__notestobib_file_iow
-\AtEndDocument {
- \int_compare:nNnT \g__notestobib_note_int > \c_zero
- {
- \iow_now:Nx \@auxout
- { \TotalNotes { \int_to_arabic:n { \g__notestobib_note_int } } }
- }
-}
-\cs_set:Npn \thanks #1 {
- \__notestobib_footnotemark:w
- \protected@xdef \@thanks
- {
- \@thanks
- \protect \__notestobib_footnotetext:w [ \the \c@footnote ] {#1}
- }
-}
+\AtEndDocument
+ {
+ \int_compare:nNnT \g__notestobib_note_int > 0
+ {
+ \iow_now:Nx \@auxout
+ { \TotalNotes { \int_to_arabic:n { \g__notestobib_note_int } } }
+ }
+ }
+\cs_set:Npn \thanks #1
+ {
+ \__notestobib_footnotemark:w
+ \protected@xdef \@thanks
+ {
+ \@thanks
+ \protect \__notestobib_footnotetext:w [ \the \c@footnote ] {#1}
+ }
+ }
\keys_set:nn { notes2bib } { placement = mixed }
\ProcessKeysOptions { notes2bib }
%%
-%% Copyright (C) 2007-2011,2013 by
-%% Copyright (C) 2007-2013 by
+%% Copyright (C) 2007-2013,2016,2019 by
%% Joseph Wright <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/notes2bib.tlpobj new/tlpkg/tlpobj/notes2bib.tlpobj
--- old/tlpkg/tlpobj/notes2bib.tlpobj 2019-02-28 03:56:23.000000000 +0100
+++ new/tlpkg/tlpobj/notes2bib.tlpobj 2019-10-01 02:22:27.000000000 +0200
@@ -1,6 +1,6 @@
name notes2bib
category Package
-revision 31162
+revision 52231
shortdesc Integrating notes into the bibliography
relocated 1
longdesc The package defines a new type of note, bibnote, which will
@@ -17,7 +17,7 @@
runfiles size=5
RELOC/tex/latex/notes2bib/notes2bib.sty
catalogue-ctan /macros/latex/contrib/notes2bib
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-09-30 17:56:14 +0200
+catalogue-license lppl1.3c
catalogue-topics notes bib-use expl3
-catalogue-version 2.0k
+catalogue-version 2.0m
++++++ noto.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/noto/README new/doc/fonts/noto/README
--- old/doc/fonts/noto/README 2019-03-15 22:16:00.000000000 +0100
+++ new/doc/fonts/noto/README 2019-12-12 23:57:04.000000000 +0100
@@ -1,16 +1,16 @@
-This is the README for the noto package, version 2019-03-15.
+This is the README for the noto package, version 2019-12-09.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
-support for the NotoSerif, NotoSans and NotoMono families of
-fonts, designed by Steve Matteson for Google.
+support for the NotoSerif, NotoSans and NotoSansMono
+families of fonts, designed by Steve Matteson for Google.
-To install this package on a TDS-compliant TeX system download the
-file "tex-archive"/install/fonts/noto.tds.zip, where the
-preferred URL for "tex-archive" is http://mirror.ctan.org. Unzip
-the archive at the root of an appropriate texmf tree, likely a
-personal or local tree. If necessary, update the file-name database
-(e.g., texhash). Update the font-map files by enabling the Map file
-noto.map.
+To install this package on a TDS-compliant TeX system
+download the file "tex-archive"/install/fonts/noto.tds.zip,
+where the preferred URL for "tex-archive" is
+http://mirror.ctan.org. Unzip the archive at the root of an
+appropriate texmf tree, likely a personal or local tree. If
+necessary, update the file-name database (e.g., texhash).
+Update the font-map files by enabling the Map file noto.map.
To use, add
@@ -18,7 +18,7 @@
to the preamble of your document. This will activate
NotoSerif as the main (serifed) text font, NotoSans as the
-sans font and NotoMono as the fixed-width font.
+sans font and NotoSansMono as the fixed-width font.
To activate NotoSerif without NotoSans, use
@@ -46,25 +46,30 @@
xeLaTeX users who might prefer type1 fonts or who wish to
avoid fontspec may use the type1 option. Use option nott to
avoid activating NotoMono as the fixed-width font.
-To active just NotoMono, use
+
+To active just NotoSansMono, use
\usepackage{noto-mono}
Options scaled=<number> or scale=<number> may be used to
-scale the NotoSans and NotoMono fonts; the serifed variants
-are not affected unless noto-serif is being used.
+scale the NotoSans and NotoSansMono fonts; the serifed
+variants are not affected unless noto-serif is being used.
-Font encodings supported are OT1, T1, LY1, LGR and TS1.
+Font encodings supported are OT1, T1, TS1, LY1, LGR and
+T2A/B/C.
-The following options
-may be used:
+The following options may be used:
pf proportional
osf oldstyle
lf lining
tf tabular
-The default figures are lining-tabular.
+The default figures are lining-tabular. NotoSansMono has
+only tabular figures.
+
+Superior numbers (for footnote markers) are available
+using \sufigures or \textsu{...}.
thin
extralight
@@ -81,15 +86,29 @@
The default bold weight is Bold.
+ condensed
+ semicondensed
+ extracondensed
+
+These are only effective for NotoSans and NotoSansMono.
+
+The mono family does not currently have italics.
+
Macros \notoserif, \notosans and \notomono select the
-NotoSerif, NotoSans and NotoMono families, respectively.
+NotoSerif, NotoSans and NotoMono families, respectively,
+and \notoseriflgr, \notosanslgr and \notomonolgr
+activate the LGR encoding.
+
+Macros \notosanscondensed, \notosanssemicondensed,
+\notosansextracondensed, \notomonocondensed,
+\notomonosemicondensed and \notomonoextracondensed
+select condensed weights for NotoSans or NotoSansMono.
The original fonts are available at
https://www.google.com/get/noto and are licensed under the
SIL Open Font License, (version 1.1); the text may be found
in the doc directory. The type1 versions were created using
-ccftot1; fontforge was used to generate bold and italic
-(i.e., oblique) variants of NotoMono. The support files were
-created using autoinst and are licensed under the terms of
-the LaTeX Project Public License. The maintainer of this
-package is Bob Tennent (rdt at cs.queensu.ca)
+ccftot1. The support files were created using autoinst and
+are licensed under the terms of the LaTeX Project Public
+License. The maintainer of this package is Bob Tennent (rdt
+at cs.queensu.ca)
Binary files old/doc/fonts/noto/noto-samples.pdf and new/doc/fonts/noto/noto-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/noto/noto-samples.tex new/doc/fonts/noto/noto-samples.tex
--- old/doc/fonts/noto/noto-samples.tex 2018-02-20 00:28:36.000000000 +0100
+++ new/doc/fonts/noto/noto-samples.tex 2019-05-23 22:51:17.000000000 +0200
@@ -1,9 +1,9 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-%\usepackage[osf,pf]{noto-mono}
-%\usepackage[osf,pf]{noto-sans}
-%\usepackage[osf,pf]{noto-serif}
-\usepackage[osf,pf]{noto}
+\usepackage[LGR,LY1]{fontenc}
+%\usepackage[osf]{noto-sans}
+%\usepackage[osf]{noto-serif}
+%\usepackage[osf]{noto-mono}
+\usepackage[osf]{noto}
\usepackage{lipsum}
\begin{document}
@@ -44,10 +44,23 @@
1234567890
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+
+\subsection*{LGR}
+
+{\notoseriflgr\noindent
+abgdezhjiklmnxoprstufqyw\\
+ABGDEZHJIKLMNXOPRSTUFQYW\\
+0123456789
+}
+
\section*{NotoSans}
-\sf
+\sffamily
\subsection*{Regular}
\lipsum[1]
@@ -84,28 +97,59 @@
1234567890
-\section*{NotoMono}
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+
+\subsection*{LGR}
-\tt
+{\notosanslgr\noindent
+abgdezhjiklmnxoprstufqyw\\
+ABGDEZHJIKLMNXOPRSTUFQYW\\
+0123456789
+}
+
+
+\section*{NotoSansMono}
+
+\ttfamily
\subsection*{Regular}
\lipsum[1]
-\subsection*{Italic}
-\textit{\lipsum[2]}
-
\subsection*{Bold}
-\textbf{\lipsum[3]}
+\textbf{\lipsum[2]}
+\subsection*{Regular Small Caps}
+\textsc{\lipsum[1]}
+\subsection*{Bold Small Caps}
-\subsection*{Bold Italic}
+\textsc{\textbf{\lipsum[3]}}
-\textbf{\textit{\lipsum[4]}}
\subsection*{Numbers}
1234567890
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+\subsection*{Mono Non-Ligatures}
+
+
+Officially broken off. Often offline, find me flowerless.
+
+
+\subsection*{LGR}
+
+{\notomonolgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+ 0 1 2 3 4 5 6 7 8 9
+}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noto.doc.tlpobj new/tlpkg/tlpobj/noto.doc.tlpobj
--- old/tlpkg/tlpobj/noto.doc.tlpobj 2019-03-16 02:23:57.000000000 +0100
+++ new/tlpkg/tlpobj/noto.doc.tlpobj 2020-03-24 02:00:59.000000000 +0100
@@ -1,9 +1,9 @@
name noto.doc
category Package
-revision 50401
+revision 54512
shortdesc doc files of noto
relocated 1
-docfiles size=36
+docfiles size=80
RELOC/doc/fonts/noto/LICENSE_OFL.txt
RELOC/doc/fonts/noto/README
RELOC/doc/fonts/noto/noto-samples.pdf
++++++ noto.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-q/noto.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/noto.tar.xz differ: char 25, line 1
++++++ novel.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/novel.doc.tlpobj new/tlpkg/tlpobj/novel.doc.tlpobj
--- old/tlpkg/tlpobj/novel.doc.tlpobj 2019-02-28 03:57:27.000000000 +0100
+++ new/tlpkg/tlpobj/novel.doc.tlpobj 2020-03-24 02:02:57.000000000 +0100
@@ -1,6 +1,6 @@
name novel.doc
category Package
-revision 47492
+revision 54512
shortdesc doc files of novel
relocated 1
docfiles size=1339
++++++ novel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/novel.tlpobj new/tlpkg/tlpobj/novel.tlpobj
--- old/tlpkg/tlpobj/novel.tlpobj 2019-02-28 03:57:29.000000000 +0100
+++ new/tlpkg/tlpobj/novel.tlpobj 2020-03-24 02:02:59.000000000 +0100
@@ -1,6 +1,6 @@
name novel
category Package
-revision 47492
+revision 54512
shortdesc Class for printing fiction, such as novels
relocated 1
longdesc This LuaLaTeX document class is specifically written to meet
@@ -33,7 +33,6 @@
RELOC/tex/lualatex/novel/novel-xmppacket.sty
RELOC/tex/lualatex/novel/novel.cls
catalogue-ctan /macros/luatex/latex/novel
-catalogue-date 2018-04-28 21:25:48 +0200
-catalogue-license lppl1.3cofl
+catalogue-license lppl1.3c ofl
catalogue-topics luatex production book-pub class
catalogue-version 1.52
++++++ npp-for-context.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/npp-for-context/LICENSE new/doc/context/third/npp-for-context/LICENSE
--- old/doc/context/third/npp-for-context/LICENSE 2018-03-28 01:08:46.000000000 +0200
+++ new/doc/context/third/npp-for-context/LICENSE 1970-01-01 01:00:00.000000000 +0100
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- {project} Copyright (C) {year} {fullname}
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum new/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum
--- old/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum 2018-04-04 09:10:40.000000000 +0200
+++ new/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum 2019-06-17 00:05:18.000000000 +0200
@@ -1 +1 @@
-9831f13c32798c44e83f007a996fb4550c219784bc493cfa0a3903d5fd6777bd Npp-for-ConTeXt.zip
+1ef7a3133cbde8a859af3ec594370567df76cbfc755a812f6a1278fa7059b67c *Npp-for-ConTeXt.zip
Binary files old/doc/context/third/npp-for-context/Npp-for-ConTeXt.zip and new/doc/context/third/npp-for-context/Npp-for-ConTeXt.zip differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/npp-for-context/README.md new/doc/context/third/npp-for-context/README.md
--- old/doc/context/third/npp-for-context/README.md 2018-04-04 09:10:40.000000000 +0200
+++ new/doc/context/third/npp-for-context/README.md 2019-06-17 00:05:18.000000000 +0200
@@ -177,6 +177,3 @@
have several ways to insert the same text. However, it's likely that in
a future release this will be simplified or streamlined.
-
-This package is released under the GPL: see the file LICENSE for the full
-text.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/npp-for-context.doc.tlpobj new/tlpkg/tlpobj/npp-for-context.doc.tlpobj
--- old/tlpkg/tlpobj/npp-for-context.doc.tlpobj 2019-02-28 03:57:30.000000000 +0100
+++ new/tlpkg/tlpobj/npp-for-context.doc.tlpobj 2019-06-17 01:39:04.000000000 +0200
@@ -1,10 +1,9 @@
name npp-for-context.doc
category Package
-revision 47282
+revision 51389
shortdesc doc files of npp-for-context
relocated 1
-docfiles size=690
- RELOC/doc/context/third/npp-for-context/LICENSE
+docfiles size=682
RELOC/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum
RELOC/doc/context/third/npp-for-context/Npp-for-ConTeXt.zip
RELOC/doc/context/third/npp-for-context/README.md
++++++ ntgclass.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/00readme.txt new/doc/latex/ntgclass/00readme.txt
--- old/doc/latex/ntgclass/00readme.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/00readme.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
- NTG document classes distribution
-
- 20 February 2004
-
-This file contains the distribution guide for the new version
-of the NTG document classes and the A4 package.
-The classes are maintained by NTG Working Group 13
-
-This distribution is described in the files ending with .txt.
-
- * 00readme.txt is this file.
-
- * manifest.txt lists all the files in the distribution.
-
-For more information about the document classes see the file
-ntgclass.tex.
-
-These files may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
-of this license or (at your option) any later version.
-The latest version of this license is in
- http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX
-version 2003/12/01 or later.
-
-Please do not request updates from us. Distribution is done only
-through mail servers and TeX organisations.
-
-
---- Copyright 1994-2004 NTG. All rights reserved ---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/CATALOG new/doc/latex/ntgclass/CATALOG
--- old/doc/latex/ntgclass/CATALOG 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/CATALOG 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,25 @@
+Name: ntgclass
+Problems-To: texniek(a)braams.texniek.nl
+Author: J.L. Braams and V. Eijkhout
+Version: 2.2-patch level 4
+
+Description:
+
+The ntgclass bundle provides a number of document classes that
+implement alternative layouts for the standard LaTeX document classes.
+These classes were originally developped by Victor Eijkhout and the
+NTG WG13.
+The classes provided are:
+artikel1, artikel2, artikel3; rapport1, rapport3; boek, boek3; brief.
+This bundle also includes the a4 package, originally written for
+LaTeX209 to support printing on A4 paper.
+
+Keywords: latex, document classes
+
+See-Also:
+
+Address:
+TeXniek
+Kersengaarde 33
+2723 BP Zoetermeer
+The Netherlands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/ChangeLog new/doc/latex/ntgclass/ChangeLog
--- old/doc/latex/ntgclass/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/ChangeLog 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,348 @@
+2020-02-22 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: The mechanism to work around the hyperref code
+ being injected int the tabel of contents lines needed to be
+ changed. There's a fourth token to jump over and the use of
+ \MakeUppercase instead of \uppercase in the toc-lines for parts
+ (rapport and boek classes) needed a different approach, made the
+ hyperref copmmand robust and protected it with \lowercase.
+
+2020-02-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * brief.dtx: Update to change copyright notice and address
+ information; synchronised with the standard document classes.
+
+ * a4.dtx: Update to change copyright notice and address
+ information.
+
+2020-02-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: Update to synchronize with classes.dtx
+
+2004-08-17 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: Various changes involving no longer passing
+ \toc@font and \toc@case settings through the .aux file because
+ they break when the hyperref package is used.
+ Fixed a bug in the toc-entry for \part: the spacing was wrong and
+ the pagenumber was put on a line by itself.
+
+2004-06-07 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx : updated version to 2.1a as 2.0z should be the
+ last, but no major changes, added a missing fix related to pr3285
+
+2004-02-20 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: various changes to sychronise with classes.dtx,
+ mostly fixes for Problem reports in the bugs database
+
+Tue Sep 9 00:43:15 1997 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx: Repaired a few documentation buglets.
+
+ * brief.dtx : Added a few extra command synonimes, suggested by
+ Wybo Dekker (wybo at servaly.hobby.nl)
+ (subsubsection{The address window}): Put the \textbullet in a
+ group to keep the font change local
+ (subsubsection{The little rules}): Make the rules slightly thinner
+ and modify their position a little
+ (subsubsection{Page breaking control}): Added a \leavevmode in
+ \@afsluiting to make \afsluiting work as documented.
+ (subsection{Footnotes}): The footnotemarker should appear
+ different in the text from in the footnotes themselves, changed
+ definition of \@makefntext and use default \@makefnmark
+
+Tue Apr 1 00:15:34 1997 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Footnotes}): Mixed the syntac for \def
+ and \newcommand (had #1 instead of [1]).
+ Found by Thorsten Schwander (schwander at ooo.lanl.gov)
+
+Sun Mar 2 00:17:17 1997 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{The title}): Use \textendash instead of
+ -- in label in footnotes on the titlepage.
+ (subsubsection{Itemize}): Now also \textasteriskcentered instead
+ of using math
+ (subsubsection{Equation and eqnarray}): Added test for chapter 0
+ in the definition of \theequation inb rapport and boek classes
+ (following classes.dtx)
+ (subsubsection{Figure}): Added test for chapter 0
+ (subsubsection{tabel}): Added test for chapter 0
+
+Mon Sep 23 23:12:21 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Itemize}): Replaced --, $\bullet$
+ and $\cdot$ with \text... commands, following a change in the
+ LaTeX classes.
+
+ * ntgclass.dtx (subsubsection{Itemize}): Replaced --, $\bullet$
+ and $\cdot$ with \text... commands, following a change in the
+ LaTeX classes.
+ (chapter*{...}): Changed \@xsect and \@ssect to follow a change in
+ the june 1996 release fo LaTeX which allows commands with an
+ argument in the last argument of \@sartsection.
+
+Mon Apr 1 19:26:32 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx : use \renewcommand rather than \newcommand to
+ define \newblock
+ (subsection{Font changing}): Removed suerfluous
+ closing braces
+ (subsection{Footnotes}): Repaired definition of \@xmakefntext (it
+ had #1 in a \newcommand
+
+ * brief.dtx (subsubsection{The address window}): Repaired a typo
+ (\parksip instead of \parskip
+
+Sun Mar 31 23:25:10 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx : Added \CodelineIndex to the driver in order
+ to really produce a .idx file for the index.
+
+Wed Mar 27 22:57:57 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dst: Update to make use of the new docstrip
+ possibillity to produce multiple files in one go.
+
+Wed Nov 29 00:19:36 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{The reference line}): Also set
+ \parindent to zero in \@refveld
+ (subsubsection{The address window}): Set both \parksip and
+ \parindent to zero inside the \adresveld
+
+Thu Oct 5 22:29:06 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{The title}): Disable some more of the
+ commands that are only needed for \maketitle; empty internal
+ storage macros.
+ (subsection{Open bibliography}): openbib option reimplemented
+ Brought in sinc again with classes.dtx
+
+Tue Aug 22 23:57:27 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx : Added missing braces around negative arguments to
+ \addpenalty; make l@part only do something when \c@tocdepthd>-2.
+
+Thu Aug 10 01:04:30 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx : Brought up-to-date with LaTeX's letter.dtx in order
+ to make the classes run with LaTeX <1995/06/01>
+
+ * ntgclass.dtx : Brought up-to-date with LaTeX's classes.dtx in
+ order to make the classes run with LaTeX <1995/06/01>
+
+Sun May 7 23:45:33 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Chapters and Sections}): Added \erlax
+ to the definition of \@svsec as a result of LaTeX pr/1596
+
+Fri Jan 6 14:09:51 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Chapters and Sections}): Changed
+ {\baselineskip\@plus... to
+ {1\baselineskip\@plus... in the defintion of \subsection and
+ \subsubsection in artikel2.
+ Found by Dick Snippe (D.M.Snippe at el.utwente.nl)
+ (subsubsection{Building blocks}): Use \protected@edef instead of
+ the juggling with redefining \protect.
+
+Sat Dec 31 16:31:12 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Page breaking control}): The printing
+ of the closing text generated an overfull hbox message. Removed
+ the extra \hbox (width \textwidth) inside the \parbox of width
+ .5\textwidth.
+
+Fri Dec 30 14:25:00 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsection{Words}): Repaired a small typo (a bracket
+ was used instead of a brace)
+
+ * ntgclass.dtx: Repaired a number of typos that prevented
+ artikel2.cls from functioning properly.
+
+ * brief.dtx (section{Executing Options}): Added a \relax after
+ \ProcessOptions to prevent the \ifcase to be `eaten' in the search
+ for a *.
+
+Fri Dec 23 21:48:47 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx: Use \newcommand* instead of \newcommand in most
+ places.
+ (subsection{Customizing the labels}): Redefined \mlabel to use the
+ new \parbox syntax instead of using the \setbox primitive.
+ (subsection{Font changing}): Define \cal and \mit using
+ \DeclareRobustCommand
+ (subsection{The generic letter commands}): Use
+ \let\protect\@unexpandable@protect instead of redefining it.
+
+ * ntgclass.dtx: More updates to go with the december 1994 release
+ of LaTeX.
+ - Made the oneside option work for the boek class (LaTeX PR
+ #1195)
+ (section{Initial Code}): Moved the allocation of
+ \if@mainmatter to this section in order to let it be known when
+ the pagestyles are defined. The switch is used there and needs to
+ be known then; otherwise TeX finds the wrong \fi in an
+ \if@twoside...\else...\fi construct.
+
+Tue Dec 20 01:52:12 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx: Updates to go with the december 1994 release of
+ LaTeX.
+ - Use \newcommand* cs.
+ - Set the \@minipage flag in the caption
+ (subsubsection{Margins}): Moved the rounding of \topmargin into
+ native mode only (LaTeX PR #93)
+ (section{Cross Referencing}): Fixed a typo in the documentation of
+ \@tocrmarg. (LaTeX PR #904)
+ (subsection{Single or double sided printing}): removed typo (LaTeX
+ PR #881)
+ (subsubsection{Chapters}): Made chapter titles more robust against
+ pagebreaks in the middle of them. Added an extra \nobreak but not
+ the extra \interlinepenalty\@M lines as that is taken care of by
+ \head@style (LaTeX PR #1016, #1135)
+ (subsection{Font changing}): Define \cal and \mit using
+ \DeclareRobustCommand
+ (the driver): use \newcommand* for shorthands with argument
+ (whole file): Use \newcommand* for commands with arguments
+
+Tue Oct 4 00:12:26 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (section{The documentation driver file}): Added a
+ missing comma in the \DoNotIndex list
+
+Tue Jul 12 22:45:13 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Defining the page styles}): Removed the
+ typo in \@othertheadheight
+
+Mon Jul 11 23:25:48 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Itemize}): \labelitemiii was
+ mistakenly called \labelitemiiii (LaTeX bug report # 711)
+
+ * ntgclass.dtx (subsection{Paragraphing}): The definition of the
+ dimension \othermargin was erroneously left out of type2 document
+ classes.
+ (subsection{Footnotes}): Moved the `.' that appeared in the
+ definition of \@xmakefntext to the definition of \@makefntext.
+ This should prevent it from appearing in a footnote produced by
+ \thanks.
+
+Wed Jun 15 22:19:45 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (section{The documentation driver file}): Reorder the
+ DoNotIndex list. Removed remnant from letter.dtx, now get the
+ file info from bief.dtx and also typeset brief.dtx instead of
+ trying to typeset letter.dtx.
+
+
+Wed Jun 8 13:16:41 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (section{The documentation driver file}): The
+ documentation didn't run; had to shuffle some entries in
+ \DoNotIndex lines.
+
+ * artdoc.tex (subsection{Fonts in sectiekoppen}): Added a missing
+ brace
+
+ * ntgclass.dtx (subsubsection{Chapters}): Removed yet another
+ carriage return that caused \if@mainmatter to end up in the
+ rapport classes.
+
+Mon Jun 6 00:03:19 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsection{Global Declarations}): Using \newcommand
+ for internal storage macros causes the test against \@empty to
+ fail; a nempty long macro is not the same as an empytt macro. This
+ happened to \fromsig and \@subject.
+
+Fri Jun 3 14:25:27 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsubsection{Chapters}): Removed a carriage
+ return behind %<+boek> which caused \f@mainmatter to end up in the
+ rapport classes.
+
+ * brief.dtx: Finished upgrading for LaTeX2e
+
+ * briefdoc.tex: Updated for latex2e and the use of the babel
+ package. Contents may not be correct with the new version of the
+ code.
+
+ * rapdoc.tex: Updated for latex2e and the use of the babel
+ package. Contents may not be correct with the new version of the
+ code.
+
+ * artdoc.tex: Updated for latex2e and the use of the babel
+ package. Contents may not be correct with the new version of the
+ code.
+
+Fri Jun 3 00:27:27 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (section{Identification}): The size files claimed
+ to have a name that starts with `size'; changed to `ntg'.
+
+ * ntgclass.dst: Added the stripping of brief.
+
+Thu Jun 2 00:30:21 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{The title}): Added check on number of
+ columns in use locally
+ (section{Identification}): Fixed bug that prevented LaTeX from
+ seeing the \ProvideFile command in the driver
+
+Wed Jun 1 14:15:21 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx: Added \Charactertable
+ Moved the identification and driver sections to the start of the
+ file; they no longer print.
+ Added 'v' to changes entries; wrapped some long lines.
+ (subsubsection{Captions}): Use \sbox\@tempboxa instead of
+ \setbox\@tempboxa\hbox to make @makecaption color safe.
+ (subsection{The title}): The boek classes always havve a
+ titlepage, forgot to remove the code for the \else part of
+ \if@titlepage.
+ (section*{\contentsname): Added a missing backslash
+
+Mon Apr 18 12:45:43 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Fonts}): The size changing commands are
+ no longer defined in the kernel. Use \newcommand instead of
+ \renewcommand.
+ (subsection{Font changing}): \@renewfontswitch has gone;
+ \@newfontswitch has become \DeclareOldFontCommand
+ Synchronized with the changes to classes.dtx
+
+Sun Mar 20 00:53:17 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dst: Removed production of the documentation driver.
+
+ * ntgclass.dtx (section{Identification}): Removed the use of
+ \typeout statements as \Provides... does that now.
+ (section{The {\sc docstrip} modules}): This section added.
+ (section{The documentation driver file}): Moved this section to
+ the front in order not to need a searate driver.
+
+Sat Mar 19 17:40:24 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsubsection{Captions}): The \CaptionLabelFont
+ shouldn't influence the font in which the caption text comes out.
+ PUt a group around the label.
+
+ * ntgclass.dst: Removed \TopLevel, a remnant from classes.dst
+
+ * ntgclass.dtx (subsubsection{Abstract}): Treat the abstract like
+ a section and use \SectFont for the title.
+
+Tue Mar 15 11:54:32 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * a4.dtx (subsection{The code}): The name of a package and the
+ name of the file should be the same.
+
+ (subsection{The code}): Added \ProcessOptions and moved it to the
+ end of the package.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/MANIFEST new/doc/latex/ntgclass/MANIFEST
--- old/doc/latex/ntgclass/MANIFEST 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/MANIFEST 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,50 @@
+%
+% CONTENTS OF THE NTG DOCUMENT CLASSES DISTRIBUTION
+% =================================================
+%
+% Documentation:
+% --------------
+%
+% 00readme.txt -- The distribution guide.
+% manifest.txt -- This file.
+% changes.txt -- List of changes in reverse chronological order.
+% catalog.txt -- A short description for the macro catalog.
+%
+% artdoc.tex -- A description of the artikel classes, in dutch
+% artdoc.pdf
+% briefdoc.tex -- A description of the brief class, in dutch
+% briefdoc.pdf
+% rapdoc.tex -- A description of the rapport classes, in dutch
+% rapdoc.pdf
+% classdoc.tex -- A description of the document classes, in english
+% classdoc.pdf
+%
+%
+% Classes:
+% --------
+%
+% ntgclass.dtx -- NTG document classes artikel1,2,3/boek,boek3/rapport1,3.
+% ntgclass.pdf
+% brief.dtx -- NTG document class brief
+% brief.pdf
+%
+% Classes:
+% --------
+%
+% a4.dtx -- The package a4 from NTG/WG13 (Braams, Poppelier)
+% a4.pdf
+%
+% Installation script for the various parts:
+% -------------------------------------------
+%
+% a4.ins -- installation script for the a4 package
+% ntgclass.ins -- NTG document classes installation script
+%
+%
+% Support files:
+% --------------
+%
+% brief-sample.tex -- A document showing the layout of the NEN-brief
+% implemented by brief.dtx
+% brief-sample.pdf
+%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/README new/doc/latex/ntgclass/README
--- old/doc/latex/ntgclass/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/README 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,28 @@
+ NTG document classes distribution
+
+ 22 February 2020
+
+This file contains the distribution guide for the new version
+of the NTG document classes and the A4 package.
+The classes are maintained by NTG Working Group 13
+
+ * README is this file.
+
+ * MANIFEST lists all the files in the distribution.
+
+For more information about the document classes see the file
+ntgclass.tex.
+
+These files may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008 or later.
+
+Please do not request updates from us. Distribution is done only
+through mail servers and TeX organisations.
+
+
+--- Copyright 1994-2020 NTG. All rights reserved ---
Binary files old/doc/latex/ntgclass/a4.pdf and new/doc/latex/ntgclass/a4.pdf differ
Binary files old/doc/latex/ntgclass/artdoc.pdf and new/doc/latex/ntgclass/artdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/artdoc.tex new/doc/latex/ntgclass/artdoc.tex
--- old/doc/latex/ntgclass/artdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/artdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It may be distributed and/or modified under the
-% % conditions of the LaTeX Project Public License, either version 1.3
-% % of this license or (at your option) any later version.
-% % The latest version of this license is in
-% % http://www.latex-project.org/lppl.txt
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[a4paper]{artikel1} %ja,ja, onze eigen documentstijl!
\usepackage[dutch]{babel}
Binary files old/doc/latex/ntgclass/brief-sample.pdf and new/doc/latex/ntgclass/brief-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/brief-sample.tex new/doc/latex/ntgclass/brief-sample.tex
--- old/doc/latex/ntgclass/brief-sample.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/brief-sample.tex 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,199 @@
+\documentclass{brief} %% er is een optie 'adresrechts'
+
+%\maaketiketten %% werkt nog niet naar behoren
+
+\begin{document}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%% briefhoofd %%%%%%%%%%%%%%%%%%%%%%%%%%
+% De gebruiker wordt geacht zijn eigen \briefhoofd te definieren,
+% of voorgedrukt briefpapier te gebruiken,
+% maar hij kan een redelijk standaard hoofd aangemeten krijgen
+% door \maakbriefhoofd.
+\maakbriefhoofd{WG 13}{Werkgroep 13\\ de De Facto Standaard
+ \\ in Nederlandse \TeX pertise}
+
+% De PTT staat toe dat boven in het venster klein (5 a 6 punt)
+% een antwoordadres gedrukt wordt. Het hoeft natuurlijk niet.
+% En svp alleen voor binnenlands gebruik.
+\antwoordadres{Toernooiveld 5, \\ 6525 ED Nijmegen}
+
+%%%%%%%%%%%%%%%%%%% de referentieregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\uwbriefvan{13 januari 1988} % vier gegevens in de referentieregels
+\datum{8 october 1989} % hier mist alleen de 'uwkenmerk'
+\onskenmerk{VE-NTG 002} % volgorde en plaatsing ligt vast
+% datum wordt automatisch ingevuld wanneer niet gespecificeerd
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%% voetregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% maximaal vier gegevens, de gebruiker specificeert zowel het
+% kopje, als wat er onder komt. Gegevens worden geplaatst in de
+% opgegeven volgorde.
+\voetitem{fax:}{12345 abc}
+\voetitem{telefoon:}{080-613169}
+\voetitem{telefoon \\ priv\'e:}{080-448664}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% de brief zelf %%%%%%%%%%%%%%%%%%%%%%%%%%
+% bijna zoals in 'letter.sty', alleen zijn de commando's
+% nu in de nederlandse taal.
+\begin{brief}{Werkgroep 13\\Nederlandse \TeX\ groep\\Nederland}
+
+\betreft{nieuwe briefstijl}
+\opening{Hallo volkjes,}
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+\ondertekening{Victor Eijkhout \\ co\"ordinator \en Johannes Braams \\ lid
+ \en Nico Poppelier \\ lid}
+\afsluiting{Hoogachtend,\\ Werkgroep 13}
+
+\bijlagen{De broncode van deze brief}
+\cc{Stichting `de Kettingbrief'}
+\ps{PS: panta rei}
+
+
+\end{brief}
+
+%\end{document} %% hier stoppen, behalve als je 'maaketiketten'
+ %% wil testen.
+
+\onskenmerk{VE-JD1}
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\onskenmerk{VE-JD2}
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\end{document}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\end{document}
Binary files old/doc/latex/ntgclass/brief.pdf and new/doc/latex/ntgclass/brief.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/brief.tex new/doc/latex/ntgclass/brief.tex
--- old/doc/latex/ntgclass/brief.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/brief.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,229 +0,0 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It may be distributed and/or modified under the
-% % conditions of the LaTeX Project Public License, either version 1.3
-% % of this license or (at your option) any later version.
-% % The latest version of this license is in
-% % http://www.latex-project.org/lppl.txt
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
-\documentclass{brief} %% er is een optie 'adresrechts'
-
-%\maaketiketten %% werkt nog niet naar behoren
-
-\begin{document}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%% briefhoofd %%%%%%%%%%%%%%%%%%%%%%%%%%
-% De gebruiker wordt geacht zijn eigen \briefhoofd te definieren,
-% of voorgedrukt briefpapier te gebruiken,
-% maar hij kan een redelijk standaard hoofd aangemeten krijgen
-% door \maakbriefhoofd.
-\maakbriefhoofd{WG 13}{Werkgroep 13\\ de De Facto Standaard
- \\ in Nederlandse \TeX pertise}
-
-% De PTT staat toe dat boven in het venster klein (5 a 6 punt)
-% een antwoordadres gedrukt wordt. Het hoeft natuurlijk niet.
-% En svp alleen voor binnenlands gebruik.
-\antwoordadres{Toernooiveld 5, \\ 6525 ED Nijmegen}
-
-%%%%%%%%%%%%%%%%%%% de referentieregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\uwbriefvan{13 januari 1988} % vier gegevens in de referentieregels
-\datum{8 october 1989} % hier mist alleen de 'uwkenmerk'
-\onskenmerk{VE-NTG 002} % volgorde en plaatsing ligt vast
-% datum wordt automatisch ingevuld wanneer niet gespecificeerd
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%% voetregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% maximaal vier gegevens, de gebruiker specificeert zowel het
-% kopje, als wat er onder komt. Gegevens worden geplaatst in de
-% opgegeven volgorde.
-\voetitem{fax:}{12345 abc}
-\voetitem{telefoon:}{080-613169}
-\voetitem{telefoon \\ priv\'e:}{080-448664}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% de brief zelf %%%%%%%%%%%%%%%%%%%%%%%%%%
-% bijna zoals in 'letter.sty', alleen zijn de commando's
-% nu in de nederlandse taal.
-\begin{brief}{Werkgroep 13\\Nederlandse \TeX\ groep\\Nederland}
-
-\betreft{nieuwe briefstijl}
-\opening{Hallo volkjes,}
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-\ondertekening{Victor Eijkhout \\ co\"ordinator \en Johannes Braams \\ lid
- \en Nico Poppelier \\ lid}
-\afsluiting{Hoogachtend,\\ Werkgroep 13}
-
-\bijlagen{De broncode van deze brief}
-\cc{Stichting `de Kettingbrief'}
-\ps{PS: panta rei}
-
-
-\end{brief}
-
-%\end{document} %% hier stoppen, behalve als je 'maaketiketten'
- %% wil testen.
-
-\onskenmerk{VE-JD1}
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\onskenmerk{VE-JD2}
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\end{document}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\end{document}
Binary files old/doc/latex/ntgclass/briefdoc.pdf and new/doc/latex/ntgclass/briefdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/briefdoc.tex new/doc/latex/ntgclass/briefdoc.tex
--- old/doc/latex/ntgclass/briefdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/briefdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It may be distributed and/or modified under the
-% % conditions of the LaTeX Project Public License, either version 1.3
-% % of this license or (at your option) any later version.
-% % The latest version of this license is in
-% % http://www.latex-project.org/lppl.txt
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[a4paper,10pt]{artikel1}
\usepackage[dutch]{babel}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/catalog.txt new/doc/latex/ntgclass/catalog.txt
--- old/doc/latex/ntgclass/catalog.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/catalog.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-Name: ntgclass
-Problems-To: JLBraams(a)cistron.nl
-Author: J.L. Braams and V. Eijkhout
-Version: 2.2-patch level 3
-
-Description:
-
-The ntgclass bundle provides a number of document classes that
-implement alternative layouts for the standard LaTeX document classes.
-These classes were originally developped by Victor Eijkhout and the
-NTG WG13.
-The classes provided are:
-artikel1, artikel2, artikel3; rapport1, rapport3; boek, boek3; brief.
-This bundle also includes the a4 package, originally written for
-LaTeX209 to support printing on A4 paper.
-
-Keywords: latex, document classes
-
-See-Also:
-
-Address:
-J.L. Braams
-Kooienswater 62
-2715 AJ Zoetermeer
-The Netherlands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/changes.txt new/doc/latex/ntgclass/changes.txt
--- old/doc/latex/ntgclass/changes.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/changes.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-
-This file lists changes to the NTG files in reverse chronological order.
-========================================================================
-
-
Binary files old/doc/latex/ntgclass/classdoc.pdf and new/doc/latex/ntgclass/classdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/classdoc.tex new/doc/latex/ntgclass/classdoc.tex
--- old/doc/latex/ntgclass/classdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/classdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It may be distributed and/or modified under the
-% % conditions of the LaTeX Project Public License, either version 1.3
-% % of this license or (at your option) any later version.
-% % The latest version of this license is in
-% % http://www.latex-project.org/lppl.txt
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[a4paper,10pt]{artikel1} % or just 'article'
\usepackage{shortvrb}
\newcommand\Lopt[1]{\textsf{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/manifest.txt new/doc/latex/ntgclass/manifest.txt
--- old/doc/latex/ntgclass/manifest.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-%
-% CONTENTS OF THE NTG DOCUMENT CLASSES DISTRIBUTION
-% =================================================
-%
-% Documentation:
-% --------------
-%
-% 00readme.txt -- The distribution guide.
-% manifest.txt -- This file.
-% changes.txt -- List of changes in reverse chronological order.
-% catalog.txt -- A short description for the macro catalog.
-%
-% artdoc.tex -- A description of the artikel classes, in dutch
-% artdoc.pdf
-% briefdoc.tex -- A description of the brief class, in dutch
-% briefdoc.pdf
-% rapdoc.tex -- A description of the rapport classes, in dutch
-% rapdoc.pdf
-% classdoc.tex -- A description of the document classes, in english
-% classdoc.pdf
-%
-% Classes:
-% --------
-%
-% ntgclass.dtx -- NTG document classes artikel1,2,3/boek,boek3/rapport1,3.
-% ntgclass.pdf
-% brief.dtx -- NTG document class brief
-% brief.pdf
-%
-% Classes:
-% --------
-%
-% a4.dtx -- The package a4 from NTG/WG13 (Braams, Poppelier)
-% a4.pdf
-%
-% Installation script for the various parts:
-% -------------------------------------------
-%
-% a4.ins -- installation script for the a4 package
-% ntgclass.ins -- NTG document classes installation script
-%
-%
-% Support files:
-% --------------
-%
-% brief.tex -- A sample file with three letters
-%
Binary files old/doc/latex/ntgclass/ntgclass.pdf and new/doc/latex/ntgclass/ntgclass.pdf differ
Binary files old/doc/latex/ntgclass/rapdoc.pdf and new/doc/latex/ntgclass/rapdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/rapdoc.tex new/doc/latex/ntgclass/rapdoc.tex
--- old/doc/latex/ntgclass/rapdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/rapdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It may be distributed and/or modified under the
-% % conditions of the LaTeX Project Public License, either version 1.3
-% % of this license or (at your option) any later version.
-% % The latest version of this license is in
-% % http://www.latex-project.org/lppl.txt
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[oldtoc,a4paper,10pt]{rapport3}
\usepackage[dutch]{babel}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ntgclass.doc.tlpobj new/tlpkg/tlpobj/ntgclass.doc.tlpobj
--- old/tlpkg/tlpobj/ntgclass.doc.tlpobj 2019-02-28 03:57:31.000000000 +0100
+++ new/tlpkg/tlpobj/ntgclass.doc.tlpobj 2020-02-25 01:54:53.000000000 +0100
@@ -1,22 +1,23 @@
name ntgclass.doc
category Package
-revision 15878
+revision 53882
shortdesc doc files of ntgclass
relocated 1
-docfiles size=313
- RELOC/doc/latex/ntgclass/00readme.txt
+docfiles size=482
+ RELOC/doc/latex/ntgclass/CATALOG
+ RELOC/doc/latex/ntgclass/ChangeLog
+ RELOC/doc/latex/ntgclass/MANIFEST
+ RELOC/doc/latex/ntgclass/README
RELOC/doc/latex/ntgclass/a4.pdf
RELOC/doc/latex/ntgclass/artdoc.pdf
RELOC/doc/latex/ntgclass/artdoc.tex
+ RELOC/doc/latex/ntgclass/brief-sample.pdf
+ RELOC/doc/latex/ntgclass/brief-sample.tex
RELOC/doc/latex/ntgclass/brief.pdf
- RELOC/doc/latex/ntgclass/brief.tex
RELOC/doc/latex/ntgclass/briefdoc.pdf
RELOC/doc/latex/ntgclass/briefdoc.tex
- RELOC/doc/latex/ntgclass/catalog.txt
- RELOC/doc/latex/ntgclass/changes.txt
RELOC/doc/latex/ntgclass/classdoc.pdf
RELOC/doc/latex/ntgclass/classdoc.tex
- RELOC/doc/latex/ntgclass/manifest.txt
RELOC/doc/latex/ntgclass/ntgclass.pdf
RELOC/doc/latex/ntgclass/rapdoc.pdf
RELOC/doc/latex/ntgclass/rapdoc.tex
++++++ ntgclass.tar.xz ++++++
++++ 2444 lines of diff (skipped)
++++++ nwejm.doc.tar.xz ++++++
++++ 2265 lines of diff (skipped)
++++++ nwejm.tar.xz ++++++
++++ 2856 lines of diff (skipped)
++++++ oberdiek.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-q/oberdiek.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/oberdiek.doc.tar.xz differ: char 25, line 1
++++++ oberdiek.tar.xz ++++++
++++ 73990 lines of diff (skipped)
++++++ ocgx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx.doc.tlpobj new/tlpkg/tlpobj/ocgx.doc.tlpobj
--- old/tlpkg/tlpobj/ocgx.doc.tlpobj 2019-02-28 03:57:50.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx.doc.tlpobj 2020-03-24 02:02:59.000000000 +0100
@@ -1,6 +1,6 @@
name ocgx.doc
category Package
-revision 28492
+revision 54512
shortdesc doc files of ocgx
relocated 1
docfiles size=253
++++++ ocgx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx.tlpobj new/tlpkg/tlpobj/ocgx.tlpobj
--- old/tlpkg/tlpobj/ocgx.tlpobj 2019-02-28 03:57:51.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx.tlpobj 2020-03-24 02:03:00.000000000 +0100
@@ -1,6 +1,6 @@
name ocgx
category Package
-revision 28492
+revision 54512
shortdesc Use OCGs within a PDF document without JavaScript
relocated 1
longdesc The package extends the ocg package, which allows you to create
@@ -16,7 +16,6 @@
RELOC/tex/latex/ocgx/tikzlibraryocgx.code.tex
catalogue-also asymptote
catalogue-ctan /macros/latex/contrib/ocgx
-catalogue-date 2016-12-28 10:23:26 +0100
-catalogue-license lppllppl
+catalogue-license lppl lppl
catalogue-topics pdf-feat
catalogue-version 0.5
++++++ ocgx2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/ChangeLog new/doc/latex/ocgx2/ChangeLog
--- old/doc/latex/ocgx2/ChangeLog 2019-01-02 23:38:58.000000000 +0100
+++ new/doc/latex/ocgx2/ChangeLog 2019-11-10 23:11:28.000000000 +0100
@@ -1,3 +1,44 @@
+2019-11-07
+ * v0.48: ocgx2.sty
+ * fix: link-making commands failed with empty option arg
+
+2019-11-04
+ * v0.47: ocgx2.sty
+ * v0.17: ocgbase.sty
+ * fix: output driver set-up
+
+2019-10-01
+ * v0.46: ocgx2.sty
+ * fix: 2020 deprecations (fixocgx.sty)
+
+2019-09-19
+ * v0.45: ocgx2.sty
+ * new: using comma for separating OCG ids in \showocg, \hideocg etc.; <space>
+ still accepted for compatibility with ocgx/ocg-p
+
+2019-09-17
+ * v0.44: ocgx2.sty
+ * fix: wrong visibility of reopened ocg (introduced in v0.41)
+
+2019-07-04
+ * v0.43: ocgx2.sty
+ * v0.16: ocgbase.sty
+ * fix: ocmd-related refactoring; now, \ocgbase@insert@oc takes into account
+ open OCMD layers;
+ * new: OCMD visibility expressions also accept references to other ocmd
+
+2019-05-28
+ * v0.42: ocgx2.sty
+ * new: `ocmd' TikZ style added; option `radiobtngrp' renamed to
+ `radiobtngrps' and accepting multiple RB group names passed as a
+ comma-separated list (`radiobtngrp' still available as an alias)
+
+2019-05-24
+ * v0.41: ocgx2.sty
+ * v0.15: ocgbase.sty
+ * new: `ocmd' environment (PDF Optional content membership dictionary)
+ * fix: passing driver options to expl3
+
2019-01-02
* v0.40: ocgx2.sty
* fix: merge request incorporated (latex3 end-of-2018 deprecations)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/README.txt new/doc/latex/ocgx2/README.txt
--- old/doc/latex/ocgx2/README.txt 2019-01-02 23:38:58.000000000 +0100
+++ new/doc/latex/ocgx2/README.txt 2019-09-19 22:44:28.000000000 +0200
@@ -24,15 +24,17 @@
To enable dvipdfmx support, pass `dvipdfmx' globally as a class option.
Also, it adds some minor improvements and bug fixes, such as package
-options, remembering option settings of re-opened ocgs, correct behaviour
+options, remembering option settings of re-opened OCGs, correct behaviour
of layer switching links that were themselves placed on layers, correct
-listing of (nested) ocgs in the layers tab of PDF viewers, compatibility
+listing of (nested) OCGs in the layers tab of PDF viewers, compatibility
with the `animate' and `media9' packages.
* New features:
+ PDF layers extending over page breaks
- + grouping PDF layers into Radio Button Groups
+ + OCMDs (Optional Content Membership Dictionaries) for creating layers
+ with complex visibility dependency
+ + grouping OCGs into Radio Button Groups
+ additional keys for the TikZ interface of package `ocgx'
+ re-implementing `hyperref's `ocgcolorlinks' option for creating
OCG coloured links, which are printed on paper in the default
@@ -43,49 +45,116 @@
2. Usage
========
-\usepackage[<options>]{ocgx2}
+ \usepackage[<options>]{ocgx2}
-\begin{ocg}[<options>]{<layer name>}{<layer id>}{<initial visibility>}
- ... material to be put on a PDF layer ...
-\end{ocg}
+ \begin{ocg}[<options>]{<layer name>}{<OCG id>}{<initial visibility>}
+ ... material to be put on a PDF layer ...
+ \end{ocg}
-With <initial visibility> = ( on | true | 1 ) | ( off | false | 0 )
+<layer name> is the name shown in the PDF viewer's "Layers" panel,
+<OCG id> is an identifier used for referencing the layer elsewhere in the
+document (e. g. layer switching buttons, visibility configuration of an `ocmd'
+environment, re-opening the OCG at another place using the `ocg' environment).
-and <options> : viewocg = always | never | ifvisible
- printocg = always | never | ifvisible
- exportocg = always | never | ifvisible
+<initial visibility> is `on', `true', `1' or `off', `false', `0'.
- not in ocgx, ocg-p:
+ \begin{ocmd}[<OCMD id>]{[<visibility policy>][,<visibility expression>]}
+ ... material to be put on a PDF layer ...
+ visibility calculated by <visibility expression> (Boolean expression) from
+ other OCGs visibility, or according to <visibility policy>
+ \end{ocmd}
- showingui (to be preferred over `listintoolbar' of ocgx/ocg-p)
- radiobtngrp = <group name> (string; environment-only option)
- tikz (package-only option)
- ocgcolorlinks (package-only option)
+Package and `ocg' environment options:
+
+ viewocg = always | never | ifvisible
+ printocg = always | never | ifvisible
+ exportocg = always | never | ifvisible
+
+ not in ocgx, ocg-p:
+
+ showingui (to be preferred over `listintoolbar' of ocgx/ocg-p)
+ radiobtngrps = {<group name 1>[,<group name 2>[, ...]]}
+
+ tikz (package-only option)
+ ocgcolorlinks (package-only option)
Package options have global scope. Environment options override package
options locally.
-Layers can be added to one or several Radio Button Groups using the new
-option `radiobtngrp'. From all layers within a Radio Button Group only
-one can be enabled at a time. Enabling a layer, e. g. in the Layers tab
-of the PDF viewer, automatically hides the previously visible layer.
-Option `radiobtngrp' can be used repeatedly for the same OCG in order
-to add the layer to more than one Radio Button Group.
+OCGs can be added to one or multiple Radio Button Groups using the new
+option `radiobtngrps'. From all OCGs within a Radio Button Group only _one_
+can be enabled at a time. Enabling an OCG, e. g. in the Layers tab of the PDF
+viewer, automatically hides the previously visible OCG in the group. An OCG
+can be added to multiple Radio Button Groups, passing a comma-separated list of
+group names. Such a list must be enclosed in braces, `{...}'.
-`ocg' environments can be nested and span multiple pages.
+`ocg' as well as `ocmd' environments can be nested and span multiple pages.
See the `ocg-p' manual about the environment usage and the meaning of
the remaining options:
texdoc ocg-p
-Clickable links for switching PDF layer visibility are created with:
- \switchocg[<trigger>]{<layer IDs to toggle, space separated>}{<link text>}
- \showocg[<trigger>]{<layer IDs to switch ON, space separated>}{<link text>}
- \hideocg[<trigger>]{<layer IDs to switch OFF, space separated>}{<link text>}
- \actionsocg[<trigger>]{<IDs to toggle>}{<IDs to switch ON>}{<IDs to switch OFF>}{<link text>}
+3. The `ocmd' environment (Optional Content Membership Dictionary)
+==================================================================
+
+ \begin{ocmd}[<OCMD id>]{[<visibility policy>][,<visibility expression>]}
+ ... material to be put on a PDF layer ...
+ \end{ocmd}
+
+This environment creates a PDF layer whose visibility is determined by the
+current visibilities of other OCGs in the document according to at most one
+visibility policy plus at most one visibility expression. If both are given
+(with a comma in between) `<visibility expression>' takes precedence over
+`<visibility policy>', but the latter may serve as a fallback in older PDF
+viewers.
+
+`<OCMD id>' is an optional identifier which can be used to re-open the same
+layer with the same visibility setting at another place further down in the
+document.
+
+A `<visibility policy>' can be _one_ of
+
+ \AllOn{<OCG id 1>, <OCG id 2>, ...}
+ \AnyOn{<OCG id 1>, <OCG id 2>, ...}
+ \AnyOff{<OCG id 1>, <OCG id 2>, ...}
+ \AllOff{<OCG id 1>, <OCG id 2>, ...}
+
+All four directives take a list of OCG ids from wich the OCMD visibility is
+calculated. If the condition represented by the policy is met, the content
+associated with the OCMD is shown. The listed OCGs can be defined anywhere in
+the document. These directives can neither be combined nor nested in order to
+define the policy. Thus, a visibility policy has limited capabilities.
+
+A `<visibility expression>' is much more flexible than a policy. Arbitrarily
+complex visibility relationships can be formulated, based on the Boolean
+functions
+
+ \And{<item a>, <item b>, ...}
+ \Or{<item i>, <item j>, ...}
+ \Not{<item n>}
+
+In the argument list, items represent OCG/OCMD ids as well as nested Boolean
+functions. As nesting of the three functions is possible, any thinkable
+visibility relationship can be defined. Note that `\Not{...}' accepts only one
+item, either an OCG/OCMD id or a nested function. Also note that Boolean functions
+and policy directives cannot be intermixed.
+
+As a trivial example, the visibility expression equivalent of the policy
+directive `\AllOff{...}' is written as `\Not{ \Or{ ... } }'.
+
+
+4. Clickable links for switching PDF layer visibility
+=====================================================
+
+The available commands are
+
+ \switchocg[<trigger>]{<OCG ids to toggle, comma-separated>}{<link text>}
+ \showocg[<trigger>]{<OCG ids to switch ON, comma-separated>}{<link text>}
+ \hideocg[<trigger>]{<OCG ids to switch OFF, comma-separated>}{<link text>}
+ \actionsocg[<trigger>]{<ids to toggle>}{<ids to switch ON>}{<ids to switch OFF>}{<link text>}
For details about their usage, read the `ocgx' package manual:
@@ -98,16 +167,21 @@
onmousenter, onmouseexit, onmousedown, onmouseup, onmouseall
for <trigger>. In order to listen to more than one mouse event, use
-`onmouseall'. Layer IDs in the mandatory argument(s) must then be grouped with
-commas as follows:
+`onmouseall'. Layer ids in the mandatory argument(s) must then be grouped with
+braces and commas as follows:
- <mouse-enter group>, <mouse-exit group>, <mouse-down group>, <mouse-up group>
+ {<mouse-enter group>}, {<mouse-exit group>}, {<mouse-down group>}, {<mouse-up group>}
Any of these groups may be left empty in order to configure only some
-mouse triggers. Inside the groups, layer IDs are separated by space.
+mouse triggers. Inside the groups, OCG ids are also separated by commas.
+Therefore, braces must be put around the groups. For example:
+
+ \switchocg[onmouseall]{
+ , , {ocg1, ocg2, ocg3, ocg4}, {ocg1, ocg2, ocg3, ocg4}
+ }{Toggle layers on mouse-down and -up}
-3. Package option `ocgcolorlinks'
+5. Package option `ocgcolorlinks'
=================================
Is a re-implementation of the same `hyperref' option for creating OCG-
@@ -133,7 +207,7 @@
\ocglinkprotect{\includegraphics{ctan-lion}}!}
-4. Usage with TikZ
+5. Usage with TikZ
==================
`ocgx2' uses code from file `tikzlibraryocgx.code.tex' by P. Gaborit to
@@ -154,13 +228,35 @@
texdoc ocgx
-The key `/tikz/ocg/opts' was added to the list in section
-`How to add TikZ scopes into OCGs' in the `ocgx' manual:
+Package `ocgx2' adds the key `/tikz/ocg/opts' to the list in section ``How to
+add TikZ scopes into OCGs'" in the `ocgx' manual:
+
+ /tikz/ocg/opts={<OCG options>}
+
+It can be used inside the `ocg' style
- /tikz/ocg/opts={<ocg options>}
+ \begin{scope}[
+ ocg={ref=..., name=..., opts={..., ...}},
+ ...
+ ]
+ ...
+ \end{scope}
+
+and allows passing `ocg'-environment options (`viewocg', `printocg', `exportocg',
+`showingui', `radiobtngrps') to the TikZ scope.
+
+The style `ocmd={...}' is another way for turning a TikZ scope into a PDF
+layer (in addition to `ocg={...}'). It has two sub-keys, `ref={...}' and
+`visibility={...}', which have the same meaning as the optional and the
+mandatory arguments of the `ocmd' environment:
+
+ \begin{scope}[
+ ocmd={ref=..., visibility=...},
+ ...
+ ]
+ ...
+ \end{scope}
-It allows passing `ocg'-environment options (`viewocg', `printocg', `exportocg',
-`showingui', `radiobtngrp') to the TikZ scope.
Moreover, TikZ objects to be turned into OCG switching hyperlinks (section "How
to transform nodes or paths into clickable links" in the `ocgx' manual) accept
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx2.doc.tlpobj new/tlpkg/tlpobj/ocgx2.doc.tlpobj
--- old/tlpkg/tlpobj/ocgx2.doc.tlpobj 2019-02-28 03:57:51.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx2.doc.tlpobj 2019-11-12 01:55:00.000000000 +0100
@@ -1,8 +1,8 @@
name ocgx2.doc
category Package
-revision 49580
+revision 52730
shortdesc doc files of ocgx2
relocated 1
-docfiles size=4
+docfiles size=5
RELOC/doc/latex/ocgx2/ChangeLog
RELOC/doc/latex/ocgx2/README.txt
++++++ ocgx2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/fixocgx.sty new/tex/latex/ocgx2/fixocgx.sty
--- old/tex/latex/ocgx2/fixocgx.sty 2015-06-19 01:16:56.000000000 +0200
+++ new/tex/latex/ocgx2/fixocgx.sty 2019-10-02 23:17:55.000000000 +0200
@@ -7,7 +7,7 @@
\ExplSyntaxOn
-\msg_interrupt:nnn{Package~`fixocgx':}{
+\msg_new:nnnn{fixocgx}{obsolete}{
This~package~is~obsolete~and~replaced~by~package~`ocgx2'.\\\\
Remove\\\\
\space\space\string\usepackage{ocgx}\\
@@ -19,4 +19,6 @@
Read~the~manual~(`texdoc~ocgx2')~for~further~information.
}
+\msg_error:nn{fixocgx}{obsolete}
+
\ExplSyntaxOff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/ocgbase.sty new/tex/latex/ocgx2/ocgbase.sty
--- old/tex/latex/ocgx2/ocgbase.sty 2018-06-09 00:04:17.000000000 +0200
+++ new/tex/latex/ocgx2/ocgbase.sty 2019-11-04 23:16:29.000000000 +0100
@@ -93,14 +93,38 @@
% The Current Maintainer of this work is A. Grahn.
\RequirePackage{expl3}
-\RequirePackage{pdfbase}
+\RequirePackage{l3keys2e}
-\def\g@ocgbase@date@tl{2018/06/07}
-\def\g@ocgbase@version@tl{0.14}
+\def\g@ocgbase@date@tl{2019/11/04}
+\def\g@ocgbase@version@tl{0.17}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
+%package options
+
+%unknown package option error message
+\msg_set:nnnn{ocgbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
+ Package option~'#1'~is~unknown;\\
+ perhaps~it~is~spelled~incorrectly.
+}
+
+\keys_define:nn{ocgbase}{
+ xetex .code:n = {}, %dummy
+
+ dvipdfmx .choice:,
+ dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
+ dvipdfmx / false .code:n = {},
+ dvipdfmx .default:n = {true},
+
+ unknown .code:n = {
+ \msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
+ }
+}
+\ProcessKeysOptions{ocgbase}
+
+\RequirePackage{pdfbase}
+
\msg_set:nnnn{ocgbase}{support~outdated}{
Support~package~`#1'~too~old.
}{
@@ -141,7 +165,7 @@
%generate RBGroups entry (radio button groups)
\tl_new:N\l_ocgbase_rbtn_groups_tl
\seq_map_inline:Nn\g_ocgbase_rbtn_groups_seq{
- \int_compare:nT{\seq_count:c{g_ocgbase_rbtn_group_#1_seq}>\c_one}{
+ \int_compare:nT{\seq_count:c{g_ocgbase_rbtn_group_#1_seq}>\c_one_int}{
\tl_put_right:Nx\l_ocgbase_rbtn_groups_tl{
~[\seq_use:cn{g_ocgbase_rbtn_group_#1_seq}{~}]
}
@@ -174,14 +198,14 @@
%macro for inserting new OCG object
\cs_new_protected_nopar:Nn\ocgbase_new_ocg:nnn{
\pbs_pdfobj:nnn{}{dict}{
- /Type/OCG/Name~(#1)~\str_if_eq_x:nnF{#2}{}{/Usage<<#2>>}
+ /Type/OCG/Name~(#1)~\str_if_eq:eeF{#2}{}{/Usage<<#2>>}
}
\tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\pbs_pdflastobj:}
\bool_if:nT{
- \str_if_eq_x_p:nn{#3}{0} ||
- \str_if_eq_x_p:nn{#3}{off} ||
- \str_if_eq_x_p:nn{#3}{false} ||
- \str_if_eq_x_p:nn{#3}{invisible}
+ \str_if_eq_p:ee{#3}{0} ||
+ \str_if_eq_p:ee{#3}{off} ||
+ \str_if_eq_p:ee{#3}{false} ||
+ \str_if_eq_p:ee{#3}{invisible}
}{
\ocgbase_add_to_off_list:n{\pbs_pdflastobj:}
}
@@ -236,7 +260,7 @@
\cs_new_protected:Nn\ocgbase_tree_node_end:{
\seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl
\seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl
- \str_if_eq_x:nnT{
+ \str_if_eq:eeT{
\cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl}
}{
\l_tempb_tl
@@ -252,7 +276,7 @@
% the node id of the sibling found is returned in arg #1
\cs_new:Nn\ocgbase_traverse_siblings:NN{
% #1: current node (in/out), #2: OCG obj (in/out)
- \str_if_eq_x:nnF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
+ \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
\tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{
\tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl}
\ocgbase_traverse_siblings:NN#1#2
@@ -329,14 +353,6 @@
\cs_new_protected_nopar:Nn\ocgbase_open_stack_pop:N{
\seq_gpop:NN\g_ocgbase_open_stack_seq#1}
-%command that inserts /OC <<OCMD with currently open OCGs>> entry;
-%for use within annotation/xobject dicts
-\cs_new_nopar:Nn\ocgbase_insert_oc:{
- \seq_if_empty:NF\g_ocgbase_open_stack_seq{
- /OC~<</Type/OCMD/OCGs~[\seq_use:Nn\g_ocgbase_open_stack_seq{~}]/P/AllOn>>
- }
-}
-
%l2e versions
\cs_gset_eq:NN\ocgbase@new@ocg\ocgbase_new_ocg:nnn
\cs_gset_eq:NN\ocgbase@last@ocg\ocgbase_last_ocg:
@@ -347,6 +363,5 @@
\cs_gset_eq:NN\ocgbase@add@ocg@to@radiobtn@grp\ocgbase_add_ocg_to_radiobtn_grp:nn
\cs_gset_eq:NN\ocgbase@oc@bdc\ocgbase_oc_bdc:n
\cs_gset_eq:NN\ocgbase@oc@emc\ocgbase_oc_emc:
-\cs_gset_eq:NN\ocgbase@insert@oc\ocgbase_insert_oc:
\cs_gset_eq:NN\ocgbase@open@stack@pop\ocgbase_open_stack_pop:N
\cs_gset_eq:NN\ocgbase@open@stack@push\ocgbase_open_stack_push:n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/ocgx2.sty new/tex/latex/ocgx2/ocgx2.sty
--- old/tex/latex/ocgx2/ocgx2.sty 2019-01-02 23:38:58.000000000 +0100
+++ new/tex/latex/ocgx2/ocgx2.sty 2019-11-10 23:11:28.000000000 +0100
@@ -15,7 +15,9 @@
%
% With ocgx2, PDF layers may extend across page breaks.
%
-% Adds some minor improvements, such as package options, remembering option
+% ocgx2 implements OCMDs (optional content membership dictionaries)
+%
+% Adds some minor improvements, such as package options, remembering option.
% settings of reopened ocgs, correct behaviour of ocg switching links that were
% themselves placed on layers, compatibility with the animate and media9
% packages.
@@ -38,20 +40,24 @@
\RequirePackage{xparse}
\RequirePackage{l3keys2e}
-\def\g@ocgxii@date@tl{2019/01/02}
-\def\g@ocgxii@version@tl{0.40}
+\def\g@ocgxii@date@tl{2019/11/07}
+\def\g@ocgxii@version@tl{0.48}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
%creating global definitions
\cs_new_protected:Npn\ocgxii@newkey#1#2{\tl_gset:cx{#1}{#2}}
+\cs_new_protected:Npn\ocgxii@newkeynoexp#1#2{\tl_gset:cn{#1}{#2}}
\AtBeginDocument{
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\ocgxii@newkey[2]{}
}
\iow_now:Nx\@mainaux{
+ \token_to_str:N\providecommand\token_to_str:N\ocgxii@newkeynoexp[2]{}
+ }
+ \iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\ocgxii@ocg@stack@on@page[2]{}
}
\iow_now:Nx\@mainaux{
@@ -60,6 +66,8 @@
}
}
+\msg_set:nnn{ocgx2}{generic~msg}{#1\\#2}
+
\msg_set:nnn{ocgx2}{missing~package}{
Package~`#1'~must~be~loaded~before~ocgx2.\\\\
Put\\\\
@@ -87,11 +95,10 @@
\bool_new:N\l_ocgxii_showingui_bool
\keys_define:nn{ocgx2}{
- xetex .code:n = {
- \PassOptionsToPackage{xetex}{pdfbase}
- },
+ xetex .code:n = {}, %dummy
dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{ocgbase}
\PassOptionsToPackage{dvipdfmx}{pdfbase}
\bool_gset_true:N\g_ocgxii_dvipdfmx_bool
},
@@ -122,8 +129,8 @@
showingui .choices:nn = {true,false,always,never,iffirstuse}{
\bool_if:nTF{
- \str_if_eq_x_p:nn{#1}{false} ||
- \str_if_eq_x_p:nn{#1}{never}
+ \str_if_eq_p:ee{#1}{false} ||
+ \str_if_eq_p:ee{#1}{never}
}{
\bool_gset_false:N\g_ocgxii_showingui_bool
}{
@@ -151,50 +158,51 @@
%process package options
\ProcessKeysOptions{ocgx2}
-\sys_if_engine_xetex:T{
- \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
-}
+\sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
\RequirePackage{ocgbase} %also loads pdfbase.sty
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
- \ocgxii_beginocg:nnnn{#1}{#2}{#3}{#4}
+ \ocgxii_begin_ocg:nnnn{#1}{#2}{#3}{#4}
}{
- \ocgxii_endocg:
+ \ocgxii_end_ocg:
}
-\cs_new_protected_nopar:Nn\ocgxii_beginocg:nnnn{
+\cs_new_protected_nopar:Nn\ocgxii_begin_ocg:nnnn{
\group_begin:
\ocgxii_reset_cmd_opts: % ... to the user-set package options
- \tl_if_exist:cTF{ocgxii@#3}{ %re-open existing layer
- \tl_set:Nx\l_tempa_tl{\tl_use:c{ocgxii@#3.opts},#1}
- \tl_gset:cx{ocgxii@#3.opts}{\l_tempa_tl} %new options appended
- \keys_set:nV{ocgx2/user}\l_tempa_tl
+ \tl_set:Nx\l_ocgxii_argiv_tl{\tl_trim_spaces:n{#4}}
+ \tl_if_exist:cTF{ocgxii_ocg_#3}{ %re-open existing layer
+ \tl_set:Nx\l_tempa_tl{\tl_use:c{ocgxii_ocg_#3.opts},#1}
+ \tl_gset:cx{ocgxii_ocg_#3.opts}{\l_tempa_tl} %new options appended
+ \keys_set:nV{ocgx2/ocgenv}\l_tempa_tl
\bool_if:nTF{ %initial visibility
- \str_if_eq_x_p:nn{#4}{1} ||
- \str_if_eq_x_p:nn{#4}{on} ||
- \str_if_eq_x_p:nn{#4}{true}
+ \str_if_eq_p:ee{\l_ocgxii_argiv_tl}{1} ||
+ \str_if_eq_p:ee{\l_ocgxii_argiv_tl}{on} ||
+ \str_if_eq_p:ee{\l_ocgxii_argiv_tl}{true}
}{
- \ocgbase_del_from_off_list:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_del_from_off_list:n{\tl_use:c{ocgxii_ocg_#3}}
}{
- \ocgbase_add_to_off_list:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_add_to_off_list:n{\tl_use:c{ocgxii_ocg_#3}}
}
}{
\tl_set:Nx\l_tempa_tl{#1}
- \tl_gset:cx{ocgxii@#3.opts}{\l_tempa_tl}
- \keys_set:nV{ocgx2/user}\l_tempa_tl
+ \tl_gset:cx{ocgxii_ocg_#3.opts}{\l_tempa_tl}
+ \keys_set:nV{ocgx2/ocgenv}\l_tempa_tl
\ocgbase_new_ocg:nnn{#2}{
\l_ocgxii_view_tl\l_ocgxii_print_tl\l_ocgxii_export_tl
- }{#4}
- \tl_gset:cx{ocgxii@#3}{\ocgbase_last_ocg:}
+ }{\l_ocgxii_argiv_tl}
+ \tl_gset:cx{ocgxii_ocg_#3}{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgx2.ocg.\ocgbase_last_ocg:}{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgx2.ocg.#3}{\ocgbase_last_ocg:}
\iow_now:Nx\@mainaux{
\token_to_str:N\ocgxii@newkey{ocgx2.ocg.#3}{\ocgbase_last_ocg:}
}
}
\bool_if:nT{
!\cs_if_exist:cTF{ocgx2.ocg.#3}{
- \str_if_eq_x_p:nn{\tl_use:c{ocgx2.ocg.#3}}{\tl_use:c{ocgxii@#3}}
+ \str_if_eq_p:ee{\tl_use:c{ocgx2.ocg.#3}}{\tl_use:c{ocgxii_ocg_#3}}
}{
\c_false_bool
}
@@ -204,29 +212,346 @@
\AtEndDocument{\msg_warning:nn{ocgx2}{rerun}}
}
}
- \tl_gset:cx{ocgx2.ocg.#3}{\tl_use:c{ocgxii@#3}}
\seq_map_inline:Nn\l_ocgxii_rbgrps_seq{% process list of radio btn groups
- \ocgbase_add_ocg_to_radiobtn_grp:nn{##1}{\tl_use:c{ocgxii@#3}}
+ \ocgbase_add_ocg_to_radiobtn_grp:nn{##1}{\tl_use:c{ocgxii_ocg_#3}}
}
- \ocgbase_open_stack_push:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_open_stack_push:n{\tl_use:c{ocgxii_ocg_#3}}
+ \ocgxii_make_oc_entry:
\ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
% insert OCG into Order tree
\bool_if:NT\l_ocgxii_showingui_bool{
- \ocgbase_tree_node_begin:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_tree_node_begin:n{\tl_use:c{ocgxii_ocg_#3}}
}
\group_end:
- \ocgbase_oc_bdc:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_#3}}
\ignorespaces
}
-\cs_new_protected_nopar:Nn\ocgxii_endocg:{
+\cs_new_protected_nopar:Nn\ocgxii_end_ocg:{
\unskip
\ocgbase_oc_emc:
\ocgbase_tree_node_end:
\ocgbase_open_stack_pop:N\l_trash_tl
+ \ocgxii_make_oc_entry:
+ \ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
+}
+
+% OCMD implementation
+\DeclareDocumentEnvironment{ocmd}{O{}m}{
+ \ocgxii_begin_ocmd:on{#1}{#2}
+ \ignorespaces
+}{
+ \unskip
+ \ocgxii_end_ocmd:
+}
+
+\cs_new_protected_nopar:Nn\ocgxii_begin_ocmd:nn{ % #1: id,
+ \bool_if:nTF{ % #2: visib. expr. or policy
+ \tl_if_blank:oTF{#1}{
+ \c_false_bool
+ }{
+ \tl_if_exist_p:c{ocgxii_ocmd_#1}
+ }
+ }{
+ % re-open existing ocmd
+ \tl_set_eq:Nc\l_ocgxii_cur_ocmd_tl{ocgxii_ocmd_#1}
+ }{
+ % new ocmd
+ \group_begin:
+ \ocgxii_ocmd_read_visbility:nN{#2}\l_ocgxii_ocmd_visibility_tl
+ \pbs_pdfobj:nnn{}{dict}{/Type/OCMD\l_ocgxii_ocmd_visibility_tl}
+ %if only visb. policy is given, generate equivalent visib. expression,
+ %needed for stack of open layers and \ocgxii_make_oc_entry: command
+ \ocgxii_ocmd_make_equiv_ve:nN{#2}\l_ocgxii_ocmd_equiv_ve_tl
+ \tl_gset:co{ocgx2.ocmd.\pbs_pdflastobj:}{\l_ocgxii_ocmd_equiv_ve_tl}
+ \group_end:
+ \tl_set:Nx\l_ocgxii_cur_ocmd_tl{\pbs_pdflastobj:}
+ \tl_if_blank:oF{#1}{
+ \tl_gset:cx{ocgxii_ocmd_#1}{\pbs_pdflastobj:}
+ \iow_now:Nn\@mainaux{\ocgxii@newkeynoexp{ocgx2.ocmd.#1}{#2}}
+ }
+ }
+ \ocgbase_open_stack_push:n{\l_ocgxii_cur_ocmd_tl}
+ \ocgxii_make_oc_entry:
+ \ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
+ \ocgbase_oc_bdc:n{\l_ocgxii_cur_ocmd_tl}
+}
+\cs_generate_variant:Nn\ocgxii_begin_ocmd:nn{on}
+\cs_new_protected_nopar:Nn\ocgxii_end_ocmd:{
+ \ocgbase_oc_emc:
+ \ocgbase_open_stack_pop:N\l_trash_tl
+ \ocgxii_make_oc_entry: %update
\ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
}
+%visibility expressions
+\cs_new_protected_nopar:Nn\ocgxii_ocmd_read_visbility:nN{
+ \int_zero:N\l_ocgxii_ve_cnt_int
+ \int_zero:N\l_ocgxii_vp_cnt_int
+ \tl_clear_new:N#2
+ \clist_map_inline:nn{#1}{\ocgxii_omcd_parse_argument:nN{##1}#2}
+}
+\cs_new_protected_nopar:Nn\ocgxii_omcd_parse_argument:nN{
+ \cs_set_eq:NN\AllOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\AllOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\Not\ocgxii_ve_check:n
+ \cs_set_eq:NN\And\ocgxii_ve_check:n
+ \cs_set_eq:NN\Or \ocgxii_ve_check:n
+ \tl_if_exist:cTF{ocgx2.ocg.#1}{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ OCG~ids~cannot~be~directly~used~in~the~visibility~argument~of~an~
+ `ocmd'~environment.
+ }{\g_ocgxii_help_msg_tl}
+ }{
+ \tl_if_exist:cTF{ocgx2.ocmd.#1}{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ OCMD~ids~cannot~be~directly~used~in~the~visibility~argument~of~an~
+ `ocmd'~environment.
+ }{\g_ocgxii_help_msg_tl}
+ }{
+ \tl_if_exist:cTF{ocgxii_#1}{
+ \str_case_e:nn{\tl_use:c{ocgxii_#1}}{
+ {VisExpr}{
+ \int_incr:N\l_ocgxii_ve_cnt_int
+ \int_compare:nNnTF{\l_ocgxii_ve_cnt_int}>{1}{
+ \msg_error:nnnn{ocgx2}{generic~msg}{
+ More~than~one~visibility~expression~passed~to~the~`ocmd'~
+ environment.
+ }{
+ At~most~one~visibility~expression~is~allowed.~A~visibility~
+ expression~is~a~boolean~expression~built~by~nesting~any~number~of~
+ \And{...},~\Or{...},~\Not{...}~commands.
+ }
+ }{
+ \tl_put_right:Nx#2{/VE~}
+ \ocgxii_ocmd_expression_parser:nN{#1}#2
+ }
+ }
+ {VisPol}{
+ \int_incr:N\l_ocgxii_vp_cnt_int
+ \int_compare:nNnTF{\l_ocgxii_vp_cnt_int}>{1}{
+ \msg_error:nnnn{ocgx2}{generic~msg}{
+ More~than~one~visibility~policy~passed~to~the~`ocmd'~environment.
+ }{
+ At~most~one~visibility~policy~out~of~\AllOn{...},~\AnyOn{...},~
+ \AnyOff{...},~\AllOff{...}~is~allowed.~Any~number~of~OCG~IDs,~
+ separated~by~commas,~may~be~passed~as~arguments~to~these~
+ commands,~but~commands~may~not~be~nested.~For~complex~visibilty~
+ relations,~consider~using~a~visibility~expression.
+ }
+ }{
+ \ocgxii_ocmd_expression_parser:nN{#1}#2
+ }
+ }
+ }
+ }{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ The~visibility~argument~of~the~`ocmd'~environment~cannot~be~parsed.
+ }{\g_ocgxii_help_msg_tl}
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn\ocgxii_omcd_parse_argument:nN{xN}
+\cs_generate_variant:Nn\ocgxii_omcd_parse_argument:nN{oN}
+\cs_new_protected_nopar:Nn\ocgxii_ocmd_expression_parser:nN{
+ \cs_set_eq:NN\AllOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\AllOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\Not\ocgxii_ve_check:n
+ \cs_set_eq:NN\And\ocgxii_ve_check:n
+ \cs_set_eq:NN\Or \ocgxii_ve_check:n
+ \tl_if_exist:cTF{ocgx2.ocg.#1}{% ocg reference
+ \tl_put_right:Nx#2{~\tl_use:c{ocgx2.ocg.#1}}
+ }{
+ \tl_if_exist:cTF{ocgx2.ocmd.#1}{% ocmd reference
+ \ocgxii_ocmd_expression_parser:vN{ocgx2.ocmd.#1}#2
+ }{
+ \tl_if_exist:cTF{ocgxii_#1}{% visib. bool expression or policy directive
+ \bool_if:nTF{
+ \str_if_eq_p:ee{\tl_use:c{ocgxii_#1}}{VisExpr} &&
+ \bool_if_p:N\l_ocgxii_vp_open_bool ||
+ \str_if_eq_p:ee{\tl_use:c{ocgxii_#1}}{VisPol} &&
+ \bool_if_p:N\l_ocgxii_ve_open_bool
+ }{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ Visibility~policy~and~expression~commands~cannot~be~mixed.
+ }{\g_ocgxii_help_msg_tl}
+ }{
+ \bool_if:nT{
+ \str_if_eq_p:ee{\tl_use:c{ocgxii_#1}}{VisPol} &&
+ \bool_if_p:N\l_ocgxii_vp_open_bool
+ }{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ Visibility~policy~commands~cannot~be~nested.~For~more~complex~
+ visibilty~relations,~consider~using~a~visibility~expression.
+ }{\g_ocgxii_help_msg_tl}
+ }
+ }
+ \cs_set_eq:NN\AllOn \ocgxii_vp_allon:nN
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_anyon:nN
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_anyoff:nN
+ \cs_set_eq:NN\AllOff\ocgxii_vp_alloff:nN
+ \cs_set_eq:NN\Not\ocgxii_ve_not:nN
+ \cs_set_eq:NN\And\ocgxii_ve_and:nN
+ \cs_set_eq:NN\Or \ocgxii_ve_or:nN
+ #1#2
+ }{
+ \msg_warning:nnx{ocgx2}{undefined~OCG}{#1}
+ \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
+ \tl_new:N\g_ocgxii_refundefwarned_tl
+ \AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
+ }
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn\ocgxii_ocmd_expression_parser:nN{vN}
+% visib. policy directives
+\cs_new_protected_nopar:Nn\ocgxii_vp_allon:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_put_right:Nx#2{/P/AllOn/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_vp_anyon:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_gput_right:Nx#2{/P/AnyOn/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_gput_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_vp_anyoff:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_gput_right:Nx#2{/P/AnyOff/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_gput_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_vp_alloff:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_gput_right:Nx#2{/P/AllOff/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_gput_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+% policy to expression conversion
+\cs_new_protected_nopar:Nn\ocgxii_ocmd_make_equiv_ve:nN{
+ \int_zero:N\l_ocgxii_ve_cnt_int
+ \tl_clear_new:N#2
+ \clist_map_inline:nn{#1}{\ocgxii_omcd_convert_vp:nN{##1}#2}
+}
+\cs_new_protected_nopar:Nn\ocgxii_omcd_convert_vp:nN{
+ \cs_set_eq:NN\AllOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\AllOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\Not\ocgxii_ve_check:n
+ \cs_set_eq:NN\And\ocgxii_ve_check:n
+ \cs_set_eq:NN\Or \ocgxii_ve_check:n
+ \tl_if_exist:cT{ocgxii_#1}{
+ \str_case_e:nn{\tl_use:c{ocgxii_#1}}{
+ {VisExpr}{
+ \int_incr:N\l_ocgxii_ve_cnt_int
+ \tl_set:Nn#2{#1}
+ }
+ {VisPol}{
+ \int_compare:nNnT{\l_ocgxii_ve_cnt_int}={0}{
+ \cs_set_eq:NN\AllOn \ocgxii_allon_to_ve:n
+ \cs_set_eq:NN\AnyOn \ocgxii_anyon_to_ve:n
+ \cs_set_eq:NN\AnyOff\ocgxii_anyoff_to_ve:n
+ \cs_set_eq:NN\AllOff\ocgxii_alloff_to_ve:n
+ \tl_set:No#2{#1}
+ }
+ }
+ }
+ }
+}
+\cs_new_protected_nopar:Nn\ocgxii_allon_to_ve:n{\And{#1}}
+\cs_new_protected_nopar:Nn\ocgxii_anyon_to_ve:n{\Or{#1}}
+\cs_new_protected_nopar:Nn\ocgxii_anyoff_to_ve:n{\Not{\And{#1}}}
+\cs_new_protected_nopar:Nn\ocgxii_alloff_to_ve:n{\Not{\Or{#1}}}
+% visib. boolean expressions
+\cs_new_protected_nopar:Nn\ocgxii_ve_and:nN{
+ \bool_set_true:N\l_ocgxii_ve_open_bool
+ \tl_put_right:Nx#2{\g_ocgxii_left_bracket_tl/And}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_ve_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_ve_or:nN{
+ \bool_set_true:N\l_ocgxii_ve_open_bool
+ \tl_put_right:Nx#2{\g_ocgxii_left_bracket_tl/Or}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_ve_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_ve_not:nN{
+ \bool_set_true:N\l_ocgxii_ve_open_bool
+ % only one item allowed in \Not{...} argument
+ \int_compare:nNnT{\clist_count:n{#1}}>{\c_one_int}{
+ \msg_error:nnnn{ocgx2}{generic~msg}{
+ More~than~one~item~passed~to~\Not{...}.
+ }{
+ Only~one~item~is~allowed.
+ }
+ }
+ \int_compare:nNnT{\clist_count:n{#1}}={\c_one_int}{
+ \tl_put_right:Nx#2{\g_ocgxii_left_bracket_tl/Not}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ }
+ \bool_set_false:N\l_ocgxii_ve_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_ve_check:n{VisExpr}
+\tl_set:cn{ocgxii_VisExpr}{VisExpr}
+\cs_new_protected_nopar:Nn\ocgxii_vp_check:n{VisPol}
+\tl_set:cn{ocgxii_VisPol}{VisPol}
+\tl_set:Nx\g_ocgxii_left_bracket_tl{\tl_to_str:N[}
+\tl_set:Nx\g_ocgxii_right_bracket_tl{\tl_to_str:N]}
+\int_new:N\l_ocgxii_vp_cnt_int %number of visib. policies
+\int_new:N\l_ocgxii_ve_cnt_int %number of visib. expressions
+\bool_new:N\l_ocgxii_vp_open_bool %for nesting test
+\bool_new:N\l_ocgxii_ve_open_bool %for nesting test
+\tl_set:Nn\g_ocgxii_help_msg_tl{
+ At~most~one~visibility~policy~and,~separated~by~a~comma,~at~most~one~
+ visibility~expression~may~be~passed~as~the~2nd~argument~to~the~`ocmd'~
+ environment.~A~visibility~
+ policy~is~defined~by~one~of~\AllOn{...},~\AnyOn{...},~\AnyOff{...},~
+ \AllOff{...}.~A~visibility~expression~is~a~boolean~expression~built~by~
+ nesting~any~number~of~\And{...},~\Or{...},~\Not{...}~commands.~If~both~are~
+ provided,~the~visibility~expression~takes~precedence~over~the~policy,~but~the~
+ latter~may~be~used~as~fallback~by~non-conforming~PDF~viewers.
+}
+%command that builds /OC entry from open layer stack
+\cs_new_nopar:Nn\ocgxii_make_oc_entry:{
+ \group_begin:
+ \tl_gclear:N\g_ocgxii_oc_entry_tl
+ \tl_clear:N\l_tempa_tl
+ \seq_if_empty:NF\g_ocgbase_open_stack_seq{
+ \seq_clear:N\l_tempa_seq
+ %additional level of braces around indirect PDF objects (needed for dvips)
+ \seq_map_inline:Nn\g_ocgbase_open_stack_seq{
+ \seq_put_right:Nn\l_tempa_seq{{##1}}
+ }
+ \ocgxii_omcd_parse_argument:xN{
+ \exp_not:N\And{\seq_use:Nn\l_tempa_seq{,}}
+ }\l_tempa_tl
+ \tl_gset:Nx\g_ocgxii_oc_entry_tl{/OC~<</Type/OCMD\l_tempa_tl>>}
+ }
+ \group_end:
+}
+%programmer/author command that inserts /OC << >> entry; for use in
+%annotation/xobject dicts, in order to make them layer-aware
+\cs_new_nopar:Nn\ocgxii_insert_oc:{\g_ocgxii_oc_entry_tl}
+\cs_gset_eq:NN\ocgbase_insert_oc:\ocgxii_insert_oc:
+\cs_gset_eq:NN\ocgbase@insert@oc\ocgxii_insert_oc:
+\tl_new:N\g_ocgxii_oc_entry_tl
+
\cs_new_protected_nopar:Nn\ocgxii_stack_shipout:NN{
\iow_shipout_x:Nx\@mainaux{
\token_to_str:N#1{
@@ -268,7 +593,7 @@
}
\bool_if:nT{
!\cs_if_exist:cTF{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int}{
- \str_if_eq_x_p:nn{
+ \str_if_eq_p:ee{
\tl_use:c{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int}
}{
\seq_use:cn{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}{,}
@@ -296,7 +621,7 @@
}
\bool_if:nT{
!\cs_if_exist:cTF{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}{
- \str_if_eq_x_p:nn{
+ \str_if_eq_p:ee{
\tl_use:c{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}
}{
\seq_use:cn{g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq}{,}
@@ -338,7 +663,7 @@
\seq_gset_eq:cc{
g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq
}{
- g_pending_ocgs_on_\int_eval:n{\g_ocgxii_page_int-\c_one}_seq
+ g_pending_ocgs_on_\int_eval:n{\g_ocgxii_page_int-\c_one_int}_seq
}
}
%the same for link colour stack
@@ -346,7 +671,7 @@
\seq_gset_eq:cc{
g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq
}{
- g_pending_lnkcols_on_\int_eval:n{\g_ocgxii_page_int-\c_one}_seq
+ g_pending_lnkcols_on_\int_eval:n{\g_ocgxii_page_int-\c_one_int}_seq
}
}
}
@@ -361,7 +686,22 @@
\cs_new_protected_nopar:Nn\ocgxii_ocglist_build:Nn{
\tl_set:Nx\l_ocglistarg_tl{#2}\tl_trim_spaces:N\l_ocglistarg_tl
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
+ % first try splitting at commas (ocgx2 syntax)
+ \tl_set_eq:NN\l_tmpa_tl\l_ocglistarg_tl
+ \tl_remove_all:Nn\l_tmpa_tl{~}
+ \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{,}\l_tmpa_tl
+ \seq_remove_all:Nn\l_ocgxii_ocglistarg_seq{}
+ \tl_set:Nx\l_tmpa_tl{\seq_count:N\l_ocgxii_ocglistarg_seq}
+ % now at spaces (legacy ocgx/ocg-p)
+ \tl_set_eq:NN\l_tmpb_tl\l_ocglistarg_tl
+ \tl_remove_all:Nn\l_tmpb_tl{,}
+ \seq_set_split:NnV\l_tmpb_seq{~}\l_tmpb_tl
+ \seq_remove_all:Nn\l_tmpb_seq{}
+ \tl_set:Nx\l_tmpb_tl{\seq_count:N\l_tmpb_seq}
+ %take the seq having more elements (guessing the separator most likely used)
+ \int_compare:nT{\l_tmpb_tl>\l_tmpa_tl}{
+ \seq_set_eq:NN\l_ocgxii_ocglistarg_seq\l_tmpb_seq
+ }
\seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
\ocgxii_process_ocgref:NN#1\l_tempa_tl
}
@@ -378,7 +718,7 @@
\cs_new_protected_nopar:Nn\ocgxii_ocglist_process_idlist:nn{
\ocgxii_ocglist_reset:
\tl_set:Nx\l_ocgxii_opt_tl{#1}\tl_remove_all:Nn\l_ocgxii_opt_tl{~}
- \str_case_x:nnF{\l_ocgxii_opt_tl}{
+ \str_case_e:nnF{\l_ocgxii_opt_tl}{
{onmouseup}{
\ocgxii_ocglist_build:Nn\l_ocgxii_u_list_tl{#2}
}
@@ -408,19 +748,19 @@
% adding optional 2nd argument -> Button Widget (non-breakable) with one of
% various mouse triggers (`troggerocgs` option from ocg-p)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareDocumentCommand\switchocg{s o m +m}{
+\DeclareDocumentCommand\switchocg{s O{} m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{#3}{}{}{#4}
}
-\DeclareDocumentCommand\showocg{s o m +m}{
+\DeclareDocumentCommand\showocg{s O{} m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{}{#3}{}{#4}
}
-\DeclareDocumentCommand\hideocg{s o m +m}{
+\DeclareDocumentCommand\hideocg{s O{} m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{}{}{#3}{#4}
}
-\DeclareDocumentCommand\actionsocg{s o m m m +m}{
+\DeclareDocumentCommand\actionsocg{s O{} m m m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{#3}{#4}{#5}{#6}
}
@@ -446,28 +786,28 @@
%
%process *all* mouse triggers (e,d,u,x)
\ocgxii_ocglist_process_idlist:nn{
- \IfValueTF{#2}{#2}{onmouseup}
+ \tl_if_blank:oTF{#2}{onmouseup}{#2}
}{#3}
\tl_set_eq:NN\l_ocgxii_toswitch_e_tl\l_ocgxii_e_list_tl
\tl_set_eq:NN\l_ocgxii_toswitch_x_tl\l_ocgxii_x_list_tl
\tl_set_eq:NN\l_ocgxii_toswitch_d_tl\l_ocgxii_d_list_tl
\tl_set_eq:NN\l_ocgxii_toswitch_u_tl\l_ocgxii_u_list_tl
\ocgxii_ocglist_process_idlist:nn{
- \IfValueTF{#2}{#2}{onmouseup}
+ \tl_if_blank:oTF{#2}{onmouseup}{#2}
}{#4}
\tl_set_eq:NN\l_ocgxii_toshow_e_tl\l_ocgxii_e_list_tl
\tl_set_eq:NN\l_ocgxii_toshow_x_tl\l_ocgxii_x_list_tl
\tl_set_eq:NN\l_ocgxii_toshow_d_tl\l_ocgxii_d_list_tl
\tl_set_eq:NN\l_ocgxii_toshow_u_tl\l_ocgxii_u_list_tl
\ocgxii_ocglist_process_idlist:nn{
- \IfValueTF{#2}{#2}{onmouseup}
+ \tl_if_blank:oTF{#2}{onmouseup}{#2}
}{#5}
\tl_set_eq:NN\l_ocgxii_tohide_e_tl\l_ocgxii_e_list_tl
\tl_set_eq:NN\l_ocgxii_tohide_x_tl\l_ocgxii_x_list_tl
\tl_set_eq:NN\l_ocgxii_tohide_d_tl\l_ocgxii_d_list_tl
\tl_set_eq:NN\l_ocgxii_tohide_u_tl\l_ocgxii_u_list_tl
%any triggers apart from mouse-up?
- \str_if_eq_x:nnF{
+ \str_if_eq:eeF{
\l_ocgxii_toswitch_e_tl\l_ocgxii_toswitch_x_tl\l_ocgxii_toswitch_d_tl
\l_ocgxii_toshow_e_tl\l_ocgxii_toshow_x_tl\l_ocgxii_toshow_d_tl
\l_ocgxii_tohide_e_tl\l_ocgxii_tohide_x_tl\l_ocgxii_tohide_d_tl
@@ -488,7 +828,7 @@
/Subtype/Widget/Ff~65536/FT/Btn/BS<</W~0>>
/T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
%treat mouse-up as mouse-click --> handle through /A dictionary
- \str_if_eq_x:nnF{}{
+ \str_if_eq:eeF{}{
\l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
}{
/A <</S/SetOCGState/State [
@@ -504,7 +844,7 @@
]>>
}
/AA <<
- %\str_if_eq_x:nnF{}{
+ %\str_if_eq:eeF{}{ % mouse-up
% \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
%}{
% /U <</S/SetOCGState/State [
@@ -519,7 +859,7 @@
% }
% ]>>
%}
- \str_if_eq_x:nnF{}{ % mouse-down
+ \str_if_eq:eeF{}{ % mouse-down
\l_ocgxii_toswitch_d_tl\l_ocgxii_toshow_d_tl\l_ocgxii_tohide_d_tl
}{
/D <</S/SetOCGState/State [
@@ -534,7 +874,7 @@
}
]>>
}
- \str_if_eq_x:nnF{}{ % mouse-enter
+ \str_if_eq:eeF{}{ % mouse-enter
\l_ocgxii_toswitch_e_tl\l_ocgxii_toshow_e_tl\l_ocgxii_tohide_e_tl
}{
/E <</S/SetOCGState/State [
@@ -549,7 +889,7 @@
}
]>>
}
- \str_if_eq_x:nnF{}{ % mouse-exit
+ \str_if_eq:eeF{}{ % mouse-exit
\l_ocgxii_toswitch_x_tl\l_ocgxii_toshow_x_tl\l_ocgxii_tohide_x_tl
}{
/X <</S/SetOCGState/State [
@@ -620,7 +960,7 @@
triggerocg .choices:nn = {
onmouseenter, onmouseexit, onmousedown, onmouseup, allactions
}{
- \str_if_eq_x:nnTF{\l_keys_choice_tl}{allactions}{
+ \str_if_eq:eeTF{\l_keys_choice_tl}{allactions}{
\tl_set:Nn\l_ocgxii_trigger_tl{onmouseall}
}{
\tl_set_eq:NN\l_ocgxii_trigger_tl\l_keys_choice_tl
@@ -650,21 +990,19 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\cs_new_protected:Nn\ocgxii_process_ocgref:NN{
- \str_if_eq_x:nnF{#2}{}{
- \tl_if_exist:cTF{ocgx2.ocg.#2}{
- \tl_put_right:Nx#1{~\tl_use:c{ocgx2.ocg.#2}}
- }{
- \msg_warning:nnx{ocgx2}{undefined~OCG}{#2}
- \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
- \tl_new:N\g_ocgxii_refundefwarned_tl
- \AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
- }
+ \tl_if_exist:cTF{ocgx2.ocg.#2}{
+ \tl_put_right:Nx#1{~\tl_use:c{ocgx2.ocg.#2}}
+ }{
+ \msg_warning:nnx{ocgx2}{undefined~OCG}{#2}
+ \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
+ \tl_new:N\g_ocgxii_refundefwarned_tl
+ \AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
}
}
}
-%command opts
-\keys_define:nn{ocgx2/user}{
+%ocg environment opts
+\keys_define:nn{ocgx2/ocgenv}{
viewocg .choice:,
viewocg / always .code:n={
\tl_set:Nn\l_ocgxii_view_tl{/View<</ViewState/ON>>}},
@@ -693,8 +1031,8 @@
showingui .choices:nn = {true,false,always,never,iffirstuse}{
\bool_if:nTF{
- \str_if_eq_x_p:nn{#1}{false} ||
- \str_if_eq_x_p:nn{#1}{never}
+ \str_if_eq_p:ee{#1}{false} ||
+ \str_if_eq_p:ee{#1}{never}
}{
\bool_set_false:N\l_ocgxii_showingui_bool
}{
@@ -706,11 +1044,15 @@
listintoolbar .meta:n = {showingui=#1},
listintoolbar .default:n={true},
- radiobtngrp .code:n = {
- \seq_if_in:NxF\l_ocgxii_rbgrps_seq{#1}{
- \seq_put_right:Nx\l_ocgxii_rbgrps_seq{#1}
+ radiobtngrps .code:n = {
+ \clist_map_inline:nn{#1}{
+ \seq_if_in:NxF\l_ocgxii_rbgrps_seq{##1}{
+ \seq_put_right:Nx\l_ocgxii_rbgrps_seq{##1}
+ }
}
},
+ radiobtngrps .value_required:n = {true},
+ radiobtngrp .meta:n={radiobtngrps={#1}},
radiobtngrp .value_required:n = {true}
}
@@ -759,10 +1101,10 @@
\cs_new_protected_nopar:Nn\ocgxii_colourlink_nobreak_end:{
\color@endgroup\hbox_set_end:
\mbox{
- \ocgbase_oc_bdc:n{\ocgxii@OCPrint}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCPrint}}
\hbox_to_zero:n{\box_use:N\l_tmpa_box\hss}
\ocgbase_oc_emc:
- \ocgbase_oc_bdc:n{\ocgxii@OCView}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCView}}
\group_begin:
\exp_after:wN\HyColor@UseColor\l_ocgxii_lnkcol_tl
\box_use_drop:N\l_tmpa_box
@@ -845,10 +1187,10 @@
%a tiny space char should keep empty link annots from flooding the page
% with link colour
\hbox_overlap_left:n{\ocgxii_tiny_space_char:}
- \ocgbase_oc_bdc:n{\ocgxii@OCPrint}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCPrint}}
\pbs_literal:nn{page}{-88888~-88888~99999~99999~re~f}
\ocgbase_oc_emc:
- \ocgbase_oc_bdc:n{\ocgxii@OCView}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCView}}
\group_begin:
\exp_after:wN\HyColor@UseColor\g_ocgxii_lnkcol_tl
\pbs_literal:nn{page}{-88888~-88888~99999~99999~re~f}
@@ -911,22 +1253,25 @@
/Print<</PrintState/OFF>>
/Export<</ExportState/OFF>>
}{on}
- \tl_gset:Nx\ocgxii@OCView{\ocgbase_last_ocg:}
- \tl_gset:cx{ocgxii@OCView.opts}{
+ \tl_gset:cx{ocgxii_ocg_OCView}{\ocgbase_last_ocg:}
+ %in case somebody wants to reopen with \begin{ocg}...
+ \tl_gset:cx{ocgxii_ocg_OCView.opts}{
showingui=never,printocg=never,exportocg=never}
\ocgbase_new_ocg:nnn{OCPrint}{
/Print<</PrintState/ON>>
/Export<</ExportState/ON>>
}{off}
- \tl_gset:Nx\ocgxii@OCPrint{\ocgbase_last_ocg:}
- \tl_gset:cx{ocgxii@OCPrint.opts}{
+ \tl_gset:cx{ocgxii_ocg_OCPrint}{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgxii_ocg_OCPrint.opts}{
showingui=never,printocg=always,exportocg=always}
\ocgxii_enable_ocglinks:
\iow_now:Nx\@mainaux{
- \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{\ocgxii@OCView}
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{
+ \tl_use:c{ocgxii_ocg_OCView}}
}
\iow_now:Nx\@mainaux{
- \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCPrint}{\ocgxii@OCPrint}
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCPrint}{
+ \tl_use:c{ocgxii_ocg_OCPrint}}
}
}
}{
@@ -953,9 +1298,15 @@
% taken in large parts from Paul Gaborit's `tikzlibraryocgx.code.tex' with
% some additions/fixes:
%
-% - opts={...} allows ocg-environment options to be passed to a TikZ scope
+% - opts={...} inside ocg={...} allows ocg-environment options to be passed
+% to a TikZ scope
+%
+% - The style ocmd={...} is another way for turning a TikZ scope into a PDF
+% layer (in addition to ocg={...}). It has two sub-keys, ref={...} and
+% visibility={...}, which have the same meaning as the optional and the
+% mandatory arguments of the `ocmd' environment
%
-% - TikZ objects to be turned into ocg switching links accept the additional
+% - TikZ objects to be turned into OCG switching links accept the additional
% key
%
% trigger ocg = onmousenter | onmouseexit | onmousedown | onmouseup |
@@ -995,6 +1346,23 @@
/tikz/execute at end scope={\end{ocg}},
}
},
+ ocmd/.style={
+ ocmd/.cd,
+ #1,
+ /tikz/execute at begin scope={%
+ \begin{ocmd}[\ocgxii@ocmdref]{\ocgxii@ocmdvisibility}%
+ },
+ /tikz/execute at end scope={\end{ocmd}},
+ /tikz/.cd
+ },
+ ocmd={
+ % parameters
+ ref/.store in=\ocgxii@ocmdref,
+ visibility/.store in=\ocgxii@ocmdvisibility,
+ % default values
+ ref=,
+ visibility=,
+ },
trigger ocg/.store in=\ocgxii@trigger,
trigger ocg/.value required,
switch ocg/.style={
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx2.tlpobj new/tlpkg/tlpobj/ocgx2.tlpobj
--- old/tlpkg/tlpobj/ocgx2.tlpobj 2019-02-28 03:57:51.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx2.tlpobj 2019-11-12 01:55:00.000000000 +0100
@@ -1,6 +1,6 @@
name ocgx2
category Package
-revision 49580
+revision 52730
shortdesc Drop-in replacement for 'ocgx' and 'ocg-p'
relocated 1
longdesc This package serves as a drop-in replacement for the packages
@@ -11,14 +11,14 @@
longdesc ps2pdf/Distiller (Xe)LaTeX(x) - dvipdfmx pdfLaTeX and LuaLaTeX
longdesc . It also ensures compatibility with the media9 and animate
longdesc packages.
-runfiles size=15
+runfiles size=18
RELOC/tex/latex/ocgx2/fixocgx.sty
RELOC/tex/latex/ocgx2/ocgbase.sty
RELOC/tex/latex/ocgx2/ocgx2.sty
catalogue-also ocgx ocg-p
catalogue-contact-repository https://gitlab.com/agrahn/ocgx2
catalogue-ctan /macros/latex/contrib/ocgx2
-catalogue-date 2019-01-02 18:29:33 +0100
+catalogue-date 2019-11-08 15:21:24 +0100
catalogue-license lppl
catalogue-topics pdf-feat adobe-distiller expl3
-catalogue-version 0.40
+catalogue-version 0.48
++++++ oldstandard.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/NewComputerModern.fontspec new/doc/fonts/oldstandard/NewComputerModern.fontspec
--- old/doc/fonts/oldstandard/NewComputerModern.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/NewComputerModern.fontspec 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,8 @@
+\defaultfontfeatures[NewComputerModern]
+ {
+ Extension = .otf ,
+ UprightFont = NewCM10-Regular,
+ BoldFont = NewCM10-Bold,
+ ItalicFont = NewCM10-Italic,
+ BoldItalicFont = NewCM10-BoldItalic,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/NewComputerModernMono.fontspec new/doc/fonts/oldstandard/NewComputerModernMono.fontspec
--- old/doc/fonts/oldstandard/NewComputerModernMono.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/NewComputerModernMono.fontspec 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,8 @@
+\defaultfontfeatures[NewComputerModern Mono]
+ {
+ Extension = .otf ,
+ UprightFont = NewCMMono10-Regular,
+ BoldFont = NewCMMono10-Bold,
+ ItalicFont = NewCMMono10-Italic,
+ BoldItalicFont = NewCMMono10-BoldOblique,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/NewComputerModernSans.fontspec new/doc/fonts/oldstandard/NewComputerModernSans.fontspec
--- old/doc/fonts/oldstandard/NewComputerModernSans.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/NewComputerModernSans.fontspec 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,8 @@
+\defaultfontfeatures[NewComputerModern Sans]
+ {
+ Extension = .otf ,
+ UprightFont = NewCMSans10-Regular,
+ BoldFont = NewCMSans10-Bold,
+ ItalicFont = NewCMSans10-Oblique,
+ BoldItalicFont = NewCMSans10-BoldOblique,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/README new/doc/fonts/oldstandard/README
--- old/doc/fonts/oldstandard/README 2016-07-20 00:28:40.000000000 +0200
+++ new/doc/fonts/oldstandard/README 2020-02-26 23:09:08.000000000 +0100
@@ -1,9 +1,10 @@
-This is the README for the OldStandard package, version 2.2.
+This is the README for the OldStandard package, version 2.5,
+reease 2020-02-26.
This package provides the Old Standard family of fonts
-designed by Alexey Kryukov, in both OpenType and Type1
-formats, with support for both traditional and modern LaTeX
-processors.
+designed by Alexey Kryukov and revised by Robert Alessi,
+in both OpenType and Type1 formats, with support for both
+traditional and modern LaTeX processors.
Old Standard reproduces a specific type of Modern
(classicist) style of serif typefaces, very commonly used in
@@ -20,9 +21,30 @@
+ the most beautiful examples of Greek and Cyrillic
lettertypes were all based on the classicist style,
so for those scripts, "Modern" fonts are much more
- appropriate than any contemporary (e. g. Times-based)
+ appropriate than any contemporary (e.g. Times-based)
designs.
+In comparison to previous releases of *Old Standard*, this release
+includes a bold italic, new letters and some corrections:
+
+1. Small capitals for Roman, Greek and Cyrillic letters, in all three
+ styles, Regular, Italic and Bold have been added. Small capitals,
+ which were missing from *Old Standard*, were already in use a
+ century ago in fine books which used font faces very similar to
+ *Old Standard*. Typical use cases of small capitals were headers,
+ current headings and in some books proper names.
+2. The letter G with caron above, that is: Ǧ (`U+01E6`, uppercase) and
+ ǧ (`U+01E7`, lowercase) has been added. It is the only character
+ missing from *Old Standard* that is needed in some of the accepted
+ standards of romanization of classical Arabic.[^2]
+3. Additionally, this release corrects the `+ss06` feature provided by
+ *Old Standard*. This feature is supposed to distinguish between
+ regular and ‘curled’ beta (β/ϐ) and to print ‘curled’ beta
+ (`U+03D0`) in medial position. This feature worked in most cases
+ with the previous release of *Old Standard*. However, it failed if
+ the beta is preceded by a vowel with an acute accent taken from the
+ *Greek extended* Unicode block.
+
To install this package on a TDS-compliant
TeX system download the file
"tex-archive"/install/fonts/oldstandard.tds.zip where the
@@ -38,9 +60,9 @@
to the preamble of your document. This will activate
OldStandard as the main (serifed) text font. Regular,
-Italic and Bold styles are available. Font encodings
-supported are OT1, T1, LY1 and TS1. The only figure style is
-tabular-lining.
+Italic, Bold and BoldItalic styles are available. Font
+encodings supported are OT1, T1, TS1, LY1, LGR and T2A/B/C.
+The only figure style is tabular-lining.
LuaLaTeX and xeLaTeX users may also use OldStandard.sty but
should read the oldstand-manual document for information
@@ -53,8 +75,16 @@
The fonts are licensed under the SIL Open Font License,
version 1.1; the text may be found in the doc directory.
-The type1 versions were created using fontforge. The LaTeX
+The type1 versions were created using cfftot1. The LaTeX
support files were created using autoinst and are licensed
under the terms of the LaTeX Project Public License.
The maintainers of this package are Bob Tennent (rdt at
-cs.queensu.ca) and Nikola Lecic.
+cs.queensu.ca), Nikola Lecic and Robert Alessi.
+
+Please send error reports and suggestions for improvements
+to Robert Alessi:
+
+ * email: <alessi(a)robertalessi.net>
+ * website: <http://www.robertalessi.net/>
+ * development: <http://git.robertalessi.net/oldstandard>
+ * comments, feature requests, bug reports: <https://gitlab.com/ralessi/oldstandard/issues>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/fonttable.lua new/doc/fonts/oldstandard/fonttable.lua
--- old/doc/fonts/oldstandard/fonttable.lua 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/fonttable.lua 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,36 @@
+-- the following is adapted from https://tex.stackexchange.com/a/380780
+ft = {}
+function ft.print_glyphs(maxCols,maxChars)
+ local id = font.current()
+ local fnt = font.getfont(id)
+ local col = 1
+ local maxU4 = 15*(16^3+16^2+16+1)
+ a = {}
+ for k, v in pairs(fnt.characters) do
+ a [#a + 1] = k
+ end
+ table.sort(a)
+ for i, k in ipairs(a) do
+ if i >= maxChars then break end
+ if col == 1 then
+ if k > maxU4 then
+ tex.sprint(string.format("U+%06x", k))
+ else
+ tex.sprint(string.format("U+%04x", k))
+ end
+ tex.sprint("&")
+ end
+ if (i) then
+ tex.sprint(string.format([[\char%i]], k))
+ else
+ tex.sprint("~")
+ end
+ if col == maxCols then
+ tex.sprint([[\\\cline{2-]] .. maxCols+1 .. "} ")
+ col = 1
+ else
+ tex.sprint("&")
+ col = col + 1
+ end
+ end
+end
Binary files old/doc/fonts/oldstandard/fonttable.pdf and new/doc/fonts/oldstandard/fonttable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/fonttable.tex new/doc/fonts/oldstandard/fonttable.tex
--- old/doc/fonts/oldstandard/fonttable.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/fonttable.tex 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,30 @@
+\documentclass[12pt]{article}
+\usepackage{fontspec}
+
+\usepackage{array}
+\usepackage{longtable}
+\usepackage{latexcolors}
+
+\usepackage{luacode}
+\luadirect{require("fonttable.lua")}
+
+\setmainfont{Old Standard}
+
+\title{\textsc{Old Standard}}
+\author{Font Table}
+\date{}
+
+\begin{document}
+\maketitle
+
+\color{cinnamon}
+
+\begin{longtable}{>{\color{gray}\ttfamily\footnotesize}r|
+ *{10}{>{\color{black}}p{1.5em}|}}
+\cline{2-11}
+\endhead
+
+\luadirect{ft.print_glyphs(10,65463)} \\ \cline{2-11}
+\end{longtable}
+
+\end{document}
\ No newline at end of file
Binary files old/doc/fonts/oldstandard/oldstandard-samples.pdf and new/doc/fonts/oldstandard/oldstandard-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/oldstandard-samples.tex new/doc/fonts/oldstandard/oldstandard-samples.tex
--- old/doc/fonts/oldstandard/oldstandard-samples.tex 2016-07-20 00:28:40.000000000 +0200
+++ new/doc/fonts/oldstandard/oldstandard-samples.tex 2019-07-26 22:47:54.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{OldStandard}
+\usepackage[LGR,T2A,LY1]{fontenc}
+\usepackage[scale=1.0]{OldStandard}
\usepackage{lipsum}
\begin{document}
\thispagestyle{empty}
@@ -12,6 +12,9 @@
\section*{Regular}
\lipsum[1]
+\section*{Small Caps}
+\textsc{\lipsum[1]}
+
\section*{Italic}
\textit{\lipsum[2]}
@@ -19,6 +22,11 @@
\textbf{\lipsum[3]}
+\section*{Bold Italic}
+
+
+\textbf{\textit{\lipsum[4]}}
+
\section*{Numbers}
0123456789
@@ -26,4 +34,18 @@
\noindent
X\textsu{0123456789}
+\section*{LGR}
+
+
+{\oldstandardlgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+}
+
+\section*{Cyrillic}
+
+{\ifxetex\else\ifluatex\else\fontencoding{T2A}\selectfont\fi\fi
+Съешь ещё этих мягких французских булок да
+выпей чаю!}
+
\end{document}
Binary files old/doc/fonts/oldstandard/oldstandard.pdf and new/doc/fonts/oldstandard/oldstandard.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/oldstandard.tex new/doc/fonts/oldstandard/oldstandard.tex
--- old/doc/fonts/oldstandard/oldstandard.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/oldstandard.tex 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,367 @@
+\RequirePackage{filecontents}
+\begin{filecontents*}{\jobname.bib}
+@software{arabluatex,
+ title = {The arabluatex package},
+ titleaddon = {Arab\TeX\ for Lua\LaTeX},
+ author = {Alessi, Robert},
+ url = {https://ctan.org/pkg/arabluatex},
+ version = {1.17}
+}
+@software{babel,
+ title = {The Babel package},
+ titleaddon = {Multilingual support for Plain TeX or LaTeX},
+ author = {Bezos López, Javier and Braams, Johannes L.},
+ url = {http://www.ctan.org/pkg/babel},
+ version = {3.33}
+}
+@software{oldstandard,
+ title = {The OldStandard package},
+ titleaddon = {Old Standard: A Unicode Font for Classical and
+ Medieval Studies},
+ author = {Kryukov, Alexey},
+ editor = {Lečić, Nikola and Tennent, Bob},
+ editortype = {compiler},
+ url = {http://www.ctan.org/pkg/oldstandard},
+ version = {2.3}
+}
+\end{filecontents*}
+\documentclass[letterpaper]{article}
+\usepackage{fontspec}
+\usepackage[english]{babel}
+\babeltags{grc = greek}
+
+\babelfont{rm}{Old Standard}
+\babelfont[greek]{rm}[RawFeature={+ss05;+ss06}]{Old Standard}
+\babelfont{sf}{NewComputerModern Sans}
+\babelfont{tt}{NewComputerModern Mono}
+
+\newlength\defaultparindent
+\setlength\defaultparindent{\parindent}
+\usepackage{dtxdescribe}
+\setlength\parindent{\defaultparindent}
+
+\usepackage[xindy]{imakeidx}
+\indexsetup{noclearpage}
+\makeindex
+
+\usepackage{latexcolors}
+\usepackage{csquotes}
+\usepackage{varioref}
+\usepackage{hyperref}
+\hypersetup{unicode=true, linktocpage=true, colorlinks,
+ allcolors=cinnamon, pdfauthor={Robert Alessi}, pdftitle={Old
+ Standard}}
+\usepackage{uri}
+
+\usepackage{enumitem}
+\setlist{nosep}
+\setlist[itemize]{label=\textendash}
+\setlist[enumerate,1]{label=(\alph*)}
+\setlist[enumerate,2]{label=\roman*.}
+\usepackage{metalogox}
+\usepackage{lettrine}
+\usepackage{setspace}
+
+\usepackage{relsize}
+\usepackage{tikz}
+\usepackage[breakable, skins, xparse, minted]{tcolorbox}
+\tcbset{colback=white, boxrule=.15mm, colframe=cinnamon, breakable}
+\newtcblisting{example}{minted options={linenos, numbersep=0mm,
+ fontsize=\smaller}}
+\newtcblisting{code}{minted options={linenos, numbersep=0mm,
+ fontsize=\smaller}, listing only}
+
+\usepackage[fullvoc]{arabluatex}
+\usepackage[style=oxnotes-inote]{biblatex}
+\DeclareFieldFormat{postnote}{\mkpageprefix[pagination][\mknormrange]{#1}}
+\addbibresource{oldstandard.bib}
+\usepackage[citecmd=autocite,defaultindex=none]{icite}
+\bibinput{oldstandard}
+
+\usepackage{cleveref}
+
+\usepackage[toc]{multitoc}
+
+\edef\pkgver{2.5}
+\edef\pkgdate{2020/02/24}
+\title{\mdseries\tcbox[colframe=black, enhanced, tikznode, drop
+ lifted shadow, colback=white, boxrule=.25mm]%
+ {\textsc{Old Standard}\\
+ \Large
+ A Unicode Font for Classical and Medieval Studies\\
+ \large Based on Alexey Kryukov's original \emph{Old Standard}\\
+ \large v\pkgver -- \pkgdate}}
+
+\author{Robert Alessi \\
+\href{mailto:alessi@robertalessi.net?Subject=arabluatex package}%
+{\texttt{alessi(a)robertalessi.net}}}
+\date{}
+
+\begin{document}
+\maketitle
+\footnotesize
+\tableofcontents
+\normalsize
+
+\begin{abstract}
+ This font is just the same as Alexey Kryukov's beautiful \emph{Old
+ Standard}. In comparison to the previous releases of \emph{Old
+ Standard}, it includes new letters and some corrections.
+\end{abstract}
+
+\section{License}
+\label{sec:license}
+Copyright \textcopyright\ 2006--2011, Alexey Kryukov
+(\href{mailto:amkryukov@gmail.com}{amkryukov@gmail.com}), without
+Reserved Font Names.
+\\
+Copyright \textcopyright\ 2019--2020, Robert Alessi
+(\href{mailto:alessi@robertalessi.net}{alessi@robertalessi.net}), without
+Reserved Font Names.
+
+Please send error reports and suggestions for improvements to Robert
+Alessi:
+\begin{itemize}
+\item email: \mailto[oldstandard package]{alessi(a)roberalessi.net}
+\item website: \url{http://git.robertalessi.net/oldstandard/about}
+\item development: \url{http://git.robertalessi.net/oldstandard}
+\item comments, feature requests, bug reports:
+\url{https://gitlab.com/ralessi/oldstandard/issues}
+\end{itemize}
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1. This license is available with a FAQ at:
+\url{http://scripts.sil.org/OFL}
+
+\section{Documentation}
+\label{sec:documentation}
+No documentation is associated with this release of \emph{Old
+ Standard} as every item of the original extensive documentation
+applies. The reader should refer to the documentation edited for CTAN
+by Bob Tennent:\icite{oldstandard}
+\begin{itemize}
+\item
+ \href{http://mirrors.ctan.org/fonts/oldstandard/doc/oldstand-manual.pdf}%
+ {Original manual (online version)}
+\item \href{oldstand-manual.pdf}{Original manual (local version
+ included in {\TeX}Live)}
+\end{itemize}
+
+\emph{Old Standard} also has its reference web page:
+\uref{https://web.archive.org/web/20190926123235/http://thessalonica.org.ru/en/oldstandard.html}{http://thessalonica.org.ru/en/oldstandard.html}%
+\footnote{Archived on Sept. 26, 2019.}
+
+\section{History}
+\label{sec:history}
+\emph{Old Standard} is a remarkable creation of Alexey Kryukov,
+inspired by a typeface most commonly used in books printed in the late
+\textsc{xix}\textsuperscript{th} and early
+\textsc{xx}\textsuperscript{th} century. The source files, which can
+be found online,\footnote{See
+ \url{https://github.com/akryukov/oldstand}} have been published
+under the terms of the OFL license (see above,
+\vref{sec:license}). However, at the time of writing, the latest
+update dates back to Aug.\ 12, 2013. To be more precise, all of the
+five \enquote*{commits} the writer was able to see were pushed on the
+very same day. Since then, two \enquote*{pull requests} dating back to
+2017 have remained unanswered. It is therefore to be feared that the
+project has been abandoned. To date, this release of \emph{Old
+ Standard} has been published by Nikola Lečić and Bob Tennent and is
+available on CTAN and {\TeX}Live with a style file.\footnote{See
+ \url{https://ctan.org/pkg/oldstandard}}
+
+Being unable himself to contact the author, the writer, while in need
+to have new letters included in \emph{Old Standard} and some issues
+addressed, took the decision to make a new release \emph{Old
+ Standard}, while maintaining the hope that the author will one day
+resume the development of this typeface.
+
+\paragraph{Important disclaimer}
+The writer is very far from being able to design glyphs \emph{ex
+ nihilo}. That aside, he has some limited knowledge in the use of
+FontForge, and, as a classicist, he is able to scrutinize how features
+operate and if they operate as expected.
+
+\section{Additions and corrections provided}
+\label{sec:addit-corr-prov}
+This release of \emph{Old Standard} includes new letters and some
+corrections:
+\begin{enumerate}
+\item Small capitals for Roman, Greek and Cyrillic letters, in all
+ three styles, Regular, Italic and Bold have been added. Small
+ capitals, which are missing from \emph{Old Standard}, were already
+ in use a century ago in fine books which used font faces very
+ similar to \emph{Old Standard}. Typical use cases of small capitals
+ were headers, current headings and in some books proper names.
+\item \emph{For the time being}, a bold italic shape has been
+ auto-generated. Of course, auto-generating shapes is not a
+ satisfactory solution. However, it is better than using the
+ font loader to emulate bold shapes. A real bold italic shape is
+ planned in the versions of \emph{Old Standard} to come.
+\item The letter G with caron above, that is: Ǧ (\verb|U+01E6|,
+ uppercase) and ǧ (\verb|U+01E7|, lowercase) has been added. It is
+ the only character missing from \emph{Old Standard} that is needed
+ in some of the accepted standards of romanization of classical
+ Arabic. See for references the current documentation of the
+ \textsf{arabluatex} package.\footnote{\icite{arabluatex}[cite], sect{.}
+ \enquote{Transliteration}.}
+\item Additionally, this release corrects the \verb|+ss06| feature
+ which is supposed to distinguish between regular and
+ \enquote*{curled} beta (β/ϐ) and to print \enquote*{curled} beta
+ (\verb|U+03D0|) in medial position. This feature worked in most
+ cases with the previous releases. However, it failed if the beta was
+ preceded by a vowel with an acute accent taken from the Greek
+ extended Unicode block.
+\end{enumerate}
+
+\section{Usage}
+\label{sec:usage}
+\emph{Old Standard} works with \TeX\ engines that directly support
+OpenType features such as \XeTeX\ and \LuaTeX.
+
+It is loaded with \pkg{fontspec} like so:---
+\begin{code}
+ \usepackage{fontspec}
+ \setmainfont{Old Standard}
+\end{code}
+
+\paragraph{Small capitals}
+Small capitals have been added for the following languages or
+transcription schemes: French, German, Italian, Spanish, unaccented
+Greek, basic Russian and Arabic \enquote*{DMG}.
+
+The following two examples demonstrate the use of small capitals:---
+\begin{tcblisting}{minted language=latex, title=Initials, minted
+ options={fontsize=\smaller, linenos, numbersep=0mm,
+ highlightlines={7}}}
+ \begin{center}
+ CHAPTER I
+
+ MR.\ SHERLOCK HOLMES
+ \end{center}
+
+ \lettrine[loversize=0.2]{M}{r.\ Sherlock Holmes}, who was usually
+ very late in the mornings, save upon those not infrequent occasions
+ when he stayed up all night, was seated at the breakfast table. I
+ stood upon the hearth-rug and picked up the stick which our visitor
+ had left behind him the night before. It was a fine, thick piece of
+ wood, bulbous-headed, of the sort which is known as a
+ \enquote{Penang lawyer.} Just under the head was a broad silver
+ band, nearly an inch across. \enquote{To James Mortimer, M.R.C.S.,
+ from his friends of the C.C.H.,} was engraved upon it, with the
+ date \enquote{1884.} It was just such a stick as the old-fashioned
+ family practitioner used to carry—dignified, solid, and reassuring.
+\end{tcblisting}
+
+\begin{tcblisting}{minted language=latex, title=Headings, minted
+ options={linenos, numbersep=0mm, fontsize=\smaller,
+ highlightlines={11}}}
+ \doublespacing
+ \begin{center}
+ \textlarger{PART SECOND}.
+
+ ETYMOLOGY OR THE PART OF THE SPEECH.
+
+ \rule{1in}{0.4pt}
+
+ I. THE VERB, \arb{al-fi`lu}.
+
+ A. \textsc{General View}.
+
+ 1. \emph{The Forms of the Triliteral Verb}.
+ \end{center}
+\end{tcblisting}
+
+\paragraph{The letter \enquote*{ǧ}} It is used notably to print
+romanized Arabic. \emph{Old Standard} now features this letter in all
+of the three styles (Regular, Italic and Bold):---
+\begin{tcblisting}{minted language=latex, minted
+ options={fontsize=\smaller, linenos, numbersep=0mm,
+ highlightlines={3,6,9}}}
+ \begin{arab}[trans]
+ \begin{center}
+ \textbf{da^gA^gaTu \uc{'a}bI 'l-\uc{h}u_dayli 'l-\uc{`a}llAfi}
+ \end{center}
+ kAna \uc{'a}bU 'l-\uc{h}u_dayli 'ahd_A 'il_A \uc{m}uwaysiN
+ da^gA^gaTaN. wa-kAnat da^gA^gatu-hu 'llatI 'ahdA-hA dUna mA kAna
+ yuttaxa_du li-\uc{m}uwaysiN.
+
+ (\uc{al-^gA.hi.zu}, \aemph{\uc{k}itAbu 'l-\uc{b}u_halA'i})
+ \end{arab}
+\end{tcblisting}
+
+\paragraph{\texttt{+ss06} OpenType feature} It is commonly believed
+that all Greek vowels with acute accent taken from the Greek Extended
+Unicode block \verb|1F00–1FFF| along with standalone acute accents
+were duplicated from the Greek and Coptic Unicode block. Affected
+characters from the Greek Extended Unicode block (\verb|0370–03FF|)
+follow: \textgrc{ά, έ, ή, ί, ό, ύ, ώ, Ά, Έ, Ή, Ί, Ό, Ύ, Ώ, ΐ, ΰ, ´,
+ ΅}. The counterparts of these letters in the Greek and Coptic
+Unicode block are vowels with \emph{tonoi}.
+
+However, strictly speaking, \emph{tonos} is not to be mistaken for
+\enquote*{acute}: that is for sure, as \emph{tonos} was introduced as
+a result of a reform to denote a tone, namely a stress on some vowels,
+and not a pitch, namely a rising and falling voice on accented vowels.
+Confusion began when the Greek government decreed that \emph{tonos}
+shall be the acute. From what the writer could see, many Greek fonts
+originally reflected the distinction between \emph{tonos} and acute.
+But nowadays, they simply mix them up. As a result of this confusion,
+in \emph{Old Standard}, vowels with acute were simply missing from the
+Greek Extended Block. All of them, including the standalone accents,
+have been restored. Furthermore, the rule that instructed to absorb
+vowels with acute into vowels with \emph{tonos} has been removed.
+
+Since assigning vowels with \emph{tonos} and vowels with acute to the
+same code points is clearly unacceptable even if the glyphs are
+identical, it is now possible in \emph{Old Standard} to input all
+accented vowels from the Greek Extended Unicode block exclusively and
+have the substitution rules applied at the same time, as shown by the
+example that follows:---
+\begin{tcblisting}{minted language=latex, minted
+ options={fontsize=\smaller, linenos, numbersep=0mm,
+ highlightlines={9-10}}}
+ \begin{grc}
+ \begin{center}
+ \textlarger{ΙΠΠΟΚΡΑΤΟΥΣ ΕΠΙΔΗΜΙΩΝ ΤΟ ΔΕΥΤΕΡΟΝ}.
+
+ ΤΜΗΜΑ ΠΡΩΤΟΝ.
+ \end{center}
+
+ \textbf{1.} Ἄνθρακες θερινοὶ ἐν Κραννῶνι· ὗεν ἐν καύμασιν ὕδατι
+ λάβρῳ δι’ ὅλου καὶ ἐγίνετο μᾶλλον νότῳ, [καὶ] ὑπογίνονται μὲν ἐν
+ τῷ δέρματι ἰχῶρες· ἐγκαταλαμβανόμενοι δέ, θερμαίνονται, καὶ
+ κνησμὸν ἐμποιέουσιν· εἶτα φλυκταινίδες ὥσπερ πυρίκαυστοι
+ ἐπανίσταντο καὶ ὑπὸ τὸ δέρμα καίεσθαι ἐδόκεον.
+ \end{grc}
+\end{tcblisting}
+
+\subsection{Using \emph{Old Standard} in multilingual
+ documents}
+\label{sec:using-old-standard}
+\pkg{babel} provides a high level interface on top of \pkg{fontspec}
+to select fonts depending on the languages to be used.\icite[For more
+information, the reader should refer to][10,24]{babel} As an example,
+here is how \emph{Old Standard} has been loaded in the preamble of
+this document to be compiled with \LuaLaTeX:---
+\begin{code}
+ \usepackage[no-math]{fontspec}
+ \usepackage{fontspec}
+ \usepackage[greek.ancient,english]{babel}
+ \babeltags{grc = greek}
+
+ \babelfont{rm}{Old Standard}
+
+ \babelfont[greek]{rm}[RawFeature={+ss05;+ss06}]{Old Standard}
+\end{code}
+
+Then, once \emph{Old Standard} has been loaded with \cs{babelfont}
+properly,
+\begin{enumerate}
+\item \cs{textgrc}\marg{Greek text} can be used for short insertions
+ of Greek text.
+\item \verb|\begin{grc}| ... \verb|\end{grc}| can be used for
+ inserting running paragraphs of Greek text.
+\end{enumerate}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oldstandard.doc.tlpobj new/tlpkg/tlpobj/oldstandard.doc.tlpobj
--- old/tlpkg/tlpobj/oldstandard.doc.tlpobj 2019-02-28 03:57:55.000000000 +0100
+++ new/tlpkg/tlpobj/oldstandard.doc.tlpobj 2020-03-24 02:03:00.000000000 +0100
@@ -1,21 +1,29 @@
name oldstandard.doc
category Package
-revision 41735
+revision 54512
shortdesc doc files of oldstandard
relocated 1
-docfiles size=339
+docfiles size=415
RELOC/doc/fonts/oldstandard/FONTLOG.txt
+ RELOC/doc/fonts/oldstandard/NewComputerModern.fontspec
+ RELOC/doc/fonts/oldstandard/NewComputerModernMono.fontspec
+ RELOC/doc/fonts/oldstandard/NewComputerModernSans.fontspec
RELOC/doc/fonts/oldstandard/OFL-FAQ.txt
RELOC/doc/fonts/oldstandard/OFL.txt
RELOC/doc/fonts/oldstandard/README
RELOC/doc/fonts/oldstandard/didot-de.png
RELOC/doc/fonts/oldstandard/didot-fr.png
+ RELOC/doc/fonts/oldstandard/fonttable.lua
+ RELOC/doc/fonts/oldstandard/fonttable.pdf
+ RELOC/doc/fonts/oldstandard/fonttable.tex
RELOC/doc/fonts/oldstandard/gendocs.sh
RELOC/doc/fonts/oldstandard/greek-contextual.png
RELOC/doc/fonts/oldstandard/oldstand-manual.pdf
RELOC/doc/fonts/oldstandard/oldstand-manual.tex
RELOC/doc/fonts/oldstandard/oldstandard-samples.pdf
RELOC/doc/fonts/oldstandard/oldstandard-samples.tex
+ RELOC/doc/fonts/oldstandard/oldstandard.pdf
+ RELOC/doc/fonts/oldstandard/oldstandard.tex
RELOC/doc/fonts/oldstandard/opentype.png
RELOC/doc/fonts/oldstandard/serbian.png
RELOC/doc/fonts/oldstandard/spadmin-add.png
++++++ oldstandard.tar.xz ++++++
++++ 5756 lines of diff (skipped)
++++++ olsak-misc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/olsak-misc/README new/doc/generic/olsak-misc/README
--- old/doc/generic/olsak-misc/README 2016-06-23 00:28:57.000000000 +0200
+++ new/doc/generic/olsak-misc/README 2019-05-09 23:26:05.000000000 +0200
@@ -22,6 +22,7 @@
1996--2016 ... files are created and released at
http://petr.olsak.net/ftp/olsak/makra/
<Jun. 2016> ver.1 ... files contributed to CTAN as one "bundle" olsak-misc
+<May 2019> ... qrcode: bug fixed
License:
-------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/olsak-misc.doc.tlpobj new/tlpkg/tlpobj/olsak-misc.doc.tlpobj
--- old/tlpkg/tlpobj/olsak-misc.doc.tlpobj 2019-02-28 03:57:56.000000000 +0100
+++ new/tlpkg/tlpobj/olsak-misc.doc.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,6 +1,6 @@
name olsak-misc.doc
category Package
-revision 41526
+revision 54080
shortdesc doc files of olsak-misc
relocated 1
docfiles size=49
++++++ olsak-misc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/olsak-misc/qrcode.tex new/tex/generic/olsak-misc/qrcode.tex
--- old/tex/generic/olsak-misc/qrcode.tex 2016-06-23 00:28:57.000000000 +0200
+++ new/tex/generic/olsak-misc/qrcode.tex 2019-05-09 23:26:05.000000000 +0200
@@ -138,11 +138,10 @@
\fi
}
-
-\long\def\isnextchar#1#2#3{\def\tmpa{#2}\def\tmpb{#3}%
+\long\def\isnextchar#1#2#3{\begingroup\toks0={\endgroup#2}\toks1={\endgroup#3}%
\let\tmp=#1\futurelet\next\isnextcharA
}
-\def\isnextcharA{\ifx\tmp\next\expandafter\tmpa\else\expandafter\tmpb\fi}
+\def\isnextcharA{\the\toks\ifx\tmp\next0\else1\fi\space}
\long\def\xaddto#1#2{\expandafter\xdef\expandafter#1\expandafter{#1#2}}
\let\g@addto@macro=\xaddto
@@ -2759,7 +2758,7 @@
}
\def\qrrestoreB#1{\advance \qr@j by1
\ifx1#1\vrule height\qrmodulesize width\qrmodulesize\else \kern\qrmodulesize\fi
- \ifnum\qr@size=\qr@j \padd\egroup \advance\qr@i by1
+ \ifnum\qr@size=\qr@j \vrule height\qrmodulesize width 0pt \padd\egroup \advance\qr@i by1
\ifnum\qr@size=\qr@i \padd\egroup \let\next=\relax \else \hbox\bgroup\padd \fi
\fi \next
}
@@ -2866,5 +2865,7 @@
History
-------
-Jun 2015 released
+Jun. 2015 released
Jul. 2015 \xprncodes=0space (bug fixed)
+Sep. 2018 \isnextchar processed in group
+May 2019 strut included for case of empty line (bug fixed)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/olsak-misc.tlpobj new/tlpkg/tlpobj/olsak-misc.tlpobj
--- old/tlpkg/tlpobj/olsak-misc.tlpobj 2019-02-28 03:57:56.000000000 +0100
+++ new/tlpkg/tlpobj/olsak-misc.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,9 +1,9 @@
name olsak-misc
category Package
-revision 41526
-shortdesc Collection with plain TeX macros written by Petr Olsak
+revision 54080
+shortdesc Collection of plain TeX macros written by Petr Olsak
relocated 1
-longdesc This is a collection with various single-file plain TeX macros
+longdesc This is a collection of various single-file plain TeX macros
longdesc written by Petr Olsak. The documentation is included in each
longdesc file separately. booklet.tex: re-orders PDF pages and collects
longdesc them for booklet printing cnv.tex: conversion of texts
@@ -23,6 +23,6 @@
RELOC/tex/generic/olsak-misc/xmlparser.tex
catalogue-contact-home http://petr.olsak.net/ftp/olsak/makra/
catalogue-ctan /macros/generic/olsak-misc
-catalogue-date 2018-01-07 12:06:50 +0100
catalogue-license pd
catalogue-topics misc-support
+catalogue-version May 2019
++++++ omegaware.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/odvicopy.man1.pdf and new/texmf-dist/doc/man/man1/odvicopy.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/odvitype.man1.pdf and new/texmf-dist/doc/man/man1/odvitype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ofm2opl.1 new/texmf-dist/doc/man/man1/ofm2opl.1
--- old/texmf-dist/doc/man/man1/ofm2opl.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ofm2opl.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OFM2OPL 1 "14 April 2016" "Web2C 2019"
+.TH OFM2OPL 1 "14 April 2016" "Web2C 2020"
.PP
.SH "NAME"
ofm2opl \- convert Omega and TeX font-metric files to property-list files
Binary files old/texmf-dist/doc/man/man1/ofm2opl.man1.pdf and new/texmf-dist/doc/man/man1/ofm2opl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/opl2ofm.1 new/texmf-dist/doc/man/man1/opl2ofm.1
--- old/texmf-dist/doc/man/man1/opl2ofm.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/opl2ofm.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OPL2OFM 1 "16 June 2015" "Web2C 2019"
+.TH OPL2OFM 1 "16 June 2015" "Web2C 2020"
.PP
.SH "NAME"
opl2ofm \- convert Omega and TeX property-list files to font-metric files
Binary files old/texmf-dist/doc/man/man1/opl2ofm.man1.pdf and new/texmf-dist/doc/man/man1/opl2ofm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/otangle.man1.pdf and new/texmf-dist/doc/man/man1/otangle.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/otp2ocp.man1.pdf and new/texmf-dist/doc/man/man1/otp2ocp.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/outocp.man1.pdf and new/texmf-dist/doc/man/man1/outocp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ovf2ovp.1 new/texmf-dist/doc/man/man1/ovf2ovp.1
--- old/texmf-dist/doc/man/man1/ovf2ovp.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ovf2ovp.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OVF2OVP 1 "14 April 2016" "Web2C 2019"
+.TH OVF2OVP 1 "14 April 2016" "Web2C 2020"
.PP
.SH "NAME"
ovf2ovp \- convert virtual font file and associated font metrics to property-list format
Binary files old/texmf-dist/doc/man/man1/ovf2ovp.man1.pdf and new/texmf-dist/doc/man/man1/ovf2ovp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ovp2ovf.1 new/texmf-dist/doc/man/man1/ovp2ovf.1
--- old/texmf-dist/doc/man/man1/ovp2ovf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ovp2ovf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OVP2OVF 1 "16 June 2015" "Web2C 2019"
+.TH OVP2OVF 1 "16 June 2015" "Web2C 2020"
.PP
.SH "NAME"
ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file
Binary files old/texmf-dist/doc/man/man1/ovp2ovf.man1.pdf and new/texmf-dist/doc/man/man1/ovp2ovf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/omegaware.doc.tlpobj new/tlpkg/tlpobj/omegaware.doc.tlpobj
--- old/tlpkg/tlpobj/omegaware.doc.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/omegaware.doc.tlpobj 2020-03-14 01:43:17.000000000 +0100
@@ -1,6 +1,6 @@
name omegaware.doc
category TLCore
-revision 50602
+revision 54276
shortdesc doc files of omegaware
docfiles size=61
texmf-dist/doc/man/man1/odvicopy.1
++++++ onedown.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onedown/README new/doc/latex/onedown/README
--- old/doc/latex/onedown/README 2019-02-23 23:18:17.000000000 +0100
+++ new/doc/latex/onedown/README 2019-10-21 22:51:57.000000000 +0200
@@ -1,11 +1,11 @@
--------------------------------------------------------------------------
-The OneDown package v1.3 - 2019/02/21
+The OneDown package v1.4 - 2019/10/15
A package to typeset diagrams for the game of bridge
--------------------------------------------------------------------------
Jacob Wiersma
Web:
-E-Mail: jack46(a)online.de
+E-Mail: jack(a)schuli-wirsi.de
--------------------------------------------------------------------------
Copyright 2018 Jacob Wiersma
@@ -33,6 +33,7 @@
- ODw-danish.trsl ODw-english.trsl ODw-french.trsl
ODw-norwegian.trsl ODw-turkish.trsl ODw-dutch.trsl
ODw-fallback.trsl ODw-german.trsl ODw-swedish.trsl
+ ODw-spanish.trsl
the directory examples with the files
- onedown-examples.pdf onedown-ref.pdf
@@ -67,11 +68,17 @@
MORE DOCUMENTATION
- examples/onedown-examples.pdf
- examples/onedown-ref.pdf
+These are in english. To get PDFs which shows the (output of) onedown commands
+in your language run
+ pdflatex '\AtBeginDocument{\def\RefLang{french}}\input{onedown-ref.tex}'
+or
+ pdflatex '\AtBeginDocument{\def\ExLang{norsk}}\input{onedown-examples.tex}'
+This works for all supported languages
--------------------------------------------------------------------------
DESCRIPTION
This packages provides macros to typeset bridge diagrams, including hands
-(stand alone or arround a compass), bidding tables (stand alone or in
+(stand alone or around a compass), bidding tables (stand alone or in
connection with hands/compass), trick tables and expert quizes.
--------------------------------------------------------------------------
REQUIREMENTS
Binary files old/doc/latex/onedown/examples/onedown-examples.pdf and new/doc/latex/onedown/examples/onedown-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onedown/examples/onedown-examples.tex new/doc/latex/onedown/examples/onedown-examples.tex
--- old/doc/latex/onedown/examples/onedown-examples.tex 2018-11-02 21:53:02.000000000 +0100
+++ new/doc/latex/onedown/examples/onedown-examples.tex 2019-10-21 22:51:57.000000000 +0200
@@ -1,6 +1,6 @@
%%
%% onedown-examples.tex
-%% April 16, 2018
+%% Oct 04, 2019
%% Requires the onedown bundle
%% Part of the OneDown bundle (mirror.ctan.org/onedown)
%% author: J. Wiersma
@@ -17,9 +17,17 @@
\usepackage[T1]{fontenc}
%
\usepackage{subfiles}% can compile stand-alone/combined
-\usepackage[dutch,norsk,%
- turkish,shorthands=,% avoid problems with ':', '=' and '!'
- german,english]{babel}% introduce possible languages
+\usepackage[%
+ danish,%
+ dutch,%
+ french,%
+ german,%
+ norsk,%
+ spanish,es-noshorthands,% unset active chars to avoid problems with '.' '’' '"' '~' '<' and '>'
+ swedish,%
+ turkish,shorthands=,% unset active chars to avoid problems with ':', '=' and '!'
+ english,%
+]{babel}% introduce all known languages, default is english
%\usepackage[mono=false]{libertine}% verbatim needs option mono=false
% linertine screws verbatim, at least I don't know how to handle that
@@ -104,8 +112,15 @@
\def\SubFile#1{\def\FileName{#1}\newpage\section{#1}\subfile{#1}}
\addtolength{\textheight}{1.5cm}
-
+\def\ExLang{english}
\begin{document}
+% when compiled with:
+% pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'
+% you'll get the onedown commands expansions in YourLanguage
+% YourLanguage can be any language out of:
+% english, danish, dutch, french, german, norsk, spanish, swedish, turkish
+%
+\expandafter\selectlanguage\expandafter{\ExLang}
\pdfbookmark[1]{Title}{Title}
\title{Examples for the\\\OneDown package%
\footnote{This file is part of the \OneDown bundle. To generate this file,
@@ -137,6 +152,12 @@
examples are produced using the \textsf{tcolorbox} package. This enables us
to show the code and the output of it side by side.
+The explanatory text is always in the English language. But you can show the output of all commands
+in any of the supported languages.\\
+These are: english, danish, dutch, french, german, norsk, spanish, swedish, turkish. \\
+You obtain this output in \emph{YourLanguage} by compiling onedown-ref.tex with: \\[0.2em]
+
+\verb|pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-examples.tex}'|
\par\vspace{1\baselineskip}
\setlength\columnseprule{.8pt}% rule between cols
\begin{multicols}{3}[{\centering \textbf{\Large List of Examples}}]
Binary files old/doc/latex/onedown/examples/onedown-ref.pdf and new/doc/latex/onedown/examples/onedown-ref.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onedown/examples/onedown-ref.tex new/doc/latex/onedown/examples/onedown-ref.tex
--- old/doc/latex/onedown/examples/onedown-ref.tex 2019-02-23 23:18:17.000000000 +0100
+++ new/doc/latex/onedown/examples/onedown-ref.tex 2019-10-21 22:51:57.000000000 +0200
@@ -1,4 +1,41 @@
-\documentclass[onedown-examples]{subfiles}
+%%
+%% onedown-ref.tex
+%% Oct 04, 2019
+%% Requires the onedown bundle
+%% Part of the OneDown bundle (mirror.ctan.org/onedown)
+%% author: J. Wiersma
+%%--------NOTE-------------------------------------------
+%% USAGE: (pdf)latex onedown-ref.tex
+%%-------------------------------------------------------
+
+\documentclass[a4paper,fontsize=11pt]{scrartcl}
+\usepackage{scrlayer-scrpage}
+%
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+%
+\usepackage[%
+ danish,%
+ dutch,%
+ french,%
+ german,%
+ norsk,%
+ spanish,es-noshorthands,% unset active chars to avoid problems with '.' '’' '"' '~' '<' and '>'
+ swedish,%
+ turkish,shorthands=,% unset active chars to avoid problems with ':', '=' and '!'
+ english,%
+]{babel}% introduce all known languages, default is english
+
+\usepackage{onedown}% our own style to set bridge stuff
+\usepackage[a4paper, total={185mm, 257mm},left=12mm,top=20mm]{geometry}
+\newcommand\OneDown{\textcolor{red}{\smaller\bfseries\textsc{OneDown}}\xspace}
+\usepackage{shortvrb}
+\MakeShortVerb{\|}
+\usepackage{enumitem}%
+%\fi
+%
+%%%
+%
\usepackage[Q=yes]{examplep}
\makeatletter
\def\verbatim@font{\ttfamily\bfseries
@@ -19,9 +56,16 @@
%
\definecolor{optbackgr}{named}{lightgray}
\newcommand\Oarg[1]{\colorbox{optbackgr}{\texttt{#1}}}
-
+% default language to show the onedown command
+\def\RefLang{english}
\begin{document}
-
+% when compiled with:
+% pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'
+% you'll get the onedown commands expansions in YourLanguage
+% YourLanguage can be any language out of:
+% english, danish, dutch, french, german, norsk, spanish, swedish, turkish
+%
+\expandafter\selectlanguage\expandafter{\RefLang}
\larger
\newgeometry{total={150mm, 265mm},left=25mm,top=15mm}
\pagestyle{empty}
@@ -37,8 +81,14 @@
background color, like \Oarg{*!}. Output of a tokenized |\macro*!| is shown
as:
\quad|\macro|\Oarg{*!}|: \macro, \macro*, \macro!, \macro*!|\\
-All output is shown for the English language.
-
+The explanatory text is always in the English language. But you can show the output of all commands
+in any of the supported languages.\\
+These are: english, danish, dutch, french, german, norsk, spanish, swedish, turkish. \\
+You obtain this output in \emph{YourLanguage} by compiling onedown-ref.tex with: \\[0.5em]
+%
+\verb|pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'|
+\\[0.7em]
+\centerline{\textbf{This document shows the commands for the \emph{\RefLang}\ language}}
\begin{description}[itemsep=-0.3em]
\item[ace]: \ace
\item[Ace\Oarg{*!}]: \Ace, \Ace*, \Ace!, \Ace*!
@@ -118,7 +168,7 @@
\item[eastwest]: \eastwest
\item[Eastwest\Oarg{*!}]: \EastWest, \EastWest*, \EastWest!, \EastWest*!
-\item[expertquiz\Oarg{*!}\Q{[comment]}{award}]\\
+\item[expertquiz\Oarg{*!}\Q{[comment]{award}}]\\
Typesets a quiz, showing a
predefined hand and a predefined bidding diagram. The star version centers
the output. The token |!| forces a newline between hand and bidding
@@ -460,6 +510,7 @@
8 & {\Pass*!} & {\Double*!} & {\Redouble*!} & {\Allpass*!} \\
9 & {\pass} & {\double} & {\redouble} & {\allpass} \\
\end{tabular}\\
+
\end{document}
\endinput
Binary files old/doc/latex/onedown/onedown.pdf and new/doc/latex/onedown/onedown.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onedown.doc.tlpobj new/tlpkg/tlpobj/onedown.doc.tlpobj
--- old/tlpkg/tlpobj/onedown.doc.tlpobj 2019-02-28 03:58:05.000000000 +0100
+++ new/tlpkg/tlpobj/onedown.doc.tlpobj 2019-10-25 01:54:26.000000000 +0200
@@ -1,9 +1,9 @@
name onedown.doc
category Package
-revision 50104
+revision 52525
shortdesc doc files of onedown
relocated 1
-docfiles size=535
+docfiles size=546
RELOC/doc/latex/onedown/README
RELOC/doc/latex/onedown/examples/Bidding.tex
RELOC/doc/latex/onedown/examples/Compass.tex
++++++ onedown.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-danish.trsl new/tex/latex/onedown/ODw-danish.trsl
--- old/tex/latex/onedown/ODw-danish.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-danish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
%% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare
%
-\ProvideDictionaryFor{danish}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{danish}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
@@ -123,7 +123,7 @@
\NewDictTranslation{redoubled-(ODw)}{redubbelt}
\NewDictTranslation{Redoubled-(ODw)}{Redubbelt}
\NewDictTranslation{redouble-(ODw)}{redubbelt}
-\NewDictTranslation{Redouble-(ODw)}{Redubbelt}
+\NewDictTranslation{ReDouble-(ODw)}{Redubbelt}
\NewDictTranslation{semi forcing-(ODw)}{semi forcing}
\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing}
\NewDictTranslation{sf-(ODw)}{sf}
@@ -140,8 +140,8 @@
\NewDictTranslation{Third Suit Forcing-(ODw)}{Tredje Farve Forcing}
\NewDictTranslation{total points-(ODw)}{total points}
\NewDictTranslation{Total Points-(ODw)}{Total Points}
-\NewDictTranslation{tp-(ODw)}{sp}
-\NewDictTranslation{TP-(ODw)}{SP}
+\NewDictTranslation{tp-(ODw)}{tp}
+\NewDictTranslation{TP-(ODw)}{TP}
\NewDictTranslation{trial bid-(ODw)}{trial bid}
\NewDictTranslation{Trial bid-(ODw)}{Trial bid}
\NewDictTranslation{trick-(ODw)}{træk}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-dutch.trsl new/tex/latex/onedown/ODw-dutch.trsl
--- old/tex/latex/onedown/ODw-dutch.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-dutch.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer
%
-\ProvideDictionaryFor{dutch}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{dutch}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1ste}
\NewDictTranslation{2nd-(ODw)}{2de}
@@ -119,15 +119,15 @@
\NewDictTranslation{Q-(ODw)}{V}
\NewDictTranslation{queen-(ODw)}{vrouw}
\NewDictTranslation{Queen-(ODw)}{Vrouw}
-\NewDictTranslation{ReDbl-(ODw)}{ReDbl}
+\NewDictTranslation{ReDbl-(ODw)}{ReDblt}
\NewDictTranslation{redoubled-(ODw)}{geredoubleerd}
\NewDictTranslation{Redoubled-(ODw)}{Geredoubleerd}
\NewDictTranslation{redouble-(ODw)}{redoublet}
-\NewDictTranslation{Redouble-(ODw)}{Redoublet}
+\NewDictTranslation{ReDouble-(ODw)}{Redoublet}
\NewDictTranslation{semi forcing-(ODw)}{semi-mancheforcing}
\NewDictTranslation{Semi Forcing-(ODw)}{Semi-MancheForcing}
-\NewDictTranslation{sf-(ODw)}{sf}
-\NewDictTranslation{SF-(ODw)}{SF}
+\NewDictTranslation{sf-(ODw)}{smf}
+\NewDictTranslation{SF-(ODw)}{SMF}
\NewDictTranslation{s-(ODw)}{z}
\NewDictTranslation{S-(ODw)}{Z}
\NewDictTranslation{south-(ODw)}{zuid}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-english.trsl new/tex/latex/onedown/ODw-english.trsl
--- old/tex/latex/onedown/ODw-english.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-english.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer
%
-\ProvideDictionaryFor{english}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{english}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1st}
\NewDictTranslation{2nd-(ODw)}{2nd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-fallback.trsl new/tex/latex/onedown/ODw-fallback.trsl
--- old/tex/latex/onedown/ODw-fallback.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-fallback.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer
%
-\ProvideDictionaryFor{fallback}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{fallback}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1st}
\NewDictTranslation{2nd-(ODw)}{2nd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-french.trsl new/tex/latex/onedown/ODw-french.trsl
--- old/tex/latex/onedown/ODw-french.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-french.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get donneur
%
-\ProvideDictionaryFor{french}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{french}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1er}
\NewDictTranslation{2nd-(ODw)}{2e}
@@ -28,8 +28,8 @@
\NewDictTranslation{Bid-(ODw)}{Enchère}
\NewDictTranslation{board-(ODw)}{etui}
\NewDictTranslation{Board-(ODw)}{Etui}
-\NewDictTranslation{brd-(ODw)}{bte}
-\NewDictTranslation{Brd-(ODw)}{Bte}
+\NewDictTranslation{brd-(ODw)}{etui}
+\NewDictTranslation{Brd-(ODw)}{Etui}
\NewDictTranslation{by-(ODw)}{pour}
\NewDictTranslation{call-(ODw)}{annonce}
\NewDictTranslation{Call-(ODw)}{Annonce}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-german.trsl new/tex/latex/onedown/ODw-german.trsl
--- old/tex/latex/onedown/ODw-german.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-german.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get teiler
%
-\ProvideDictionaryFor{german}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{german}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
@@ -38,7 +38,7 @@
\NewDictTranslation{Contract-(ODw)}{Kontrakt}
\NewDictTranslation{contr-(ODw)}{kontr}
\NewDictTranslation{Contr-(ODw)}{Kontr}
-\NewDictTranslation{Dbl-(ODw)}{Kontra}
+\NewDictTranslation{Dbl-(ODw)}{Kntr}
\NewDictTranslation{dealer-(ODw)}{teiler}
\NewDictTranslation{Dealer-(ODw)}{Teiler}
\NewDictTranslation{deal!-(ODw)}{aust}
@@ -119,11 +119,11 @@
\NewDictTranslation{Q-(ODw)}{D}
\NewDictTranslation{queen-(ODw)}{dame}
\NewDictTranslation{Queen-(ODw)}{Dame}
-\NewDictTranslation{ReDbl-(ODw)}{ReKontra}
+\NewDictTranslation{ReDbl-(ODw)}{ReKntr}
\NewDictTranslation{redoubled-(ODw)}{rekontriert}
\NewDictTranslation{Redoubled-(ODw)}{Rekontriert}
\NewDictTranslation{redouble-(ODw)}{rekontra}
-\NewDictTranslation{Redouble-(ODw)}{Rekontra}
+\NewDictTranslation{ReDouble-(ODw)}{ReKontra}
\NewDictTranslation{semi forcing-(ODw)}{semi forcing}
\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing}
\NewDictTranslation{sf-(ODw)}{sf}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-norwegian.trsl new/tex/latex/onedown/ODw-norwegian.trsl
--- old/tex/latex/onedown/ODw-norwegian.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-norwegian.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare
%
-\ProvideDictionaryFor{norwegian}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{norwegian}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
@@ -123,7 +123,7 @@
\NewDictTranslation{redoubled-(ODw)}{redoblet}
\NewDictTranslation{Redoubled-(ODw)}{Redoblet}
\NewDictTranslation{redouble-(ODw)}{redoblet}
-\NewDictTranslation{Redouble-(ODw)}{Redoblet}
+\NewDictTranslation{ReDouble-(ODw)}{Redoblet}
\NewDictTranslation{semi forcing-(ODw)}{RundKrav}
\NewDictTranslation{Semi Forcing-(ODw)}{RundKrav}
\NewDictTranslation{sf-(ODw)}{rk}
@@ -140,8 +140,8 @@
\NewDictTranslation{Third Suit Forcing-(ODw)}{Tredje Farge Forcing}
\NewDictTranslation{total points-(ODw)}{totalt poeng}
\NewDictTranslation{Total Points-(ODw)}{Totalt Poeng}
-\NewDictTranslation{tp-(ODw)}{sp}
-\NewDictTranslation{TP-(ODw)}{SP}
+\NewDictTranslation{tp-(ODw)}{tp}
+\NewDictTranslation{TP-(ODw)}{TP}
\NewDictTranslation{trial bid-(ODw)}{prøving bud}
\NewDictTranslation{Trial bid-(ODw)}{Prøving bud}
\NewDictTranslation{trick-(ODw)}{trekk}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-spanish.trsl new/tex/latex/onedown/ODw-spanish.trsl
--- old/tex/latex/onedown/ODw-spanish.trsl 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/onedown/ODw-spanish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -0,0 +1,160 @@
+% this is file ODw-spanish.trsl from the OneDown bundle
+%
+% Entries with a "!" denote an abreviated form
+%
+% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get donneur
+%
+\ProvideDictionaryFor{spanish}{ODw}[V0.51-2019/10/15]
+
+\NewDictTranslation{1st-(ODw)}{1er}
+\NewDictTranslation{2nd-(ODw)}{2do}
+\NewDictTranslation{3rd-(ODw)}{3er}
+\NewDictTranslation{4th-(ODw)}{4th}
+\NewDictTranslation{ace-(ODw)}{as}
+\NewDictTranslation{Ace-(ODw)}{As}
+\NewDictTranslation{all-(ODw)}{todos}
+\NewDictTranslation{All-(ODw)}{Todos}
+\NewDictTranslation{all!-(ODw)}{todos}
+\NewDictTranslation{All!-(ODw)}{Todos}
+\NewDictTranslation{all pass-(ODw)}{todos pasan}
+\NewDictTranslation{All pass-(ODw)}{Todos pasan}
+\NewDictTranslation{a-(ODw)}{a}
+\NewDictTranslation{A-(ODw)}{A}
+\NewDictTranslation{ap-(ODw)}{tp}
+\NewDictTranslation{AP-(ODw)}{TP}
+\NewDictTranslation{award-(ODw)}{premio}
+\NewDictTranslation{Award-(ODw)}{Premio}
+\NewDictTranslation{bid-(ODw)}{contrato}
+\NewDictTranslation{Bid-(ODw)}{Contrato}
+\NewDictTranslation{board-(ODw)}{estuche}
+\NewDictTranslation{Board-(ODw)}{Estuche}
+\NewDictTranslation{brd-(ODw)}{est}
+\NewDictTranslation{Brd-(ODw)}{Est}
+\NewDictTranslation{by-(ODw)}{por}
+\NewDictTranslation{call-(ODw)}{annonce}
+\NewDictTranslation{Call-(ODw)}{Annonce}
+\NewDictTranslation{-card-(ODw)}{-carta}
+\NewDictTranslation{contract-(ODw)}{contrato final}
+\NewDictTranslation{Contract-(ODw)}{Contrato final}
+\NewDictTranslation{contr-(ODw)}{ctrf}
+\NewDictTranslation{Contr-(ODw)}{Ctrf}
+\NewDictTranslation{Dbl-(ODw)}{Dbl}
+\NewDictTranslation{dealer-(ODw)}{dador}
+\NewDictTranslation{Dealer-(ODw)}{Dador}
+\NewDictTranslation{deal!-(ODw)}{donne}
+\NewDictTranslation{Deal!-(ODw)}{Donne}
+\NewDictTranslation{deal-(ODw)}{donne}
+\NewDictTranslation{Deal-(ODw)}{Donne}
+\NewDictTranslation{declarer-(ODw)}{declarante}
+\NewDictTranslation{Declarer-(ODw)}{Declarante}
+\NewDictTranslation{decl-(ODw)}{decl}
+\NewDictTranslation{Decl-(ODw)}{Decl}
+\NewDictTranslation{distribution points-(ODw)}{puntos de distribución}
+\NewDictTranslation{Distribution Points-(ODw)}{Puntos de Distribución}
+\NewDictTranslation{doubled-(ODw)}{doblado}
+\NewDictTranslation{Doubled-(ODw)}{Doblado}
+\NewDictTranslation{double-(ODw)}{doblo}
+\NewDictTranslation{Double-(ODw)}{Doblo}
+\NewDictTranslation{dp-(ODw)}{pd}
+\NewDictTranslation{DP-(ODw)}{PD}
+\NewDictTranslation{east-(ODw)}{este}
+\NewDictTranslation{East-(ODw)}{Este}
+\NewDictTranslation{e-(ODw)}{e}
+\NewDictTranslation{E-(ODw)}{E}
+\NewDictTranslation{fourth suit forcing-(ODw)}{cuarto palo forcing}
+\NewDictTranslation{Fourth Suit Forcing-(ODw)}{Cuarto Palo Forcing}
+\NewDictTranslation{fsf-(ODw)}{4th\,pf}
+\NewDictTranslation{FSF-(ODw)}{4th\,PF}
+\NewDictTranslation{game forcing-(ODw)}{forcing a manga}
+\NewDictTranslation{Game Forcing-(ODw)}{Forcing a Manga}
+\NewDictTranslation{GF-(ODw)}{FG}
+\NewDictTranslation{gf-(ODw)}{fg}
+\NewDictTranslation{hand-(ODw)}{mano}
+\NewDictTranslation{Hand-(ODw)}{Mano}
+\NewDictTranslation{hcp-(ODw)}{ph}
+\NewDictTranslation{HCP-(ODw)}{PH}
+\NewDictTranslation{high card points-(ODw)}{puntos de honores}
+\NewDictTranslation{High Card Points-(ODw)}{Puntos de Honores}
+\NewDictTranslation{hlp-(ODw)}{hl}
+\NewDictTranslation{HLP-(ODw)}{HL}
+\NewDictTranslation{jack-(ODw)}{jaco}
+\NewDictTranslation{Jack-(ODw)}{Jaco}
+\NewDictTranslation{j-(ODw)}{j}
+\NewDictTranslation{J-(ODw)}{J}
+\NewDictTranslation{king-(ODw)}{rey}
+\NewDictTranslation{King-(ODw)}{Rey}
+\NewDictTranslation{k-(ODw)}{r}
+\NewDictTranslation{K-(ODw)}{R}
+\NewDictTranslation{lead!-(ODw)}{ent.}
+\NewDictTranslation{Lead!-(ODw)}{Ent.}
+\NewDictTranslation{lead-(ODw)}{entame}
+\NewDictTranslation{Lead-(ODw)}{Entame}
+\NewDictTranslation{length points-(ODw)}{points de longueur}
+\NewDictTranslation{Length Points-(ODw)}{Points de Longueur}
+\NewDictTranslation{lp-(ODw)}{pl}
+\NewDictTranslation{LP-(ODw)}{PL}
+\NewDictTranslation{new minor forcing-(ODw)}{neuvo menor forcing}
+\NewDictTranslation{New Minor Forcing-(ODw)}{Neuvo Menor Forcing}
+\NewDictTranslation{nmf-(ODw)}{nmf}
+\NewDictTranslation{NMF-(ODw)}{NMF}
+\NewDictTranslation{n-(ODw)}{n}
+\NewDictTranslation{N-(ODw)}{N}
+\NewDictTranslation{none-(ODw)}{nadie}
+\NewDictTranslation{None-(ODw)}{Nadie}
+\NewDictTranslation{none!-(ODw)}{nadie}
+\NewDictTranslation{None!-(ODw)}{Nadie}
+\NewDictTranslation{north-(ODw)}{norte}
+\NewDictTranslation{North-(ODw)}{Norte}
+\NewDictTranslation{no trump-(ODw)}{sin triunfo}
+\NewDictTranslation{No Trump-(ODw)}{Sin Triunfo}
+\NewDictTranslation{Nr-(ODw)}{\textnumero}
+\NewDictTranslation{Nr.-(ODw)}{\textnumero.}
+\NewDictTranslation{nt-(ODw)}{st}
+\NewDictTranslation{NT-(ODw)}{S\kern-0.01emT}
+\NewDictTranslation{pass-(ODw)}{paso}
+\NewDictTranslation{Pass-(ODw)}{Paso}
+\NewDictTranslation{pass!-(ODw)}{p}
+\NewDictTranslation{Pass!-(ODw)}{P}
+\NewDictTranslation{q-(ODw)}{d}
+\NewDictTranslation{Q-(ODw)}{D}
+\NewDictTranslation{queen-(ODw)}{dama}
+\NewDictTranslation{Queen-(ODw)}{Dama}
+\NewDictTranslation{ReDbl-(ODw)}{ReDbl}
+\NewDictTranslation{redoubled-(ODw)}{redoblado}
+\NewDictTranslation{Redoubled-(ODw)}{Redoblado}
+\NewDictTranslation{redouble-(ODw)}{redoblo}
+\NewDictTranslation{Redouble-(ODw)}{Redoblo}
+\NewDictTranslation{semi forcing-(ODw)}{semi forcing}
+\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing}
+\NewDictTranslation{SF-(ODw)}{SF}
+\NewDictTranslation{sf-(ODw)}{sf}
+\NewDictTranslation{s-(ODw)}{s}
+\NewDictTranslation{S-(ODw)}{S}
+\NewDictTranslation{south-(ODw)}{sur}
+\NewDictTranslation{South-(ODw)}{Sur}
+\NewDictTranslation{suiter-(ODw)}{color}
+\NewDictTranslation{Suiter-(ODw)}{Color}
+\NewDictTranslation{suit-(ODw)}{palo}
+\NewDictTranslation{Suit-(ODw)}{Palo}
+\NewDictTranslation{third suit forcing-(ODw)}{tercer palo forcing}
+\NewDictTranslation{Third Suit Forcing-(ODw)}{Tercer Palo Forcing}
+\NewDictTranslation{total points-(ODw)}{puntos de honor-distribución}
+\NewDictTranslation{Total Points-(ODw)}{Puntos de Honor-Distribución}
+\NewDictTranslation{TP-(ODw)}{PHD}
+\NewDictTranslation{tp-(ODw)}{phd}
+\NewDictTranslation{trial bid-(ODw)}{trial bid}
+\NewDictTranslation{Trial bid-(ODw)}{Trial bid}
+\NewDictTranslation{trick-(ODw)}{baza}
+\NewDictTranslation{Trick-(ODw)}{Baza}
+\NewDictTranslation{tsf-(ODw)}{3er\,pf}
+\NewDictTranslation{TSF-(ODw)}{3er\,PF}
+\NewDictTranslation{vulnerable-(ODw)}{vulnerable}
+\NewDictTranslation{Vulnerable-(ODw)}{Vulnerable}
+\NewDictTranslation{vul-(ODw)}{vul}
+\NewDictTranslation{Vul-(ODw)}{Vul}
+\NewDictTranslation{west-(ODw)}{oeste}
+\NewDictTranslation{West-(ODw)}{Oeste}
+\NewDictTranslation{w-(ODw)}{o}
+\NewDictTranslation{W-(ODw)}{O}
+%
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-swedish.trsl new/tex/latex/onedown/ODw-swedish.trsl
--- old/tex/latex/onedown/ODw-swedish.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-swedish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
% Thanks to Per Karlberg
% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare
%
-\ProvideDictionaryFor{swedish}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{swedish}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1:a}
\NewDictTranslation{2nd-(ODw)}{2:a}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-turkish.trsl new/tex/latex/onedown/ODw-turkish.trsl
--- old/tex/latex/onedown/ODw-turkish.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-turkish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get kâğıdı
%
-\ProvideDictionaryFor{turkish}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{turkish}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/onedown.sty new/tex/latex/onedown/onedown.sty
--- old/tex/latex/onedown/onedown.sty 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/onedown.sty 2019-10-21 22:51:57.000000000 +0200
@@ -21,10 +21,10 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2014/05/01]
-\def\ODwstyleversion{1.3}\def\ODwstyledate{2019/02/21}
+\def\ODwstyleversion{1.4}\def\ODwstyledate{2019/10/15}
\ProvidesPackage{onedown}
[\ODwstyledate\space v\ODwstyleversion\space
- Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2018]
+ Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2019]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -132,16 +132,16 @@
}% gamefont
\fontencoding{T1}\fontfamily{stix}
\fontseries{m}\fontshape{n}\selectfont
-\DeclareSymbolFont{symbols}{OMS}{txsy}{m}{n}
-\SetSymbolFont{symbols}{bold}{OMS}{txsy}{bx}{n}
+\DeclareSymbolFont{ODw@symbols}{OMS}{txsy}{m}{n}
+\SetSymbolFont{ODw@symbols}{bold}{OMS}{txsy}{bx}{n}
\DeclareFontSubstitution{OMS}{txsy}{m}{n}
-\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n}
-\SetSymbolFont{symbolsC}{bold}{U}{txsyc}{bx}{n}
+\DeclareSymbolFont{ODw@symbolsC}{U}{txsyc}{m}{n}
+\SetSymbolFont{ODw@symbolsC}{bold}{U}{txsyc}{bx}{n}
\DeclareFontSubstitution{U}{txsyc}{m}{n}
-\DeclareMathSymbol{\ODw@spadesuit}{\mathord}{symbols}{127}
-\DeclareMathSymbol{\ODw@varheart}{\mathord}{symbolsC}{114}
-\DeclareMathSymbol{\ODw@vardiamond}{\mathord}{symbolsC}{113}
-\DeclareMathSymbol{\ODw@clubsuit}{\mathord}{symbols}{124}
+\DeclareMathSymbol{\ODw@spadesuit}{\mathord}{ODw@symbols}{127}
+\DeclareMathSymbol{\ODw@varheart}{\mathord}{ODw@symbolsC}{114}
+\DeclareMathSymbol{\ODw@vardiamond}{\mathord}{ODw@symbolsC}{113}
+\DeclareMathSymbol{\ODw@clubsuit}{\mathord}{ODw@symbols}{124}
\def\Cl{}\def\Di{}\def\He{}\def\Sp{}%
\ODw@set{%
colors/0/.code={%
@@ -185,6 +185,21 @@
}
\ODw(a)set{colors/b+r/.code={\pgfkeys{/ODw/colors=2}}}
\ODw@set{%
+ colors/3/.code={%
+ \ODw@monochromefalse%
+ \renewrobustcmd\Cl{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
+ \renewrobustcmd\Di{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@vardiamond}}\xspace}%
+ \renewrobustcmd\He{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@varheart}}\xspace}%
+ \renewrobustcmd\Sp{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@spadesuit}}\xspace}%
+ }%
+}
+\ODw(a)set{colors/grey/.code={\pgfkeys{/ODw/colors=3}}}
+\ODw(a)set{colors/gray/.code={\pgfkeys{/ODw/colors=3}}}
+\ODw@set{%
colors/4A/.code={%
\ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{green}%
@@ -1860,6 +1875,13 @@
\xspace%
}% Jack
\def\jack{\Jack*!}
+\newcommand{\Ten}{%
+ \bgroup%
+ 10%
+ \egroup%
+ \xspace%
+}% Ten
+
\NewDocumentCommand{\All}{s t!}{%
\bgroup%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onedown.tlpobj new/tlpkg/tlpobj/onedown.tlpobj
--- old/tlpkg/tlpobj/onedown.tlpobj 2019-02-28 03:58:06.000000000 +0100
+++ new/tlpkg/tlpobj/onedown.tlpobj 2019-10-25 01:54:27.000000000 +0200
@@ -1,6 +1,6 @@
name onedown
category Package
-revision 50104
+revision 52525
shortdesc Typeset Bridge Diagrams
relocated 1
longdesc This is a comprehensive package to draw all sorts of bridge
@@ -13,7 +13,7 @@
longdesc consistency of suit and hands. Multilingual output of bridge
longdesc terms. Extensive documentation: User manual, Reference manual,
longdesc and Examples.
-runfiles size=35
+runfiles size=37
RELOC/tex/latex/onedown/ODw-danish.trsl
RELOC/tex/latex/onedown/ODw-dutch.trsl
RELOC/tex/latex/onedown/ODw-english.trsl
@@ -21,11 +21,12 @@
RELOC/tex/latex/onedown/ODw-french.trsl
RELOC/tex/latex/onedown/ODw-german.trsl
RELOC/tex/latex/onedown/ODw-norwegian.trsl
+ RELOC/tex/latex/onedown/ODw-spanish.trsl
RELOC/tex/latex/onedown/ODw-swedish.trsl
RELOC/tex/latex/onedown/ODw-turkish.trsl
RELOC/tex/latex/onedown/onedown.sty
catalogue-ctan /macros/latex/contrib/onedown
-catalogue-date 2019-02-23 19:45:42 +0100
+catalogue-date 2019-10-24 16:04:43 +0200
catalogue-license lppl1.3
catalogue-topics games
-catalogue-version 1.3
+catalogue-version 1.4
++++++ opensans.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/CHANGES new/doc/fonts/opensans/CHANGES
--- old/doc/fonts/opensans/CHANGES 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/CHANGES 2019-06-25 23:29:46.000000000 +0200
@@ -1,5 +1,25 @@
-Changelog for version 1.1:
- - fix bad weight substitution when using light weight and slanted shape
+VERSION 2.2:
+ - Fix ligatures for hyphens
+ - Fix font family definition with proportional numbers
+ - Fix font name in XeLaTeX/LuaLaTeX mode
-Changelog for version 1.2:
- - remove unneeded call to textcomp package in opensans.sty
+VERSION 2.1:
+ - Fix OT1 encoding with italic shape
+ - Fix packaging according to CTAN guidelines
+
+VERSION 2.0:
+ - Complete rewrite of the TeX metric file generation (otftotfm is now
+ used instead of fontinst)
+ - Support for XeLaTeX and LuaLaTeX
+ - Add bold condensed font
+ - Improve support for figure variant selection
+ - Drop faked smallcaps support
+ - Fix kerning with uppercase Greek diacritics
+ - Add "scaled" alias option
+ - Fix NFSS shape for condensed fonts
+
+VERSION 1.2:
+ - remove unneeded call to textcomp package in opensans.sty
+
+VERSION 1.1:
+ - fix bad weight substitution when using light weight and slanted shape
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/README new/doc/fonts/opensans/README
--- old/doc/fonts/opensans/README 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/README 2019-06-25 23:29:46.000000000 +0200
@@ -1,24 +1,22 @@
------------------------
- Open Sans, version 1.2
+ Open Sans, version 2.1
------------------------
Open Sans is a humanist sans serif typeface designed by Steve Matteson. Open
Sans was designed with an upright stress, open forms and a neutral, yet friendly
appearance. It was optimized for print, web, and mobile interfaces, and has
-excellent legibility characteristics in its letterforms. This font is available
-from the Google Font Directory at
-http://code.google.com/webfonts/family?family=Open+Sans as TrueType files
-licensed under the Apache License version 2.0.
+excellent legibility characteristics in its letterforms.
-This package provides support for this font family in LaTeX. It includes the
-original TrueType fonts, as well as Type 1 versions, converted for this package
-using FontForge for full support with Dvips.
+The font family is available from the Google Font Directory as TTF-flavored
+OpenType files licensed under the Apache License version 2.0.
-Installation and usage instructions are described in
-doc/fonts/opensans/opensans.pdf.
+This package provides support for Open Sans in LaTeX, including XeLaTeX and
+LuaLaTeX. It includes the original OpenType fonts, as well as Type 1 versions,
+converted for this package using FontForge for full support with LaTeX and
+Dvips.
This package is released under the LaTeX Project Public License, either version
-1.3c or above, with the exception of the .pfb and .sfd files, released under the
+1.3c or above, with the exception of the .ttf and .pfb files, released under the
Apache License version 2.0.
If you have comments about the package, please contact Mohamed El Morabity
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/manifest.txt new/doc/fonts/opensans/manifest.txt
--- old/doc/fonts/opensans/manifest.txt 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,823 +0,0 @@
-./source/fonts/opensans/opensans-02.etx
-./source/fonts/opensans/opensans-fixcyrillic.mtx
-./source/fonts/opensans/opensans-fixtextcomp.mtx
-./source/fonts/opensans/opensans-osfigures.etx
-./source/fonts/opensans/opensans-04.etx
-./source/fonts/opensans/opensans-fixlatin.mtx
-./source/fonts/opensans/opensans-03.etx
-./source/fonts/opensans/opensans-fixgreek.mtx
-./source/fonts/opensans/Makefile
-./source/fonts/opensans/opensans-01.etx
-./source/fonts/opensans/opensans-map.tex
-./source/fonts/opensans/opensans-drv.tex
-./source/fonts/opensans/ttf2type1.pe
-./fonts/truetype/public/opensans/OpenSans-Light.ttf
-./fonts/truetype/public/opensans/OpenSans-LightItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-Regular.ttf
-./fonts/truetype/public/opensans/OpenSans-SemiboldItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-Semibold.ttf
-./fonts/truetype/public/opensans/OpenSans-Bold.ttf
-./fonts/truetype/public/opensans/OpenSans-BoldItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-CondLight.ttf
-./fonts/truetype/public/opensans/OpenSans-Italic.ttf
-./fonts/truetype/public/opensans/OpenSans-ExtraBold.ttf
-./fonts/truetype/public/opensans/OpenSans-ExtraBoldItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-CondLightItalic.ttf
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-03.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-02.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-01.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-01.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-03.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-01.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-03.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-04.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-03.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-04.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-01.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-01.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-01.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-04.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t1.tfm
-./fonts/map/dvips/opensans/opensans.map
-./fonts/afm/public/opensans/OpenSans-LightItalic.afm
-./fonts/afm/public/opensans/OpenSans-ExtraBoldItalic.afm
-./fonts/afm/public/opensans/OpenSans-Bold.afm
-./fonts/afm/public/opensans/OpenSans-Italic.afm
-./fonts/afm/public/opensans/OpenSans-SemiboldItalic.afm
-./fonts/afm/public/opensans/OpenSans-CondLightItalic.afm
-./fonts/afm/public/opensans/OpenSans-ExtraBold.afm
-./fonts/afm/public/opensans/OpenSans-CondLight.afm
-./fonts/afm/public/opensans/OpenSans-Light.afm
-./fonts/afm/public/opensans/OpenSans-BoldItalic.afm
-./fonts/afm/public/opensans/OpenSans-Regular.afm
-./fonts/afm/public/opensans/OpenSans-Semibold.afm
-./fonts/vf/public/opensans/OpenSans-Bold-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t2a.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-t2b.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-x2.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-ts1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-x2.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-lgr.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t2b.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-lgr.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-ts1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-ts1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/enc/dvips/opensans/opensans-03.enc
-./fonts/enc/dvips/opensans/opensans-04.enc
-./fonts/enc/dvips/opensans/opensans-01.enc
-./fonts/enc/dvips/opensans/opensans-02.enc
-./fonts/type1/public/opensans/OpenSans-Bold.pfb
-./fonts/type1/public/opensans/OpenSans-SemiboldItalic.pfb
-./fonts/type1/public/opensans/OpenSans-ExtraBold.pfb
-./fonts/type1/public/opensans/OpenSans-Semibold.pfb
-./fonts/type1/public/opensans/OpenSans-Italic.pfb
-./fonts/type1/public/opensans/OpenSans-ExtraBoldItalic.pfb
-./fonts/type1/public/opensans/OpenSans-Regular.pfb
-./fonts/type1/public/opensans/OpenSans-CondLightItalic.pfb
-./fonts/type1/public/opensans/OpenSans-CondLight.pfb
-./fonts/type1/public/opensans/OpenSans-Light.pfb
-./fonts/type1/public/opensans/OpenSans-BoldItalic.pfb
-./fonts/type1/public/opensans/OpenSans-LightItalic.pfb
-./tex/latex/opensans/ot1fos.fd
-./tex/latex/opensans/t2bfosj.fd
-./tex/latex/opensans/t2afos.fd
-./tex/latex/opensans/lgrfosj.fd
-./tex/latex/opensans/lgrfos.fd
-./tex/latex/opensans/t2cfos.fd
-./tex/latex/opensans/t1fos.fd
-./tex/latex/opensans/t1fosj.fd
-./tex/latex/opensans/ot1fosj.fd
-./tex/latex/opensans/t2cfosj.fd
-./tex/latex/opensans/ts1fos.fd
-./tex/latex/opensans/t2afosj.fd
-./tex/latex/opensans/t2bfos.fd
-./tex/latex/opensans/x2fosj.fd
-./tex/latex/opensans/opensans.sty
-./tex/latex/opensans/x2fos.fd
-./tex/latex/opensans/ts1fosj.fd
-./manifest.txt
-./doc/fonts/opensans/CHANGES
-./doc/fonts/opensans/opensans-samples.tex
-./doc/fonts/opensans/opensans.tex
-./doc/fonts/opensans/opensans.pdf
-./doc/fonts/opensans/opensans-samples.pdf
-./doc/fonts/opensans/README
-./README
Binary files old/doc/fonts/opensans/opensans-samples.pdf and new/doc/fonts/opensans/opensans-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/opensans-samples.tex new/doc/fonts/opensans/opensans-samples.tex
--- old/doc/fonts/opensans/opensans-samples.tex 2011-08-27 00:25:05.000000000 +0200
+++ new/doc/fonts/opensans/opensans-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,127 +0,0 @@
-%% opensans-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{opensans}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils
- sont doués de raison et de conscience et doivent agir les uns envers les
- autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они
- наделены разумом и совестью и должны поступать в отношении друг друга в духе
- братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα
- δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να
- συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 \oldstylenums{0123456789} ff fi fl ffi ffl \textperthousand{}
- \textcopyright{} \textregistered{} \texttrademark{} \texteuro{}
- \textsterling{} \textyen\\%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fos}{#1}{#2}\latinSample}
-
- {\usefont{T2A}{fos}{#1}{#2}\cyrillicSample}
-
- {\usefont{LGR}{fos}{#1}{#2}\greekSample}
-
- {\fontfamily{fos}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Opensans Light}
-
-\fontSample{l}{n}
-
-\fontSample{l}{it}
-
-\fontSample{l}{sc}
-
-\fontSample{l}{scit}
-
-\section*{Opensans Condensed Light}
-
-\fontSample{cl}{n}
-
-\fontSample{cl}{it}
-
-\fontSample{cl}{sc}
-
-\fontSample{cl}{scit}
-
-\section*{Opensans Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{it}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scit}
-
-\section*{Opensans Semibold}
-
-\fontSample{sb}{n}
-
-\fontSample{sb}{it}
-
-\fontSample{sb}{sc}
-
-\fontSample{sb}{scit}
-
-\section*{Opensans Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{it}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scit}
-
-\section*{Opensans Extrabold}
-
-\fontSample{eb}{n}
-
-\fontSample{eb}{it}
-
-\fontSample{eb}{sc}
-
-\fontSample{eb}{scit}
-
-\end{document}
Binary files old/doc/fonts/opensans/opensans.pdf and new/doc/fonts/opensans/opensans.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/opensans.tex new/doc/fonts/opensans/opensans.tex
--- old/doc/fonts/opensans/opensans.tex 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/opensans.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,257 +0,0 @@
-%% opensans.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage[default,osfigures]{opensans}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{textcomp}
-\usepackage{varioref}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
- pdftitle={LaTeX support for Open Sans},%
- pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Open Sans\\Version~1.2}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity(a)fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-Open Sans is a humanist sans serif typeface designed by Steve
-\name{Matteson}. Open Sans was designed with an upright stress, open forms and a
-neutral, yet friendly appearance. It was optimized for print, web, and mobile
-interfaces, and has excellent legibility characteristics in its letterforms (see
-figure~\vref{styles}). This font is available from the Google Font Directory
-~\cite{opensans} as TrueType files licensed under the Apache License
-version~2.0.
-
-\begin{figure}
- \centering
- \fosfamily%
- {%
- {\fontseries{l}\selectfont Open Sans Light}\\
- {\fontseries{l}\selectfont\itshape Open Sans Light Italic}\\
- {\fontseries{cl}\selectfont Open Sans Condensed Light}\\
- {\fontseries{cl}\selectfont\itshape Open Sans Condensed Light Italic}\\
- Open Sans Regular\\
- {\itshape Open Sans Italic}\\
- {\fontseries{sb}\selectfont Open Sans Semibold}\\
- {\fontseries{sb}\selectfont\itshape Open Sans Semibold Italic}\\
- {\bfseries Open Sans Bold}\\
- {\bfseries\itshape Open Sans Bold Italic}\\
- {\fontseries{eb}\selectfont Open Sans Extrabold}\\
- {\fontseries{eb}\selectfont\itshape Open Sans Extrabold Italic}%
- }
- \caption{Available styles for Open Sans}
- \label{styles}
-\end{figure}
-
-This package provides support for this font in \LaTeX. It includes Type~1
-versions of the fonts, converted for this package using \program{FontForge} from
-its sources, for full support with \program{Dvips}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|opensans.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
- directories to your \path|texmf/| directory (either your local or global
- \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
- aware of the new files.
-\item Run \command{updmap --enable Map=opensans.map} to make \program{Dvips},
- \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Open Sans}
-
-You can use the Open Sans font in a \LaTeX{} document by adding the command
-\begin{verbatim}
-\usepackage{opensans}
-\end{verbatim}
-to the preamble. The package supplies the \code{\char`\\fosfamily} command to
-switch the current font to Open Sans.
-
-\subsection{Options}
-
-\subsubsection{Open Sans as default (sans-serif) font}
-
-You can set \LaTeX{} to use Open Sans as standard font throughout the whole
-document by passing the \code{default} option to the package:
-\begin{verbatim}
-\usepackage[default]{opensans}
-\end{verbatim}
-To set Open Sans as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{opensans}
-\end{verbatim}
-
-\subsubsection{Font scaling}
-
-The font can be up- and downscale by any factor. This can be used to make Open
-Sans more friendly when used in company with other type faces, e.g., to adapt
-the x-height. The package option \code{scale=\parameter{ratio}} will scale the
-font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{opensans}
-\end{verbatim}
-
-\subsubsection{Figure selection}
-
-Open Sans provides two different figures versions (see table~\vref{figures}):
-\begin{itemize}
-\item\emph{Lining figures} are designed to match the uppercase letters in size
- and clor; they are used by default.
-\item\emph{Text figures} (also known as \emph{old-style figures}) are designed
- to match the lowercase letters.
-\end{itemize}
-
-\begin{table}
- \centering
- \begin{tabular}{ll}
- \toprule
- lining figures&{\fontfamily{fos}\selectfont 0123456789}\\
- \midrule
- text figures&{\fontfamily{fosj}\selectfont 0123456789}\\
- \bottomrule
- \end{tabular}
- \caption{Comparison between lining figures and text figures}
- \label{figures}
-\end{table}
-
-To use text figures by default when calling \code{\char`\\fosfamily}, enable the
-\code{osfigures} package option:
-\begin{verbatim}
-\usepackage[osfigures]{opensans}
-\end{verbatim}
-To use Open Sans as default font with text figures:
-\begin{verbatim}
-\usepackage[default,osfigures]{opensans}
-\end{verbatim}
-
-\subsubsection{Encodings}
-
-The following encodings are supported:
-\begin{description}
-\item[Latin] OT1, T1, TS1 (partial)
-\item[Cyrillic] T2A, T2B, T2C, X2
-\item[Greek] LGR (monotonic only)
-\end{description}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{opensans}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between these two encoding
-in table~\vref{kerning}.
-\begin{table}
-\centering
- \begin{tabular}{ll}
- \toprule
- OT1-encoded&{\fosfamily Te T\'e}\\
- \midrule
- T1-encoded&{\fosfamily\fontencoding{T1}\selectfont Te T\'e}\\
- \bottomrule
- \end{tabular}
- \caption{Kerning with OT1 and T1 encodings}
- \label{kerning}
-\end{table}
-It is therefore advised to always use the Open Sans fonts in any encoding than
-OT1 when typing diacritics.
-
-\subsection{Available weights and variants}
-
-Table~\vref{nfss} lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- family&encoding&series&shape\\
- \midrule
- \multirow{4}{*}{fos, fosj}&OT1,T1,&\multirow{4}{*}{l, lc, m, sb, b (bx), eb}&\multirow{3}{*}{n, it (sl), sc, scit (scsl)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, it (sl)\\
- \bottomrule
- \end{tabular}
- \caption{Available font series and shapes for Open Sans; fosj corresponds to the text-figures version of the family}
- \label{nfss}
-\end{table}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-Samples of the font are available in the
-\href{run:opensans-samples.pdf}{\path|opensans-samples.pdf|} file.
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Open Sans \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Apache License version~2.0~\cite{asl}.
-
-\begin{thebibliography}{9}
-\bibitem{opensans} \url{http://code.google.com/webfonts/family?family=Open+Sans}
-\bibitem{keyval}
- \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{asl} \url{http://www.apache.org/licenses/LICENSE-2.0.html}
-\end{thebibliography}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/opensans.doc.tlpobj new/tlpkg/tlpobj/opensans.doc.tlpobj
--- old/tlpkg/tlpobj/opensans.doc.tlpobj 2019-02-28 03:58:07.000000000 +0100
+++ new/tlpkg/tlpobj/opensans.doc.tlpobj 2020-03-24 02:03:01.000000000 +0100
@@ -1,13 +1,10 @@
name opensans.doc
category Package
-revision 24706
+revision 54512
shortdesc doc files of opensans
relocated 1
-docfiles size=170
+docfiles size=149
RELOC/doc/fonts/opensans/CHANGES
RELOC/doc/fonts/opensans/README
- RELOC/doc/fonts/opensans/manifest.txt
RELOC/doc/fonts/opensans/opensans-samples.pdf
- RELOC/doc/fonts/opensans/opensans-samples.tex
RELOC/doc/fonts/opensans/opensans.pdf
- RELOC/doc/fonts/opensans/opensans.tex
++++++ opensans.tar.xz ++++++
++++ 247765 lines of diff (skipped)
++++++ optidef.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/optidef/README.md new/doc/latex/optidef/README.md
--- old/doc/latex/optidef/README.md 2018-07-19 23:11:40.000000000 +0200
+++ new/doc/latex/optidef/README.md 2019-05-03 00:39:15.000000000 +0200
@@ -68,7 +68,7 @@
Github: https://github.com/jeslago/optidef
-## Latest stable version: Optidef 3.0
+## Latest stable version: Optidef 3.1
CTAN: https://www.ctan.org/pkg/optidef
Binary files old/doc/latex/optidef/optidef.pdf and new/doc/latex/optidef/optidef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/optidef/optidef.tex new/doc/latex/optidef/optidef.tex
--- old/doc/latex/optidef/optidef.tex 2018-07-19 23:11:40.000000000 +0200
+++ new/doc/latex/optidef/optidef.tex 2019-05-03 00:39:15.000000000 +0200
@@ -1,13 +1,13 @@
\documentclass[a4paper]{article}
\usepackage{remreset}
-\usepackage[short]{optidef}
+\usepackage{optidef}
\usepackage{listings}
\usepackage{enumitem}
\usepackage[hidelinks]{hyperref}
\lstset{basicstyle=\ttfamily,breaklines=true}
% Title Page
-\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 3.0}}
+\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 3.1}}
\author{Jesus Lago}
@@ -306,18 +306,17 @@
\begin{lstlisting}
\begin{mini*}<b>
{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
-\breakObjective{-g(w^3-x^2*200+10000*w^5)}
\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1}
\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
\end{mini*}
\end{lstlisting}
-For the \verb|mini|, \verb|maxi|, \verb|argmini|, and \verb|argmaxi| environments, when the option \verb|<b>| is provided, the environment does not automatically set the numbering nor the label of the environment. To create the number/label, the command \verb|\labelOP{label}| should be used. In particular, in the equation/constraint of the optimization problem where the label/number should be located, simply add \verb|\labelOP{label}|. For example, the following code:
+
+However, when using this option \verb|<b>|, it is important to note that labeling of equations is no longer automatic. To create the number/label, the command \verb|\labelOP{label}| should be used. In particular, in the equation/constraint of the optimization problem where the label/number should be located, simply add \verb|\labelOP{label}|. For example, the following code:
\begin{lstlisting}
\begin{mini}<b>
{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
-\breakObjective{-g(w^3-x^2*200+10000*w^5)}
\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
\end{mini}
@@ -327,12 +326,11 @@
\begin{mini}<b>
{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
- \breakObjective{-g(w^3-x^2*200+10000*w^5)}
\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
\end{mini}
-In addition to automatic breaking equations, manual breaks at selected locations can also be done using the \verb|\displaybreak| command. Just add \verb|\displaybreak| between the two constraints that need to be broken, e.g.:
+The option \verb|<b>| automatically breaks the optimization problem when the problem is too large to fit in one page (e.g.\ see an example in \ref{ex:break}). However, manual breaks at selected locations are also possible using the \verb|\displaybreak| command. Just add \verb|\displaybreak| between the two constraints that need to be broken, e.g.:
\begin{lstlisting}
\begin{mini}<b>
@@ -789,11 +787,15 @@
\end{maxi}
\subsection{Example 13 - Breaking optimization problem}
+\label{ex:break}
\begin{lstlisting}
\begin{mini}<b>
{w}{f(w)+ R(w+6x)}
{\label{eq:Example1}}{}
\addConstraint{g(w)}{=0}
+\addConstraint{p(w)}{=0}
+\addConstraint{q(w)}{=0}
+\addConstraint{r(w)}{=0\labelOP{testLabel}}
\addConstraint{n(w)}{= 6}
\addConstraint{L(w)+r(x)}{=Kw+p}
\addConstraint{h(x)}{=0.}
@@ -805,9 +807,9 @@
{w}{f(w)+ R(w+6x)}
{\label{eq:Example1}}{}
\addConstraint{g(w)}{=0}
-%\addConstraint{p(w)}{=0}
-%\addConstraint{q(w)}{=0}
-%\addConstraint{r(w)}{=0}
+\addConstraint{p(w)}{=0}
+\addConstraint{q(w)}{=0}
+\addConstraint{r(w)}{=0\labelOP{testLabel}}
%\addConstraint{s(w)}{=0}
%\addConstraint{t(w)}{=0}
%\addConstraint{v(w)}{=0}
@@ -821,13 +823,14 @@
\subsection{Example 14 - All Possible Parameters}
\begin{verbatim}
-\begin{mini!}|s|[1]<b>
-{w}{f(w)+ R(w+6x)}
-{}{w^*=}
-\addConstraint{g(w)}{=0,}{ \quad \text{(Dynamic constraint)}}
-\addConstraint{n(w)}{= 6,}{ \quad \text{(Boundary constraint)}}
-\addConstraint{L(w)+r(x)}{=Kw+p,}{ \quad \text{(Random constraint)}}
-\addConstraint{h(x)}{=0,}{ \quad \text{(Path constraint).}}
+\begin{mini!}|s|[2]<b>
+{w}{f(w)+ R(w+6x)\label{eq:ObjectiveExample3}}
+{\label{eq:Example3}}
+{w^*=}
+\addConstraint{g(w)}{=0 \label{eq:C1Example3}}
+\addConstraint{n(w)}{= 6 \label{eq:C2Example3}}
+\addConstraint{L(w)+r(x)}{=Kw+p \label{eq:C3Example3}}
+\addConstraint{h(x)}{=0.\label{eq:C4Example3}}
\end{mini!}
\end{verbatim}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/optidef.doc.tlpobj new/tlpkg/tlpobj/optidef.doc.tlpobj
--- old/tlpkg/tlpobj/optidef.doc.tlpobj 2019-02-28 03:58:10.000000000 +0100
+++ new/tlpkg/tlpobj/optidef.doc.tlpobj 2019-05-03 01:40:06.000000000 +0200
@@ -1,9 +1,9 @@
name optidef.doc
category Package
-revision 48228
+revision 50941
shortdesc doc files of optidef
relocated 1
-docfiles size=70
+docfiles size=71
RELOC/doc/latex/optidef/README.md
RELOC/doc/latex/optidef/optidef.pdf
RELOC/doc/latex/optidef/optidef.tex
++++++ optidef.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/optidef/optidef.sty new/tex/latex/optidef/optidef.sty
--- old/tex/latex/optidef/optidef.sty 2018-07-19 23:11:40.000000000 +0200
+++ new/tex/latex/optidef/optidef.sty 2019-05-03 00:39:15.000000000 +0200
@@ -1,4 +1,4 @@
-% optidef - Version 3.0
+% optidef - Version 3.1
%
%Copyright 2018 Jesus Lago
%
@@ -7,12 +7,12 @@
%
%This work has the LPPL maintenance status 'maintained'. The Current Maintainer of this work is J. Lago .
%
-%E-mail: J.LagoGarcia(a)tudelft.nl
+%E-mail: j.lagogarcia(a)tudelft.nl
%
%This work consists of the file optidef.sty.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{optidef}[2018/07/19 - version=3.0, Package for defining optimization problems]
+\ProvidesPackage{optidef}[2019/04/23 - version=3.1, Package for defining optimization problems]
\RequirePackage{environ}
\RequirePackage{mathtools}
@@ -32,26 +32,26 @@
\newcommand{\defaultConstraintFormat}{0}
\newcommand{\labelOP}[1]{\stepcounter{equation}\tag{\theequation}\label{#1}}
-\DeclareOption{short}{
- \renewcommand{\defaultProblemFormat}{s}
+\DeclareOption{short}{%
+ \renewcommand{\defaultProblemFormat}{s}%
}
-\DeclareOption{long}{
-\renewcommand{\defaultProblemFormat}{l}
+\DeclareOption{long}{%
+\renewcommand{\defaultProblemFormat}{l}%
}
-\DeclareOption{nocomma}{
- \renewcommand{\defaultOCPConstraint}{}
+\DeclareOption{nocomma}{%
+ \renewcommand{\defaultOCPConstraint}{}%
}
-\DeclareOption{c1}{
- \renewcommand{\defaultConstraintFormat}{1}
+\DeclareOption{c1}{%
+ \renewcommand{\defaultConstraintFormat}{1}%
}
-\DeclareOption{c2}{
- \renewcommand{\defaultConstraintFormat}{2}
+\DeclareOption{c2}{%
+ \renewcommand{\defaultConstraintFormat}{2}%
}
-\DeclareOption{c3}{
- \renewcommand{\defaultConstraintFormat}{3}
+\DeclareOption{c3}{%
+ \renewcommand{\defaultConstraintFormat}{3}%
}
\ProcessOptions\relax
@@ -91,42 +91,35 @@
%%%%%%%%%%%%%%%%%%%%%%%
% OBJECTIVE COMMAND DEFINITION
%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\bodyobj}[4]
-{
- \ifthenelse{\isempty{#4}}
- {
+\newcommand{\bodyobj}[4]{%
+ \ifthenelse{\isempty{#4}}{%
&\underset{\displaystyle #1}{\mathrlap{\mathrm{#3}}\phantom{\mathrm{subject~to}}} \quad #2\span\span\span\span
- }
- {
+ }{%
#4~ &\underset{\displaystyle #1}{\mathrlap{\mathrm{#3}}\phantom{\mathrm{subject~to}}} \quad #2\span\span\span\span
- }
+ }%
}
%% LONG VERSION "minimize" instead of "min"
-\newcommand{\bodyobjLong}[4]
-{
- \ifthenelse{\isempty{#4}}
- {
- &\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
- }
- {
- #4~ &\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
- }
+\newcommand{\bodyobjLong}[4]{%
+ \ifthenelse{\isempty{#4}}{%
+ &\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}][l]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
+ }{%
+ #4~&\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}][l]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
+ }%
}
%% SHORT VERSION "min" instead of "minimize"
-\newcommand{\bodyobjShort}[4]
-{
- \ifthenelse{\isempty{#4}}
- {
+\newcommand{\bodyobjShort}[4]{%
+ \ifthenelse{\isempty{#4}}{%
&\underset{\displaystyle #1}{\mathrm{#3}} \quad #2\span\span\span\span
- }
- {
+ }{%
#4 ~ &\underset{\displaystyle #1}{\mathrm{#3}} \quad #2\span\span\span\span
- }
+ }%
}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% DEFINITION DIFFERENT TYPE OF BODY CONSTRAINTS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -135,141 +128,137 @@
% Main command. Dynamically redefined at every new problem definition.
-\DeclareDocumentCommand{\bodyconst}{m G{}}
-{ \equalsNothing{#2}{
+\DeclareDocumentCommand{\bodyconst}{m G{}}{%
+ \equalsNothing{#2}{%
\\ &\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{subject~to}} \quad & #2
- }{
+ }{%
\\ &\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{subject~to}} \quad  & #2
- }
+ }%
}
-\newcommand{\bodySubjectToDefinition}{
+\newcommand{\bodySubjectToDefinition}{%
%## If the short version of "subject to", i.e. "s.t.", should be used the command \bodySubjectTo should be modified
-\ifthenelse{\equal{\localProblemFormat}{s}}
-{%%
-\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{\localProblemType}}$}][c]{\mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{\mathrm{\kern 0.1em s.t.}}}}
-}{%%
-\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{\,subject~to}}$}][c]{\mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{\mathrm{subject~to}}}}
-}%%
-%
+\ifthenelse{\equal{\localProblemFormat}{s}}{%
+\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{\localProblemType}}$}][c]{\mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{\mathrm{\kern 0.1em s.t.}}}}
+}{%
+\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{subject~to}}$}][c]{%
+% \mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]
+ {\mathrm{subject~to}}
+ }%
+ }%
+}%
}
% Standard version.
-\DeclareDocumentCommand{\bodyconstRight}{m G{} G{}}
-{%%%
+\DeclareDocumentCommand{\bodyconstRight}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
-\equalsNothing{#3}{%%
- \equalsNothing{#2}{%
- \\ & \bodySubjectTo \quad & #2
+\equalsNothing{#3}{%
+ \equalsNothing{#2}{%
+ \\ & \bodySubjectTo \quad & #2
}{%
\\ &\bodySubjectTo \quad  & #2
}%
\togglefalse{previousThird}
-}{%%
+}{%
\equalsNothing{#2}{%
\\ &\bodySubjectTo \quad & #2 &
}{%
\\ &\bodySubjectTo \quad  & #2 &
}%
\toggletrue{previousThird}
-}%%
-}%%%
+}%
+}
% Single alignment point but next to subject to
-\DeclareDocumentCommand{\bodyconstOneAlign}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstOneAlign}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
- \\ &\bodySubjectTo\quad & #2 \togglefalse{previousThird}
- }{
+ \equalsNothing{#3}{%
+ \\ &\bodySubjectTo\quad & #2 \togglefalse{previousThird}
+ }{%
\\ &\bodySubjectTo\quad & #2 &
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to and with a single alignment point
-\DeclareDocumentCommand{\bodyconstOneAlignBelow}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstOneAlignBelow}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
+ \equalsNothing{#3}{%
\\ &\bodySubjectTo \span\span\span\span \\
&& #2 \togglefalse{previousThird}
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \\
&& #2 &
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to but with double alignment point
-\DeclareDocumentCommand{\bodyconstBelow}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstBelow}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
- \equalsNothing{#2}{
+ \equalsNothing{#3}{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo\span\span\span\span \\
&& #2
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \\
& & #2
- }
+ }%
\togglefalse{previousThird}
- }{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo \span\span\span\span \\
&& #2 &
- }{
+ }{%
\\ &\bodySubjectTo\span\span\span\span \\
& & #2 &
- }
+ }%
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to for the case of having a reference/label for each individual equation
-\DeclareDocumentCommand{\bodyconstBelowMult}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstBelowMult}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
- \equalsNothing{#2}{
+ \equalsNothing{#3}{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \nonumber \\
& & #2
- }
+ }%
\togglefalse{previousThird}
- }{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2 &
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \nonumber \\
& & #2 &
- }
+ }%
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to and with a single alignment point for the case of having a reference/label for each individual equation
-\DeclareDocumentCommand{\bodyconstOneAlignBelowMult}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstOneAlignBelowMult}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
+ \equalsNothing{#3}{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2 \togglefalse{previousThird}
- }{
+ }{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2 && #3
\toggletrue{previousThird}
- }
+ }%
}
@@ -279,238 +268,253 @@
% Main command. Dynamically redefined at every problem definiton.
-\DeclareDocumentCommand{\addConstraint}{m G{} G{}}{
+\DeclareDocumentCommand{\addConstraint}{m G{} G{}}{%
% "If clause" selecting whether a third parameter (#3) defining extra constraint information is used
-\equalsNothing{#3}{
+\equalsNothing{#3}{%
% Second "If clause" selecting whether two or 1 elements for the constraints are used
- \equalsNothing{#2}{
- \iftoggle{bodyCon}{
+ \equalsNothing{#2}{%
+ \iftoggle{bodyCon}{%
\bodyconst{#1}
\togglefalse{bodyCon}
- }{
+ }{%
\defaultOCPConstraint\\&\quad & #2\span\span
\togglefalse{bodyCon}
- }
- }{
- \iftoggle{bodyCon}{
+ }%
+ }{%
+ \iftoggle{bodyCon}{%
\bodyconst{#1}{#2}
\togglefalse{bodyCon}
- }{
+ }{%
\defaultOCPConstraint\\&\quad  & #2\span\span
\togglefalse{bodyCon}
- }
- }
+ }%
+ }%
\togglefalse{previousThird}
- }{
- \iftoggle{bodyCon}{
+ }{%
+ \iftoggle{bodyCon}{%
\bodyconst{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#2}{%
\defaultOCPConstraint\\&\quad & #2 && #3
- }{
+ }{%
\defaultOCPConstraint\\&\quad  & #2 && #3
- }
+ }%
\togglefalse{bodyCon}
- }
+ }%
\toggletrue{previousThird}
- }
+ }%
}
% Standard version of adding constraints
% The toggle previousThird indicates if the previous constraint had three arguments or two. According to that it adjust the required spans at the end of the previous contraint. It is needed because the line jump after a constraint it is done at the beginning of the next constraint, not after the constraint itself. That avoid the last jump of the last constraint.
% The toggle bodyCon indicate that it is the first contraint. The first contraint is different that the rest because it contains "subject to"
% The commands \equalsNothing checks if the optional arguments exists
-\DeclareDocumentCommand{\standardAddConstraint}{m G{} G{}}{
- \iftoggle{previousThird}
- {
+\DeclareDocumentCommand{\standardAddConstraint}{m G{} G{}}{%
+ \iftoggle{previousThird}{%
\renewcommand{\spanit}{}
- }{
+ }{%
\renewcommand{\spanit}{\span\span}
- }
-\iftoggle{bodyCon}{
+ }%
+\iftoggle{bodyCon}{%
\bodyconstRight{#1}{#2}{#3}
\togglefalse{bodyCon}
-}{
- \equalsNothing{#2}{
- \equalsNothing{#3}{
+}{%
+ \equalsNothing{#2}{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&\quad & #2
\togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&\quad & #2 && #3
\toggletrue{previousThird}
- }
- }{
- \equalsNothing{#3}{
+ }%
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&\quad  & #2
\togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&\quad  & #2 && #3
\toggletrue{previousThird}
- }
-}
-\togglefalse{bodyCon}
-}
+ }%
+}%
+\togglefalse{bodyCon}%
+}%
}
% Adding constraints below subject to
-\DeclareDocumentCommand{\BelowAddConstraint}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\BelowAddConstraint}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstBelow{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#2}{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#2}{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&& #2 \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&& #2 && #3
\toggletrue{previousThird}
- }
- }{
- \equalsNothing{#3}{
+ }%
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\ &  \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\ &  && #3
\toggletrue{previousThird}
- }
- }
- \togglefalse{bodyCon}
- }
+ }%
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints with a single alignment point but next to subject to
-\DeclareDocumentCommand{\oneAlignAddConstraint}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\oneAlignAddConstraint}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstOneAlign{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&\quad & #2 \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&\quad & #2 && #3
\toggletrue{previousThird}
- }
- \togglefalse{bodyCon}
- }
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints for a single alignment point and with the constraints below
-\DeclareDocumentCommand{\oneAlignBelowAddConstraint}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\oneAlignBelowAddConstraint}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstOneAlignBelow{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\& & #2\togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\& & #2 && #3
\toggletrue{previousThird}
- }
- \togglefalse{bodyCon}
- }
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints below "subject to" for multiple references
-\DeclareDocumentCommand{\BelowAddConstraintMult}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\BelowAddConstraintMult}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstBelowMult{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#3}{%
+ \equalsNothing{#2}{%
\defaultOCPConstraint\spanit\\&& #2
- }{
+ }{%
\defaultOCPConstraint\spanit\\ & 
- }
+ }%
\togglefalse{previousThird}
- }{
+ }{%
\equalsNothing{#2}{
\defaultOCPConstraint\spanit\\&& #2 && #3
- }{
+ }{%
\defaultOCPConstraint\spanit\\ & && #3}
\toggletrue{previousThird}
- }
- \togglefalse{bodyCon}
- }
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints for a single alignment point and with the constraints below for multiple references
\DeclareDocumentCommand{\oneAlignBelowAddConstraintMult}{m G{} G{}}{
- \iftoggle{bodyCon}{
+ \iftoggle{bodyCon}{%
\bodyconstOneAlignBelowMult{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\& & #2 \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\& & #2 && #3
\toggletrue{previousThird}
- }
+ }%
\togglefalse{bodyCon}
-}
+}%
}
%%%%%%%%%%%%%%%%%%%%
% ADDING EXTRA LINE
%%%%%%%%%%%%%%%%%%%%
-\newcommand{\breakObjective}[1]
-{
-\\&\mathmakebox[\widthInit]{\phantom{\underset{}{}}}#1\span\span\span\span
-}
+\newcommand{\breakObjective}[1]{%
+ \bodyBreakObjectiveDefinition
+\\
+\bodyBreakObjective\quad #1\span\span\span\span
+}%
+\newcommand{\bodyBreakObjectiveDefinition}{%
+ \ifthenelse{\equal{\localProblemFormat}{s}}{%
+ \global\def\bodyBreakObjective{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{\localProblemType}}$}][c]{%
+ \mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{}%
+ }%
+ }%
+ }%
+{%
+ \global\def\bodyBreakObjective{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{subject~to}}$}][c]{%
+ {}%
+ }%
+ }%
+ }%
+}%
+
%%%%%%%%%%%%%%%%%%%%
% SELECTING TYPE OF FORMAT
%%%%%%%%%%%%%%%%%%%%
-\newcommand{\selectConstraint}[1]{
- \ifthenelse{\equal{#1}{1}}{
+\newcommand{\selectConstraint}[1]{%
+ \ifthenelse{\equal{#1}{1}}{%
\let\addConstraint\BelowAddConstraint
- }{
- \ifthenelse{\equal{#1}{2}}{
+ }{%
+ \ifthenelse{\equal{#1}{2}}{%
\let\addConstraint\oneAlignAddConstraint
- }{
- \ifthenelse{\equal{#1}{3}}{
+ }{%
+ \ifthenelse{\equal{#1}{3}}{%
\let\addConstraint\oneAlignBelowAddConstraint
- }{
- \let\addConstraint\standardAddConstraint}
-}
-}
-}
+ }{%
+ \let\addConstraint\standardAddConstraint
+ }%
+}%
+}%
+}%
% Selecting for multiple references
-\newcommand{\selectConstraintMult}[1]{
- \ifthenelse{\equal{#1}{1}}{
+\newcommand{\selectConstraintMult}[1]{%
+ \ifthenelse{\equal{#1}{1}}{%
\let\addConstraint\BelowAddConstraintMult
- }{
- \ifthenelse{\equal{#1}{2}}{
+ }{%
+ \ifthenelse{\equal{#1}{2}}{%
\let\addConstraint\oneAlignAddConstraint
- }{
- \ifthenelse{\equal{#1}{3}}{
+ }{%
+ \ifthenelse{\equal{#1}{3}}{%
\let\addConstraint\oneAlignBelowAddConstraintMult
- }{
- \let\addConstraint\standardAddConstraint}
-}
-}
-}
+ }{%
+ \let\addConstraint\standardAddConstraint
+}%
+}%
+}%
+}%
%%%%%%%%%%%%%%%%%%%
% SETTING DEFAULT FORMAT
%%%%%%%%%%%%%%%%%%%
% Originally, \toggletrue{bodyCon} was inside this function, however, spacing issues after environment made me remove it.
-\newcommand{\setStandardMini}{
- \let\addConstraint\standardAddConstraint
-}
+\newcommand{\setStandardMini}{\let\addConstraint\standardAddConstraint}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% COMMANDS TO DEFINE ALL REQUIRED PROPERTIES TO CHOOSE SHORT/LONG FORMAT
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\setFormatShort}[2]{\global\def\localProblemFormat{s} \let\bodyobj\bodyobjShort \renewcommand{\localProblemType}{#1}
- \setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{#1}}$\quad}}
+\newcommand{\setFormatShort}[2]{\global\def\localProblemFormat{s}\let\bodyobj\bodyobjShort \renewcommand{\localProblemType}{#1}%
+ \setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{#1}}$\quad}}%
}
-\newcommand{\setFormatLong}[2]{\global\def\localProblemFormat{l} \let\bodyobj\bodyobjLong \renewcommand{\localProblemType}{#1}
-\setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{subject~to}}$ \quad}}
-}
+\newcommand{\setFormatLong}[2]{\global\def\localProblemFormat{l}\let\bodyobj\bodyobjLong \renewcommand{\localProblemType}{#1}%
+\setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{subject~to}}$ \quad}}%
+}%
%%%%%%%%%%%%%%%%%%%%%
%MINIMIZATION ENVIRONMENTS
@@ -521,58 +525,46 @@
% Base environment for the three possible types of referencing: 1 label, no label or multilabel
% Base environment defined using NewEnviron package because of \BODY command
\NewEnviron{BaseMini}[6]{%
-
-\selectConstraint{#1}
-\renewcommand{\localOptimalVariable}{#2}
+\selectConstraint{#1}%
+\renewcommand{\localOptimalVariable}{#2}%
\begin{equation}
#4
\begin{alignedat}{5}
\bodyobj{#2}{#3}{#6}{#5}
\BODY
\end{alignedat}
-\end{equation}
+\end{equation}%
\setStandardMini
}
\NewEnviron{BaseMiniStar}[6]{%
-\selectConstraint{#1}
-\renewcommand{\localOptimalVariable}{#2}
-\ifthenelse{\equal{#6}{b}}{
- \begingroup
- \allowdisplaybreaks
-}{}
+\selectConstraint{#1}%
+\renewcommand{\localOptimalVariable}{#2}%
+\ifthenelse{\equal{#6}{b}}{\begingroup\allowdisplaybreaks}{}%
\begin{alignat*}{5}
\bodyobj{#2}{#3}{#5}{#4}
\BODY
-\end{alignat*}
-\ifthenelse{\equal{#6}{b}}{
- \endgroup
-}{}
+\end{alignat*}%
+\ifthenelse{\equal{#6}{b}}{\endgroup}{}%
\setStandardMini
}
\NewEnviron{BaseMiniExclam}[7]{%
- \selectConstraintMult{#1}
- \renewcommand{\localOptimalVariable}{#2}
-\ifthenelse{\equal{#7}{b}}{
- \begingroup
- \allowdisplaybreaks
-}{}
+ \selectConstraintMult{#1}%
+ \renewcommand{\localOptimalVariable}{#2}%
+ \ifthenelse{\equal{#7}{b}}{\begingroup\allowdisplaybreaks}{}%
\begin{subequations}
#4
\begin{alignat}{5}
\bodyobj{#2}{#3}{#6}{#5}
\BODY
\end{alignat}
- \end{subequations}
-\ifthenelse{\equal{#7}{b}}{
- \endgroup
-}{}
- \setStandardMini
+ \end{subequations}%
+\ifthenelse{\equal{#7}{b}}{\endgroup}{}%
+\setStandardMini
}
-
% INDIVIDUAL AND SPECIFIC ENVIRONMENTS (mini, maxi, argmini*...)
% Specific environments defined with xparse package due to arguments options
@@ -580,191 +572,183 @@
% In the below definitions, \toggletrue{bodyCon} has to be added once the definition of the environment is finished. I tried to do inside the environment itself using \setStandardMini, but it produced some ugly text displacemente.
% Single reference probems
-\DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
-\ifthenelse{\equal{#3}{b}}
-{
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+\ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}
-}
-{
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{minimize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}%
+}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{min}}
+ {\setFormatShort{min}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{min}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{minimize}}
-}
+ {\setFormatLong{minimize}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{minimize}}%
+}%
}%
{\endBaseMini\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
- \ifthenelse{\equal{#3}{b}}
- {
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+ {\setFormatShort{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
- }
- {
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
+ }{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}
+ {\setFormatShort{arg~min}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}%
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}
- }
+ {\setFormatLong{arg~min}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}%
+ }%
}%
{\endBaseMini\toggletrue{bodyCon}}
% No reference
-\DeclareDocumentEnvironment{mini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{mini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}
+ {\setFormatLong{minimize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+{\setFormatShort{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
% Long version problem
-{\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+{\setFormatLong{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{mini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{mini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}
+ {\setFormatLong{minimize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+{\setFormatShort{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
% Long version problem
-{\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+{\setFormatLong{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{minie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{minie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}
+ {\setFormatLong{minimize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argminie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argminie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+ {\setFormatShort{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+ {\setFormatLong{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
%MAXIMIZATION ENVIRONMENTS
% Single reference probems
-\DeclareDocumentEnvironment{maxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
- \ifthenelse{\equal{#3}{b}}
- {
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}
+ {\setFormatShort{max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}%
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}
- }
- {
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{maximize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}%
+ }{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{max}}
+ {\setFormatShort{max}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{max}}%
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{maximize}}
- }
+ {\setFormatLong{maximize}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{maximize}}%
+ }%
}%
{\endBaseMini\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
- \ifthenelse{\equal{#3}{b}}
- {
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+ {\setFormatShort{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
- }
- {
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
+ }{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}
+ {\setFormatShort{arg~max}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}%
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}
- }
+ {\setFormatLong{arg~max}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}%
+ }%
}%
{\endBaseMini\toggletrue{bodyCon}}
% No reference
-\DeclareDocumentEnvironment{maxi*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxi*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}
+{\setFormatShort{max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}%
% Long version problem
-{\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}
+{\setFormatLong{maximize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi*}{D||{l} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxi*}{D||{l} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+{\setFormatShort{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
% Long version problem
-{\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+{\setFormatLong{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{maxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}
+{\setFormatShort{max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}%
% Long version problem
-{\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}
+{\setFormatLong{maximize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+{\setFormatShort{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
% Long version problem
-{\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+{\setFormatLong{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{maxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}
+ {\setFormatShort{max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}%
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}
+ {\setFormatLong{maximize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+ {\setFormatShort{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+ {\setFormatLong{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/optidef.tlpobj new/tlpkg/tlpobj/optidef.tlpobj
--- old/tlpkg/tlpobj/optidef.tlpobj 2019-02-28 03:58:11.000000000 +0100
+++ new/tlpkg/tlpobj/optidef.tlpobj 2019-05-03 01:40:06.000000000 +0200
@@ -1,6 +1,6 @@
name optidef
category Package
-revision 48228
+revision 50941
shortdesc Environments for writing optimization problems
relocated 1
longdesc This small library provides a standard set of environments for
@@ -19,12 +19,12 @@
longdesc has an individual reference. Finally, it also allows a
longdesc definition of any optimization problem without a limitless
longdesc number of constraints.
-runfiles size=6
+runfiles size=7
RELOC/tex/latex/optidef/optidef.sty
catalogue-contact-bugs https://github.com/jeslago/optidef/issues
catalogue-contact-repository https://github.com/jeslago/optidef
catalogue-ctan /macros/latex/contrib/optidef
-catalogue-date 2018-07-19 13:37:27 +0200
+catalogue-date 2019-04-23 21:57:10 +0200
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 3.0
+catalogue-version 3.1
++++++ oscola.doc.tar.xz ++++++
++++ 1698 lines of diff (skipped)
++++++ oscola.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/oscola/oscola.ist new/makeindex/oscola/oscola.ist
--- old/makeindex/oscola/oscola.ist 2019-01-21 00:18:31.000000000 +0100
+++ new/makeindex/oscola/oscola.ist 2020-03-15 22:31:46.000000000 +0100
@@ -1,6 +1,6 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-% v 1.6 22/03/2018
+% 2020/03/15 v1.7
delim_0 "\\space\\dotfill\\space "
delim_1 "\\space\\dotfill\\space "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/american-oscola.lbx new/tex/latex/oscola/american-oscola.lbx
--- old/tex/latex/oscola/american-oscola.lbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/american-oscola.lbx 2020-03-15 22:31:46.000000000 +0100
@@ -2,8 +2,8 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+\ProvidesFile{american-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/british-oscola.lbx new/tex/latex/oscola/british-oscola.lbx
--- old/tex/latex/oscola/british-oscola.lbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/british-oscola.lbx 2020-03-15 22:31:46.000000000 +0100
@@ -2,12 +2,13 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{british-oscola.lbx}[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
-
-\InheritBibliographyExtras{british}
+\ProvidesFile{british-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
+\InheritBibliographyExtras{british}
+
\NewBibliographyString{regulation,
regulations,
eucase,
@@ -75,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -93,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -529,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -551,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/english-oscola.lbx new/tex/latex/oscola/english-oscola.lbx
--- old/tex/latex/oscola/english-oscola.lbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/english-oscola.lbx 2020-03-15 22:31:46.000000000 +0100
@@ -3,7 +3,7 @@
% oscola.lbx for copyright and licence information
\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/oscola.bbx new/tex/latex/oscola/oscola.bbx
--- old/tex/latex/oscola/oscola.bbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/oscola.bbx 2020-03-15 22:31:46.000000000 +0100
@@ -13,7 +13,7 @@
% This work has the LPPL maintenance status 'maintained'.
% The current maintainer of this work is Paul Stanley (pstanley(a)essexcourt.net)
-\ProvidesFile{oscola.bbx}[2019/01/20 v1.6 Biblatex bibliography style for OSCOLA standard]
+\ProvidesFile{oscola.bbx}[2020/03/15 v1.7 Biblatex bibliography style for OSCOLA standard]
\RequireBibliographyStyle{authortitle}
@@ -131,12 +131,6 @@
\newboolean{bbx@year-essential}\setboolean{bbx@year-essential}{false}
% Entry options
-\DeclareEntryOption{url}[true]{%
- \settoggle{bbx:url}{#1}}
-\DeclareEntryOption{doi}[true]{%
- \settoggle{bbx:doi}{#1}}
-\DeclareEntryOption{eprint}[true]{%
- \settoggle{bbx:eprint}{#1}}
\DeclareEntryOption{scottish-style}[true]{%
\settoggle{bbx:scotstyle}{#1}}
\DeclareEntryOption{no-ibid}[true]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/oscola.cbx new/tex/latex/oscola/oscola.cbx
--- old/tex/latex/oscola/oscola.cbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/oscola.cbx 2020-03-15 22:31:46.000000000 +0100
@@ -2,7 +2,7 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{oscola.cbx}[2018/03/22 v1.6 Biblatex citation style for OSCOLA standard]
+\ProvidesFile{oscola.cbx}[2020/03/15 v1.7 Biblatex citation style for OSCOLA standard]
\RequireCitationStyle{verbose-inote}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oscola.tlpobj new/tlpkg/tlpobj/oscola.tlpobj
--- old/tlpkg/tlpobj/oscola.tlpobj 2019-02-28 03:58:12.000000000 +0100
+++ new/tlpkg/tlpobj/oscola.tlpobj 2020-03-16 02:21:38.000000000 +0100
@@ -1,6 +1,6 @@
name oscola
category Package
-revision 49772
+revision 54328
shortdesc BibLaTeX style for the Oxford Standard for the Citation of Legal Authorities
relocated 1
longdesc The package provides a set of style files for use with BibLaTeX
@@ -9,15 +9,15 @@
longdesc Citation of Legal Authorities. It also includes facilities for
longdesc constructing tables of cases and legislation from citations (in
longdesc conjunction with appropriate indexing packages).
-runfiles size=55
+runfiles size=54
RELOC/makeindex/oscola/oscola.ist
RELOC/tex/latex/oscola/american-oscola.lbx
RELOC/tex/latex/oscola/british-oscola.lbx
RELOC/tex/latex/oscola/english-oscola.lbx
RELOC/tex/latex/oscola/oscola.bbx
RELOC/tex/latex/oscola/oscola.cbx
+catalogue-contact-repository https://github.com/PaulStanley/oscola-biblatex
catalogue-ctan /macros/latex/contrib/biblatex-contrib/oscola
-catalogue-date 2019-01-20 10:41:30 +0100
catalogue-license lppl1.3
catalogue-topics legal biblatex
-catalogue-version 1.6
+catalogue-version 1.7
1
0
Hello community,
here is the log from the commit of package texlive-specs-p for openSUSE:Factory checked in at 2020-05-29 21:18:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-p (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-p"
Fri May 29 21:18:36 2020 rev:40 rq:806906 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.changes 2019-11-07 23:11:34.528209403 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/texlive-specs-p.changes 2020-05-29 21:30:12.153368500 +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:
----
mychemistry.doc.tar.xz
mychemistry.tar.xz
New:
----
metastr.doc.tar.xz
metastr.tar.xz
mismath.doc.tar.xz
mismath.tar.xz
mlacls.doc.tar.xz
mlacls.tar.xz
mleftright.doc.tar.xz
mleftright.tar.xz
modes.doc.tar.xz
modes.tar.xz
mpfonts.doc.tar.xz
mpfonts.tar.xz
musical.doc.tar.xz
musical.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-p.spec ++++++
++++ 12232 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/texlive-specs-p.spec
++++++ merriweather.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/merriweather/README new/doc/fonts/merriweather/README
--- old/doc/fonts/merriweather/README 2014-06-19 22:22:31.000000000 +0200
+++ new/doc/fonts/merriweather/README 2019-10-14 22:44:59.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2014-06-19.
+This is the README for the merriweather package, version 2019-10-13.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Merriweather and MerriweatherSans families of fonts, designed by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/merriweather.doc.tlpobj new/tlpkg/tlpobj/merriweather.doc.tlpobj
--- old/tlpkg/tlpobj/merriweather.doc.tlpobj 2019-02-28 03:53:31.000000000 +0100
+++ new/tlpkg/tlpobj/merriweather.doc.tlpobj 2019-10-15 01:55:28.000000000 +0200
@@ -1,6 +1,6 @@
name merriweather.doc
category Package
-revision 34315
+revision 52380
shortdesc doc files of merriweather
relocated 1
docfiles size=31
++++++ merriweather.tar.xz ++++++
++++ 3998 lines of diff (skipped)
++++++ metafont.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/inimf.man1.pdf and new/texmf-dist/doc/man/man1/inimf.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/mf-nowin.man1.pdf and new/texmf-dist/doc/man/man1/mf-nowin.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mf.1 new/texmf-dist/doc/man/man1/mf.1
--- old/texmf-dist/doc/man/man1/mf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MF 1 "17 January 2018" "Web2C 2019"
+.TH MF 1 "6 August 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
@@ -252,6 +252,13 @@
.I %&
line.
.TP
+.BI -cnf-line \ string
+Parse
+.I string
+as a
+.I texmf.cnf
+configuration line. See the Kpathsea manual.
+.TP
.B -file-line-error
Print error messages in the form
.I file:line:error
Binary files old/texmf-dist/doc/man/man1/mf.man1.pdf and new/texmf-dist/doc/man/man1/mf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metafont.doc.tlpobj new/tlpkg/tlpobj/metafont.doc.tlpobj
--- old/tlpkg/tlpobj/metafont.doc.tlpobj 2019-03-27 02:25:21.000000000 +0100
+++ new/tlpkg/tlpobj/metafont.doc.tlpobj 2020-03-14 01:43:10.000000000 +0100
@@ -1,6 +1,6 @@
name metafont.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of metafont
docfiles size=36
texmf-dist/doc/man/man1/inimf.1
++++++ metafont.tar.xz ++++++
++++ 2621 lines of diff (skipped)
++++++ metapost.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvitomp.1 new/texmf-dist/doc/man/man1/dvitomp.1
--- old/texmf-dist/doc/man/man1/dvitomp.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/dvitomp.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH DVITOMP 1 "16 June 2015" "Web2C 2019"
+.TH DVITOMP 1 "16 June 2015" "Web2C 2020"
.\" man page by Jim Van Zandt <jrv(a)vanzandt.mv.com>
.SH NAME
dvitomp \- convert a TeX DVI file to a MetaPost MPXFILE
Binary files old/texmf-dist/doc/man/man1/dvitomp.man1.pdf and new/texmf-dist/doc/man/man1/dvitomp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mpost.1 new/texmf-dist/doc/man/man1/mpost.1
--- old/texmf-dist/doc/man/man1/mpost.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mpost.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MPOST 1 "31 December 2018" "Web2C 2019"
+.TH MPOST 1 "31 December 2018" "Web2C 2020"
.\"=====================================================================
.de URL
\\$2 \(laURL: \\$1 \(ra\\$3
Binary files old/texmf-dist/doc/man/man1/mpost.man1.pdf and new/texmf-dist/doc/man/man1/mpost.man1.pdf differ
Binary files old/texmf-dist/doc/metapost/base/mpman.pdf and new/texmf-dist/doc/metapost/base/mpman.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/metapost/base/source-manual/README new/texmf-dist/doc/metapost/base/source-manual/README
--- old/texmf-dist/doc/metapost/base/source-manual/README 2011-04-05 17:03:39.000000000 +0200
+++ new/texmf-dist/doc/metapost/base/source-manual/README 2019-06-01 23:52:22.000000000 +0200
@@ -4,8 +4,9 @@
"A User's Manual for MetaPost", "Drawing Boxes with MetaPost",
"Drawing Graphs with MetaPost" and the introductory article "The
MetaPost System", written by John D. Hobby.
-They were converted to more modern LaTeX by Dylan Thurston and are
-currently maintained by Troy Henderson and Stephan Hennig. The manual
+They were converted to more modern LaTeX by Dylan Thurston,
+later updated Troy Henderson and Stephan Hennig, and currently
+maintained by the MetaPost developers. The manual
may be freely used and modified, but John Hobby makes these requests:
- I request that it remain clear that I am the author of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/metapost/base/source-manual/mpman.tex new/texmf-dist/doc/metapost/base/source-manual/mpman.tex
--- old/texmf-dist/doc/metapost/base/source-manual/mpman.tex 2018-02-19 16:31:52.000000000 +0100
+++ new/texmf-dist/doc/metapost/base/source-manual/mpman.tex 2019-06-01 23:52:22.000000000 +0200
@@ -12,7 +12,7 @@
\fi
\documentclass{article} % article is NOT the original style
\usepackage[nofancy]{svninfo}% Access VCS information.
-\svnInfo $Id: mpman.tex 2139 2018-02-19 14:38:47Z luigi.scarso(a)gmail.com $
+\svnInfo $Id: mpman.tex 2140 2019-06-01 14:38:47Z luigi.scarso(a)gmail.com $
%\svnInfo $Id: mpman.tex 2139 2018-02-19 14:38:47Z luigi.scarso(a)gmail.com $
\newcommand*{\mpversion}{2.00}
@@ -113,10 +113,12 @@
\vskip3bp
\centerline{and the MetaPost development team}
\vskip20.8bp% actually 31.8bp (-11bp)
- \centerline{\large documented version: \mpversion\ (2.0rc2)}
+ \centerline{\large documented version: \mpversion}
\vskip3bp
\tracingall \centerline{\svnInfoMaxToday} \tracingnone
- \vfil
+ \vskip\baselineskip
+ \centerline{Web page: {\tt https://tug.org/metapost}}
+ \centerline{Mailing list: {\tt https://lists.tug.org/metapost}}
\vfil
\vfil
}
@@ -169,23 +171,25 @@
based on Knuth's \MF\ to a large extent. Appendix~\ref{MPvsMF} gives a
detailed comparison of MetaPost and \MF.
-MetaPost documentation is completed by ``Drawing Boxes with MetaPost''
-and ``Drawing Graphs with MetaPost''---the manuals of the \texttt{boxes}
-and \texttt{graph} packages originally developed by John~D. Hobby.
+The basic MetaPost documentation is completed with ``Drawing Boxes with
+MetaPost'' and ``Drawing Graphs with MetaPost''---the manuals of the
+\texttt{boxes} and \texttt{graph} packages originally developed by
+John~D. Hobby.
-The MetaPost home page is \url{http://tug.org/metapost}. It has links
+The MetaPost home page is \url{https://tug.org/metapost}. It has links
to much additional information, including many articles that have been
-written about MetaPost. For general help, try the
+written about MetaPost. For general help and discussion, try the
\url{metapost(a)tug.org} mailing list; you can subscribe to this list at
-\url{http://tug.org/mailman/listinfo/metapost}.
+\url{https://lists.tug.org/metapost}.
-The development is currently hosted at
-\url{https://serveur-svn.lri.fr/svn/modhel/metapost}; visit this site for
-the current development team members and sources (currently no web interface, only anonymouse svn access).
-
-Please report bugs and request enhancements either on the
-\url{metapost(a)tug.org} list, or through the address given above.
-(Please do not send reports directly to Dr.\ Hobby any more.)
+The development repository is currently hosted at
+\url{https://serveur-svn.lri.fr/svn/modhel/metapost}; web browsing and
+anonymous svn checkout are allowed with username \texttt{anonsvn} and
+password \texttt{anonsvn}.
+
+If bug reports get no reply from \url{metapost(a)tug.org}, feel free to
+resend to \url{mp-implementors(a)tug.org}. (Please do not send reports
+directly to Dr.~Hobby in any event.)
\section{Basic Drawing Statements}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metapost.doc.tlpobj new/tlpkg/tlpobj/metapost.doc.tlpobj
--- old/tlpkg/tlpobj/metapost.doc.tlpobj 2019-03-27 02:25:26.000000000 +0100
+++ new/tlpkg/tlpobj/metapost.doc.tlpobj 2020-03-04 23:52:31.000000000 +0100
@@ -1,8 +1,8 @@
name metapost.doc
category Package
-revision 50602
+revision 54070
shortdesc doc files of metapost
-docfiles size=818
+docfiles size=828
texmf-dist/doc/man/man1/dvitomp.1
texmf-dist/doc/man/man1/dvitomp.man1.pdf
texmf-dist/doc/man/man1/mpost.1
++++++ metapost.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metapost.tlpobj new/tlpkg/tlpobj/metapost.tlpobj
--- old/tlpkg/tlpobj/metapost.tlpobj 2019-03-27 02:25:27.000000000 +0100
+++ new/tlpkg/tlpobj/metapost.tlpobj 2020-03-04 23:52:32.000000000 +0100
@@ -1,6 +1,6 @@
name metapost
category Package
-revision 50602
+revision 54070
shortdesc A development of Metafont for creating graphics
longdesc MetaPost uses a language based on that of Metafont to produce
longdesc precise technical illustrations. Its output is scalable
@@ -97,6 +97,5 @@
catalogue-contact-home http://tug.org/metapost
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/mplibdir
catalogue-contact-support http://lists.tug.org/metapost
-catalogue-date 2018-12-31 06:55:45 +0100
catalogue-license lgpl
catalogue-topics graphics-engn
++++++ metrix.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/metrix/README new/doc/latex/metrix/README
--- old/doc/latex/metrix/README 2016-01-21 23:21:24.000000000 +0100
+++ new/doc/latex/metrix/README 2019-05-14 23:41:19.000000000 +0200
@@ -20,9 +20,13 @@
# License
-This material is subject to the LaTeX Project Public License.
-See http://mirror.ctan.org/help/Catalogue/licenses.lppl.html
-for the details of that license.
+License:
+This material is subject to 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
# Files
Binary files old/doc/latex/metrix/metrix.pdf and new/doc/latex/metrix/metrix.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metrix.doc.tlpobj new/tlpkg/tlpobj/metrix.doc.tlpobj
--- old/tlpkg/tlpobj/metrix.doc.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/metrix.doc.tlpobj 2019-10-10 02:04:17.000000000 +0200
@@ -1,8 +1,8 @@
name metrix.doc
category Package
-revision 40099
+revision 52323
shortdesc doc files of metrix
relocated 1
-docfiles size=128
+docfiles size=154
RELOC/doc/latex/metrix/README
RELOC/doc/latex/metrix/metrix.pdf
++++++ metrix.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/metrix/metrix.sty new/tex/latex/metrix/metrix.sty
--- old/tex/latex/metrix/metrix.sty 2016-03-21 21:46:28.000000000 +0100
+++ new/tex/latex/metrix/metrix.sty 2019-10-09 23:56:26.000000000 +0200
@@ -20,9 +20,9 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% File: metrix.dtx Copyright (C) 2013-2015 Tobias Weh
+%% File: metrix.dtx Copyright (c) Tobias Weh
%%
-%% It may be distributed and/or modified under the conditions of the
+%% This file 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
@@ -43,9 +43,9 @@
\endinput
}
\def\metrixFileName{metrix}
-\def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2016/03/21}
-\def\metrixFileVersion{1.3}
+\def\metrixFileDescription{Typeset prosody/metric symbols.}
+\def\metrixFileDate{2019/10/09}
+\def\metrixFileVersion{1.5}
\ProvidesExplPackage
{\metrixFileName}{\metrixFileDate}{\metrixFileVersion}{\metrixFileDescription}
\RequirePackage{xparse}
@@ -54,6 +54,27 @@
\ExplSyntaxOff
\usetikzlibrary{calc}
\ExplSyntaxOn
+\RequirePackage{textcomp}
+\tl_const:Nn \c__metrix_acute_accent_tl { / }
+\tl_const:Nn \c__metrix_grave_accent_tl { * }
+\tl_new:N \l__metrix_words_tl
+\seq_new:N \l__metrix_syllables_seq
+\seq_new:N \l__metrix_symbols_seq
+\seq_new:N \l__metrix_short_breaks_seq
+\seq_new:N \l__metrix_foot_breaks_seq
+\prop_new:N \l__metrix_highlights_prop
+\seq_new:N \l__metrix_highlight_seq
+\seq_new:N \l__metrix_highlight_pos_seq
+\quark_new:N \q__metrix_space_marker
+\int_new:N \l__metrix_process_int
+\bool_new:N \l__metrix_short_syllable_bool
+\box_new:N \l__metrix_syllable_box
+\tl_new:N \g__metrix_variable_shortsyllablelimit_tl
+\tl_set:Nn \g__metrix_variable_shortsyllablelimit_tl { 0.8em }
+\tl_new:N \l__metrix_current_symbol_tl
+\tl_new:N \l__metrix_current_symbol_head_tl
+\bool_new:N \l__metrix_has_acute_accent_bool
+\bool_new:N \l__metrix_has_grave_accent_bool
\tl_new:N \g__metrix_variable_symbollinewidth_tl
\tl_set:Nn \g__metrix_variable_symbollinewidth_tl { 0.04em }
\tl_new:N \g__metrix_variable_bigsymbollinewidth_tl
@@ -97,11 +118,11 @@
\tl_new:N \g__metrix_variable_bowlooseness_tl
\tl_set:Nn \g__metrix_variable_bowlooseness_tl { 0.75 }
\tl_new:N \g__metrix_variable_symbolcolor_tl
-\tl_set:Nn \g__metrix_variable_symbolcolor_tl { black }
+\tl_set:Nn \g__metrix_variable_symbolcolor_tl { . }
\tl_new:N \g__metrix_variable_accentcolor_tl
-\tl_set:Nn \g__metrix_variable_accentcolor_tl { black }
+\tl_set:Nn \g__metrix_variable_accentcolor_tl { . }
\tl_new:N \g__metrix_variable_bowcolor_tl
-\tl_set:Nn \g__metrix_variable_bowcolor_tl { black }
+\tl_set:Nn \g__metrix_variable_bowcolor_tl { . }
\tl_new:N \g__metrix_variable_highlightcolor_tl
\tl_set:Nn \g__metrix_variable_highlightcolor_tl { red }
\tl_new:N \g__metrix_variable_fillcolor_tl
@@ -112,24 +133,15 @@
\tl_set:Nn \g__metrix_variable_breakgap_tl { 0.6em }
\tl_new:N \g__metrix_variable_emptywidth_tl
\tl_set:Nn \g__metrix_variable_emptywidth_tl { 1em }
-\tl_new:N \l__metrix_words_tl
-\seq_new:N \l__metrix_syllables_seq
-\seq_new:N \l__metrix_symbols_seq
-\seq_new:N \l__metrix_short_breaks_seq
-\seq_new:N \l__metrix_foot_breaks_seq
-\prop_new:N \l__metrix_highlights_prop
-\seq_new:N \l__metrix_highlight_seq
-\seq_new:N \l__metrix_highlight_pos_seq
-\quark_new:N \q__metrix_space_marker
-\int_new:N \l__metrix_process_int
-\bool_new:N \l__metrix_short_syllable_bool
-\box_new:N \l__metrix_syllable_box
-\tl_new:N \g__metrix_variable_shortsyllablelimit_tl
-\tl_set:Nn \g__metrix_variable_shortsyllablelimit_tl { 0.8em }
+\tl_new:N \g__metrix_variable_acute_tl
+\tl_set:Nn \g__metrix_variable_acute_tl { \textasciiacute }
+\tl_new:N \g__metrix_variable_grave_tl
+\tl_set:Nn \g__metrix_variable_grave_tl { \textasciigrave }
\cs_generate_variant:Nn \prop_item:Nn { No , Nf , NV , Nx }
\cs_generate_variant:Nn \prop_put:Nnn { Nnx , Nxx , Nff , Noo }
\cs_generate_variant:Nn \seq_item:Nn { Nf , NV , Nx }
\cs_generate_variant:Nn \seq_set_split:Nnn { Nnf , NnV , Nnx }
+\cs_generate_variant:Nn \tl_remove_once:Nn { NV }
\cs_new_protected:Npn \__metrix_metrics:nn #1 #2
{
\tl_set:Nx \l__metrix_words_tl { \tl_trim_spaces:n { #2 } }
@@ -253,7 +265,7 @@
\int_incr:N \l__metrix_process_int
\int_compare:nT { \l__metrix_process_int > 1 }
{
- \hspace{\usemetrixvar{symbolsep}}
+ \hspace { \usemetrixvar{symbolsep} }
}
\str_case:nnF { ##1 }
{
@@ -331,16 +343,32 @@
}
\cs_new_protected:Npn \__metrix_print_symbol:
{
+ \tl_set:Nx \l__metrix_current_symbol_tl
+ {
+ \seq_item:Nn \l__metrix_symbols_seq { \l__metrix_process_int }
+ }
+ \tl_set:Nx \l__metrix_current_symbol_head_tl
+ {
+ \tl_head:N \l__metrix_current_symbol_tl
+ }
+ \tl_case:NnT \l__metrix_current_symbol_head_tl
+ {
+ \c__metrix_acute_accent_tl { \bool_set_true:N \l__metrix_has_acute_accent_bool }
+ \c__metrix_grave_accent_tl { \bool_set_true:N \l__metrix_has_grave_accent_bool }
+ }
+ {
+ \tl_remove_once:NV \l__metrix_current_symbol_tl \l__metrix_current_symbol_head_tl
+ }
\cs_if_exist_use:cF
{
- __metrix_\seq_item:Nn \l__metrix_symbols_seq
- { \l__metrix_process_int }_mark:
+ __metrix_
+ \tl_use:N \l__metrix_current_symbol_tl
+ _mark:
}
{
\__metrix_error_msg:n
{
- Unknown~symbol~abbreviation~'\seq_item:Nn
- \l__metrix_symbols_seq { \l__metrix_process_int }'.
+ Unknown~symbol~abbreviation~'\tl_use:N \l__metrix_current_symbol_tl'.
}
}
}
@@ -372,9 +400,8 @@
}
\cs_new_protected:Npn \__metrix_break_gap:
{
- \hspace{\usemetrixvar{breakgap}}
+ \hspace { \usemetrixvar { breakgap } }
}
-
\cs_new:Npn \__metrix_break_node:n #1
{
\group_begin:
@@ -387,10 +414,9 @@
;
\group_end:
}
-
\cs_new_protected:Npn \__metrix_e_gap:
{
- \hspace*{\usemetrixvar{emptywidth}}
+ \hspace* { \usemetrixvar { emptywidth } }
}
\cs_new_protected:Npn \__metrix_evaluate_higlights:n #1
{
@@ -459,6 +485,14 @@
{
\begin{tikzpicture}[every~metrix~symbol]
\draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.225];
+ \bool_if:NT \l__metrix_has_acute_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.225,0) { \usemetrixvar { acute } };
+ }
+ \bool_if:NT \l__metrix_has_grave_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.225,0) { \usemetrixvar { grave } };
+ }
\end{tikzpicture}
}
\cs_new:Npn \__metrix___mark:
@@ -467,11 +501,27 @@
{
\begin{tikzpicture}[every~metrix~symbol]
\draw (0,0) -- ++(0.4,0);
+ \bool_if:NT \l__metrix_has_acute_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.2,0) { \usemetrixvar { acute } };
+ }
+ \bool_if:NT \l__metrix_has_grave_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.2,0) { \usemetrixvar { grave } };
+ }
\end{tikzpicture}
}
{
\begin{tikzpicture}[every~metrix~symbol]
\draw (0,0) -- ++(0.75,0);
+ \bool_if:NT \l__metrix_has_acute_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.375,0) { \usemetrixvar { acute } };
+ }
+ \bool_if:NT \l__metrix_has_grave_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.375,0) { \usemetrixvar { grave } };
+ }
\end{tikzpicture}
}
}
@@ -526,6 +576,24 @@
\draw (-0.2,-0.2) -- (0.2,0.2);
\end{tikzpicture}
}
+\cs_new:Npn \__metrix_v_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) -- (0.225,-0.225) -- (0.45,0);
+ \end{tikzpicture}
+ }
+\cs_new:Npn \__metrix_A_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) -- (0.225,0.225) -- (0.45,0);
+ \end{tikzpicture}
+ }
+\cs_new:Npn \__metrix_o_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) circle [radius=0.2];
+ \end{tikzpicture}
+ }
\cs_new:Npn \__metrix_oo_mark:
{
\begin{tikzpicture}[every~metrix~symbol]
@@ -542,6 +610,15 @@
+(0,-\usemetrixvar{gap})$);
\end{tikzpicture}
}
+\cs_new:Npn \__metrix__u_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.2];
+ \draw ($(0,0)+(-0.5\pgflinewidth,0.5\pgflinewidth)+(0,\usemetrixvar{gap})$) --
+ ($(0.4,0)+(0.5\pgflinewidth,0.5\pgflinewidth)
+ +(0,\usemetrixvar{gap})$);
+ \end{tikzpicture}
+ }
\cs_new:Npn \__metrix_n_mark:
{
\begin{tikzpicture}[every~metrix~symbol]
@@ -550,6 +627,18 @@
circle [radius=0.7\pgflinewidth];
\end{tikzpicture}
}
+\cs_new:Npn \__metrix_p_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (-0.2,-0.2) -- (0.2,0.2);
+ \end{tikzpicture}
+ }
+\cs_new:Npn \__metrix_s_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (-0.2,0.2) -- (0.2,-0.2);
+ \end{tikzpicture}
+ }
\cs_new:Npn \__metrix_l_mark:
{
\begin{tikzpicture}[every~metrix~symbol]
@@ -739,6 +828,9 @@
every metrix symbol node/.style={
inner sep=0pt, anchor=center,
},
+ every metrix ictus node/.style={
+ overlay,
+ },
every metrix break node/.style={
inner sep=0pt, anchor=base,
},
@@ -838,25 +930,25 @@
\string\verseref\space can~only~be~used~in~{metricverses}~env.
}
}
-\NewDocumentEnvironment{metricverses} { }
+\NewDocumentEnvironment { metricverses } { }
{
\RenewDocumentCommand { \verseref } { m }
{
\__metrix_print_vers_ref:n { ##1 }
}
\par
- \addvspace{0.7\baselineskip}
- \fp_compare:nT { \usemetrixvar{symbolshift} < 0.0 }
+ \addvspace { 0.7\baselineskip }
+ \fp_compare:nT { \usemetrixvar { symbolshift } < 0.0 }
{
- \vspace{\usemetrixvar{symbolshift}}
+ \vspace { \usemetrixvar { symbolshift } }
}
- \addtolength{\baselineskip}{0.6\baselineskip}
+ \addtolength { \baselineskip } { 0.6\baselineskip }
}
{
\par
- \addtolength{\baselineskip}{-0.6\baselineskip}
- \vspace{\baselineskip}
- \noindent\ignorespacesafterend
+ \addtolength { \baselineskip } { -0.6\baselineskip }
+ \vspace { \baselineskip }
+ \noindent \ignorespacesafterend
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metrix.tlpobj new/tlpkg/tlpobj/metrix.tlpobj
--- old/tlpkg/tlpobj/metrix.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/metrix.tlpobj 2019-10-10 02:04:18.000000000 +0200
@@ -1,18 +1,20 @@
name metrix
category Package
-revision 40099
+revision 52323
shortdesc Typeset metric marks for Latin text
relocated 1
longdesc The package may be used to type the prosodics/metrics of
longdesc (latin) verse; it provides macros to typeset the symbols
longdesc standing alone, and in combination with symbols, giving
-longdesc automatic alignment. The package requires tikz (including the
-longdesc calc library, and the xparse package (thus also requiring the
-longdesc experimental LaTeX 3 environment).
-runfiles size=7
+longdesc automatic alignment. The package requires TikZ (including the
+longdesc calc library), xpatch, and xparse (thus also requiring the
+longdesc experimental LaTeX3 environment).
+runfiles size=8
RELOC/tex/latex/metrix/metrix.sty
+catalogue-contact-bugs https://github.com/tweh/metrix/issues
+catalogue-contact-repository https://github.com/tweh/metrix
catalogue-ctan /macros/latex/contrib/metrix
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-10-09 13:48:07 +0200
+catalogue-license lppl1.3c
catalogue-topics latin verse expl3
-catalogue-version 1.3
+catalogue-version 1.5
++++++ mex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mex.doc.tlpobj new/tlpkg/tlpobj/mex.doc.tlpobj
--- old/tlpkg/tlpobj/mex.doc.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/mex.doc.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mex.doc
category Package
-revision 45678
+revision 54227
shortdesc doc files of mex
docfiles size=31
texmf-dist/doc/mex/base/00readme
++++++ mex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mex.tlpobj new/tlpkg/tlpobj/mex.tlpobj
--- old/tlpkg/tlpobj/mex.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/mex.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mex
category Package
-revision 45678
+revision 54227
shortdesc Polish formats for TeX
longdesc MeX is an adaptation of Plain TeX (MeX) and LaTeX209 (LaMeX)
longdesc formats to the Polish language and to Polish printing customs.
@@ -11,6 +11,7 @@
depend hyphen-polish
depend pdftex
depend tex
+depend hyph-utf8
depend hyphen-base
depend knuth-lib
depend plain
@@ -18,9 +19,9 @@
depend enctex
depend utf8mex
depend mex.ARCH
-execute AddFormat name=mex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *mex.ini" fmttriggers=hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
-execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *pdfmex.ini" fmttriggers=hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
-execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex options="-enc *utf8mex.ini" fmttriggers=hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files,enctex,utf8mex
+execute AddFormat name=mex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *mex.ini" fmttriggers=hyph-utf8,hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
+execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *pdfmex.ini" fmttriggers=hyph-utf8,hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
+execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex options="-enc *utf8mex.ini" fmttriggers=hyph-utf8,hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files,enctex,utf8mex
runfiles size=13
texmf-dist/tex/mex/base/lamex.tex
texmf-dist/tex/mex/base/mex.tex
@@ -30,7 +31,6 @@
texmf-dist/tex/mex/config/mex.ini
texmf-dist/tex/mex/config/pdfmex.ini
catalogue-ctan /language/polish/mex105.zip
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics format polish
catalogue-version 1.05
++++++ mflogo-font.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mflogo-font.doc.tlpobj new/tlpkg/tlpobj/mflogo-font.doc.tlpobj
--- old/tlpkg/tlpobj/mflogo-font.doc.tlpobj 2019-02-28 03:54:01.000000000 +0100
+++ new/tlpkg/tlpobj/mflogo-font.doc.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,6 +1,6 @@
name mflogo-font.doc
category Package
-revision 36898
+revision 54512
shortdesc doc files of mflogo-font
relocated 1
docfiles size=1
++++++ mflogo-font.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mflogo-font.tlpobj new/tlpkg/tlpobj/mflogo-font.tlpobj
--- old/tlpkg/tlpobj/mflogo-font.tlpobj 2019-02-28 03:54:01.000000000 +0100
+++ new/tlpkg/tlpobj/mflogo-font.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,6 +1,6 @@
name mflogo-font
category Package
-revision 36898
+revision 54512
shortdesc Metafont logo font
relocated 1
longdesc These fonts were created in Metafont by Knuth, for his own
@@ -28,8 +28,7 @@
RELOC/fonts/type1/hoekwater/mflogo-font/logosl10.pfb
RELOC/fonts/type1/hoekwater/mflogo-font/logosl8.pfb
RELOC/fonts/type1/hoekwater/mflogo-font/logosl9.pfb
-catalogue-ctan /fonts/mflogo/ps-type1/hoekwater
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-ctan /fonts/mflogo
catalogue-license knuth
catalogue-topics font font-mf font-type1
catalogue-version 1.002
++++++ mflua.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mflua.tlpobj new/tlpkg/tlpobj/mflua.tlpobj
--- old/tlpkg/tlpobj/mflua.tlpobj 2019-04-07 01:38:04.000000000 +0200
+++ new/tlpkg/tlpobj/mflua.tlpobj 2020-03-04 23:52:35.000000000 +0100
@@ -1,6 +1,6 @@
name mflua
category TLCore
-revision 50829
+revision 54074
shortdesc configuration and base files for MFLua
longdesc For information on this Lua-enabled Metafont, see, for example:
longdesc tug.org/TUGboat/tb32-2/tb101scarso.pdf.
++++++ mfware.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/gftodvi.1 new/texmf-dist/doc/man/man1/gftodvi.1
--- old/texmf-dist/doc/man/man1/gftodvi.1 2019-03-26 15:41:17.000000000 +0100
+++ new/texmf-dist/doc/man/man1/gftodvi.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH GFTODVI 1 "25 March 2019" "Web2C 2019"
+.TH GFTODVI 1 "25 March 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/gftodvi.man1.pdf and new/texmf-dist/doc/man/man1/gftodvi.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/gftopk.1 new/texmf-dist/doc/man/man1/gftopk.1
--- old/texmf-dist/doc/man/man1/gftopk.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/gftopk.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH GFTOPK 1 "16 June 2015" "Web2C 2019"
+.TH GFTOPK 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/gftopk.man1.pdf and new/texmf-dist/doc/man/man1/gftopk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/gftype.1 new/texmf-dist/doc/man/man1/gftype.1
--- old/texmf-dist/doc/man/man1/gftype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/gftype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH GFTYPE 1 "16 June 2015" "Web2C 2019"
+.TH GFTYPE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/gftype.man1.pdf and new/texmf-dist/doc/man/man1/gftype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mft.1 new/texmf-dist/doc/man/man1/mft.1
--- old/texmf-dist/doc/man/man1/mft.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mft.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MFT 1 "27 May 2018" "Web2C 2019"
+.TH MFT 1 "27 May 2018" "Web2C 2020"
.\"=====================================================================
.if n .ds MP MetaPost
.if t .ds MP MetaPost
Binary files old/texmf-dist/doc/man/man1/mft.man1.pdf and new/texmf-dist/doc/man/man1/mft.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pktogf.1 new/texmf-dist/doc/man/man1/pktogf.1
--- old/texmf-dist/doc/man/man1/pktogf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pktogf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PKTOGF 1 "16 June 2015" "Web2C 2019"
+.TH PKTOGF 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/pktogf.man1.pdf and new/texmf-dist/doc/man/man1/pktogf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pktype.1 new/texmf-dist/doc/man/man1/pktype.1
--- old/texmf-dist/doc/man/man1/pktype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pktype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PKTYPE 1 "16 June 2015" "Web2C 2019"
+.TH PKTYPE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/pktype.man1.pdf and new/texmf-dist/doc/man/man1/pktype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mfware.doc.tlpobj new/tlpkg/tlpobj/mfware.doc.tlpobj
--- old/tlpkg/tlpobj/mfware.doc.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/mfware.doc.tlpobj 2020-03-04 23:52:36.000000000 +0100
@@ -1,6 +1,6 @@
name mfware.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of mfware
docfiles size=42
texmf-dist/doc/man/man1/gftodvi.1
++++++ mfware.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mfware.tlpobj new/tlpkg/tlpobj/mfware.tlpobj
--- old/tlpkg/tlpobj/mfware.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/mfware.tlpobj 2020-03-04 23:52:36.000000000 +0100
@@ -1,6 +1,6 @@
name mfware
category TLCore
-revision 50602
+revision 54070
shortdesc Supporting tools for use with Metafont
longdesc A collection of programs (as web source) for processing the
longdesc output of Metafont.
@@ -14,6 +14,5 @@
catalogue-contact-repository http://tug.org/svn/texlive/trunk/Build/source/texk/web2c/
catalogue-contact-support http://lists.tug.org/tex-k
catalogue-ctan /systems/knuth/dist/mfware
-catalogue-date 2018-12-31 06:12:45 +0100
catalogue-license knuth
catalogue-topics collection
++++++ mhchem.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mhchem.doc.tlpobj new/tlpkg/tlpobj/mhchem.doc.tlpobj
--- old/tlpkg/tlpobj/mhchem.doc.tlpobj 2019-02-28 03:54:17.000000000 +0100
+++ new/tlpkg/tlpobj/mhchem.doc.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name mhchem.doc
category Package
-revision 48088
+revision 52662
shortdesc doc files of mhchem
relocated 1
docfiles size=88
++++++ mhchem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mhchem.tlpobj new/tlpkg/tlpobj/mhchem.tlpobj
--- old/tlpkg/tlpobj/mhchem.tlpobj 2019-02-28 03:54:18.000000000 +0100
+++ new/tlpkg/tlpobj/mhchem.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name mhchem
category Package
-revision 48088
+revision 52662
shortdesc Typeset chemical formulae/equations and Risk and Safety phrases
relocated 1
longdesc The bundle provides three packages: The mhchem package provides
@@ -11,7 +11,12 @@
longdesc package provides commands for the official Risk and Safety (R
longdesc and S) Phrases that are used to label chemicals. The package
longdesc requires the expl3 bundle.
+depend amsmath
depend chemgreek
+depend graphics
+depend l3kernel
+depend l3packages
+depend tools
runfiles size=109
RELOC/tex/latex/mhchem/hpstatement.sty
RELOC/tex/latex/mhchem/mhchem.sty
++++++ miama.doc.tar.xz ++++++
Binary files old/doc/fonts/miama/miama.pdf and new/doc/fonts/miama/miama.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/miama.doc.tlpobj new/tlpkg/tlpobj/miama.doc.tlpobj
--- old/tlpkg/tlpobj/miama.doc.tlpobj 2019-02-28 03:54:18.000000000 +0100
+++ new/tlpkg/tlpobj/miama.doc.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,8 +1,8 @@
name miama.doc
category Package
-revision 39837
+revision 54512
shortdesc doc files of miama
relocated 1
-docfiles size=89
+docfiles size=96
RELOC/doc/fonts/miama/README
RELOC/doc/fonts/miama/miama.pdf
++++++ miama.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/lgrfmm.fd new/tex/latex/miama/lgrfmm.fd
--- old/tex/latex/miama/lgrfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/lgrfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -23,12 +23,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{LGR}{fmm}{}
-\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@scale miama-lgr}{}
+\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@@scale miama-lgr}{}
\DeclareFontShape{LGR}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{LGR}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{LGR}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/miama.sty new/tex/latex/miama/miama.sty
--- old/tex/latex/miama/miama.sty 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/miama.sty 2019-06-19 00:28:12.000000000 +0200
@@ -10,7 +10,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{miama}
-[2016/02/19 v1.0 class to use the typeface Miama Nueva]
+[2019/06/18 v1.1 class to use the typeface Miama Nueva]
%% \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
@@ -26,10 +26,11 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\RequirePackage{kvoptions}
-\SetupKeyvalOptions{prefix=fmm@}
-\DeclareStringOption[0.5]{scale}
-\ProcessKeyvalOptions*
+\newcommand*{\fmm(a)scale}{0.5}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\fmm@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\fmm@scale}{#1}}
+\ProcessOptionsX\relax
\DeclareRobustCommand\fmmfamily{%
\not@math@alphabet\fmmfamily\relax
\fontfamily{fmm}\selectfont}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/ot1fmm.fd new/tex/latex/miama/ot1fmm.fd
--- old/tex/latex/miama/ot1fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/ot1fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{OT1}{fmm}{}
-\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@scale miama-ot1}{}
+\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@@scale miama-ot1}{}
\DeclareFontShape{OT1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{OT1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{OT1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/qxfmm.fd new/tex/latex/miama/qxfmm.fd
--- old/tex/latex/miama/qxfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/qxfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -25,12 +25,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{QX}{fmm}{}
-\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@scale miama-qx}{}
+\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@@scale miama-qx}{}
\DeclareFontShape{QX}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{QX}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{QX}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t1fmm.fd new/tex/latex/miama/t1fmm.fd
--- old/tex/latex/miama/t1fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t1fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T1}{fmm}{}
-\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@scale miama-t1}{}
+\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@@scale miama-t1}{}
\DeclareFontShape{T1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t2afmm.fd new/tex/latex/miama/t2afmm.fd
--- old/tex/latex/miama/t2afmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t2afmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T2A}{fmm}{}
-\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@scale miama-t2a}{}
+\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@@scale miama-t2a}{}
\DeclareFontShape{T2A}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2A}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2A}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t2bfmm.fd new/tex/latex/miama/t2bfmm.fd
--- old/tex/latex/miama/t2bfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t2bfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T2B}{fmm}{}
-\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@scale miama-t2b}{}
+\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@@scale miama-t2b}{}
\DeclareFontShape{T2B}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2B}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2B}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t2cfmm.fd new/tex/latex/miama/t2cfmm.fd
--- old/tex/latex/miama/t2cfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t2cfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T2C}{fmm}{}
-\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@scale miama-t2c}{}
+\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@@scale miama-t2c}{}
\DeclareFontShape{T2C}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2C}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2C}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t5fmm.fd new/tex/latex/miama/t5fmm.fd
--- old/tex/latex/miama/t5fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t5fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T5}{fmm}{}
-\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@scale miama-t5}{}
+\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@@scale miama-t5}{}
\DeclareFontShape{T5}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T5}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T5}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/x2fmm.fd new/tex/latex/miama/x2fmm.fd
--- old/tex/latex/miama/x2fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/x2fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{X2}{fmm}{}
-\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@scale miama-x2}{}
+\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@@scale miama-x2}{}
\DeclareFontShape{X2}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{X2}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{X2}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/miama.tlpobj new/tlpkg/tlpobj/miama.tlpobj
--- old/tlpkg/tlpobj/miama.tlpobj 2019-02-28 03:54:18.000000000 +0100
+++ new/tlpkg/tlpobj/miama.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,6 +1,6 @@
name miama
category Package
-revision 39837
+revision 54512
shortdesc The Miama Nueva handwriting font with LaTeX support
relocated 1
longdesc Miama Nueva is a handwriting / script font with over 1300
@@ -41,7 +41,6 @@
RELOC/tex/latex/miama/t5fmm.fd
RELOC/tex/latex/miama/x2fmm.fd
catalogue-ctan /fonts/miama
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
-catalogue-topics font-calligraphic font-cyrillic font-greek font-otf font-type1
-catalogue-version 1.0
+catalogue-license ofl lppl1.3
+catalogue-topics font font-calligraphic font-cyrillic font-greek font-multilingual font-otf font-type1 font-t1enc font-supp
+catalogue-version 1.1
++++++ microtype-de.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/microtype-de.doc.tlpobj new/tlpkg/tlpobj/microtype-de.doc.tlpobj
--- old/tlpkg/tlpobj/microtype-de.doc.tlpobj 2019-02-28 03:54:20.000000000 +0100
+++ new/tlpkg/tlpobj/microtype-de.doc.tlpobj 2020-03-04 23:52:37.000000000 +0100
@@ -1,6 +1,6 @@
name microtype-de.doc
category Package
-revision 24549
+revision 54080
shortdesc doc files of microtype-de
relocated 1
docfiles size=451
++++++ microtype.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/microtype/README.md new/doc/latex/microtype/README.md
--- old/doc/latex/microtype/README.md 2019-03-01 23:25:46.000000000 +0100
+++ new/doc/latex/microtype/README.md 2019-11-19 01:01:37.000000000 +0100
@@ -4,7 +4,7 @@
**Subliminal refinements towards typographical perfection**
- (v2.7b -- 2019/02/28)
+ (v2.7d -- 2019/11/18)
Overview
@@ -76,5 +76,5 @@
(2) the identification string is changed.
------------------------------------------------------
-Copyright (c) 2004--2018 R Schlicht `<w.m.l(a)gmx.net>`
+Copyright (c) 2004--2019 R Schlicht `<w.m.l(a)gmx.net>`
------------------------------------------------------
Binary files old/doc/latex/microtype/microtype.pdf and new/doc/latex/microtype/microtype.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/microtype/test-microtype.tex new/doc/latex/microtype/test-microtype.tex
--- old/doc/latex/microtype/test-microtype.tex 2018-01-15 23:21:32.000000000 +0100
+++ new/doc/latex/microtype/test-microtype.tex 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/microtype.doc.tlpobj new/tlpkg/tlpobj/microtype.doc.tlpobj
--- old/tlpkg/tlpobj/microtype.doc.tlpobj 2019-03-02 02:26:07.000000000 +0100
+++ new/tlpkg/tlpobj/microtype.doc.tlpobj 2019-11-19 01:55:50.000000000 +0100
@@ -1,9 +1,9 @@
name microtype.doc
category Package
-revision 50187
+revision 52853
shortdesc doc files of microtype
relocated 1
-docfiles size=412
+docfiles size=417
RELOC/doc/latex/microtype/README.md
RELOC/doc/latex/microtype/microtype.pdf
RELOC/doc/latex/microtype/test-microtype.tex
++++++ microtype.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/letterspace.sty new/tex/latex/microtype/letterspace.sty
--- old/tex/latex/microtype/letterspace.sty 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/letterspace.sty 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -33,7 +33,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{letterspace}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Robust letterspacing
(RS)]
\def\MT@MT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype-luatex.def new/tex/latex/microtype/microtype-luatex.def
--- old/tex/latex/microtype/microtype-luatex.def 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype-luatex.def 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-luatex.def}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Definitions specific to
luatex
(RS)]
@@ -113,7 +113,6 @@
\fi
}
\let\MT@copy@font\relax
-\MT@requires@luatex4{\let\pdfcopyfont\copyfont}\relax
\def\MT@copy@font@{%
\xdef\MT@font@copy{\csname\MT@@font/\MT@pr@context/\MT@ex@context\endcsname}%
\expandafter\ifx\MT@font@copy\relax
@@ -123,7 +122,7 @@
\else
\MT@exp@two@c\let\font@name\MT@font@orig
\fi
- \global\MT@exp@two@c\pdfcopyfont\MT@font@copy\font@name
+ \MT@exp@two@c\MT@lua@copyfont\meaning\font@name\@nil
\MT@map@clist@c\MT@active@features{%
\MT@exp@cs\ifx{MT@\@nameuse{MT@abbr@##1}}\relax\else
\def\@tempa{##1}%
@@ -133,6 +132,7 @@
\fi
\MT@exp@two@c\let\MT@font\MT@font@copy
\let\font@name\MT@font@copy
+ \aftergroup\MT@exp@two@c
\aftergroup\let\aftergroup\font@name\aftergroup\MT@font@copy
}
\def\MT@rem@from@list#1{%
@@ -141,6 +141,8 @@
\MT@font \csname MT@\@tempa @#1font@list\endcsname
\fi
}
+\def\MT@lua@copyfont #1 #2 #3\@nil{%
+ \global\expandafter\font\MT@font@copy=#3\relax}
\def\MT@protrusion{\MT@maybe@do{pr}}
\def\MT@set@pr@codes{%
\MT@nofamilyfalse
@@ -303,10 +305,22 @@
\MT@nonselectedfalse
}
\let\MT@set@ex@codes\MT@set@ex@codes@n
+\directlua{\detokenize{
+ if font.setexpansion == nil then
+ tex.print("\\@firstoftwo")
+ else
+ tex.print("\\@secondoftwo")
+ end
+}}{
\MT@requires@luatex4{\let\pdffontexpand\expandglyphsinfont}\relax
\def\MT@expandfont{%
\pdffontexpand\MT@font \MT@stretch@ \MT@shrink@ \MT@step@ \MT@auto@\relax
}
+}{
+\def\MT@expandfont{%
+ \directlua{font.setexpansion(font.current(),\MT@stretch@,\MT@shrink@,\MT@step@)}%
+}
+}
\def\MT@set@all@ex#1{%
\MT@do@font{\efcode\MT@font\@tempcnta=#1\relax}%
}
@@ -1152,14 +1166,24 @@
\MT@check@step{stretch}%
\MT@check@step{shrink}%
\MT@check@active@set{ex}%
- \CheckCommand*\showhyphens[1]{\setbox0\vbox{%
- \color@begingroup\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
- \gdef\showhyphens##1{\setbox0\vbox{%
- \color@begingroup\pdfadjustspacing\z@\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
+ \MT@ifdefined@n@TF{showhyphens }{%
+ \def\MT@temp##1##2{%
+ \expandafter\CheckCommand\csname showhyphens \endcsname[1]{##1}%
+ \DeclareRobustCommand\showhyphens[1]{##2}}%
+ }{%
+ \def\MT@temp##1##2{%
+ \CheckCommand*\showhyphens[1]{##1}%
+ \gdef\showhyphens####1{##2}}%
+ }%
+ \MT@temp
+ {\setbox0\vbox{\color@begingroup
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}
+ {\setbox0\vbox{\color@begingroup\pdfadjustspacing\z@
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
\else
\let\MT@expansion\relax
\MT@info@nl{No font expansion}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype-pdftex.def new/tex/latex/microtype/microtype-pdftex.def
--- old/tex/latex/microtype/microtype-pdftex.def 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype-pdftex.def 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-pdftex.def}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Definitions specific to
pdftex
(RS)]
@@ -1487,14 +1487,24 @@
\MT@check@step{stretch}%
\MT@check@step{shrink}%
\MT@check@active@set{ex}%
- \CheckCommand*\showhyphens[1]{\setbox0\vbox{%
- \color@begingroup\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
- \gdef\showhyphens##1{\setbox0\vbox{%
- \color@begingroup\pdfadjustspacing\z@\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
+ \MT@ifdefined@n@TF{showhyphens }{%
+ \def\MT@temp##1##2{%
+ \expandafter\CheckCommand\csname showhyphens \endcsname[1]{##1}%
+ \DeclareRobustCommand\showhyphens[1]{##2}}%
+ }{%
+ \def\MT@temp##1##2{%
+ \CheckCommand*\showhyphens[1]{##1}%
+ \gdef\showhyphens####1{##2}}%
+ }%
+ \MT@temp
+ {\setbox0\vbox{\color@begingroup
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}
+ {\setbox0\vbox{\color@begingroup\pdfadjustspacing\z@
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
\else
\let\MT@expansion\relax
\MT@info@nl{No font expansion}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype-xetex.def new/tex/latex/microtype/microtype-xetex.def
--- old/tex/latex/microtype/microtype-xetex.def 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype-xetex.def 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-xetex.def}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Definitions specific to
xetex
(RS)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype.cfg new/tex/latex/microtype/microtype.cfg
--- old/tex/latex/microtype/microtype.cfg 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype.cfg 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -40,7 +40,7 @@
%%
\ProvidesFile
{microtype.cfg}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
microtype main configuration file
(RS)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype.lua new/tex/latex/microtype/microtype.lua
--- old/tex/latex/microtype/microtype.lua 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype.lua 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
--
-- The `microtype' package
-- Subliminal refinements towards typographical perfection
--- Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+-- Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
--
-- 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
@@ -34,16 +34,16 @@
local microtype = microtype
microtype.module = {
name = "microtype",
- version = "2.7b",
- date = "2019/02/28",
+ version = "2.7d",
+ date = "2019/11/18",
description = "microtype module.",
author = "E. Roux, R. Schlicht and P. Gesang",
copyright = "E. Roux, R. Schlicht and P. Gesang",
license = "LPPL",
}
-function microtype.warning(...)
- luatexbase.module_warning("microtype",...)
+function microtype.info(...)
+ luatexbase.module_info("microtype",...)
end
local find = string.find
@@ -143,7 +143,7 @@
if luaotfload and luaotfload.letterspace then
if luaotfload.letterspace.keepligature then
- microtype.warning("overwriting function `keepligature'")
+ microtype.info("overwriting function `keepligature'")
end
luaotfload.letterspace.keepligature = keepligature
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype.sty new/tex/latex/microtype/microtype.sty
--- old/tex/latex/microtype/microtype.sty 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype.sty 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{microtype}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Micro-typographical refinements
(RS)]
\def\MT@MT
@@ -1076,6 +1076,9 @@
\set@display@protect
\let\IeC\@firstofone
\let\@inpenc@undefined@\MT@undefined@char
+ \let\UTF@two@octets@noexpand\@empty
+ \let\UTF@three@octets@noexpand\@empty
+ \let\UTF@four@octets@noexpand\@empty
\def\UTFviii@defined##1{\ifx ##1\relax
\MT@undefined@char{utf8}\else\expandafter ##1\fi}%
\MT@ifdefined@c@T\PrerenderUnicode
@@ -1095,7 +1098,10 @@
\expandafter\MT@exp@two@c\expandafter\MT@is@char\expandafter
\meaning\expandafter\MT@char\MT@charstring\relax\relax\relax
\ifnum\MT@char@ < \z@
- \expandafter\expandafter\expandafter\MT@is@letter\MT@char\relax\relax
+ \expandafter\expandafter\expandafter\MT@is@tlig\MT@char\relax\relax
+ \ifnum\MT@char@ < \z@
+ \expandafter\expandafter\expandafter\MT@is@letter\MT@char\relax\relax
+ \fi
\fi
}
\begingroup
@@ -1140,6 +1146,11 @@
}%
}
/x
+\def\MT@is@tlig#1#2{%
+ \ifx#1\remove@tlig
+ \MT@is@number #2\relax\relax
+ \fi
+}
\def\MT@is@composite#1#2\relax{%
\ifx\\#2\\\else
\expandafter\def\expandafter\MT@char\expandafter{\csname\expandafter
@@ -1278,8 +1289,13 @@
}
\def\MT@check@font{\MT@exp@one@n\MT@in@clist\MT@font\MT@font@list}
\def\MT@register@font{\xdef\MT@font@list{\MT@font@list\MT@font,}}
-\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list
- \ifMT@inlist@\else\xdef\MT@font@list{\MT@font@list\font@name,}\fi}
+\def\MT@register@subst@font{%
+ \MT@exp@one@n\MT@in@clist\font@name\MT@font@list
+ \ifMT@inlist@\else
+ \xdef\MT@font@list{\MT@font@list\font@name,}%
+ \expandafter\MT@rem@from@clist\MT@font\MT@font@list
+ \fi
+}
\let\MT@active@features\@empty
\def\MT@check@font@cx{%
\MT@if@true
@@ -1302,6 +1318,8 @@
\MT@exp@cs\MT@xadd
{MT@##1@\csname MT@##1@context\endcsname font@list}%
{\font@name,}%
+ \expandafter\MT@exp@one@n\expandafter\MT@rem@from@clist\expandafter\MT@font
+ \csname MT@##1@\csname MT@##1@context\endcsname font@list\endcsname
\fi
}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-CharisSIL.cfg new/tex/latex/microtype/mt-CharisSIL.cfg
--- old/tex/latex/microtype/mt-CharisSIL.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-CharisSIL.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-LatinModernRoman.cfg new/tex/latex/microtype/mt-LatinModernRoman.cfg
--- old/tex/latex/microtype/mt-LatinModernRoman.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-LatinModernRoman.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-PalatinoLinotype.cfg new/tex/latex/microtype/mt-PalatinoLinotype.cfg
--- old/tex/latex/microtype/mt-PalatinoLinotype.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-PalatinoLinotype.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
@@ -322,7 +322,7 @@
fl = { 0,50},
ffl = { 0,50},
ſt = { 0,50},
- st = { 0,50}
+ st = { 0,50}
}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-bch.cfg new/tex/latex/microtype/mt-bch.cfg
--- old/tex/latex/microtype/mt-bch.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-bch.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-blg.cfg new/tex/latex/microtype/mt-blg.cfg
--- old/tex/latex/microtype/mt-blg.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-blg.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-cmr.cfg new/tex/latex/microtype/mt-cmr.cfg
--- old/tex/latex/microtype/mt-cmr.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-cmr.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-euf.cfg new/tex/latex/microtype/mt-euf.cfg
--- old/tex/latex/microtype/mt-euf.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-euf.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-eur.cfg new/tex/latex/microtype/mt-eur.cfg
--- old/tex/latex/microtype/mt-eur.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-eur.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-euroitc.cfg new/tex/latex/microtype/mt-euroitc.cfg
--- old/tex/latex/microtype/mt-euroitc.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-euroitc.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-eus.cfg new/tex/latex/microtype/mt-eus.cfg
--- old/tex/latex/microtype/mt-eus.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-eus.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-msa.cfg new/tex/latex/microtype/mt-msa.cfg
--- old/tex/latex/microtype/mt-msa.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-msa.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-msb.cfg new/tex/latex/microtype/mt-msb.cfg
--- old/tex/latex/microtype/mt-msb.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-msb.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-mvs.cfg new/tex/latex/microtype/mt-mvs.cfg
--- old/tex/latex/microtype/mt-mvs.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-mvs.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-pad.cfg new/tex/latex/microtype/mt-pad.cfg
--- old/tex/latex/microtype/mt-pad.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-pad.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-pmn.cfg new/tex/latex/microtype/mt-pmn.cfg
--- old/tex/latex/microtype/mt-pmn.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-pmn.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-ppl.cfg new/tex/latex/microtype/mt-ppl.cfg
--- old/tex/latex/microtype/mt-ppl.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-ppl.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-ptm.cfg new/tex/latex/microtype/mt-ptm.cfg
--- old/tex/latex/microtype/mt-ptm.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-ptm.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-ugm.cfg new/tex/latex/microtype/mt-ugm.cfg
--- old/tex/latex/microtype/mt-ugm.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-ugm.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-zpeu.cfg new/tex/latex/microtype/mt-zpeu.cfg
--- old/tex/latex/microtype/mt-zpeu.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-zpeu.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht <w.m.l(a)gmx.net>
+%% Copyright (c) 2004--2019 R Schlicht <w.m.l(a)gmx.net>
%%
%% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/microtype.tlpobj new/tlpkg/tlpobj/microtype.tlpobj
--- old/tlpkg/tlpobj/microtype.tlpobj 2019-03-02 02:26:07.000000000 +0100
+++ new/tlpkg/tlpobj/microtype.tlpobj 2019-11-19 01:55:50.000000000 +0100
@@ -1,6 +1,6 @@
name microtype
category Package
-revision 50187
+revision 52853
shortdesc Subliminal refinements towards typographical perfection
relocated 1
longdesc The package provides a LaTeX interface to the micro-typographic
@@ -20,7 +20,7 @@
longdesc requires pdfTeX or LuaTeX, while the adjustment of interword
longdesc spacing and of kerning only works with pdfTeX. Letterspacing is
longdesc available with pdfTeX or LuaTeX. The alternative package
-longdesc `letterspace', which also works with plain TeX, provides the
+longdesc 'letterspace', which also works with plain TeX, provides the
longdesc user commands for letterspacing only, omitting support for all
longdesc other extensions.
runfiles size=105
@@ -52,7 +52,7 @@
RELOC/tex/latex/microtype/mt-zpeu.cfg
catalogue-also pdfcprot
catalogue-ctan /macros/latex/contrib/microtype
-catalogue-date 2019-03-01 06:53:03 +0100
+catalogue-date 2019-11-18 10:28:58 +0100
catalogue-license lppl1.3c
catalogue-topics micro-layout letterspace
-catalogue-version 2.7b
+catalogue-version 2.7d
++++++ milsymb.doc.tar.xz ++++++
++++ 14865 lines of diff (skipped)
++++++ milsymb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/milsymb/milsymb.sty new/tex/latex/milsymb/milsymb.sty
--- old/tex/latex/milsymb/milsymb.sty 2018-04-29 23:46:45.000000000 +0200
+++ new/tex/latex/milsymb/milsymb.sty 2020-03-16 22:05:08.000000000 +0100
@@ -1,17 +1,17 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% MilSymb Style File %%
-%%-------------------- %%
-%% Version: 1.0 %%
-%% Last Updated: 29/04/2018 %%
-%% Github: https://github.com/ralphieraccoon/MilSymb %%
-%% Copyright: Damian Crosby 2018 %%
-%% Licence: Creative Commons Attribution-ShareAlike 4.0 International License %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% MilSymb Style File %%
+%%-------------------- %%
+%% Version: 1.02 %%
+%% Last Updated: 2020-03-15 %%
+%% Github: https://github.com/ralphieraccoon/MilSymb %%
+%% Copyright: Damian Crosby 2018 %%
+%% Licence: Creative Commons Attribution-ShareAlike 4.0 International License %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{milsymb}[29/04/2018 v1.0]
+\ProvidesPackage{milsymb}[05/07/2019 v1.01]
\RequirePackage{tikz}
-\RequirePackage[T1]{fontenc}
+\RequirePackage{lmodern}
\RequirePackage{fix-cm}
\RequirePackage{arevmath}
\RequirePackage{marvosym}
@@ -19,6 +19,7 @@
\RequirePackage{amssymb}
\RequirePackage{xifthen}
\RequirePackage{xparse}
+\RequirePackage{textcomp}
\definecolor{friendlyA}{RGB}{128, 224, 255}
\definecolor{hostileA}{RGB}{255, 128, 128}
\definecolor{neutralA}{RGB}{170, 255, 170}
@@ -2135,8 +2136,6 @@
frame status/anticipated/.style={/MilSymb/line=dashed},
frame status/uncertain/.style={/MilSymb/line=uncertainline},
fill=gray,
-frame status=normal,
-scale=1,
}
\newcommand*{\clipfriendly}{
(-0.75, -0.5) rectangle (0.75, 0.5)
@@ -2257,8 +2256,10 @@
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
call sign=,
position and movement=,
@@ -2319,6 +2320,8 @@
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
+ frame status=normal,
+ scale=1,
track number=,
call sign=,
position and movement=,
@@ -2683,6 +2686,8 @@
offset/.value required,
movement/.code 2 args={\begin{scope}[shift={(#2)}]\ifthenelse{\equal{\MilSymb@drawH}{true}\AND \equal{\MilSymb@selectedfaction}{friendly}}{ \draw [-{Stealth[inset=0pt,scale=1]}] (-0.75, -0.75) -- +($(0, -##1) - (0, -0.75)$) -- +(##2);}{\draw [-{Stealth[inset=0pt,scale=1]}] (0,0) -- +(0, -##1) -- +(##2);}\end{scope}},
movement/.value required,
+ frame status=normal,
+ scale=1,
faction=friendly,
main=none,
upper=none,
@@ -2745,7 +2750,11 @@
\newcounter{exitem}
\newlength{\itemlength}
\NewDocumentEnvironment{landheadquarters}{ o D(){0,0}}{
-\tikzset{#1}
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\setlength{\itemlength}{0pt}
\begin{scope}[shift={(#2)}, scale=\MilSymb@scale, transform shape]
\setcounter{exitem}{0}
@@ -2762,7 +2771,11 @@
\stepcounter{exitem}}
}{\end{scope}}
\NewDocumentEnvironment{landgroup}{ o D(){0,0}}{
-\tikzset{#1}
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\setlength{\itemlength}{0pt}
\begin{scope}[local bounding box=G, shift={(#2)}, scale=\MilSymb@scale, transform shape]
\RenewDocumentCommand\item{m}{
@@ -2906,6 +2919,8 @@
equipment teardown time/.store in=\MilSymb@SymbAE,
common identifier/.store in=\MilSymb@SymbAF,
speed/.store in=\MilSymb@SymbZ,
+ frame status=normal,
+ scale=1,
faction=none,
main=none,
mobility=none,
@@ -3043,6 +3058,8 @@
altitude value/.store in=\MilSymb@SymbX,
location/.store in=\MilSymb@SymbY,
speed/.store in=\MilSymb@SymbZ,
+ frame status=normal,
+ scale=1,
headquarters=false,
feint or dummy=false,
country indicator=,
@@ -3227,8 +3244,10 @@
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3258,8 +3277,12 @@
\end{scope}
\IfNoValueF{#4}{\node [anchor=west, align=left] at (#3.east) {#4};}
}
-\NewDocumentCommand\OwnShip{o D(){0,0} d() g}{
-\tikzset{#1}
+\NewDocumentCommand\OwnShip{ O{} D(){0,0} d() g}{
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\begin{scope}[shift={(#2)}, local bounding box=#3, scale=\MilSymb@scale, transform shape]
\draw [ultra thick, friendlyA] (0, 0) circle (0.5);
\draw [ultra thick, friendlyA] (0.5, 0) -- (-0.5, 0);
@@ -3348,8 +3371,10 @@
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3406,13 +3431,15 @@
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
identification=,
additional information=,
date-time group=,
- faction=none,
+ faction=friendly,
mine=normal,
neutralised=false,
#1,
@@ -3503,8 +3530,10 @@
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3544,6 +3573,7 @@
man made/.is if=manmade,
size=small,
man made=false,
+ scale=1,
#1,
}%
\begin{scope}[shift={(#2)}, local bounding box=#3, scale=\MilSymb@scale, transform shape]
@@ -3615,6 +3645,8 @@
offset/.value required,
movement/.code 2 args={\begin{scope}[shift={(#2)}]\ifthenelse{\equal{\MilSymb@drawH}{true}\AND \equal{\MilSymb@selectedfaction}{friendly}}{ \draw [-{Stealth[inset=0pt,scale=1]}] (-0.75, -0.75) -- +($(0, -##1) - (0, -0.75)$) -- +(##2);}{\draw [-{Stealth[inset=0pt,scale=1]}] (0,0) -- +(0, -##1) -- +(##2);}\end{scope}},
movement/.value required,
+ frame status=normal,
+ scale=1,
faction=friendly,
main=none,
upper=none,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/milsymb.tlpobj new/tlpkg/tlpobj/milsymb.tlpobj
--- old/tlpkg/tlpobj/milsymb.tlpobj 2019-02-28 03:54:22.000000000 +0100
+++ new/tlpkg/tlpobj/milsymb.tlpobj 2020-03-17 02:07:38.000000000 +0100
@@ -1,6 +1,6 @@
name milsymb
category Package
-revision 47482
+revision 54361
shortdesc LaTeX package for TikZ based drawing of military symbols as per NATO APP-6(C)
relocated 1
longdesc The package offers commands to draw military symbols as per
@@ -15,7 +15,6 @@
catalogue-contact-home https://github.com/ralphieraccoon/MilSymb/wiki
catalogue-contact-repository https://github.com/ralphieraccoon/MilSymb
catalogue-ctan /graphics/pgf/contrib/milsymb
-catalogue-date 2018-05-03 05:20:47 +0200
catalogue-license cc-by-sa-4
-catalogue-topics pgf-tikz symbol-supp
-catalogue-version 1.0
+catalogue-topics graphics pgf-tikz symbol-supp
+catalogue-version 1.02
++++++ missaali.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-p/missaali.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/missaali.doc.tar.xz differ: char 7898598, line 30695
++++++ missaali.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/missaali.tlpobj new/tlpkg/tlpobj/missaali.tlpobj
--- old/tlpkg/tlpobj/missaali.tlpobj 2019-02-28 03:54:32.000000000 +0100
+++ new/tlpkg/tlpobj/missaali.tlpobj 2020-03-24 02:00:06.000000000 +0100
@@ -1,6 +1,6 @@
name missaali
category Package
-revision 42810
+revision 54512
shortdesc A late medieval OpenType textura font
relocated 1
longdesc This package contains the free OpenType Textura font Missaali
@@ -21,7 +21,6 @@
RELOC/fonts/opentype/public/missaali/Missaali-Regular.otf
RELOC/tex/latex/missaali/missaali.sty
catalogue-ctan /fonts/missaali
-catalogue-date 2016-12-31 06:02:05 +0100
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font-otf font-archaic
catalogue-version 1.004
++++++ mla-paper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mla-paper.doc.tlpobj new/tlpkg/tlpobj/mla-paper.doc.tlpobj
--- old/tlpkg/tlpobj/mla-paper.doc.tlpobj 2019-02-28 03:54:33.000000000 +0100
+++ new/tlpkg/tlpobj/mla-paper.doc.tlpobj 2020-03-04 23:52:37.000000000 +0100
@@ -1,6 +1,6 @@
name mla-paper.doc
category Package
-revision 20885
+revision 54080
shortdesc doc files of mla-paper
relocated 1
docfiles size=1
++++++ mla-paper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mla-paper.tlpobj new/tlpkg/tlpobj/mla-paper.tlpobj
--- old/tlpkg/tlpobj/mla-paper.tlpobj 2019-02-28 03:54:33.000000000 +0100
+++ new/tlpkg/tlpobj/mla-paper.tlpobj 2020-03-04 23:52:37.000000000 +0100
@@ -1,15 +1,15 @@
name mla-paper
category Package
-revision 20885
+revision 54080
shortdesc Proper MLA formatting
relocated 1
-longdesc The package formats articles using the MLA style. The aim is
-longdesc that students and other academics in the humanities should be
-longdesc able to typeset their materials, properly, with minimal effort
-longdesc on their part.
+longdesc The package formats articles using the MLA style ("MLA" =
+longdesc "Modern Language Association"). The aim is that students and
+longdesc other academics in the humanities should be able to typeset
+longdesc their materials, properly, with minimal effort on their part.
runfiles size=2
RELOC/tex/latex/mla-paper/mla.sty
+catalogue-also mlacls
catalogue-ctan /macros/latex/contrib/mla-paper
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
-catalogue-topics gen-paper
+catalogue-topics gen-paper humanities
++++++ mltex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mltex.doc.tlpobj new/tlpkg/tlpobj/mltex.doc.tlpobj
--- old/tlpkg/tlpobj/mltex.doc.tlpobj 2019-02-28 03:54:33.000000000 +0100
+++ new/tlpkg/tlpobj/mltex.doc.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mltex.doc
category Package
-revision 48634
+revision 54227
shortdesc doc files of mltex
docfiles size=9
texmf-dist/doc/latex/mltex/README
++++++ mltex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mltex.tlpobj new/tlpkg/tlpobj/mltex.tlpobj
--- old/tlpkg/tlpobj/mltex.tlpobj 2019-02-28 03:54:34.000000000 +0100
+++ new/tlpkg/tlpobj/mltex.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mltex
category Package
-revision 48634
+revision 54227
shortdesc The MLTeX system
longdesc MLTeX is a modification of TeX version >=3.0 that allows the
longdesc hyphenation of words with accented letters using ordinary
@@ -11,12 +11,15 @@
depend hyphen-base
depend babel
depend dehyph
+depend hyph-utf8
+depend l3kernel
depend latexconfig
depend latex-fonts
+depend unicode-data
depend knuth-lib
depend plain
depend mltex.ARCH
-execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=cm,hyphen-base,babel,dehyph,latex,latexconfig,latex-fonts
+execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=cm,hyphen-base,babel,dehyph,hyph-utf8,l3kernel,latex,latexconfig,latex-fonts,unicode-data
execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini" fmttriggers=cm,hyphen-base,knuth-lib,plain
runfiles size=8
texmf-dist/tex/latex/mltex/lo1enc.def
@@ -24,7 +27,6 @@
texmf-dist/tex/latex/mltex/mltex.sty
texmf-dist/tex/mltex/config/mltex.ini
catalogue-ctan /systems/generic/mltex
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license knuth
catalogue-topics engine multilingual
catalogue-version 2.2
++++++ moderncv.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderncv.doc.tlpobj new/tlpkg/tlpobj/moderncv.doc.tlpobj
--- old/tlpkg/tlpobj/moderncv.doc.tlpobj 2019-02-28 03:54:37.000000000 +0100
+++ new/tlpkg/tlpobj/moderncv.doc.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name moderncv.doc
category Package
-revision 37992
+revision 52669
shortdesc doc files of moderncv
relocated 1
docfiles size=460
++++++ moderncv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderncv.tlpobj new/tlpkg/tlpobj/moderncv.tlpobj
--- old/tlpkg/tlpobj/moderncv.tlpobj 2019-02-28 03:54:37.000000000 +0100
+++ new/tlpkg/tlpobj/moderncv.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name moderncv
category Package
-revision 37992
+revision 52669
shortdesc A modern curriculum vitae class
relocated 1
longdesc The class provides facilities for typesetting modern
@@ -8,6 +8,16 @@
longdesc is fairly customizable, allowing you to define your own style
longdesc by changing the colours, the fonts, etc. A number of templates
longdesc are provided in the distribution examples subdirectory.
+depend etoolbox
+depend fancyhdr
+depend graphics
+depend hyperref
+depend iftex
+depend l3packages
+depend microtype
+depend tools
+depend url
+depend xcolor
runfiles size=61
RELOC/tex/latex/moderncv/moderncv.cls
RELOC/tex/latex/moderncv/moderncvbodyi.sty
++++++ modiagram.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/modiagram/README new/doc/latex/modiagram/README
--- old/doc/latex/modiagram/README 2015-09-24 01:36:16.000000000 +0200
+++ new/doc/latex/modiagram/README 2019-10-31 23:22:27.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the MODIAGRAM package 2015/09/23 v0.2g
+the MODIAGRAM package 2019/10/31 v0.3
easy creation of molecular orbital diagrams
@@ -11,7 +11,7 @@
If you have any ideas, questions, suggestions or bugs to report, please
feel free to contact me.
--------------------------------------------------------------------------
-Copyright 2011--2015 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/modiagram/modiagram_en.pdf and new/doc/latex/modiagram/modiagram_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/modiagram/modiagram_en.tex new/doc/latex/modiagram/modiagram_en.tex
--- old/doc/latex/modiagram/modiagram_en.tex 2015-09-24 01:36:16.000000000 +0200
+++ new/doc/latex/modiagram/modiagram_en.tex 2019-10-31 23:22:27.000000000 +0100
@@ -13,7 +13,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011--2015 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
@@ -45,9 +45,9 @@
connect,
EnergyAxis,
molecule,
- MOsetup
+ setmodiagram
} ,
- add-envs = { MOdiagram } ,
+ add-envs = { modiagram } ,
add-silent-cmds = {
ch,
draw,
@@ -58,17 +58,19 @@
chemSigma
} ,
abstract = {%
- \begin{MOdiagram}[style=fancy,distance=7cm,AO-width=15pt,labels,names]
+ \begin{modiagram}[style=fancy,distance=7cm,AO-width=15pt,labels,names]
\atom[N]{left}{ 2p = {0;up,up,up} }
\atom[O]{right}{ 2p = {2;pair,up,up} }
\molecule[NO]{
2pMO = {1.8,.4;pair,pair,pair,up},
color = { 2piy*=red }
}
- \end{MOdiagram}
+ \end{modiagram}
}
}
+\newpackagename\modiag{modiagram}
+
\defbibheading{bibliography}{\addsec{References}}
\usepackage{booktabs}
@@ -83,9 +85,14 @@
long = molecular orbital
}
-\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{chemmacros,chemformula}
\chemsetup{
@@ -98,11 +105,11 @@
{%
\begingroup
\IfNoValueTF{#1}
- {\MOsetup{ style=square,AO-width=8pt }}%
- {\MOsetup{ style=square,AO-width=8pt , #1 }}%
- \begin{MOdiagram}
+ {\setmodiagram{ style=square,AO-width=8pt }}%
+ {\setmodiagram{ style=square,AO-width=8pt , #1 }}%
+ \begin{modiagram}
\AO{s}{0;#2}
- \end{MOdiagram}%
+ \end{modiagram}%
\endgroup
}
@@ -113,7 +120,7 @@
\section{Licence, Requirements}
\license
-\modiagram\ uses \bnd{l3kernel}~\cite{bnd:l3kernel} and
+\modiag\ uses \bnd{l3kernel}~\cite{bnd:l3kernel} and
\bnd{l3packages}~\cite{bnd:l3packages}. It also uses \TikZ~\cite{pkg:pgf} and
the package \pkg{chemgreek}~\cite{pkg:chemgreek} bundle. Additionally the
\TikZ\ libraries \code{calc} and \code{arrows} are loaded. Knowledge of
@@ -133,14 +140,14 @@
Otherwise, I think I'll have a go at it in \TikZ.
\end{cnltxquote}
The problem was solved using \TikZ, since no package existed for that purpose.
-For one thing \modiagram\ is intended to fill this gap. I also found it very
+For one thing \modiag\ is intended to fill this gap. I also found it very
tedious, to make all this copying and pasting when I needed a second, third,
-\ldots\ diagram. \modiagram\ took care of that.
+\ldots\ diagram. \modiag\ took care of that.
\section{Main Commands}
All molecular orbital (MO) diagrams are created using the environment
-\env{MOdiagram}{}.
+\env{modiagram}{}.
\subsection{The \cs*{atom} Command}
\begin{commands}
@@ -152,13 +159,13 @@
Let's take a look at an example:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{right}{
1s = { 0; pair} ,
2s = { 1; pair} ,
2p = {1.5; up, down }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
As you can see, the argument \meta{AO-spec} is essential to create the actual
@@ -180,20 +187,20 @@
The argument \meta{left}/\meta{right} is important, when p~orbitals are used.
For instance compare the following example to the one before:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{
1s = { 0; pair} ,
2s = { 1; pair} ,
2p = {1.5; up, down }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
When both variants are used one can also see, that the right atom is shifted to
the right (hence the naming). The right atom is shifted by \SI{4}{\centi\metre}
per default and can be adjusted individually, see page~\pageref{option:distance}.
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{
1s = { 0; pair} ,
2s = { 1; pair} ,
@@ -204,7 +211,7 @@
2s = { 1; pair} ,
2p = {1.5; up, down }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
With the command \cs{molecule} (section~\ref{ssec:molecule}) the reason for the
shift becomes clear.
@@ -212,23 +219,23 @@
Any of the arguments for the \ac{AO} can be left empty or be omitted.
\begin{example}[side-by-side]
Without argument: default height, full:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{1s, 2s, 2p}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
empty argument: default height, empty:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{1s=, 2s=, 2p=}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
using some values:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{1s, 2s=1, 2p={;,up} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{The \cs*{molecule} Command}\label{ssec:molecule}
@@ -240,11 +247,11 @@
An example first:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 0; up } }
\molecule { 1sMO = {.75; pair } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The command \cs{molecule} connects the \acp{AO} with the bonding and
anti-bondung \acp{MO}. \cs{molecule} can only be used \emph{after} one has
@@ -269,11 +276,11 @@
Obviously the regarding \acp{AO} must have been set in order to connect them.
This for example won't work:
\begin{sourcecode}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = 0 }
\atom{right}{ 1s = 0 }
\molecule { 2sMO = .75 }
- \end{MOdiagram}
+ \end{modiagram}
\end{sourcecode}
The value used in \meta{energy gain} determines how many \si{\centi\metre} the
bonding \ac{MO} lies below the lower \ac{AO} or how many \si{\centi\metre} the
@@ -281,52 +288,52 @@
\begin{example}[side-by-side]
same level:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 0; up } }
\molecule { 1sMO = {.75; pair } }
- \end{MOdiagram}
+ \end{modiagram}
different levels:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 1; up } }
\molecule { 1sMO = {.25; pair } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
If you specify \meta{energy loss} you can create non-symmetrical splittings.
Then, the first value (\meta{energy gain}) is used for the bonding \ac{MO} and
the second value (\meta{energy loss}) is used for the anti-bonding \ac{MO}.
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 0; up } }
\molecule { 1sMO = {.75/.25; pair } }
- \end{MOdiagram}
+ \end{modiagram}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 1; up } }
\molecule { 1sMO = {.25/.75; pair } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
Please be aware, that you have to specify \emph{two} such values or pairs with
\option{2pMO}: the splitting of the \chemsigma\ orbitals and the splitting of
the \chempi\ orbitals.
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 2p = { 0; up, up } }
\atom{right}{ 2p = { 1; up, up } }
\molecule { 2pMO = { 1.5, .75; pair, up, up } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The complete \ac{MO} diagram for triplett dioxygen now could look something
like that:
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{
1s, 2s, 2p = {;pair,up,up}
}
@@ -336,7 +343,7 @@
\molecule{
1sMO, 2sMO, 2pMO = {;pair,pair,pair,up,up}
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{The Naming Scheme}\label{Namensgebung}
@@ -344,7 +351,7 @@
nodes in a \env*{tikzpicture}, the internal naming scheme is important. It
closely follows the function:
\begin{center}
- \begin{MOdiagram}[
+ \begin{modiagram}[
distance = 6cm,
AO-width = 20pt,
labels-fs = \ttfamily\footnotesize,
@@ -391,13 +398,13 @@
2piz* = {2piz*}
}
}
- \end{MOdiagram}
+ \end{modiagram}
\end{center}
With these names it is possible to reference the orbitals with the known \TikZ
commands:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = 0 }
\atom{right}{ 1s = 0 }
\molecule { 1sMO = .75 }
@@ -405,11 +412,11 @@
(1sigma.center) -- (1sigma*.center) ;
\draw[red]
(1sigma*) ++ (2cm,.5cm) node {splitting} ;
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = 0 }
\atom{right}{ 1s = 0 }
\molecule { 1sMO = .75 }
@@ -417,7 +424,7 @@
(1sigma*) circle (8pt);
\draw[<-,shorten <=8pt,shorten >=15pt,blue]
(1sigma*) --++(2,1) node {anti-bonding MO};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{Placing AOs and MOs Arbitrarily}\label{ssec:AO_MO_irgendwo}
@@ -428,7 +435,7 @@
Xenon:
\begin{center}
- \begin{MOdiagram}[names]
+ \begin{modiagram}[names]
\atom[\chlewis{0.}{F}\hspace*{5mm}\chlewis{180.}{F}]{left}{
1s=.2;up,up-el-pos={1sleft=.5}
}
@@ -440,7 +447,7 @@
\node[right,xshift=4mm] at (1sigma) {\footnotesize bonding};
\node[above] at (AO2.90) {\footnotesize non-bonding};
\node[above] at (1sigma*.90) {\footnotesize anti-bonding};
- \end{MOdiagram}
+ \end{modiagram}
\end{center}
To create diagrams like this there is the following command, which draws a single
@@ -459,10 +466,10 @@
Depending on the \meta{type} one s or three p orbitals are drawn.
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{s}{0;}
\AO(-20pt){p}{1;pair,up,down}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
If one wants to place such an \ac{AO} at the position of an atom, one has to
@@ -475,21 +482,21 @@
\end{itemize}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} {1s=0}
\atom{right}{1s=0}
\molecule {1sMO=1}
\AO(1cm){s}{2}
\AO(3cm){s}{2}
\AO(5cm){s}{2}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
Within the p orbitals there is an additional shift by \SI{20}{pt} per orbital.
This is equivalent to a double shift by the length \code{AO-width} (see
section~\ref{option:AO-width}):
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} {2p=0}
\atom{right}{2p=0}
% above the left atom:
@@ -500,26 +507,26 @@
\AO(1cm) {s}{ .5}
\AO(5cm+20pt){s}{ 1;up}
\AO(5cm+40pt){s}{1.5;down}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The \acp{AO} created with \cs{AO} also can be connected. For this you can use
the \TikZ\ command \cs*{draw}, of course. You can use the predefined node
names\ldots
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{s}{0} \AO(2cm){s}{1}
\AO{s}{2} \AO(2cm){s}{1.5}
\draw[red] (AO1.0) -- (AO2.180) (AO3.0) -- (AO4.180);
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\ldots\ or use own node names
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\AO[a]{s}{0} \AO[b](2cm){s}{1}
\AO[c]{s}{2} \AO[d](2cm){s}{1.5}
\draw[red] (a.0) -- (b.180) (c.0) -- (d.180);
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The predefined names are \code{AO1}, \code{AO2} \etc for the type \code{s} and
@@ -527,15 +534,15 @@
\code{p}. Nodes of the type \code{p} get an \code{x}, \code{y} or \code{z} if
you specify your own name, too.
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{p}{0}
\draw[<-,shorten >=5pt] (AO1y.-90) -- ++ (.5,-1) node {y};
- \end{MOdiagram}
+ \end{modiagram}
and
- \begin{MOdiagram}
+ \begin{modiagram}
\AO[A]{p}{0}
\draw[<-,shorten >=5pt] (Ay.-90) -- ++ (.5,-1) node {y};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
However, if you want the lines to be drawn in the same style as the ones
@@ -549,11 +556,11 @@
This command expects a comma separated list of node name pairs that are to be
connected. The names have to be connected with a \code{\&}:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{s}{0;} \AO(2cm){s}{1;}
\AO{s}{2;} \AO(2cm){s}{1.5;}
\connect{ AO1 & AO2, AO3 & AO4 }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
Some things still need to be said: \cs{connect} adds the anchor \code{east} to
@@ -574,7 +581,7 @@
(\meta{AO}). In sections~\ref{option:distance} and \ref{option:AO-width} these
lengths and how they can be changed are discussed.
\begin{center}
- \begin{MOdiagram}[
+ \begin{modiagram}[
AO-width = 22pt ,
labels-fs = \ttfamily\tiny ,
labels-style = {text width=40pt,align=center,yshift=11pt}]
@@ -617,7 +624,7 @@
2piz* = {.5*\meta{dist} + 1cm + \meta{AO}}
}
}
- \end{MOdiagram}
+ \end{modiagram}
\end{center}
\subsection{Default Values}
@@ -663,23 +670,23 @@
Compare these examples:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s={0;pair} }
\atom{right}{ 1s }
- \end{MOdiagram}
+ \end{modiagram}
\hrulefill
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{ 1s=1 }
\atom{right}{ 1s= }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\section{Customization}
The options of the section~\ref{ssec:umgebungs_optionen} can be set global as
package option, \ie, with \cs*{usepackage}\oarg{options}\Marg{modiagram}, or
-via the setup command \cs{MOsetup}\marg{options}.
+via the setup command \cs{setmodiagram}\marg{options}.
\subsection{Environment Options}\label{ssec:umgebungs_optionen}
There are some options with which the layout of the \ac{MO} diagrams can be
@@ -728,9 +735,9 @@
They all are discussed in the following sections. If they're used as options
for the environment, they're set locally and only change that environment.
\begin{sourcecode}
- \begin{MOdiagram}[options]
+ \begin{modiagram}[options]
...
- \end{MOdiagram}
+ \end{modiagram}
\end{sourcecode}
\subsubsection{Option \option*{style}}\label{option:style}
@@ -746,47 +753,47 @@
Let's take the \ac{MO} diagram of \ch{H2} to illustrate the different styles:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=plain]% default
+ \begin{modiagram}[style=plain]% default
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=circle]
+ \begin{modiagram}[style=circle]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=round]
+ \begin{modiagram}[style=round]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=fancy]
+ \begin{modiagram}[style=fancy]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{distance}}\label{option:distance}
@@ -798,11 +805,11 @@
section~\ref{orbital-positionen}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[distance=6cm]
+ \begin{modiagram}[distance=6cm]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{AO-width}}\label{option:AO-width}
@@ -811,20 +818,20 @@
\SI{10}{pt}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[AO-width=15pt]
+ \begin{modiagram}[AO-width=15pt]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=fancy,AO-width=15pt]
+ \begin{modiagram}[style=fancy,AO-width=15pt]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
By changing the value of \option{AO-width} the positions of the p and the
\chempi\ orbitals also change, see section~\ref{orbital-positionen}.
@@ -841,29 +848,29 @@
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[el-sep=.2]% default
+ \begin{modiagram}[el-sep=.2]% default
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[el-sep=0]
+ \begin{modiagram}[el-sep=0]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[el-sep=1]
+ \begin{modiagram}[el-sep=1]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The options \key{up-el-pos}{<num>} and \key{down-el-pos}{<num>} can be used
@@ -873,29 +880,29 @@
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[up-el-pos=.4,down-el-pos=.6]% default
+ \begin{modiagram}[up-el-pos=.4,down-el-pos=.6]% default
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[up-el-pos=.333,down-el-pos=.667]
+ \begin{modiagram}[up-el-pos=.333,down-el-pos=.667]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[up-el-pos=.7,down-el-pos=.3]
+ \begin{modiagram}[up-el-pos=.7,down-el-pos=.3]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{lines}}\label{option:lines}
@@ -903,11 +910,11 @@
connecting lines:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[lines={gray,thin}]
+ \begin{modiagram}[lines={gray,thin}]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{names}}\label{option:names}
@@ -916,11 +923,11 @@
\cs{molecule}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[names]
+ \begin{modiagram}[names]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Options \option*{names-style} and \option*{names-style-add}}\label{option:names_style}
@@ -930,11 +937,11 @@
for Version 2.10'' p.\,183 section 16.4.4 (pgfmanual.pdf) for the meaning}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style={draw=blue}]
+ \begin{modiagram}[names,names-style={draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
With this the default setting is overwritten. As you can see it destroys the
@@ -942,37 +949,37 @@
specify \code{text height} and \code{text depth} yourself \ldots
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style={text height=1.5ex, text depth=.25ex, draw=blue}]
+ \begin{modiagram}[names,names-style={text height=1.5ex, text depth=.25ex, draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\ldots, add the \code{anchor} again \ldots
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style={anchor=base, draw=blue}]
+ \begin{modiagram}[names,names-style={anchor=base, draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\ldots\ or use the option \key{names-style-add}. It doesn't overwrite the
current setting but appends the new declaration:
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style-add={draw=blue}]
+ \begin{modiagram}[names,names-style-add={draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
% use package `chemmacros'
- \MOsetup{
+ \setmodiagram{
names,
names-style = {
text height = 2.5ex,
@@ -981,16 +988,16 @@
rounded corners
}
}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
- \begin{MOdiagram}[names-style-add={fill=blue!20}]
+ \end{modiagram}
+ \begin{modiagram}[names-style-add={fill=blue!20}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{labels}}\label{option:labels}
@@ -998,11 +1005,11 @@
orbitals. These labels can be changed, see section~\ref{sec:key:label}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels]
+ \begin{modiagram}[labels]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{labels-fs}}\label{option:labels-fs}
@@ -1010,21 +1017,21 @@
can use the option \option{labels-fs}.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[labels,labels-fs=\footnotesize]
+ \begin{modiagram}[labels,labels-fs=\footnotesize]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
This also allows you to change the font style or font shape of the labels.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[labels,labels-fs=\sffamily\footnotesize]
+ \begin{modiagram}[labels,labels-fs=\sffamily\footnotesize]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{labels-style}}\label{option:labels-style}
@@ -1032,11 +1039,11 @@
which the labels are written.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[labels,labels-style={blue,yshift=4pt}]
+ \begin{modiagram}[labels,labels-style={blue,yshift=4pt}]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{\cs*{atom} and \cs*{molecule} Specific Customizations}
@@ -1049,18 +1056,18 @@
keys to specify the \ac{AO} that you want to label.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels-fs=\footnotesize]
+ \begin{modiagram}[labels-fs=\footnotesize]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{
1sMO = {.75;pair},
label = { 1sigma = {bonding MO} }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square,distance=6cm]
+ \begin{modiagram}[style=square,distance=6cm]
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{
@@ -1072,21 +1079,21 @@
}
\node[right] at (1sigma.-45) {bonding};
\node[right] at (1sigma*.45) {anti-bonding};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
If the option is used together with the \option{labels} option
(page~\pageref{option:labels}) single labels are overwritten:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels]
+ \begin{modiagram}[labels]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{
1sMO = {.75;pair},
label = { 1sigma = \textcolor{red}{??} }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{color} Key}\label{sec:key:color}
@@ -1094,7 +1101,7 @@
display coloured electrons:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels-fs=\footnotesize]
+ \begin{modiagram}[labels-fs=\footnotesize]
\atom[H]{left}{
1s, color = { 1sleft = blue }
}
@@ -1106,7 +1113,7 @@
label = { 1sigma = {bonding MO} },
color = { 1sigma = green, 1sigma* = cyan }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{up-el-pos} and \option*{down-el-pos} keys}\label{sec:key:electrons}
@@ -1116,7 +1123,7 @@
section~\ref{option:electrons}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}
+ \begin{modiagram}
\atom[H]{left}{
1s = {;up},
up-el-pos = { 1sleft=.5 }
@@ -1127,7 +1134,7 @@
up-el-pos = { 1sigma=.15 } ,
down-el-pos = { 1sigma=.85 }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{\cs*{AO} Specific Customizations}\label{ssec:AO_anpassen}
@@ -1138,10 +1145,10 @@
label to the \ac{AO}/\ac{MO}. If you use the type \code{p} you can specify
the orbital you want to label in square brackets:
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\AO{s}[label={s orbital}]{0}
\AO{p}[label[y]=py,label[z]=pz]{1.5}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{color} Key}\label{key:AO_color}
@@ -1150,10 +1157,10 @@
color for the electrons. If you use the type \code{p} you can specify the
orbital in square brackets:
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\AO{s}[color=red]{0}
\AO{p}[color[y]=green,color[z]=cyan]{1.5}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{up-el-pos} and \option*{down-el-pos} Keys}\label{key:AO_electrons}
@@ -1163,10 +1170,10 @@
and \code{1}, also see section~\ref{option:electrons}. If you use the type
\code{p} you can specify the orbital in square brackets:
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\AO{s}[up-el-pos=.15]{0}
\AO{p}[up-el-pos[y]=.15,down-el-pos[z]=.15]{1.5}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{Energy Axis}
@@ -1180,12 +1187,12 @@
\end{commands}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{ 1sMO = {.75;pair} }
\EnergyAxis
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
For the time being there are two options to modify the axis.
@@ -1198,28 +1205,28 @@
\end{options}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{ 1sMO = {.75;pair} }
\EnergyAxis[title]
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{ 1sMO = {.75;pair} }
\EnergyAxis[title=E,head=stealth]
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\section{Examples}
The example from the beginning of section \ref{ssec:AO_MO_irgendwo}.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names]
+ \begin{modiagram}[names]
\atom[\chlewis{0.}{F}\hspace*{5mm}\chlewis{180.}{F}]{left}{
1s=.2;up,up-el-pos={1sleft=.5}
}
@@ -1231,14 +1238,14 @@
\node[right,xshift=4mm] at (1sigma) {\footnotesize bonding};
\node[above] at (AO2.90) {\footnotesize non-bonding};
\node[above] at (1sigma*.90) {\footnotesize anti-bonding};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[outside]
% use package `chemmacros'
\begin{figure}[p]
\centering
- \begin{MOdiagram}[style=square,labels,names,AO-width=8pt,labels-fs=\footnotesize]
+ \begin{modiagram}[style=square,labels,names,AO-width=8pt,labels-fs=\footnotesize]
\atom[\ch{O_a}]{left}{
1s, 2s, 2p = {;pair,up,up}
}
@@ -1250,7 +1257,7 @@
color = { 2piy*=red, 2piz*=red }
}
\EnergyAxis
- \end{MOdiagram}
+ \end{modiagram}
\caption{MO diagram of \ch{^3 "\chemSigma-" O2}.}
\end{figure}
\end{example}
@@ -1259,8 +1266,8 @@
% use package `chemmacros'
\begin{figure}[p]
\centering
- \MOsetup{style = fancy, distance = 7cm, AO-width = 15pt, labels}
- \begin{MOdiagram}
+ \setmodiagram{style = fancy, distance = 7cm, AO-width = 15pt, labels}
+ \begin{modiagram}
\atom[N]{left}{
2p = {0;up,up,up}
}
@@ -1272,7 +1279,7 @@
color = { 2piy*=red }
}
\EnergyAxis
- \end{MOdiagram}
+ \end{modiagram}
\caption{Part of the MO diagram of \chlewis{180.}{NO}.}
\end{figure}
\end{example}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modiagram.doc.tlpobj new/tlpkg/tlpobj/modiagram.doc.tlpobj
--- old/tlpkg/tlpobj/modiagram.doc.tlpobj 2019-02-28 03:54:38.000000000 +0100
+++ new/tlpkg/tlpobj/modiagram.doc.tlpobj 2019-11-01 02:04:45.000000000 +0100
@@ -1,9 +1,9 @@
name modiagram.doc
category Package
-revision 38448
+revision 52589
shortdesc doc files of modiagram
relocated 1
-docfiles size=164
+docfiles size=141
RELOC/doc/latex/modiagram/README
RELOC/doc/latex/modiagram/modiagram_en.pdf
RELOC/doc/latex/modiagram/modiagram_en.tex
++++++ modiagram.tar.xz ++++++
++++ 3338 lines of diff (skipped)
++++++ montserrat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/montserrat/README new/doc/fonts/montserrat/README
--- old/doc/fonts/montserrat/README 2017-02-27 23:34:30.000000000 +0100
+++ new/doc/fonts/montserrat/README 2019-11-08 22:40:13.000000000 +0100
@@ -13,13 +13,21 @@
part of all distributions of LaTeX version 2003/12/01 or later. Those files and
LaTeX support file montserrat.sty are
- Copyright (c) 2017 Michael Sharpe
+ Copyright (c) 2017--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.
-Current version: 1.01 2017-02-26
+Current version: 1.03 2019-11-07
+
+Changes in version 1.03
+1. Update the otf and pfb to the latest version of Montserrat (early 2019.)
+2. Added commands to remove all f-ligatures, which were not working as expected in small caps.
+3. Reverted the sty and fd files in accordance with recent changes in NFSS spec.
+
+Changes in version 1.02
+Changed the sty and fd files in line with the latest NFSS weight abbreviations, and chaged documentation accordingly.
Changes in version 1.01
Corrected a number of issues with montserat.sty.
Binary files old/doc/fonts/montserrat/montserrat-doc.pdf and new/doc/fonts/montserrat/montserrat-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/montserrat/montserrat-doc.tex new/doc/fonts/montserrat/montserrat-doc.tex
--- old/doc/fonts/montserrat/montserrat-doc.tex 2017-02-27 23:34:30.000000000 +0100
+++ new/doc/fonts/montserrat/montserrat-doc.tex 2019-11-08 22:40:13.000000000 +0100
@@ -5,18 +5,18 @@
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
%\usepackage{amssymb}% don't use with newtxmath
-%\pdfmapfile{+montserrat.map}
+\pdfmapfile{=montserrat.map}
%SetFonts
% libertine+newtxmath
-\usepackage{newtxtext} % use sb in place of bold
+%\usepackage{newtxtext} % use sb in place of bold
\usepackage[T1]{fontenc}
\usepackage{textcomp}
+\usepackage[scaled=.9,t,defaultfam]{montserrat}
\usepackage{nimbusmononarrow}% narrow
\usepackage{amsmath,amsthm}
-\usepackage[scaled=.9,defaultfam]{montserrat}
-\usepackage[libertine,bigdelims,vvarbb]{newtxmath}
+\usepackage[libertine,vvarbb]{newtxmath}
% option vvarbb gives you stix blackboard bold
-\useosf % use oldstyle figures except in math
+%\useosf % use oldstyle figures except in math
\usepackage[cal=boondoxo]{mathalfa}% less slanted than STIX cal
%SetFonts
\usepackage{booktabs}
@@ -24,11 +24,16 @@
\author{Michael Sharpe}
\date{\today} % Activate to display a given date or no date
\def\TeXShop{\TeX Shop}
+\usepackage{fonttable}
%\renewcommand*{\familydefault}{\sfdefault}
+\usepackage{trace}
\begin{document}
\maketitle
%\expandafter\show\csname lfstyle \endcsname
-Montserrat is a geometric sans-serif typeface designed by Julieta Ulanovsky, inspired by posters and signage from her historical Buenos Aires neighborhood of the same name. It is rather close in spirit to Gotham and Proxima Nova, but has its own individual appearance---more informal, less extended and more idiosyncratic. It is provided in a total of nine different weights, with upright and italic shapes, and every one of them has \textsc{Small Caps} and \textit{\textsc{Small Caps}}. There are two quite different versions that don't fit into the usual \LaTeX\ classifications. The version having the appellation Alternates has letter shapes that are much more rounded than the default version, reflecting the signage in the neighborhood of Montserrat. For example, here are the same four letters displayed in both the default and Alternates styles: ATWl, {\montserratalt ATWl}.
+%{\montserratalt fi fl ff ffi ffl}
+
+
+Montserrat is a geometric sans-serif typeface designed by Julieta Ulanovsky, inspired by posters and signage from her historic Buenos Aires neighborhood of the same name. It is rather close in spirit to Gotham and Proxima Nova, but has its own individual appearance---more informal, less extended and more idiosyncratic. It is provided in a total of nine different weights, with upright and italic shapes, and every one of them has \textsc{Small Caps} and \textit{\textsc{Small Caps}}. There are two quite different versions that don't fit into the usual \LaTeX\ classifications. The version having the appellation Alternates has letter shapes that are much more rounded than the default version, reflecting the signage in the neighborhood of Montserrat. For example, here are the same four letters displayed in both the default and Alternates styles: ATWl, {\montserratalt ATWl}.
As it currently set up, a preamble entry of the form
\begin{verbatim}
@@ -42,37 +47,49 @@
\item
{\tt defaultfam} will cause \verb|\familydefault| to be set to \verb|\sfdefault|, so that Montserrat becomes the default text font for the document.
\item {\tt alternates} will result in \verb|\sfdefault| being set to MontserratAlternates, with the rounder shapes.
-\item One of the options {\tt thin}, {\tt extralight}, {\tt light}, {\tt regular} may be specified to select the weight that should be used to render \LaTeX's {\tt regular}. (The default is {\tt regular}.)
-\item One of the options {\tt medium}, {\tt semibold}, {\tt bold}, {\tt extrabold}, {\tt black} may be specified to select the weight that should be used to render \LaTeX's {\tt bold}. (The default is {\tt bold}.)
-\item One of the options {\tt lining}, {\tt oldstyle} may be specified to select the figure style. (The default is {\tt lining}.)
-\item One of the options {\tt proportional}, {\tt tabular} may be specified to select the figure alignment. (The default is {\tt proportional}.)
+\item One of the options {\tt thin}, {\tt extralight}, {\tt light}, {\tt regular}, {\tt medium} may be specified to select the weight that should be used to render \LaTeX's {\tt regular}. (The default is {\tt regular}.)
+\item One of the options {\tt semibold}, {\tt bold}, {\tt extrabold}, {\tt black} may be specified to select the weight that should be used to render \LaTeX's {\tt bold}. (The default is {\tt bold}.)
+\item One of the options {\tt lining}, {\tt oldstyle} (or {\tt osf}) may be specified to select the figure style. (The default is {\tt lining}.)
+\item One of the options {\tt proportional} (or {\tt p}), {\tt tabular} (or {\tt t}) may be specified to select the figure alignment. (The default is {\tt proportional}.)
\end{itemize}
No matter which style you choose, you may specify the other using the construction \verb|{\montserratalt ...}|. (For example, this was used at the end of the first paragraph of this document to show the alternate version of ATWl.)
-The abbreviations for the weights in the {\tt fd} files are as follows.
+%The abbreviations for the weights in the {\tt fd} files are as follows.
+%
+%
+% \begin{tabular}{@{} ll @{}}
+% \toprule
+% Weight & abbrev \\
+% \midrule
+% thin & t \\
+% extralight & el \\
+% light & l \\
+% regular & m \\
+% medium & mb \\
+% semibold & sb \\
+% bold & b \\
+% extrabold & eb \\
+% black & k \\
+% \bottomrule
+% \end{tabular}
+
+As of version 1.02, it is easier to remember how to obtain weights other than LaTeX's {\tt regular} and {\tt bold}, however they may be have been selected. The available weights are named as follows:\par
+{\fontseries{thin}\selectfont thin}\\
+{\fontseries{extralight}\selectfont extralight}\\
+{\fontseries{light}\selectfont light}\\
+{\fontseries{regular}\selectfont regular}\\
+{\fontseries{medium}\selectfont medium}\\
+{\fontseries{semibold}\selectfont semibold}\\
+{\fontseries{bold}\selectfont bold}\\
+{\fontseries{extrabold}\selectfont extrabold}\\
+{\fontseries{black}\selectfont black}\\
- \begin{tabular}{@{} ll @{}}
- \toprule
- Weight & abbrev \\
- \midrule
- thin & t \\
- extralight & el \\
- light & l \\
- regular & m \\
- medium & mb \\
- semibold & sb \\
- bold & b \\
- extrabold & eb \\
- black & k \\
- \bottomrule
- \end{tabular}
-
-These may be used to render text in other weights. For example, while in a block of sans serif text,
+These names be used to render text any of these weights. For example, while in a block of sans serif text,
\begin{verbatim}
-{\fontseries{t}\selectfont x}
+{\fontseries{thin}\selectfont x}
\end{verbatim}
-will show as {\fontseries{t}\selectfont x} in thin weight.
+will render as {\fontseries{thin}\selectfont x} in thin weight.
Montserrat has four basic figure options, plus another four at smaller size. Other than the default figure style and alignment set in the package options, access to all other possible figure options is a little complicated, and you should devise macros for any you might use regularly.
@@ -84,10 +101,10 @@
Proportional lining & LF & {\fontfamily{Montserrat-LF}\selectfont 1} & \verb|{\fontfamily{Montserrat-LF}\selectfont 1}| \\
Tabular Oldstyle & TOsF & {\fontfamily{Montserrat-TOsF}\selectfont 1} & \verb|{\fontfamily{Montserrat-TOsF}\selectfont 1}| \\
Oldstyle & OsF & {\fontfamily{Montserrat-OsF}\selectfont 1} & \verb|{\fontfamily{Montserrat-OsF}\selectfont 1}| \\
- Superiors & Sup & {\sufigures 1} & \verb|{\sufigures 1}| or \textsu{1}\\
- Inferiors & Inf & {\infigures 1} & \verb|{\infigures 1}| or \textin{1}\\
- Numerators & Numr & {\nufigures 1} & \verb|{\nufigures 1}| or \textnu{1}\\
- Denominators & Dnom & {\defigures 1} & \verb|{\defigures 1}| or \textde{1}\\
+ Superiors & Sup & {\sufigures 1} & \verb|{\sufigures 1}| or \verb|\textsu{1}|\\
+ Inferiors & Inf & {\infigures 1} & \verb|{\infigures 1}| or \verb|\textin{1}|\\
+ Numerators & Numr & {\nufigures 1} & \verb|{\nufigures 1}| or \verb|\textnu{1}|\\
+ Denominators & Dnom & {\defigures 1} & \verb|{\defigures 1}| or \verb|\textde{1}|\\
\bottomrule
\end{tabular}
@@ -99,7 +116,7 @@
\textsc{Example macro definition:}\\
-Suppose you have set your default figure style in sans serif to proportional lining. (This is the default---you need not set any options to get this.) If you wish to have the option of proportional lining figures in sans serif made easier, you could modify the definitions in the {\tt.sty} file, as follows. Place the following in your preamble after loading Montserrat.
+Suppose you have set your default figure style in sans serif to proportional lining. (This is the default---you need not set any options to get this.) If you wish to have the option of proportional oldstyle figures in sans serif made easier, you could modify the definitions in the {\tt.sty} file, as follows. Place the following in your preamble after loading Montserrat.
\begin{verbatim}
\makeatletter
\DeclareRobustCommand{\sfosfstyle}{%
@@ -111,4 +128,11 @@
\makeatother
\end{verbatim}
+\section*{Usage with fontspec}
+Because the package supplies a file named {\tt montserrat.fontspec} whose contents list the {\tt otf} files that correspond to each of nine styles you may load {\tt montserrat} as the main text font with just
+\begin{verbatim}
+\usepackage{fontspec}
+\setmainfont{montserrat}
+\end{verbatim}
+This will use regular and bold weights for \LaTeX's regular and bold. If you wish other choices, you will have to suitably modify {\tt montserrat.fontspec}.
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/montserrat.doc.tlpobj new/tlpkg/tlpobj/montserrat.doc.tlpobj
--- old/tlpkg/tlpobj/montserrat.doc.tlpobj 2019-02-28 03:54:41.000000000 +0100
+++ new/tlpkg/tlpobj/montserrat.doc.tlpobj 2020-03-24 02:00:06.000000000 +0100
@@ -1,9 +1,9 @@
name montserrat.doc
category Package
-revision 43347
+revision 54512
shortdesc doc files of montserrat
relocated 1
-docfiles size=67
+docfiles size=132
RELOC/doc/fonts/montserrat/FONTLOG.txt
RELOC/doc/fonts/montserrat/OFL-FAQ.txt
RELOC/doc/fonts/montserrat/OFL.txt
++++++ montserrat.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-p/montserrat.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/montserrat.tar.xz differ: char 25, line 1
++++++ mptopdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/context/scripts/mkii/mptopdf.man new/texmf-dist/doc/context/scripts/mkii/mptopdf.man
--- old/texmf-dist/doc/context/scripts/mkii/mptopdf.man 2019-02-24 16:12:57.000000000 +0100
+++ new/texmf-dist/doc/context/scripts/mkii/mptopdf.man 2020-02-05 22:46:49.000000000 +0100
@@ -1,6 +1,6 @@
-.TH "mptopdf" "1" "01-01-2018" "version 1.4.1" "convert MetaPost figures to PDF"
+.TH "mptopdf" "1" "01-01-2020" "version 1.4.1" "convert MetaPost figures to PDF"
.SH NAME
-.B mptopdf
+ mptopdf - convert MetaPost figures to PDF
.SH SYNOPSIS
.B mptopdf [
.I OPTIONS ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mptopdf.1 new/texmf-dist/doc/man/man1/mptopdf.1
--- old/texmf-dist/doc/man/man1/mptopdf.1 2018-09-02 23:18:44.000000000 +0200
+++ new/texmf-dist/doc/man/man1/mptopdf.1 2020-02-05 22:49:44.000000000 +0100
@@ -1,6 +1,6 @@
-.TH "mptopdf" "1" "01-01-2018" "version 1.4.1" "convert MetaPost figures to PDF"
+.TH "mptopdf" "1" "01-01-2020" "version 1.4.1" "convert MetaPost figures to PDF"
.SH NAME
-.B mptopdf
+ mptopdf - convert MetaPost figures to PDF
.SH SYNOPSIS
.B mptopdf [
.I OPTIONS ...
Binary files old/texmf-dist/doc/man/man1/mptopdf.man1.pdf and new/texmf-dist/doc/man/man1/mptopdf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mptopdf.doc.tlpobj new/tlpkg/tlpobj/mptopdf.doc.tlpobj
--- old/tlpkg/tlpobj/mptopdf.doc.tlpobj 2019-02-28 03:54:57.000000000 +0100
+++ new/tlpkg/tlpobj/mptopdf.doc.tlpobj 2020-03-14 01:43:17.000000000 +0100
@@ -1,6 +1,6 @@
name mptopdf.doc
category Package
-revision 50112
+revision 54276
shortdesc doc files of mptopdf
docfiles size=6
texmf-dist/doc/context/scripts/mkii/mptopdf.man
++++++ mptopdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/context/perl/mptopdf.pl new/texmf-dist/scripts/context/perl/mptopdf.pl
--- old/texmf-dist/scripts/context/perl/mptopdf.pl 2019-02-24 16:12:57.000000000 +0100
+++ new/texmf-dist/scripts/context/perl/mptopdf.pl 2020-02-05 22:46:49.000000000 +0100
@@ -3,6 +3,12 @@
# MikTeX users can set environment variable TEXSYSTEM to "miktex".
+# There have been suggestions to patch this script for dealing with different
+# output templates (a relative new metapost feature) but these have given
+# unwanted side effects. One can always wrap this script in another script
+# to deal with whatever patterns needed. We won't touch what has worked for
+# ages. (December 2019)
+
#D \module
#D [ file=mptopdf.pl,
#D version=2010.05.28, % 2000.05.29
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mptopdf.tlpobj new/tlpkg/tlpobj/mptopdf.tlpobj
--- old/tlpkg/tlpobj/mptopdf.tlpobj 2019-02-28 03:54:57.000000000 +0100
+++ new/tlpkg/tlpobj/mptopdf.tlpobj 2020-03-14 01:43:17.000000000 +0100
@@ -1,15 +1,15 @@
name mptopdf
category Package
-revision 50112
+revision 54276
shortdesc mpost to PDF, native MetaPost graphics inclusion
longdesc The mptopdf script does standalone conversion from mpost to
-longdesc PDF, using the supp-* and syst-* files. They also allow native
+longdesc PDF, using the supp-* and syst-* files. They also allow native
longdesc MetaPost graphics inclusion in LaTeX (via pdftex.def) and
-longdesc ConTeXt. They can be used independently of the rest of
-longdesc ConTeXt, yet are maintained as part of it. So in TeX Live we
-longdesc pull them out to this separate package for the benefit of LaTeX
-longdesc users who do not install the rest of ConTeXt. This can be
-longdesc found on CTAN in macros/pdftex/graphics.
+longdesc ConTeXt. They can be used independently of the rest of ConTeXt,
+longdesc yet are maintained as part of it. So in TeX Live we pull them
+longdesc out to this separate package for the benefit of LaTeX users who
+longdesc do not install the rest of ConTeXt. This can be found on CTAN
+longdesc in macros/pdftex/graphics.
depend plain
depend mptopdf.ARCH
execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" fmttriggers=plain
++++++ ms.doc.tar.xz ++++++
++++ 11842 lines of diff (skipped)
++++++ ms.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ms/ragged2e.sty new/tex/latex/ms/ragged2e.sty
--- old/tex/latex/ms/ragged2e.sty 2009-06-13 02:24:58.000000000 +0200
+++ new/tex/latex/ms/ragged2e.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,314 +0,0 @@
-%%
-%% This is file `ragged2e.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ragged2e.dtx (with options: `package')
-%%
-%% Copyright 1996..2009 Martin Schroeder.
-%%
-%% This file is part of the Ragged2e package
-%% -----------------------------------------
-%%
-%% 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 Martin Schroeder.
-%%
-%% This work consists of the files ragged2e.dtx and ragged2e.ins
-%% and the derived file ragged2e.sty.
-%%
-\NeedsTeXFormat{LaTeX2e}[1996/10/24]
-\ProvidesPackage{ragged2e}
- [2009/05/21 v2.1 ragged2e Package (MS)]
-%% Copyright 1996..2009 by Martin Schr\"oder.
-%% \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 \~}
-%%
-%% \iffalse meta-comment
-%% ===================================================================
-%% @LaTeX-style-file{
-%% author = {Martin Schr\"oder},
-%% version = "2.1",
-%% date = "21 May 2009",
-%% filename = "ragged2e.sty",
-%% address = {Martin Schr\"oder
-%% Barmer Stra\"se 14
-%% 44137 Dortmund
-%% Germany}
-%% telephone = "+49-231-1206574",
-%% email = "martin(a)oneiros.de",
-%% docstring = "LaTeX package which defines new commands
-%% \Centering, \RaggedLeft, \RaggedRight and
-%% \justifying and new environments Center,
-%% FlushLeft, FlushRight and justify, which
-%% set ragged text and are easily configurable
-%% to allow hyphenation.
-%% Uses the everysel package.
-%% "
-%% }
-%% ===================================================================
-%% \fi
-\newif\if@raggedtwoe@originalcommands
-\newif\if@raggedtwoe@originalparameters
-\newif\if@raggedtwoe@footmisc
-\DeclareOption{OriginalCommands}{\@raggedtwoe@originalcommandstrue}
-\DeclareOption{originalcommands}{\@raggedtwoe@originalcommandstrue}
-\DeclareOption{NewCommands}{\@raggedtwoe@originalcommandsfalse}
-\DeclareOption{newcommands}{\@raggedtwoe@originalcommandsfalse}
-\DeclareOption{OriginalParameters}{\@raggedtwoe@originalparameterstrue}
-\DeclareOption{originalparameters}{\@raggedtwoe@originalparameterstrue}
-\DeclareOption{NewParameters}{\@raggedtwoe@originalparametersfalse}
-\DeclareOption{newparameters}{\@raggedtwoe@originalparametersfalse}
-\newcommand*{\@raggedtwoe@raggedrightboxes@opt}{
- \CheckCommand*{\@arrayparboxrestore}{%
- \let\if@nobreak\iffalse
- \let\if@noskipsec\iffalse
- \let\par\@@par
- \let\-\@dischyph
- \let\'\@acci\let\`\@accii\let\=\@acciii
- \parindent\z@ \parskip\z@skip
- \everypar{}%
- \linewidth\hsize
- \@totalleftmargin\z@
- \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip
- \parfillskip\@flushglue \lineskip\normallineskip
- \baselineskip\normalbaselineskip
- \sloppy}%
- \renewcommand{\@arrayparboxrestore}{%
- \let\if@nobreak\iffalse
- \let\if@noskipsec\iffalse
- \let\par\@@par
- \let\-\@dischyph
- \let\'\@acci\let\`\@accii\let\=\@acciii
- \parskip\z@skip
- \everypar{}%
- \linewidth\hsize
- \@totalleftmargin\z@
- \RaggedRight
- \lineskip\normallineskip
- \baselineskip\normalbaselineskip
- \sloppy}%
- \let\@raggedtwoe@raggedrightboxes@opt\relax
- }
-\DeclareOption{raggedrightboxes}{\@raggedtwoe@raggedrightboxes@opt}
-\DeclareOption{footnotes}{%
- \@raggedtwoe@footmisctrue
- \PassOptionsToPackage{ragged}{footmisc}%
- }
-\newcommand{\@raggedtwoe@abdhook}{%
- \PackageInfo{ragged2e}{ABD: executing \string\RaggedRight}%
- \RaggedRight
- \@ifundefined{@tocrmarg}{}{\edef\@tocrmarg{\@tocrmarg plus 2em}}%
- \let\@raggedtwoe@abdhook\relax
- }
-\newcommand{\@raggedtwoe@document@opt}{%
- \AtBeginDocument{\@raggedtwoe@abdhook}%
- \@raggedtwoe@raggedrightboxes@opt
- \@raggedtwoe@footmisctrue
- \let\@raggedtwoe@document@opt\relax
- }
-\DeclareOption{document}{\@raggedtwoe@document@opt}
-\DeclareOption*{%
- \if@raggedtwoe@footmisc
- \PassOptionsToPackage{\CurrentOption}{footmisc}%
- \else
- \OptionNotUsed
- \fi
- }
-%% ^^A -----------------------------
-\ExecuteOptions{originalcommands,newparameters}
-\ProcessOptions\relax
-\RequirePackage{everysel}
-\if@raggedtwoe@footmisc
- \RequirePackage{footmisc}[2002/08/28]
-\fi
-\newlength{\CenteringLeftskip}
-\newlength{\RaggedLeftLeftskip}
-\newlength{\RaggedRightLeftskip}
-\newlength{\CenteringRightskip}
-\newlength{\RaggedLeftRightskip}
-\newlength{\RaggedRightRightskip}
-\newlength{\CenteringParfillskip}
-\newlength{\RaggedLeftParfillskip}
-\newlength{\RaggedRightParfillskip}
-\newlength{\JustifyingParfillskip}
-\newlength{\CenteringParindent}
-\newlength{\RaggedLeftParindent}
-\newlength{\RaggedRightParindent}
-\newlength{\JustifyingParindent}
-\if@raggedtwoe@originalparameters
- \CenteringLeftskip\@flushglue
- \RaggedLeftLeftskip\@flushglue
- \RaggedRightLeftskip\z@skip
- \CenteringRightskip\@flushglue
- \RaggedLeftRightskip\z@skip
- \RaggedRightRightskip\@flushglue
- \CenteringParfillskip\z@skip
- \RaggedLeftParfillskip\z@skip
- \RaggedRightParfillskip\@flushglue
- \CenteringParindent\z@
- \RaggedLeftParindent\z@
- \RaggedRightParindent\z@
-\else
- \CenteringLeftskip\z@\@plus\tw@ em
- \RaggedLeftLeftskip\z@\@plus\tw@ em
- \RaggedRightLeftskip\z@skip
- \CenteringRightskip\z@\@plus\tw@ em
- \RaggedLeftRightskip\z@skip
- \RaggedRightRightskip\z@\@plus\tw@ em
- \CenteringParfillskip\z@skip
- \RaggedLeftParfillskip\z@skip
- \RaggedRightParfillskip\@flushglue
- \CenteringParindent\z@
- \RaggedLeftParindent\z@
- \RaggedRightParindent\z@
-\fi
-\JustifyingParfillskip\@flushglue
-\JustifyingParindent\parindent
-\newif\if@raggedtwoe@spaceskip
-\newcommand{\@raggedtwoe@everyselectfont}{%
- \if@raggedtwoe@spaceskip
- \ifdim\fontdimen\thr@@\font=\z@\relax
- \spaceskip\z@
- \else
- \spaceskip\fontdimen\tw@\font
- \fi
- \else
- \spaceskip\z@
- \fi
- }
-\EverySelectfont{\@raggedtwoe@everyselectfont}
-\let\@raggedtwoe@savedcr\\
-\let\@raggedtwoe@saved@gnewline\@gnewline
-\newcommand*{\@raggedtwoe@gnewline}[1]{%
- \ifvmode
- \@nolnerr
- \else
- \unskip
- \ifmmode
- \reserved@e {\reserved@f #1}\nobreak \hfil \break
- \else
- \reserved@e {\reserved@f #1}{\parskip\z@\par}%
- \fi
- \fi
- }
-\newcommand{\Centering}{%
- \ifx\\\@raggedtwoe@savedcr
- \let\\\@centercr
- \fi
- \let\@gnewline\@raggedtwoe@gnewline
- \leftskip\CenteringLeftskip
- \@rightskip\CenteringRightskip
- \rightskip\@rightskip
- \parfillskip\CenteringParfillskip
- \parindent\CenteringParindent
- \@raggedtwoe@spaceskiptrue
- \@raggedtwoe@everyselectfont
- }
-\newcommand{\RaggedLeft}{%
- \ifx\\\@raggedtwoe@savedcr
- \let\\\@centercr
- \fi
- \let\@gnewline\@raggedtwoe@gnewline
- \leftskip\RaggedLeftLeftskip
- \@rightskip\RaggedLeftRightskip
- \rightskip\@rightskip
- \parfillskip\RaggedLeftParfillskip
- \parindent\RaggedLeftParindent
- \@raggedtwoe@spaceskiptrue
- \@raggedtwoe@everyselectfont
- }
-\newcommand{\RaggedRight}{%
- \ifx\\\@raggedtwoe@savedcr
- \let\\\@centercr
- \fi
- \let\@gnewline\@raggedtwoe@gnewline
- \leftskip\RaggedRightLeftskip
- \@rightskip\RaggedRightRightskip
- \rightskip\@rightskip
- \parfillskip\RaggedRightParfillskip
- \parindent\RaggedRightParindent
- \@raggedtwoe@spaceskiptrue
- \@raggedtwoe@everyselectfont
- }
-\newcommand{\justifying}{%
- \let\\\@raggedtwoe@savedcr
- \let\@gnewline\@raggedtwoe@saved@gnewline
- \leftskip\z@
- \@rightskip\z@
- \rightskip\@rightskip
- \parfillskip\JustifyingParfillskip
- \parindent\JustifyingParindent
- \@raggedtwoe@spaceskipfalse
- \@raggedtwoe@everyselectfont
- }
-\newenvironment{Center}{%
- \trivlist
- \Centering\item\relax
- }{%
- \endtrivlist
- }
-\newenvironment{FlushLeft}{%
- \trivlist
- \RaggedRight\item\relax
- }{%
- \endtrivlist
- }
-\newenvironment{FlushRight}{%
- \trivlist
- \RaggedLeft\item\relax
- }{%
- \endtrivlist
- }
-\newenvironment{justify}{%
- \trivlist
- \justifying\item\relax
- }{%
- \endtrivlist
- }
-\if@raggedtwoe@originalcommands
-\else
- \let\LaTeXcentering\centering
- \let\LaTeXraggedleft\raggedleft
- \let\LaTeXraggedright\raggedright
- \let\centering\Centering
- \let\raggedleft\RaggedLeft
- \let\raggedright\RaggedRight
- \let\LaTeXcenter\center
- \let\endLaTeXcenter\endcenter
- \let\LaTeXflushleft\flushleft
- \let\endLaTeXflushleft\endflushleft
- \let\LaTeXflushright\flushright
- \let\endLaTeXflushright\endflushright
- \let\center\Center
- \let\endcenter\endCenter
- \let\flushleft\FlushLeft
- \let\endflushleft\endFlushLeft
- \let\flushright\FlushRight
- \let\endflushright\endFlushRight
-\fi
-\endinput
-%%
-%% End of file `ragged2e.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ms.tlpobj new/tlpkg/tlpobj/ms.tlpobj
--- old/tlpkg/tlpobj/ms.tlpobj 2019-02-28 03:54:58.000000000 +0100
+++ new/tlpkg/tlpobj/ms.tlpobj 2019-07-31 01:54:23.000000000 +0200
@@ -1,23 +1,23 @@
name ms
category Package
-revision 42428
+revision 51784
shortdesc Various LaTeX packages by Martin Schroder
relocated 1
longdesc A bundle of LaTeX packages by Martin Schroder; the collection
-longdesc comprises: count1to, make use of fixed TeX counters; everysel,
-longdesc set commands to execute every time a font is selected;
-longdesc everyshi, set commands to execute whenever a page is shipped
-longdesc out; multitoc, typeset the table of contents in multiple
-longdesc columns; prelim2e, mark typeset pages as preliminary; and
-longdesc ragged2e, typeset ragged text and allow hyphenation.
-runfiles size=12
+longdesc comprises: count1to, make use of TeX counters; everysel, set
+longdesc commands to execute every time a font is selected; everyshi,
+longdesc set commands to execute whenever a page is shipped out;
+longdesc multitoc, typeset the table of contents in multiple columns;
+longdesc and prelim2e, mark typeset pages as preliminary. ragged2e,
+longdesc which used to be part of this bundle, has become an independent
+longdesc package.
+runfiles size=9
RELOC/tex/latex/ms/count1to.sty
RELOC/tex/latex/ms/everysel.sty
RELOC/tex/latex/ms/everyshi.sty
RELOC/tex/latex/ms/multitoc.sty
RELOC/tex/latex/ms/prelim2e.sty
- RELOC/tex/latex/ms/ragged2e.sty
catalogue-ctan /macros/latex/contrib/ms
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-30 20:37:59 +0200
catalogue-license lppl
catalogue-topics collection
++++++ mslapa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mslapa.doc.tlpobj new/tlpkg/tlpobj/mslapa.doc.tlpobj
--- old/tlpkg/tlpobj/mslapa.doc.tlpobj 2019-02-28 03:54:59.000000000 +0100
+++ new/tlpkg/tlpobj/mslapa.doc.tlpobj 2020-03-04 23:52:58.000000000 +0100
@@ -1,6 +1,6 @@
name mslapa.doc
category Package
-revision 17514
+revision 54080
shortdesc doc files of mslapa
relocated 1
docfiles size=75
++++++ mslapa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mslapa.tlpobj new/tlpkg/tlpobj/mslapa.tlpobj
--- old/tlpkg/tlpobj/mslapa.tlpobj 2019-02-28 03:54:59.000000000 +0100
+++ new/tlpkg/tlpobj/mslapa.tlpobj 2020-03-04 23:52:58.000000000 +0100
@@ -1,6 +1,6 @@
name mslapa
category Package
-revision 17514
+revision 54080
shortdesc Michael Landy's APA citation style
relocated 1
longdesc LaTeX and BibTeX style files for a respectably close
@@ -11,6 +11,5 @@
RELOC/tex/latex/mslapa/mslapa.sty
catalogue-also apacite apa
catalogue-ctan /macros/latex/contrib/mslapa
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
-catalogue-topics psychology journalpub bibtex-sty
+catalogue-topics psychology journalpub bibtex-sty apa
++++++ multicolrule.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multicolrule/README.md new/doc/latex/multicolrule/README.md
--- old/doc/latex/multicolrule/README.md 2019-01-02 23:38:45.000000000 +0100
+++ new/doc/latex/multicolrule/README.md 2019-10-04 22:48:54.000000000 +0200
@@ -26,6 +26,3 @@
`makeindex -s gglo.ist -o multicolrule.gls multicolrule.glo`.
This package requires expl3 and xparse.
- % |\DeclareMCRulePattern| \marg{name} \marg{key-value list}
- % \end{syntax}
-
Binary files old/doc/latex/multicolrule/mcrule-examples.pdf and new/doc/latex/multicolrule/mcrule-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multicolrule/mcrule-examples.tex new/doc/latex/multicolrule/mcrule-examples.tex
--- old/doc/latex/multicolrule/mcrule-examples.tex 2019-01-02 23:38:45.000000000 +0100
+++ new/doc/latex/multicolrule/mcrule-examples.tex 2019-10-04 22:48:54.000000000 +0200
@@ -2,17 +2,19 @@
\documentclass{article}
\usepackage[left=1in,right=1in,top=1in,bottom=1in]{geometry}
\usepackage{fontspec}
-\usepackage[tikz]{multicolrule}[2018/12/31]
+\usepackage[tikz]{multicolrule}[2019/10/01]
\usepackage{lipsum}
+\usepackage{fancyvrb}
\usepackage{bbding}
\usepackage{pgfornament}
\usepackage{bidi}
+\usetikzlibrary{calc}
\setlength{\columnsep}{24pt}
\setlength{\columnseprule}{.5pt}
\begin{document}
\section*{Style Gallery}
-This file gives brief examples covering all the defined line styles and
+This file gives brief examples covering all defined line styles and
other functions available in \texttt{multicolrule}. See the documentation
for instructions on how to set them in your own documents.
@@ -157,13 +159,22 @@
\lipsum[1-2]
\end{multicols}
-\setlength{\columnsep}{50pt}
-\begin{multicols}{2}[Custom Line (color gray, 4 repeats), just because we can]
+\begin{multicols}{2}[Custom line that is too wide for the separator]
\SetMCRule{color=gray,repeat=4,repeat-distance=4pt,width=1pt,custom-line={\path (TOP) to [ornament=88] (BOT);}}
\lipsum[1-2]
\end{multicols}
-\newpage
+\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule]
+ \SetMCRule{color=gray,width=0.4pt, expand=2pt, custom-line={
+ \coordinate (TOPLEFT) at ($(TOP)-(\columnwidth+.5\columnsep,\columnseprule)$);
+ \coordinate (TOPRIGHT) at ($(TOP)+(\columnwidth+.5\columnsep,-\columnseprule)$);
+ \coordinate (BOTLEFT) at ($(BOT)-(\columnwidth+.5\columnsep,-\columnseprule)$);
+ \coordinate (BOTRIGHT) at ($(BOT)+(\columnwidth+.5\columnsep,\columnseprule)$);
+ \draw[line width=\columnseprule] (TOPLEFT) -- (TOPRIGHT)
+ (TOP) -- (BOT) (BOTLEFT) -- (BOTRIGHT);}}
+ \lipsum[1-2]
+\end{multicols}
+
\subsection*{Extended Rules}
\setlength{\columnsep}{24pt}
@@ -177,16 +188,32 @@
\lipsum[1]
\end{multicols}
-\begin{multicols}{2}[Dashed -- shrink both 16pt]
- \SetMCRule{line-style=dashed,extend-top=-16pt,extend-bot=-16pt}
+\begin{multicols}{2}[Dashed -- expand -8pt]
+ \SetMCRule{line-style=dashed,expand=-8pt}
+ \lipsum[1]
+\end{multicols}
+
+\begin{multicols}{2}[Dots -- expand 8pt]
+ \SetMCRule{line-style=dots,expand=8pt}
\lipsum[1]
\end{multicols}
-\begin{multicols}{2}[Extend-Fill with extend-reserve]
+\begin{multicols}{2}[Dots -- shift 16pt]
+ \SetMCRule{line-style=dots,shift=16pt}
+ \lipsum[1-2]
+\end{multicols}
+
+\begin{multicols}{2}[Extend-fill with extend-reserve]
\SetMCRule{line-style=solid,extend-fill,extend-reserve=\baselineskip}
- \lipsum[1-5]
+ \lipsum[1-2]
+\end{multicols}
+And something at the end to show the reserved space.
+
+\begin{multicols}{2}[Strut with extend-fill + extend-reserve]
+ \SetMCRule{line-style=strut,extend-fill,extend-reserve=\baselineskip}
+ \lipsum[1-3]
\end{multicols}
-And something at the end to show the reserved space
+This text is here to show the effect of the strut used as a separator above.
\subsection*{Patterns}
@@ -194,7 +221,7 @@
\DeclareMCRulePattern{right-hand}{custom-tile={\HandRight}{8pt}{8pt}}
\DeclareMCRulePattern{shrinking}{line-style=solid,color=blue,extend-top=-16pt}
\begin{multicols}{3}[Alternating Patterns]
- \SetMCRule{patterns={right-hand,left-hand}}
+ \SetMCRule{patterns={left-hand,right-hand}}
\lipsum[1-3]
\end{multicols}
@@ -225,6 +252,12 @@
\lipsum[1-2]
\end{multicols}
+\DeclareMCRulePattern{invisible}{width=thin,line-style=strut}
+\SetMCRule{patterns={left-hand,invisible,right-hand}}
+\begin{multicols}{4}[Invisible middle divider with strut]
+ \raggedcolumns
+ \lipsum[1-2]
+\end{multicols}
\DeclareMCRulePattern{blue-double}{width=thick,line-style=solid,color=blue,double=3pt}
\DeclareMCRulePattern{orange-triple}{width=thick,line-style=solid,color=orange,triple=3pt}
Binary files old/doc/latex/multicolrule/multicolrule.pdf and new/doc/latex/multicolrule/multicolrule.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multicolrule.doc.tlpobj new/tlpkg/tlpobj/multicolrule.doc.tlpobj
--- old/tlpkg/tlpobj/multicolrule.doc.tlpobj 2019-02-28 03:55:02.000000000 +0100
+++ new/tlpkg/tlpobj/multicolrule.doc.tlpobj 2019-10-05 01:54:43.000000000 +0200
@@ -1,9 +1,9 @@
name multicolrule.doc
category Package
-revision 49579
+revision 52283
shortdesc doc files of multicolrule
relocated 1
-docfiles size=150
+docfiles size=155
RELOC/doc/latex/multicolrule/README.md
RELOC/doc/latex/multicolrule/mcrule-examples.pdf
RELOC/doc/latex/multicolrule/mcrule-examples.tex
++++++ multicolrule.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multicolrule/multicolrule.sty new/tex/latex/multicolrule/multicolrule.sty
--- old/tex/latex/multicolrule/multicolrule.sty 2019-01-02 23:38:45.000000000 +0100
+++ new/tex/latex/multicolrule/multicolrule.sty 2019-10-04 22:48:54.000000000 +0200
@@ -15,10 +15,7 @@
%%
\RequirePackage{expl3}
\RequirePackage{xparse}
- % |\DeclareMCRulePattern| \marg{name} \marg{key-value list}
- % \end{syntax}
-
-\ProvidesExplPackage {multicolrule} {2019/01/01} {1.2}
+\ProvidesExplPackage {multicolrule} {2019/10/01} {1.3}
{Decorative vertical rules between columns}
\RequirePackage{l3keys2e}
\RequirePackage{xpatch}
@@ -63,6 +60,7 @@
\ProcessKeysOptions{mcrule-opts}
\cs_new:Npn \__mcrule_column_height: {}
\cs_new:Npn \__mcrule_column_depth: {}
+\cs_new:Npn \__mcrule_column_overflow: {0pt}
\cs_new_protected:Npn \__mcrule_patch_mcol_output:N #1
{
\xpatchcmd{#1} {\columnseprulecolor\vrule\@width\columnseprule}
@@ -85,7 +83,6 @@
\cs_gset:Npn \__mcrule_column_height: {\box_ht:N \@outputbox}
\cs_gset:Npn \__mcrule_column_depth: {\box_dp:N \@outputbox}
\__mcrule_patch_twocol_output:N \@outputdblcol
- \__mcrule_patch_twocol_output:N \@outputdblcol
\AfterPackage!{bidi}
{
\__mcrule_patch_twocol_output:N \RTL@outputdblcol
@@ -96,8 +93,18 @@
\RequirePackage{multicol}
\__mcrule_patch_mcol_output:N \LR@column@boxes
\__mcrule_patch_mcol_output:N \RL@column@boxes
- \cs_gset:Npn \__mcrule_column_height: {\box_ht:N \mult@rightbox}
- \cs_gset:Npn \__mcrule_column_depth: {\dimen\tw@}
+ \cs_gset:Npn \__mcrule_column_height:
+ {
+ \box_ht:N \mult@rightbox
+ }
+ \cs_gset:Npn \__mcrule_column_depth:
+ {
+ \dim_max:nn {\dimen\tw@}{\box_dp:N \mult@rightbox}
+ }
+\cs_gset:Npn \__mcrule_column_overflow:
+{
+ \dim_max:nn {\box_ht:N \mult@nat@firstbox - \box_ht:N \mult@rightbox}{0pt}
+}
\LRmulticolcolumns
\AfterPackage!{bidi}
{
@@ -124,7 +131,8 @@
{
\int_gset:Nn \g__mcrule_pattern_count_int {\c_one_int}
}
- \tl_set:Nx \l_tmpa_tl {\seq_item:Nn \l__mcrule_pattern_list_seq {\g__mcrule_pattern_count_int} }
+ \tl_set:Nx \l_tmpa_tl {\seq_item:Nn \l__mcrule_pattern_list_seq
+ {\g__mcrule_pattern_count_int} }
\tl_if_blank:VF \l_tmpa_tl
{
\__mcrule_set_pattern:V \l_tmpa_tl
@@ -151,11 +159,12 @@
\cs_new:Npn \__mcrule_column_total_height:
{
\dim_eval:n {\__mcrule_column_height: + \__mcrule_column_depth: +
- \__mcrule_extend_column_top: + \__mcrule_extend_column_bottom:}
+ \__mcrule_extend_column_top: + \__mcrule_column_overflow: + \__mcrule_extend_column_bottom:}
}
\cs_new:Npn \__mcrule_column_total_depth:
{
- \dim_eval:n {\__mcrule_column_depth: + \__mcrule_extend_column_bottom:}
+ \dim_eval:n {\__mcrule_column_depth: + \__mcrule_column_overflow: +
+ \__mcrule_extend_column_bottom:}
}
\cs_new:Npn \__mcrule_extend_column_top:
{
@@ -188,7 +197,9 @@
\vbox_to_ht:nn {\__mcrule_column_total_height:}
{
\tex_vfill:D
- \tex_kern:D #2 \hbox:n{#1} \tex_kern:D #3
+ \tex_kern:D \dim_eval:n {#2} \exp_stop_f:
+ \hbox:n{#1}
+ \tex_kern:D \dim_eval:n {#3} \exp_stop_f:
\tex_vfill:D
}
}
@@ -201,7 +212,9 @@
{
\tex_cleaders:D \vbox:n
{
- \tex_kern:D #2 \hbox:n{#1} \tex_kern:D #3
+ \tex_kern:D \dim_eval:n {#2} \exp_stop_f:
+ \hbox:n{#1}
+ \tex_kern:D \dim_eval:n {#3} \exp_stop_f:
}
\tex_vfill:D
}
@@ -221,6 +234,10 @@
{
\rule[-\__mcrule_column_total_depth:]{\columnseprule}{\__mcrule_column_total_height:}
}
+\cs_new:Npn \__mcrule_strut:
+{
+ \rule[-\__mcrule_column_total_depth:]{0pt}{\__mcrule_column_total_height:}
+}
\bool_if:NTF \g__mcrule_use_tikz_bool
{
\ExplSyntaxOff
@@ -306,11 +323,21 @@
extend-fill .bool_set:N = \l__mcrule_extend_fill_bool,
extend-fill .default:n = true,
extend-reserve .dim_set:N = \l__mcrule_extend_reserve_dim,
+ expand .code:n = {
+ \dim_set:Nn \l__mcrule_extend_bot_dim {#1}
+ \dim_set:Nn \l__mcrule_extend_top_dim {#1}
+ },
+ shift .code:n = {
+ \dim_set:Nn \l__mcrule_extend_bot_dim {#1}
+ \dim_set:Nn \l__mcrule_extend_top_dim {\fp_to_dim:n {-1 * \l__mcrule_extend_bot_dim}}
+ },
line-style .choice:,
line-style / default .code:n = \cs_set:Npn \mcrule_divider:
{\vrule\@width\columnseprule},
line-style / solid .code:n = \cs_set:Npn \mcrule_divider:
{\__mcrule_solid_line:},
+ line-style / strut .code:n = \cs_set:Npn \mcrule_divider:
+ {\__mcrule_strut:},
line-style / dots .code:n = \cs_set:Npn \mcrule_divider:
{\__mcrule_tile_pattern:nnn {.}{1pt}{1pt}},
line-style / dense-dots .code:n = \cs_set:Npn \mcrule_divider:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multicolrule.tlpobj new/tlpkg/tlpobj/multicolrule.tlpobj
--- old/tlpkg/tlpobj/multicolrule.tlpobj 2019-02-28 03:55:02.000000000 +0100
+++ new/tlpkg/tlpobj/multicolrule.tlpobj 2019-10-05 01:54:44.000000000 +0200
@@ -1,6 +1,6 @@
name multicolrule
category Package
-revision 49579
+revision 52283
shortdesc Decorative rules between columns
relocated 1
longdesc This package lets you customize the appearance of the vertical
@@ -10,12 +10,12 @@
longdesc macro provided by the standard classes (and related classes
longdesc such as the KOMA-Script equivalents). The package depends on
longdesc expl3 and xparse.
-runfiles size=4
+runfiles size=5
RELOC/tex/latex/multicolrule/multicolrule.sty
catalogue-contact-bugs https://github.com/polysyllabic/multicolrule/issues
catalogue-contact-repository https://github.com/polysyllabic/multicolrule
catalogue-ctan /macros/latex/contrib/multicolrule
-catalogue-date 2019-01-01 23:43:18 +0100
+catalogue-date 2019-10-04 14:50:49 +0200
catalogue-license lppl1.3c
catalogue-topics decoration rule line-patt line-weight expl3
-catalogue-version 1.2
+catalogue-version 1.3
++++++ multirow.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multirow/README new/doc/latex/multirow/README
--- old/doc/latex/multirow/README 2019-01-01 23:50:59.000000000 +0100
+++ new/doc/latex/multirow/README 2019-05-31 23:45:57.000000000 +0200
@@ -1,6 +1,6 @@
-multirow.sty 2019/01/01 v2.4
-bigstruts.sty 2019/01/01 v2.4
-bigdelim.sty 2019/01/01 v2.4
+multirow.sty 2019/05/31 v2.5
+bigstruts.sty 2019/05/31 v2.5
+bigdelim.sty 2019/05/31 v2.5
Original Author: Jerry Leichter
Current Author: Piet van Oostrum <piet(a)vanoostrum.org>
Binary files old/doc/latex/multirow/multirow.pdf and new/doc/latex/multirow/multirow.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multirow.doc.tlpobj new/tlpkg/tlpobj/multirow.doc.tlpobj
--- old/tlpkg/tlpobj/multirow.doc.tlpobj 2019-02-28 03:55:04.000000000 +0100
+++ new/tlpkg/tlpobj/multirow.doc.tlpobj 2019-06-01 01:38:46.000000000 +0200
@@ -1,6 +1,6 @@
name multirow.doc
category Package
-revision 49572
+revision 51278
shortdesc doc files of multirow
relocated 1
docfiles size=151
++++++ multirow.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/bigdelim.sty new/tex/latex/multirow/bigdelim.sty
--- old/tex/latex/multirow/bigdelim.sty 2019-01-01 23:50:59.000000000 +0100
+++ new/tex/latex/multirow/bigdelim.sty 2019-05-31 23:45:57.000000000 +0200
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigdelim}
- [2019/01/01 v2.4
+ [2019/05/31 v2.5
Create big delimiters in tabular or array]
\RequirePackage{multirow}
\newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/bigstrut.sty new/tex/latex/multirow/bigstrut.sty
--- old/tex/latex/multirow/bigstrut.sty 2019-01-01 23:50:59.000000000 +0100
+++ new/tex/latex/multirow/bigstrut.sty 2019-05-31 23:45:57.000000000 +0200
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigstrut}
- [2019/01/01 v2.4
+ [2019/05/31 v2.5
Provide larger struts in tabulars]
\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot=2pt
\newcommand\bigstrut[1][x]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/multirow.sty new/tex/latex/multirow/multirow.sty
--- old/tex/latex/multirow/multirow.sty 2019-01-01 23:50:59.000000000 +0100
+++ new/tex/latex/multirow/multirow.sty 2019-05-31 23:45:57.000000000 +0200
@@ -23,13 +23,14 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{multirow}%
- [2019/01/01 v2.4
+ [2019/05/31 v2.5
Span multiple rows of a table]%
\newif\ifmultirowdebug
\DeclareOption{debug}{\multirowdebugtrue}
\DeclareOption{longtable}{%
\AtBeginDocument{%
-\def\@cline#1-#2\@nil{%
+\@ifundefined{CT@arc}
+{\def\@cline#1-#2\@nil{%
\omit
\@multicnt#1%
\advance\@multispan\m@ne
@@ -39,7 +40,18 @@
\advance\@multispan\@ne
\leaders\hrule\@height\arrayrulewidth\hfill
\cr
- \noalign{\nobreak\vskip-\arrayrulewidth}}
+ \noalign{\nobreak\vskip-\arrayrulewidth}}}
+{\def\@cline#1-#2\@nil{%
+ \omit
+ \@multicnt#1%
+ \advance\@multispan\m@ne
+ \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi
+ \@multicnt#2%
+ \advance\@multicnt-#1%
+ \advance\@multispan\@ne
+ {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}%
+ \cr
+ \noalign{\nobreak\vskip-\arrayrulewidth}}}
}}
\DeclareOption{supertabular}{%
\AtBeginDocument{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multirow.tlpobj new/tlpkg/tlpobj/multirow.tlpobj
--- old/tlpkg/tlpobj/multirow.tlpobj 2019-02-28 03:55:04.000000000 +0100
+++ new/tlpkg/tlpobj/multirow.tlpobj 2019-06-01 01:38:47.000000000 +0200
@@ -1,6 +1,6 @@
name multirow
category Package
-revision 49572
+revision 51278
shortdesc Create tabular cells spanning multiple rows
relocated 1
longdesc The package has a lot of flexibility, including an option for
@@ -13,7 +13,7 @@
RELOC/tex/latex/multirow/multirow.sty
catalogue-also bigstrut bigdelim
catalogue-ctan /macros/latex/contrib/multirow
-catalogue-date 2019-01-01 14:36:00 +0100
+catalogue-date 2019-05-31 16:05:47 +0200
catalogue-license lppl1.3
catalogue-topics table
-catalogue-version 2.4
+catalogue-version 2.5
++++++ musicography.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/musicography/README.md new/doc/latex/musicography/README.md
--- old/doc/latex/musicography/README.md 2017-10-31 22:23:51.000000000 +0100
+++ new/doc/latex/musicography/README.md 2020-01-29 23:39:07.000000000 +0100
@@ -2,7 +2,7 @@
This package makes available the most commonly used symbols in writing about
music in a way that can be used with `pdflatex` and looks consistent and
-attractive.
+attractive. (It also works with `xelatex`.)
It includes accidentals, meters, and notes of different rhythmic values.
The package provides a flexible, user-friendly interface written using `xparse`.
Binary files old/doc/latex/musicography/musicography.pdf and new/doc/latex/musicography/musicography.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/musicography/musicography.tex new/doc/latex/musicography/musicography.tex
--- old/doc/latex/musicography/musicography.tex 2018-05-26 00:32:19.000000000 +0200
+++ new/doc/latex/musicography/musicography.tex 2020-01-29 23:39:07.000000000 +0100
@@ -14,8 +14,7 @@
{\end{tabular}\end{quote}}
\usepackage[
- pdftitle={The musicography Package: Symbols for Music Writing with
- pdflatex},
+ pdftitle={The musicography Package: Symbols for Music Writing},
pdfauthor={Andrew A. Cashner},
pdfsubject={LaTeX package}, pdfkeywords={LaTeX, symbols, music, musicology, humanities}
]{hyperref}
@@ -27,24 +26,29 @@
{\nolinkurl{andrewacashner(a)gmail.com}}%
}%
}
-\date{May 21, 2018}
+\date{January 29, 2020}
\begin{document}
\maketitle
-Font packages for \code{pdflatex} only provided a limited range of musical
-symbols.
+Most \LaTeX{} font packages and freely available fonts only provided a limited
+range of musical symbols.
The \code{lilyglyphs} package uses Lilypond's fonts, but requires
\code{lualatex}.
This package makes available the most commonly used symbols in writing about
-music in a way that can be used with \code{pdflatex} and looks consistent and
-attractive.
-It includes accidentals, meters, and notes of different rhythmic values.
+music in a way that looks consistent and attractive.
+It is especially useful for \code{pdflatex} but also works alongside Unicode
+fonts with \code{xelatex}.
+It includes accidentals, meters, notes of different rhythmic values, and
+automatic formatting of figured bass.
This package builds on the approach used in the \code{harmony} package, where
the symbols are taken from the MusiXTeX fonts.
But it provides a larger range of symbols and a more flexible, user-friendly
interface written using \code{xparse}.
+The package is meant to work hand-in-hand with my \code{semantic-markup}
+package, and overrides some of its music-symbol commands with better
+alternatives.
\tableofcontents
@@ -58,6 +62,9 @@
The \code{bigger} option provides larger font sizes that match better with
certain fonts.
+The package now (2019) provides full support for figured-bass notation using the
+\verb|\musFig| command.
+
The \verb|\musNumFont| command allows you to change the font of the numerals
used.
For example, if using the \code{ebgaramond} font package, it looks better if you
@@ -66,6 +73,7 @@
\verb|\renewcommand{\musNumFont}[1]{\liningnums{#1}}|.
\end{quote}
+
\section{Symbols and Commands}
\subsection{Accidentals}
@@ -92,6 +100,8 @@
Eighth note (corchea) & \verb|\musEighth| or \verb|\musCorchea| &
\musEighth\\
Sixteenth note & \verb|\musSixteenth| & \musSixteenth\\
+ Thirty-second note & \verb|\musThirtySecond| & \musThirtySecond\\
+ Sixty-fourth note & \verb|\musSixtyFourth| & \musSixtyFourth\\
\end{codetable}
A dot may be added to any of the above by adding \code{Dotted} to the end of the
@@ -100,6 +110,8 @@
\begin{codetable}
Dotted whole note & \verb|\musWholeDotted| & \musWholeDotted\\
Dotted quarter note & \verb|\musQuarterDotted| & \musQuarterDotted\\
+ Dotted thirty-second note & \verb|\musThirtySecondDotted| &
+ \musThirtySecondDotted\\
\end{codetable}
\subsection{Meter Signatures}
@@ -111,12 +123,66 @@
Ternary with $3:2$ proportion & \verb|\meterCThreeTwo| &
\meterCThreeTwo\\
Spanish 17th-cent. ternary & \verb|\meterCZ| & \meterCZ\\
+ Medieval \term{tempus perfectum} & \verb|\meterO| & \meterO\\
\end{codetable}
-For other time signatures, use \verb|\musMeter{}{}|.
-The command \verb|\musFigures| is an alias for \verb|\musMeter| that can be used
-for notating figured bass.
-Both commands take two arguments and stack the arguments vertically.
+For other time signatures, use \verb|\musMeter{}{}|; the two arguments are the
+numerator and denominator of the fraction, respectively.
+
+\subsection{Figured Bass}
+
+For figured-bass notation, use \verb|\musFig{}|.
+The command, as of May 2019 now re-implemented using the \code{stackengine}
+package, takes a single argument which may contain as many space-separated
+elements as you like.
+(The \verb|\musFig| command is implemented with \verb|\musStack{}|, which is
+also used to for \verb|\musMeter|.)
+
+The elements in the argument will be stacked vertically and left-aligned.
+Multiple figures in a row should be enclosed in brackets if there are spaces
+between them.
+
+To align figures when there are empty slots, as in \musFig{6--5
+\noFig[5--]\musSharp}, use \verb|\noFig[]|.
+It will insert horizontal space the
+same width as its optional argument when typeset; the default value is the
+width of the numeral 5.
+It does this using \verb|\hphantom|, so you should supply the same text in the
+argument as the figure with which you want to align.
+The code for the example at the beginning of this paragraph was
+\verb|\musFig{6--5 \noFig[5--]\musSharp}|.
+
+The font may be controlled by redefining \verb|\musFigFont{}|.
+Its default value is as follows:
+\begin{Verbatim}
+\NewDocumentCommand{\musFigFont}{}{%
+ \scriptsize
+ \let\musFontLarge\musFontBig
+}
+\end{Verbatim}
+This reduces the size of numbers and the music font so that they fit better with
+surrounding text and so that numerals and accidentals in the figures match.
+
+
+
+{\renewcommand{\arraystretch}{2.5}
+\small
+\begin{codetable}
+ Two figures & \verb|\musFig{7 5\musSharp}|
+ & \musFig{7 5\musSharp}\\
+ Three figures & \verb|\musFig{7\musFlat{} 5 3}|
+ & \musFig{7\musFlat{} 5 3}\\
+ Four figures & \verb|\musFig{7 5 4 2}| &
+ \musFig{9 7 5 3}\\
+ Voice leading & \verb|\musFig{7--6 5--4 3}|
+ & \musFig{7--6 5--4 3}\\
+ Voice leading & \verb|\musFig{6--7 4--5 \noFig[2--]3}|
+ & \musFig{7--6 5--4 \noFig[2--]3}\\
+ Multiple figures per row
+ & \verb|\musFig{{6\musFlat{} 5} {\noFig[6\musFlat] \musSharp}}|
+ & \musFig{{6\musFlat{} 5} {\noFig[6\musFlat] \musSharp}}\\
+\end{codetable}}
+
\subsection{Customization}
@@ -129,14 +195,36 @@
\section{Changes}
-\begin{tabular}{r p{0.75\textwidth}}
- 2018/05/21 & Override semantic-markup's \verb|\fl|, \verb|\sh|, \verb|\na|
- commands if it is loaded \\
- 2017/10/31 & Corrected glyph used for \verb|\musHalf| and documented
- \verb|\musMeter| and \verb|\musFigures|\\
- 2017/08/29 & First version on CTAN\\
- 2017/04/12 & Created\\
-\end{tabular}
+\begin{itemize}
+ \item[2020-01-29] Reduced stack gap for \verb|\musFig|
+ \item[2019/11/24] Fix \verb|\MeterCThreeTwo| so that numbers are stacked
+ and aligned correctly
+ \item[2019/05/28] Bux fixes and new features, especially figured bass
+ \begin{itemize}
+ \item Fix issue 1 on Bitbucket, thanks to Christian Mondrup
+ \begin{itemize}
+ \item Correct mistaken notehead symbol for values less than
+ quarter note (was hollow, now filled)
+ \item Add 32nd and 64th notes, regular and dotted varieties
+ \item \verb|\musSymbol| is now typeset inside an
+ \verb|\mbox| to fix alignment problems when used in
+ tables
+ \end{itemize}
+ \item New features (some requested in issue no. 1):
+ \begin{itemize}
+ \item Add medieval perfect meter
+ \item Add aliases for \term{fusa} ($=$ corchea $=$ eighth note)
+ \item Replace musStack implementation with \code{stackengine}
+ \item Add full figured-bass support
+ \end{itemize}
+ \end{itemize}
+ \item[2018/05/21] Override semantic-markup's \verb|\fl|, \verb|\sh|,
+ \verb|\na| commands if it is loaded
+ \item[2017/10/31] Corrected glyph used for \verb|\musHalf| and documented
+ \verb|\musMeter| and \verb|\musFigures|
+ \item[2017/08/29] First version on CTAN
+ \item[2017/04/12] Created
+\end{itemize}
\section{Code}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musicography.doc.tlpobj new/tlpkg/tlpobj/musicography.doc.tlpobj
--- old/tlpkg/tlpobj/musicography.doc.tlpobj 2019-02-28 03:55:05.000000000 +0100
+++ new/tlpkg/tlpobj/musicography.doc.tlpobj 2020-01-30 01:55:21.000000000 +0100
@@ -1,9 +1,9 @@
name musicography.doc
category Package
-revision 47838
+revision 53596
shortdesc doc files of musicography
relocated 1
-docfiles size=68
+docfiles size=90
RELOC/doc/latex/musicography/README.md
RELOC/doc/latex/musicography/musicography.pdf
RELOC/doc/latex/musicography/musicography.tex
++++++ musicography.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/musicography/musicography.sty new/tex/latex/musicography/musicography.sty
--- old/tex/latex/musicography/musicography.sty 2018-05-26 00:32:19.000000000 +0200
+++ new/tex/latex/musicography/musicography.sty 2020-01-29 23:39:07.000000000 +0100
@@ -1,8 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{musicography}[2018/05/21
+\ProvidesPackage{musicography}[2020/01/29
Symbols for music writing with pdflatex]
-% Copyright 2017 Andrew A. Cashner, andrewacashner(a)gmail.com
+% Copyright 2020 Andrew A. Cashner, andrewacashner(a)gmail.com
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -19,6 +19,20 @@
% and the documentation file musicography.tex.
% CHANGE LOG
+% 2020-01-29 - Reduced stack gap for \musFig
+% 2019-11-24 - Fix problem with \MeterCThreeTwo where numerals were being
+% printed next to each other instead of stacked.
+% 2019-05-28 - Fix issue #1:
+% + Correct notehead symbol for values < quarter note
+% (was hollow, should be filled)
+% + Add 32nd and 64th notes regular and dotted
+% + \musSymbol now inside an \mbox to fix alignment problems
+% - New features (some requested in issue #1)
+% + Add medieval perfect meter
+% + Add aliases for fusa (= corchea = eighth note)
+% + Replace musStack implementation with stackengine:
+% Now takes any number of space-separated arguments to stack
+% numerals, allowing for full figured-bass notation
% 2018-05-21 Override semantic-markup's \fl, \sh, \na commands if it is loaded
% 2017-10-31 Corrected glyph for \musHalf and documented
% \musMeter and \musFigures
@@ -55,7 +69,7 @@
% #4 kern after
% #5 symbol code (e.g., \symbol{4})
\NewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{%
- {#1\kern#2\raisebox{#3}{#5}\kern#4}%
+ \mbox{#1\kern#2\raisebox{#3}{#5}\kern#4}%
}
% Accidentals
@@ -119,10 +133,16 @@
\musStemmedNote{\symbol{7}}%
}
\NewDocumentCommand{\musEighth}{}{%
- \musFlaggedNote{\symbol{8}}{\symbol{40}}%
+ \musFlaggedNote{\symbol{7}}{\symbol{40}}%
}
\NewDocumentCommand{\musSixteenth}{}{%
- \musFlaggedNote{\symbol{8}}{\symbol{41}}%
+ \musFlaggedNote{\symbol{7}}{\symbol{41}}%
+}
+\NewDocumentCommand{\musThirtySecond}{}{%
+ \musFlaggedNote{\symbol{7}}{\symbol{42}}%
+}
+\NewDocumentCommand{\musSixtyFourth}{}{%
+ \musFlaggedNote{\symbol{7}}{\symbol{43}}%
}
\NewDocumentCommand{\musWholeDotted}{}{%
@@ -140,43 +160,19 @@
\NewDocumentCommand{\musSixteenthDotted}{}{%
\musDottedNote{\musSixteenth}%
}
+\NewDocumentCommand{\musThirtySecondDotted}{}{%
+ \musDottedNote{\musThirtySecond}%
+}
+\NewDocumentCommand{\musSixtyFourthDotted}{}{%
+ \musDottedNote{\musSixtyFourth}%
+}
-% Command to stack numerals
-% Adapted from harmony.sty's \ueber command
-\newdimen\tmpdima
-\newdimen\tmpdimb
-\newdimen\tmpdimc
-\newdimen\tmpdimd
-\newdimen\tmpdime
-\newbox\nbxa
-\newbox\nbxb
-\newbox\nbxc
-\newbox\nbxd
-\newbox\nbxe
-\newbox\nbxf
-\newbox\nbxg
-\newbox\nbxh
-\newbox\nbxi
-
-\NewDocumentCommand{\musStack}{ m m }{%
- \setbox\nbxi=\hbox{%
- \setbox\nbxa=\hbox{\scriptsize{\musNumFont{#1}}}%
- \setbox\nbxb=\hbox{\scriptsize{\musNumFont{#2}}}%
- \ifdim\wd\nbxa>\wd\nbxb%
- \tmpdima=\wd\nbxa%
- \else%
- \tmpdima=\wd\nbxb%
- \fi%
- \setbox\nbxa=\hbox to \tmpdima{%
- \scriptsize\hss{\musNumFont{#1}}\hss}%
- \setbox\nbxb=\hbox to \tmpdima{\scriptsize\hss{%
- \musNumFont{#2}}\hss}%
- \lower0.3ex\copy\nbxb%
- \kern-\wd\nbxb%
- \raise0.8\ht\nbxb%
- \box\nbxa%
- }%
- \unhbox\nbxi%
+
+% Command to stack numerals for metrical symbols or figured bass
+% Takes any number of space-separated arguments and stacks them vertically
+\RequirePackage{stackengine}
+\NewDocumentCommand{\musStack}{ O{\musNumFont} m }{%
+ {#1\Shortstack[l]{#2}}%
}
% Meter symbols
@@ -193,10 +189,20 @@
% #1 number on top
% #2 number on bottom
\NewDocumentCommand{\musMeter}{ m m }{%
- \musStack{#1}{#2}\kern0.05em
+ \musStack{#1 #2}\kern0.05em
}
% Same command used for figured bass
-\NewDocumentCommand{\musFigures}{}{\musMeter}
+\NewDocumentCommand{\musFigFont}{}{%
+ \scriptsize
+ \let\musFontLarge\musFontBig
+}
+\NewDocumentCommand{\musFig}{ m }{%
+ \setstackgap{S}{1pt}%
+ \musStack[\musFigFont]{#1}%
+}
+\NewDocumentCommand{\noFig}{ O{5} }{%
+ \hphantom{#1}%
+}
\NewDocumentCommand{\meterC}{}{%
\musSymbolMeter{\symbol{83}}%
@@ -209,21 +215,28 @@
\meterCplus{\musNumFont{3}}%
}
\NewDocumentCommand{\meterCThreeTwo}{}{%
- \meterCplus{\musStack{3}{2}}%
+ \meterCplus{{\footnotesize\stackanchor[1pt]{3}{2}}}%
}
% Ternary meter used in 17th-century Spanish music
\NewDocumentCommand{\meterCZ}{}{%
\meterCplus{Z}%
}
+% Perfect meter in medieval music
+\NewDocumentCommand{\meterO}{}{%
+ $\bigcirc$
+}
+
% Aliases for older note names
\NewDocumentCommand{\musSemibreve} {}{\musWhole}
\NewDocumentCommand{\musMinim} {}{\musHalf}
\NewDocumentCommand{\musSemiminim} {}{\musQuarter}
\NewDocumentCommand{\musCorchea} {}{\musEighth}
+\NewDocumentCommand{\musFusa} {}{\musEighth}
\NewDocumentCommand{\musSemibreveDotted} {}{\musWholeDotted}
\NewDocumentCommand{\musMinimDotted} {}{\musHalfDotted}
\NewDocumentCommand{\musSeminiminimDotted} {}{\musQuarterDotted}
\NewDocumentCommand{\musCorcheaDotted} {}{\musEighthDotted}
+\NewDocumentCommand{\musFusaDotted} {}{\musEighthDotted}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musicography.tlpobj new/tlpkg/tlpobj/musicography.tlpobj
--- old/tlpkg/tlpobj/musicography.tlpobj 2019-02-28 03:55:05.000000000 +0100
+++ new/tlpkg/tlpobj/musicography.tlpobj 2020-01-30 01:55:21.000000000 +0100
@@ -1,6 +1,6 @@
name musicography
category Package
-revision 47838
+revision 53596
shortdesc Accessing symbols for music writing with pdfLaTeX
relocated 1
longdesc This package makes available the most commonly used symbols in
@@ -10,11 +10,10 @@
longdesc builds on the approach used in the harmony package, where the
longdesc symbols are taken from the MusiXTeX fonts. But it provides a
longdesc larger range of symbols and a more flexible, user-friendly
-longdesc interface written using xparse.
+longdesc interface written using xparse and stackengine.
runfiles size=2
RELOC/tex/latex/musicography/musicography.sty
catalogue-contact-repository https://bitbucket.org/andrewacashner/musicography
catalogue-ctan /macros/latex/contrib/musicography
-catalogue-date 2018-05-24 21:54:18 +0200
catalogue-license lppl1.3
catalogue-topics music font-supp-symbol
++++++ musixtex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt
--- old/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt 2020-03-20 22:25:54.000000000 +0100
@@ -0,0 +1,5 @@
+
+Changes from MusiXTeX 129 to 130:
+
+ * defined \zdoublebar for use within a bar
+ * defined \hbp and \hbpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/README new/texmf-dist/doc/generic/musixtex/README
--- old/texmf-dist/doc/generic/musixtex/README 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/README 2020-03-20 22:25:54.000000000 +0100
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.29 (2018-08-04).
+This is MusiXTeX, version 1.30 (2020-03-20).
MusiXTeX is a TeX-based system for typesetting music.
The main author was Daniel Taupin, who died in a climbing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex new/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex 2020-03-20 22:25:54.000000000 +0100
@@ -14,10 +14,10 @@
also issue \keyindex{setdoublebar} to cause the next \verb|\bar| (or
\keyindex{stoppiece}, \keyindex{alaligne}, or \keyindex{alapage}) to be replaced
by a double bar.
-
There is no specific command to print a thin-thick double bar line, but
\keyindex{setdoubleBAR} will cause one in the same cases where
\verb|\setdoublebar| would cause a thin-thin double bar line.
+To typeset a double-bar line in the middle of a bar, use \keyindex{zdoublebar}.
To make the next bar line invisible, use \keyindex{setemptybar} before
\verb|\bar|.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex new/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex 2017-12-26 23:07:24.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex 2020-03-20 22:25:54.000000000 +0100
@@ -340,6 +340,10 @@
\Notes\ibbl0j0\hb0j\tbl0\hb0j\en
\Notes\ibbl0h4\hb0h\tbl0\hb0j\en
\end{verbatim}\end{quote}\noindent
+There are also dotted and double-dotted versions \keyindex{hbp} and
+\keyindex{hbpp}.
+
+
A different look could be obtained as follows:
\begin{music}\nostartrule
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2020-03-20 22:25:54.000000000 +0100
@@ -1,6 +1,6 @@
\title{\Huge\bfseries\musixtex\\[\bigskipamount]
\LARGE\bfseries Using \TeX{} to write polyphonic\\or
-instrumental music\\\Large\itshape Version 1.29}
+instrumental music\\\Large\itshape Version 1.30}
\author{}
@@ -68,7 +68,7 @@
takes advantage of the greater capacity of the e\TeX\ version of \TeX.
This manual
is the definitive reference to all features of
-\musixtex\ version~1.29.
+\musixtex\ version~1.30.
Novice users need not start here.
Most
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2017-03-01 23:32:52.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2020-03-20 22:25:54.000000000 +0100
@@ -16,9 +16,10 @@
The heavy final double bar of a piece is one of the consequences of
\keyindex{Endpiece} or \keyindex{Stoppiece}. If you just want to terminate
the text with a simple bar, say \keyindex{stoppiece} or \keyindex{endpiece}.
-If you want to suppress right-justification of the last line of a score,
-use \keyindex{raggedstoppiece}.
To terminate it with no bar line at all, code \keyindex{zstoppiece}.
+If you want to suppress right-justification of the last line of a score,
+use \keyindex{raggedstoppiece}; the bar line can be suppressed by
+using \keyindex{setemptybar}.
Once you have stopped the score by any of these means, you may want to restart
it, and there are several ways to do so. If you don't need to change the key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2020-03-20 22:25:54.000000000 +0100
@@ -81,9 +81,14 @@
\end{itemize}
These marks are horizontally centered relative to solid note heads.
To
-compensate for the fact that whole notes are wider, you should use
-\keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}| to center accents
-and other items (e.g.,~\verb|\Fermataup|) above a whole note.
+compensate for the fact that whole notes are wider, you may use
+\begin{quote}
+\keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}|
+\end{quote}
+to center accents
+(and other items) above or below a whole note. For example,
+\keyindex{Fermataup}\pitchp~(described in Section~{\ref{ornaments}}) is
+\emph{defined} as \keyindex{wholeshift}\verb|{|\keyindex{fermataup}\pitchp\verb|}|.
There are also variants of the most common accents\footnote{Thanks to Klaus
{\sc Bechert}'s corrections.} which will be automatically positioned
@@ -139,6 +144,7 @@
\verb|\tuplettxt| serves the same role for the last two macros.
The font used is defined by
\verb|\txtfont| and is, by default, \verb|\eightit| (in normal music size) but may be re-defined.
+\zkeyindex{txtfont}
The first four commands in the table
are normally used with beamed xtuplets. As indicated in the
@@ -273,6 +279,7 @@
\end{verbatim}\end{quote}
\section{Ornaments}
+\label{ornaments}
\subsection{Simple ornaments}\index{ornaments}
@@ -302,7 +309,7 @@
\keyindex{wholeshift}\verb|{|\mbox{\ital{Any nonspacing macro}}\verb|}|
\end{quote}
to center any of these ornaments
-above a whole note.
+above (or below) a whole note.
In the following macros for fermatas, the argument $p$ is the pitch of the
@@ -951,6 +958,55 @@
\zendextract
\end{verbatim}\end{quote}
\end{footnotesize}
+
+\clearpage
+
+Here is the same example with \verb|\tabstylespacetrue|:
+\begin{music}
+\input musixps
+\def\psslurhgt{0.5}
+\instrumentnumber{2}
+\songbottom1\songtop2
+\generalmeter{\meterfrac34}
+\generalsignature{-1}
+\setlines16
+\setclefsymbol1\tabclef\setclefsymbol2\treblelowoct
+\tabstylespacetrue
+\setsize1\largevalue
+\setsign10
+\nobarnumbers
+\interinstrument=4\internote
+\parindent=2ex
+\setname1{\tabstringfnt\baselineskip=1.5\internote%
+ \vbox{\hbox to\parindent{\hss E \hss}%
+ \hbox to\parindent{\hss B \hss}%
+ \hbox to\parindent{\hss G \hss}%
+ \hbox to\parindent{\hss D \hss}%
+ \hbox to\parindent{\hss A \hss}%
+ \hbox to\parindent{\hss D \hss}%
+}}
+\startextract
+\NOtesp\zltab55\zltab43\ltab32&\zh{d}\zhl{f}\qu{.h}\en
+\Notes\ltab32&\cu{h}\en
+\bar%
+\NOtes\zltab55\zltab45\zltab33\ltab10&\zq d\zql g\zq i\qu l\en
+\NOtesp\zltab54\zltab45\zltab32\ltab10&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en
+\Notes\ltab10&\cu{l}\en
+\bar%
+\NOtes\zltab40\zltab32\zltab23\ltab11&\zq d\zq h\zq k\qu{m}\en
+\NOtes\zltab51\zltab43\zltab33\ltab23&\zhl b\zh f\zq{.i}\qu{.k}\en
+\Notes\ltab35&\cu j\en
+\bar%
+\NOtes\zltab65\zltab45\ltab33&\zql N\zq g\qu i\en
+\NOtes\zltab50\zltab43\ltab32&\zql a\zq f\qu h\en
+\notes\zltab54\ltab45\ilsluru05\ltab43\ltab42\tlslur05\ltab43%
+&\zql{^c}\ibbu0g{-1}\qb0{g}\slur eed2\qb0{fe}\tqu0f\en
+\bar%
+\notes\zltab60\zltab50\ltab45\ilsluru05\ltab42\ltab43\tlslur05\ltab40%
+&\zq K\zql a\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en
+\znotes&\lcn{14}{J.S. Bach}\en
+\zendextract
+\end{music}
Tablature support in \musixtex\ has been adapted
from \verb|tabdefs.tex| by R.J.~Gelten, which is available
\href{http://icking-music-archive.org/software/musixtex/add-ons/tabdefs.tex}
Binary files old/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf and new/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2017-03-01 23:32:52.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2020-03-20 22:25:54.000000000 +0100
@@ -138,3 +138,83 @@
number of lines per staff for all instruments ($5$); and will reset all clef
symbols to standard clef symbols.
+ \section{Split and Shortened Systems}
+It is sometimes desirable to typeset a ``shortened'' system or to split
+a system into left and right segments, as in the following (extracted from a
+Geminiani \emph{concerto grosso}):
+
+\begin{music}
+\smallmusicsize
+\setclef1\bass
+\setclef5\treble\settrebleclefsymbol5\trebleoct
+\generalsignature{-2}
+\instrumentnumber5
+\songbottom{1}\songtop{5}
+\setinterinstrument4{1\internote}
+\nobarnumbers
+\generalmeter{\meterfrac38}
+\hbox to\hsize\bgroup\vbox\bgroup\hsize=1.7in
+\startpiece\addspace\afterruleskip
+\Notes\qa G\sk&\ibu1i{-1}\qb1i\qb1{.g}&\ca d\qa g&\ca n\itieu3n\qa n&\ca g\ds\en
+\notes\ds\sk&\sk\tbbu1\tqu1g&\sk\sk&\sk\sk\ttie3&\ds\sk\en
+\znotes&&&&\lcn{q}{\bf D.S. al\kern3ex}\coda p\en
+\setdoublebar\endpiece
+\egroup\hfill\vbox\bgroup\hsize=3.7in
+\generalmeter{\allabreve}
+\startpiece\addspace\afterruleskip
+\znotes&&&&\coda o\en
+\NOtes\qa{.G}&\qa{.k}&\qa{.d}&\qa n&\qa g\en
+\notes\sk\sk\qs\cca N&\sk\sk\qs\cca i&\sk\sk\qs\cca k&\qs\ibbl3p{-2}\qb3{p}\qb3{o}\tql3n&\qp\sk\sk\sk\en
+\NOtes\qa{.M}&\qa{.h}&\qa{.k}&\qa o&\ha k\en
+\Notes\sk&\sk&\sk&\itieu3r\qa r&\sk\en
+\notes\qs\cca M&\qs\cca h&\qs\cca k&\sk\sk&\sk\sk\en
+\bar
+\NOtes\wh L\sk&\qa{g}\qa{g}&\ha{l}\sk&\ttie3\ha r\sk&\ha{g}\sk\en
+\NOTes\sk&\ha j&\ha{n}&\tr s\ha q&\ha{n}\en
+\bar
+\nspace
+\NOtesp\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en
+\setdoublebar\endpiece
+\egroup\egroup
+\end{music}
+
+This was coded as follows:
+\begin{footnotesize}
+\begin{quote}\begin{verbatim}
+\setclef1\bass\setclef5\treble\settrebleclefsymbol5\trebleoct
+\generalsignature{-2}
+\instrumentnumber5\songbottom{1}\songtop{5}
+\nobarnumbers
+\generalmeter{\meterfrac38}
+\hbox to\hsize\bgroup\vbox\bgroup\hsize=1.7in % specify length of left segment
+\startpiece\addspace\afterruleskip
+\Notes\qa G\sk&\ibu1i{-1}\qb1i\qb1{.g}
+ &\ca d\qa g&\ca n\itieu3n\qa n&\ca g\ds\en
+\notes\ds\sk&\sk\tbbu1\tqu1g
+ &\sk\sk&\sk\sk\ttie3&\ds\sk\en
+\znotes&&&&\lcn{q}{\bf D.S. al\kern3ex}\coda p\en
+\setdoublebar\endpiece
+\egroup\hfill\vbox\bgroup\hsize=3.7in % specify length of right segment
+\generalmeter{\allabreve}
+\startpiece\addspace\afterruleskip
+\znotes&&&&\coda o\en
+\NOtes\qa{.G}&\qa{.k}&\qa{.d}&\qa n&\qa g\en
+\notes\sk\sk\qs\cca N&\sk\sk\qs\cca i
+ &\sk\sk\qs\cca k
+ &\qs\ibbl3p{-2}\qb3{p}\qb3{o}\tql3n
+ &\qp\sk\sk\sk\en
+\NOtes\qa{.M}&\qa{.h}&\qa{.k}&\qa o&\ha k\en
+\Notes\sk&\sk&\sk&\itieu3r\qa r&\sk\en
+\notes\qs\cca M&\qs\cca h&\qs\cca k
+ &\sk\sk&\sk\sk\en
+\bar
+\NOtes\wh L\sk&\qa{g}\qa{g}&\ha{l}\sk
+ &\ttie3\ha r\sk&\ha{g}\sk\en
+\NOTes\sk&\ha j&\ha{n}&\tr s\ha q&\ha{n}\en
+\bar
+\nspace
+\NOtesp\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en
+\setdoublebar\endpiece
+\egroup\egroup % close open \bgroups
+\end{verbatim}\end{quote}
+\end{footnotesize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2020-03-20 22:25:54.000000000 +0100
@@ -61,7 +61,11 @@
For shifts farther to the left, use
\keyindex{iLsluru},
\keyindex{iLslurd}
-or \keyindex{tLslur}.
+or \keyindex{tLslur};
+for shifts farther to the right, use
+\keyindex{iRsluru},
+\keyindex{iRslurd}
+or \keyindex{tRslur}.
You can control the shape of type~K slurs with variants of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex new/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex 2017-12-26 23:07:24.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex 2020-03-20 22:25:54.000000000 +0100
@@ -44,7 +44,7 @@
\item[\keyindex{breve}{\tt\char123}$p${\tt\char125} :]breve (\hbox to 8pt{\zbreve1\hss}) .
\item[\keyindex{longa}{\tt\char123}$p${\tt\char125} :]longa (\hbox to8pt{\zlonga1\hss}) .
\item[\keyindex{longaa}{\tt\char123}$p${\tt\char125} :]longa with automatic stem direction\footnote{Editor's note: Evidently there is no explicit up-stemmed longa} .
- \item[\keyindex{zmaxima}{\tt\char123}$p${\tt\char125} :]maxima(\hbox to16pt{\zmaxima1\hss}) .
+ \item[\keyindex{maxima}{\tt\char123}$p${\tt\char125} :]maxima (\hbox to16pt{\zmaxima1\hss}) .
\item[\keyindex{wq}{\tt\char123}$p${\tt\char125} :]arbitrary duration note (\hbox to8pt{\zwq1\hss})
(also used as alternate representation of a \ital{breve}).
\item[\keyindex{wqq}{\tt\char123}$p${\tt\char125} :]long arbitrary duration note
@@ -214,7 +214,7 @@
By appending one or two \verb|p|'s (for ``pointed'') to the name, many of the
macros just introduced provide one or two dots after the notehead:
-\keyindex{whp}\pitchp, \keyindex{whpp},
+\keyindex{whp}, \keyindex{whpp},
\keyindex{zwp}, \keyindex{zwpp},
\keyindex{hup}, \keyindex{hupp},
\keyindex{hlp}, \keyindex{hlpp},
@@ -226,12 +226,14 @@
\keyindex{zqp}, \keyindex{zqpp},
\keyindex{cup}, \keyindex{cupp},
\keyindex{clp}, \keyindex{clpp},
-\keyindex{qbp} and \keyindex{qbpp}.
-Naturally, the ones that start with ``\verb|z|'' are used in chords.
+\keyindex{qbp} and \keyindex{qbpp}, all followed by a pitch argument.
+The ones that start with ``\verb|z|'' are used in chords.
The dot(s) will be raised if the note is on a line.
-A more explicit way uses one of the macros \keyindex{pt}{\tt\char123}$p${\tt\char125},
-\keyindex{ppt}, or \keyindex{pppt} right
+A more explicit way uses one of the macros
+\keyindex{pt}{\tt\char123}$p${\tt\char125},
+\keyindex{ppt}{\tt\char123}$p${\tt\char125}, or
+\keyindex{pppt}{\tt\char123}$p${\tt\char125} right
before any note macro to place one to three dots after the normal note
head at pitch $p$. Again they will be raised if on a line. In fact this is the only
way to get a triple-dotted note.
@@ -239,6 +241,10 @@
quarter note with one dot could be coded \verb|\pt h\qu h|, with two dots
as \keyindex{ppt}\verb| h\qu h| and with three as
\keyindex{pppt}\verb| h\qu h|.
+As a matter of style, if two voices share one staff, the dots in
+the lower voice should be \emph{lowered} if the note is on a line. For
+this you can use \keyindex{lpt},
+\keyindex{lppt} and \keyindex{lpppt}.
Yet another method for posting a dot is to insert a \ital{period} before
the letter representing the pitch. Thus \verb|\qu{.a}| is equivalent to
@@ -248,14 +254,17 @@
Non-spacing dotted notes can be produced using
\keyindex{zhup}, \keyindex{zhlp}, \keyindex{zqup}, \keyindex{zqlp},
-\keyindex{zcup}, \keyindex{zclp}, \keyindex{zqbp},
+\keyindex{zcup}, \keyindex{zclp}, \keyindex{zqbp}, followed by a pitch,
+and similarly with two \verb|p|'s for
+double-dotted notes.
+The following provide dotted chord notes shifted left or right:
+\keyindex{lhp},
+\keyindex{rhp},
+\keyindex{lqp},
+\keyindex{rqp},
and similarly with two \verb|p|'s for
double-dotted notes.
-As a matter of style, if two voices share one staff, the dots in
-the lower voice should be lowered if the note is on a line. For
-this you can use \keyindex{lpt}{\tt\char123}$p${\tt\char125} and
-\keyindex{lppt}{\tt\char123}$p${\tt\char125}.
\section{Sequences of equally spaced notes; collective coding}
\label{CollectiveCoding}
Binary files old/texmf-dist/doc/generic/musixtex/musixdoc.pdf and new/texmf-dist/doc/generic/musixtex/musixdoc.pdf differ
Binary files old/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf and new/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/musixtex.1 new/texmf-dist/doc/man/man1/musixtex.1
--- old/texmf-dist/doc/man/man1/musixtex.1 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/man/man1/musixtex.1 2020-03-20 22:25:54.000000000 +0100
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2018-07-27 "musixtex version 0.21" ""
+.TH MUSIXTEX 1 2020-03-20 "musixtex version 0.22" ""
.SH NAME
musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary,
@@ -67,10 +67,10 @@
in that order, and process it as above.
.SH OPTIONS
.TP 10
-.B -v
+.B -v, -version, --version
output program name and version number, and quit
.TP
-.B -h
+.B -h, -help, --help
output usage summary and quit
.TP
.B -l
@@ -118,12 +118,16 @@
.B mtxx
as the mtx preprocessor; e.g., -M "prepmx -i".
.TP
+.B -X pmxx
+use
+.B pmxx
+as the pmx preprocessor; e.g., -X "./pmxab",
+.TP
.B -A aspcx
use
.B aspcx
as the aspc preprocessor; e.g., -A "autosp -l".
.TP
-.TP
.B -t
stop processing at the tex/mid files
.TP
@@ -153,7 +157,6 @@
If an error occurs at the TeX stage, processing halts immediately and the tail of the log file is sent to stderr.
Version information is copied from the temporary file to the log file.
-
.TP 0
Options affect processing of all succeeding MusiXTeX files unless changed by another option. Option flags cannot be combined; e.g., use \fB -l -x \fP rather than \fB -lx\fP.
Binary files old/texmf-dist/doc/man/man1/musixtex.man1.pdf and new/texmf-dist/doc/man/man1/musixtex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex.doc.tlpobj new/tlpkg/tlpobj/musixtex.doc.tlpobj
--- old/tlpkg/tlpobj/musixtex.doc.tlpobj 2019-02-28 03:55:06.000000000 +0100
+++ new/tlpkg/tlpobj/musixtex.doc.tlpobj 2020-03-20 23:58:35.000000000 +0100
@@ -1,8 +1,8 @@
name musixtex.doc
category Package
-revision 48353
+revision 54431
shortdesc doc files of musixtex
-docfiles size=1387
+docfiles size=1077
texmf-dist/doc/generic/musixtex/ChangeLog-114.txt
texmf-dist/doc/generic/musixtex/ChangeLog-115.txt
texmf-dist/doc/generic/musixtex/ChangeLog-116.txt
@@ -19,6 +19,7 @@
texmf-dist/doc/generic/musixtex/ChangeLog-127.txt
texmf-dist/doc/generic/musixtex/ChangeLog-128.txt
texmf-dist/doc/generic/musixtex/ChangeLog-129.txt
+ texmf-dist/doc/generic/musixtex/ChangeLog-130.txt
texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
texmf-dist/doc/generic/musixtex/README
texmf-dist/doc/generic/musixtex/examples/adagio.tex
@@ -118,7 +119,6 @@
texmf-dist/doc/generic/musixtex/musixdoc/lyrics.tex
texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx
- texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
++++++ musixtex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/musixtex/musixtex.lua new/texmf-dist/scripts/musixtex/musixtex.lua
--- old/texmf-dist/scripts/musixtex/musixtex.lua 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/scripts/musixtex/musixtex.lua 2020-03-20 22:25:54.000000000 +0100
@@ -1,12 +1,12 @@
#!/usr/bin/env texlua
-VERSION = "0.21"
+VERSION = "0.22"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
autosp as pre-processors (and deletes intermediate files)
- (c) Copyright 2011-2018 Bob Tennent rdt(a)cs.queensu.ca
+ (c) Copyright 2011-2020 Bob Tennent rdt(a)cs.queensu.ca
and Dirk Laurie dirk.laurie(a)gmail.com
This program is free software; you can redistribute it and/or modify it
@@ -29,6 +29,10 @@
ChangeLog:
+ version 0.22 2020-03-20 RDT
+ add -X option
+ add -version, --version, -help, --help options
+
version 0.21 2018-07-27 RDT
add -P option.
@@ -134,8 +138,8 @@
The normal route after preprocessing goes tex-dvi-ps-pdf, but shorter
routes are also available, see the options. The default processing route
for .tex files is etex-musixflx-etex.
-Options: -v version
- -h help
+Options: -v, --version version
+ -h, --help help
-l latex source
-p direct tex-pdf (pdftex etc)
-F fmt use fmt as the TeX processor
@@ -146,6 +150,7 @@
-m stop at pmx
-M prepmxx use prepmxx as the mtx preprocessor
-A autospx use autospx as the aspc preprocessor
+ -X pmxabx use pmxabx as the pmx preprocessor
-t stop at tex/mid
-s stop at dvi
-g stop at ps
@@ -289,9 +294,9 @@
end
function process_option(this_arg)
- if this_arg == "-v" then
+ if this_arg == "-v" or this_arg == "-version" or this_arg == "--version" then
os.exit(0)
- elseif this_arg == "-h" then
+ elseif this_arg == "-h" or this_arg == "-help" or this_arg == "--help" then
usage()
os.exit(0)
elseif this_arg == "-l" then
@@ -345,6 +350,9 @@
elseif this_arg == "-P" then
narg = narg+1
ps2pdf = arg[narg]
+ elseif this_arg == "-X" then
+ narg = narg+1
+ pmx = arg[narg]
else
print("! Unknown option "..this_arg.." ignored")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixps.tex new/texmf-dist/tex/generic/musixtex/musixps.tex
--- old/texmf-dist/tex/generic/musixtex/musixps.tex 2017-03-01 23:32:52.000000000 +0100
+++ new/texmf-dist/tex/generic/musixtex/musixps.tex 2020-03-20 22:25:54.000000000 +0100
@@ -1,5 +1,6 @@
%% PostScript slurs, ties and crescendos
% Coded by Stanislav Kneifl
+% RDT added \psRslurskip \iRslur \tRslur \psRtieskip \tRtie \psLtieskip \tLtie 2019/06/17
\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
\ifx\undefined\liftcresc\else\endinput\fi
@@ -26,6 +27,7 @@
\def\psbslurraise{2} % vert. offset for slurs on beams
\def\psLslurskip{-0.2} % horiz. offset of slurs shifted more to the left
+\def\psRslurskip{4} % horiz. offset of slurs shifted more to the right
\def\pslslurskip{0.4} % horiz. offset of slurs shifted to the left
\def\psislurskip{1.4} % horiz. offset of the slur beginnings
\def\pstslurskip{1.2} % horiz. offset of the slur endings
@@ -48,6 +50,8 @@
\def\psttieskip{0.3} % horiz. offset of the tie endings
\def\psltieskip{-0.2} % horiz. offset of ties shifted to the left
\def\psrtieskip{3} % horiz. offset of ties shifted to the right
+\def\psLtieskip{-0.4} % horiz. offset of ties shifted more to the left
+\def\psRtieskip{4} % horiz. offset of ties shifted more to the right
\def\pstiehgt{0.7} % height coeficient of the ties
\def\pstiemaxhgt{30} % maximal height if the ties
@@ -554,7 +558,9 @@
\def\ilsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\pslslurskip}}
\def\ilslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\pslslurskip}}
\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
-\def\iLslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psLslurskip}}
+\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
\def\tfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psfslurhgt}{\psslurangul}}
\def\tslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psslurhgt}{\psslurangul}}
@@ -576,6 +582,7 @@
\def\tLfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psfslurhgt}{\psslurangul}}
\def\tLslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psslurhgt}{\psslurangul}}
+\def\tRslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psRslurskip}{\psslurhgt}{\psslurangul}}
\def\tLhslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\pshslurhgt}{\psslurangul}}
\def\tLHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHslurhgt}{\psHslurangul}}
\def\tLHHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHHslurhgt}{\psHHslurangul}}
@@ -599,6 +606,8 @@
\def\ttie#1{\tTie{#1}{\psttieskip}}
\def\tltie#1{\tTie{#1}{\psltieskip}}
\def\trtie#1{\tTie{#1}{\psrtieskip}}
+\def\tLtie#1{\tTie{#1}{\psLtieskip}}
+\def\tRtie#1{\tTie{#1}{\psRtieskip}}
\def\icresc#1{\Icresc{#1}{\d@nh}{0}}
\def\idecresc#1{\Idecresc{#1}{\d@nh}{0}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixtex.tex new/texmf-dist/tex/generic/musixtex/musixtex.tex
--- old/texmf-dist/tex/generic/musixtex/musixtex.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixtex.tex 2020-03-20 22:25:54.000000000 +0100
@@ -25,16 +25,20 @@
\def\mufl(a)x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{29}
+\def\mxminorvernumber{30}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
-\def\mxversuffix{}%
+\def\mxversuffix{beta}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2018-08-04}
+\def\mxdate{2018-08-09}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.30
+% defined \zdoublebar for use within a bar
+% defined \hbp and \hbpp
+
% version 1.29
% defined \tabfnt, \tabcleffnt, \tabstringfnt, \tab etc. to support tablature
@@ -2284,6 +2288,7 @@
% if you need a line which appears ragged
\def\raggedstoppiece{\ifx\ragg@d\empty \fil@{r}\fi % version 1.18 RDT (from musixext)
\check@nopen\n@wbar\hfill\z@suspend\@nds@ction}
+\def\zendpiece{\setemptybar\raggedstoppiece}
\def\Stoppiece{\setdoubleBAR\stoppiece}
\let\Endpiece\Stoppiece
@@ -2580,14 +2585,13 @@
\fi}
\def\zzleftrightrepeat{% % RDT 1.28
- \advance\barno\m@ne
- \setrightrepeat
- \stoppiece
- \let\z@sw\@ne
- \contpiece
- \addspace{\h@lf\afterruleskip}%
- \kernm\afterruleskip\l@eftrepeat\kern\afterruleskip
- \advance\lastbarpos\afterruleskip \b@rrul@
+\advance\barno\m@ne%
+\setrightrepeat%
+\stoppiece%
+\let\z@sw\@ne%
+\contpiece%
+\advance\barno\m@ne%
+\leftrepeat% % RDT revised 1.30
}
\def\zleftrightrepeat@II{% % RDT 1.28
@@ -2603,6 +2607,9 @@
\let\leftrightrepeat\leftrightrepeat@II
\let\zleftrightrepeat\zleftrightrepeat@II % RDT 1.28
+
+\def\zdoublebar{\advance\barno\m@ne\doublebar} % RDT 1.30
+
\def\alapage{\stoppiece\eject\contpiece}
\def\zalapage{\zstoppiece\eject\contpiece}
@@ -3657,6 +3664,8 @@
\def\hlpp{\h@symbol\@qlpp}
\def\hb{\h@symbol\@qb}
+\def\hbp{\h@symbol\@qbp}
+\def\hbpp{\h@symbol\@qbpp}
\def\zh{\h@symbol\@zq}
\def\zhp{\h@symbol\@zqp}
@@ -4156,6 +4165,18 @@
\def\lppt{\g@pt\m@ne\@ne}
\def\lpppt{\g@pt\m@ne\tw@}
+
+% Shifted, pointed chord notes
+%
+\def\lhp#1{\loff{\zhp{#1}}}
+\def\rhp#1{\roff{\zhp{#1}}}
+\def\lqp#1{\loff{\zqp{#1}}}
+\def\rqp#1{\roff{\zqp{#1}}}
+\def\rhpp#1{\roff{\zhpp{#1}}}
+\def\lhpp#1{\loff{\zhpp{#1}}}
+\def\rqpp#1{\roff{\zqpp{#1}}}
+\def\lqpp#1{\loff{\zqpp{#1}}}
+
\def\g@pt#1#2#3{\check@staff
\inhgetn@i#3\relax \relax % two \relax since the first one
\ifnum\n@i<\@c % in swallowed by \inhgetn@i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex.tlpobj new/tlpkg/tlpobj/musixtex.tlpobj
--- old/tlpkg/tlpobj/musixtex.tlpobj 2019-02-28 03:55:09.000000000 +0100
+++ new/tlpkg/tlpobj/musixtex.tlpobj 2020-03-20 23:58:37.000000000 +0100
@@ -1,6 +1,6 @@
name musixtex
category Package
-revision 48353
+revision 54431
shortdesc Sophisticated music typesetting
longdesc MusiXTeX provides a set of macros, based on the earlier
longdesc MusicTeX, for typesetting music with TeX. To produce optimal
@@ -16,7 +16,7 @@
longdesc the pmx preprocessor compiles a simpler input language to
longdesc MusiXTeX macros..
depend musixtex.ARCH
-runfiles size=148
+runfiles size=149
texmf-dist/dvips/musixtex/psslurs.pro
texmf-dist/scripts/musixtex/musixflx.lua
texmf-dist/scripts/musixtex/musixtex.lua
@@ -71,7 +71,6 @@
catalogue-also pmx
catalogue-contact-home http://icking-music-archive.org/software/htdocs
catalogue-ctan /macros/musixtex
-catalogue-date 2018-08-05 08:12:10 +0200
catalogue-license gpl2+
catalogue-topics music
-catalogue-version 1.29
+catalogue-version 1.30
++++++ musixtex_various.dif ++++++
--- /var/tmp/diff_new_pack.csWE08/_old 2020-05-29 21:30:24.065403958 +0200
+++ /var/tmp/diff_new_pack.csWE08/_new 2020-05-29 21:30:24.065403958 +0200
@@ -314,7 +314,7 @@
+pdflatex musixdoc
--- texmf-dist/scripts/musixtex/musixtex.lua
+++ texmf-dist/scripts/musixtex/musixtex.lua 2018-05-03 10:08:07.363421541 +0000
-@@ -200,15 +200,24 @@ end
+@@ -205,15 +205,24 @@ end
-- possible by exploiting the the fact that Lua has two false values.
-- dvi == nil "do not produce a DVI file" (but maybe PDF)
-- dvi == false "do not process the DVI file" (but stop after TeX)
++++++ mweights.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mweights/README new/doc/latex/mweights/README
--- old/doc/latex/mweights/README 2017-03-30 23:32:20.000000000 +0200
+++ new/doc/latex/mweights/README 2020-01-23 22:58:09.000000000 +0100
@@ -1,5 +1,5 @@
This is the README for the mweights package, version
-2017-03-30.
+2020-01-23.
Many font families available for use with LaTeX have multiple
weights, especially when originally aimed at use on the web. For
@@ -49,5 +49,11 @@
\ttfamily) to use the macros. It should be a RequiredPackage (for
type1 font use only) in any such font package.
-The package is licensed under the terms of the LaTeX Project Public
-License. The maintainer is Bob Tennent (rdt at cs.queensu.ca).
+This package need not be used with LaTeX releases after
+2020-02-02 which will incorporate mweights functionality
+into the LaTeX kernel; the mweights package itself will
+actually not be loaded by the kernel.
+
+The package is licensed under the terms of the LaTeX Project
+Public License. The maintainer is Bob Tennent (rdt at
+cs.queensu.ca).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mweights.doc.tlpobj new/tlpkg/tlpobj/mweights.doc.tlpobj
--- old/tlpkg/tlpobj/mweights.doc.tlpobj 2019-02-28 03:55:16.000000000 +0100
+++ new/tlpkg/tlpobj/mweights.doc.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,6 +1,6 @@
name mweights.doc
category Package
-revision 43647
+revision 53520
shortdesc doc files of mweights
relocated 1
docfiles size=1
++++++ mweights.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mweights.tlpobj new/tlpkg/tlpobj/mweights.tlpobj
--- old/tlpkg/tlpobj/mweights.tlpobj 2019-02-28 03:55:16.000000000 +0100
+++ new/tlpkg/tlpobj/mweights.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,6 +1,6 @@
name mweights
category Package
-revision 43647
+revision 53520
shortdesc Support for multiple-weight font packages
relocated 1
longdesc Many font families available for use with LaTeX are available
@@ -13,6 +13,5 @@
runfiles size=2
RELOC/tex/latex/mweights/mweights.sty
catalogue-ctan /macros/latex/contrib/mweights
-catalogue-date 2017-03-30 19:47:45 +0200
catalogue-license lppl
catalogue-topics font-use font-supp
1
0
Hello community,
here is the log from the commit of package texlive-specs-o for openSUSE:Factory checked in at 2020-05-29 21:18:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-o (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-o.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-o"
Fri May 29 21:18:30 2020 rev:39 rq:806905 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-o/texlive-specs-o.changes 2019-11-07 23:11:28.548202853 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-o.new.3606/texlive-specs-o.changes 2020-05-29 21:29:47.973296523 +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:
----
ltxindex.doc.tar.xz
ltxindex.tar.xz
lua2dox.doc.tar.xz
lua2dox.tar.xz
mathalfa.doc.tar.xz
mathalfa.tar.xz
New:
----
ltxcmds.doc.tar.xz
ltxcmds.tar.xz
lua-uca.doc.tar.xz
lua-uca.source.tar.xz
lua-ul.doc.tar.xz
lua-ul.tar.xz
luacolor.doc.tar.xz
luacolor.tar.xz
luahbtex.doc.tar.xz
luajittex.doc.tar.xz
magicnum.doc.tar.xz
magicnum.tar.xz
makerobust.doc.tar.xz
makerobust.tar.xz
manfnt.doc.tar.xz
marcellus.doc.tar.xz
marcellus.tar.xz
mathalpha.doc.tar.xz
mathalpha.tar.xz
mathcommand.doc.tar.xz
mathcommand.tar.xz
mathlig.tar.xz
matrix-skeleton.doc.tar.xz
matrix-skeleton.tar.xz
media4svg.doc.tar.xz
media4svg.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-o.spec ++++++
++++ 13150 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-o/texlive-specs-o.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-o.new.3606/texlive-specs-o.spec
++++++ ltxguidex.doc.tar.xz ++++++
Binary files old/doc/latex/ltxguidex/ltxguidex.pdf and new/doc/latex/ltxguidex/ltxguidex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ltxguidex/ltxguidex.tex new/doc/latex/ltxguidex/ltxguidex.tex
--- old/doc/latex/ltxguidex/ltxguidex.tex 2019-01-14 23:07:57.000000000 +0100
+++ new/doc/latex/ltxguidex/ltxguidex.tex 2019-05-05 00:48:07.000000000 +0200
@@ -1,4 +1,5 @@
\documentclass{ltxguidex}
+\usepackage{changelog}
\usepackage{fontspec}
\setmainfont{Tiempos Text}
\usepackage{FiraSans}
@@ -10,7 +11,7 @@
\title{Towards Better \LaTeX\ Documentation With the \ltx\ Document Class}
\author{Rebecca Turner\thanks{Brandeis University;
\email{rebeccaturner(a)brandeis.edu}}}
-\date{2019/01/13 v0.1.0}
+\date{2019/04/15 0.2.0}
\begin{document}
\maketitle
@@ -356,9 +357,8 @@
These environments typeset ``notices'' with a hanging indent. Original
definitions written by Javier Bezos for the \ctan{enumitem} documenation.
-|\ltxguidex@noticestyle| is executed before the marker text (``warning,''
-``note,'' etc.) in a separate group. New notice environments can be created
-with |\newnotice|.
+|\noticestyle| is executed before the marker text (``warning,'' ``note,''
+etc.). New notice environments can be created with |\newnotice|.
\begin{bug}
If the first content in a notice environment is vertical, the marker
@@ -597,4 +597,13 @@
\end{LTXexample}
\end{example}
+\begin{changelog}[author=Rebecca Turner]
+\begin{version}[v=0.1.1, date=2019-04-15]
+\added
+ \item Renamed \cs{ltxguidex@noticestyle} to \cs{noticestyle} and committed
+ it to the public \textsc{api}.
+ \item The \cs{cs} and \cs{command} commands.
+\end{version}
+\end{changelog}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ltxguidex.doc.tlpobj new/tlpkg/tlpobj/ltxguidex.doc.tlpobj
--- old/tlpkg/tlpobj/ltxguidex.doc.tlpobj 2019-02-28 03:51:09.000000000 +0100
+++ new/tlpkg/tlpobj/ltxguidex.doc.tlpobj 2019-05-05 01:38:57.000000000 +0200
@@ -1,6 +1,6 @@
name ltxguidex.doc
category Package
-revision 49705
+revision 50992
shortdesc doc files of ltxguidex
relocated 1
docfiles size=27
++++++ ltxguidex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ltxguidex/ltxguidex.cls new/tex/latex/ltxguidex/ltxguidex.cls
--- old/tex/latex/ltxguidex/ltxguidex.cls 2019-01-14 23:07:57.000000000 +0100
+++ new/tex/latex/ltxguidex/ltxguidex.cls 2019-05-05 00:48:07.000000000 +0200
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesClass{ltxguidex}[2019/01/13 v0.1.0 Extended LaTeX documentation class]
+\ProvidesClass{ltxguidex}[2019/04/15 0.2.0 Extended LaTeX documentation class]
% Description: An improved document class for writing LaTeX documentation
% with extra tools for authors.
% Homepage: https://github.com/9999years/ltxguidex
@@ -81,11 +81,11 @@
\decl}
{\enddecl}
-\newcommand{\ltxguidex@noticestyle}{\sffamily\bfseries\color{notes}}
+\newcommand{\noticestyle}{\sffamily\bfseries\color{notes}}
\def\@begintheorem#1#2{%
\list{}{}%
\global\advance\@listdepth\m@ne
- \item[{\ltxguidex@noticestyle\MakeUppercase{#1}}]}
+ \item[{\noticestyle\MakeUppercase{#1}}]}
\newcommand{\newnotice}[2]{\newtheorem{#1}{#2}}
\newnotice{warning}{Warning}
@@ -208,6 +208,8 @@
\let\ctanlogo\ctan
\newcommand{\pipe}{\char"7C}
\newcommand{\bs}{\char"5C}
+\newcommand{\command}[1]{\texttt{\bs#1}}
+\let\cs\command
\newcommand{\email}[1]{\href{mailto:#1}{#1}}
\newcommand{\http}[1]{\href{http://#1}{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ltxguidex.tlpobj new/tlpkg/tlpobj/ltxguidex.tlpobj
--- old/tlpkg/tlpobj/ltxguidex.tlpobj 2019-02-28 03:51:09.000000000 +0100
+++ new/tlpkg/tlpobj/ltxguidex.tlpobj 2019-05-05 01:38:57.000000000 +0200
@@ -1,6 +1,6 @@
name ltxguidex
category Package
-revision 49705
+revision 50992
shortdesc An extended ltxguide class
relocated 1
longdesc The ltxguidex document class extends ltxguide with a set of
@@ -11,7 +11,7 @@
catalogue-contact-bugs https://github.com/9999years/ltxguidex/issues
catalogue-contact-home https://github.com/9999years/ltxguidex
catalogue-ctan /macros/latex/contrib/ltxguidex
-catalogue-date 2019-01-20 05:31:27 +0100
+catalogue-date 2019-04-15 21:59:07 +0200
catalogue-license lppl1.3c
catalogue-topics class
-catalogue-version 0.1.0
+catalogue-version 0.2.0
++++++ ltximg.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ltximg/CHANGUES.md new/texmf-dist/doc/support/ltximg/CHANGUES.md
--- old/texmf-dist/doc/support/ltximg/CHANGUES.md 2018-05-02 20:32:35.000000000 +0200
+++ new/texmf-dist/doc/support/ltximg/CHANGUES.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-## Changues
-```
- v1.5. (d) 2018-04-12 - Use GitHub to control version
- - Rewrite and optimize most part of code and options
- - Changue pdf2svg for pdftocairo
- - Complete support for pst-exa packpage
- - Clean take and optional
- v1.4. (d) 2016-11-29 - Remove and rewrite code for regex and system call
- - Append arara compiler, clean and comment code
- - Append dvips and dvipdfm for creation images
- - Append bmp, tif image format
- v1.3. (d) 2016-10-16 - All options its read from cmd line and input file
- - Rewrite some part of code (norun, nocrop, clean)
- - Suport minted and tcolorbox packpage for verbatim
- - Use /tmp dir for work process
- - Escape some characters in regex according to v5.2xx
- v1.2 (p) 2015-04-22 - Remove unused modules
- v1.1 (p) 2015-04-21 - Change mogrify to gs for image formats
- - Create output file
- - Rewrite source code and fix regex
- - Add more image format
- - Change date to iso format
- v1.0 (p) 2013-12-01 - First public release
-```
-Copyright 2013 - 2018 by Pablo González L <pablgonz(a)yahoo.com>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ltximg/README.md new/texmf-dist/doc/support/ltximg/README.md
--- old/texmf-dist/doc/support/ltximg/README.md 2018-05-02 20:32:35.000000000 +0200
+++ new/texmf-dist/doc/support/ltximg/README.md 2019-08-24 22:34:28.000000000 +0200
@@ -8,11 +8,11 @@
with only extracted environments and other with environments converted to `\includegraphics`.
## Syntax
-```
+```bash
$ ltximg [<compiler>] [<options>] [--] <input file>.<tex|ltx>
```
## Usage
-```
+```bash
$ ltximg --latex [<options>] <file.tex>
$ ltximg --arara [<options>] <file.tex>
$ ltximg [<options>] <file.tex>
@@ -20,19 +20,19 @@
```
If used without `[<compiler>]` and `[<options>]` the extracted environments are converted to `pdf` image format
and saved in the `/images` directory using `pdflatex` and `preview` package. Relative or absolute `paths` for files
-and directories is not supported and if the last `[<options>]` take a list separated by commas you need `--` at the end.
+and directories is not supported. If the last `[<options>]` take a *list separated by commas*, you need `--` at the end.
## Default environments extract
-```
+```bash
pspicture tikzpicture pgfpicture psgraph postscript PSTexample
```
## Options
-```
+```bash
[default]
-h, --help Display command line help and exit [off]
-l, --license Display GPL license and exit [off]
--v, --version Display current version (v1.5) and exit [off]
+-v, --version Display current version (1.7) and exit [off]
-t, --tif Create .tif files using ghostscript [gs]
-b, --bmp Create .bmp files using ghostscript [gs]
-j, --jpg Create .jpg files using ghostscript [gs]
@@ -48,6 +48,8 @@
-m <integer>, --margin <integer>
Set margins for pdfcrop [0]
--imgdir <dirname> Set name of directory to save images [images]
+--zip Compress files generated in .zip format [off]
+--tar Compress files generated in .tar.gz format [off]
-o <filename>, --output <filename>
Create output file [off]
--verbose Verbose printing [off]
@@ -75,14 +77,14 @@
--deltenv <env1,...> Delete environments in output file [empty]
```
## Example
-```
+```bash
$ ltximg --latex -e -p --srcenv --imgdir=mypics -o test-out test-in.ltx
```
-```
+```bash
$ ltximg --latex -ep --srcenv --imgdir mypics -o test-out test-in.ltx
```
Create a `/mypics` directory whit all extracted environments converted to
- image formats(`.pdf`, `.eps`, `.png`), individual files whit source code (`.tex`)
+ image formats (`.pdf`, `.eps`, `.png`), individual files whit source code (`.tex`)
for all extracted environments, a file `test-out.ltx` whit all environments converted to `\includegraphics`
and file `test-in-fig-all.tex` with only the extracted environments using
`latex>dvips>ps2pdf` and `preview` package for `<input file>` and `pdflatex`
@@ -90,9 +92,13 @@
## Documentation
For full documentation use:
-```
+```bash
$ texdoc ltximg
```
+ For recreation all documentation use:
+```bash
+$ arara ltximg-doc.dtx
+```
## Licence
This program is free software; you can redistribute it and/or modify it under the terms of the GNU
@@ -105,8 +111,8 @@
## Author
-Written by Pablo González L <pablgonz(a)yahoo.com>, last update 2018-04-12.
+Written by Pablo González L <pablgonz(a)yahoo.com>, last update 2019-08-24.
## Copyright
-Copyright 2013 - 2018 by Pablo González L
+Copyright 2013 - 2019 by Pablo González L
Binary files old/texmf-dist/doc/support/ltximg/ltximg-doc.pdf and new/texmf-dist/doc/support/ltximg/ltximg-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ltximg.doc.tlpobj new/tlpkg/tlpobj/ltximg.doc.tlpobj
--- old/tlpkg/tlpobj/ltximg.doc.tlpobj 2019-02-28 03:51:09.000000000 +0100
+++ new/tlpkg/tlpobj/ltximg.doc.tlpobj 2019-08-25 01:55:19.000000000 +0200
@@ -1,8 +1,7 @@
name ltximg.doc
category Package
-revision 47568
+revision 51951
shortdesc doc files of ltximg
-docfiles size=50
- texmf-dist/doc/support/ltximg/CHANGUES.md
+docfiles size=39
texmf-dist/doc/support/ltximg/README.md
texmf-dist/doc/support/ltximg/ltximg-doc.pdf
++++++ ltximg.tar.xz ++++++
++++ 2188 lines of diff (skipped)
++++++ luabidi.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/luabidi/LICENCE.md new/doc/lualatex/luabidi/LICENCE.md
--- old/doc/lualatex/luabidi/LICENCE.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/luabidi/LICENCE.md 2019-08-28 01:01:08.000000000 +0200
@@ -0,0 +1,6 @@
+# MIT Licence
+
+Copyright (c) Vafa Khalighi 2009, Arthur Reutenauer 2013, 2019, Jürgen Spitzmüller 2019.
+
+The licence for all files within this package is (the MIT
+licence)[https://opensource.org/licenses/MIT] unless otherwise noted.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/luabidi/README new/doc/lualatex/luabidi/README
--- old/doc/lualatex/luabidi/README 2013-05-29 00:18:34.000000000 +0200
+++ new/doc/lualatex/luabidi/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-Luabidi is an attempt to offer the same functionality for LuaTeX as bidi
-does for XeTeX.
-
-Copyright (c) Vafa Khalighi 2009, and Arthur Reutenauer 2013
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/luabidi/README.md new/doc/lualatex/luabidi/README.md
--- old/doc/lualatex/luabidi/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/luabidi/README.md 2019-08-28 01:01:08.000000000 +0200
@@ -0,0 +1,8 @@
+# luabidi
+Luabidi is an attempt to offer the same functionality for LuaTeX as bidi
+does for XeTeX.
+
+## CTAN Package
+https://www.ctan.org/pkg/luabidi
+
+Copyright (c) Vafa Khalighi 2009, Arthur Reutenauer 2013, 2019, Jürgen Spitzmüller 2019
Binary files old/doc/lualatex/luabidi/luabidi.pdf and new/doc/lualatex/luabidi/luabidi.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/luabidi/luabidi.tex new/doc/lualatex/luabidi/luabidi.tex
--- old/doc/lualatex/luabidi/luabidi.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/luabidi/luabidi.tex 2019-10-28 21:55:00.000000000 +0100
@@ -0,0 +1,237 @@
+% !TeX spellcheck = en_US
+% !TeX TS-program = lualatex
+\documentclass[11pt]{ltxdoc}
+\usepackage{color}
+\usepackage{xspace,fancyvrb,booktabs}
+\usepackage[neverdecrease]{paralist}
+\definecolor{myblue}{rgb}{0.02,0.04,0.48}
+\definecolor{lightblue}{rgb}{0.61,.8,.8}
+\definecolor{myred}{rgb}{0.65,0.04,0.07}
+\usepackage[
+unicode=true,
+bookmarks=true,
+colorlinks=true,
+linkcolor=myblue,
+urlcolor=myblue,
+citecolor=myblue,
+hyperindex=false,
+hyperfootnotes=false,
+pdftitle={luabidi: Bidirectional typesetting in LuaLaTeX},
+pdfauthor={V Khalighi, A Reutenauer, J Spitzmüller},
+pdfkeywords={luatex, lualatex, multilingual, bidi}
+]{hyperref}
+\usepackage{metalogo}
+%\let\XeTeX\undefined
+%\let\XeLaTeX\undefined
+\usepackage{polyglossia}
+\usepackage{luabidi}
+
+\setmainlanguage{english}
+\usepackage[protrusion]{microtype}
+\newcommand*\Cmd[1]{\cmd{#1}\DescribeMacro{#1}\xspace}
+\newcommand*{\cscmd}[1]{\texttt{\textbackslash #1}}
+\newcommand*\pkg[1]{\textsf{\color{myblue}#1}}
+\newcommand*\file[1]{\texttt{\color{myblue}#1}}
+\newcommand*\TR[1]{\textcolor{myred}{#1}}
+\newcommand*\TX[1]{\hyperref[#1]{\textcolor{myred}{#1}}}
+\newcommand*\TB[1]{\textcolor{myblue}{\bf #1}}
+\newcommand*\TA[1]{\textsc{\color{myblue}#1}}
+\newcommand*\link[1]{\href{#1}{#1}}
+\def\eg{\textit{e.g.,}\xspace}
+\def\ie{\textit{i.e.,}\xspace}
+\def\ca{\textit{ca.}\@\xspace}
+\def\Eg{\textit{E.g.,}\xspace}
+\def\Ie{\textit{I.e.,}\xspace}
+\def\etc{\@ifnextchar.{\textit{etc}}{\textit{etc.}\@\xspace}}
+
+%% Sidenotes << copied from fontspec.dtx
+\newcommand\new[1]{%
+ \edef\thisversion{#1}%
+ \ifhmode\unskip~\fi{\ifx\thisversion\fileversion\color{blue}\else\color[gray]{0.5}\fi
+ $\leftarrow$}%
+ \marginpar{\centering
+ \small\ifx\thisversion\fileversion\color{blue}\else\color[gray]{0.5}\fi
+ \textsf{#1}}}
+\newcommand\displaycmd[2]{%
+ \\\DescribeMacro{#2}\centerline{\cmd{#1}}}
+\renewenvironment{itemize}{\begin{compactitem}[\char"2023]}%[{\fontspec{DejaVu Sans}\char"25BB}]}%
+ {\end{compactitem}}
+
+\def\condbreak#1{%
+ \vskip 0pt plus #1\pagebreak[3]\vskip 0pt plus -#1\relax}
+
+\newcommand*\lbd{\pkg{luabidi}}
+\newcommand*\Lbd{\pkg{Luabidi}}
+
+%% fontspec declarations:
+\setmainfont{Linux Libertine O}
+\setsansfont{Linux Biolinum O}
+\setmonofont[Scale=MatchLowercase]{DejaVu Sans Mono}
+
+\linespread{1.05}
+\frenchspacing
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+% COMMENT THE NEXT LINE TO INCLUDE THE CODE
+\AtBeginDocument{\OnlyDescription}
+
+
+\begin{document}
+\hyphenation{Kha-li-ghi Reu-ten-auer}
+\GetFileInfo{luabidi.sty}
+
+\title{\lbd\\\color{myblue}Bidirectional typesetting in \LuaLaTeX}
+
+\date{\color{myblue}\filedate \qquad \fileversion\\
+ \footnotesize (\textsc{pdf} file generated on \today)}
+
+\author{\TA{Vafa Khalighi} \and \TA{Arthur Reutenauer}\thanks{%
+ Current maintainer. Please submit bug reports and feature requests to \protect\url{https://github.com/bidi-tex/luabidi/issues}.}
+ \and \TA{Jürgen Spitzmüller}}
+
+\maketitle
+
+\DeleteShortVerb{\|}
+\MakeShortVerb{\¦}
+
+\tableofcontents
+
+\condbreak{2\baselineskip}
+\section{Objectives}
+\Lbd\ is an attempt to provide bidirectional writing support for the \LuaTeX\ engine in the same vein as the \pkg{bidi} package\footnote{%
+See \url{https://ctan.org/pkg/bidi}.} enables bidirectional writing with \XeTeX. The most prominent user of this package is \pkg{polyglossia}\footnote{%
+See \url{https://ctan.org/pkg/polyglossia}.} which uses \lbd\ with RTL languages and \LuaTeX\ output (as opposed to \pkg{bidi} with \XeTeX). Note, however, that \lbd\ is much more limited than \textsf{bidi}. Currently, only a very basic
+subset of the latter's features is supported.
+
+\section{Package Options}
+
+\begin{description}
+ \item[\TB{arabmaths}] By default, \lbd\ generates left-to-right maths. If you would like to have right-to-left maths, use this option.
+ \item[\TB{textwidthfootnoterule}] expands the footnote rule to the whole text width.
+ \item[\TB{autofootnoterule}] sets the footnote rule right or left aligned, depending on the direction of the first footnote
+ that follows the rule (\ie that comes on the current page).
+\end{description}
+
+\section{User Commands}
+
+\subsection{Main Text Direction}
+
+By default, the main directionality of the document is left-to-right. To change it to right-to-left, use the switch
+
+\begin{quote}
+ \Cmd\setRTLmain
+\end{quote}
+%
+This is advisable if your document consists mainly of right-to-left text.
+
+\subsection{Paragraph Text Direction}
+
+To change directionality for paragraphs, you can use the following switches:
+\begin{description}
+ \item[\cmd{\setRTL}]\DescribeMacro{\setRTL} (alias: \Cmd{\setRL}, \Cmd{\unsetLTR}) changes paragraph direction to right-to-left.
+ \item[\cmd{\setLTR}]\DescribeMacro{\setLTR} (alias: \Cmd{\setLR}, \Cmd{\unsetRTL}) changes paragraph direction to left-to-right.
+\end{description}
+%
+\condbreak{2\baselineskip}
+Alternatively,\DescribeMacro{RTL}\DescribeMacro{LTR} you can also use the environments
+
+\begin{quote}
+ \begin{verbatim}
+ \begin{RTL}
+ ...
+ \end{RTL}
+ \end{verbatim}
+\end{quote}
+%
+or
+
+\begin{quote}
+ \begin{verbatim}
+ \begin{LTR}
+ ...
+ \end{LTR}
+ \end{verbatim}
+\end{quote}
+
+\subsection{Inline Text Direction}
+
+To change directionality for text chunks inside paragraphs, use
+\begin{description}
+ \item[\cmd\RLE\{...\}]\DescribeMacro{\RLE} (alias: \Cmd\RL) changes the directionality locally to right-to-left.
+ \item[\cmd\LRE\{...\}]\DescribeMacro{\LRE} (alias: \Cmd\LR) changes the directionality locally to left-to-right.
+\end{description}
+
+\subsection{Footnotes}
+
+\subsubsection{Horizontal Footnote Position}
+
+\Lbd\ provides two additional footnote commands in addition to standard \cmd{\footnote}:
+\Cmd{\RTLfootnote}\new{v0.5} and \Cmd{\LTRfootnote}\new{v0.5}.
+The standard \cmd{\footnote} command thereby places the footnote always on the side that is currently the origin of direction:
+on the left side of the page in LTR paragraphs and on the right in RTL paragraphs.
+
+\cmd{\LTRfootnote}, in contrast, always places the footnote on the left side, notwithstanding the current
+directionality. \cmd{\RTLfootnote} always places it on the right side. Like \cmd{\footnote}, \cmd{\RTLfootnote}
+and \cmd{\LTRfootnote} have an optional argument to customize the number.
+
+
+\subsubsection{Footnote Rule Length and Position}
+
+By default, the placement of the footnote rule depends on the main text directionality:
+
+\begin{itemize}
+ \item In default mode (\ie if \cmd{\setRTLmain} is not used), the footnote rule is always set left-aligned (as usual in LTR documents).
+ \item If the main direction is RTL (\ie if \cmd{\setRTLmain} is used), the footnote rule is always set right-aligned (as usual in RTL documents)
+\end{itemize}
+%
+However, with the switch \Cmd{\leftfootnoterule}\new{v0.5}, all subsequent footnote rules are always placed on the left.
+Likewise, \Cmd{\rightfootnoterule}\new{v0.5} causes all subsequent footnote rules to be always placed on the right.
+
+The switch \Cmd{\autofootnoterule}\new{v0.5} and the corresponding package option advise \lbd\ to automatically determine the rule position,
+depending on the directionality of the first footnote on the page. Note that this automatic can fail with footnotes at page boundaries
+that differ in directionality from the first footnote on the page. You can work around such cases by switching to \cmd{\rightfootnoterule}
+or \cmd{\leftfootnoterule} on these pages.
+
+If you want a footnote rule that spans the whole text width, you can use the switch \Cmd{\textwidth\-footnoterule}\new{v0.5}
+or the respective package option.
+
+The length of left and right footnote rules can be adjusted via
+
+\begin{quote}
+ ¦\setlength\footenoterulewidth{⟨length⟩}¦\DescribeMacro{\footenoterulewidth}
+\end{quote}
+%
+The predefined ¦⟨length⟩¦ is ¦0.4\columnwidth¦.
+
+
+
+\section{Commands for Package Authors}
+
+The following tests are provided to be used in packages:
+
+\begin{description}
+ \item[\cscmd{if@RTL}]\DescribeMacro{\if@RTL} determines whether the current paragraph direction is right-to-left.
+ \item[\cscmd{if@RTLmain}]\DescribeMacro{\if@RTLmain} determines whether the main direction is right-to-left.
+\end{description}
+%
+The following macros are provided:
+\begin{description}
+ \item[\cscmd{@ensure@RTL\{...\}}]\DescribeMacro{\@ensure@RTL} Ensure that the argument is typeset RTL.
+ \item[\cscmd{@ensure@LTR\{...\}}]\DescribeMacro{\@ensure@LTR} Ensure that the argument is typeset LTR.
+ \item[\cscmd{@ensure@dir\{...\}}]\DescribeMacro{\@ensure@dir} (alias: \cmd{\@ensure@maindir\{...\}}\DescribeMacro{\@ensure@maindir}) If used in RTL mode, the argument is put inside \cmd{\RLE}, if used in LTR mode, the argument is output as is.
+ \item[\cscmd{hboxR\{...\}}]\DescribeMacro{\hboxR}\new{v0.5} Puts its argument in a RTL \cmd{\hbox}.
+\end{description}
+
+\section{Revision Log}
+
+\begin{description}
+ \item[v. 0.5 (2019/10/27)] Add \cmd{\RTLfootnote}, \cmd{\LTRfootnote}, and \cmd{\hboxR}; fix \texttt{autofootnoterule} option; add \cmd{\autofootnoterule},
+ \cmd{\leftfootnoterule}, \cmd{\rightfootnoterule} and \cmd{\textwidthfootnoterule}; add manual.
+ \item[v. 0.4 (2019/08/24)] Fix \cmd{\@ensure@RTL}.
+ \item[v. 0.3 (2019/07/10)] Fix compatibility with recent \LuaTeX\ (this version was never released to CTAN).
+ \item[v. 0.2 (2013/05/27)] Fix additional files.
+ \item[v. 0.1 (2009/04/01)] Initial release.
+\end{description}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/luabidi/test.tex new/doc/lualatex/luabidi/test.tex
--- old/doc/lualatex/luabidi/test.tex 2013-05-29 00:18:34.000000000 +0200
+++ new/doc/lualatex/luabidi/test.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage[arabmaths]{luabidi}
-\begin{document}
-\setRTLmain
-\section{ghesmate 1}
-
-in yek ghesmat ast ke an ra dar inja minevisam
-
-\begin{equation}
-1+2=3
-\end{equation}
-in ham dobare masalei ast ke man minevisam va shoma an ra mibinid.
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luabidi.doc.tlpobj new/tlpkg/tlpobj/luabidi.doc.tlpobj
--- old/tlpkg/tlpobj/luabidi.doc.tlpobj 2019-02-28 03:51:12.000000000 +0100
+++ new/tlpkg/tlpobj/luabidi.doc.tlpobj 2020-03-24 01:59:58.000000000 +0100
@@ -1,8 +1,10 @@
name luabidi.doc
category Package
-revision 30790
+revision 54512
shortdesc doc files of luabidi
relocated 1
-docfiles size=2
- RELOC/doc/lualatex/luabidi/README
- RELOC/doc/lualatex/luabidi/test.tex
+docfiles size=28
+ RELOC/doc/lualatex/luabidi/LICENCE.md
+ RELOC/doc/lualatex/luabidi/README.md
+ RELOC/doc/lualatex/luabidi/luabidi.pdf
+ RELOC/doc/lualatex/luabidi/luabidi.tex
++++++ luabidi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/arabmaths.tex new/tex/lualatex/luabidi/arabmaths.tex
--- old/tex/lualatex/luabidi/arabmaths.tex 2013-05-29 00:18:34.000000000 +0200
+++ new/tex/lualatex/luabidi/arabmaths.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-\luatexmathdir TRT
-\def\@eqnnum{{\normalfont \normalcolor \luatextextdir TLT ({\luatextextdir TRT\theequation})}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/autofootnoterule.tex new/tex/lualatex/luabidi/autofootnoterule.tex
--- old/tex/lualatex/luabidi/autofootnoterule.tex 2013-05-29 00:18:34.000000000 +0200
+++ new/tex/lualatex/luabidi/autofootnoterule.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-\ifx \CatEscape\undefined
- \chardef\CatEscape=0
- \chardef\CatOpen=1
- \chardef\CatClose=2
- \chardef\CatIgnore=9
- \chardef\CatLetter=11
- \chardef\CatOther=12
- \chardef\CatActive=13 % is defined in Plain already
-
- \chardef\CatUsCode=\catcode`\_
-\fi
-
-\catcode`\_=\CatLetter % top level macro file
-
-
-\def\l@fn{%
- \hbox to \columnwidth
- {\luatexpagedir TLT\vbox{\kern -3\p@
- \hrule width .4\columnwidth \kern2.6\p@}\hfil}}
-\def\r@fn{%
- \hrule width .4\columnwidth\kern 2.6\p@}
-
-
-\def\@makefnmark{\hbox{$^{\hbox{\scriptsize\@thefnmark}}\m@th$}}
-
-
-\def\leftfootnoterule{\global\def\footnoterule{\l@fn}}
-\def\rightfootnoterule{\global\def\footnoterule{\r@fn}}
-\leftfootnoterule
-
-%%% \beginprog
-\newread\old_foot_file
-\newwrite\foot_file
-\def\foot_file_name{\jobname.fot\relax}
-\def\init_footnote{%
- \openin\old_foot_file\foot_file_name
- \ifeof\old_foot_file \closein\old_foot_file
- \else \closein\old_foot_file
- \read_foot_file
- \fi
- \immediate\openout\foot_file\foot_file_name
- \immediate\write\foot_file{\relax}%
- \global\let\init_footnote\relax
- }
-
-\newcount\foot_name_no % for generating footnote mark names
-
-
-
-
-
-\newcount\autofootnote
-\def\fnpp_next_footnote{%
- \init_footnote
- \global\advance\foot_name_no\@ne
- \global\advance\c@footnote\@ne
- \edef\do_write{%
- \immediate\write\foot_file{%
- \string\advance\autofootnote\@ne
- \string\expandafter\xdef
- \string\csname\space f@\number\foot_name_no \endcsname{%
- \string\number\autofootnote
- }%
- }%
- }%
- \do_write
- \global\autofootnote 0\csname f@\number\foot_name_no \endcsname \relax
- }
-
-\def\read_foot_file{%
- \begingroup
- \catcode`\@\CatLetter \catcode`\^^M\CatIgnore
- \input \foot_file_name
- \endgroup
- }
-
-\let\fnpp_orig_outputpage=\@outputpage
-\def\@outputpage{%
- \ifx \init_footnote\relax
- \immediate\write\foot_file{\autofootnote\z@}%
- \fi
- \fnpp_orig_outputpage
- }
-
-\let\FnppOrigFootnote=\footnote % save original bindings
-\let\FnppOrigFootnotemark=\footnotemark
-
-\def\footnote{%
- \@ifnextchar[% % ] (Emacs)
- \@xfootnote
- {\fnpp_next_footnote \ifnum\autofootnote=1\rightfootnoterule\fi \@xfootnote[\the\c@footnote] %
-}%
- }
-\def\footnotemark{%
- \@ifnextchar[% % ] (Emacs)
- \@xfootnotemark
- {\fnpp_next_footnote \ifnum\autofootnote=1\rightfootnoterule\fi \@xfootnotemark[\the\c@footnote]}%
- }
-
-
-
-
-\def\footnotemarkLR{%
- \@ifnextchar[% % ] (Emacs)
- \@xfootnotemark
- {\fnpp_next_footnote \ifnum\autofootnote=1\leftfootnoterule\fi\@xfootnotemark[\the\c@footnote]}%
- }
-
-
-\def\Footnote#1{%
-\begingroup
-\footnotemarkLR%
-\renewcommand{\thefootnote}{\@arabic\c@footnote}%
-\luatexpardir TLT \luatextextdir TLT\footnotetext{#1}%
-\endgroup
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/luabidi-arabmaths.def new/tex/lualatex/luabidi/luabidi-arabmaths.def
--- old/tex/lualatex/luabidi/luabidi-arabmaths.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/lualatex/luabidi/luabidi-arabmaths.def 2019-10-28 21:55:00.000000000 +0100
@@ -0,0 +1,11 @@
+%% This file is luabidi-arabmaths.def
+%% This is part of the luabidi package
+%%
+%% Copyright © 2009 Vafa Khalighi, 2013--2019 Arthur Reutenauer, 2019 Jürgen Spitzmüller
+%%
+%%%% 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.
+
+\mathdir TRT
+\def\@eqnnum{{\normalfont \normalcolor \textdir TLT ({\textdir TRT\theequation})}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/luabidi-autofootnoterule.def new/tex/lualatex/luabidi/luabidi-autofootnoterule.def
--- old/tex/lualatex/luabidi/luabidi-autofootnoterule.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/lualatex/luabidi/luabidi-autofootnoterule.def 2019-10-28 21:55:00.000000000 +0100
@@ -0,0 +1,72 @@
+%% This file is luabidi-autofootnoterule.def
+%% This is part of the luabidi package
+%%
+%% Copyright © 2009 Vafa Khalighi, 2013--2019 Arthur Reutenauer, 2019 Jürgen Spitzmüller
+%%
+%%%% 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.
+
+
+%
+% Determine first footnote on current page
+%
+
+\RequirePackage{perpage}
+\newcounter{pagefnt}
+\setcounter{pagefnt}{0}
+\MakePerPage[0]{pagefnt}
+
+
+%
+% Footnote redefinitions
+%
+
+% Save original definitions
+\let\FnppOrigFootnote=\footnote
+\let\FnppOrigFootnotemark=\footnotemark
+
+% Default: left-aligned rule
+\leftfootnoterule
+
+% \footnote
+\def\footnote{%
+ \@ifnextchar[% % ] (Editor)
+ \@xfootnote
+ {\stepcounter\@mpfn\stepcounter{pagefnt}%
+ \ifnum\value{pagefnt}=0%
+ \if@RTL%
+ \rightfootnoterule%
+ \else%
+ \leftfootnoterule%
+ \fi%
+ \fi%
+ \@xfootnote[\the\c@footnote]%
+ }%
+}
+
+% \RTLfootnote
+\def\footnotemarkRL{%
+ \@ifnextchar[% % ] (Editor)
+ \@xfootnotemark
+ {\stepcounter\@mpfn\stepcounter{pagefnt}%
+ \ifnum\value{pagefnt}=0%
+ \rightfootnoterule%
+ \fi%
+ \@xfootnotemark[\the\c@footnote]%
+ }%
+}
+
+% \LTRfootnote
+\def\footnotemarkLR{%
+ \@ifnextchar[% % ] (Editor)
+ \@xfootnotemark
+ {\stepcounter\@mpfn\stepcounter{pagefnt}%
+ \ifnum\value{pagefnt}=0%
+ \leftfootnoterule%
+ \fi%
+ \@xfootnotemark[\the\c@footnote]%
+ }%
+}
+
+% Finis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/luabidi-footnotes.def new/tex/lualatex/luabidi/luabidi-footnotes.def
--- old/tex/lualatex/luabidi/luabidi-footnotes.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/lualatex/luabidi/luabidi-footnotes.def 2019-10-28 21:55:00.000000000 +0100
@@ -0,0 +1,76 @@
+%% This file is luabidi-footnotes.def
+%% This is part of the luabidi package
+%%
+%% Copyright © 2009 Vafa Khalighi, 2013--2019 Arthur Reutenauer, 2019 Jürgen Spitzmüller
+%%
+%%%% 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.
+
+%
+% Footnotes
+%
+
+% These are defined in polyglossia. Provide simple fallbacks
+\providecommand*\localnumeral{\@ifstar\@@localnumeral\@localnumeral}
+
+\providecommand*\@localnumeral[1]{#1}
+\providecommand*\@@localnumeral[1]{%
+ \protect\@arabic\csuse{c@#1}%
+}
+
+\let\footnotemarkLR\footnotemark
+\let\footnotemarkRL\footnotemark
+
+\providecommand\LTRfootnote[2][]{%
+ \begingroup
+ \ifx#1\\\\\footnotemarkLR
+ \renewcommand{\thefootnote}{\localnumeral*{footnote}}%
+ \else%
+ \footnotemarkLR[#1]%
+ \renewcommand{\thefootnote}{\localnumeral{#1}}%
+ \fi
+ \pardir TLT \textdir TLT\footnotetext{#2}%
+ \endgroup
+}
+
+\providecommand\RTLfootnote[2][]{%
+ \begingroup
+ \ifx#1\\\\\footnotemarkRL%
+ \renewcommand{\thefootnote}{\localnumeral*{footnote}}%
+ \else%
+ \footnotemarkRL[#1]%
+ \renewcommand{\thefootnote}{\localnumeral{#1}}%
+ \fi
+ \pardir TRT \textdir TRT\footnotetext{#2}%
+ \endgroup
+}
+
+% backwards compatibility
+\def\Footnote#1{\LTRfootnote{#1}}
+
+%
+% Footnote rules
+%
+
+% adjustable rule length
+\newlength\footnoterulewidth
+\setlength\footnoterulewidth{.4\columnwidth}
+
+% The left, right and full width rules
+\def\luabidi@left@fn{%
+ \hbox to \columnwidth
+ {\pagedir TLT\textdir TLT\vbox{\kern -3\p@
+ \hrule\@width\footnoterulewidth\kern2.6\p@}\hfil}}
+\def\luabidi@right@fn{%
+ \pagedir TRT\textdir TRT\hrule\@width\footnoterulewidth\kern2.6\p@}
+\def\luabidi@textwidth@fn{%
+ \kern-3\p@\hrule\@width\textwidth\kern2.6\p@}
+
+% switches for the rule position
+\def\leftfootnoterule{\global\def\footnoterule{\luabidi@left@fn}}
+\def\rightfootnoterule{\global\def\footnoterule{\luabidi@right@fn}}
+\def\textwidthfootnoterule{\global\def\footnoterule{\luabidi@textwidth@fn}}
+\def\autofootnoterule{\luabidi@autofootnoteruletrue}
+
+% Finis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/luabidi-test-arabmaths.tex new/tex/lualatex/luabidi/luabidi-test-arabmaths.tex
--- old/tex/lualatex/luabidi/luabidi-test-arabmaths.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/lualatex/luabidi/luabidi-test-arabmaths.tex 2019-10-28 21:55:00.000000000 +0100
@@ -0,0 +1,13 @@
+\documentclass[12pt]{article}
+\usepackage[arabmaths]{luabidi}
+\begin{document}
+\setRTLmain
+\section{ghesmate 1}
+
+in yek ghesmat ast ke an ra dar inja minevisam
+
+\begin{equation}
+1+2=3
+\end{equation}
+in ham dobare masalei ast ke man minevisam va shoma an ra mibinid.
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/luabidi.sty new/tex/lualatex/luabidi/luabidi.sty
--- old/tex/lualatex/luabidi/luabidi.sty 2013-05-29 00:18:34.000000000 +0200
+++ new/tex/lualatex/luabidi/luabidi.sty 2019-10-28 21:55:00.000000000 +0100
@@ -1,33 +1,50 @@
%% This file is luabidi.sty
+%% This is part of the luabidi package
%%
-%% Copyright © 2009 Vafa Khalighi, 2013 Arthur Reutenauer
+%% Copyright © 2009 Vafa Khalighi, 2013--2019 Arthur Reutenauer, 2019 Jürgen Spitzmüller
%%
%%%% 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.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luabidi}[2013/05/27 v0.2
+\ProvidesPackage{luabidi}[2019/10/27 v0.5
Bidirectional typesetting in LuaTeX]
+
+\RequirePackage{etoolbox}
+
+%
+% Package options
+%
+
+\DeclareOption{arabmaths}{\input{luabidi-arabmaths.def}}
+\newif\ifluabidi@autofootnoterule
+\DeclareOption{autofootnoterule}{\luabidi@autofootnoteruletrue}
+\newif\ifluabidi@textwidthfootnoterule
+\DeclareOption{textwidthfootnoterule}{\luabidi@textwidthfootnoteruletrue}
+\ProcessOptions
+
+%
+% General command and switches
+%
+
\newif\if@RTL
\newif\if@RTLmain
-\def\setRTLmain{\luatexpagedir TRT \luatexbodydir TRT \luatexpardir TRT \luatextextdir TRT}
-\def\setRTL{\@RTLtrue\luatexpardir TRT \luatextextdir TRT}
+\@RTLmainfalse
+\def\setRTLmain{\@RTLmaintrue\pagedir TRT \bodydir TRT \pardir TRT \textdir TRT}
+\def\setRTL{\@RTLtrue\pardir TRT \textdir TRT}
\let\setRL=\setRTL
-\def\setLTR{\@RTLfalse\luatexpardir TLT \luatextextdir TLT}
+\def\setLTR{\@RTLfalse\pardir TLT \textdir TLT}
\let\setLR=\setLTR
\let\unsetRTL=\setLTR
\let\unsetLTR=\setRTL
-\def\RTL{\@RTLtrue\trivlist \luatexpardir TRT \luatextextdir TRT\item\relax}
+\def\RTL{\@RTLtrue\trivlist \pardir TRT \textdir TRT\item\relax}
\def\endRTL{\@RTLfalse\endtrivlist}
-\def\LTR{\trivlist \luatexpardir TLT \luatextextdir TLT\item\relax}
+\def\LTR{\trivlist \pardir TLT \textdir TLT\item\relax}
\def\endLTR{\endtrivlist}
\def\@ensure@RTL#1{\if@RTL#1\else\RLE{#1}\fi}
-\def\@ensure@LTR#1{\if@RTL#1\else\LRE{#1}\fi}
+\def\@ensure@LTR#1{\if@RTL\LRE{#1}\else{#1}\fi}
\def\@ensure@dir#1{\if@RTL\RLE{#1}\else{#1}\fi}
\let\@ensure@maindir=\@ensuredir
-\@RTLmainfalse
-\DeclareOption{arabmaths}{\input{arabmaths}}
-\DeclareOption{textwidthfootnoterule}{\input{textwidthfootnoterule}}
\let\n@xt=\
\DeclareRobustCommand*\LRE{\protect\pLRE}
\def\pLRE{\protect\afterassignment\moreLRE \let\n@xt= }
@@ -39,18 +56,25 @@
\def\moreRLE{\bracetext \aftergroup\unsetRTL \setRTL\@RTLtrue}
\let\LR=\LRE
\let\RL=\RLE
+\def\hboxR#1{\hbox{\RL{#1}}}
-\def\Footnote#1{%
-\begingroup
-\footnotemark
-\renewcommand{\thefootnote}{\@arabic\c@footnote}%
-\luatexpardir TLT \luatextextdir TLT\footnotetext{#1}%
-\endgroup
-}
+%
+% Footnotes
+%
-\DeclareOption{autofootnoterule}{\input{autofootnoterule}}
+\input{luabidi-footnotes.def}
+\ifluabidi@textwidthfootnoterule
+ \textwidthfootnoterule
+\fi
+% This needs to be loaded late because of the switch
+\AtEndPreamble{%
+ \makeatletter
+ \ifluabidi@autofootnoterule
+ \input{luabidi-autofootnoterule.def}
+ \fi
+ \makeatother
+}
-\ProcessOptions
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luabidi/textwidthfootnoterule.tex new/tex/lualatex/luabidi/textwidthfootnoterule.tex
--- old/tex/lualatex/luabidi/textwidthfootnoterule.tex 2013-05-29 00:18:34.000000000 +0200
+++ new/tex/lualatex/luabidi/textwidthfootnoterule.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-\def\footnoterule{\kern-3\p@
- \hrule \@width \textwidth \kern 2.6\p@}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luabidi.tlpobj new/tlpkg/tlpobj/luabidi.tlpobj
--- old/tlpkg/tlpobj/luabidi.tlpobj 2019-02-28 03:51:12.000000000 +0100
+++ new/tlpkg/tlpobj/luabidi.tlpobj 2020-03-24 01:59:58.000000000 +0100
@@ -1,19 +1,20 @@
name luabidi
category Package
-revision 30790
-shortdesc Bidirectional typesetting with LuaLaTeX
+revision 54512
+shortdesc Bidi functions for LuaTeX
relocated 1
longdesc The package attempts to emulate the XeTeX bidi package, in the
longdesc context of LuaTeX.
-runfiles size=4
- RELOC/tex/lualatex/luabidi/arabmaths.tex
- RELOC/tex/lualatex/luabidi/autofootnoterule.tex
+runfiles size=5
+ RELOC/tex/lualatex/luabidi/luabidi-arabmaths.def
+ RELOC/tex/lualatex/luabidi/luabidi-autofootnoterule.def
+ RELOC/tex/lualatex/luabidi/luabidi-footnotes.def
+ RELOC/tex/lualatex/luabidi/luabidi-test-arabmaths.tex
RELOC/tex/lualatex/luabidi/luabidi.sty
- RELOC/tex/lualatex/luabidi/textwidthfootnoterule.tex
catalogue-contact-bugs https://github.com/bidi-tex/luabidi/issues
+catalogue-contact-home https://github.com/bidi-tex/luabidi/
catalogue-contact-repository https://github.com/bidi-tex/luabidi
catalogue-ctan /macros/luatex/latex/luabidi
-catalogue-date 2018-11-28 20:29:19 +0100
-catalogue-license lppl1.3
+catalogue-license lppl1.3c mit
catalogue-topics typesetting luatex
-catalogue-version 0.2
+catalogue-version 0.5
++++++ lualatex-math.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lualatex-math.doc.tlpobj new/tlpkg/tlpobj/lualatex-math.doc.tlpobj
--- old/tlpkg/tlpobj/lualatex-math.doc.tlpobj 2019-02-28 03:51:13.000000000 +0100
+++ new/tlpkg/tlpobj/lualatex-math.doc.tlpobj 2019-11-07 18:46:15.000000000 +0100
@@ -1,6 +1,6 @@
name lualatex-math.doc
category Package
-revision 49904
+revision 52663
shortdesc doc files of lualatex-math
relocated 1
docfiles size=49
++++++ lualatex-math.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lualatex-math.tlpobj new/tlpkg/tlpobj/lualatex-math.tlpobj
--- old/tlpkg/tlpobj/lualatex-math.tlpobj 2019-02-28 03:51:13.000000000 +0100
+++ new/tlpkg/tlpobj/lualatex-math.tlpobj 2019-11-07 18:46:15.000000000 +0100
@@ -1,6 +1,6 @@
name lualatex-math
category Package
-revision 49904
+revision 52663
shortdesc Fixes for mathematics-related LuaLaTeX issues
relocated 1
longdesc The package patches a few commands of the LaTeX2e kernel and
@@ -10,6 +10,8 @@
longdesc functionality. The fixes are mostly moved from the unicode-math
longdesc package to this package since they are not directly related to
longdesc Unicode mathematics typesetting.
+depend etoolbox
+depend filehook
runfiles size=3
RELOC/tex/lualatex/lualatex-math/lualatex-math.lua
RELOC/tex/lualatex/lualatex-math/lualatex-math.sty
++++++ lualibs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/lualibs/NEWS new/doc/luatex/lualibs/NEWS
--- old/doc/luatex/lualibs/NEWS 2019-02-25 23:22:22.000000000 +0100
+++ new/doc/luatex/lualibs/NEWS 2020-02-05 22:26:20.000000000 +0100
@@ -1,4 +1,23 @@
History of the lualibs package
+2020/02/02 v2.70/
+ * sync with Context current as of 2020/01/26.
+
+2019/11/06 v2.69/
+ * corrected github address and version info.
+
+2019/11/05 v2.68/
+ * sync with Context current as of 2019/10/29
+
+2019/08/11 v2.67/
+ * sync with Context current as of 2019/08/11
+
+2019/07/04 v2.66/
+ * sync with Context current as of 2019/07/04
+ * changed kpse initialization to avoid conflicts with latex-dev format
+
+2019/05/18 v2.65/
+ * sync with Context current as of 2019/05/18
+
2019/02/14 v2.64/
* sync with Context beta as of 2019/02/14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/lualibs/README new/doc/luatex/lualibs/README
--- old/doc/luatex/lualibs/README 2019-02-25 23:22:22.000000000 +0100
+++ new/doc/luatex/lualibs/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-********************************************************************************
- The Lualibs Package
-********************************************************************************
-
-
-Lualibs is a collection of Lua modules useful for general programming.
-
-This work is based on Lua modules shipped with ConTeXt, to make them available
-for use independent of ConTeXt.
-
-This package has been developed by the LuaLaTeX development team on
-<http://github.com/lualatex/lualibs>.
-
-The current verson 2.64 has been build by Ulrike Fischer on
-<https://github.com/u-fischer/lualibs> from context 2019-02-14.
-
-See the 'NEWS' file for version history.
-
-
-
-Installation
---------------------------------------------------------------------------------
-
-
-1. If you are using TeX Live 2010 or later use 'tlmgr install lualibs'.
- With miktex, use the miktex console.
- Alternatively, use your (TeX or Linux) distribution's package management
- system.
-
-2. a. Grab lualibs.tds.zip on CTAN.
- b. Unzip it at the root of one or your TDS trees.
- c. You may need to update some filename database after this, see your TeX
- distribution's manual for details.
-
-
-Manifest
---------------------------------------------------------------------------------
- file TDS location
-
-Source files:
- lualibs.dtx source/luatex/lualibs/lualibs.dtx
- lualibs-boolean.lua tex/luatex/lualibs/lualibs-boolean.lua
- lualibs-compat.lua tex/luatex/lualibs/lualibs-compat.lua
- lualibs-dir.lua tex/luatex/lualibs/lualibs-dir.lua
- lualibs-file.lua tex/luatex/lualibs/lualibs-file.lua
- lualibs-gzip.lua tex/luatex/lualibs/lualibs-gzip.lua
- lualibs-function.lua tex/luatex/lualibs/lualibs-function.lua
- lualibs-io.lua tex/luatex/lualibs/lualibs-io.lua
- lualibs-lpeg.lua tex/luatex/lualibs/lualibs-lpeg.lua
- lualibs-lua.lua tex/luatex/lualibs/lualibs-lua.lua
- lualibs-math.lua tex/luatex/lualibs/lualibs-math.lua
- lualibs-md5.lua tex/luatex/lualibs/lualibs-md5.lua
- lualibs-number.lua tex/luatex/lualibs/lualibs-number.lua
- lualibs-os.lua tex/luatex/lualibs/lualibs-os.lua
- lualibs-package.lua tex/luatex/lualibs/lualibs-package.lua
- lualibs-set.lua tex/luatex/lualibs/lualibs-set.lua
- lualibs-string.lua tex/luatex/lualibs/lualibs-string.lua
- lualibs-table.lua tex/luatex/lualibs/lualibs-table.lua
- lualibs-trac-inf.lua tex/luatex/lualibs/lualibs-trac-inf.lua
- lualibs-unicode.lua* tex/luatex/lualibs/lualibs-unicode.lua
- lualibs-url.lua tex/luatex/lualibs/lualibs-url.lua
- lualibs-util-deb.lua tex/luatex/lualibs/lualibs-util-deb.lua
- lualibs-util-dim.lua tex/luatex/lualibs/lualibs-util-dim.lua
- lualibs-util-jsn.lua tex/luatex/lualibs/lualibs-util-jsn.lua
- lualibs-util-lua.lua tex/luatex/lualibs/lualibs-util-lua.lua
- lualibs-util-prs.lua tex/luatex/lualibs/lualibs-util-prs.lua
- lualibs-util-sta.lua tex/luatex/lualibs/lualibs-util-sta.lua
- lualibs-util-sto.lua tex/luatex/lualibs/lualibs-util-sto.lua
- lualibs-util-str.lua tex/luatex/lualibs/lualibs-util-str.lua
- lualibs-util-tab.lua tex/luatex/lualibs/lualibs-util-tab.lua
- lualibs-util-tpl.lua tex/luatex/lualibs/lualibs-util-tpl.lua
- LICENSE doc/luatex/lualibs/LICENSE
- NEWS doc/luatex/lualibs/NEWS
- README doc/luatex/lualibs/README
-
-* the file has been modified to enable the unicode library again
-
-Derived files:
- lualibs.lua tex/luatex/lualibs/lualibs.lua
- lualibs-basic.lua tex/luatex/lualibs/lualibs-basic.lua
- lualibs-basic-merged.lua tex/luatex/lualibs/lualibs-basic-merged.lua
- lualibs-extended.lua tex/luatex/lualibs/lualibs-extended.lua
- lualibs-extended-merged.lua tex/luatex/lualibs/lualibs-extended-merged.lua
- lualibs.pdf doc/luatex/lualibs/lualibs.pdf
-
-License and Copyright
---------------------------------------------------------------------------------
-
-As a derived work of Context, this work and the derived files are under the
-GNU GPL v.2.0 license.
-The full text of the license is included in the file LICENSE.
-
-The files taken from Context (lualibs-*.lua) are copyright PRAGMA ADE / ConTeXt
-Development Team.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/lualibs/README.md new/doc/luatex/lualibs/README.md
--- old/doc/luatex/lualibs/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/luatex/lualibs/README.md 2020-02-05 22:26:20.000000000 +0100
@@ -0,0 +1,101 @@
+# The Lualibs Package
+
+VERSION: 2.70
+
+DATE: 2020-02-02
+
+FONTLOADERDATE: 2020-01-26
+
+Lualibs is a collection of Lua modules useful for general programming.
+
+This work is based on Lua modules shipped with ConTeXt, to make them available
+for use independent of ConTeXt.
+
+This package has been developed by the LuaLaTeX development team on
+<https://github.com/lualatex/lualibs>.
+
+The current version has been build by the LaTeX3 Project Team on
+<https://github.com/latex3/lualibs/>. The fontloader date equals the date of the context files.
+
+See the 'NEWS' file for version history.
+
+
+
+## Installation
+
+
+1. If you are using TeX Live 2010 or later use 'tlmgr install lualibs'.
+ With miktex, use the miktex console.
+ Alternatively, use your (TeX or Linux) distribution's package management
+ system.
+
+2.
+ 1. Grab lualibs.tds.zip on CTAN.
+ 2. Unzip it at the root of one or your TDS trees.
+ 3. You may need to update some filename database after this, see your TeX
+ distribution's manual for details.
+
+
+## Manifest
+
+### Source files:
+
+| file | TDS location
+|------------------------------------|-----------------------------------
+| lualibs.dtx |source/luatex/lualibs/lualibs.dtx
+| lualibs-boolean.lua |tex/luatex/lualibs/lualibs-boolean.lua
+| lualibs-compat.lua |tex/luatex/lualibs/lualibs-compat.lua
+| lualibs-dir.lua |tex/luatex/lualibs/lualibs-dir.lua
+| lualibs-file.lua | tex/luatex/lualibs/lualibs-file.lua
+| lualibs-gzip.lua | tex/luatex/lualibs/lualibs-gzip.lua
+| lualibs-function.lua | tex/luatex/lualibs/lualibs-function.lua
+| lualibs-io.lua | tex/luatex/lualibs/lualibs-io.lua
+| lualibs-lpeg.lua | tex/luatex/lualibs/lualibs-lpeg.lua
+| lualibs-lua.lua | tex/luatex/lualibs/lualibs-lua.lua
+| lualibs-math.lua | tex/luatex/lualibs/lualibs-math.lua
+| lualibs-md5.lua | tex/luatex/lualibs/lualibs-md5.lua
+| lualibs-number.lua | tex/luatex/lualibs/lualibs-number.lua
+| lualibs-os.lua | tex/luatex/lualibs/lualibs-os.lua
+| lualibs-package.lua | tex/luatex/lualibs/lualibs-package.lua
+| lualibs-set.lua | tex/luatex/lualibs/lualibs-set.lua
+| lualibs-string.lua | tex/luatex/lualibs/lualibs-string.lua
+| lualibs-table.lua | tex/luatex/lualibs/lualibs-table.lua
+| lualibs-trac-inf.lua | tex/luatex/lualibs/lualibs-trac-inf.lua
+| lualibs-unicode.lua\* | tex/luatex/lualibs/lualibs-unicode.lua
+| lualibs-url.lua | tex/luatex/lualibs/lualibs-url.lua
+| lualibs-util-deb.lua | tex/luatex/lualibs/lualibs-util-deb.lua
+| lualibs-util-dim.lua | tex/luatex/lualibs/lualibs-util-dim.lua
+| lualibs-util-jsn.lua | tex/luatex/lualibs/lualibs-util-jsn.lua
+| lualibs-util-lua.lua | tex/luatex/lualibs/lualibs-util-lua.lua
+| lualibs-util-prs.lua | tex/luatex/lualibs/lualibs-util-prs.lua
+| lualibs-util-sta.lua | tex/luatex/lualibs/lualibs-util-sta.lua
+| lualibs-util-sto.lua | tex/luatex/lualibs/lualibs-util-sto.lua
+| lualibs-util-str.lua | tex/luatex/lualibs/lualibs-util-str.lua
+| lualibs-util-tab.lua | tex/luatex/lualibs/lualibs-util-tab.lua
+| lualibs-util-tpl.lua | tex/luatex/lualibs/lualibs-util-tpl.lua
+| LICENSE | doc/luatex/lualibs/LICENSE
+| NEWS | doc/luatex/lualibs/NEWS
+| README | doc/luatex/lualibs/README
+
+\* the file has been modified to enable the unicode library again
+
+### Derived files:
+
+| file | TDS location
+|------------------------------------|-----------------------------------
+| lualibs.lua | tex/luatex/lualibs/lualibs.lua
+| lualibs-basic.lua | tex/luatex/lualibs/lualibs-basic.lua
+| lualibs-basic-merged.lua | tex/luatex/lualibs/lualibs-basic-merged.lua
+| lualibs-extended.lua | tex/luatex/lualibs/lualibs-extended.lua
+| lualibs-extended-merged.lua | tex/luatex/lualibs/lualibs-extended-merged.lua
+| lualibs.pdf | doc/luatex/lualibs/lualibs.pdf
+
+## License and Copyright
+
+As a derived work of Context, this work and the derived files are under the
+GNU GPL v.2.0 license.
+The full text of the license is included in the file LICENSE.
+
+The files taken from Context (lualibs-*.lua) are copyright PRAGMA ADE / ConTeXt
+Development Team.
+
Binary files old/doc/luatex/lualibs/lualibs.pdf and new/doc/luatex/lualibs/lualibs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lualibs.doc.tlpobj new/tlpkg/tlpobj/lualibs.doc.tlpobj
--- old/tlpkg/tlpobj/lualibs.doc.tlpobj 2019-02-28 03:51:13.000000000 +0100
+++ new/tlpkg/tlpobj/lualibs.doc.tlpobj 2020-02-06 01:55:05.000000000 +0100
@@ -1,10 +1,10 @@
name lualibs.doc
category Package
-revision 50130
+revision 53682
shortdesc doc files of lualibs
relocated 1
docfiles size=28
RELOC/doc/luatex/lualibs/LICENSE
RELOC/doc/luatex/lualibs/NEWS
- RELOC/doc/luatex/lualibs/README
+ RELOC/doc/luatex/lualibs/README.md
RELOC/doc/luatex/lualibs/lualibs.pdf
++++++ lualibs.tar.xz ++++++
++++ 4521 lines of diff (skipped)
++++++ luamplib.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luamplib/NEWS new/doc/luatex/luamplib/NEWS
--- old/doc/luatex/luamplib/NEWS 2019-03-26 22:01:21.000000000 +0100
+++ new/doc/luatex/luamplib/NEWS 2020-02-25 02:22:23.000000000 +0100
@@ -1,5 +1,21 @@
History of the luamplib package
+2020/02/24 2.20.5
+ * Extra check for \pdfliteral (PR #89)
+ * allow expansion of \mpdim and \mpcolor when they are used in
+ another macro
+ * step copyright year
+
+2019/12/11 2.20.4
+ * remove unnecessary setting of endlinechar
+ * \prependtomplibbox instead of \mplibhmodeornot
+
+2019/11/14 2.20.3
+ * fix issue #86 (LaTeX command inside metapost label)
+
+2019/10/11 2.20.2
+ * fix issue #84 (pgf package hinders \mpcolor process)
+
2019/03/26 2.20.1
* '\mpdim' and '\mpcolor' are allowed, even if '\mplibverbatim' is enabled.
Binary files old/doc/luatex/luamplib/luamplib.pdf and new/doc/luatex/luamplib/luamplib.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luamplib/test-luamplib-latex.tex new/doc/luatex/luamplib/test-luamplib-latex.tex
--- old/doc/luatex/luamplib/test-luamplib-latex.tex 2019-03-21 21:54:31.000000000 +0100
+++ new/doc/luatex/luamplib/test-luamplib-latex.tex 2019-12-11 22:54:44.000000000 +0100
@@ -31,7 +31,7 @@
draw btex g etex withcolor \mpcolor{orange};
draw btex\tracingcommands0
multi%
- \begin{huge}line\end{huge}%
+ \begin{huge}line\end{huge}
texcode
with \%
etex shifted (10,0);
@@ -63,7 +63,7 @@
endfor;
endfig;
\end{mplibcode}%
-B\par\leavevmode
+B\par\mplibforcehmode
\mplibcodeinherit{enable}%
\mplibglobaltextext{enable}%
\everymplib{ beginfig(0);}\everyendmplib{ endfig;}%
@@ -75,6 +75,7 @@
\begin{mplibcode}
currentpicture := pic scaled 2;
\end{mplibcode}%
+\mplibnoforcehmode
\everymplib{}\everyendmplib{}%
\mplibcodeinherit{disable}%
\mplibglobaltextext{disable}\par
@@ -101,8 +102,9 @@
\end{mplibcode}%
\newbox\mympbox
+\def\prependtomplibbox{\global\setbox\mympbox}%
\begin{mplibcode}
-verbatimtex \global\setbox\mympbox etex
+%verbatimtex \global\setbox\mympbox etex
beginfig(0);
breadth=.667\mpdim\linewidth;
height=2pt;
@@ -117,6 +119,7 @@
\copy\mympbox
\copy\mympbox
+\mplibnoforcehmode
\mplibnumbersystem{double}%
\begin{mplibcode}
beginfig(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luamplib/test-luamplib-plain.tex new/doc/luatex/luamplib/test-luamplib-plain.tex
--- old/doc/luatex/luamplib/test-luamplib-plain.tex 2019-03-21 21:54:31.000000000 +0100
+++ new/doc/luatex/luamplib/test-luamplib-plain.tex 2019-12-11 22:54:44.000000000 +0100
@@ -61,7 +61,7 @@
endfor;
endfig;
\endmplibcode
-B\par\leavevmode
+B\par\mplibforcehmode
\mplibcodeinherit{enable}%
\mplibglobaltextext{enable}%
\everymplib{ beginfig(0);}\everyendmplib{ endfig;}%
@@ -73,6 +73,7 @@
\mplibcode
currentpicture := pic scaled 2;
\endmplibcode
+\mplibnoforcehmode
\everymplib{}\everyendmplib{}%
\mplibcodeinherit{disable}%
\mplibglobaltextext{disable}\par
@@ -99,8 +100,9 @@
\endmplibcode
\newbox\mympbox
+\def\prependtomplibbox{\global\setbox\mympbox}%
\mplibcode
-verbatimtex \global\setbox\mympbox etex
+%verbatimtex \global\setbox\mympbox etex
beginfig(0);
breadth=.667\mpdim\hsize;
height=2pt;
@@ -115,6 +117,7 @@
\copy\mympbox
\copy\mympbox
+\mplibnoforcehmode
\mplibnumbersystem{double}%
\mplibcode
beginfig(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luamplib.doc.tlpobj new/tlpkg/tlpobj/luamplib.doc.tlpobj
--- old/tlpkg/tlpobj/luamplib.doc.tlpobj 2019-03-27 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/luamplib.doc.tlpobj 2020-02-26 01:54:57.000000000 +0100
@@ -1,9 +1,9 @@
name luamplib.doc
category Package
-revision 50608
+revision 53904
shortdesc doc files of luamplib
relocated 1
-docfiles size=42
+docfiles size=43
RELOC/doc/luatex/luamplib/NEWS
RELOC/doc/luatex/luamplib/README
RELOC/doc/luatex/luamplib/luamplib.pdf
++++++ luamplib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luamplib/luamplib.lua new/tex/luatex/luamplib/luamplib.lua
--- old/tex/luatex/luamplib/luamplib.lua 2019-03-26 22:01:21.000000000 +0100
+++ new/tex/luatex/luamplib/luamplib.lua 2020-02-25 02:22:23.000000000 +0100
@@ -11,8 +11,8 @@
luatexbase.provides_module {
name = "luamplib",
- version = "2.20.1",
- date = "2019/03/26",
+ version = "2.20.5",
+ date = "2020/02/24",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -354,6 +354,10 @@
local tex_box_id = 2047
local factor = 65536*(7227/7200)
+local textext_fmt = [[image(addto currentpicture doublepath unitsquare ]]..
+ [[xscaled %f yscaled %f shifted (0,-%f) ]]..
+ [[withprescript "mplibtexboxid=%i:%f:%f")]]
+
local function process_tex_text (str)
if str then
tex_box_id = tex_box_id + 1
@@ -363,23 +367,22 @@
local wd = box.width / factor
local ht = box.height / factor
local dp = box.depth / factor
- return format("image(addto currentpicture doublepath unitsquare "..
- "xscaled %f yscaled %f shifted (0,-%f) "..
- "withprescript \"mplibtexboxid=%i:%f:%f\")",
- wd, ht+dp, dp, tex_box_id, wd, ht+dp)
+ return textext_fmt:format(wd, ht+dp, dp, tex_box_id, wd, ht+dp)
end
return ""
end
+local mplibcolor_fmt = [[\begingroup\let\XC@mcolor\relax]]..
+ [[\def\set@color{\global\mplibtmptoks\expandafter{\current@color}}]]..
+ [[\color %s \endgroup]]
+
local function process_color (str)
if str then
if not str:find("{.-}") then
str = format("{%s}",str)
end
- run_tex_code(format(
- "\\def\\set@color{\\toks0\\expandafter{\\current@color}}\\color %s", str),
- catat11)
- return format("1 withprescript \"MPlibOverrideColor=%s\"", texgettoks(0))
+ run_tex_code(mplibcolor_fmt:format(str), catat11)
+ return format('1 withprescript "MPlibOverrideColor=%s"', texgettoks"mplibtmptoks")
end
return ""
end
@@ -387,8 +390,8 @@
local function process_dimen (str)
if str then
str = str:gsub("{(.+)}","%1")
- run_tex_code(format("\\toks0\\expandafter{\\the\\dimexpr %s\\relax}", str))
- return format("begingroup %s endgroup", texgettoks(0))
+ run_tex_code(format([[\mplibtmptoks\expandafter{\the\dimexpr %s\relax}]], str))
+ return format("begingroup %s endgroup", texgettoks"mplibtmptoks")
end
return ""
end
@@ -418,7 +421,7 @@
local function process_verbatimtex_infig (str)
if str then
- return format("special \"postmplibverbtex=%s\";", str)
+ return format('special "postmplibverbtex=%s";', str)
end
return ""
end
@@ -577,30 +580,30 @@
local function protect_expansion (str)
if str then
- str = str:gsub("\\","\1Control\1")
- :gsub("%%","\1Comment\1")
- :gsub("#", "\1HashSign\1")
- :gsub("{", "\1LBrace\1")
- :gsub("}", "\1RBrace\1")
+ str = str:gsub("\\","!!!Control!!!")
+ :gsub("%%","!!!Comment!!!")
+ :gsub("#", "!!!HashSign!!!")
+ :gsub("{", "!!!LBrace!!!")
+ :gsub("}", "!!!RBrace!!!")
return format("\\unexpanded{%s}",str)
end
end
local function unprotect_expansion (str)
if str then
- return str:gsub("\1Control\1", "\\")
- :gsub("\1Comment\1", "%%")
- :gsub("\1HashSign\1","#")
- :gsub("\1LBrace\1", "{")
- :gsub("\1RBrace\1", "}")
+ return str:gsub("!!!Control!!!", "\\")
+ :gsub("!!!Comment!!!", "%%")
+ :gsub("!!!HashSign!!!","#")
+ :gsub("!!!LBrace!!!", "{")
+ :gsub("!!!RBrace!!!", "}")
end
end
local function process_mplibcode (data)
legacy_mplibcode_reset()
- local everymplib = texgettoks('everymplibtoks') or ''
- local everyendmplib = texgettoks('everyendmplibtoks') or ''
+ local everymplib = texgettoks'everymplibtoks' or ''
+ local everyendmplib = texgettoks'everyendmplibtoks' or ''
data = format("\n%s\n%s\n%s\n",everymplib, data, everyendmplib)
data = data:gsub("\r","\n")
@@ -619,9 +622,13 @@
if not luamplib.verbatiminput then
data = data:gsub("\".-\"", protect_expansion)
+
+ data = data:gsub("\\%%", "\0PerCent\0")
data = data:gsub("%%.-\n","")
- run_tex_code(format("\\toks0\\expanded{{%s}}",data))
- data = texgettoks(0)
+ data = data:gsub("%zPerCent%z", "\\%%")
+
+ run_tex_code(format("\\mplibtmptoks\\expanded{{%s}}",data))
+ data = texgettoks"mplibtmptoks"
data = data:gsub("##", "#")
data = data:gsub("\".-\"", unprotect_expansion)
data = data:gsub(btex_etex, function(str)
@@ -637,9 +644,9 @@
luamplib.process_mplibcode = process_mplibcode
local further_split_keys = {
- ["mplibtexboxid"] = true,
- ["sh_color_a"] = true,
- ["sh_color_b"] = true,
+ mplibtexboxid = true,
+ sh_color_a = true,
+ sh_color_b = true,
}
local function script2table(s)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luamplib/luamplib.sty new/tex/luatex/luamplib/luamplib.sty
--- old/tex/luatex/luamplib/luamplib.sty 2019-03-26 22:01:21.000000000 +0100
+++ new/tex/luatex/luamplib/luamplib.sty 2020-02-25 02:22:23.000000000 +0100
@@ -14,19 +14,19 @@
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2019/03/26 v2.20.1 mplib package for LuaTeX]
+ [2020/02/24 v2.20.5 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
\fi
\directlua{require("luamplib")}
-\ifx\scantextokens\undefined
- \let\scantextokens\luatexscantextokens
-\fi
\ifx\pdfoutput\undefined
\let\pdfoutput\outputmode
\protected\def\pdfliteral{\pdfextension literal}
\fi
+\ifx\pdfliteral\undefined
+ \protected\def\pdfliteral{\pdfextension literal}
+\fi
\def\mplibsetformat#1{\directlua{luamplib.setformat("#1")}}
\ifnum\pdfoutput>0
\let\mplibtoPDF\pdfliteral
@@ -40,30 +40,18 @@
\write128{}
\fi
\fi
-\def\mplibforcehmode{\let\mplibhmodeornot\leavevmode}
-\def\mplibnoforcehmode{\let\mplibhmodeornot\relax}
+\def\mplibforcehmode{\let\prependtomplibbox\leavevmode}
+\def\mplibnoforcehmode{\let\prependtomplibbox\relax}
\mplibnoforcehmode
\def\mplibsetupcatcodes{%
- \mplibhmodeornot %catcode`\{=12 %catcode`\}=12
+ %catcode`\{=12 %catcode`\}=12
\catcode`\#=12 \catcode`\^=12 \catcode`\~=12 \catcode`\_=12
- \catcode`\&=12 \catcode`\$=12 \catcode`\%=12 \catcode`\^^M=12 \endlinechar=10
+ \catcode`\&=12 \catcode`\$=12 \catcode`\%=12 \catcode`\^^M=12
}
\def\mplibputtextbox#1{\vbox to 0pt{\vss\hbox to 0pt{\raise\dp#1\copy#1\hss}}}
-\newcount\mplibstartlineno
-\def\mplibpostmpcatcodes{%
- \catcode`\{=12 \catcode`\}=12 \catcode`\#=12 \catcode`\%=12 }
-\def\mplibreplacenewlinebr{%
- \begingroup \mplibpostmpcatcodes \mplibdoreplacenewlinebr}
-\begingroup\lccode`\~=`\^^M \lowercase{\endgroup
- \def\mplibdoreplacenewlinebr#1^^J{\endgroup\scantextokens{{}#1~}}}
\bgroup\expandafter\expandafter\expandafter\egroup
\expandafter\ifx\csname selectfont\endcsname\relax
-\def\mplibreplacenewlinecs{%
- \begingroup \mplibpostmpcatcodes \mplibdoreplacenewlinecs}
-\begingroup\lccode`\~=`\^^M \lowercase{\endgroup
- \def\mplibdoreplacenewlinecs#1^^J{\endgroup\scantextokens{\relax#1~}}}
\def\mplibcode{%
- \mplibstartlineno\inputlineno
\begingroup
\begingroup
\mplibsetupcatcodes
@@ -73,12 +61,10 @@
\endgroup
\directlua{luamplib.process_mplibcode([===[\unexpanded{#1}]===])}%
\endgroup
- \ifnum\mplibstartlineno<\inputlineno\expandafter\mplibreplacenewlinecs\fi
}
\else
\newenvironment{mplibcode}{%
- \global\mplibstartlineno\inputlineno
- \toks@{}\ltxdomplibcode
+ \mplibtmptoks{}\ltxdomplibcode
}{}
\def\ltxdomplibcode{%
\begingroup
@@ -88,16 +74,14 @@
\def\mplib@mplibcode{mplibcode}
\long\def\ltxdomplibcodeindeed#1\end#2{%
\endgroup
- \toks@\expandafter{\the\toks@#1}%
+ \mplibtmptoks\expandafter{\the\mplibtmptoks#1}%
\def\mplibtemp@a{#2}%
\ifx\mplib@mplibcode\mplibtemp@a
- \directlua{luamplib.process_mplibcode([===[\the\toks@]===])}%
+ \directlua{luamplib.process_mplibcode([===[\the\mplibtmptoks]===])}%
\end{mplibcode}%
- \ifnum\mplibstartlineno<\inputlineno
- \expandafter\expandafter\expandafter\mplibreplacenewlinebr
- \fi
\else
- \toks@\expandafter{\the\toks@\end{#2}}\expandafter\ltxdomplibcode
+ \mplibtmptoks\expandafter{\the\mplibtmptoks\end{#2}}%
+ \expandafter\ltxdomplibcode
\fi
}
\fi
@@ -121,7 +105,6 @@
\newtoks\everymplibtoks
\newtoks\everyendmplibtoks
\protected\def\everymplib{%
- \mplibstartlineno\inputlineno
\begingroup
\mplibsetupcatcodes
\mplibdoeverymplib
@@ -129,10 +112,8 @@
\long\def\mplibdoeverymplib#1{%
\endgroup
\everymplibtoks{#1}%
- \ifnum\mplibstartlineno<\inputlineno\expandafter\mplibreplacenewlinebr\fi
}
\protected\def\everyendmplib{%
- \mplibstartlineno\inputlineno
\begingroup
\mplibsetupcatcodes
\mplibdoeveryendmplib
@@ -140,8 +121,10 @@
\long\def\mplibdoeveryendmplib#1{%
\endgroup
\everyendmplibtoks{#1}%
- \ifnum\mplibstartlineno<\inputlineno\expandafter\mplibreplacenewlinebr\fi
}
+\def\mpdim#1{ mplibdimen("#1") }
+\def\mpcolor#1#{\domplibcolor{#1}}
+\def\domplibcolor#1#2{ mplibcolor("#1{#2}") }
\def\mplibnumbersystem#1{\directlua{
local t = "#1"
if t == "binary" then t = "decimal" end
@@ -196,6 +179,7 @@
}}
\ifx\mplibscratchbox\undefined \newbox\mplibscratchbox \fi
\def\mplibstarttoPDF#1#2#3#4{%
+ \prependtomplibbox
\hbox\bgroup
\xdef\MPllx{#1}\xdef\MPlly{#2}%
\xdef\MPurx{#3}\xdef\MPury{#4}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luamplib.tlpobj new/tlpkg/tlpobj/luamplib.tlpobj
--- old/tlpkg/tlpobj/luamplib.tlpobj 2019-03-27 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/luamplib.tlpobj 2020-02-26 01:54:57.000000000 +0100
@@ -1,6 +1,6 @@
name luamplib
category Package
-revision 50608
+revision 53904
shortdesc Use LuaTeX's built-in MetaPost interpreter
relocated 1
longdesc The package enables the user to specify MetaPost diagrams
@@ -13,7 +13,6 @@
catalogue-contact-bugs https://github.com/lualatex/luamplib/issues
catalogue-contact-repository http://github.com/lualatex/luamplib
catalogue-ctan /macros/luatex/generic/luamplib
-catalogue-date 2019-03-26 13:13:24 +0100
catalogue-license gpl2
catalogue-topics mp-use graphics-in-tex luatex
-catalogue-version 2.20.1
+catalogue-version 2.20.5
++++++ luaotfload.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/NEWS new/texmf-dist/doc/luatex/luaotfload/NEWS
--- old/texmf-dist/doc/luatex/luaotfload/NEWS 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/NEWS 2020-02-03 23:30:09.000000000 +0100
@@ -1,5 +1,45 @@
Change History
--------------
+2020-02-02 luaotfload v3.12
+ * new experimental feature multiscript
+ * new experimental feature fallback
+ * extension of the color feature to color output glyphs
+ * Small bug correction
+
+2019-11-10 luaotfload v3.11
+ * Changed the handling of the script key in harf mode to be more compatible with behaviour of the node mode.
+ It now expects the name of a script that is actually in the font instead of a ISO 15924 script tag. See issue 117.
+ * Corrected a number of small typos and bugs in harf mode.
+
+2019-11-04 luaotfload v3.1
+ * added code to use the harfbuzz library of luahbtex ("mode=harf")
+ * fonts in ttc can now be indexed by name
+ * remove a number of lua tables from the global enviroment (_G) to reduce the polution.
+ Kept there are only the tables luaotfload, fonts and nodes.
+ * sync with context files from 2019-10-29
+
+2019-09-13 luaotfload v3.0
+ * invisible option to avoid that some glyph are shown (issue #63)
+ * correct small bug in xheight calculation
+
+2019-08-11 luaotfload v2.99
+ * some clean up
+ * fix a bug in luaotfload.aux.resolve_fontname() (issue #76)
+ * removed dependency on slnunicode (PR#72)
+ * sync with context files from 2019-08-11
+
+2019-06-20 luaotfload v2.98
+ * add embolden key
+ * add missing char detection issue #65
+ * sync with context files from 2019-07-04
+
+2019-05-18 luaotfload v2.97
+ * fix issue #47
+ * fix whatsits interfering with letterspacing (issue #53)
+ * fix luaotfload-tool switches version and find not working correctly (PR#59)
+ * fix luaotfload-tool support of ttc fonts (PR#58)
+ * sync with context files from 2019-05-18 (improves handling of large fonts, see e.g. issue #55 and PR#58)
+
2019-01-28 luaotfload v2.96
* repaired broken letterspace (issue #38)
* changed handling of spaces in letterspacing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/README.md new/texmf-dist/doc/luatex/luaotfload/README.md
--- old/texmf-dist/doc/luatex/luaotfload/README.md 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/README.md 2020-02-03 23:30:09.000000000 +0100
@@ -1,8 +1,8 @@
# The Luaotfload Package
-VERSION: 2.96
+VERSION: 3.12
-DATE: 2019-02-14
+DATE: 2020-02-02
## Description
Binary files old/texmf-dist/doc/luatex/luaotfload/filegraph.pdf and new/texmf-dist/doc/luatex/luaotfload/filegraph.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/filegraph.tex new/texmf-dist/doc/luatex/luaotfload/filegraph.tex
--- old/texmf-dist/doc/luatex/luaotfload/filegraph.tex 2018-10-04 00:43:11.000000000 +0200
+++ new/texmf-dist/doc/luatex/luaotfload/filegraph.tex 2019-08-14 22:52:07.000000000 +0200
@@ -65,6 +65,7 @@
if rowcnt % 2 == 0 then sep = "\\\\" else sep = "&" end
tex.sprint("\\mbox{"..v.gitpref..v.name..v.ext.."}".. sep)
end
+ if rowcnt % 2 == 1 then tex.sprint("\\\\") end -- if odd number we must end the matrix
end
function printscriptlist ()
Binary files old/texmf-dist/doc/luatex/luaotfload/luaotfload-conf.pdf and new/texmf-dist/doc/luatex/luaotfload/luaotfload-conf.pdf differ
Binary files old/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.pdf and new/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.tex new/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.tex
--- old/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.tex 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/luaotfload-latex.tex 2020-02-03 23:30:09.000000000 +0100
@@ -47,6 +47,7 @@
linkcolor=\primarycolor,
urlcolor=\secondarycolor,
citecolor=\primarycolor,
+ unicode,
pdftitle={The Luaotfload package},
pdfsubject={OpenType layout system for Plain TeX and LaTeX},
pdfauthor={Elie Roux \& Khaled Hosny \& Philipp Gesang \& Ulrike Fischer},
@@ -207,6 +208,7 @@
%% one that we could map directly onto Latex’s \verb|…|.
\usepackage{pdfpages}
\usepackage {listings}
+\usepackage{csquotes}
\usepackage {luatexbase}
\lstset {
basicstyle=\ttfamily,
@@ -279,7 +281,37 @@
end
end
}
-
+\directlua{
+ luaotfload.add_colorscheme("myscheme",
+ {
+ ["00FFFF30"] = {"default"},
+ ["FF0000"] = {"kabeng"},
+ ["00FF00"] = {"ivowelsignbeng"},
+ ["0000FF"] = {369} %% 369 is the GID of "nadarabeng"
+ })
+ }
+
+ \directlua{
+ luaotfload.add_multiscript
+ ("cyrlgrekbeng",
+ {
+ cyrl = "DejaVuSans:mode=node;script=cyrl;color=FF0000;",
+ grek = "texgyreheros:mode=harf;script=grek;color=0000FF;",
+ beng = "NotoSansBengali:mode=harf;script=bng2;color=00FF00"
+ }
+ )
+ }
+ \directlua
+ {luaotfload.add_fallback
+ ("myfallback",
+ {
+ "DejaVuSans:mode=harf;script=grek;color=FF0000;",
+ "cmuserif:mode=node;script=cyrl;color=00FF00;",
+ "NotoSansBengali:mode=harf;script=bng2;color=0000FF;",
+ "NotoColorEmoji:mode=harf;"
+ }
+ )
+ }
\def \listingpar {\endgraf}
\let \endlistingline \relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex new/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex
--- old/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/luaotfload-main.tex 2020-02-03 23:30:09.000000000 +0100
@@ -32,11 +32,10 @@
\beginfrontmatter
\setdocumenttitle {The \identifier{luaotfload} package}
- \setdocumentdate {2019-02-14 v2.96}
- \setdocumentauthor {Elie Roux · Khaled Hosny · Philipp Gesang · Ulrike Fischer\\
- Home: \hyperlink {https://github.com/lualatex/luaotfload}\\
- New Home: \hyperlink {https://github.com/u-fischer/luaotfload}\\
- Support: \email {lualatex-dev(a)tug.org}}
+ \setdocumentdate {2020-02-02 v3.12}
+ \setdocumentauthor {LaTeX3 Project\\
+ Elie Roux · Khaled Hosny · Philipp Gesang · Ulrike Fischer · Marcel Krüger\\
+ Home: \hyperlink {https://github.com/latex3/luaotfload}}
\typesetdocumenttitle
@@ -55,8 +54,71 @@
\pdfbookmark[1]{\contentsname}{table}
\typesetcontent
+\beginsection {Engine and version support}
+\identifier{luaotfload} is a quite large and complex package. It imports code from context which is actively developed along with the luatex binary. It is not possible
+to support a large number of engines variants or versions.
-\beginsection {New in version 2.96 (by Ulrike Fischer)}
+Supported is the \identifier{luatex} versions of a current TeXLive 2019 (and a current MiKTeX). Beginning with version 3.1 of this package also \identifier{luahbtex} is supported.
+\endsection
+
+\beginsection{Changes}
+\beginsubsection {New in version 3.12 (by Ulrike Fischer/Marcel Krüger)}
+\begin{itemize}
+\item Corrected a number of small bugs in harf mode.
+\item Extension\marginpar{Experimental!} of the \identifier{color} key to allow
+coloring of specific output glyphs, see page~\pageref{color-glyphs}
+\item A\marginpar{Experimental!} new \identifier{fallback} key to allow to define fallback fonts, see page~\pageref{fallback}
+\item A\marginpar{Experimental!} new \identifier{multiscript} key to allow to use a font
+for more than one script, see page~\pageref{multiscript}
+\end{itemize}
+
+\beginsubsection {New in version 3.11 (by Ulrike Fischer/Marcel Krüger)}
+\begin{itemize}
+\item Changed the handling of the \identifier{script} key in harf mode to be more compatible with behaviour of the node mode. It now expects the name of a script that is actually in the font instead of a ISO 15924 script tag. See issue 117.
+\item Corrected a number of small typos and bugs in harf mode.
+\end{itemize}
+\beginsubsection {New in version 3.1 (by Ulrike Fischer/Marcel Krüger)}
+\begin{itemize}
+\item The package has been moved to the github of the LaTeX3 Project and is now maintained
+ officially by the LaTeX3 Project team.
+\item Code to use the harfbuzz library of luahbtex has been added. See the description of the harf mode.
+\item fonts in ttc-collections can now be indexed by name.
+\item To reduce the polution of the global lua enviroment a number of lua tables have been removed.
+ Only the tables \identifier{luaotfload}, \identifier{fonts} and \identifier{nodes} have been kept there.
+\item The fontloader has been synched with the context files from 2019-10-29.
+
+\end{itemize}
+\endsubsection
+
+
+\beginsubsection {New in version 3.00 (by Ulrike Fischer/Marcel Krüger)}
+\begin{itemize}
+\item Default Ignorable characters are now invisible by default (issue 63). This can be deactivated with the option \texttt{invisible}.
+\end{itemize}
+\endsubsection
+
+\beginsubsection {New in version 2.99 (by Ulrike Fischer)}
+\begin{itemize}
+\item Code cleanup.
+\item The fontloader has been synched with the context files from 2019-08-11.
+\end{itemize}
+\endsubsection
+\beginsubsection {New in version 2.98 (by Ulrike Fischer)}
+\begin{itemize}
+\item The\marginpar{\mbox{}\hfill \textbf{breaking change!}} handling of missing chars has been changed. In This version a missing char will insert the \inlinecode{/.notdef} char of the fonts (this is sometimes a space, sometimes a rectangle with a cross) and no longer simply ignore the glyph. This behaviour can be reverted by using \inlinecode{notdef=false} as font feature.
+\item The font feature \inlinecode{embolden} can now be used to fake a bold font.
+\item The fontloader has been synched with the context files from 2019-07-04.
+\end{itemize}
+\endsubsection
+\beginsubsection {New in version 2.97 (by Ulrike Fischer)}
+\begin{itemize}
+\item the new generic fontloader improves the handling of large fonts (but some fonts still need a 64bit luatex version to create the font files).
+\item A number of small bug (also in luaotfload-tool) have been corrected, see the NEWS file for details.
+
+\end{itemize}
+\endsubsection
+
+\beginsubsection {New in version 2.96 (by Ulrike Fischer)}
\begin{itemize}
\item In\marginpar{\mbox{}\hfill \textbf{Incompatible change!}}
version 2.95 letterspacing was broken due to a change in the fontloader (issue 38). This has been repaired. At the same time a number of oddities and bugs in the letterspacing has been corrected. This can change existing documents. See page~\pageref{p:letterspace} for more information.
@@ -64,11 +126,11 @@
\item A problem with the detection of bold fonts has been corrected (issue 41, pull request 42).
\end{itemize}
-\endsection
+\endsubsection
-\beginsection {New in version 2.95 (by Ulrike Fischer)}
+\beginsubsection {New in version 2.95 (by Ulrike Fischer)}
\begin{itemize}
\item
This version imports from context the generic fontloader in the version of 2019-01-28. Contrary to the last announcement, it still works with luatex 1.07. So updates will continue.
@@ -80,8 +142,8 @@
\item The resolver code has be refactorated (pull request 36).
\end{itemize}
-\endsection
-\beginsection {New in version 2.94 (by Ulrike Fischer)}
+\endsubsection
+\beginsubsection {New in version 2.94 (by Ulrike Fischer)}
\begin{itemize}
\item
This version imports from context the generic fontloader in the version of 2018-12-19. It is the last version that works with luatex 1.07 and texlive 2018. As context has moved to luatex 1.09 newer versions of the fontloader needs now this luatex version too. This means that until the texlive 2018 freeze there will be probably no update of luaotfload.
@@ -90,13 +152,13 @@
\end{itemize}
-\endsection
+\endsubsection
-\beginsection {New in version 2.93 (by Ulrike Fischer)}
+\beginsubsection {New in version 2.93 (by Ulrike Fischer)}
Mainly internal clean up of the version info to allow automatic versioning.
-\endsection
+\endsubsection
-\beginsection {New in version 2.92 (by Ulrike Fischer)}
+\beginsubsection {New in version 2.92 (by Ulrike Fischer)}
\begin{itemize}
@@ -105,15 +167,15 @@
\item The syntax \inlinecode{file:} for legacy font works again (issue \#11).
\item The fontloader has been synched with the newest context version from october, 18.
\end{itemize}
-\endsection
-\beginsection {New in version 2.91 (by Ulrike Fischer)}
+\endsubsection
+\beginsubsection {New in version 2.91 (by Ulrike Fischer)}
This version mostly correct two bugs found in the previous fontloader: Glyphvariants weren't copied and pasted correctly. Glyphs encoded in the PUA couldn't be accessed anymore.
-\endsection
+\endsubsection
-\beginsection {New in version 2.9 (by Ulrike Fischer)}
+\beginsubsection {New in version 2.9 (by Ulrike Fischer)}
On the one side there is not very much new in this version: The native components of \identifier{Luaotfload} are nearly unchanged. A few bugs have been corrected, the various files lists which loads the components of the font loader have been cleaned up.
@@ -128,7 +190,7 @@
\beginaltitem {Lualibs} The update of the fontloader files also required an update of the \identifier{Lualibs} package. This \identifier{Luaotfload} version needs version 2.6 of \identifier{Lualibs}.
\endaltitem
- \beginaltitem {Maintenance} As the current maintainer wasn't available and it was urgent to get a \identifier{Luaotfload} compatible with \LUATEX 1.08/1.09 maintenance has been transfered to Ulrike Fischer and Marcel Krüger. The package is currently maintained and developed at \hyperlink{https://github.com/u-fischer/luaotfload}. Issues should be reported there.
+ \beginaltitem {Maintenance} As the current maintainer wasn't available and it was urgent to get a \identifier{Luaotfload} compatible with \LUATEX 1.08/1.09 maintenance has been transfered to Ulrike Fischer and Marcel Krüger. The package was maintained and developed at \hyperlink{https://github.com/u-fischer/luaotfload}. Issues should be reported there.
\endaltitem
\beginaltitem {Documentation}
@@ -137,6 +199,7 @@
\enddescriptions
+\endsubsection
\endsection
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\beginsection {Introduction}
@@ -155,11 +218,8 @@
as additional functionality like ligatures, old-style numbers, small
capitals, etc., and support more complex writing systems like Arabic
and Indic\footnote{%
- Unfortunately, \identifier{luaotfload} doesn‘t support many Indic
- scripts right now.
- Assistance in implementing the prerequisites is greatly
- appreciated.
-}
+ Unfortunately, the default fontloader of \identifier{luaotfload} doesn‘t support many Indic
+ scripts correctly. For these scripts it is recommended to use the harf mode along with the binary \identifier{luahbtex}.}
scripts.
\OpenType fonts are widely deployed and available for all modern
@@ -356,7 +416,7 @@
%
For a working example see the
\hyperlink [test in the luaotfload
- repo]{https://github.com/u-fischer/luaotfload/blob/master/testfiles/my-reso….
+ repo]{https://github.com/latex3/luaotfload/blob/master/testfiles/my-resolve….
}
%
It determines whether the font loader should interpret the request as
@@ -537,8 +597,8 @@
\identifier{TrueType} collection files (the extension is usually
\inlinecode{.ttc}) contain more than a single font. In order to refer to these
-subfonts, the respective index may be added in parentheses after the file
-name.\footnote{%
+subfonts, the respective index or the respective PostScript font name may be
+added in parentheses after the file name.\footnote{%
Incidentally, this syntactical detail also prevents one from loading files
that end in balanced parentheses.
}
@@ -546,6 +606,8 @@
\beginlisting
\font \cambriamain = "file:cambria.ttc(0)" at 10pt
\font \cambriamath = "file:cambria.ttc(1)" at 10pt
+ \font \Cambriamain = "file:cambria.ttc(Cambria)" at 10pt
+ \font \Cambriamath = "file:cambria.ttc(CambriaMath)" at 10pt
\endlisting
and likewise, requesting subfont inside a TTC container by path:
@@ -695,10 +757,9 @@
\begindescriptions
\beginaltitem {mode}
- Until version 2.94
- \identifier{luaotfload} had two \OpenType processing
+ \identifier{luaotfload} had three \OpenType processing
\emphasis{modes}:
- \identifier{base} and \identifier{node}.
+ \identifier{base}, \identifier{node} and \identifier{harf}.
\identifier{base} mode works by mapping \OpenType
features to traditional \TEX ligature and kerning mechanisms.
@@ -718,13 +779,43 @@
mode, and \identifier{base} mode has to be requested where needed,
e.~g. for math fonts.
- Since version 2.94 it is possible to call other font renderers with the mode key. A simple example with a plain reader can be found at \hyperlink{https://github.com/u-fischer/luaotfload/pull/26\#issuecomment-437716326}.
- A more useful example needs the new experimental luahbtex engine (windows binaries can be found at w32tex.org), and the luahbtex-harf renderer (\hyperlink{https://github.com/khaledhosny/luahbtex-harf}). With both it is possible to render a font using the harfbuzz library (used also by xetex).
+ \identifier{harf} mode is new in version 3.1 and needs the new \identifier{luahbtex} engine (the mode is ignored if \identifier{luahbtex} is not used). With it is possible to render a font using the harfbuzz library in-built in the new engine. \identifier{harf} mode improves greatly the rendering of indic and arabic scripts and is highly recommended for such scripts.
+
+ When using \identifier{harf} mode it is required to set also the script correctly.
+
+
+ \beginlisting
+ \font\burmesefont={file:NotoSerifMyanmar-Regular.ttf:mode=harf;script=mym2;}
+ \font\devafont={file:NotoSansDevanagari-Regular.ttf:mode=harf;script=dev2;}
+ \font\banglafont={name:Noto Sans Bengali:mode=harf;script=ben2;}
+ \font\tibetanfont={name:Noto Serif Tibetan:mode=harf;script=tibt;}
+ \endlisting
+
+ \includegraphics{scripts-demo}
+ It is possible to call other font renderers with the mode key. A simple example with a plain reader can be found at \url{https://github.com/latex3/luaotfload/pull/26#issuecomment-437716326}.
+
\endaltitem
+ \beginaltitem {shaper} \phantomsection\label{shaper-tag}
+ If \identifier{luahbtex} and \identifier{harf} mode are used it is possible to specify a shaper, like \identifier{graphite2} or \identifier{ot} (open type).
+
+ \beginlisting
+ \pardir TRT\textdir TRT
+ \font\test={file:AwamiNastaliq-Regular.ttf:mode=harf;shaper=ot}
+ \endlisting
+
+ \includegraphics{shaper-demo}
+
+ \beginlisting
+ \pardir TRT\textdir TRT
+ \font\test={file:AwamiNastaliq-Regular.ttf:mode=harf;shaper=graphite2}
+ \endlisting
+
+ \includegraphics{shaper-demo-graphite}
- \beginaltitem {script} \label{script-tag}
+ \endaltitem
+ \beginaltitem {script} \phantomsection\label{script-tag}
An \OpenType script tag;\footnote{%
See \hyperlink {http://www.microsoft.com/typography/otspec/scripttags.htm}
for a list of valid values.
@@ -758,9 +849,60 @@
\beginlisting
\font \test = "Latin Modern Roman:color=FF0000BB"
\endlisting
+
+ Experimental!\marginpar{\mbox{}\hfill NEW in v3.12!}\phantomsection\label{color-glyphs} The \identifier{color} key has been
+ extended to accept a table with color declarations of (output) glyphs. For example
+
+ \beginlisting
+ \directlua{
+ luaotfload.add_colorscheme("myscheme",
+ {
+ ["00FFFF30"] = {"default"},
+ ["FF0000"] = {"kabeng","ebeng"},
+ ["00FF00"] = {"ivowelsignbeng"},
+ ["0000FF"] = {369} %% 369 is the GID of "nadarabeng"
+ })
+ }
+ \endlisting
+
+ The keys in such a table are like above RGB colors with an optional transparency setting.
+ The values are either lists of glyph names or GID numbers.
+ Both types are font dependant! Not every font use the same
+ glyph names (or even glyph names at all). GID number are font specific anyway. The GID can be found
+ by looking up the \verb+["index"]+ entry in the lua file of a font.
+
+ Such a colorscheme can then be used like this:
+ \beginlisting
+ \font\test={name:Noto Sans Bengali:mode=harf;script=bng2;color=myscheme}
+ \endlisting
+
+ and then would give this output:
+
+
+ {\font\test={name:Noto Sans Bengali:mode=harf;script=bng2;color=myscheme}\test
+ কণ্যা এখন কি করিবে
+ \char"0995 \char"09BF
+ \char"09A8 \char"09CD \char"09A6
+ \char"09CD \char"09B0}
+
+ \endaltitem
+
+
+ \beginaltitem {embolden}
+ A factor, defined as a decimal number.
+
+ For example
+
+ \beginlisting
+ \font\test = "Latin Modern Roman:mode=node;embolden=2;"
+ \endlisting
+
+ {\font\test= "Latin Modern Roman:mode=node;"\test Dies is not bold.
+ \font\test= "Latin Modern Roman:mode=node;embolden=2;" \test Dies is a faked bold font.}
+
\endaltitem
- \beginaltitem {kernfactor \& letterspace}\label{p:letterspace}
+ \beginaltitem {kernfactor \& letterspace}\phantomsection\label{p:letterspace}
Define a font with letterspacing (tracking) enabled.
%
In \identifier{luaotfload}, letterspacing is implemented by
@@ -907,6 +1049,139 @@
\font \test = LatinModernRoman:protrusion=default
\endlisting
\endaltitem
+
+ \beginaltitem {invisible}
+ Default Ignorable characters are control characters that should be invisible by default even if the font has glyphs for them. Since version 3.0 luaotfload makes them invisible, this can be switch on and off with the \texttt{invisible}. By default it is on.
+
+ For example
+
+ \beginlisting
+ \font\amiri={file:amiri-regular.ttf} at 20pt \amiri
+ \char"200Dي\char"200D
+ \endlisting
+
+ {\font\amiri={file:amiri-regular.ttf} at 20pt \amiri \char"200Dي\char"200D}
+
+ \beginlisting
+ \font\amiri={file:amiri-regular.ttf:-invisible;} at 20pt \amiri
+ \char"200Dي\char"200D
+ \endlisting
+
+ {\font\amiri={file:amiri-regular.ttf:-invisible;} at 20pt \amiri \char"200Dي\char"200D}
+
+
+ \endaltitem
+
+ \beginaltitem {multiscript}\phantomsection\label{multiscript}
+ In\marginpar{New in 3.12 -- experimental} fonts many shaping rules are implemented only for specific scripts and so you get correct typesetting only if the \identifier{script} feature is correctly set. This means that to write a text which uses more than one script you have to declare a font for each script and switch fonts even if the font contains glyphs for all scripts.
+ \identifier{multiscript} tries to help here. The feature is experimental and bound to change. Feedback is welcome but you use it at your risk.
+
+ \identifier{multiscript} allows you to declare fonts for various script. The value is either \identifier{auto} described below, or a name which has been previously declared or a combination of both. An example for such a named multiscript could look like this (the colors are only for demonstration):
+
+ \beginlisting
+ \directlua{
+ luaotfload.add_multiscript
+ ("cyrlgrekbeng",
+ {
+ Cyrl = "DejaVuSans:mode=node;script=cyrl;color=FF0000;",
+ Grek = "texgyreheros:mode=harf;script=grek;color=0000FF;",
+ Beng = "NotoSansBengali:mode=harf;script=bng2;color=00FF00;"
+ }
+ )
+ }
+ \endlisting
+
+ \identifier{cyrlgrekbeng} is the name of the multiscript (the name is case insensitive). The keys are ISO language tags (not open type tags!). They are case insensitive too: the example uses an uppercase letter for ISO tags to differentiate them from script tags. The values are font declarations.
+
+ The multiscript can then be used in a font like this:
+
+ \beginlisting
+ \font\test={name:DejaVuSans:mode=node;multiscript=cyrlgrekbeng;}
+ \endlisting
+
+ This would lead to this output:
+
+ {\Large \font\test={name:DejaVuSans:mode=node;multiscript=cyrlgrekbeng;}\test
+ „a^^^^0301123!?“ „π^^^^0301123!?“ „a!?“ „Б123!?“ a „\char"0995\char"09BF 123“
+ }
+
+ It shows that fonts are switched with the scripts.
+
+ Be aware of the following drawbacks:
+
+ \begin{itemize}
+ \item Quite a lot chars can and should be used with more than one script, they belong to the Common or Inherited class. Examples are punctuation chars, digits, accents but also emoji. Currently these chars follow the active script. That's why the digits are all typeset with a different font, the accent over the pi is different to the one over the a, and why the opening quote is sometimes different to the closing quote. It is clear that some tools to force a script (and so a font) locally and globally for such chars are needed.
+
+ \item \identifier{multiscript} doesn't change hyphenation patterns or other language or script related features.
+
+ \item Language packages like \identifier{babel} or \identifier{polyglossia} have code to change the script too which could interfere or clash. This hasn't been tested yet.
+
+ \item \identifier{multiscript} can slow down the compilation.
+ \end{itemize}
+
+ It is possible to use the value \identifier{auto} with \identifier{multiscript}. luaotfload will then switch the script if it detects a char belonging to another script (and if the font support this script). This can be useful for fonts supporting more than one script or when using the \identifier{fallback} key described below.
+
+ It is also possible to combine \identifier{auto} with a named multiscript with the syntax \identifier{multiscript=auto+name}. The rules of the named multiscript will in such cases take precedence and \identifier{auto} used only for other scripts.
+
+
+
+ \endaltitem
+
+ \beginaltitem {fallback}\label{fallback}
+ This\marginpar{New in 3.12 -- experimental} allows you to define a chain of fonts which are used if glyphs are missing in the main font. It works only for text fonts, not for math fonts set with the \identifier{unicode-math} package.
+ The feature is experimental and bound to change. Feedback is welcome but you use it at your risk.
+ For example
+
+ \beginlisting
+ \directlua
+ {luaotfload.add_fallback
+ ("myfallback",
+ {
+ "DejaVuSans:mode=harf;script=grek;color=FF0000;",
+ "cmuserif:mode=node;script=cyrl;color=00FF00;",
+ "NotoSansBengali:mode=harf;script=bng2;color=0000FF;"
+ "NotoColorEmoji:mode=harf;"
+ }
+ )
+ }
+ \endlisting
+
+ This fallback can then be used e.g. like this:
+
+ \beginlisting
+ \font\test={name:LatinModernRoman:mode=node;fallback=myfallback;}
+ \endlisting
+
+ {\Large
+ \font\test={name:LatinModernRoman:mode=node;fallback=myfallback;}\test
+ 1234 a^^^^0301 π^^^^0301 a!? π123!? a БѨ123!? a \char"1F600\ \char"1F986\ \char"0995\char"09BF a „π“ a „Б“
+ }
+
+ Interesting points in the output are
+ \begin{itemize}
+ \item The accent over the pi, the digits and the quotes are all from the base font. Only missing glyphs are from the fallback.
+ \item The cyrillic is printed with the DejaVu font, despite the fact that is sets the script to \identifier{grek} and that the next font in the fallback chain would fit better.
+ \item The duck emoji is from the Noto font, while the face is from DejaVu as it comes first in the chain.
+ \end{itemize}
+
+ The \identifier{fallback} can be combined with the \identifier{multiscript}. For example
+
+ \beginlisting
+ \font\test={name:LatinModernRoman:mode=node;fallback=myfallback;multiscript=auto;}
+ \endlisting
+
+ {\Large
+ \font\test={name:LatinModernRoman:mode=node;fallback=myfallback;multiscript=auto;}\test
+ 1234 a^^^^0301 π^^^^0301 a!? π123!? a БѨ123!? a \char"1F600\ \char"1F986\ \char"0995\char"09BF a „π“ a „Б“
+ }
+
+ Now the accent over the pi is better. The digits after the pi and the closing quote use the DejaVu font. The digits after
+ the cyrillic use the Latin Modern font because of an interesting \enquote{feature} of this font: It claims to know the \identifier{cyrl} script despite the fact that it doesn't contain any cyrillic glyphs.
+
+ \identifier{fallback} can be nested: fonts in the fallback table can refer to another \identifier{fallback} table.
+
+ As with the \identifier{multiscript} key more control over the used glyph and script in edge cases will be needed.
+ \endaltitem
\enddescriptions
\endsubsection
@@ -975,8 +1250,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\beginsection {Combining fonts}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-Version 2.7 and later support combining characters from multiple fonts into a
+Beside the new keys \identifier{multiscript} and \identifier{fallback} described earlier
+Version 2.7 and later support another method to combine characters from multiple fonts into a
single virtualized one. This requires that the affected fonts be loaded in
advance as well as a special \emphasis{request syntax}. Furthermore, this
allows to define \emphasis{fallback fonts} to supplement fonts that may lack
@@ -1780,18 +2055,32 @@
has glyph \luaident{index}.
\endaltitem
- \beginaltitem {aux.slot_of_name(name : string)}
- Translates an Adobe Glyph name to the corresponding glyph
- slot.
+ \beginaltitem {aux.slot_of_name(id : int, name : string)}
+ Translates a name for a glyph in font \luaident{id} to the
+ corresponding glyph slot which can be used e.g.\ as an argument to
+ \inlinecode{\char}. The number is assigned by the \identifier{luaotfload} code
+ and not related to the glyph index (GID) of the font as stored in the \identifier{[index]} field
+ of the lua-file.
+ \endaltitem
+
+ \beginaltitem {aux.gid_of_name(id : int, name : string)}
+ Translates\marginpar{New version 3.12} a name for a glyph in font \luaident{id} to the
+ corresponding glyph index (GID) as stored in the \identifier{[index]} field.
\endaltitem
- \beginaltitem {aux.name_of_slot(slot : int)}
+ \beginaltitem {aux.name_of_slot(id : int, slot : int)}
The inverse of \luaident{slot_of_name}; note that this
might be incomplete as multiple glyph names may map to the
same codepoint, only one of which is returned by
\luaident{name_of_slot}.
\endaltitem
+ \beginaltitem {aux.gid_of_name(id : int, name : string)}
+ Translates a Glyph name to the corresponding GID in font
+ \luaident{id}. This corresponds to the value returned by
+ \inlinecode{\XeTeXglyphindex} in \XeTeX.
+ \endaltitem
+
\beginaltitem {aux.provides_script(id : int, script : string)}
Test if a font supports \luaident{script}.
\endaltitem
Binary files old/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.pdf and new/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst new/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst
--- old/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst 2020-02-03 23:30:09.000000000 +0100
@@ -6,9 +6,9 @@
generate and query the Luaotfload font names database
-----------------------------------------------------------------------
-:Date: 2019-02-14
+:Date: 2020-02-02
:Copyright: GPL v2.0
-:Version: 2.96
+:Version: 3.12
:Manual section: 1
:Manual group: text processing
@@ -304,7 +304,7 @@
* ``texdoc luaotfload`` to display the manual for the *Luaotfload*
package
-* Luaotfload development `<https://github.com/lualatex/luaotfload>`_
+* Luaotfload development `<https://github.com/latex3/luaotfload>`_
* LuaLaTeX mailing list `<http://tug.org/pipermail/lualatex-dev/>`_
* LuaTeX `<http://luatex.org/>`_
* ConTeXt `<http://wiki.contextgarden.net>`_
@@ -319,8 +319,8 @@
=======================================================================
*Luaotfload* was developed by the LuaLaTeX dev team
-(`<https://github.com/lualatex/>`__). It is currently maintained by Ulrike Fischer
-and Marcel Krüger at `<https://github.com/u-fischer/luaotfload>`__
+(`<https://github.com/lualatex/>`__). It is currently maintained by the LaTeX
+Project Team at `<https://github.com/latex3/luaotfload>`__
The fontloader code is provided by Hans Hagen of Pragma ADE, Hasselt
NL (`<http://pragma-ade.com/>`__).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst new/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst
--- old/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst 2020-02-03 23:30:09.000000000 +0100
@@ -6,9 +6,9 @@
Luaotfload configuration file
-----------------------------------------------------------------------
-:Date: 2019-02-14
+:Date: 2020-02-02
:Copyright: GPL v2.0
-:Version: 2.96
+:Version: 3.12
:Manual section: 5
:Manual group: text processing
@@ -386,7 +386,7 @@
* ``texdoc luaotfload`` to display the PDF manual for the *Luaotfload*
package
-* Luaotfload development `<https://github.com/u-fischer/luaotfload>`_
+* Luaotfload development `<https://github.com/latex3/luaotfload>`_
* LuaLaTeX mailing list `<http://tug.org/pipermail/lualatex-dev/>`_
* LuaTeX `<http://luatex.org/>`_
* Luaotfload on CTAN `<http://ctan.org/pkg/luaotfload>`_
@@ -402,8 +402,8 @@
=======================================================================
*Luaotfload* was developed by the LuaLaTeX dev team
-(`<https://github.com/lualatex/>`_). It is currently maintained by Ulrike Fischer
-and Marcel Krüger at `<https://github.com/u-fischer/luaotfload>`_
+(`<https://github.com/lualatex/>`_). It is currently maintained by the
+LaTeX Project Team at `<https://github.com/latex3/luaotfload>`_
This manual page was written by Philipp Gesang <phg(a)phi-gamma.net>.
Binary files old/texmf-dist/doc/luatex/luaotfload/scripts-demo.pdf and new/texmf-dist/doc/luatex/luaotfload/scripts-demo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/scripts-demo.tex new/texmf-dist/doc/luatex/luaotfload/scripts-demo.tex
--- old/texmf-dist/doc/luatex/luaotfload/scripts-demo.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/scripts-demo.tex 2019-11-11 22:44:06.000000000 +0100
@@ -0,0 +1,15 @@
+\documentclass{standalone}
+
+\font\burmesefont={file:NotoSerifMyanmar-Regular.ttf:mode=harf;script=mym2;}
+\font\devafont={file:NotoSansDevanagari-Regular.ttf:mode=harf;script=dev2;}
+\font\banglafont={file:NotoSansBengali-Regular.ttf:mode=harf;script=bng2;}
+\font\tibetanfont={file:NotoSerifTibetan-Regular.ttf:mode=harf;script=tibt;}
+\standaloneenv{tabular}
+\begin{document}
+\begin{tabular}{l}
+\burmesefont မ္မတီခေါင်းလောင်းကြီ\\
+\devafont क्रर्कि \\
+\banglafont কণ্যা এখন কি করিবে\\
+\tibetanfont སྐྱེས་ཙམ་ཉིད་ནས་ཆེ་མཐོངས་དང༌།
+\end{tabular}
+\end{document}
Binary files old/texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.pdf and new/texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.tex new/texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.tex
--- old/texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.tex 2019-11-05 22:35:11.000000000 +0100
@@ -0,0 +1,9 @@
+\documentclass[12pt]{standalone}
+
+\begin{document}
+
+\pardir TRT\textdir TRT
+\font\test={file:AwamiNastaliq-Regular.ttf:mode=harf;shaper=graphite2}
+\test
+اُرْشَلیمئے
+\end{document}
Binary files old/texmf-dist/doc/luatex/luaotfload/shaper-demo.pdf and new/texmf-dist/doc/luatex/luaotfload/shaper-demo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/luaotfload/shaper-demo.tex new/texmf-dist/doc/luatex/luaotfload/shaper-demo.tex
--- old/texmf-dist/doc/luatex/luaotfload/shaper-demo.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/luatex/luaotfload/shaper-demo.tex 2019-11-05 22:35:11.000000000 +0100
@@ -0,0 +1,7 @@
+\documentclass[12pt]{standalone}
+\begin{document}
+\pardir TRT\textdir TRT
+\font\test={file:AwamiNastaliq-Regular.ttf:mode=harf;shaper=ot}
+\test
+اُرْشَلیمئے
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/luaotfload-tool.1 new/texmf-dist/doc/man/man1/luaotfload-tool.1
--- old/texmf-dist/doc/man/man1/luaotfload-tool.1 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/man/man1/luaotfload-tool.1 2020-02-03 23:30:09.000000000 +0100
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH LUAOTFLOAD-TOOL 1 "2019-02-14" "2.96" "text processing"
+.TH LUAOTFLOAD-TOOL 1 "2020-02-02" "3.12" "text processing"
.SH NAME
luaotfload-tool \- generate and query the Luaotfload font names database
.
@@ -326,7 +326,7 @@
.SS miscellaneous
.INDENT 0.0
.TP
-.BI \-\-verbose\fB= N\fP,\fB \ \-v
+.BI \-\-verbose\fB= N\fR,\fB \ \-v
Set verbosity level to \fIn\fP or the number of
repetitions of \fB\-v\fP\&.
.TP
@@ -414,7 +414,7 @@
\fBtexdoc luaotfload\fP to display the manual for the \fILuaotfload\fP
package
.IP \(bu 2
-Luaotfload development \fI\%https://github.com/lualatex/luaotfload\fP
+Luaotfload development \fI\%https://github.com/latex3/luaotfload\fP
.IP \(bu 2
LuaLaTeX mailing list \fI\%http://tug.org/pipermail/lualatex\-dev/\fP
.IP \(bu 2
@@ -430,8 +430,8 @@
.SH AUTHORS
.sp
\fILuaotfload\fP was developed by the LuaLaTeX dev team
-(\fI\%https://github.com/lualatex/\fP). It is currently maintained by Ulrike Fischer
-and Marcel Krüger at \fI\%https://github.com/u\-fischer/luaotfload\fP
+(\fI\%https://github.com/lualatex/\fP). It is currently maintained by the LaTeX
+Project Team at \fI\%https://github.com/latex3/luaotfload\fP
The fontloader code is provided by Hans Hagen of Pragma ADE, Hasselt
NL (\fI\%http://pragma\-ade.com/\fP).
.sp
Binary files old/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf and new/texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man5/luaotfload.conf.5 new/texmf-dist/doc/man/man5/luaotfload.conf.5
--- old/texmf-dist/doc/man/man5/luaotfload.conf.5 2019-02-25 23:22:50.000000000 +0100
+++ new/texmf-dist/doc/man/man5/luaotfload.conf.5 2020-02-03 23:30:09.000000000 +0100
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH LUAOTFLOAD.CONF 5 "2019-02-14" "2.96" "text processing"
+.TH LUAOTFLOAD.CONF 5 "2020-02-02" "3.12" "text processing"
.SH NAME
luaotfload.conf \- Luaotfload configuration file
.
@@ -605,7 +605,7 @@
\fBtexdoc luaotfload\fP to display the PDF manual for the \fILuaotfload\fP
package
.IP \(bu 2
-Luaotfload development \fI\%https://github.com/u\-fischer/luaotfload\fP
+Luaotfload development \fI\%https://github.com/latex3/luaotfload\fP
.IP \(bu 2
LuaLaTeX mailing list \fI\%http://tug.org/pipermail/lualatex\-dev/\fP
.IP \(bu 2
@@ -622,8 +622,8 @@
.SH AUTHORS
.sp
\fILuaotfload\fP was developed by the LuaLaTeX dev team
-(\fI\%https://github.com/lualatex/\fP). It is currently maintained by Ulrike Fischer
-and Marcel Krüger at \fI\%https://github.com/u\-fischer/luaotfload\fP
+(\fI\%https://github.com/lualatex/\fP). It is currently maintained by the
+LaTeX Project Team at \fI\%https://github.com/latex3/luaotfload\fP
.sp
This manual page was written by Philipp Gesang <\fI\%phg(a)phi\-gamma.net\fP>.
.SH COPYRIGHT
Binary files old/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf and new/texmf-dist/doc/man/man5/luaotfload.conf.man5.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luaotfload.doc.tlpobj new/tlpkg/tlpobj/luaotfload.doc.tlpobj
--- old/tlpkg/tlpobj/luaotfload.doc.tlpobj 2019-02-28 03:51:15.000000000 +0100
+++ new/tlpkg/tlpobj/luaotfload.doc.tlpobj 2020-02-04 01:55:17.000000000 +0100
@@ -1,8 +1,8 @@
name luaotfload.doc
category Package
-revision 50131
+revision 53652
shortdesc doc files of luaotfload
-docfiles size=208
+docfiles size=254
texmf-dist/doc/luatex/luaotfload/COPYING
texmf-dist/doc/luatex/luaotfload/NEWS
texmf-dist/doc/luatex/luaotfload/README.md
@@ -16,6 +16,12 @@
texmf-dist/doc/luatex/luaotfload/luaotfload-tool.rst
texmf-dist/doc/luatex/luaotfload/luaotfload.conf.example
texmf-dist/doc/luatex/luaotfload/luaotfload.conf.rst
+ texmf-dist/doc/luatex/luaotfload/scripts-demo.pdf
+ texmf-dist/doc/luatex/luaotfload/scripts-demo.tex
+ texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.pdf
+ texmf-dist/doc/luatex/luaotfload/shaper-demo-graphite.tex
+ texmf-dist/doc/luatex/luaotfload/shaper-demo.pdf
+ texmf-dist/doc/luatex/luaotfload/shaper-demo.tex
texmf-dist/doc/man/man1/luaotfload-tool.1
texmf-dist/doc/man/man1/luaotfload-tool.man1.pdf
texmf-dist/doc/man/man5/luaotfload.conf.5
++++++ luaotfload.tar.xz ++++++
++++ 92355 lines of diff (skipped)
++++++ luaotfload_varfonts.dif ++++++
--- /var/tmp/diff_new_pack.6jpmtL/_old 2020-05-29 21:29:53.721313633 +0200
+++ /var/tmp/diff_new_pack.6jpmtL/_new 2020-05-29 21:29:53.725313645 +0200
@@ -47,7 +47,7 @@
if cachepaths == "" then
--- texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua
+++ texmf-dist/tex/luatex/luaotfload/fontloader-reference.lua 2019-05-10 09:32:16.562792353 +0000
-@@ -4314,12 +4314,35 @@ if not caches.namespace or caches.namesp
+@@ -4472,12 +4472,35 @@ if not caches.namespace or caches.namesp
end
do
local cachepaths=kpse.expand_var('$TEXMFCACHE') or ""
++++++ luapackageloader.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luapackageloader/README.md new/doc/luatex/luapackageloader/README.md
--- old/doc/luatex/luapackageloader/README.md 2017-06-06 23:51:05.000000000 +0200
+++ new/doc/luatex/luapackageloader/README.md 2019-12-22 22:55:58.000000000 +0100
@@ -1,6 +1,6 @@
# luapackageloader
-CTAN package to allow LuaTeX to load packages from the default `package.path` and `package.cpath` locations. This could be useful
-to load external Lua modules, including modules installed via [LuaRocks](https://luarocks.org).
+CTAN package to allow LuaTeX to load modules from the default `package.path` and `package.cpath` locations. This could be used
+to load external Lua modules outside the TEXMF tree, including modules installed via [LuaRocks](https://luarocks.org).
## Usage
See the [PDF documentation](luapackageloader.pdf) for details.
Binary files old/doc/luatex/luapackageloader/luapackageloader.pdf and new/doc/luatex/luapackageloader/luapackageloader.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luapackageloader.doc.tlpobj new/tlpkg/tlpobj/luapackageloader.doc.tlpobj
--- old/tlpkg/tlpobj/luapackageloader.doc.tlpobj 2019-02-28 03:51:18.000000000 +0100
+++ new/tlpkg/tlpobj/luapackageloader.doc.tlpobj 2020-04-19 18:10:18.000000000 +0200
@@ -1,6 +1,6 @@
name luapackageloader.doc
category Package
-revision 44865
+revision 54779
shortdesc doc files of luapackageloader
relocated 1
docfiles size=11
++++++ luapackageloader.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luapackageloader/luapackageloader.lua new/tex/luatex/luapackageloader/luapackageloader.lua
--- old/tex/luatex/luapackageloader/luapackageloader.lua 2017-07-22 01:06:28.000000000 +0200
+++ new/tex/luatex/luapackageloader/luapackageloader.lua 2019-12-22 22:55:58.000000000 +0100
@@ -1,7 +1,7 @@
-- Author: Deepak Jois
--- License: http://www.latex-project.org/lppl.txt
--- Date: 2017/05/26
--- Version: 0.1
+-- License: LPPL Version 1.3c or higher <http://www.latex-project.org/lppl.txt>
+-- Date: 2019/12/21
+-- Version: 0.2
local luapackageloader = {}
-- Cache the current kpse based searchers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luapackageloader/luapackageloader.sty new/tex/luatex/luapackageloader/luapackageloader.sty
--- old/tex/luatex/luapackageloader/luapackageloader.sty 2017-06-06 23:51:05.000000000 +0200
+++ new/tex/luatex/luapackageloader/luapackageloader.sty 2019-12-22 22:55:58.000000000 +0100
@@ -1,15 +1,15 @@
% Author: Deepak Jois
-% License: http://www.latex-project.org/lppl.txt
-% Date: 2017/05/26
-% Version: 0.1
-\def\luapackageloaderpkgdate{2017/05/26}
-\def\luapackageloaderversion{0.1}
+% License: LPPL Version 1.3c or higher <http://www.latex-project.org/lppl.txt>
+% Date: 2019/12/21
+% Version: 0.2
+\def\luapackageloaderpkgdate{2019/12/21}
+\def\luapackageloaderversion{0.2}
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
\input ifluatex.sty\relax
\else
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{}[\luapackageloaderpkgdate\space v\luapackageloaderversion\space Lua package searchers for LuaTeX]
+ \ProvidesPackage{luapackageloader}[\luapackageloaderpkgdate\space v\luapackageloaderversion\space Lua package searchers for LuaTeX]
\RequirePackage{ifluatex}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luapackageloader.tlpobj new/tlpkg/tlpobj/luapackageloader.tlpobj
--- old/tlpkg/tlpobj/luapackageloader.tlpobj 2019-02-28 03:51:18.000000000 +0100
+++ new/tlpkg/tlpobj/luapackageloader.tlpobj 2020-04-19 18:10:18.000000000 +0200
@@ -1,19 +1,19 @@
name luapackageloader
category Package
-revision 44865
+revision 54779
shortdesc Allow LuaTeX to load external Lua packages
relocated 1
longdesc This package allows LuaTeX to load packages from the default
longdesc package.path and package.cpath locations. This could be useful
longdesc to load external Lua modules, including modules installed via
longdesc LuaRocks. This package requires ifluatex.
+depend iftex
runfiles size=2
RELOC/tex/luatex/luapackageloader/luapackageloader.lua
RELOC/tex/luatex/luapackageloader/luapackageloader.sty
catalogue-contact-bugs https://github.com/deepakjois/luapackageloader/issues
catalogue-contact-repository https://github.com/deepakjois/luapackageloader
catalogue-ctan /macros/luatex/generic/luapackageloader
-catalogue-date 2017-06-07 05:22:03 +0200
catalogue-license lppl1.3c
catalogue-topics luatex lua-supp use-lua
-catalogue-version 0.1
+catalogue-version 0.2
++++++ luatex.doc.tar.xz ++++++
++++ 38926 lines of diff (skipped)
++++++ luatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/web2c/texmfcnf.lua new/texmf-dist/web2c/texmfcnf.lua
--- old/texmf-dist/web2c/texmfcnf.lua 2019-02-28 00:33:00.000000000 +0100
+++ new/texmf-dist/web2c/texmfcnf.lua 2020-03-01 23:41:34.000000000 +0100
@@ -45,13 +45,13 @@
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
TEXMFSYSVAR = "selfautoparent:texmf-var",
- TEXMFVAR = "home:.texlive2019/texmf-var",
+ TEXMFVAR = "home:.texlive2020/texmf-var",
-- We have only one cache path but there can be more. The first writable one
-- will be chosen but there can be more readable paths.
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
- TEXMFCONFIG = "home:.texlive2019/texmf-config",
+ TEXMFCONFIG = "home:.texlive2020/texmf-config",
-- I don't like this texmf under home and texmf-home would make more
-- sense. One never knows what installers put under texmf anywhere and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatex.tlpobj new/tlpkg/tlpobj/luatex.tlpobj
--- old/tlpkg/tlpobj/luatex.tlpobj 2019-03-27 02:24:13.000000000 +0100
+++ new/tlpkg/tlpobj/luatex.tlpobj 2020-03-29 03:11:17.000000000 +0200
@@ -1,6 +1,6 @@
name luatex
category TLCore
-revision 50602
+revision 54610
shortdesc The LuaTeX engine
longdesc LuaTeX is an extended version of pdfTeX using Lua as an
longdesc embedded scripting language. The LuaTeX project's main
@@ -19,10 +19,10 @@
depend plain
depend tex-ini-files
depend unicode-data
+depend hyph-utf8
depend luatex.ARCH
-execute AddFormat name=luatex engine=luatex options="luatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data
-execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data
-execute AddFormat name=luajittex engine=luajittex options="luatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data
+execute AddFormat name=luatex engine=luatex options="luatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data,hyph-utf8
+execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" patterns=language.def,language.dat.lua fmttriggers=cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data,hyph-utf8
runfiles size=37
texmf-dist/tex/generic/config/luatex-unicode-letters.tex
texmf-dist/tex/generic/config/luatexiniconfig.tex
@@ -31,6 +31,5 @@
catalogue-contact-home http://luatex.org
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/luatexdir
catalogue-contact-support http://lists.tug.org/luatex
-catalogue-date 2018-12-31 06:11:12 +0100
catalogue-license gpl2
catalogue-topics engine
++++++ luatex_cnf.dif ++++++
--- /var/tmp/diff_new_pack.6jpmtL/_old 2020-05-29 21:29:54.309315384 +0200
+++ /var/tmp/diff_new_pack.6jpmtL/_new 2020-05-29 21:29:54.309315384 +0200
@@ -3,7 +3,7 @@
1 file changed, 16 insertions(+), 8 deletions(-)
--- texmf-dist/web2c/texmfcnf.lua
-+++ texmf-dist/web2c/texmfcnf.lua 2019-05-10 09:42:30.695251184 +0000
++++ texmf-dist/web2c/texmfcnf.lua 2020-03-26 12:29:02.097164665 +0000
@@ -42,16 +42,24 @@ return {
-- "selfautoparent:",
-- }
@@ -18,7 +18,7 @@
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
- TEXMFSYSVAR = "selfautoparent:texmf-var",
-- TEXMFVAR = "home:.texlive2019/texmf-var",
+- TEXMFVAR = "home:.texlive2020/texmf-var",
+ TEXMFSYSVAR = "/var/lib/texmf",
+ TEXMFVAR = "$TEXMFSYSVAR",
+ HOMECACHE = "home:.cache/texmf/fonts",
@@ -27,7 +27,7 @@
-- will be chosen but there can be more readable paths.
- TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
-- TEXMFCONFIG = "home:.texlive2019/texmf-config",
+- TEXMFCONFIG = "home:.texlive2020/texmf-config",
+ TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR;$HOMECACHE",
+ TEXMFCONFIG = "$TEXMFSYSCONFIG",
++++++ luatexbase.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatexbase.doc.tlpobj new/tlpkg/tlpobj/luatexbase.doc.tlpobj
--- old/tlpkg/tlpobj/luatexbase.doc.tlpobj 2019-02-28 03:52:48.000000000 +0100
+++ new/tlpkg/tlpobj/luatexbase.doc.tlpobj 2019-11-07 18:46:19.000000000 +0100
@@ -1,6 +1,6 @@
name luatexbase.doc
category Package
-revision 38550
+revision 52663
shortdesc doc files of luatexbase
relocated 1
docfiles size=66
++++++ luatexbase.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatexbase.tlpobj new/tlpkg/tlpobj/luatexbase.tlpobj
--- old/tlpkg/tlpobj/luatexbase.tlpobj 2019-02-28 03:52:48.000000000 +0100
+++ new/tlpkg/tlpobj/luatexbase.tlpobj 2019-11-07 18:46:19.000000000 +0100
@@ -1,6 +1,6 @@
name luatexbase
category Package
-revision 38550
+revision 52663
shortdesc Basic resource management for LuaTeX code
relocated 1
longdesc The LaTeX kernel (LaTeX2e 2015/10/01 onward) builds in support
@@ -11,6 +11,7 @@
longdesc differences. This 'stub' package provides a compatibility layer
longdesc to allow existing packages to upgrade smoothly to the new
longdesc support structure.
+depend ctablestack
runfiles size=11
RELOC/tex/luatex/luatexbase/luatexbase-attr.sty
RELOC/tex/luatex/luatexbase/luatexbase-cctb.sty
++++++ luatexja.doc.tar.xz ++++++
++++ 3664 lines of diff (skipped)
++++++ luatexja.tar.xz ++++++
++++ 13763 lines of diff (skipped)
++++++ luatexko.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luatexko/ChangeLog new/doc/luatex/luatexko/ChangeLog
--- old/doc/luatex/luatexko/ChangeLog 2019-04-06 23:13:13.000000000 +0200
+++ new/doc/luatex/luatexko/ChangeLog 2020-03-20 22:28:12.000000000 +0100
@@ -1,3 +1,75 @@
+2020-03-20 Dohyun Kim <nomos at ktug org>
+
+ Version 2.8
+
+ * luatexko.lua, luatexko.sty:
+ use atbegshi package for dotemph, uline, and ruby
+
+2020-03-14 Dohyun Kim <nomos at ktug org>
+
+ Version 2.7
+
+ * luatexko.lua:
+ use post_linebreak_filter callback;
+ support expansion/protrusion in harf mode
+
+2020-02-17 Dohyun Kim <nomos at ktug org>
+
+ Version 2.6
+
+ * luatexko.lua:
+ discourage font substitution of monospaced ascii punctuations
+
+ * luatexko.sty:
+ use latex's newly introduced \@{rm|sf|tt|default}familyhook;
+ suppress bx-font-not-found warnings and make \bfseries work again
+
+2019-12-01 Dohyun Kim <nomos at ktug org>
+
+ Version 2.5
+
+ * luatexko.lua: start to support luahbtex
+ * luatexko.sty: 2020 expl3 deprecation removals
+
+2019-08-01 Dohyun Kim <nomos at ktug org>
+
+ Version 2.4
+
+ * luatexko.lua: allow linebreak before/after a normal hbox
+ * luatexko.{sty,lua}: moveleft horizontal box inside vertical writing
+
+2019-06-21 Dohyun Kim <nomos at ktug org>
+
+ Version 2.3
+
+ * luatexko.lua: prevent discretionary node after Kana;
+ provide lua functions deactivateall() and reactivateall().
+
+2019-06-07 Dohyun Kim <nomos at ktug org>
+
+ Version 2.2
+
+ * luatexko.sty, luatexko.lua: provide font option `InterCharStretch'
+
+2019-05-25 Dohyun Kim <nomos at ktug org>
+
+ Version 2.1
+
+ * luatexko.sty: give smallest stretch to quite short ruby;
+ allow star option to markoverwith.
+
+
+2019-05-01 Dohyun Kim <nomos at ktug org>
+
+ Version 2.0
+
+ * luatexko-core.sty: removed.
+ * luatexko.lua: totally rewritten.
+ * luatexko.sty: Package option `nofontspec' removed.
+ Font options `CompressPunctuations' `RemoveClassicSpaces'
+ and `InterCharacter' added.
+ `\registerbreakablebefore' and `\registerbreakableafter' added.
+
2019-04-06 Dohyun Kim <nomos at ktug org>
Version 1.24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luatexko/README new/doc/luatex/luatexko/README
--- old/doc/luatex/luatexko/README 2019-04-06 23:13:13.000000000 +0200
+++ new/doc/luatex/luatexko/README 2020-03-20 22:28:12.000000000 +0100
@@ -1,17 +1,16 @@
-LuaTeX-ko Package version 1.24 (2019/04/06)
+LuaTeX-ko Package version 2.8 (2020/03/20)
===========================================
This is a Lua(La)TeX macro package that supports typesetting Korean
documents including Old Hangul texts. As LuaTeX has opened up access to
almost all the hidden routines of TeX engine, users can obtain more
-beautiful outcome using this package rather than other Hangul macros
+beautiful outcome using this package rather than other Hangul packages
operating on other engines.
-LuaTeX version 0.95+ and luaotfload package version 2.7+ are required for
+LuaTeX version 1.10+ and luaotfload package version 2.96+ are required for
this package to run.
-This package also requires both cjk-ko and xetexko packages for its full
-functionality.
+This package also requires cjk-ko package for its full functionality.
License
@@ -40,7 +39,6 @@
TeXinputs
luatexko.sty -> tex/luatex/luatexko/
- luatexko-core.sty -> tex/luatex/luatexko/
luatexko.lua -> tex/luatex/luatexko/
luatexko-normalize.lua -> tex/luatex/luatexko/
luatexko-uhc2utf8.lua -> tex/luatex/luatexko/
@@ -80,10 +78,6 @@
[hanja]
Load Hanja captions. Also apply other settings as [hangul] option does.
- [nofontspec]
-Prevents loading of fontspec package. Entire document will be typeset
-with Type1 fonts.
-
Hangul Font Commands
--------------------
@@ -114,8 +108,8 @@
\hanjafontspec \newhanjafontfamily \addhanjafontfeature
\fallbackfontspec \newfallbackfontfamily \addfallbackfontfeature
-If any of these CJK fonts are not specified, Nanum Type1 fonts from
-nanumtype1 package will be used for typesetting CJK characters.
+If any of these CJK fonts are not specified, UnBatang/UnDotum TrueType
+fonts will be used for typesetting CJK characters.
Hangul Font Options
@@ -134,13 +128,9 @@
Other User Commands
-------------------
- \luatexuhcinputencoding=<number>
-When <number> is 1 or greater, UHC (aka. Windows CP949) input encoding
-is allowed. <number> 0 restores UTF-8, the default input encoding.
-
\hangulpunctuations=<number>
-When <number> is 1 or greater, latin punctuations will be typeset with
-hangul fonts.
+When <number> is 1 or greater (being default value), latin punctuations
+will be typeset with hangul fonts.
\dotemph{...}
Emphasise Hangul or Hanja by putting dot above.
Binary files old/doc/luatex/luatexko/luatexko-doc.pdf and new/doc/luatex/luatexko/luatexko-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luatexko/luatexko-doc.tex new/doc/luatex/luatexko/luatexko-doc.tex
--- old/doc/luatex/luatexko/luatexko-doc.tex 2019-04-06 23:13:13.000000000 +0200
+++ new/doc/luatex/luatexko/luatexko-doc.tex 2020-03-20 22:28:12.000000000 +0100
@@ -8,468 +8,646 @@
%%
%% public domain
-%\RequirePackage{luatex85}
\documentclass[a4paper]{article}
\usepackage[hmargin=3.8cm]{geometry}
+\usepackage[svgnames]{xcolor}
+\usepackage{luacolor}
\usepackage[hangul]{luatexko}
-\usepackage{luamplib}
+\directlua{
+ local gidoffset = 0x120000
+ local notoserifcjkkr_hb = {
+ [171] = { 0.5, 0 }, % «
+ [187] = { 0, 0.5 }, % »
+ [62253+gidoffset] = { 0.5, 0 }, % (
+ [62254+gidoffset] = { 0, 0.5 }, % )
+ [62255+gidoffset] = { 0, 1 }, % ,
+ [62257+gidoffset] = { 0, 1 }, % .
+ [62259+gidoffset] = { 0, 0.5 }, % :
+ [62260+gidoffset] = { 0, 0.5 }, % ;
+ [62270+gidoffset] = { 1, 0 }, % ‘
+ [62271+gidoffset] = { 0, 1 }, % ’
+ [62273+gidoffset] = { 0.5, 0 }, % “
+ [62274+gidoffset] = { 0, 0.5 }, % ”
+ }
+ fonts.protrusions.setups.notoserifcjk = notoserifcjkkr_hb
+}
+\defaultfontfeatures+{Renderer=OpenType}
+\setmainfont{Latin Modern Roman}[Expansion] % for hb tlig
\setmainhangulfont{Noto Serif CJK KR}[
+ Scale=0.98,
AutoFakeSlant,
Script=Hangul,
Language=Korean,
- LocalForms=On,
UprightFont=* Light,
BoldFont=* Bold,
InterLatinCJK=.125em,
- Expansion, Protrusion,
+ Expansion, Protrusion=notoserifcjk,
]
+\setsansfont{Latin Modern Sans}
\setsanshangulfont{Noto Sans CJK KR}[
+ Scale=0.98,
Script=Hangul,
Language=Korean,
UprightFont=* DemiLight,
BoldFont=* Bold,
InterLatinCJK=.125em,
+ CompressPunctuations,
]
\setmonofont{Inconsolatazi4}[
- Color=191970, % MidnightBlue
+ Scale=0.98,
+ CharRaise=0.125ex,
+ Color=MidnightBlue,
]
\setmonohangulfont{Noto Sans CJK KR}[
+ Scale=0.98,
UprightFont=* DemiLight,
BoldFont=* Bold,
- CharRaise=-.25ex,
- Color=191970, % MidnightBlue
+ CharRaise=-.125ex,
+ Color=MidnightBlue,
+]
+\setmathhangulfont{Noto Sans CJK KR}[
+ Script=Hangul,
+ Language=Korean,
+ SizeFeatures={
+ {Size=-6, Font=* Medium},
+ {Size=6-9, Font=* Regular},
+ {Size=9-, Font=* DemiLight},
+ },
+]
+\newhangulfontfamily\verticalhangulfont{Noto Sans CJK KR}[
+ Renderer=Node,
+ Script=Hangul,
+ Language=Korean,
+ UprightFont=* DemiLight,
+ BoldFont=* Bold,
+ InterLatinCJK=.125em,
+ Vertical=Alternates,
+ RawFeature=vertical,
+ CompressPunctuations,
+ InterCharStretch=1pt,
+ CharRaise=3.6pt,
+ CharacterWidth=Full,
+]
+\newhangulfontface\rubyfont{Noto Serif CJK KR Medium}[
+ Script=Hangul,
+ Language=Korean,
]
\usepackage{hologo}
\def\luatex{\hologo{LuaTeX}}
-\def\MP{\hologo{METAPOST}}
\def\XeTeX{\hologo{XeTeX}}
-\usepackage[pdfencoding=auto,bookmarksnumbered,hidelinks]{hyperref}
+\usepackage[hidelinks]{hyperref}
\edef\verbatim{\unexpanded\expandafter{\verbatim\linespread{1.1}\selectfont}}
\edef\itemize{\unexpanded\expandafter{\itemize\small}}
-\catcode`|=13 \def|{\verb|\let\\=\textbackslash} %|
+\catcode`|=13 \protected\def|{\verb|\let\\=\textbackslash}
+\def\nohyphen{\language\csname l@nohyphenation\endcsname}
+\protected\def\cs#1{\texttt{\nohyphen \textbackslash\detokenize{#1}}}
+\protected\def\pkgkwd#1#{\leavevmode
+ \ifx\relax#1\relax \expandafter\luatexkopkgkwd
+ \else \expandafter\luatexkopkgkwdX \fi}
+\def\luatexkopkgkwd#1{\texttt{\nohyphen \string#1}\luatexkopkgkwdX{#1}}
+\def\luatexkopkgkwdX#1{\marginpar{%
+ \hfuzz\maxdimen \texttt{\nohyphen \footnotesize \string#1}}}
\def\logoko{\textsf{k}\kern-.0625em\textit{o}}
\def\luatexko{\luatex-\logoko}
\def\texlive{\TeX\ Live}
\def\kotex{\logoko\kern-.1ex .\kern-.1667em \TeX}
-\edef\section#1{\unexpanded\expandafter{\section{\empty}\vskip-5pt\hrule\nobreak\vskip5pt}}
\def\hemph#1{\textsf{\bfseries #1}}
-\def\cs#1{\texttt{\textbackslash\detokenize{#1}}}
\def\ldots{$\dots$}
-\registerpunctuations{`-}
-\widowpenalty10000 \clubpenalty10000
-\automatichyphenmode=1 % for emdash in tl2019 pretest
\begin{document}
\title{\luatexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize |<nomos at ktug org>| \and
Soojin Nam \normalsize |<jsunam at gmail com>| \and
\normalsize <\url{http://github.com/dohyunkim/luatexko}>}
-\date{Version 1.24\quad 2019/04/06}
+\date{Version 2.8\quad 2020/03/20}
\maketitle
\begin{quote}\small
For a summary introduction in English, please see |README| file.
-\begin{itemize}\linespread{1.1}\selectfont
- \item[v1.0] ------
- \item \hyperref[sec:loading]{플레인텍에서도 luatexko.sty을 불러야 한다.}
- \item \hyperref[sec:fontoption]{글꼴 옵션값을 |<dimen>|으로 지시한다.}
- \item \hyperref[sec:metapost]{\MP\ 코드를 넣으려면 luamplib 패키지를
- 불러야 한다.}
- \item[v1.3] ------
- \item \hyperref[sec:fontcmds]{fallbackfont 계열의 명령이 추가되었다.}
- \item \hyperref[sec:fontswitch]{\cs{hangulpunctuations} 선언 추가,
- |[QuoteRaise]| 옵션 제거}
- \item \hyperref[sec:autojosa]{\cs{josaignoreparens=1}이 선언되면
- 자동조사 결정시 괄호 부분을 무시한다.}
- \item[v1.5] ------
- \item \hyperref[sec:verttype]{세로쓰기를 지원하기 위한 실험적 코드가
- 들어갔다.}
- \item \hyperref[sec:actualtext]{\cs{actualtext} 명령 추가}
- \item \hyperref[sec:fontswitch]{한글·한자 글꼴의 지정이 없으면
- 나눔 Type1을 이용한다.}
- \item \hyperref[sec:packageopt]{패키지 옵션 |[nofontspec]| 추가}
- \item[v1.6] ------
- \item \hyperref[sec:fontoption]{글꼴 옵션 |[NoEmbedding]| 추가}
- \item \hyperref[sec:fontcmds]{main/sans hangul/hanja/fallback 폰트의
- 디폴트 옵션으로 |[Ligatures=TeX]|이 주어진다.}
- \item[v1.7] ------
- \item 패키지 옵션 |[unfonts]|를 더는 지원하지 않는다. 이 옵션을 사용한
- 기존 문서는 기본 글꼴인 나눔 Type1으로 식자될 것이다.
- \item[v1.8] ------
- \item \hyperref[sec:ruby]{\cs{xxruby} 명령 추가}
- \item[v1.9] ------
- \item \hyperref[sec:verttype]{|horizontal| 환경 추가}
- \item[v1.22] ------
- \item \hyperref[sec:fontswitch]{\cs{hangulbyhangulfont} 명령 추가}
+ \begin{itemize}\linespread{1.1}\selectfont
+ \item[v2.6] ------
+ \item \hyperref[sec:fontswitch]{\cs{hangulbyhangulfont} 및
+ \cs{hanjabyhanjafont}가 지역적 효력만 가짐}
+ \item[v2.5] ------
+ \item LuaHB\TeX\ 지원 (세로쓰기 제외)
+ \item[v2.2] ------
+ \item \hyperref[sec:fontoption]{글꼴옵션 |InterCharStretch| 제공}
+ \item[v2.0] ------
+ \item \hyperref[sec:mathhangul]{수식 한글 글꼴을 자동으로 잡아주지 않음}
+ \item \cs{actualtext} 명령 작동 않음. 대신, 옛한글 텍스트 추출 자동 지원%
+ \footnote{%
+ PDF 리더 어플리케이션이 ActualText 기능을 지원해야 가능하다.
+ 어도비 리더는 확실히 가능할 것이다. }
+ \item \hyperref[sec:fontoption]{글꼴옵션 |CompressPunctuations|,
+ |RemoveClassicSpaces|, |InterCharacter| 추가}
+ \item \hyperref[sec:break]{\cs{registerbreakableafter},
+ \cs{registerbreakablebefore} 명령 추가}
\end{itemize}
\end{quote}
\smallskip
-\section{}
-\hemph{\texlive\ 2016 이상}{\small (\luatex\ v0.95 이상)}을 사용해야 한다.
-아직 \luatex은 베타 상태로 개발 중에 있으므로 안정적인 동작을 보장하지 않는다.
-
-\section{}\label{sec:loading}
-\luatexko\ 로드하기: \cs{usepackage{luatexko}} 혹은 \cs{usepackage{kotex}}.
-플레인텍에서는 \cs{input luatexko.sty} 혹은 \cs{input kotex.sty}.
+\section{부르기}\label{sec:loading}
+
+\hemph{\texlive\ 2020 이상}{ \small (\luatex\ v1.12 이상)}을 사용해야 한다.
+
+\luatexko\ 부르기: \cs{usepackage{luatexko}} 혹은 \cs{usepackage{kotex}}.%
+\footnote{%
+ 플레인텍에서는 \cs{input luatexko.sty} 혹은 \cs{input kotex.sty}. }
+
입력은 원칙적으로 UTF-8으로 한다.
BOM (Byte Order Mark)은 있어도 좋고 없어도 좋다.
CP949 인코딩에 관해서는 제\ref{sec:uhcencoding}절 참조.
-\section{}\label{sec:packageopt}
-패키지 옵션으로 |[hangul]|과 |[hanja]|가 제공된다. 행간격 조정이 행해지며
-장 제목이나 표·그림 캡션 따위가 한글 또는 한자 방식으로 표시된다. 다만
+\section{패키지 옵션}\label{sec:packageopt}
+
+패키지 옵션으로 \pkgkwd{hangul}과 \pkgkwd{hanja}가 제공된다.%
+\footnote{%
+ |[nofontspec]| 옵션은 v2.0부터 더는 제공되지 않는다. }
+행간격 조정이 행해지며
+장 제목이나 표·그림 캡션 따위가 한글 또는 한자 방식으로 표시된다.
장(chapter) 제목과 편(part) 제목에만 ``제(第)''가 붙어 ``제~1 편''
``제~3 장''과 같은 방식으로 표시되며 절 제목 이하에는 붙지 않는다.
-|[nofontspec]| 옵션을 주면 fontspec을 부르지 않는다.
-따라서 아래 \ref{sec:fontcmds}, \ref{sec:fontswitch}, \ref{sec:fontoption},
-\ref{sec:verttype}, \ref{sec:mathhangul}절의 유니코드 한국어 글꼴 설정
-명령들도 사용할 수 없다.
-
-\section{}\label{sec:fontcmds}
-\luatexko를 로드하면 fontspec 패키지를 자동으로 불러온다. 글꼴 설정에
-대해서는 fontspec 문서를 참조하라.
+\section{글꼴명령}\label{sec:fontcmds}
-한국어 글꼴을 위해 새로 마련한 명령은 다음과 같다.
+\luatexko를 부르면 fontspec 패키지도 자동 불러온다. 글꼴 설정은
+fontspec 문서 참조.
+
+한국어 글꼴을 위해 새로 마련한 명령은 다음과 같다.%
+\pkgkwd*{\setmainhangulfont}%
+\pkgkwd*{\setsanshangulfont}%
+\pkgkwd*{\setmonohangulfont}%
+\pkgkwd*{\newhangulfontfamily}%
+\pkgkwd*{\newhangulfontface}%
+\pkgkwd*{\addhangulfontfeature}%
+\pkgkwd*{\hangulfontspec}
+첫 두 줄, 즉 main/sans 글꼴들에는 |Ligatures=TeX| 옵션이 자동으로 주어진다.%
+\footnote{%
+ \cs{adhochangulfont} \cs{adhochanjafont} \cs{addhocfallbackfont}는
+ 마지막 줄 명령들의 다른 이름들이다. }\,%
+\footnote{%
+ 플레인텍에서 한글 글꼴 설정은 다음과 같이 한다:\par
+ \leftskip=3em\noindent
+ \cs{hangulfont=UnDotum\relax}\\
+ \cs{hanjafont=UnDotum at 14pt}\\
+ \cs{fallbackfont=HanaMinB at 12pt} }
\begin{verbatim}
\setmainhangulfont \setmainhanjafont \setmainfallbackfont
\setsanshangulfont \setsanshanjafont \setsansfallbackfont
\setmonohangulfont \setmonohanjafont \setmonofallbackfont
\newhangulfontfamily \newhanjafontfamily \newfallbackfontfamily
+ \newhangulfontface \newhanjafontface \newfallbackfontface
\addhangulfontfeature \addhanjafontfeature \addfallbackfontfeature
\hangulfontspec \hanjafontspec \fallbackfontspec
\end{verbatim}
-\cs{adhochangulfont} \cs{adhochanjafont} \cs{addhocfallbackfont}는
-마지막 줄 명령들의 다른 이름들이다.
-첫 두 줄, 즉 main/sans hangul/hanja/fallback 글꼴에는
-|Ligatures=TeX| 옵션이 자동으로 주어진다.
-\begin{itemize}\item[]
-플레인텍에서 한글 글꼴 설정은 영문 글꼴 지정하는 방식과 거의 같다.
-\begin{verbatim}
- \hangulfont=UnDotum\relax
- \hanjafont=UnDotum at 14pt
- \fallbackfont=HanaMinB at 12pt
- \hangulfont=UnDotum scaled 2000
- \hanjafont="HCR Batang LVT"\relax
- \hangulfont={HCR Batang LVT:script=hang;+dlig} at 12pt
-\end{verbatim}
-\end{itemize}
-\section{}\label{sec:fontswitch}
+\section{글꼴 대체}\label{sec:fontswitch}
+
원칙적으로 \luatexko는 지시된 글자가 영문폰트에 없으면 한글폰트에서,
한글폰트에도 없으면 한자폰트에서, 한자폰트에도 없으면 fallback
-폰트에서 글자를 찾아 찍는다. 세 가지 \hemph{모두 지정되지 않았다면 나눔 Type1
-폰트를} 이용한다. 기존 \kotex과는 글꼴 대체 방식이 다르므로 주의해야 한다.
-
-하지만 \cs{hangulbyhangulfont=1}을 선언하면 한글은 우선 한글폰트로
-식자한다. 또한
-\cs{hanjabyhanjafont=1}을 선언하면 한자는 우선 한자폰트로
-식자한다. 둘 다 |0|을 선언하면 원래 방식으로 되돌아간다. 이 명령들은 문단
-중간에서 사용하지 않도록 주의해야 한다. 문단 중에 사용되었다면
-그 문단의 처음부터 효력이 발생한다.
-
-\cs{hangulpunctuations=1}을 선언하면 영문 \hemph{문장부호들을 한글 폰트로}
-식자한다. |0|을 지시하면 원래 상태로 되돌린다.
-|[hangul]| 옵션을 주면 \cs{hangulpunctuations=1}이 자동으로
-선언된다.\footnote{나눔 Type1 상태면 그러하지 아니하다.}
-이 선언에 의해 영향 받는 문장부호들을 다음처럼 지정할 수 있다.
+폰트에서 글자를 찾아 찍는다.
+한글폰트가 지정되지 않았고 기본폰트에 한글 글리프가 없다면
+\hemph{은바탕, 은돋움 트루타입}을 자동으로 불러온다.%
+\footnote{%
+ 은글꼴 트루타입은 \texlive에 포함되어 있다. }
+
+하지만 \pkgkwd{\hangulbyhangulfont}|=1|을 선언하면 한글은 우선 한글폰트로
+식자한다. 또한 \pkgkwd{\hanjabyhanjafont}|=1|을 선언하면 한자는 우선 한자폰트로
+식자한다. 두 경우 모두 |0|을 선언하면 원래 방식으로 되돌아간다.
+문단 중간에서 사용해도 동작한다. \sout{그러나 루아코드가 실행되므로
+텍의 그룹에 의해 영향받지 않는 전역적 효과를 가진다.}
+
+일정한 영문 문장부호들은 한글 폰트로 식자된다.
+즉, \pkgkwd{\hangulpunctuations}|=1|이 기본으로 작동하고,
+|0|을 지시해야 이 기능이 비로소 꺼진다.
+verbatim 코드를 식자할 때는 이 기능이 작동하지 않으며,%
+\footnote{%
+ 정확히 말하자면 |\\language=\\l@nohyphenation|, 즉 하이프네이션이
+ 허용 안 되는 상황에서는 작동하지 않는다.
+ 부연하건대, |\\language=\\l@nohyphenation| 상황에서 작동하지 않는
+ 그밖의 기능은 다음과 같다: 줄바꿈 허용, InterCharacter, InterHangul,
+ InterLatinCJK, CompressPunctuations, RemoveClassicSpaces,
+ 한글^^b7한자 폰트 문자 다음의 공백 크기 조정 등. }
+문장부호가 고정폭 글꼴일 때에도 작동하지 않는다.%
+\footnote{%
+ 또한 플레인텍에서는 영문글꼴을 트루타입/오픈타입으로 지정해야만 작동한다. }
+영향 받는 문장부호들의 기본값은 다음과 같다:
+\begin{verbatim}
+ [0x21] ! [0x27] ' [0x28] ( [0x29] )
+ [0x2C] , [0x2E] . [0x3A] : [0x3B] ;
+ [0x3F] ? [0x60] ` [0xB7] · [0x2014] —
+ [0x2015] ― [0x2018] ‘ [0x2019] ’ [0x201C] “
+ [0x201D] ” [0x2026] … [0x203B] ※
+\end{verbatim}
+다음과 같은 명령으로 이 목록에 문자를 추가하거나 제거할 수 있다.%
+\pkgkwd*{\registerpunctuations}%
+\pkgkwd*{\unregisterpunctuations}
인자는 콤마로 분리된 숫자 형식으로서 유니코드 코드포인트를 뜻한다.
\begin{verbatim}
\registerpunctuations{45, "2D, `-}
\unregisterpunctuations{"2D, "2015}
\end{verbatim}
-이들 두 명령은 항상 전역적 효과를 가진다.
+이상 문장부호 관련 명령들은 문단 중간에서도 쓸 수 있지만, 전역적 효과를 가진다.
+\section{줄바꿈 허용}\label{sec:break}
-\section{}\label{sec:fontoption}
-fontspec의 글꼴 옵션 외에 \luatexko가 따로 제공하는 것들이
-있다.\footnote{ 옛한글 식자를 위해서는
- |[Script=Hangul]| 옵션을 사용하는 것으로 충분하다.
- 플레인텍이라면 |script=hang|.}
+어떤 글자 앞이나 뒤에서 줄바꿈을 허용하고 싶을 때 아래와 같이 명령을 준다.%
+\pkgkwd*{\registerbreakableafter}%
+\pkgkwd*{\registerbreakablebefore}
+이들 명령을 문단 중간에서 사용하면 문단의 처음부터 전역적 효력을 가진다.
+\begin{verbatim}
+\registerbreakableafter{"2460, "2461}
+\registerbreakablebefore{"2460, "2461}
+\end{verbatim}
+\luatexko는 다분히 보수적으로 줄바꿈을 허용하고 있다.
+예시한 유니코드는 `①'과 `②'인데 기본적으로
+이들 문자 앞뒤 모두에서 줄바꿈이 되지 않는다.
+
+\section{글꼴 옵션}\label{sec:fontoption}
+
+fontspec의 글꼴 옵션 외에 \luatexko가 따로 제공하는 것들이 있다.%
+\footnote{%
+ 옛한글 식자를 위해서는 적어도 |Script=Hangul|
+ (플레인텍이라면 |script=hang|)을 주어야 한다.
+ 옛한글이 아니더라도 한글을 쓴다면 이 옵션과 |Language=Korean|
+ (플레인텍은 |language=KOR|)을 주는 것이 좋다. }\,%
+\footnote{%
+ |PunctRaise|, |NoEmbedding| 옵션은 v2.0부터 더는 제공하지 않는다. }
+
+\def\hunmintxt{%
+ \noindent\textbf{%
+ 世솅〮宗조ᇰ御ᅌᅥᆼ〮製졩〮訓훈〮民민正져ᇰ〮音ᅙᅳᆷ
+ }\par
+ 製졩〮ᄂᆞᆫ〮글〮지ᅀᅳᆯ〮씨〮니〮御ᅌᅥᆼ〮製졩〮ᄂᆞᆫ〮님〯금〮지〯ᅀᅳ샨〮그〮리라〮%
+ 訓훈〮은〮ᄀᆞᄅᆞ칠〮씨〮오〮民민ᄋᆞᆫ〮百ᄇᆡᆨ〮姓셔ᇰ〮이〮오〮音ᅙᅳᆷ은〮소리〮니〮%
+ 訓훈〮民민正져ᇰ〮音ᅙᅳᆷ은〮百ᄇᆡᆨ〮姓셔ᇰ〮ᄀᆞᄅᆞ치〮시논〮正져ᇰ〮ᄒᆞᆫ소리〮라〮
+ \par\medskip
+ \noindent\textbf{%
+ 國귁〮之징語ᅌᅥᆼ〯音ᅙᅳᆷ이〮
+ }\par
+ 國귁〮ᄋᆞᆫ〮나라〮히라〮之징ᄂᆞᆫ〮입〮겨〮지라〮語ᅌᅥᆼ〯는말〯ᄊᆞ미라〮
+ \par
+ 나랏〮말〯ᄊᆞ미〮
+ \par\medskip
+ \noindent\textbf{%
+ 異잉〮乎ᅘᅩᆼ中듀ᇰ國귁〮ᄒᆞ〮야〮
+ }\par
+ 異잉〮ᄂᆞᆫ〮다ᄅᆞᆯ씨라乎ᅘᅩᆼᄂᆞᆫ〮아〯모〮그ᅌᅦᄒᆞ〮논겨〮체ᄡᅳ〮는字ᄍᆞᆼ〮ㅣ라〮%
+ 中듀ᇰ國귁〮ᄋᆞᆫ〮皇ᅘᅪᇰ帝뎽〮겨〯신나라〮히니〮우〮리〮나랏〮常쌰ᇰ談땀애〮%
+ 江가ᇰ南남이〮라〮ᄒᆞ〮ᄂᆞ〮니라〮
+ \par
+ 中듀ᇰ國귁〮에〮달아〮
+}
\begin{figure}
\fboxsep=1em
- \fbox{\parbox{\dimexpr\linewidth-2.1em\relax}{%
- \sffamily \leftskip2.5cm
-뎨 가ᄂᆞᆫ 뎌 각시 본 듯도 ᄒᆞᆫ뎌이고.\\
-天텬上상白ᄇᆡᆨ玉옥京경을 엇디ᄒᆞ야 離니別별ᄒᆞ고\\
-ᄒᆡ 다 져믄 날의 눌을 보라 가시ᄂᆞᆫ고
-
-\medskip
-
-어와 네여이고 내 ᄉᆞ셜 드러보오.\\
-내 얼굴 이 거동이 님 괴얌즉 ᄒᆞᆫ가마ᄂᆞᆫ\\
-엇딘디 날 보시고 네로다 녀기실ᄉᆡ\\
-나도 님을 미더 군 ᄠᅥ디 전혀 업서\\
-이ᄅᆡ야 교ᄐᆡ야 어ᄌᆞ러이 구돗ᄯᅥᆫ디\\
-반기시ᄂᆞᆫ ᄂᆞᆺ비치 녜와 엇디 다ᄅᆞ신고.%\\
-%누어 ᄉᆡᆼ각ᄒᆞ고 니러 안자 혜여ᄒᆞ니\\
-%내 몸의 지은 죄 뫼ᄀᆞ티 ᄡᅡ혀시니\\
-%하ᄂᆞᆯ히라 원망ᄒᆞ고 사ᄅᆞᆷ이라 허믈ᄒᆞ랴\\
-%셜워 플텨 혜니 造조物믈의 타시로다.
-}}
-\caption{옛한글 조판 보기}\label{fig:yethangul}
+ \fbox{\parbox{\dimexpr\linewidth-2.1em\relax}{\sffamily
+ \parindent1em
+ \hunmintxt
+ }}
+ \caption{옛한글 조판 보기}\label{fig:yethangul}
\end{figure}
-그러나 \cs{defaulthangulfontfeatures} 따위 명령은 따로 구현돼 있지 않으며,
-설혹 사용하더라도 fontspec의 \cs{defaultfontfeatures}와 같은 효과를 가진다.
-다시 말해 한글 폰트 옵션과 라틴 폰트 옵션에 차이는 없다.
-
\begin{description}
- \item[InterHangul] {\addhangulfontfeature{InterHangul=.5ex}한글 글자
- 사이의 자간}. 아래는 $-0.04$em 만큼 한글
- 자간을 지시한다. 플레인텍에서는 |interhangul|.
+ \item[InterHangul] \pkgkwd*{InterHangul}%
+ {\addhangulfontfeature{InterHangul=.5ex}한글 글자
+ 사이의 자간}. 아래는 $-0.04$em 만큼 한글 자간을 지시한다.%
+ \footnote{%
+ 플레인텍에서는 |interhangul=<dimen>|. }
\begin{verbatim}
[InterHangul=-0.04em]
\end{verbatim}
-\item[InterLatinCJK] 한글 또는 한자와 라틴 문자 사이의 자간을
- 설정한다. 플레인텍에서는 |interlatincjk|.
+\item[InterLatinCJK] \pkgkwd*{InterLatinCJK}%
+ 한글 또는 한자와 Latin문자 사이의 자간을 설정한다.%
+ \footnote{%
+ 플레인텍에서는 |interlatincjk=<dimen>|. }
+ 한글^^b7한자 다음에 라틴 문자가 오는 경우 원래는 줄바꿈이 되지 않지만
+ 이 옵션을 주면 줄바꿈이 가능해진다.
\begin{verbatim}
- [InterLatinCJK=0.125em]
+ [InterLatinCJK=0.25em]
\end{verbatim}
-\item[CharRaise] 글자의 세로 위치를
- {\addhangulfontfeature{CharRaise=.3em} 조절}할 수 있는 기능이다.
- 이로써 주변에 식자되는 다른 글꼴과 조화를 이루게 한다.
- 따라서 영문폰트에는 작동하지 않는다.
- 플레인텍에서는 |charraise|.
+\item[InterCharacter] \pkgkwd*{InterCharacter}%
+ CJK 글자들 사이의 자간을 지시한다.%
+ \footnote{%
+ 플레인텍에서는 |intercharacter=<dimen>|. }
+ fontspec의 |LetterSpace| 옵션과 기능이 유사하지만, 옛한글을 깨뜨리는 등의
+ 오작동을 하지 않는다. 전술한 자간 옵션들보다 후순위로 동작한다.
\begin{verbatim}
- [CharRaise=0.1em]
+ [InterCharacter=.125em]
\end{verbatim}
-\item[PunctRaise] 한글 또는 한자 다음에 라틴 구두점---마침표에
- 한한다---이 왔을 때 그 세로 위치를 조절할 수 있다.
- \cs{hangulpunctuations}로 인해 거의 쓸 일이 없게 되었다.
- 플레인텍에서는 |punctraise|.
+\item[InterCharStretch] \pkgkwd*{InterCharStretch}%
+ CJK 글자간 가변공백{\small(글루)}의 stretch 값을 지시한다.%
+ \footnote{%
+ 플레인텍에서는 |intercharstretch=<dimen>|. }
\begin{verbatim}
- [PunctRaise=-0.125em]
+ [InterCharStretch=0.5pt]
\end{verbatim}
-\item[NoEmbedding] |NoEmbed|와 동의어.
- 폰트를 내장하지 않으므로 결과물의 크기가 대폭 줄어든다.
- 하지만 대외적 배포에 적합하지 않음에 유의.\footnote{%
- Adobe Reader에 번들된 폰트를 쓴다면 대외적 배포도 대체로 무난하다.}
- 플레인텍에서는 |embedding=no|.
-\begin{verbatim}
- [NoEmbedding]
-\end{verbatim}
-
-\item[Protrusion] 특정 글자가 행 끌에 왔을 때 판면 바깥으로 끌어내는
- 기능이다. Lua\LaTeX의 기본값은 구두점들만 완전히 글자내밀기 한다. 즉
- hanging punctuation이 작동한다.
-\begin{verbatim}
- [Protrusion]
-\end{verbatim}
- 이는 |Protrusion=default|와 같은 뜻이다.
- 플레인텍에서는 |protrusion=default|.
- 마이크로타입에 관심 있으면 자신만의 설정을 만들어 지정할 수 있다.\footnote{%
- default 설정을 고치는 방법은 이를테면 다음과 같다:\par
- \cs{directlua{ fonts.protrusions.setups.default[0x201C] = { 1, 0 } }}
- }
-
-\item[Expansion] 판면의 균일한 조판을 위해 글자들을 미세하게 늘이거나
- 줄이는 기능이다.
-\begin{verbatim}
- [Expansion]
-\end{verbatim}
- 이는 |Expansion=default|와 마찬가지 뜻이다.
- 플레인텍에서는 |expansion=default|.
+\item[CharRaise] \pkgkwd*{CharRaise}%
+ 글자의 세로 위치를
+ {\addhangulfontfeature{CharRaise=.3em} 조절}할 수 있는 기능이다.
+ 이로써 주변에 식자되는 다른 글꼴과 조화를 이루게 한다.%
+ \footnote{%
+ 플레인텍에서는 |charraise=<dimen>|. }
+\begin{verbatim}
+ [CharRaise=2pt]
+\end{verbatim}
+ 세로쓰기에서는 모든 글자들을 지정한 값만큼 오른쪽으로 이동시킨다.
+ 세로쓰기에서 이 옵션 값을 고정길이{\small(가령 |pt| 단위)}로 주면
+ 크기가 다른 폰트들간에 중앙정렬이 이루어진다.
+ 세로쓰기에서 이 옵션을 주지 않으면 |0.5ex|가 기본값으로 동작한다.
+
+\item[RemoveClassicSpaces] \pkgkwd*{RemoveClassicSpaces}%
+ 고문헌 조판시에 CJK 글자들 사이의 공백을 없애준다.%
+ \footnote{%
+ 플레인텍에서는 |+removeclassicspaces|. }
+
+\item[CompressPunctuations] \pkgkwd*{CompressPunctuations}%
+ CJK 구두점 {\small (낫표 따위)}의 글자폭을
+ 반각으로 만든다. v2.0부터는 사용자가 지시하지 않는 한 자동으로 글자폭을
+ 줄여주지 않는다.%
+ \footnote{%
+ 플레인텍에서는 |+compresspunctuations|. }
+ 이 옵션은 |CharacterWidth=AlternateHalf| 내지 {\small (세로쓰기의 경우)}
+ |Vertical=HalfMetrics|와 거의 같은 기능을 한다.%
+ \footnote{%
+ 플레인텍에서는 각각 |+halt| 및 |+vhal|이다. 이들과 완전 동일하진
+ 않다. 가령 U+3002 (\char"3002) 처리의 경우.}
+
+\item[Protrusion] \pkgkwd*{Protrusion}%
+ 특정 글자가 행 끝에 왔을 때 판면 바깥으로 끌어내는
+ 기능이다. \luatex은 기본값으로 온점 반점 등을 완전 글자내밀기 한다.
+ |Protrusion|은 |Protrusion=default|와 같은 뜻이다.%
+ \footnote{%
+ 플레인텍에서는 |protrusion=default|. }
+ 자신만의 설정을 만들어 지정할 수 있다.%
+ \footnote{%
+ default 설정을 고치는 방법은 이를테면 다음과 같다
+ (이 매뉴얼의 소스 앞부분을 참고하라):\par
+ \leftskip=3em\noindent
+ \cs{directlua{ fonts.protrusions.setups.default[0x201C] = { 1, 0 } }} }
+
+\item[Expansion] \pkgkwd*{Expansion}%
+ 판면의 균일한 조판을 위해 글자들을 미세하게 늘이거나
+ 줄이는 기능이다. |Expansion|은 |Expansion=default|와 마찬가지 뜻이다.%
+ \footnote{%
+ 플레인텍에서는 |expansion=default|. }
\end{description}
-\section{}
-고문헌·일본어·중국어 조판을 위해 japanese, Schinese, Tchinese 환경을
-제공한다. chinese는 Schinese의 다른 이름이다. korean 환경도
-마련했는데 이들 환경 안에서 잠깐 한국어를 조판하는 데 사용한다.
-일반적으로 우리 고문헌 조판에는 japanese 환경을 이용하면 무난하다.
-그림~\ref{fig:ancientdoc} 참조.
-플레인텍에서는 {\small(문서 전체에 적용하지 않는다면 그룹을 열고)}
-\cs{chinese} \cs{japanese} 따위를 사용한다.
+\section{고문헌}\label{sec:classic}
-\begin{figure}
- \centering
- \fbox{\parbox{37em}{\japanese\sffamily
-子曰:「學而時習之,不亦說乎?有朋自遠方來,不亦樂乎?人不知而不慍,
-不亦君子乎?」\par
-有子曰:「其爲人也孝弟,而好犯上者,鮮矣!不好犯上,而好作亂者,未之有也!
-君子務本,本立而道生;孝弟也者,其爲仁之本與?」\par
+\def\analectstext{%
+子曰:「學而時習之,不亦說乎?有朋自遠方來,不亦樂乎?人不知而不慍,不亦君子乎?」\par
+有子曰:「其爲人也孝弟,而好犯上者,鮮矣!不好犯上,而好作亂者,未之有也!君子務本,本立而道生;孝弟也者,其爲仁之本與?」\par
子曰:「巧言令色,鮮矣仁!」\par
-曾子曰:「吾日三省吾身:爲人謀,而不忠乎?與朋友交,而不信乎?傳,
-不習乎?」\par
+曾子曰:「吾日三省吾身:爲人謀,而不忠乎?與朋友交,而不信乎?傳,不習乎?」\par
子曰:「道千乘之國,敬事而信,節用而愛人,使民以時。」\par
子曰:「弟子入則孝,出則弟;謹而信,汎愛衆;而親仁,行有餘力,則以學文。」
+}
+\begin{figure}
+ \centering
+ \fbox{\parbox{37em}{\typesetclassic\sffamily
+ \analectstext
}}
-\caption{고문헌 조판 보기. japanese 환경을 이용했다.}\label{fig:ancientdoc}
+ \caption{고문헌 조판 보기. typesetclassic 환경을 이용했다.
+ 글꼴에 |CompressPunctuations| 옵션을 주었다.
+ }\label{fig:gomun}
\end{figure}
-일본어·중국어라도 글꼴 설정은 \cs{newhangulfontfamily}
-\cs{newhanjafontfamily} 따위를 이용한다.
+고문헌 조판을 위해 \pkgkwd{typesetclassic} 환경을 제공한다.%
+\footnote{%
+ 플레인텍에서는 (문서 전체에 적용하지 않는다면 그룹 안에서)
+ \cs{typesetclassic}을 사용한다.
+ |japanese|, |chinese|, |Schinese|, |Tchinese|, |korean| 따위의 환경은
+ 지난 버전과의 호환성을 위해 당분간 제공되고 있을 뿐이다. }
+그림~\ref{fig:gomun} 참조.
+
+v2.0부터는 고문헌 조판에서 한글^^b7한자와 영문자가 붙어 나오더라도 자동으로
+간격을 잡아주지 않으므로 이런 경우 사용자가 |InterLatinCJK| 옵션을
+지정해야 한다.
+또한 불필요한 공백이 오더라도 자동으로 제거해주지 않으므로 이런 경우
+사용자가 |RemoveClassicSpaces| 옵션을 주어야 한다.
+
+\pkgkwd{typesetmodern} 환경은 고문헌 조판 중에 잠깐 현대 한국어를 조판하는 데
+사용한다.%
+\footnote{%
+ 플레인텍에서는 (문서 전체에 적용하지 않는다면 그룹 안에서)
+ \cs{typesetmodern}을 사용한다. }
-\luatexko가 글자 사이에 삽입하는 미세간격을 사용자가 영(zero)으로
-강제하기 위해선 \cs{inhibitglue} 명령을 이용한다.
-대체로 일본어·중국어 환경에서만 문제된다.
+고문헌 조판 중 \luatexko가 글자 사이에 삽입하는 미세간격을 사용자가
+영{\small(zero)}으로 강제하기 위해선 \pkgkwd{\inhibitglue} 명령을 이용한다.
+
+\section{세로쓰기}\label{sec:verttype}
-\section{}\label{sec:verttype}
세로쓰기는 폰트의 고급 오픈타입 속성을 이용하므로 폰트가 이를 지원해야
-가능한 일이다. 폰트에 |Vertical=RotatedGlyphs| 옵션을 준다. 이는
-플레인텍에서 |vertical;+vrt2| 옵션을 주는 것과 같다.\footnote{|vmtx| 정보를
- 가지고 있지 않은 글꼴은 세로쓰기에 적합치 않은 글꼴이다.
- |otfinfo -t <파일>| 명령으로 글꼴에 들어있는 테이블 정보를 알 수 있다.}
-
-문서의 일부를 세로쓰기하려면 \cs{begin{vertical}{<dimen>}} \ldots\ \cs{end{vertical}}
-환경을 이용하라. |<dimen>|으로 세로쓰기 박스의 높이를 지시한다.
-그림~\ref{fig:vertical} 참조.
-플레인텍에서는 \cs{vertical{<dimen>}} \ldots\ \cs{endvertical}.
+가능한 일이다. 폰트에 |Vertical=Alternates|와 \pkgkwd{RawFeature=vertical}
+옵션을 준다.%
+\footnote{%
+ 이는 플레인텍에서 |vertical;+vert| 옵션을 주는 것과 같다.
+ 사실 |vertical|을 선언하면 |vert|는 자동으로 켜지도록 해 두었다. }\,%
+\footnote{%
+ |vmtx| 정보를 가지고 있지 않은 글꼴은 세로쓰기에 적합치 않은 글꼴이다.
+ |otfinfo -t <파일>| 명령으로 글꼴에 들어있는 테이블 정보를 알 수 있다. }\,%
+\footnote{%
+ 폰트 옵션 |Renderer=OpenType| 또는 |Renderer=HarfBuzz| 등
+ (플레인텍에서는 |mode=harf| 옵션)을 주고
+ 컴파일하여 Harfbuzz 모듈을 이용하려는 경우 세로쓰기가
+ 현재로서는 지원되지 않는다. 세로쓰기를 하려면 이 옵션을 빼고 디폴트 값인
+ |Renderer=Node| (플레인텍에서는 |mode=node|)를 사용하라.}
+세로쓰기에서 |CharRaise| 옵션의 효과에 대해서는 제\ref{sec:fontoption}절을
+참조할 것.
+
+세로쓰기에서는 \cs{typesetclassic}의 아종인 \cs{typesetvertical}이
+기본으로 셋팅되어 있다. 일종의 고문헌 조판으로 보는 것이다.
\begin{figure}
-\framebox[\linewidth]{\begin{vertical}{17em}
- \sffamily
- \addhangulfontfeature{Vertical=RotatedGlyphs,
- RawFeature=vertical,
- CharacterWidth=Full, CharRaise=0.1ex, }
-\parindent-1em\leftskip1em \linespread{1.5}\selectfont
-\noindent 님의 침묵(The Silent Beloved)
-\smallbreak
-\hfil\hfil 한 용 운\hfil
-\bigbreak
-님은 갓슴니다 아아 사랑하는나의님은 갓슴니다\par
-푸른산빗을깨치고 단풍나무숩을향하야난 적은길을 거러서 참어떨치고
-갓슴니다\par
-黃金의꽃가티 굿고빗나든 옛盟誓는 차듸찬띠끌이되야서 한숨의 微風에
-나러갓슴니다\par
-날카로은 첫〈키쓰〉의追憶은 나의運命의指針을 돌너노코 뒷거름처서 사러젓슴니다\par
-\hellipsis\par
-아아 님은갓지마는 나는 님을보내지 아니하얏슴니다\par
-제곡조를못이기는 사랑의노래는 님의沈默을 휩싸고돔니다\par
-\end{vertical}}
-\caption{세로쓰기의 예. 박스 높이 \texttt{17em}을 지시했다.}\label{fig:vertical}
+ \framebox[\linewidth]{
+ \begin{vertical}{20em}
+ \linespread{1.5}\sffamily \verticalhangulfont
+ \hunmintxt
+ \end{vertical}
+ }
+ \caption{세로쓰기의 예. 박스 높이 |20em|을 지시했다.}\label{fig:vertical}
+\end{figure}
+
+\begin{figure}
+ \framebox[\linewidth]{
+ \begin{vertical}{19em}
+ \linespread{1.5}\sffamily \verticalhangulfont
+ \parindent0pt \everypar{\hangindent1em \hangafter1 }
+ \analectstext
+ \end{vertical}
+ }
+ \caption{세로쓰기의 다른 예. 박스 높이 |19em|을 지시했다.
+ 글꼴에 |CompressPunctuations|와 더불어
+ |InterCharStretch=1pt|를 옵션으로 주었다. 공백이 없는 문서는 자간늘이기 값을
+ 넉넉하게 주는 것이 좋다.
+ }\label{fig:vertical3}
\end{figure}
+문서의 일부를 세로쓰기하려면
+|\begin{|\pkgkwd{vertical}|}{<dimen>}| \ldots\ |\end{vertical}|
+환경을 이용한다. |<dimen>|으로 세로쓰기 박스의 높이를 지시한다.%
+\footnote{%
+ 플레인텍에서는 \cs{vertical{<dimen>}} \ldots\ \cs{endvertical}. }
+그림~\ref{fig:vertical},~\ref{fig:vertical3} 및 \ref{fig:vertical2} 참조.
+
문서 전체를 세로쓰기한다면 이 환경을 쓰는 대신
-\cs{verticaltypesetting} 명령을 전처리부에 선언한다.
+\pkgkwd{\verticaltypesetting} 명령을 전처리부에 선언한다.
이때 면주는 가로로 식자되며 면주 폰트의 설정은 사용자의 몫이다.
세로쓰기 도중에 문서의 일부를 가로쓰기하려면
-\cs{begin{horizontal}{<dimen>}} \ldots\ \cs{end{horizontal}}
-환경을 이용하라. |<dimen>|은 가로쓰기 박스의 너비를 지시한다.
-플레인텍에서는 \cs{horizontal{<dimen>}} \ldots\ \cs{endhorizontal}.
-가로쓰기 영역의 폰트 설정은 사용자의 몫이다.
-
-\section{}\label{sec:metapost}
-전처리부에서 \cs{usepackage{luamplib}}을 선언하면 \MP\ 코드를 문서 중간에
-삽입할 수 있다. 한글이나 수식은 |btex| \ldots\ |etex| 안에 넣어야 한다.
-그림~\ref{fig:mplib} 참조. 상세한 것은 luamplib 패키지 문서를 참조하라.
+|\begin{|\pkgkwd{horizontal}|}{<dimen>}| \ldots\ |\end{horizontal}|
+환경을 이용한다. |<dimen>|은 가로쓰기 박스의 너비를 지시한다.%
+\footnote{%
+ 플레인텍에서는 \cs{horizontal{<dimen>}} \ldots\ \cs{endhorizontal}. }
+가로쓰기 영역의 폰트 설정은 사용자의 몫이다.%
+\footnote{폰트 지시는 |horizontal| 환경 안에서 행하는 것을 권장한다.}
\begin{figure}
-\setbox0\vbox{\kern10pt
-\begin{verbatim}
- \usepackage{luamplib}
- ...
- \begin{mplibcode}
- beginfig(1);
- draw fullcircle scaled 2cm;
- dotlabel.bot(btex \TeX etex, origin);
- dotlabel.rt(btex 루아 etex, dir45*1cm);
- endfig;
- \end{mplibcode}
-\end{verbatim}}
-\begin{mplibcode}
-beginfig(1);
- draw btex \copy0 etex shifted (-\mpdim{\textwidth-3cm},-\mpdim{.5\ht0});
- draw fullcircle scaled 2cm;
- dotlabel.bot(btex\TeX etex, origin);
- dotlabel.rt(btex 루아 etex, dir 45*1cm);
- bboxmargin:=0; draw bbox currentpicture;
-endfig;
-\end{mplibcode}
-\caption{mplib 용례}\label{fig:mplib}
+ \framebox[\linewidth]{
+ \begin{vertical}{17em}
+ \linespread{1.5}\sffamily \verticalhangulfont
+ \parindent0pt \everypar{\hangindent1em \hangafter1 }
+ \spaceskip=.5em plus.25em minus.125em
+ \quad 님의 침묵(The Silent Beloved)
+ \smallbreak
+ \hfil\hfil 한 용 운\hfil
+ \bigbreak
+ 님은 갓슴니다 아아 사랑하는나의님은 갓슴니다\par
+ 푸른산빗을깨치고 단풍나무숩을향하야난 적은길을 거러서 참어떨치고
+ 갓슴니다\par
+ 黃金의꽃가티 굿고빗나든 옛盟誓는 차듸찬띠끌이되야서 한숨의 微風에
+ 나러갓슴니다\par
+ 날카로은 첫〈키쓰〉의追憶은 나의運命의指針을 돌너노코 뒷거름처서 사러젓슴니다\par
+ \hellipsis\par
+ 아아 님은갓지마는 나는 님을보내지 아니하얏슴니다\par
+ 제곡조를못이기는 사랑의노래는 님의沈默을 휩싸고돔니다\par
+ \end{vertical}
+ }
+ \caption{세로쓰기의 또 다른 예. 박스 높이 |17em|을 지시했다.
+ Noto Sans CJK 글꼴의 세로쓰기 공백은 원래 |1em|,
+ 즉 전각크기로 매우 크기 때문에, 여기서는 \cs{spaceskip} 명령을 이용하여
+ 반각 크기로 강제했다.
+ }\label{fig:vertical2}
\end{figure}
-\section{}\label{sec:mathhangul}
-\begin{quote}
- |$가^{나^다}$|\quad$\Rightarrow\quad가^{나^다}$
-\end{quote}
-수식 모드에서도 한글을 {\small(hbox로 감싸지 않고)} 직접 입력할 수
-있다. 문서의 기본 한글 글꼴이 자동으로 수식 한글에도 적용되므로 따로
-설정할 것이 없지만 굳이 한다면 다음처럼 지시한다.
-\begin{verbatim}
- \setmathhangulfont{HCRBatang}
-\end{verbatim}
-현재 한글만 쓸 수 있게 설정되어 있다.
-한자도 수식에 직접 입력하려면 사용자는
-\begin{verbatim}
- \setmathhangulblock{4E00}{9FC3}
-\end{verbatim}
-명령으로 유니코드 블럭을 추가 지정해야 한다.
+\section{드러냄표}\label{sec:dotemph}
-\section{}
-\cs{dotemph} 명령으로 \dotemph{드러냄표}%
+\pkgkwd{\dotemph} 명령으로 \dotemph{드러냄표}%
를 이용한 강조를 할 수 있다. 기본은 글자 위에 점을 찍는 형태이나
다음과 같이 명령을 주어 개인적으로 선호하는 기호를 드러냄표로 쓸 수
있다.
-①~|\def\dotemphraise{0.4em }|: 드러냄표를 피강조 글자 위로 끌어올리는 길이
+\medskip
+①~|\def|\pkgkwd{\dotemphraise}|{0.4em }|:
+드러냄표를 피강조 글자 위로 끌어올리는 길이
-②~|\def\dotemphchar{\bfseries ^^^^02d9}|: 드러냄표 기호 자체를 정의.
-|^^^^02d9|는 유니코드 코드포인트를 뜻하는 16진수이고 소문자로만 써야 한다.
-숫자 대신 직접 문자를 입력해도 된다. 플레인텍에서도 쓸 수 있다.
+②~|\def|\pkgkwd{\dotemphchar}|{\bfseries ^^^^02d9}|: 드러냄표 기호 자체를 정의.
+
+\section{루비}\label{sec:ruby}
-\section{}\label{sec:ruby}
루비를 달 수 있다. ruby 패키지가 이미 존재하지만 \luatexko와 궁합이 잘
-맞지 않아 새로 매크로를 제공한다. 플레인텍도 지원한다.
+맞지 않아 새로 매크로를 제공한다.
\begin{quote}
- \cs{ruby{漢字}{한자}}\quad$\Rightarrow$\quad\ruby{漢字}{한자}
+ \pkgkwd{\ruby}|{漢字}{한자}|\quad$\Rightarrow$\quad\ruby{漢字}{한자}
\end{quote}
이처럼 글자별로 따로 루비를 달 필요가 없다. 관련 설정은 다음처럼
한다.
-①~\cs{rubyfont}: 루비를 식자할 폰트를 지시해 둔다. 기본값은 현재 폰트.
-
-②~|\def\rubysize{0.6}|: 루비 글자 크기를 본문 글자 크기에 대한 비율로
-지정
+\medskip
+①~\pkgkwd{\rubyfont}: 루비를 식자할 폰트를 지시해 둔다. 기본값은 현재 폰트%
+\footnote{%
+ 루비는 글자 크기가 작기 때문에 본문 폰트보다 약간 굵은 폰트로
+ 지정하는 것이 좋다. }
+
+②~|\def|\pkgkwd{\rubysize}|{0.6}|:
+루비 글자 크기를 본문 글자 크기에 대한 비율로 지정%
+\footnote{%
+ 플레인텍에서는 루비의 글꼴크기를 따로 조정해주지 않는다.
+ 사용자가 \cs{rubyfont}를 설정할 때 크기도 함께 지시하도록 한다.
+ 가령:\par
+ \leftskip=3em\noindent
+ |\\font\\rubyfont=UnBatang at \\rubysize em| }
-③~|\def\rubysep{0.2ex}|: 루비와 본문 글자 사이의 간격을 지정
+③~|\def|\pkgkwd{\rubysep}|{0.1ex}|: 루비와 본문 글자 사이의 간격을 지정
-④~\cs{rubynooverlap}: 루비의 폭이 본문 글자의 폭보다 클 때 루비가 이웃
+④~\pkgkwd{\rubynooverlap}: 루비의 폭이 본문 글자의 폭보다 클 때 루비가 이웃
글자들 위로 삐져나가지 못하게 한다. 본문 글자의 흐름을 중시하여
-\cs{rubyoverlap}을 기본값으로 하였으므로 이는 따로 선언할 필요가 없다.
+\pkgkwd{\rubyoverlap}을 기본값으로 하였으므로 이는 따로 선언할 필요가 없다.
+\medskip
한편, 연속된 본문 글자들에 각각 한 글자씩 루비를 달고자 한다면
-|\xxruby{...}{...}| 명령을 사용하라. 글자들 사이에 줄바꿈이 허용된다.
-다만 두 인자의 글자 수가 동일해야 한다.
+\pkgkwd{\xxruby}|{...}{...}| 명령을 사용한다. 글자들 사이에 줄바꿈이 허용된다.
+두 인자의 글자 수가 동일해야 한다.
+
+\section{밑줄긋기}\label{sec:uline}
-\section{}
-ulem 패키지가 \luatexko와 궁합이 잘 맞지 않아{\small (줄바꿈에 문제가 있음)}
-명령을 따로 제공한다. 플레인텍에서도 쓸 수 있다.
-
-\bigskip
-\begin{tabular}{l@{\quad$\Rightarrow$\quad}l}
-\cs{uline{밑줄을 그을 수 있다}}&\uline{밑줄을 그을 수 있다}\\
-\cs{sout{취소선을 그을 수 있다}}&\sout{취소선을 그을 수 있다}\\
-\cs{uuline{밑줄을 두 줄 긋는다}}&\uuline{밑줄을 두 줄 긋는다}\\
-\cs{xout{빗금으로 취소할 수 있다}}&\xout{빗금으로 취소할 수 있다}\\
-\cs{uwave{물결표로 밑줄을 삼는다}}&\uwave{물결표로 밑줄을 삼는다}\\
-\cs{dashuline{대시로 밑줄을 삼는다}}&\dashuline{대시로 밑줄을 삼는다}\\
-\cs{dotuline{밑줄을 점선으로 긋는다}}&\dotuline{밑줄을 점선으로 긋는다}\\
-\end{tabular}
-\bigskip
+ulem 패키지가 \luatexko와 궁합이 맞지 않아{\small (줄바꿈에 문제가 있음)}
+명령을 따로 제공한다.%
+\pkgkwd*{\uline}%
+\pkgkwd*{\sout}%
+\pkgkwd*{\uuline}%
+\pkgkwd*{\xout}%
+\pkgkwd*{\uwave}%
+\pkgkwd*{\dashuline}%
+\pkgkwd*{\dotuline}
+
+\def\RA{\>$\Rightarrow$\>}
+\begin{tabbing}
+ \cs{dotuline{밑줄을 점선으로 긋는다}}\quad\=$\Rightarrow$\quad\= \kill
+ \cs{uline{밑줄을 그을 수 있다}}\RA\uline{밑줄을 그을 수 있다}\\
+ \cs{sout{취소선을 그을 수 있다}}\RA\sout{취소선을 그을 수 있다}\\
+ \cs{uuline{밑줄을 두 줄 긋는다}}\RA\uuline{밑줄을 두 줄 긋는다}\\
+ \cs{xout{빗금으로 취소할 수 있다}}\RA\xout{빗금으로 취소할 수 있다}\\
+ \cs{uwave{물결표로 밑줄을 삼는다}}\RA\uwave{물결표로 밑줄을 삼는다}\\
+ \cs{dashuline{대시로 밑줄을 삼는다}}\RA\dashuline{대시로 밑줄을 삼는다}\\
+ \cs{dotuline{밑줄을 점선으로 긋는다}}\RA\dotuline{밑줄을 점선으로 긋는다}
+\end{tabbing}
관련하여 다음 설정을 할 수 있다.
-①~|\def\ulinedown{0.24em}|: 밑줄을 베이스라인 아래로 끌어내리는 정도
+\medskip
+①~|\def|\pkgkwd{\ulinedown}|{0.5ex}|: 밑줄을 베이스라인 아래로 끌어내리는 정도
+
+②~|\def|\pkgkwd{\ulinewidth}|{0.04em}|: 밑줄의 굵기
+
+\medskip
+사실 위 밑줄 양식들을 만드는 데는 예외없이
+\pkgkwd{\markoverwith} 명령이 사용되었다.
+따라서 사용자는 이를 이용해 원하는 양식을 만들 수 있다.
+가령 노란색 마커펜을 흉내내려면,%
+\footnote{%
+ 이 명령의 인자로 들어갈 수 있는 것은 box와 rule에 국한된다.
+ 예시에서는 박스를 넣었다.}\,%
+\footnote{%
+ 별표 붙은 명령 \cs{markoverwith*}는 \cs{xleaders}를 실행하고,
+ 예시처럼 별표가 없으면 \cs{cleaders}를 실행한다. }
+\begin{verbatim}
+ \def\ymarker{%
+ \markoverwith{%
+ \hbox{{\color{yellow!50}\vrule width 1pt height 9pt depth 2pt}}%
+ }}
+\end{verbatim}
+
+\def\ymarker{\markoverwith{%
+ \hbox{{\color{yellow!50}\vrule width 1pt height 9pt depth 2pt}}}}
-②~|\def\ulinewidth{0.04em}|: 밑줄의 굵기
+\cs{ymarker{노란색을 칠해서 강조한다}}\quad$\Rightarrow$\quad
+\ymarker{노란색을 칠해서 강조한다}.
+
+\section{자동조사}\label{sec:autojosa}
-\section{}\label{sec:autojosa}
자동조사는 \kotex 과 동일하게 \cs{은} \cs{는} \cs{이} \cs{가} \cs{을} \cs{를}
\cs{와} \cs{과} \cs{로} \cs{으로} \cs{라} \cs{이라} 따위를 사용한다.
-문장 중에서도 작동할 뿐만 아니라 플레인텍도 지원한다.
-버전 1.3부터는 \cs{josaignoreparens=1}이 선언되어 있으면 자동조사는
+버전 1.3부터는 \pkgkwd{\josaignoreparens}|=1|이 선언되어 있으면 자동조사는
\hemph{괄호 부분을 건너뛰고} 그 앞 글자에 매칭한다.
|0|이 선언되면 원래 방식으로 돌아간다.
\begin{quote}
@@ -481,39 +659,76 @@
|홍길동(2001)\로|\quad$\Rightarrow$\quad 홍길동(2001)\로
\end{quote}
-\section{}
-항목 번호를 한국어 기호로 붙일 수 있다. \kotex과 동일하게 \cs{jaso} \cs{gana}
-\cs{ojaso} \cs{ogana} \cs{pjaso} \cs{pgana} \cs{onum} \cs{pnum} \cs{oeng}
-\cs{peng} \cs{hnum} \cs{Hnum} \cs{hroman} \cs{hRoman} \cs{hNum} \cs{hanjanum}
-따위를 사용한다.
-
-\section{}\label{sec:actualtext}
-\cs{actualtext{...}} 명령은 인자를 식자함과 동시에, \hemph{입력한 문자 그대로}
-PDF에서 텍스트로 추출할 수 있게 해준다. 인자가 두 페이지에 나눠지지 않도록
-유의한다. 모든 PDF 리더가 이를 지원하는 것은 아니다. 예:
-$\actualtext{\sqrt 2}$,
-{\sffamily \actualtext{ᄆᆞᄎᆞᆷ〮내〯}}.
-인자가 글자 없이 그림으로만 돼있다면 \cs{actualtext*{...}} 방식을 이용한다.
+\section{루아 모듈의 제거 및 복원}\label{sec:luamodule}
+
+루아 코드 |luatexko.deactivateall()|은 이상 언급한 \luatexko 의 거의 모든
+기능을 무력화한다. |luatexko.reactivateall()|은 이를 복원한다.%
+\footnote{수직 모드 (문단과 문단 사이)에서 사용할 것.
+ 수평 모드에서는 정상작동을 보장하지 못한다.}
+다른 패키지와 충돌할 때 시도해 볼 수 있다.
+전자의 함수에는 문자열을 인자로 줄 수도 있는데, 해당하는 다른 패키지의
+모듈들을 잠시 제거할 수 있다.
+
+\section{수식 한글}\label{sec:mathhangul}
-\section{}
-\cs{luatexhangulnormalize=1}이라 지시하면 첫가끝 자모를 완성형 음절로,
+\begin{quote}
+ |$가^{나^다}$|\quad$\Rightarrow\quad가^{나^다}$
+\end{quote}
+수식 한글 폰트를 설정하면 수식 모드에서도 한글을 {\small(hbox로 감싸지 않고)}
+직접 입력할 수 있다.%
+\footnote{%
+ 플레인텍에서는 \cs{mathhangulfont=UnBatang}과 같이 설정한다.
+ 또는 좀 더 그럴듯하게 하려면:\par
+ \leftskip=3em\noindent
+ |\\font\\texthangul="Noto Sans CJK KR DemiLight" at 10pt|\\
+ |\\font\\scripthangul="Noto Sans CJK KR Regular" at 7pt|\\
+ |\\font\\scriptscripthangul="Noto Sans CJK KR Medium" at 5pt|\\
+ |\\setmathhangulfonts\\texthangul\\scripthangul\\scriptscripthangul| }
+v2.0부터는 자동으로 수식 한글을 잡아주지 않는다.%
+\pkgkwd*{\setmathhangulfont}
+\begin{verbatim}
+ \setmathhangulfont{Noto Sans CJK KR}[
+ SizeFeatures={
+ {Size=-6, Font=* Medium},
+ {Size=6-9, Font=* Regular},
+ {Size=9-, Font=* DemiLight},
+ } ]
+\end{verbatim}
+현재 한글만 쓸 수 있게 설정되어 있다. 한자도 수식에 직접 입력하려면 사용자는
+다음 명령으로 유니코드 블럭을 추가 지정해야 한다.%
+\pkgkwd*{\setmathhangulblock}
+\begin{verbatim}
+ \setmathhangulblock{4E00}{9FC3}
+\end{verbatim}
+
+\section{한국어 항목 번호}\label{sec:hangulnums}
+
+\kotex과 동일하게 항목 번호를 한국어 기호로 붙일 수 있다.%
+\footnote{%
+ \cs{jaso} \cs{gana} \cs{ojaso} \cs{ogana} \cs{pjaso} \cs{pgana}
+ \cs{onum} \cs{pnum} \cs{oeng} \cs{peng} \cs{hnum} \cs{Hnum}
+ \cs{hroman} \cs{hRoman} \cs{hNum} \cs{hanjanum} 따위를 사용한다. }
+
+\section{입력 변환}\label{sec:normalize}
+
+\pkgkwd{\luatexhangulnormalize}|=1|이라 지시하면 첫가끝 자모를 완성형 음절로,
|2|라면 완성형 음절을 첫가끝 자모로 인코딩 변환한다. |0|이 할당되면
인코딩 변환 기능이 꺼진다. \XeTeX의 \cs{XeTeXinputnormalization} 명령과
-유사하나 오직 한글과 일부 한자에 대해서만 정규화가 작동하는 점에서
-\XeTeX의 그것에 비해 기능이 한참 모자란다.
+유사하나, 오직 한글과 일부 한자에 대해서만 정규화가 작동할 뿐이다.
+
+\section{UHC 입력 인코딩}\label{sec:uhcencoding}
+
+권장하지 않지만 불가피하게 입력 인코딩이 UHC (Unified Hangul Code)%
+\footnote{%
+ CP949라고도 하며 EUC-KR을 포함한다. }%
+로 되어 있는 파일을 처리할 때는 \pkgkwd{\luatexuhcinputencoding}|=1|을 선언한다.
+|0|을 할당하면 다시 UTF-8 입력으로 간주한다. \XeTeX의 \cs{XeTeXinputencoding}
+명령과 유사하나, 오직 한국어 문자만 처리할 수 있다.%
+\footnote{%
+ 윈도 운영체제에서의 한글 파일이름 불러오기 기능은 v2.0부터는 제공하지 않는다.
+ 대신 |luatex -cmdx ...|, |lualatex -cmdx ...|와 같이 컴파일시 명령행에
+ |-cmdx| 옵션을 주면 된다고 하니 테스트해 보시기 바란다. }
-\section{}\label{sec:uhcencoding}
-권장하지 않지만 불가피하게 입력 인코딩이 UHC (Unified Hangul Code)\footnote{%
- CP949라고도 하며 EUC-KR을 포함한다}로 되어 있는 파일을 처리할 때는
-\cs{luatexuhcinputencoding=1}을 선언한다.
-|0|을 할당하면 다시 UTF-8 입력으로 간주한다.
-\XeTeX의 \cs{XeTeXinputencoding} 명령과 유사하나 오직 한국어 문자만 처리할 수
-있어 \XeTeX의 그것에 비해 기능이 한참 모자란다.
-
-\section{}
-마찬가지로 바람직하지는 않지만 불가피하게 파일 이름이 UHC로 인코딩되어
-있다면 \cs{luatexuhcfilenames=1}을 선언한다. |0|을 할당하면 다시 UTF-8
-이름으로 간주한다. 윈도 계열 운영체제에서만 문제될 것이다.
\hfill \fboxsep=-\fboxrule \fbox{\vbox to 1em{\hbox to 1em{\hss}\vss}}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatexko.doc.tlpobj new/tlpkg/tlpobj/luatexko.doc.tlpobj
--- old/tlpkg/tlpobj/luatexko.doc.tlpobj 2019-04-06 23:33:58.000000000 +0200
+++ new/tlpkg/tlpobj/luatexko.doc.tlpobj 2020-03-20 23:58:34.000000000 +0100
@@ -1,9 +1,9 @@
name luatexko.doc
category Package
-revision 50816
+revision 54438
shortdesc doc files of luatexko
relocated 1
-docfiles size=66
+docfiles size=91
RELOC/doc/luatex/luatexko/ChangeLog
RELOC/doc/luatex/luatexko/README
RELOC/doc/luatex/luatexko/luatexko-doc.pdf
++++++ luatexko.tar.xz ++++++
++++ 6274 lines of diff (skipped)
++++++ luatodonotes.doc.tar.xz ++++++
Binary files old/doc/lualatex/luatodonotes/luatodonotes.pdf and new/doc/lualatex/luatodonotes/luatodonotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatodonotes.doc.tlpobj new/tlpkg/tlpobj/luatodonotes.doc.tlpobj
--- old/tlpkg/tlpobj/luatodonotes.doc.tlpobj 2019-02-28 03:52:51.000000000 +0100
+++ new/tlpkg/tlpobj/luatodonotes.doc.tlpobj 2020-02-18 01:54:47.000000000 +0100
@@ -1,8 +1,8 @@
name luatodonotes.doc
category Package
-revision 45454
+revision 53825
shortdesc doc files of luatodonotes
relocated 1
-docfiles size=53
+docfiles size=54
RELOC/doc/lualatex/luatodonotes/README.md
RELOC/doc/lualatex/luatodonotes/luatodonotes.pdf
++++++ luatodonotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luatodonotes/luatodonotes.lua new/tex/lualatex/luatodonotes/luatodonotes.lua
--- old/tex/lualatex/luatodonotes/luatodonotes.lua 2015-12-06 00:01:08.000000000 +0100
+++ new/tex/lualatex/luatodonotes/luatodonotes.lua 2020-02-17 23:18:23.000000000 +0100
@@ -1,5 +1,5 @@
--
--- Copyright (C) 2014-2015 by Fabian Lipp <fabian.lipp(a)gmx.de>
+-- Copyright (C) 2014-2020 by Fabian Lipp <fabian.lipp(a)gmx.de>
-- ------------------------------------------------------------
--
-- This file may be distributed and/or modified under the
@@ -374,8 +374,7 @@
end
function luatodonotes.linePositionsAddLine(ycoord, lineheight, linedepth)
- local baseline = ycoord - tex.pageheight
- linePositionsCurPage[#linePositionsCurPage + 1] = {baseline, baseline + lineheight, baseline - linedepth}
+ linePositionsCurPage[#linePositionsCurPage + 1] = {ycoord, lineheight, linedepth}
end
@@ -741,7 +740,7 @@
end
if foundGlyph then
- local w = node.new("whatsit", "write") -- 8/1
+ local w = node.new("whatsit", "write")
w.stream = lpoFileStream
local tokenlist = {
{12, 92, 0}, -- \
@@ -770,19 +769,31 @@
{12, 110, 0}, -- n
{12, 123, 0} -- {
}
- t = token.create("@todonotes@pdflastypos")
- tokenlist[#tokenlist + 1] = t
- tokenlist[#tokenlist + 1] = {12, 125, 0}
- tokenlist[#tokenlist + 1] = {12, 123, 0}
+ local t = token.create("@todonotes@pdflastypos")
+ -- the token handling changed with newer LuaTeX versions
+ if tex.luatexversion > 81 then
+ tokenlist[#tokenlist + 1] = {0, t.tok}
+ else
+ tokenlist[#tokenlist + 1] = t
+ end
+ tokenlist[#tokenlist + 1] = {12, 125, 0} -- }
+ tokenlist[#tokenlist + 1] = {12, 123, 0} -- {
appendStrToTokenlist(tokenlist, tostring(head.height))
- tokenlist[#tokenlist + 1] = {12, 125, 0}
- tokenlist[#tokenlist + 1] = {12, 123, 0}
+ tokenlist[#tokenlist + 1] = {12, 125, 0} -- }
+ tokenlist[#tokenlist + 1] = {12, 123, 0} -- {
appendStrToTokenlist(tokenlist, tostring(head.depth))
- tokenlist[#tokenlist + 1] = {12, 125, 0}
+ tokenlist[#tokenlist + 1] = {12, 125, 0} -- }
w.data = tokenlist
head.head = node.insert_before(head.head,head.head,w)
- local w = node.new("whatsit", "pdf_save_pos") -- 8/23
+ -- the name of the whatsit node changed with newer LuaTeX versions
+ local whatsitName
+ if tex.luatexversion > 80 then
+ whatsitName = "save_pos"
+ else
+ whatsitName = "pdf_save_pos"
+ end
+ local w = node.new("whatsit", whatsitName)
head.head = node.insert_before(head.head,head.head,w)
end
end
@@ -1742,7 +1753,18 @@
local function posPoLeaders(notes, rightSide, avoidLines)
local linePositionsCurPage
if avoidLines then
- linePositionsCurPage = linePositions[currentPage] or {}
+ linePositionsCurPage = {}
+ -- use the current pageheight to convert coordinates:
+ -- savepos yields coordinates relativ to lower left corner of page,
+ -- while our tikzpicture is anchored at the upper left corner
+ for k, v in pairs(linePositions[currentPage] or {}) do
+ local baseline = v[1] - tex.pageheight
+ linePositionsCurPage[k] = {baseline, baseline + v[2], baseline - v[3]}
+ if todonotesDebug then
+ print("linePositionsAddLine, add: " .. v[1] .. ", pageheight: " .. tex.pageheight ..
+ ", result: " .. baseline)
+ end
+ end
end
-- number of slots on the whole page
@@ -1759,11 +1781,16 @@
-- sort notes by inputY
table.sort(notes, compareNoteIndInputYDesc)
- -- draw slots
+ -- draw slots and line positions
if todonotesDebug then
for i = 1,totalNumSlots+1 do
local pos = area.top - (i-1) * rasterHeight
- tex.print("\\draw[blue,dashed] (0," .. pos .. "sp) -- +(21cm,0);")
+ tex.print("\\draw[blue,dashed] (0," .. pos .. "sp) -- +(21cm,0);")
+ end
+ for ind, v in pairs(linePositionsCurPage) do
+ local pos = v[1]
+ tex.print("\\draw[red,dashed] (0," .. pos .. "sp) -- +(21cm,0);")
+ tex.print("\\node[red] at (1cm," .. pos .. "sp) {" .. ind .. "};")
end
end
@@ -1870,7 +1897,7 @@
if avoidLines then
leaderArmR = labelTopR - noteInnerSep - r:getHeight() / 2 -- east anchor
- -- find first line (from the top) which lower bound is below leaderArmR
+ -- find first line (from the top) whose lower bound is below leaderArmR
local lineBelowInd
for ind, v in pairs(linePositionsCurPage) do
if v[3] <= leaderArmR then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/luatodonotes/luatodonotes.sty new/tex/lualatex/luatodonotes/luatodonotes.sty
--- old/tex/lualatex/luatodonotes/luatodonotes.sty 2017-10-02 23:58:58.000000000 +0200
+++ new/tex/lualatex/luatodonotes/luatodonotes.sty 2020-02-17 23:18:23.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2014-2015 by Fabian Lipp <fabian.lipp(a)gmx.de>
+%% Copyright (C) 2014-2020 by Fabian Lipp <fabian.lipp(a)gmx.de>
%% based on the todonotes package by
%% Henrik Skov Midtiby <henrikmidtiby(a)gmail.com>
%%
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{luatodonotes}
- [2017/09/30 v0.4 luatodonotes source and documentation.]
+ [2020/02/16 v0.5 luatodonotes source and documentation.]
\@ifpackageloaded{todonotes}{
\PackageError{luatodonotes}{%
@@ -280,13 +280,20 @@
\if@todonotes@additionalMarginEnabled
\newlength{\@todonotes@modpaperwidth}
\AfterEndPreamble{%
- \setlength{\@todonotes@modpaperwidth}{\paperwidth}%
- \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
- \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
- \pdfpagewidth=\@todonotes@modpaperwidth%
- \addtolength{\hoffset}{\@todonotes@additionalMargin}%
+ \@todonotes@setAdditionalMargin%
+ \ifdefined\Gm@changelayout
+ \g@addto@macro{\Gm@changelayout}{\@todonotes@setAdditionalMargin}
+ \fi
}%
\fi%
+\newcommand{\@todonotes@setAdditionalMargin}{
+ \setlength{\@todonotes@modpaperwidth}{\paperwidth}%
+ \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
+ \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
+ \ifdefined\pdfpagewidth\else\let\pdfpagewidth\pagewidth\fi
+ \pdfpagewidth=\@todonotes@modpaperwidth%
+ \addtolength{\hoffset}{\@todonotes@additionalMargin}%
+}
\newdimen\@todonotes@extractx
\newdimen\@todonotes@extracty
\newsavebox\@todonotes@heightcalcbox
@@ -315,6 +322,7 @@
\directlua{luatodonotes.setPositioningAlgo("\luatexluaescapestring{\@todonotes@positioning}")}
\directlua{luatodonotes.setSplittingAlgo("\luatexluaescapestring{\@todonotes@splitting}")}
\directlua{luatodonotes.setLeaderType("\luatexluaescapestring{\@todonotes@leadertype}")}
+\ifdefined\pdflastypos\else\let\pdflastypos\lastypos\fi
\def\@todonotes@pdflastypos{\the\pdflastypos}
\newcommand{\@todonotes@lineposition}[3]{%
\directlua{luatodonotes.linePositionsAddLine(#1,#2,#3)}%
@@ -336,6 +344,9 @@
\newcommand{\@todonotes@AtBeginShipoutUpperLeft}
{\AtBeginShipoutUpperLeft}
\fi
+\newcommand{\@todonotes@before@tikzpict}{\begingroup%
+ \ifdefined\tikzexternaldisable\tikzexternaldisable\fi}
+\newcommand{\@todonotes@after@tikzpict}{\endgroup}
\directlua{luatodonotes.initTodonotes()}
\soulregister{\ }{0}
\newlength{\todonotes@textmark@width}
@@ -366,6 +377,7 @@
{@todonotes@\arabic{@todonotes@numberoftodonotes}%
@\arabic{@todonotes@numberofLinesInArea} }%
\hspace*{\todonotes@textmark@shift}{\smash{%
+ \@todonotes@before@tikzpict%
\begin{tikzpicture}[overlay,remember picture,
deco/.style={}]%
\setlength\todonotes@textmark@linebelow%
@@ -394,7 +406,8 @@
-- (\@todonotes@nodeNamePrefix areaSE)
}
-- cycle;
- \end{tikzpicture}%
+ \end{tikzpicture}%
+ \@todonotes@after@tikzpict%
}}%
}%
\newcommand{\@todonotes@currentlinecolor}{}%
@@ -548,17 +561,21 @@
\@todonotes@areaselectedtrue%
\@todocommon{#1}{#2}%
\todonotes@textmark@highlight{#3}%
+ \@todonotes@before@tikzpict%
\begin{tikzpicture}[remember picture, overlay]%
\node [coordinate] (@todonotes@\arabic{@todonotes@numberoftodonotes} %
inTextEnd) {};%
\end{tikzpicture}%
+ \@todonotes@after@tikzpict%
\zref@label{@todonotes@\arabic{@todonotes@numberoftodonotes}@end}%
}%
\newcommand{\@todonotes@drawMarginNoteWithLine}{%
+ \@todonotes@before@tikzpict%
\begin{tikzpicture}[remember picture, overlay]%
\node [coordinate] (@todonotes@\arabic{@todonotes@numberoftodonotes} %
inText) {};%
\end{tikzpicture}%
+ \@todonotes@after@tikzpict%
\@todonotes@baselineskip=\baselineskip%
\@todonotes@normalbaselineskip=\normalbaselineskip%
\@todonotes@fontsize=\f@size pt%
@@ -607,7 +624,9 @@
\addcontentsline{tdo}{todo}{\@todonotes@caption}%
\fi}%
\newcommand{\@todonotes@drawInlineNote}{%
- {\par\noindent\begin{tikzpicture}[remember picture]%
+ {\par\noindent%
+ \@todonotes@before@tikzpict%
+ \begin{tikzpicture}[remember picture]%
\draw node[@todonotes@inlinenote,font=\@todonotes@sizecommand]{%
\if@todonotes@authorgiven%
{\noindent \@todonotes@sizecommand %
@@ -615,13 +634,16 @@
\else%
{\noindent \@todonotes@sizecommand \@todonotes@text}%
\fi};%
- \end{tikzpicture}\par}%
+ \end{tikzpicture}%
+ \@todonotes@after@tikzpict%
+ \par}%
}%
\newcommand{\missingfigure}[2][]{%
\setkeys{todonotes}{#1}%
\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}%
\par
\noindent
+\@todonotes@before@tikzpict%
\begin{tikzpicture}
\draw[fill=\@todonotes@currentfigcolor, draw = black!40, line width=2pt]
(-2, -2.5) rectangle +(\@todonotes@currentfigwidth, \@todonotes@currentfigheight);
@@ -632,6 +654,7 @@
\draw (0, 0.3) node {\@todonotes@MissingFigureUp};
\draw (0, -0.3) node {\@todonotes@MissingFigureDown};
\end{tikzpicture}\hfill
+\@todonotes@after@tikzpict%
}% Ending \missingfigure command
\fi% Ending \@todonotes@ifdisabled
\newcommand{\todototoc}
@@ -659,10 +682,12 @@
\directlua{luatodonotes.calcHeightsForNotes()}% has to be outside of tikzpicture
\raisebox{\voffset}{%
\hspace{-\hoffset}%
+ \@todonotes@before@tikzpict%
\begin{tikzpicture}[remember picture,overlay]
\directlua{luatodonotes.getInputCoordinatesForNotes()}
\directlua{luatodonotes.printNotes()}
\end{tikzpicture}%
+ \@todonotes@after@tikzpict%
}%
\directlua{luatodonotes.clearNotes()}%
\EndCatcodeRegime
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luatodonotes.tlpobj new/tlpkg/tlpobj/luatodonotes.tlpobj
--- old/tlpkg/tlpobj/luatodonotes.tlpobj 2019-02-28 03:52:51.000000000 +0100
+++ new/tlpkg/tlpobj/luatodonotes.tlpobj 2020-02-18 01:54:47.000000000 +0100
@@ -1,6 +1,6 @@
name luatodonotes
category Package
-revision 45454
+revision 53825
shortdesc Add editing annotations in a LuaLaTeX document
relocated 1
longdesc The package allows the user to insert comments into a document
@@ -10,7 +10,7 @@
longdesc selected using package options. The package is based on the
longdesc package todonotes, and depends heavily on Lua, so it can only
longdesc be used with LuaLaTeX.
-runfiles size=34
+runfiles size=35
RELOC/tex/lualatex/luatodonotes/inspect.lua
RELOC/tex/lualatex/luatodonotes/luatodonotes.lua
RELOC/tex/lualatex/luatodonotes/luatodonotes.sty
@@ -20,7 +20,6 @@
catalogue-contact-bugs https://github.com/fabianlipp/luatodonotes/issues
catalogue-contact-repository https://github.com/fabianlipp/luatodonotes
catalogue-ctan /macros/luatex/latex/luatodonotes
-catalogue-date 2017-10-01 23:18:24 +0200
catalogue-license lppl1.2
catalogue-topics notes editorial luatex use-lua
-catalogue-version 0.4
+catalogue-version 0.5
++++++ luavlna.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luavlna/README.md new/doc/luatex/luavlna/README.md
--- old/doc/luatex/luavlna/README.md 2018-05-31 23:52:21.000000000 +0200
+++ new/doc/luatex/luavlna/README.md 2019-11-07 23:21:01.000000000 +0100
@@ -1,4 +1,4 @@
-# Luavlna, version v0.1b, 2018-05-31
+# Luavlna, version v0.1f, 2019-11-06
# Introduction
Binary files old/doc/luatex/luavlna/luavlna-doc.pdf and new/doc/luatex/luavlna/luavlna-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luavlna/luavlna-doc.tex new/doc/luatex/luavlna/luavlna-doc.tex
--- old/doc/luatex/luavlna/luavlna-doc.tex 2018-05-31 23:52:21.000000000 +0200
+++ new/doc/luatex/luavlna/luavlna-doc.tex 2019-11-07 23:21:01.000000000 +0100
@@ -44,7 +44,7 @@
\verb!impnattypo! for Lua\LaTeX). %This package is for plain
%lua\TeX and for lua\LaTeX.
-Other feature of this package is including of non-breakable space after
+Another feature is inclusion of a non-breakable space after
initials, like in personal names, after or before academic degrees
and between numbers and units (SI and others).
@@ -52,10 +52,11 @@
TeX.sx\footnote{\url{http://tex.stackexchange.com/a/28128/2891}}.
The difference is that it is possible to specify which single letters
should be taken into account for different languages.
-The support for degrees and units was added as well.
+% The support for degrees and units was added as well.
% The code works also for single letters at the beginning of the brackets.
+
\section{Usage}
The usage is simple:
@@ -129,6 +130,19 @@
in the preamble.
+\section{Package options}
+The \verb|luavlna| package recognizes the following options
+
+\begin{description}
+ \item[\texttt{noprocess}] -- disable the automatic document processing.
+ \item[\texttt{noinitials}] -- disable processing of the initials.
+ \item[\texttt{nounits}] -- disable processing of the SI units.
+ \item[\texttt{nopredegrees}] -- disable processing of the the academic degrees before names.
+ \item[\texttt{nosufdegrees}] -- disable processing of the the academic degrees after names.
+ \item[\texttt{debug}] -- enable the debugging mode.
+ \item[\texttt{defaults}] -- load default settings. Enabled by default.
+\end{description}
+
\section{Commands}
\begin{mycode}
@@ -169,6 +183,35 @@
\end{verbatim}
\end{mycode}
+
+\subsection{Split hyphens}
+
+The hyphenated words like ``je-li'' should be be hyphenated as ``je-/-li``
+according to the Czech typesetting rules. This behaviour can be enabled or disabled for a particular
+language using the following commands:
+
+\begin{mycode}
+ \cmd{\enablesplithyphens}\marg{language name}\\
+ \cmd{\disablesplithyphens}\marg{language name}
+\end{mycode}
+
+By default, it is enabled for the Czech language.
+
+Example in action:
+
+\begin{minipage}{3in}
+ \selectlanguage{czech}
+ Sedlec-Prčice, modro-zelený, překladatel-tlumočník, kuchař-číšník, propan-butan,
+ Otýlie Sklenářová-Malá, František Jílek-Oberpfalcer.
+ \selectlanguage{english}
+\end{minipage}
+
+The similar behaviour can be achieved using the \verb|\splithyphens| command
+provided by Czech langauge definitions for the Babel package, but it's use is
+discouraged. It prevents use ot the hyphen character in many situations. The
+solution provided by Luavlna should be safe.
+
+
\subsection{Turning off language switching}
By default, language of the nodes is taken into account. If you want to use
@@ -192,14 +235,16 @@
\cmd{\preventsingleon}
\end{mycode}
-You can also disable units and degrees processing:
+You can also disable initials, units and degrees processing:
\begin{mycode}
+ \cmd{\noinitials}\\
\cmd{\nounits}\\
\cmd{\nopredegrees}\\
\cmd{\nosufdegrees}
\end{mycode}
+
\subsection{Debugging commands}
\begin{mycode}
\cmd{\preventsingledebugon}\par
@@ -227,7 +272,7 @@
\subsection{Recognized languages}
\subsubsection{Lua\TeX\ and Lua\LaTeX}
-File \verb|language.dat| is processed to load language names, aliases and assigned numbers. These language names are the same as supported by \verb|babel| package.
+File \verb|language.dat| is processed to load language names, aliases and assigned numbers. These language names are the same as names supported by the \verb|babel| package.
\begin{quotation}
\small\noindent
@@ -248,10 +293,7 @@
\subsubsection{CSplain}
-Different method is used. File \verb|hyphen.lan| is included in CSplain, where
-language numbers are assigned to ISO-639-1 or ISO-639-2 language codes.
-These language codes were then normalized to names used vy \verb|babel|, or
-standard English language names.
+Different method is used with the CSplain format. The \verb|lua-hyphen.lan| file is parsed for the language codes.
\begin{quotation}
\small\noindent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luavlna/luavlna.tex new/doc/luatex/luavlna/luavlna.tex
--- old/doc/luatex/luavlna/luavlna.tex 2018-05-31 23:52:21.000000000 +0200
+++ new/doc/luatex/luavlna/luavlna.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,104 +0,0 @@
-% detect LaTeX and use the correct method for luatexbase inclusion
-\ifx\RequirePackage\undefined
- \input{luatexbase.sty}%
-\else
- \RequirePackage{luatexbase}
-\fi
-
-\newluatexattribute\preventsinglestatus
-% Modify pre_linebreak_filter callback so the spaces can be inserted
-\directlua{%
-luavlna = require "luavlna"
-langno = require "luavlna-langno"
-luatexbase.add_to_callback("pre_linebreak_filter", luavlna.preventsingle," ")
-
-local languages = langno.load_languages()
-local get_lang_id = function(lang)
- local langid = lang
- if not tonumber(lang) then
- langid = languages:get_number(lang)
- end
- return langid
-end
-
-% Process string and make table of enabled single letters
-% By default, spaces for all single letters are inserted
-% This can be modified with \singlechars macro
-set_singlechars = function(lang,chars)
- local utf_gmatch = unicode.utf8.gmatch
- % local langnumbers = languages.names
- local langid = get_lang_id(lang)
- if not langid then return nil, "Cannot find language number for: "..lang end
- local chars = chars or ""
- local singlechars = {}
- local percent = string.char(37)
- local alpha = percent .. "a"
- for char in utf_gmatch(chars,"("..alpha..")") do
- singlechars[char] = true
- end
- luavlna.singlechars(langid,singlechars)
-end
-
-% set compound characters for initials handling
-% useful for Czech "Ch" etc.
-% comma separated list of compounds
-set_compounds = function(lang, compounds)
- local langid = get_lang_id(lang)
- if not langid then return nil, "Cannot find language number for: "..lang end
- local c = compounds:explode(",+") % match multiple colons as one
- local compoundstable = {}
- for _, compound in pairs(c) do
- compoundstable[compound] = true
- end
- luavlna.initials(langid, compoundstable)
-end
-
-set_main_language = function(lang)
- local langid = languages:get_number(lang)
- if not langid then return nil, "Cannot find language number for: "..lang end
- luavlna.set_main_language(langid)
-end
-}
-
-% Set letters which are prevented from breaking
-\def\singlechars#1#2{%
-\directlua{set_singlechars("#1","#2")}
-}
-
-% Define compound initials
-\def\compoundinitials#1#2{%
-\directlua{set_compounds("#1","#2")}
-}
-% Enable inserting of visual marks for debugging
-\def\preventsingledebugon{%
-\directlua{luavlna.debug(true)}
-}
-
-\def\preventsinglelang#1{%
- \directlua{set_main_language("#1")}
-}
-
-\def\preventsingleon{%
- \preventsinglestatus=2
-}
-
-\def\preventsingleoff{
- \preventsinglestatus=1
-}
-% Disable inserting of visual marks for dewbugging
-\def\preventsingledebugoff{%
-\directlua{luavlna.debug(false)}
-}
-
-% disable processing of units or degrees
-
-\def\nopredegrees{\directlua{luavlna.no_predegrees = true}}
-\def\nosufdegrees{\directlua{luavlna.no_sufdegrees = true}}
-\def\nounits{\directlua{luavlna.no_unit = true}}
-
-\ifdefined\nosingledefaults\else
- \singlechars{czech}{AIiVvOoUuSsZzKk}
- \singlechars{slovak}{AIiVvOoUuSsZzKk}
- \compoundinitials{czech}{Ch,CH}
-\fi
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luavlna.doc.tlpobj new/tlpkg/tlpobj/luavlna.doc.tlpobj
--- old/tlpkg/tlpobj/luavlna.doc.tlpobj 2019-02-28 03:52:51.000000000 +0100
+++ new/tlpkg/tlpobj/luavlna.doc.tlpobj 2019-11-08 01:56:05.000000000 +0100
@@ -1,10 +1,9 @@
name luavlna.doc
category Package
-revision 47892
+revision 52682
shortdesc doc files of luavlna
relocated 1
-docfiles size=26
+docfiles size=27
RELOC/doc/luatex/luavlna/README.md
RELOC/doc/luatex/luavlna/luavlna-doc.pdf
RELOC/doc/luatex/luavlna/luavlna-doc.tex
- RELOC/doc/luatex/luavlna/luavlna.tex
++++++ luavlna.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luavlna/luavlna-csplain-langs.lua new/tex/luatex/luavlna/luavlna-csplain-langs.lua
--- old/tex/luatex/luavlna/luavlna-csplain-langs.lua 2018-05-31 23:52:21.000000000 +0200
+++ new/tex/luatex/luavlna/luavlna-csplain-langs.lua 2019-05-05 00:48:20.000000000 +0200
@@ -1,59 +1,21 @@
-return {
-["spanish; castilian"]={26, 126},
-["magyar; hungarian"]={30, 130},
-["english; usenglish; american"]={100},
-["icelandic"]={42, 142},
-["basque"]={33, 133},
-["coptic"]={205},
-["catalan; valencian"]={204},
-["welsh"]={24, 124},
-["irish"]={34, 134},
-["armenian"]={210},
-["chinese"]={41, 141},
-["danish"]={25, 125},
-["turkish"]={31, 131},
-["interlingua "]={103},
-["slovak"]={6, 16, 116},
-["english; ukenglish; british"]={101},
-["ukrainian"]={209},
-["turkmen"]={47, 147},
-["sanskrit"]={207},
-["hindi"]={212},
-["lao"]={214},
-["finnish"]={29, 129},
-["assamese"]={211},
-["greek; polutonikogreek"]={203},
-["czech"]={5, 15, 115},
-["tamil"]={221},
-["italian"]={102},
-["french; francais; canadien; acadian"]={22, 122},
-["telugu"]={222},
-["croatian"]={40, 140},
-["panjabi; punjabi"]={220},
-["oriya"]={219},
-["russian"]={208},
-["malayalam"]={217},
-["marathi"]={218},
-["uppersorbian"]={43, 143},
-["portuges; portuguese; brazilian; brazil"]={38, 138},
-["galician"]={45, 145},
-["latvian"]={215},
-["afrikaans"]={44, 144},
-["lithuanian"]={216},
-["slovenian;slovene"]={28, 128},
-["mongolian"]={206},
-["greek; polutonikogreek"]={202},
-["latin"]={48, 148},
-["indonesian; indon; bahasai; bahasam; malay; meyalu"]={104},
-["polish"]={23, 123},
-["bokmål"]={35, 135},
-["dutch; flemish"]={37, 137},
-["greek; polutonikogreek"]={201},
-["norsk; nynorsk; norwegian"]={36, 136},
-["kannada"]={213},
-["estonian"]={32, 132},
-["english; usenglish; american; ukenglish; british; canadian; australian; newzealand"]={0},
-["romanian; moldavian; moldovan"]={39, 139},
-["german; germanb; ngerman; naustrian"]={21, 121},
-["kurdish"]={46, 146},
-}
+local languages = {}
+local function parse_language_lan(content)
+ for name, id in content:gmatch("preplang%s+.-%s+(.-)%s+.-%s(.-)%s+") do
+ -- skip invalid languages
+ if not name:match("%#") then
+ languages[name] = id
+ end
+ end
+end
+
+local langfile = kpse.find_file("lua-hyphen.lan")
+if langfile then
+ local f = io.open(langfile, "r")
+ local content = f:read("*all")
+ parse_language_lan(content)
+ f:close()
+end
+
+
+return languages
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luavlna/luavlna-langno.lua new/tex/luatex/luavlna/luavlna-langno.lua
--- old/tex/luatex/luavlna/luavlna-langno.lua 2018-05-31 23:52:21.000000000 +0200
+++ new/tex/luatex/luavlna/luavlna-langno.lua 2019-05-05 00:48:20.000000000 +0200
@@ -67,7 +67,6 @@
local numlang = {}
for k, v in pairs(l) do
local first = k:gsub(" *;.*","")
- --print(first)
langnum[first] = v
for _,i in ipairs(v) do
numlang[i] = first
@@ -85,7 +84,7 @@
drivers["default"] = load_lang_dat
drivers["csplain"] = load_csplain
drivers["pdfcsplain"] = load_csplain
-drivers["luaplain"] = load_csplain
+drivers["luacsplain"] = load_csplain
local load_languages = function(name)
local name = name or format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luavlna/luavlna.lua new/tex/luatex/luavlna/luavlna.lua
--- old/tex/luatex/luavlna/luavlna.lua 2018-05-31 23:52:21.000000000 +0200
+++ new/tex/luatex/luavlna/luavlna.lua 2019-11-07 23:21:01.000000000 +0100
@@ -14,6 +14,7 @@
local glyph_id = node.id "glyph"
local hlist_id = node.id "hlist"
local vlist_id = node.id "vlist"
+local penalty_id = node.id "penalty"
local math_id = node.id "math"
local period_char = string.byte(".")
@@ -47,15 +48,12 @@
-- must be table in the {char = true, char2=true} form
local set_singlechars= function(lang,c)
--print("Set single chars lua")
- print(type(lang), lang)
if type(lang) == "table" then
for _,l in pairs(lang) do
- print("language: ",l)
singlechars[l] = c
end
else
local lang = tonumber(lang)
- print("language: ",lang)
-- for k,_ in pairs(c) do print(k) end
singlechars[lang] = c
end
@@ -227,11 +225,13 @@
local word = ""
local no_predegrees = M.no_predegrees
local no_sufdegrees = M.no_sufdegrees
+ local no_initials = M.no_initials
local in_math = false
while head do
local id = head.id
local nextn = head.next
- local skip = node.has_attribute(head, luatexbase.attributes.preventsinglestatus)
+ -- local skip = node.has_attribute(head, luatexbase.attributes.preventsinglestatus)
+ local skip = node.has_attribute(head, M.preventsingleid)
if id == math_id then
if head.subtype == 0 then
word = ""
@@ -286,7 +286,7 @@
space = false
-- handle initials
-- uppercase letter followed by period (code 46)
- elseif init and head.id == glyph_id and head.char == period_char and nextn.id == glue_id and utf_len(word) == 1 then
+ elseif no_initials~=true and init and head.id == glyph_id and head.char == period_char and nextn.id == glue_id and utf_len(word) == 1 then
head = insert_penalty(head)
elseif head.id == glyph_id then
local char = utf_char(head.char)
@@ -307,10 +307,79 @@
return true
end
+local hyphenate_langs = {}
+local hyphenchar = string.byte("-")
+-- don't break if the next or previous char is hyphen, in order to support ligaturing of dashes
+local is_hyphen_ligature = function(n)
+ local next_node = n.next
+ -- split_hyphens code
+ if next_node and next_node.id == glyph_id and next_node.char == hyphenchar then
+ return true
+ end
+ local prev_node = n.prev
+ if prev_node and prev_node.id == glyph_id and prev_node.char == hyphenchar then
+ return true
+ end
+ return false
+end
+
+-- detect if the current character is a hyphen
+local function is_breakable_hyphen(n)
+ return n.id == glyph_id and hyphenate_langs[n.lang] and n.char == hyphenchar
+end
+
+-- don't process hyphens if the next node is penalty
+-- necessary to support \nobreakdash
+local function is_next_penalty(n)
+ local next_node = n.next
+ if next_node and next_node.id == penalty_id then
+ return true
+ end
+end
+
+-- Enable hyphenation of words that contain hyphens
+-- and repeating of the explicit hyphen on a new line when
+-- the hyphen is hyphenated
+-- It should be used in the `hyphenate` callback
+-- based on ShreewatsaR's code from:
+-- https://tex.stackexchange.com/a/417883/2891
+local break_hyphens = function(head, tail)
+ local glyph_id = node.id("glyph")
+ local n = head
+ while n do
+ local skip = node.has_attribute(n, M.preventsingleid)
+ if skip ~= 1 and is_breakable_hyphen(n) and not is_next_penalty(n) and not is_hyphen_ligature(n) then
+ -- Insert an infinite penalty before, and a zero-width glue node after, the hyphen.
+ -- Like writing "\nobreak-\hspace{0pt}" or equivalently "\penalty10000-\hskip0pt"
+ local p = node.new(node.id('penalty'))
+ p.penalty = 10000
+ head, p = node.insert_before(head, n, p)
+ local g = node.new(node.id('glue'))
+ head, g = node.insert_after(head, n, g)
+ -- insert the discretionary
+ local disc = node.new("disc")
+ disc.penalty = tex.hyphenpenalty
+ disc.subtype = 2
+ disc.pre = node.copy(n)
+ disc.post = node.copy(n)
+ disc.replace = node.copy(n)
+ node.insert_before(head, g, disc)
+ -- insert another penalty
+ node.insert_before(head, g, node.copy(p))
+ node.remove(head,n)
+ n = g
+ end
+ n = n.next
+ end
+ lang.hyphenate(head, tail)
+end
+
M.preventsingle = prevent_single_letter
M.singlechars = set_singlechars
M.initials = set_initials
M.set_tex4ht = set_tex4ht
M.debug = set_debug
M.set_main_language = set_main_language
+M.split_hyphen_langs = hyphenate_langs
+M.split_hyphens = break_hyphens
return M
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luavlna/luavlna.sty new/tex/luatex/luavlna/luavlna.sty
--- old/tex/luatex/luavlna/luavlna.sty 2018-05-31 23:52:21.000000000 +0200
+++ new/tex/luatex/luavlna/luavlna.sty 2019-11-07 23:21:01.000000000 +0100
@@ -1,8 +1,12 @@
-\ProvidesPackage{luavlna}[2017/09/30 luavlna]
+\ProvidesPackage{luavlna}[2019/10/30 luavlna]
+
+\RequirePackage{kvoptions}
\def\nosingledefaults{\relax}
\input luavlna
+% we need to redefine the setting functions to use directly the language numbers
+% in order to support polyglossia
\def\singlechars#1#2{%
\ifcsname l@#1\endcsname%
\expandafter\directlua\expandafter{set_singlechars("\the\csname l@#1\endcsname","#2")}%
@@ -16,9 +20,36 @@
\fi%
}
+
+\def\enablesplithyphens#1{%
+ \ifcsname l@#1\endcsname%
+ \typeout{set lang #1, \the\csname l@#1\endcsname}
+ \directlua{enable_split_hyphens("\the\csname l@#1\endcsname")}%
+ \fi%
+}
+
+\def\disablesplithyphens#1{%
+ \ifcsname l@#1\endcsname%
+ \directlua{disable_split_hyphens("\the\csname l@#1\endcsname")}%
+ \fi%
+}
+
+\DeclareVoidOption{noinitials}{\noinitials}
+\DeclareVoidOption{nounits}{\nounits}
+\DeclareVoidOption{nopredegrees}{\nopredegrees}
+\DeclareVoidOption{nosufdegrees}{\nosufdegrees}
+\DeclareVoidOption{noprocess}{\preventsingleoff}
+\DeclareVoidOption{debug}{\preventsingledebugon}
+\DeclareBoolOption[true]{defaults}
+\ProcessKeyvalOptions*
+
+\ifluavlna@defaults
\AtBeginDocument{%
\singlechars{czech}{AIiVvOoUuSsZzKk}
\singlechars{slovak}{AIiVvOoUuSsZzKk}
\compoundinitials{czech}{Ch,CH}
+ \enablesplithyphens{czech}
+ \enablesplithyphens{slovak}
}
+\fi
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/luatex/luavlna/luavlna.tex new/tex/luatex/luavlna/luavlna.tex
--- old/tex/luatex/luavlna/luavlna.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/luatex/luavlna/luavlna.tex 2019-11-07 23:21:01.000000000 +0100
@@ -0,0 +1,124 @@
+% Modify pre_linebreak_filter callback so the spaces can be inserted
+\directlua{%
+luavlna = require "luavlna"
+langno = require "luavlna-langno"
+
+require "ltluatex"
+luatexbase.add_to_callback("pre_linebreak_filter", luavlna.preventsingle,"LuaVlna")
+luatexbase.add_to_callback("hyphenate", luavlna.split_hyphens, "allow hyphen breaks")
+% -- define the attribute number
+luavlna.preventsingleid = math.random(2^16)
+
+local languages = langno.load_languages()
+local get_lang_id = function(lang)
+ local langid = tonumber(lang)
+ if not tonumber(lang) then
+ langid = languages:get_number(lang)
+ end
+ return langid
+end
+
+% Process string and make table of enabled single letters
+% By default, spaces for all single letters are inserted
+% This can be modified with \singlechars macro
+set_singlechars = function(lang,chars)
+ local utf_gmatch = unicode.utf8.gmatch
+ % local langnumbers = languages.names
+ local langid = get_lang_id(lang)
+ if not langid then return nil, "Cannot find language number for: "..lang end
+ local chars = chars or ""
+ local singlechars = {}
+ local percent = string.char(37)
+ local alpha = percent .. "a"
+ for char in utf_gmatch(chars,"("..alpha..")") do
+ singlechars[char] = true
+ end
+ luavlna.singlechars(langid,singlechars)
+end
+
+% set compound characters for initials handling
+% useful for Czech "Ch" etc.
+% comma separated list of compounds
+set_compounds = function(lang, compounds)
+ local langid = get_lang_id(lang)
+ if not langid then return nil, "Cannot find language number for: "..lang end
+ local c = compounds:explode(",+") % match multiple colons as one
+ local compoundstable = {}
+ for _, compound in pairs(c) do
+ compoundstable[compound] = true
+ end
+ luavlna.initials(langid, compoundstable)
+end
+
+set_main_language = function(lang)
+ local langid = languages:get_number(lang)
+ if not langid then return nil, "Cannot find language number for: "..lang end
+ luavlna.set_main_language(langid)
+end
+
+enable_split_hyphens = function(lang)
+ local langid = get_lang_id(lang)
+ if not langid then return nil, "Cannot find language number for: "..lang end
+ luavlna.split_hyphen_langs[langid] = true
+end
+
+disable_split_hyphens = function(lang)
+ local langid = get_lang_id(lang)
+ if not langid then return nil, "Cannot find language number for: "..lang end
+ luavlna.split_hyphen_langs[langid] = nil
+end
+}
+
+% Set letters which are prevented from breaking
+\def\singlechars#1#2{%
+\directlua{set_singlechars("#1","#2")}
+}
+
+% Define compound initials
+\def\compoundinitials#1#2{%
+\directlua{set_compounds("#1","#2")}
+}
+% Enable inserting of visual marks for debugging
+\def\preventsingledebugon{%
+\directlua{luavlna.debug(true)}
+}
+
+\def\preventsinglelang#1{%
+ \directlua{set_main_language("#1")}
+}
+
+%\newluatexattribute\preventsinglestatus
+\attributedef\preventsinglestatus=\directlua{tex.print(luavlna.preventsingleid)} % just a random number
+
+\def\preventsingleon{%
+ \preventsinglestatus=2
+}
+
+\def\preventsingleoff{
+ \preventsinglestatus=1
+}
+% Disable inserting of visual marks for dewbugging
+\def\preventsingledebugoff{%
+\directlua{luavlna.debug(false)}
+}
+
+% enable/disable split hyphens for a language
+
+\def\enablesplithyphens#1{\directlua{enable_split_hyphens("#1")}}
+\def\disablesplithyphens#1{\directlua{disable_split_hyphens("#1")}}
+
+% disable processing of units or degrees
+
+\def\nopredegrees{\directlua{luavlna.no_predegrees = true}}
+\def\nosufdegrees{\directlua{luavlna.no_sufdegrees = true}}
+\def\nounits{\directlua{luavlna.no_unit = true}}
+\def\noinitials{\directlua{luavlna.no_initials = true}}
+
+\ifdefined\nosingledefaults\else
+ \singlechars{czech}{AIiVvOoUuSsZzKk}
+ \singlechars{slovak}{AIiVvOoUuSsZzKk}
+ \compoundinitials{czech}{Ch,CH}
+ \enablesplithyphens{czech}
+ \enablesplithyphens{slovak}
+\fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luavlna.tlpobj new/tlpkg/tlpobj/luavlna.tlpobj
--- old/tlpkg/tlpobj/luavlna.tlpobj 2019-02-28 03:52:51.000000000 +0100
+++ new/tlpkg/tlpobj/luavlna.tlpobj 2019-11-08 01:56:05.000000000 +0100
@@ -1,6 +1,6 @@
name luavlna
category Package
-revision 47892
+revision 52682
shortdesc Prevent line breaks after single letter words, units, or adademic titles
relocated 1
longdesc In some languages, like Czech or Polish, there should be no
@@ -16,7 +16,7 @@
longdesc BTW: "vlna" is the Czech word for "wave" or "curl" and also
longdesc denotes the tilde which, in TeX, is used for "unbreakable
longdesc spaces".
-runfiles size=11
+runfiles size=12
RELOC/tex/luatex/luavlna/luavlna-csplain-langs.lua
RELOC/tex/luatex/luavlna/luavlna-langno.lua
RELOC/tex/luatex/luavlna/luavlna-predegrees.lua
@@ -26,11 +26,12 @@
RELOC/tex/luatex/luavlna/luavlna.4ht
RELOC/tex/luatex/luavlna/luavlna.lua
RELOC/tex/luatex/luavlna/luavlna.sty
+ RELOC/tex/luatex/luavlna/luavlna.tex
catalogue-also encxvlna xevlna
catalogue-contact-bugs https://github.com/michal-h21/luavlna/issues
catalogue-contact-repository https://github.com/michal-h21/luavlna
catalogue-ctan /macros/luatex/generic/luavlna
-catalogue-date 2018-06-01 05:09:44 +0200
+catalogue-date 2019-11-07 14:38:13 +0100
catalogue-license lppl1.3
catalogue-topics typesetting czech slovak polish luatex
-catalogue-version 0.1b
+catalogue-version 0.1f
++++++ luaxml.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luaxml/README new/doc/luatex/luaxml/README
--- old/doc/luatex/luaxml/README 2019-01-10 23:20:52.000000000 +0100
+++ new/doc/luatex/luaxml/README 2019-09-20 23:33:58.000000000 +0200
@@ -28,7 +28,7 @@
------
Michal Hoftich
Email: michal.h21(a)gmail.com
-Version: v0.1h, 2018-12-18
+Version: 0.1l, 2019-09-16
Original authors: Paul Chakravarti and Manoel Campos (http://manoelcampos.com)
Binary files old/doc/luatex/luaxml/luaxml.pdf and new/doc/luatex/luaxml/luaxml.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/luatex/luaxml/luaxml.tex new/doc/luatex/luaxml/luaxml.tex
--- old/doc/luatex/luaxml/luaxml.tex 2019-01-10 23:20:52.000000000 +0100
+++ new/doc/luatex/luaxml/luaxml.tex 2019-09-20 23:33:58.000000000 +0200
@@ -7,7 +7,7 @@
\usepackage{framed}
% Version is defined in the makefile, use default values when compiled directly
\ifdefined\version\else
-\def\version{v0.1h}
+\def\version{0.1l}
\let\gitdate\date
\fi
\newcommand\modulename[1]{\subsection{#1}\label{sec:#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/luaxml.doc.tlpobj new/tlpkg/tlpobj/luaxml.doc.tlpobj
--- old/tlpkg/tlpobj/luaxml.doc.tlpobj 2019-02-28 03:52:51.000000000 +0100
+++ new/tlpkg/tlpobj/luaxml.doc.tlpobj 2019-09-21 01:53:52.000000000 +0200
@@ -1,6 +1,6 @@
name luaxml.doc
category Package
-revision 49663
+revision 52137
shortdesc doc files of luaxml
relocated 1
docfiles size=32
++++++ luaxml.tar.xz ++++++
++++ 4538 lines of diff (skipped)
++++++ lwarp.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/lwarp/README.txt new/texmf-dist/doc/latex/lwarp/README.txt
--- old/texmf-dist/doc/latex/lwarp/README.txt 2019-04-03 23:40:52.000000000 +0200
+++ new/texmf-dist/doc/latex/lwarp/README.txt 2020-03-27 22:13:53.000000000 +0100
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.70 README.txt
+LaTeX lwarp package v0.83 README.txt
Files included are:
@@ -41,7 +41,7 @@
version 2005/12/01 or later.
-Copyright 2016-2019 Brian Dunn
+Copyright 2016-2020 Brian Dunn
Homepage: http://BDTechConcepts.com
Email: bd(a)BDTechConcepts.com
Binary files old/texmf-dist/doc/latex/lwarp/lwarp.pdf and new/texmf-dist/doc/latex/lwarp/lwarp.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lwarp.doc.tlpobj new/tlpkg/tlpobj/lwarp.doc.tlpobj
--- old/tlpkg/tlpobj/lwarp.doc.tlpobj 2019-04-04 01:24:46.000000000 +0200
+++ new/tlpkg/tlpobj/lwarp.doc.tlpobj 2020-03-28 01:55:24.000000000 +0100
@@ -1,8 +1,8 @@
name lwarp.doc
category Package
-revision 50739
+revision 54586
shortdesc doc files of lwarp
-docfiles size=594
+docfiles size=650
texmf-dist/doc/latex/lwarp/README.txt
texmf-dist/doc/latex/lwarp/lwarp.pdf
texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt
++++++ lwarp.tar.xz ++++++
++++ 23816 lines of diff (skipped)
++++++ lyluatex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/lyluatex/LICENSE new/doc/support/lyluatex/LICENSE
--- old/doc/support/lyluatex/LICENSE 2018-03-13 23:07:05.000000000 +0100
+++ new/doc/support/lyluatex/LICENSE 2019-05-28 23:25:42.000000000 +0200
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2015--2018 jperon and others
+Copyright (c) 2015--2019 jperon and others
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/support/lyluatex/README.md new/doc/support/lyluatex/README.md
--- old/doc/support/lyluatex/README.md 2018-03-13 23:07:05.000000000 +0100
+++ new/doc/support/lyluatex/README.md 2019-05-28 23:25:42.000000000 +0200
@@ -84,3 +84,14 @@
# Credits
Cf. [Contributors.md](Contributors.md)
+
+# Contributing
+
+If you want improvements or encounter an error, do not hesitate to
+to report the [issue](https://github.com/jperon/lyluatex/issues).
+If you have programming skills, you may also propose your changes
+via a [pull request](https://github.com/jperon/lyluatex/pulls).
+
+This extension is and will remain free; if you find it useful and
+wish to encourage its development by a
+[donation](https://www.paypal.me/abjperon), many thanks!
Binary files old/doc/support/lyluatex/lyluatex.pdf and new/doc/support/lyluatex/lyluatex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/lyluatex/lyluatex.tex new/doc/support/lyluatex/lyluatex.tex
--- old/doc/support/lyluatex/lyluatex.tex 2018-03-13 23:07:05.000000000 +0100
+++ new/doc/support/lyluatex/lyluatex.tex 2019-05-28 23:25:42.000000000 +0200
@@ -40,37 +40,37 @@
\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
% Add ',fontsize=\small' for more characters per line
\newenvironment{Shaded}{}{}
-\newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
-\newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{#1}}
-\newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+\newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
+\newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+\newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
\newcommand{\BaseNTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
-\newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
-\newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{#1}}
+\newcommand{\BuiltInTok}[1]{#1}
\newcommand{\CharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
-\newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{#1}}
-\newcommand{\ImportTok}[1]{#1}
\newcommand{\CommentTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textit{#1}}}
-\newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{#1}}}
-\newcommand{\AnnotationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
\newcommand{\CommentVarTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
-\newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{#1}}
-\newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
-\newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{#1}}
+\newcommand{\ConstantTok}[1]{\textcolor[rgb]{0.53,0.00,0.00}{#1}}
\newcommand{\ControlFlowTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
-\newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
-\newcommand{\BuiltInTok}[1]{#1}
+\newcommand{\DataTypeTok}[1]{\textcolor[rgb]{0.56,0.13,0.00}{#1}}
+\newcommand{\DecValTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+\newcommand{\DocumentationTok}[1]{\textcolor[rgb]{0.73,0.13,0.13}{\textit{#1}}}
+\newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
\newcommand{\ExtensionTok}[1]{#1}
+\newcommand{\FloatTok}[1]{\textcolor[rgb]{0.25,0.63,0.44}{#1}}
+\newcommand{\FunctionTok}[1]{\textcolor[rgb]{0.02,0.16,0.49}{#1}}
+\newcommand{\ImportTok}[1]{#1}
+\newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+\newcommand{\KeywordTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{\textbf{#1}}}
+\newcommand{\NormalTok}[1]{#1}
+\newcommand{\OperatorTok}[1]{\textcolor[rgb]{0.40,0.40,0.40}{#1}}
+\newcommand{\OtherTok}[1]{\textcolor[rgb]{0.00,0.44,0.13}{#1}}
\newcommand{\PreprocessorTok}[1]{\textcolor[rgb]{0.74,0.48,0.00}{#1}}
-\newcommand{\AttributeTok}[1]{\textcolor[rgb]{0.49,0.56,0.16}{#1}}
\newcommand{\RegionMarkerTok}[1]{#1}
-\newcommand{\InformationTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
+\newcommand{\SpecialCharTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
+\newcommand{\SpecialStringTok}[1]{\textcolor[rgb]{0.73,0.40,0.53}{#1}}
+\newcommand{\StringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
+\newcommand{\VariableTok}[1]{\textcolor[rgb]{0.10,0.09,0.49}{#1}}
+\newcommand{\VerbatimStringTok}[1]{\textcolor[rgb]{0.25,0.44,0.63}{#1}}
\newcommand{\WarningTok}[1]{\textcolor[rgb]{0.38,0.63,0.69}{\textbf{\textit{#1}}}}
-\newcommand{\AlertTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
-\newcommand{\ErrorTok}[1]{\textcolor[rgb]{1.00,0.00,0.00}{\textbf{#1}}}
-\newcommand{\NormalTok}[1]{#1}
\setlength{\emergencystretch}{3em} % prevent overfull lines
\providecommand{\tightlist}{%
\setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
@@ -93,9 +93,9 @@
\title{\lyluatex}
\providecommand{\subtitle}[1]{}
-\subtitle{1.0b}
+\subtitle{1.0f}
\author{Fr. Jacques Peron \and Urs Liska \and Br. Samuel Springuel}
-\date{}
+\date{\lyluatexmanualdate}
\begin{document}
\maketitle
@@ -107,8 +107,8 @@
\hypertarget{introduction}{%
\section{Introduction}\label{introduction}}
-\lyluatex~is a \LaTeX~package that manages the inclusion of musical
-scores in \LaTeX~documents. It uses the GNU LilyPond\footnote{\url{http://lilypond.org}}
+\lyluatex~is a comprehensive \LuaLaTeX~package to manage the inclusion
+of musical scores in text documents. It uses the GNU LilyPond\footnote{\url{http://lilypond.org}}
score writer to produce beautiful music elements in beautifully typeset
text documents. \lyluatex~supports a wide range of use cases and lends
itself equally well to authoring musicological texts with music examples
@@ -119,10 +119,10 @@
\lyluatex~is inspired by and provides a fully compatible drop-in
replacement to
\href{http://lilypond.org/doc/v2.18/Documentation/usage/invoking-lilypond_002dbook.html}{lilypond-book},
-a \LaTeX~document preprocessor shipping with LilyPond. However, thanks
-to the use of \LuaLaTeX~it can overcome substantial limitations of the
-scripted solution, and it actually is a \emph{superset} of
-\texttt{lilypond-book}, providing numerous additional features.
+a \LaTeX~document preprocessor shipping with LilyPond, which it actually
+is a \emph{superset} of. However, thanks to the use of \LuaLaTeX~it can
+overcome substantial usability limitations of the scripted solution and
+provide numerous additional features.
\lyluatex's main features include:
@@ -141,79 +141,89 @@
Comprehensive configuration through global and per-score options
\end{itemize}
-\hypertarget{installation}{%
-\subsection{Installation}\label{installation}}
-
-\hypertarget{for-a-single-document}{%
-\subsubsection{For a single document}\label{for-a-single-document}}
-
-Copy \texttt{lyluatex.sty} and \texttt{lyluatex.lua} into the folder
-containing the document you wish to typeset.
-
-\hypertarget{for-all-documents-compiled-with-your-latex-distribution}{%
-\subsubsection{For all documents compiled with your LaTeX
-distribution}\label{for-all-documents-compiled-with-your-latex-distribution}}
-
-\hypertarget{texlive-version}{%
-\paragraph{TeXLive version}\label{texlive-version}}
-
-Just run this command~:
+What \lyluatex~does \emph{not} try to do is managing the handling of
+floating environments, counters and lists of music examples. The
+\emph{ly}\LuaTeX\textsc{mp} package\footnote{\url{https://github.com/uliska/lyluatexmp}}
+is currently under construction and practical testing and will
+eventually be released to become a suitable wrapper for using
+\lyluatex~to create numbered music examples.
+
+\hypertarget{installation-and-requirements}{%
+\subsection{Installation and
+Requirements}\label{installation-and-requirements}}
+
+\hypertarget{prerequisites}{%
+\subsubsection{Prerequisites}\label{prerequisites}}
+
+As the name \lyluatex~implies this package can only be used with the
+\LuaLaTeX~engine. For more information on this please refer to
+\protect\hyperlink{usage}{Usage} below.
+
+Musical scores are created in real-time (instead of incorporating
+pre-built \emph{image} files) using the GNU LilyPond\footnote{\url{http://lilypond.org}}
+score writer, so of course this has to be installed too.
+\lyluatex~should work with any versions of LilyPond but it has been
+developed against the stable and development versions that were current
+at the time of this writing: 2.18.2 and 2.19.83.
+
+\hypertarget{texlive-and-miktex}{%
+\subsubsection{TeXLive and MiKTeX}\label{texlive-and-miktex}}
+
+\lyluatex~is included in both the TeXLive and MiKTeX
+\LaTeX~distributions and can be installed through their package
+management systems. In TeXLive it is included in the
+\texttt{texlive-music} collection and -- of course -- in
+\texttt{texlive-full}. If neither of these collections is installed
+\lyluatex~can be added to a TeXLive installation by running
\begin{verbatim}
tlmgr install lyluatex
\end{verbatim}
-\hypertarget{latest-version}{%
-\paragraph{Latest version}\label{latest-version}}
-
-Copy \texttt{lyluatex.sty} and \texttt{lyluatex.lua} from this
-repository into your \texttt{TEXMF} tree, or clone this repostory into
-your \texttt{TEXMF} tree using Git, then run \texttt{mktexlsr}. Note
-that in this case your local copy will shadow the version possibly
-installed in your \TeX~distribution.
+from the command line.
-\hypertarget{usage}{%
-\section{Usage}\label{usage}}
+\textbf{TODO:} Document handling with MiKTeX.
-\lyluatex~is loaded with the command
-\texttt{\textbackslash{}usepackage\{lyluatex\}} which also accepts a
-number of \texttt{key=value} options. Their general use is described in
-the \protect\hyperlink{option-handling}{Option Handling} section below.
+\hypertarget{latest-version}{%
+\subsubsection{Latest version}\label{latest-version}}
-By default \lyluatex~invokes LilyPond simply as \texttt{lilypond}. If
-LilyPond is installed in another location or a specific version of
-LilyPond should be used the invocation is controlled with the
-\option{program} option, see \protect\hyperlink{program}{The LilyPond
-Executable}.
+The \lyluatex~versions shipped with the \LaTeX~distributions may be
+significantly outdated so you may want to install and use the latest
+version from the Github repository\footnote{\url{https://github.com/jperon/lyluatex}}
+instead.
-\lyIssue{Note:} \lyluatex~can only be used with \LuaLaTeX, and compiling
-with any other \LaTeX~engine will fail.
+Copy \texttt{lyluatex.sty} and \texttt{lyluatex.lua} from this
+repository into your \texttt{\$TEXMFHOME} tree, or clone this repostory
+into your \texttt{\$TEXMFHOME} tree using Git. In many cases this will
+be \texttt{\$HOME/texmf}, and \lyluatex~should be located below
+\texttt{\$TEXMFHOME/tex/luatex}. It is important that this is the
+\texttt{tex/luatex} subtree rather than \texttt{tex/latex}: if
+\lyluatex~should \emph{also} be present in the \LaTeX~distribution
+\LuaLaTeX~would otherwise find that version first and use that instead
+of your local clone.
+
+\lyMargin{Note:}
+
+It may be useful to clone the Git repository not into the
+\texttt{\$TEXMFHOME} tree directly but to some arbitrary location and
+link to that. Please note that \LuaLaTeX~will only follow such symbolic
+links if there is at least one \emph{real} subdirectory in each
+directory. So if there is a directory \texttt{\$TEXMFHOME/tex/luatex}
+containing \emph{only} symbolic links it is necessary to create a dummy
+subdirectory in it.
-\lyIssue{Note:} In order to avoid unexpected behaviour it is strongly
-suggested that documents are generally compiled from their actual
-directory, i.e.~without referring to it through a path.
+\hypertarget{for-a-single-document}{%
+\subsubsection{For a single document}\label{for-a-single-document}}
-\lyIssue{NOTE:} \lyluatex~requires that \LuaLaTeX~is started with the
-\texttt{-\/-shell-escape} command line option to enable the execution of
-arbitrary shell commands, which is necessary to let LilyPond compile the
-inserted scores on-the-fly and to perform some auxiliary shell
-operations. However, this opens a significant security hole, and only
-fully trusted input files should be compiled. You may mitigate (but not
-totally remove) this security hole by adding \texttt{lilypond} and
-\texttt{gs} to \texttt{shell\_escape\_commands}, and using
-\texttt{-\/-shell-restricted} instead of \texttt{-\/-shell-escape}: look
-at the documentation of your \TeX~distribution. For example, on Debian
-Linux with TeXLive:
+Copy \texttt{lyluatex.sty} and \texttt{lyluatex.lua} into the folder
+containing the document you wish to typeset.
-\begin{Shaded}
-\begin{Highlighting}[]
-\ExtensionTok{%}\NormalTok{ export shell_escape_commands=}\VariableTok{$(}\ExtensionTok{kpsewhich}\NormalTok{ -expand-var }\StringTok{'$shell_escape_commands'}\VariableTok{)}\NormalTok{,lilypond,gs}
-\ExtensionTok{%}\NormalTok{ lualatex --shell-restricted DOCUMENT.tex}
-\end{Highlighting}
-\end{Shaded}
+\hypertarget{usage}{%
+\section{Usage}\label{usage}}
-\hypertarget{basic-operation}{%
-\subsection{Basic Operation}\label{basic-operation}}
+\hypertarget{the-big-picture-and-caveats}{%
+\subsection{The Big Picture and
+caveats}\label{the-big-picture-and-caveats}}
Once \lyluatex~is loaded it provides commands and environments to
include musical scores and score fragments which are produced using the
@@ -224,7 +234,11 @@
mechanism --, and it will match the score's layout to that of the text
document. \lyluatex~will produce PDF image files which are automatically
included within the current paragraph, in their own paragraphs or as
-full pages.
+full pages. The behaviour of \lyluatex~and the appearance of the
+resulting scores are highly configurable through package, global, and
+per-score options which are globally described in the
+\protect\hyperlink{option-handling}{Option Handling} section below and
+in detail throughout the rest of this manual.
\lyluatex~aims at being an upwards-compatible drop-in replacement for
the \highlight{lilypond-book} preprocessor shipping with
@@ -257,6 +271,67 @@
\highlight{lilypond-book}, you should load it with options as follows:
\cmd{usepackage[nofragment, insert=systems]\{lyluatex\}}.
+\lyIssue{Note:}
+
+By default \lyluatex~invokes LilyPond simply as \texttt{lilypond}. If
+LilyPond is installed in another location or a specific version of
+LilyPond should be used the invocation is controlled with the
+\option{program} option, see \protect\hyperlink{program}{The LilyPond
+Executable}.
+
+\lyIssue{Note:} \lyluatex~can only be used with \LuaLaTeX, and compiling
+with any other \LaTeX~engine will fail.
+
+\lyIssue{Note:} In order to avoid unexpected behaviour it is strongly
+suggested that documents are generally compiled from their actual
+directory, i.e.~without referring to it through a path. This is because
+in many places during the compilation process relative paths are
+calculated from this starting point. Building \emph{out-of-tree} isn't
+supported, though it should be possible with the following workarounds:
+
+\begin{enumerate}
+\def\labelenumi{\arabic{enumi}.}
+\tightlist
+\item
+ \texttt{includepaths=\{..\}}: (for example, if you build from a
+ subdirectory of main directory) tell lyluatex to search the parent
+ directory;
+\item
+ if the book contain figures, enter only the name of the files, then
+ set two paths, e.g.:
+ \texttt{\textbackslash{}graphicspath\{\{images/\}\{../images/\}\}}, so
+ images will be found either way.
+\end{enumerate}
+
+\lyIssue{NOTE:} \lyluatex~requires that \LuaLaTeX~is started with the
+\texttt{-\/-shell-escape} command line option to enable the execution of
+arbitrary shell commands, which is necessary to let LilyPond compile the
+inserted scores on-the-fly and to perform some auxiliary shell
+operations. However, this opens a significant security hole, and only
+fully trusted input files should be compiled. You may mitigate (but not
+totally remove) this security hole by adding \texttt{lilypond} and
+\texttt{gs} to \texttt{shell\_escape\_commands}, and using
+\texttt{-\/-shell-restricted} instead of \texttt{-\/-shell-escape}: look
+at the documentation of your \TeX~distribution. For example, on Debian
+Linux with TeXLive:
+
+\begin{Shaded}
+\begin{Highlighting}[]
+\ExtensionTok{%}\NormalTok{ export shell_escape_commands=}\VariableTok{$(}\ExtensionTok{kpsewhich}\NormalTok{ -expand-var }\StringTok{'$shell_escape_commands'}\VariableTok{)}\NormalTok{,lilypond,gs}
+\ExtensionTok{%}\NormalTok{ lualatex --shell-restricted DOCUMENT.tex}
+\end{Highlighting}
+\end{Shaded}
+
+\hypertarget{basic-operation}{%
+\subsection{Basic Operation}\label{basic-operation}}
+
+\lyluatex~is loaded with the command
+\texttt{\textbackslash{}usepackage\{lyluatex\}} which also accepts a
+number of \texttt{key=value} options. Their general use is described in
+the \protect\hyperlink{option-handling}{Option Handling} section below.
+If LilyPond can be invoked through \texttt{lilypond} on the given system
+using the package without any options already provides a usable system.
+
\lyMargin{lilypond\index{lilypond}}
The basic mode of inserting scores into text documents is the
@@ -311,6 +386,15 @@
and all options will be used to determine if the score has already been
compiled earlier, so unnecessary recompilations are avoided.
+\lyIssue{Note:} Despite its familiar appearance, this environment is
+very special, using a mechanism specific to \LuaLaTeX. One consequence
+is that you necessarily need a newline after
+\texttt{\textbackslash{}begin\{lilypond\}}, and before
+\texttt{\textbackslash{}end\{lilypond\}}; another is that you have to be
+careful when you want to wrap this environment in a custom one: see
+\protect\hyperlink{wrapping-commands}{Wrapping \lyluatex~commands} and
+the examples at the end of the manual.
+
\lyCmd{lilypond}
Very short fragments of LilyPond code can be entered inline using the
@@ -479,10 +563,28 @@
files representing one system each. By default the systems are separated
by a paragraph and a variable skip depending on the staffsize.
+\lyIssue{Note:}
+
+\option{insert=systems} implies the use of
+\texttt{lilypond-book-preamble.ly}. It is worth pointing out that the
+score will \emph{not} have any notion of pages anymore - resulting in
+the staff-staff spacing to be minimal/natural. Usually LilyPond will
+space out the inter-staff (not -system!) space when the page is not
+filled, but with \option{insert=systems} this will not happen. While
+this behavior is usually desirable when including score examples in
+text, it may result in suboptimal output for multi-page scores, when
+there's the typical issues of how many systems will fit on a page.
+
+Also notice that by default pages will be ragged-bottom, and LilyPond
+will not make any efforts to optimize page breaks.
+\cmd{betweenLilyPondSystem} can be used when the space between systems
+seems too tight, for example using something like
+\texttt{\textbackslash{}vfill}.
+
\lyCmd{betweenLilyPondSystem}
-However, if a macro \cmd{betweenLilyPondSystem} is defined it will be
-expanded between each system. This macro is documented in
+If a macro \cmd{betweenLilyPondSystem} is defined it will be expanded
+between each system. This macro is documented in
\href{http://lilypond.org/doc/v2.18/Documentation/usage/latex}{LilyPond
documentation}. It must accept one argument, which will be the number of
systems already printed in the score (`1' after the first system). With
@@ -540,6 +642,15 @@
setting of these two options means that LilyPond does \emph{not} print
page numbers while \LaTeX~continues to print headers and footers.
+The same may be achieved only for first page with
+\option{print-first-page-number}.
+
+\lyOption{first-page-number}{false}
+
+Normally, \lyluatex~should automatically determine the first page number
+of the score to match its place in the document. Should you like to
+force it to another value, you may do it thanks to this option.
+
\hypertarget{inline}{%
\subsubsection{Inline}\label{inline}}
@@ -685,6 +796,13 @@
\option{indent=0pt}. Please also see the section about
\protect\hyperlink{indent}{Dynamic Indentation}.
+\lyOption{system-count}{}
+
+Forces LilyPond to produce a fixed number of systems. This may be useful
+when LilyPond breaks a score that can manually be squeezed to one system
+less, but it is also possible to spread out a score to more systems than
+LilyPond would consider necessary.
+
\lyOption{quote}{false}
This option, which is there for compatibility with
@@ -768,7 +886,9 @@
}
\end{lilypond}
-\lyOption{max-protrusion}{\cmd{maxdimen}}\lyOption{max-left-protrusion}{default}\lyOption{max-right-protrusion}{default}
+\lyOption{max-protrusion}{\cmd{maxdimen}}
+\lyOption{max-left-protrusion}{default}
+\lyOption{max-right-protrusion}{default}
These options set the protrusion limit. If either of the \texttt{-left-}
or \texttt{-right-} options is unset then the value will be taken from
@@ -1116,7 +1236,9 @@
each other. Therefore \lyluatex~by default passes the text document's
three font families to their directy LilyPond counterparts.
-\lyOption{rmfamily}{}\lyOption{sffamily}{}\lyOption{ttfamily}{}
+\lyOption{rmfamily}{}
+\lyOption{sffamily}{}
+\lyOption{ttfamily}{}
The roman, sans, and mono fonts can also be specified explicitly to be
passed into the LilyPond document independently from the text document's
@@ -1359,10 +1481,10 @@
\lyOption{includepaths}{./}
-With the \option{includepaths} option a comma-separated list of search
-paths can be specified. These paths will be used by \lyluatex~to locate
-external files, and relative paths are searched for in the following
-order:
+With the \option{includepaths} option a comma-separated list (enclosed
+in curly brackets) of search paths can be specified. These paths will be
+used by \lyluatex~to locate external files, and relative paths are
+searched for in the following order:
\begin{itemize}
\tightlist
@@ -1381,6 +1503,14 @@
code. Paths starting with the tilde will implicitly be expanded to
absolute paths in that process.
+\begin{Shaded}
+\begin{Highlighting}[]
+\FunctionTok{\textbackslash{}lysetoption}\NormalTok{\{includepaths\}\{}\FunctionTok{\textbackslash{}string}\NormalTok{~/lilypond-lib\}}
+
+\FunctionTok{\textbackslash{}lilypondfile}\NormalTok{[includepaths=\{}\FunctionTok{\textbackslash{}string}\NormalTok{~/lilypond-lib,/home/johndoe/project-lib\}]}
+\end{Highlighting}
+\end{Shaded}
+
\hypertarget{program}{%
\subsubsection{LilyPond Executable}\label{program}}
@@ -1454,6 +1584,36 @@
\texttt{\textless{}documentname\textgreater{}.list} files and only
remove scores that are not referenced by \emph{any} list file.
+\hypertarget{writing-headers-to-include-file}{%
+\subsubsection{Writing headers to include
+file}\label{writing-headers-to-include-file}}
+
+\lyOption{write-headers}{false}
+
+When using \texttt{\textbackslash{}lilypondfile} it is possible to write
+a copy of the LilyPond headers defining the layout and appearance of the
+score to an include file. When working on the score in an external
+editor this makes it possible to include this file to see the score in
+the layout it will have in the final \LaTeX\\
+document. Using this option together with non-filebased scores makes no
+sense, therefore it is ignored while a warning is issued.
+
+\emph{NOTE}: Of course this will produce conflicts if a LilyPond file is
+used in multiple \LaTeX~documents.
+
+If set to a \emph{path} the LilyPond headers defining the layout and
+appearance of the score will be exported to a file
+\texttt{\textless{}path\textgreater{}/\textless{}input-file-basename\textgreater{}-lyluatex-headers.ily}.
+The target directory will be created if necessary.
+
+If set to a \emph{filename} (i.e.~a path with a file extension) the
+headers will be written to this specific file. This is useful because in
+most cases the headers will be consistent throughout a \LaTeX~document,
+so it should be unncecessary to copy them for all input files. A typical
+use case might be to specify one header file as a package option while
+overriding the option for specific scores that require different headers
+(e.g.~in combination with a different \texttt{staffsize})
+
\hypertarget{pdf-optimization}{%
\subsubsection{PDF optimization}\label{pdf-optimization}}
@@ -1472,7 +1632,10 @@
basic problem is when LilyPond can't be started at all. \lyluatex~will
correctly determine and report an error if \LuaLaTeX~has been started
without the \option{--shell-escape} option or if the \option{program}
-option doesn't point to a valid LilyPond executable.
+option doesn't point to a valid LilyPond executable. However, if the
+\option{showfailed} option is also set then only a \emph{warning} is
+issued while instead of a score an information box is created in the
+document, informing about the problem.
Two other situations that are correctly recognized are when LilyPond
\emph{reports} a compilation failure but still produces a (potentially
@@ -1501,6 +1664,30 @@
warning is issued and a box with an informative text is typeset into the
resulting document.
+\hypertarget{forcing-re-compilation}{%
+\subsubsection{Forcing (Re-)Compilation}\label{forcing-re-compilation}}
+
+\lyOption{force-compilation}{false}
+
+In some cases \lyluatex's heuristics to determine the need for
+recompilation may fail, especially when not all relevant code is
+included through LilyPond's \cmd{include} command, in which cases
+\lyluatex~may consider the content unchanged. In such cases the
+\option{force-compilation} option skips the checks and unconditionally
+recompiles the score, which may be a better solution than to
+(selectively) delete the scores from the \option{tmpdir} directory.
+
+\hypertarget{bug-workaround}{%
+\subsubsection{Bug workaround}\label{bug-workaround}}
+
+\lyOption{fix\_badly\_cropped\_staffgroup\_brackets}{false}
+
+This option is a dirty workaround for a
+\href{https://lists.gnu.org/archive/html/lilypond-user/2018-11/msg00039.html}{known
+bug} of LilyPond. It's disabled by default; should you enable it
+globally, you may cancel it locally with
+\option{nofix\_badly\_cropped\_staffgroup\_brackets}.
+
\hypertarget{musicxml-options}{%
\subsection{MusicXML options}\label{musicxml-options}}
@@ -1509,7 +1696,9 @@
This option does the same for \texttt{\textbackslash{}musicxmlfile} as
\option{program} for \texttt{\textbackslash{}lilypondfile}.
-\lyOption{language}{}\lyOption{absolute, lxml, verbose}{false}\lyOption{
+\lyOption{language}{}
+\lyOption{absolute, lxml, verbose}{false}
+\lyOption{
no-articulation-directions, no-beaming, no-page-layout, no-rest-positions
}{true}
@@ -1574,7 +1763,8 @@
be found in \protect\hyperlink{insert-raw-pdf}{Wrapping Raw PDF
Filenames}.
-\printindex\addcontentsline{toc}{section}{Index}
+\printindex
+\addcontentsline{toc}{section}{Index}
\hypertarget{examples}{%
\section{Examples}\label{examples}}
@@ -1584,31 +1774,22 @@
\addcontentsline{toc}{subsection}{Insert Systems}
\hypertarget{insert-systems}{}
-
\section*{Insert System-by-System}
-
By default scores defined by the \option{lilypond} environment or the \cmd{lilypondfile} command are inserted as a sequence of systems.
-
\lyluatex\ determines the vertical space between the systems as a flexible length calculated from the \emph{staff size} of the score (as opposed to from the font size) to produce an regular-looking vertical spacing:
-
\begin{lilypond}[]
{
\repeat unfold 30 { c' d' e' d' }
}
\end{lilypond}
-
The following score has a significantly smaller staff size, and consequently the inter-system space is reduced:
-
\begin{lilypond}[staffsize=12]
{
\repeat unfold 36 { c' d' e' d' }
}
\end{lilypond}
-
\subsection*{Before and After the Score}
-
\cmd{preLilyPondExample} and \cmd{postLilyPondExample} allow some code to be printed before and after the score. This may for example be used to wrap the resulting score in an environment. In the following example rules are printed:
-
\def\preLilyPondExample{%
\par\bigskip
\noindent Before the score:
@@ -1617,43 +1798,35 @@
\par\bigskip
\hrule\par\medskip\noindent After the score
\par\bigskip}
-
\begin{verbatim}
\newcommand{\preLilyPondExample}{%
\par\bigskip
\noindent Before the score:
\par\medskip\hrule\par\medskip}
-
\newcommand{\postLilyPondExample}{%
\par\bigskip
\hrule\par\medskip\noindent After the score
\par\bigskip}
\end{verbatim}
-
\begin{lilypond}[]
{
\repeat unfold 30 { c' d' e' d' }
}
\end{lilypond}
-
\subsection*{Configuring the Inter-System Content}
-
\let\preLilyPondExample\undefined
\let\postLilyPondExample\undefined
-
Using \cmd{betweenLilyPondSystem} it is possible to define a macro that is
expanded between each system pair. It is given the index of the previous system
as an argument to work with. The following example simply prints that index
between the systems, but with some programming more complicated and useful
things could be done, for example printing a rule after every third system or
conditionally insert a page break.
-
\def\betweenLilyPondSystem#1{%
\begin{center}
System #1
\end{center}
}
-
\begin{verbatim}
\newcommand{\betweenLilyPondSystem}[1]{%
\begin{center}
@@ -1661,53 +1834,42 @@
\end{center}
}
\end{verbatim}
-
\bigskip
-
\begin{lilypond}[]
{
\repeat unfold 30 { c' d' e' d' }
}
\end{lilypond}
-
\let\betweenLilyPondSystem\undefined
-
\addcontentsline{toc}{subsection}{Insert Inline}
\hypertarget{insert-inline}{}
-
\section*{Insert Scores Inline}
-
With the \option{insert=inline} option it is simple to insert arbitrary
notational fragments in the \lilypond{ e'8 d'16 e' } continuous text of a
document. By default the staffsize is scaled to be 2/3 of the staffsize a
regular score would have at this point. This means if the \option{staffsize}
option is modified globally or locally then the staffsize of the inline score is
changed too.
-
In order to make the size of inline scores independent from the regular
staffsize the option \option{inline-staffsize} can be used the same way as
\option{staffsize}. \lilypond[inline-staffsize=8]{ e'8 d'16 e' } has the inline
staffsize manually set to \texttt{8}.
-
\paragraph{Alignment and padding} By default inline scores are vertically
centered to a line 1/2em above the text's baseline. \lilypond[valign=top]{ e'8
d'16 e' } but the score can also be aligned \lilypond[valign=bottom]{ e'8 d'16
e' } to the top or the baseline of the text.
-
Unfortunately this can only consider the borders of the \emph{image} and not
those of the \emph{score} or the staff lines. To alleviate this situation a
specific vertical offset can be given with \option{voffset=-3pt} (or any other
\TeX\ lengths). This offset is calculated after the alignment.
\lilypond[valign=bottom,voffset=-6pt]{ e'8 d'16 e' } is inserted with
\option{valign=bottom,voffset=-4pt}.
-
Horizontally inline scores are padded by \option{hpadding=0.75ex} -- except if
they happen to appear at the beginning or end of a line, as can be seen in the
last score in the previous paragraph. \lilypond[hpadding=2em]{ e'8 d'16 e' }
Increasing the \option{hpadding} will ensure more space around the score.
-
\paragraph{Bare Inline scores} \option{insert=bare-inline} will remove all the
staff elements (staff symbol, time signature, clef) by implicitly applying
\option{nostaff}, which is most useful for including notational symbols like
@@ -1723,156 +1885,121 @@
precompiled PDF images.
-
\addcontentsline{toc}{subsection}{Choosing Systems}
\hypertarget{print-only}{}
-
\def\postLilyPondExample{\par\bigskip\hrule\par\bigskip}
-
\section*{Print only Selected Systems or Pages}
-
-The \texttt{print-only} option allows to limit the printed systems or pages from
-a score. A typical use case is to print a score interspersed with comments. The
-advantage of this approach is that the score is compiled only once while the
-individual systems are simply reused by \LaTeX.
-
+The \texttt{print-only} and \texttt{do-not-print} options allow to limit
+the printed systems or pages from a score. A typical use case is to print
+a score interspersed with comments. The advantage of this approach is that
+the score is compiled only once while the individual systems are simply
+reused by \LaTeX.
Throughout this document we'll demonstrate the different options to
select systems from the following score:
-
\lilypondfile[verbatim]{eight-systems.ly}
-
The simplest selection is a single system: \texttt{print-only=4}
-
\lilypondfile[print-only=4]{eight-systems.ly}
-
Ranges are also possible: \texttt{print-only=3-5}, with the special form of
\texttt{print-only=6-} which prints from the given system throughout the end of
the score. Negative ranges can be given with \texttt{print-only=7-5}
-
\lilypondfile[print-only=3-5]{eight-systems.ly}
-
\lilypondfile[print-only=6-]{eight-systems.ly}
-
\lilypondfile[print-only=7-5]{eight-systems.ly}
-
With a comma-separated list an arbitrary sequence of systems can be specified.
The list has to be enclosed in curly brackets: \texttt{print-only={4,1,2}}
-
\lilypondfile[print-only={4,1,2}]{eight-systems.ly}
-
Each element of the list can include any of the forms described above:\\
\texttt{print-only={3,5-7,4,7-}}
-
\lilypondfile[print-only={3,5-7,4,7-}]{eight-systems.ly}
-
+\texttt{do-not-print} does the opposite: it prevents the list of systems from
+being printed. It might be used alone, or in combination with
+\texttt{print-only}:\\
+\texttt{print-only=3-,do-not-print=6}
+\lilypondfile[print-only=3-,do-not-print=6]{eight-systems.ly}
The functionality is identical with fullpage scores where the selection applies
to \emph{pages} instead. This can for example be used when the “score” file
contains a number of individual pieces (e.g. songs for a song book), and
individual selections are to be printed.
-
-Systems have some specific behaviour with regard to \emph{indent}, but this is demonstrated in its own file \texttt{dynamic-indent.tex}.
-
+Systems have some specific behaviour with regard to \emph{indent},
+but this is demonstrated in its own file \texttt{dynamic-indent.tex}.
\let\postLilyPondExample\undefined
-
\addcontentsline{toc}{subsection}{Dynamic Indent Handling}
\hypertarget{dynamic-indent}{}
-
\def\postLilyPondExample{\par\bigskip\hrule\par\bigskip}
-
\section*{Dynamic Indent}
-
This document demonstrates the use of \texttt{indent} and \texttt{autoindent},
partially in combination with \texttt{print-only}.
-
\texttt{indent=1cm} indents the first line, but if the resulting score contains
only one system this indent is suppressed (issuing a warning on the console):
-
\begin{lilypond}[indent=1cm]
\set Staff.instrumentName = "Violin"
\repeat unfold 12 { c' d' e' d' }
\end{lilypond}
-
\begin{lilypond}[indent=1cm]
{
\set Staff.instrumentName = "Violin"
c' d' e' d'
}
\end{lilypond}
-
If the output of a score which contains more than one system is limited to the
first system using \texttt{print-only=1} then the indent is removed but the
score is recompiled to ensure a full-length system. The following score shows
the two-system score from above (with \texttt{indent=1cm}), limited to its first
system:
-
\begin{lilypond}[indent=1cm,print-only=1]
\set Staff.instrumentName = "Violin"
\repeat unfold 12 { c' d' e' d' }
\end{lilypond}
-
Note that this behaviour also applies when \texttt{print-only} causes the first
system to be printed at another position, e.g. with \texttt{print-only={3,1,2}}.
In this case the indent of the first system is suppressed in order to avoid a
“hole”. Of course this is a corner case, but might be useful when a score
consists of separate entities (examples, exercises) per system.
-
\begin{lilypond}[indent=1cm,print-only={3,1,2},max-protrusion=0.5cm]
\repeat unfold 25 { c' d' e' d' }
\end{lilypond}
-
If a protrusion limit has been set with \texttt{max-protrusion=0.5cm} and the
score exceeds that limit in spite of \texttt{indent=1cm} then the whole score
will appropriately be narrowed:
-
\begin{lilypond}[indent=1cm,max-protrusion=0.5cm]
\set Staff.instrumentName = "Violin I. and II."
\repeat unfold 11 { c' d' e' d' }
\end{lilypond}
-
-
This doesn't really look good because the indentation of the second system
wouldn't have been necessary since only the first system exceeds the protrusion
limit. The solution to this situation is the option \texttt{autoindent} which
handles the indentation \emph{automatically} and set the indent to a value that
will make the \emph{first} system fit into the protrusion limit and leave the
remaining systems unchanged:
-
\begin{lilypond}[autoindent=true,max-protrusion=0.5cm]
\set Staff.instrumentName = "Violin I. and II."
\repeat unfold 11 { c' d' e' d' }
\end{lilypond}
-
-
However, if the protrusion limit is not only exceeded by the \emph{first} system
(which should be the typical case due to the instrument name) \texttt{lyluatex}
will deal with the situation by narrowing the \emph{whole} score by the
appropriate amount and adjusting the indent of the first system so all systems
will just fit into the protrusion limit:
-
\begin{lilypond}[autoindent=true,max-protrusion=0.5cm]
\set Staff.instrumentName = "Violin I. and II."
\set Staff.shortInstrumentName = "Violin I/II"
\repeat unfold 11 { c' d' e' d' }
\end{lilypond}
-
There is one special case to be mentioned. As described above the indent is
deactivated if the first system of a score is printed at a later position.
However, if this score will exceed the left protrusion limit \texttt{autoindent}
will be automatically activated to avoid having the \emph{whole} score narrowed:
-
\begin{lilypond}[indent=1cm,print-only={3,1,2},max-protrusion=0.5cm]
\set Staff.instrumentName = "Violin"
\repeat unfold 25 { c' d' e' d' }
\end{lilypond}
-
\paragraph{Right protrusion}
The dynamic handling of (automatic) indent also works correctly when there is
protrusion handling to the right. The following score has the ties manually
shaped to exceed the staff symbol by 10, and 7 staff spaces, and
\texttt{max-protrusion=1cm} .
-
\begin{lilypond}[nofragment,max-protrusion=1cm,]
{
\set Staff.instrumentName = "Violin 1 & 2"
@@ -1884,57 +2011,42 @@
c'
}
\end{lilypond}
-
-
\paragraph{Performance considerations}
The handling of indent suppression may require up to four compilations of the
score, but these are handled automatically, and the resulting intermediate
stages of the score are cached just like the scores actually used in the
document.
-
The \texttt{autoindent} option is active by default but will be deactivated if
\texttt{indent} is set explicitly. It has to be noted that this option will add
more LilyPond compilations and therefore compilation time. But it will only
apply and be executed if the score exceeds the protrusion limit, so it can only
occur in circumstances where multiple LilyPond runs are expected anyway.
-
\let\postLilyPondExample\undefined
-
\addcontentsline{toc}{subsection}{Font Handling}
\hypertarget{fonts}{}
-
\defaultfontfeatures{Ligatures=TeX,Numbers=OldStyle,Scale=MatchLowercase}
\setmainfont{Linux Libertine O}
\setsansfont[BoldFont={Linux Biolinum O Bold}]{Linux Biolinum O}
\setmonofont{Inconsolata}
-
\section*{Font Handling}
-
To demonstrate the font handling features of \lyluatex\ we will repeatedly
include the following score from an external file. It includes roman (lyrics,
instrument name), sans (rehearsal mark), and mono (tempo) text, first using
LilyPond's built-in default fonts.
-
\lilypondfile[verbatim]{fonts}
-
\bigskip
The current document uses \option{fontspec} to set roman font to \emph{Linux
Libertine O}, sans font to \emph{Linux Biolinum O}, and mono font to
\emph{Inconsolata}. So if you compile this document yourself and don't have
these fonts installed you will receive unexpected results.
-
\subsection*{Passing Document Fonts to Score}
-
With \option{pass-fonts} the currently active font families for roman, sans, and
mono fonts are passed to LilyPond in order to achieve the most coherent
appearance between text and music.
-
\bigskip
-
\lilypondfile[pass-fonts]{fonts}
-
\bigskip
Note that LilyPond loads fonts differently than \LaTeX\ and can only make use of
fonts installed as system fonts, fonts that are only installed through a \LaTeX\
@@ -1942,14 +2054,11 @@
not installed system-wide (e.\,g. the default fonts) LilyPond will use rather
ugly fallback fonts. This can't be demonstrated here but the section about
explicitly setting font families will include an example.
-
The inherent problem of fallback fonts, especially with \LaTeX's default
settings, is the reason \option{pass-fonts} is inactive by default. But the
general recommendation is to set \option{pass-fonts} as package option if the
text document uses fonts that are available to LilyPond.
-
\bigskip
-
\sffamily \option{current-font-as-main} will use the font that is
\emph{currently} used for typesetting as LilyPond's main (roman) font. This can
make sure that the score's main font (and roman is usually the font used most in
@@ -1960,12 +2069,9 @@
inconsistency not between the score and the surrounding text but between
different scores in a document. For all these reasons the option is by default
set to \texttt{false}.
-
\bigskip
\lilypondfile[pass-fonts,current-font-as-main]{fonts}
-
\subsection*{Setting Score Fonts Explicitly}
-
With \option{rmfamily}, \option{sffamily}, and \option{ttfamily} specific
families can be set to arbitrary fonts, independently from the text document.
For the following score \option{ttfamily=\{TeXGyre Adventor\}} is
@@ -1973,31 +2079,24 @@
installed if you want to successfully compile this document.} Note that this
implicitly sets \option{pass-fonts=true}, and \emph{Linux Libertine O} and
\emph{Linux Biolinum O} are used from the text document.
-
\bigskip
\lilypondfile[ttfamily={TeXGyre Adventor}]{fonts}
-
\highlight{NOTE:} when \option{rmfamily} is set explicitly
\option{current-font-as-main} is forced to \texttt{false} to ensure that the
roman font is actually used. The next score sets \option{rmfamily=\{TeXGyre
Adventor\}} and \option{current-font-as-main}, and despite the current font still being \cmd{sffamily}
\emph{Adventor} is used as the score's main font:
-
\bigskip
\lilypondfile[current-font-as-main,rmfamily={TeXGyre Adventor}]{fonts}
-
\subsection*{LilyPond's Font Fallback}
-
If unavailable fonts are set in a LilyPond document they will \emph{silently} be
replaced with fallback fonts that tend to cause ugly results. This will be shown
by setting \option{rmfamily=FantasyFontOne}, \option{sffamily=FantasyFontTwo},
and \option{tfamily=FantasyFontThree}:
-
\bigskip
\lilypondfile[rmfamily=FantasyFontOne,%
sffamily=FantasyFontTwo,%
ttfamily=FantasyFontThree]{fonts}
-
This can happen in several contexts: apart from compiling the document on a
different computer where the used fonts are missing it is most likely to occur
with the \option{pass-fonts} option, when the text document uses internal
@@ -2005,27 +2104,28 @@
family is specified explicitly with an option and the other families are passed
from the text document.
-
+\defaultfontfeatures{Ligatures=TeX,Numbers=OldStyle,Scale=MatchLowercase}
+\setmainfont{Linux Libertine O}
+\setsansfont[BoldFont={Linux Biolinum O Bold}]{Linux Biolinum O}
+\setmonofont{Inconsolata}
\addcontentsline{toc}{subsection}{Wrapping Commands}
\hypertarget{wrappingcommands}{}
-
+\VerbatimFootnotes
\section*{Wrapping Commands}
-
+\subsection*{Command within commands}
\cmd{lily} can be wrapped within another command as usual:
-
\begin{verbatim}
\newcommand\mylily[2][1]{\lily[inline-staffsize=10, #1]{#2}}
-
This is \mylily[voffset=10pt]{a' b' c''} an example.
\end{verbatim}
-
\newcommand\mylily[2][1]{\lily[inline-staffsize=10, #1]{#2}}
-
-This is \mylily[voffset=10pt]{a' b' c''} an example.
-
+This is \mylily[voffset=10pt]{a' b' c''} an example.\par
+\subsection*{Environment within environments}
+\emph{It isn't possible to wrap \highlight{ly} environment within a command.}\par
It's possible to wrap \highlight{ly} within and environment, but there are
-several drawbacks:
+several drawbacks\footnote{%
+Those drawbacks are:
\begin{itemize}
\item this custom environment cannot have optional parameters. To be more
precise, if it has only optional parameters, it will be necessary to add \verb`[]`
@@ -2038,34 +2138,32 @@
\item or use the \TeX\ primitives \verb`\ly \endly` (not only for \highlight{ly},
but also for other environments).
\end{itemize}
-\end{itemize}
-
+\end{itemize}%
+}.
+To avoid those drawbacks, \lyluatex\ defines a special command, \verb`\lynewenvironment`,
+that behaves as you'd expect from \verb`\newenvironment`.
\begin{verbatim}
-\newenvironment{myly}{%
+\lynewenvironment{myly}{%
This is \emph{my} lilypond environment.
- \begin{ly}[]%
+ \begin{ly}%
}{%
\end{ly}
}
-
\begin{myly}
a b c
\end{myly}
\end{verbatim}
-
\newenvironment{myly}{%
This is \emph{my} lilypond environment.
- \begin{ly}[]%
+ \begin{ly}%
}{%
\end{ly}
}
-
\begin{myly}
a b c
\end{myly}
-
\begin{verbatim}
-\newenvironment{lyfigure}[2][]{%
+\lynewenvironment{lyfigure}[2][]{%
\edef\mycaption{#2}
\begin{figure}
\begin{center}
@@ -2076,14 +2174,12 @@
\end{center}
\end{figure}
}
-
-\begin{lyfigure}{caption}
+\begin{lyfigure}{This is a caption}
a' b' c
d' e' f
\end{lyfigure}
\end{verbatim}
-
-\newenvironment{lyfigure}[2][]{%
+\lynewenvironment{lyfigure}[2][]{%
\edef\mycaption{#2}
\begin{figure}
\begin{center}
@@ -2094,14 +2190,12 @@
\end{center}
\end{figure}
}
-
-\begin{lyfigure}{caption}
+\begin{lyfigure}{This is a caption}
a' b' c
d' e' f
\end{lyfigure}
-
\begin{verbatim}
-\newenvironment{lyotherfigure}[1][]{%
+\lynewenvironment{lyotherfigure}[1][]{%
\edef\option{#1}
\figure
\center
@@ -2112,14 +2206,12 @@
\endcenter
\endfigure
}
-
-\begin{lyotherfigure}[]
+\begin{lyotherfigure}
d' e' f
a' b' c
\end{lyotherfigure}
\end{verbatim}
-
-\newenvironment{lyotherfigure}[1][]{%
+\lynewenvironment{lyotherfigure}[1][]{%
\edef\option{#1}
\figure
\center
@@ -2130,35 +2222,121 @@
\endcenter
\endfigure
}
-
-\begin{lyotherfigure}[]
+\begin{lyotherfigure}
d' e' f
a' b' c
\end{lyotherfigure}
-
+\begin{verbatim}
+\begin{lyotherfigure}[This time with a caption]
+d' e' f
+a' b' c
+\end{lyotherfigure}
+\end{verbatim}
+\begin{lyotherfigure}[This time with a caption]
+d' e' f
+a' b' c
+\end{lyotherfigure}
+\textbf{Important note:} \verb`\lynewenvironment` is intended to insert \LaTeX\ code before
+and after the scores; due to the special behavior of \verb`ly` environment, it isn't possible
+to insert \emph{LilyPond} code that way. So this won't work:
+\begin{verbatim}
+ \lynewenvironment{myly}{%
+ \begin{ly}
+ a b c
+ }{%
+ \end{ly}
+ }
+\end{verbatim}
+To do such a thing, \lyluatex\ defines a command and four options:
+\begin{itemize}
+ \item \verb`\lysavefrag` lets one save a LilyPond fragment to be re-used afterward;
+ \item \verb`include_header`, \verb`include_footer`, \verb`include_before_body` and \verb`include_after_body` options
+ let one insert such fragments at designed places within inserted score.
+\end{itemize}
+So this works:
+\begin{verbatim}
+\begin{lysavefrag}{head}
+a b c
+\end{lysavefrag}
+\begin{lysavefrag}{foot}
+g a' b
+\end{lysavefrag}
+\begin{lysavefrag}{mymark}
+\mark \default
+\end{lysavefrag}
+\begin{lysavefrag}{mymark}
+\mark \default
+\end{lysavefrag}
+begin{ly}[
+ include_before_body={head,mymark,head},
+ include_after_body=foot,
+]
+d e f
+\end{ly}
+\end{verbatim}
+It's also possible to use \verb`\lynewenvironment` to wrap such a command:
+\begin{verbatim}
+\begin{lysavefrag}{head}
+a b c
+\end{lysavefrag}
+\begin{lysavefrag}{foot}
+g a' b
+\end{lysavefrag}
+\begin{lysavefrag}{mymark}
+\mark \default
+\end{lysavefrag}
+\lynewenvironment{yourly}[1][]{%
+ {\centering test \par}
+ \begin{ly}[
+ include_before_body={head,mymark,head},
+ include_after_body=foot,
+ ]
+}{
+ \end{ly}
+}
+\begin{yourly}
+d e f
+\end{yourly}
+\end{verbatim}
+\begin{lysavefrag}{head}
+a b c
+\end{lysavefrag}
+\begin{lysavefrag}{foot}
+g a' b
+\end{lysavefrag}
+\begin{lysavefrag}{mymark}
+\mark \default
+\end{lysavefrag}
+\lynewenvironment{yourly}[1][]{%
+ {\centering test \par}
+ \begin{ly}[
+ include_before_body={head,mymark,head},
+ include_after_body=foot,
+ ]
+}{
+ \end{ly}
+}
+\begin{yourly}
+d e f
+\end{yourly}
\addcontentsline{toc}{subsection}{Wrapping Raw PDF Filenames}
\hypertarget{insert-raw-pdf}{}
-
\section*{Wrapping Raw PDF Filenames}
-
With the \option{raw-pdf} option it is possible to create wrapping commands that
circumvent \lyluatex's layout considerations by working with the raw PDF
filename of the generated score. This is especially useful for developing
packages or personal class and style files. For this scores generated with
\option{raw-pdf} define a command \cmd{lyscore} that can be used in the wrapping
commands or environments.
-
All examples in this document could also be realized using “default” \lyluatex\
without \option{raw-pdf}, but they are intended to show how this low-level
access can be used to retrieve the information from the generated score in order
to build custom versions of commands that don't have to adhere to \lyluatex's
pre-built strategies of including the score in the document
-
The easiest way to use a “raw” score is to simply access \cmd{lyscore} in a
command and pass it to an \cmd{includegraphics} macro:
-
\begin{verbatim}
\newcommand\lilyinline[2][]{%
\lily[raw-pdf,%
@@ -2170,33 +2348,27 @@
\includegraphics{\lyscore{}}%
}
\end{verbatim}
-
\newcommand\lilyinline[2][]{%
\lily[raw-pdf,insert=bare-inline,inline-staffsize=8,hpadding=0.25ex,#1]{
\omit Stem
#2}%
\includegraphics{\lyscore{}}%
}
-
This basically is a way to provide pre-configured commands. In this case
\lilyinline{ c'8 d' c' d'} it is used to pre-configure an inline
type, entered as \verb+\lilyinline{ c'8 d' c' d'}+.
-
-
\bigskip \cmd{lyscore} takes one mandatory argument which can be empty -- as in
the example above --, receive a number, one of the keywords \texttt{nsystems}
and \texttt{hoffset}, or any of the score's options. If passed a number it will
return the filename of the N-th system. With \texttt{nsystems} the number of
systems in the generated score will be returned, while \texttt{hoffset}
generates the code that shifts the score to the left to accommodate protrusion.
-
The following example takes an optional argument with options that are passed to
\lyluatex, and one mandatory argument which expects the system to be used. It
prints the given system centered in a figure and uses the file name as the
caption and makes use of the score's \texttt{label}. Figure \ref{centered} shows
the centering of a short fragment, figure \ref{fifth} the selection of the fifth
system from a larger score.
-
\begin{verbatim}
\newenvironment{centeredlilypondsystem}[2][]{%
\def\usesystem{#2}
@@ -2211,16 +2383,13 @@
\end{center}
\end{figure}
}
-
\begin{centeredlilypondsystem}[label=centered]{1}
c'1 d' e'
\end{centeredlilypondsystem}
-
\begin{centeredlilypondsystem}[label=fifth]{5}
\repeat unfold 8 { c'1 \break }
\end{centeredlilypondsystem}
\end{verbatim}
-
\newenvironment{centeredlilypondsystem}[2][]{%
\def\usesystem{#2}
\begin{figure}
@@ -2234,22 +2403,17 @@
\end{center}
\end{figure}
}
-
\begin{centeredlilypondsystem}[label=centered]{1}
c'1 d' e'
\end{centeredlilypondsystem}
-
\begin{centeredlilypondsystem}[label=fifth]{5}
\repeat unfold 8 { c'1 \break }
\end{centeredlilypondsystem}
-
-
Finally there's an example showing how to iterate over the systems of a score
using \cmd{foreach} from the \option{pgffor} package. It iterates over all the
systems in the given score, prints them using the protrusion adjustment seen
before, and if the system is the third it prints this information, otherwise
just a line break:
-
\begin{verbatim}
\newcommand\myforlily[2][]{%
\lily[insert=systems,raw-pdf,#1]{#2}%
@@ -2258,12 +2422,10 @@
\ifthenelse{\equal{\n}{3}}{\par Third system\par}{\\}
}%
}
-
\myforlily[staffsize=24]{
\set Staff.instrumentName = "Vl. "
\repeat unfold 4 { c'1 \break } }
\end{verbatim}
-
\newcommand\myforlily[2][]{%
\lily[insert=systems,raw-pdf,#1]{#2}%
\foreach \n in {1,...,\lyscore{nsystems}}%
@@ -2271,11 +2433,9 @@
\ifthenelse{\equal{\n}{3}}{\par\bigskip Third system\par\bigskip}{\\}
}%
}
-
\myforlily[staffsize=24]{
\set Staff.instrumentName = "Vl. "
\repeat unfold 4 { c'1 \break } }
-
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/lyluatex/lyluatexbase.cls new/doc/support/lyluatex/lyluatexbase.cls
--- old/doc/support/lyluatex/lyluatexbase.cls 2018-03-13 23:07:05.000000000 +0100
+++ new/doc/support/lyluatex/lyluatexbase.cls 2019-05-28 23:25:42.000000000 +0200
@@ -1,11 +1,11 @@
%Lyluatex LaTeX class.
%
-% Copyright (C) 2015-2018 jperon and others (see CONTRIBUTORS.md)
+% Copyright (C) 2015-2019 jperon and others (see CONTRIBUTORS.md)
% License: MIT
% This file is part of lyluatex.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{lyluatexbase}[2018/03/12 v1.0b] %%LYLUATEX_DATE LYLUATEX_VERSION
+\ProvidesClass{lyluatexbase}[2019/05/27 v1.0f] %%LYLUATEX_DATE LYLUATEX_VERSION
\LoadClass[DIV=11]{scrartcl}
\RequirePackage{lyluatex}
@@ -14,6 +14,7 @@
\RequirePackage{listings}
\RequirePackage{minted}
\RequirePackage{pgffor}
+\RequirePackage{fancyvrb}
\RequirePackage[colorlinks=true]{hyperref}
\lysetoption{includepaths}{./, ly/}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/lyluatex/lyluatexmanual.cls new/doc/support/lyluatex/lyluatexmanual.cls
--- old/doc/support/lyluatex/lyluatexmanual.cls 2018-03-13 23:07:05.000000000 +0100
+++ new/doc/support/lyluatex/lyluatexmanual.cls 2019-05-28 23:25:42.000000000 +0200
@@ -1,11 +1,11 @@
%Lyluatex LaTeX class for the manual.
%
-% Copyright (C) 2015-2018 jperon and others (see CONTRIBUTORS.md)
+% Copyright (C) 2015-2019 jperon and others (see CONTRIBUTORS.md)
% License: MIT
% This file is part of lyluatex.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{lyluatexmanual}[2018/03/12 v1.0b] %%LYLUATEX_DATE LYLUATEX_VERSION
+\ProvidesClass{lyluatexmanual}[2019/05/27 v1.0f] %%LYLUATEX_DATE LYLUATEX_VERSION
\LoadClass{lyluatexbase}
@@ -28,3 +28,14 @@
\addcontentsline{toc}{subsection}{#2}
\hypertarget{#1}{}
}
+
+
+\newcommand{\lyluatexmanualdate}{
+ \directlua{
+ local PC = string.char(37)
+ local date_fmt = PC..'Y-'..PC..'m-'..PC..'d'
+ local p = io.popen('git log -n1 --date=short --format='..PC..'"ad"', 'r')
+ tex.sprint(p and p:read('*a') or os.date(date_fmt))
+ if p then p:close() end
+ }
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lyluatex.doc.tlpobj new/tlpkg/tlpobj/lyluatex.doc.tlpobj
--- old/tlpkg/tlpobj/lyluatex.doc.tlpobj 2019-02-28 03:52:55.000000000 +0100
+++ new/tlpkg/tlpobj/lyluatex.doc.tlpobj 2019-05-29 01:39:00.000000000 +0200
@@ -1,9 +1,9 @@
name lyluatex.doc
category Package
-revision 47584
+revision 51252
shortdesc doc files of lyluatex
relocated 1
-docfiles size=436
+docfiles size=439
RELOC/doc/support/lyluatex/Contributors.md
RELOC/doc/support/lyluatex/LICENSE
RELOC/doc/support/lyluatex/README.md
++++++ lyluatex.tar.xz ++++++
++++ 1872 lines of diff (skipped)
++++++ m-tx.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/prepmx.man1.pdf and new/texmf-dist/doc/man/man1/prepmx.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/m-tx.doc.tlpobj new/tlpkg/tlpobj/m-tx.doc.tlpobj
--- old/tlpkg/tlpobj/m-tx.doc.tlpobj 2019-03-27 02:25:19.000000000 +0100
+++ new/tlpkg/tlpobj/m-tx.doc.tlpobj 2019-11-19 01:55:49.000000000 +0100
@@ -1,6 +1,6 @@
name m-tx.doc
category Package
-revision 50602
+revision 52851
shortdesc doc files of m-tx
docfiles size=259
texmf-dist/doc/generic/m-tx/Makefile
++++++ m-tx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/m-tx.tlpobj new/tlpkg/tlpobj/m-tx.tlpobj
--- old/tlpkg/tlpobj/m-tx.tlpobj 2019-03-27 02:25:20.000000000 +0100
+++ new/tlpkg/tlpobj/m-tx.tlpobj 2019-11-19 01:55:49.000000000 +0100
@@ -1,6 +1,6 @@
name m-tx
category Package
-revision 50602
+revision 52851
shortdesc A preprocessor for pmx
longdesc M-Tx is a preprocessor to pmx, which is itself a preprocessor
longdesc to musixtex, a music typesetting system. The prime motivation
++++++ make4ht.doc.tar.xz ++++++
++++ 3967 lines of diff (skipped)
++++++ make4ht.tar.xz ++++++
++++ 4475 lines of diff (skipped)
++++++ makeindex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/makeindex.man1.pdf and new/texmf-dist/doc/man/man1/makeindex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/mkindex.man1.pdf and new/texmf-dist/doc/man/man1/mkindex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeindex.doc.tlpobj new/tlpkg/tlpobj/makeindex.doc.tlpobj
--- old/tlpkg/tlpobj/makeindex.doc.tlpobj 2019-03-27 02:25:20.000000000 +0100
+++ new/tlpkg/tlpobj/makeindex.doc.tlpobj 2019-11-19 01:55:49.000000000 +0100
@@ -1,6 +1,6 @@
name makeindex.doc
category Package
-revision 50602
+revision 52851
shortdesc doc files of makeindex
docfiles size=131
texmf-dist/doc/man/man1/makeindex.1
++++++ makeindex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/makeindex.tlpobj new/tlpkg/tlpobj/makeindex.tlpobj
--- old/tlpkg/tlpobj/makeindex.tlpobj 2019-03-27 02:25:20.000000000 +0100
+++ new/tlpkg/tlpobj/makeindex.tlpobj 2019-11-19 01:55:49.000000000 +0100
@@ -1,6 +1,6 @@
name makeindex
category Package
-revision 50602
+revision 52851
catalogue makeindexk
shortdesc Makeindex development sources
longdesc The package contains the development sources of makeindex, as
++++++ manfnt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/manfnt.tlpobj new/tlpkg/tlpobj/manfnt.tlpobj
--- old/tlpkg/tlpobj/manfnt.tlpobj 2019-02-28 03:53:04.000000000 +0100
+++ new/tlpkg/tlpobj/manfnt.tlpobj 2020-04-12 01:55:36.000000000 +0200
@@ -1,6 +1,6 @@
name manfnt
category Package
-revision 42428
+revision 54684
shortdesc LaTeX support for the TeX book symbols
relocated 1
longdesc A LaTeX package for easy access to the symbols of the Knuth's
@@ -9,6 +9,5 @@
runfiles size=1
RELOC/tex/latex/manfnt/manfnt.sty
catalogue-ctan /macros/latex/contrib/manfnt
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp
++++++ markdown.doc.tar.xz ++++++
++++ 4776 lines of diff (skipped)
++++++ markdown.tar.xz ++++++
++++ 3016 lines of diff (skipped)
++++++ mathastext.doc.tar.xz ++++++
++++ 1972 lines of diff (skipped)
++++++ mathastext.tar.xz ++++++
++++ 2000 lines of diff (skipped)
++++++ mathfam256.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathfam256/LICENSE new/doc/latex/mathfam256/LICENSE
--- old/doc/latex/mathfam256/LICENSE 2018-01-22 23:49:36.000000000 +0100
+++ new/doc/latex/mathfam256/LICENSE 2020-01-23 22:57:56.000000000 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 Hironobu Yamashita
+Copyright (c) 2016-2020 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -11,9 +11,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/mathfam256/README.md new/doc/latex/mathfam256/README.md
--- old/doc/latex/mathfam256/README.md 2018-01-22 23:49:36.000000000 +0100
+++ new/doc/latex/mathfam256/README.md 2020-01-23 22:57:56.000000000 +0100
@@ -34,6 +34,6 @@
## Release Date
-2018-01-22
+2020-01-23
Hironobu Yamashita
Binary files old/doc/latex/mathfam256/mathfam256.pdf and new/doc/latex/mathfam256/mathfam256.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathfam256/mathfam256.tex new/doc/latex/mathfam256/mathfam256.tex
--- old/doc/latex/mathfam256/mathfam256.tex 2018-01-22 23:49:36.000000000 +0100
+++ new/doc/latex/mathfam256/mathfam256.tex 2019-09-14 23:36:52.000000000 +0200
@@ -36,8 +36,8 @@
However, the ``native'' kernel support is limited:
\begin{itemize}
-\item Lamed (\LaTeX\ on Aleph) is not supported at all.
\item The upper limit for math symbol families is still limited to 16.
+\item Lamed (\LaTeX\ on Aleph) is not supported at all.
\end{itemize}
The package \textsf{mathfam256} is an attempt to resolve this situation;
@@ -55,7 +55,7 @@
\OMEGA\ (Omega), and are currently available in the followings.
Without one of these, the package causes an error.
\begin{itemize}
-\item \pLaTeX/\upLaTeX, run on \epTeX/\eupTeX\ (Japanese TeX engine)
+\item \pLaTeX/\upLaTeX, run on \epTeX/\eupTeX\ (Japanese \TeX\ engine)
\item Lamed, run on Aleph (successor of \OMEGA)
\end{itemize}
@@ -81,7 +81,7 @@
256個までの数式ファミリをサポートするものが現れています。
この状況を鑑み、\LaTeXe カーネル(2015/01/01以降)では、
-Unicode対応のXe\TeX とLua\LaTeX について、数式ファミリ(正確には
+Unicode対応のXe\TeX とLua\TeX について、数式ファミリ(正確には
\verb+\DeclareMathAlphebet+で使われる数式アルファベット)の上限を256に
増やしています。同様に、\pLaTeXe/\upLaTeXe カーネル(2016/11/29以降)も、
\OMEGA ベースのいわゆる「FAM256パッチ」が適用された\epTeX/\eupTeX について、
@@ -93,8 +93,8 @@
しかし、この“ネイティブな”カーネルのサポートには限界があります:
\begin{itemize}
-\item Lamed (\LaTeX\ on Aleph)は全く考慮されていない。
\item 数式シンボルフォントの上限は依然として16のままである(安全のため)。
+\item Lamed (\LaTeX\ on Aleph)は全く考慮されていない。
\end{itemize}
この\textsf{mathfam256}パッケージは、この状況を改善する試みです。
@@ -139,7 +139,7 @@
掲示板「\TeX\ Q\ \&\ A」,2009/02/21.\\
\url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52799.html}
\bibitem{eptexdoc} 北川 弘典,「\epTeX について」.\\
- \verb+$TEXMFDIST/doc/ptex/ptex-base/etex_man.pdf+
+ \verb+$TEXMFDIST/doc/ptex/ptex-base/eptexdoc.pdf+
\end{thebibliography}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathfam256.doc.tlpobj new/tlpkg/tlpobj/mathfam256.doc.tlpobj
--- old/tlpkg/tlpobj/mathfam256.doc.tlpobj 2019-02-28 03:53:14.000000000 +0100
+++ new/tlpkg/tlpobj/mathfam256.doc.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,9 +1,9 @@
name mathfam256.doc
category Package
-revision 46412
+revision 53519
shortdesc doc files of mathfam256
relocated 1
-docfiles size=24
+docfiles size=25
RELOC/doc/latex/mathfam256/LICENSE
RELOC/doc/latex/mathfam256/README.md
RELOC/doc/latex/mathfam256/mathfam256.pdf
++++++ mathfam256.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mathfam256/mathfam256.sty new/tex/latex/mathfam256/mathfam256.sty
--- old/tex/latex/mathfam256/mathfam256.sty 2018-01-22 23:49:36.000000000 +0100
+++ new/tex/latex/mathfam256/mathfam256.sty 2020-01-23 22:57:56.000000000 +0100
@@ -1,6 +1,9 @@
%
% mathfam256.sty
-% 2018/01/22 v0.2 Hironobu Yamashita (aminophen)
+% 2020/01/23 v0.5 -- compatibility with amstext
+% 2020/01/22 v0.4 -- sync with LaTeX2e 2020-02-02 dev
+% 2019/09/14 v0.3 -- bug fix and support LaTeX2e 2019-10-01
+% 2018/01/22 v0.2 -- first CTAN version
% 2016/12/26 v0.1 Hironobu Yamashita (aminophen)
% 2009/02/20 v0.01 Kazuyoshi Yamamoto (ymt)
%
@@ -13,7 +16,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mathfam256}
- [2018/01/22 v0.2 Extend math family up to 256]
+ [2020/01/23 v0.5 Extend math family up to 256]
%% engine check
\ifx\omathchar\@undefined
@@ -24,9 +27,11 @@
* upLaTeX (run on e-upTeX)\MessageBreak
* Lamed (run on Aleph)\MessageBreak
It seems you are running unsupported engine}\@ehc
+ \expandafter\endinput
\fi
\ifx\numexpr\@undefined
\PackageError{mathfam256}{This package requires e-TeX features}\@ehc
+ \expandafter\endinput
\fi
%% engine check has been done, so always 256
@@ -93,6 +98,25 @@
{\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top}%
}
+%% LaTeX2e 2019/10/01 makes lots of commands robust;
+%% follow both old and new behavior
+%% -- Among the changes in 2019/10/01,
+%% "making math delimiters robust with \MakeRobust"
+%% was backed out and replaced with "engine protection"
+%% in 2020/02/02.
+%% (see https://github.com/latex3/latex2e/issues/251)
+\edef\omfcclvi@reset{%
+ \catcode`\noexpand\&=\the\catcode`\&\relax
+ \catcode`\noexpand\~=\the\catcode`\~\relax
+ \let\noexpand\omfcclvi@reset\noexpand\@undefined}
+\@ifl@t@r\fmtversion{2019/10/01}{%
+ \catcode`\&=9\relax
+ \catcode`\~=14\relax
+}{%
+ \catcode`\&=14\relax
+ \catcode`\~=9\relax
+}
+
%% use \omath... primitives for low-level commands
\def\set@mathchar#1#2#3#4{%
\ifnum#1<\sixt@@n
@@ -114,14 +138,17 @@
\else
\xdef#2{\omathaccent"\mathchar@type#3\hexnumber@@#100#4\relax}%
\fi
+& \MakeRobust#2%
}
\def\set@mathdelimiter#1#2#3#4#5#6{%
\@tempswatrue
\ifnum#1<\sixt@@n\relax\else\@tempswafalse\fi
\ifnum#2<\sixt@@n\relax\else\@tempswafalse\fi
\if@tempswa
+& \protected
\xdef#3{\delimiter"\mathchar@type#4\hexnumber@#1#5\hexnumber@#2#6\relax}%
\else
+& \protected
\xdef#3{\odelimiter"\mathchar@type#4\hexnumber@@#100#5%
"\hexnumber@@#200#6\relax}%
\fi
@@ -248,9 +275,7 @@
E0\or E1\or E2\or E3\or E4\or E5\or E6\or E7\or E8\or
E9\or EA\or EB\or EC\or ED\or EE\or EF\or
F0\or F1\or F2\or F3\or F4\or F5\or F6\or F7\or F8\or
- F9\or FA\or FB\or FC\or FD\or FE\or FF
- \fi
-}
+ F9\or FA\or FB\or FC\or FD\or FE\or FF\fi}
%% patch LaTeX2e internal only if newer than (or equal to) 2015/01/01
%% since the error code was introduced at that time
@@ -302,13 +327,19 @@
\ifin@
\begingroup
\if\relax\noexpand#1% is command?
- \edef\reserved@a{\noexpand\in@{\string\mathchar}{\meaning#1}}%
+& \edef\reserved@b{\expandafter\noexpand
+& \csname\expandafter\@gobble\string#1\space\endcsname}%
+ \edef\reserved@a
+ {\noexpand\in@{\expandafter\@gobble\string\mathchar}%
+~ {\meaning#1}}%
+& {\meaning#1\expandafter\meaning\reserved@b}}%
\reserved@a
+& \global\expandafter\let\reserved@b\@undefined
\ifin@
\oset@mathsymbol{#1}{#2}{#3}{#4}%
\@font@info{Redeclaring math symbol \string#1}%
\else
- \expandafter\ifx
+ \expandafter\ifx
\csname\expandafter\@gobble\string#1\endcsname
\relax
\oset@mathsymbol{#1}{#2}{#3}{#4}%
@@ -341,9 +372,16 @@
\ifin@
\begingroup
\if\relax\noexpand#1% is command?
- \edef\reserved@a{\noexpand\in@{\string\mathaccent}{\meaning#1}}%
+ \edef\reserved@a{\noexpand\in@
+~ {\expandafter\@gobble\string\mathaccent}{\meaning#1}}%
+& {\expandafter\@gobble\string\mathaccent}
+& {\expandafter\meaning
+& \csname\expandafter\@gobble\string#1\space\endcsname}}%
\reserved@a
\ifin@
+& \expandafter\let
+& \csname\expandafter\@gobble\string#1\space\endcsname
+& \@undefined
\oset@mathaccent{#1}{#2}{#3}{#4}%
\@font@info{Redeclaring math accent \string#1}%
\else
@@ -367,7 +405,9 @@
\def\oset@mathaccent#1#2#3#4{%
\xdef#1{\omathaccent%
\number
- \numexpr"1000000*\mathchar@type#2+"10000*\csname sym#3\endcsname+#4}}
+ \numexpr"1000000*\mathchar@type#2+"10000*\csname sym#3\endcsname+#4}%
+& \MakeRobust#1%
+}
\@onlypreamble\oset@mathaccent
%\def\DeclareMathDelimiter#1{%
% \if\relax\noexpand#1%
@@ -398,19 +438,35 @@
\expandafter{\group@list}%
\ifin@
\begingroup
- \edef\reserved@a{\noexpand\in@{\string\delimiter}{\meaning#1}}%
+ \edef\reserved@a{\noexpand\in@
+ {\expandafter\@gobble\string\delimiter}{\meaning#1}}%
\reserved@a
\ifin@
\oset@mathdelimiter{#1}{#2}{#3}{#4}{#5}{#6}%
\@font@info{Redeclaring math delimiter \string#1}%
\else
- \expandafter\ifx
+ %%%%% BEGIN -- only for "real" format as of 2019-10-01 which used \MakeRobust
+ \edef\reserved@a{\noexpand\in@
+ {\expandafter\@gobble\string\delimiter}%
+ {\expandafter\meaning\csname\expandafter\@gobble\string#1\space\endcsname}}%
+ \reserved@a
+ \ifin@
+ \global % to cancel global assignment done by \MakeRobust
+ \expandafter\let\csname\expandafter\@gobble\string#1\space\endcsname\@undefined
+ \oset@mathdelimiter{#1}{#2}{#3}{#4}{#5}{#6}%
+ \@font@info{Redeclaring math delimiter \string#1}%
+ \else
+ %%%%% END
+ \expandafter\ifx
\csname\expandafter\@gobble\string#1\endcsname
\relax
\oset@mathdelimiter{#1}{#2}{#3}{#4}{#5}{#6}%
\else
\@latex@error{Command `\string#1' already defined}\@eha
\fi
+ %%%%% BEGIN -- only for "real" format as of 2019-10-01 which used \MakeRobust
+ \fi
+ %%%%% END
\fi
\endgroup
\else
@@ -443,6 +499,7 @@
\numexpr"1000000*\mathchar@type#2+"10000*\csname sym#3\endcsname+#4%
\count\tw@
\numexpr"10000*\csname sym#5\endcsname+#6%
+& \protected
\xdef#1{\odelimiter\number\count\z@\space \number\count\tw@}%
\endgroup
}
@@ -461,7 +518,8 @@
\relax
\let#1\radical
\fi
- \edef\reserved@a{\noexpand\in@{\string\radical}{\meaning#1}}%
+ \edef\reserved@a{\noexpand\in@
+ {\expandafter\@gobble\string\radical}{\meaning#1}}%
\reserved@a
\ifin@
\expandafter\in@\csname sym#2\expandafter\endcsname
@@ -491,5 +549,34 @@
}
\@onlypreamble\oset@mathradical
+%% reset
+\omfcclvi@reset
+
+%% patch: amstext.sty redefines \mathhexbox to use its own \text
+\let\omfcclvi@my@mathhexbox\mathhexbox
+\def\omfcclvi@patch@mathhexbox{%
+ \ifx\mathhexbox\omfcclvi@old@mathhexbox
+ \expandafter\@firstoftwo % known -> info only
+ \else\ifx\mathhexbox\omfcclvi@my@mathhexbox
+ \expandafter\expandafter\expandafter\@firstoftwo % known -> info only
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo % unknown -> warning
+ \fi\fi
+ \PackageInfo\PackageWarning{mathfam256}{Redefining \string\mathhexbox}%
+ \let\mathhexbox\omfcclvi@new@mathhexbox
+ \let\omfcclvi@old@mathhexbox\@undefined
+ \let\omfcclvi@new@mathhexbox\@undefined
+ \let\omfcclvi@patch@mathhexbox\@undefined}
+\begingroup \catcode`\"=12
+\gdef\omfcclvi@old@mathhexbox#1#2#3{\text{$\m@th\mathchar"#1#2#3$}}
+\gdef\omfcclvi@new@mathhexbox#1#2#3{%
+ \ifnum"#1<\sixt@@n
+ \text{$\m@th \mathchar"#1#2#3$}%
+ \else
+ \text{$\m@th \omathchar"#100#2#3$}%
+ \fi}
+\endgroup
+\AtBeginDocument{\ifx\text\@undefined\else \omfcclvi@patch@mathhexbox \fi}
+
%% all done
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathfam256.tlpobj new/tlpkg/tlpobj/mathfam256.tlpobj
--- old/tlpkg/tlpobj/mathfam256.tlpobj 2019-02-28 03:53:14.000000000 +0100
+++ new/tlpkg/tlpobj/mathfam256.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,6 +1,6 @@
name mathfam256
category Package
-revision 46412
+revision 53519
shortdesc Extend math family up to 256 for pLaTeX/upLaTeX/Lamed
relocated 1
longdesc This package increases the upper limit of math symbols up to
@@ -8,11 +8,10 @@
longdesc originally introduced in Omega and are currently available in
longdesc the following formats: pLaTeX (runs on e-pTeX), upLaTeX (runs
longdesc on e-upTeX), Lamed (runs on Aleph, successor of Omega).
-runfiles size=4
+runfiles size=5
RELOC/tex/latex/mathfam256/mathfam256.sty
catalogue-contact-repository https://github.com/aminophen/mathfam256
catalogue-ctan /macros/latex/contrib/mathfam256
-catalogue-date 2018-01-24 04:32:31 +0100
catalogue-license bsd3
catalogue-topics maths omega japanese etex
-catalogue-version 0.2
+catalogue-version 0.5
++++++ mathfont.doc.tar.xz ++++++
++++ 1606 lines of diff (skipped)
++++++ mathfont.tar.xz ++++++
++++ 1633 lines of diff (skipped)
++++++ mathpazo.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathpazo.doc.tlpobj new/tlpkg/tlpobj/mathpazo.doc.tlpobj
--- old/tlpkg/tlpobj/mathpazo.doc.tlpobj 2019-02-28 03:53:15.000000000 +0100
+++ new/tlpkg/tlpobj/mathpazo.doc.tlpobj 2019-11-07 18:46:22.000000000 +0100
@@ -1,6 +1,6 @@
name mathpazo.doc
category Package
-revision 15878
+revision 52663
shortdesc doc files of mathpazo
relocated 1
docfiles size=109
++++++ mathpazo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathpazo.tlpobj new/tlpkg/tlpobj/mathpazo.tlpobj
--- old/tlpkg/tlpobj/mathpazo.tlpobj 2019-02-28 03:53:15.000000000 +0100
+++ new/tlpkg/tlpobj/mathpazo.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name mathpazo
category Package
-revision 15878
+revision 52663
shortdesc Fonts to typeset mathematics to match Palatino
relocated 1
longdesc The Pazo Math fonts are a family of PostScript fonts suitable
@@ -22,6 +22,8 @@
longdesc sets (C, I, N, Q, R, and Z) in blackboard bold. LaTeX macro
longdesc support (using package mathpazo.sty) is provided in psnfss (a
longdesc required part of any LaTeX distribution).
+depend fpl
+depend palatino
runfiles size=41
RELOC/fonts/afm/public/mathpazo/fplmb.afm
RELOC/fonts/afm/public/mathpazo/fplmbb.afm
++++++ mathtools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathtools/README new/doc/latex/mathtools/README
--- old/doc/latex/mathtools/README 2017-06-06 23:53:26.000000000 +0200
+++ new/doc/latex/mathtools/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,84 +0,0 @@
-The mathtools bundle
-=============
-Morten Hoegholm (c) 2002-2011
-Lars Madsen (c) 2012-
-email: daleif(a)math.au.dk
-License: LaTeX Project Public License
-
-The files in the mathtools bundle are:
- mhsetup.dtx
- mathtools.dtx
- empheq.dtx
-and derived files. The derived files of each .dtx-file are listed
-at the top of the respective .dtx-file.
-
-
-INSTALLATION
-============
-Running TeX on each dtx file extracts the runtime files. See the dtx
-files for details.
-
-DESCRIPTION
-===========
-
-
-mathtools
-=========
-
-The mathtools package provides many useful tools for mathematical
-typesetting. It is based on amsmath and fixes various deficiencies
-of amsmath and standard LaTeX. It provides:
- -- Extensible symbols, such as brackets, arrows, harpoons, etc.
- -- Various symbols such as \coloneqq (:=).
- -- Easy creation of new tag forms.
- -- Showing only the referenced equations.
- -- Extensible arrows, harpoons and hookarrows.
- -- Starred versions of the amsmath matrix environments for
- specifying the column alignment.
- -- More building blocks: multlined, cases-like environments, new
- gathered environments.
- -- Math versions of \makebox, \llap, \rlap etc.
- -- Cramped math styles.
- -- Macro generators.
- -- and more...
-
-mathtools requires mhsetup.
-
-empheq
-======
-
-The empheq package is a visual markup extension designed to
-function on top of amsmath. It features:
- -- Boxing multi line math displays while leaving equation
- numbers untouched at the margin. Any kind of box will do.
- -- Making the ntheorem package place end-of-theorem markers
- perfectly.
- -- Placing arbitrary material on either side of math displays.
- This includes delimiters that automatically scale to the
- correct size.
-
-empheq requires mathtools.
-
-
-mhsetup
-=======
-
-The mhsetup package defines various programming tools needed by
-both empheq and mathtools. The syntax is the same as for expl3,
-but there is no code overlap (anymore as of May 2017).
-In the future, most of these tools will probably be an integral part of LaTeX3 (they were).
-
-
-BUG REPORTS
-===========
-
-The bundle is maintained by:
-
- Morten H\o gholm
- Lars Madsen <daleif(a)math.au.dk>
-
-
-Please report bugs to daleif(a)math.au.dk
-
-===========
-This README file was last revised 2017/05/24.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mathtools/README.md new/doc/latex/mathtools/README.md
--- old/doc/latex/mathtools/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/mathtools/README.md 2020-03-24 21:50:35.000000000 +0100
@@ -0,0 +1,56 @@
+The `mathtools` bundle
+======================
+
+`mathtools`
+-----------
+
+The `mathtools` package provides many useful tools for mathematical
+typesetting. It is based on `amsmath` and fixes various deficiencies
+of `amsmath` and standard LaTeX. It provides:
+
+- Extensible symbols, such as brackets, arrows, harpoons, etc.
+- Various symbols such as `\coloneqq` (:=).
+- Easy creation of new tag forms.
+- Showing only the referenced equations.
+- Extensible arrows, harpoons and hook arrows.
+- Starred versions of the `amsmath` matrix environments for
+ specifying the column alignment.
+- More building blocks: multlined, cases-like environments, new
+ gathered environments.
+- Math versions of `\makebox`, `\llap`, `\rlap`, etc.
+- Cramped math styles.
+- and more ...
+
+`mathtools` requires `mhsetup`.
+
+`empheq`
+--------
+
+The `empheq` package is a visual markup extension designed to
+function on top of `amsmath`. It features:
+
+- Boxing multi line math displays while leaving equation
+ numbers untouched at the margin. Any kind of box will do.
+- Making the `ntheorem` package place end-of-theorem markers
+ perfectly.
+- Placing arbitrary material on either side of math displays.
+ This includes delimiters that automatically scale to the
+ correct size.
+
+`empheq` requires `mathtools`.
+
+`mhsetup`
+---------
+
+The `mhsetup` package defines various programming tools needed by
+both `empheq` and `mathtools`. In the future, most of these tools will
+probably be an integral part of LaTeX3.
+
+-----
+
+Copyright (C) 2002-2011 Morten Hoegholm
+Copyright (C) 2012-2019 Lars Madsen
+Copyright (C) 2020 Lars Madsen, The LaTeX3 Project
+<https://latex-project.org/>
+All rights reserved.
+
Binary files old/doc/latex/mathtools/empheq.pdf and new/doc/latex/mathtools/empheq.pdf differ
Binary files old/doc/latex/mathtools/mathtools.pdf and new/doc/latex/mathtools/mathtools.pdf differ
Binary files old/doc/latex/mathtools/mhsetup.pdf and new/doc/latex/mathtools/mhsetup.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathtools.doc.tlpobj new/tlpkg/tlpobj/mathtools.doc.tlpobj
--- old/tlpkg/tlpobj/mathtools.doc.tlpobj 2019-02-28 03:53:18.000000000 +0100
+++ new/tlpkg/tlpobj/mathtools.doc.tlpobj 2020-03-25 16:13:13.000000000 +0100
@@ -1,10 +1,10 @@
name mathtools.doc
category Package
-revision 46250
+revision 54516
shortdesc doc files of mathtools
relocated 1
-docfiles size=243
- RELOC/doc/latex/mathtools/README
+docfiles size=248
+ RELOC/doc/latex/mathtools/README.md
RELOC/doc/latex/mathtools/empheq.pdf
RELOC/doc/latex/mathtools/mathtools.pdf
RELOC/doc/latex/mathtools/mhsetup.pdf
++++++ mathtools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mathtools/empheq.sty new/tex/latex/mathtools/empheq.sty
--- old/tex/latex/mathtools/empheq.sty 2017-06-06 23:53:26.000000000 +0200
+++ new/tex/latex/mathtools/empheq.sty 2020-03-24 21:50:35.000000000 +0100
@@ -9,7 +9,8 @@
%% This is a generated file.
%%
%% Copyright (C) 2002-2007 by Morten Hoegholm
-%% Copyright (C) 2012- by Lars Madsen
+%% Copyright (C) 2012-2019 by Lars Madsen
+%% Copyright (C) 2020- by Lars Madsen, The LaTeX3 Project
%%
%%
%% This work may be distributed and/or modified under the
@@ -23,7 +24,7 @@
%% This work has the LPPL maintenance status "maintained".
%%
%% This Current Maintainer of this work is
-%% Lars Madsen
+%% Lars Madsen, The LaTeX3 Project
%%
%% This work consists of the main source file empheq.dtx
%% and the derived files
@@ -75,6 +76,7 @@
\newdimen\l_EQ_displaywidth_dim
\def\EmphEqdisplaywidth{\l_EQ_displaywidth_dim}
\newdimen\l_EQ_temp_linewidth_dim
+\newdimen\l_EQ_linewidth_dim
\newdimen\EmphEqdelimitershortfall
\newcount\EmphEqdelimiterfactor
\EmphEqdelimiterfactor950
@@ -117,8 +119,8 @@
\MH_else:
\setkeys{\MT_options_name:}{multlined-pos=t}
\MH_fi:
- \g@addto@macro\EQ_complete_mathdisplay:{
- \begin{MTmultlined}\relax}
+ \g@addto@macro\EQ_complete_mathdisplay:{
+ \begin{MTmultlined}\relax}
}
\g@addto@macro\EQ_complete_mathdisplay:\EQ_mathbody:
\MH_if_boolean:nT {outer_mult}{
@@ -190,6 +192,19 @@
\MH_let:NwN\SetTagPlusEndMark\EQ_tag_plus_endmark:
\MH_let:NwN\SetOnlyEndMark\EQ_only_endmark:
\l_EQ_temp_linewidth_dim\linewidth
+ \l_EQ_linewidth_dim\linewidth
+ \@tempdima\z@
+ \begingroup
+ \ifdefined\fullwidthdisplay\relax
+ \fullwidthdisplay
+ \global\@tempdima\displaywidth
+ \fi
+ \endgroup
+ \ifdim\@tempdima>\linewidth\relax
+ \l_EQ_temp_linewidth_dim\@tempdima
+ \l_EQ_linewidth_dim\@tempdima
+ \fi
+ \@tempdima\z@
\g_EQ_toprow_height_dim\z@
\g_EQ_bottomrow_depth_dim\z@
\g_EQ_toptag_height_dim\z@
@@ -420,7 +435,9 @@
\MH_if_num:w \maxfields@=\tw@
\MH_else:
\setlength{\l_EQ_temp_linewidth_dim}{%
- \linewidth-\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
+ % \linewidth
+ \l_EQ_linewidth_dim
+ -\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
\MH_fi:}
\def\EQ_modify_linewidth_ii:{\EQ_modify_linewidth_i:}
\def\EQ_find_displaywidth_i:{%
@@ -492,191 +509,209 @@
\MH_let:NwN \MTmultlined \multlined
\MH_let:NwN \endMTmultlined \endmultlined
\MH_if_boolean:nTF {good_mult}{
-\MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline}{gather}
- {\MH_set_boolean_T:n {outer_mult}}
-\MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline*}{gather*}
- {\MH_set_boolean_T:n {outer_mult}}
-\def\EQ_modify_linewidth_iii_mult:{
- \setlength{\l_EQ_temp_linewidth_dim}{%
- \linewidth-\widthof{\EQ_outerbox:{}}}%
- \MH_if_dim:w \g_EQ_widesttag_dim>\z@
- \EQ_multline_modify_linewidth_tag:
- \MH_else:
- \EQ_multline_modify_linewidth_notag:
- \MH_fi:
- \MH_setlength:dn \l_MT_multwidth_dim{\l_EQ_temp_linewidth_dim}
-}
-\def\EQ_modify_linewidth_iv_mult:{\EQ_modify_linewidth_iii_mult:}
-\def\EQ_find_displaywidth_iii_mult:{%
- \MH_setlength:dn \l_EQ_displaywidth_dim{\totwidth@}%
- \MH_if_case:w \l_EQ_alignmentmode_int \MH_or: \MH_or: % #1 & #2:
- \MH_or: % #3:
- \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
- \MH_or: % #4:
- \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
- \MH_fi:}
-\def\EQ_find_displaywidth_iv_mult:{\EQ_find_displaywidth_iii_mult:}
-\def\EQ_place_display_iii_mult:{
- \MH_if_case:w \l_EQ_alignmentmode_int
- \MH_or: % #1:
+ \MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline}{gather}
+ {\MH_set_boolean_T:n {outer_mult}}
+ \MH_keyval_alias_with_addon:nnnn {EmphEqEnv}{multline*}{gather*}
+ {\MH_set_boolean_T:n {outer_mult}}
+ \def\EQ_modify_linewidth_iii_mult:{
+ \setlength{\l_EQ_temp_linewidth_dim}{%
+ % \linewidth
+ \l_EQ_linewidth_dim
+ -\widthof{\EQ_outerbox:{}}}%
\MH_if_dim:w \g_EQ_widesttag_dim>\z@
- \abovedisplayshortskip=\abovedisplayskip
- \rlap{
- \kern-.5\linewidth
- \kern\multlinegap
- \EQ_use_mathdisplay:
- }
+ \EQ_multline_modify_linewidth_tag:
\MH_else:
- \EQ_use_mathdisplay:
+ \EQ_multline_modify_linewidth_notag:
\MH_fi:
- \MH_or: % #2:
- \MH_if_dim:w \g_EQ_widesttag_dim>\z@
- \llap{
- \EQ_use_mathdisplay:
- \kern-.5\linewidth
- \kern\multlinegap
- }%
- \MH_else:
- \EQ_use_mathdisplay:
+ \MH_setlength:dn \l_MT_multwidth_dim{\l_EQ_temp_linewidth_dim}
+ \MH_if_case:w \l_EQ_alignmentmode_int
+ \MH_or: \MH_or: % 1 and 2
+ \MH_or:
+ \MH_addtolength:dn
+ \l_EQ_temp_linewidth_dim{\@mathmargin}%
+ \MH_or:
+ \MH_addtolength:dn
+ \l_EQ_temp_linewidth_dim{\@mathmargin}%
\MH_fi:
- \MH_or: % #3:
- \EQ_use_mathdisplay:
- \MH_or: % #4:
- \EQ_use_mathdisplay:
- \MH_fi:
-}
-\def\EQ_place_display_iv_mult: {\EQ_place_display_iii_mult:}
-}{
-\def\EQ_generic_multline:nnnnn #1#2#3#4#5{%
- \hskip1sp#2#3{{}#5}#4%
- \MH_if:w *#1\relax\MH_else:\notag\MH_fi:}
-\def\multleft{\@ifstar{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_left:n}
- }{
- \def\EQ_next:{
- \EQ_generic_multline:nnnnn {*}{}{\mathrlap}{&&&&&}}
- }
- \EQ_next:}{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_left:n}%
- }{
- \def\EQ_next:{
- \EQ_generic_multline:nnnnn {}{}{\mathrlap}{&&&&&}}
}
- \EQ_next:}}%
-\def\multcenter{\@ifstar{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_center:n}%
- }{
- \def\EQ_next:{
- \EQ_generic_multline:nnnnn {*}{&&}{\mathclap}{&&&}}
- }
- \EQ_next:}{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_center:n }%
- }{
- \def\EQ_next:{
- \EQ_generic_multline:nnnnn {}{&&}{\mathclap}{&&&}}
- }
- \EQ_next:}}%
-\def\multright{\@ifstar{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_right:n }%
- }{
- \def\EQ_next:{
- \EQ_generic_multline:nnnnn {*}{&&&&&}{\mathllap}{}}
- }
- \EQ_next:}{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_right:n }%
- }{
- \def\EQ_next:{
- \EQ_generic_multline:nnnnn {}{&&&&&}{\mathllap}{}}
- }
- \EQ_next:}}
-\def\multfirst{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_left:n }%
- }{
+ \def\EQ_modify_linewidth_iv_mult:{\EQ_modify_linewidth_iii_mult:}
+ \def\EQ_find_displaywidth_iii_mult:{%
+ \MH_setlength:dn \l_EQ_displaywidth_dim{\totwidth@}%
+ \MH_if_case:w \l_EQ_alignmentmode_int \MH_or: \MH_or: % #1 & #2:
+ \MH_or: % #3:
+ \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
+ \MH_or: % #4:
+ \MH_addtolength:dn \l_EQ_displaywidth_dim{-\@mathmargin}%
+ \MH_fi:}
+ \def\EQ_find_displaywidth_iv_mult:{\EQ_find_displaywidth_iii_mult:}
+ \def\EQ_place_display_iii_mult:{
\MH_if_case:w \l_EQ_alignmentmode_int
\MH_or: % #1:
- \def\EQ_next:{\multleft}%
+ \MH_if_dim:w \g_EQ_widesttag_dim>\z@
+ \abovedisplayshortskip=\abovedisplayskip
+ \rlap{
+ % \kern-.5\linewidth
+ \kern-.5\l_EQ_linewidth_dim
+ \kern\multlinegap
+ \EQ_use_mathdisplay:
+ }
+ \MH_else:
+ \EQ_use_mathdisplay:
+ \MH_fi:
\MH_or: % #2:
- \def\EQ_next:{\multleft*}%
+ \MH_if_dim:w \g_EQ_widesttag_dim>\z@
+ \llap{
+ \EQ_use_mathdisplay:
+ % \kern-.5\linewidth
+ \kern-.5\l_EQ_linewidth_dim
+ \kern\multlinegap
+ }%
+ \MH_else:
+ \EQ_use_mathdisplay:
+ \MH_fi:
\MH_or: % #3:
- \def\EQ_next:{\multleft}%
+ \EQ_use_mathdisplay:
\MH_or: % #4:
- \def\EQ_next:{\multleft*}%
+ \EQ_use_mathdisplay:
\MH_fi:
}
- \EQ_next:}
-\def\multmiddle{%
- \def\EQ_next:{%
+ \def\EQ_place_display_iv_mult: {\EQ_place_display_iii_mult:}
+}{% on to the 'bad' version
+ \def\EQ_generic_multline:nnnnn #1#2#3#4#5{%
+ \hskip1sp#2#3{{}#5}#4%
+ \MH_if:w *#1\relax\MH_else:\notag\MH_fi:}
+ \def\multleft{\@ifstar{%
\MH_if_boolean:nTF {multlined}{
- \expandafter\EQ_multlined_center:n
+ \def\EQ_next:{\EQ_multlined_left:n}
}{
- \expandafter\multcenter
+ \def\EQ_next:{
+ \EQ_generic_multline:nnnnn {*}{}{\mathrlap}{&&&&&}}
}
- }%
- \@ifstar{\EQ_next:}{\EQ_next:}}
-\def\multlast{%
- \MH_if_boolean:nTF {multlined}{
- \def\EQ_next:{\EQ_multlined_right:n }%
- }{
- \MH_if_case:w \l_EQ_alignmentmode_int
- \MH_or: % #1:
- \def\EQ_next:{\multright*}%
- \MH_or: % #2:
- \def\EQ_next:{\multright}%
- \MH_or: % #3:
- \def\EQ_next:{\multright*}%
- \MH_or: % #4:
- \def\EQ_next:{\multright}%
- \MH_fi:
- }
- \EQ_next:}
-\MH_new_boolean:n {multlined}
-\newdimen\multlinedwidth
-\MH_setlength:dn \multlinedwidth{.7\linewidth}
-\renewenvironment{multlined}%
- {\MH_nospace_ifnextchar:Nnn [ {\EQ_multlined_I:w}
- {\EQ_multlined_I:w[c]}
- }
- { \endaligned }
-\def\EQ_multlined_I:w[#1]{%
- \MH_nospace_ifnextchar:Nnn[ {\EQ_multlined_II:w[#1]}
- {\EQ_multlined_II:w[#1][\multlinedwidth]}}
-\def\EQ_multlined_II:w[#1][#2]{%
- \MH_set_boolean_T:n {multlined}
- \MH_let:NwN \Let@\MT_saved_Let:
- \MH_if:w t#1\relax \EQ_multlined_III:nn {#1}{#2}%
- \MH_else:
- \MH_if:w b#1\relax \EQ_multlined_III:nn {#1}{#2}%
+ \EQ_next:}{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_left:n}%
+ }{
+ \def\EQ_next:{
+ \EQ_generic_multline:nnnnn {}{}{\mathrlap}{&&&&&}}
+ }
+ \EQ_next:}}%
+ \def\multcenter{\@ifstar{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_center:n}%
+ }{
+ \def\EQ_next:{
+ \EQ_generic_multline:nnnnn {*}{&&}{\mathclap}{&&&}}
+ }
+ \EQ_next:}{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_center:n }%
+ }{
+ \def\EQ_next:{
+ \EQ_generic_multline:nnnnn {}{&&}{\mathclap}{&&&}}
+ }
+ \EQ_next:}}%
+ \def\multright{\@ifstar{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_right:n }%
+ }{
+ \def\EQ_next:{
+ \EQ_generic_multline:nnnnn {*}{&&&&&}{\mathllap}{}}
+ }
+ \EQ_next:}{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_right:n }%
+ }{
+ \def\EQ_next:{
+ \EQ_generic_multline:nnnnn {}{&&&&&}{\mathllap}{}}
+ }
+ \EQ_next:}}
+ \def\multfirst{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_left:n }%
+ }{
+ \MH_if_case:w \l_EQ_alignmentmode_int
+ \MH_or: % #1:
+ \def\EQ_next:{\multleft}%
+ \MH_or: % #2:
+ \def\EQ_next:{\multleft*}%
+ \MH_or: % #3:
+ \def\EQ_next:{\multleft}%
+ \MH_or: % #4:
+ \def\EQ_next:{\multleft*}%
+ \MH_fi:
+ }
+ \EQ_next:}
+ \def\multmiddle{%
+ \def\EQ_next:{%
+ \MH_if_boolean:nTF {multlined}{
+ \expandafter\EQ_multlined_center:n
+ }{
+ \expandafter\multcenter
+ }
+ }%
+ \@ifstar{\EQ_next:}{\EQ_next:}}
+ \def\multlast{%
+ \MH_if_boolean:nTF {multlined}{
+ \def\EQ_next:{\EQ_multlined_right:n }%
+ }{
+ \MH_if_case:w \l_EQ_alignmentmode_int
+ \MH_or: % #1:
+ \def\EQ_next:{\multright*}%
+ \MH_or: % #2:
+ \def\EQ_next:{\multright}%
+ \MH_or: % #3:
+ \def\EQ_next:{\multright*}%
+ \MH_or: % #4:
+ \def\EQ_next:{\multright}%
+ \MH_fi:
+ }
+ \EQ_next:}
+ \MH_new_boolean:n {multlined}
+ \newdimen\multlinedwidth
+ \MH_setlength:dn \multlinedwidth{
+ % .7\linewidth
+ 0.7\l_EQ_linewidth_dim
+ }
+ \renewenvironment{multlined}%
+ {\MH_nospace_ifnextchar:Nnn [ {\EQ_multlined_I:w}
+ {\EQ_multlined_I:w[c]}
+ }
+ { \endaligned }
+ \def\EQ_multlined_I:w[#1]{%
+ \MH_nospace_ifnextchar:Nnn[ {\EQ_multlined_II:w[#1]}
+ {\EQ_multlined_II:w[#1][\multlinedwidth]}}
+ \def\EQ_multlined_II:w[#1][#2]{%
+ \MH_set_boolean_T:n {multlined}
+ \MH_let:NwN \Let@\MT_saved_Let:
+ \MH_if:w t#1\relax \EQ_multlined_III:nn {#1}{#2}%
\MH_else:
- \MH_if:w c#1\relax \EQ_multlined_III:nn {#1}{#2}%
+ \MH_if:w b#1\relax \EQ_multlined_III:nn {#1}{#2}%
\MH_else:
- \EQ_multlined_III:nn {#2}{#1}%
+ \MH_if:w c#1\relax \EQ_multlined_III:nn {#1}{#2}%
+ \MH_else:
+ \EQ_multlined_III:nn {#2}{#1}%
+ \MH_fi:
\MH_fi:
\MH_fi:
- \MH_fi:
- \mkern-\thinmuskip
- \EQ_next:}
-\def\EQ_multlined_III:nn #1#2{%
- \def\EQ_next:{\setlength\multlinedwidth{#2}%
- \start@aligned{#1}{\thr@@}}}
-\def\EQ_multlined_left:n #1{%
- \mathrlap{#1}&\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&}
-\def\EQ_multlined_center:n #1{%
- &\hskip.5\multlinedwidth&&\mathclap{#1}\hskip.5\multlinedwidth&&}
-\def\EQ_multlined_right:n #1{%
- &\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&\mathllap{#1}}
+ \mkern-\thinmuskip
+ \EQ_next:}
+ \def\EQ_multlined_III:nn #1#2{%
+ \def\EQ_next:{\setlength\multlinedwidth{#2}%
+ \start@aligned{#1}{\thr@@}}}
+ \def\EQ_multlined_left:n #1{%
+ \mathrlap{#1}&\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&}
+ \def\EQ_multlined_center:n #1{%
+ &\hskip.5\multlinedwidth&&\mathclap{#1}\hskip.5\multlinedwidth&&}
+ \def\EQ_multlined_right:n #1{%
+ &\hskip.5\multlinedwidth&&\hskip.5\multlinedwidth&&\mathllap{#1}}
}
\EQ_new_equationtype:nnn {EmphEqEnv}{flalign}{5}
\EQ_new_equationtype:nnn {EmphEqEnv}{flalign*}{6}
\def\EQ_modify_linewidth_v:{%
\setlength{\l_EQ_temp_linewidth_dim}{%
- \linewidth-\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
+ % \linewidth
+ \l_EQ_linewidth_dim
+ -\l_EQ_totalwidth_dim-\widthof{\EQ_outerbox:{}}}%
\MH_if_dim:w \g_EQ_widesttag_dim>\z@
\MH_if_boolean:nTF {multline}{
\EQ_multline_modify_linewidth_tag:
@@ -711,11 +746,15 @@
\MH_or: % #1:
\MH_if_dim:w \g_EQ_widesttag_dim>\z@
\MH_if_boolean:nTF {multline}{
- \rlap{\kern\multlinegap \kern-.5\linewidth
+ \rlap{\kern\multlinegap
+ % \kern-.5\linewidth
+ \kern-.5\l_EQ_linewidth_dim
\EQ_use_mathdisplay:
\kern-\mintagsep \kern\multlinetaggap}%
}{
- \rlap{\kern-.5\linewidth\EQ_use_mathdisplay:}%
+ \rlap{%\kern-.5\linewidth
+ \kern-.5\l_EQ_linewidth_dim
+ \EQ_use_mathdisplay:}%
}
\MH_else:
\EQ_use_mathdisplay:
@@ -725,15 +764,22 @@
\MH_if_boolean:nTF {multline}{
\llap{\kern-\mintagsep \kern\multlinetaggap
\EQ_use_mathdisplay:
- \kern\multlinegap \kern-.5\linewidth}%
+ \kern\multlinegap
+ % \kern-.5\linewidth
+ \kern-.5\l_EQ_linewidth_dim
+ }%
}{
- \llap{\EQ_use_mathdisplay:\kern-.5\linewidth}%
+ \llap{\EQ_use_mathdisplay:
+ % \kern-.5\linewidth
+ \kern-.5\l_EQ_linewidth_dim
+ }%
}
\MH_else:
\EQ_use_mathdisplay:
\MH_fi:
\MH_or: % #3:
- \MH_if_boolean:nF {multline}{ \kern-\multlinetaggap }
+ \MH_if_boolean:nTF {multline}{ \kern-\multlinetaggap }
+ { \kern-\@mathmargin }
\EQ_use_mathdisplay:
\MH_or: % #4:
\MH_if_dim:w \g_EQ_widesttag_dim>\z@
@@ -902,6 +948,10 @@
\rule[-\dp\z@-\shadowsize]{\shadowsize}{\ht\z@+\dp\z@}}}}%
}{}%
}
+\g@addto@macro\EQ_typeset_display_hook:{
+ % \columnwidth\linewidth
+ \def\fullwidthdisplay{}
+}
\def\EQ_overload_ams_begin:n #1{%
\MH_let:cc {AmS#1}{#1}%
\MH_let:cc {AmS#1*}{#1*}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mathtools/mathtools.sty new/tex/latex/mathtools/mathtools.sty
--- old/tex/latex/mathtools/mathtools.sty 2018-01-08 23:18:48.000000000 +0100
+++ new/tex/latex/mathtools/mathtools.sty 2020-03-24 21:50:35.000000000 +0100
@@ -9,7 +9,8 @@
%% This is a generated file.
%%
%% Copyright (C) 2002-2011 by Morten Hoegholm
-%% Copyright (C) 2012- by Lars Madsen
+%% Copyright (C) 2012-2019 by Lars Madsen
+%% Copyright (C) 2020 by Lars Madsen, the LaTeX3 project
%%
%%
%% This work may be distributed and/or modified under the
@@ -23,14 +24,14 @@
%% This work has the LPPL maintenance status "maintained".
%%
%% This Current Maintainer of this work is
-%% Lars Madsen
+%% Lars Madsen and the LaTeX3 project
%%
%% This work consists of the main source file mathtools.dtx
%% and the derived files
%% mathtools.sty, mathtools.pdf, mathtools.ins, mathtools.drv.
%%
\ProvidesPackage{mathtools}%
- [2018/01/08 v1.21 mathematical typesetting tools]
+ [2020/03/24 v1.24 mathematical typesetting tools]
\RequirePackage{keyval,calc}
\RequirePackage{mhsetup}[2017/03/31]
\MHInternalSyntaxOn
@@ -195,7 +196,7 @@
{ \MT_prev_tagform:n {#1} }
{ \@safe@activestrue
\@ifundefined{MT_r_\df@label}
- { \global\MH_set_boolean_F:n {manual_tag} }
+ { \global\MH_set_boolean_F:n {manual_tag} \kern1sp } % kern added 2020
{ \MT_prev_tagform:n {#1} }
\@safe@activesfalse
}
@@ -203,7 +204,7 @@
{
\@safe@activestrue
\@ifundefined{MT_r_\df@label}
- { }
+ { \kern1sp }% kern added 2020
{ \refstepcounter{equation}\MT_prev_tagform:n {#1} }
\@safe@activesfalse
}
@@ -320,11 +321,11 @@
\def\MT_leftrightarrow_fill:{%
\arrowfill@\leftarrow\relbar\rightarrow}
\providecommand*\xLeftarrow[2][]{%
- \ext@arrow 0055{\Leftarrowfill@}{#1}{#2}}
+ \ext@arrow 0055{\Leftarrowfill@}{\ #1}{\ #2}}
\providecommand*\xRightarrow[2][]{%
- \ext@arrow 0055{\Rightarrowfill@}{#1}{#2}}
+ \ext@arrow 0055{\Rightarrowfill@}{#1\ }{#2\ }}
\providecommand*\xLeftrightarrow[2][]{%
- \ext@arrow 0055{\Leftrightarrowfill@}{#1}{#2}}
+ \ext@arrow 0055{\Leftrightarrowfill@}{\ #1\ }{\ #2\ }}
\def\MT_rightharpoondown_fill:{%
\arrowfill@\relbar\relbar\rightharpoondown}
\def\MT_rightharpoonup_fill:{%
@@ -624,6 +625,37 @@
}{%
\crcr\egroup\egroup
}
+ \renewenvironment{crampedsubarray}[1]{%
+ \vcenter\bgroup
+ \Let@ \restore@math@cr \default@tag
+ \let\math@cr@@\AMS@math@cr@@ % <--- the fix
+ \baselineskip\fontdimen10 \scriptfont\tw@
+ \advance\baselineskip\fontdimen12 \scriptfont\tw@
+ \lineskip\thr@@\fontdimen8 \scriptfont\thr@@
+ \lineskiplimit\lineskip
+ \ialign\bgroup\ifx c##1\hfil\fi
+ $\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{####}$
+ \hfil\crcr
+ }{%
+ \crcr\egroup\egroup
+ }
+ % from mathtolls
+ \def\MT_smallmatrix_begin:N ##1{%
+ \Let@\restore@math@cr\default@tag
+ \let\math@cr@@\AMS@math@cr@@ % <--- the fix
+ \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip
+ \csname MT_smallmatrix_##1_begin:\endcsname
+ }
+ % from amsmath
+ \renewenvironment{smallmatrix}{\null\,\vcenter\bgroup
+ \Let@\restore@math@cr\default@tag
+ \let\math@cr@@\AMS@math@cr@@ % <--- the fix
+ \baselineskip6\ex@ \lineskip1.5\ex@ \lineskiplimit\lineskip
+ \ialign\bgroup\hfil$\m@th\scriptstyle####$\hfil&&\thickspace\hfil
+ $\m@th\scriptstyle####$\hfil\crcr
+ }{%
+ \crcr\egroup\egroup\,%
+ }
}
\newenvironment{multlined}[1][]
@@ -1447,6 +1479,20 @@
\def\MT_cramped_rlap_internal:Nn #1#2{
{}\rlap{\MT_cramped_internal:Nn #1{#2}}
}
+\newenvironment{crampedsubarray}[1]{%
+ \vcenter\bgroup
+ \Let@ \restore@math@cr \default@tag
+ \baselineskip\fontdimen10 \scriptfont\tw@
+ \advance\baselineskip\fontdimen12 \scriptfont\tw@
+ \lineskip\thr@@\fontdimen8 \scriptfont\thr@@
+ \lineskiplimit\lineskip
+ \ialign\bgroup\ifx c#1\hfil\fi
+ $\m@th\scriptstyle\kern-\nulldelimiterspace\radical\z@{##}$% <-- changed line
+ \hfil\crcr%
+}{%
+\crcr\egroup\egroup
+}
+\newcommand{\crampedsubstack}[1]{\crampedsubarray{c}#1\endcrampedsubarray}
\newcommand{\MT_prescript_inner:}[4]{
\@mathmeasure\z@#4{\MT_prescript_sup:{#1}}
\@mathmeasure\tw@#4{\MT_prescript_sub:{#2}}
@@ -1657,6 +1703,24 @@
\MaybeMHPrecedingSpacesOff
\renewcommand\aligned@a[1][c]{\start@aligned{#1}\m@ne}
\MHPrecedingSpacesOn
+\newbox\xmathstrut@box
+\newdimen\xmathstrut@dim
+\def\xmathstrut{\@dblarg\xmathstrut@}
+\def\xmathstrut@[#1]#2{%
+ \def\xmathstrut@dp{#1}%
+ \vphantom{\mathpalette\xmathstrut@do{#2}}%
+}
+\def\xmathstrut@do#1#2{%
+ \setbox\xmathstrut@box\hbox{$#1($}%)%emacs
+ \xmathstrut@dim\dimexpr\ht\xmathstrut@box+\dp\xmathstrut@box\relax
+ \ht\xmathstrut@box\dimexpr\ht\xmathstrut@box
+ +#2\xmathstrut@dim
+ \relax
+ \dp\xmathstrut@box\dimexpr\dp\xmathstrut@box
+ +\xmathstrut@dp\xmathstrut@dim
+ \relax
+ \box\xmathstrut@box}
+
\endinput
%%
%% End of file `mathtools.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mathtools/mhsetup.sty new/tex/latex/mathtools/mhsetup.sty
--- old/tex/latex/mathtools/mhsetup.sty 2017-06-06 23:53:26.000000000 +0200
+++ new/tex/latex/mathtools/mhsetup.sty 2020-03-24 21:50:35.000000000 +0100
@@ -9,7 +9,8 @@
%% This is a generated file.
%%
%% Copyright (C) 2002-2007,2010 by Morten Hoegholm
-%% Copyright (C) 2017 by Lars Madsen
+%% Copyright (C) 2017-2019 by Lars Madsen
+%% Copyright (C) 2020- by Lars Madsen, The LaTeX3 team
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -21,7 +22,8 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% This Current Maintainer of this work is Lars Madsen <daleif(a)math.au.dk>
+%% This Current Maintainer of this work is Lars Madsen
+%% <daleif(a)math.au.dk>, The LaTeX3 team https://github.com/latex3/mathtools
%%
%% This work consists of the main source file mhsetup.dtx
%% and the derived files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mathtools.tlpobj new/tlpkg/tlpobj/mathtools.tlpobj
--- old/tlpkg/tlpobj/mathtools.tlpobj 2019-02-28 03:53:18.000000000 +0100
+++ new/tlpkg/tlpobj/mathtools.tlpobj 2020-03-25 16:13:14.000000000 +0100
@@ -1,6 +1,6 @@
name mathtools
category Package
-revision 46250
+revision 54516
shortdesc Mathematical tools to use with amsmath
relocated 1
longdesc Mathtools provides a series of packages designed to enhance the
@@ -24,8 +24,8 @@
RELOC/tex/latex/mathtools/mathtools.sty
RELOC/tex/latex/mathtools/mhsetup.sty
catalogue-also mhsetup empheq
+catalogue-contact-repository https://github.com/latex3/mathtools
catalogue-ctan /macros/latex/contrib/mathtools
-catalogue-date 2018-01-08 15:01:37 +0100
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 1.21
+catalogue-version 1.24
++++++ mcf2graph.doc.tar.xz ++++++
++++ 2161 lines of diff (skipped)
++++++ mcf2graph.tar.xz ++++++
++++ 1764 lines of diff (skipped)
++++++ mcmthesis.doc.tar.xz ++++++
++++ 28330 lines of diff (skipped)
++++++ mcmthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/mcmthesis/mcmthesis.cls new/tex/latex/mcmthesis/mcmthesis.cls
--- old/tex/latex/mcmthesis/mcmthesis.cls 2019-01-26 23:57:28.000000000 +0100
+++ new/tex/latex/mcmthesis/mcmthesis.cls 2020-01-23 22:54:54.000000000 +0100
@@ -11,8 +11,9 @@
%% This is a generated file.
%%
%% Copyright (C)
-%% 2010 -- 2015 by Zhaoli Wang
-%% 2014 -- present by Liam Huang
+%% 2010 -- 2015 by Zhaoli Wang
+%% 2014 -- 2019 by Liam Huang
+%% 2019 -- present by latexstudio.net
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,9 +29,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{mcmthesis}
- [2019/01/26 v6.2.2 The Thesis Template Designed For MCM/ICM]
+ [2020/01/18 v6.3 The Thesis Template Designed For MCM/ICM]
\typeout{The Thesis Template Designed For MCM/ICM}
-\def\MCMversion{v6.2.2}
+\def\MCMversion{v6.3}
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\define@boolkey{MCM}[MCM@opt@]{CTeX}[false]{}
@@ -94,7 +95,7 @@
\RequirePackage{bmpsize}
\fi
\fi
-\RequirePackage{xcolor}
+\RequirePackage[svgnames]{xcolor}
\ifpdf
\hypersetup{hidelinks}
\else
@@ -104,7 +105,7 @@
\hypersetup{dvipdfm, hidelinks}
\fi
\fi
-\geometry{a4paper, margin = 1.2in}
+\geometry{a4paper, margin = 1in}
\pagestyle{fancy}
\fancyhf{}
\lhead{\small\sffamily \team}
@@ -164,6 +165,14 @@
\@abstract\par
}
\fi
+\newenvironment{letter}[1]{%
+ \par%
+ \bgroup\parindent0pt%
+ \begin{minipage}{5cm}
+ \flushleft #1%
+ \end{minipage}}
+ {\egroup\smallskip}
+
\def\keywordsname{Keywords}
\ifMCM@opt@CTeX
\newbox\@keywords
@@ -180,7 +189,7 @@
\@keywords\par
}
\fi
-\newcommand{\headset}{{\Large\the\year}\\MCM/ICM\\Summary Sheet}
+\newcommand{\headset}{{\the\year}\\MCM/ICM\\Summary Sheet}
\newcommand{\problem}[1]{\mcmsetup{problem = #1}}
\def\makesheet{%
\pagestyle{empty}%
@@ -189,30 +198,21 @@
\begin{center}
\begingroup
\setlength{\parindent}{0pt}
- \begin{minipage}{0.28\linewidth}
- For office use only\\[4pt]
- \makebox[0.15\linewidth][l]{T1}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
- \makebox[0.15\linewidth][l]{T2}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
- \makebox[0.15\linewidth][l]{T3}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
- \makebox[0.15\linewidth][l]{T4}\rule[-2pt]{0.85\linewidth}{0.5pt}
- \end{minipage}%
- \begin{minipage}{0.44\linewidth}
- \centering
- Team Control Number\\[0.7pc]
- {\Huge\textbf{\MCM@opt@tcn}}\\[1.8pc]
+ \begin{minipage}[t]{0.33\linewidth}
+ \bfseries\centering%
Problem Chosen\\[0.7pc]
- {\Huge\textbf{\MCM@opt@problem}}
+ {\Huge\textbf{\MCM@opt@problem}}\\[2.8pc]
+ \end{minipage}%
+ \begin{minipage}[t]{0.33\linewidth}
+ \centering%
+ \textbf{\headset}%
\end{minipage}%
- \begin{minipage}{0.28\linewidth}
- For office use only\\[4pt]
- \makebox[0.15\linewidth][l]{F1}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
- \makebox[0.15\linewidth][l]{F2}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
- \makebox[0.15\linewidth][l]{F3}\rule[-2pt]{0.85\linewidth}{0.5pt}\\[4pt]
- \makebox[0.15\linewidth][l]{F4}\rule[-2pt]{0.85\linewidth}{0.5pt}
+ \begin{minipage}[t]{0.33\linewidth}
+ \centering\bfseries%
+ Team Control Number\\[0.7pc]
+ {\Huge\textbf{\MCM@opt@tcn}}\\[2.8pc]
\end{minipage}\par
- \rule{\linewidth}{0.5pt}\par
- \textbf{\headset}%
- \par
+ \rule{\linewidth}{0.8pt}\par
\endgroup
\vskip 10pt%
\ifMCM@opt@titleinsheet
@@ -294,9 +294,27 @@
\newtheorem{Proposition}[Theorem]{Proposition}
\newtheorem{Definition}[Theorem]{Definition}
\newtheorem{Example}[Theorem]{Example}
+\renewcommand\section{\@startsection{section}{1}{\z@}%
+ {-0pt\@plus -.2ex \@minus -.2ex}%
+ {1pt \@plus .2ex}%
+ {\rmfamily\Large\bfseries}}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+ {-0pt\@plus -.2ex \@minus -.2ex}%
+ {1pt \@plus .2ex}%
+ {\rmfamily\large\bfseries}}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-.5ex\@plus -1ex \@minus -.2ex}%
+ {.25ex \@plus .2ex}%
+ {\rmfamily\normalsize\bfseries}}
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {1ex \@plus1ex \(a)minus.2ex}%
+ {-1em}%
+ {\rmfamily\normalsize}}
+
\providecommand{\dif}{\mathop{}\!\mathrm{d}}
\providecommand{\me}{\mathrm{e}}
\providecommand{\mi}{\mathrm{i}}
+
\definecolor{grey}{rgb}{0.8,0.8,0.8}
\definecolor{darkgreen}{rgb}{0,0.3,0}
\definecolor{darkblue}{rgb}{0,0,0.3}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mcmthesis.tlpobj new/tlpkg/tlpobj/mcmthesis.tlpobj
--- old/tlpkg/tlpobj/mcmthesis.tlpobj 2019-02-28 03:53:21.000000000 +0100
+++ new/tlpkg/tlpobj/mcmthesis.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,16 +1,15 @@
name mcmthesis
category Package
-revision 49825
+revision 53513
shortdesc Template designed for MCM/ICM
relocated 1
longdesc The package offers a template for MCM (The Mathematical Contest
longdesc in Modeling) and ICM (The Interdisciplinary Contest in
-longdesc Modeling).
+longdesc Modeling) for typesetting the submitted paper.
runfiles size=3
RELOC/tex/latex/mcmthesis/mcmthesis.cls
-catalogue-contact-repository https://github.com/Liam0205/mcmthesis
+catalogue-contact-home https://github.com/latexstudio-org/mcmthesis
catalogue-ctan /macros/latex/contrib/mcmthesis
-catalogue-date 2019-01-26 10:02:14 +0100
catalogue-license lppl1.3
catalogue-topics dissertation class
-catalogue-version 6.2.2
+catalogue-version 6.3
++++++ media9.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/media9/ChangeLog new/doc/latex/media9/ChangeLog
--- old/doc/latex/media9/ChangeLog 2019-02-23 00:12:42.000000000 +0100
+++ new/doc/latex/media9/ChangeLog 2020-03-25 22:11:52.000000000 +0100
@@ -1,3 +1,82 @@
+2020-03-24
+ * v1.10 : media9.sty
+ * v0.41 : pdfbase.sty
+ * fix : pdfbase.sty, dvisvgm driver: missing id and class attrs in
+ \pbs_pdfxform:nnnnn
+
+2020-03-24
+ * v1.09 : media9.sty
+ * v0.40 : pdfbase.sty
+ * fix : pdfbase.sty, dvisvgm driver: supporting latest dvisvgm-2.9.1
+ additions
+
+2020-03-23
+ * v1.08 : media9.sty
+ * v0.39 : pdfbase.sty
+ * fix : pdfbase.sty, dvisvgm driver: minor change of transform attr in
+ \pbs_pdfxform:nnnnn to cope with a dvisvgm issue
+
+2020-03-20
+ * v1.07 : media9.sty
+ * v0.38 : pdfbase.sty
+ * fix : pdfbase.sty, dvisvgm driver: transform attr in \pbs_pdfxform:nnnnn
+
+2020-03-04
+ * v1.06 : media9.sty
+ * v0.37 : pdfbase.sty
+ * fix : pdfbase.sty, dvisvgm driver: fixed behaviour of
+ \pbs_pdfrefxform:n under rotation/scaling, \pbs_pdfxform:nnnnn not changing
+ page bbox anymore
+
+2020-01-27
+ * v1.05 : media9.sty
+ * v0.36 : pdfbase.sty
+ * fix : dependency on pdftexcmds.sty removed; deprecated l3 functions
+ replaced
+
+2019-11-04
+ * v1.04 : media9.sty
+ * v0.35 : pdfbase.sty
+ * fix : output driver set-up
+
+2019-09-30
+ * v1.03 : media9.sty
+ * v0.34 : pdfbase.sty
+ * fix : expl3 functions to be deprecated in 2020
+
+2019-07-11
+ * v1.02 : media9.sty
+ * v0.33 : pdfbase.sty
+ * fix : dvipdfmx warning about off-page annotation, occuring if
+ ocgbase.sty is loaded at the same time
+
+2019-05-24
+ * v1.01 : media9.sty
+ * v0.32 : pdfbase.sty
+ * fix : pdfbase: \pbs_pdfdest:nnnn (luaTeX version)
+
+2019-05-17
+ * v1.0 : media9.sty
+ * v0.31 : pdfbase.sty
+ * fix : pdfbase: missing expansion when writing label to
+ aux file (PDF dest, dvips)
+
+2019-05-15
+ * v0.99 : media9.sty
+ * v0.30 : pdfbase.sty
+ * fix : pdfbase, dvipdfmx: missing space after dim expression in
+ \pbs_pdfxform:nnnnn
+
+2019-05-10
+ * v0.98 : media9.sty
+ * v0.29 : pdfbase.sty
+ * fix : deprecated expl3 commands replaced
+
+2019-05-02
+ * v0.97 : media9.sty
+ * v0.28 : pdfbase.sty
+ * new : pdfbase.sty: PDF Link destinations (doc level navigation)
+
2019-02-21
* v0.96 : media9.sty
* v0.27 : pdfbase.sty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/media9/README.txt new/doc/latex/media9/README.txt
--- old/doc/latex/media9/README.txt 2019-01-02 23:37:03.000000000 +0100
+++ new/doc/latex/media9/README.txt 2019-05-11 23:31:47.000000000 +0200
@@ -30,6 +30,7 @@
Requirements:
+Recent versions of
* l3kernel (LaTeX package), version >=2012/07/16
* l3packages (LaTeX package), version >=2012/07/16
* pdfTeX, version >=1.30
Binary files old/doc/latex/media9/media9.pdf and new/doc/latex/media9/media9.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/media9.doc.tlpobj new/tlpkg/tlpobj/media9.doc.tlpobj
--- old/tlpkg/tlpobj/media9.doc.tlpobj 2019-02-28 03:53:24.000000000 +0100
+++ new/tlpkg/tlpobj/media9.doc.tlpobj 2020-03-26 01:56:08.000000000 +0100
@@ -1,9 +1,9 @@
name media9.doc
category Package
-revision 50089
+revision 54554
shortdesc doc files of media9
relocated 1
-docfiles size=920
+docfiles size=915
RELOC/doc/latex/media9/ChangeLog
RELOC/doc/latex/media9/README.txt
RELOC/doc/latex/media9/media9.pdf
++++++ media9.tar.xz ++++++
++++ 1708 lines of diff (skipped)
++++++ memoir.doc.tar.xz ++++++
++++ 2208 lines of diff (skipped)
++++++ memoir.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/memoir/mem9.clo new/tex/latex/memoir/mem9.clo
--- old/tex/latex/memoir/mem9.clo 2018-04-05 23:10:27.000000000 +0200
+++ new/tex/latex/memoir/mem9.clo 2019-11-21 22:48:59.000000000 +0100
@@ -27,7 +27,7 @@
%% This work consists of the files listed in the README file.
%%
\ProvidesFile{mem9.clo}%
- [2008/01/30 v0.4 memoir class 9pt size option]
+ [2008/01/30 v0.4 memoir class 9pt size option]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@ixpt\@xpt
\abovedisplayskip 9\p@ \@plus 2\p@ \@minus 4.5\p@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/memoir/memhfixc.sty new/tex/latex/memoir/memhfixc.sty
--- old/tex/latex/memoir/memhfixc.sty 2018-04-05 23:10:27.000000000 +0200
+++ new/tex/latex/memoir/memhfixc.sty 2019-11-15 22:40:34.000000000 +0100
@@ -41,6 +41,7 @@
%% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15
%% or later, memhfixc will be automatically loaded after hyperref.
%%
+%% Version 1.18 2019/10/24
%% Version 1.17 2013/05/30
%% Version 1.16 2013/05/16
%% Version 1.15 2010/08/17
@@ -60,7 +61,7 @@
%% Version 1.1 2003/01/22
%% Version 1.0 2002/10/22
%%
-\ProvidesPackage{memhfixc}[2013/05/30 v1.17 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2019/10/24 v1.18 nameref/hyperref package fixes for memoir class]
\let\M@hfixcfinish\relax
\@ifclassloaded{memoir}{}%
{\let\M@hfixcfinish\endinput
@@ -250,6 +251,7 @@
\setcounter{memhycontfloat}{0}
\renewcommand{\contcaption}{%
+ \par%
\refstepcounter{memhycontfloat}%
\addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}%
\@contcaption\@captype}
@@ -350,6 +352,19 @@
\@namedef{mem@pnmm@end@hook}{\hyper@linkend}
\fi
+\AtEndPackage{hypcap}{%
+ \long\def\@@contcaption##1##2{%
+ \par
+ \begingroup
+ \@parboxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \global\@capstartfalse% added
+ \normalsize
+ \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##2}\par
+ \endgroup}
+}
\endinput
%%
%% End of file `memhfixc.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/memoir/memoir.cls new/tex/latex/memoir/memoir.cls
--- old/tex/latex/memoir/memoir.cls 2018-12-12 22:24:10.000000000 +0100
+++ new/tex/latex/memoir/memoir.cls 2020-03-25 22:12:10.000000000 +0100
@@ -28,8 +28,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{memoir}%
- [2018/12/12 v3.7h configurable book, report, article document class]
-\newcommand\memversion{v3.7h, 2018/12/12}
+ [2020/03/25 v3.7k configurable book, report, article document class]
+\newcommand\memversion{v3.7k, 2020/03/25}
\newcommand*{\@ptsize}{}
\newcommand*{\@memptsize}{}
\newlength{\onelineskip}
@@ -135,12 +135,26 @@
\@namelet{ver@#1.\@pkgextension}\relax}
\@onlypreamble\DisemulatePackage
+\ifcsname InputIfFileExists \endcsname% looking for an explicit space
+ % here aka the robust version
+ \DeclareRobustCommand \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{\InputIfFileExists}[2]{%
\IfFileExists{#1}%
{#2\@addtofilelist{#1}\m@matbeginf{#1}%
\@@input \@filef@und
\m@matendf{#1}%
\killm@matf{#1}}}
+\fi
\newcommand{\m@matbeginf}[1]{\@ifundefined{#1-m@mfb}{}%
{\@nameuse{#1-m@mfb}}}
@@ -217,11 +231,7 @@
\newcommand{\cmd}[1]{\cmdprint{#1}%
\index{\expandafter\@gobble\string#1?\string\cmdprint{\string#1}}}
-\RequirePackage{ifpdf}[2017/03/15]
-\RequirePackage{ifetex}
-\RequirePackage{ifxetex}[2010/09/12]
-\RequirePackage{ifluatex}[2016/05/16]
-
+\RequirePackage{iftex}[2019/11/07]
\edef\wo@dmacro{%
\string m\string a\string c\string r\string o\string :%
}
@@ -406,6 +416,7 @@
\newcommand*{\stockaiv} {\stockheight=297mm \stockwidth=210mm}
\newcommand*{\stockav} {\stockheight=210mm \stockwidth=148mm}
\newcommand*{\stockavi} {\stockheight=148mm \stockwidth=105mm}
+\newcommand*{\stockavii}{\stockheight=105mm \stockwidth=74mm}
\newcommand*{\stockbo} {\stockheight=1414mm \stockwidth=1000mm}
\newcommand*{\stockbi} {\stockheight=1000mm \stockwidth=707mm}
@@ -414,6 +425,7 @@
\newcommand*{\stockbiv} {\stockheight=353mm \stockwidth=250mm}
\newcommand*{\stockbv} {\stockheight=250mm \stockwidth=176mm}
\newcommand*{\stockbvi} {\stockheight=176mm \stockwidth=125mm}
+\newcommand*{\stockbvii}{\stockheight=125mm \stockwidth=88mm}
\newcommand*{\pagedbill} {\paperheight=7in \paperwidth=3in}
\newcommand*{\pagestatement} {\paperheight=8.5in \paperwidth=5.5in}
@@ -450,6 +462,7 @@
\newcommand*{\pageaiv} {\paperheight=297mm \paperwidth=210mm}
\newcommand*{\pageav} {\paperheight=210mm \paperwidth=148mm}
\newcommand*{\pageavi} {\paperheight=148mm \paperwidth=105mm}
+\newcommand*{\pageavii}{\paperheight=105mm \paperwidth=74mm}
\newcommand*{\pagebo} {\paperheight=1414mm \paperwidth=1000mm}
\newcommand*{\pagebi} {\paperheight=1000mm \paperwidth=707mm}
@@ -458,6 +471,7 @@
\newcommand*{\pagebiv} {\paperheight=353mm \paperwidth=250mm}
\newcommand*{\pagebv} {\paperheight=250mm \paperwidth=176mm}
\newcommand*{\pagebvi} {\paperheight=176mm \paperwidth=125mm}
+\newcommand*{\pagebvii}{\paperheight=125mm \paperwidth=88mm}
\DeclareOption{a0paper}{\stockao}
\DeclareOption{a1paper}{\stockai}
@@ -466,6 +480,7 @@
\DeclareOption{a4paper}{\stockaiv}
\DeclareOption{a5paper}{\stockav}
\DeclareOption{a6paper}{\stockavi}
+\DeclareOption{a7paper}{\stockavii}
\DeclareOption{b0paper}{\stockbo}
\DeclareOption{b1paper}{\stockbi}
\DeclareOption{b2paper}{\stockbii}
@@ -473,6 +488,7 @@
\DeclareOption{b4paper}{\stockbiv}
\DeclareOption{b5paper}{\stockbv}
\DeclareOption{b6paper}{\stockbvi}
+\DeclareOption{b7paper}{\stockbvii}
\DeclareOption{mcrownvopaper}{\stockmcrownvo}
\DeclareOption{mlargecrownvopaper}{\stockmlargecrownvo}
\DeclareOption{mdemyvopaper}{\stockmdemyvo}
@@ -1361,6 +1377,7 @@
}
\AtBeginDocument{\mem@fixpagelayout}
+\let\refixpagelayout\mem@fixpagelayout
\newcommand*{\fixpdflayout}{%
\ClassWarning{memoir}{As of 2018, \string\fixpdflayout\ is no longer used}
@@ -1472,6 +1489,7 @@
\advance\trimtop -0.5\trimtop
\trimedge=\stockwidth \advance\trimedge -\paperwidth
\advance\trimedge -0.5\trimedge}
+\let\setpagemm\setpagecc
\setcounter{topnumber}{3}
\renewcommand{\topfraction}{.85}
@@ -1857,22 +1875,55 @@
\fi}
\newcommand\createmark[5]{%
- \def\@tempa{00}
+ % \def\@tempa{00}
+ % \nametest{#3}{nonumber}%
+ % \ifsamename
+ % \def\@tempa{01}%
+ % \else
+ % \nametest{#3}{shownumber}
+ % \ifsamename\else
+ % \@memerror{Unknown numbering value `#3' for #1mark}%
+ % {I expected `shownumber' or `nonumber'.\MessageBreak
+ % I will assume you meant `shownumber'}%
+ % \fi
+ % \fi
+ % \expandafter\if\@tempa% compares the two \@tempa digits
+ % \@namedef{#1marksn}##1{##1}%
+ % \else
+ % \@namedef{#1marksn}{\@gobble}%
+ % \fi
+ \def\@tempa{1}
\nametest{#3}{nonumber}%
\ifsamename
- \def\@tempa{01}%
+ \def\@tempa{0}
\else
\nametest{#3}{shownumber}
- \ifsamename\else
- \@memerror{Unknown numbering value `#3' for #1mark}%
- {I expected `shownumber' or `nonumber'.\MessageBreak
- I will assume you meant `shownumber'}%
+ \ifsamename
+ \def\@tempa{1}
+ \else
+ \nametest{#3}{notitle}
+ \ifsamename
+ \def\@tempa{2}
+ \else
+ \@memerror{Unknown numbering value `#3' for
+ #1mark,\MessageBreak
+ please use one of 'shownumber', 'nonumber' or 'notitle'}%
+ {I expected `shownumber', `nonumber' or 'notitle'.\MessageBreak
+ I will assume you meant `shownumber'}%
+ \fi
\fi
\fi
- \expandafter\if\@tempa% compares the two \@tempa digits
- \@namedef{#1marksn}##1{##1}%
- \else
+ \@namedef{#1markst}##1{##1}
+ \ifcase\@tempa\relax
+ % nonumber
\@namedef{#1marksn}{\@gobble}%
+ \or % 1
+ % shownumber
+ \@namedef{#1marksn}##1{##1}
+ \or % 2, 2 implies shownumber
+ % shownumber
+ \@namedef{#1marksn}##1{##1}
+ \@namedef{#1markst}{\@gobble}
\fi
\nametest{#2}{left}%
\ifsamename
@@ -1886,7 +1937,11 @@
\@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
\fi
\fi
- ##1}}{}}%
+ \@nameuse{#1markst}{##1}%
+ }%
+ }%
+ {}% just left
+ }%
\else
\nametest{#2}{right}
\ifsamename
@@ -1900,7 +1955,10 @@
\@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
\fi%
\fi%
- ##1}}}%
+ \@nameuse{#1markst}{##1}%
+ }%
+ }%
+ }%
\else
\nametest{#2}{both}%
\ifsamename\else
@@ -1919,16 +1977,22 @@
\@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
\fi
\fi
- ##1}}{%
+ \@nameuse{#1markst}{##1}%
+ }%
+ }{%
\memUChead{%
\ifnum \c@secnumdepth > \c@@memmarkcntra
\if@mainmatter
\@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
\fi
\fi
- ##1}}}%
+ \@nameuse{#1markst}{##1}%
+ }%
+ }%
+ }%
\fi
- \fi}
+ \fi
+}
\newcommand\addtopsmarks[3]{%
\mem@ps@safe@change{#1}%
@@ -5954,6 +6018,7 @@
\ifx\longtable\undefined
\let\@BTswitch\@BTnormal
\else\ifx\hline\LT@hline
+ \nobreak
\let\@BTswitch\@BLTrule
\else
\let\@BTswitch\@BTnormal
@@ -6817,6 +6882,7 @@
\@contbotsubtrue
\newcommand{\subcaption}{%
+ \par
\bgroup
\let\label=\memsub@label
\ifdonemaincaption\else
@@ -6859,6 +6925,9 @@
{\@memsubcap{sub\@captype}[\@empty]}}
\newenvironment{subfloat}{}{}
+\newcommand\mem@step@subcounter{%
+ \refstepcounter{sub\@captype}\@contkeep%
+}
\newcommand{\subbottom}{%
\@contbotsubtrue
\@memsubbody}
@@ -6869,7 +6938,7 @@
\ifdonemaincaption\else
\advance\csname c@\@captype\endcsname\@ne
\fi
- \refstepcounter{sub\@captype}\@contkeep%
+ % \refstepcounter{sub\@captype}\@contkeep%
\leavevmode
\@ifnextchar [%
{\@memsubfig}%
@@ -6883,7 +6952,7 @@
\bgroup
\let\label=\memsub@label
\@contset
- \refstepcounter{sub\@captype}\@contkeep%
+ % \refstepcounter{sub\@captype}\@contkeep%
\leavevmode
\@ifnextchar [%
{\@memsubfig}%
@@ -6924,7 +6993,8 @@
\fi
\setbox\@tempboxa \hbox{#4}%
\@tempdima=\wd\@tempboxa
- \vtop\bgroup
+ \vbox\bgroup%
+ \mem@step@subcounter%
\vbox\bgroup
\ifcase\@tempcnta
\@minipagefalse
@@ -7064,10 +7134,12 @@
\@esphack}
}{}%
}% end no nameref
- \@ifpackageloaded{showkeys}{%
- \renewcommand\sf@@memsub@label@hook[1]{%
- \SK@\SK@@label{#1}%
- }
+ \@ifpackageloaded{showkeys}{%
+ \ifdefined\SK@\relax
+ \renewcommand\sf@@memsub@label@hook[1]{%
+ \SK@\SK@@label{#1}%
+ }
+ \fi
}{}
} % end AtBeginDocument
@@ -7694,13 +7766,13 @@
\ensureonecol
\par
\begingroup
- \@nameuse{@#2maketitle}
+ \phantomsection
\if##1
\ifmem@em@starred@listof\else
- \phantomsection
\addcontentsline{toc}{chapter}{#3}
\fi
\fi
+ \@nameuse{@#2maketitle}
\parskip\cftparskip
\@nameuse{cft#2beforelisthook}%
\@starttoc{#2}%
@@ -8467,7 +8539,8 @@
\AtBeginDocument{%
\def\@@@wrindexm@m#1#2{%
\if@filesw
- \immediate\write \@idxfile{\string\indexentry{#1}{#2}}%
+ %\immediate\write \@idxfile{\string\indexentry{#1}{#2}}%
+ \immediate@protected@write\@idxfile{}{\string\indexentry{#1}{#2}}%
\fi
\endgroup}%
}
@@ -8721,9 +8794,11 @@
\newcommand{\memwritetoglo}[5]{\endgroup}
\newcommand{\@ctualm@mwritetoglo}[5]{%
- \immediate\write \memglofile{\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
- {\string\memgloterm{#2}}{\string\memglodesc{#3}}
- {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
+ %\immediate\write \memglofile%
+ \immediate@protected@write\memglofile{}%
+ {\string\glossaryentry{#1\@nameuse{memglsact\m@mgf}
+ {\string\memgloterm{#2}}{\string\memglodesc{#3}}
+ {\string\memgloref{#4}}\@nameuse{memglsnf\m@mgf}}{#5}}%
\endgroup}
\AtBeginDocument{%
\let\memwritetoglo\@ctualm@mwritetoglo}
@@ -9362,7 +9437,7 @@
\m@makefootfootmark{#1}% -> \footfootmark#1
\m@makemakefootmark{#1}% -> \makefootmark#1
\m@makefootmarkstyle{#1}% -> \footmarkstyle#1
- \@namedef{@makefntext#1}##1{\@nameuse{makefootmark#1} ##1}%
+ \@namelongdef{@makefntext#1}##1{\@nameuse{makefootmark#1} ##1}%
\m@make@footstart{#1}% -> \@footstart#1
\m@make@footgroup{#1}% -> \@footgroup#1
\expandafter\newinsert\csname @mpfootins#1\endcsname% -> \@mpfootins#1
@@ -10473,17 +10548,19 @@
\typeout{Writing note file \jobname.ent}%
\let\makepagenote\@empty}
-\newcommand{\immediate@protected@write}[3]{%
+\providecommand{\immediate@protected@write}[3]{%
\begingroup
#2%
\let\protect\@unexpandable@protect
- \edef\reserved@a{\immediate\write#1{#3}}%
- \reserved@a
+ %\edef\reserved@a{\immediate\write#1{#3}}%
+ %\reserved@a
+ \immediate\write#1{#3}%
\endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi}
+ %\if@nobreak\ifvmode\nobreak\fi\fi%
+}
\newcommand{\m@m@pnwrite}[3]{\immediate\write#1{#3}}
-\newcommand{\m@m@pnwrited}[3]{\immediate\write#1{\detokenize{#3}}}
+\newcommand{\m@m@pnwrited}[3]{\immediate\write#1{\detokenize{#3}\@percentchar}}
\newcommand*{\pnchap}{\f@rtoc}
\newcommand*{\pnschap}{\f@rbdy}
@@ -10514,7 +10591,7 @@
\m@mmf@prepare% rerun
\fi%
\mem@pn@multiple@marker{\notenumintext{\thepagenote}}%
- }{}%
+ }{\m@mmf@prepare}%
\fi%
\ifm@mpn@new@chap%
\global\m@mpn@new@chapfalse%
@@ -12843,44 +12920,61 @@
\AtEndDocument{\@memensuresigpages}
-%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
-\def\@uclcnotmath#1#2#3#4{\begingroup
- #1%
+\expandafter\let\csname MemOrigMakeUppercase \expandafter\endcsname
+ \csname MakeUppercase \endcsname
+\expandafter\let\csname MemOrigMakeLowercase \expandafter\endcsname
+ \csname MakeLowercase \endcsname
+\def\MemRestoreOrigMakecase{
+ \expandafter\let\csname MakeUppercase \expandafter\endcsname
+ \csname MemOrigMakeUppercase \endcsname
+ \expandafter\let\csname MakeLowercase \expandafter\endcsname
+ \csname MemOrigMakeLowercase \endcsname
+}
+\IfFileExists{textcase.sty}{
+ \RequirePackage[overload]{textcase}
+ }{% resort to the
+ \@memwarn{Haven't found the textcase package,\MessageBreak resorting to embedded
+ copy of v0.07 (2004/10/07),\MessageBreak consider installing the textcase package}
+%%%% Nearly a carbon copy from textcase.dtx by David Carlisle
+%%%% Since we are inside a \IfFileExists we need to double the #/daleif
+\def\@uclcnotmath##1##2##3##4{\begingroup
+ ##1%
\def\({$}\let\)\(% $ for emacs :-)
- \def\NoCaseChange##1{\noexpand\NoCaseChange{\noexpand##1}}%
+ \def\NoCaseChange####1{\noexpand\NoCaseChange{\noexpand####1}}%
\@nonchangecase\label
\@nonchangecase\ref
\@nonchangecase\ensuremath
- \def\cite##1##{\toks@{\noexpand\cite##1}\@citex}%
- \def\@citex##1{\NoCaseChange{\the\toks@{##1}}}%
- \def\reserved@a##1##2{\let#2\reserved@a}%
+ \def\cite####1####{\toks@{\noexpand\cite####1}\@citex}%
+ \def\@citex####1{\NoCaseChange{\the\toks@{####1}}}%
+ \def\reserved@a####1####2{\let##2\reserved@a}%
\expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}%
\protected@edef\reserved@a{\endgroup
- \noexpand\@skipmath#3#4$\valign$}%
+ \noexpand\@skipmath##3##4$\valign$}%
\reserved@a}
-\def\@nonchangecase#1{\def#1##1{\NoCaseChange{#1{##1}}}}
+\def\@nonchangecase##1{\def##1####1{\NoCaseChange{##1{####1}}}}
\let\NoCaseChange\@firstofone
-\def\@skipmath#1#2$#3${%
- \@skip@nonchangecase#1#2\NoCaseChange\valign
- \ifx\valign#3%
- \else
- $#3$%
- \expandafter\@skipmath\expandafter#1%
- \fi}
-\def\@skip@nonchangecase#1#2\NoCaseChange#3{%
- #1{#2}%
- \ifx\valign#3%
+\def\@skipmath##1##2$##3${%
+ \@skip@nonchangecase##1##2\NoCaseChange\valign
+ \ifx\valign##3%
+ \else
+ $##3$%
+ \expandafter\@skipmath\expandafter##1%
+ \fi}
+\def\@skip@nonchangecase##1##2\NoCaseChange##3{%
+ ##1{##2}%
+ \ifx\valign##3%
\else
- #3%
- \expandafter\@skip@nonchangecase\expandafter#1%
+ ##3%
+ \expandafter\@skip@nonchangecase\expandafter##1%
\fi}
\DeclareRobustCommand\MakeTextUppercase{%
- \@uclcnotmath{\def\i{I}\def\j{J}}{##1##2}\uppercase}
-\protected@edef\MakeTextUppercase#1{\MakeTextUppercase{#1}}
+ \@uclcnotmath{\def\i{I}\def\j{J}}{####1####2}\uppercase}
+\protected@edef\MakeTextUppercase##1{\MakeTextUppercase{##1}}
\DeclareRobustCommand\MakeTextLowercase{%
- \@uclcnotmath{}{##2##1}\lowercase}
-\protected@edef\MakeTextLowercase#1{\MakeTextLowercase{#1}}
+ \@uclcnotmath{}{####2####1}\lowercase}
+\protected@edef\MakeTextLowercase##1{\MakeTextLowercase{##1}}
%%%% End copy from textcase.dtx
+} % end of \IfFileExists
\newcommand*{\abstractname}{Abstract}
\newcommand*{\contentsname}{Contents}
\newcommand*{\listfigurename}{List of Figures}
@@ -12912,13 +13006,6 @@
\space\number\day, \number\year}
\setlength\columnsep{10\p@}
\setlength\columnseprule{0\p@}
-\ifartopt
-\pagestyle{plain}
-\else
-\pagestyle{headings}
-\fi
-\pagenumbering{arabic}
-
\setcounter{part}{0}
\setcounter{chapter}{0}
\setcounter{tocdepth}{1}
@@ -13056,12 +13143,12 @@
%%% revert changes to captioning macros if the caption package is used.
\AtBeginPackage{caption}{
\ClassWarningNoLine{memoir}{%
- You are using the caption package with the memoir class.
- To prepare we will now reset all captioning macros and
- configurations to kernel defaults, and then let the
- caption package take over. Please remember to use^^J
- the caption package interfaces in order to^^J
- configure your captions}
+ For the caption package to function properly with memoir,
+ we will now reset\string\caption\space and friends to
+ kernel defaults and then let the caption package take over.
+ Remember: all caption configuration now goves via the caption
+ package interface, not the interface from the memoir class.
+ }
\long\def\@makecaption##1##2{%
\vskip\abovecaptionskip
@@ -13106,6 +13193,14 @@
\AtBeginPackage{float}{\let\newfloat\relax}
+\ifartopt
+\pagestyle{plain}
+\else
+\pagestyle{headings}
+\fi
+\pagenumbering{arabic}
+
+
\endinput
%%
%% End of file `memoir.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/memoir.tlpobj new/tlpkg/tlpobj/memoir.tlpobj
--- old/tlpkg/tlpobj/memoir.tlpobj 2019-02-28 03:53:29.000000000 +0100
+++ new/tlpkg/tlpobj/memoir.tlpobj 2020-03-26 01:56:12.000000000 +0100
@@ -1,6 +1,6 @@
name memoir
category Package
-revision 49394
+revision 54554
shortdesc Typeset fiction, non-fiction and mathematical books
relocated 1
longdesc The memoir class is for typesetting poetry, fiction,
@@ -15,7 +15,7 @@
longdesc memhfixc package (part of this bundle). Note, however, that any
longdesc current version of hyperref actually loads the package
longdesc automatically if it detects that it is running under memoir.
-runfiles size=119
+runfiles size=120
RELOC/makeindex/memoir/basic.gst
RELOC/tex/latex/memoir/mem10.clo
RELOC/tex/latex/memoir/mem11.clo
@@ -33,7 +33,6 @@
RELOC/tex/latex/memoir/memoir.cls
catalogue-also memdesign
catalogue-ctan /macros/latex/contrib/memoir
-catalogue-date 2018-12-12 17:35:45 +0100
catalogue-license lppl1.3
catalogue-topics book-pub class
-catalogue-version 3.7h
+catalogue-version 3.7k
1
0
Hello community,
here is the log from the commit of package texlive-specs-n for openSUSE:Factory checked in at 2020-05-29 21:18:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-n (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-n"
Fri May 29 21:18:19 2020 rev:39 rq:806901 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-n/texlive-specs-n.changes 2019-11-07 23:11:22.848196610 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606/texlive-specs-n.changes 2020-05-29 21:29:31.129246384 +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:
----
latino-sine-flexione.doc.tar.xz
latino-sine-flexione.tar.xz
letltxmacro.doc.tar.xz
letltxmacro.tar.xz
letterspacing.tar.xz
letterswitharrows.doc.tar.xz
letterswitharrows.tar.xz
lexend.doc.tar.xz
lexend.tar.xz
librefranklin.doc.tar.xz
librefranklin.tar.xz
lie-hasse.doc.tar.xz
lie-hasse.tar.xz
linguisticspro.doc.tar.xz
linguisticspro.tar.xz
listingsutf8.doc.tar.xz
listingsutf8.tar.xz
logix.doc.tar.xz
logix.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-n.spec ++++++
++++ 19709 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-n/texlive-specs-n.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606/texlive-specs-n.spec
++++++ latex2nemeth.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latex2nemeth/README new/texmf-dist/doc/support/latex2nemeth/README
--- old/texmf-dist/doc/support/latex2nemeth/README 2017-11-28 23:15:08.000000000 +0100
+++ new/texmf-dist/doc/support/latex2nemeth/README 2020-03-18 22:17:45.000000000 +0100
@@ -1,6 +1,16 @@
Latex2Nemeth
============
-Version 1.0.1
+Version 1.0.2
+
+====================================
+
+New addition in this version (compared to 1.0.1)
+is basic macro support. The program supports
+simple replacement commands (such as \newcommand{}{})
+and commands with optional arguments
+(such as \newcommand{\inner}[2]{\langle#1,#2\rangle}).
+
+=====================================
This is the source tree for Latex2Nemeth, a tool for translating TeX files to Braille.
@@ -13,7 +23,7 @@
Licence
-------
-Copyright 2016-2017 by Andreas Papasalοuros, Antonis Tsolomitis.
+Copyright 2016-2020 by Andreas Papasalοuros, Antonis Tsolomitis.
This program is distributed under the GPL, version 3 or later. Please see the COPYING file for details.
@@ -53,7 +63,7 @@
-----
After compiling the tool the executable `jar` will be located in the `target/` directory,
-e.g. `target/latex2nemeth-v1.0.1.jar`.
+e.g. `target/latex2nemeth-v1.0.2.jar`.
A simple to way to run the tool is
@@ -69,13 +79,13 @@
**Examples**
A simple example:
- java -jar target/latex2nemeth-v1.0.1.jar src/test/resources/com/latex2nemeth/bootstrap/mathtest.tex src/test/resources/com/latex2nemeth/bootstrap/mathtest.aux
+ java -jar target/latex2nemeth-v1.0.2.jar src/test/resources/com/latex2nemeth/bootstrap/mathtest.tex src/test/resources/com/latex2nemeth/bootstrap/mathtest.aux
A more complicated example:
- java -jar target/latex2nemeth-v1.0.1.jar src/test/resources/com/latex2nemeth/bootstrap/mathtest.tex src/test/resources/com/latex2nemeth/bootstrap/mathtest.aux -o ch -m nemeth -e src/test/resources/com/latex2nemeth/bootstrap/nemeth.json
+ java -jar target/latex2nemeth-v1.0.2.jar src/test/resources/com/latex2nemeth/bootstrap/mathtest.tex src/test/resources/com/latex2nemeth/bootstrap/mathtest.aux -o ch -m nemeth -e src/test/resources/com/latex2nemeth/bootstrap/nemeth.json
An example with pictures:
- java -jar target/latex2nemeth-v1.0.1.jar src/test/resources/com/latex2nemeth/bootstrap/mathpics.tex src/test/resources/com/latex2nemeth/bootstrap/mathpics.aux
+ java -jar target/latex2nemeth-v1.0.2.jar src/test/resources/com/latex2nemeth/bootstrap/mathpics.tex src/test/resources/com/latex2nemeth/bootstrap/mathpics.aux
**Notes**
-------------
@@ -85,7 +95,7 @@
iconv -f iso8859-7 -t utf-8 source.tex > source-utf8.tex
- or using your editor. Now run "java -jar latex2nemeth-v1.0.1.jar" as above with
+ or using your editor. Now run "java -jar latex2nemeth-v1.0.2.jar" as above with
source-utf8.tex as the tex file and source.aux as the aux file. If errors are
produced you need to modify the source-utf8.tex at the line indicated.
Usually the errors have to do either with non supported shortcuts for macros
@@ -119,7 +129,7 @@
6. It is possible to translate TeX files using different Braille alphabets. A different Braille alphabet
is encoded in a JSON file. For example, in order to translate a texfile into polytonic Greek, the command is as follows:
- java -jar latex2nemeth-v1.0.1.jar texfile.tex auxfile.aux -e /path/to/polytonic.json
+ java -jar latex2nemeth-v1.0.2.jar texfile.tex auxfile.aux -e /path/to/polytonic.json
Please report issues related to erratic output to a n d p a p a s [AT] a e g e a n . g r
and issues related to the tex file handling/modifying to a n t o n i s . t s o l o m i t i s [AT] g m a i l . c o m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex2nemeth.doc.tlpobj new/tlpkg/tlpobj/latex2nemeth.doc.tlpobj
--- old/tlpkg/tlpobj/latex2nemeth.doc.tlpobj 2019-02-28 03:48:02.000000000 +0100
+++ new/tlpkg/tlpobj/latex2nemeth.doc.tlpobj 2020-03-19 01:54:36.000000000 +0100
@@ -1,6 +1,6 @@
name latex2nemeth.doc
category Package
-revision 45934
+revision 54389
shortdesc doc files of latex2nemeth
docfiles size=42
texmf-dist/doc/support/latex2nemeth/README
++++++ latex2nemeth.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-n/latex2nemeth.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606/latex2nemeth.tar.xz differ: char 26, line 1
++++++ latexbug.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/latexbug/changes.txt new/doc/latex/latexbug/changes.txt
--- old/doc/latex/latexbug/changes.txt 2019-01-01 23:51:12.000000000 +0100
+++ new/doc/latex/latexbug/changes.txt 2019-09-14 23:44:33.000000000 +0200
@@ -1,3 +1,7 @@
+2019-09-13 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * latexbug.dtx: added rotating.sty (graphics)
+
2018-12-31 <Frank.Mittelbach(a)latex-project.org>
* latexbug.dtx:
Binary files old/doc/latex/latexbug/latexbug.pdf and new/doc/latex/latexbug/latexbug.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexbug.doc.tlpobj new/tlpkg/tlpobj/latexbug.doc.tlpobj
--- old/tlpkg/tlpobj/latexbug.doc.tlpobj 2019-02-28 03:48:08.000000000 +0100
+++ new/tlpkg/tlpobj/latexbug.doc.tlpobj 2019-10-17 01:54:27.000000000 +0200
@@ -1,6 +1,6 @@
name latexbug.doc
category Package
-revision 49573
+revision 52414
shortdesc doc files of latexbug
relocated 1
docfiles size=48
++++++ latexbug.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latexbug/latexbug.sty new/tex/latex/latexbug/latexbug.sty
--- old/tex/latex/latexbug/latexbug.sty 2019-01-01 23:51:12.000000000 +0100
+++ new/tex/latex/latexbug/latexbug.sty 2019-10-16 22:56:55.000000000 +0200
@@ -30,7 +30,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{latexbug}[2018/12/31 v1.0e Bug-classification]
+\ProvidesPackage{latexbug}[2019/10/15 v1.0g Bug-classification]
\def\latexbug@empty{}
\def\latexbug@us{us}
\def\latexbug@usstar{us*}
@@ -317,6 +317,7 @@
pctexwin.def = us ,
pdftex.def = us ,
pdftex.def = us ,
+rotating.sty = us ,
tcidvi.def = us ,
trig.sty = us ,
truetex.def = us ,
@@ -471,8 +472,24 @@
xgalley.sty = us* ,
l3keys2e.sty = us* ,
expl3-code.tex = ignore ,
+l3deprecation.def = ignore ,
+l3backend-dvipdfmx.def = ignore ,
+l3backend-dvips.def = ignore ,
+l3backend-dvisvgm.def = ignore ,
+l3backend-pdfmode.def = ignore ,
+l3backend-xdvipdfmx.def = ignore ,
+hluatex.def = ignore ,
+hpdftex.def = ignore ,
+hxetex.def = ignore ,
+hyperref.cfg = ignore ,
+hyperref.sty = LaTeX Team
+ \Contact https://github.com/latex3/hyperref/issues ,
+pd1enc.def = ignore ,
+puenc.def = ignore ,
blindtext.sty = ignore ,
etoolbox.sty = ignore ,
+kantlipsum.sty = ignore ,
+lipsum.ltd = ignore ,
lipsum.sty = ignore ,
beamer.cls = Joseph Wright
\Contact https://github.com/josephwright/beamer/issues ,
@@ -480,23 +497,15 @@
\Contact https://github.com/wspr/fontspec/issues ,
geometry.sty = Hideo Umeki
\Contact <latexgeometry [at] gmail [dot] com> ,
-hpdftex.def = ignore ,
-hluatex.def = ignore ,
-hxetex.def = ignore ,
-hyperref.cfg = ignore ,
-hyperref.sty = Heiko Oberdiek
- \Contact https://github.com/ho-tex/hyperref/issues ,
luatex85.sty = Joseph Wright
\Contact https://github.com/josephwright/luatex85/issues ,
-pd1enc.def = ignore ,
-puenc.def = ignore ,
siunitx.sty = Joseph Wright
\Contact https://github.com/josephwright/siunitx/issues ,
basque.ldf = Juan M. Aguirregabiria
\Contact <http://tp.lc.ehu.es/jma.html> ,
belarusian.ldf = Aleksey Novodvorsky, Andrew Shadura
\Contact <andrew [at] shadura [dot] me> ,
-bosnian.ldf = Samir Halilcevic %% Halil^^c4^^8devi^^c4^^87
+bosnian.ldf = Samir Halilcevic %% Halilčević
\Contact <samir [dot] halilcevic [at] fet [dot] ba> ,
bulgarian.ldf = Georgi N. Boshnakov
\Contact <Georgi Boshnakov [at] manchester [dot] ac [dot] uk> ,
@@ -528,7 +537,7 @@
\Contact <juergen [at] spitzmueller [dot] org> ,
greek.ldf = Guenter Milde
\Contact <milde [at] users [dot] sf [dot] net> ,
-magyar.ldf = Peter Szabo %% P^^c3^^a9ter Szab^^c3^^b3
+magyar.ldf = Peter Szabo %% Péter Szabó
\Contact <http://www.math.bme.hu/latex/> ,
italian.ldf = Claudio Beccari
\Contact <claudio [dot] beccari [at] gmail [dot] com> ,
@@ -538,7 +547,7 @@
\Contact <claudio [dot] beccari [at] gmail [dot] com> ,
macedonian.ldf = Stojan Trajanovski
\Contact <stojan [dot] trajanovski [at] gmail [dot] com> ,
-occitan.ldf = Cedric Valmary %% C^^c3^^a9dric Valmary
+occitan.ldf = Cedric Valmary %% Cédric Valmary
\Contact <cvalmary [at] yahoo [dot] fr> ,
piedmontese.ldf = Claudio Beccari
\Contact <claudio [dot] beccari [at] gmail [dot] com> ,
@@ -557,7 +566,7 @@
thaicjk.ldf = Werner Lemberg
\Contact <wl [at] gnu [dot] org> ,
ukraineb.ldf = Sergiy Ponomarenko
- \Contact <sergiy [dot] pono^^c2^^admarenko [at] gmail [dot] com> ,
+ \Contact <sergiy [dot] ponomarenko [at] gmail [dot] com> ,
vietnamese.ldf = Werner Lemberg
\Contact <wl [at] gnu [dot] org> ,
{\latexbug@empty} = {} ,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexbug.tlpobj new/tlpkg/tlpobj/latexbug.tlpobj
--- old/tlpkg/tlpobj/latexbug.tlpobj 2019-02-28 03:48:08.000000000 +0100
+++ new/tlpkg/tlpobj/latexbug.tlpobj 2019-10-17 01:54:27.000000000 +0200
@@ -1,6 +1,6 @@
name latexbug
category Package
-revision 49573
+revision 52414
shortdesc Bug-classification for LaTeX related bugs
relocated 1
longdesc The package is written in order to help identifying the
@@ -11,7 +11,7 @@
RELOC/tex/latex/latexbug/latexbug.sty
catalogue-contact-repository https://github.com/latex3/latexbug
catalogue-ctan /macros/latex/required/latexbug
-catalogue-date 2018-12-31 21:24:55 +0100
+catalogue-date 2019-10-16 10:42:14 +0200
catalogue-license lppl1.3c
catalogue-topics latex-doc latex-devel
-catalogue-version 1.0e
+catalogue-version 1.0g
++++++ latexconfig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latexconfig/hyperref.cfg new/tex/latex/latexconfig/hyperref.cfg
--- old/tex/latex/latexconfig/hyperref.cfg 2009-09-28 02:19:49.000000000 +0200
+++ new/tex/latex/latexconfig/hyperref.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-\ProvidesFile{hyperref.cfg}%
- [2002/06/06 v1.2 hyperref configuration of TeXLive]
-% Change default driver to "dvips" instead of "hypertex",
-% requires hyperref 2002/06/05 v6.72s
-\providecommand*{\Hy@defaultdriver}{hdvips}%
-\endinput
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latexconfig/lualatex-patch-kernel.tex new/tex/latex/latexconfig/lualatex-patch-kernel.tex
--- old/tex/latex/latexconfig/lualatex-patch-kernel.tex 2011-03-12 14:17:28.000000000 +0100
+++ new/tex/latex/latexconfig/lualatex-patch-kernel.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-% $Id: lualatexquotejobname.tex 18968 2010-06-14 11:22:59Z mpg $
-% Manuel Pegourie-Gonnard, originally written 2010. WTFPL v2.
-%
-% Misc. patches to commands in the LaTeX kernel for LuaTeX.
-
-\makeatletter
-
-% \endlinechar must always be < 127
-%
-% mpg: this was the only occurence of such an assignement in the kernel
-% (checked \newlinechar too)
-%
-% mpg: the +10000/-10000 breaks, and we want to avoid munging
-% \@tempcnta globally, so use a group with a few \expandafter's
-\def\@xtypein[#1]#2{%
- \typeout{#2}%
- %%\advance\endlinechar\@M
- \begingroup \endlinechar\m@ne
- \read\@inputcheck to#1%
- \expandafter\endgroup
- \expandafter\def\expandafter#1\expandafter{#1}%
- %%\advance\endlinechar-\@M
- \@typein}
-
-\makeatother
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latexconfig/lualatex-reset-codes.tex new/tex/latex/latexconfig/lualatex-reset-codes.tex
--- old/tex/latex/latexconfig/lualatex-reset-codes.tex 2010-11-23 23:54:42.000000000 +0100
+++ new/tex/latex/latexconfig/lualatex-reset-codes.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-% $Id $
-% Manuel Pégourié-Gonnard, originally written 2010. WTFPL v2.
-
-% To be loaded after latex.ltx and before luatex-unicode-letters.tex.
-
-% latex.ltx (ltfinal.dtx) sets lccodes, uccodes, sfcodes and catcodes for
-% characters in the "00-"ff range.
-%
-% In the "80-"ff range, lccodes, uccodes & sfcodes are based on T1, and need
-% to be reset before the correct, Unicode-based, codes are set. Also, the
-% catcodes are set to 12 (other).
-%
-\begingroup
-\makeatletter
-\count@=128
-\loop \ifnum\count@<256
- \global\uccode\count@=0
- \global\lccode\count@=0
- \global\sfcode\count@=1000
- \global\catcode\count@=12
- \advance\count@\@ne
-\repeat
-\endgroup
-
-% A few codes in the ASCII range are set by latex.ltx:
-%
-% \lccode`\^^[=`\^^[ % oe in OT1
-% \lccode`\- =`\- % default hyphen char
-% \lccode 127=127 % alternate hyphen char
-% \lccode 23 =23 % textcompwordmark in T1
-%
-% They don't look too problematic, so we don't reset them now, but this may
-% change later if problems are found.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexconfig.tlpobj new/tlpkg/tlpobj/latexconfig.tlpobj
--- old/tlpkg/tlpobj/latexconfig.tlpobj 2019-02-28 03:48:09.000000000 +0100
+++ new/tlpkg/tlpobj/latexconfig.tlpobj 2020-01-24 01:57:15.000000000 +0100
@@ -1,14 +1,11 @@
name latexconfig
category Package
-revision 45777
+revision 53525
shortdesc configuration files for LaTeX-related formats
relocated 1
-runfiles size=10
+runfiles size=7
RELOC/tex/latex/latexconfig/epstopdf-sys.cfg
- RELOC/tex/latex/latexconfig/hyperref.cfg
RELOC/tex/latex/latexconfig/latex.ini
- RELOC/tex/latex/latexconfig/lualatex-patch-kernel.tex
- RELOC/tex/latex/latexconfig/lualatex-reset-codes.tex
RELOC/tex/latex/latexconfig/lualatexiniconfig.tex
RELOC/tex/latex/latexconfig/lualatexquotejobname.lua
RELOC/tex/latex/latexconfig/lualatexquotejobname.tex
++++++ latexgit.doc.tar.xz ++++++
Binary files old/doc/latex/latexgit/latexgit.pdf and new/doc/latex/latexgit/latexgit.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexgit.doc.tlpobj new/tlpkg/tlpobj/latexgit.doc.tlpobj
--- old/tlpkg/tlpobj/latexgit.doc.tlpobj 2019-02-28 03:48:13.000000000 +0100
+++ new/tlpkg/tlpobj/latexgit.doc.tlpobj 2020-03-19 01:54:39.000000000 +0100
@@ -1,9 +1,9 @@
name latexgit.doc
category Package
-revision 41920
+revision 54391
shortdesc doc files of latexgit
relocated 1
-docfiles size=115
+docfiles size=117
RELOC/doc/latex/latexgit/LICENSE
RELOC/doc/latex/latexgit/README.md
RELOC/doc/latex/latexgit/latexgit.pdf
++++++ latexgit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/latexgit/latexgit.sty new/tex/latex/latexgit/latexgit.sty
--- old/tex/latex/latexgit/latexgit.sty 2016-08-25 00:48:07.000000000 +0200
+++ new/tex/latex/latexgit/latexgit.sty 2020-03-18 22:18:16.000000000 +0100
@@ -8,7 +8,7 @@
%% latexgit
%% Author: Camil Staps <info(a)camilstaps.nl>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{latexgit}[2016/08/24]
+\ProvidesPackage{latexgit}[2020/03/18]
\RequirePackage{pgfkeys}
\RequirePackage{datetime}
@@ -22,6 +22,7 @@
/git/.is family, /git,
default/.style={
directory=.,
+ file=,
formatDate=false,
formatInterDateTime=\space{}at\space{},
formatTime=false,
@@ -30,6 +31,7 @@
shortHash=true,
},
directory/.estore in=\git@opt@Directory,
+ file/.estore in=\git@opt@File,
formatDate/.is if=git@opt@FormatDate,
formatInterDateTime/.estore in=\git@opt@FormatInterDateTime,
formatTime/.is if=git@opt@FormatTime,
@@ -54,100 +56,104 @@
\endgroup%
\fi%
}
-\newcommand{\gitcommithash}[1][]{%
+\catcode`\&=14\catcode`\%=11
+\def\git@space{ }
+\newcommand{\gitcommithash}[1][]{&
\git@commithash[#1]\git@result}
-\newcommand{\git@commithash}[1][]{%
- \pgfkeys{/git,default,#1}%
- \ifgit@opt@ShortHash%
- \git@command{git log -n 1 --oneline \git@opt@Revision
- | cut -d' ' -f1}%
- \else%
- \git@command{git log -n 1 \git@opt@Revision
- | head -1 | cut -d' ' -f2}%
- \fi%
+\newcommand{\git@commithash}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \ifgit@opt@ShortHash&
+ \git@command{git log -n 1 --format=%h
+ \git@opt@Revision\git@space -- \git@opt@File}&
+ \else&
+ \git@command{git log -n 1 --format=%H
+ \git@opt@Revision\git@space -- \git@opt@File}&
+ \fi&
}
-\newcommand{\gitcommitmsg}[1][]{%
+\newcommand{\gitcommitmsg}[1][]{&
\git@commitmsg[#1]\git@result}
-\newcommand{\git@commitmsg}[1][]{%
- \pgfkeys{/git,default,#1}%
- \git@command{git log -n 1 --oneline \git@opt@Revision
- | cut -d' ' -f2-}%
-}
-\def\git@formatCommitDate#1-#2-#3 #4:#5:#6 +#7\relax{%
- \formatdate{#3}{#2}{#1}%
-}
-\def\git@formatCommitTime#1-#2-#3 #4:#5:#6 +#7\relax{%
- \formattime{#4}{#5}{#6}%
- \ifgit@opt@ShowTimeZone%
- \space(+#7\unskip)%
- \fi%
-}
-\newcommand{\gitcommitdate}[1][]{%
- \git@commitdate[#1]%
- \ifgit@opt@FormatDate%
- \expandafter\git@formatCommitDate\git@rawresult\relax%
- \ifgit@opt@FormatTime%
- \git@opt@FormatInterDateTime%
- \expandafter\git@formatCommitTime\git@rawresult\relax%
+\newcommand{\git@commitmsg}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \git@command{git log -n 1 --format=%B
+ \git@opt@Revision\git@space -- \git@opt@File}&
+}
+\def\git@formatCommitDate#1-#2-#3 #4:#5:#6 +#7\relax{&
+ \formatdate{#3}{#2}{#1}&
+}
+\def\git@formatCommitTime#1-#2-#3 #4:#5:#6 +#7\relax{&
+ \formattime{#4}{#5}{#6}&
+ \ifgit@opt@ShowTimeZone&
+ \space(+#7\unskip)&
+ \fi&
+}
+\newcommand{\gitcommitdate}[1][]{&
+ \git@commitdate[#1]&
+ \ifgit@opt@FormatDate&
+ \expandafter\git@formatCommitDate\git@rawresult\relax&
+ \ifgit@opt@FormatTime&
+ \git@opt@FormatInterDateTime&
+ \expandafter\git@formatCommitTime\git@rawresult\relax&
\fi
- \else\ifgit@opt@FormatTime%
- \expandafter\git@formatCommitTime\git@rawresult\relax%
+ \else\ifgit@opt@FormatTime&
+ \expandafter\git@formatCommitTime\git@rawresult\relax&
\else
- \git@result%
- \fi\fi%
+ \git@result&
+ \fi\fi&
}
-\newcommand{\git@commitdate}[1][]{%
- \pgfkeys{/git,default,#1}%
- \git@command{git log -n 1 --date=iso \git@opt@Revision
- | grep Date | head -1 | cut -d' ' -f2-}%
+\newcommand{\git@commitdate}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \git@command{git log -n 1 --format=%ai
+ \git@opt@Revision\git@space -- \git@opt@File}&
}
-\newcommand{\gitcommitauthor}[1][]{%
+\newcommand{\gitcommitauthor}[1][]{&
\git@commitauthor[#1]\git@result}
-\newcommand{\git@commitauthor}[1][]{%
- \pgfkeys{/git,default,#1}%
- \git@command{git log -n 1 \git@opt@Revision
- | grep Author | head -1 | cut -d' ' -f2-}%
+\newcommand{\git@commitauthor}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \git@command{git log -n 1 --format='%an <%ae>'
+ \git@opt@Revision\git@space -- \git@opt@File}&
}
-\newcommand{\gitcommitauthorname}[1][]{%
+\newcommand{\gitcommitauthorname}[1][]{&
\git@commitauthorname[#1]\git@result}
-\newcommand{\git@commitauthorname}[1][]{%
- \pgfkeys{/git,default,#1}%
- \git@command{git log -n 1 \git@opt@Revision
- | grep Author | head -1 | cut -d' ' -f2- | cut -d'<' -f1}%
+\newcommand{\git@commitauthorname}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \git@command{git log -n 1 --format=%an
+ \git@opt@Revision\git@space -- \git@opt@File}&
}
-\newcommand{\gitcommitauthoremail}[1][]{%
+\newcommand{\gitcommitauthoremail}[1][]{&
\git@commitauthoremail[#1]\git@result}
-\newcommand{\git@commitauthoremail}[1][]{%
- \pgfkeys{/git,default,#1}%
- \git@command{git log -n 1 \git@opt@Revision
- | grep Author | head -1 | cut -d' ' -f2-
- | cut -d'<' -f2 | cut -d'>' -f1}%
-}
-\newcommand{\git@commitparent}[1][]{%
- \pgfkeys{/git,default,#1}%
- \git@command{git log -n 1 --pretty=raw \git@opt@Revision
- | grep parent | head -1 | cut -d' ' -f2}%
+\newcommand{\git@commitauthoremail}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \git@command{git log -n 1 --format=%ae
+ \git@opt@Revision\git@space -- \git@opt@File}&
+}
+\newcommand{\git@commitparent}[1][]{&
+ \pgfkeys{/git,default,#1}&
+ \git@command{git log -n 1 --format=%p
+ \git@opt@Revision\git@space -- \git@opt@File
+ | cut -d' ' -f2}&
}
-\newcommand{\gitchanges}[1][]{%
+\newcommand{\gitchanges}[1][]{&
\git@changes[#1]{HEAD}
}
-\newcommand{\git@changes}[2][]{%
- \edef\git@@revision{#2}%
- \git@commithash[revision=\git@@revision]%
- \edef\git@@thishash{\git@rawresult}%
- \git@command{git log -n 1 --date=iso \git@@revision
- | grep Date | head -1 | cut -d' ' -f4}%
- \edef\git@@thisdate{\git@rawresult}%
- \git@commitmsg[revision=\git@@revision]%
- \edef\git@@thismsg{\git@rawresult}%
- \changes{\git@@thisdate\unskip: \git@@thishash}\git@@thisdate\git@@thismsg%
- \git@commitparent[revision=\git@@revision]%
- \let\git@@parent\git@rawresult%
+\newcommand{\git@changes}[2][]{&
+ \edef\git@@revision{#2}&
+ \git@commithash[revision=\git@@revision]&
+ \edef\git@@thishash{\git@rawresult}&
+ \git@command{git log -n 1 --format=%ad --date=short \git@opt@Revision}&
+ \edef\git@@thisdate{\git@rawresult}&
+ \git@commitmsg[revision=\git@@revision]&
+ & TODO: this removes '=' characters because they break \changes, but the real
+ & solution would be to put something back that restores these characters.
+ \StrSubstitute[0]{\git@rawresult}{=}{}[\git@@thismsg]&
+ \changes{\git@@thisdate\unskip: \git@@thishash}{\git@@thisdate}{\git@@thismsg}&
+ \git@commitparent[revision=\git@@revision]&
+ \let\git@@parent\git@rawresult&
\setbox0=\hbox{\git@@parent\unskip}\ifdim\wd0=0pt
- \else%
- \git@changes{\git@@parent}%
- \fi%
+ \else&
+ \git@changes{\git@@parent}&
+ \fi&
}
+\catcode`\&=4\catcode`\%=14
%% Copyright (c) 2016 Camil Staps <info(a)camilstaps.nl>
%% Licensed under GPL v3.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexgit.tlpobj new/tlpkg/tlpobj/latexgit.tlpobj
--- old/tlpkg/tlpobj/latexgit.tlpobj 2019-02-28 03:48:13.000000000 +0100
+++ new/tlpkg/tlpobj/latexgit.tlpobj 2020-03-19 01:54:39.000000000 +0100
@@ -1,6 +1,6 @@
name latexgit
category Package
-revision 41920
+revision 54391
shortdesc A LaTeX git wrapper
relocated 1
longdesc This package provides several macros to fetch git information
@@ -10,6 +10,5 @@
runfiles size=2
RELOC/tex/latex/latexgit/latexgit.sty
catalogue-ctan /macros/latex/contrib/latexgit
-catalogue-date 2016-08-31 04:53:42 +0200
catalogue-license gpl3
catalogue-topics version-control doc-mgmt
++++++ latexindent.doc.tar.xz ++++++
++++ 4547 lines of diff (skipped)
++++++ latexindent.tar.xz ++++++
++++ 3604 lines of diff (skipped)
++++++ latexmk.doc.tar.xz ++++++
++++ 4195 lines of diff (skipped)
++++++ latexmk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/latexmk/latexmk.pl new/texmf-dist/scripts/latexmk/latexmk.pl
--- old/texmf-dist/scripts/latexmk/latexmk.pl 2019-03-19 22:28:43.000000000 +0100
+++ new/texmf-dist/scripts/latexmk/latexmk.pl 2020-04-18 22:56:25.000000000 +0200
@@ -124,7 +124,7 @@
# Test for already running previewer gets wrong answer if another
# process has the viewed file in its command line
-## Copyright John Collins 1998-2018
+## Copyright John Collins 1998-2020
## (username jcc8 at node psu.edu)
## (and thanks to David Coppit (username david at node coppit.org)
## for suggestions)
@@ -162,6 +162,65 @@
##
## 12 Jan 2012 STILL NEED TO DOCUMENT some items below
##
+## 16 Apr 2020 John Collins Correct contents of "All targets (...) are up-to-date" message
+## V. 4.69a.
+## 12 Mar 2020 John Collins Version is 4.69
+## 7 Feb 2020 John Collins Report rc files read
+## 6 Feb 2020 John Collins Fix bug when -cd and -outdir are used, and outdir is
+## same as document directory. (Bug is caused by
+## problem in perl module Cwd.)
+## 2,3 Feb 2020 John Collins Correction in find_basename.
+## 31 Jan 2020 John Collins Cleanup sub exit_msg1: incorrect comment etc.
+## Extra @file_not_found entry for message from
+## \input on not-found-file
+## Remove use of $extension_treatment: Too hard to
+## check. Always use what was called 'unix' method.
+## When command-line-specified tex file not found,
+## test for cusdep to make it, then try kpsewhich,
+## and only if all 3 fail report an error.
+## 15 Jan 2020 John Collins Add -MSWinBackSlash -MSWinBackSlash- options to
+## control whether directory separator '\' is
+## used for filenames on command line for
+## called programs under MSWin.
+## 3 Jan 2020 John Collins Add -E option to default command for xdvipdfmx, to
+## match call made by xetex (see XeTeX_ext.c in
+## xetex source). This forces xdvipdfmx to always
+## try to embed fonts, ignoring licensing flags, etc.
+##
+## Current version (4.67, 26 Dec 2019) to CTAN
+## 26 Dec 2019 John Collins Change place of setting of $view_file
+## Make fully consistent set of options for engines:
+## -latex, -latex=...,
+## preserving backward compatibility, and avoiding suprises.
+## 11 Dec 2019 John Collins Change rules for wrapping in log file: This deals
+## with xelatex wrapping at > standard number of
+## bytes in presence of non-ASCII Unicode characters.
+## 4 Dec 2019 John Collins If there were missing subdirectories in output/aux
+## directories, and these were successfully created,
+## then ignore error from *latex, since rerun may
+## succeed.
+## 14 Nov 2019 John Collins Add comment.
+## 12 Nov 2019 John Collins Use $compiling_cmd, $warning_cmd, $success_cmd
+# on normal make, rather than just in -pvc mode.
+## 5 Aug 2019 John Collins The changing of '\' to '/' in filenames is now
+## done for msys as well as MSWin32.
+## 8 Jul 2019 John Collins Allow addition of hook for processing lists of
+## missing source files, used after run of *latex.
+## 2 Jul 2019 John Collins Silence message about disallowing change of output
+## file type.
+## V. 4.66
+## 28 Jun 2019 John Collins Try to deal with log file parsing problems
+## V. 4.65
+## 21 May 2019 John Collins Fix incorrect listings by -rules and by -deps
+## 21 May 2019 John Collins V. 4.64a.
+## 20,21 May 2019 John Collins Fix problem with not always running dvipdf,
+## dvips, xdvpdf because of missing information
+## on source files. Do this by adding a
+## source_rule hash to each rule and adding a
+## pass-based criterion for out-of-dateness
+## 20 May 2019 John Collins V. 4.64.
+## 17 Mar 2019 John Collins V. 4.63c.
+## 18 Mar 2019 John Collins Update copyright date
## 17 Mar 2019 John Collins Further test for problems when linking rules
## 17 Mar 2019 John Collins V. 4.63b.
## 17 Mar 2019 John Collins Fix problem revealed by bibtopic package
@@ -221,8 +280,8 @@
$my_name = 'latexmk';
$My_name = 'Latexmk';
-$version_num = '4.63b';
-$version_details = "$My_name, John Collins, 17 March 2019";
+$version_num = '4.69a';
+$version_details = "$My_name, John Collins, 17 Apr. 2020";
use Config;
use File::Basename;
@@ -260,7 +319,7 @@
use File::Find;
use List::Util qw( max );
use Cwd; # To be able to change cwd
-use Cwd "chdir"; # Ensure $ENV{PWD} tracks cwd
+#use Cwd "chdir"; # Ensure $ENV{PWD} tracks cwd. NO NEED, and it messes up -cd -outdir=
use Digest::MD5;
#use strict;
@@ -304,6 +363,7 @@
@file_not_found = (
'^No file\\s*(.*)\\.$',
'^\\! LaTeX Error: File `([^\\\']*)\\\' not found\\.',
+ '^\\! I can\\\'t find file `([^\\\']*)\\\'\\.',
'.*?:\\d*: LaTeX Error: File `([^\\\']*)\\\' not found\\.',
'^LaTeX Warning: File `([^\\\']*)\\\' not found',
'^Package .* [fF]ile `([^\\\']*)\\\' not found',
@@ -347,7 +407,7 @@
# Hooks for customized extra processing on aux files. The following
-# variable is an array of references to function. Each function is
+# variable is an array of references to functions. Each function is
# invoked in turn when a line of an aux file is processed (if none
# of the built-in actions have been done). On entry to the function,
# the following variables are set:
@@ -355,6 +415,15 @@
# $rule = name of rule during the invocation of which, the aux file
# was supposed to have been generated.
@aux_hooks = ();
+# Hooks for customized processing on lists of source and missing files.
+# The following variable is an array of references to functions. Each
+# function is invoked in turn after a run of latex (or pdflatex etc) and
+# latexmk has analyzed the .log and .fls files for dependency information.
+# On entry to each called function, the following variables are set:
+# $rule = name of *latex rule
+# %dependents: maps source files and possible source files to a status.
+# See begining of sub parse_log for possible values.
+@latex_file_hooks = ();
#########################################################################
## Default document processing programs, and related settings,
@@ -611,7 +680,7 @@
$ps2pdf = 'ps2pdf %O %S %D';
## Command to convert xdv file to pdf file
-$xdvipdfmx = 'xdvipdfmx -o %D %O %S';
+$xdvipdfmx = 'xdvipdfmx -E -o %D %O %S';
$xdvipdfmx_silent_switch = '-q';
@@ -627,13 +696,6 @@
# 'auto' ==> set print type according to the printable
# file(s) being made: priority 'ps', 'pdf', 'dvi'
-## Which treatment of default extensions and filenames with
-## multiple extensions is used, for given filename on
-## tex/latex's command line? See sub find_basename for the
-## possibilities.
-## Current tex's treat extensions like UNIX teTeX:
-$extension_treatment = 'unix';
-
# Viewers. These are system dependent, so default to none:
$pdf_previewer = $ps_previewer = $ps_previewer_landscape = $dvi_previewer = $dvi_previewer_landscape = "NONE";
@@ -872,6 +934,8 @@
# NT executables.
$tmpdir = $ENV{TMPDIR} || $ENV{TEMP} || '.';
+ # Which rc files did I read?
+ @rc_files_read = ();
## List of possibilities for the system-wide initialization file.
## The first one found (if any) is used.
## We could stay with MSWin files here, since cygwin perl understands them
@@ -1514,12 +1578,6 @@
# default_extra_generated is a reference to an array
# of specifications of extra generated files (beyond
# the main dest file. Standard place holders are used.
- # active (1 or 0) is whether the rule is currently active
- # and hence accessed in recursion and linked to
- #
- # Example ['%Y%R.log'] for (pdf)latex, and ['%R.blg']
- # for bibtex. (There's no need for '%R.aux', here,
- # since such generated files are detected dynamically.)
# 1: {Hash sourcefile -> [source-file data] }
# Source-file data array:
# 0: time
@@ -1551,6 +1609,28 @@
# 2: {Hash generated_file -> 1 }
# This lists all generated files; the values
# are currently unused, only the keys
+ # 3: {Hash source_rule -> last_pass }
+ # This lists rules that are to be considered source
+ # rules for the current rule, separately from the
+ # from_rules of the source files. It maps the name
+ # of each of these rules to the pass number of the
+ # current rule when it was last run. The current rule
+ # is out-of-date if the last_pass for a source rule
+ # is less than the pass number for the rule.
+ # The purpose of this is when the source file list
+ # is expected to be inaccurate, because the source
+ # files are hard to determine. Typical needs are
+ # for rules applied to dvi and xdv files, when
+ # graphics files are involved. Their names are coded
+ # inside the dvi/xdv file, but not the contents.
+ # It would need parsing of the contents of the file
+ # to determine the actual source files.
+ # An implication of using a source_rule is that this
+ # rule passes files to the current rule and that the
+ # current rule can be considered out-of-date whenever
+ # the source_rule has been run. Effectively these
+ # files are unconditionallyconsidered changed when
+ # the source_rule runs.
%fdb_current = (); # Hash of information for all files used.
# It maps filename to a reference to an array
@@ -1618,7 +1698,6 @@
" and in that case it should be a regular text file, not a directory.\n";
}
elsif ( -e $rc_file ) {
- #print "===Reading rc file \"$rc_file\" ...\n";
process_rc_file( $rc_file );
return;
}
@@ -1711,6 +1790,11 @@
}
elsif (/^-l$/) { $landscape_mode = 1; }
elsif (/^-l-$/) { $landscape_mode = 0; }
+ elsif ( /^-latex$/ ) {
+ $pdf_mode = 0;
+ $postscript_mode = 0;
+ $dvi_mode = 1;
+ }
elsif (/^-latex=(.*)$/) {
$latex = $1;
}
@@ -1724,6 +1808,11 @@
{ $silence_logfile_warnings = 0; }
elsif ( /^-logfilewarninglist-$/ || /^-logfilewarnings-$/ )
{ $silence_logfile_warnings = 1; }
+ elsif ( /^-lualatex$/ || /^-pdflualatex$/ ) {
+ $pdf_mode = 4;
+ $dvi_mode = $postscript_mode = 0;
+ }
+# See below for -lualatex=...
# See above for -M
elsif (/^-MF$/) {
if ( $ARGV[0] eq '' ) {
@@ -1733,6 +1822,8 @@
shift;
}
elsif ( /^-MP$/ ) { $dependents_phony = 1; }
+ elsif ( /-MSWinBackSlash$/ ) { $MSWin_back_slash = 1; }
+ elsif ( /-MSWinBackSlash-$/ ) { $MSWin_back_slash = 0; }
elsif (/^-new-viewer$/) {
$new_viewer_always = 1;
}
@@ -1757,18 +1848,18 @@
elsif (/^-pdflua$/){ $pdf_mode = 4; }
elsif (/^-pdfps$/) { $pdf_mode = 2; }
elsif (/^-pdfxe$/) { $pdf_mode = 5; }
-# elsif (/^-pdflatex$/) {
-# $pdflatex = "pdflatex %O %S";
-# $pdf_mode = 1;
-# $dvi_mode = $postscript_mode = 0;
-# }
+ elsif (/^-pdflatex$/) {
+ $pdflatex = "pdflatex %O %S";
+ $pdf_mode = 1;
+ $dvi_mode = $postscript_mode = 0;
+ }
elsif (/^-pdflatex=(.*)$/) {
$pdflatex = $1;
}
- elsif (/^-pdflualatex=(.*)$/) {
+ elsif ( /^-pdflualatex=(.*)$/ || /^-lualatex=(.*)$/ ) {
$lualatex = $1;
}
- elsif (/^-pdfxelatex=(.*)$/) {
+ elsif ( /^-pdfxelatex=(.*)$/ || /^-xelatex=(.*)$/ ) {
$xelatex = $1;
}
elsif (/^-pretex=(.*)$/) {
@@ -1845,14 +1936,11 @@
elsif (/^-view=ps$/) { $view = "ps";}
elsif (/^-view=pdf$/) { $view = "pdf"; }
elsif (/^-Werror$/){ $warnings_as_errors = 1; }
- elsif (/^-lualatex$/) {
- $pdf_mode = 4;
- $dvi_mode = $postscript_mode = 0;
- }
- elsif (/^-xelatex$/) {
+ elsif ( /^-xelatex$/ || /^-pdfxelatex$/ ) {
$pdf_mode = 5;
$dvi_mode = $postscript_mode = 0;
}
+# See above for -xelatex=...
elsif (/^-e$/) {
if ( $#ARGV < 0 ) {
&exit_help( "No code to execute specified after -e switch");
@@ -1925,6 +2013,9 @@
}
}
+show_array( "Rc files read:", @rc_files_read )
+ unless ( $silent && ! $diagnostics );
+
if ( $bad_options > 0 ) {
&exit_help( "Bad options specified" );
}
@@ -2239,8 +2330,10 @@
# the only destinations. So if ps or dvi files needed, we cannot
# allow switching. (There will then be an error condition if a TeX
# engine fails to produce the correct type of output file.)
- warn "$My_name: Disallowing switch of output file as incompatible\n",
- " with file requests.\n";
+ if ($diagnostics) {
+ warn "$My_name: Disallowing switch of output file as incompatible\n",
+ " with file requests.\n";
+ }
$can_switch = 0;
}
@@ -2346,7 +2439,7 @@
($filename, $path) = fileparse( $filename );
warn "$My_name: Changing directory to '$path'\n"
if !$silent;
- pushd( $path );
+ pushd( dirname_no_tail( $path ) );
}
else {
$path = '';
@@ -2385,9 +2478,13 @@
&set_names;
# For use under error conditions:
@default_includes = ($texfile_name, $aux_main);
- local %rule_db = ();
+ # N.B. Do **not** apply local %rule_db here. It might appear appropriate,
+ # but %rule_db is needed in the continue block, which is not in the
+ # scope of a local declaration here.
&rdb_initialize_rules;
-
+ $view_file = '';
+ rdb_one_rule( 'view', sub{ $view_file = $$Psource; } );
+
if ( $cleanup_mode > 0 ) {
# ?? MAY NEED TO FIX THE FOLLOWING IF $aux_dir or $out_dir IS SET.
my %other_generated = ();
@@ -2615,6 +2712,7 @@
#Initialize failure flags now.
$failure = 0;
$failure_msg = '';
+ if ($compiling_cmd) { Run_subst( $compiling_cmd ); }
$failure = &rdb_make;
if ( ( $failure <= 0 ) || $force_mode ) {
rdb_for_some( [keys %one_time], \&rdb_run1 );
@@ -2626,7 +2724,13 @@
$failure_msg = "Warning(s) from latex (or c.) for '$filename'; treated as error";
}
}
- if ($failure > 0) { next FILE; }
+
+ if ($failure > 0) {
+ if ($failure_cmd) { Run_subst( $failure_cmd ); }
+ next FILE;
+ } else {
+ if ($success_cmd) { Run_subst( $success_cmd ); }
+ }
} # end FILE
continue {
if ($deps_handle) { deps_list($deps_handle); }
@@ -2725,7 +2829,7 @@
my $unbalanced_quote = 0;
my $balanced_quote = 0;
foreach (@_) {
- if ( $^O eq "MSWin32" ) {
+ if ( ($^O eq "MSWin32") || ($^O eq "msys") ) {
# On MS-Win, change directory separator '\' to '/', as needed
# by the TeX engines, for which '\' introduces a macro name.
# Remember that '/' is a valid directory separator in MS-Win.
@@ -2802,6 +2906,8 @@
# Normalize versions terminating in directory/path separator
# and versions referring to current directory
# These actions in a subroutine so they can be used elsewhere.
+ $out_dir = dirname_no_tail( $out_dir );
+ $aux_dir = dirname_no_tail( $aux_dir );
$out_dir1 = $out_dir;
$aux_dir1 = $aux_dir;
foreach ( $aux_dir1, $out_dir1 ) {
@@ -3028,8 +3134,7 @@
# it doesn't exist. Later a rule is created by latexmk to make that
# file. Then the rule's main destination file should have priority
# over non-main generated files from other rules.
-
-
+ local %from_rules_old = %from_rules;
&rdb_cache_generated;
rdb_for_actives(
0,
@@ -3045,11 +3150,35 @@
}
}
);
+ rdb_for_actives( \&rdb_set_source_rules );
# &rdb_show;
} # END rdb_make_links
#************************************************************
+sub rdb_set_source_rules {
+ # This applies to rules whose source file is a dvi or xdv file
+ # Uses rule context
+ my ($base, $path, $ext) = fileparseA( $$Psource );
+ if ( ($ext eq '.dvi') || ($ext eq '.dviF') || ($ext eq '.xdv') ) {
+ my $old_rule = $from_rules_old{$$Psource};
+ my $new_rule = $from_rules{$$Psource};
+ if ( defined $old_rule
+ && defined $new_rule
+ && ($old_rule eq $new_rule)
+ && defined $$PHsource_rules{$new_rule}
+ )
+ { # Nothing to do: source rule is correct.
+ }
+ else {
+ if ( defined $old_rule ) { delete $$PHsource_rules{$old_rule}; }
+ if ( defined $new_rule ) { $$PHsource_rules{$new_rule} = 0; }
+ }
+ }
+}
+
+#************************************************************
+
sub rdb_cache_generated {
# Update %from_rules
%from_rules = ();
@@ -3309,90 +3438,83 @@
# 2 - Where to place base file
# 3 - Where to place tex file
# Returns non-zero if tex file does not exist
- #
- # The rules for determining this depend on the implementation of TeX.
- # The variable $extension_treatment determines which rules are used.
- # !!!!!!!! I still need to implement use of kpsewhich to match behavior
- # of (pdf)latex correctly.
+ my $fail = 0;
+ local ( $given_name, $base_name, $ext, $path, $tex_name, $source_name );
+ $given_name = $_[0];
+ $source_name = '';
+ $tex_name = $given_name; # Default name if I don't find the tex file
+ ($base_name, $path, $ext) = fileparseB( $given_name );
+
+ # Treatment of extensions (in TeXLive 2019), with omission of path search:
+ # Exists: always means exists as a file, i.e., not as a directory.
+ # A. Finding of tex file:
+ # 1. If extension is .tex and given_name.tex exists, use it.
+ # 2. Else if given_name.tex exists, use it.
+ # 3. Else if givne_name exists, use it.
+ # B. The base filename is obtained by deleting the path
+ # component and the extension.
+ # C. The names of generated files (log, aux) are obtained by appending
+ # .log, .aux, etc to the basename. Note that these are all in the
+ # CURRENT directory (or the output or aux directory, as appropriate).
+ # The drive/path part of the originally given filename is ignored.
+
+ # Here we'll do:
+ # 1. Find the tex file by the above method, if possible.
+ # 2. If not, find a custom dependency with a source file that exists to
+ # make the tex file so that after the tex file is made, the above
+ # rules find the tex file.
+ # 3. If that also fails, use kpsewhich on given_name to find the tex
+ # file
+ # 4. If that also fails, report non-existent tex file.
+
+
+ if ( ($ext eq '.tex') && (-f $given_name) ) {
+ $tex_name = "$given_name";
+ }
+ elsif ( -f "$given_name.tex" ) {
+ $tex_name = "$given_name.tex";
+ $base_name .= $ext;
+ }
+ elsif ( -f $given_name ) {
+ $tex_name = $given_name;
+ }
+ elsif ( ($ext eq '.tex') && find_cus_dep( $given_name, $source_name ) ) {
+ $tex_name = $given_name;
+ }
+ elsif ( find_cus_dep( "$given_name.tex", \$source_name ) ) {
+ $tex_name = "$given_name.tex";
+ $base_name .= $ext;
+ }
+ elsif ( ($ext =~ /^\..+/) && find_cus_dep( $given_name, $source_name ) ) {
+ $tex_name = $given_name;
+ }
+ else {
+ my @kpse_result = kpsewhich( $given_name );
+ if ($#kpse_result < 0) {
+ $fail = 1;
+ }
+ else {
+ $tex_name = $kpse_result[0];
+ ($base_name) = fileparseB( $tex_name );
+ }
+ }
- local($given_name, $base_name, $ext, $path, $tex_name);
- $given_name = $_[0];
- if ( "$extension_treatment" eq "miktex_old" ) {
- # Miktex v. 1.20d:
- # 1. If the filename has an extension, then use it.
- # 2. Else append ".tex".
- # 3. The basename is obtained from the filename by
- # removing the path component, and the extension, if it
- # exists. If a filename has a multiple extension, then
- # all parts of the extension are removed.
- # 4. The names of generated files (log, aux) are obtained by
- # appending .log, .aux, etc to the basename. Note that
- # these are all in the CURRENT directory, and the drive/path
- # part of the originally given filename is ignored.
- #
- # Thus when the given filename is "\tmp\a.b.c", the tex
- # filename is the same, and the basename is "a".
-
- ($base_name, $path, $ext) = fileparse( $given_name, '\..*' );
- if ( "$ext" eq "") { $tex_name = "$given_name.tex"; }
- else { $tex_name = $given_name; }
- $_[1] = $base_name;
- $_[2] = $tex_name;
- }
- elsif ( "$extension_treatment" eq "unix" ) {
- # unix (at least TeXLive 2016) =>
- # A. Finding of tex file:
- # 1. If filename.tex exists, use it,
- # 2. else if kpsewhich finds filename.tex, use it
- # 3. else if filename exists, use it,
- # 4. else if kpsewhich finds filename, use it.
- # (Probably can unify the above by
- # 1'. If kpsewhich finds filename.tex, use result.
- # 2'. else if kpsewhich finds filename, use result.
- # 3'. else report file not found.
- # B. The base filename is obtained by deleting the path
- # component and, if an extension exists, the last
- # component of the extension, even if the extension is
- # null. (A name ending in "." has a null extension.)
- # C. The names of generated files (log, aux) are obtained by
- # appending .log, .aux, etc to the basename. Note that
- # these are all in the CURRENT directory, and the drive/path
- # part of the originally given filename is ignored.
- #
- # Thus when the given filename is "/tmp/a.b.c", there are two
- # cases:
- # a. /tmp/a.b.c.tex exists. Then this is the tex file,
- # and the basename is "a.b.c".
- # b. /tmp/a.b.c.tex does not exist. Then the tex file is
- # "/tmp/a.b.c", and the basename is "a.b".
- # But there are also modifications of this when a file can be
- # found by kpsewhich.
+ $_[1] = $base_name;
+ $_[2] = $tex_name;
+
+ if ($diagnostics) {
+ print "Given='$given_name', tex='$tex_name', base='$base_name', ext= $ext, source='$source_name'\n";
+ }
+ return $fail;
- if ( -f "$given_name.tex" ) {
- $tex_name = "$given_name.tex";
- }
- else {
- $tex_name = "$given_name";
- }
- ($base_name, $path, $ext) = fileparse( $tex_name, '\.[^\.]*' );
- $_[1] = $base_name;
- $_[2] = $tex_name;
- }
- else {
- die "$My_name: Incorrect configuration gives \$extension_treatment=",
- "'$extension_treatment'\n";
- }
- if ($diagnostics) {
- print "Given='$given_name', tex='$tex_name', base='$base_name'\n";
- }
- return ! -e $tex_name;
} #END find_basename
#************************************************************
sub make_preview_continuous {
local @changed = ();
+ local %changed_rules = ();
local @changed_user = ();
local @disappeared = ();
local @no_dest = (); # Non-existent destination files
@@ -3407,9 +3529,6 @@
$quell_uptodate_msgs = 1;
- local $view_file = '';
- rdb_one_rule( 'view', sub{ $view_file = $$Psource; } );
-
if ( ($view eq 'dvi') || ($view eq 'pdf') || ($view eq 'ps') ) {
warn "Viewing $view\n";
}
@@ -3474,8 +3593,6 @@
}
$failure = &rdb_make;
-## warn "=========Viewer PID = $$Pviewer_process; updated=$updated\n";
-
if ( $MSWin_fudge_break && ($^O eq "MSWin32") ) {
$SIG{BREAK} = $SIG{INT} = 'DEFAULT';
}
@@ -3631,8 +3748,8 @@
# Exit with code 2 if is a syntax error or other problem.
my $rc_file = $_[0];
my $ret_code = 0;
- warn "$My_name: Executing Perl code in file '$rc_file'...\n"
- if $diagnostics;
+ push @rc_files_read, $rc_file;
+
# I could use the do command of perl, but the preceeding -r test
# to get good diagnostics gets the wrong result under cygwin
# (e.g., on /cygdrive/c/latexmk/LatexMk)
@@ -3781,10 +3898,9 @@
sub exit_msg1
{
- # exit_msg1( error_message, retcode [, action])
+ # exit_msg1( error_message, retcode )
# 1. display error message
- # 2. if action set, then restore aux file
- # 3. exit with retcode
+ # 2. exit with retcode
warn "\n------------\n";
warn "$My_name: $_[0].\n";
warn "-- Use the -f option to force complete processing.\n";
@@ -3888,6 +4004,10 @@
" -M - Show list of dependent files after processing\n",
" -MF file - Specifies name of file to receives list dependent files\n",
" -MP - List of dependent files includes phony target for each source file.\n",
+ " -MSWinBackSlash under MSWin use backslash (\\) for directory separators\n",
+ " for filenames given to called programs\n",
+ " -MSWinBackSlash- under MSWin use forward slash (/) for directory separators\n",
+ " for filenames given to called programs\n",
" -new-viewer - in -pvc mode, always start a new viewer\n",
" -new-viewer- - in -pvc mode, start a new viewer only if needed\n",
" -nobibtex - never use bibtex\n",
@@ -4484,8 +4604,12 @@
}
}
else {
- # LuaTeX sometimes wraps at 80 instead of 79, so work around this
- while ( ( ($len == $log_wrap) || ( ($engine eq 'LuaTeX') && ($len == $log_wrap+1) ) )
+ # Xetex and luatex sometimes wrap at longer line lengths:
+ # LuaTeX sometimes at 80. Xetex 80 or longer with non-ascii characters.
+ while ( ( ($len == $log_wrap)
+ || ( ($engine eq 'LuaTeX') && ($len == $log_wrap+1) )
+ || ( ($engine eq 'XeTeX') && ($len >= $log_wrap+1) )
+ )
&& !eof($log_file) ) {
push @lines, $_;
my $extra = <$log_file>;
@@ -4662,11 +4786,24 @@
# Latex error/warning, etc.
next LINE;
}
- elsif ( /^\\openout\d+\s*=\s*\`([^\']+)\'\.$/ ) {
- # When (pdf)latex is run with an -output-directory
- # or an -aux_directory, the file name does not contain
- # the output path; fix this, after removing quotes:
- $generated_log{normalize_force_directory( $aux_dir1, $1 )} = 1;
+ elsif ( /^\\openout\d+\s*=\s*(.*)\s*$/ ) {
+ # \openout followed by filename followed by line end.
+ # pdflatex and xelatex quote it and wrap,
+ # lualatex leaves filename as is, and doesn't wrap.
+ my $cand = $1;
+ if ( $cand =~ /\`\"([^\'\"]+)\"\'\.$/ ) {
+ # One form of quoting by pdflatex, xelatex: `"..."'.
+ $cand = $1;
+ }
+ elsif ( $cand =~ /\`([^\']+)\'\.$/ ) {
+ # Another form of quoting by pdflatex, xelatex: `...'.
+ $cand = $1;
+ }
+ if ( $cand =~ /[\`\'\"]/){
+ # Bad quotes: e.g., incomplete wrapped line
+ next LINE;
+ }
+ $generated_log{normalize_force_directory( $aux_dir1, $cand )} = 1;
next LINE;
}
# Test for conversion produced by package:
@@ -4882,6 +5019,11 @@
# Quoted file name, as from MikTeX
$quoted = 1;
}
+ elsif ( /^\"/ ) {
+ # Incomplete quoted file, as in wrapped line before appending
+ # next line
+ next LINE;
+ }
elsif ( /^([^\(^\)]*?)\s+[\[\{\<]/ ) {
# Terminator: space then '[' or '{' or '<'
# Use *? in condition: to pick up first ' [' (etc)
@@ -4900,12 +5042,20 @@
$_ = $'; # Put $_ equal to the unmatched tail of string '
my $include_candidate = $1;
$include_candidate =~ s/\s*$//; # Remove trailing space.
- if ( !$quoted && ($include_candidate =~ /(\S+)\s/ ) ){
+ if ($quoted) {
+ # Remove quotes around filename.
+ $include_candidate =~ s/^\"(.*)\"$/$1/;
+ }
+ elsif ( !$quoted && ($include_candidate =~ /(\S+)\s/ ) ){
# Non-space-containing filename-candidate
# followed by space followed by message
# (Common)
push @new_includes, $1;
}
+ if ($include_candidate =~ /[\"\'\`]/) {
+ # Quote inside filename. Probably misparse.
+ next INCLUDE_CANDIDATE;
+ }
if ( $include_candidate eq "[]" ) {
# Part of overfull hbox message
next INCLUDE_CANDIDATE;
@@ -4914,9 +5064,6 @@
# Part of font message
next INCLUDE_CANDIDATE;
}
- # Remove quotes around filename, as for MikTeX. I've already
- # treated this as a special case. For safety check here:
- $include_candidate =~ s/^\"(.*)\"$/$1/;
push @new_includes, $include_candidate;
if ( $include_candidate =~ /^(.+)\[([^\]]+)\]$/ ) {
@@ -4935,6 +5082,10 @@
INCLUDE_NAME:
foreach my $include_name (@new_includes) {
+ if ($include_name =~ /[\"\'\`]/) {
+ # Quote inside filename. Probably misparse.
+ next INCLUDE_NAME;
+ }
$include_name = normalize_filename( $include_name, @pwd_log );
my ($base, $path, $ext) = fileparseB( $include_name );
if ( ($path eq './') || ($path eq '.\\') ) {
@@ -5268,6 +5419,30 @@
#************************************************************
+sub dirname_no_tail {
+ my $dirname = $_[0];
+# print "DNT1 = '$dirname'\n";
+ foreach ($dirname) {
+ # Normalize name to use / to separate directory components:
+ # (Note both / and \ are allowed under MSWin.)
+ s(\\)(/)g;
+ # Change multiple trailing / to single /
+ # (Note internal // or \\ can have special meaning on MSWin)
+ s(/+$)(/);
+ # Remove trailing /,
+ # BUT **not** if that changes the semantics, i.e., if name is "/" or "C:/".
+ if ( m(/$) ) {
+ if ( ( ! m(^/+$) ) && ( ! m(:/+$) ) ) {
+ s(/$)();
+ }
+ }
+ }
+# print "DNT2 = '$dirname'\n";
+ return $dirname;
+}
+
+#************************************************************
+
sub clean_filename {
# Convert quoted filename as found in log file to filename without quotes
# Allows arbitrarily embedded double-quoted substrings, includes the
@@ -5299,13 +5474,17 @@
# (Note both / and \ are allowed under MSWin.)
foreach ($cwd, $file, @dirs) {
s(\\)(/)g;
+ $_ = dirname_no_tail( $_ );
}
# Remove initial component equal to current working directory.
# Use \Q and \E round directory name in regex to avoid interpretation
# of metacharacters in directory name:
foreach my $dir ( @dirs, '.', $cwd ) {
- if ( $file =~ s(^\Q$dir\E/)() ) {
- last;
+ if ( $dir =~ /^\s*$/ ) {
+ next;
+ }
+ if ( $file =~ s(^\Q$dir\E/)() ) {
+ last;
}
}
return $file;
@@ -5812,9 +5991,10 @@
warn " ===== CHANGING output type from '$newext' to '$oldext' in '$rule'\n";
my $switch_error = switch_output( $oldext, $newext );
if ($switch_error) {
- warn " I could not accommodate the changed output extension\n",
- " (either because the configuration does not allow it\n",
- " or because there is a conflict with requested filetypes).\n",
+ warn " I could not accommodate the changed output extension.\n",
+ " That is either because the configuration does not allow it\n",
+ " or because there is a conflict with implicit or explicit requested filetypes.\n",
+ " (Typically that is about .dvi and/or .ps filetypes.)\n",
"===> There may be subsequent warnings, which may or may not be ignorable.\n",
"===> If necessary, clean out generated files and try again\n";
}
@@ -6043,7 +6223,8 @@
}
&parse_log;
- $missing_dirs = 'none'; # Status of missing directories
+
+ my $missing_dirs = 'none'; # Status of missing directories
if (@missing_subdirs) {
$missing_dirs = 'success';
if ($allow_subdir_creation) {
@@ -6343,6 +6524,10 @@
}
}
+ foreach my $Psub (@latex_file_hooks) {
+ &$Psub;
+ }
+
# Some packages (e.g., bibtopic) generate a dummy error-message-providing
# bbl file when a bbl file does not exist. Then the fls and log files
# show the bbl file as created by the primary run and hence as a
@@ -6389,6 +6574,8 @@
}
rdb_remove_files( $rule, @files_not_needed );
+ return ($missing_dirs, [@missing_subdirs] );
+
} # END rdb_set_latex_deps
#************************************************************
@@ -6504,7 +6691,7 @@
foreach my $dep (@cus_dep_list){
my ($fromext,$toext) = split('\s+',$dep);
if ( ( "$ext" eq "$toext" )
- && ( -e "$path$base.$fromext" )
+ && ( -f "$path$base.$fromext" )
) {
# Source file for the missing file exists
# So we have a real include file, and it will be made
@@ -6522,14 +6709,14 @@
# and $_ doesn't have an extension
foreach my $dep (@cus_dep_list){
my ($fromext,$toext) = split('\s+',$dep);
- if ( -e "$path$base.$fromext" ) {
+ if ( -f "$path$base.$fromext" ) {
# Source file for the missing file exists
# So we have a real include file, and it will be made
# next time by &rdb__dependents
$new_includes{"$path$base.$toext"} = 1;
# next MISSING_FILE;
}
- if ( -e "$path$base.$toext" ) {
+ if ( -f "$path$base.$toext" ) {
# We've found the extension for the missing file,
# and the file exists
$new_includes{"$path$base.$toext"} = 1;
@@ -6871,6 +7058,7 @@
sub rdb_accessible {
# Call: &rdb_accessible
# Returns array of rules accessible from target rules and rules to make target files
+
local %accessible_rules = &rdb_target_hash;
rdb_recurse( [keys %accessible_rules], sub{ $accessible_rules{$rule} = 1; } );
return keys %accessible_rules;
@@ -7031,9 +7219,13 @@
local $switched_primary_output = 0;
my $retry_msg = 0; # Did I earlier say I was going to attempt
# another pass after a failure?
- foreach my $rule (keys %rule_db) {
- $pass{$rule} = 0;
- }
+ rdb_for_some ( [keys %rule_db],
+ sub{ $pass{$rule} = 0;
+ foreach (keys %$PHsource_rules) {
+ $$PHsource_rules{$_} = 0;
+ }
+ }
+ );
PASS:
while (1==1) {
# Exit condition at end of body of loop.
@@ -7125,11 +7317,20 @@
print "$My_name: Errors, so I did not complete making targets\n";
}
else {
+# local @dests = ( keys %current_primaries, @pre_primary, @post_primary, @unusual_one_time );
+ local @rules = ( keys %current_primaries, @post_primary, @unusual_one_time );
local @dests = ();
- rdb_for_some( [@_], sub{ push @dests, $$Pdest if ($$Pdest); } );
+ rdb_for_some( [@rules], sub{ push @dests, $$Pdest if ($$Pdest); } );
print "$My_name: All targets (@dests) are up-to-date\n";
}
}
+ rdb_for_some ( [keys %rule_db],
+ sub{
+ foreach my $s_rule (keys %$PHsource_rules) {
+ $$PHsource_rules{$s_rule} = $pass{$s_rule};
+ }
+ }
+ );
return $failure;
} #END rdb_make
@@ -7293,7 +7494,7 @@
$rules_applied{$rule} = 1;
$runs++;
- $pass{$rule}++;
+ $pass{$rule}++;
if ($bibtex_not_run > 0) {
if ($bibtex_not_run == 1 ) {
show_array ("$My_name: I WON'T RUN '$rule' because I don't find the following files:",
@@ -7302,7 +7503,7 @@
elsif ($bibtex_not_run == 2 ) {
warn "$My_name: I AM CONFIGURED/INVOKED NOT TO RUN '$rule'\n";
}
- $return = &rdb_dummy_run1;
+ $return = &rdb_dummy_run0;
}
else {
warn_running( "Run number $pass{$rule} of rule '$rule'" );
@@ -7364,6 +7565,9 @@
# !!?? $failure_msg = $$Plast_message;
}
+ foreach ( keys %$PHsource_rules ) {
+ $$PHsource_rules{$_} = $pass{$_};
+ }
} #END rdb_make1
#************************************************************
@@ -7672,7 +7876,7 @@
#-----------------
-sub rdb_dummy_run1 {
+sub rdb_dummy_run0 {
# Assumes contexts for: rule.
# Update rule state as if the rule ran successfully,
# but don't run the rule.
@@ -7694,7 +7898,7 @@
$$Pout_of_date = $$Pout_of_date_user = 0;
return 0;
-} # END rdb_dummy_run1
+} # END rdb_dummy_run0
#-----------------
@@ -7853,7 +8057,7 @@
}
# Find current set of source files:
- &rdb_set_latex_deps;
+ my ($missing_dirs, $PA_missing_subdirs) = &rdb_set_latex_deps;
# For each file of the kind made by epstopdf.sty during a run,
# if the file has changed during a run, then the new version of
@@ -7885,6 +8089,12 @@
if (! $silent);
$return = 0;
}
+ if ($return_latex && ($missing_dirs ne 'none') ) {
+ print "Error in (pdf)LaTeX, but needed subdirectories in output directory\n",
+ " were missing and successfully created, so try again.\n"
+ if (! $silent);
+ $return = 0;
+ }
# Summarize issues that may have escaped notice:
@primary_warning_summary = ();
if ($bad_reference) {
@@ -7915,6 +8125,7 @@
sub rdb_clear_change_record {
# Initialize diagnostics for reasons for running rule.
@changed = ();
+ %changed_rules = ();
@changed_user = ();
@disappeared = ();
@no_dest = (); # We are not now using this
@@ -7940,6 +8151,15 @@
local $dest_mtime = 0;
$dest_mtime = get_mtime($$Pdest) if ($$Pdest);
rdb_do_files( \&rdb_file_change1);
+ while ( my ($s_rule, $l_pass) = each %$PHsource_rules ) {
+ if ( defined $pass{$s_rule}
+ && ($pass{$s_rule} > $l_pass)
+ )
+ {
+ $changed_rules{$s_rule} = $rule;
+ $$Pout_of_date = 1;
+ }
+ }
if ($$Pout_of_date) {
push @rules_to_apply, $rule;
}
@@ -8033,7 +8253,7 @@
warn "${heading}Rules & subrules not known to be previously run:\n";
foreach (@rules_never_run) { warn " $_\n"; }
}
- if ( ($#changed >= 0) || ($#disappeared >= 0) || ($#no_dest >= 0) ) {
+ if ( ($#changed >= 0) || (keys %changed_rules > 0) || ($#disappeared >= 0) || ($#no_dest >= 0) ) {
warn "${heading}File changes, etc:\n";
if ( $#changed >= 0 ) {
warn " Changed files, or newly in use since previous run(s):\n";
@@ -8047,6 +8267,12 @@
warn " Non-existent destination files:\n";
foreach (uniqs(@no_dest)) { warn " '$_'\n"; }
}
+ if ( keys %changed_rules > 0 ) {
+ warn " Rule(s) that have been run and require run of dependent rule:\n";
+ while (my ($s_rule, $d_rule) = each %changed_rules) {
+ warn " '$s_rule' which requires run of '$d_rule'\n";
+ }
+ }
}
elsif ($#rules_to_apply >=0) {
warn "${heading}The following rules & subrules became out-of-date:\n";
@@ -8307,7 +8533,7 @@
#?? &R1;
if ( (! $rule) || ! rdb_rule_exists($rule) ) { return; }
- local ( $PArule_data, $PHsource, $PHdest ) = @{$rule_db{$rule}};
+ local ( $PArule_data, $PHsource, $PHdest, $PHsource_rules ) = @{$rule_db{$rule}};
local ($Pcmd_type, $Pext_cmd, $PAint_cmd, $Ptest_kind,
$Psource, $Pdest, $Pbase,
$Pout_of_date, $Pout_of_date_user, $Prun_time, $Pcheck_time,
@@ -8434,10 +8660,13 @@
if (! defined $_) { $_ = ''; }
}
if ( ($source =~ /\"/) || ($dest =~ /\"/) || ($base =~ /\"/) ) {
- die "$My_name: Error. In rdb_create_rule there is a double quote in one of\n",
- " source, destination or base parameters:\n",
- " '$source', '$dest', '$base'\n",
- " I cannot handle this.\n";
+ die "$My_name: Error. In rdb_create_rule to create rule\n",
+ " '$rule',\n",
+ " there is a double quote in one of source, destination or base parameters:\n",
+ " '$source'\n",
+ " '$dest'\n",
+ " '$base'\n",
+ " I cannot handle this. Cause is probably a latexmk bug. Please report it.\n";
}
foreach ( $needs_making, $run_time, $check_time, $test_kind ) {
if (! defined $_) { $_ = 0; }
@@ -8464,6 +8693,7 @@
$needs_making, 0, $run_time, $check_time, $changed,
-1, '', $PA_extra_gen ],
{},
+ {},
{}
];
if ($source) {
@@ -9035,8 +9265,6 @@
#************************************************************
sub find_file1 {
-#?? Need to use kpsewhich, if possible
-
# Usage: find_file1(name, ref_to_array_search_path)
# Modified find_file, which doesn't die.
# Given filename and path, return array of:
@@ -9231,6 +9459,29 @@
####################################################
+sub find_cus_dep {
+ # Usage find_cus_dep( dest, source )
+ # Given dest, if a cus_dep to make it is found, set source.
+ # Return 1 or 0 on success or failure.
+ #
+ my $dest = $_[0];
+ my ($base, $path, $ext) = fileparseB( $dest );
+ $ext =~ s/^\.//;
+ if (! $ext ) { return 0; }
+ foreach my $dep ( @cus_dep_list ) {
+ my ($fromext, $toext) = split( '\s+', $dep );
+ if ( ( "$ext" eq "$toext" ) && ( -f "$path$base.$fromext" ) ) {
+ # We have a way of making $dest
+ $_[1] = "$path$base.$fromext";
+ return 1
+ }
+ }
+ return 0;
+}
+
+####################################################
+####################################################
+
sub add_aux_hook {
# Usage: add_aux_hook( sub_name )
# Add the name subroutine to the array of hooks for
@@ -9247,6 +9498,22 @@
####################################################
+sub add_latex_file_hook {
+ # Usage: add_latex_file_hook( sub_name )
+ # Add the name subroutine to the array of hooks for
+ # processing list of possible dependency files after a run of *latex.
+ # The argument is either a string naming the subroutine, e.g.
+ # add_latex_file_hook( 'subname' );
+ # or a Perl reference to the subroutine, e.g.,
+ # add_latex_file_hook( \&subname );
+ # It is also possible to use an anonymous subroutine, e.g.,
+ # add_latex_file_hook( sub{ code of subroutine... } );
+ my ($sub_name) = @_;
+ push @latex_file_hooks, $sub_name;
+}
+
+####################################################
+
sub set_input_ext {
# Usage: set_input_ext( rule, ext, ... )
# Set list of extension(s) (specified without a leading period)
@@ -9783,7 +10050,7 @@
sub pushd {
push @dir_stack, [cwd(), $cache{cwd}];
if ( $#_ > -1) {
- chdir $_[0];
+ chdir dirname_no_tail( $_[0] );
&cache_good_cwd;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexmk.tlpobj new/tlpkg/tlpobj/latexmk.tlpobj
--- old/tlpkg/tlpobj/latexmk.tlpobj 2019-03-20 02:24:14.000000000 +0100
+++ new/tlpkg/tlpobj/latexmk.tlpobj 2020-04-19 18:10:18.000000000 +0200
@@ -1,6 +1,6 @@
name latexmk
category Package
-revision 50472
+revision 54786
shortdesc Fully automated LaTeX document generation
longdesc Latexmk completely automates the process of generating a LaTeX
longdesc document. Given the source files for a document, latexmk issues
@@ -12,11 +12,10 @@
longdesc changed. Thus a previewer can offer a display of the document's
longdesc latest state.
depend latexmk.ARCH
-runfiles size=98
+runfiles size=101
texmf-dist/scripts/latexmk/latexmk.pl
catalogue-also latexn prv arara
catalogue-ctan /support/latexmk
-catalogue-date 2019-03-18 21:33:46 +0100
catalogue-license gpl2
catalogue-topics compilation
-catalogue-version 4.63b
+catalogue-version 4.69a
++++++ latexpand.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/LICENCE new/texmf-dist/doc/support/latexpand/LICENCE
--- old/texmf-dist/doc/support/latexpand/LICENCE 2018-05-01 19:35:37.000000000 +0200
+++ new/texmf-dist/doc/support/latexpand/LICENCE 2019-12-12 23:59:47.000000000 +0100
@@ -1,5 +1,6 @@
-Copyright (c) 2012, 2013, 2014, 2015, 2016,
- Matthieu Moy <git(a)matthieu-moy.fr>
+Copyright (c) 2012-2019, Matthieu Moy <git(a)matthieu-moy.fr> and
+contributors.
+
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/texmf-dist/doc/support/latexpand/README new/texmf-dist/doc/support/latexpand/README
--- old/texmf-dist/doc/support/latexpand/README 2019-02-20 23:43:45.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/README 2019-12-12 23:59:47.000000000 +0100
@@ -20,6 +20,10 @@
--expand-bbl FILE
Expand the bibliography by inlining FILE
(should be a *.bbl file)
+ --biber FILE Include \bibliography{} with FILE's content,
+ as needed by biblatex with the biber backend.
+ (similar to --expand-bbl FILE, but for
+ biber+biblatex).
--help this help message
--output <file>, -o <file>
generate output in <file>
@@ -117,5 +121,5 @@
https://lacl.fr/~caubert/notes/portabilite-du-tex.html#dependances
VERSION
- This is latexpand version v1.5.
+ This is latexpand version v1.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/version.txt new/texmf-dist/doc/support/latexpand/version.txt
--- old/texmf-dist/doc/support/latexpand/version.txt 2019-02-20 23:43:45.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/version.txt 2019-12-12 23:59:47.000000000 +0100
@@ -1,2 +1,2 @@
-latexpand version v1.5 (be890116022866564388af207e11f4b5b962d57d).
-Committed on Sat Feb 16 08:42:38 2019 +0100.
+latexpand version v1.6 (ce086093a2413c99af11cc08aceab8e5483d65ff).
+Committed on Thu Dec 12 09:37:27 2019 +0000.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexpand.doc.tlpobj new/tlpkg/tlpobj/latexpand.doc.tlpobj
--- old/tlpkg/tlpobj/latexpand.doc.tlpobj 2019-02-28 03:48:21.000000000 +0100
+++ new/tlpkg/tlpobj/latexpand.doc.tlpobj 2019-12-13 01:54:36.000000000 +0100
@@ -1,6 +1,6 @@
name latexpand.doc
category Package
-revision 50079
+revision 53109
shortdesc doc files of latexpand
docfiles size=4
texmf-dist/doc/support/latexpand/LICENCE
++++++ latexpand.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/latexpand/latexpand new/texmf-dist/scripts/latexpand/latexpand
--- old/texmf-dist/scripts/latexpand/latexpand 2019-02-20 23:43:45.000000000 +0100
+++ new/texmf-dist/scripts/latexpand/latexpand 2019-12-12 23:59:47.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# Inspired by latexpand by D. Musliner, University of Michigan
-# 2012, 2013, 2014, 2015, 2016, 2017: Matthieu Moy <git(a)matthieu-moy.fr>
+# 2012-2019: Matthieu Moy <git(a)matthieu-moy.fr>
# BSD License
use strict;
@@ -10,7 +10,9 @@
use File::Spec;
my $TEXINPUTS = $ENV{'TEXINPUTS'};
-if (!$TEXINPUTS) { $TEXINPUTS = getcwd(); }
+# By default, search in current directory. We use '.' and not getcwd()
+# to avoid issues if the working directory contains a ':' character.
+if (!$TEXINPUTS) { $TEXINPUTS = '.'; }
my $verbose;
my $keep_comments;
@@ -24,6 +26,7 @@
my $graphics_extensions = ":.pdf:.png:.jpg:.eps";
my $expand_usepackage;
my $expand_bbl;
+my $biber;
my $fatal;
my $version;
my $makeatletter;
@@ -44,6 +47,7 @@
'graphics-extensions' => \$graphics_extensions,
'expand-usepackage' => \$expand_usepackage,
'expand-bbl=s' => \$expand_bbl,
+ 'biber=s' => \$biber,
'fatal' => \$fatal,
'version' => \$version,
'makeatletter' => \$makeatletter,
@@ -80,7 +84,7 @@
{
# $VERSION's value will be substituted by 'make dist', but the
# next line won't (the string has to be broken to avoid it).
- my $VERSION = 'v1.5';
+ my $VERSION = 'v1.6';
if ($VERSION eq '@LATEXPAND' . '_VERSION@') {
my($vol,$dir,$file) = File::Spec->splitpath($0);
chdir($dir);
@@ -130,6 +134,16 @@
process_file($file, " ");
}
+sub cat_file
+{
+ my $file = shift;
+ open (my $INFILE, "<", $file) || die "could not open input file '$file'\n";
+ while (<$INFILE>) {
+ print;
+ }
+ close ($INFILE);
+}
+
sub process_file
{
my $file = shift;
@@ -195,8 +209,10 @@
if ($in_preamble && /^[^%]*\\makeatother/) {
$makeatletter_found = 0;
}
+ my $command;
if (!$makeatletter && !$makeatletter_found
- && (my ($command) = /^[^%]*(\\[[:alpha:]]*@[[:alpha:]]*)/)) {
+ && (($command) = /^[^%]*(\\[[:alpha:]]*@[[:alpha:]]*)/)
+ && ($command ne '\@')) {
print STDERR "Warning: command $command containing @ found in\n";
print STDERR "Warning: $file.\n";
print STDERR "Warning: consider using --makeatletter if the result is not compilable.\n";
@@ -235,8 +251,16 @@
}
unless ($keep_includes) {
- if (my ($before, $ignored, $full_filename, $after)
- = /^($NON_COMMENT)\\include[{\s]+(.*?)[\s}](.*)$/) {
+ # \input{foo.tex}
+ my $ARGBRACES = '\{\\s*([^"}\\s][^}]*)(\\s*)\}';
+ # \input{"foo bar.tex"}
+ my $ARGQUOTED = '\{\\s*"([^"]*)"(\\s*)\}';
+ # \input foo.tex
+ my $ARGSPACES = '\\s([^\{\\s][^\\s]+?)\\s()';
+ my $ARGUMENT = "\\s*?(?|$ARGBRACES|$ARGQUOTED|$ARGSPACES)";
+
+ if (my ($before, $ignored, $full_filename, $trailing, $after)
+ = /^($NON_COMMENT)\\include$ARGUMENT(.*)$/) {
$full_filename = find_tex_file($full_filename . ".tex");
if ($full_filename) {
say $prefix . "Found include for file: $full_filename\n";
@@ -253,15 +277,19 @@
print $nl . $after . "\n";
$_ = "";
}
- } elsif (my ($before, $ignored, $full_filename, $after)
- = /^($NON_COMMENT)\\input[{\s]+(.*?)[\s}](.*)$/) {
+ } elsif (my ($before, $ignored, $full_filename, $trailing, $after)
+ = /^($NON_COMMENT)\\input$ARGUMENT(.*)$/) {
if ($inside_import) {
$full_filename = $inside_import . $full_filename;
}
$full_filename = find_tex_file($full_filename, ":.tex");
if ($full_filename) {
say $prefix . "Found input for file: $full_filename\n";
- print $before . $nl;
+ # Surprisingly, space after filename
+ # in \input{foo.tex } is inserted
+ # _before_ the inclusion. Apply this
+ # rule in latexpand.
+ print $before . $trailing . $nl;
print "% start input $full_filename\n" if ($explain);
my $in_comment = process_file($full_filename, $prefix . " ");
if ($explain) {
@@ -277,8 +305,8 @@
}
$_ = "";
}
- } elsif (my ($before, $ignored, $dir, $full_filename, $after)
- = /^($NON_COMMENT)\\(?:sub)?import[{\s]+(.*?)[\s}][{\s]+(.*?)[\s}](.*)$/) {
+ } elsif (my ($before, $ignored, $dir, $ignored, $full_filename, $ignored, $after)
+ = /^($NON_COMMENT)\\(?:sub)?import$ARGUMENT$ARGUMENT(.*)$/) {
if ($explain) {
print "% dir " . $dir ."\n";
print "% full_filename " . $full_filename ."\n";
@@ -312,8 +340,8 @@
}
$_ = "";
}
- } elsif (my ($before, $ignored, $args, $full_filename, $after)
- = /^($NON_COMMENT)\\includegraphics[\[\s]+(.*?)[\s\]][{\s]+(.*?)[\s}](.*)$/) {
+ } elsif (my ($before, $ignored, $args, $full_filename, $ignored, $after)
+ = /^($NON_COMMENT)\\includegraphics[\[\s]+(.*?)[\s\]]$ARGUMENT(.*)$/) {
if ($explain) {
print "% inside_import " . $inside_import ."\n";
print "% before " . $before ."\n";
@@ -327,8 +355,8 @@
print "$before\\includegraphics[$args]{$full_filename}$after\n";
$_ = "";
}
- } elsif (my ($before, $ignored, $args, $full_filename, $after)
- = /^($NON_COMMENT)\\lstinputlisting[\[\s]+(.*?)[\s\]][{\s]+(.*?)[\s}](.*)$/) {
+ } elsif (my ($before, $ignored, $args, $full_filename, $ignored, $after)
+ = /^($NON_COMMENT)\\lstinputlisting[\[\s]+(.*?)[\s\]]$ARGUMENT(.*)$/) {
if ($explain) {
print "% inside_import " . $inside_import ."\n";
print "% before " . $before ."\n";
@@ -373,6 +401,36 @@
$_ = "";
}
}
+ if ($biber) {
+ if (my ($before, $after)
+ = /^(.*)\\(?:addbibresource)\{[^\}]*\}(.*)$/) {
+ # See https://tex.stackexchange.com/questions/166518/biblatex-include-bbl-problem…
+ my $biber_noext = $biber;
+ $biber_noext =~ s/.bbl//;
+ print $before . $nl;
+ say $prefix . "Expanding Biber BBL file: $biber\n";
+ print '\begin{filecontents*}{' . $biber . '}' . "\n";
+ cat_file($biber);
+ print "\n";
+ print '\end{filecontents*}
+
+\usepackage{xpatch}
+
+%Patch the biblatex input command.
+%replace "testinput-bbl" if you change the name above.
+%disable if you want to run biblatex/biber normally
+\makeatletter
+\patchcmd\blx@bblinput{\blx@blxinit}
+ {\blx@blxinit
+ \def\jobname{' . $biber_noext . '}%new jobname
+ }{}{\fail}
+\makeatother
+ ';
+ say $prefix . "End expansion of Biber BBL file: $biber\n";
+ print " " . $nl . $after . "\n";
+ $_ = "";
+ }
+ }
if ($show_graphics) {
if (/\\includegraphics(\[[^\]]*\])?{([^}]*)}/) {
my $full_filename = $2;
@@ -393,10 +451,24 @@
print;
}
+sub unquote
+{
+ my $str = shift;
+ my $x = substr($str, 0, 1);
+ my $y = substr($str, -1, 1);
+ if ($x eq $y && ($x eq '"' || $x eq "'")) {
+ $str = substr($str, 1, -1);
+ }
+ # There's a weird LaTeX syntax: \include{"file\space
+ # with\space spaces"}, so remove these \space when unquoting.
+ $str =~ s/\\space / /g;
+ return $str;
+}
+
# search $1 in $TEXINPUTS, with possible extensions in $2
sub find_tex_file
{
- my $file = shift;
+ my $file = unquote(shift);
my $extensions = (shift || ":");
foreach my $ext (split(':', $extensions, -1)) {
my $full = find_file_global($file . $ext);
@@ -417,15 +489,17 @@
my $file = shift;
if (open(my $fh, "-|", "kpsewhich", $file)) {
my $full = <$fh>;
- chomp($full);
+ $full =~ s/\s+$//;
close($fh);
if ($full) {
return $full;
}
}
+ # Should be useless, but fall-back in case kpsewhich fails (or is not installed, or ...):
return find_file($file, $TEXINPUTS);
}
+# Find files, not searching for global files (to allow not expanding global .sty packages)
sub find_file
{
my ($file, $path) = @_;
@@ -436,6 +510,13 @@
return;
}
}
+
+ # TEXINPUTS=...: (trailing :) means "append default search
+ # directories". We don't want global directories here, but
+ # still add . that may be needed.
+ if (substr($path, -1) eq ':') {
+ $path .= '.';
+ }
foreach my $dir (split(':', $path)) {
if (-e "$dir/$file" && ! -d "$dir/$file") {
return("$dir/$file");
@@ -471,6 +552,10 @@
--expand-bbl FILE
Expand the bibliography by inlining FILE
(should be a *.bbl file)
+ --biber FILE Include \bibliography{} with FILE's content,
+ as needed by biblatex with the biber backend.
+ (similar to --expand-bbl FILE, but for
+ biber+biblatex).
--help this help message
--output <file>, -o <file>
generate output in <file>
@@ -577,4 +662,4 @@
=head1 VERSION
-This is latexpand version v1.5.
+This is latexpand version v1.6.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexpand.tlpobj new/tlpkg/tlpobj/latexpand.tlpobj
--- old/tlpkg/tlpobj/latexpand.tlpobj 2019-02-28 03:48:21.000000000 +0100
+++ new/tlpkg/tlpobj/latexpand.tlpobj 2019-12-13 01:54:36.000000000 +0100
@@ -1,6 +1,6 @@
name latexpand
category Package
-revision 50079
+revision 53109
shortdesc Expand \input and \include in a LaTeX document
longdesc Latexpand is a Perl script that simply replaces \input and
longdesc \include commands with the content of the input or included
@@ -10,7 +10,6 @@
texmf-dist/scripts/latexpand/latexpand
catalogue-contact-repository https://gitlab.com/latexpand/latexpand
catalogue-ctan /support/latexpand
-catalogue-date 2019-02-20 20:34:48 +0100
catalogue-license bsd
catalogue-topics file-mgmt
-catalogue-version 1.5
+catalogue-version 1.6
++++++ latexpand_perl.dif ++++++
--- /var/tmp/diff_new_pack.uIzbkv/_old 2020-05-29 21:29:37.825266316 +0200
+++ /var/tmp/diff_new_pack.uIzbkv/_new 2020-05-29 21:29:37.829266328 +0200
@@ -6,7 +6,7 @@
--- texmf-dist/scripts/latexpand/latexpand
+++ texmf-dist/scripts/latexpand/latexpand 2017-06-13 14:06:39.461591189 +0000
-@@ -161,6 +161,7 @@ sub process_file
+@@ -175,6 +175,7 @@ sub process_file
return $in_comment;
}
@@ -14,11 +14,11 @@
sub process_line
{
my ($line, $prefix, $commented_newline, $file) = @_;
-@@ -392,6 +393,7 @@ sub process_line
+@@ -450,6 +451,7 @@ sub process_line
}
print;
}
+use warnings;
- # search $1 in $TEXINPUTS, with possible extensions in $2
- sub find_tex_file
+ sub unquote
+ {
++++++ lato.doc.tar.xz ++++++
++++ 2417 lines of diff (skipped)
++++++ lato.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-n/lato.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606/lato.tar.xz differ: char 26, line 1
++++++ lcdftypetools.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/cfftot1.man1.pdf and new/texmf-dist/doc/man/man1/cfftot1.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/mmafm.man1.pdf and new/texmf-dist/doc/man/man1/mmafm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/mmpfb.man1.pdf and new/texmf-dist/doc/man/man1/mmpfb.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/otfinfo.man1.pdf and new/texmf-dist/doc/man/man1/otfinfo.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/otftotfm.man1.pdf and new/texmf-dist/doc/man/man1/otftotfm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/t1dotlessj.man1.pdf and new/texmf-dist/doc/man/man1/t1dotlessj.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/t1lint.man1.pdf and new/texmf-dist/doc/man/man1/t1lint.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/t1rawafm.man1.pdf and new/texmf-dist/doc/man/man1/t1rawafm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/t1reencode.man1.pdf and new/texmf-dist/doc/man/man1/t1reencode.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/t1testpage.man1.pdf and new/texmf-dist/doc/man/man1/t1testpage.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttftotype42.man1.pdf and new/texmf-dist/doc/man/man1/ttftotype42.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lcdftypetools.doc.tlpobj new/tlpkg/tlpobj/lcdftypetools.doc.tlpobj
--- old/tlpkg/tlpobj/lcdftypetools.doc.tlpobj 2019-03-27 02:24:11.000000000 +0100
+++ new/tlpkg/tlpobj/lcdftypetools.doc.tlpobj 2019-11-19 01:55:45.000000000 +0100
@@ -1,6 +1,6 @@
name lcdftypetools.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of lcdftypetools
docfiles size=105
texmf-dist/doc/man/man1/cfftot1.1
++++++ leadsheets.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leadsheets/README new/doc/latex/leadsheets/README
--- old/doc/latex/leadsheets/README 2017-09-27 01:19:58.000000000 +0200
+++ new/doc/latex/leadsheets/README 2019-10-03 23:10:20.000000000 +0200
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the LEADSHEETS package v0.5b 2017/09/26
+the LEADSHEETS package v0.6 2019/10/02
typesetting leadsheets and songbooks
@@ -8,7 +8,7 @@
Web: https://github.com/cgnieder/leadsheets
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2014-2017 Clemens Niederberger
+Copyright 2014--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/leadsheets/leadsheets_en.pdf and new/doc/latex/leadsheets/leadsheets_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leadsheets/leadsheets_en.tex new/doc/latex/leadsheets/leadsheets_en.tex
--- old/doc/latex/leadsheets/leadsheets_en.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/doc/latex/leadsheets/leadsheets_en.tex 2019-10-03 23:10:20.000000000 +0200
@@ -1,7 +1,7 @@
-% !arara: pdflatex: { shell: on , action: nonstopmode }
+% arara: pdflatex: { shell: on , action: nonstopmode }
% arara: biber
-% arara: pdflatex
-% arara: pdflatex
+% arara: pdflatex: { action: nonstopmode }
+% arara: pdflatex: { action: nonstopmode }
% --------------------------------------------------------------------------
% the LEADSHEETS package
%
@@ -11,7 +11,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets.doc.tlpobj new/tlpkg/tlpobj/leadsheets.doc.tlpobj
--- old/tlpkg/tlpobj/leadsheets.doc.tlpobj 2019-02-28 03:49:29.000000000 +0100
+++ new/tlpkg/tlpobj/leadsheets.doc.tlpobj 2019-10-04 01:54:07.000000000 +0200
@@ -1,6 +1,6 @@
name leadsheets.doc
category Package
-revision 45405
+revision 52275
shortdesc doc files of leadsheets
relocated 1
docfiles size=255
++++++ leadsheets.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leadsheets/leadsheet.cls new/tex/latex/leadsheets/leadsheet.cls
--- old/tex/latex/leadsheets/leadsheet.cls 2017-01-23 23:19:36.000000000 +0100
+++ new/tex/latex/leadsheets/leadsheet.cls 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.chordnames.code.tex new/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.chordnames.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -53,6 +53,7 @@
\tl_new:N \l__leadsheets_dim_tl
\tl_new:N \l__leadsheets_add_tl
\tl_new:N \l__leadsheets_major_seven_tl
+\tl_new:N \l__leadsheets_major_nine_tl
\tl_new:N \l__leadsheets_german_B_tl
\tl_new:N \l__leadsheets_german_H_tl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leadsheets/leadsheets.library.chords.code.tex new/tex/latex/leadsheets/leadsheets.library.chords.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.chords.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.chords.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.external.code.tex new/tex/latex/leadsheets/leadsheets.library.external.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.external.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.external.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.musejazz.code.tex new/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.musejazz.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.musicsymbols.code.tex new/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex 2017-01-23 23:19:36.000000000 +0100
+++ new/tex/latex/leadsheets/leadsheets.library.musicsymbols.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.properties.code.tex new/tex/latex/leadsheets/leadsheets.library.properties.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.properties.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.properties.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -42,7 +42,6 @@
\prop_gput:cnV {l__leadsheets_songs_#2_prop} {#1}
\l__leadsheets_tmpa_tl
}
-\cs_generate_variant:Nn \prop_gput:cnn {cnV}
\cs_generate_variant:Nn \leadsheets_set_property:nnn { nnx }
\cs_new:Npn \leadsheets_get_property:nn #1#2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex new/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.shorthands.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2016 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.songs.code.tex new/tex/latex/leadsheets/leadsheets.library.songs.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.songs.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.songs.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\LeadsheetsExplLibrary{songs}{2016/07/02 typesetting songs}
+\LeadsheetsExplLibrary{songs}{2019/10/02 typesetting songs}
% --------------------------------------------------------------------------
% messages:
@@ -533,14 +533,16 @@
\bool_if:cF {l__leadsheets_#1_empty_bool}
{
\tl_use:c {l__leadsheets_#1_label_format_tl}
- \bool_if:cT {l__leadsheets_#1_named_bool}
- {
- \leadsheets_translation:n {#1}
- \bool_if:cT {l__leadsheets_#1_numbered_bool} { ~ }
- }
- \bool_if:cT {l__leadsheets_#1_numbered_bool}
- { \use:c {the#1} }
- \tl_use:c {l__leadsheets_#1_after_label_tl}
+ {
+ \bool_if:cT {l__leadsheets_#1_named_bool}
+ {
+ \leadsheets_translation:n {#1}
+ \bool_if:cT {l__leadsheets_#1_numbered_bool} {~}
+ }
+ \bool_if:cT {l__leadsheets_#1_numbered_bool}
+ { \use:c {the#1} }
+ \tl_use:c {l__leadsheets_#1_after_label_tl}
+ }
}
}
@@ -790,3 +792,4 @@
2016/06/29: - adapt to changed shorthand library
- activate bar-shortcuts per default
2016/07/02: fix issue when \capo is used in a title template
+2019/10/02: enable https://tex.stackexchange.com/q/442222/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leadsheets/leadsheets.library.templates.code.tex new/tex/latex/leadsheets/leadsheets.library.templates.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.templates.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.templates.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.translations.code.tex new/tex/latex/leadsheets/leadsheets.library.translations.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.translations.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.translations.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.library.transposing.code.tex new/tex/latex/leadsheets/leadsheets.library.transposing.code.tex
--- old/tex/latex/leadsheets/leadsheets.library.transposing.code.tex 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.library.transposing.code.tex 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--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/leadsheets/leadsheets.sty new/tex/latex/leadsheets/leadsheets.sty
--- old/tex/latex/leadsheets/leadsheets.sty 2017-09-27 01:19:58.000000000 +0200
+++ new/tex/latex/leadsheets/leadsheets.sty 2019-10-03 23:10:20.000000000 +0200
@@ -7,7 +7,7 @@
% Clemens Niederberger
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2014-2017 Clemens Niederberger
+% Copyright 2014--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -27,8 +27,8 @@
% --------------------------------------------------------------------------
% package information:
\ExplSyntaxOn
-\tl_const:Nn \leadsheetsdate {2017/09/26}
-\tl_const:Nn \leadsheetsversion {0.5b}
+\tl_const:Nn \leadsheetsdate {2019/10/02}
+\tl_const:Nn \leadsheetsversion {0.6}
\tl_const:Nn \leadsheetsinfo {Typesetting leadsheets and songbooks}
\ProvidesExplPackage
@@ -60,10 +60,11 @@
\cs_generate_variant:Nn \seq_item:Nn { cV }
\cs_generate_variant:Nn \int_to_arabic:n { V }
\cs_generate_variant:Nn \tl_replace_once:Nnn { NnV }
-\cs_generate_variant:Nn \prop_gput:Nnn { cxx , NVf }
+\cs_generate_variant:Nn \prop_gput:Nnn { cnV , cxx , NVf }
\cs_generate_variant:Nn \msg_error:nnn { nnV }
\cs_generate_variant:Nn \msg_warning:nnn { nnV }
\cs_generate_variant:Nn \vbox_set:Nn { NV }
+\cs_generate_variant:Nn \prop_gput:Nnn { cnV }
% --------------------------------------------------------------------------
% temporary variables:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leadsheets.tlpobj new/tlpkg/tlpobj/leadsheets.tlpobj
--- old/tlpkg/tlpobj/leadsheets.tlpobj 2019-02-28 03:49:29.000000000 +0100
+++ new/tlpkg/tlpobj/leadsheets.tlpobj 2019-10-04 01:54:07.000000000 +0200
@@ -1,6 +1,6 @@
name leadsheets
category Package
-revision 45405
+revision 52275
shortdesc Typesetting leadsheets and songbooks
relocated 1
longdesc This LaTeX package offers support for typesetting simple
@@ -24,7 +24,7 @@
catalogue-contact-bugs https://github.com/cgnieder/leadsheets/issues
catalogue-contact-repository https://github.com/cgnieder/leadsheets
catalogue-ctan /macros/latex/contrib/leadsheets
-catalogue-date 2017-09-26 16:41:35 +0200
+catalogue-date 2019-10-03 06:09:40 +0200
catalogue-license lppl1.3
catalogue-topics music chords
-catalogue-version 0.5b
+catalogue-version 0.6
++++++ lectures.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lectures.doc.tlpobj new/tlpkg/tlpobj/lectures.doc.tlpobj
--- old/tlpkg/tlpobj/lectures.doc.tlpobj 2019-02-28 03:49:31.000000000 +0100
+++ new/tlpkg/tlpobj/lectures.doc.tlpobj 2020-02-03 01:54:56.000000000 +0100
@@ -1,6 +1,6 @@
name lectures.doc
category Package
-revision 49863
+revision 53642
shortdesc doc files of lectures
relocated 1
docfiles size=2
++++++ lectures.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lectures/lectures.cls new/tex/latex/lectures/lectures.cls
--- old/tex/latex/lectures/lectures.cls 2019-01-29 23:12:24.000000000 +0100
+++ new/tex/latex/lectures/lectures.cls 2020-02-02 23:42:37.000000000 +0100
@@ -1,5 +1,5 @@
%
-% Copyright 2018 Luca Cappelletti
+% Copyright 2020 Luca Cappelletti
%
% 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:
%
@@ -7,7 +7,7 @@
%
% 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.
%
-\def\LectureNotesVersion{v1.0.2}
+\def\LectureNotesVersion{v1.0.5}
\newcommand{\defaultlanguage}{italian}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{lectures}[2019/01/27 LaTeX document class for lectures notes.]
@@ -27,6 +27,10 @@
top=20mm,
}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\renewcommand{\familydefault}{\sfdefault}
+
% Disabling useless warnings.
\RequirePackage{silence}
\WarningFilter{latex}{You have requested package}
@@ -49,7 +53,11 @@
\RequirePackage{centernot}
\RequirePackage{framed}
\RequirePackage{float}
+\RequirePackage{stmaryrd}
+\RequirePackage{verbatim}
+\RequirePackage{gensymb}
\RequirePackage[colorlinks=true,urlcolor=blue,pdfpagelabels,hyperindex=false]{hyperref} % Enable table of contents and links.
+\RequirePackage{diagbox}% To make split cellboxes
\RequirePackage[x11names,table,dvipsnames]{xcolor}
\RequirePackage{subfiles} % To use subfiles without cruxifying saints
@@ -67,6 +75,11 @@
\RequirePackage{sectsty} % Styles sectional headers
\RequirePackage{fancyhdr} % This allows for the headings in the chapters
\pagestyle{fancy} % This activates it
+
+% Reset the page number position
+\cfoot{} % Make the center of the footer blank
+\rfoot{\thepage} % Add the page number to the right corner of the page
+
\RequirePackage[avantgarde]{quotchap} % Custom style for chapters
% Reduce chapter name size and reserved blank space.
@@ -76,11 +89,11 @@
{\size@chapter{\sectfont\raggedleft
{\chapnumfont
\ifnum \c@secnumdepth >\m@ne%
- \if@mainmatter\thechapter\else\phantom{\thechapter}%
+ \if@mainmatter\Huge\thechapter\else\phantom{\thechapter}%
\fi\else\phantom{\thechapter}\fi
\par\nobreak}%
{\raggedleft\advance\leftmargin10em\interlinepenalty\@M #1\par}}
- \nobreak\chapterheadendvskip}}
+ \nobreak}}
\makeatother
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -142,20 +155,12 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareMathOperator{\var}{Var}
-\DeclareMathOperator{\conv}{conv}
-\DeclareMathOperator*{\argmin}{argmin}
-\DeclareMathOperator*{\argmax}{argmax}
-\DeclareMathOperator*{\mcd}{mcd}
-\DeclareMathOperator*{\mcp}{mcp}
-\DeclareMathOperator*{\Gr}{G=\rnd{V, E}}
-%\DeclareMathOperator* this one allows to create environment that behave like sum or min
-
\newcommand{\crs}{\text{\Cross}}
\newcommand*{\QED}{\hfill\ensuremath{\square}}%
\newcommand{\bra}[1]{\left\langle#1\right\rvert}
\newcommand{\ket}[1]{\left\lvert#1\right\rangle}
+\newcommand{\ngle}[1]{\left\langle#1\right\rangle}
\newcommand{\braket}[2]{\left\langle#1\delimsize\vert#2\right\rangle}
\newcommand{\ceil}[1]{\left\lceil#1\right\rceil}
@@ -165,9 +170,11 @@
\newcommand{\norm}[1]{\left\lVert#1\right\rVert}
\newcommand{\rnd}[1]{\left(#1\right)}
\newcommand{\sqr}[1]{\left[#1\right]}
+\newcommand{\ssqr}[1]{\llbracket#1\rrbracket}
\newcommand{\crl}[1]{\left\{#1\right\}}
\newcommand{\arity}[1]{\#\crl{#1}}
-
+\renewcommand{\hat}{\widehat}
+\renewcommand{\tilde}{\widetilde}
\let\oldbm\bm
\renewcommand{\bar}{\overline}
\renewcommand{\bm}[1]{\oldbm{\underline{#1}}}
@@ -176,17 +183,29 @@
\renewcommand{\geq}{\geqslant}
\renewcommand{\leq}{\leqslant}
+\DeclareMathOperator{\var}{Var}
+\DeclareMathOperator{\conv}{conv}
+\DeclareMathOperator*{\argmin}{argmin}
+\DeclareMathOperator*{\argmax}{argmax}
+\DeclareMathOperator*{\mcd}{mcd}
+\DeclareMathOperator*{\mcp}{mcp}
+\DeclareMathOperator*{\Gr}{G=\rnd{V, E}}
+%\DeclareMathOperator* this one allows to create environment that behave like sum or min
+
\def\zero{0}
\def\one{1}
\def\negative{-}
\def\positive{+}
\def\false{\zero}
\def\true{\one}
+\newcommand{\C}{\mathbb{C}}
\newcommand{\R}{\mathbb{R}}
\newcommand{\D}{\mathbb{D}}
\newcommand{\Z}{\mathbb{Z}}
\newcommand{\N}{\mathbb{N}}
\newcommand{\bs}{\backslash}
+\newcommand{\funcdef}[3]{#1:#2\longrightarrow #3}
+\newcommand{\fdef}[2]{\funcdef{f}{#1}{#2}}
\renewcommand{\O}[1]{\mathcal{O}\rnd{#1}}
@@ -212,7 +231,7 @@
\renewcommand{\a}{\alpha}
\newcommand{\w}{\omega}
-\newcommand{\e}{\epsilon}
+\newcommand{\e}{\varepsilon}
\buildVectorAliases{a}[\a]
\buildVectorAliases{w}[\w]
@@ -229,6 +248,18 @@
\buildVectorAliases{y}
\buildVectorAliases{z}
+% Derivates
+\NewDocumentCommand{\derivative}{m m}{
+ \frac{d #1}{d #2}
+}
+\NewDocumentCommand{\pderivative}{m m}{
+ \frac{\partial #1}{\partial #2}
+}
+% Matrix
+\NewDocumentCommand{\Matrix}{m}{
+ \begin{bmatrix}#1\end{bmatrix}
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% CUSTOM PROBABILITY COMMANDS AND MACROS %
@@ -267,12 +298,12 @@
% #5 (optional) -> upscript
%
\ifblank{#3}{%
- \mathbb{E}_{#4}^{#5}\rnd{#1}
+ \mathbb{E}_{#4}^{#5}\sqr{#1}
}{%
\IfNoValueTF{#2}{%
- \mathbb{E}_{#4}^{#5}\rnd{\left. #1 \;\right\rvert\; #3}
+ \mathbb{E}_{#4}^{#5}\sqr{\left. #1 \;\right\rvert\; #3}
}{%
- \mathbb{E}_{#4}^{#5}\rnd{#1\;#2\;#3}
+ \mathbb{E}_{#4}^{#5}\sqr{#1\;#2\;#3}
}
}
}
@@ -394,6 +425,27 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Units macro to be able to do \unit{m} to get \leftm\right] and \unit{m}{s} to get \left[\frac{m}{s}\right]
+\NewDocumentCommand{\unit}{m G{}}{
+ \ifblank{#2}{
+ \sqr{#1}
+ }{
+ \sqr{\frac{#1}{#2}}
+ }
+}
+
+\def\celsius{
+ ^\circ C
+}
+
+\def\kelvin{
+ ^\circ K
+}
+
+\def\fahrenheit{
+ ^\circ F
+}
+
\def\hz{
Hz
}
@@ -409,6 +461,8 @@
% automaticall apply mathmode to column
\newcolumntype{L}{>{$}l<{$}}
+\newcolumntype{C}{>{$}c<{$}}
+\newcolumntype{R}{>{$}r<{$}}
\renewcommand*{\arraystretch}{1.25} % Stretching arrays
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -470,7 +524,6 @@
\ctikzset{tripoles/mos style/arrows}
\ctikzset{tripoles/pmos style/emptycircle}
\usetikzlibrary{shapes,arrows,calc,positioning,matrix}
-\usepgfplotslibrary{external}
\pgfplotsset{samples=60,shader=interp,grid=both}
@@ -495,68 +548,46 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\theoremstyle{definition} % Sets the theorem style without italic
-
-\IfEq{\defaultlanguage}{italian}{
- \newtheorem{theorem}{Teorema}[section]
- \newtheorem{corollary}{Corollario}[theorem]
- \newtheorem{lemma}[theorem]{Lemma}
- \newtheorem{proposition}[theorem]{Proposizione}
- \newtheorem{observation}[theorem]{Osservazione}
- \newtheorem{definition}[theorem]{Definizione}
- \newtheorem{complexity}[theorem]{Complessità computazionale}
- \newtheorem{property}[theorem]{Proprietà}
- \newtheorem{problem}[theorem]{Problema}
- \newtheorem{customProof}[theorem]{Dimostrazione}
-}{
- \IfEq{\defaultlanguage}{italian}{
- \newtheorem{theorem}{Theorem}[section]
- \newtheorem{corollary}{Corollary}[theorem]
- \newtheorem{lemma}[theorem]{Lemma}
- \newtheorem{proposition}[theorem]{Proposition}
- \newtheorem{observation}[theorem]{Observation}
- \newtheorem{definition}[theorem]{Definition}
- \newtheorem{complexity}[theorem]{Computational complexity}
- \newtheorem{property}[theorem]{Property}
- \newtheorem{problem}[theorem]{Problem}
- \newtheorem{customProof}[theorem]{Proof}
- }{
- \PackageError{lectures}{%
- Given language option is unknown.
- }{%
- Use either italian or english.
- }
- }
+\usepackage{tcolorbox}
+\NewDocumentCommand{\createtheorem}{m m m m m}{%
+ % #1 -> environment name
+ % #2 -> italian name
+ % #3 -> background color
+ % #4 -> border color
+ % #5 -> title color
+
+ \newtcolorbox[auto counter,number within=chapter]{#1}[1][]{colback=#3,colframe=#4,coltitle=#5,fonttitle=\bfseries,parbox=false,title=#2~\thetcbcounter~|~##1}
}
+\createtheorem{axiom}{Assioma}{Gold1!10}{Gold1!60}{black}
+\createtheorem{goal}{Obbiettivo}{Goldenrod1!10}{Goldenrod1!50}{black}
-\let\oldTheorem\theorem
-\renewenvironment{theorem}{\colorlet{shadecolor}{Green!15}\begin{shaded}\begin{oldTheorem}}{\end{oldTheorem}\end{shaded}\ignorespacesafterend}
+\createtheorem{definition}{Definizione}{Red2!10}{Red2!40}{black}
-\let\oldDefinition\definition
-\renewenvironment{definition}{\colorlet{shadecolor}{Red!10}\begin{shaded}\begin{oldDefinition}}{\end{oldDefinition}\end{shaded}\ignorespacesafterend}
+\createtheorem{fact}{Fatto}{Green3!10}{Green3!30}{black}
+\createtheorem{theorem}{Teorema}{Chartreuse2!10}{Chartreuse3!30}{black}
+\createtheorem{lemma}{Lemma}{Chartreuse3!10}{Chartreuse3!40}{black}
-\let\oldCorollary\corollary
-\renewenvironment{corollary}{\colorlet{shadecolor}{Brown!10}\begin{shaded}\begin{oldCorollary}}{\end{oldCorollary}\end{shaded}\ignorespacesafterend
-}
+\createtheorem{claim}{Affermazione}{Chartreuse3!10}{Chartreuse3!40}{black}
-\let\oldProposition\proposition
-\renewenvironment{proposition}{\colorlet{shadecolor}{Green!5}\begin{shaded}\begin{oldProposition}}{\end{oldProposition}\end{shaded}\ignorespacesafterend
-}
+\createtheorem{corollary}{Corollario}{Sienna2!10}{Sienna2!60}{black}
+\createtheorem{property}{Proprietà}{Sienna2!10}{Sienna2!90}{white}
-\let\oldLemma\lemma
-\renewenvironment{lemma}{\colorlet{shadecolor}{Green!10}\begin{shaded}\begin{oldLemma}}{\end{oldLemma}\end{shaded}\ignorespacesafterend
-}
+\createtheorem{proposition}{Proposizione}{SpringGreen3!10}{SpringGreen3!30}{black}
+\createtheorem{observation}{Osservazione}{Firebrick2!10}{Firebrick2!40}{black}
-\let\oldComplexity\complexity
-\renewenvironment{complexity}{\colorlet{shadecolor}{Melon!10}\begin{shaded}\begin{oldComplexity}}{\end{oldComplexity}\end{shaded}\ignorespacesafterend}
+\createtheorem{conclusion}{Conclusione}{SteelBlue3!10}{SteelBlue3!90}{black}
+\createtheorem{generalization}{Generalizzazione}{LavenderBlush3!10}{LavenderBlush3}{black}
-\let\oldProperty\property
-\renewenvironment{property}{\colorlet{shadecolor}{Red!10}\begin{shaded}\begin{oldProperty}}{\end{oldProperty}\end{shaded}\ignorespacesafterend}
+\createtheorem{problem}{Problema}{Red1!10}{Red1!60}{white}
+\createtheorem{example}{Esempio}{MediumPurple3!10}{MediumPurple3!40}{black}
-\let\oldProblem\problem
-\renewenvironment{problem}{\colorlet{shadecolor}{Red!15}\begin{shaded}\begin{oldProblem}}{\end{oldProblem}\end{shaded}\ignorespacesafterend}
+\createtheorem{solution}{Soluzione}{DodgerBlue3!10}{DodgerBlue3!30}{black}
+\createtheorem{analysis}{Analisi}{DeepPink2!10}{DeepPink2!30}{black}
+\createtheorem{complexity}{Complessità}{Turquoise4!10}{Turquoise4}{black}
-\renewenvironment{proof}{\colorlet{shadecolor}{Violet!10}\begin{shaded}\begin{customProof}}{\QED\end{customProof}\end{shaded}\ignorespacesafterend}
+\createtheorem{proofWrapper}{Dimostrazione}{DarkOrchid4!10}{DarkOrchid4!30}{black}
+\renewenvironment{proof}{\begin{proofWrapper}}{\end{proofWrapper}}
%
% THE FOLLOWING CODE ADDS BOLD TO THE THEOREM NAME
@@ -694,4 +725,23 @@
\RenewDocumentCommand{\tableofcontents}{}{
{\hypersetup{hidelinks}\oldtableofcontents}
-}
\ No newline at end of file
+}
+
+\NewDocumentCommand{\DisableTikz}{}{%
+ \newif\ifshowtikz
+ \showtikztrue
+ \showtikzfalse % <---- comment/uncomment that line
+
+ \let\oldtikzpicture\tikzpicture
+ \let\oldendtikzpicture\endtikzpicture
+
+ \renewenvironment{tikzpicture}{%
+ \ifshowtikz\expandafter\oldtikzpicture%
+ \else\comment%
+ \fi
+ }{%
+ \ifshowtikz\oldendtikzpicture%
+ \else\endcomment%
+ \fi
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lectures.tlpobj new/tlpkg/tlpobj/lectures.tlpobj
--- old/tlpkg/tlpobj/lectures.tlpobj 2019-02-28 03:49:31.000000000 +0100
+++ new/tlpkg/tlpobj/lectures.tlpobj 2020-02-03 01:54:56.000000000 +0100
@@ -1,7 +1,7 @@
name lectures
category Package
-revision 49863
-shortdesc Lectures - A document class for quickly drafting nice looking lecture notes
+revision 53642
+shortdesc A document class for quickly drafting nice looking lecture notes
relocated 1
longdesc This LaTeX documentclass provides a number of gimmicks to draft
longdesc nice looking lecture notes, such as a number of theorem
@@ -12,7 +12,6 @@
catalogue-contact-bugs https://github.com/LucaCappelletti94/lectures/issues
catalogue-contact-repository https://github.com/LucaCappelletti94/lectures
catalogue-ctan /macros/latex/contrib/lectures
-catalogue-date 2019-01-29 06:09:06 +0100
catalogue-license mit
catalogue-topics class presentation teaching
-catalogue-version 1.0.2
+catalogue-version 1.0.5
++++++ leipzig.doc.tar.xz ++++++
Binary files old/doc/latex/leipzig/leipzig.pdf and new/doc/latex/leipzig/leipzig.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leipzig.doc.tlpobj new/tlpkg/tlpobj/leipzig.doc.tlpobj
--- old/tlpkg/tlpobj/leipzig.doc.tlpobj 2019-02-28 03:49:33.000000000 +0100
+++ new/tlpkg/tlpobj/leipzig.doc.tlpobj 2019-10-20 01:55:02.000000000 +0200
@@ -1,6 +1,6 @@
name leipzig.doc
category Package
-revision 44625
+revision 52450
shortdesc doc files of leipzig
relocated 1
docfiles size=149
++++++ leipzig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/leipzig/leipzig.ist new/makeindex/leipzig/leipzig.ist
--- old/makeindex/leipzig/leipzig.ist 2017-06-18 01:46:41.000000000 +0200
+++ new/makeindex/leipzig/leipzig.ist 2019-10-19 23:18:06.000000000 +0200
@@ -1,5 +1,5 @@
% makeindex style file created by the glossaries package
-% for document 'leipzig' on 2017-6-18
+% for document 'leipzig' on 2019-10-19
actual '?'
encap '|'
level '!'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leipzig/leipzig.sty new/tex/latex/leipzig/leipzig.sty
--- old/tex/latex/leipzig/leipzig.sty 2017-06-18 01:46:41.000000000 +0200
+++ new/tex/latex/leipzig/leipzig.sty 2019-10-19 23:18:06.000000000 +0200
@@ -12,7 +12,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-%% Copyright (C) 2017 by Natalie Weber <natalie.a.weber(a)gmail.com>
+%% Copyright (C) 2019 by Natalie Weber <natalie.a.weber(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -38,7 +38,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1996/10/24]%
\ProvidesPackage{leipzig}%
- [2017/06/16 v2.0 Leipzig package for linguistic abbreviations]%
+ [2019/10/19 v2.3 Leipzig package for linguistic abbreviations]%
@@ -422,7 +422,7 @@
}%
\def\@newleipzig#1#2\@nil{%
\ifleipzigdonotindex
- \uppercase{\expandafter\gdef\csname #2}#2\endcsname{%
+ \uppercase{\expandafter\gdef\csname #1}#2\endcsname{%
\leipzigfont{\glsentryshort{#1#2}}%
}%
\else
@@ -468,7 +468,8 @@
\fi
{\newleipzig{#2}}{\newleipzig[#1]{#2}}%
}%
-}{%
+}%
+{%
\newcommand{\newleipzig}[4][]{\@newleipzig(#3)#2\@nil}%
\newcommand{\renewleipzig}[4][]{%
\if@leipzig@defined{#2}
@@ -482,16 +483,26 @@
\@gobbletwo
}%
}
+ \def\if@leipzig@defined#1{%
+ \uppercase\expandafter{\expandafter\ifcsname\@car#1\@nil}\@cdr#1\@nil\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }
\def\@newleipzig(#1)#2#3\@nil{%
\uppercase{\expandafter\gdef\csname #2}#3\endcsname{\leipzigfont{#1}}
}%
}
\@ifpackageloaded{glossaries}{%
+ \ifleipzig@nostandards\leipzigdonotindextrue\fi
\loadglsentries{leipzig.tex}%
+ \glsfindwidesttoplevelname[\leipzigtype]%
+ \leipzigdonotindexfalse
}%
{\input{leipzig.tex}}%
%%
-%% Copyright (C) 2017 by Natalie Weber <natalie.a.weber(a)gmail.com>
+%% Copyright (C) 2019 by Natalie Weber <natalie.a.weber(a)gmail.com>
%%
%% 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/leipzig/leipzig.tex new/tex/latex/leipzig/leipzig.tex
--- old/tex/latex/leipzig/leipzig.tex 2017-06-18 01:46:41.000000000 +0200
+++ new/tex/latex/leipzig/leipzig.tex 2019-10-19 23:18:06.000000000 +0200
@@ -12,7 +12,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-%% Copyright (C) 2017 by Natalie Weber <natalie.a.weber(a)gmail.com>
+%% Copyright (C) 2019 by Natalie Weber <natalie.a.weber(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -47,14 +47,13 @@
%% http://www.eva.mpg.de/lingua/resources/glossing-rules.php %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\makeatletter\ifleipzig@nostandards\leipzigdonotindextrue\fi\makeatother
+\newleipzig{aarg}{a}{agent} %agent-like argument of
\newleipzig{abl}{abl}{ab\-la\-tive} %ablative
\newleipzig{abs}{abs}{ab\-so\-lu\-tive} %absolutive
\newleipzig{acc}{acc}{ac\-cusa\-tive} %accusative
\newleipzig{adj}{adj}{ad\-jec\-tive} %adjective
\newleipzig{adv}{adv}{ad\-ver\-bial} %adverb(ial)
-\newleipzig{aarg}{a}{agent} %agent-like argument of
\newleipzig{agr}{agr}{agreement} %agreement
\newleipzig{all}{all}{al\-la\-tive} %allative
\newleipzig{antip}{antip}{anti\-pas\-sive} %antipassive
@@ -102,8 +101,8 @@
\newleipzig{nom}{nom}{nom\-in\-ative} %nominative
\newleipzig{obj}{obj}{object} %object
\newleipzig{obl}{obl}{ob\-lique} %oblique
-\newleipzig{pass}{pass}{passive} %passive
\newleipzig{parg}{p}{patient} %patient
+\newleipzig{pass}{pass}{passive} %passive
\newleipzig{pfv}{pfv}{per\-fec\-tive} %perfective
\newleipzig{pl}{pl}{plural} %plural
\newleipzig{poss}{poss}{possessive} %possessive
@@ -122,15 +121,21 @@
\newleipzig{refl}{refl}{reflexive} %reflexive
\newleipzig{rel}{rel}{relative} %relative
\newleipzig{res}{res}{re\-sul\-ta\-tive} %resultative
-\newleipzig{sbj}{sbj}{subject} %subject
-\newleipzig{subj}{subj}{sub\-junc\-tive} %subjunctive
-\newleipzig{sg}{sg}{singular} %singular
\newleipzig{sarg}{s}{argument of intransitive verb}
%single argument of intransitive verb
+\newleipzig{sbj}{sbj}{subject} %subject
+\newleipzig{sbjv}{sbjv}{sub\-junc\-tive} %subjunctive
+\newleipzig{sg}{sg}{singular} %singular
\newleipzig{top}{top}{topic} %topic
\newleipzig{tr}{tr}{tran\-si\-tive} %transitive
\newleipzig{voc}{voc}{voc\-ative} %vocative
+%% For backwards compatibility with older versions of the leipzig package,
+%% where `subjunctive' was incorrectly abbreviated to SUBJ.
+
+\providecommand{\Subj}{}
+\let\Subj\Sbjv
+
%% Define short versions of person + number:
\newleipzig{first}{1}{first person}%
\newleipzig{second}{2}{second person}%
@@ -146,15 +151,8 @@
\newcommand{\Tdu}{{\Third}{\Du}}%
\newcommand{\Tpl}{{\Third}{\Pl}}%
-\makeatletter
-\@ifpackageloaded{glossaries}{% if glossary-tree loaded
- \glsfindwidesttoplevelname[\leipzigtype]%
-}{\relax}%
-\leipzigdonotindexfalse
-\makeatother
-
%%
-%% Copyright (C) 2017 by Natalie Weber <natalie.a.weber(a)gmail.com>
+%% Copyright (C) 2019 by Natalie Weber <natalie.a.weber(a)gmail.com>
%%
%% 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/leipzig.tlpobj new/tlpkg/tlpobj/leipzig.tlpobj
--- old/tlpkg/tlpobj/leipzig.tlpobj 2019-02-28 03:49:34.000000000 +0100
+++ new/tlpkg/tlpobj/leipzig.tlpobj 2019-10-20 01:55:03.000000000 +0200
@@ -1,6 +1,6 @@
name leipzig
category Package
-revision 44625
+revision 52450
shortdesc Typeset and index linguistic gloss abbreviations
relocated 1
longdesc The leipzig package provides a set of macros for standard
@@ -14,7 +14,7 @@
RELOC/tex/latex/leipzig/leipzig.tex
catalogue-contact-repository https://github.com/natalieweber/leipzig
catalogue-ctan /macros/latex/contrib/leipzig
-catalogue-date 2017-06-17 09:57:56 +0200
+catalogue-date 2019-10-18 21:58:43 +0200
catalogue-license lppl1.3
catalogue-topics linguistic
-catalogue-version 2.0
+catalogue-version 2.3
++++++ lettre.doc.tar.xz ++++++
++++ 28420 lines of diff (skipped)
++++++ lettre.tar.xz ++++++
++++ 3025 lines of diff (skipped)
++++++ lettrine.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lettrine/README new/doc/latex/lettrine/README
--- old/doc/latex/lettrine/README 2018-08-26 23:26:43.000000000 +0200
+++ new/doc/latex/lettrine/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
- Lettrine bundle
-
-This bundle contains a package that I maintain to typeset dropped
-capitals in a LaTeX document.
-
-It is subject to the LaTeX Project Public License.
-See http://www.latex-project.org/lppl.txt
-for the details of that license.
-
-Installation: this bundle is included in most TeX distributions, but
-if you need to install it by yourself
-1. run lualatex on lettrine.dtx to get the documentation (lettrine.pdf),
-2. run luatex on lettrine.ins to strip the comments and create
- lettrine.sty and lettrine.cfg
-3. run luatex on contrib.dtx to produce the *.cfl files.
-Files lettrine.sty, lettrine.cfg, lettrine-*.sty and *.cfl go to to
-a directory searched by TeX, typically $TEXMF/tex/latex/lettrine.
-Files README, demo*, *.pdf go to a doc directory, typically
-$TEXMF/doc/latex/lettrine.
-Files *.dtx, *.ins go to a source directory, typically
-$TEXMF/source/latex/lettrine
-
-If you wish, you can customize lettrine.cfg according to your needs.
-
-Have a look at one of the PDF files, demo.pdf (in French), or
-demo-de.pdf (in German) in the doc directory, to see how
-different layouts for dropped capitals can be achieved.
-You can also play with the source files demo.tex or demo-de.tex.
-Have a look at lettrine.pdf in the doc directory, if you are interested
-in the complete documentation and code.
-
---
-Daniel Flipo, <daniel.flipo(a)free.fr>
-August, 25th, 2018.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lettrine/README.md new/doc/latex/lettrine/README.md
--- old/doc/latex/lettrine/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lettrine/README.md 2020-03-26 22:28:05.000000000 +0100
@@ -0,0 +1,50 @@
+The Lettrine bundle
+===================
+
+Description
+-----------
+
+This package is meant for typesetting dropped capitals in LaTeX documents.
+
+Documentation
+-------------
+
+Have a look at one of the PDF files, demo-fr.pdf (in French),
+demo-de.pdf (in German) or demo-lua.pdf in the doc directory,
+to see how different layouts for dropped capitals can be achieved.
+You can also play with the source files demo-*.tex.
+
+Have a look at lettrine.pdf in the doc directory, if you are interested
+in the complete documentation and code.
+
+If you wish, you can customize lettrine.cfg according to your needs.
+
+License
+-------
+
+Released under the LaTeX Project Public License v1.3 or later
+See http://www.latex-project.org/lppl.txt
+for the details of that license.
+
+Installation
+------------
+
+This bundle is included in most TeX distributions, but if you need
+to install it by yourself
+1. run lualatex on lettrine.dtx to get the documentation (lettrine.pdf),
+2. run luatex on lettrine.ins to strip the comments and create
+ lettrine.sty and lettrine.cfg
+3. run luatex on contrib.dtx to produce the *.cfl files.
+
+Files lettrine.sty, lettrine.cfg, lettrine-*.sty and *.cfl go to to
+a directory searched by TeX, typically $TEXMF/tex/latex/lettrine.
+
+Files README, demo*, *.pdf go to a doc directory, typically
+$TEXMF/doc/latex/lettrine.
+
+Files *.dtx, *.ins go to a source directory, typically
+$TEXMF/source/latex/lettrine
+
+--
+Copyright 1999--2020 Daniel Flipo
+E-mail: daniel (dot) flipo (at) free (dot) fr
Binary files old/doc/latex/lettrine/demo-de.pdf and new/doc/latex/lettrine/demo-de.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lettrine/demo-de.tex new/doc/latex/lettrine/demo-de.tex
--- old/doc/latex/lettrine/demo-de.tex 2018-08-21 23:52:33.000000000 +0200
+++ new/doc/latex/lettrine/demo-de.tex 2020-03-26 22:28:05.000000000 +0100
@@ -1,22 +1,25 @@
-%Format: pdfLaTeX
-\documentclass[12pt,a4paper]{article}
+\documentclass[a4paper,12pt,german]{article}
+\usepackage{iftex}
+\iftutex
+ \usepackage{fontspec}
+ \setmainfont{erewhon} % erewhon (Utopia)
+\else
+ \usepackage{fourier} % fourier (Utopia) und
+ \renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter fonts
+\fi
\usepackage[a4paper,text={150mm,240mm},centering]{geometry}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{palatino} % Palatino und
-\renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter fonts
\usepackage{microtype}
\usepackage{lettrine}
\usepackage{graphicx,color}
\usepackage{lettrine}
-\usepackage{german}
+\usepackage{babel}
-\newcommand{\MF}{{\small\sffamily\scshape metafont}}
-\newcommand{\MP}{{\small\sffamily\scshape metapost}}
+\newcommand{\MF}{{\small\scshape metafont}}
+\newcommand{\MP}{{\small\scshape metapost}}
\setlength{\parindent}{0pt}
\sloppy
\begin{document}
@@ -55,11 +58,11 @@
\vspace{\baselineskip}
\textit{Initiale vollständig im Randbereich} :\\
-\verb+\lettrine[lhang=1, nindent=0pt, lines=3]{V}{erschieben}+
+\verb+\lettrine[lhang=1,findent= .3em,nindent=0pt,lines=3]{V}{erschieben}+
-\lettrine[lhang=1, nindent=0pt, lines=3]{V}{erschieben} wir nun im vierten
-Beispiel die Initiale in den Randbereich. Dieses Verhalten wird durch den
-Parameter \verb+lhang= + gesteuert.
+\lettrine[lhang=1,findent= .3em,nindent=0pt,lines=3]{V}{erschieben}
+wir nun im vierten Beispiel die Initiale in den Randbereich.
+Dieses Verhalten wird durch den Parameter \verb+lhang= + gesteuert.
\vspace{\baselineskip}
\textit{Initiale, vergrössert und teilweise im Randbereich} :\\
@@ -91,10 +94,10 @@
\newpage
\textit{Wir verkleinern die Initiale nun um 10\% und heben sie
-um 10\% wegen des {\glqq}Q{\grqq}}
-\verb+\lettrine[lines=4, loversize=-.1, lraise=.1]{Q}{ualität}+
+um 15\% wegen des {\glqq}Q{\grqq}}:\\
+\verb+\lettrine[lines=4, loversize=-.15, lraise=.15]{Q}{ualität}+
-\lettrine[lines=4, loversize=-.1, lraise=.1]{Q}{ualität} hat ihren
+\lettrine[lines=4, loversize=-.15, lraise=.15]{Q}{ualität} hat ihren
Preis. Und wenn es nur die Zeit ist, um zu lernen wie Sie solche Spielereien
anstellen können. Bei den Ergebnissen lohnt sich aber die Mühe. Welche
Parameter diesmal was beeinflussen, lasse ich Sie nun selbst herausfinden.
@@ -130,24 +133,24 @@
der Neigung des {\ttfamily\upshape V} folgt; Das {\ttfamily\upshape V} ragt
zusätzlich halb in den Rand hinein
(Option {\ttfamily\upshape lhang=0.5} :})\\
-\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]+\\
+\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em,nindent=0pt]+\\
\verb+ {V}{iel} ist...+
-\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]{V}{iel} ist hier
-nicht anders. Nur die negative Neigung und das Hereinragen in den Rand. Ob
-Ihnen das Ergebnis gefällt müssen Sie selber entscheiden. Sie sehen aber,
-das das {\glqq}V{\grqq} wirklich keine Schwierigkeiten bietet. Der Unterschied
-zum vorhergehenden Beispiel ist nicht besonders gross.
+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em, nindent=0pt]{V}{iel}
+ist hier nicht anders. Nur die negative Neigung und das Hereinragen in den
+Rand. Ob Ihnen das Ergebnis gefällt müssen Sie selber entscheiden.
+Sie sehen aber, das das {\glqq}V{\grqq} wirklich keine Schwierigkeiten bietet.
+Der Unterschied zum vorhergehenden Beispiel ist nicht besonders gross.
\vspace{.5\baselineskip}
\textit{Ändern wir nun die Schriftfamilie für die Initiale
(hier AvantGarde bold italique):}\\
-\verb+\renewcommand{\LettrineFontHook}{\fontfamily{pag}%+\\
+\verb+\renewcommand{\LettrineFontHook}{\fontfamily{pag}\fontencoding{T1}%+\\
\verb+ \fontseries{bx}\fontshape{it}}+\\
\verb+\lettrine[findent=.3em]{A}{uch} ein Wechsel...+
{% (Ändern des lokalen fonts)
-\renewcommand{\LettrineFontHook}{\fontfamily{pag}\fontseries{bx}\fontshape{it}}
+\renewcommand{\LettrineFontHook}{\fontfamily{pag}\fontencoding{T1}\fontseries{bx}\fontshape{it}}
\lettrine[findent=.3em]{A}{uch} ein Wechsel der Schriftfamilie ist problemlos
möglich. Hier verwenden wir Avantgarde und setzen mit der Option
@@ -157,11 +160,12 @@
\vspace{.5\baselineskip}
\textit{Ändern wir nun die Schriftfamilie und die Farbe für die Initiale
(hier yfrak in Grau) :}\\
-\verb+\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\color[gray]{0.5}}+\\
-\verb+\lettrine[loversize=0.1]{A}{uch}...+
+\verb+\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\fontencoding{T1}+\\
+\verb+ \color[gray]{0.5}}\lettrine[loversize=0.1]{A}{uch}...+
{% (Aendern des lokalen fonts)
-\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\color[gray]{0.5}}
+\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\fontencoding{T1}
+ \color[gray]{0.5}}
\lettrine[loversize=0.1]{A}{uch} ein Wechsel der
Schriftfamilie ist problemlos möglich. Hier verwenden wir yfrak,
@@ -181,14 +185,14 @@
\vspace{.5\baselineskip}
{% Gruppierung, um die LOKALEN Definitionen zu schützen
-\fontfamily{yfrak}\selectfont\Large
+\fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
\renewcommand{\LettrineTextFont}{\relax}
\lettrine[image=true, lines=3, lhang=.2, loversize=.25, %
lraise=-.05, findent=0.1em, nindent=0em]
{W}{er} reitet so spät durch Nacht und Wind?\\
Es ist der Vater mit seinem Kind;\\
Er hat den Knaben wohl in dem Arm,\\
-Er faßt ihn sicher, er hält ihn warm.
+Er fa{\ss}t ihn sicher, er hält ihn warm.
\par}
\vspace{\baselineskip} Und hier der zum Beispiel gehörende \LaTeX{}--Code:
@@ -197,14 +201,14 @@
Pakets \verb+graphicx.sty+ -- weggelassen werden.
\begin{verbatim}
-{\fontfamily{yfrak}\selectfont\Large
+{\fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
\renewcommand{\LettrineTextFont}{\relax}
\lettrine[image=true, lines=3, lhang=.2, loversize=.25, %
lraise=-.05, findent=0.1em, nindent=0em]
{W}{er} reitet so spät durch Nacht und Wind?
Es ist der Vater mit seinem Kind;
Er hat den Knaben wohl in dem Arm,
-Er faßt ihn sicher, er hält ihn warm.\par}
+Er fa{\ss}t ihn sicher, er hält ihn warm.\par}
\end{verbatim}
Zur Darstellung dieses Beispiels müssen folgende Pakete installiert sein:
@@ -235,5 +239,7 @@
%%% Local Variables:
%%% mode: latex
+%%% coding: utf-8
%%% TeX-master: t
+%%% TeX-engine: xetex
%%% End:
Binary files old/doc/latex/lettrine/demo-fr.pdf and new/doc/latex/lettrine/demo-fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lettrine/demo-fr.tex new/doc/latex/lettrine/demo-fr.tex
--- old/doc/latex/lettrine/demo-fr.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lettrine/demo-fr.tex 2020-03-26 22:28:05.000000000 +0100
@@ -0,0 +1,302 @@
+
+\documentclass[paper=a4,12pt,german,french]{scrartcl}
+\usepackage{iftex}
+\iftutex
+ \usepackage{fontspec}
+ \setmainfont{erewhon}
+\else
+ \usepackage[utf8]{inputenc}
+ \usepackage{fourier}
+ \renewcommand{\ttdefault}{lmtt} % Courier chasse trop !
+\fi
+\usepackage{microtype}
+\usepackage{Rothdn, Typocaps} % cfr-initials (p. 3)
+
+\usepackage{graphicx,color}
+\usepackage{lettrine}
+\usepackage{babel}
+\frenchbsetup{AutoSpacePunctuation=false,og=«,fg=»}
+
+\newcommand*{\MF}{{\small\scshape metafont}}
+\newcommand*{\MP}{{\small\scshape metapost}}
+\newcommand*{\file}[1]{\texttt{#1}}
+\newcommand*{\cs}[1]{\texttt{\boi#1}}
+
+\setlength{\parindent}{0pt}
+\sloppy
+\begin{document}
+\thispagestyle{empty}
+
+\begin{center}
+\large\bfseries Quelques exemples de lettrines
+\end{center}
+
+\vspace{\baselineskip}
+\textit{Usage standard (2 lignes) :}\\
+\verb+\lettrine{E}{n} plein marais...+
+
+\lettrine{E}{n} plein marais de la Souteyranne, à quelques kilomètres
+au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody.
+
+\vspace{\baselineskip}
+\textit{Lettrine sur une seule ligne (option {\ttfamily\upshape lines=1}) :}\\
+\verb+\lettrine[lines=1]{E}{n} plein marais...+
+
+\lettrine[lines=1]{E}{n} plein marais de la Souteyranne,
+à quelques kilomètres au nord d'Aigues-Mortes, se trouve
+la Tour Carbonnière.
+
+\vspace{\baselineskip}
+\textit{Lettrine sur trois lignes (option {\ttfamily\upshape lines=3}) :}\\
+\verb+\lettrine[lines=3]{E}{n} plein marais...+
+
+\lettrine[lines=3]{E}{n} plein marais de la Souteyranne,
+à juste quelques kilomètres au nord d'Aigues-Mortes,
+se trouve la Tour Carbonnière.
+Elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+
+\vspace{\baselineskip}
+\textit{Lettrine complètement dans la marge} :\\
+\verb+\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement},...+
+
+\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement},
+à quelques kilomètres au nord d'Aigues-Mortes,
+se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+L'abbaye était ravitaillée ---~dit-on ~--- par un souterrain
+qui la reliait au château de Treillan.
+
+\vspace{\baselineskip}
+\textit{Lettrine en saillie à la fois en hauteur et dans la marge} :\\
+\verb+\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n} ...+
+
+\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n}
+plein marais de la Souteyranne,
+à quelques kilomètres au nord d'Aigues-Mortes la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que des vestiges.
+
+\vspace{\baselineskip}
+\textit{On peut ajouter un guillemet devant la lettrine} :\\
+\verb+\lettrine[ante=«]{E}{n} plein marais ...+
+
+\lettrine[ante=«]{E}{n} plein marais de la Souteyranne,
+à quelques kilomètres au nord d'Aigues-Mortes, se trouve
+la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody.
+
+\newpage
+Toutes Les lettrines suivantes seront en gris jusqu'à nouvel ordre : \\
+\verb+\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}+
+\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}
+
+\vspace{.5\baselineskip}
+\textit{On diminue la taille de la lettrine de 10\% et on
+la remonte de 10\% à cause du « Q »}
+\verb+\lettrine[lines=4, loversize=-0.1, lraise=0.1]{Q}{u'en...+
+
+\lettrine[lines=4, loversize=-0.1, lraise=0.1]{Q}{u'en plein marais}
+ de la Souteyranne, à quelques kilomètres au nord d'Aigues-Mortes,
+se trouve la Tour Carbonnière, surprend les visiteurs.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+L'abbaye était ravitaillée par un souterrain qui
+la reliait au château de Treillan.
+
+\vspace{.5\baselineskip}
+\textit{Autre solution : ajout d’une ligne grâce à} \verb+depth+\\
+\verb+\lettrine[lines=4,depth=1]{Q}{u'en plein marais} de ...+
+
+\lettrine[lines=4,depth=1]{Q}{u'en plein marais} de la Souteyranne,
+à quelques kilomètres au nord d'Aigues-Mortes,
+se trouve la Tour Carbonnière, surprend les visiteurs.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
+la reliait au château de Treillan.
+
+\vspace{.5\baselineskip}
+\textit{Utilisation de l'option {\ttfamily\upshape slope}} pour que le texte
+suive la pente du « À » :\\
+\verb+\lettrine[lines=4, slope=0.6em, findent=-1em,+\\
+\verb+ nindent=0.6em]{À}{quelques kilomètres}...+
+
+\lettrine[lines=4, slope=0.6em, findent=-1em, nindent=0.6em]{À} {quelques
+kilomètres} au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
+la reliait au château de Treillan.
+
+\vspace{.5\baselineskip}
+\textit{Utilisation de l'option {\ttfamily\upshape slope} pour que le texte
+ suive la pente du {\ttfamily\upshape V}, noter que celui-ci est à
+ demi-poussé dans la marge par l'option {\ttfamily\upshape lhang=0.5} :}\\
+\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em, nindent=0pt]+\\
+\verb+ {V}{oici} à...+
+
+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em, nindent=0pt]{V}{oici}
+à quelques kilomètres au nord d'Aigues-Mortes la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
+la reliait au château de Treillan distant de quelques kilomètres à peine.
+
+\newpage
+
+\begin{center}
+\large\bfseries Deux exemples d’utilisation de cfr-initials
+\end{center}
+
+\textit{Dans le préambule :}
+\verb+\usepackage{Typocaps, Rothdn}+
+
+\vspace{.5\baselineskip}
+\textit{Changement de police (ici Typocaps)
+ et de couleur pour la lettrine :}\\
+\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}+\\
+\verb+\lettrine[findent=.3em]{E}{n} plein marais...+
+
+{% Groupe (changement local de fonte)
+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}
+
+\lettrine[findent=.3em]{E}{n} plein marais de la Souteyranne, à quelques
+kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée.
+\par}% Fin du groupe.
+
+\vspace{.5\baselineskip}
+\textit{Les quatre exemples suivants font appel à la police d’initiales Rothdn}\\
+\verb+\renewcommand{\LettrineFontHook}{\Rothdnfamily}+
+
+\renewcommand{\LettrineFontHook}{\Rothdnfamily}
+
+\vspace{.5\baselineskip}
+
+\textit{Le calcul de la taille de la lettrine prend normalement comme
+ référence les lettres EFTZ (voir {\upshape\cs{LettrineTestString}}),
+ dans le cas de la police Rothdn ça donne ceci pour A : }
+
+\verb+\lettrine[lines=3]{A}{u} bord du marais+
+
+\lettrine[lines=3]{A}{u} bord du marais de la Souteyranne, à quelques
+kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+
+\vspace{\baselineskip}
+\textit{L’option {\ttfamily\upshape refstring} donne une taille correcte à la
+ lettrine (le calcul est fait sur la base du A lui-même et non de EFTZ%
+ \footnote{Le F de la police Rothdn a une hauteur supérieure à celles des
+ autres lettres.} :
+}
+
+\verb+\lettrine[refstring, lines=3]{A}{u} bord du marais+
+
+\lettrine[refstring, lines=3]{A}{u} bord du marais de la Souteyranne,
+à quelques kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+
+
+\vspace{\baselineskip}
+\textit{Il suffit maintenant de remonter la lettrine
+ ({\ttfamily\upshape lraise=0.15}) pour compenser sa profondeur :
+}
+
+\verb+\lettrine[refstring, lraise=0.15, lines=3]{A}{u} bord du marais+
+
+\lettrine[refstring, lraise=0.15, lines=3]{A}{u} bord du marais de la
+Souteyranne, à quelques kilomètres au nord d'Aigues-Mortes, se trouve
+la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+
+\newpage
+\begin{center}
+\large\bfseries Utilisation d'une image comme lettrine
+\end{center}
+
+\vspace{\baselineskip}
+Si la lettrine souhaitée n'est pas un caractère d'une fonte mais une
+image, \verb+\lettrine+ peut encore être utilisée, il suffit
+d'utiliser le booléen \texttt{image}, exemple :
+
+\begin{otherlanguage}{german}
+\renewcommand{\LettrineTextFont}{\relax}
+\fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
+\lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
+{W}{er} reitet so spät durch Nacht und Wind?\\
+Es ist der Vater mit seinem Kind;\\
+Er hat den Knaben wohl in dem Arm,\\
+Er fa{\ss}t ihn sicher, er hält ihn warm.\par
+\end{otherlanguage}
+
+\vspace{.5\baselineskip}
+Et voici le code \LaTeX{} correspondant ;
+le premier argument de \verb+\lettrine+ étant \verb+W+,
+\verb+\lettrine+ fait appel au fichier \verb+W.pdf+, \verb+W.jpg+, etc. en
+pdfLaTeX (omission possible du suffixe \verb+.eps+, \verb+.pdf+, propriété
+de \verb+graphicx.sty+).
+
+\begin{verbatim}
+\begin{otherlanguage}{german}
+ \fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
+ \renewcommand{\LettrineTextFont}{\relax}
+ \lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
+ {W}{er} reitet so spät durch Nacht und Wind?\\
+ Es ist der Vater mit seinem Kind;\\
+ Er hat den Knaben wohl in dem Arm,\\
+ Er fa{\ss}t ihn sicher, er hält ihn warm.\par
+\end{otherlanguage}
+\end{verbatim}
+
+Pour la compilation en pdfLaTeX cet exemple fait appel aux fichiers suivants :
+\begin{itemize}
+\item \texttt{graphicx.sty} (extension standard \LaTeXe{}),
+\item \texttt{blackletter1} de Thorsten~\textsc{Bronger} (disponible sur CTAN),
+\item les fontes gothiques « Fraktur » de Yannis~\textsc{Haralambous} type\,1
+ \texttt{yfrak.pfb} disponibles sur CTAN).
+\end{itemize}
+L'initiale gothique « W » utilisée dans
+cet exemple a été créée par \MP{} (fichier \texttt{W.pdf} ci-joint)
+à partir du source \MF{} \texttt{yinitW.mf} de Yannis grâce aux précieuses
+indications de Denis~\textsc{Roegel} que je remercie bien vivement.
+
+\vspace{.5\baselineskip}
+Une solution plus simple s’offre aux utilisateurs de LuaLaTeX ou XeLaTeX pour
+reproduire le poème ci-dessus : il suffit d’utiliser la police OpenType Yinit
+pour la lettrine et par exemple une des polices OpenType UnifrakturMaguntia
+pour le texte, voir le fichier \file{demo-lua.pdf}.
+
+\vfill
+\begin{flushright}
+ Daniel \textsc{Flipo}\\
+ \texttt{daniel.flipo(a)free.fr}\\
+ mars 2020.
+\end{flushright}
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% coding: utf-8
+%%% TeX-master: t
+%%% TeX-engine: xetex
+%%% End:
Binary files old/doc/latex/lettrine/demo-lua.pdf and new/doc/latex/lettrine/demo-lua.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lettrine/demo-lua.tex new/doc/latex/lettrine/demo-lua.tex
--- old/doc/latex/lettrine/demo-lua.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lettrine/demo-lua.tex 2020-03-26 22:28:05.000000000 +0100
@@ -0,0 +1,116 @@
+\documentclass[12pt,paper=a4,german,french,british]{scrartcl}
+
+\usepackage{lettrine}
+\usepackage[dvipsnames]{xcolor}
+\usepackage[colorlinks, urlcolor=ForestGreen, linkcolor=blue]{hyperref}
+
+%%% Linux Libertine fonts...
+\usepackage{fontspec}
+\setmainfont{Linux Libertine O}
+%\setsansfont{TeX Gyre Heros}[Scale=MatchLowercase]
+\setmonofont{Latin Modern Mono}[Scale=MatchLowercase]
+
+\usepackage{Typocaps}
+
+\usepackage{babel}
+\frenchbsetup{AutoSpacePunctuation=false, og=«,fg=»}
+\babeltags{fr=french, de=german, uk=british}
+
+\newcommand*{\file}[1]{\texttt{#1}}
+\newcommand*{\cs}[1]{\texttt{\boi#1}}
+\newcommand*{\MF}{{\small\scshape metafont}}
+
+\setlength{\parindent}{0pt}
+\sloppy
+
+\begin{document}
+\thispagestyle{empty}
+\enlargethispage{2\baselineskip}
+
+\begin{center}
+\large\bfseries Some LuaLaTeX examples
+\end{center}
+
+Both files \file{demo-fr.tex} and \file{demo-de.tex} can be compiled either with
+pdfLaTeX or with LuaLaTeX or XeLaTeX. The purpose of the next examples is to
+show how easy it is to change the font for the dropped initial with Unicode
+engines: no need to care about the low-level NFSS syntax, a simple
+\cs{fontspec} call will do the trick.
+
+\vspace{.5\baselineskip}
+In the first example, \textit{ Linux Libertine Initials} is used for the
+dropped capital:\\
+\verb+\renewcommand{\LettrineFontHook}{\fontspec{LinLibertine_I.otf}}+\\
+\verb+\lettrine[lines=3]{E}{n plein marais de la Souteyranne...}+
+
+\begin{fr}
+ \renewcommand{\LettrineFontHook}{\fontspec{LinLibertine_I.otf}}
+ \lettrine[lines=3]{E}{n plein marais de la Souteyranne}, à quelques
+ kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+ Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+ terrestre de la ville fortifiée, celle qui menait à Psalmody,
+ l'une des « abbayes de sel» dont il ne reste que quelques vestiges.\par
+\end{fr}
+
+\vspace{.5\baselineskip}
+Of course, it is still possible to use Type\,1 fonts for the dropped capitals,
+here \textit{Typocaps} (red):\\
+\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}+\\
+\verb+\lettrine[findent=.3em]{E}{n plein marais de la Souteyranne}...+
+
+\begin{fr}
+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}
+\lettrine[findent=.3em]{E}{n plein marais de la Souteyranne}, à quelques
+kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
+Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
+terrestre de la ville fortifiée.\par
+\end{fr}
+
+\vspace{.5\baselineskip}
+OpenType and TrueType free fonts are available for Old German, here is an example
+featuring the \textit{Yinit} OpenType font%
+\footnote{produced by Élie Roux from Yannis Haralambous’ Gothic Initials
+ originally in \MF.}
+for the initial and \textit{UnifrakturMaguntia} TrueType font%
+\footnote{\url{http://unifraktur.sourceforge.net/maguntia.html}}
+for the running text. The later has several nice \textit{optional features},
+(here long s and old umlaut variant):
+
+\verb+\setmainfont{UnifrakturMaguntia.ttf}[StylisticSet=11,CharacterVariant=15]+\\
+\verb+\renewcommand{\LettrineTextFont}{\relax} % No small caps here!+ \\
+\verb+\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}}+\\
+\verb+\lettrine[lhang=.2, loversize=.25, findent=0.1em]{W}{er} reitet+
+
+\begin{de}\Large
+\setmainfont{UnifrakturMaguntia.ttf}[StylisticSet=11,CharacterVariant=15]
+\renewcommand{\LettrineTextFont}{\relax}
+\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}}
+\lettrine[lhang=.2, loversize=.25, findent=0.1em]
+{W}{er} reitet so spät durch Nacht und Wind?\\
+Es ist der Vater mit seinem Kind;\\
+Er hat den Knaben wohl in dem Arm,\\
+Er faßt ihn sicher, er hält ihn warm.\par
+\end{de}
+
+\vspace{.5\baselineskip}
+Without the \textit{optional features}, the output looks more modern:
+
+\begin{otherlanguage}{german}\Large
+\setmainfont{UnifrakturMaguntia.ttf}
+\renewcommand{\LettrineTextFont}{\relax}
+\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}}
+\lettrine[lhang=.2, loversize=.25, findent=0.1em]
+{W}{er} reitet so spät durch Nacht und Wind?\\
+Es ist der Vater mit seinem Kind;\\
+Er hat den Knaben wohl in dem Arm,\\
+Er faßt ihn sicher, er hält ihn warm.\par
+\end{otherlanguage}
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% coding: utf-8
+%%% TeX-master: t
+%%% TeX-engine: luatex
+%%% End:
Binary files old/doc/latex/lettrine/demo.pdf and new/doc/latex/lettrine/demo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lettrine/demo.tex new/doc/latex/lettrine/demo.tex
--- old/doc/latex/lettrine/demo.tex 2019-04-07 23:26:50.000000000 +0200
+++ new/doc/latex/lettrine/demo.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,306 +0,0 @@
-%Format: pdfLaTeX
-
-\documentclass[12pt,german,french]{article}
-
-\usepackage[a4paper,text={145mm,240mm},centering]{geometry}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{palatino} % Romain (sans-serif= helvetica)
-\renewcommand{\ttdefault}{lmtt} % Courier chasse trop !
-\usepackage{microtype}
-\usepackage{Rothdn, Typocaps} % cfr-initials (p. 3)
-
-\usepackage{lettrine}
-\usepackage{babel}
-\frenchbsetup{AutoSpacePunctuation=false,og=«,fg=»}
-
-\usepackage{graphicx,color}
-\usepackage{hyperref,bookmark}
-
-\newcommand{\MF}{{\small\sffamily\scshape metafont}}
-\newcommand{\MP}{{\small\sffamily\scshape metapost}}
-\setlength{\parindent}{0pt}
-\sloppy
-\begin{document}
-\thispagestyle{empty}
-
-\begin{center}
-\large\bfseries Quelques exemples de lettrines
-\end{center}
-
-\vspace{\baselineskip}
-\textit{Usage standard (2 lignes) :}\\
-\verb+\lettrine{E}{n} plein marais...+
-
-\lettrine{E}{n} plein marais de la Souteyranne, à quelques kilomètres
-au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-
-\vspace{\baselineskip}
-\textit{Lettrine sur une seule ligne (option {\ttfamily\upshape lines=1}) :}\\
-\verb+\lettrine[lines=1]{E}{n} plein marais...+
-
-\lettrine[lines=1]{E}{n} plein marais de la Souteyranne,
-à quelques kilomètres au nord d'Aigues-Mortes, se trouve
-la Tour Carbonnière.
-
-\vspace{\baselineskip}
-\textit{Lettrine sur trois lignes (option {\ttfamily\upshape lines=3}) :}\\
-\verb+\lettrine[lines=3]{E}{n} plein marais...+
-
-\lettrine[lines=3]{E}{n} plein marais de la Souteyranne,
-à juste quelques kilomètres au nord d'Aigues-Mortes,
-se trouve la Tour Carbonnière.
-Elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-
-\vspace{\baselineskip}
-\textit{Lettrine complètement dans la marge} :\\
-\verb+\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement},...+
-
-\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement},
-à quelques kilomètres au nord d'Aigues-Mortes,
-se trouve la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-L'abbaye était ravitaillée ---~dit-on ~--- par un souterrain
-qui la reliait au château de Treillan.
-
-\vspace{\baselineskip}
-\textit{Lettrine en saillie à la fois en hauteur et dans la marge} :\\
-\verb+\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n} ...+
-
-\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n}
-plein marais de la Souteyranne,
-à quelques kilomètres au nord d'Aigues-Mortes la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» \dots
-% dont il ne reste que des vestiges.
-
-\vspace{\baselineskip}
-\textit{On peut ajouter un guillemet devant la lettrine} :\\
-\verb+\lettrine[ante=«]{E}{n} plein marais ...+
-
-\lettrine[ante=«]{E}{n} plein marais de la Souteyranne,
-à quelques kilomètres au nord d'Aigues-Mortes, se trouve
-la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» \dots
-% dont il ne reste que des vestiges.
-
-\newpage
-Toutes Les lettrines suivantes seront en gris jusqu'à nouvel ordre : \\
-\verb+\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}+
-\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}
-
-\vspace{.5\baselineskip}
-\textit{On diminue la taille de la lettrine de 10\% et on
-la remonte de 10\% à cause du « Q »}
-\verb+\lettrine[lines=4, loversize=-0.1, lraise=0.1]{Q}{u'en...+
-
-\lettrine[lines=4, loversize=-0.1, lraise=0.1]{Q}{u'en plein marais}
- de la Souteyranne, à quelques kilomètres au nord d'Aigues-Mortes,
-se trouve la Tour Carbonnière, surprend les visiteurs.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-L'abbaye était ravitaillée par un souterrain qui
-la reliait au château de Treillan.
-
-\vspace{.5\baselineskip}
-\textit{Autre solution : ajout d’une ligne grâce à} \verb+depth+\\
-\verb+\lettrine[lines=4,depth=1]{Q}{u'en plein marais} de ...+
-
-\lettrine[lines=4,depth=1]{Q}{u'en plein marais} de la Souteyranne,
-à quelques kilomètres au nord d'Aigues-Mortes,
-se trouve la Tour Carbonnière, surprend les visiteurs.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-L'abbaye était ravitaillée par un souterrain qui
-la reliait au château de Treillan.
-
-\vspace{.5\baselineskip}
-\textit{Utilisation de l'option {\ttfamily\upshape slope}} pour que le texte
-suive la pente du « À » :\\
-\verb+\lettrine[lines=4, slope=0.6em, findent=-1em,+\\
-\verb+ nindent=0.6em]{À}{quelques kilomètres}...+
-
-\lettrine[lines=4, slope=0.6em, findent=-1em, nindent=0.6em]{À} {quelques
-kilomètres} au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
-la reliait au château de Treillan.
-
-\vspace{.5\baselineskip}
-\textit{Utilisation de l'option {\ttfamily\upshape slope} pour que le texte
- suive la pente du {\ttfamily\upshape V}, noter que celui-ci est à
- demi-poussé dans la marge par l'option {\ttfamily\upshape lhang=0.5} :}\\
-\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]+\\
-\verb+ {V}{oici} à...+
-
-\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]{V}{oici}
-à quelques kilomètres au nord d'Aigues-Mortes la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
-la reliait au château de Treillan.
-
-\newpage
-\newgeometry{text={138mm,240mm},centering}
-
-\begin{center}
-\large\bfseries Deux exemples d’utilisation de cfr-initials
-\end{center}
-
-\textit{Dans le préambule :}
-\verb+\usepackage{Typocaps, Rothdn}+
-
-\vspace{.5\baselineskip}
-\textit{Changement de police (ici Typocaps)
- et de couleur pour la lettrine :}\\
-\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}+\\
-\verb+\lettrine[findent=.3em]{E}{n} plein marais...+
-
-{% Groupe (changement local de fonte)
-\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}
-
-\lettrine[findent=.3em]{E}{n} plein marais de la Souteyranne, à quelques
-kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée.
-\par}% Fin du groupe.
-
-\vspace{.5\baselineskip}
-\textit{Les quatre exemples suivants font appel à la police d’initiales Rothdn}\\
-\verb+\renewcommand{\LettrineFontHook}{\Rothdnfamily}+
-
-\renewcommand{\LettrineFontHook}{\Rothdnfamily}
-
-\vspace{.5\baselineskip}
-\textit{Le calcul de la taille de la lettrine prend comme référence les
- lettres EFTZ (voir {\ttfamily\upshape\boi LettrineTestString}),
- dans le cas de la police Rothdn ça donne ceci pour A :
-}
-
-\verb+\lettrine[lines=3]{A}{u} bord du marais+
-
-\lettrine[lines=3]{A}{u} bord du marais de la Souteyranne, à quelques
-kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody.
-
-\vspace{.5\baselineskip}
-\textit{L’option {\ttfamily\upshape refstring} donne une taille correcte à la
- lettrine (le calcul est fait sur la base du A lui-même et non de EFTZ%
- \footnote{Le F de la police Rothdn a une hauteur supérieure à celles des
- autres lettres.} :
-}
-
-\verb+\lettrine[refstring, lines=3]{A}{u} bord du marais+
-
-\lettrine[refstring, lines=3]{A}{u} bord du marais de la Souteyranne,
-à quelques kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody.
-
-
-\vspace{.5\baselineskip}
-\textit{Il suffit maintenant de remonter un peu la lettrine
- ({\ttfamily\upshape lraise=0.15}) pour compenser sa profondeur :
-}
-
-\verb+\lettrine[refstring, lraise=0.15, lines=3]{A}{u} bord du marais+
-
-\lettrine[refstring, lraise=0.15, lines=3]{A}{u} bord du marais de la
-Souteyranne, à quelques kilomètres au nord d'Aigues-Mortes, se trouve
-la Tour Carbonnière.
-Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès
-terrestre de la ville fortifiée, celle qui menait à Psalmody.
-
-\newpage
-\restoregeometry
-\begin{center}
-\large\bfseries Utilisation d'une image comme lettrine
-\end{center}
-
-\vspace{\baselineskip}
-Si la lettrine souhaitée n'est pas un caractère d'une fonte mais une
-image, \verb+\lettrine+ peut encore être utilisée, il suffit
-d'utiliser le booléen \texttt{image}, exemple :
-
-\begin{otherlanguage}{german}
-\renewcommand{\LettrineTextFont}{\relax}
-\fontfamily{yfrak}\selectfont\Large
-\lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
-{W}{er} reitet so spät durch Nacht und Wind?\\
-Es ist der Vater mit seinem Kind;\\
-Er hat den Knaben wohl in dem Arm,\\
-Er faßt ihn sicher, er hält ihn warm.\par
-\end{otherlanguage}
-
-\vspace{.5\baselineskip}
-Et voici le code \LaTeX{} correspondant ;
-le premier argument de \verb+\lettrine+ étant \verb+W+,
-\verb+\lettrine+ fait appel au fichier \verb+W.pdf+, \verb+W.jpg+, etc. en
-pdfLaTeX (omission possible du suffixe \verb+.eps+, \verb+.pdf+, propriété
-de \verb+graphicx.sty+).
-
-\begin{verbatim}
-\begin{otherlanguage}{german}
- \fontfamily{yfrak}\selectfont\Large
- \renewcommand{\LettrineTextFont}{\relax}
- \lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
- {W}{er} reitet so spät durch Nacht und Wind?\\
- Es ist der Vater mit seinem Kind;\\
- Er hat den Knaben wohl in dem Arm,\\
- Er faßt ihn sicher, er hält ihn warm.\par
-\end{otherlanguage}
-\end{verbatim}
-
-Cet exemple fait appel aux fichiers suivants :
-\begin{itemize}
-\item \texttt{graphicx.sty} (extension standard \LaTeXe{}),
-\item \texttt{blackletter1} de Thorsten~\textsc{Bronger} (disponible sur CTAN),
-\item les fontes gothiques « Fraktur » de Yannis~\textsc{Haralambous} type\,1
- \texttt{yfrak.pfb} disponibles sur CTAN).
-\end{itemize}
-L'initiale gothique « W » utilisée dans
-cet exemple a été créée par \MP{} (fichier \texttt{W.pdf} ci-joint)
-à partir du source \MF{} \texttt{yinitW.mf} de Yannis grâce aux précieuses
-indications de Denis~\textsc{Roegel} que je remercie bien vivement.
-
-\vspace{.5\baselineskip}
-Une solution plus simple s’offre aux utilisateurs de LuaLaTeX ou XeLaTeX pour
-reproduire le poème ci-dessus : il suffit d’utiliser la police OpenType Yinit
-pour la lettrine et par exemple une des polices OpenType UnifrakturMaguntia
-pour le texte, voir \url{http://unifraktur.sourceforge.net/maguntia.html}.
-
-Le codage est identique à ceci près que l’option \texttt{image=true} est
-supprimée et l’appel à la police \texttt{yfrak} remplacé par :\\
-\verb+\setmainfont{UnifrakturMaguntia19}\Large+\\
-\verb+\renewcommand{\LettrineFontHook}{\setmainfont{Yinit}}+
-
-\vfill
-\begin{flushright}
- Daniel \textsc{Flipo}\\
- \texttt{daniel.flipo(a)free.fr}\\
- avril 2019.
-\end{flushright}
-
-\end{document}
-
-%%% Local Variables:
-%%% mode: latex
-%%% coding: utf-8
-%%% TeX-master: t
-%%% End:
Binary files old/doc/latex/lettrine/lettrine.pdf and new/doc/latex/lettrine/lettrine.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lettrine.doc.tlpobj new/tlpkg/tlpobj/lettrine.doc.tlpobj
--- old/tlpkg/tlpobj/lettrine.doc.tlpobj 2019-04-08 01:39:47.000000000 +0200
+++ new/tlpkg/tlpobj/lettrine.doc.tlpobj 2020-03-26 23:29:41.000000000 +0100
@@ -1,12 +1,14 @@
name lettrine.doc
category Package
-revision 50847
+revision 54560
shortdesc doc files of lettrine
relocated 1
-docfiles size=108
- RELOC/doc/latex/lettrine/README
+docfiles size=81
+ RELOC/doc/latex/lettrine/README.md
RELOC/doc/latex/lettrine/demo-de.pdf
RELOC/doc/latex/lettrine/demo-de.tex
- RELOC/doc/latex/lettrine/demo.pdf
- RELOC/doc/latex/lettrine/demo.tex
+ RELOC/doc/latex/lettrine/demo-fr.pdf
+ RELOC/doc/latex/lettrine/demo-fr.tex
+ RELOC/doc/latex/lettrine/demo-lua.pdf
+ RELOC/doc/latex/lettrine/demo-lua.tex
RELOC/doc/latex/lettrine/lettrine.pdf
++++++ lettrine.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lettrine/lettrine.sty new/tex/latex/lettrine/lettrine.sty
--- old/tex/latex/lettrine/lettrine.sty 2019-04-07 23:26:50.000000000 +0200
+++ new/tex/latex/lettrine/lettrine.sty 2020-03-26 22:28:05.000000000 +0100
@@ -27,12 +27,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\ProvidesFile{lettrine.sty}
- [2019-04-06 v2.22 (Daniel Flipo)]
+ [2020-03-14 v2.23 (Daniel Flipo)]
\ifdefined\DeclareRelease
\DeclareRelease{v1.6}{1999-03-03}{lettrine-2006-03-17.sty}
\DeclareRelease{v1.9}{2012-07-20}{lettrine-2015-08-31.sty}
\DeclareRelease{v2.0}{2018-07-21}{lettrine-2018-08-18.sty}
- \DeclareCurrentRelease{}{2019-03-30}
+ \DeclareCurrentRelease{}{2020-03-14}
\else
\PackageWarning{lettrine}{Your LaTeX kernel is too old to provide
access\MessageBreak to former versions of the lettrine package.%
@@ -225,7 +225,7 @@
\@tempdima=\L@oversize pt\relax
\PackageInfo{lettrine.sty}%
{Targeted height = \the\L@target@tht\MessageBreak
- (no accent, loversize=0),\MessageBreak
+ (for loversize=0, accent excluded),\MessageBreak
Lettrine height = \the\LettrineHeight\space (#2)%
\ifdim\@tempdima=\z@\else\space loversize=\L@oversize\fi;%
\MessageBreak reported}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lettrine/optfile.cfl new/tex/latex/lettrine/optfile.cfl
--- old/tex/latex/lettrine/optfile.cfl 2018-07-26 23:43:30.000000000 +0200
+++ new/tex/latex/lettrine/optfile.cfl 2020-03-26 22:28:05.000000000 +0100
@@ -15,8 +15,8 @@
%%
%% A
\LettrineOptionsFor{A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=.7em}
-%% Same parameters for \`A
-\LettrineOptionsFor{\`A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em}
+%% Same parameters for À (utf-8)
+\LettrineOptionsFor{À}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em}
%% C'
\LettrineOptionsFor{C'}{nindent=-0.5em}
%% I and J hang into the margin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lettrine.tlpobj new/tlpkg/tlpobj/lettrine.tlpobj
--- old/tlpkg/tlpobj/lettrine.tlpobj 2019-04-08 01:39:47.000000000 +0200
+++ new/tlpkg/tlpobj/lettrine.tlpobj 2020-03-26 23:29:42.000000000 +0100
@@ -1,6 +1,6 @@
name lettrine
category Package
-revision 50847
+revision 54560
shortdesc Typeset dropped capitals
relocated 1
longdesc The lettrine package supports various dropped capitals styles,
@@ -21,7 +21,6 @@
RELOC/tex/latex/lettrine/pzc3.cfl
catalogue-contact-home http://daniel.flipo.free.fr/lettrine
catalogue-ctan /macros/latex/contrib/lettrine
-catalogue-date 2019-04-07 14:25:55 +0200
-catalogue-license lppl1.3c
+catalogue-license lppl1.3
catalogue-topics lettrine
-catalogue-version 2.22
+catalogue-version 2.23
++++++ libertine.doc.tar.xz ++++++
++++ 2173 lines of diff (skipped)
++++++ libertine.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-n/libertine.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606/libertine.tar.xz differ: char 25, line 1
++++++ libertinus-fonts.doc.tar.xz ++++++
++++ 2177 lines of diff (skipped)
++++++ libertinus-fonts.tar.xz ++++++
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusKeyboard-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusKeyboard-Regular.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusMath-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusMath-Regular.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusMono-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusMono-Regular.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSans-Bold.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSans-Bold.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSans-Italic.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSans-Italic.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSans-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSans-Regular.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Bold.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Bold.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerif-BoldItalic.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerif-BoldItalic.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Italic.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Italic.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Regular.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Semibold.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerif-Semibold.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerifDisplay-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerifDisplay-Regular.otf differ
Binary files old/fonts/opentype/public/libertinus-fonts/LibertinusSerifInitials-Regular.otf and new/fonts/opentype/public/libertinus-fonts/LibertinusSerifInitials-Regular.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinus-fonts.tlpobj new/tlpkg/tlpobj/libertinus-fonts.tlpobj
--- old/tlpkg/tlpobj/libertinus-fonts.tlpobj 2019-04-04 01:24:43.000000000 +0200
+++ new/tlpkg/tlpobj/libertinus-fonts.tlpobj 2020-03-10 01:48:32.000000000 +0100
@@ -1,6 +1,6 @@
name libertinus-fonts
category Package
-revision 50742
+revision 54197
shortdesc The Libertinus font family
relocated 1
longdesc This is a fork of the Linux Libertine and Linux Biolinum fonts
@@ -11,7 +11,7 @@
longdesc Biolinum. Libertinus Mono: forked from Linux Libertine Mono.
longdesc Libertinus Math: an OpenType math font for use in OpenType
longdesc math-capable applications like LuaTeX, XeTeX or MS Word 2007+.
-runfiles size=1390
+runfiles size=1614
RELOC/fonts/opentype/public/libertinus-fonts/LibertinusKeyboard-Regular.otf
RELOC/fonts/opentype/public/libertinus-fonts/LibertinusMath-Regular.otf
RELOC/fonts/opentype/public/libertinus-fonts/LibertinusMono-Regular.otf
@@ -26,10 +26,10 @@
RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf
RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerifDisplay-Regular.otf
RELOC/fonts/opentype/public/libertinus-fonts/LibertinusSerifInitials-Regular.otf
+catalogue-also libertinus-otf libertinus-type1
catalogue-contact-bugs https://github.com/libertinus-fonts/libertinus/issues
catalogue-contact-repository https://github.com/libertinus-fonts/libertinus
catalogue-ctan /fonts/libertinus-fonts
-catalogue-date 2019-04-03 20:16:31 +0200
catalogue-license ofl
catalogue-topics font font-body font-proportional font-mono font-serif font-sans font-multilingual font-maths font-otf
-catalogue-version 6.8
+catalogue-version 6.11
++++++ libertinus-otf.doc.tar.xz ++++++
++++ 2005 lines of diff (skipped)
++++++ libertinus-otf.tar.xz ++++++
Binary files old/fonts/opentype/public/libertinus-otf/LibertinusMath-Bold.otf and new/fonts/opentype/public/libertinus-otf/LibertinusMath-Bold.otf differ
Binary files old/fonts/opentype/public/libertinus-otf/LibertinusMono-Bold.otf and new/fonts/opentype/public/libertinus-otf/LibertinusMono-Bold.otf differ
Binary files old/fonts/opentype/public/libertinus-otf/LibertinusMono-BoldOblique.otf and new/fonts/opentype/public/libertinus-otf/LibertinusMono-BoldOblique.otf differ
Binary files old/fonts/opentype/public/libertinus-otf/LibertinusMono-Oblique.otf and new/fonts/opentype/public/libertinus-otf/LibertinusMono-Oblique.otf differ
Binary files old/fonts/opentype/public/libertinus-otf/LibertinusSans-BoldOblique.otf and new/fonts/opentype/public/libertinus-otf/LibertinusSans-BoldOblique.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/libertinus-otf/libertinus-otf.sty new/tex/latex/libertinus-otf/libertinus-otf.sty
--- old/tex/latex/libertinus-otf/libertinus-otf.sty 2019-04-05 23:05:24.000000000 +0200
+++ new/tex/latex/libertinus-otf/libertinus-otf.sty 2020-02-23 01:28:59.000000000 +0100
@@ -1,17 +1,17 @@
-%% $Id: libertinus-otf.sty 1036 2019-04-04 20:29:44Z herbert $
+%% $Id: libertinus-otf.sty 1146 2020-02-22 15:47:27Z herbert $
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
%% Either version 1.3 or, at your option, any later version.
%%
%
-% Copyright 2018 Herbert Voss hvoss(a)tug.org and Bob Tennent rdt(a)cs.queensu.ca
+% Copyright 2020 Herbert Voss hvoss(a)tug.org
%
\ProvidesPackage{libertinus-otf}[%
- 2019/04/04 v. 0.14 (Herbert Voss and Bob Tennent) Supports libertinus fonts for lualatex and xelatex.]
+ 2020/02/22 v. 0.24 (Herbert Voss) Supports libertinus fonts for lualatex and xelatex.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
-\RequirePackage{unicode-math}
+%\RequirePackage[no-math]{fontspec}
\newif\iflibertinus@mono \libertinus@monotrue
\newif\iflibertinus@nomath \libertinus@nomathfalse
@@ -53,16 +53,22 @@
\ProcessOptionsX\relax
+\iflibertinus@nomath
+ \RequirePackage{fontspec}
+\else
+ \RequirePackage{unicode-math}
+\fi
+
\iflibertinus@lining
- \def\libertinus@figurestyle{Lining}
+ \def\libertinus@figurestyle{+lnum}
\else
- \def\libertinus@figurestyle{OldStyle}
+ \def\libertinus@figurestyle{+onum}
\fi
\iflibertinus@tabular
- \def\libertinus@figurealign{Monospaced}
+ \def\libertinus@figurealign{+tnum}
\else
- \def\libertinus@figurealign{Proportional}
+ \def\libertinus@figurealign{+pnum}
\fi
\iflibertinus@semibold
@@ -75,221 +81,358 @@
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
- SmallCapsFeatures={Letters=SmallCaps\ifluatex,Renderer=Basic\fi} ,
+ SmallCapsFeatures={Letters=SmallCaps\ifluatex,Renderer=Basic\fi},
\libertinus@defaultfeatures
}
\iflibertinus@usefilenames
-
+%------------------------ filenames start -------------------------
\setmainfont{LibertinusSerif}[
- Numbers = {\libertinus@figurealign,\libertinus@figurestyle},
+ RawFeature = {\libertinus@figurealign;\libertinus@figurestyle},
Scale = \libertinusRM@scale ,
UprightFont = *-Regular,
ItalicFont = *-Italic,
- BoldFont = *-\libertinus@boldstyle,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-\libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = *-\libertinus@boldstyle },
BoldItalicFont = *-\libertinus@boldstyle Italic,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldItalicFeatures = { SmallCapsFont = *-\libertinus@boldstyle Italic },
+ BoldSlantedFont= *-\libertinus@boldstyle,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-\libertinus@boldstyle },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+% SmallCapsFeatures={Letters=SmallCaps},
Extension = .otf
]
\newfontfamily\LibertinusSerifSB{LibertinusSerif}[
- Numbers = {\libertinus@figurealign,\libertinus@figurestyle},
+ RawFeature = {\libertinus@figurealign;\libertinus@figurestyle},
Scale = \libertinusRM@scale,
UprightFont = *-Regular,
ItalicFont = *-Italic,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
BoldFont = *-Semibold,
+ BoldFeatures = { SmallCapsFont = *-Semibold },
BoldItalicFont = *-SemiboldItalic,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldItalicFeatures = { SmallCapsFont = *-SemiboldItalic },
+ BoldSlantedFont= *-Semibold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Semibold },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+% SmallCapsFeatures={Letters=SmallCaps},
Extension = .otf
]
\newfontfamily\LibertinusSerifOsF{LibertinusSerif}[
- Numbers = {OldStyle,Proportional},
+ RawFeature = {+onum},
Scale = \libertinusRM@scale ,
UprightFont = *-Regular,
ItalicFont = *-Italic,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
BoldFont = *-\libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = *-\libertinus@boldstyle },
BoldItalicFont = *-\libertinus@boldstyle Italic,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldItalicFeatures = { SmallCapsFont = *-\libertinus@boldstyle Italic },
+ BoldSlantedFont= *-\libertinus@boldstyle,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-\libertinus@boldstyle },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+% SmallCapsFeatures={Letters=SmallCaps},
Extension = .otf
]
\newfontfamily\LibertinusSerifTLF{LibertinusSerif}[
- Numbers = {Lining,Monospaced},
+ RawFeature = {+tnum;-onum},
Scale = \libertinusRM@scale ,
UprightFont = *-Regular,
ItalicFont = *-Italic,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
BoldFont = *-\libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = *-\libertinus@boldstyle },
BoldItalicFont = *-\libertinus@boldstyle Italic,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldItalicFeatures = { SmallCapsFont = *-\libertinus@boldstyle Italic },
+ BoldSlantedFont= *-\libertinus@boldstyle,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-\libertinus@boldstyle },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+% SmallCapsFeatures={Letters=SmallCaps},
Extension = .otf
]
\setsansfont{LibertinusSans}[
- Numbers = {\libertinus@figurealign,\libertinus@figurestyle} ,
- Scale = \libertinusSF@scale ,
+ Extension = .otf,
+ RawFeature = {\libertinus@figurealign;\libertinus@figurestyle},
+ Scale = \libertinusSF@scale,
UprightFont = *-Regular,
ItalicFont = *-Italic,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
BoldFont = *-Bold,
- BoldItalicFont = *-BoldOblique,
+ BoldFeatures = { SmallCapsFont = *-Bold },
+ BoldItalicFont = *-Italic,
+ BoldItalicFeatures = {RawFeature={embolden=3},SmallCapsFont = *-Italic },
+ BoldSlantedFont= *-Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Bold },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
SmallCapsFeatures={Letters=SmallCaps},
- Extension = .otf
]
\newfontfamily\LibertinusSansOsF{LibertinusSans}[
- Numbers = {OldStyle,Proportional} ,
+ RawFeature = {+onum;+pnum},
Scale = \libertinusSF@scale ,
UprightFont = *-Regular,
ItalicFont = *-Italic,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
BoldFont = *-Bold,
- BoldItalicFont = *-BoldOblique,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldFeatures = { SmallCapsFont = *-Bold },
+ BoldItalicFont = *-Italic,
+ BoldItalicFeatures = {RawFeature={embolden=3}},
+ BoldSlantedFont= *-Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Bold },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+% SmallCapsFeatures={Letters=SmallCaps},
Extension = .otf
]
\newfontfamily\LibertinusSansTLF{LibertinusSans}[
- Numbers = {Lining, Monospaced} ,
+ RawFeature = {+lnum;-onum;+tnum} ,
Scale = \libertinusSF@scale ,
UprightFont = *-Regular,
ItalicFont = *-Italic,
+ ItalicFeatures = { SmallCapsFont = *-Italic },
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
BoldFont = *-Bold,
- BoldItalicFont = *-BoldOblique,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldFeatures = { SmallCapsFont = *-Bold },
+ BoldItalicFont = *-Italic,
+ BoldItalicFeatures = {RawFeature={embolden=3}},
+ BoldSlantedFont= *-Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = *-Bold },
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+% SmallCapsFeatures={Letters=SmallCaps},
Extension = .otf
]
\iflibertinus@mono
\setmonofont{LibertinusMono}[
-% Numbers = {\libertinus@figurealign, \libertinus@figurestyle},
+ RawFeature = {\libertinus@figurealign; \libertinus@figurestyle},
Scale = \libertinusTT@scale,
FakeStretch = 0.8,
UprightFont = *-Regular,
- ItalicFont = *-Oblique,
- BoldFont = *-Bold,
- BoldItalicFont = *-BoldOblique,
+ ItalicFont = *-Regular,
+ ItalicFeatures = {FakeSlant=0.2},
+ SlantedFont = *-Regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-Regular,
+ BoldFeatures = {RawFeature={embolden=3}},
+ BoldItalicFont = *-Regular,
+ BoldItalicFeatures={FakeSlant=0.2,RawFeature={embolden=3}},
Extension = .otf,
]
\fi
-
+%------------------------ filenames stop -------------------------
\else
-
+%------------------------ symbolic names start -------------------------
\setmainfont{Libertinus Serif}[
- Numbers = {\libertinus@figurealign,\libertinus@figurestyle},
- Scale = \libertinusRM@scale ,
-% UprightFont = * Regular,
-% ItalicFont = * Ialic,
-% BoldFont = * Bold, % \libertinus@boldstyle,
-% BoldItalicFont = * Bold Italic, %-\libertinus@boldstyle italic,
- SmallCapsFeatures={Letters=SmallCaps},
-% Extension = .otf
+ RawFeature = {\libertinus@figurealign,\libertinus@figurestyle},
+ Scale = \libertinusRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * \libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = * \libertinus@boldstyle },
+ BoldItalicFont = * \libertinus@boldstyle Italic,
+ BoldItalicFeatures= { SmallCapsFont = * \libertinus@boldstyle Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * \libertinus@boldstyle,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * \libertinus@boldstyle },
+% SmallCapsFeatures = {Letters=SmallCaps},
]
-
\newfontfamily\LibertinusSerif{Libertinus Serif}[
- Numbers = {\libertinus@figurealign,\libertinus@figurestyle},
- Scale = \libertinusRM@scale ,
-% UprightFont = *-regular,
-% ItalicFont = *-italic,
-% BoldFont = *-\libertinus@boldstyle,
-% BoldItalicFont = *-\libertinus@boldstyle italic,
- SmallCapsFeatures={Letters=SmallCaps},
-% Extension = .otf
-]
-
-\newfontfamily\LibertnusSerifSB{Libertinus Serif}[
- Numbers = {\libertinus@figurealign,\libertinus@figurestyle},
- Scale = \libertinusRM@scale ,
-% UprightFont = *-regular,
-% ItalicFont = *-italic,
- BoldFont = * Semibold,
- BoldItalicFont = * Semibold Italic,
- SmallCapsFeatures={Letters=SmallCaps},
-% Extension = .otf
+ RawFeature = {\libertinus@figurealign,\libertinus@figurestyle},
+ Scale = \libertinusRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * \libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = * \libertinus@boldstyle },
+ BoldItalicFont = * \libertinus@boldstyle Italic,
+ BoldItalicFeatures= { SmallCapsFont = * \libertinus@boldstyle Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * \libertinus@boldstyle,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * \libertinus@boldstyle },
+% SmallCapsFeatures = {Letters=SmallCaps},
+]
+\newfontfamily\LibertinusSerifSB{Libertinus Serif}[
+ RawFeature = {\libertinus@figurealign,\libertinus@figurestyle},
+ Scale = \libertinusRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * Semibold,
+ BoldFeatures = { SmallCapsFont = * Semibold},
+ BoldItalicFont = * SemiboldItalic,
+ BoldItalicFeatures= { SmallCapsFont = * SemiboldItalic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * Semibold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Semibold},
+% SmallCapsFeatures = {Letters=SmallCaps},
]
-
\newfontfamily\LibertinusSerifOsF{Libertinus Serif}[
- Numbers = {OldStyle,Proportional},
- Scale = \libertinusRM@scale ,
-% UprightFont = *-regular,
-% ItalicFont = *-italic,
-% BoldFont = *-\libertinus@boldstyle,
-% BoldItalicFont = *-\libertinus@boldstyle italic,
- SmallCapsFeatures={Letters=SmallCaps},
-% Extension = .otf
+ RawFeature = {OldStyle,Proportional},
+ Scale = \libertinusRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * \libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = * \libertinus@boldstyle },
+ BoldItalicFont = * \libertinus@boldstyle Italic,
+ BoldItalicFeatures= { SmallCapsFont = * \libertinus@boldstyle Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * \libertinus@boldstyle,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * \libertinus@boldstyle },
+% SmallCapsFeatures = {Letters=SmallCaps},
]
\newfontfamily\LibertinusSerifTLF{Libertinus Serif}[
- Numbers = {Lining,Monospaced},
- Scale = \libertinusRM@scale ,
-% UprightFont = *-regular,
-% ItalicFont = *-italic,
-% BoldFont = *-\libertinus@boldstyle,
-% BoldItalicFont = *-\libertinus@boldstyle italic,
- SmallCapsFeatures={Letters=SmallCaps},
-% Extension = .otf
+ RawFeature = {Lining,Monospaced},
+ Scale = \libertinusRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * \libertinus@boldstyle,
+ BoldFeatures = { SmallCapsFont = * \libertinus@boldstyle },
+ BoldItalicFont = * \libertinus@boldstyle Italic,
+ BoldItalicFeatures= { SmallCapsFont = * \libertinus@boldstyle Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * \libertinus@boldstyle,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * \libertinus@boldstyle },
+% SmallCapsFeatures = {Letters=SmallCaps},
]
\setsansfont{Libertinus Sans}[
- Numbers = {\libertinus@figurealign, \libertinus@figurestyle} ,
- Scale = \libertinusSF@scale ,
-% UprightFont = * Regular,
-% ItalicFont = * Italic,
-% BoldFont = * Bold,
-% BoldItalicFont = * Bold Italic,
+ RawFeature = {\libertinus@figurealign;\libertinus@figurestyle},
+ Scale = \libertinusSF@scale,
+ UprightFont = * Regular,
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ SlantedFont = * Regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Italic,
+ BoldItalicFeatures = {RawFeature={embolden=3},SmallCapsFont = * Italic },
+ BoldSlantedFont= * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
SmallCapsFeatures={Letters=SmallCaps},
-% Extension = .otf
]
-\newfontfamily\LibertinusSansOsF{Libertinus Sans}
-[
- Numbers = {OldStyle,Proportional} ,
+\newfontfamily\LibertinusSansOsF{Libertinus Sans}[
+ RawFeature = {OldStyle,Proportional} ,
Scale = \libertinusSF@scale ,
-% UprightFont = *-regular,
-% ItalicFont = *-italic,
-% BoldFont = *-bold,
-% BoldItalicFont = *-bolditalic,
- SmallCapsFeatures={Letters=SmallCaps},
+ UprightFont = * Regular,
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ SlantedFont = * Regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Italic,
+ BoldItalicFeatures = {RawFeature={embolden=3}},
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+ BoldSlantedFont= * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+% SmallCapsFeatures={Letters=SmallCaps},
% Extension = .otf
]
-
-\newfontfamily\LibertinusSansTLF{Libertinus Sans}
-[
- Numbers = {Lining, Monospaced} ,
+\newfontfamily\LibertinusSansTLF{Libertinus Sans}[
+ RawFeature = {Lining, Monospaced} ,
Scale = \libertinusSF@scale ,
-% UprightFont = *-regular,
-% ItalicFont = *-italic,
-% BoldFont = *-bold,
-% BoldItalicFont = *-bolditalic,
- SmallCapsFeatures={Letters=SmallCaps},
+ UprightFont = * Regular,
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ SlantedFont = * Regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Italic,
+ BoldItalicFeatures = {RawFeature={embolden=3}},
+ SmallCapsFont = *-Regular,
+ SmallCapsFeatures={RawFeature=+smcp},
+ BoldSlantedFont= * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+% SmallCapsFeatures={Letters=SmallCaps},
% Extension = .otf
]
-
\iflibertinus@mono
\setmonofont{Libertinus Mono}[
-% Numbers = {\libertinus@figurealign, \libertinus@figurestyle},
+% RawFeature = {\libertinus@figurealign, \libertinus@figurestyle},
Scale = \libertinusTT@scale,
FakeStretch = 0.8,
-% UprightFont = * Regular,
-% ItalicFont = * Italic,
-% BoldFont = * Bold,
-% BoldItalicFont = * Bold Italic,
-% AutoFakeBold = 1.5,
-% Extension = .otf,
+ UprightFont = * Regular,
+ ItalicFont = * Regular,
+ ItalicFeatures = {FakeSlant=0.2},
+ SlantedFont = * Regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = * Regular,
+ BoldFeatures = {RawFeature={embolden=3}},
+ BoldItalicFont = * Regular,
+ BoldItalicFeatures={FakeSlant=0.2,RawFeature={embolden=3}},
]
\fi
-
\fi
+%------------------------ symbolic names stop -------------------------
\def\sufigures{\addfontfeatures{VerticalPosition=Superior}}
\DeclareTextFontCommand{\textsu}{\sufigures}
\iflibertinus@nomath\else
- \setmathfont{LibertinusMath-Regular.otf}[BoldFont=LibertinusMath-Bold.otf]
-% \setmathfont{LibertinusMath-regular.otf}
-% \setmathfont[version=bold]{libertinusmath-bold.otf}
+ \typeout{*************************************^^J%
+ * Using libertinus math *^^J%
+ *************************************}%
+ \setmathfont{LibertinusMath-Regular.otf}%[BoldFont=LibertinusMath-Bold.otf]
+ \setmathfont[version=bold,RawFeature={embolden=3}]{LibertinusMath-Regular.otf}
\fi
-\newfontfamily\LibertinusKeyboard{LibertinusKeyboard-Regular.otf}
+\ifluatex
+ \newfontface\LibertinusKeyboard{LibertinusKeyboard-Regular.otf}
+% \hyphenchar\LibertinusKeyboard=-1
+\else
+ \font\LibertinusKeyboard="[LibertinusKeyboard-Regular.otf]"
+\fi
\newfontfamily\LibertinusDisplay{LibertinusSerifDisplay-Regular.otf}
\newfontfamily\Libertinusinitials{LibertinusSerifInitials-Regular.otf}
\newfontfamily\LibertinusInitials{LibertinusSerifInitials-Regular.otf}
@@ -298,58 +441,59 @@
\def\BiolinumKeyGlyph#1{{\LibertinusKeyboard#1}}
\DeclareRobustCommand*\LKey[1]{\BiolinumKeyGlyph{#1}}
-\DeclareRobustCommand*\LKeyStrg{\biolinumKeyGlyph{"E170}}
-\DeclareRobustCommand*\LKeyAlt{\biolinumKeyGlyph{"E171}}
-\DeclareRobustCommand*\LKeyAltGr{\biolinumKeyGlyph{"E172}}
-\DeclareRobustCommand*\LKeyShift{\biolinumKeyGlyph{"E174}}
-\DeclareRobustCommand*\LKeyTab{\biolinumKeyGlyph{"E175}}
-\DeclareRobustCommand*\LKeyEnter{\biolinumKeyGlyph{"E176}}
-\DeclareRobustCommand*\LKeyCapsLock{\biolinumKeyGlyph{"E177}}
-\DeclareRobustCommand*\LKeyPos{\biolinumKeyGlyph{"E191}}
-\DeclareRobustCommand*\LKeyEntf{\biolinumKeyGlyph{"E18A}}
-\DeclareRobustCommand*\LKeyEinf{\biolinumKeyGlyph{"E18B}}
-\DeclareRobustCommand*\LKeyLeer{\biolinumKeyGlyph{"E18C}}
+\DeclareRobustCommand*\LKeyStrg{\BiolinumKeyGlyph{Strg}}
+\DeclareRobustCommand*\LKeyAlt{\BiolinumKeyGlyph{Alt}}
+\DeclareRobustCommand*\LKeyAltGr{\BiolinumKeyGlyph{AltGr}}
+\DeclareRobustCommand*\LKeyShift{\BiolinumKeyGlyph{Shift}}
+\DeclareRobustCommand*\LKeyTab{\BiolinumKeyGlyph{Tab}}
+\DeclareRobustCommand*\LKeyEnter{\BiolinumKeyGlyph{Enter}}
+\DeclareRobustCommand*\LKeyCapslock{\BiolinumKeyGlyph{Capslock}}
+\DeclareRobustCommand*\LKeyPos{\BiolinumKeyGlyph{Pos1}}
+\DeclareRobustCommand*\LKeyEntf{\BiolinumKeyGlyph{Entf}}
+\DeclareRobustCommand*\LKeyEinf{\BiolinumKeyGlyph{Einf}}
+\DeclareRobustCommand*\LKeyLeer{\BiolinumKeyGlyph{Leer}}
\let\LKeySpace\LKeyLeer
-\DeclareRobustCommand*\LKeyEsc{\biolinumKeyGlyph{"E195}}
-\DeclareRobustCommand*\LKeyEnde{\biolinumKeyGlyph{"E196}}
-\DeclareRobustCommand*\LKeyTux{\biolinumKeyGlyph{"E000}}
-\DeclareRobustCommand*\LKeyWin{\biolinumKeyGlyph{"E168}}
+\DeclareRobustCommand*\LKeyEsc{\BiolinumKeyGlyph{Esc}}
+\DeclareRobustCommand*\LKeyEnde{\BiolinumKeyGlyph{Ende}}
+%\DeclareRobustCommand*\LKeyTux{\BiolinumKeyGlyph{Tux}}
+\DeclareRobustCommand*\LKeyWin{\BiolinumKeyGlyph{Windows}}
\DeclareRobustCommand*\LKeyMenu{\biolinumKeyGlyph{"E104}}
-\DeclareRobustCommand*\LKeyCommand{\biolinumKeyGlyph{"2318}}
-\DeclareRobustCommand*\LKeyOptionKey{\biolinumKeyGlyph{"2325}}
-\DeclareRobustCommand*\LKeyBack{\biolinumKeyGlyph{"E16E}}
+\DeclareRobustCommand*\LKeyCtrl{\BiolinumKeyGlyph{Ctrl}}
+\DeclareRobustCommand*\LKeyOptionKey{\BiolinumKeyGlyph{Fn}}
+\DeclareRobustCommand*\LKeyBack{\BiolinumKeyGlyph{Back}}
\DeclareRobustCommand*\LKeyUp{\biolinumKeyGlyph{"2191}}
\DeclareRobustCommand*\LKeyDown{\biolinumKeyGlyph{"2193}}
\DeclareRobustCommand*\LKeyLeft{\biolinumKeyGlyph{"2190}}
\DeclareRobustCommand*\LKeyRight{\biolinumKeyGlyph{"2192}}
-\DeclareRobustCommand*\LKeyPgUp{\biolinumKeyGlyph{"E198}}
-\DeclareRobustCommand*\LKeyPgDown{\biolinumKeyGlyph{"E199}}
+\DeclareRobustCommand*\LKeyBildUp{\BiolinumKeyGlyph{Buildup}}
+\DeclareRobustCommand*\LKeyBildDown{\BiolinumKeyGlyph{Builddown}}
\DeclareRobustCommand*\LKeyAt{\biolinumKeyGlyph{"0040}}
-\DeclareRobustCommand*\LKeyFn{\biolinumKeyGlyph{"E188}}
-\DeclareRobustCommand*\LKeyHome{\biolinumKeyGlyph{"E189}}
-\DeclareRobustCommand*\LKeyDel{\biolinumKeyGlyph{"E18A}}
-\DeclareRobustCommand*\LKeyIns{\biolinumKeyGlyph{"E18B}}
-\DeclareRobustCommand*\LKeyEnd{\biolinumKeyGlyph{"E18E}}
-\DeclareRobustCommand*\LKeyGNU{\biolinumKeyGlyph{"E190}}
-\DeclareRobustCommand*\LKeyPageUp{\biolinumKeyGlyph{"E19A}}
-\DeclareRobustCommand*\LKeyPageDown{\biolinumKeyGlyph{"E19B}}
-
-\@namedef{libertine@key@F@1}{\biolinumKeyGlyph{"E178}}
-\@namedef{libertine@key@F@2}{\biolinumKeyGlyph{"E179}}
-\@namedef{libertine@key@F@3}{\biolinumKeyGlyph{"E17A}}
-\@namedef{libertine@key@F@4}{\biolinumKeyGlyph{"E17B}}
-\@namedef{libertine@key@F@5}{\biolinumKeyGlyph{"E17C}}
-\@namedef{libertine@key@F@6}{\biolinumKeyGlyph{"E17D}}
-\@namedef{libertine@key@F@7}{\biolinumKeyGlyph{"E17E}}
-\@namedef{libertine@key@F@8}{\biolinumKeyGlyph{"E17F}}
-\@namedef{libertine@key@F@9}{\biolinumKeyGlyph{"E180}}
-\@namedef{libertine@key@F@10}{\biolinumKeyGlyph{"E181}}
-\@namedef{libertine@key@F@11}{\biolinumKeyGlyph{"E182}}
-\@namedef{libertine@key@F@12}{\biolinumKeyGlyph{"E183}}
-\@namedef{libertine@key@F@13}{\biolinumKeyGlyph{"E184}}
-\@namedef{libertine@key@F@14}{\biolinumKeyGlyph{"E185}}
-\@namedef{libertine@key@F@15}{\biolinumKeyGlyph{"E186}}
-\@namedef{libertine@key@F@16}{\biolinumKeyGlyph{"E187}}
+\DeclareRobustCommand*\LKeyFn{\BiolinumKeyGlyph{Fn}}
+\DeclareRobustCommand*\LKeyHome{\BiolinumKeyGlyph{Home}}
+\DeclareRobustCommand*\LKeyDel{\BiolinumKeyGlyph{Del}}
+\DeclareRobustCommand*\LKeyIns{\BiolinumKeyGlyph{Ins}}
+\DeclareRobustCommand*\LKeyEnd{\BiolinumKeyGlyph{End}}
+\DeclareRobustCommand*\LKeyGNU{\BiolinumKeyGlyph{GNU}}
+\DeclareRobustCommand*\LKeyPageUp{\BiolinumKeyGlyph{Pageup}}
+\DeclareRobustCommand*\LKeyPageDown{\BiolinumKeyGlyph{Pagedown}}
+\DeclareRobustCommand*\LKeyWindows{\BiolinumKeyGlyph{Windows}}
+
+\@namedef{libertine@key@F@1}{\BiolinumKeyGlyph{F1}}
+\@namedef{libertine@key@F@2}{\BiolinumKeyGlyph{F2}}
+\@namedef{libertine@key@F@3}{\BiolinumKeyGlyph{F3}}
+\@namedef{libertine@key@F@4}{\BiolinumKeyGlyph{F4}}
+\@namedef{libertine@key@F@5}{\BiolinumKeyGlyph{F5}}
+\@namedef{libertine@key@F@6}{\BiolinumKeyGlyph{F6}}
+\@namedef{libertine@key@F@7}{\BiolinumKeyGlyph{F7}}
+\@namedef{libertine@key@F@8}{\BiolinumKeyGlyph{F8}}
+\@namedef{libertine@key@F@9}{\BiolinumKeyGlyph{F9}}
+\@namedef{libertine@key@F@10}{\BiolinumKeyGlyph{F10}}
+\@namedef{libertine@key@F@11}{\BiolinumKeyGlyph{F11}}
+\@namedef{libertine@key@F@12}{\BiolinumKeyGlyph{F12}}
+\@namedef{libertine@key@F@13}{\BiolinumKeyGlyph{F13}}
+\@namedef{libertine@key@F@14}{\BiolinumKeyGlyph{F14}}
+\@namedef{libertine@key@F@15}{\BiolinumKeyGlyph{F15}}
+\@namedef{libertine@key@F@16}{\BiolinumKeyGlyph{F16}}
\DeclareRobustCommand*\LKeyF[1]{\@nameuse{libertine@key@F@#1}}
%
\DeclareRobustCommand*\LKeyAltF[1]{\LKeyAlt+\@nameuse{libertine@key@F@#1}}
@@ -362,28 +506,29 @@
\DeclareRobustCommand*\LKeyShiftAltX[1]{\LKeyShift+\LKeyAlt+\LKey{#1}}
\DeclareRobustCommand*\LKeyShiftAltGrX[1]{\LKeyShift+\LKeyAltGr+\LKey{#1}}
\DeclareRobustCommand*\LKeyStrgAltX[1]{\LKeyStrg+\LKeyAlt+\LKey{#1}}
-\DeclareRobustCommand*\LKeyStrgAltEnt{\LKeyStrg+\LKeyAlt+\LKeyEntf}
-\let\LKeyReset\LKeyStrgAltEnt
+\DeclareRobustCommand*\LKeyStrgAltEntf{\LKeyStrg+\LKeyAlt+\LKeyEntf}
+\let\LKeyReset\LKeyStrgAltEntf
%
-\@namedef{libertine@key@Pad@0}{\biolinumKeyGlyph{"E1A0}}
-\@namedef{libertine@key@Pad@1}{\biolinumKeyGlyph{"E1A1}}
-\@namedef{libertine@key@Pad@2}{\biolinumKeyGlyph{"E1A2}}
-\@namedef{libertine@key@Pad@3}{\biolinumKeyGlyph{"E1A3}}
-\@namedef{libertine@key@Pad@4}{\biolinumKeyGlyph{"E1A4}}
-\@namedef{libertine@key@Pad@5}{\biolinumKeyGlyph{"E1A5}}
-\@namedef{libertine@key@Pad@6}{\biolinumKeyGlyph{"E1A6}}
-\@namedef{libertine@key@Pad@7}{\biolinumKeyGlyph{"E1A7}}
-\@namedef{libertine@key@Pad@8}{\biolinumKeyGlyph{"E1A8}}
-\@namedef{libertine@key@Pad@9}{\biolinumKeyGlyph{"E1A9}}
-\@namedef{libertine@key@Pad@10}{\biolinumKeyGlyph{"E1AA}}
-\@namedef{libertine@key@Pad@11}{\biolinumKeyGlyph{"E1AB}}
-\@namedef{libertine@key@Pad@12}{\biolinumKeyGlyph{"E1AC}}
-\@namedef{libertine@key@Pad@13}{\biolinumKeyGlyph{"E1AD}}
-\@namedef{libertine@key@Pad@14}{\biolinumKeyGlyph{"E1AE}}
+\@namedef{libertine@key@Pad@0}{\BiolinumKeyGlyph{Pad0}}
+\@namedef{libertine@key@Pad@1}{\BiolinumKeyGlyph{Pad1}}
+\@namedef{libertine@key@Pad@2}{\BiolinumKeyGlyph{Pad2}}
+\@namedef{libertine@key@Pad@3}{\BiolinumKeyGlyph{Pad3}}
+\@namedef{libertine@key@Pad@4}{\BiolinumKeyGlyph{Pad4}}
+\@namedef{libertine@key@Pad@5}{\BiolinumKeyGlyph{Pad5}}
+\@namedef{libertine@key@Pad@6}{\BiolinumKeyGlyph{Pad6}}
+\@namedef{libertine@key@Pad@7}{\BiolinumKeyGlyph{Pad7}}
+\@namedef{libertine@key@Pad@8}{\BiolinumKeyGlyph{Pad8}}
+\@namedef{libertine@key@Pad@9}{\BiolinumKeyGlyph{Pad9}}
+%\@namedef{libertine@key@Pad@10}{\BiolinumKeyGlyph{"E1AA}}
+%\@namedef{libertine@key@Pad@11}{\BiolinumKeyGlyph{"E1AB}}
+%\@namedef{libertine@key@Pad@12}{\BiolinumKeyGlyph{"E1AC}}
+%\@namedef{libertine@key@Pad@13}{\BiolinumKeyGlyph{"E1AD}}
+%\@namedef{libertine@key@Pad@14}{\BiolinumKeyGlyph{"E1AE}}
\DeclareRobustCommand*\LKeyPad[1]{\@nameuse{libertine@key@Pad@#1}}
%
% Maus
%
+\iffalse
\DeclareRobustCommand*\LMouseEmpty{\biolinumKeyGlyph{"E130}}
\DeclareRobustCommand*\LMouseN{\biolinumKeyGlyph{"E131}}
\DeclareRobustCommand*\LMouseL{\biolinumKeyGlyph{"E132}}
@@ -395,5 +540,67 @@
\DeclareRobustCommand*\LMouseIIL{\biolinumKeyGlyph{"E13A}}
\DeclareRobustCommand*\LMouseIIR{\biolinumKeyGlyph{"E13C}}
\DeclareRobustCommand*\LMouseIILR{\biolinumKeyGlyph{"E13D}}
+\fi
%
+\def\WikipediaW{{\fontspec{LibertinusSerif-Regular.otf}[RawFeature=+ss05]W}}
+\def\Wikipedia{{\fontspec{LibertinusSerif-Regular.otf}[RawFeature={+ss05,+smcp}]W\kern-1pt ikipediA}}
+
+%\def\WikipediaWSF{{\sffamily\addfontfeature{RawFeature=+ss05}W}}
+%\def\WikipediaSF{{\addfontfeature{RawFeature=+ss05}\sffamily WikipediA}}
+
+\def\Lsup#1{{\addfontfeature{RawFeature=+sups}#1}}
+\def\Lsinf#1{{\addfontfeature{RawFeature=+sinf}#1}}
+\def\Land{{\addfontfeature{RawFeature=+ss06}\&}}
+
+\def\Lcase#1{{\addfontfeature{RawFeature=case}#1}}
+\def\LCASE{\@ifnextchar-\L@CASE\L@@CASE}
+\def\L@CASE-{\addfontfeature{RawFeature=-case}}
+\def\L@@CASE#1{\addfontfeature{RawFeature=+case}\ifx#1+\else#1\fi}
+
+\def\Lfrac#1{{\addfontfeature{RawFeature=+frac}#1}}
+\def\LFRAC{\@ifnextchar-\L@FRAC\L@@FRAC}
+\def\L@FRAC-{\addfontfeature{RawFeature=-frac}}
+\def\L@@FRAC#1{\addfontfeature{RawFeature=+frac}\ifx#1+\else#1\fi}
+
+\def\Lcpsp#1{{\addfontfeature{RawFeature=+cpsp}#1}}
+\def\LCPSP{\@ifnextchar-\L@CPSP\L@@CPSP}
+\def\L@CPSP-{\addfontfeature{RawFeature=-cpsp}}
+\def\L@@CPSP#1{\addfontfeature{RawFeature=+cpsp}\ifx#1+\else#1\fi}
+
+\def\Lss#1#2#3{{\addfontfeature{RawFeature=ss#1#2}#3}}
+\def\LSS#1#2{\addfontfeature{RawFeature=ss#1#2}}
+
+\def\Lctosc#1{{\addfontfeature{RawFeature=+c2sc}#1}}
+\def\LCtoSC{\@ifnextchar-\L@CtoSC\L@@CtoSC}
+\def\L@CtoSC-{\addfontfeature{RawFeature=-c2sc}}
+\def\L@@CtoSC#1{\addfontfeature{RawFeature=+c2sc}\ifx#1+\else#1\fi}
+
+\def\Lctosmcp#1{{\addfontfeature{RawFeature={+c2sc,+smcp}}#1}}
+\def\LCtoSMCP{\@ifnextchar-\L@CtoSMCP\L@@CtoSMCP}
+\def\L@CtoSMCP-{\addfontfeature{RawFeature={-c2sc,-smcp}}}
+\def\L@@CtoSMCP#1{\addfontfeature{RawFeature={+c2sc,+smcp}}\ifx#1+\else#1\fi}
+
+\def\Lsalt#1{{\addfontfeature{RawFeature=+salt}#1}}
+\def\LSALT{\@ifnextchar-\L@SALT\L@@SALT}
+\def\L@SALT-{\addfontfeature{RawFeature=-salt}}
+\def\L@@SALT#1{\addfontfeature{RawFeature=+salt}\ifx#1+\else#1\fi}
+
+\def\Lliga#1{{\addfontfeature{RawFeature=+liga}#1}}
+\def\LLIGA{\@ifnextchar-\L@LIGA\L@@LIGA}
+\def\L@LIGA-{\addfontfeature{RawFeature=-liga}}
+\def\L@@LIGA#1{\addfontfeature{RawFeature=+liga}\ifx#1+\else#1\fi}
+
+
+\def\Lhlig#1{{\addfontfeature{RawFeature=+hlig}#1}}
+\def\LHLIG{\@ifnextchar-\L@HLIG\L@@HLIG}
+\def\L@HLIG-{\addfontfeature{RawFeature=-hlig}}
+\def\L@@HLIG#1{\addfontfeature{RawFeature=+hlig}\ifx#1+\else#1\fi}
+
+\def\Ldlig#1{{\addfontfeature{RawFeature=+dlig}#1}}
+\def\LDLIG{\@ifnextchar-\L@DLIG\L@@DLIG}
+\def\L@DLIG-{\addfontfeature{RawFeature=-dlig}}
+\def\L@@DLIG#1{\addfontfeature{RawFeature=+dlig}\ifx#1+\else#1\fi}
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinus-otf.tlpobj new/tlpkg/tlpobj/libertinus-otf.tlpobj
--- old/tlpkg/tlpobj/libertinus-otf.tlpobj 2019-04-06 23:33:56.000000000 +0200
+++ new/tlpkg/tlpobj/libertinus-otf.tlpobj 2020-02-23 01:54:43.000000000 +0100
@@ -1,23 +1,17 @@
name libertinus-otf
category Package
-revision 50783
+revision 53871
shortdesc Support for Libertinus OpenType
relocated 1
longdesc This package offers LuaLaTeX/XeLaTeX support for the Libertinus
-longdesc OpenType fonts maintained by Khaled Hosny. Furthermore
-longdesc math-bold, mono-bold, mono-oblique, and mono-bold-oblique font
-longdesc styles are provided, which have been derived from the ones in
-longdesc the libertinus-fonts package itself. The Libertinus fonts are
-longdesc similiar to Libertine and Biolinum, but come with math symbols.
-runfiles size=1027
- RELOC/fonts/opentype/public/libertinus-otf/LibertinusMath-Bold.otf
- RELOC/fonts/opentype/public/libertinus-otf/LibertinusMono-Bold.otf
- RELOC/fonts/opentype/public/libertinus-otf/LibertinusMono-BoldOblique.otf
- RELOC/fonts/opentype/public/libertinus-otf/LibertinusMono-Oblique.otf
- RELOC/fonts/opentype/public/libertinus-otf/LibertinusSans-BoldOblique.otf
+longdesc OpenType fonts maintained by Khaled Hosny. Missing fonts are
+longdesc defined via several font feature settings. The Libertinus fonts
+longdesc are similiar to Libertine and Biolinum, but come with math
+longdesc symbols.
+runfiles size=7
RELOC/tex/latex/libertinus-otf/libertinus-otf.sty
+catalogue-also libertinus-fonts libertinus-type1
catalogue-ctan /fonts/libertinus-otf
-catalogue-date 2019-04-05 09:38:28 +0200
-catalogue-license lppl1.3ofl
-catalogue-topics font font-otf font-supp font-sans font-mono font-maths
-catalogue-version 0.14
+catalogue-license lppl1.3
+catalogue-topics font-body font-otf font-supp font-serif font-sans font-proportional font-mono font-maths luatex xetex
+catalogue-version 0.24
++++++ libertinus-type1.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus-type1/README new/doc/fonts/libertinus-type1/README
--- old/doc/fonts/libertinus-type1/README 2019-02-08 23:59:45.000000000 +0100
+++ new/doc/fonts/libertinus-type1/README 2019-12-18 00:08:41.000000000 +0100
@@ -1,4 +1,4 @@
-This is the README for libertinus-type1, version 2019-02-07.
+This is the README for libertinus-type1, version 2019-12-17.
The Libertinus fonts are derived from the Linux Libertine
and Biolinum families of fonts. To use the OpenType fonts
@@ -22,11 +22,14 @@
\usepackage{libertinus}
to the preamble of your document. This will activate
-Libertinus Serif as the main text font, Libertinus Sans as
-the sans font and Libertinus Mono as the monospaced font.
-It is recommended that the font encoding be set to T1 or
-LY1, but the default OT1 encoding is also supported. The LGR
-encoding is supported for the Serif and Sans families.
+Libertinus Serif as the main text font, Libertinus Sans
+as the sans font and Libertinus Mono as the monospaced
+font. It is recommended that the font encoding be set
+to T1 or LY1, but the default OT1 encoding is also
+supported. The LGR encoding is supported for the Serif
+and Sans families. The T2A/B/C encodings are supported
+for the Serif and Sans families and may be selected using
+{\fontencoding{T2x}\selectfont ...}.
Available shapes in all series (except tt) include:
@@ -48,6 +51,10 @@
sfdefault. To suppress activating Libertinus Mono, use
mono=false (or tt=false).
+Commands \libertinusseriflgr and \libertinussanslgr
+select the LGR encoding for the Serif and Sans families,
+respectively.
+
For more advanced usage, please see the libertinus-type1.pdf
document.
Binary files old/doc/fonts/libertinus-type1/libertinus-samples.pdf and new/doc/fonts/libertinus-type1/libertinus-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus-type1/libertinus-samples.tex new/doc/fonts/libertinus-type1/libertinus-samples.tex
--- old/doc/fonts/libertinus-type1/libertinus-samples.tex 2018-09-04 23:25:22.000000000 +0200
+++ new/doc/fonts/libertinus-type1/libertinus-samples.tex 2019-05-28 23:21:31.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{libertinus}
+\usepackage[LGR,T1]{fontenc}
+\usepackage{libertinus-type1}
\usepackage{lipsum}
\usepackage{lettrine}
\usepackage{soul}
@@ -59,6 +59,14 @@
X\textsu{1234567890}
+\subsection*{LGR}
+
+
+{\libertinusseriflgr\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\\
+}
+
\clearpage
\section{Libertinus Sans}\sf
@@ -93,7 +101,7 @@
\subsection*{Default Numbers}
-1234567890
+\textbf{1234567890}
\subsection*{Oldstyle Numbers}
@@ -107,6 +115,13 @@
X\textsu{1234567890}
+\subsection*{LGR}
+
+
+{\libertinussanslgr\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\\
+}
\clearpage
@@ -114,18 +129,19 @@
\ttfamily
+
\subsection*{Regular}
\lipsum[1]
\subsection*{Italic}
-\textit{\lipsum[2]}
+\textit{\lipsum[1]}
\subsection*{Bold}
-\textbf{\lipsum[3]}
+\textbf{\lipsum[1]}
\subsection*{Bold Italic}
-\textbf{\textit{\lipsum[4]}}
+\textbf{\textit{\lipsum[1]}}
\section{Libertinus Initials}
\rm
Binary files old/doc/fonts/libertinus-type1/libertinus-type1.pdf and new/doc/fonts/libertinus-type1/libertinus-type1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus-type1/libertinus-type1.tex new/doc/fonts/libertinus-type1/libertinus-type1.tex
--- old/doc/fonts/libertinus-type1/libertinus-type1.tex 2019-02-08 23:59:45.000000000 +0100
+++ new/doc/fonts/libertinus-type1/libertinus-type1.tex 2019-05-29 22:52:07.000000000 +0200
@@ -56,7 +56,8 @@
It is
recommended that the font encoding be set to \verb\T1\ or \verb\LY1\ but the default
\verb\OT1\ encoding is also supported. The \verb|LGR| encoding is supported for the Serif and Sans
-families.
+families. The T2A/B/C encodings are supported and may be selected using
+\verb|{\fontencoding{T2x}\selectfont ...}|.
Available shapes in all series (except \texttt{tt}, which
only has \texttt{it}) include:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinus-type1.doc.tlpobj new/tlpkg/tlpobj/libertinus-type1.doc.tlpobj
--- old/tlpkg/tlpobj/libertinus-type1.doc.tlpobj 2019-02-28 03:50:06.000000000 +0100
+++ new/tlpkg/tlpobj/libertinus-type1.doc.tlpobj 2020-03-24 01:59:43.000000000 +0100
@@ -1,9 +1,9 @@
name libertinus-type1.doc
category Package
-revision 49979
+revision 54512
shortdesc doc files of libertinus-type1
relocated 1
-docfiles size=90
+docfiles size=102
RELOC/doc/fonts/libertinus-type1/OFL.txt
RELOC/doc/fonts/libertinus-type1/README
RELOC/doc/fonts/libertinus-type1/libertinus-samples.pdf
++++++ libertinus-type1.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-n/libertinus-type1.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-n.new.3606/libertinus-type1.tar.xz differ: char 25, line 1
++++++ libertinust1math.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinust1math.doc.tlpobj new/tlpkg/tlpobj/libertinust1math.doc.tlpobj
--- old/tlpkg/tlpobj/libertinust1math.doc.tlpobj 2019-02-28 03:50:16.000000000 +0100
+++ new/tlpkg/tlpobj/libertinust1math.doc.tlpobj 2020-03-24 01:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name libertinust1math.doc
category Package
-revision 48862
+revision 54512
shortdesc doc files of libertinust1math
relocated 1
docfiles size=1193
++++++ libertinust1math.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinust1math.tlpobj new/tlpkg/tlpobj/libertinust1math.tlpobj
--- old/tlpkg/tlpobj/libertinust1math.tlpobj 2019-02-28 03:50:16.000000000 +0100
+++ new/tlpkg/tlpobj/libertinust1math.tlpobj 2020-03-24 01:59:51.000000000 +0100
@@ -1,6 +1,6 @@
name libertinust1math
category Package
-revision 48862
+revision 54512
shortdesc A Type 1 font and LaTeX support for Libertinus Math
relocated 1
longdesc The package provides a Type1 version of Libertinus Math, with a
@@ -61,7 +61,6 @@
RELOC/tex/latex/libertinust1math/ls2libertinust1mathsym.fd
RELOC/tex/latex/libertinust1math/ot1libertinust1mathsf.fd
catalogue-ctan /fonts/libertinust1math
-catalogue-date 2018-10-08 07:53:35 +0200
-catalogue-license ofllppl
+catalogue-license ofl lppl
catalogue-topics font-serif font-sans font-maths font-type1
catalogue-version 1.1.9
++++++ librecaslon.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/librecaslon/README new/doc/fonts/librecaslon/README
--- old/doc/fonts/librecaslon/README 2013-10-17 00:58:48.000000000 +0200
+++ new/doc/fonts/librecaslon/README 2019-10-26 22:31:56.000000000 +0200
@@ -1,23 +1,28 @@
+This is the README for the librecaslon package, version
+2019-10-26.
-This is the README for the librecaslon package, version 2013-10-15.
-
-This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
-the Libre Caslon family of fonts, designed by Pablo Impallari.
-
-To install this package on a TDS-compliant TeX system download the file
-tex-archive/install/fonts/librecaslon.tds.zip and unzip 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 LibreCaslon.map.
+This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
+support for the Libre Caslon family of fonts, designed by
+Pablo Impallari.
+
+To install this package on a TDS-compliant
+TeX system download the file
+"tex-archive"/install/fonts/librecaslon.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 LibreCaslon.map.
To use, add
\usepackage{librecaslon}
-to the preamble of your document. This will activate Libre Caslon
-Text as the main (serifed) text font. A bold italic variant of Libre
-Caslon is not currently available; as a stopgap, an artificially
-slanted version has been generated and treated as if it were italic.
+to the preamble of your document. This will activate Libre
+Caslon Text as the main (serifed) text font. A bold italic
+variant of Libre Caslon is not currently available; as a
+stopgap, an artificially slanted version has been generated
+and treated as if it were italic.
LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish to
avoid fontspec may use the type1 option.
@@ -25,25 +30,28 @@
Options scaled=<number> or scale=<number> may be used to scale the
fonts.
-The default figure style is lining but option osf (or oldstyle)
-allows for use of oldstyle figures.
+The default figure style is proportional lining but options
+osf (or oldstyle) and tf (or tabular) allow for use of
+oldstyle and lining tabular figures, respectively.
Font encodings supported are OT1, T1, LY1 and TS1.
-Macro \librecaslon selects the Libre Caslon Text family. Macros
-\librecaslonLF and \librecaslonOsF allow for local use of lining
-or oldstyle figures. \textsu{...} can be used for superior
-(superscript) figures. Command \useosf switches the default figure
-style to old-style figures; this is primarily for use after calling
-a math package with lining figures as the default.
-
-The original fonts (version 1.0) were obtained from
-
-http://www.impallari.com/projects/overview/libre-caslon-display-and-text
-
-and are licensed under the SIL Open Font License (version 1.1);
-the text may be found in the doc directory. The opentype and type1
-versions were created using fontforge. The support files were
-created using autoinst and are licensed under the terms of the
-LaTeX Project Public License. The maintainer of this package is Bob
-Tennent (rdt at cs.queensu.ca)
+Macro \librecaslon selects the Libre Caslon Text family.
+Macros \librecaslonLF, \librecaslonOsF and \librecaslonTLF
+allow for local use of lining, oldstyle or tabular figures,
+respectively. \textsu{...} and \textin{...} can be used for
+superior (superscript) and inferior (subscript) figures,
+respectively. Command \useosf switches the default figure
+style to old-style figures; this is primarily for use after
+calling a math package with lining figures as the default.
+
+The original fonts (version 1.002) were obtained from
+
+https://github.com/impallari/Libre-Caslon-Text
+
+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 generated by cfftot1. The support files were
+created using autoinst and are licensed under the terms of
+the LaTeX Project Public License. The maintainer of this
+package is Bob Tennent (rdt at cs.queensu.ca)
Binary files old/doc/fonts/librecaslon/librecaslon-samples.pdf and new/doc/fonts/librecaslon/librecaslon-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/librecaslon/librecaslon-samples.tex new/doc/fonts/librecaslon/librecaslon-samples.tex
--- old/doc/fonts/librecaslon/librecaslon-samples.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/librecaslon/librecaslon-samples.tex 2019-06-25 23:27:37.000000000 +0200
@@ -0,0 +1,50 @@
+\documentclass{article}
+\usepackage[T1]{fontenc}
+\usepackage{librecaslon}
+\usepackage{lipsum}
+\begin{document}
+
+\begin{center}\huge
+Libre Caslon
+\end{center}
+
+\subsection*{Regular}
+\lipsum[1]
+
+\subsection*{Italic}
+\textit{\lipsum[2]}
+
+\subsection*{Bold}
+\textbf{\lipsum[3]}
+
+\subsection*{Bold Italic}
+
+\textbf{\textit{\lipsum[4]}}
+
+\subsection*{Default Numbers}
+
+1234567890
+
+\subsection*{Proportional Oldstyle Numbers}
+
+{\librecaslonOsF 1234567890}
+
+\subsection*{Proportional Lining Numbers}
+
+{\librecaslonLF 1234567890}
+
+\subsection*{Tabular Lining Numbers}
+
+{\librecaslonTLF 1234567890}
+
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+\subsection*{Inferior Numbers}
+
+X\textin{1234567890}
+
+
+
+\end{document}
Binary files old/doc/fonts/librecaslon/samples.pdf and new/doc/fonts/librecaslon/samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/librecaslon/samples.tex new/doc/fonts/librecaslon/samples.tex
--- old/doc/fonts/librecaslon/samples.tex 2013-06-27 00:50:50.000000000 +0200
+++ new/doc/fonts/librecaslon/samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{librecaslon}
-\usepackage{lipsum}
-
-\begin{document}
-
-\begin{center}\huge
-Libre Caslon
-\end{center}
-
-\subsection*{Regular}
-\lipsum[1]
-
-\subsection*{Italic}
-\textit{\lipsum[2]}
-
-\subsection*{Bold}
-\textbf{\lipsum[3]}
-
-\subsection*{Bold Italic}
-
-\textbf{\textit{\lipsum[4]}}
-
-\subsection*{Default Numbers}
-
-1234567890
-
-\subsection*{Oldstyle Numbers}
-
-{\librecaslonOsF 1234567890}
-
-\subsection*{Lining Numbers}
-
-{\librecaslonLF 1234567890}
-
-\subsection*{Superior Numbers}
-
-X\textsu{1234567890}
-
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librecaslon.doc.tlpobj new/tlpkg/tlpobj/librecaslon.doc.tlpobj
--- old/tlpkg/tlpobj/librecaslon.doc.tlpobj 2019-02-28 03:50:18.000000000 +0100
+++ new/tlpkg/tlpobj/librecaslon.doc.tlpobj 2020-03-24 01:59:52.000000000 +0100
@@ -1,10 +1,10 @@
name librecaslon.doc
category Package
-revision 31929
+revision 54512
shortdesc doc files of librecaslon
relocated 1
-docfiles size=34
+docfiles size=11
RELOC/doc/fonts/librecaslon/OFL.txt
RELOC/doc/fonts/librecaslon/README
- RELOC/doc/fonts/librecaslon/samples.pdf
- RELOC/doc/fonts/librecaslon/samples.tex
+ RELOC/doc/fonts/librecaslon/librecaslon-samples.pdf
+ RELOC/doc/fonts/librecaslon/librecaslon-samples.tex
++++++ librecaslon.tar.xz ++++++
++++ 5250 lines of diff (skipped)
++++++ limecv.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/limecv/README.md new/doc/latex/limecv/README.md
--- old/doc/latex/limecv/README.md 2017-11-25 21:59:01.000000000 +0100
+++ new/doc/latex/limecv/README.md 2020-03-15 22:32:00.000000000 +0100
@@ -1,5 +1,7 @@
# limecv <img src="src/images/limecv-icon.png" alt="limecv project icon" width="40px"/>
+[![Build Status](https://travis-ci.org/opieters/limecv.svg?branch=master)](https://t…
+
`limecv` is a document class to typeset curriculum vitæ in (Xe/Lua)LaTeX.
The design of this document class is detailed in [a series of blog posts][blog].
@@ -22,33 +24,17 @@
* [FontAwesome][FA]
* [Fira][fira] (only needed when using XeLaTeX/LuaLaTeX)
-The following packages need to be installed on your system. They are all available on CTAN:
-`kvoptions`,
-`ifxetex`,
-`ifluatex`,
-`xparse`,
-`calc`,
-`xcolor`,
-`tabularx`,
-`hyperref`,
-`url`,
-`parskip`,
-`xstring`,
-`xkeyval`,
-`tikz`,
-`graphicx`,
-`fontspec` (XeLaTeX and LuaLaTeX only) and
-`fontawesome`.
+The required packages are all available on CTAN. `support/install_texlive.sh` list all of them.
## Documentation
-The class documentation can be found on [CTAN](http://mirrors.ctan.org/macros/latex/contrib/limecv/limecv.pdf).
+The class documentation can be found on [CTAN](http://ctan.org/tex-archive/macros/latex/contrib/limecv/limecv.pdf).
-Alternatively, the documentation can also be created by running `pdflatex limecv.dtx`.
+Alternatively, the documentation can also be created by running `xelatex limecv.dtx`.
## Examples
-To compile the examples in `/examples/`, install the package from CTAN or compile from source by running: `pdflatex limecv.ins` and copy the resulting `limecv.cls` file to the `/examples/` folder.
+To compile the examples in `/examples/`, install the package from CTAN or compile from source by running: `xelatex limecv.ins` and copy the resulting `limecv.cls` file to the `/examples/` folder.
## Licence
@@ -56,9 +42,8 @@
Default profile picture courtesy of Twitter.
-© 2017 Olivier Pieters
+© 2017 - 2020 Olivier Pieters
[blog]: https://olivierpieters.be/blog/archive/tag/limecv
[FA]: http://fontawesome.io
[fira]: https://github.com/mozilla/Fira
-[docs]: http://ctan.org/tex-archive/macros/generic/limecv/limecv.pdf
Binary files old/doc/latex/limecv/examples/mwe-latex.pdf and new/doc/latex/limecv/examples/mwe-latex.pdf differ
Binary files old/doc/latex/limecv/examples/mwe-lualatex.pdf and new/doc/latex/limecv/examples/mwe-lualatex.pdf differ
Binary files old/doc/latex/limecv/examples/mwe-xelatex.pdf and new/doc/latex/limecv/examples/mwe-xelatex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/limecv/examples/mwe-xelatex.tex new/doc/latex/limecv/examples/mwe-xelatex.tex
--- old/doc/latex/limecv/examples/mwe-xelatex.tex 2017-11-25 21:59:01.000000000 +0100
+++ new/doc/latex/limecv/examples/mwe-xelatex.tex 2020-02-08 23:18:03.000000000 +0100
@@ -34,6 +34,7 @@
\begin{document}
+\cvSetLanguage{german}
% Design of side bar.
\begin{cvSidebar}
Binary files old/doc/latex/limecv/limecv.pdf and new/doc/latex/limecv/limecv.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/limecv.doc.tlpobj new/tlpkg/tlpobj/limecv.doc.tlpobj
--- old/tlpkg/tlpobj/limecv.doc.tlpobj 2019-02-28 03:50:22.000000000 +0100
+++ new/tlpkg/tlpobj/limecv.doc.tlpobj 2020-03-16 02:21:36.000000000 +0100
@@ -1,9 +1,9 @@
name limecv.doc
category Package
-revision 45906
+revision 54329
shortdesc doc files of limecv
relocated 1
-docfiles size=163
+docfiles size=122
RELOC/doc/latex/limecv/LICENSE
RELOC/doc/latex/limecv/README.md
RELOC/doc/latex/limecv/examples/limecv-icon.pdf
++++++ limecv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/limecv/limecv.cls new/tex/latex/limecv/limecv.cls
--- old/tex/latex/limecv/limecv.cls 2017-11-25 21:59:01.000000000 +0100
+++ new/tex/latex/limecv/limecv.cls 2020-03-15 22:32:00.000000000 +0100
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{limecv}
- [2017/09/12 v0.1.3 limecv Document class for CVs.]
+ [2020/03/15 v0.1.8 limecv Document class for CVs.]
\RequirePackage{kvoptions}
\DeclareBoolOption[false]{print}
@@ -52,6 +52,7 @@
\definecolor{cvRed}{HTML}{7f2d35}
\definecolor{cvDark}{HTML}{2F3142}
\definecolor{cvAccent}{HTML}{474A65}
+\definecolor{cvBackground}{HTML}{FFFFFF}
\newcolumntype{L}[1]{>{\raggedright\let\newline\\%
\arraybackslash\hspace{0pt}}m{#1}}
\newcolumntype{C}[1]{>{\centering\let\newline\\%
@@ -74,6 +75,7 @@
}
\AtBeginDocument{\globalcolor{cvDark}}
\RequirePackage{tikz}
+
\RequirePackage{graphicx}
\usetikzlibrary{%
calc,
@@ -98,8 +100,6 @@
progressBar/.style={},
sectionTitle/.style={},
sectionEduText/.style={%
- eventdottext,
- anchor=north west
},
cv(a)interesticon/.style = {%
minimum width=\cvHeaderIconWidth,
@@ -148,7 +148,7 @@
minimum width=\cvProgressAreaWidth,
minimum height=\cvProgressAreaHeight,
rectangle,
- draw,
+ draw=cvBackground,
cvGreen,
progressArea
},
@@ -174,15 +174,15 @@
}
\NewDocumentCommand{\cv@loadFonts}{}{
\RequirePackage{fontspec}
- \RequirePackage{fontawesome}
+ \RequirePackage{fontawesome5}
\setmainfont[Numbers={Monospaced}]{\limecv@sansfont}
\setsansfont{\limecv@sansfont}
\setmonofont{\limecv@monofont}
\ifcv@fontPath
\newfontfamily{\cv@FA}[Path=\limecv@path]%
- {FontAwesome}
+ {Font Awesome 5 Free}
\else
- \newfontfamily{\cv@FA}{FontAwesome}
+ \newfontfamily{\cv@FA}{Font Awesome 5 Free}
\fi
\ProvideDocumentCommand{\faAddressCard}{}{{\cv@FA%
\symbol{"F2B9}}}
@@ -197,7 +197,7 @@
\ifluatex
\cv@loadFonts
\else
- \RequirePackage{fontawesome}
+ \RequirePackage{fontawesome5}
\RenewDocumentCommand{\familydefault}{}{\sfdefault}
\fi
\fi
@@ -279,16 +279,16 @@
\newlength\cvSkillSep
\setlength\cvSkillSep{1ex}
\newlength\cvHeaderIconWidth
-\setlength\cvHeaderIconWidth{0pt}
+\setlength\cvHeaderIconWidth{10pt}
\NewDocumentCommand{\cvSection}{m}{\Large\textbf{#1}}
\newcount\my@repeat@count
\NewDocumentCommand{\cvSkill}{m}{%
\begingroup
\my@repeat@count=\z@
- \@whilenum\my@repeat@count<#1\do{\faCircle\advance%
+ \@whilenum\my@repeat@count<#1\do{\faCircle[solid]\advance%
\my@repeat@count\@ne}%
\my@repeat@count=\numexpr5-\z@\relax
- \@whilenum\my@repeat@count>#1\do{\faCircleO\advance%
+ \@whilenum\my@repeat@count>#1\do{\faCircle[regular]\advance%
\my@repeat@count\m@ne}%
\endgroup
}
@@ -303,7 +303,8 @@
\setcounter{cv@titleNext}{1}
\NewDocumentCommand{\cv@Title}{mm}{%
\ifnodedefined{cv@last item \the\value{cv@lastItem}}{%
- \setlength\cvHeaderIconWidth{\maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}%
+ \setlength\cvHeaderIconWidth\cvHeaderIconWidth%{%
+ %\maxof{\cvHeaderIconWidth}{\widthof{\Large #2}}}%
\protected@write\@auxout{}{\global\cvHeaderIconWidth=\the\cvHeaderIconWidth}
\node[%
below=\cvSectionSep of cv@last item %
@@ -429,6 +430,7 @@
\pgfkeys{/@cv/names/experience = Experience}%
\pgfkeys{/@cv/names/references = References}%
\pgfkeys{/@cv/names/skills = Skills}%
+ \pgfkeys{/@cv/names/publications = Publications}%
}
\NewDocumentCommand{\cv@setDutch}{}{
\pgfkeys{/@cv/names/profile = Profiel}%
@@ -442,6 +444,62 @@
\pgfkeys{/@cv/names/experience = Werkervaring}%
\pgfkeys{/@cv/names/references = Referenties}%
\pgfkeys{/@cv/names/skills = Vaardigheden}%
+ \pgfkeys{/@cv/names/publications = Publicaties}%
+}
+\NewDocumentCommand{\cv@setChinese}{}{
+ \pgfkeys{/@cv/names/profile = 关于我}%
+ \pgfkeys{/@cv/names/contact = 联系我}%
+ \pgfkeys{/@cv/names/languages = 语言能力}%
+ \pgfkeys{/@cv/names/interests = 兴趣爱好}%
+ \pgfkeys{/@cv/names/professional = Professional}%
+ \pgfkeys{/@cv/names/personal = Personal}%
+ \pgfkeys{/@cv/names/projects = 我的项目}%
+ \pgfkeys{/@cv/names/education = 教育背景}%
+ \pgfkeys{/@cv/names/experience = 工作经验}%
+ \pgfkeys{/@cv/names/references = References}%
+ \pgfkeys{/@cv/names/skills = IT技能}%
+ \pgfkeys{/@cv/names/publications = 出版作品}%
+}
+\NewDocumentCommand{\cv@setFrench}{}{
+ \pgfkeys{/@cv/names/profile = Profil}%
+ \pgfkeys{/@cv/names/contact = Contact}%
+ \pgfkeys{/@cv/names/languages = Langues}%
+ \pgfkeys{/@cv/names/interests = Centres d'int\'{e}r\^{e}t}%
+ \pgfkeys{/@cv/names/professional = Professionel}%
+ \pgfkeys{/@cv/names/personal = Personnel}%
+ \pgfkeys{/@cv/names/projects = Projets}%
+ \pgfkeys{/@cv/names/education = Education}%
+ \pgfkeys{/@cv/names/experience = Exp\'{e}riences}%
+ \pgfkeys{/@cv/names/references = R\'{e}f\'{e}rences}%
+ \pgfkeys{/@cv/names/skills = Comp\'{e}tences}%
+}
+\NewDocumentCommand{\cv@setGerman}{}{
+ \pgfkeys{/@cv/names/profile = Profil}%
+ \pgfkeys{/@cv/names/contact = Kontakt}%
+ \pgfkeys{/@cv/names/languages = Sprachen}%
+ \pgfkeys{/@cv/names/interests = Interessen}%
+ \pgfkeys{/@cv/names/professional = Beruflich}%
+ \pgfkeys{/@cv/names/personal = Persönlich}%
+ \pgfkeys{/@cv/names/projects = Projekte}%
+ \pgfkeys{/@cv/names/education = Ausbildung}%
+ \pgfkeys{/@cv/names/experience = Berufliche Erfahrung}%
+ \pgfkeys{/@cv/names/references = Referenzen}%
+ \pgfkeys{/@cv/names/skills = Kenntnisse}%
+ \pgfkeys{/@cv/names/publications = Veröffentlichungen}%
+}
+\NewDocumentCommand{\cv@setItalian}{}{
+ \pgfkeys{/@cv/names/profile = Profilo}%
+ \pgfkeys{/@cv/names/contact = Contatti}%
+ \pgfkeys{/@cv/names/languages = Lingue}%
+ \pgfkeys{/@cv/names/interests = Interessi}%
+ \pgfkeys{/@cv/names/professional = Professionali}%
+ \pgfkeys{/@cv/names/personal = Personali}%
+ \pgfkeys{/@cv/names/projects = Progetti}%
+ \pgfkeys{/@cv/names/education = Formazione}%
+ \pgfkeys{/@cv/names/experience = Esperienze lavorative}%
+ \pgfkeys{/@cv/names/references = Referenze}%
+ \pgfkeys{/@cv/names/skills = Competenze}%
+ \pgfkeys{/@cv/names/publications = Pubblicazioni}%
}
\ExplSyntaxOn
\NewDocumentCommand{\cvSetLanguage}{m}{
@@ -449,10 +507,17 @@
{
{dutch} {\cv@setDutch}
{english} {\cv@setEnglish}
+ {french} {\cv@setFrench}
+ {german} {\cv@setGerman}
+ {italian} {\cv@setItalian}
+ {chinese} {%
+ \usepackage[BoldFont,SlantFont]{xeCJK}%
+ \cv@setChinese%
+ }
}
{\ClassError{limecv}{Unknown option `#1' for cvLanguage %
- macro.}{Only `english' and `dutch' are valid options %
- for this macro.}}
+ macro.}{Only `english', `chinese`, `dutch`, `french`, `german` %
+ and `italian` are valid options for this macro.}}
}
\ExplSyntaxOff
\cvSetLanguage{english}
@@ -539,6 +604,17 @@
\draw (skills.south west) node %
(cv@last item \the\value{cv@lastItem}) {};
}
+\NewDocumentEnvironment{cvPublications}{}{%
+\cv@Title{\pgfkeysvalueof{/@cv/names/publications}}{\faNewspaper}
+ \stepcounter{cv@itemPrev}
+ \stepcounter{cv@itemNext}
+ \cv@definecvItem
+}{%
+ \cv@EndSectionDraw
+ \stepcounter{cv@lastItem}
+ \draw (item \the\value{cv(a)itemPrev}.south west)
+ node (cv@last item \the\value{cv@lastItem}) {};
+}
\NewDocumentEnvironment{cvReferences}{}{%
\cv@Title{\pgfkeysvalueof{/@cv/names/references}}{\faLink}
\node[
@@ -652,14 +728,14 @@
-0.5\cvTableSepWidth}@{\hskip \cvTableSepWidth}%
L{0.5\cvMainWidth-0.5\cvTimeDotSep%
-0.5\cvTableSepWidth}@{}}%
- \ifcv@refName \cv@refAName & \cv@refBName \fi %
- \ifcv@refCompany \\ \cv@refACompany & \cv@refBCompany \fi %
- \ifcv@refPosition \\ \cv@refAPosition & \cv@refBPosition \fi %
- \ifcv@refAddressLineA \\ \cv@refAAddressLineA & \cv@refBAddressLineA \fi %
- \ifcv@refAddressLineB \\ \cv@refAAddressLineB & \cv@refBAddressLineB \fi %
- \ifcv@refAddressLineC \\ \cv@refAAddressLineC & \cv@refBAddressLineC \fi %
- \ifcv@refWorkPhone \\ \cv@refAPhoneWork & \cv@refBPhoneWork \fi %
- \ifcv@refMobilePhone \\ \cv@refAMobilePhone & \cv@refBMobilePhone \fi %
+ \ifcv@refName \cv@refAName & \cv@refBName \fi %
+ \ifcv@refCompany \\ \cv@refACompany & \cv@refBCompany \fi %
+ \ifcv@refPosition \\ \cv@refAPosition & \cv@refBPosition \fi %
+ \ifcv@refAddressLineA \\ \cv@refAAddressLineA & \cv@refBAddressLineA \fi %
+ \ifcv@refAddressLineB \\ \cv@refAAddressLineB & \cv@refBAddressLineB \fi %
+ \ifcv@refAddressLineC \\ \cv@refAAddressLineC & \cv@refBAddressLineC \fi %
+ \ifcv@refWorkPhone \\ \cv@refAPhoneWork & \cv@refBPhoneWork \fi %
+ \ifcv@refMobilePhone \\ \cv@refAMobilePhone & \cv@refBMobilePhone \fi %
\end{tabular}%
\pgfkeys{/@cv/references/value stored = false}%
\else%
@@ -725,6 +801,17 @@
\@IfNoValueOrEmptyTF{##1}{##2}{\href{##1}{##2}}};
}
}
+\NewDocumentCommand{\cvContactTemplate}{O{} mm}{
+ \ifcv@contactfirst%
+ \\%
+ \else %
+ \global\cv@contactfirsttrue %
+ \fi %
+ \node[cv@contactIcon]{#2};
+ \pgfmatrixnextcell \node[cv@contactText]{%
+ \@IfNoValueOrEmptyTF{#1}{#3}{\href{#1}{#3}}%
+ };
+}
\newif\ifcv@contactfirst
\NewDocumentEnvironment{cvContact}{}{%
\vspace{\cvSectionSBSep}
@@ -738,7 +825,8 @@
\cv@ContactTemplateLink{\cvContactEmail}{\faEnvelope}
\cv@ContactTemplateLink{\cvContactWebsite}{\faGlobe}
\cv@ContactTemplateLink{\cvContactGithub}{\faGithub}
- \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedinSquare}
+ \cv@ContactTemplateLink{\cvContactGitlab}{\faGitlab}
+ \cv@ContactTemplateLink{\cvContactLinkedin}{\faLinkedin}
\cv@ContactTemplateLink{\cvContactTwitter}{\faTwitter}
\cv@ContactTemplateLink{\cvContactKeybase}{\faKey}
\begin{tikzpicture}[%
@@ -807,18 +895,22 @@
\NewDocumentCommand{\cvInterest}{mm}{%
\ifcv@interestContent %
\node[
- below=\cvItemSep of cv@interest text \the\value{cv@cvInterestCounterPrev},
+ below=\cvItemSep of cv@interest text %
+ \the\value{cv@cvInterestCounterPrev},
cv@interesticon]
(cv@interest icon \the\value{cv@cvInterestCounter}) {##1};
\node[
- below=\cvInterestDetailsSep of cv@interest icon \the\value{cv@cvInterestCounter},
+ below=\cvInterestDetailsSep of cv@interest icon %
+ \the\value{cv@cvInterestCounter},
cv@interesttext]
(cv@interest text \the\value{cv@cvInterestCounter}) {##2};
\else
\cv@interestOpen
- \node[cv@interesticon] (cv@interest icon \the\value{cv@cvInterestCounter}) {##1};
+ \node[cv@interesticon]
+ (cv@interest icon \the\value{cv@cvInterestCounter}) {##1};
\node[
- below=\cvInterestDetailsSep of cv@interest icon \the\value{cv@cvInterestCounter},
+ below=\cvInterestDetailsSep of cv@interest icon %
+ \the\value{cv@cvInterestCounter},
cv@interesttext]
(cv@interest text \the\value{cv@cvInterestCounter}) {##2};
\fi
@@ -852,9 +944,11 @@
\cv@definecv@interestSection
\NewDocumentCommand{\cvInterestsPersonal}{}{%
- \cv@interestSection{\faUser\ \emph{Personal}}}
+ \cv@interestSection{\faUser\ \emph{\pgfkeysvalueof{/@cv/names/personal}}}}
\NewDocumentCommand{\cvInterestsProfessional}{}{%
- \cv@interestSection{\faBriefcase\ \emph{Professional}}}
+ \cv@interestSection{\faBriefcase\ \emph{%
+ \pgfkeysvalueof{/@cv/names/professional}}%
+ }}
\ifcv@interestLong
\cv@definecvInterestLong
\else
@@ -925,7 +1019,8 @@
\node[%
text width=\cvSideWidth,
align=center,
- below=\cvProjectDetailsSep of project \the\value{cv@projectCurrent} image]
+ below=\cvProjectDetailsSep of project \the\value{cv@projectCurrent} %
+ image]
(project \the\value{cv@projectCurrent} title) {%
\ifcv@projectLink \href{\cv@projectLink}{##2} \else ##2 \fi };
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/limecv.tlpobj new/tlpkg/tlpobj/limecv.tlpobj
--- old/tlpkg/tlpobj/limecv.tlpobj 2019-02-28 03:50:22.000000000 +0100
+++ new/tlpkg/tlpobj/limecv.tlpobj 2020-03-16 02:21:36.000000000 +0100
@@ -1,19 +1,18 @@
name limecv
category Package
-revision 45906
+revision 54329
shortdesc A (Xe/Lua)LaTeX document class for curriculum vitae
relocated 1
longdesc limecv is a (Xe/Lua)LaTeX document class to write curriculum
longdesc vitae. It is designed with the following design rules: simple,
longdesc elegant and clean. To this end, it offers several environments
longdesc and macros for convenience.
-runfiles size=9
+runfiles size=10
RELOC/tex/latex/limecv/limecv.cls
catalogue-contact-bugs https://github.com/opieters/limecv/issues
catalogue-contact-home https://olivierpieters.be/projects/limecv
catalogue-contact-repository https://github.com/opieters/limecv
catalogue-ctan /macros/latex/contrib/limecv
-catalogue-date 2018-01-07 12:02:30 +0100
catalogue-license lppl1.3c
-catalogue-topics cv
-catalogue-version 0.1.3
+catalogue-topics cv class
+catalogue-version 0.1.8
++++++ lion-msc.doc.tar.xz ++++++
Binary files old/doc/latex/lion-msc/Thumbs.db and new/doc/latex/lion-msc/Thumbs.db differ
Binary files old/doc/latex/lion-msc/lion-msc.pdf and new/doc/latex/lion-msc/lion-msc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lion-msc/lion-msc.tex new/doc/latex/lion-msc/lion-msc.tex
--- old/doc/latex/lion-msc/lion-msc.tex 2017-03-17 22:34:56.000000000 +0100
+++ new/doc/latex/lion-msc/lion-msc.tex 2019-05-16 23:03:36.000000000 +0200
@@ -26,7 +26,7 @@
%\major{Physics and Mathematics}
% optional cover picture - should be jpg or pdf
-\coverpicture{\includegraphics[width=13cm]{thesisstyle.png}}
+% \coverpicture{\includegraphics[width=13cm]{thesisstyle.png}}
% Use this to make hyperlinks visible in the document.
% \hypersetup{colorlinks=true}
@@ -127,7 +127,6 @@
\textbf{AlexanderPRA.tex} & \LaTeX file used as an example of a Master Thesis \\
\textbf{lion-msc.tex} & This file \\
\textbf{lion-msc.pdf} & PDF file of the compiled version of lion-msc.tex \\
-\textbf{thesisstyle.jpg} & Image used for the cover \\
\textbf{Fig1.png} & Figure used in AlexanderPRA.tex \\
\textbf{Fig2.png} & Figure used in AlexanderPRA.tex \\
\textbf{Fig3a.png} & Figure used in AlexanderPRA.tex \\
@@ -179,6 +178,9 @@
\textbf{$\backslash$coverpicture} & (optional) Insert a cover picture on the first page \\
& Usage: \\
& $\backslash$coverpicture\{$\backslash$includegraphics[width=13cm]\{picture.jpg\}\} \\
+\textbf{$\backslash$dedicate} & (optional) Use this to dedicate your thesis to someone. \\
+ & Please do respect the university guidelines for this! \\
+
\hline
\end{tabular}
Binary files old/doc/latex/lion-msc/minimal.pdf and new/doc/latex/lion-msc/minimal.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lion-msc.doc.tlpobj new/tlpkg/tlpobj/lion-msc.doc.tlpobj
--- old/tlpkg/tlpobj/lion-msc.doc.tlpobj 2019-02-28 03:50:24.000000000 +0100
+++ new/tlpkg/tlpobj/lion-msc.doc.tlpobj 2019-05-17 01:38:31.000000000 +0200
@@ -1,9 +1,9 @@
name lion-msc.doc
category Package
-revision 44131
+revision 51143
shortdesc doc files of lion-msc
relocated 1
-docfiles size=587
+docfiles size=446
RELOC/doc/latex/lion-msc/4photon.bib
RELOC/doc/latex/lion-msc/AlexanderPRA.tex
RELOC/doc/latex/lion-msc/Fig1.png
@@ -13,7 +13,6 @@
RELOC/doc/latex/lion-msc/Fig4.png
RELOC/doc/latex/lion-msc/LICENSE
RELOC/doc/latex/lion-msc/README.md
- RELOC/doc/latex/lion-msc/Thumbs.db
RELOC/doc/latex/lion-msc/lion-msc.layout
RELOC/doc/latex/lion-msc/lion-msc.pdf
RELOC/doc/latex/lion-msc/lion-msc.tex
++++++ lion-msc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lion-msc/lion-msc.cls new/tex/latex/lion-msc/lion-msc.cls
--- old/tex/latex/lion-msc/lion-msc.cls 2017-03-17 22:34:56.000000000 +0100
+++ new/tex/latex/lion-msc/lion-msc.cls 2019-05-16 23:03:36.000000000 +0200
@@ -48,9 +48,9 @@
\typeout{}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{lion-msc}[2017/03/17 v0.27]
+\ProvidesClass{lion-msc}[2019/05/15 v0.28]
\typeout{}
-\typeout{Leiden Institute of Physics thesis class - version 0.27}
+\typeout{Leiden Institute of Physics thesis class - version 0.28}
\typeout{}
\typeout{Copyright (c) 2014 Michiel de Dood}
\typeout{Please send questions, comments, additions, complaints to:}
@@ -141,7 +141,10 @@
\RequirePackage[margin=0cm,font={small,sl},labelfont={bf,sl},tableposition=top,singlelinecheck=false,hypcap]{caption}
% Use US english (default) hyphenation rules and provide dutch as an option
-\RequirePackage[dutch,USenglish]{babel}
+% 14/05/2019 The USenglish as an option started generating errors.
+% changed the option to english instead hoping for more
+% stable behavior (M.J.A. de Dood)
+\RequirePackage[dutch,english]{babel}
% For standard formatting of dates I use the datetime package
% It is important to load this package AFTER the babel package
@@ -206,6 +209,11 @@
% New if construct: Default condition:
\newif\ifcover@picture \cover@picturefalse
+% Optional dedication added 14-05-2019. Requested by Ruoyan Wang
+% use \dedicate to define
+\def\dedicate#1{\gdef\@dedicate{#1}\dedicationtrue}
+% default option is off
+\newif\ifdedication \dedicationfalse
% == start : title page using titling package
@@ -282,6 +290,9 @@
\normalsize
}
+% Changed the alignment of the abstract. The centering is plain ugly
+% Following comments of Casper Remeijer
+
\postdate{
\end{center}
\begin{center}
@@ -291,20 +302,15 @@
\vskip 1em
\normalsize \@abstract
\vfill
+ \ifdedication
+ \clearpage
+ \thispagestyle{empty}
+ \vskip 3em
+ \textit{\@dedicate}
+ \fi
}
-% Changed the alignment of the abstract. The centering is plain ugly
-% Following comments of Casper Remeijer
-\postdate{
- \end{center}
- \begin{center}
- \vskip 1 em
- \color{black} \large \textbf{Abstract} \\
- \vskip 1em
- \normalsize \@abstract
- \end{center}
- \vfill
-}
+
% == end : title page using titling package
% == start : pagesize commands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lion-msc.tlpobj new/tlpkg/tlpobj/lion-msc.tlpobj
--- old/tlpkg/tlpobj/lion-msc.tlpobj 2019-02-28 03:50:25.000000000 +0100
+++ new/tlpkg/tlpobj/lion-msc.tlpobj 2019-05-17 01:38:32.000000000 +0200
@@ -1,6 +1,6 @@
name lion-msc
category Package
-revision 44131
+revision 51143
shortdesc LaTeX class for B.Sc. and M.Sc. reports at Leiden Institute of Physics (LION)
relocated 1
longdesc LaTeX class for B.Sc. and M.Sc. reports at Leiden Institute of
@@ -16,7 +16,7 @@
RELOC/tex/latex/lion-msc/lion-msc-logo.pdf
RELOC/tex/latex/lion-msc/lion-msc.cls
catalogue-ctan /macros/latex/contrib/lion-msc
-catalogue-date 2018-01-07 14:49:11 +0100
+catalogue-date 2019-05-15 23:06:58 +0200
catalogue-license lppl1.3
catalogue-topics class dissertation class class class
-catalogue-version 0.27
+catalogue-version 0.28
++++++ listings.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/README new/doc/latex/listings/README
--- old/doc/latex/listings/README 2019-02-28 23:37:22.000000000 +0100
+++ new/doc/latex/listings/README 2020-03-25 22:10:48.000000000 +0100
@@ -3,7 +3,7 @@
Copyright 1996--2004 Carsten Heinz (the package)
Copyright 1996--2007 individual authors (language drivers)
Copyright 2006--2007 Brooks Moses (continued maintenance)
-Copyright 2013--2019 Jobst Hoffmann (continued maintenance)
+Copyright 2013--2020 Jobst Hoffmann (continued maintenance)
Released under the LaTeX Project Public License 1.3c or later
Binary files old/doc/latex/listings/listings-devel.pdf and new/doc/latex/listings/listings-devel.pdf differ
Binary files old/doc/latex/listings/listings.pdf and new/doc/latex/listings/listings.pdf differ
Binary files old/doc/latex/listings/lstdrvrs.pdf and new/doc/latex/listings/lstdrvrs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listings.doc.tlpobj new/tlpkg/tlpobj/listings.doc.tlpobj
--- old/tlpkg/tlpobj/listings.doc.tlpobj 2019-03-01 02:26:52.000000000 +0100
+++ new/tlpkg/tlpobj/listings.doc.tlpobj 2020-03-26 01:56:02.000000000 +0100
@@ -1,9 +1,9 @@
name listings.doc
category Package
-revision 50175
+revision 54554
shortdesc doc files of listings
relocated 1
-docfiles size=602
+docfiles size=604
RELOC/doc/latex/listings/README
RELOC/doc/latex/listings/listings-devel.pdf
RELOC/doc/latex/listings/listings.pdf
++++++ listings.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings-acm.prf new/tex/latex/listings/listings-acm.prf
--- old/tex/latex/listings/listings-acm.prf 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings-acm.prf 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{listings-acm.prf}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\usepackage[rgb, x11names]{xcolor}
\definecolor{Comments}{rgb}{0.00,0.50,0.00}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings-bash.prf new/tex/latex/listings/listings-bash.prf
--- old/tex/latex/listings/listings-bash.prf 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings-bash.prf 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{listings-bash.prf}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstset{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings-fortran.prf new/tex/latex/listings/listings-fortran.prf
--- old/tex/latex/listings/listings-fortran.prf 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings-fortran.prf 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{listings-fortran.prf}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstset{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings-hansl.prf new/tex/latex/listings/listings-hansl.prf
--- old/tex/latex/listings/listings-hansl.prf 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings-hansl.prf 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{listings-hansl.prf}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstdefinestyle{hanslbw}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings-lua.prf new/tex/latex/listings/listings-lua.prf
--- old/tex/latex/listings/listings-lua.prf 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings-lua.prf 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{listings-lua.prf}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\usepackage[rgb, x11names]{xcolor}
\lstdefinestyle{Lua}{%
language=[5.2]Lua,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings-python.prf new/tex/latex/listings/listings-python.prf
--- old/tex/latex/listings/listings-python.prf 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings-python.prf 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{listings-python.prf}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\usepackage{xcolor}
\usepackage{textcomp}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings.cfg new/tex/latex/listings/listings.cfg
--- old/tex/latex/listings/listings.cfg 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings.cfg 2020-03-25 22:10:48.000000000 +0100
@@ -21,7 +21,7 @@
%% Send comments and ideas on the package, error reports and additional
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
-\ProvidesFile{listings.cfg}[2019/02/27 1.8b listings configuration]
+\ProvidesFile{listings.cfg}[2020/03/24 1.8d listings configuration]
\def\lstlanguagefiles
{lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty}
\lstset{defaultdialect=[R/3 6.10]ABAP,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings.sty new/tex/latex/listings/listings.sty
--- old/tex/latex/listings/listings.sty 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/listings.sty 2020-03-25 22:10:48.000000000 +0100
@@ -16,8 +16,8 @@
%% Send comments and ideas on the package, error reports and additional
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
-\def\filedate{2019/02/27}
-\def\fileversion{1.8b}
+\def\filedate{2020/03/24}
+\def\fileversion{1.8d}
\NeedsTeXFormat{LaTeX2e}
\AtEndOfPackage{\ProvidesPackage{listings}
[\filedate\space\fileversion\space(Carsten Heinz)]}
@@ -927,7 +927,7 @@
\lst@ProcessOther {"27}{\lst@ifupquote \textquotesingle
\else \char39\relax \fi}
\lst@ProcessOther {"2A}{\lst@ttfamily*\textasteriskcentered}
- \lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{$-$}}
+ \lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{\textminus}}
\lst@ProcessOther {"3C}{\lst@ttfamily<\textless}
\lst@ProcessOther {"3E}{\lst@ttfamily>\textgreater}
\lst@ProcessOther {"5C}{\lst@ttfamily{\char92}\textbackslash}
@@ -1575,6 +1575,7 @@
\gdef\thelstlisting{\@arabic\c@lstlisting}
\fi}
\lst@UserCommand\lstlistingname{Listing}
+\lst@UserCommand\lstlistingnamestyle{}
\lst@Key{numberbychapter}{true}[t]{\lstKV@SetIf{#1}\lst@ifnumberbychapter}
\@ifundefined{abovecaptionskip}
{\newskip\abovecaptionskip
@@ -1592,8 +1593,8 @@
\vskip\belowcaptionskip}%
}{}
\def\fnum@lstlisting{%
- \lstlistingname
- \ifx\lst@@caption\@empty\else~\thelstlisting\fi}%
+ {\lstlistingnamestyle\lstlistingname
+ \ifx\lst@@caption\@empty\else~\thelstlisting\fi}}%
\def\lst@MakeCaption#1{%
\lst@ifdisplaystyle
\ifx #1t%
@@ -2066,11 +2067,21 @@
\else
\expandafter\lst@BOLGobble
\fi}
+ \lst@Key{consecutivenumbers}{true}[t]{\lstKV@SetIf{#1}\lst@ifconsecutivenumbers}
+ \def\lst@DisplayConsecutiveNumbersOrNot{%
+ \lst@ifconsecutivenumbers\typeout{consecutive:}\else%
+ \typeout{non-consecutive:}
+ \c@lstnumber=\numexpr-1+\lst@lineno %\relax % this enforces the
+ %displayed line numbers to always be the
+ %input line numbers
+ \fi%
+}
\def\lst@MSkipToFirst{%
\global\advance\lst@lineno\@ne
\ifnum \lst@lineno=\lst@firstline
\lst@LeaveMode \global\lst@newlines\z@
\lsthk@InitVarsBOL
+ \lst@DisplayConsecutiveNumbersOrNot
\expandafter\lst@BOLGobble
\fi}
\def\lstenv@DroppedWarning{%
@@ -2209,7 +2220,7 @@
\lstset{#1}%
\csname\@lst @SetFirstNumber\endcsname%
}{%
- \let\if@nobreak\iffalse%
+ \@nobreakfalse
\csname\@lst @SaveFirstNumber\endcsname%
}
\lst@Key{fancyvrb}\relax[t]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstdoc.sty new/tex/latex/listings/lstdoc.sty
--- old/tex/latex/listings/lstdoc.sty 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/lstdoc.sty 2020-03-25 22:10:48.000000000 +0100
@@ -6,8 +6,8 @@
%%
%% listings.dtx (with options: `doc')
%%
-\def\filedate{2019/02/27}
-\def\fileversion{1.8b}
+\def\filedate{2020/03/24}
+\def\fileversion{1.8d}
\ProvidesPackage{lstdoc}
[\filedate\space\fileversion\space(Carsten Heinz)]
\let\lstdoc@currversion\fileversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstlang1.sty new/tex/latex/listings/lstlang1.sty
--- old/tex/latex/listings/lstlang1.sty 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/lstlang1.sty 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{lstlang1.sty}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
%%
%% ACSL definition (c) 2000 by Andreas Matthias
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstlang2.sty new/tex/latex/listings/lstlang2.sty
--- old/tex/latex/listings/lstlang2.sty 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/lstlang2.sty 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{lstlang2.sty}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
%%
%% Abap definition by Knut Lickert
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstlang3.sty new/tex/latex/listings/lstlang3.sty
--- old/tex/latex/listings/lstlang3.sty 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/lstlang3.sty 2020-03-25 22:10:48.000000000 +0100
@@ -22,7 +22,7 @@
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
\ProvidesFile{lstlang3.sty}
- [2019/02/27 1.8b listings language file]
+ [2020/03/24 1.8d listings language file]
\lst@definelanguage[68]{Algol}%
{morekeywords={abs,and,arg,begin,bin,bits,bool,by,bytes,case,channel,%
char,co,comment,compl,conj,divab,do,down,elem,elif,else,empty,%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstmisc.sty new/tex/latex/listings/lstmisc.sty
--- old/tex/latex/listings/lstmisc.sty 2019-02-28 23:37:22.000000000 +0100
+++ new/tex/latex/listings/lstmisc.sty 2020-03-25 22:10:48.000000000 +0100
@@ -16,8 +16,8 @@
%% Send comments and ideas on the package, error reports and additional
%% programming languages to Jobst Hoffmann at <j.hoffmann(a)fh-aachen.de>.
%%
-\def\filedate{2019/02/27}
-\def\fileversion{1.8b}
+\def\filedate{2020/03/24}
+\def\fileversion{1.8d}
\ProvidesFile{lstmisc.sty}
[\filedate\space\fileversion\space(Carsten Heinz)]
\lst@CheckVersion\fileversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listings.tlpobj new/tlpkg/tlpobj/listings.tlpobj
--- old/tlpkg/tlpobj/listings.tlpobj 2019-03-01 02:26:53.000000000 +0100
+++ new/tlpkg/tlpobj/listings.tlpobj 2020-03-26 01:56:03.000000000 +0100
@@ -1,6 +1,6 @@
name listings
category Package
-revision 50175
+revision 54554
shortdesc Typeset source code listings using LaTeX
relocated 1
longdesc The package enables the user to typeset programs (programming
@@ -33,7 +33,6 @@
RELOC/tex/latex/listings/lstmisc.sty
catalogue-also listing
catalogue-ctan /macros/latex/contrib/listings
-catalogue-date 2019-02-27 23:09:36 +0100
catalogue-license lppl1.3c
catalogue-topics listing synt-hlt
-catalogue-version 1.8b
+catalogue-version 1.8d
++++++ listofitems.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/listofitems/README new/doc/generic/listofitems/README
--- old/doc/generic/listofitems/README 2019-03-03 23:13:54.000000000 +0100
+++ new/doc/generic/listofitems/README 2019-08-21 22:38:52.000000000 +0200
@@ -4,9 +4,9 @@
listofitems
package
- v1.61
+ v1.63
- 03/03/2019
+ 21/08/2019
___________________________________
Authors : Christian Tellechea, Steven B. Segletes
@@ -27,4 +27,4 @@
This package allows one to capture all the items of a list, for which
the parsing character has been selected by the user, and to access any
-of these items with a simple syntax.
+of these items with a simple syntax.
\ No newline at end of file
Binary files old/doc/generic/listofitems/listofitems-en.pdf and new/doc/generic/listofitems/listofitems-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/listofitems/listofitems-en.tex new/doc/generic/listofitems/listofitems-en.tex
--- old/doc/generic/listofitems/listofitems-en.tex 2018-11-01 23:08:53.000000000 +0100
+++ new/doc/generic/listofitems/listofitems-en.tex 2019-05-18 23:15:12.000000000 +0200
@@ -137,6 +137,8 @@
\def\listofitems{\textsf\loiname\xspace}
\section{Preface}
+\fbox{\vbox{\hsize\dimexpr\linewidth-2\fboxsep-2\fboxrule\relax\textbf{Important}: As of version 1.62, \listofitems requires a \TeX{} engine that provides the \texttt{\string\expanded} primitive. If this is not available, an error message will be issued and version 1.61 will be loaded (last version working without the primitive \texttt{\string\expanded}); it is strongly recommended that you update your \LaTeX{} distribution in order to take advantage of the newer \TeX{} engines that provide for the use of this new primitive.}}\medbreak
+
This package loads no external packages, must be used with the
\eTeX{} engine, and must be called in (pdf)\hskip0pt(Xe)\hskip0pt(lua)\LaTeX{} with
the invocation
@@ -556,7 +558,7 @@
\lstinputlisting[
language=TeX,
inputencoding=latin1,
- moretexcs={unless,ifcsname,ifdefined,detokenize,numexpr,dimexpr,glueexpr,unexpanded},
+ moretexcs={unless,ifcsname,ifdefined,detokenize,numexpr,dimexpr,glueexpr,unexpanded,expanded},
basicstyle=\small\ttfamily\color{black!25},
identifierstyle=\bfseries\color{white},%
backgroundcolor=\color{black!85},
Binary files old/doc/generic/listofitems/listofitems-fr.pdf and new/doc/generic/listofitems/listofitems-fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/listofitems/listofitems-fr.tex new/doc/generic/listofitems/listofitems-fr.tex
--- old/doc/generic/listofitems/listofitems-fr.tex 2018-11-01 23:08:53.000000000 +0100
+++ new/doc/generic/listofitems/listofitems-fr.tex 2019-05-18 23:15:12.000000000 +0200
@@ -119,6 +119,8 @@
\end{titlepage}
\def\listofitems{\textsf\loiname\xspace}
\section{Avant-propos}
+\fbox{\vbox{\hsize\dimexpr\linewidth-2\fboxsep-2\fboxrule\relax\textbf{Important} : à partir de la version 1.62, \listofitems nécessite un moteur \TeX{} fournissant la primitive \texttt{\string\expanded}. Si ce n'est pas le cas, un message d'erreur sera émis et la version 1.61 sera chargée (dernière version fonctionnant sans la primitive \texttt{\string\expanded}) : il est vivement conseillé de mettre à jour sa distribution \LaTeX{} afin de profiter d'un moteur \TeX{} récent permettant l'utilisation de cette nouvelle primitive.}}\medbreak
+
Cette extension ne requiert aucun package, doit être utilisée avec un moteur \eTeX, et doit être appelée sous (pdf)(Xe)(lua)\LaTeX{} par
\code|\usepackage{listofitems}|
@@ -404,7 +406,7 @@
\lstinputlisting[
language=TeX,
inputencoding=latin1,
- moretexcs={unless,ifcsname,ifdefined,detokenize,numexpr,dimexpr,glueexpr,unexpanded},
+ moretexcs={unless,ifcsname,ifdefined,detokenize,numexpr,dimexpr,glueexpr,unexpanded,expanded},
basicstyle=\small\ttfamily\color{black!25},
identifierstyle=\bfseries\color{white},%
backgroundcolor=\color{black!85},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listofitems.doc.tlpobj new/tlpkg/tlpobj/listofitems.doc.tlpobj
--- old/tlpkg/tlpobj/listofitems.doc.tlpobj 2019-03-04 02:24:05.000000000 +0100
+++ new/tlpkg/tlpobj/listofitems.doc.tlpobj 2019-08-22 01:53:47.000000000 +0200
@@ -1,9 +1,9 @@
name listofitems.doc
category Package
-revision 50216
+revision 51923
shortdesc doc files of listofitems
relocated 1
-docfiles size=223
+docfiles size=224
RELOC/doc/generic/listofitems/README
RELOC/doc/generic/listofitems/listofitems-en.pdf
RELOC/doc/generic/listofitems/listofitems-en.tex
++++++ listofitems.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/listofitems/listofitems.sty new/tex/generic/listofitems/listofitems.sty
--- old/tex/generic/listofitems/listofitems.sty 2017-10-06 00:22:24.000000000 +0200
+++ new/tex/generic/listofitems/listofitems.sty 2019-05-18 23:15:12.000000000 +0200
@@ -1,3 +1,4 @@
+\expandafter\let\csname loi_fromsty\endcsname\relax
\input listofitems.tex
\ProvidesPackage\loiname[\loidate\space v\loiver\space Grab items in lists using user-specified sep char (CT)]
\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/listofitems/listofitems.tex new/tex/generic/listofitems/listofitems.tex
--- old/tex/generic/listofitems/listofitems.tex 2019-03-03 23:13:54.000000000 +0100
+++ new/tex/generic/listofitems/listofitems.tex 2019-08-21 22:38:52.000000000 +0200
@@ -4,13 +4,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\loiname {listofitems} %
-\def\loiver {1.61} %
+\def\loiver {1.63} %
% %
-\def\loidate {2019/03/03} %
+\def\loidate {2019/08/21} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
-% Author : Christian Tellechea, Steven B. Segletes %
+% Author : Christian Tellechea, Steven B. Segletes (contributor) %
% Status : Maintained %
% Maintainer : Christian Tellechea %
% Email : unbonpetit(a)netc.fr %
@@ -29,40 +29,46 @@
% 6) listofitems-en.pdf %
% 7) README %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifdefined\ProvidesPackage\else
- \immediate\write -1 {%
- Package: \loidate\space v\loiver\space Grab items in lists using user-specified sep char (CT)}%
-\fi
\expandafter\edef\csname loi_restorecatcode\endcsname{\catcode\number`\_=\number\catcode`\_\relax}
\catcode`\_11
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%% gestion des erreurs %%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%% gestion des erreurs + annonce package %%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\unless\ifdefined\loi_fromsty
+ \immediate\write -1 {Package: \loidate\space v\loiver\space Grab items in lists using user-specified sep char (CT)}%
+\fi
+
\ifdefined\PackageError
- \def\loi_error#1{\PackageError\loiname{#1}{Read the manual}}% pour LaTeX
+ \def\loi_error#1{\PackageError\loiname{#1}{Read the \loiname\space manual}}% pour LaTeX
\else
\def\loi_error#1{\errmessage{Package \loiname\space Error: #1^^J}}% pour TeX
\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%% v�rification de la pr�sence de etex %%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%% v�rification des pr�requis %%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begingroup
-\edef\__tempa{\meaning\eTeXversion}\edef\__tempb{\string\eTeXversion}%
-\ifx\__tempa\__tempb
- \endgroup
-\else
+\def\loi_checkprimitive#1#2#3{% V�rifie que #1 est une primitive et sinon, �met le message #2 et ex�cute #3
+ \begingroup
+ \edef\__tempa{\meaning#1}\edef\__tempb{\string#1}\expandafter
\endgroup
- \loi_error{You are not using an eTeX engine, listofitems cannot work.}%
- \loi_restorecatcode\expandafter\endinput
-\fi
+ \ifx\__tempa\__tempb\else
+ \loi_error{#2}%
+ \def\loi_temp{#3}%
+ \loi_restorecatcode\expandafter\loi_temp
+ \fi
+}
+\loi_checkprimitive\eTeXversion
+ {You are not using an eTeX engine, listofitems cannot work.}
+ {\endinput}%
+\loi_checkprimitive\expanded
+ {the \string\expanded\space primitive is not provided by your TeX engine, listofitems v\loiver\space cannot work: loading listofitems v1.61}
+ {\input listofitemsold.tex\relax\endinput}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%% macros auxiliaires %%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\chardef\loi_stop=0
\def\loi_quark{\loi_quark}
\long\def\loi_identity#1{#1}
\long\def\loi_gobarg#1{}
@@ -86,34 +92,35 @@
\long\def\loi_ifx#1{\ifx#1\expandafter\loi_first\else\expandafter\loi_second\fi}
\long\def\loi_ifempty#1{\loi_exparg\loi_ifx{\expandafter\relax\detokenize{#1}\relax}}
\def\loi_ifstar#1#2{\def\loi_ifstar_a{\loi_ifx{*\loi_nxttok}{\loi_first{#1}}{#2}}\futurelet\loi_nxttok\loi_ifstar_a}
-\long\def\loi_ifstuffexpandable#1{\def\loi_tempa{#1}\loi_exparg{\def\loi_tempb}{#1}\expandafter\unless\loi_ifx{\loi_tempa\loi_tempb}}
-\long\def\loi_ifcsexpandable#1{% #1 est-il constitu� d'une sc _d�veloppable_ ?
+\edef\loi_escapechar{\expandafter\loi_gobarg\string\\}
+\long\def\loi_ifcsexpandable#1{% #1 est-il constitu� d'une seule sc _d�veloppable_ ?
\loi_ifempty{#1}
{\loi_second
}
{\loi_ifspacefirst{#1}
{\loi_second% si espace en 1er, faux
}
- {%
- \loi_exparg\loi_ifempty{\loi_gobarg#1}% 1 seul token ?
- {\begingroup\escapechar`\_\def\_{#1}\expandafter\endgroup
- \csname loi_\if\expandafter\expandafter\expandafter\loi_firsttonil\expandafter\string\_\_nil\string _first\else second\fi\endcsname
- {\loi_ifstuffexpandable{#1}}
- {\loi_second}%
+ {\csname loi_\if\loi_escapechar\expandafter\loi_firsttonil\detokenize{#1}\_nil first\else second\fi\endcsname
+ {\loi_exparg\loi_ifempty{\loi_gobarg#1}% 1 seul arg commen�ant par "\" ?
+ {\def\loi_tempa{#1}\loi_exparg{\def\loi_tempb}{#1}% est-il d�veloppable ?
+ \expandafter\unless\loi_ifx{\loi_tempa\loi_tempb}%
+ }
+ {\loi_second
+ }%
}
- {\loi_second% si plusieurs tokens, faux
+ {\loi_second
}%
}%
}%
}
-\def\loi_ifinrange#1[[#2:#3]]{\loi_ifnum{\numexpr(#1-#2)*(#1-#3)>0 }\loi_second\loi_first}
-\def\loi_ifstring#1\in#2{% si la chaine #1 est contenue dans #2
+\def\loi_ifinrange#1[[#2:#3]]{\expandafter\unless\loi_ifnum{\numexpr(#1-#2)*(#1-#3)>0 }}
+\def\loi_ifstring#1#2{% si la chaine #1 est contenue dans #2
\def\loi_ifstring_a##1#1##2\_nil{\loi_ifempty{##2}\loi_second\loi_first}%
- \loi_ifstring_a#2#1\@nil% appel de la macro auxiliaire
+ \loi_ifstring_a#2#1\_nil% appel de la macro auxiliaire
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%% macros \loi_foreach %%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% macro \loi_foreach %%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcount\loi_cnt_foreach_nest \loi_cnt_foreach_nest=0
\def\end_foreach{\end_foreach}
@@ -136,7 +143,7 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%% macros g�rant l'appariement %%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%% macros g�rant l'appariement %%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\long\def\defpair#1{%
\let\loi_listofpair\empty
@@ -205,7 +212,11 @@
\loi_foreach\loi_pair\in{#1}{\expandafter\loi_grabpaired_expr_a\loi_pair{#3}#4}%
\def\loi_remove_lastsep##1#3\_nil{\def#4{##1}}%
\expandafter\loi_remove_lastsep#4\_nil
- \expandafter\long\expandafter\def\expandafter\loi_grab_remain#4##1\_nil{\loi_ifempty{##1}{\let#5\empty}{\loi_exparg{\def#5}{\loi_gobarg##1}}}%
+ \loi_expafter{\long\def\loi_grab_remain}#4##1\_nil{%
+ \loi_ifempty{##1}
+ {\let#5\empty}
+ {\loi_exparg{\def#5}{\loi_gobarg##1}}%
+ }%
\loi_grab_remain#2\_nil
}
\long\def\loi_grabpaired_expr_a#1#2#3#4{% #1#2=paire en cours #3=s�parateur #4=r�sultat
@@ -233,8 +244,11 @@
{\def\insidepair_a##1#1##2\_nil{\insidepair_b##2\_nil{#1}}%
\def\insidepair_b##1#2##2\_nil##3{%
\loi_check_pair#1#2\in{##3##1#2}
- {\loi_exparg{\def#4}{\loi_gobarg##3##1}}%
- {\insidepair_b##2\_nil{##3##1#2}}%
+ {\loi_exparg{\def#4}{\loi_gobarg##3##1}%
+ \def\loi_remainafterparen{##2}%
+ }%
+ {\insidepair_b##2\_nil{##3##1#2}%
+ }%
}%
\insidepair_a#3\_nil
}
@@ -248,32 +262,38 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%% macro \loi_fornum %%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%% macro \loi_fornum %%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\loi_fornum#1=#2to#3\do{%
- \edef#1{\number\numexpr#2}\edef\loi_sgncmp{\ifnum#1<\numexpr#3\relax>+\else<-\fi}%
- \expandafter\loi_fornum_a\csname loi_fornum_\string#1\expandafter\endcsname\expandafter{\number\numexpr#3\expandafter}\loi_sgncmp#1%
+ \edef#1{\number\numexpr#2}%
+ \expandafter\loi_fornum_a
+ \csname loi_fornum_\string#1\expandafter\endcsname\expandafter
+ {\number\numexpr#3\expandafter}%
+ \expanded{\ifnum#1<\numexpr#3\relax>+\else<-\fi}%
+ #1%
+}
+\long\def\loi_fornum_a#1#2#3#4#5#6{%
+ \def#1{%
+ \unless\ifnum#5#3#2\relax
+ \loi_antefi{#6\edef#5{\number\numexpr#5#41\relax}#1}%
+ \fi}%
+ #1%
}
-\long\def\loi_fornum_a#1#2#3#4#5#6{\def#1{\unless\ifnum#5#3#2\relax\loi_antefi{#6\edef#5{\number\numexpr#5#41\relax}#1}\fi}#1}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%% macro retirant les espaces extr�mes %%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% macro retirant les espaces extr�mes %%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\long\def\loi_ifspacefirst#1{\expandafter\loi_ifspacefirst_a\detokenize{#10} \_nil}
\long\def\loi_ifspacefirst_a#1 #2\_nil{\loi_ifempty{#1}}
-\expandafter\def\expandafter\loi_gobspace\space{}
-\def\loi_removefirstspaces{\romannumeral\loi_removefirstspaces_a}
-\long\def\loi_removefirstspaces_a#1{\loi_ifspacefirst{#1}{\expandafter\loi_removefirstspaces_a\expandafter{\loi_gobspace#1}}{\loi_stop#1}}
-\edef\loi_restorezerocatcode{\catcode0=\number\catcode0 \relax}
-\catcode0 12
-\long\def\loi_removelastspaces#1{\romannumeral\loi_removelastspaces_a#1^^00 ^^00\_nil}
-\long\def\loi_removelastspaces_a#1 ^^00{\loi_removelastspaces_b#1^^00}
-\long\def\loi_removelastspaces_b#1^^00#2\_nil{\loi_ifspacefirst{#2}{\loi_removelastspaces_a#1^^00 ^^00\_nil}{\loi_stop#1}}
-\loi_restorezerocatcode
-\long\def\loi_removeextremespaces#1{% #1=texte o� les espaces extr�mes sont retir�s
- \romannumeral\expandafter\expandafter\expandafter\loi_removelastspaces\expandafter\expandafter\expandafter
- {\expandafter\expandafter\expandafter\loi_stop\loi_removefirstspaces{#1}}%
-}
+\loi_expafter{\def\loi_gobspace}\space{}
+\long\def\loi_removefirstspaces#1{\loi_ifspacefirst{#1}{\loi_exparg\loi_removefirstspaces{\loi_gobspace#1}}{\unexpanded{#1}}}%##BUGFIX v1.63
+\begingroup
+ \catcode0 12
+ \long\gdef\loi_removelastspaces#1{\loi_removelastspaces_a#1^^00 ^^00\_nil}
+ \long\gdef\loi_removelastspaces_a#1 ^^00{\loi_removelastspaces_b#1^^00}
+ \long\gdef\loi_removelastspaces_b#1^^00#2\_nil{\loi_ifspacefirst{#2}{\loi_removelastspaces_a#1^^00 ^^00\_nil}{\unexpanded{#1}}}
+\endgroup
+\long\def\loi_removeextremespaces#1{\expanded{\loi_exparg\loi_removelastspaces{\expanded{\loi_removefirstspaces{#1}}}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%% macro publique \setsepchar %%%%%%%%%%%%%%%%%%%%%
@@ -296,9 +316,9 @@
\let\loi_list_ofpair\empty
\loi_ifempty{#2}
{\loi_error{Empty list of separators not allowed, "," used}%
- \readlist_e1{,}%
+ \readlist_g1{,}%
}
- {\readlist_e1{#2}%
+ {\readlist_g1{#2}%
}%
\loi_argcsname\let\nestdepth{loi_listofseplen[0]}%
\loi_argcsname\let\loi_currentsep{loi_listofsep[1]}% 1er car de s�paration
@@ -307,12 +327,12 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%% macro normalisant l'index %%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%% macro normalisant l'index %%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\loi_normalizeindex#1#2#3{% #1=macroname #2=liste d'index #3=profondeur max --> renvoie {err}{indx norm}
+\def\loi_normalizeindex#1#2{% #1=macroname #2=liste d'index --> renvoie {err}{indx norm}
\loi_ifempty{#2}
- {\loi_stop{}{}}
- {\loi_normalizeindex_a1{}{#3}{#1}#2,\loi_quark,}%
+ {{}{}}
+ {\loi_exparg{\loi_normalizeindex_a1{}}{\number\csname#1nest\endcsname}{#1}#2,\loi_quark,}%
}%
\def\loi_normalizeindex_a#1#2#3#4#5,{% #1=compteur de profondeur #2=index pr�c�dents #3=profondeur max #4=macroname #5=index courant
\loi_ifx{\loi_quark#5}
@@ -328,10 +348,10 @@
}%
}
\def\loi_normalizeindex_b#1#2#3{\loi_exparg\loi_normalizeindex_a{\number\numexpr#2+1}{#3#1,}}% #1=index � rajouter #2=compteur de profondeur #3=index pr�c�dents
-\def\loi_normalizeindex_c#1,\loi_quark{\loi_stop{}{#1}}
+\def\loi_normalizeindex_c#1,\loi_quark{{}{#1}}
\def\loi_invalidindex#1#2{\loi_ifempty{#2}{\loi_invalidindex_a{#1},}\loi_invalidindex_a{#1}{#2}}
\def\loi_invalidindex_a#1#2{\loi_invalidindex_b#1\loi_quark#2\loi_quark}
-\def\loi_invalidindex_b#1[.]#2\loi_quark#3,\loi_quark#4\loi_quark,{\loi_stop{#1[#3]#2}{#3}}% #4= index ignor�s
+\def\loi_invalidindex_b#1[.]#2\loi_quark#3,\loi_quark#4\loi_quark,{{#1[#3]#2}{#3}}% #4= index ignor�s
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%% macro publique \readlist %%%%%%%%%%%%%%%%%%%%%%
@@ -349,88 +369,93 @@
{\loi_exparg{\readlist_b#1}{#2}%
}
{\loi_edef\loi_listname{\loi_macroname#1}%
- \loi_argcsname\loi_let{\loi_listname nest}\nestdepth
- \loi_argcsname\loi_def{\loi_listname[]}{#2}% la liste enti�re
- \loi_argcsname\loi_def{\loi_listname sep[]}{}% s�parateur vide
- \loi_ifempty{#2}
- {\loi_def#1[##1]{}%
- \loi_argcsname\loi_def{\loi_listname len}{0}\loi_argcsname\loi_def{\loi_listname len[0]}{0}%
- \loi_error{Empty list ignored, nothing to do}%
- }
- {\loi_edef#1[##1]{\unexpanded{\romannumeral\expandafter\loi_checkindex\romannumeral\loi_normalizeindex}{\loi_listname}{##1}{\csname\loi_listname nest\endcsname}{\loi_listname}}%
- \loi_argcsname\loi_edef{\loi_listname sep}[##1]{\unexpanded{\romannumeral\expandafter\loi_checkindex\romannumeral\loi_normalizeindex}{\loi_listname}{##1}{\csname\loi_listname nest\endcsname}{\loi_listname sep}}%
- \readlist_c{#2}%
- \loi_argcsname\loi_argcsname\loi_let{\loi_listname len}{\loi_listname len[0]}% longueur du niveau 0
- }%
+ \loi_exparg{\readlist_c#1{#2}}{\loi_listname}%%
+ }%
+}
+\long\def\readlist_c#1#2#3{% #1=macro stockant les �l�ments #2=liste des �l�ments #3=macroname
+ \loi_argcsname\loi_let{#3nest}\nestdepth
+ \loi_argcsname\loi_def{#3[]}{#2}% la liste enti�re
+ \loi_argcsname\loi_def{#3sep[]}{}% s�parateur vide
+ \loi_ifempty{#2}
+ {\loi_def#1[##1]{}%
+ \loi_argcsname\loi_def{#3len}{0}\loi_argcsname\loi_def{#3len[0]}{0}%
+ \loi_error{Empty list ignored, nothing to do}%
+ }
+ {\loi_def#1[##1]{\expanded{\expandafter\readlist_d\expanded{\loi_normalizeindex{#3}{##1}}{#3}}}%
+ \loi_argcsname\loi_def{#3sep}[##1]{\expanded{\expandafter\readlist_d\expanded{\loi_normalizeindex{#3}{##1}}{#3sep}}}%
+ \readlist_e{#2}%
+ \loi_argcsname\loi_argcsname\loi_let{#3len}{#3len[0]}% longueur du niveau 0
}%
}
-\def\loi_checkindex#1#2#3{%
- \expandafter\expandafter\expandafter\loi_stop\csname#3[#2]\expandafter\endcsname
- \romannumeral\loi_ifempty{#1}{\loi_stop}{\loi_stop\loi_error{#1}}%
+\def\readlist_d#1#2#3{%
+ \unexpanded\expandafter\expandafter\expandafter{\csname#3[#2]\expandafter\endcsname\expandafter}%
+ \expanded{\loi_ifempty{#1}{}{\unexpanded{\unexpanded{\loi_error{#1}}}}}%
}
-\def\readlist_c{%
+\def\readlist_e{%
\loi_argcsname\loi_let\loi_currentsep{loi_listofsep[\number\loi_nestcnt]}%
- \expandafter\readlist_d\loi_currentsep||\_nil
+ \expandafter\readlist_f\loi_currentsep||\_nil
}
-\long\def\readlist_d#1||#2\_nil#3{\readlist_e1{#3#1}}% #1=<sep courant simple> #3=liste -> rajoute un �l�ment vide pour le test \ifempty ci dessous
-\long\def\readlist_e#1#2{% #1=compteur d'index #2=liste d'�l�ments � examiner termin�e par <sep courant simple> >>RIEN laiss� apr�s
+\long\def\readlist_f#1||#2\_nil#3{\readlist_g1{#3#1}}% #1=<sep courant simple> #3=liste -> rajoute un �l�ment vide pour le test \ifempty ci dessous
+\long\def\readlist_g#1#2{% #1=compteur d'index #2=liste d'�l�ments � examiner termin�e par <sep courant simple> >>RIEN laiss� apr�s
\loi_ifempty{#2}
{\loi_argcsname\loi_edef{\loi_listname len[\csname loi_previndex[\number\loi_nestcnt]\endcsname0]}{\number\numexpr#1-1\relax}%
\loi_argcsname\loi_let{\loi_listname sep[\csname loi_previndex[\number\loi_nestcnt]\endcsname\number\numexpr#1-1\relax]}\empty% le dernier <sep> est <vide> ##NEW v1.52
\advance\loi_nestcnt-1
\loi_argcsname\loi_let\loi_currentsep{loi_listofsep[\number\loi_nestcnt]}%
}
- {\loi_expafter{\readlist_f{#2}{}}\loi_currentsep||\loi_quark||#2\_nil{#1}% aller isoler le 1er item
+ {\loi_expafter{\readlist_h{#2}{}}\loi_currentsep||\loi_quark||#2\_nil{#1}% aller isoler le 1er item
}%
}
-\long\def\readlist_f#1#2#3||{% #1=liste restante #2=<dernier sep utilis�> #3=<sep courant>
+\long\def\readlist_h#1#2#3||{% #1=liste restante #2=<dernier sep utilis�> #3=<sep courant>
\loi_ifx{\loi_quark#3}% on a �puis� tous les <s�parateurs> ? RESTE � lire <expr+sep1>\_nil{<compteur>}
{\loi_ifempty{#2}% si #2 vide, aucun <sep utilis�> n'a �t� trouv�, il reste � lire "<liste compl�te>\_nil"
- {\long\def\readlist_g##1\_nil##2{\loi_exparg{\readlist_h{##2}{}}{\loi_gobarg##1}{#2}}% ##2=compteur d'index
+ {\long\def\readlist_i##1\_nil##2{\loi_exparg{\readlist_j{##2}{}}{\loi_gobarg##1}{#2}}% ##2=compteur d'index
}
{\loi_ifx{\loi_listofpair\empty}% paires d�finies ?
- {\long\def\readlist_g##1#2##2\_nil##3{\loi_exparg{\readlist_h{##3}{##2}}{\loi_gobarg##1}{#2}}%
+ {\long\def\readlist_i##1#2##2\_nil##3{\loi_exparg{\readlist_j{##3}{##2}}{\loi_gobarg##1}{#2}}%
}
- {\long\def\readlist_g##1\_nil##2{%
+ {\long\def\readlist_i##1\_nil##2{%
\loi_exparg{\loi_exparg\loi_grabpaired_expr\loi_listofpair}{\loi_gobarg##1}{#2}\loi_grabpaired_result\loi_grabpaired_remain
- \loi_exparg{\loi_exparg{\readlist_h{##2}}{\loi_grabpaired_remain}}{\loi_grabpaired_result}{#2}}%
+ \loi_exparg{\loi_exparg{\readlist_j{##2}}{\loi_grabpaired_remain}}{\loi_grabpaired_result}{#2}}%{#}
}%
}%
- \readlist_g\relax% le \relax meuble l'argument d�limit�
+ \readlist_i\relax% le \relax meuble l'argument d�limit�
}
- {\long\def\readlist_g##1#3##2\_nil{%
+ {\long\def\readlist_i##1#3##2\_nil{%
\loi_ifempty{##2}% si <liste restante> ne contient pas le <sep courant>
- {\readlist_f{#1}{#2}% recommencer avec le m�me <sep utile>
+ {\readlist_h{#1}{#2}% recommencer avec le m�me <sep utile>
}%
{\loi_ifx{\loi_listofpair\empty}% si pas de paires d�finies
- {\loi_exparg\readlist_f{\loi_gobarg##1#3}{#3}% raccourcir <liste restante> et <sep courant>:=<sep utile>% ##BUGFIX v1.53
+ {\loi_exparg\readlist_h{\loi_gobarg##1#3}{#3}% raccourcir <liste restante> et <sep courant>:=<sep utile>% ##BUGFIX v1.53
}%
- {\loi_exparg\loi_grabpaired_expr\loi_listofpair{#1}{#3}\loi_grabpaired_result\loi_grabpaired_remain
- \loi_exparg\readlist_f{\loi_grabpaired_result#3}{#3}%
+ {\loi_exparg\loi_grabpaired_expr\loi_listofpair{#1#3}{#3}\loi_grabpaired_result\loi_grabpaired_remain
+ \loi_ifx{\loi_grabpaired_remain\empty}% si liste non raccourcie #BUGFIX 1.63
+ {\loi_exparg\readlist_h{\loi_grabpaired_result}{#2}}% garder le pr�c�dent <sep>
+ {\loi_exparg\readlist_h{\loi_grabpaired_result}{#3}}%
}%
}%
}%
- \readlist_g\relax#1#3\_nil% ##BUGFIX v1.53
+ \readlist_i\relax#1#3\_nil% ##BUGFIX v1.53
}%
}
-\long\def\readlist_h#1#2#3{% #1=compteur d'index #2=liste restante #3=�l�ment courant
+\long\def\readlist_j#1#2#3{% #1=compteur d'index #2=liste restante #3=�l�ment courant
\loi_ifnum{0\loi_exparg\loi_ifspacefirst{\loi_currentsep}{}1\if_removeextremespaces1\fi=11 }% s'il faur retirer les espaces extr�mes
- {\loi_exparg{\loi_exparg{\readlist_i{#1}{#2}}}{\loi_removeextremespaces{#3}}}% red�finir l'�l�ment courant
- {\readlist_i{#1}{#2}{#3}}%
+ {\loi_exparg{\loi_exparg{\readlist_k{#1}{#2}}}{\loi_removeextremespaces{#3}}}% red�finir l'�l�ment courant
+ {\readlist_k{#1}{#2}{#3}}%
}
-\long\def\readlist_i#1#2#3#4{% #1=compteur d'index #2=liste restante #3=�l�ment courant #4=sep utilis�
+\long\def\readlist_k#1#2#3#4{% #1=compteur d'index #2=liste restante #3=�l�ment courant #4=sep utilis�
\loi_ifnum{0\if_ignoreemptyitems1\fi\loi_ifempty{#3}1{}=11 }
- {\readlist_e{#1}{#2}% si l'on n'ignore pas les �l�ments vides
+ {\readlist_g{#1}{#2}% si l'on n'ignore pas les �l�ments vides
}%
- {\loi_argcsname\loi_def{\loi_listname[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#3}% assignation de l'item ctuel � la macro
+ {\loi_argcsname\loi_def{\loi_listname[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#3}% assignation
\loi_argcsname\loi_def{\loi_listname sep[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#4}% assignation du <sep> actuel � la macro \<macrolist>sep
\loi_ifnum{\loi_nestcnt<\nestdepth\relax}% si imbrication max non atteinte
{\advance\loi_nestcnt1
\loi_argcsname\edef{loi_previndex[\number\loi_nestcnt]}{\csname loi_previndex[\number\numexpr\loi_nestcnt-1]\endcsname#1,}%
- \readlist_c{#3}% recommencer avec l'�l�ment courant
+ \readlist_e{#3}% recommencer avec l'�l�ment courant
}
{}%
- \loi_exparg\readlist_e{\number\numexpr#1+1}{#2}% puis chercher l'�l�ment suivant dans la liste restante
+ \loi_exparg\readlist_g{\number\numexpr#1+1}{#2}% puis chercher l'�l�ment suivant dans la liste restante
}%
}
@@ -438,16 +463,18 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%% macro \listlen %%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\listlen#1[#2]{%
- \romannumeral\loi_ifempty{#2}
- {\expandafter\expandafter\expandafter\loi_stop\csname\loi_macroname#1len[0]\endcsname}
- {\loi_exparg\listlen_a{\romannumeral-`\.\loi_macroname#1}{#2}}%
+ \expanded{%
+ \loi_ifempty{#2}
+ {\csname\loi_macroname#1len[0]\endcsname}
+ {\loi_exparg\listlen_a{\expanded{\loi_macroname#1}}{#2}}%
+ }%
}
\def\listlen_a#1#2{% #1=macro name #2=index non normalis� prendre <profondeur max-1>
- \loi_exparg{\expandafter\listlen_b\romannumeral\loi_normalizeindex{#1}{#2}}{\number\numexpr\csname#1nest\endcsname-1}{#1}%
+ \expandafter\listlen_b\expanded{\loi_normalizeindex{#1}{#2}}{#1}%
}
\def\listlen_b#1#2#3{% #1=err #2=index normalis� #3=macroname
- \expandafter\expandafter\expandafter\loi_stop\csname#3len[#2,0]\expandafter\endcsname
- \romannumeral\loi_ifempty{#1}{\loi_stop}{\loi_stop\loi_error{#1}}%
+ \csname#3len[#2,0]\expandafter\endcsname
+ \expanded{\loi_ifempty{#1}{}{\unexpanded{\unexpanded{\loi_error{#1}}}}}%
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -459,7 +486,7 @@
}
\def\foreachitem_b{\loi_ifx{\loi_nxttok[}\foreachitem_a{\foreachitem_a[]}}
\def\foreachitem_c#1#2#3[#4]{% prendre <profondeur max-1>
- \loi_exparg{\expandafter\foreachitem_d\romannumeral\loi_normalizeindex{#3}{#4}}{\number\numexpr\csname#3nest\endcsname-1}#1{#2}{#3}%
+ \expandafter\foreachitem_d\expanded{\loi_normalizeindex{#3}{#4}}#1{#2}{#3}%
}
\def\foreachitem_d#1#2{\loi_ifempty{#2}{\foreachitem_e{#1}{}}{\foreachitem_e{#1}{#2,}}}% #1=err #2=index norm
\long\def\foreachitem_e#1#2#3#4#5#6{% #1=err #2=index norm #3=macroiter #4=compteur associ� #5=nom de macrolist #6=code
@@ -471,12 +498,12 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%% macro \showitem %%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%% macro \showitem %%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\showitems{\loi_ifstar{\let\showitems_cmd\detokenize\showitems_a}{\let\showitems_cmd\loi_identity\showitems_a}}
\def\showitems_a#1{\def\showitems_b{\showitems_d#1}\futurelet\loi_nxttok\showitems_c}
\def\showitems_c{\loi_ifx{\loi_nxttok[}\showitems_b{\showitems_b[]}}
-\def\showitems_d#1[#2]{\foreachitem\showitems_ater\in#1[#2]{\showitemsmacro{\expandafter\showitems_cmd\expandafter{\showitems_ater}}}}
+\def\showitems_d#1[#2]{\foreachitem\showitems_iter\in#1[#2]{\showitemsmacro{\expandafter\showitems_cmd\expandafter{\showitems_iter}}}}
\unless\ifdefined\fbox
\newdimen\fboxrule \newdimen\fboxsep \fboxrule=.4pt \fboxsep=3pt % r�glages identiques � LaTeX
\def\fbox#1{% imitation de la macro \fbox de LaTeX, voir pages 271 � 274 de "Apprendre � programmer en TeX"
@@ -499,11 +526,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\itemtomacro#1[#2]{% #1[#2]=item non encore lu: #3=macro
\edef\loi_listname{\loi_macroname#1}%
- \loi_exparg{\expandafter\itemtomacro_a\romannumeral\expandafter\loi_normalizeindex\expandafter{\loi_listname}{#2}}{\csname\loi_listname nest\endcsname}\let
+ \expandafter\itemtomacro_a\expanded{\loi_normalizeindex{\loi_listname}{#2}}\let
}
\def\gitemtomacro#1[#2]{% #1[#2]=item
\xdef\loi_listname{\loi_macroname#1}%
- \loi_exparg{\expandafter\itemtomacro_a\romannumeral\expandafter\loi_normalizeindex\expandafter{\loi_listname}{#2}}{\csname\loi_listname nest\endcsname}{\global\let}%
+ \expandafter\itemtomacro_a\expanded{\loi_normalizeindex{\loi_listname}{#2}}{\global\let}%
}
\def\itemtomacro_a#1#2#3#4{%
\loi_ifempty{#1}{}{\loi_error{#1}}%
@@ -511,62 +538,69 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%% r�glages par d�faut %%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%% r�glages par d�faut %%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\if_removeextremespaces
\newif\if_ignoreemptyitems
\let\ignoreemptyitems\_ignoreemptyitemstrue
\let\reademptyitems\_ignoreemptyitemsfalse
-\setsepchar{,}
-\defpair{}
\loi_def_foreachsep{,}
-\reademptyitems
-
\loi_restorecatcode
+\reademptyitems
+\setsepchar{,}
+\defpair{}
\endinput
-######################################################################
-############################ Historique #############################
-######################################################################
-
-v1.0 19/8/2016
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%% historique %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+v1.0 19/8/2016
- Premi�re version publique
-
-v1.1 01/09/2016
+----------------------------------------------------------------------
+v1.1 01/09/2016
- Stockage des s�parateurs dans <macrolist>sep
- bug corrig� dans \loi_restorecatcode
-
-v1.2 22/10/2016
+----------------------------------------------------------------------
+v1.2 22/10/2016
- macros \greadlist et \gitemtomacro pour la globalit�
-
-v1.3 18/11/2016
+----------------------------------------------------------------------
+v1.3 18/11/2016
- bugs corrig�s dans la gestion de la globalit�
-
-v1.4 05/10/2017
+----------------------------------------------------------------------
+v1.4 05/10/2017
- test \loi_ifprimitive ajout� au test \loi_ifcs
- suppression de \loi_expafternil, cr�ation de \loi_expafter,
modification de \loi_argcsname
- - correction d'un bug : \setsepchar{\par} ne provoque plus
- d'erreur. \loi_ifnum devient \long
-
-v1.5 06/10/2017
+ - correction d'un bug : \setsepchar{\par} ne provoque plus d'erreur.
+ \loi_ifnum devient \long
+----------------------------------------------------------------------
+v1.5 06/10/2017
- correction d'un bug dans \loi_ifcs
-
-v1.51 24/10/2017
+----------------------------------------------------------------------
+v1.51 24/10/2017
- correction d'un bug dans \loi_ifcs
-
-v1.52 13/01/2018
+----------------------------------------------------------------------
+v1.52 13/01/2018
- le dernier s�parateur est <vide>
-
-v1.53 13/03/2018
- - correction d'un bug dans \readlist_g
-
-v1.6 01/11/2018
+----------------------------------------------------------------------
+v1.53 13/03/2018
+ - correction d'un bug dans \readlist_i
+----------------------------------------------------------------------
+v1.6 01/11/2018
- possibilit� d'appariement de tokens dans les items
-
-v1.61 03/03/2019
- - la macro \loi_ifcs contient une erreur de conception.
- Il faut tester si le token est un sc && s'il est
- d�veloppable pour renvoyer vrai car il existe des sc
- non d�veloppables && qui ne sont _pas_ des primitives.
- Macro rebaptis�e \loi_ifcsexpandable
\ No newline at end of file
+----------------------------------------------------------------------
+v1.61 03/03/2019
+ - la macro \loi_ifcs contient une erreur de conception. Il faut
+ tester si le token est un sc && s'il est d�veloppable pour
+ renvoyer vrai car il existe des sc non d�veloppables && qui ne
+ sont _pas_ des primitives.
+ Macro rebaptis�e \loi_ifcsexpandable
+----------------------------------------------------------------------
+v1.62 18/05/2019
+ - utilisation de la nouvelle primitive \expanded au lieu du
+ d�sormais obsol�te \romannumeral
+ - bug corrig� dans \loi_ifcsexpandable
+----------------------------------------------------------------------
+v1.63 21/08/2019
+ - bug corrig� dans \readlist_h avec les tokens appari�s
+ - bug corrig� \loi_removefirstspaces est d�sormais \long
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/listofitems/listofitemsold.tex new/tex/generic/listofitems/listofitemsold.tex
--- old/tex/generic/listofitems/listofitemsold.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/generic/listofitems/listofitemsold.tex 2019-05-18 23:16:50.000000000 +0200
@@ -0,0 +1,572 @@
+% !TeX encoding = ISO-8859-1
+% Ce fichier contient le code de l'extension "listofitems"
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+\def\loiname {listofitems} %
+\def\loiver {1.61} %
+% %
+\def\loidate {2019/03/03} %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% Author : Christian Tellechea, Steven B. Segletes %
+% Status : Maintained %
+% Maintainer : Christian Tellechea %
+% Email : unbonpetit(a)netc.fr %
+% steven.b.segletes.civ(a)mail.mil %
+% Package URL: https://www.ctan.org/pkg/listofitems %
+% Bug tracker: https://framagit.org/unbonpetit/listofitems/issues %
+% Repository : https://framagit.org/unbonpetit/listofitems/tree/master
+% Copyright : Christian Tellechea 2016-2019 %
+% Licence : Released under the LaTeX Project Public License v1.3c %
+% or later, see http://www.latex-project.org/lppl.txt %
+% Files : 1) listofitems.tex %
+% 2) listofitems.sty %
+% 3) listofitems-fr.tex %
+% 4) listofitems-fr.pdf %
+% 5) listofitems-en.tex %
+% 6) listofitems-en.pdf %
+% 7) README %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifdefined\ProvidesPackage\else
+ \immediate\write -1 {%
+ Package: \loidate\space v\loiver\space Grab items in lists using user-specified sep char (CT)}%
+\fi
+
+\expandafter\edef\csname loi_restorecatcode\endcsname{\catcode\number`\_=\number\catcode`\_\relax}
+\catcode`\_11
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%% gestion des erreurs %%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifdefined\PackageError
+ \def\loi_error#1{\PackageError\loiname{#1}{Read the manual}}% pour LaTeX
+\else
+ \def\loi_error#1{\errmessage{Package \loiname\space Error: #1^^J}}% pour TeX
+\fi
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%% v�rification de la pr�sence de etex %%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begingroup
+\edef\__tempa{\meaning\eTeXversion}\edef\__tempb{\string\eTeXversion}%
+\ifx\__tempa\__tempb
+ \endgroup
+\else
+ \endgroup
+ \loi_error{You are not using an eTeX engine, listofitems cannot work.}%
+ \loi_restorecatcode\expandafter\endinput
+\fi
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% macros auxiliaires %%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\chardef\loi_stop=0
+\def\loi_quark{\loi_quark}
+\long\def\loi_identity#1{#1}
+\long\def\loi_gobarg#1{}
+\long\def\loi_first#1#2{#1}
+\long\def\loi_second#1#2{#2}
+\long\def\loi_firsttonil#1#2\_nil{#1}
+\long\def\loi_antefi#1#2\fi{#2\fi#1}
+\long\def\loi_exparg#1#2{\expandafter\loi_exparg_a\expandafter{#2}{#1}}% \loi_exparg{<a>}{<b>} devient <a>{<*b>}
+\long\def\loi_exparg_a#1#2{#2{#1}}
+\long\def\loi_expafter#1#2{\expandafter\loi_expafter_a\expandafter{#2}{#1}}% \loi_expafter{<a>}{<b>} devient <a><*b>
+\long\def\loi_expafter_a#1#2{#2#1}
+\def\loi_macroname{\loi_ifinrange\escapechar[[0:255]]{\expandafter\loi_gobarg}{}\string}
+\def\loi_argcsname#1#{\loi_argcsname_a{#1}}
+\def\loi_argcsname_a#1#2{\loi_expafter{#1}{\csname#2\endcsname}}
+\long\def\loi_addtomacro#1#2{\loi_exparg{\def#1}{#1#2}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%% macros de test %%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\long\def\loi_ifnum#1{\ifnum#1\expandafter\loi_first\else\expandafter\loi_second\fi}
+\long\def\loi_ifx#1{\ifx#1\expandafter\loi_first\else\expandafter\loi_second\fi}
+\long\def\loi_ifempty#1{\loi_exparg\loi_ifx{\expandafter\relax\detokenize{#1}\relax}}
+\def\loi_ifstar#1#2{\def\loi_ifstar_a{\loi_ifx{*\loi_nxttok}{\loi_first{#1}}{#2}}\futurelet\loi_nxttok\loi_ifstar_a}
+\long\def\loi_ifstuffexpandable#1{\def\loi_tempa{#1}\loi_exparg{\def\loi_tempb}{#1}\expandafter\unless\loi_ifx{\loi_tempa\loi_tempb}}
+\long\def\loi_ifcsexpandable#1{% #1 est-il constitu� d'une sc _d�veloppable_ ?
+ \loi_ifempty{#1}
+ {\loi_second
+ }
+ {\loi_ifspacefirst{#1}
+ {\loi_second% si espace en 1er, faux
+ }
+ {%
+ \loi_exparg\loi_ifempty{\loi_gobarg#1}% 1 seul token ?
+ {\begingroup\escapechar`\_\def\_{#1}\expandafter\endgroup
+ \csname loi_\if\expandafter\expandafter\expandafter\loi_firsttonil\expandafter\string\_\_nil\string _first\else second\fi\endcsname
+ {\loi_ifstuffexpandable{#1}}
+ {\loi_second}%
+ }
+ {\loi_second% si plusieurs tokens, faux
+ }%
+ }%
+ }%
+}
+\def\loi_ifinrange#1[[#2:#3]]{\loi_ifnum{\numexpr(#1-#2)*(#1-#3)>0 }\loi_second\loi_first}
+\def\loi_ifstring#1\in#2{% si la chaine #1 est contenue dans #2
+ \def\loi_ifstring_a##1#1##2\_nil{\loi_ifempty{##2}\loi_second\loi_first}%
+ \loi_ifstring_a#2#1\@nil% appel de la macro auxiliaire
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% macros \loi_foreach %%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcount\loi_cnt_foreach_nest \loi_cnt_foreach_nest=0
+\def\end_foreach{\end_foreach}
+\def\loi_def_foreachsep#1{%
+ \long\def\loi_foreach##1\in##2##3{%
+ \global\advance\loi_cnt_foreach_nest1
+ \loi_argcsname\def{loop_code_\number\loi_cnt_foreach_nest}{##3}%
+ \loi_foreach_a##1##2#1\end_foreach#1%
+ \loi_argcsname\let{loop_code_\number\loi_cnt_foreach_nest}\empty
+ \global\advance\loi_cnt_foreach_nest-1
+ }%
+ \long\def\loi_foreach_a##1##2#1{%
+ \def##1{##2}%
+ \loi_ifx{\end_foreach##1}
+ {}
+ {\csname loop_code_\number\loi_cnt_foreach_nest\endcsname% ex�cute le code
+ \loi_foreach_a##1%
+ }%
+ }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%% macros g�rant l'appariement %%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\long\def\defpair#1{%
+ \let\loi_listofpair\empty
+ \loi_ifempty{#1}
+ {}
+ {\defpair_a{}#1\loi_quark\loi_quark}%
+}
+\long\def\defpair_a#1#2#3{%
+ \loi_ifx{\loi_quark#2}
+ {\def\loi_sanitizelist##1,\_nil{\def\loi_listofpair{##1}}%
+ \loi_sanitizelist#1\_nil
+ }
+ {\loi_if_validpair#2#3%
+ {\long\def\loi_paired_a{#2}\long\def\loi_paired_b{#3}%
+ \loi_ifx{\loi_paired_a\loi_paired_b}
+ {\loi_error{Paired tokens must not be equal, the pair \detokenize{#2#3} is ignored}%
+ \defpair_a{#1}%
+ }
+ {\defpair_a{#1#2#3,}%
+ }%
+ }
+ {\loi_error{Invalid paired tokens, the pair "\detokenize{#2}" and "\detokenize{#3}" is ignored}%
+ \defpair_a{#1}%
+ }%
+ }%
+}
+\long\def\loi_if_validpair#1#2{%
+ \def\loi_validpair{1}%
+ \loi_if_invalid_pairtoken{#1}{\def\loi_validpair{0}}%
+ \loi_if_invalid_pairtoken{#2}{\def\loi_validpair{0}}%
+ \loi_ifnum{\loi_validpair=1 }
+}
+\long\def\loi_if_invalid_pairtoken#1{%
+ \loi_ifempty{#1}
+ {\loi_identity
+ }
+ {\loi_ifspacefirst{#1}
+ {\loi_identity
+ }
+ {\loi_exparg\loi_ifempty{\loi_gobarg#1}% 1 seul token ?
+ {\ifcat\relax\noexpand#1\expandafter\loi_identity\else\expandafter\loi_gobarg\fi}
+ {\loi_identity}% si plusieurs tokens, faux
+ }%
+ }%
+}
+\long\def\loi_count_occur#1\in#2:#3{% compte le nombre d'occurrences de #1 dans #2 et met le r�sultat dans la macro #3
+ \long\def\loi_count_occur_a##1##2#1##3\_nil{%
+ \loi_ifempty{##3}
+ {\def#3{##1}}
+ {\expandafter\loi_count_occur_a\number\numexpr##1+1\relax##3\_nil}%
+ }%
+ \loi_count_occur_a0#2#1\_nil
+}
+\long\def\loi_check_pair#1#2\in#3{% teste l'appariement de #1 et #2 dans #3
+ \loi_ifempty{#3}
+ {\loi_second
+ }
+ {\loi_count_occur#1\in#3:\loi_tempa
+ \loi_count_occur#2\in#3:\loi_tempb
+ \loi_ifnum{\loi_tempa=\loi_tempb\relax}%
+ }%
+}
+\long\def\loi_grabpaired_expr#1#2#3#4#5{% #1=liste de paires #2=expression #3=s�parateur #4=r�sultat #5=ce qui reste
+ \let#4\empty
+ \def\loi_remain{#2#3}%
+ \loi_foreach\loi_pair\in{#1}{\expandafter\loi_grabpaired_expr_a\loi_pair{#3}#4}%
+ \def\loi_remove_lastsep##1#3\_nil{\def#4{##1}}%
+ \expandafter\loi_remove_lastsep#4\_nil
+ \expandafter\long\expandafter\def\expandafter\loi_grab_remain#4##1\_nil{\loi_ifempty{##1}{\let#5\empty}{\loi_exparg{\def#5}{\loi_gobarg##1}}}%
+ \loi_grab_remain#2\_nil
+}
+\long\def\loi_grabpaired_expr_a#1#2#3#4{% #1#2=paire en cours #3=s�parateur #4=r�sultat
+ \loi_exparg{\loi_check_pair#1#2\in}#4% si les paires sont appari�es dans le r�sultat
+ {}% passer � la paire suivante
+ {\long\def\loi_grabpaired_expr_b##1#3##2\_nil{%
+ \loi_addtomacro#4{##1#3}% ajouter au r�sultat ce qui est jusqu'au prochain s�parateur
+ \def\loi_remain{##2}%
+ \loi_exparg{\loi_check_pair#1#2\in}{#4}
+ {}
+ {\loi_ifempty{##2}
+ {\loi_error{"\detokenize{#1}" and "\detokenize{#2}" are not paired}}
+ {\loi_grabpaired_expr_b##2\_nil}%
+ }%
+ }%
+ \expandafter\loi_grabpaired_expr_b\loi_remain\_nil
+ }%
+}
+\def\insidepair#1#2#3#4{% #1#2=paire #3=expr #4=macro re�evant le resultat
+ \loi_if_validpair#1#2%
+ {\loi_ifcsexpandable{#3}
+ {\loi_exparg{\insidepair#1#2}{#3}#4%
+ }
+ {\loi_check_pair#1#2\in{#3}% si les paires sont appari�es dans le r�sultat
+ {\def\insidepair_a##1#1##2\_nil{\insidepair_b##2\_nil{#1}}%
+ \def\insidepair_b##1#2##2\_nil##3{%
+ \loi_check_pair#1#2\in{##3##1#2}
+ {\loi_exparg{\def#4}{\loi_gobarg##3##1}}%
+ {\insidepair_b##2\_nil{##3##1#2}}%
+ }%
+ \insidepair_a#3\_nil
+ }
+ {\loi_error{"\detokenize{#1}" and "\detokenize{#2}" are not paired in "#3"}%
+ }%
+ }%
+ }
+ {\loi_error{Invalid paired tokens "\detokenize{#1}" and "\detokenize{#2}", empty \string#4 returned}% et bim
+ \let#4\empty% voil�, bien fait pour vos gueules
+ }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% macro \loi_fornum %%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\loi_fornum#1=#2to#3\do{%
+ \edef#1{\number\numexpr#2}\edef\loi_sgncmp{\ifnum#1<\numexpr#3\relax>+\else<-\fi}%
+ \expandafter\loi_fornum_a\csname loi_fornum_\string#1\expandafter\endcsname\expandafter{\number\numexpr#3\expandafter}\loi_sgncmp#1%
+}
+\long\def\loi_fornum_a#1#2#3#4#5#6{\def#1{\unless\ifnum#5#3#2\relax\loi_antefi{#6\edef#5{\number\numexpr#5#41\relax}#1}\fi}#1}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%% macro retirant les espaces extr�mes %%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\long\def\loi_ifspacefirst#1{\expandafter\loi_ifspacefirst_a\detokenize{#10} \_nil}
+\long\def\loi_ifspacefirst_a#1 #2\_nil{\loi_ifempty{#1}}
+\expandafter\def\expandafter\loi_gobspace\space{}
+\def\loi_removefirstspaces{\romannumeral\loi_removefirstspaces_a}
+\long\def\loi_removefirstspaces_a#1{\loi_ifspacefirst{#1}{\expandafter\loi_removefirstspaces_a\expandafter{\loi_gobspace#1}}{\loi_stop#1}}
+\edef\loi_restorezerocatcode{\catcode0=\number\catcode0 \relax}
+\catcode0 12
+\long\def\loi_removelastspaces#1{\romannumeral\loi_removelastspaces_a#1^^00 ^^00\_nil}
+\long\def\loi_removelastspaces_a#1 ^^00{\loi_removelastspaces_b#1^^00}
+\long\def\loi_removelastspaces_b#1^^00#2\_nil{\loi_ifspacefirst{#2}{\loi_removelastspaces_a#1^^00 ^^00\_nil}{\loi_stop#1}}
+\loi_restorezerocatcode
+\long\def\loi_removeextremespaces#1{% #1=texte o� les espaces extr�mes sont retir�s
+ \romannumeral\expandafter\expandafter\expandafter\loi_removelastspaces\expandafter\expandafter\expandafter
+ {\expandafter\expandafter\expandafter\loi_stop\loi_removefirstspaces{#1}}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%% macro publique \setsepchar %%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\setsepchar{\futurelet\loi_nxttok\setsepchar_a}
+\def\setsepchar_a{\loi_ifx{[\loi_nxttok}\setsepchar_b{\setsepchar_b[/]}}
+\long\def\setsepchar_b[#1]#2{% #1=sepcar de <liste des sepcar> #2=<liste des sepcar>
+ \loi_ifempty{#1}
+ {\loi_error{Empty separator not allowed, separator "/" used}%
+ \setsepchar_b[/]{#2}%
+ }
+ {\def\loi_currentsep{#1}%
+ \_removeextremespacesfalse
+ \loi_nestcnt1 % r�initaliser niveau initial � 1
+ \def\nestdepth{1}%
+ \loi_argcsname\let{loi_previndex[\number\loi_nestcnt]}\empty
+ \def\loi_listname{loi_listofsep}%
+ \let\loi_def\def \let\loi_edef\edef \let\loi_let\let
+ \let\loi_listofpair_saved\loi_list_ofpair
+ \let\loi_list_ofpair\empty
+ \loi_ifempty{#2}
+ {\loi_error{Empty list of separators not allowed, "," used}%
+ \readlist_e1{,}%
+ }
+ {\readlist_e1{#2}%
+ }%
+ \loi_argcsname\let\nestdepth{loi_listofseplen[0]}%
+ \loi_argcsname\let\loi_currentsep{loi_listofsep[1]}% 1er car de s�paration
+ \let\loi_listofpair\loi_listofpair_saved
+ }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%% macro normalisant l'index %%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\loi_normalizeindex#1#2#3{% #1=macroname #2=liste d'index #3=profondeur max --> renvoie {err}{indx norm}
+ \loi_ifempty{#2}
+ {\loi_stop{}{}}
+ {\loi_normalizeindex_a1{}{#3}{#1}#2,\loi_quark,}%
+}%
+\def\loi_normalizeindex_a#1#2#3#4#5,{% #1=compteur de profondeur #2=index pr�c�dents #3=profondeur max #4=macroname #5=index courant
+ \loi_ifx{\loi_quark#5}
+ {\loi_normalizeindex_c#2\loi_quark% supprimer la derni�re virgule
+ }
+ {\loi_ifnum{#1>#3 }
+ {\loi_invalidindex{Too deeply nested index, index [.] retained}{#2}% si profondeur trop grande
+ }
+ {\loi_ifinrange\ifnum\numexpr#5<0 -1*\fi(#5)[[1:\csname #4len[#20]\endcsname]]% si abs(#5) hors de [1,len]
+ {\loi_exparg\loi_normalizeindex_b{\number\numexpr#5\ifnum\numexpr#5<0 +\csname #4len[#20]\endcsname+1\fi}{#1}{#2}{#3}{#4}}
+ {\loi_invalidindex{#5 is an invalid index, index [.] retained}{#2}}%
+ }%
+ }%
+}
+\def\loi_normalizeindex_b#1#2#3{\loi_exparg\loi_normalizeindex_a{\number\numexpr#2+1}{#3#1,}}% #1=index � rajouter #2=compteur de profondeur #3=index pr�c�dents
+\def\loi_normalizeindex_c#1,\loi_quark{\loi_stop{}{#1}}
+\def\loi_invalidindex#1#2{\loi_ifempty{#2}{\loi_invalidindex_a{#1},}\loi_invalidindex_a{#1}{#2}}
+\def\loi_invalidindex_a#1#2{\loi_invalidindex_b#1\loi_quark#2\loi_quark}
+\def\loi_invalidindex_b#1[.]#2\loi_quark#3,\loi_quark#4\loi_quark,{\loi_stop{#1[#3]#2}{#3}}% #4= index ignor�s
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%% macro publique \readlist %%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcount\loi_nestcnt
+\def\greadlist{\let\loi_def\gdef\let\loi_edef\xdef\def\loi_let{\global\let}\readlist_a}%
+\def\readlist{\let\loi_def\def\let\loi_edef\edef\let\loi_let\let\readlist_a}
+\def\readlist_a{%
+ \loi_nestcnt1 % niveau initial = 1
+ \loi_argcsname\let{loi_previndex[\number\loi_nestcnt]}\empty
+ \loi_ifstar{\_removeextremespacestrue\readlist_b}{\_removeextremespacesfalse\readlist_b}%
+}
+\long\def\readlist_b#1#2{% #1=macro stockant les �l�ments #2=liste des �l�ments
+ \loi_ifcsexpandable{#2}
+ {\loi_exparg{\readlist_b#1}{#2}%
+ }
+ {\loi_edef\loi_listname{\loi_macroname#1}%
+ \loi_argcsname\loi_let{\loi_listname nest}\nestdepth
+ \loi_argcsname\loi_def{\loi_listname[]}{#2}% la liste enti�re
+ \loi_argcsname\loi_def{\loi_listname sep[]}{}% s�parateur vide
+ \loi_ifempty{#2}
+ {\loi_def#1[##1]{}%
+ \loi_argcsname\loi_def{\loi_listname len}{0}\loi_argcsname\loi_def{\loi_listname len[0]}{0}%
+ \loi_error{Empty list ignored, nothing to do}%
+ }
+ {\loi_edef#1[##1]{\unexpanded{\romannumeral\expandafter\loi_checkindex\romannumeral\loi_normalizeindex}{\loi_listname}{##1}{\csname\loi_listname nest\endcsname}{\loi_listname}}%
+ \loi_argcsname\loi_edef{\loi_listname sep}[##1]{\unexpanded{\romannumeral\expandafter\loi_checkindex\romannumeral\loi_normalizeindex}{\loi_listname}{##1}{\csname\loi_listname nest\endcsname}{\loi_listname sep}}%
+ \readlist_c{#2}%
+ \loi_argcsname\loi_argcsname\loi_let{\loi_listname len}{\loi_listname len[0]}% longueur du niveau 0
+ }%
+ }%
+}
+\def\loi_checkindex#1#2#3{%
+ \expandafter\expandafter\expandafter\loi_stop\csname#3[#2]\expandafter\endcsname
+ \romannumeral\loi_ifempty{#1}{\loi_stop}{\loi_stop\loi_error{#1}}%
+}
+\def\readlist_c{%
+ \loi_argcsname\loi_let\loi_currentsep{loi_listofsep[\number\loi_nestcnt]}%
+ \expandafter\readlist_d\loi_currentsep||\_nil
+}
+\long\def\readlist_d#1||#2\_nil#3{\readlist_e1{#3#1}}% #1=<sep courant simple> #3=liste -> rajoute un �l�ment vide pour le test \ifempty ci dessous
+\long\def\readlist_e#1#2{% #1=compteur d'index #2=liste d'�l�ments � examiner termin�e par <sep courant simple> >>RIEN laiss� apr�s
+ \loi_ifempty{#2}
+ {\loi_argcsname\loi_edef{\loi_listname len[\csname loi_previndex[\number\loi_nestcnt]\endcsname0]}{\number\numexpr#1-1\relax}%
+ \loi_argcsname\loi_let{\loi_listname sep[\csname loi_previndex[\number\loi_nestcnt]\endcsname\number\numexpr#1-1\relax]}\empty% le dernier <sep> est <vide> ##NEW v1.52
+ \advance\loi_nestcnt-1
+ \loi_argcsname\loi_let\loi_currentsep{loi_listofsep[\number\loi_nestcnt]}%
+ }
+ {\loi_expafter{\readlist_f{#2}{}}\loi_currentsep||\loi_quark||#2\_nil{#1}% aller isoler le 1er item
+ }%
+}
+\long\def\readlist_f#1#2#3||{% #1=liste restante #2=<dernier sep utilis�> #3=<sep courant>
+ \loi_ifx{\loi_quark#3}% on a �puis� tous les <s�parateurs> ? RESTE � lire <expr+sep1>\_nil{<compteur>}
+ {\loi_ifempty{#2}% si #2 vide, aucun <sep utilis�> n'a �t� trouv�, il reste � lire "<liste compl�te>\_nil"
+ {\long\def\readlist_g##1\_nil##2{\loi_exparg{\readlist_h{##2}{}}{\loi_gobarg##1}{#2}}% ##2=compteur d'index
+ }
+ {\loi_ifx{\loi_listofpair\empty}% paires d�finies ?
+ {\long\def\readlist_g##1#2##2\_nil##3{\loi_exparg{\readlist_h{##3}{##2}}{\loi_gobarg##1}{#2}}%
+ }
+ {\long\def\readlist_g##1\_nil##2{%
+ \loi_exparg{\loi_exparg\loi_grabpaired_expr\loi_listofpair}{\loi_gobarg##1}{#2}\loi_grabpaired_result\loi_grabpaired_remain
+ \loi_exparg{\loi_exparg{\readlist_h{##2}}{\loi_grabpaired_remain}}{\loi_grabpaired_result}{#2}}%
+ }%
+ }%
+ \readlist_g\relax% le \relax meuble l'argument d�limit�
+ }
+ {\long\def\readlist_g##1#3##2\_nil{%
+ \loi_ifempty{##2}% si <liste restante> ne contient pas le <sep courant>
+ {\readlist_f{#1}{#2}% recommencer avec le m�me <sep utile>
+ }%
+ {\loi_ifx{\loi_listofpair\empty}% si pas de paires d�finies
+ {\loi_exparg\readlist_f{\loi_gobarg##1#3}{#3}% raccourcir <liste restante> et <sep courant>:=<sep utile>% ##BUGFIX v1.53
+ }%
+ {\loi_exparg\loi_grabpaired_expr\loi_listofpair{#1}{#3}\loi_grabpaired_result\loi_grabpaired_remain
+ \loi_exparg\readlist_f{\loi_grabpaired_result#3}{#3}%
+ }%
+ }%
+ }%
+ \readlist_g\relax#1#3\_nil% ##BUGFIX v1.53
+ }%
+}
+\long\def\readlist_h#1#2#3{% #1=compteur d'index #2=liste restante #3=�l�ment courant
+ \loi_ifnum{0\loi_exparg\loi_ifspacefirst{\loi_currentsep}{}1\if_removeextremespaces1\fi=11 }% s'il faur retirer les espaces extr�mes
+ {\loi_exparg{\loi_exparg{\readlist_i{#1}{#2}}}{\loi_removeextremespaces{#3}}}% red�finir l'�l�ment courant
+ {\readlist_i{#1}{#2}{#3}}%
+}
+\long\def\readlist_i#1#2#3#4{% #1=compteur d'index #2=liste restante #3=�l�ment courant #4=sep utilis�
+ \loi_ifnum{0\if_ignoreemptyitems1\fi\loi_ifempty{#3}1{}=11 }
+ {\readlist_e{#1}{#2}% si l'on n'ignore pas les �l�ments vides
+ }%
+ {\loi_argcsname\loi_def{\loi_listname[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#3}% assignation de l'item ctuel � la macro
+ \loi_argcsname\loi_def{\loi_listname sep[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#4}% assignation du <sep> actuel � la macro \<macrolist>sep
+ \loi_ifnum{\loi_nestcnt<\nestdepth\relax}% si imbrication max non atteinte
+ {\advance\loi_nestcnt1
+ \loi_argcsname\edef{loi_previndex[\number\loi_nestcnt]}{\csname loi_previndex[\number\numexpr\loi_nestcnt-1]\endcsname#1,}%
+ \readlist_c{#3}% recommencer avec l'�l�ment courant
+ }
+ {}%
+ \loi_exparg\readlist_e{\number\numexpr#1+1}{#2}% puis chercher l'�l�ment suivant dans la liste restante
+ }%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%% macro \listlen %%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\listlen#1[#2]{%
+ \romannumeral\loi_ifempty{#2}
+ {\expandafter\expandafter\expandafter\loi_stop\csname\loi_macroname#1len[0]\endcsname}
+ {\loi_exparg\listlen_a{\romannumeral-`\.\loi_macroname#1}{#2}}%
+}
+\def\listlen_a#1#2{% #1=macro name #2=index non normalis� prendre <profondeur max-1>
+ \loi_exparg{\expandafter\listlen_b\romannumeral\loi_normalizeindex{#1}{#2}}{\number\numexpr\csname#1nest\endcsname-1}{#1}%
+}
+\def\listlen_b#1#2#3{% #1=err #2=index normalis� #3=macroname
+ \expandafter\expandafter\expandafter\loi_stop\csname#3len[#2,0]\expandafter\endcsname
+ \romannumeral\loi_ifempty{#1}{\loi_stop}{\loi_stop\loi_error{#1}}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% macro \foreachitem %%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\foreachitem#1\in#2{%
+ \edef\foreachitem_a{\noexpand\foreachitem_c\noexpand#1{\expandafter\noexpand\csname\loi_macroname#1cnt\endcsname}{\loi_macroname#2}}%
+ \futurelet\loi_nxttok\foreachitem_b
+}
+\def\foreachitem_b{\loi_ifx{\loi_nxttok[}\foreachitem_a{\foreachitem_a[]}}
+\def\foreachitem_c#1#2#3[#4]{% prendre <profondeur max-1>
+ \loi_exparg{\expandafter\foreachitem_d\romannumeral\loi_normalizeindex{#3}{#4}}{\number\numexpr\csname#3nest\endcsname-1}#1{#2}{#3}%
+}
+\def\foreachitem_d#1#2{\loi_ifempty{#2}{\foreachitem_e{#1}{}}{\foreachitem_e{#1}{#2,}}}% #1=err #2=index norm
+\long\def\foreachitem_e#1#2#3#4#5#6{% #1=err #2=index norm #3=macroiter #4=compteur associ� #5=nom de macrolist #6=code
+ \loi_ifnum{\csname#5len[#20]\endcsname>0 }
+ {\loi_ifempty{#1}{}{\loi_error{#1}}%
+ \loi_fornum#4=1to\csname#5len[#20]\endcsname\do{\loi_argcsname\let#3{#5[#2#4]}#6}%
+ }
+ {}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%% macro \showitem %%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\showitems{\loi_ifstar{\let\showitems_cmd\detokenize\showitems_a}{\let\showitems_cmd\loi_identity\showitems_a}}
+\def\showitems_a#1{\def\showitems_b{\showitems_d#1}\futurelet\loi_nxttok\showitems_c}
+\def\showitems_c{\loi_ifx{\loi_nxttok[}\showitems_b{\showitems_b[]}}
+\def\showitems_d#1[#2]{\foreachitem\showitems_ater\in#1[#2]{\showitemsmacro{\expandafter\showitems_cmd\expandafter{\showitems_ater}}}}
+\unless\ifdefined\fbox
+ \newdimen\fboxrule \newdimen\fboxsep \fboxrule=.4pt \fboxsep=3pt % r�glages identiques � LaTeX
+ \def\fbox#1{% imitation de la macro \fbox de LaTeX, voir pages 271 � 274 de "Apprendre � programmer en TeX"
+ \hbox{%
+ \vrule width\fboxrule
+ \vtop{%
+ \vbox{\hrule height\fboxrule \kern\fboxsep \hbox{\kern\fboxsep#1\kern\fboxsep}}%
+ \kern\fboxsep \hrule height\fboxrule
+ }\vrule width\fboxrule
+ }%
+ }
+\fi
+\def\showitemsmacro#1{% encadrement par d�faut
+ \begingroup\fboxsep=0.25pt \fboxrule=0.5pt \fbox{\strut#1}\endgroup
+ \hskip0.25em\relax
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% macro \itemtomacro %%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\itemtomacro#1[#2]{% #1[#2]=item non encore lu: #3=macro
+ \edef\loi_listname{\loi_macroname#1}%
+ \loi_exparg{\expandafter\itemtomacro_a\romannumeral\expandafter\loi_normalizeindex\expandafter{\loi_listname}{#2}}{\csname\loi_listname nest\endcsname}\let
+}
+\def\gitemtomacro#1[#2]{% #1[#2]=item
+ \xdef\loi_listname{\loi_macroname#1}%
+ \loi_exparg{\expandafter\itemtomacro_a\romannumeral\expandafter\loi_normalizeindex\expandafter{\loi_listname}{#2}}{\csname\loi_listname nest\endcsname}{\global\let}%
+}
+\def\itemtomacro_a#1#2#3#4{%
+ \loi_ifempty{#1}{}{\loi_error{#1}}%
+ \loi_argcsname#3#4{\loi_listname[#2]}%
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%% r�glages par d�faut %%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\if_removeextremespaces
+\newif\if_ignoreemptyitems
+\let\ignoreemptyitems\_ignoreemptyitemstrue
+\let\reademptyitems\_ignoreemptyitemsfalse
+\setsepchar{,}
+\defpair{}
+\loi_def_foreachsep{,}
+\reademptyitems
+
+\loi_restorecatcode
+\endinput
+
+######################################################################
+############################ Historique #############################
+######################################################################
+
+v1.0 19/8/2016
+ - Premi�re version publique
+
+v1.1 01/09/2016
+ - Stockage des s�parateurs dans <macrolist>sep
+ - bug corrig� dans \loi_restorecatcode
+
+v1.2 22/10/2016
+ - macros \greadlist et \gitemtomacro pour la globalit�
+
+v1.3 18/11/2016
+ - bugs corrig�s dans la gestion de la globalit�
+
+v1.4 05/10/2017
+ - test \loi_ifprimitive ajout� au test \loi_ifcs
+ - suppression de \loi_expafternil, cr�ation de \loi_expafter,
+ modification de \loi_argcsname
+ - correction d'un bug : \setsepchar{\par} ne provoque plus
+ d'erreur. \loi_ifnum devient \long
+
+v1.5 06/10/2017
+ - correction d'un bug dans \loi_ifcs
+
+v1.51 24/10/2017
+ - correction d'un bug dans \loi_ifcs
+
+v1.52 13/01/2018
+ - le dernier s�parateur est <vide>
+
+v1.53 13/03/2018
+ - correction d'un bug dans \readlist_g
+
+v1.6 01/11/2018
+ - possibilit� d'appariement de tokens dans les items
+
+v1.61 03/03/2019
+ - la macro \loi_ifcs contient une erreur de conception.
+ Il faut tester si le token est un sc && s'il est
+ d�veloppable pour renvoyer vrai car il existe des sc
+ non d�veloppables && qui ne sont _pas_ des primitives.
+ Macro rebaptis�e \loi_ifcsexpandable
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listofitems.tlpobj new/tlpkg/tlpobj/listofitems.tlpobj
--- old/tlpkg/tlpobj/listofitems.tlpobj 2019-03-04 02:24:05.000000000 +0100
+++ new/tlpkg/tlpobj/listofitems.tlpobj 2019-08-22 01:53:47.000000000 +0200
@@ -1,6 +1,6 @@
name listofitems
category Package
-revision 50216
+revision 51923
shortdesc Grab items in lists using user-specified sep char
relocated 1
longdesc This simple package is designed to read a list of items whose
@@ -14,13 +14,14 @@
longdesc employing a syntax reminiscent of an array of several
longdesc dimensions of the type \foo[3,2] to access the item #2 of the
longdesc list contained within the item #3 of the top-tier list.
-runfiles size=8
+runfiles size=15
RELOC/tex/generic/listofitems/listofitems.sty
RELOC/tex/generic/listofitems/listofitems.tex
+ RELOC/tex/generic/listofitems/listofitemsold.tex
catalogue-contact-bugs https://framagit.org/unbonpetit/listofitems/issues
catalogue-contact-repository https://framagit.org/unbonpetit/listofitems/tree/master
catalogue-ctan /macros/generic/listofitems
-catalogue-date 2019-03-03 09:06:44 +0100
+catalogue-date 2019-08-21 18:34:56 +0200
catalogue-license lppl1.3c
catalogue-topics text-manip list
-catalogue-version 1.61
+catalogue-version 1.63
++++++ lni.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lni/CHANGELOG.md new/doc/latex/lni/CHANGELOG.md
--- old/doc/latex/lni/CHANGELOG.md 2019-04-04 22:53:02.000000000 +0200
+++ new/doc/latex/lni/CHANGELOG.md 2019-10-14 22:50:13.000000000 +0200
@@ -6,7 +6,24 @@
## [Unreleased]
-## [1.5.0] -2019-04-04
+## [1.6.0] - 2019-10-14
+
+### Added
+- Optional argument for `\booktitle` to support a short book title for running headers
+- New macro `\booksubtitle`
+- Add support for `selnolig` (LuaTeX-only)
+
+### Changed
+- `\email` now generates a `mailto:` hyperlink
+- Example file: `align` instead of `eqnarray`
+- Add `driver=none` option to `geometry` for better crop results (independent from engine)
+
+### Fixed
+- Global options are passed to `article` class ([#78](https://github.com/gi-ev/LNI/issues/78))
+- Finally fix BiBTeX issue thanks to @ytzemih ([#6](https://github.com/gi-ev/LNI/issues/6))
+- `hyperref` is loaded without options to make it more compatible with other packages like `authorarchive`
+
+## [1.5.0] - 2019-04-04
### Added
- Load package `textcomp` by default and add option `upquote` to `listings` package ([#69](https://github.com/gi-ev/LNI/issues/69))
@@ -79,11 +96,11 @@
## [1.0.0] - 2017-04-07
First release of the revised files
-[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.4...HEAD
-[1.4.0]: https://github.com/gi-ev/LNI/releases/tag/v1.5
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.6...HEAD
+[1.6.0]: https://github.com/gi-ev/LNI/releases/tag/v1.6
+[1.5.0]: https://github.com/gi-ev/LNI/releases/tag/v1.5
[1.4.0]: https://github.com/gi-ev/LNI/releases/tag/v1.4
[1.3.0]: https://github.com/gi-ev/LNI/releases/tag/v1.3
[1.2.0]: https://github.com/gi-ev/LNI/releases/tag/v1.2
[1.1.0]: https://github.com/gi-ev/LNI/releases/tag/v1.1
[1.0.0]: https://github.com/gi-ev/LNI/releases/tag/v1.0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lni/README.md new/doc/latex/lni/README.md
--- old/doc/latex/lni/README.md 2019-04-04 22:53:02.000000000 +0200
+++ new/doc/latex/lni/README.md 2019-10-14 22:50:13.000000000 +0200
@@ -4,7 +4,7 @@
----------------------------------------------------------------------------
lni -- A class for submissions to the ``Lecture Notes in Informatics''
(c) 2016-2019 Gesellschaft für Informatik (GI)
-Version: 1.5
+Version: 1.6
Maintainer: Martin Sievers
Email: martin.sievers(a)schoenerpublizieren.de
License: Released under the LaTeX Project Public License v1.3c or later
@@ -19,10 +19,10 @@
It is based on previous templates created on behalf of the GI.
Quick start:
-Download [lni-author-template.tex](lni-author-template.tex) and edit it in
+Download [lni-author-template.tex](lni-author-template.tex) and edit it in
your favorite LaTeX editor.
You will have to use [BibTeX](https://www.ctan.org/pkg/bibtex) as bibliography tool.
-In case you want to use [biblatex](https://www.ctan.org/pkg/biblatex) and
+In case you want to use [biblatex](https://www.ctan.org/pkg/biblatex) and
[Biber](https://www.ctan.org/pkg/biber), read on in the documentation of this class.
You should use `pdflatex` as `xelatex` and `lualatex` lack some features of the class file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lni/lni-author-template.tex new/doc/latex/lni/lni-author-template.tex
--- old/doc/latex/lni/lni-author-template.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lni/lni-author-template.tex 2019-10-16 00:05:12.000000000 +0200
@@ -0,0 +1,43 @@
+% !TeX encoding = UTF-8
+% !TeX program = pdflatex
+% !BIB program = bibtex
+
+%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne
+%%% Parameter zu laden.
+\documentclass[]{lni}
+%%% To write an article in English, please use the option ``english'' in order
+%%% to get the correct hyphenation patterns and terms.
+%%% \documentclass[english]{class}
+%%
+\begin{document}
+%%% Mehrere Autoren werden durch \and voneinander getrennt.
+%%% Die Fußnote enthält die Adresse sowie eine E-Mail-Adresse.
+%%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
+\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen
+Worten und noch mehr Buchstaben}
+%%%\subtitle{Untertitel / Subtitle} % if needed
+\author[Vorname1 Nachname1 \and Firstname2 Lastname2]
+{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort,
+Land \email{emailaddress@author1}} \and
+Firstname2 Lastname2\footnote{University, Department, Address, Country
+\email{emailaddress@author2}}}
+\startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page
+\editor{Herausgeber et al.} % Names of Editors
+\booktitle{Name-der-Konferenz} % Name of book title
+\year{2017}
+%%%\lnidoi{18.18420/provided-by-editor-02} % if known
+\maketitle
+
+\begin{abstract}
+This is a brief overview of the paper, which should be 70 to 150 words long and
+include the most relevant points. This has to be a single paragraph.
+\end{abstract}
+\begin{keywords}
+Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
+\end{keywords}
+%%% Beginn des Artikeltexts
+\section{Überschrift/Heading}
+
+%%% Angabe der .bib-Datei (ohne Endung) / State .bib file (for BibTeX usage)
+\bibliography{mybibfile} %\printbibliography if you use biblatex/Biber
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lni/lni-paper-example-de.bib new/doc/latex/lni/lni-paper-example-de.bib
--- old/doc/latex/lni/lni-paper-example-de.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lni/lni-paper-example-de.bib 2019-10-16 00:05:12.000000000 +0200
@@ -0,0 +1,90 @@
+
+@InProceedings{ABC01,
+ author = {N. Abraham and U. Bibel and P. Corleone},
+ title = {Formatting Contributions for Proceedings},
+ pages = {46-53},
+ crossref = {Gl01},
+}
+
+@InBook{Az09,
+ pages = {135-162},
+ title = {Die Fußnote in LNI-Bänden},
+ author = {Azubi, L. and others},
+ crossref = {Gl09},
+}
+
+@Book{AB00,
+ title = {Formatierungsrichtlinien für Tagungsbände},
+ publisher = {Format-Verlag},
+ year = {2000},
+ author = {K. Abel and U. Bibel},
+ address = {Bonn},
+}
+
+@Book{Ez10,
+ title = {The Magic Format -- Your Way to Pretty Books},
+ publisher = {Noah \& Sons},
+ year = {2010},
+ author = {O. Ezgarani},
+}
+
+@Article{Gl06,
+ author = {H. I. Glück},
+ title = {Formatierung leicht gemacht},
+ journal = {Formatierungsjournal},
+ volume = {11},
+ number = {09},
+ year = {2009},
+ pages = {23-27},
+}
+
+@Book{Wa14,
+ title = {Essenzen der Informatik},
+ publisher = {Verlag Formvoll},
+ year = {2014},
+ author = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+}
+
+@Book{Wa14b,
+ title = {Ganz neue Essenzen der Informatik im selben Jahr},
+ publisher = {Format-Verlag},
+ year = {2014},
+ author = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+}
+
+@Proceedings{Gl01,
+ title = {Proc. 7th Int. Conf. on Formatting of Workshop-Proceedings},
+ year = {2001},
+ editor = {Glück, H. I.},
+ address = {San Francisco},
+ publisher = {Noah \& Sons},
+ booktitle = {Proc. 7th Int. Conf. on Formatting of Workshop-Proceedings},
+}
+
+@Book{Gl09,
+ title = {Formatierung 2009},
+ publisher = {Format-Verlag},
+ year = {2009},
+ editor = {H. I. Glück},
+ number = {999},
+ series = {LNI},
+ address = {Bonn},
+ booktitle = {Formatierung 2009},
+}
+
+@Misc{XX14,
+ title = {Anteil an Frauen in der Informatik},
+ label = {An},
+ howpublished = {Statistics Worldwide},
+ year = {2014},
+}
+
+@Online{GI19,
+ author = {{Gesellschaft für Informatik e.\,V.}},
+ label = {GI},
+ year = {2019},
+ url = {http://www.gi.de},
+ urldate = {2019-03-21}
+}
+
+@Comment{jabref-meta: databaseType:biblatex;}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lni/lni-paper-example-de.tex new/doc/latex/lni/lni-paper-example-de.tex
--- old/doc/latex/lni/lni-paper-example-de.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lni/lni-paper-example-de.tex 2019-10-16 00:05:12.000000000 +0200
@@ -0,0 +1,173 @@
+% !TeX encoding = UTF-8
+% !TeX spellcheck = de_DE
+
+%% Dies gibt Warnungen aus, sollten veraltete LaTeX-Befehle verwendet werden
+\RequirePackage[l2tabu, orthodox]{nag}
+
+\documentclass[utf8,biblatex]{lni}
+\bibliography{lni-paper-example-de}
+
+%% Schöne Tabellen mittels \toprule, \midrule, \bottomrule
+\usepackage{booktabs}
+
+%% Zu Demonstrationszwecken
+\usepackage[math]{blindtext}
+\usepackage{mwe}
+
+%% BibLaTeX-Sonderkonfiguration,
+%% falls man schnell eine existierende Bibliographie wiederverwenden will, aber nicht die .bib-Datei händisch anpassen möchte.
+%% Bitte \iffalse und \fi entfernen, dann ist diese Konfiguration aktiviert.
+
+\iffalse
+\AtEveryBibitem{%
+ \ifentrytype{article}{%
+ }{%
+ \clearfield{doi}%
+ \clearfield{issn}%
+ \clearfield{url}%
+ \clearfield{urldate}%
+ }%
+ \ifentrytype{inproceedings}{%
+ }{%
+ \clearfield{doi}%
+ \clearfield{issn}%
+ \clearfield{url}%
+ \clearfield{urldate}%
+ }%
+}
+\fi
+
+\begin{document}
+%%% Mehrere Autoren werden durch \and voneinander getrennt.
+%%% Die Fußnote enthält die Adresse sowie eine E-Mail-Adresse.
+%%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
+\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen Worten und noch mehr Buchstaben}
+%%%\subtitle{Untertitel / Subtitle} % falls benötigt
+\author[Vorname1 Nachname1 \and Vorname2 Nachname2]
+{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort, Land \email{emailaddress@author1}} \and
+ Vorname2 Nachname2\footnote{University, Department, Address, Country \email{emailaddress@author2}}}
+\startpage{11} % Beginn der Seitenzählung für diesen Beitrag
+\editor{Herausgeber et al.} % Namen der Herausgeber
+\booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
+\year{2017}
+%%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
+\maketitle
+
+\begin{abstract}
+Die \LaTeX-Klasse \texttt{lni} setzt die Layout-Vorgaben für Beiträge in LNI Konferenzbänden um.
+Dieses Dokument beschreibt ihre Verwendung und ist ein Beispiel für die entsprechende Darstellung.
+Der Abstract ist ein kurzer Überblick über die Arbeit der zwischen 70 und 150 Wörtern lang sein und das Wichtigste enthalten sollte.
+Die Formatierung erfolgt automatisch innerhalb des abstract-Bereichs.
+\end{abstract}
+
+\begin{keywords}
+LNI Guidelines \and \LaTeX Vorlage
+\end{keywords}
+
+\section{Verwendung}
+Die GI gibt unter \url{http://www.gi-ev.de/LNI} Vorgaben für die Formatierung von Dokumenten in der LNI Reihe.
+Für \LaTeX-Dokumente werden diese durch die Dokumentenklasse \texttt{lni} realisiert.
+
+Dieses Dokument basiert auf der offiziellen Dokumentation, simplifiziert und setzt grundlegendes LaTeX-Wissen voraus.
+Es werden generische Platzhalter an die entsprechenden Stellen (wie beispielsweise die Authoren-Angaben) gesetzt und nicht weiter an anderer Stelle dokumentiert.
+
+Dieses Template ist wie folgt gegliedert:
+\Cref{sec:demos} zeigt Demonstrationen der LNI-Verlage.
+\Cref{sec:lniconformance} zeigt die Einhaltung der Richtlinien durch einfachen Text.
+
+\section{Demonstrationen}
+\label{sec:demos}
+Das Symbol für Potenzmengen ($\powerset$) wird korrekt angezeigt.
+Es ist kein Weierstraß-p ($\wp$) mehr.
+
+Spitze Klammen können direkt eingegeben werden: <test />
+
+Hier eine kleine Demonstration von \href{https://www.ctan.org/pkg/microtype}{microtype}:
+\blindtext
+
+\section{Demonstration der Einhaltung der Richtlinien}
+\label{sec:lniconformance}
+
+\subsection{Literaturverzeichnis}
+Der letzte Abschnitt zeigt ein beispielhaftes Literaturverzeichnis für Bücher mit einem Autor \cite{Ez10} und zwei AutorInnen \cite{AB00}, einem Beitrag in Proceedings mit drei AutorInnen \cite{ABC01}, einem Beitrag in einem LNI Band mit mehr als drei AutorInnen \cite{Az09}, zwei Bücher mit den jeweils selben vier AutorInnen im selben Erscheinungsjahr \cite{Wa14} und \cite{Wa14b}, ein Journal \cite{Gl06}, eine Website \cite{GI19} bzw.\ anderweitige Literatur ohne konkrete AutorInnenschaft \cite{XX14}.
+Es wird biblatex verwendet, da es UTF8 sauber unterstützt und \href{https://github.com/gi-ev/LNI/issues/5}{im Gegensatz zu lni.bst} keine Fehler beim bibtexen auftreten.
+
+Referenzen sollten nicht direkt als Subjekt eingebunden werden, sondern immer nur durch Authorenanganben:
+Beispiel: \Citet{AB00} geben ein Beispiel, aber auch \citet{Az09}.
+Hinweis: Großes C bei \texttt{Citet}, wenn es am Satzanfang steht. Dies ist analog zu \texttt{Cref}.
+
+Formatierung und Abkürzungen werden für die Referenzen \texttt{book}, \texttt{inbook}, \texttt{proceedings}, \texttt{inproceedings}, \texttt{article}, \texttt{online} und \texttt{misc} automatisch vorgenommen.
+Mögliche Felder für Referenzen können der Beispieldatei \texttt{lni-paper-example-de.bib} entnommen werden.
+Andere Referenzen sowie Felder müssen allenfalls nachträglich angepasst werden.
+
+\subsection{Abbildungen}
+\Cref{fig:demo} zeigt eine Abbildung.
+
+\begin{figure}
+ \centering
+ \includegraphics[width=.8\textwidth]{example-image}
+ \caption{Demographik}
+ \label{fig:demo}
+\end{figure}
+
+\subsection{Tabellen}
+\Cref{tab:demo} zeigt eine Tabelle.
+
+\begin{table}
+\centering
+\begin{tabular}{lll}
+\toprule
+Überschriftsebenen & Beispiel & Schriftgröße und -art \\
+\midrule
+Titel (linksbündig) & Der Titel \ldots & 14 pt, Fett\\
+Überschrift 1 & 1 Einleitung & 12 pt, Fett\\
+Überschrift 2 & 2.1 Titel & 10 pt, Fett\\
+\bottomrule
+\end{tabular}
+\caption{Die Überschriftsarten}
+\label{tab:demo}
+\end{table}
+
+\subsection{Programmcode}
+Die LNI-Formatvorlage verlangt die Einrückung von Listings vom linken Rand.
+In der \texttt{lni}-Dokumentenklasse ist dies für die \texttt{verbatim}-Umgebung realisiert.
+
+\begin{verbatim}
+public class Hello {
+ public static void main (String[] args) {
+ System.out.println("Hello World!");
+ }
+}
+\end{verbatim}
+
+Alternativ kann auch die \texttt{lstlisting}-Umgebung verwendet werden.
+
+\Cref{L1} zeigt uns ein Beispiel, das mit Hilfe der \texttt{lstlisting}-Umgebung realisiert ist.
+
+\begin{lstlisting}[caption={Beschreibung}, label=L1, language=Java]
+public class Hello {
+ public static void main (String[] args) {
+ System.out.println("Hello World!");
+ }
+}
+\end{lstlisting}
+
+\subsection{Formeln und Gleichungen}
+
+Die korrekte Einrückung und Nummerierung für Formeln ist bei den Umgebungen
+\texttt{equation} und \texttt{align} gewährleistet.
+
+\begin{equation}
+ 1=4-3
+\end{equation}
+und
+\begin{align}
+ 2&=7-5\\
+ 3&=2-1
+\end{align}
+
+%% \bibliography{lni-paper-example-de.tex} ist hier nicht erlaubt: biblatex erwartet dies bei der Preambel
+%% Starten Sie "biber paper", um eine Biliographie zu erzeugen.
+\printbibliography
+
+\end{document}
Binary files old/doc/latex/lni/lni.pdf and new/doc/latex/lni/lni.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lni.doc.tlpobj new/tlpkg/tlpobj/lni.doc.tlpobj
--- old/tlpkg/tlpobj/lni.doc.tlpobj 2019-04-06 23:33:57.000000000 +0200
+++ new/tlpkg/tlpobj/lni.doc.tlpobj 2019-10-16 02:05:37.000000000 +0200
@@ -1,10 +1,13 @@
name lni.doc
category Package
-revision 50754
+revision 52401
shortdesc doc files of lni
relocated 1
-docfiles size=91
+docfiles size=96
RELOC/doc/latex/lni/CHANGELOG.md
RELOC/doc/latex/lni/CONTRIBUTING.md
RELOC/doc/latex/lni/README.md
+ RELOC/doc/latex/lni/lni-author-template.tex
+ RELOC/doc/latex/lni/lni-paper-example-de.bib
+ RELOC/doc/latex/lni/lni-paper-example-de.tex
RELOC/doc/latex/lni/lni.pdf
++++++ lni.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/lni/lni.bst new/bibtex/bst/lni/lni.bst
--- old/bibtex/bst/lni/lni.bst 2019-04-04 22:53:02.000000000 +0200
+++ new/bibtex/bst/lni/lni.bst 2019-10-16 00:05:12.000000000 +0200
@@ -553,7 +553,7 @@
FUNCTION {article}
{ output.bibitem
- format.authors %"author" output.check %% No dot after authors
+ format.authors write$ %"author" output.check %% No dot after authors
new.block
format.title "title" output.check
new.block
@@ -576,7 +576,7 @@
{ output.bibitem
author empty$
{ format.editors "author and editor" output.check }
- { format.authors %output.nonnull %%no dot after authors:
+ { format.authors write$ %output.nonnull %%no dot after authors:
crossref missing$
{ "author and editor" editor either.or.check }
'skip$
@@ -622,7 +622,7 @@
{ output.bibitem
author empty$
{ format.editors "author and editor" output.check }
- { format.authors %*output.nonnull %%no dot after authors:
+ { format.authors write$ %*output.nonnull %%no dot after authors:
crossref missing$
{ "author and editor" editor either.or.check }
'skip$
@@ -657,7 +657,7 @@
FUNCTION {incollection}
{ output.bibitem
- format.authors %"author" output.check %%no dot after authors:
+ format.authors write$ %"author" output.check %%no dot after authors:
new.block
format.title "title" output.check
new.block
@@ -683,7 +683,7 @@
FUNCTION {inproceedings}
{ output.bibitem
- format.authors %"author" output.check %%no dot after authors:
+ format.authors write$ %"author" output.check %%no dot after authors:
new.block
format.title "title" output.check
new.block
@@ -752,7 +752,7 @@
FUNCTION {mastersthesis}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.title "title" output.check
new.block
@@ -795,7 +795,7 @@
FUNCTION {phdthesis}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.btitle "title" output.check
new.block
@@ -845,7 +845,7 @@
FUNCTION {techreport}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.title "title" output.check
new.block
@@ -860,7 +860,7 @@
FUNCTION {unpublished}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.title "title" output.check
new.block
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/lni/lnig.bst new/bibtex/bst/lni/lnig.bst
--- old/bibtex/bst/lni/lnig.bst 2019-04-04 22:53:02.000000000 +0200
+++ new/bibtex/bst/lni/lnig.bst 2019-10-16 00:05:12.000000000 +0200
@@ -553,7 +553,7 @@
FUNCTION {article}
{ output.bibitem
- format.authors %"author" output.check %% No dot after authors
+ format.authors write$ %"author" output.check %% No dot after authors
new.block
format.title "title" output.check
new.block
@@ -576,7 +576,7 @@
{ output.bibitem
author empty$
{ format.editors "author and editor" output.check }
- { format.authors %output.nonnull %%no dot after authors:
+ { format.authors write$ %output.nonnull %%no dot after authors:
crossref missing$
{ "author and editor" editor either.or.check }
'skip$
@@ -622,7 +622,7 @@
{ output.bibitem
author empty$
{ format.editors "author and editor" output.check }
- { format.authors %*output.nonnull %%no dot after authors:
+ { format.authors write$ %*output.nonnull %%no dot after authors:
crossref missing$
{ "author and editor" editor either.or.check }
'skip$
@@ -657,7 +657,7 @@
FUNCTION {incollection}
{ output.bibitem
- format.authors %"author" output.check %%no dot after authors:
+ format.authors write$ %"author" output.check %%no dot after authors:
new.block
format.title "title" output.check
new.block
@@ -683,7 +683,7 @@
FUNCTION {inproceedings}
{ output.bibitem
- format.authors %"author" output.check %%no dot after authors:
+ format.authors write$ %"author" output.check %%no dot after authors:
new.block
format.title "title" output.check
new.block
@@ -752,7 +752,7 @@
FUNCTION {mastersthesis}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.title "title" output.check
new.block
@@ -795,7 +795,7 @@
FUNCTION {phdthesis}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.btitle "title" output.check
new.block
@@ -845,7 +845,7 @@
FUNCTION {techreport}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.title "title" output.check
new.block
@@ -860,7 +860,7 @@
FUNCTION {unpublished}
{ output.bibitem
- format.authors %"author" output.check
+ format.authors write$ %"author" output.check
new.block
format.title "title" output.check
new.block
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lni/lni.cls new/tex/latex/lni/lni.cls
--- old/tex/latex/lni/lni.cls 2019-04-04 22:53:02.000000000 +0200
+++ new/tex/latex/lni/lni.cls 2019-10-16 00:05:12.000000000 +0200
@@ -14,7 +14,7 @@
%% --------| -----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{lni}
- [2019/04/04 v1.5 Official class for submissions to the ``Lecture Notes
+ [2019/10/14 v1.6BETA Official class for submissions to the ``Lecture Notes
in Informatics'']
\def\@clearglobaloption#1{%
\def\@tempa{#1}%
@@ -58,7 +58,7 @@
\newif\ifnorunningheads
\DeclareOption{norunningheads}{\norunningheadstrue}
\ExecuteOptions{utf8}
-\DeclareOption*{\ClassWarning{Option `\CurrentOption` is not supported!}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
\RequirePackage{iftex}
\ifPDFTeX
@@ -150,6 +150,13 @@
\RequirePackage[%
final,%
protrusion=alltext-nott]{microtype}%
+ \ifluatex
+ \iflnienglish
+ \RequirePackage[english]{selnolig}%
+ \else
+ \RequirePackage[ngerman]{selnolig}%
+ \fi%
+ \fi%
\fi%
\SetTracking{encoding=*,shape=sc}{50}%
\DeclareFontFamily{U}{MnSymbolC}{}
@@ -175,7 +182,8 @@
includehead,
headheight=20.39pt,
headsep=.31cm,
- centering]
+ centering,
+ driver=none]
{geometry}
\RequirePackage[a4,center,cam,info]{crop}
\renewcommand*\CROP@@info{{%
@@ -296,7 +304,7 @@
\def\and{\unskip,\ }#1}}\gdef\@author{#2}}
\newcommand{\authorrunning}[1]{%
\fancyhead[LE]{\hspace{0.05cm}\oldsmall\thepage\hspace{5pt}#1}}
-\newcommand*{\email}[1]{{\urlstyle{same}\protect\url{#1}}}
+\newcommand*{\email}[1]{\href{mailto:#1}{\urlstyle{same}\protect\nolinkurl{#1}}}
\newcommand{\@lnidoi}{}
\newcommand{\lnidoi}[1]{\gdef\@lnidoi{#1}}
\renewcommand\maketitle{\par%
@@ -484,8 +492,9 @@
\renewcommand{\refname}{Bibliography}%
}%
\newcommand*{\startpage}[1]{\setcounter{page}{#1}}
-\newcommand*{\@booktitle}{}
-\newcommand*{\booktitle}[1]{\renewcommand{\@booktitle}{#1}}
+\newcommand{\booktitle}{\@dblarg\@@booktitle}
+\def\@@booktitle[#1]#2{\gdef\@bookshorttitle{#1}\gdef\@booktitle{#2}}
+\newcommand{\booksubtitle}[1]{\gdef\@booksubtitle{#1}}
\newcommand*{\@editor}{}
\newcommand*{\editor}[1]{\renewcommand{\@editor}{#1}}
\AtBeginDocument{%
@@ -497,10 +506,12 @@
}%
\fancypagestyle{plain}{%
\fancyhead{} % Löscht alle Kopfzeileneinstellungen
- \fancyhead[RO]{\small\@editor~(Hrsg.):\ \@booktitle,\hspace{1sp}\null\linebreak%
+ \fancyhead[RO]{\small\@editor~(Hrsg.):\ \@bookshorttitle,\hspace{1sp}\null\linebreak%
Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year%
\hspace{5pt}\thepage\hspace{0.05cm}}
- \fancyhead[LE]{\small\@editor~(Hrsg.):\ \(a)booktitle,\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year}
+ \fancyhead[LE]{\small\@editor~(Hrsg.):\
+ \(a)bookshorttitle,\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes
+ in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year}
\fancyfoot{} % Löscht alle Fußzeileneinstellungen
\renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
}%
@@ -519,12 +530,14 @@
\RequirePackage{xspace}
\ifusehyperref
\AtEndPreamble{%
- \RequirePackage[pdfusetitle,bookmarks=false]{hyperref}
+ \RequirePackage[bookmarks=false]{hyperref}
\hypersetup{%
pdfdisplaydoctitle,%
colorlinks=true,%
allcolors=black,%
- pdfstartview=Fit%
+ pdfstartview=Fit,%
+ pdfauthor={\@author},%
+ pdftitle={\@title}%
}%
}%
\fi%
@@ -545,7 +558,11 @@
\Crefname{table}{\tablename}{\tablename}
}%
\fi%
-\AtEndPreamble{\RequirePackage[all]{hypcap}}
+\AtEndPreamble{%
+ \@ifpackageloaded{hyperref}
+ {\RequirePackage[all]{hypcap}}%
+ {}%
+}%
\def\and{\unskip\hspace{-0.42em},\hspace{.6em}}
\ifusebiblatex
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lni.tlpobj new/tlpkg/tlpobj/lni.tlpobj
--- old/tlpkg/tlpobj/lni.tlpobj 2019-04-06 23:33:58.000000000 +0200
+++ new/tlpkg/tlpobj/lni.tlpobj 2019-10-16 02:05:37.000000000 +0200
@@ -1,6 +1,6 @@
name lni
category Package
-revision 50754
+revision 52401
shortdesc Official class for the "Lecture Notes in Informatics"
relocated 1
longdesc This is the official version of the class "lni" for submissions
@@ -8,7 +8,7 @@
longdesc Gesellschaft fur Informatik. To use it, download the file
longdesc lni-author-template.tex and edit it in your favorite LaTeX
longdesc editor.
-runfiles size=17
+runfiles size=18
RELOC/bibtex/bst/lni/lni.bst
RELOC/bibtex/bst/lni/lnig.bst
RELOC/tex/latex/lni/lni.cls
@@ -16,7 +16,7 @@
catalogue-contact-bugs https://github.com/gi-ev/LNI/issues
catalogue-contact-repository https://github.com/gi-ev/LNI
catalogue-ctan /macros/latex/contrib/lni
-catalogue-date 2019-04-04 10:35:48 +0200
+catalogue-date 2019-10-14 21:29:08 +0200
catalogue-license lppl1.3c
catalogue-topics journalpub class
-catalogue-version 1.5
+catalogue-version 1.6
++++++ logreq.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logreq.doc.tlpobj new/tlpkg/tlpobj/logreq.doc.tlpobj
--- old/tlpkg/tlpobj/logreq.doc.tlpobj 2019-02-28 03:50:49.000000000 +0100
+++ new/tlpkg/tlpobj/logreq.doc.tlpobj 2019-12-03 01:55:01.000000000 +0100
@@ -1,6 +1,6 @@
name logreq.doc
category Package
-revision 19640
+revision 53003
shortdesc doc files of logreq
relocated 1
docfiles size=12
++++++ logreq.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logreq.tlpobj new/tlpkg/tlpobj/logreq.tlpobj
--- old/tlpkg/tlpobj/logreq.tlpobj 2019-02-28 03:50:50.000000000 +0100
+++ new/tlpkg/tlpobj/logreq.tlpobj 2019-12-03 01:55:01.000000000 +0100
@@ -1,6 +1,6 @@
name logreq
category Package
-revision 19640
+revision 53003
shortdesc Support for automation of the LaTeX workflow
relocated 1
longdesc The package helps to automate a typical LaTeX workflow that
@@ -15,6 +15,7 @@
longdesc things: enable package authors to use LaTeX commands to issue
longdesc requests, collect all requests from all packages and write them
longdesc to an external XML file at the end of the document.
+depend etoolbox
runfiles size=3
RELOC/tex/latex/logreq/logreq.def
RELOC/tex/latex/logreq/logreq.sty
++++++ lshort-chinese.doc.tar.xz ++++++
++++ 13878 lines of diff (skipped)
++++++ lshort-korean.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-korean/README.ko new/doc/latex/lshort-korean/README.ko
--- old/doc/latex/lshort-korean/README.ko 2006-10-08 01:18:23.000000000 +0200
+++ new/doc/latex/lshort-korean/README.ko 1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-#-* UTF-8 *-
-
-The Not So Short Introduction to LaTeX2e : Korean translation
---------------------------------------------------
- by Tobias Oetiker <oetiker(a)ee.ethz.ch>
-
- tr. by Karnes Kim and 이기황, 샘처럼, MIKA, 김지운
-
-
-lshort-kr이란?
-============
- lshort-kr(LaTeX2e 입문)은
- Tobias Oetiker의 `The Not So Short Introduction to LaTeX2e' 4.17의
- 한국어 번역본입니다.
- 원본은 CTAN에서 찾을 수 있습니다. CTAN:info/lshort
- 번역의 대본은 영문판을 사용했습니다.
- 번역자는 김강수, 이기황, 샘처럼, MIKA, 김지운입니다.
-
-Distribution
-==========
- 공식 배포처는 다음 사이트입니다.
- http://faq.ktug.or.kr/faq/lshort-kr
-
- 배포되는 파일은 다음과 같습니다.
- PDF 파일 : lshort-kr.pdf
- 소스 : lshort-kr-4.17.tar.gz
-
-Versions
-=========
- 현재 배포되는 버전은 ver 4.17kr-2 (2005/11/05) 버전입니다.
-
-Print
-=========
- 배포되는 PDF 파일을 열어서 인쇄합니다.
-
-How to Compile
-============
- 배포되는 PDF는 한겨레결체를 이용하지만
- 소스를 컴파일하면 은글꼴을 본문글꼴로 사용하는 결과를
- 얻을 수 있습니다.
- 컴파일하기 위해서는 다음이 필요합니다.
-
- TeX System(latex)
- LaTeX2e
- 은글꼴
- dhucs
-
- 한글은 dhucs/unicode 를 사용합니다. dhucs/unicode의
- 설치와 설정에 관해서는 KTUG(http://www.ktug.or.kr)을
- 참조하시기 바랍니다.
- PDF 파일을 얻기 위해서는 dvipdfmx를 이용하십시오.
-
- lshort-kr.pdf를 얻기 위해서는 다음과 같이 합니다.
-
- -. Windows/MiKTeX의 경우
-
- $> compile.bat
-
- -. Linux/teTeX의 경우
-
- $> make lshort-kr.pdf
-
-Licenses
-========
- GNU Free Documentation License를 따릅니다.
- cf. http://www.gnu.org/copyleft/fdl.html
-
-Suggestions, Corrections
-================
- 한글판에 대한 제안이나 의견, 수정은 전자우편을 이용하시거나 KTUG 게시판에
- 써주시기 바랍니다.
-
- E-mail : info(a)mail.ktug.or.kr
- Web : http://www.ktug.or.kr/
-
-Acknowledgement
-=============
- * 문서의 역자 후기에 기록된 모든 분들과 이 글을 읽어주실
- 분들께 감사드립니다.
-
-이 번역본이 도움이 되기를 바랍니다.
-
-2005.11.03. KTUG lshort translation team.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-korean/README.md new/doc/latex/lshort-korean/README.md
--- old/doc/latex/lshort-korean/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/lshort-korean/README.md 2019-05-07 21:53:19.000000000 +0200
@@ -0,0 +1,39 @@
+The Not So Short Introduction to LaTeX2e (Korean Translation)
+================================================================
+
+About
+-------
+
+version: 6.2(2018/0218)
+ by Tobias Oetiker, et. al.
+
+Korean translation:
+ LaTeX2e 입문: 143분 동안 익히는 LaTeX2e (한국어판 2019/05/07)
+ by Kangsoo Kim and In-Sung Cho <ischo at ktug.org>
+
+License
+-------
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License,
+Version 1.2 or any later version published by the Free Software Foundation.
+http://www.gnu.org/copyleft/fdl.html
+
+Fonts
+------
+
+`lshort-ko` uses the [KoPubWorld font](http://www.kopus.org/biz/electronic/font.aspx), which is not redistributable.
+To compile the document from source code, you need to install it by yourself and uncomment the lines for font setting in kopubworldfont.sty.
+Alternaltively, you can use the UnFonts shipped in the TeXLive distribution, in which case uncomment the related lines in the style file.
+If you do not use the both of them, the truetype [Nanum font](https://hangeul.naver.com/2017/nanum) must be installed.
+
+How to compile
+--------------
+
+ * `pygmentize` (Python pygments) is required.
+ * run `xelatex` with `--shell-escape` option.
+ * to make indices, run `komkindex` on the `.idx` file.
+
+```
+cd src && make
+```
Binary files old/doc/latex/lshort-korean/lshort-ko-src-20190507.tar.gz and new/doc/latex/lshort-korean/lshort-ko-src-20190507.tar.gz differ
Binary files old/doc/latex/lshort-korean/lshort-ko.pdf and new/doc/latex/lshort-korean/lshort-ko.pdf differ
Binary files old/doc/latex/lshort-korean/lshort-kr-src.tar.gz and new/doc/latex/lshort-korean/lshort-kr-src.tar.gz differ
Binary files old/doc/latex/lshort-korean/lshort-kr.pdf and new/doc/latex/lshort-korean/lshort-kr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lshort-korean.doc.tlpobj new/tlpkg/tlpobj/lshort-korean.doc.tlpobj
--- old/tlpkg/tlpobj/lshort-korean.doc.tlpobj 2019-02-28 03:50:59.000000000 +0100
+++ new/tlpkg/tlpobj/lshort-korean.doc.tlpobj 2019-05-08 01:40:01.000000000 +0200
@@ -1,9 +1,9 @@
name lshort-korean.doc
category Package
-revision 15878
+revision 51035
shortdesc doc files of lshort-korean
relocated 1
-docfiles size=383
- RELOC/doc/latex/lshort-korean/README.ko
- RELOC/doc/latex/lshort-korean/lshort-kr-src.tar.gz
- RELOC/doc/latex/lshort-korean/lshort-kr.pdf
+docfiles size=315
+ RELOC/doc/latex/lshort-korean/README.md
+ RELOC/doc/latex/lshort-korean/lshort-ko-src-20190507.tar.gz
+ RELOC/doc/latex/lshort-korean/lshort-ko.pdf
1
0
Hello community,
here is the log from the commit of package texlive-specs-m for openSUSE:Factory checked in at 2020-05-29 21:18:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-m (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-m"
Fri May 29 21:18:12 2020 rev:42 rq:806899 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-m/texlive-specs-m.changes 2019-11-07 23:11:04.328174871 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/texlive-specs-m.changes 2020-05-29 21:29:06.161172062 +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:
----
is-bst.doc.tar.xz
is-bst.tar.xz
jbact.tar.xz
jmb.tar.xz
kblocks.doc.tar.xz
kblocks.tar.xz
kvdefinekeys.doc.tar.xz
kvdefinekeys.tar.xz
kvoptions.doc.tar.xz
kvoptions.tar.xz
kvsetkeys.doc.tar.xz
kvsetkeys.tar.xz
l3backend.doc.tar.xz
l3backend.tar.xz
labels4easylist.doc.tar.xz
labels4easylist.tar.xz
langsci-avm.doc.tar.xz
langsci-avm.tar.xz
latex-amsmath-dev.doc.tar.xz
latex-amsmath-dev.tar.xz
latex-base-dev.doc.tar.xz
latex-base-dev.tar.xz
latex-bin-dev.doc.tar.xz
latex-graphics-dev.doc.tar.xz
latex-graphics-dev.tar.xz
latex-tools-dev.doc.tar.xz
latex-tools-dev.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-m.spec ++++++
++++ 14848 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-m/texlive-specs-m.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/texlive-specs-m.spec
++++++ ipaex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ipaex/README new/doc/fonts/ipaex/README
--- old/doc/fonts/ipaex/README 2016-10-08 00:23:28.000000000 +0200
+++ new/doc/fonts/ipaex/README 2019-09-06 00:24:58.000000000 +0200
@@ -1,3 +1,7 @@
+README for IPA and IPAex font bundle
+====================================
+Version: 2019-09-05
+
These are both the IPA and IPAex fonts as provided at
http://ipafont.ipa.go.jp/
The license of the fonts can be found in the accompanying file
@@ -12,9 +16,10 @@
norbert(a)preining.info
Norbert Preining
-2016-10-07
+2019-09-05
Changes:
+2019-09-05 IPAex 4.01
2016-10-07 IPAex 3.01
2014-11-14 IPAex 2.01, IPA 3.03
inclusion of IPAPGothic (ipagp.ttf) IPAPMincho (ipamp.ttf)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ipaex/Readme_IPAexfont00301.txt new/doc/fonts/ipaex/Readme_IPAexfont00301.txt
--- old/doc/fonts/ipaex/Readme_IPAexfont00301.txt 2016-10-08 00:23:28.000000000 +0200
+++ new/doc/fonts/ipaex/Readme_IPAexfont00301.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-IPAexフォント
-— はじめにお読みください —
-
-IPAexフォントは、JIS X 0213:2004に準拠したTrueTypeアウトラインベースのOpenTypeフォントです。
-
-IPAexフォントの使用または利用に当たっては、添付の「IPAフォントライセンスv1.0」に定める条件に従ってください。
-IPAexフォントを使用し、複製し、または頒布する行為、その他、「IPAフォントライセンスv1.0」に定める権利の利用を行った場合、受領者は「IPAフォントライセンスv1.0」に同意したものと見なします。
-
-
-IPAexフォント2書体パック(IPAexゴシック、IPAex明朝) IPAexfont00301.zip
-|--はじめにお読みください Readme_IPAexfont00301.txt
-|--IPAフォントライセンスv1.0 IPA_Font_License_Agreement_v1.0.txt
-|--IPAexゴシック(Ver.003.01) ipaexg.ttf
-|--IPAex明朝(Ver.003.01) ipaexm.ttf
-
-
-「IPAフォント」は、IPAの登録商標です。
-
-=========================
-IPAex Font
--- Readme --
-
-IPAex Fonts are JIS X 0213:2004 compliant OpenType fonts based on TrueType outlines.
-
-In using IPAex fonts, please comply with the terms and conditions set out in "IPA Font License Agreement v1.0" included in this package.
-Any use, reproduction or distribution of the IPA Font or any exercise of rights under "IPA Font License Agreement v1.0" by a Recipient constitutes the Recipient's acceptance of the License Agreement.
-
-
-IPAex Fonts 2 fonts package (IPAex Gothic、IPAex Mincho) IPAexfont00301.zip
-|--Readme Readme_IPAexfont00301.txt
-|--IPA Font License Agreement v1.0 IPA_Font_License_Agreement_v1.0.txt
-|--IPAexGothic(Ver.003.01) ipaexg.ttf
-|--IPAexMincho(Ver.003.01) ipaexm.ttf
-
-
-"IPA Font" is a registered trademark of IPA in Japan.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ipaex/Readme_IPAexfont00401.txt new/doc/fonts/ipaex/Readme_IPAexfont00401.txt
--- old/doc/fonts/ipaex/Readme_IPAexfont00401.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/ipaex/Readme_IPAexfont00401.txt 2019-09-06 00:24:58.000000000 +0200
@@ -0,0 +1,36 @@
+IPAexフォント
+― はじめにお読みください ―
+
+IPAexフォントは、JIS X 0213:2012に準拠したTrueTypeアウトラインベースのOpenTypeフォントです。
+
+IPAexフォントの使用または利用に当たっては、添付の「IPAフォントライセンスv1.0」に定める条件に従ってください。
+IPAexフォントを使用し、複製し、または頒布する行為、その他、「IPAフォントライセンスv1.0」に定める権利の利用を行った場合、受領者は「IPAフォントライセンスv1.0」に同意したものと見なします。
+
+
+IPAexフォント2書体パック(IPAexゴシック、IPAex明朝) IPAexfont00401.zip
+|--はじめにお読みください Readme_IPAexfont00401.txt
+|--IPAフォントライセンスv1.0 IPA_Font_License_Agreement_v1.0.txt
+|--IPAexゴシック(Ver.004.01) ipaexg.ttf
+|--IPAex明朝(Ver.004.01) ipaexm.ttf
+
+
+「IPAフォント」は、IPAの登録商標です。
+
+=========================
+IPAex Font
+-- Readme --
+
+IPAex Fonts are JIS X 0213:2012 compliant OpenType fonts based on TrueType outlines.
+
+In using IPAex fonts, please comply with the terms and conditions set out in "IPA Font License Agreement v1.0" included in this package.
+Any use, reproduction or distribution of the IPA Font or any exercise of rights under "IPA Font License Agreement v1.0" by a Recipient constitutes the Recipient's acceptance of the License Agreement.
+
+
+IPAex Fonts 2 fonts package (IPAex Gothic、IPAex Mincho) IPAexfont00401.zip
+|--Readme Readme_IPAexfont00401.txt
+|--IPA Font License Agreement v1.0 IPA_Font_License_Agreement_v1.0.txt
+|--IPAexGothic(Ver.004.01) ipaexg.ttf
+|--IPAexMincho(Ver.004.01) ipaexm.ttf
+
+
+"IPA Font" is a registered trademark of IPA in Japan.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ipaex.doc.tlpobj new/tlpkg/tlpobj/ipaex.doc.tlpobj
--- old/tlpkg/tlpobj/ipaex.doc.tlpobj 2019-02-28 03:43:08.000000000 +0100
+++ new/tlpkg/tlpobj/ipaex.doc.tlpobj 2019-09-06 01:53:57.000000000 +0200
@@ -1,10 +1,10 @@
name ipaex.doc
category Package
-revision 45751
+revision 52032
shortdesc doc files of ipaex
relocated 1
docfiles size=8
RELOC/doc/fonts/ipaex/IPA_Font_License_Agreement_v1.0.txt
RELOC/doc/fonts/ipaex/README
- RELOC/doc/fonts/ipaex/Readme_IPAexfont00301.txt
+ RELOC/doc/fonts/ipaex/Readme_IPAexfont00401.txt
RELOC/doc/fonts/ipaex/Readme_IPAfont00303.txt
++++++ ipaex.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/ipaex.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/ipaex.tar.xz differ: char 25, line 1
++++++ jadetex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jadetex.doc.tlpobj new/tlpkg/tlpobj/jadetex.doc.tlpobj
--- old/tlpkg/tlpobj/jadetex.doc.tlpobj 2019-02-28 03:43:52.000000000 +0100
+++ new/tlpkg/tlpobj/jadetex.doc.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name jadetex.doc
category Package
-revision 48634
+revision 54227
shortdesc doc files of jadetex
docfiles size=34
texmf-dist/doc/man/man1/jadetex.1
++++++ jadetex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jadetex.tlpobj new/tlpkg/tlpobj/jadetex.tlpobj
--- old/tlpkg/tlpobj/jadetex.tlpobj 2019-02-28 03:43:53.000000000 +0100
+++ new/tlpkg/tlpobj/jadetex.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name jadetex
category Package
-revision 48634
+revision 54227
shortdesc Macros supporting Jade DSSSL output
longdesc Macro package on top of LaTeX to typeset TeX output of the Jade
longdesc DSSSL implementation.
@@ -9,36 +9,56 @@
depend pdftex
depend tex
depend amsfonts
+depend atbegshi
+depend atveryend
+depend auxhook
depend babel
+depend bigintcalc
+depend bitset
depend cm
depend colortbl
depend cyrillic
depend dehyph
depend ec
+depend etexcmds
depend fancyhdr
depend graphics
depend graphics-cfg
depend graphics-def
+depend hycolor
depend hyperref
+depend hyph-utf8
depend hyphen-base
-depend ifxetex
+depend iftex
+depend infwarerr
+depend intcalc
+depend kvdefinekeys
+depend kvoptions
+depend kvsetkeys
+depend l3kernel
depend latex-fonts
depend latexconfig
+depend letltxmacro
+depend ltxcmds
depend marvosym
-depend oberdiek
+depend pdfescape
+depend pdftexcmds
depend psnfss
+depend rerunfilecheck
depend stmaryrd
depend symbol
depend tex-ini-files
depend tipa
depend tools
depend ulem
+depend uniquecounter
+depend unicode-data
depend url
depend wasysym
depend zapfding
depend jadetex.ARCH
-execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="*jadetex.ini" fmttriggers=amsfonts,babel,cm,colortbl,cyrillic,dehyph,ec,fancyhdr,graphics,graphics-cfg,graphics-def,hyperref,hyphen-base,ifxetex,latex,latex-fonts,latexconfig,marvosym,oberdiek,passivetex,psnfss,stmaryrd,symbol,tex-ini-files,tipa,tools,ulem,url,wasysym,zapfding
-execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="*pdfjadetex.ini" fmttriggers=amsfonts,babel,cm,colortbl,cyrillic,dehyph,ec,fancyhdr,graphics,graphics-cfg,graphics-def,hyperref,hyphen-base,ifxetex,latex,latex-fonts,latexconfig,marvosym,oberdiek,passivetex,psnfss,stmaryrd,symbol,tex-ini-files,tipa,tools,ulem,url,wasysym,zapfding
+execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="*jadetex.ini" fmttriggers=amsfonts,atbegshi,atveryend,auxhook,babel,bigintcalc,bitset,cm,colortbl,cyrillic,dehyph,ec,etexcmds,fancyhdr,graphics,graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,hyphen-base,iftex,infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,l3kernel,latex,latex-fonts,latexconfig,letltxmacro,ltxcmds,marvosym,passivetex,pdfescape,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,symbol,tex-ini-files,tipa,tools,ulem,uniquecounter,unicode-data,url,wasysym,zapfding
+execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="*pdfjadetex.ini" fmttriggers=amsfonts,atbegshi,atveryend,auxhook,babel,bigintcalc,bitset,cm,colortbl,cyrillic,dehyph,ec,etexcmds,fancyhdr,graphics,graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,hyphen-base,iftex,infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,l3kernel,latex,latex-fonts,latexconfig,letltxmacro,ltxcmds,marvosym,passivetex,pdfescape,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,symbol,tex-ini-files,tipa,tools,ulem,uniquecounter,unicode-data,url,wasysym,zapfding
runfiles size=60
texmf-dist/tex/jadetex/base/dsssl.def
texmf-dist/tex/jadetex/base/jadetex.ini
@@ -48,7 +68,6 @@
texmf-dist/tex/jadetex/base/ut1omlgc.fd
catalogue-contact-repository http://jadetex.sourceforge.net/
catalogue-ctan /macros/jadetex
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license other-free
catalogue-topics foreign-import
catalogue-version 3.13
++++++ japanese-otf-uptex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/japanese-otf-uptex/00otf-uptex.txt new/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
--- old/doc/fonts/japanese-otf-uptex/00otf-uptex.txt 2019-04-02 23:04:45.000000000 +0200
+++ new/doc/fonts/japanese-otf-uptex/00otf-uptex.txt 2020-03-04 00:03:50.000000000 +0100
@@ -1,5 +1,5 @@
[ Title ]
-japanese-otf-uptex Ver.0.23 2019/04/01
+japanese-otf-uptex Ver.0.25 2020/02/28
[ Abstract ]
@@ -34,7 +34,7 @@
script/umkpkana.pl : perl script making pl, ovp for proportional kana
script/umkvpkana.pl : perl script making pl, ovp for proportional kana
-sty/otf.sty : basic style file
+sty/otf.sty : basic style file
sty/mlutf.sty : style file for multi option
test/uplatex/* : test samples.
@@ -382,3 +382,18 @@
Added.
COPYRIGHT ::
Update year.
+2019.09.07 Ver0.24
+ ## Thank @aminophen san.
+ sty/otf.sty, sty/mlutf.sty ::
+ Increment version number.
+ script/CheckDVICode.pm ::
+ Make half width U+00B7 in VFs.
+2020.02.28 Ver0.25
+ sty/otf.sty, sty/mlutf.sty ::
+ Increment version number.
+ script/CheckDVICode.pm, script/sp_list_j.txt,
+ test/uplatex/sp_jp_{utf,text}.tex ::
+ Update references:
+ Adobe-Japan1-7 cid2code.txt (Version 07/30/2019).
+ COPYRIGHT ::
+ Update year.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/japanese-otf-uptex/COPYRIGHT new/doc/fonts/japanese-otf-uptex/COPYRIGHT
--- old/doc/fonts/japanese-otf-uptex/COPYRIGHT 2019-04-02 23:04:45.000000000 +0200
+++ new/doc/fonts/japanese-otf-uptex/COPYRIGHT 2020-03-04 00:03:50.000000000 +0100
@@ -1,5 +1,5 @@
Copyright (C) 2003--2019 SAITO Shuzaburo and INOUE Koichi
-Copyright (C) 2007--2019 TANAKA Takuji
+Copyright (C) 2007--2020 TANAKA Takuji
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/fonts/japanese-otf-uptex/README new/doc/fonts/japanese-otf-uptex/README
--- old/doc/fonts/japanese-otf-uptex/README 2019-04-02 23:04:45.000000000 +0200
+++ new/doc/fonts/japanese-otf-uptex/README 2020-03-04 00:03:50.000000000 +0100
@@ -3,7 +3,7 @@
From 00otf-uptex.txt:
[ Title ]
-japanese-otf-uptex Ver.0.23 2019/04/01
+japanese-otf-uptex Ver.0.25 2020/02/28
[ Abstract ]
@@ -22,11 +22,11 @@
The original source has been downloaded from
https://github.com/t-tk/japanese-otf-uptex
as
- https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.23
+ https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.25
After that the scripts run and the generated tfm and vf files included.
Norbert Preining <preining(a)logic.at>
TANAKA Takuji <ttk(a)t-lab.opal.ne.jp>
-2019-04-02
+2020-02-29
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex new/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex
--- old/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex 2019-04-02 23:04:45.000000000 +0200
+++ new/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_text.tex 2020-03-04 00:03:50.000000000 +0100
@@ -1,6 +1,6 @@
%
% This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 02/05/2019)
+% in cid2code.txt (Version 07/30/2019)
% for Adobe-Japan1-7
%
% Reference:
@@ -26,15 +26,15 @@
🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹
🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘
-沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将
-𭕄𠀋城𩙿真𠆢𮕩𫝑成𧾷
-𣳾炭𥫗彫潮𡈽冬𤴔姬𫞉
-諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔
-𦦙𣏌杞𪧦𫞽絣𮉸𠔿𦉪𠂰
-𮛪𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你
-𣘺𣏾𢘉
+🆄🆅🆆🆇🆈🆉🞜眞𠤎𦥑
+𫟘沿芽槪割𦈢𠮷𩵋卿𫞎
+憲𠩤浩𫝆𫝷滋𠮟勺爵周
+将𭕄𠀋城𩙿真𠆢𮕩𫝑成
+𧾷𣳾炭𥫗彫潮𡈽冬𤴔姬
+𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃
+拔𦦙𣏌杞𪧦𫞽絣𮉸𠔿𦉪
+𠂰𮛪𨦇𨸗𫠚𤋮桒𣲾𠘑嶲
+你𣘺𣏾𢘉
Adobe-Japan1-5\\
𡌛𡑮𡢽𡚴𡸴𣇄𣗄𣜿𣝣𤟱
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex new/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
--- old/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex 2019-04-02 23:04:45.000000000 +0200
+++ new/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex 2020-03-04 00:03:50.000000000 +0100
@@ -1,6 +1,6 @@
%
% This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 02/05/2019)
+% in cid2code.txt (Version 07/30/2019)
% for Adobe-Japan1-7
%
% Reference:
@@ -26,15 +26,15 @@
\UTF{1F142}\UTF{1F143}\UTF{1F144}\UTF{1F145}\UTF{1F146}\UTF{1F147}\UTF{1F148}\UTF{1F149}\UTF{1F202}\UTF{1F237}%
\UTF{1F170}\UTF{1F171}\UTF{1F172}\UTF{1F173}\UTF{1F174}\UTF{1F175}\UTF{1F176}\UTF{1F177}\UTF{1F178}\UTF{1F179}%
\UTF{1F17A}\UTF{1F17B}\UTF{1F17C}\UTF{1F17D}\UTF{1F17E}\UTF{1F17F}\UTF{1F180}\UTF{1F181}\UTF{1F182}\UTF{1F183}%
-\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{2F945}\UTF{2090E}\UTF{26951}\UTF{2B7D8}%
-\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}\UTF{2F833}\UTF{2B78E}\UTF{2F8AC}%
-\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}\UTF{2F921}\UTF{2F83F}\UTF{2F873}%
-\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}\UTF{2B751}\UTF{2F8B2}\UTF{27FB7}%
-\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}\UTF{24D14}\UTF{2F862}\UTF{2B789}%
-\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}\UTF{2F82C}\UTF{2F86D}\UTF{2F8B6}%
-\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}\UTF{2053F}\UTF{2626A}\UTF{200B0}%
-\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}\UTF{20611}\UTF{2F9F4}\UTF{2F804}%
-\UTF{2363A}\UTF{233FE}\UTF{22609}
+\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{1F79C}\UTF{2F945}\UTF{2090E}\UTF{26951}%
+\UTF{2B7D8}\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}\UTF{2F833}\UTF{2B78E}%
+\UTF{2F8AC}\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}\UTF{2F921}\UTF{2F83F}%
+\UTF{2F873}\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}\UTF{2B751}\UTF{2F8B2}%
+\UTF{27FB7}\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}\UTF{24D14}\UTF{2F862}%
+\UTF{2B789}\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}\UTF{2F82C}\UTF{2F86D}%
+\UTF{2F8B6}\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}\UTF{2053F}\UTF{2626A}%
+\UTF{200B0}\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}\UTF{20611}\UTF{2F9F4}%
+\UTF{2F804}\UTF{2363A}\UTF{233FE}\UTF{22609}
Adobe-Japan1-5\\
\UTF{2131B}\UTF{2146E}\UTF{218BD}\UTF{216B4}\UTF{21E34}\UTF{231C4}\UTF{235C4}\UTF{2373F}\UTF{23763}\UTF{247F1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/japanese-otf-uptex.doc.tlpobj new/tlpkg/tlpobj/japanese-otf-uptex.doc.tlpobj
--- old/tlpkg/tlpobj/japanese-otf-uptex.doc.tlpobj 2019-04-03 01:24:55.000000000 +0200
+++ new/tlpkg/tlpobj/japanese-otf-uptex.doc.tlpobj 2020-03-04 23:51:11.000000000 +0100
@@ -1,6 +1,6 @@
name japanese-otf-uptex.doc
category Package
-revision 50707
+revision 54080
shortdesc doc files of japanese-otf-uptex
relocated 1
docfiles size=40
++++++ japanese-otf-uptex.tar.xz ++++++
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgotheb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgotheb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgotheb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgotheb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothebn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothebn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothebn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothebn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpmgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminl-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminln-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminln-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminln-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminln-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgexpminrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgexpminrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgotheb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothebn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothebn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothebn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothebn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminl-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminln-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminln-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminln-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminln-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upbrsgnmlminrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgotheb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgotheb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgotheb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgotheb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothebn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothebn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothebn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothebn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpmgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpmgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpmgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpmgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpmgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpmgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpmgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpmgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminl-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminl-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminl-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminl-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminln-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminln-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminln-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminln-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upexpminrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upexpminrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgotheb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgotheb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgotheb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgotheb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothebn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothebn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothebn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothebn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlmgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlmgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlmgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlmgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlmgothrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlmgothrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlmgothrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlmgothrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminb-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminb-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminbn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminbn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminbn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminbn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminl-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminl-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminl-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminl-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminln-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminln-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminln-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminln-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminr-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminr-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminrn-h.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminrn-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/upnmlminrn-v.vf and new/fonts/vf/public/japanese-otf-uptex/upnmlminrn-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubygothb-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubygothb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubygothb-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubygothb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubygotheb-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubygotheb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubygotheb-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubygotheb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubygothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubygothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubygothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubygothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubymgothr-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubymgothr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubymgothr-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubymgothr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubyminb-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubyminb-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubyminb-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubyminb-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubyminl-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubyminl-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubyminl-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubyminl-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubyminr-h.vf and new/fonts/vf/public/japanese-otf-uptex/uprubyminr-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/uprubyminr-v.vf and new/fonts/vf/public/japanese-otf-uptex/uprubyminr-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfgrj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfgrj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfgrj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfgrj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjgbj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjgbj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjgbj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjgbj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjgej-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjgej-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjgej-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjgej-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjgrj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjgrj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjgrj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjgrj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmbj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmbj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmbj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmbj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmgrj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmgrj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmgrj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmgrj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmlj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmlj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmlj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmlj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmrj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmrj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfjmrj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfjmrj-v.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfmrj-h.vf and new/fonts/vf/public/japanese-otf-uptex/utfmrj-h.vf differ
Binary files old/fonts/vf/public/japanese-otf-uptex/utfmrj-v.vf and new/fonts/vf/public/japanese-otf-uptex/utfmrj-v.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/japanese-otf-uptex/mlutf.sty new/tex/platex/japanese-otf-uptex/mlutf.sty
--- old/tex/platex/japanese-otf-uptex/mlutf.sty 2019-04-02 23:04:45.000000000 +0200
+++ new/tex/platex/japanese-otf-uptex/mlutf.sty 2020-03-04 00:03:50.000000000 +0100
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.23 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.25 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/japanese-otf-uptex/otf.sty new/tex/platex/japanese-otf-uptex/otf.sty
--- old/tex/platex/japanese-otf-uptex/otf.sty 2019-04-02 23:04:45.000000000 +0200
+++ new/tex/platex/japanese-otf-uptex/otf.sty 2020-03-04 00:03:50.000000000 +0100
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.23 ttk]
+\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.25 ttk]
\RequirePackage{keyval}
%for processing options
\newif\if@kana \@kanafalse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/japanese-otf-uptex.tlpobj new/tlpkg/tlpobj/japanese-otf-uptex.tlpobj
--- old/tlpkg/tlpobj/japanese-otf-uptex.tlpobj 2019-04-03 01:24:55.000000000 +0200
+++ new/tlpkg/tlpobj/japanese-otf-uptex.tlpobj 2020-03-04 23:51:11.000000000 +0100
@@ -1,6 +1,6 @@
name japanese-otf-uptex
category Package
-revision 50707
+revision 54080
shortdesc Support for Japanese OTF files in upLaTeX
relocated 1
longdesc The bundle offers support of the fonts in the japanese-otf
@@ -1030,7 +1030,6 @@
catalogue-contact-home http://www.t-lab.opal.ne.jp/tex/uptex.html
catalogue-contact-repository https://github.com/texjporg/japanese-otf-mirror
catalogue-ctan /language/japanese/japanese-otf-uptex
-catalogue-date 2019-04-02 19:34:38 +0200
catalogue-license bsd3
catalogue-topics font-use font-cjk japanese
-catalogue-version 0.23
+catalogue-version 0.25
++++++ jfmutil.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/jfmutil/README-ja.md new/texmf-dist/doc/fonts/jfmutil/README-ja.md
--- old/texmf-dist/doc/fonts/jfmutil/README-ja.md 2019-02-11 23:04:43.000000000 +0100
+++ new/texmf-dist/doc/fonts/jfmutil/README-ja.md 2019-09-04 23:47:23.000000000 +0200
@@ -466,6 +466,9 @@
更新履歴
--------
+ * Version 1.2.3 〈2019/09/02〉
+ - バグ・不具合の修正。
+
* Version 1.2.2 〈2019/02/09〉
- バグ修正。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/jfmutil/README.md new/texmf-dist/doc/fonts/jfmutil/README.md
--- old/texmf-dist/doc/fonts/jfmutil/README.md 2019-02-11 23:04:43.000000000 +0100
+++ new/texmf-dist/doc/fonts/jfmutil/README.md 2019-09-04 23:47:23.000000000 +0200
@@ -85,6 +85,9 @@
Revision History
----------------
+ * Version 1.2.3 〈2019/09/02〉
+ - Bug fix.
+
* Version 1.2.2 〈2019/02/09〉
- Bug fix.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jfmutil.doc.tlpobj new/tlpkg/tlpobj/jfmutil.doc.tlpobj
--- old/tlpkg/tlpobj/jfmutil.doc.tlpobj 2019-02-28 03:45:18.000000000 +0100
+++ new/tlpkg/tlpobj/jfmutil.doc.tlpobj 2019-09-05 01:53:58.000000000 +0200
@@ -1,6 +1,6 @@
name jfmutil.doc
category Package
-revision 50002
+revision 52026
shortdesc doc files of jfmutil
docfiles size=9
texmf-dist/doc/fonts/jfmutil/LICENSE
++++++ jfmutil.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/jfmutil/jfmutil.pl new/texmf-dist/scripts/jfmutil/jfmutil.pl
--- old/texmf-dist/scripts/jfmutil/jfmutil.pl 2019-02-11 23:04:43.000000000 +0100
+++ new/texmf-dist/scripts/jfmutil/jfmutil.pl 2019-09-04 23:47:23.000000000 +0200
@@ -12,8 +12,8 @@
#------------------------------------------------- ZRTeXtor module
package ZRTeXtor;
-our $VERSION = 1.005_00;
-our $mod_date = "2018/01/21";
+our $VERSION = 1.007_00;
+our $mod_date = "2019/09/02";
use Encode qw(encode decode);
# Here follows excerpt from ZRTeXtor.pm
@@ -255,15 +255,17 @@
# Wrapper for 'tftopl' command.
sub x_tftopl
{
- my ($tfm, $cmd) = @_; my ($ftmp, $ftfm, $cout, $cerr);
+ my ($tfm, $cmd) = @_; my ($ftmp, $ftfm, $fpl, $cout, $cerr);
if (!defined $cmd) { $cmd = $cmd_name{tftopl}; }
if ($tfm =~ m/\.tfm$/i && $tfm !~ /\0/) { $ftfm = $tfm; }
else {
$ftfm = $ftmp = get_temp_name() . ".tfm";
(write_whole_file($ftmp, $tfm, 1)) or return;
}
- ($cout, $cerr) = x_captured_exec("$cmd $ftfm");
+ $fpl = get_temp_name() . ".pl";
+ ($cout, $cerr) = x_captured_exec("$cmd $ftfm $fpl");
if (defined $ftmp) { unlink($ftmp); }
+ $cout = read_whole_file($fpl); unlink($fpl);
if ($cout eq '' || $cout =~ /CHANGED!\)\s*$/) {
return error("tftopl failed: $ftfm");
}
@@ -480,6 +482,9 @@
else {
if ($lin =~ m/\(/) { $lins[$_] =~ s/\(/X0028/g; $repl = 1; }
if ($lin =~ m/\)/) { $lins[$_] =~ s/\)/X0029/g; $repl = 1; }
+ if ($lin =~ m/\bU [\dA-F]{4}/) {
+ $lins[$_] =~ s/\bU ([\dA-F]{4})/U$1/g; $repl = 1;
+ }
}
}
if ($lin =~ m/^\(CHARSINTYPE /) { $mod = 1; }
@@ -1944,6 +1949,7 @@
(defined $cspc) or $cspc = jfm_charlist('GL94DB');
# Next I check consistency about existence of entries
# (e.g. CIT 4 should exist iff TYPE 4 exists).
+ ($#cist >= 0 && $#cit < 0) and $#cit = 0;
(defined $tydsc[0])
or return error("no TYPE for type 0");
(vf_check_match("TYPE", \@tydsc, "CIT", \@cit, 1, "type"))
@@ -2242,8 +2248,11 @@
# coderange consistency
@fs = sort { $a <=> $b } (keys %$typ);
foreach $cc (@fs) {
- (defined $chdsc->{$cc}) or return error(
- sprintf("charpacket missing in VF: code %04X", $cc));
+ (defined $chdsc->{$cc}) and next;
+ if ($vf_strict) {
+ return error(sprintf("charpacket missing in VF: code %04X", $cc));
+ }
+ delete $typ->{$cc};
}
#
@ccs = sort { $a <=> $b } (keys %$chdsc);
@@ -2772,8 +2781,8 @@
#================================================= BEGIN
use Encode qw(encode decode);
my $prog_name = 'jfmutil';
-my $version = '1.2.2';
-my $mod_date = '2019/02/09';
+my $version = '1.2.3';
+my $mod_date = '2019/09/02';
#use Data::Dump 'dump';
#
my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc, $sw_lenient);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jfmutil.tlpobj new/tlpkg/tlpobj/jfmutil.tlpobj
--- old/tlpkg/tlpobj/jfmutil.tlpobj 2019-02-28 03:45:18.000000000 +0100
+++ new/tlpkg/tlpobj/jfmutil.tlpobj 2019-09-05 01:53:58.000000000 +0200
@@ -1,6 +1,6 @@
name jfmutil
category Package
-revision 50002
+revision 52026
shortdesc Utility to process pTeX-extended TFM and VF
longdesc This program provides functionality to process data files (JFM
longdesc and VF) that form logical fonts used in (u)pTeX. The functions
@@ -15,7 +15,7 @@
runfiles size=26
texmf-dist/scripts/jfmutil/jfmutil.pl
catalogue-ctan /fonts/utilities/jfmutil
-catalogue-date 2019-02-11 14:03:12 +0100
+catalogue-date 2019-09-03 22:04:21 +0200
catalogue-license mit
catalogue-topics font-proc
-catalogue-version 1.2.2
+catalogue-version 1.2.3
++++++ jlreq.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/LICENSE new/doc/latex/jlreq/LICENSE
--- old/doc/latex/jlreq/LICENSE 2019-01-15 22:39:30.000000000 +0100
+++ new/doc/latex/jlreq/LICENSE 2020-02-08 23:16:07.000000000 +0100
@@ -1,6 +1,6 @@
(2-clause BSD license)
jlreq and jlreq-trimmarks
-Copyright 2017-2019, Noriyuki Abe.
+Copyright 2017-2020, Noriyuki Abe.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/README-ja.md new/doc/latex/jlreq/README-ja.md
--- old/doc/latex/jlreq/README-ja.md 2019-04-01 23:08:48.000000000 +0200
+++ new/doc/latex/jlreq/README-ja.md 2020-02-08 23:16:07.000000000 +0100
@@ -4,7 +4,7 @@
[日本語組版処理の要件](https://www.w3.org/TR/jlreq/ja/)の実装を試みる[LuaTeX-ja](https://osdn… / pLaTeX / upLaTeX用のクラスファイルと,それに必要なJFMの組み合わせです.
## 提供されるもの
-クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX / upLaTeX 用のJFMを生成するいくつかのスクリプトがあります.
+クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX / upLaTeX用のJFMを生成するいくつかのスクリプトがあります.
## インストール
`make`で必要なJFMを生成してください.その後,
@@ -16,6 +16,15 @@
と配置します.`make install`とすると,$TEXMF=$TEXMFHOMEとしてこのコピーを行います.
+## 動作環境
+pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内部で読み込みます.
+
+* (常時):xkeyval,everyhook,filehook,etoolbox,ifthen,lmodern
+* (LuaLaTeX利用時):luatexja,luatexja-adjust
+
+リリース時点での最新版での動作を確認しています.
+
+
## 使い方
通常通り
```latex
@@ -71,6 +80,7 @@
### その他
* ルビや圏点は提供されません.[PXrubrica](https://github.com/zr-tex8r/PXrubrica)または`luatexj…
+* pLaTeX / upLaTeX利用時はそれぞれ`zw`および`zh`に展開されるマクロ`\zw`と`\zh`が定義されます.LuaLaTeX利用時はLuaTeX-ja内で同名のマクロが定義されます.
* 日本語組版処理の要件2.3.2.dによれば,横組みにおける二段組の最後のページの各段の行数は揃えることが望ましいとされていますが,この処理は行われません.`nidanfloat`パッケージを使い,
```latex
@@ -79,10 +89,20 @@
とするとこの処理が行われます.ただし,最終ページでの`\newpage`や`\clearpage`が正しく動作しません.詳しくは`nidanfloat`パッケージのマニュアルをご覧ください.
* フォントを設定する機能は有していません.和文フォントは,LuaLaTeX利用時は`luatexja-fontspec`や`luatexja-prese…
+* 和文間の空白((u)pTeXでは`\kanjiskip`に,LuateX-jaでは`kanjiskip`パラメータに格納されているもの)は,デフォルトでは1/4文字分までの空きを許容した設定になっています.これは日本語組版処理の要件に従ったものですが,TeXでの機能の制限などもあり,場合によってはあまり適切ではない結果を生じることがあります.この値を変更する場合は,`\jlreqkanjiskip`を再定義してください.例えば,
+ ```latex
+ \documentclass{jlreq}
+ \renewcommand{\jlreqkanjiskip}{0pt plus .1\zw minus .01\zw}
+ \begin{document}
+ (本文)
+ \begin{document}
+ ```
+
+ のようにします.
## 各種設計
-設計はクラスオプションまたは`\jlreqsetup`によりkeyval形式で行います.ただし,クラスオプションではLaTeXの実装により,本来可能な入力が受け付けられないがケースあります.多くの場合は空白を除くことにより解決します.
+設計はクラスオプションまたは`\jlreqsetup`によりkeyval形式で行います.ただし,クラスオプションではLaTeXの実装により,本来可能な入力が受け付けられないケースがあります.多くの場合は空白を除くことにより解決します.
以下では次の用法を使います.
@@ -439,7 +459,19 @@
- `zref`パッケージの利用をやめた.
- 新元号を追加.
- バグ修正.
-
+* 2019-05-07
+ - わずかな誤差で行数が減ってしまうのを防ぐために,`\textwidth`と`\textheight`を少しだけ増やした.
+ - `\DeclarePageStyle`内の`running_head_ii`などの実装を変更.
+ - バグ修正
+* 2019-09-24
+ - `\@cite`と`\@biblabel`を再定義していたのをやめた.
+ - 別行見出しの前に`\allowbreak`を追加.
+ - バグ修正.
+* 2020-02-07
+ - `itemization_label_length`のデフォルト値を`\leftmargini`などにした.
+ - `\rmfamily`などの再定義をやめ,`\@rmfamilyhook`などにコードを挿入することにした.
+ - `\parskip`を`0pt`に変更.
+ - バグ修正.
--------------
Noriyuki Abe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/README.md new/doc/latex/jlreq/README.md
--- old/doc/latex/jlreq/README.md 2019-04-01 23:08:48.000000000 +0200
+++ new/doc/latex/jlreq/README.md 2020-02-08 23:16:07.000000000 +0100
@@ -111,7 +111,19 @@
- Stopped to use `zref` package.
- New regnal year.
- Fixed bugs.
-
+* 2019-05-07
+ - Added a small length to `\textwidth` and `\textheight`.
+ - Changed the implementation of `running_head_ii` etc. in `\DeclarePageStyle`.
+ - Fixed bugs.
+* 2019-09-24
+ - Deleted the (re-)definitions of `\@cite` and `\@biblabel`.
+ - Added `\allowbreak` before block headings.
+ - Fixed bugs.
+* 2020-02-07
+ - Changed the default value of `itemization_label_length` to `\leftmargini` etc.
+ - Removed the redefinitions `\rmfamily` etc and added a code to `\@rmfamilyhook`.
+ - Changed `\parskip` to `0pt`.
+ - Fixed bugs.
--------------
Noriyuki Abe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/jlreq-ja.html new/doc/latex/jlreq/jlreq-ja.html
--- old/doc/latex/jlreq/jlreq-ja.html 2019-04-01 23:08:48.000000000 +0200
+++ new/doc/latex/jlreq/jlreq-ja.html 2020-02-08 23:16:07.000000000 +0100
@@ -90,7 +90,7 @@
<h2 id="これは何">これは何?</h2>
<p><a href="https://www.w3.org/TR/jlreq/ja/">日本語組版処理の要件</a>の実装を試みる<a href="https://osdn.jp/projects/luatex-ja/wiki/FrontPage">LuaTeX-ja</a> / pLaTeX / upLaTeX用のクラスファイルと,それに必要なJFMの組み合わせです.</p>
<h2 id="提供されるもの">提供されるもの</h2>
-<p>クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX / upLaTeX 用のJFMを生成するいくつかのスクリプトがあります.</p>
+<p>クラスファイルjlreq.clsと,横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています.また,縦書きのJFMやpLaTeX / upLaTeX用のJFMを生成するいくつかのスクリプトがあります.</p>
<h2 id="インストール">インストール</h2>
<p><code>make</code>で必要なJFMを生成してください.その後,</p>
<ul>
@@ -100,11 +100,18 @@
<li>jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq</li>
</ul>
<p>と配置します.<code>make install</code>とすると,$TEXMF=$TEXMFHOMEとしてこのコピーを行います.</p>
+<h2 id="動作環境">動作環境</h2>
+<p>pLaTeX / upLaTeX / LuaLaTeX上で動きます.以下のパッケージを内部で読み込みます.</p>
+<ul>
+<li>(常時):xkeyval,everyhook,filehook,etoolbox,ifthen,lmodern</li>
+<li>(LuaLaTeX利用時):luatexja,luatexja-adjust</li>
+</ul>
+<p>リリース時点での最新版での動作を確認しています.</p>
<h2 id="使い方">使い方</h2>
<p>通常通り</p>
-<pre class="sourceCode latex" id="cb1"><code class="sourceCode latex"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</a></code></pre>
+<div class="sourceCode" id="cb1"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb1-1"><a href="#cb1-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span></code></pre></div>
<p>とします.これで横書きのarticle相当の文書クラスとなります.エンジンは自動判定されますが,指定する場合はクラスオプションに<code>platex/uplatex/lualatex</code>のいずれかを渡してください.縦書きにするには<code>tate</code>オプションを渡します.また,reportやbook相当の文書クラスとするには,それぞれ<code>report</code>や<code>book</code>オプションを渡します.たとえば,縦書きの本を作成するには</p>
-<pre class="sourceCode latex" id="cb2"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</a></code></pre>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1"></a><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</span></code></pre></div>
<p>とします.</p>
<p>その他,<code>oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn</code>というよくあるオプションを受け付けます.</p>
<p>標準的な文書クラスと同じように中身を書くことができますが,次のような命令が追加 / 拡張されています.なお,本ドキュメントでは<a href="https://www.w3.org/TR/jlreq/ja/">日本語組版処理の要件</a>における用語を断りなく使います.</p>
@@ -117,7 +124,7 @@
<h3 id="sidenote"><code>\sidenote</code></h3>
<p>この命令は傍注の幅が正の時にのみ定義されます.デフォルトの基本版面ではこの幅は0に設定されています.従って<code>\sidenote</code>は定義されません.後の基本版面の設定を参考にしてください.</p>
<p><code>\sidenote</code>は傍注(縦組みの場合は脚注)を出力します.内部では<code>\marginpar</code>を使っています.デフォルトでは<code>\footnote</code>と同様の書式となりますが,<code>\jlreqsetup</code>で<code>sidenote_type=symbol</code>が指定されている場合,その書式は<code>\sidenote{該当項目}{注}</code>となります.たとえば</p>
-<pre class="sourceCode latex" id="cb3"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1">刊行できる<span class="fu">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である.</a></code></pre>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1"></a>刊行できる<span class="fu">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である.</span></code></pre></div>
<p>とします.後の説明も参照してください.</p>
<h3 id="endnote"><code>\endnote</code></h3>
<p>後注を指定します.<code>\footnote</code>と同様の書式です.デフォルトでは,注自身の出力は見出し直前に行われます.この動作は<code>\jlreqsetup</code>に<code>endnote_position</code>を渡すことで制御できます.詳しくは後の注関係の説明をご覧ください.また<code>\theendnotes</code>を実行するとその場に出力をします.</p>
@@ -135,13 +142,21 @@
<h3 id="その他">その他</h3>
<ul>
<li><p>ルビや圏点は提供されません.<a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>または<code>luatexja-ruby</code>(LuaLaTeX,LuaTeX-jaパッケージに付属)を使うと良いかと思います.</p></li>
+<li><p>pLaTeX / upLaTeX利用時はそれぞれ<code>zw</code>および<code>zh</code>に展開されるマクロ<code>\zw</code>と<code>\zh</code>が定義されます.LuaLaTeX利用時はLuaTeX-ja内で同名のマクロが定義されます.</p></li>
<li><p>日本語組版処理の要件2.3.2.dによれば,横組みにおける二段組の最後のページの各段の行数は揃えることが望ましいとされていますが,この処理は行われません.<code>nidanfloat</code>パッケージを使い,</p>
-<pre class="sourceCode latex" id="cb5"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</a></code></pre>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1"></a><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</span></code></pre></div>
<p>とするとこの処理が行われます.ただし,最終ページでの<code>\newpage</code>や<code>\clearpage</code>が正しく動作しません.詳しくは<code>nidanfloat</code>パッケージのマニュアルをご覧ください.</p></li>
<li><p>フォントを設定する機能は有していません.和文フォントは,LuaLaTeX利用時は<code>luatexja-fontspec</code>や<code>luatexja-preset</code>(いずれもLuaTeX-jaパッケージに付属)により設定することができます.dvipdfmxを使う場合は,<a href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>での設定が可能です.</p></li>
+<li><p>和文間の空白((u)pTeXでは<code>\kanjiskip</code>に,LuateX-jaでは<code>kanjiskip</code>パラメータに格納されているもの)は,デフォルトでは1/4文字分までの空きを許容した設定になっています.これは日本語組版処理の要件に従ったものですが,TeXでの機能の制限などもあり,場合によってはあまり適切ではない結果を生じることがあります.この値を変更する場合は,<code>\jlreqkanjiskip</code>を再定義してください.例えば,</p>
+<div class="sourceCode" id="cb6"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb6-1"><a href="#cb6-1"></a><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</span>
+<span id="cb6-2"><a href="#cb6-2"></a><span class="fu">\renewcommand</span>{<span class="ex">\jlreqkanjiskip</span>}{0pt plus .1<span class="fu">\zw</span> minus .01<span class="fu">\zw</span>}</span>
+<span id="cb6-3"><a href="#cb6-3"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span>
+<span id="cb6-4"><a href="#cb6-4"></a>(本文)</span>
+<span id="cb6-5"><a href="#cb6-5"></a><span class="kw">\begin</span>{<span class="ex">document</span>}</span></code></pre></div>
+<p>のようにします.</p></li>
</ul>
<h2 id="各種設計">各種設計</h2>
-<p>設計はクラスオプションまたは<code>\jlreqsetup</code>によりkeyval形式で行います.ただし,クラスオプションではLaTeXの実装により,本来可能な入力が受け付けられないがケースあります.多くの場合は空白を除くことにより解決します.</p>
+<p>設計はクラスオプションまたは<code>\jlreqsetup</code>によりkeyval形式で行います.ただし,クラスオプションではLaTeXの実装により,本来可能な入力が受け付けられないケースがあります.多くの場合は空白を除くことにより解決します.</p>
<p>以下では次の用法を使います.</p>
<ul>
<li><code>[A/B]</code>:AまたはBです.<code>[A/B/C]</code>等も同様.</li>
@@ -305,10 +320,10 @@
</ul>
<h4 id="連続して掲げる見出しの行取り">連続して掲げる見出しの行取り</h4>
<p><code>\SetBlockHeadingSpaces</code>により,見出しが連続して掲げられたときの行取りを設定することができます.<code>\SetBlockHeadingSpaces</code>は</p>
-<pre class="sourceCode latex" id="cb7"><code class="sourceCode latex"><a class="sourceLine" id="cb7-1" data-line-number="1"><span class="fu">\SetBlockHeadingSpaces</span>{</a>
-<a class="sourceLine" id="cb7-2" data-line-number="2"> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</a>
-<a class="sourceLine" id="cb7-3" data-line-number="3"> [lines=5]{_section,23pt,_subsection,16pt}</a>
-<a class="sourceLine" id="cb7-4" data-line-number="4">}</a></code></pre>
+<div class="sourceCode" id="cb8"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb8-1"><a href="#cb8-1"></a><span class="fu">\SetBlockHeadingSpaces</span>{</span>
+<span id="cb8-2"><a href="#cb8-2"></a> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</span>
+<span id="cb8-3"><a href="#cb8-3"></a> [lines=5]{_section,23pt,_subsection,16pt}</span>
+<span id="cb8-4"><a href="#cb8-4"></a>}</span></code></pre></div>
<p>のように使います.この意味は次の通りです.</p>
<ul>
<li><code>\part</code>,<code>\section</code>,<code>\subsection</code>という順番で見出しが掲げられていて,その前後が見出しでない場合は,<code>\part</code>は三行取り+前に一行空き,<code>\section</code>と<code>\subsection</code>は二行取りとなります.</li>
@@ -343,14 +358,14 @@
</ul>
<h3 id="modifyheading"><code>\ModifyHeading</code></h3>
<p>既に(上のどれかを使い)定義された見出し命令の設定を変更します.たとえば</p>
-<pre class="sourceCode latex" id="cb8"><code class="sourceCode latex"><a class="sourceLine" id="cb8-1" data-line-number="1"><span class="fu">\ModifyHeading</span>{section}{lines=10}</a></code></pre>
+<div class="sourceCode" id="cb9"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb9-1"><a href="#cb9-1"></a><span class="fu">\ModifyHeading</span>{section}{lines=10}</span></code></pre></div>
<p>とすると,<code>\section</code>のフォントなどの設定はそのままに,行取りのみが10行に変更されます.見出しの種類を変更することはできません.</p>
<h3 id="saveheading"><code>\SaveHeading</code></h3>
<p>見出し命令の定義を待避します.</p>
-<pre class="sourceCode latex" id="cb9"><code class="sourceCode latex"><a class="sourceLine" id="cb9-1" data-line-number="1"><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避.</span></a>
-<a class="sourceLine" id="cb9-2" data-line-number="2"><span class="fu">\RenewBlockHeading</span>{section}{1}{font=……} <span class="co">% \sectionを新しく定義する.</span></a>
-<a class="sourceLine" id="cb9-3" data-line-number="3">……</a>
-<a class="sourceLine" id="cb9-4" data-line-number="4"><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す.</span></a></code></pre>
+<div class="sourceCode" id="cb10"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb10-1"><a href="#cb10-1"></a><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避.</span></span>
+<span id="cb10-2"><a href="#cb10-2"></a><span class="fu">\RenewBlockHeading</span>{section}{1}{font=……} <span class="co">% \sectionを新しく定義する.</span></span>
+<span id="cb10-3"><a href="#cb10-3"></a>……</span>
+<span id="cb10-4"><a href="#cb10-4"></a><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す.</span></span></code></pre></div>
<p>のように使います.</p>
<h2 id="ページスタイル">ページスタイル</h2>
<pre><code>\NewPageStyle{<ページスタイル名>}{<設定>}
@@ -398,7 +413,7 @@
<li>クラスオプション<code>jlreq_notes</code>が渡されると,日本語組版処理の記述と矛盾する設定が行われた場合に通知がされます.</li>
</ul>
<h2 id="ライセンス">ライセンス</h2>
-<p>このパッケージは二条項BSDライセンスの元で配布されています.詳しくは<a href="LICENSE" class="uri">LICENSE</a>をご覧ください.</p>
+<p>このパッケージは二条項BSDライセンスの元で配布されています.詳しくは<a href="LICENSE">LICENSE</a>をご覧ください.</p>
<h2 id="履歴">履歴</h2>
<ul>
<li>2017-02-08
@@ -536,9 +551,28 @@
<li>新元号を追加.</li>
<li>バグ修正.</li>
</ul></li>
+<li>2019-05-07
+<ul>
+<li>わずかな誤差で行数が減ってしまうのを防ぐために,<code>\textwidth</code>と<code>\textheight</code>を少しだけ増やした.</li>
+<li><code>\DeclarePageStyle</code>内の<code>running_head_ii</code>などの実装を変更.</li>
+<li>バグ修正</li>
+</ul></li>
+<li>2019-09-24
+<ul>
+<li><code>\@cite</code>と<code>\@biblabel</code>を再定義していたのをやめた.</li>
+<li>別行見出しの前に<code>\allowbreak</code>を追加.</li>
+<li>バグ修正.</li>
+</ul></li>
+<li>2020-02-07
+<ul>
+<li><code>itemization_label_length</code>のデフォルト値を<code>\leftmargini</code>などにした.</li>
+<li><code>\rmfamily</code>などの再定義をやめ,<code>\@rmfamilyhook</code>などにコードを挿入することにした.</li>
+<li><code>\parskip</code>を<code>0pt</code>に変更.</li>
+<li>バグ修正.</li>
+</ul></li>
</ul>
<hr />
-<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq" class="uri">https://github.com/abenori/jlreq</a></p>
+<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
</body>
</html>
Binary files old/doc/latex/jlreq/jlreq-ja.pdf and new/doc/latex/jlreq/jlreq-ja.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/jlreq-trimmarks-ja.html new/doc/latex/jlreq/jlreq-trimmarks-ja.html
--- old/doc/latex/jlreq/jlreq-trimmarks-ja.html 2019-04-01 23:08:48.000000000 +0200
+++ new/doc/latex/jlreq/jlreq-trimmarks-ja.html 2020-02-08 23:16:07.000000000 +0100
@@ -136,60 +136,60 @@
</ul>
<h3 id="bleed_margin"><code>bleed_margin</code></h3>
<p>仕上がりと裁ち落としの間(ドブ)の長さを指定します.次のようにすると,上下左右を独立に変更できます.</p>
-<pre class="sourceCode latex" id="cb2"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</a></code></pre>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1"></a><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</span></code></pre></div>
<h2 id="jlreqtrimmarkssetup"><code>\jlreqtrimmarkssetup</code></h2>
<p>パッケージオプションで指定できない設定を行えます.keyval形式です.</p>
<h3 id="banner"><code>banner</code></h3>
<p><code>show=banner</code>時に出力される文字列.通常は左上に出力されますが,四つ角および上下左右の中心に出力することもできます.指定は</p>
-<pre class="sourceCode latex" id="cb3"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
-<a class="sourceLine" id="cb3-2" data-line-number="2"> banner={</a>
-<a class="sourceLine" id="cb3-3" data-line-number="3"> <場所(上下,左右中央)>={</a>
-<a class="sourceLine" id="cb3-4" data-line-number="4"> <細かな位置>={</a>
-<a class="sourceLine" id="cb3-5" data-line-number="5"> <ページ数の偶奇に応じて>={</a>
-<a class="sourceLine" id="cb3-6" data-line-number="6"> <表示項目></a>
-<a class="sourceLine" id="cb3-7" data-line-number="7"> }</a>
-<a class="sourceLine" id="cb3-8" data-line-number="8"> }</a>
-<a class="sourceLine" id="cb3-9" data-line-number="9"> }</a>
-<a class="sourceLine" id="cb3-10" data-line-number="10"> }</a>
-<a class="sourceLine" id="cb3-11" data-line-number="11">}</a></code></pre>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb3-2"><a href="#cb3-2"></a> banner={</span>
+<span id="cb3-3"><a href="#cb3-3"></a> <場所(上下,左右中央)>={</span>
+<span id="cb3-4"><a href="#cb3-4"></a> <細かな位置>={</span>
+<span id="cb3-5"><a href="#cb3-5"></a> <ページ数の偶奇に応じて>={</span>
+<span id="cb3-6"><a href="#cb3-6"></a> <表示項目></span>
+<span id="cb3-7"><a href="#cb3-7"></a> }</span>
+<span id="cb3-8"><a href="#cb3-8"></a> }</span>
+<span id="cb3-9"><a href="#cb3-9"></a> }</span>
+<span id="cb3-10"><a href="#cb3-10"></a> }</span>
+<span id="cb3-11"><a href="#cb3-11"></a>}</span></code></pre></div>
<p>のようになります.キー名は省略することもできます.例えば次のように指定します.</p>
-<pre class="sourceCode latex" id="cb4"><code class="sourceCode latex"><a class="sourceLine" id="cb4-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
-<a class="sourceLine" id="cb4-2" data-line-number="2"> banner={</a>
-<a class="sourceLine" id="cb4-3" data-line-number="3"> top-right={</a>
-<a class="sourceLine" id="cb4-4" data-line-number="4"> tate={</a>
-<a class="sourceLine" id="cb4-5" data-line-number="5"> odd={奇数ページの右上に縦書きで表示},</a>
-<a class="sourceLine" id="cb4-6" data-line-number="6"> even={偶数ページの右上に縦書きで表示},</a>
-<a class="sourceLine" id="cb4-7" data-line-number="7"> },</a>
-<a class="sourceLine" id="cb4-8" data-line-number="8"> yoko={右上に横書きで表示}, <span class="co">% ページの偶奇によらず共通</span></a>
-<a class="sourceLine" id="cb4-9" data-line-number="9"> corner={右上角に横書きで表示},</a>
-<a class="sourceLine" id="cb4-10" data-line-number="10"> in-yoko={右上版面内に横書きで表示},</a>
-<a class="sourceLine" id="cb4-11" data-line-number="11"> in-tate={右上版面内に縦書きで表示},</a>
-<a class="sourceLine" id="cb4-12" data-line-number="12"> },</a>
-<a class="sourceLine" id="cb4-13" data-line-number="13"> bottom-center={</a>
-<a class="sourceLine" id="cb4-14" data-line-number="14"> left={中央下の左に表示}, <span class="co">% odd=, even=も使用可能</span></a>
-<a class="sourceLine" id="cb4-15" data-line-number="15"> right={中央下の右に表示},</a>
-<a class="sourceLine" id="cb4-16" data-line-number="16"> in={中央下の版面内に表示},</a>
-<a class="sourceLine" id="cb4-17" data-line-number="17"> },</a>
-<a class="sourceLine" id="cb4-18" data-line-number="18"> center-gutter={</a>
-<a class="sourceLine" id="cb4-19" data-line-number="19"> above={ノド側中央の上側に表示},</a>
-<a class="sourceLine" id="cb4-20" data-line-number="20"> below={ノド側中央の下側に表示},</a>
-<a class="sourceLine" id="cb4-21" data-line-number="21"> },</a>
-<a class="sourceLine" id="cb4-22" data-line-number="22"> }</a>
-<a class="sourceLine" id="cb4-23" data-line-number="23">}</a></code></pre>
+<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb4-2"><a href="#cb4-2"></a> banner={</span>
+<span id="cb4-3"><a href="#cb4-3"></a> top-right={</span>
+<span id="cb4-4"><a href="#cb4-4"></a> tate={</span>
+<span id="cb4-5"><a href="#cb4-5"></a> odd={奇数ページの右上に縦書きで表示},</span>
+<span id="cb4-6"><a href="#cb4-6"></a> even={偶数ページの右上に縦書きで表示},</span>
+<span id="cb4-7"><a href="#cb4-7"></a> },</span>
+<span id="cb4-8"><a href="#cb4-8"></a> yoko={右上に横書きで表示}, <span class="co">% ページの偶奇によらず共通</span></span>
+<span id="cb4-9"><a href="#cb4-9"></a> corner={右上角に横書きで表示},</span>
+<span id="cb4-10"><a href="#cb4-10"></a> in-yoko={右上版面内に横書きで表示},</span>
+<span id="cb4-11"><a href="#cb4-11"></a> in-tate={右上版面内に縦書きで表示},</span>
+<span id="cb4-12"><a href="#cb4-12"></a> },</span>
+<span id="cb4-13"><a href="#cb4-13"></a> bottom-center={</span>
+<span id="cb4-14"><a href="#cb4-14"></a> left={中央下の左に表示}, <span class="co">% odd=, even=も使用可能</span></span>
+<span id="cb4-15"><a href="#cb4-15"></a> right={中央下の右に表示},</span>
+<span id="cb4-16"><a href="#cb4-16"></a> in={中央下の版面内に表示},</span>
+<span id="cb4-17"><a href="#cb4-17"></a> },</span>
+<span id="cb4-18"><a href="#cb4-18"></a> center-gutter={</span>
+<span id="cb4-19"><a href="#cb4-19"></a> above={ノド側中央の上側に表示},</span>
+<span id="cb4-20"><a href="#cb4-20"></a> below={ノド側中央の下側に表示},</span>
+<span id="cb4-21"><a href="#cb4-21"></a> },</span>
+<span id="cb4-22"><a href="#cb4-22"></a> }</span>
+<span id="cb4-23"><a href="#cb4-23"></a>}</span></code></pre></div>
<p>場所は<code>top/bottom/center</code>と<code>left/right/center/gutter/fore-edge</code>の可能な組み合わせが指定可能です.各項目に<code>\thepage</code>を指定するとページ数を出力できます.</p>
<p>次のような指定も可能です.</p>
-<pre class="sourceCode latex" id="cb5"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
-<a class="sourceLine" id="cb5-2" data-line-number="2"> banner={</a>
-<a class="sourceLine" id="cb5-3" data-line-number="3"> tate={左上に縦書き}, <span class="co">% 場所が省略されるとtop-leftと見なされる.</span></a>
-<a class="sourceLine" id="cb5-4" data-line-number="4"> odd={左上奇数ページ}, <span class="co">% 省略されたのでyokoと見なされる.</span></a>
-<a class="sourceLine" id="cb5-5" data-line-number="5"> top-right={</a>
-<a class="sourceLine" id="cb5-6" data-line-number="6"> odd={右上奇数ページ} <span class="co">% ここもyokoが省略されている.</span></a>
-<a class="sourceLine" id="cb5-7" data-line-number="7"> }</a>
-<a class="sourceLine" id="cb5-8" data-line-number="8"> }</a>
-<a class="sourceLine" id="cb5-9" data-line-number="9">}</a></code></pre>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb5-2"><a href="#cb5-2"></a> banner={</span>
+<span id="cb5-3"><a href="#cb5-3"></a> tate={左上に縦書き}, <span class="co">% 場所が省略されるとtop-leftと見なされる.</span></span>
+<span id="cb5-4"><a href="#cb5-4"></a> odd={左上奇数ページ}, <span class="co">% 省略されたのでyokoと見なされる.</span></span>
+<span id="cb5-5"><a href="#cb5-5"></a> top-right={</span>
+<span id="cb5-6"><a href="#cb5-6"></a> odd={右上奇数ページ} <span class="co">% ここもyokoが省略されている.</span></span>
+<span id="cb5-7"><a href="#cb5-7"></a> }</span>
+<span id="cb5-8"><a href="#cb5-8"></a> }</span>
+<span id="cb5-9"><a href="#cb5-9"></a>}</span></code></pre></div>
<h3 id="trimmarks_width"><code>trimmarks_width</code></h3>
<p>トンボ自身の太さを指定します.</p>
-<h3 id="color"><code>color</code></h3>
+<h3 id="-color"><code> color</code></h3>
<p>トンボの色.この機能を利用するには,あらかじめ<code>\color</code>を定義するパッケージ(<code>color</code>パッケージまたはその派生)を読み込んでおく必要があります.ここでの指定は次のようにして<code>\color</code>命令に変換されます.</p>
<ul>
<li><p><code>cy</code>や<code>myk</code>のように<code>cmyk</code>という文字列の一部の場合は,<code>cmyk</code>で指定された色のみの色になります.例えば<code>color=cy</code>は<code>\color[cmyk]{1,0,1,0}</code>となります.</p></li>
@@ -200,7 +200,7 @@
</ul></li>
</ul>
<h2 id="ライセンス">ライセンス</h2>
-<p>このパッケージは二条項BSDライセンスの元で配布されています.詳しくは<a href="LICENSE" class="uri">LICENSE</a>をご覧ください.</p>
+<p>このパッケージは二条項BSDライセンスの元で配布されています.詳しくは<a href="LICENSE">LICENSE</a>をご覧ください.</p>
<h2 id="履歴">履歴</h2>
<ul>
<li>2018-05-19
@@ -233,7 +233,7 @@
</ul></li>
</ul>
<hr />
-<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq" class="uri">https://github.com/abenori/jlreq</a></p>
+<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/jlreq-trimmarks.html new/doc/latex/jlreq/jlreq-trimmarks.html
--- old/doc/latex/jlreq/jlreq-trimmarks.html 2019-04-01 23:08:48.000000000 +0200
+++ new/doc/latex/jlreq/jlreq-trimmarks.html 2020-02-08 23:16:07.000000000 +0100
@@ -135,56 +135,56 @@
</ul>
<h3 id="bleed_margin"><code>bleed_margin</code></h3>
<p>Set the bleed margin. You can also specify as follows.</p>
-<pre class="sourceCode latex" id="cb2"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</a></code></pre>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb2-1"><a href="#cb2-1"></a><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</span></code></pre></div>
<h2 id="jlreqtrimmarkssetup"><code>\jlreqtrimmarkssetup</code></h2>
<p>Set the additional settings with the keyval style.</p>
<h3 id="banner"><code>banner</code></h3>
<p>The things which the package outputs when <code>show=banner</code> is specified in the package option. Normally it is showed in the left of the top. You can also put them in many places with</p>
-<pre class="sourceCode latex" id="cb3"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
-<a class="sourceLine" id="cb3-2" data-line-number="2"> banner={</a>
-<a class="sourceLine" id="cb3-3" data-line-number="3"> <Position (top/bottom, left/right, center)>={</a>
-<a class="sourceLine" id="cb3-4" data-line-number="4"> <more precise position>={</a>
-<a class="sourceLine" id="cb3-5" data-line-number="5"> <odd/even>={</a>
-<a class="sourceLine" id="cb3-6" data-line-number="6"> <content></a>
-<a class="sourceLine" id="cb3-7" data-line-number="7"> }</a>
-<a class="sourceLine" id="cb3-8" data-line-number="8"> }</a>
-<a class="sourceLine" id="cb3-9" data-line-number="9"> }</a>
-<a class="sourceLine" id="cb3-10" data-line-number="10"> }</a>
-<a class="sourceLine" id="cb3-11" data-line-number="11">}</a></code></pre>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb3-1"><a href="#cb3-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb3-2"><a href="#cb3-2"></a> banner={</span>
+<span id="cb3-3"><a href="#cb3-3"></a> <Position (top/bottom, left/right, center)>={</span>
+<span id="cb3-4"><a href="#cb3-4"></a> <more precise position>={</span>
+<span id="cb3-5"><a href="#cb3-5"></a> <odd/even>={</span>
+<span id="cb3-6"><a href="#cb3-6"></a> <content></span>
+<span id="cb3-7"><a href="#cb3-7"></a> }</span>
+<span id="cb3-8"><a href="#cb3-8"></a> }</span>
+<span id="cb3-9"><a href="#cb3-9"></a> }</span>
+<span id="cb3-10"><a href="#cb3-10"></a> }</span>
+<span id="cb3-11"><a href="#cb3-11"></a>}</span></code></pre></div>
<p>Here is an example.</p>
-<pre class="sourceCode latex" id="cb4"><code class="sourceCode latex"><a class="sourceLine" id="cb4-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
-<a class="sourceLine" id="cb4-2" data-line-number="2"> banner={</a>
-<a class="sourceLine" id="cb4-3" data-line-number="3"> top-right={</a>
-<a class="sourceLine" id="cb4-4" data-line-number="4"> vertical={</a>
-<a class="sourceLine" id="cb4-5" data-line-number="5"> odd={In the right of the top, only in odd pages, vertical mode.},</a>
-<a class="sourceLine" id="cb4-6" data-line-number="6"> even={In the right of the top, only in even pages, vertical mode.},</a>
-<a class="sourceLine" id="cb4-7" data-line-number="7"> },</a>
-<a class="sourceLine" id="cb4-8" data-line-number="8"> horizontal={In the right of the top, horizontal mode.}, <span class="co">% does not depend on the parity of the page number</span></a>
-<a class="sourceLine" id="cb4-9" data-line-number="9"> corner={In the corner of the right of the top, horizontal mode.},</a>
-<a class="sourceLine" id="cb4-10" data-line-number="10"> in-horizontal={In the right of the top, horizontal mode, in the trim area.},</a>
-<a class="sourceLine" id="cb4-11" data-line-number="11"> in-vertical={In the right of the top, vertical mode, in the trim area.},</a>
-<a class="sourceLine" id="cb4-12" data-line-number="12"> },</a>
-<a class="sourceLine" id="cb4-13" data-line-number="13"> bottom-center={</a>
-<a class="sourceLine" id="cb4-14" data-line-number="14"> left={In the left in the center of the bottom}, <span class="co">% odd=, even= is also available</span></a>
-<a class="sourceLine" id="cb4-15" data-line-number="15"> right={In the right in the center of the bottom},</a>
-<a class="sourceLine" id="cb4-16" data-line-number="16"> in={In the trim area in the center of the bottom.},</a>
-<a class="sourceLine" id="cb4-17" data-line-number="17"> }</a>
-<a class="sourceLine" id="cb4-18" data-line-number="18"> }</a>
-<a class="sourceLine" id="cb4-19" data-line-number="19">}</a></code></pre>
+<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb4-1"><a href="#cb4-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb4-2"><a href="#cb4-2"></a> banner={</span>
+<span id="cb4-3"><a href="#cb4-3"></a> top-right={</span>
+<span id="cb4-4"><a href="#cb4-4"></a> vertical={</span>
+<span id="cb4-5"><a href="#cb4-5"></a> odd={In the right of the top, only in odd pages, vertical mode.},</span>
+<span id="cb4-6"><a href="#cb4-6"></a> even={In the right of the top, only in even pages, vertical mode.},</span>
+<span id="cb4-7"><a href="#cb4-7"></a> },</span>
+<span id="cb4-8"><a href="#cb4-8"></a> horizontal={In the right of the top, horizontal mode.}, <span class="co">% does not depend on the parity of the page number</span></span>
+<span id="cb4-9"><a href="#cb4-9"></a> corner={In the corner of the right of the top, horizontal mode.},</span>
+<span id="cb4-10"><a href="#cb4-10"></a> in-horizontal={In the right of the top, horizontal mode, in the trim area.},</span>
+<span id="cb4-11"><a href="#cb4-11"></a> in-vertical={In the right of the top, vertical mode, in the trim area.},</span>
+<span id="cb4-12"><a href="#cb4-12"></a> },</span>
+<span id="cb4-13"><a href="#cb4-13"></a> bottom-center={</span>
+<span id="cb4-14"><a href="#cb4-14"></a> left={In the left in the center of the bottom}, <span class="co">% odd=, even= is also available</span></span>
+<span id="cb4-15"><a href="#cb4-15"></a> right={In the right in the center of the bottom},</span>
+<span id="cb4-16"><a href="#cb4-16"></a> in={In the trim area in the center of the bottom.},</span>
+<span id="cb4-17"><a href="#cb4-17"></a> }</span>
+<span id="cb4-18"><a href="#cb4-18"></a> }</span>
+<span id="cb4-19"><a href="#cb4-19"></a>}</span></code></pre></div>
<p>A possible combination of <code>top/bottom/center</code> and <code>left/right/center/gutter/fore-edge</code> can be used for the position. You can use <code>\thepage</code> to output the number of the page.</p>
<p>The keys can be ommited. For example:</p>
-<pre class="sourceCode latex" id="cb5"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
-<a class="sourceLine" id="cb5-2" data-line-number="2"> banner={</a>
-<a class="sourceLine" id="cb5-3" data-line-number="3"> vertical={Vertical mode, in the top of the left},</a>
-<a class="sourceLine" id="cb5-4" data-line-number="4"> odd={In the top of the left, only in odd pages.}, <span class="co">% regarded as `horizontal`</span></a>
-<a class="sourceLine" id="cb5-5" data-line-number="5"> top-right={</a>
-<a class="sourceLine" id="cb5-6" data-line-number="6"> odd={In the top of the right, only in odd pages, horizontal mode.}</a>
-<a class="sourceLine" id="cb5-7" data-line-number="7"> }</a>
-<a class="sourceLine" id="cb5-8" data-line-number="8"> }</a>
-<a class="sourceLine" id="cb5-9" data-line-number="9">}</a></code></pre>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><span id="cb5-1"><a href="#cb5-1"></a><span class="fu">\jlreqtrimmarkssetup</span>{</span>
+<span id="cb5-2"><a href="#cb5-2"></a> banner={</span>
+<span id="cb5-3"><a href="#cb5-3"></a> vertical={Vertical mode, in the top of the left},</span>
+<span id="cb5-4"><a href="#cb5-4"></a> odd={In the top of the left, only in odd pages.}, <span class="co">% regarded as `horizontal`</span></span>
+<span id="cb5-5"><a href="#cb5-5"></a> top-right={</span>
+<span id="cb5-6"><a href="#cb5-6"></a> odd={In the top of the right, only in odd pages, horizontal mode.}</span>
+<span id="cb5-7"><a href="#cb5-7"></a> }</span>
+<span id="cb5-8"><a href="#cb5-8"></a> }</span>
+<span id="cb5-9"><a href="#cb5-9"></a>}</span></code></pre></div>
<h3 id="trimmarks_width"><code>trimmarks_width</code></h3>
<p>Set the width of trim marks.</p>
-<h3 id="color"><code>color</code></h3>
+<h3 id="-color"><code> color</code></h3>
<p>Set the color of the trim marks. You have to load a package which defines <code>\color</code> (`color' package or its variant) before loading this package to use this function. Here are some examples of specifying the color.</p>
<ul>
<li><code>color=c</code> -> <code>\color[cmyk]{1,0,0,0}</code></li>
@@ -193,7 +193,7 @@
<li><code>[cmyk]0.5,0.5,0.5,0</code> -> <code>\color[cmyk]{0.5,0.5,0.5,0}</code></li>
</ul>
<h2 id="license">LICENSE</h2>
-<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE" class="uri">LICENSE</a>.</p>
+<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE">LICENSE</a>.</p>
<h2 id="changelog">CHANGELOG</h2>
<ul>
<li>2018-05-19
@@ -226,7 +226,7 @@
</ul></li>
</ul>
<hr />
-<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq" class="uri">https://github.com/abenori/jlreq</a></p>
+<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jlreq/jlreq.html new/doc/latex/jlreq/jlreq.html
--- old/doc/latex/jlreq/jlreq.html 2019-04-01 23:08:48.000000000 +0200
+++ new/doc/latex/jlreq/jlreq.html 2020-02-08 23:16:07.000000000 +0100
@@ -69,9 +69,9 @@
</ul>
<p>The other way to install is just to run <code>make install</code>. It will install all files in <code>$TEXMFHOME</code>.</p>
<h2 id="usage">Usage</h2>
-<p>See <a href="jlreq-ja.html" class="uri">jlreq-ja.html</a> (in Japanese).</p>
+<p>See <a href="jlreq-ja.html">jlreq-ja.html</a> (in Japanese).</p>
<h2 id="license">LICENSE</h2>
-<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE" class="uri">LICENSE</a>.</p>
+<p>This package is distributed under the BSD 2-Clause License. See <a href="LICENSE">LICENSE</a>.</p>
<h2 id="changelog">CHANGELOG</h2>
<ul>
<li>2017-02-08
@@ -209,9 +209,28 @@
<li>New regnal year.</li>
<li>Fixed bugs.</li>
</ul></li>
+<li>2019-05-07
+<ul>
+<li>Added a small length to <code>\textwidth</code> and <code>\textheight</code>.</li>
+<li>Changed the implementation of <code>running_head_ii</code> etc. in <code>\DeclarePageStyle</code>.</li>
+<li>Fixed bugs.</li>
+</ul></li>
+<li>2019-09-24
+<ul>
+<li>Deleted the (re-)definitions of <code>\@cite</code> and <code>\@biblabel</code>.</li>
+<li>Added <code>\allowbreak</code> before block headings.</li>
+<li>Fixed bugs.</li>
+</ul></li>
+<li>2020-02-07
+<ul>
+<li>Changed the default value of <code>itemization_label_length</code> to <code>\leftmargini</code> etc.</li>
+<li>Removed the redefinitions <code>\rmfamily</code> etc and added a code to <code>\@rmfamilyhook</code>.</li>
+<li>Changed <code>\parskip</code> to <code>0pt</code>.</li>
+<li>Fixed bugs.</li>
+</ul></li>
</ul>
<hr />
-<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq" class="uri">https://github.com/abenori/jlreq</a></p>
+<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>
</article>
</body>
</html>
Binary files old/doc/latex/jlreq/jlreq.pdf and new/doc/latex/jlreq/jlreq.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jlreq.doc.tlpobj new/tlpkg/tlpobj/jlreq.doc.tlpobj
--- old/tlpkg/tlpobj/jlreq.doc.tlpobj 2019-04-02 01:24:45.000000000 +0200
+++ new/tlpkg/tlpobj/jlreq.doc.tlpobj 2020-02-09 01:54:35.000000000 +0100
@@ -1,15 +1,17 @@
name jlreq.doc
category Package
-revision 50697
+revision 53717
shortdesc doc files of jlreq
relocated 1
-docfiles size=40
+docfiles size=158
RELOC/doc/latex/jlreq/LICENSE
RELOC/doc/latex/jlreq/README-ja.md
RELOC/doc/latex/jlreq/README.md
RELOC/doc/latex/jlreq/jlreq-ja.html
+ RELOC/doc/latex/jlreq/jlreq-ja.pdf
RELOC/doc/latex/jlreq/jlreq-trimmarks-ja.html
RELOC/doc/latex/jlreq/jlreq-trimmarks-ja.md
RELOC/doc/latex/jlreq/jlreq-trimmarks.html
RELOC/doc/latex/jlreq/jlreq-trimmarks.md
RELOC/doc/latex/jlreq/jlreq.html
+ RELOC/doc/latex/jlreq/jlreq.pdf
++++++ jlreq.tar.xz ++++++
++++ 1909 lines of diff (skipped)
++++++ jmlr.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/CHANGES new/doc/latex/jmlr/CHANGES
--- old/doc/latex/jmlr/CHANGES 2017-08-01 23:39:04.000000000 +0200
+++ new/doc/latex/jmlr/CHANGES 2020-03-26 22:29:05.000000000 +0100
@@ -1,18 +1,45 @@
-v1.24:
+v1.27 (2020-03-26):
+
+ * jmlrutils.sty:
+
+ Bug fix: subfigure and subtable references were producing
+ extraneous text (added check for LaTeX kernel version)
+
+v1.26 (2020-01-31):
+
+ * jmlr.cls:
+
+ - removed \vbox from \@jmlrmaketitle to allow for extremely long
+ author/affiliation list. Added \ignorespaces before \@author
+ to allow for spacing the contents in the code for clarity
+ at the start of a long author list.
+
+v1.25 (2020-01-17):
+
+ * jmlr.cls:
+
+ - Added check for graphics.sty 2019/07/01 (which now detokenizes
+ filename)
+
+ * jmlrutils.sty:
+
+ - Added \proofname
+
+v1.24 (2017-08-01):
* moved non-class related code into new package jmlrutils.sty
* fixed bug in \includeteximage
-v1.23:
+v1.23 (2017-03-09):
* added pmlr class option
-v1.22:
+v1.22 (2015-04-11):
* added oneside and twoside class options
-v1.21:
+v1.21 (2015-02-24):
* jmlr.cls
@@ -25,19 +52,19 @@
- added \nopagebreak after \@editorialteam
-v1.20:
+v1.20 (2014-10-15):
* jmlrbook.cls
- added \jmlrprefaceheader, \jmlrlocation
-v1.19:
+v1.19 (2014-09-29):
* jmlrbook.cls
- changed \chapter* to \chapter in preface environment
-v1.18:
+v1.18 (2013-10-17):
* jmlrbook.cls
@@ -58,7 +85,7 @@
- Added \theorembodyfont, \theoremheaderfont, \theorempostheader
and \theoremsep
-v1.17:
+v1.17 (2012-05-30):
* jmlr.cls
@@ -79,7 +106,7 @@
- added optional argument to \logo
-v1.16:
+v1.16 (2012-05-15):
* jmlr.cls
@@ -89,7 +116,7 @@
- added code to deal with \c@lenddoca clash
-v1.15:
+v1.15 (2012-05-12):
* jmlrbook.cls
@@ -102,7 +129,7 @@
- added \markleft
-v1.14:
+v1.14 (2012-04-24):
* jmlrbook.cls
@@ -110,7 +137,7 @@
information to aux file
- fixed bug in fetching time zone information
-v1.13:
+v1.13 (2012-02-25):
* jmlrbook.cls
@@ -122,7 +149,7 @@
- added \@pre@hyperref hook
-v1.12:
+v1.12 (2012-01-05):
* jmlr.cls
@@ -163,7 +190,7 @@
- added debugging option --noexecute
-v1.11:
+v1.11 (2011-03-24):
* jmlr.cls
@@ -193,7 +220,7 @@
- abstract html source files now input original aux files to allow
for citations.
-v1.10:
+v1.10 (2011-01-05):
jmlr.cls
@@ -236,7 +263,7 @@
* added time stamp at the end of each of the generated html file.
-v1.09:
+v1.09 (2010-12-01):
jmlr.cls
@@ -265,16 +292,16 @@
* Added \label to \jmlrmaketitlehook
-v1.08:
+v1.08 (2010-07-27):
* Fixed \thanks so that the footnote symbol is raised and isn't
followed by a full stop.
-v1.07:
+v1.07 (2010-06-30):
* Added check for two column
-v1.06:
+v1.06 (2010-06-17):
jmlr.cls
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/README new/doc/latex/jmlr/README
--- old/doc/latex/jmlr/README 2017-08-01 23:39:04.000000000 +0200
+++ new/doc/latex/jmlr/README 2020-03-26 22:29:05.000000000 +0100
@@ -1,8 +1,17 @@
-LaTeX Class : jmlr bundle v1.24
+LaTeX Class : jmlr bundle v1.27 (2020-03-26)
-Last Modified : 2017-08-01
+Author : Nicola L. C. Talbot
+ dickimaw-books.com/contact
-Author : Nicola L. C. Talbot
+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 2006-2020 Nicola Talbot
+
+DESCRIPTION
This bundle provides:
@@ -60,12 +69,6 @@
setspace
fink
-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.
-
RELATED SOFTWARE:
http://www.dickimaw-books.com/software/makejmlrbookgui/
Binary files old/doc/latex/jmlr/jmlr.pdf and new/doc/latex/jmlr/jmlr.pdf differ
Binary files old/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf and new/doc/latex/jmlr/sample-books/jmlrbook-sample.pdf differ
Binary files old/doc/latex/jmlr/sample-books/proceedings-sample.pdf and new/doc/latex/jmlr/sample-books/proceedings-sample.pdf differ
Binary files old/doc/latex/jmlr/sample-papers/jmlr-sample.pdf and new/doc/latex/jmlr/sample-papers/jmlr-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/sample-papers/jmlr-sample.tex new/doc/latex/jmlr/sample-papers/jmlr-sample.tex
--- old/doc/latex/jmlr/sample-papers/jmlr-sample.tex 2015-02-25 00:10:45.000000000 +0100
+++ new/doc/latex/jmlr/sample-papers/jmlr-sample.tex 2020-03-26 22:29:05.000000000 +0100
@@ -128,9 +128,9 @@
Please also ensure that your document will compile with PDF\LaTeX.
If you have an error message that's puzzling you, first check for it
at the UK TUG FAQ
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}. If
+\url{https://texfaq.org/FAQ-man-latex}. If
that doesn't help, create a minimal working example (see
-\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post
+\url{https://www.dickimaw-books.com/latex/minexample/}) and post
to somewhere like \TeX\ on StackExchange
(\url{http://tex.stackexchange.com/}) or the \LaTeX\ Community Forum
(\url{http://www.latex-community.org/forum/}).
Binary files old/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf and new/doc/latex/jmlr/sample-papers/jmlrwcp-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex new/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex
--- old/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex 2017-08-01 23:39:04.000000000 +0200
+++ new/doc/latex/jmlr/sample-papers/jmlrwcp-sample.tex 2020-03-26 22:29:05.000000000 +0100
@@ -102,9 +102,9 @@
Please also ensure that your document will compile with PDF\LaTeX.
If you have an error message that's puzzling you, first check for it
at the UK TUG FAQ
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex}. If
+\url{https://texfaq.org/FAQ-man-latex}. If
that doesn't help, create a minimal working example (see
-\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}) and post
+\url{https://www.dickimaw-books.com/latex/minexample}) and post
to somewhere like TeX on StackExchange
(\url{http://tex.stackexchange.com/}) or the LaTeX Community Forum
(\url{http://www.latex-community.org/forum/}).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jmlr.doc.tlpobj new/tlpkg/tlpobj/jmlr.doc.tlpobj
--- old/tlpkg/tlpobj/jmlr.doc.tlpobj 2019-02-28 03:45:24.000000000 +0100
+++ new/tlpkg/tlpobj/jmlr.doc.tlpobj 2020-03-26 23:29:41.000000000 +0100
@@ -1,9 +1,9 @@
name jmlr.doc
category Package
-revision 44935
+revision 54562
shortdesc doc files of jmlr
relocated 1
-docfiles size=523
+docfiles size=532
RELOC/doc/latex/jmlr/CHANGES
RELOC/doc/latex/jmlr/INSTALL
RELOC/doc/latex/jmlr/README
++++++ jmlr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jmlr/jmlr.cls new/tex/latex/jmlr/jmlr.cls
--- old/tex/latex/jmlr/jmlr.cls 2017-08-01 23:39:04.000000000 +0200
+++ new/tex/latex/jmlr/jmlr.cls 2020-03-26 22:29:05.000000000 +0100
@@ -7,7 +7,7 @@
%% jmlr.dtx (with options: `jmlr.cls,package')
%%
%% jmlr.dtx
-%% Copyright 2017 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
@@ -41,7 +41,7 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlr}[2017/08/01 v1.24 (NLCT) Journal of Machine Learning Research]
+\ProvidesClass{jmlr}[2020/03/26 v1.27 (NLCT) Journal of Machine Learning Research]
\RequirePackage{xkeyval}
\RequirePackage{calc}
\RequirePackage{etoolbox}
@@ -450,16 +450,17 @@
\fi
\vskip \aftermaketitskip
}
-\def\@jmlrmaketitle{\vbox{\hsize\textwidth
- \linewidth\hsize
- \jmlrpretitle
+\def\@jmlrmaketitle{%
+ {%
+ \jmlrpretitle
{%
\def\titletag##1{##1}%
\@title
}%
- \jmlrposttitle
- \jmlrpreauthor \@author \jmlrpostauthor
-}}
+ \jmlrposttitle
+ \jmlrpreauthor \ignorespaces\@author \jmlrpostauthor
+ }%
+}
\newcommand*\kernelmachines{(for
{\textsc{http://www.kernel-machines.org}})}
\newcommand*{\editorname}{Editor}
@@ -588,11 +589,10 @@
\newcommand{\acks}[1]{\section*{Acknowledgments}#1}
\newcommand{\researchnote}[1]{\noindent {\LARGE\itshape Research Note} #1}
\providecommand{\ifprint}[2]{\ifgrayscale#1\else#2\fi}
-%% \begin{macrocode}
\ifjmlrhtml
\else
\let\@org@Ginclude@graphics\Ginclude@graphics
- \def\Ginclude@graphics#1{%
+ \def\@jmlr@old@Ginclude@graphics#1{%
\begingroup
\let\input@path\Ginput@path
\ifprint{\filename@parse{#1-gray}}{\filename@parse{#1}}%
@@ -628,6 +628,91 @@
\csname Gin@rule@\Gin@ext\endcsname{\Gin@base\Gin@ext}}%
\fi
\endgroup}
+\def\@jmlr@new@Ginclude@graphics#1{%
+ \ifx\detokenize\@undefined\else
+ \edef\Gin@extensions{\detokenize\expandafter{\Gin@extensions}}%
+ \fi
+ \begingroup
+ \let\input@path\Ginput@path
+ \ifprint{\set@curr@file{#1-gray}}{\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
+ \let\@jmlr@filename@ext\filename@ext
+ \ifx\filename@ext\relax
+ \@for\Gin@temp:=\Gin@extensions\do{%
+ \ifx\Gin@ext\relax
+ \Gin@getbase\Gin@temp
+ \fi}%
+ \ifprint
+ {\ifx\Gin@ext\relax
+ \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
+ \let\@jmlr@filename@ext\filename@ext
+ \ifx\filename@ext\relax
+ \@for\Gin@temp:=\Gin@extensions\do{%
+ \ifx\Gin@ext\relax
+ \Gin@getbase\Gin@temp
+ \fi}%
+ \fi
+ \fi}{}%
+ \fi
+ \ifx\@jmlr@filename@ext\relax
+ \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}%
+ \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
+}
+ \@ifpackagelater{graphics}{2019/07/01}
+ {\let\Ginclude@graphics\@jmlr@new@Ginclude@graphics}%
+ {\let\Ginclude@graphics\@jmlr@old@Ginclude@graphics}%
\fi
\newcommand{\artappendix}{\par
\setcounter{section}{0}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jmlr/jmlrbook.cls new/tex/latex/jmlr/jmlrbook.cls
--- old/tex/latex/jmlr/jmlrbook.cls 2017-08-01 23:39:04.000000000 +0200
+++ new/tex/latex/jmlr/jmlrbook.cls 2020-03-26 22:29:05.000000000 +0100
@@ -7,7 +7,7 @@
%% jmlr.dtx (with options: `jmlrbook.cls,package')
%%
%% jmlr.dtx
-%% Copyright 2017 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
@@ -41,7 +41,7 @@
%% First editor:
%% Second editor:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jmlrbook}[2017/08/01 v1.24 (NLCT) JMLR Book Style]
+\ProvidesClass{jmlrbook}[2020/03/26 v1.27 (NLCT) JMLR Book Style]
\RequirePackage{xkeyval}
\RequirePackage{setspace}
\newcommand*\jmlrprefacepath{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jmlr/jmlrutils.sty new/tex/latex/jmlr/jmlrutils.sty
--- old/tex/latex/jmlr/jmlrutils.sty 2017-08-01 23:39:04.000000000 +0200
+++ new/tex/latex/jmlr/jmlrutils.sty 2020-03-26 22:29:05.000000000 +0100
@@ -7,7 +7,7 @@
%% jmlr.dtx (with options: `jmlrutils.sty,package')
%%
%% jmlr.dtx
-%% Copyright 2017 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
@@ -40,7 +40,7 @@
%% Right brace \} Tilde \~}
%% First editor:
%% Second editor:
-\ProvidesPackage{jmlrutils}[2017/08/01]
+\ProvidesPackage{jmlrutils}[2020/03/26 v1.27 (NLCT)]
\newif\ifjmlrutilsmaths
\jmlrutilsmathstrue
\DeclareOption{maths}{\jmlrutilsmathstrue}
@@ -216,12 +216,24 @@
\newcommand*{\@p@subfigure}[1]{%
\protect\@subfigurelabel{\thefigure}{\thesubfigure}%
}
- \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}}
- \newcommand*\@subfigref[1]{%
- {%
- \def\@subfigurelabel##1##2{\subfigurelabel{##2}}%
- \ref{#1}%
- }%
+ \@ifl@t@r\fmtversion{2019/08/22}%
+ {
+ \newcommand*\@subfigurelabel[3]{#1\subfigurelabel{#2}}
+ \newcommand*\@subfigref[1]{%
+ {%
+ \def\@subfigurelabel##1##2##3{\subfigurelabel{##2}}%
+ \ref{#1}%
+ }%
+ }
+ }%
+ {
+ \newcommand*\@subfigurelabel[2]{#1\subfigurelabel{#2}}
+ \newcommand*\@subfigref[1]{%
+ {%
+ \def\@subfigurelabel##1##2{\subfigurelabel{##2}}%
+ \ref{#1}%
+ }%
+ }
}
\newcommand*{\subfigref}[1]{%
\let\@objectname\@empty
@@ -280,13 +292,25 @@
\newcommand*{\@p@subtable}[1]{%
\protect\@subtablelabel{\thetable}{\thesubtable}%
}
- \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}}
- \newcommand*\@subtabref[1]{%
- {%
- \def\@subtablelabel##1##2{\subtablelabel{##2}}%
- \ref{#1}%
- }%
- }
+ \@ifl@t@r\fmtversion{2019/08/22}%
+ {
+ \newcommand*\@subtablelabel[3]{#1\subtablelabel{#2}}
+ \newcommand*\@subtabref[1]{%
+ {%
+ \def\@subtablelabel##1##2##3{\subtablelabel{##2}}%
+ \ref{#1}%
+ }%
+ }
+ }%
+ {
+ \newcommand*\@subtablelabel[2]{#1\subtablelabel{#2}}
+ \newcommand*\@subtabref[1]{%
+ {%
+ \def\@subtablelabel##1##2{\subtablelabel{##2}}%
+ \ref{#1}%
+ }%
+ }
+ }%
\newcommand*{\subtabref}[1]{%
\let\@objectname\@empty
\def\@objectref{}%
@@ -374,9 +398,10 @@
\newcommand{\jmlrBlackBox}{\rule{1.5ex}{1.5ex}}
\providecommand{\BlackBox}{\jmlrBlackBox}
\newcommand{\jmlrQED}{\hfill\jmlrBlackBox\par\bigskip}
+\providecommand{\proofname}{Proof}
\newenvironment{proof}%
{%
- \par\noindent{\bfseries\upshape Proof\ }%
+ \par\noindent{\bfseries\upshape \proofname\ }%
}%
{\jmlrQED}
\newcommand*{\theorembodyfont}[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jmlr.tlpobj new/tlpkg/tlpobj/jmlr.tlpobj
--- old/tlpkg/tlpobj/jmlr.tlpobj 2019-02-28 03:45:25.000000000 +0100
+++ new/tlpkg/tlpobj/jmlr.tlpobj 2020-03-26 23:29:41.000000000 +0100
@@ -1,6 +1,6 @@
name jmlr
category Package
-revision 44935
+revision 54562
shortdesc Class files for the Journal of Machine Learning Research
relocated 1
longdesc The jmlr bundle provides a class for authors (jmlr) and a class
@@ -11,14 +11,13 @@
longdesc or a greyscale nonhyperlinked book for printing. Production
longdesc editors can use makejmlrbookgui to help build the proceedings
longdesc from the articles.
-runfiles size=29
+runfiles size=30
RELOC/scripts/jmlr/makejmlrbook
RELOC/tex/latex/jmlr/jmlr.cls
RELOC/tex/latex/jmlr/jmlrbook.cls
RELOC/tex/latex/jmlr/jmlrutils.sty
-catalogue-contact-bugs http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi
+catalogue-contact-bugs https://www.dickimaw-books.com/bugtracker.php?category=jmlr
catalogue-ctan /macros/latex/contrib/jmlr
-catalogue-date 2017-08-01 19:14:03 +0200
catalogue-license lppl1.3
catalogue-topics journalpub class
-catalogue-version 1.24
+catalogue-version 1.27
++++++ jnuexam.doc.tar.xz ++++++
Binary files old/doc/latex/jnuexam/exam-a-a3input.pdf and new/doc/latex/jnuexam/exam-a-a3input.pdf differ
Binary files old/doc/latex/jnuexam/exam-a-a3split.pdf and new/doc/latex/jnuexam/exam-a-a3split.pdf differ
Binary files old/doc/latex/jnuexam/exam-a-empty.pdf and new/doc/latex/jnuexam/exam-a-empty.pdf differ
Binary files old/doc/latex/jnuexam/exam-a.pdf and new/doc/latex/jnuexam/exam-a.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jnuexam/exam-a.tex new/doc/latex/jnuexam/exam-a.tex
--- old/doc/latex/jnuexam/exam-a.tex 2018-11-21 22:59:30.000000000 +0100
+++ new/doc/latex/jnuexam/exam-a.tex 2019-11-08 22:40:58.000000000 +0100
@@ -39,10 +39,10 @@
\vfill
\begin{problem}
-已知二阶行列式 $\text{$\left|\begin{array}{cc}
+已知二阶行列式 $\left|\begin{array}{cc}
1 & 2\\
- 3 & x
-\end{array}\right|$=0}$,则 $x=$ \fillout{$-6$}.
+\end{array}\right|=0$,则 $x=$ \fillout{$-6$}.
\end{problem}
\vfill
@@ -178,10 +178,10 @@
\begin{solution}
\everymath{\displaystyle}%
-原式$=\int\e^{2x}\,\sec^2 x\dx+2\int\e^{2x}\,\tan x\dx$ \score{2}
-\hspace{5em}${}=\int\e^{2x}\,\d(\tan x)+ 2\int\e^{2x}\,\tan x\dx$ \score{4}
-\hspace{5em}${}=\e^{2x}\,\tan x - 2\int\e^{2x}\,\tan x\dx+ 2\int\e^{2x}\,\tan x\dx$ \score{6}
-\hspace{5em}${}=\e^{2x}\,\tan x + C$ \score{8}
+原式 \? $=\int\e^{2x}\,\sec^2 x\dx+2\int\e^{2x}\,\tan x\dx$ \score{2}
+\+ $=\int\e^{2x}\,\d(\tan x)+ 2\int\e^{2x}\,\tan x\dx$ \score{4}
+\+ $=\e^{2x}\,\tan x - 2\int\e^{2x}\,\tan x\dx+ 2\int\e^{2x}\,\tan x\dx$ \score{6}
+\+ $=\e^{2x}\,\tan x + C$ \score{8}
\end{solution}
\vfill
@@ -220,7 +220,7 @@
\bigskip
\begin{solution}
-$A = \left|\begin{array}{cccc}
+$A \? = \left|\begin{array}{cccc}
0 & 1 & 2 & 3\\
1 & 2 & 3 & 0\\
2 & 3 & 0 & 1\\
@@ -235,7 +235,7 @@
- 1 & - 6 & 1\\
- 6 & - 8 & 2
\end{array}\right|$ \score{4}
-\qquad $= -\left|\begin{array}{ccc}
+\+ $= -\left|\begin{array}{ccc}
1 & 2 & 3\\
0 & - 4 & 4\\
0 & 4 & 20
@@ -255,11 +255,11 @@
\bigskip
\begin{solution}
-$f = x_1^2 + 2 x_1 x_2 - 6 x_1 x_3 + 2 x_2^2 - 12 x_2 x_3 + 9 x^2_3$ \par
-\qquad$= x_1^2 + 2 x_1 (x_2 - 3 x_3) + (x_2 - 3 x_3)^2 + x_2^2 - 6 x_2 x_3 $ \par
-\qquad$= (x_1 + x_2 - 3 x_3)^2 + x_2^2 - 6 x_2 x_3$ \score{3}
-\qquad$= (x_1 + x_2 - 3 x_3)^2 + x_2^2 - 2 x_2 \cdot 3 x_3 + (3 x_3)^2 - 9x_3^2$ \par
-\qquad$= (x_1 + x_2 - 3 x_3)^2 + (x_2 - 3 x_3)^2 - 9 x_3^2$ \score{6}
+$f \? = x_1^2 + 2 x_1 x_2 - 6 x_1 x_3 + 2 x_2^2 - 12 x_2 x_3 + 9 x^2_3$ \par
+ \+ $= x_1^2 + 2 x_1 (x_2 - 3 x_3) + (x_2 - 3 x_3)^2 + x_2^2 - 6 x_2 x_3 $ \par
+ \+ $= (x_1 + x_2 - 3 x_3)^2 + x_2^2 - 6 x_2 x_3$ \score{3}
+ \+ $= (x_1 + x_2 - 3 x_3)^2 + x_2^2 - 2 x_2 \cdot 3 x_3 + (3 x_3)^2 - 9x_3^2$ \par
+ \+ $= (x_1 + x_2 - 3 x_3)^2 + (x_2 - 3 x_3)^2 - 9 x_3^2$ \score{6}
令$y_1 = x_1 + x_2 - 3 x_3, y_2 = x_2 - 3 x_3, y_3 = x_3$, \newline
则$f = y_1^2 + y_2^2 - 9y_3^2$为标准形.\score{8}
\end{solution}
@@ -270,19 +270,19 @@
\begin{problem}
设每发炮弹命中飞机的概率是0.2且相互独立,现在发射100发炮弹.\par
-\step 用切贝谢夫不等式估计命中数目$\xi$在10发到30发之间的概率.\par
-\step 用中心极限定理估计命中数目$\xi$在10发到30发之间的概率.
+(1) 用切贝谢夫不等式估计命中数目$\xi$在10发到30发之间的概率.\par
+(2) 用中心极限定理估计命中数目$\xi$在10发到30发之间的概率.
\end{problem}
\bigskip
\begin{solution}
$E\xi = n p = 100 \cdot 0.2 = 20, D\xi = n p q = 100 \cdot 0.2 \cdot 0.8 = 16$. \score{2}
-\step $P (10 < \xi < 30) = P (| \xi - E \xi | < 10) \ge 1 - \frac{D\xi}{10^2}
+(1) $P (10 < \xi < 30) = P (|\xi - E\xi| < 10) \ge 1 - \frac{D\xi}{10^2}
= 1 - \frac{16}{100} = 0.84$. \score{4}
-\step $P (10 < \xi < 30) \approx \Phi_0 \left( \frac{30 - 20}{\sqrt{16}}\right)
- - \Phi_0 \left( \frac{10 - 20}{\sqrt{16}} \right)$ \score{6}
-\qquad $= 2 \Phi_0 (2.5) - 1 = 2 \cdot 0.9938 - 1 =0.9876$ \score{8}
+(2) $P (10 < \xi < 30) \? \approx \Phi_0\left(\frac{30 - 20}{\sqrt{16}}\right)
+ - \Phi_0\left(\frac{10 - 20}{\sqrt{16}}\right)$ \score{6}
+ \+ $= 2 \Phi_0(2.5) - 1 = 2 \cdot 0.9938 - 1 =0.9876$ \score{8}
\end{solution}
\vfill
@@ -295,11 +295,11 @@
\bigskip
\begin{solution}
-\step 待检假设 $H_0 : \mu = 3140$. \score{1}
-\step 选取统计量 $T = \frac{\bar{X}-\mu}{S / \sqrt{n}} \sim t(n-1)$. \score{3}
-\step 查表得到 $t_{\alpha} = t_{\alpha} (n - 1) = t_{0.01} (15) =2.947$. \score{5}
-\step 计算统计值 $t = \frac{\bar{x} - \mu_0}{s/\sqrt{n}} =\frac{3160-3140}{100/4} = 0.8$.\score{7}
-\step 由于 $| t | < t_{\alpha}$, 故接受 $H_0$, 即假设成立. \score{8}
+(1) 待检假设 $H_0 : \mu = 3140$. \score{1}
+(2) 选取统计量 $T = \frac{\widebar{X}-\mu}{S / \sqrt{n}} \sim t(n-1)$. \score{3}
+(3) 查表得到 $t_{\alpha} = t_{\alpha} (n - 1) = t_{0.01} (15) =2.947$. \score{5}
+(4) 计算统计值 $t = \frac{\widebar{x} - \mu_0}{s/\sqrt{n}} =\frac{3160-3140}{100/4} = 0.8$.\score{7}
+(5) 由于 $| t | < t_{\alpha}$, 故接受 $H_0$, 即假设成立. \score{8}
\end{solution}
\vfill
@@ -308,6 +308,8 @@
\makepart{证明题}{共~2~小题,每小题~8~分,共~16~分}
+\renewcommand{\solutionname}{证} % 将“解”字改为“证”字
+
\begin{problem}
设数列$\{x_n\}$满足$x_1=\sqrt2$,$x_{n+1}=\sqrt{2+x_n}$.证明数列收敛,并求出极限.
\end{problem}
@@ -315,13 +317,13 @@
\bigskip
\begin{solution}
-\step 事实上,由于$x_1<2$,且$x_k<2$时
+(1) 事实上,由于$x_1<2$,且$x_k<2$时
$$x_{k+1}=\sqrt{2+x_k}<\sqrt{2+2}=2,$$
由数学归纳法知对所有$n$都有$x_n<2$,即数列有上界.
又由于
$$\frac{x_{n+1}}{x_n}=\sqrt{\frac{2}{x_n^2}+\frac{1}{x_n}}>\sqrt{\frac{2}{2^2}+\frac{1}{2}}=1,$$
所以数列单调增加.由极限存在准则II,数列必定收敛.\score{4}
-\step 设数列的极限为$A$,对递推公式两边同时取极限得到
+(2) 设数列的极限为$A$,对递推公式两边同时取极限得到
$$A=\sqrt{2+A}.$$
解得$A=2$,即数列$\{x_n\}$的极限为$2$.\score{8}
\end{solution}
@@ -329,29 +331,29 @@
\vfill
\begin{problem}
-设事件$A$和$B$相互独立,证明$A$和$\bar{B}$相互独立.
+设事件$A$和$B$相互独立,证明$A$和$\widebar{B}$相互独立.
\end{problem}
\bigskip
\begin{solution}
-$P (A \cdot \bar{B}) = P (A - B) = P (A - A B)$ \score{2}
-\qquad $= P (A) - P (A B) = P (A) - P (A) P (B)$ \score{4}
-\qquad $= P (A) (1 - P (B)) = P (A) P (\bar{B})$ \score{6}
-所以$A$和$\bar{B}$相互独立.\score{8}
+\? $P (A \cdot \widebar{B}) = P (A - B) = P (A - A B)$ \score{2}
+\< $= P (A) - P (A B) = P (A) - P (A) P (B)$ \score{4}
+\< $= P (A) (1 - P (B)) = P (A) P (\widebar{B})$ \score{6}
+所以$A$和$\widebar{B}$相互独立.\score{8}
\end{solution}
\vfill
\makedata{一些可能用到的数据} %附录数据
-\begin{tabu}{*{4}{X[l,$]}}
+\begin{tabularx}{\linewidth}{*{4}{>{$}X<{$}}}
\hline
\Phi_0(0.5)=0.6915 & \Phi_0(1)=0.8413 & \Phi_0(2)=0.9773 & \Phi_0(2.5)=0.9938 \\
t_{0.01}(8)=3.355 & t_{0.01}(9)=3.250 & t_{0.01}(15)=2.947 & t_{0.01}(16)=2.921 \\
\chi_{0.005}^2(8)=22.0 & \chi_{0.005}^2(9)=23.6 & \chi_{0.005}^2(15)=32.8 & \chi_{0.005}^2(16)=34.3 \\
\chi_{0.995}^2(8)=1.34 & \chi_{0.995}^2(9)=1.73 & \chi_{0.995}^2(15)=4.60 & \chi_{0.995}^2(16)=5.14 \\
\hline
-\end{tabu}
+\end{tabularx}
\end{document}
Binary files old/doc/latex/jnuexam/exam-b-a3input.pdf and new/doc/latex/jnuexam/exam-b-a3input.pdf differ
Binary files old/doc/latex/jnuexam/exam-b-a3split.pdf and new/doc/latex/jnuexam/exam-b-a3split.pdf differ
Binary files old/doc/latex/jnuexam/exam-b-empty.pdf and new/doc/latex/jnuexam/exam-b-empty.pdf differ
Binary files old/doc/latex/jnuexam/exam-b.pdf and new/doc/latex/jnuexam/exam-b.pdf differ
Binary files old/doc/latex/jnuexam/jnuexam.pdf and new/doc/latex/jnuexam/jnuexam.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jnuexam/jnuexam.tex new/doc/latex/jnuexam/jnuexam.tex
--- old/doc/latex/jnuexam/jnuexam.tex 2018-11-21 22:59:30.000000000 +0100
+++ new/doc/latex/jnuexam/jnuexam.tex 2019-11-08 22:40:58.000000000 +0100
@@ -5,9 +5,7 @@
\usepackage[UTF8,noindent]{ctex}
\usepackage{arev}
-\usepackage{ragged2e}
-\usepackage{listings}
-\usepackage{tabu}
+\usefonttheme{professionalfonts}
\makeatletter
@@ -28,39 +26,45 @@
\setlength{\parskip}{7pt plus 1pt minus 1pt}
-\justifying
-\let\oldraggedright\raggedright
-\let\raggedright\justifying
-
-\lstset{
- basicstyle=\ttfamily\color{blue!50!red}
-}
-
-\lstnewenvironment{code}{}{}
-
\setbeamersize{text margin left=8mm,text margin right=8mm}
-\newenvironment{framex}{\begin{frame}[fragile=singleslide,environment=framex]}{\end{frame}}
+\setbeamercolor{normal text}{bg=gray!20}
\setbeamertemplate{frametitle}{\strut\insertframetitle\strut\par}
\setbeamertemplate{navigation symbols}{}
+\newcommand{\cdotfill}{\leavevmode\xleaders\hbox to 0.5em{\hss$\cdot$\hss}\hfill\kern0pt\relax}
+
+\usepackage{tabularx}
+
\newcommand{\ulinefill}[1]{\xleaders\hbox{\underline{\vphantom{#1}\kern1pt}}\hfill\kern0pt}
\newcommand{\fillbox}[1]{\ulinefill{#1}\underline{#1}\ulinefill{#1}}
-\setbeamercolor{normal text}{bg=gray!20}
-
\setbeamertemplate{title page}{%
\renewcommand{\arraystretch}{2}%
\usebeamerfont{title}
- \begin{tabu}{|X|}
+ \begin{tabularx}{\linewidth}{|X|}
\hline
模板名称:\fillbox{\usebeamercolor[fg]{title}\inserttitle} \\
模板作者:\fillbox{\insertauthor} \\
所在单位:\fillbox{\insertinstitute} \\
更新日期:\fillbox{\the\year}年\fillbox{\the\month}月\fillbox{\the\day}日\\
\hline
- \end{tabu}%
+ \end{tabularx}%
+}
+
+\usepackage{ragged2e}
+
+\justifying
+\let\oldraggedright\raggedright
+\let\raggedright\justifying
+
+\usepackage{fancyvrb}
+
+\newenvironment{framex}{\begin{frame}[fragile=singleslide,environment=framex]}{\end{frame}}
+
+\DefineVerbatimEnvironment{code}{Verbatim}{%
+ formatcom=\color{blue!50!red}%
}
\begin{document}
@@ -136,6 +140,22 @@
\end{framex}
\begin{framex}
+\frametitle{判断题目}
+\begin{code}
+\makepart{判断题}{题数分值}
+
+\begin{problem}
+第一道判断题描述。\true
+\end{problem}
+
+\begin{problem}
+第二道判断题描述。\false
+\end{problem}
+\end{code}
+其中 \verb!\true! 和 \verb!\false! 命令分别表示正确和错误。
+\end{framex}
+
+\begin{framex}
\frametitle{填空题目}
\begin{code}
\makepart{填空题}{题数分值}
@@ -243,6 +263,15 @@
\end{framex}
\begin{framex}
+\frametitle{解答名称}
+通过重新定义 \verb!\solutionname! 命令,可以改变 \verb!solution! 环境的名称。
+比如下面例子将“解答”二字改为“证明”:
+\begin{code}
+\renewcommand{\solutionname}{证明}
+\end{code}
+\end{framex}
+
+\begin{framex}
\frametitle{评分命令}
计算题和证明题等主观题的排版方法是完全一样的。在编写这些主观题的解答时,
可以用 \verb!\score! 命令给出各步骤得分。比如:
@@ -256,6 +285,40 @@
\end{framex}
\begin{framex}
+\frametitle{对齐命令}
+此文档类提供几个对齐命令,用于在不同行之间对齐。比如
+\vskip1em\hrule
+我们有$(a+b)^2 = (a+b)(a+b)$ \par
+\leavevmode\phantom{我们有$(a+b)^2$}${}= a^2 + 2ab + b^2$ \cdotfill 2分
+\vskip0.6em\hrule\vskip1em
+\begin{code}
+我们有$(a+b)^2 \? = (a+b)(a+b)$ \\
+ \+$= a^2+2ab+b^2$ \score{2}
+\end{code}
+第一个公式内部的 \verb!\?! 保存当前水平位置,
+而第二个公式前面的 \verb!\+! 表示跳到之前保存的位置。
+\par
+这两个对齐命令 \verb!\?! 和 \verb!\+! 需要编译两次才能生效。
+\end{framex}
+
+\begin{framex}
+\frametitle{对齐命令}
+此文档类提供几个对齐命令,用于在不同行的对齐。比如
+\vskip1em\hrule
+我们有$(a+b)^2 = (a+b)(a+b)$ \par
+\leavevmode\phantom{我们\,}${}= a^2 + 2ab + b^2$ \cdotfill 2分
+\vskip0.6em\hrule\vskip1em
+\begin{code}
+我们有 \? $(a+b)^2 = (a+b)(a+b)$ \\
+ \< $= a^2+2ab+b^2$ \score{2}
+\end{code}
+第一行公式前面的 \verb!\?! 保存当前水平位置,
+而第二行公式前面的 \verb!\<! 表示跳到之前保存位置的左侧(左移一个等号的宽度)。
+\par
+这两个对齐命令 \verb!\?! 和 \verb!\<! 需要编译两次才能生效。
+\end{framex}
+
+\begin{framex}
\frametitle{其它题型}
除了上述四种题型之外,其它题型可以用下面方式编写:
\begin{code}
@@ -308,7 +371,7 @@
\frametitle{竖直空白}
在试卷的各个小题后面,可以留下一些竖直空白。本文档类支持下列这些竖直空白命令:\par
\renewcommand{\arraystretch}{1.3}%
-\begin{tabu}{XX}
+\begin{tabularx}{\linewidth}{l<{\qquad}X}
\hline
\texttt{\string\smallskip} & 竖直小空白 \\
\hline
@@ -318,7 +381,7 @@
\hline
\texttt{\string\vfill} & 竖直填充 \\
\hline
-\end{tabu}
+\end{tabularx}\par
当然,竖直空白命令可以连续使用多个,以得到所需的空白。
\end{framex}
@@ -329,7 +392,7 @@
分别只对 A 卷和 B 卷有效。
\par
\renewcommand{\arraystretch}{1.3}%
-\begin{tabu}{XX[2]}
+\begin{tabularx}{\linewidth}{l<{\qquad}X}
\hline
\texttt{\string\newpage} & 分页,对A卷和B卷均有效 \\
\hline
@@ -337,7 +400,7 @@
\hline
\texttt{\string\newpageb} & 分页,仅对B卷有效 \\
\hline
-\end{tabu}
+\end{tabularx}\par
在试卷中\alert{不要}使用其他分页命令,比如 \verb!\clearpage! 等。
\end{framex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jnuexam.doc.tlpobj new/tlpkg/tlpobj/jnuexam.doc.tlpobj
--- old/tlpkg/tlpobj/jnuexam.doc.tlpobj 2019-02-28 03:45:26.000000000 +0100
+++ new/tlpkg/tlpobj/jnuexam.doc.tlpobj 2019-11-09 01:54:35.000000000 +0100
@@ -1,9 +1,9 @@
name jnuexam.doc
category Package
-revision 49212
+revision 52696
shortdesc doc files of jnuexam
relocated 1
-docfiles size=247
+docfiles size=228
RELOC/doc/latex/jnuexam/README
RELOC/doc/latex/jnuexam/exam-a-a3input.pdf
RELOC/doc/latex/jnuexam/exam-a-a3input.tex
++++++ jnuexam.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jnuexam/jnuexam.cls new/tex/latex/jnuexam/jnuexam.cls
--- old/tex/latex/jnuexam/jnuexam.cls 2018-11-21 22:59:30.000000000 +0100
+++ new/tex/latex/jnuexam/jnuexam.cls 2019-11-08 22:40:58.000000000 +0100
@@ -6,18 +6,22 @@
% ----------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jnuexam}[2018/11/21 v0.5 An exam class for Jinan University]
+\ProvidesClass{jnuexam}[2019/11/08 v0.7 An exam class for Jinan University]
\newif\ifsidebyside \sidebysidefalse % 是否 A3 纸张
\newif\ifreverse \reversefalse % 是否逆序出题
\newif\ifanswer \answertrue % 是否显示答案
+\newif\ifamsfonts \amsfontsfalse % 切换数学字体
\newif\ifsourcehan \sourcehanfalse % 切换思源字体
+\newif\ifdisplay \displayfalse % 切换展示公式
\newif\ifcollection \collectionfalse % 用于试卷题库
\DeclareOption{a3paper}{\sidebysidetrue}
\DeclareOption{reverse}{\reversetrue}
\DeclareOption{noanswer}{\answerfalse}
+\DeclareOption{amsfonts}{\amsfontstrue}
\DeclareOption{sourcehan}{\sourcehantrue}
+\DeclareOption{display}{\displaytrue}
\DeclareOption{collection}{\collectiontrue}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexart}} %其它选项
@@ -28,14 +32,22 @@
% 14bp 12bp 10.5bp 9bp
\LoadClass[cs4size,UTF8,noindent]{ctexart}
+\ifamsfonts
+ \RequirePackage{amssymb}
+\else
+ \RequirePackage[utopia]{mathdesign} % charter, utopia
+ \renewcommand\bfdefault{bx}
+ \let\oldoiint\oiint\renewcommand{\oiint}{\oldoiint\nolimits}
+ \DeclareTextCommandDefault{\nobreakspace}{\leavevmode\nobreak\ }
+\fi
+
\ifsidebyside
\RequirePackage[a3paper,landscape,twocolumn,columnsep=40mm,left=50mm,right=30mm,top=25mm,bottom=25mm]{geometry}
\else
\RequirePackage[a4paper,left=30mm,right=30mm,top=25mm,bottom=25mm]{geometry}
\fi
-\RequirePackage{tabu}
-\RequirePackage{amssymb}
+\RequirePackage{tabularx}
\RequirePackage{lastpage}
\RequirePackage{fancyhdr}
\RequirePackage{xcolor}
@@ -44,9 +56,12 @@
\RequirePackage{etoolbox}
\RequirePackage{calc}
+\newcolumntype{Y}{>{\centering\arraybackslash}X}
+\newcolumntype{n}[1]{>{\centering\arraybackslash}m{#1}}
+
\setlength{\parindent}{0em}
-\setlength{\lineskiplimit}{3pt}
-\setlength{\lineskip}{3pt}
+\setlength{\lineskiplimit}{4pt}
+\setlength{\lineskip}{4pt}
%% ---------------------------------------------------------------------------
%% 密封线命令 \mifengxian
@@ -116,10 +131,10 @@
\newcommand{\head@table@a}{%
\begin{tabular}{l}
- \underbox{11em}{\niandu}学年度第\underbox{5.5em}{\xueqi}学期 \\
- 课程名称:\underbox{17.5em}{\kecheng\ifx\zhuanye\my@empty\else\kern0pt(\zhuanye)\fi} \\
- 授课教师:\underparbox{17.5em}{\centering\rule{0pt}{3ex}\jiaoshi} \\
- 考试时间:\underbox{17.5em}{\shijian} \\
+ \underbox{11\ccwd}{\niandu}学年度第\underbox{5.5\ccwd}{\xueqi}学期 \\
+ 课程名称:\underbox{17.5\ccwd}{\kecheng\ifx\zhuanye\my@empty\else\kern0pt(\zhuanye)\fi} \\
+ 授课教师:\underparbox{17.5\ccwd}{\centering\rule{0pt}{3ex}\jiaoshi} \\
+ 考试时间:\underbox{17.5\ccwd}{\shijian} \\
\end{tabular}
}
@@ -136,9 +151,9 @@
\newcommand{\head@table@c}{%
\begin{tabular}{l}
- \underspace{10em}学院\underspace{8em}专业\underspace{7.5em}班\kern0pt(\kern0pt{}级\kern0pt) \\[1em]
- 姓名\underspace{8em}学号\underspace{10em}\hfill
- \bfseries 内招~[\ischeck{\neizhao}] 外招~[\ischeck{\waizhao}] %\\[0.8em]
+ \underspace{10\ccwd}学院\underspace{8\ccwd}专业\underspace{7.5\ccwd}班\kern0pt(\kern0pt{}级\kern0pt) \\[1em]
+ 姓名\underspace{8\ccwd}学号\underspace{10\ccwd}\hfill
+ \bfseries 内招~[\ischeck{\neizhao}]~~外招~[\ischeck{\waizhao}] %\\[0.8em]
\end{tabular}
}
@@ -151,25 +166,25 @@
\ifx\shijuan\my@temp@c\renewcommand{\shijuan}{D}\fi
\fi
\noindent
- \begin{tabu}{|@{}X@{}|}
+ \begin{tabularx}{\linewidth}{|@{}X@{}|}
\hline\renewcommand{\arraystretch}{1.5}%
- \begin{tabu}{@{}>{\bfseries}l@{}|@{}X@{}|@{}l@{}}
+ {\begin{tabularx}{\linewidth}{@{}>{\bfseries}l@{}|@{}X@{}|@{}l@{}}
\begin{tabular}{l}教\\ 师\\ 填\\ 写\end{tabular} & \head@table@a & \head@table@b
- \end{tabu}\\
+ \end{tabularx}}\\
\hline\renewcommand{\arraystretch}{0.9}%
- \begin{tabu}{@{}>{\bfseries}l@{}|@{}X@{}}
+ {\begin{tabularx}{\linewidth}{@{}>{\bfseries}l@{}|@{}X@{}}
\begin{tabular}{l}考\\ 生\\ 填\\ 写\end{tabular} & \head@table@c
- \end{tabu}\\
+ \end{tabularx}}\\
\hline
- \end{tabu}
- \vspace{1em}
- \noindent\begin{tabu}{|*{8}{X[c]|}}
+ \end{tabularx}
+ \par\vspace{1em}
+ \noindent\begin{tabularx}{\linewidth}{|*{8}{Y|}}
\hline
- \bfseries{题 号} & 一 & 二 & 三 & 四 & 五 & 六 & 总 分\\
+ \textbf{题号} & 一 & 二 & 三 & 四 & 五 & 六 & 总分\\
\hline
- \bfseries{得 分} & & & & & & & \\
+ \parbox[c][2em][c]{2.2em}{\bfseries 得分} & & & & & & & \\
\hline
- \end{tabu}
+ \end{tabularx}
}
%% ---------------------------------------------------------------------------
@@ -218,6 +233,7 @@
\xdef\allproblems{}
\xdef\lastproblem{}
\newcounter{problem}
+\newcommand{\solutionname}{解}
\newcounter{choice} % 后面选择题的 abcd 环境要用到
\newcounter{step} % 后面解答题的 \step 命令要用到
@@ -228,14 +244,14 @@
\setcounter{problem}{0}%
\stepcounter{section}%
\vspace{1em}%
- \noindent\begin{tabu}{|X[c]|X[c]|X[6]}
+ \noindent\begin{tabularx}{\linewidth}{|n{1.7cm}|n{1.7cm}|X}
\cline{1-2}
得分 & 评阅人 & \textbf{\Chinese{section}、#1}\\
\cline{1-2}
& & (#2) \\
\cline{1-2}
- \end{tabu}
- \vspace{1em}
+ \end{tabularx}
+ \par\vspace{1em}
}
\newcommand{\makedata}[1]{%
@@ -249,11 +265,11 @@
\newenvironment{problemreal}{%
\stepcounter{problem}\setcounter{choice}{0}\setcounter{step}{0}%
- \textsf{\color{blue}\arabic{problem}}.\;\,\ignorespaces
+ \textbf{\textsf{{\color{blue}\arabic{problem}}.}}\;\,\ignorespaces
}{\par}
\newenvironment{solutionreal}{%
\setcounter{step}{0}%
- \textsf{\color{blue}解答}\quad\ignorepars
+ \textbf{\textsf{{\color{blue}\solutionname}.}}\;\,\ignorepars
}{\par}
\let \oldnewpage = \newpage
@@ -373,15 +389,16 @@
\newcommand{\answertable}[3][1em]{%
答题须知:本题答案必须写在如下表格中,否则不给分.\par
- \begin{tabu}{|c|*{#3}{X[c]|}}
+ \begin{tabularx}{\linewidth}{|c|*{#3}{Y|}}
\hline
\answer@lines{#1}{#2}{#3}
- \end{tabu}%
+ \end{tabularx}%
\par\vspace{0.8em}%
}
%% ---------------------------------------------------------------------------
%% 答案切换命令 \answer
+%% 判断命令 \true 和 \false
%% 填空命令 \fillin 和 \fillout
%% 选择命令 \pickin 和 \pickout
%% 四个选项排版环境 abcd,根据四个选项的长度自动排成一行、两行或四行
@@ -389,11 +406,14 @@
\newcommand{\answer}[1]{\ifanswer#1\else\phantom{#1}\fi}
+\newcommand{\cdotfill}{\leavevmode\xleaders\hbox to 0.5em{\hss$\cdot$\hss}\hfill\kern0pt\relax}
+\newcommand{\true}{\unskip\nobreak\cdotfill(\makebox[1.5em]{\color{blue}\answer{$\checkmark$}})}
+\newcommand{\false}{\unskip\nobreak\cdotfill(\makebox[1.5em]{\color{blue}\answer{\sffamily x}})}
+
\newcommand{\ulinefill}[1]{\xleaders\hbox{\underline{\vphantom{#1}\kern1pt}}\hfill\kern0pt}
\newcommand{\fillout}[1]{\allowbreak\hbox{}\nobreak\ulinefill{#1}\underline{\color{blue}\answer{#1}}\ulinefill{#1}}
\newcommand{\fillin}[1]{\underline{\hspace{1em}\color{blue}\answer{#1}\hspace{1em}}}
-\newcommand{\cdotfill}{\leavevmode\xleaders\hbox to 0.5em{\hss$\cdot$\hss}\hfill\kern0pt\relax}
\newcommand{\pickout}[1]{\unskip\nobreak\cdotfill(\makebox[1.5em]{\color{blue}\answer{#1}})}
\newcommand{\pickin}[1]{\unskip\nobreak\hspace{0.3em}(\makebox[1.5em]{\color{blue}\answer{#1}})\hspace{0.3em}\ignorespaces}
@@ -431,21 +451,86 @@
\fi
}
-%\newcommand{\my@item}{\ifnum\value{choice}=0\par\fi\stepcounter{choice}}
-%\newcommand{\fullitem}[1]{\my@item\parbox{\linewidth}{(\Alph{choice})\ #1\rule[-0.5em]{0pt}{0.5em}}\hfill\ignorespaces}
-%\newcommand{\halfitem}[2][0.5]{\my@item\makebox[#1\linewidth][l]{(\Alph{choice})\ #2}\hfill\ignorespaces}
-%\newcommand{\quaritem}[2][0.25]{\my@item\makebox[#1\linewidth][l]{(\Alph{choice})\ #2}\hfill\ignorespaces}
-
%% ---------------------------------------------------------------------------
%% 解答题步骤命令 \step
%% ---------------------------------------------------------------------------
\newcommand{\step}{%
\stepcounter{step}%
- \makebox[2em][l]{\ttfamily(\arabic{step})}%
+ \textsf{(\arabic{step})}\;\,%
}
%% ---------------------------------------------------------------------------
+%% 自由对齐命令 \tabpoint, \tabto, \tableft
+%% 命令 \tabpoint 记录当前的水平位置,也可以简写为 \?
+%% 命令 \tabto 跳到之前记录的位置,也可以简写为 \+
+%% 命令 \tableft 跳到之前记录的位置的左侧,也可以简写为 \<
+%% 这些自由对齐命令需要编译两次才能生效
+%% ---------------------------------------------------------------------------
+
+\usepackage{zref-savepos}
+
+\@ifundefined{zsaveposx}{\let\zsaveposx\zsavepos}{} % 旧版本无 \zsaveposx 命令
+
+\newcounter{saveposcnt}
+\newcounter{useposcnt}
+\renewcommand*{\thesaveposcnt}{savepos\number\value{saveposcnt}}
+\renewcommand*{\theuseposcnt}{usepos\number\value{useposcnt}}
+
+\def\my@alignment@offset{}
+
+\def\my@alignment@list{}
+\forcsvlist{\listadd\my@alignment@list}{=,<,>,\le,\ge,\leq,\geq,\approx}
+
+\newlength{\my@alignment@kern}
+
+\newcommand*{\my@alignment@check}[1]{%
+ \ifx\my@let@token #1%
+ \def\my@alignment@offset{5}%
+ \listbreak
+ \fi
+}
+
+\newcommand{\my@alignment@next}{%
+ \ifdefempty{\my@alignment@offset}{%
+ \def\my@alignment@offset{0}%
+ \forlistloop{\my@alignment@check}{\my@alignment@list}%
+ }{}%
+ \settowidth{\my@alignment@kern}{$\mkern\my@alignment@offset mu$}%
+ \stepcounter{saveposcnt}%
+ \rlap{\kern\my@alignment@kern\zsaveposx{\thesaveposcnt}}%
+}
+
+\newcommand*{\tabpoint}[1][]{%
+ \leavevmode
+ \def\my@alignment@offset{#1}%
+ \futurelet\my@let@token\my@alignment@next
+}
+\let \? = \tabpoint
+
+\newcommand*{\tabto}{%
+ \stepcounter{useposcnt}%
+ \zsaveposx{\theuseposcnt}%
+ \noindent
+ \hskip\zposx{\thesaveposcnt}sp\relax
+ \hskip-\zposx{\theuseposcnt}sp\relax
+ \ignorespaces
+}
+\let \+ = \tabto
+
+\newcommand*{\tableft}{%
+ \settowidth{\my@alignment@kern}{$=\mkern5mu$}%
+ \stepcounter{useposcnt}%
+ \zsaveposx{\theuseposcnt}%
+ \noindent
+ \hskip\zposx{\thesaveposcnt}sp\relax
+ \hskip-\zposx{\theuseposcnt}sp\relax
+ \hskip-\my@alignment@kern
+ \ignorespaces
+}
+\let \< = \tableft
+
+%% ---------------------------------------------------------------------------
%% 评分命令 \score
%% ---------------------------------------------------------------------------
@@ -467,6 +552,14 @@
}
%% ---------------------------------------------------------------------------
+%% 文档选项 display 将全部公式都设为展示公式
+%% 命令 \display 将当前环境的公式都设为展示公式
+%% ---------------------------------------------------------------------------
+
+\newcommand{\display}{\everymath\expandafter{\the\everymath\displaystyle}}
+\ifbool{display}{\display}{}
+
+%% ---------------------------------------------------------------------------
%% 载入个人定制文件 jnuexam.cfg
%% 中文字体切换选项 sourcehan
%% ---------------------------------------------------------------------------
@@ -526,6 +619,7 @@
\RequirePackage{CJKfntef}
\RequirePackage{multirow}
\RequirePackage{diagbox}
+\RequirePackage{tabu}
\RequirePackage{relsize}
\newcommand{\Int}{\mathop{\mathlarger{\int}}}
@@ -557,9 +651,15 @@
\renewrobustcmd{\d}{\ifbool{mmode}{\diff}{\oldd}}%
}
-\newcommand{\va}{\vec{a\vphantom{b}}}
+% from mathabx package
+\DeclareFontFamily{U}{mathx}{\hyphenchar\font45}
+\DeclareFontShape{U}{mathx}{m}{n}{<-> mathx10}{}
+\DeclareSymbolFont{mathx}{U}{mathx}{m}{n}
+\DeclareMathAccent{\widebar}{0}{mathx}{"73}
+
+\newcommand{\va}{\vec{a}}
\newcommand{\vb}{\vec{b}}
-\newcommand{\vc}{\vec{c\vphantom{b}}}
+\newcommand{\vc}{\vec{c}}
\newcommand{\vd}{\vec{d}}
\newcommand{\ve}{\vec{e}}
\newcommand{\vi}{\vec{i}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jnuexam.tlpobj new/tlpkg/tlpobj/jnuexam.tlpobj
--- old/tlpkg/tlpobj/jnuexam.tlpobj 2019-02-28 03:45:26.000000000 +0100
+++ new/tlpkg/tlpobj/jnuexam.tlpobj 2019-11-09 01:54:35.000000000 +0100
@@ -1,15 +1,15 @@
name jnuexam
category Package
-revision 49212
+revision 52696
shortdesc Exam class for Jinan University
relocated 1
longdesc The package provides an exam class for Jinan University
longdesc (China).
-runfiles size=5
+runfiles size=6
RELOC/tex/latex/jnuexam/jnuexam.cls
catalogue-contact-home https://lvjr.bitbucket.io/jnuexam.html
catalogue-ctan /macros/latex/contrib/jnuexam
-catalogue-date 2018-11-21 15:54:53 +0100
+catalogue-date 2019-11-08 10:54:48 +0100
catalogue-license lppl1.3
catalogue-topics exam class chinese
-catalogue-version 0.5
+catalogue-version 0.7
++++++ jsclasses.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/platex/jsclasses/LICENSE new/doc/platex/jsclasses/LICENSE
--- old/doc/platex/jsclasses/LICENSE 2019-04-06 23:11:50.000000000 +0200
+++ new/doc/platex/jsclasses/LICENSE 2020-02-02 23:42:26.000000000 +0100
@@ -1,6 +1,6 @@
Copyright 1995-1999 ASCII MEDIA WORKS
Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2019 Japanese TeX Development Community
+Copyright 2016-2020 Japanese TeX Development Community
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/platex/jsclasses/README.md new/doc/platex/jsclasses/README.md
--- old/doc/platex/jsclasses/README.md 2019-04-06 23:11:50.000000000 +0200
+++ new/doc/platex/jsclasses/README.md 2020-02-02 23:42:26.000000000 +0100
@@ -37,7 +37,7 @@
## Release Date
-2019-04-06
+2020-02-02
Haruhiko Okumura,
Japanese TeX Development Community
Binary files old/doc/platex/jsclasses/jsclasses.pdf and new/doc/platex/jsclasses/jsclasses.pdf differ
Binary files old/doc/platex/jsclasses/jslogo.pdf and new/doc/platex/jsclasses/jslogo.pdf differ
Binary files old/doc/platex/jsclasses/okumacro.pdf and new/doc/platex/jsclasses/okumacro.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jsclasses.doc.tlpobj new/tlpkg/tlpobj/jsclasses.doc.tlpobj
--- old/tlpkg/tlpobj/jsclasses.doc.tlpobj 2019-04-06 23:33:50.000000000 +0200
+++ new/tlpkg/tlpobj/jsclasses.doc.tlpobj 2020-02-03 01:54:45.000000000 +0100
@@ -1,9 +1,9 @@
name jsclasses.doc
category Package
-revision 50813
+revision 53641
shortdesc doc files of jsclasses
relocated 1
-docfiles size=233
+docfiles size=235
RELOC/doc/platex/jsclasses/LICENSE
RELOC/doc/platex/jsclasses/README.md
RELOC/doc/platex/jsclasses/jsclasses.pdf
++++++ jsclasses.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/jsarticle.cls new/tex/platex/jsclasses/jsarticle.cls
--- old/tex/platex/jsclasses/jsarticle.cls 2019-04-06 23:11:50.000000000 +0200
+++ new/tex/platex/jsclasses/jsarticle.cls 2020-02-02 23:42:26.000000000 +0100
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2019/04/06 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -463,6 +463,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -472,6 +473,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \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
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1373,11 +1393,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/jsbook.cls new/tex/platex/jsclasses/jsbook.cls
--- old/tex/platex/jsclasses/jsbook.cls 2019-04-06 23:11:50.000000000 +0200
+++ new/tex/platex/jsclasses/jsbook.cls 2020-02-02 23:42:26.000000000 +0100
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2019/04/06 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -468,6 +468,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -477,6 +478,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \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
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1480,11 +1500,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/jslogo.sty new/tex/platex/jsclasses/jslogo.sty
--- old/tex/platex/jsclasses/jslogo.sty 2017-02-24 23:17:33.000000000 +0100
+++ new/tex/platex/jsclasses/jslogo.sty 2019-07-25 23:47:53.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{jslogo}
- [2017/02/24 okumura, texjporg]
+ [2019/07/25 okumura, texjporg]
\def\jslg@small#1{\hbox{$\m@th$%
\csname S@\f@size\endcsname
\fontsize\sf@size\z@
@@ -207,8 +207,8 @@
\def\upLaTeX{u\pLaTeX}
\def\upLaTeXe{u\pLaTeXe}
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\jslg(a)small{I\kern-.025em B}%
- \ifx\f(a)family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
+\DeclareRobustCommand{\BibTeX}{%
+ B\kern-.05em\jslg(a)small{I\kern-.025em B}\kern-.15em\TeX}
\DeclareRobustCommand{\SliTeX}{%
S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
\providecommand*\pdfstringdefPreHook{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/jspf.cls new/tex/platex/jsclasses/jspf.cls
--- old/tex/platex/jsclasses/jspf.cls 2019-04-06 23:11:50.000000000 +0200
+++ new/tex/platex/jsclasses/jspf.cls 2020-02-02 23:42:26.000000000 +0100
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2019/04/06 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jspf}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -459,6 +459,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -468,6 +469,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \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
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1246,11 +1266,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/jsreport.cls new/tex/platex/jsclasses/jsreport.cls
--- old/tex/platex/jsclasses/jsreport.cls 2019-04-06 23:11:50.000000000 +0200
+++ new/tex/platex/jsclasses/jsreport.cls 2020-02-02 23:42:26.000000000 +0100
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsreport}
- [2019/04/06 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsreport}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -464,6 +464,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -473,6 +474,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \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
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1432,11 +1452,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/kiyou.cls new/tex/platex/jsclasses/kiyou.cls
--- old/tex/platex/jsclasses/kiyou.cls 2019-04-06 23:11:50.000000000 +0200
+++ new/tex/platex/jsclasses/kiyou.cls 2020-02-02 23:42:26.000000000 +0100
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2019/04/06 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc@clsname{kiyou}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -470,6 +470,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -479,6 +480,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \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
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1328,11 +1348,11 @@
\renewcommand{\theenumiii}{\@roman\c@enumiii}
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue (\theenumii )\inhibitglue}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/platex/jsclasses/okumacro.sty new/tex/platex/jsclasses/okumacro.sty
--- old/tex/platex/jsclasses/okumacro.sty 2018-06-23 22:55:43.000000000 +0200
+++ new/tex/platex/jsclasses/okumacro.sty 2019-07-25 23:47:53.000000000 +0200
@@ -24,7 +24,7 @@
\epTeXinputencoding utf8 % ^^A added (2017-10-04)
\fi
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
+\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
\providecommand{\rubyfamily}{}
\def\kanjistrut{\iftdir
\vrule \(a)height0.5zw \(a)depth0.5zw \@width\z@
@@ -249,9 +249,8 @@
\newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
\newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
\newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
-\DeclareRobustCommand{\JBibTeX}{$\mbox{%
- \lower.5ex\hbox{J}\ifx\f(a)family\cmr\kern-.15em\else\kern-.05em\fi
- \BibTeX}$}
+\DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
+ \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
\newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
\newcommand{\iTeX}{\accent'27\i\TeX}
\newcommand{\MlTeX}{M\kern-.1667em\lower.5ex\hbox{L}\kern-.25em\TeX}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jsclasses.tlpobj new/tlpkg/tlpobj/jsclasses.tlpobj
--- old/tlpkg/tlpobj/jsclasses.tlpobj 2019-04-06 23:33:50.000000000 +0200
+++ new/tlpkg/tlpobj/jsclasses.tlpobj 2020-02-03 01:54:46.000000000 +0100
@@ -1,6 +1,6 @@
name jsclasses
category Package
-revision 50813
+revision 53641
shortdesc Classes tailored for use with Japanese
relocated 1
longdesc Classes jsarticle and jsbook are provided, together with
@@ -19,6 +19,5 @@
RELOC/tex/platex/jsclasses/okuverb.sty
catalogue-contact-repository https://github.com/texjporg/jsclasses
catalogue-ctan /macros/latex/contrib/jsclasses
-catalogue-date 2019-04-06 10:47:48 +0200
catalogue-license bsd
catalogue-topics japanese class
++++++ jslectureplanner.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jslectureplanner/README new/doc/latex/jslectureplanner/README
--- old/doc/latex/jslectureplanner/README 2019-02-06 22:59:40.000000000 +0100
+++ new/doc/latex/jslectureplanner/README 2020-02-04 23:16:50.000000000 +0100
@@ -68,6 +68,10 @@
== CHANGES ==
+* V. 1.9 (2020-02-04): - Allow \SetBeamerFrameBreak within SessionBlock.
+ - Fix \SetAutoOffset at first session and add optional argument
+ to alter first session (fix contributed by Richard Zach).
+
* V. 1.8 (2019-02-06): - Add extradate option to \NewSession to support fix dates.
- Add possibility to enter exam dates that are not added to
the standard program (option exam of \NewSession).
@@ -83,8 +87,8 @@
(the short and long date formats would override such settings).
- Add support for lecture and session start time, duration and thus
also end time calculation.
- - Add support for displaying the next semester (\AdjSem and
- \AdjSemVerb).
+ - Add support for displaying the next semester (\adjsemester and
+ \adjsemesterverb).
* V. 1.7 (2018-12-14): - Allow options in \makebeamerprogram also with blocksonly.
- Add overlayarg option to \makebeamerprogram.
Binary files old/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf and new/doc/latex/jslectureplanner/examples/English/lecturebib-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf and new/doc/latex/jslectureplanner/examples/English/lecturehandout-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf and new/doc/latex/jslectureplanner/examples/English/lecturepresentation-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf and new/doc/latex/jslectureplanner/examples/English/lectureprogram-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf and new/doc/latex/jslectureplanner/examples/English/lecturescript-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf and new/doc/latex/jslectureplanner/examples/English/membertable-blank-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf and new/doc/latex/jslectureplanner/examples/English/membertable-filled-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf and new/doc/latex/jslectureplanner/examples/English/presencetable-blank-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf and new/doc/latex/jslectureplanner/examples/English/presencetable-filled-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf and new/doc/latex/jslectureplanner/examples/English/presentation-list-english.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/lecturebib.pdf and new/doc/latex/jslectureplanner/examples/German/lecturebib.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf and new/doc/latex/jslectureplanner/examples/German/lecturehandout.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf and new/doc/latex/jslectureplanner/examples/German/lecturepresentation.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf and new/doc/latex/jslectureplanner/examples/German/lectureprogram.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/lecturescript.pdf and new/doc/latex/jslectureplanner/examples/German/lecturescript.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf and new/doc/latex/jslectureplanner/examples/German/membertable-blank.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf and new/doc/latex/jslectureplanner/examples/German/membertable-filled.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf and new/doc/latex/jslectureplanner/examples/German/presencetable-blank.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf and new/doc/latex/jslectureplanner/examples/German/presencetable-filled.pdf differ
Binary files old/doc/latex/jslectureplanner/examples/German/presentation-list.pdf and new/doc/latex/jslectureplanner/examples/German/presentation-list.pdf differ
Binary files old/doc/latex/jslectureplanner/jslectureplanner.pdf and new/doc/latex/jslectureplanner/jslectureplanner.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/jslectureplanner/jslectureplanner.tex new/doc/latex/jslectureplanner/jslectureplanner.tex
--- old/doc/latex/jslectureplanner/jslectureplanner.tex 2019-02-06 22:59:40.000000000 +0100
+++ new/doc/latex/jslectureplanner/jslectureplanner.tex 2020-02-04 23:16:50.000000000 +0100
@@ -72,7 +72,7 @@
\author{J�rgen Spitzm�ller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/jslectureplanner}.}}
-\date{Version 1.8, 2019/02/06}
+\date{Version 1.9, 2020/02/04}
\maketitle
@@ -312,12 +312,21 @@
Default is 90.
\item \jcsmacro{LecInterval\{\jparam{interval}\}}: Adjust the interval (in days) between two sessions.
The preset interval is 7 (=~weekly courses).
-\item \jcsmacro{SetAutoOffset\{\jparam{n}\}\{\jparam{days}\}}: Automatically shift all subsequent sessions
- by \jparam{days} extra days after every \jparam{n}th session. This is useful if you have each week
- two regular sessions and then a pause until the next week (for instance, a Tuesday +
- Thursday course could be defined via \jcsmacro{LecInterval\{2\}} and
- \jcsmacro{SetAutoOffset\{2\}\{3\}}). \jparam{n} must be a positive integer, \jparam{days} can
- also be a negative integer value.
+\item \jcsmacro{SetAutoOffset[\jparam{first}]\{\jparam{n}\}\{\jparam{days}\}}:
+ Automatically shift all subsequent sessions
+ by \jparam{days} extra days after every \jparam{n}th session,
+ counting the first session as the \jparam{first}th session for
+ this purpose. This is useful if your course meets multiple times
+ a week. For instance, a course meeting Tuesdays and Thursdays
+ could be defined via \jcsmacro{LecInterval\{2\}} and
+ \jcsmacro{SetAutoOffset\{2\}\{3\}}, a course meeting Monday,
+ Wednesday, Friday using \jcsmacro{LecInterval\{2\}} and
+ \jcsmacro{SetAutoOffset\{3\}\{1\}}. \jparam{n} must be a
+ positive integer, \jparam{days} can also be a negative integer
+ value. Use the optional \jparam{first} if the first session in
+ the course is not the first session in a group. For instance, if
+ your course meets Monday/Wednesday/Friday but the first day of
+ term is a Wednesday, use \jcsmacro{SetAutoOffset[2]\{3\}\{1\}}.
\end{itemize}
\subsubsection{Additional information}\label{ses-add}
@@ -437,10 +446,10 @@
\end{itemize}
\item \jcsmacro{SetLecOffset\{\jparam{n}\}}: Shift the date of all subsequent sessions by \jparam{n} days.
\jparam{n} can also be negative.
-\item \jcsmacro{SetBeamerFrameBreak}: Add a frame break in
-the beamer program at this position (more precisely, start a new frame).
-This also increments the frame counter which is used for subsequent program
-frame titles. Note that you can insert maximally 3 breaks.
+\item \jcsmacro{SetBeamerFrameBreak}: Add a frame break in the beamer program at this position
+ (more precisely, start a new frame; see sec.~\ref{sec:lecprog} for details).
+ This also increments the frame counter which is used for subsequent program
+ frame titles. Note that you can insert maximally 3 breaks.
\item \jcsmacro{SetBeamerHook\{\jparam{code}\}}: Add arbitrary LaTeX code to the
beamer program
\item \jcsmacro{begin\{SessionBlock\}\{\jparam{Block title}\}}\\
@@ -545,14 +554,18 @@
\end{frame}
\end{lstlisting}
-Note that multiple subsequent frames (not just slides) are generated if the metadata
-file contains \jcsmacro{SetBeamerFrameBreak} macros.
-Also note that you can refer to the frames via the automatically generated
-labels \emph{beamerprogram} (for the first frame), \emph{beamerprogram2}
-for the second, etc. Finally note that the number of program frames
-is currently limited to 4. If you need more, you should probably rethink
-your program structure.
-
+Note that
+\begin{itemize}
+ \item multiple subsequent frames (not just slides) are generated if the metadata
+ file contains \jcsmacro{SetBeamerFrameBreak} macros (this is because beamer frame breaks
+ via \jfoption{allowframebreaks} and \jfcsmacro{framebreak} do not allow for overlays).
+ \item you can refer to the frames via the automatically generated
+ labels \emph{beamerprogram} (for the first frame), \emph{beamerprogram2}
+ for the second, etc.
+ \item the number of program frames is currently limited to 4. If you need more, you should probably rethink
+ your program structure.
+\end{itemize}
+%
\joption{\jparam{options}} include
\begin{itemize}
\item \joption{title=\jparam{title}}: Program title (\jparam{Heading})
@@ -1164,7 +1177,7 @@
I could not have written the packages of the \jslp\ bundle without the expertise of the incredible \LaTeX\
community. The packages heavily rely on functions and features
provided by other packages (which are listed in sec.~\ref{sec:req-jslp} and \ref{sec:req-jsmt}).
-I am deeply indepted to the authors of those packages.
+I am deeply indebted to the authors of those packages.
Furthermore, \emph{stackexchange} proved to be a great source of knowledge which
provided me with solutions for specific tasks:
\jsmt\ heavily draws on code for dynamic table generation that has been
@@ -1173,17 +1186,25 @@
a \emph{stackexchange} post by Enrico Gregorio (\url{http://tex.stackexchange.com/a/50131}).
The time span calculation uses code provided by Christian Hupfer at
\url{https://tex.stackexchange.com/a/473552/19291}.
-Thank you, Herbert, Enrico and Christian! Finally, Dominik Wa�enhoven tested the package and provided
+Thank you, Herbert, Enrico and Christian!
+Richard Zach provided a fix and enhancement to \jcsmacro{SetAutoOffset}. Many thanks for this.
+Finally, Dominik Wa�enhoven tested the package and provided
me with multiple suggestions, which effectively manifested in major new features such as
the \jslp\ style files. Thanks, Dominik.
\section{Release History}
\begin{itemize}
+\item 2020/02/04 (v. 1.9):
+ \begin{itemize}
+ \item Allow \jcsmacro{SetBeamerFrameBreak} within \joption{SessionBlock}.
+ \item Fix \jcsmacro{SetAutoOffset} at first session and add optional argument
+ to alter first session (fix contributed by Richard Zach).
+ \end{itemize}
\item 2019/02/06 (v. 1.8):
\begin{itemize}
- \item Add support for displaying the next semester (\jcsmacro{AdjSem} and
- \jcsmacro{AdjSemVerb}).
+ \item Add support for displaying the next semester (macros \jcsmacro{adjsemester} and
+ \jcsmacro{adjsemesterverb}).
\item Add support for lecture and session start time, duration and thus also end time
calculation.
\item Add unstyled date formats which allow preceding \jfcsmacro{DTMsetdatestyle}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jslectureplanner.doc.tlpobj new/tlpkg/tlpobj/jslectureplanner.doc.tlpobj
--- old/tlpkg/tlpobj/jslectureplanner.doc.tlpobj 2019-02-28 03:45:27.000000000 +0100
+++ new/tlpkg/tlpobj/jslectureplanner.doc.tlpobj 2020-02-05 01:54:53.000000000 +0100
@@ -1,6 +1,6 @@
name jslectureplanner.doc
category Package
-revision 49963
+revision 53672
shortdesc doc files of jslectureplanner
relocated 1
docfiles size=401
++++++ jslectureplanner.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jslectureplanner/jslectureplanner.sty new/tex/latex/jslectureplanner/jslectureplanner.sty
--- old/tex/latex/jslectureplanner/jslectureplanner.sty 2019-02-06 22:59:40.000000000 +0100
+++ new/tex/latex/jslectureplanner/jslectureplanner.sty 2020-02-04 23:16:50.000000000 +0100
@@ -23,8 +23,8 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\filedate{2019/02/06}
-\def\fileversion{1.8}
+\def\filedate{2020/02/04}
+\def\fileversion{1.9}
\def\filename{jslectureplanner.sty}
\NeedsTeXFormat{LaTeX2e}
@@ -1039,13 +1039,15 @@
}
% Automatic Offset after n sessions
-\newcommand*\SetAutoOffset[2]{%
- \setcounter{autooffsettrigger}{#1}
- \setcounter{autooffset}{#2}
+\newcommand*{\SetAutoOffset}[3][1]{%
+ \setcounter{autooffsetcounter}{#1}
+ \setcounter{autooffsettrigger}{#2}
+ \setcounter{autooffset}{#3}
}
% 3) Definition of thematic blocks
%
+\newtoggle{inblock}
\newcommand*\StartBlock[1]{%
\stepcounter{blocks}%
\protected@eappto\programlist{\noexpand\item[{\noexpand\bfseries\Roman{blocks}}.]%
@@ -1057,6 +1059,7 @@
\protected(a)xappto\programblocklistbeamer{\noexpand\item[{\Roman{blocks}}.] #1}%
\csxdef{@currentblock}{#1}%
\csxdef{@currentblockno}{\Roman{blocks}}%
+ \global\toggletrue{inblock}%
}
\newcommand*\EndBlock{%
@@ -1064,6 +1067,7 @@
\gappto\programlistbeamer{\end{description}}
\csxdef{@currentblock}{}%
\csxdef{@currentblockno}{}%
+ \global\togglefalse{inblock}%
}
\newcommand*\NewBlock[1]{%
@@ -1071,23 +1075,36 @@
\StartBlock{#1}
}
+\newcommand*\@PauseBlock{%
+ \gappto\programlist{\end{labeling}}
+ \gappto\programlistbeamer{\end{description}}
+}
+
+\newcommand*\@ResumeBlock{%
+ % the \item here is necessary since this is nested immediately into another list
+ \gappto\programlist{\item \begin{labeling}{\lecprogramlistindent}}%
+ \gappto\programlistbeamer{\item \begin{description}[\lecprogramlistindent]}
+}
+
\newenvironment{SessionBlock}[1]{\StartBlock{#1}}{\EndBlock}
% 4) Beamer-specific features
%
% Beamer frame breaks
\newcommand*\SetBeamerFrameBreak{%
+ \iftoggle{inblock}{\@PauseBlock}{}%
\stepcounter{fbreaks}
- \@ifundefined{programlistbeamerii}{%
+ \ifdefined\programlistbeamerii
+ \ifdefined\programlistbeameriii
+ \global\let\programlistbeameriv\programlistbeamer
+ \else
+ \global\let\programlistbeameriii\programlistbeamer
+ \fi
+ \else%
\global\let\programlistbeamerii\programlistbeamer
- }{%
- \@ifundefined{programlistbeameriii}{%
- \global\let\programlistbeameriii\programlistbeamer
- }{%
- \global\let\programlistbeameriv\programlistbeamer
- }
- }
+ \fi
\global\let\programlistbeamer\empty
+ \iftoggle{inblock}{\@ResumeBlock}{}%
}
% Beamer program hook
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/jslectureplanner/jsmembertable.sty new/tex/latex/jslectureplanner/jsmembertable.sty
--- old/tex/latex/jslectureplanner/jsmembertable.sty 2019-02-06 22:59:40.000000000 +0100
+++ new/tex/latex/jslectureplanner/jsmembertable.sty 2020-02-04 23:16:50.000000000 +0100
@@ -24,8 +24,8 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\filedate{2019/02/06}
-\def\fileversion{1.8}
+\def\filedate{2020/02/04}
+\def\fileversion{1.9}
\def\filename{jsmembertable.sty}
\NeedsTeXFormat{LaTeX2e}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/jslectureplanner.tlpobj new/tlpkg/tlpobj/jslectureplanner.tlpobj
--- old/tlpkg/tlpobj/jslectureplanner.tlpobj 2019-02-28 03:45:28.000000000 +0100
+++ new/tlpkg/tlpobj/jslectureplanner.tlpobj 2020-02-05 01:54:54.000000000 +0100
@@ -1,6 +1,6 @@
name jslectureplanner
category Package
-revision 49963
+revision 53672
shortdesc Creation and management of university course material
relocated 1
longdesc The jslectureplanner package facilitates the generation and
@@ -21,7 +21,6 @@
RELOC/tex/latex/jslectureplanner/jsmembertable.sty
catalogue-contact-repository https://github.com/jspitz/jslectureplanner
catalogue-ctan /macros/latex/contrib/jslectureplanner
-catalogue-date 2019-02-09 05:50:04 +0100
catalogue-license lppl1.3
catalogue-topics teaching
-catalogue-version 1.8
+catalogue-version 1.9
++++++ junicode.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/COPYING new/doc/fonts/junicode/COPYING
--- old/doc/fonts/junicode/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/junicode/COPYING 2020-02-28 23:21:39.000000000 +0100
@@ -0,0 +1,93 @@
+(c) 1998-2018 Peter S. Baker
+
+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:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/ChangeLog new/doc/fonts/junicode/ChangeLog
--- old/doc/fonts/junicode/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/junicode/ChangeLog 2020-02-28 23:21:39.000000000 +0100
@@ -0,0 +1,154 @@
+2018-06-25 Peter Baker <peter@mycomputer>
+
+ * all: Corrected bug that caused incorrect clipping in MS Word for
+ the Mac. Added sigma in Regular and Italic faces. Incorrect glyph
+ was displayed for EBA1 in Regular face. uni1EBD added for Bold and
+ BoldItalic. Anchor added for E8BF in Regular and
+ Italic. Linespacing numbers revised: we've returned to using
+ linegap numbers.
+
+2017-09-06 Peter Baker <peter@hengest>
+
+ * Junicode, Junicode-Italic: Mkmk failed in different ways in
+ different applications. It turned out this was about the ways
+ different shaping engines handled normalization. Solution was to
+ add anchors to the precomposed characters in the Unicode
+ Normalization List (single-storey only).
+
+2017-08-27 Peter Baker <peter@hengest>
+
+ * Junicode, Junicode-Italic: MUFI 4.0 now fully implemented in
+ regular and italic faces.
+
+2017-08-16 Peter Baker <peter@hengest>
+
+ * Junicode-Italic: Characters and features added to bring italic
+ face into line with regular. It is now possible to switch back and
+ forth between regular and italic losslessly.
+
+ * Junicode: Greek ranges removed and placed in a new font, Foulis
+ Greek, which has all the kerning and OT features that were in
+ Junicode Greek.
+
+ * Junicode, Junicode-Italic: Removed ss14 feature as no longer
+ necessary, now that combining ogonek above is part of the Unicode
+ standard (U+1DCE). mgrk removed as no longer necessary; Greek math
+ and PUA charaacters moved from unencoded area to vacated Greek
+ range. hist now substitues longs for s everywhere except at
+ word-end and before apostrophe + letter. fina removed as not
+ appropriate for Latin script.
+
+ * All: ccmp "make precomposed" disabled. Must decide whether to
+ retain this feature.
+
+ * Junicode, Junicode-Italic: Selection of cap combining marks
+ expanded. These are covered by case feature, used automatically in
+ some applications. Coverage of mark and mkmk features expanded.
+
+ * All: Source format is now UFO. Ongoing cleanup of decayed glyphs
+ (FontForge TrueType editing being somewhat lossy). Change of
+ format and editor should stop the decay.
+
+ * Junicode-Bold, Junicode-BoldItalic: These two faces are being
+ maintained but not developed further. Anyone want to take them
+ over?
+
+ * All: Too many minor changes to list, over five years.
+
+2012-12-27 Peter Baker <peter@hengest>
+
+ * Junicode*: ss17 now used for linguistic alternates. Regularized
+ underline position and thickness. Added uni0294.alt, accessible
+ via ss17. theta1 is now present in all faces. anchor added for
+ scaron.
+
+ * Junicode-Italic, Junicode-Regular: Number Forms range now
+ complete and up-to-date.
+
+ * Junicode-Italic: subs lookup added. Roman numbers in Number
+ Forms range accessible via dlig.
+
+ * Junicode-BoldItalic: below-char anchors added for Basic
+ Latin. uni330 (combining tilde below) added.
+
+ * Junicode-Bold: more below-char anchors added in Basic
+ Latin. uni330 (combining tilde below) added.
+
+2012-11-17 Peter Baker <peter@hengest>
+
+ * Junicode*: f_f ligature now behaves like f when vowel with
+ diacritic follows. -f option for ttfautohint forces hinting of all
+ characters in the font. Kerning of f-ligatures corrected. Common
+ ligatures moved to unencoded slots (references left behind for
+ backward compatibility), improving searchability in PDF
+ files. Metrics slightly changed to address Windows clipping
+ problems.
+
+ * Junicode-Bold, Junicode-Regular: Small caps added for some base
+ letter + diacritic combos.
+
+ * Junicode-Regular: Fixups of Greek outlines. digamma, koppa, Cap
+ stigma added. Two more ligatures added from the Foulis-Wilson
+ specimen.
+
+ * Junicode-Italic: Several cap swashes added: A, J, D, Q, AE
+ (these are used in Hickes's Thesaurus). k_i, s_t ligatures added.
+
+2012-04-08 Peter Baker <peter@hengest>
+
+ * Junicode-Regular: All ligatures and stylistic alternates found
+ in the Foulis Homer have been added in the regular face: these are
+ accessed via hlig and salt. It may be necessary to set the script
+ explicitly to Greek to access these Greek features. The style of
+ rho used in the Foulis Homer has been made the default.
+
+2012-04-01 Peter Baker <peter@hengest>
+
+ * Junicode-Regular, Junicode-Italic, Junicode-Bold,
+ Junicode-BoldItalic: Gothic now in all four faces. Original Gothic
+ moved to Bold; Gothic in Regular harmonizes with small caps;
+ skewed versions in Italic and BoldItalic.
+ * Junicode.tex: revised Gothic specimen; added note on use of mgrk
+ to get IPA shapes of beta and theta.
+
+2012-03-27 Peter Baker <peter@hengest>
+
+ * Junicode-Regular: Added Gothic range; added lookups ss19
+ (Latin-to-Gothic tranliteration) and ss20 (Gothic-to-Latin
+ transliteration).
+
+2012-03-07 Peter Baker <peter@hengest>
+
+ * Junicode-Bold, Junicode-Italic, Junicode-BoldItalic: Swashes
+ (for Middle English) for all 4 faces
+ * All: Improvements for Turkish (including dotted small-cap
+ i). These should be automatic via locl.
+ * All: Improved shape of dcaron, tcaron, lcaron (with kerning) for
+ Eastern European languages
+ * Junicode-Bold: small caps for bold face
+ * Junicode-Bold, Junicode-BoldItalic: added capital Eszett, U+1E9E
+ * Junicode-Regular, Junicode-Bold: small cap Eszett when c2sc is
+ applied to U+1E9E
+ * Junicode-Regular, Junicode-Italic, Junicode-Bold: IPA shapes of
+ beta, theta available at U+701, U+702 (and alternative omega in
+ regular at U+703). Preferred method of accessing these is still
+ via standard beta and theta + mgrk
+ * All: arrows at U+2190 - U+2193; emptyset at U+2205
+ * All: f.alt accessible via salt
+ * All: kern f + exclam
+ * All: obsolete MUFI code points removed; these codes may be reused.
+ * All: minimal Panose values
+ * All: additional small caps for Eastern European languages
+ * All: additional small caps for Turkish
+ * Junicode-Bold, Junicode-Italic, Junicode-BoldItalic: more MUFI
+ characters here and there
+ * Junicode-Regular, Junicode-Italic: some filling in of Latin
+ Extended B
+ * Junicode-Regular, Junicode-Italic: deleted s03 lookup
+ * Junicode-Regular: A number of Fleurons in retired MUFI code
+ points in the PUA
+ * Junicode-Regular: continuing to add Greek historic
+ ligatures. Try omicron + upsilon, epsilon + iota, alpha + iota,
+ alpha + upsilon, with various accents.
+ * Junicode-Regular: reordered GPOS kern lookups to fix a problem
+ in Scribus
Binary files old/doc/fonts/junicode/Junicode.pdf and new/doc/fonts/junicode/Junicode.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/Junicode.tex new/doc/fonts/junicode/Junicode.tex
--- old/doc/fonts/junicode/Junicode.tex 2012-11-18 01:43:31.000000000 +0100
+++ new/doc/fonts/junicode/Junicode.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,646 +0,0 @@
-%&program=xelatex
-%&encoding=UTF-8 Unicode
-
-\documentclass[12pt,a4paper,openany]{book}
-
-\usepackage{fontspec}
-
-\usepackage{microtype}
-
-\setmainfont[Contextuals=Alternate]{Junicode}
-
-\newICUfeature{StyleSet}{insular}{+ss02,-liga}
-\newICUfeature{StyleSet}{highline}{+ss04}
-\newICUfeature{StyleSet}{medline}{+ss05}
-\newICUfeature{StyleSet}{enlarged}{+ss06}
-\newICUfeature{StyleSet}{underdot}{+ss07}
-\newICUfeature{StyleSet}{altyogh}{+ss08}
-\newICUfeature{StyleSet}{altpua}{+ss09}
-\newICUfeature{StyleSet}{althook}{+ss14}
-\newICUfeature{StyleSet}{altogonek}{+ss15}
-\newICUfeature{StyleSet}{oldpunct}{+ss18}
-\newICUfeature{StyleSet}{gothic}{+ss19}
-\newICUfeature{StyleSet}{gothtolat}{+ss20}
-\newICUfeature{MirrorRunes}{on}{+rtlm}
-\newICUfeature{IPAMode}{on}{+mgrk,-liga}
-\newICUfeature{Fractions}{on}{+frac}
-\newICUfeature{Superscripts}{on}{+sups}
-\newICUfeature{Subscripts}{on}{+subs}
-\newcommand{\salt}[1]{{\addfontfeatures{Alternate=0}{#1}}}
-\newcommand{\saltb}[1]{{\addfontfeatures{Alternate=1}{#1}}}
-\usepackage{color}
-\definecolor{titlblue}{rgb}{0.34,0.33,0.63}
-\definecolor{titlred}{rgb}{0.75,0.29,0.31}
-\definecolor{titlbrown}{rgb}{0.41,0.34,0.30}
-\definecolor{myRed}{rgb}{0.5,0,0}
-\definecolor{myPink}{rgb}{1.0,0.7,0.7}
-\definecolor{myBlue}{rgb}{0,0,0.5}
-\definecolor{myLightBlue}{rgb}{0.7,0.7,1.0}
-\definecolor{myGreen}{rgb}{0,0.5,0}
-\definecolor{myMaroon}{rgb}{0.35,0,0.5}
-\usepackage{fancyhdr}
-\pagestyle{fancy}
-\fancyfoot{}
-\renewcommand{\headrulewidth}{0pt}
-\newcommand{\sampletext}{Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 12345 \addfontfeatures{Numbers=OldStyle}12345}
-\newcommand{\sctext}{Cum multa divinitus, pontifices, a
-ma\-ioribus nos\-tris in\-venta atque in\-sti\-tuta sunt}
-
-\frenchspacing
-\setlength{\parskip}{0ex plus0ex minus0ex}
-\tolerance=1000
-
-\begin{document}
-\begin{titlepage}
-\huge\noindent
-{\color{myRed}}\\[5cm]
-\Huge \hfill {\color{myBlue}Junicode}\hfill \\[1cm]
-\huge \hfill the font for medievalists\hfill \\[1cm]
- \Huge\hfill {\color{myRed}}\hfill \\[1cm]
- \huge\hfill {\itshape specimens and user’s guide}\hfill \\
-\vfill
-{\color{myRed}}
-\end{titlepage}
-\mainmatter
-\fancyhead[CE]{\scshape\color{myRed} {\addfontfeatures{Numbers=OldStyle}\thepage}\hspace{10pt}junicode}
-\fancyhead[CO]{\scshape\color{myRed} {junicode}\hspace{10pt}{\addfontfeatures{Numbers=OldStyle}\thepage}}
-\chapter*{\color{myBlue}Junicode}
-\large
-
-\noindent The Junicode font is designed to
-meet the needs of medieval scholars; however, it has a large enough
-character set to be useful to the general user. It comes in Regular,
-Italic, Bold and Bold Italic faces. The Regular face has the fullest
-character set and is richest in OpenType features.
-
-Both the selection and design of the characters in Junicode reflect
-the needs of medievalists. However, many persons writing in ancient
-and modern languages have found the font useful. If you wish to see
-better support for any language, please leave a request at the
-Junicode project page (http://sourceforge.net/projects/junicode).
-
-Junicode implements most of the recommendation of the Medieval Unicode
-Font Initiative (version 3.0). Look for special MUFI characters
-(those not in the Unicode standard) in the Private Use Area (U+E000
-and above). Download the complete recommendation at
-http://www.mufi.info/.
-
-Junicode is licensed under the SIL Open Font License: for the full
-text, go to
-http://scripts.sil.org/OFL. Briefly: You may use Junicode in any
-kind of publication, print or electronic, without fee or
-restriction. You may modify the font for your own use. You may
-distribute your modified version in accordance with the terms of the
-license.
-
-\begin{center}
-\Huge\color{myRed}
-\end{center}
-
-\chapter*{\color{myBlue}Specimens}
-
-\fontspec{Junicode}
-\noindent {\tiny \sampletext} {\small \sampletext} {\large \sampletext}
-{\Large \sampletext} {\LARGE \sampletext} {\huge \sampletext}\\
-
-{\itshape\noindent {\tiny \sampletext} {\small \sampletext} {\large \sampletext}
-{\Large \sampletext} {\LARGE \sampletext} {\huge \sampletext}}\\
-
-{\bfseries\noindent {\tiny \sampletext} {\small \sampletext} {\large \sampletext}
-{\Large \sampletext} {\LARGE \sampletext} {\huge \sampletext}}\\
-
-{\bfseries\itshape\noindent {\tiny \sampletext} {\small \sampletext} {\large \sampletext}
-{\Large \sampletext} {\LARGE \sampletext} {\huge \sampletext}}\\
-
-\noindent {\scshape {\tiny \sctext} {\small \sctext} {\large \sctext}
-{\Large \sctext} {\LARGE \sctext}}\\
-
-\noindent {\scshape\bfseries {\tiny \sctext} {\small \sctext} {\large \sctext}
-{\Large \sctext} {\LARGE \sctext}}\\
-
-\noindent{\Large abcdefghijklmnopqrstuvwxyz æðþȝ\\
-ABCDEFGHIJKLMNOPQRSTUVWXYZ ÆÐÞȜ\\
-αβγδεζηθικλμνξοπρςστυφχψω\\
-ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ}\newpage
-
-\subsection*{Old and Middle English}
-
-\noindent{\small\itshape The default letter-shapes are suitable for
-setting Old and Middle English.}\\[1ex]
-Wē æthrynon mid ūrum ārum þā ȳðan þæs dēopan wǣles; wē
-ġesāwon ēac þā muntas ymbe þǣre sealtan sǣ strande, and wē mid
-āðēnedum hræġle and ġesundfullum windum þǣr ġewīcodon on þām
-ġemǣrum þǣre fæġerestan þēode. Þā ȳðan ġetācniað þisne dēopan
-cræft, and þā muntas ġetācniað ēac þā miċelnyssa þisses cræftes.\\
-
-\noindent S{\scshape iþen} þe sege and þe assaut watz sesed at Troye,\\
-Þe borȝ brittened and brent to brondez and askez,\\
-Þe tulk þat þe trammes of tresoun þer wroȝt\\
-Watz tried for his tricherie, þe trewest on erthe:\\
-Hit watz Ennias þe athel, and his highe kynde,\\
-Þat siþen depreced prouinces, and patrounes bicome\\
-Welneȝe of al þe wele in þe west iles.\\
-
-\noindent{\small\itshape Apply the OpenType feature ss02 (Style Set 2)
-for insular letter-forms.}\\[1ex]
-{\addfontfeature{StyleSet=insular,Ligatures=NoCommon,StyleSet=altogonek}
-Her cynewulf benam sigebryht his rices \& weſtſeaxna wiotan for
-un\-ryht\-um dędū buton hamtúnſcire \& he hæfde þa oþ he ofslog
-þone aldormon þe hī lengeſt wunode \& hiene þa cynewulf on
-andred adræfde \& ħ þær wunade oþ þæt hine án ſwán ofſtang
-æt pryfetesflodan \& he wręc þone aldormon cumbran \& se cynewulf
-oft miclum gefeohtum feaht uuiþ bretwalū.}
-
-
-
-\subsection*{Old Icelandic}
-
-\fontspec[Language=Icelandic]{Junicode}
-{\small\itshape For Nordic shapes of þ and ð, specify the Icelandic
-language, if your application has good language support; or apply the OpenType
-ss01 (Style Set 1) feature.}\\[1ex]
-Um haustit sendi Mǫrðr Valgarðsson orð at Gunnarr myndi vera einn heimi, en
-lið alt myndi vera niðri í eyjum at lúka heyverkum. Riðu þeir Gizurr Hvíti ok
-Geirr Goði austr yfir ár, þegar þeir spurðu þat, ok austr yfir sanda til Hofs.
-Þá sendu þeir orð Starkaði undir Þríhyrningi; ok fundusk þeir þar allir er at
-Gunnari skyldu fara, ok réðu hversu at skyldi fara.
-
-\subsection*{Runic}
-\fontspec{Junicode}
-ᚠᛁᛋᚳ ᚠᛚᚩᛞᚢ ᚪᚻᚩᚠ ᚩᚾ ᚠᛖᚱᚷᛖᚾᛒᛖᚱᛁᚷ ᚹᚪᚱᚦ ᚷᚪ᛬ᛇᚱᛁᚳ ᚷᚱᚩᚱᚾ ᚦᚨᚱ ᚻᛖ ᚩᚾ ᚷᚱᛖᚢᛏ ᚷᛁᛇᚹᚩᛗ
-ᚻᚱᚩᚾᚨᛇ ᛒᚪᚾ\\
-ᚱᚩᛗᚹᚪᛚᚢᛇ ᚪᚾᛞ ᚱᛖᚢᛗᚹᚪᛚᚢᛇ ᛏᚹᛟᚷᛖᚾ ᚷᛁᛒᚱᚩᚦᚫᚱ ᚪᚠᛟᛞᛞᚫ ᛞᛁᚫ ᚹᚣᛚᛁᚠ ᚩᚾ ᚱᚩᛗᚫ\linebreak[0]ᚳᚫᛇᛏᛁ᛬
-ᚩᚦᛚᚫ ᚢᚾᚾᛖᚷ
-
-\subsection*{German}
-
-Ich ſag üch aber / minen fründen / Foͤꝛchtēd üch nit voꝛ denen die den
-lyb toͤdend / vnd darnach nichts habennd das ſy mer thuͤgind. Ich wil
-üch aber zeigē voꝛ welchem ir üch \saltb{f}oͤꝛchten ſollend. Foͤꝛchtend üch voꝛ
-dem / der / nach dem er toͤdet hat / ouch macht hat zewerffen inn die
-hell: ja ich ſag üch / voꝛ dem ſelben \saltb{f}oͤꝛchtēd üch. Koufft man nit
-fünff Sparen vm̄ zween pfennig\\[1ex]
-{\Large Die straße ist zu schmal für autos. Wohin fährt dieser Zug?}\\
-DIE STRAẞE IST ZU SCHMAL FÜR AUTOS.
-{\itshape DIE STRAẞE IST ZU SCHMAL FÜR AUTOS.}
-{\bfseries DIE STRAẞE IST ZU SCHMAL FÜR AUTOS.}
-{\itshape\bfseries DIE STRAẞE IST ZU SCHMAL FÜR AUTOS.}\\[1ex]
-{\scshape Die straße ist zu schmal für autos.
-\bfseries Die straße ist zu schmal für autos.}
-{\itshape Use c2sc for small cap Eszett:}
-{\addfontfeature{Letters=UppercaseSmallCaps}DIE STRAẞE IST ZU SCHMAL FÜR AUTOS.
-\bfseries DIE STRAẞE IST ZU SCHMAL FÜR AUTOS.}
-
-
-
-\subsection*{Latin}
-
-{\small\itshape Junicode contains the most common Latin abbreviations,
- making it suitable for diplomatic editions of Latin texts.}\\[1ex]
-{\addfontfeatures{StyleSet=altogonek}Adiuuanos dſ̄ ſalutariſ noſter \&
- ꝓpt̄ głam nominiſ tui dnē liƀanoſ· \& ꝓpitiuſ eſto peccatiſ noſtriſ
- ꝓpter nomen tuum· Ne forte dicant ingentib: ubi eſt dſ̄ eorum \&
- innoteſcat innationib: corā oculiſ nr̄iſ· Poſuerunt moſticina
- ſeruorū ruorū eſcaſ uolatilib: cęli carneſ ſcōꝝ tuoꝝ beſtiiſ tenice·
- Facti ſumꝰ ob\kern+0.2ptꝓbrium uiciniſ nr̄iſ·}
-
-\subsection*{Gothic}
-
-jabai auk ƕas gasaiƕiþ þuk þana habandan kunþi in galiuge stada
-anakumbjandan, niu miþwissei is siukis wis\-an\-dins timrjada du
-galiugagudam gasaliþ matjan? fraqistniþ auk sa unmahteiga ana
-þeinamma witubnja broþar in þize Xristus gaswalt. swaþ~þan
-frawaurkjandans wiþra broþruns, slahandans ize gahugd siuka, du
-Xristau fra\-waur\-keiþ.\\
-
-{\noindent\small\itshape Use ss19 to produce Gothic letters
- automatically from transliterated text and ss20 to produce Latin
- letters from Gothic. Available in all four faces.}\\[1ex]
-{\addfontfeature{StyleSet=gothic}jabai auk ƕas gasaiƕiþ þuk þana
- habandan kunþi in ga\-liuge stada anakumbjandan, niu miþwissei is
- siukis wis\-an\-dins timrjada du galiugagudam gasaliþ matjan?
- {\bfseries jabai auk ƕas gasaiƕiþ þuk þana habandan kunþi in
- ga\-liuge stada anakumbjandan, niu miþwissei is siukis
- wis\-an\-dins timrjada du galiugagudam gasaliþ matjan?}
- \textit{abgdeqzh \bfseries abgdeqzh}}
-
-\subsection*{Sanskrit Transliteration}
-
-\noindent mānaṁ dvividhaṁ viṣayadvai vidyātśaktyaśaktitaḥ \\
- arthakriyāyāṁ keśadirnārtho ’narthādhimokṣataḥ\\[1ex]
-sadr̥śāsadr̥śatvācca viṣayāviṣayatvataḥ \\
- śabdasyānyanimittānāṁ bhāve dhīsadasattvataḥ
-
-\subsection*{International Phonetic Alphabet}
-\fontspec[IPAMode=on]{Junicode}
-hwɑn θɑt ɑːprɪl wiθ is ʃuːrəs soːtə θə drʊxt ɔf mɑrʧ hɑθ peːrsəd toː
-θə roːte ɑnd bɑːðəd ɛvrɪ væɪn ɪn swɪʧ lɪkuːr ɔf hwɪʧ vɛrtɪu
-ɛnʤɛndrəd ɪs θə fluːr hwɑn zɛfɪrʊs eːk wɪθ hɪs sweːtə bræːθ
-\fontspec{Junicode}
-
-\subsection*{Greek}
-
-{\small\itshape The Greek typeface (available only in the regular
- face) is based on the Greek Double Pica cut by Alexander Wilson of
- Glasgow in the eighteenth century. It is not really suitable for
- setting modern Greek; those who want a more modern Greek face that
- harmonizes well with Junicode should consider GFS Didot
- Classic or GFS Porson.}\\[1ex]
-{\addfontfeature{Script=Greek}βίβλος
-γενέσεως ἰησοῦ χ\kern+1pt\salt{ρ}ιστοῦ υἱοῦ δαυὶδ
-υἱοῦ ἀβραάμ.
-ἀβραὰμ
-ἐγέννησεν τὸν ἰσαάκ, ἰσαὰκ δὲ ἐγέννησεν
-τὸν ἰακώβ, ἰακὼβ δὲ ἐγέννησεν τὸν
-ἰούδαν καὶ τοὺς ἀδελφοὺς αὐτοῦ,
-ἰούδας
-δὲ ἐγέννησεν τὸν φάρες καὶ τὸν ζάρα
-ἐκ τῆς θαμάρ, φάρες δὲ ἐγέννησεν τὸν
-ἑσρώμ, ἑσρὼμ δὲ ἐγέννησεν τὸν ἀράμ,
-ἀρὰμ
-δὲ ἐγέννησεν τὸν ἀμιναδάβ, ἀμιναδὰβ
-δὲ ἐγέννησεν τὸν ναασσών, ναασσὼν δὲ
-ἐγέννησεν τὸν σαλμών,
-σαλμὼν
-δὲ ἐγέννησεν τὸν βόες ἐκ τῆς ῥαχάβ,
-βόες δὲ ἐγέννησεν}\\[1ex]
-{\small\itshape Use the OpenType feature hlig and salt for old-style ligatures
-and alternative letter-shapes:}\\[1ex]
-{\addfontfeature{Script=Greek,Ligatures=Historic}βί\salt{β}λος
-γενέσεως ἰησοῦ χ\kern+1pt\salt{ρ}ισ\salt{τ}οῦ υἱοῦ δαυὶδ
-υἱοῦ ἀ\salt{β}ραάμ.
-ἀ\salt{β}ραὰμ
-ἐγέννησεν τὸν ἰσαάκ, ἰσαὰκ δὲ ἐγέννησεν
-τὸν ἰακώ\salt{β}, ἰακὼ\salt{β} δὲ ἐγέννησεν τὸν
-ἰούδαν καὶ τοὺς ἀδελφοὺς αὐτοῦ,
-ἰούδας
-δὲ ἐγέννησεν τὸν \salt{φ}άρες καὶ τὸν ζάρα
-ἐκ τῆς \salt{θ}αμάρ, φάρες δὲ ἐγέννησεν τὸν
-ἑσρώμ, ἑσρὼμ δὲ ἐγέννησεν τὸν ἀράμ,
-ἀρὰμ
-δὲ ἐγέννησεν τὸν ἀμιναδά\salt{β}, ἀμιναδὰ\salt{β}
-δὲ ἐγέννησεν τὸν ναασσών, ναασσὼν δὲ
-ἐγέννησεν τὸν σαλμών,
-σαλμὼν
-δὲ ἐγέννησεν τὸν βόες ἐκ τῆς ῥαχά\salt{β},
-βόες δὲ ἐγέννησεν}\\[1ex]
-
-\subsection*{Lithuanian}
-
-{\small\itshape Lithuanian poses several typographical challenges. An
- accented i retains its dot: i̇́; and certain characters with ogonek
- must avoid colliding with a following j:
- {\upshape\addfontfeatures{Contextuals=Alternate} ęj ųj}. Make sure
- Contextual Alternates (calt) is turned on; for i̇́, use i followed
- by non-spacing dot accent (0307) and acute (0301).}\\[1ex]
-Visa žemė turėjo vieną kalbą ir tuos pačius žodžius. Kai žmonės
-kėlėsi iš rytų, jie rado slėnį Šinaro krašte ir ten įsikūrė. Vieni
-kitiems sakė: Eime, pasidirbkime plytų ir jas išdekime. – Vietoj
-akmens jie naudojo plytas, o vietoj kalkių – bitumą. Eime, – jie
-sakė, – pasistatykime miestą ir bokštą su dangų siekiančia viršūne ir
-pasidarykime sau vardą, kad nebūtume išblaškyti po visą žemės veidą.
-
-\subsection*{Polish}
-{\small\itshape The default shape and position of ogonek in Junicode are suitable
-for modern Polish. For the medieval Latin e-caudata, consider using
-ss15.}\\[1ex]
-Mieszkańcy całej ziemi mieli jedną mowę, czyli jednakowe słowa. A
-gdy wędrowali ze wschodu, napotkali równinę w kraju Szinear i tam
-zamieszkali. I mówili jeden do drugiego: Chodźcie, wyrabiajmy cegłę
-i wypalmy ją w ogniu. A gdy już mieli cegłę zamiast kamieni i smołę
-zamiast zaprawy murarskiej, rzekli: Chodźcie, zbudujemy sobie miasto
-i wieżę, której wierzchołek będzie sięgał nieba, i w ten sposób
-uczynimy sobie znak, abyśmy się nie rozproszyli po całej ziemi.
-
-\subsection*{Czech}
-{\small\itshape Special care has recently been taken to improve
- handling
-of Eastern European languages. The developer solicits suggestions for
-further improvement.}\\
-Pojďme do Betléma a přesvědčme
-se o tom, co nám anděl oznámil. Mojžíšův Zákon přikazoval, aby každá
-žena čtyřicátý den po narození chlapce přinesla oběť do chrámu.
-{\itshape Pojďme do Betléma a přesvědčme
-se o tom, co nám anděl oznámil. Mojžíšův Zákon přikazoval, aby každá
-žena čtyřicátý den po narození chlapce přinesla oběť do chrámu.}
-{\bfseries Pojďme do Betléma a přesvědčme
-se o tom, co nám anděl oznámil. Mojžíšův Zákon přikazoval, aby každá
-žena čtyřicátý den po narození chlapce přinesla oběť do chrámu.}
-{\scshape Pojďme do Betléma a přesvědčme
-se o tom, co nám anděl oznámil. Mojžíšův Zákon přikazoval, aby každá
-žena čtyřicátý den po narození chlapce přinesla oběť do chrámu.}
-
-\subsection*{Fleurons}
-
-\begin{center}
-\huge \\
- \\[0.7ex]
-\\[0.7ex]
-\\
-
-\end{center}
-
-\chapter*{\color{myBlue}OpenType Features}
-
-{\itshape Following is a list of the OpenType features in
- Junicode. For instructions on applying OpenType features, consult
- the documentation for your preferred application. Note that you
- should turn on the following features, if they are not on by
- default: {\upshape liga} (Standard Ligatures), {\upshape ccmp}
- (Glyph Composition/Decomposition), {\upshape calt} (Contextual
- Alternates), {\upshape kern} (Horizontal Kerning).}
-
-\subsection*{Standard Ligatures (liga)}
-
-Like many old-style fonts, Junicode contains the most common f-ligatures
-(first flight offer office afflict fjord) and some that are less common
-(e.g. thrift fifty afraid für fördern). It
-also has long-s ligatures (e.g. aſſert ſtart ſlick omiſſion).
-
-\subsection*{Glyph Composition/Decomposition (ccmp)}
-
-A base character followed by one or more combining diacritical marks
-is replaced with a precomposed character when that would look
-different from the character + diacritic sequence: for example A +
-U+301 makes Á, where a special upper-case form of the diacritic is
-used.
-
-\subsection*{Contextual Alternates (calt)}
-
-When this feature is on (as it should be by default), Junicode will
-avoid unsightly collisions between neighboring characters such as f
-and vowels with diacritics, e.g. fêler fíf fŭl. If you find that f
-collides with some other character, you can select the narrower
-\saltb{f} via the OpenType salt feature.
-
-\subsection*{Stylistic Alternates (salt)}
-
-This feature gives you direct access to a number of alternates that
-are available via other features. Some of these (for example the
-narrow f) may be useful to avoid collisions that the font designer has
-not anticipated. In Greek script, alternative letter shapes should be
-accessed via salt:
-e.g. {\addfontfeature{Script=Greek}β\salt{β}γ\salt{γ}ρ\salt{ρ}τ\salt{τ}φ\salt{φ}.}
-It may be necessary to set the script to Greek explicitly to access
-Greek alternates.
-
-\subsection*{Kerning (kern)}
-
-Junicode uses class-based kerning. A few applications are unable to
-use it.
-
-\subsection*{Discretionary Ligatures (dlig)}
-
-This feature will give you fancy ligatures, e.g. %
-{\addfontfeature{Ligatures=Discretionary} act star track bitten
- attract,} %
-and also connected Roman numbers (%
-{\addfontfeature{Ligatures=Discretionary} I II III IV V VI VII VIII IX X XI
- XII}).
-Use it also for circled numbers and letters:
-[1] {\addfontfeature{Ligatures=Discretionary}= [1]};
-[A] {\addfontfeature{Ligatures=Discretionary}= [A]};
-[a] {\addfontfeature{Ligatures=Discretionary}= [a]};
-[[1]] {\addfontfeature{Ligatures=Discretionary}= [[1]]};
-<1> {\addfontfeature{Ligatures=Discretionary}= <1>}
-(regular face only).
-
-\subsection*{Historical Ligatures (hlig)}
-
-Nearly all of MUFI’s ligatures are
-accessible via “Historical Ligatures” (hlig).
-{\addfontfeature{Ligatures=Historic}Even if you are not a medievalist,
- you may still be amused by the strange effects you can achieve by
- turning on this feature: egg track caught fan sock book save aardvark
- chaos AA AO
- AU AV.} This feature willl also permit you to access a large number
-of historical Greek ligatures that appear in the Foulis Homer, e.g.
-{\addfontfeatures{Script=Greek,Ligatures=Historic}ἰφθίμους
- ἐτελείε\salt{τ}ο
-διαστήτην μάχεσθαι χραίσμῃ.} You may have to
-set the script to Greek explicitly to access Greek historical ligatures.
-
-\subsection*{Mark Positioning (mark and mkmk)}
-
-Where no precomposed character is available, combining marks should
-still be correctly positioned, and marks can be “stacked” via “Mark
-to Base” (mark) and “Mark to Mark” (mkmk): ŏ́ (o + U+306 + U+301);
-ī̆ (i + U+304 + U+306). The dot of an i or j followed by a diacritic
-will generally be removed: i̽. If your application supports these
-features, they are probably on by default.
-
-\subsection*{Small Capitals (smcp and c2sc)}
-
-Use “Small Caps” (smcp) to change lower-case letters to
-small caps; add “Caps to Small Caps” (c2sc) for text entirely in small
-caps. {\scshape Junicode has true small caps rather than scaled
- capitals.} Special small cap versions of common combining diacritics
-are available, and these should be positioned correctly relative to
-the base characters: {\scshape äçé}. {\itshape Regular face
- only.}
-
-\subsection*{Old-Style Numbers (onum)}
-
-You have a choice of either standard “lining” figures or old-style
-figures, selected by “Old-Style Numbers” (onum): 0123456789
-{\addfontfeature{Numbers=OldStyle}0123456789.}
-
-\subsection*{Superscripts and Subscripts (sups, subs)}
-
-\noindent Superscript numbers are rendered with “Superscripts” (sups):
-{\addfontfeature{Superscripts=on} 0123456789}. Subscript numbers
-are rendered with “Subscripts” (subs):
-{\addfontfeature{Subscripts=on} 0123456789}. In the regular and
-italic styles there is a complete alphabet of superscripts (e.g.
-{\addfontfeature{Superscripts=on}abcxyz}).
-
-\subsection*{Fractions (frac)}
-
-A sequence of number + slash + number is rendered by a fraction if the
-fraction has a Unicode encoding and this feature is on:
-{\addfontfeature{Fractions=on} 1/2 1/4 2/3 3/4}.
-
-\subsection*{Letters with flourishes (swsh)}
-For letters with flourishes (sometimes used for setting Middle English
-texts), use “Swash” (swsh):
-{\addfontfeature{Style=Swash}c d f g k n r}. Some capital swashes are also
-available in the italic face, based on those in Hickes's \textit{Thesaurus}:
-{\addfontfeature{Style=Swash}\textit{A D J Q Æ}}.
-
-\subsection*{Mirrored runes (rtlm)}
-
-In the regular face Junicode
-contains mirrored versions of runes. To access these, use
-Right-to-Left Mirroring (rtlm): {\addfontfeatures{MirrorRunes=on}
- ᚾᚪᛒᛋᚫᚾᚩᚱᚻ.}
-
-\subsection*{Greek letters in IPA (mgrk)}
-
-Greek β and θ are needed for phonetic work, but the Greek of Junicode
-does not harmonize with other characters in the IPA range. To solve
-the problem, use mgrk: {\addfontfeature{IPAMode=on}βθ}. Alternatively,
-both characters are available in the Private Use Area: U+F701, U+F702.
-
-\subsection*{Nordic letter-shapes (ss01)}
-
-The default shape of ð and þ in Junicode is English: this is unusual in
-modern fonts. For the shapes used in Icelandic, specify the Icelandic
-language, if your application has good language support, or select
-“Style Set 1” (ss01): {\addfontfeature{Language=Icelandic} ðþ}.
-
-\subsection*{Insular letter-shapes (ss02)}
-
-Use “Style Set 2” (ss02) for insular letter-forms:
-{\fontspec[StyleSet=insular]{Junicode} abcdefg.} Turn off “Standard
-Ligatures” (liga) for best results.
-
-\subsection*{Overlined characters (ss04, ss05)}
-
-Use “Style Set 4” (ss04) for roman numbers with high overline
-({\fontspec[StyleSet=highline]{Junicode} viii XCXV}) and “Style Set 5”
-(ss05) for lower-case roman numbers with medium-high overline
-({\fontspec[StyleSet=medline]{Junicode} viii dclx}). These Stylistic
-Sets will work only with letters used in Roman numbers.
-
-\subsection*{Enlarged minuscules (ss06)}
-
-“Style Set 6” (ss06) produces enlarged minuscules, thus:
-{\addfontfeature{StyleSet=enlarged} abcdefg.} Since the underlying
-text remains unchanged, enlarged text can be searched like normal
-text.
-
-\subsection*{Deleted text (ss07)}
-
-In medieval manuscripts, text is often deleted by placing a dot under each
-letter. Both Unicode and MUFI define many characters with dots below:
-{\addfontfeature{StyleSet=underdot} if possible, you should avoid
-hard-coding these and instead use} “Style Set 7” (ss07).
-
-\subsection*{Alternate yogh (ss08)}
-
-For Middle English, always use the yogh at U+021C and U+021D (Ȝȝ).
-Unicode also has an alternative yogh, which in Junicode has a
-flat top. If you prefer this, leave the underlying text the same and
-specify “Style Set 8” (ss08):
-{\addfontfeature{StyleSet=altyogh} Ȝȝ}.
-
-
-\subsection*{Retired letter-shapes (ss09)}
-
-The design of a few Junicode characters has changed since the font was
-introduced. The original designs, if you prefer them, will always be
-available via “Style Set 9” (ss09). Currently there are just a few
-such alternates: {\fontspec[StyleSet=altpua]{Junicode} ꝺ} for ꝺ,
-{\addfontfeature{StyleSet=altpua} T} for T,
-{\scshape{\addfontfeature{StyleSet=altpua} t} for t}.
-
-\subsection*{Letters with hook above (ss14)}
-
-The Unicode standard contains several precomposed characters with
-combining hook above in the Latin Extended Additional range
-(e.g. ẢỎ). These are used automatically when a vowel is followed by
-the diacritic U+0309. However, MUFI contains a series of precomposed
-characters in which the hook differs in shape and position. Use “Style
-Set 14” (ss14) for the MUFI characters (e.g.
-\addfontfeature{StyleSet=althook}ẢỎ).
-
-\subsection*{E caudata (ss15)}
-
-Medieval Latin texts often use an {\itshape e} with tail, called
-{\itshape e caudata}; this represents Latin {\itshape ae} or {\itshape
- oe}. Polish, Lithuanian, and several other languages also use this
-letter. While in modern editions of medieval texts the {\itshape
- cauda} (or in Polish, the {\itshape ogonek}) is often attached to
-the very bottom of the letter, in modern Polish and Lithuanian
-printing it is attached to the end of the bottom stroke: Polish ę,
-medieval Latin {\addfontfeatures{StyleSet=altogonek}ę}. The modern
-Polish version of the letter is acceptable for medieval Latin;
-however, if you prefer a centered {\itshape cauda}, use
-“Style Set 15” (ss15).
-
-\subsection*{Old-Style Punctuation (ss18)}
-
-{\addfontfeature{StyleSet=oldpunct}Old books generally set
-extra space before the heavier punctuation marks (; : ! ?);
-they also leave extra space inside quotation marks and
-parentheses (e.g. “here”). For a similar effect, use Stylistic Set 18 (ss18). Make sure
-that Contextual Alternates are also on so that Junicode can correct
-the spacing in certain environments (but you will have to kern the English plural
-possessive apostrophe manually).}
-
-\subsection*{Latin-to-Gothic Transliteration (ss19)}
-
-As transliteration of Latin to Gothic characters is straightforward,
-it can easily be handled with OpenType features. Note that the Gothic
-alphabet has no distinction between upper- and lower-case, so capitals
-and lower-case letters are transliterated the same way:
-{\addfontfeature{StyleSet=gothic} mahtedi sweþauh jah inu mans leik}.
-
-\subsection*{Gothic-to-Latin Transliteration (ss20)}
-
-The same as ss19, but in reverse. It produces all lower-case
-letters. Thus 𐌲𐌰𐌳𐍉𐌱 𐌽𐌿 𐍅𐌰𐍃 𐌼𐌰𐌹𐍃 𐌸𐌰𐌽𐍃 𐍃𐍅𐌴𐍃𐍅𐌰𐌼𐌼𐌰
-becomes ‘{\addfontfeature{StyleSet=gothtolat}𐌲𐌰𐌳𐍉𐌱 𐌽𐌿 𐍅𐌰𐍃 𐌼𐌰𐌹𐍃 𐌸𐌰𐌽𐍃 𐍃𐍅𐌴𐍃𐍅𐌰𐌼𐌼𐌰}’.
-
-\begin{center}
-\huge {\color{myRed}}
-\end{center}
-
-\chapter*{\color{myBlue}Other Features}
-
-\subsection*{Treatment of Obsolete Characters}
-
-A number of medieval characters originally assigned by MUFI to the
-Unicode Private Use Area have been accepted into the Unicode
-standard. For several years Junicode retained the obsolete
-characters, adding a mark to warn document maintainers to reencode
-their documents. Beginning with version 0.7.3 obsolete MUFI characters
-have been removed from the font.
-
-\subsection*{Character Protrusion}
-
-For XeLaTeX users who use the Microtype package for
-character protrusion, a
-configuration file (mt-Junicode.cfg) is provided for Junicode. Users
-of XeLaTeX will need Microtype version 2.5 (currently beta). The
-configuration file will work only with XeLaTeX, though it can probably be made
-to work with LuaTeX by commenting out the last five lines of the
-{\textbackslash}DeclareCharacterInheritance command.
-
-\subsection*{Fleurons}
-
-Junicode contains a number of fleurons (floral ornaments) copied from
-a 1785 Caslon specimen book. This book contains a number of
-examples. Fleurons may be found at these code-points: E270, E27D,
-E670, E67D, E68A, E736, E8B0, E8B1, EF90–EF9C, EF9F, F011, F014, F018,
-F019, F01B, F01D, F01E.
-
-\chapter*{\color{myBlue}Miscellanea}
-
-The Junicode font is available at
-http://junicode.sourceforge.net/. You can also find it in the
-repositories of many Linux distributions, and also via CTAN. Visit the
-Junicode Project Page at SourceForge to leave feature requests and bug
-reports. Contributions are welcome: if you wish to contribute to
-Junicode, leave a patch at the Project Page or contact the
-developer.\\
-
-\subsection*{Developer}
-Peter S. Baker, University of Virginia
-
-\subsection*{Contributors}
-Denis Moyogo Jacquerye\\
-Adam Buchbinder\\
-Pablo Rodriguez\\
-
-\noindent Thanks to the many users who have submitted feature requests
-and bug reports.\\
-
-\def\reflect#1{{\setbox0=\hbox{#1}\rlap{\kern0.5\wd0
- \special{x:gsave}\special{x:scale -1 1}}\box0 \special{x:grestore}}}
-\def\XeTeX{\leavevmode
- \setbox0=\hbox{X\lower.5ex\hbox{\kern-.15em\reflect{E}}\kern-.1667em \TeX}%
- \dp0=0pt\ht0=0pt\box0 }
-
-\noindent This document was set with {\XeTeX}.
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/README new/doc/fonts/junicode/README
--- old/doc/fonts/junicode/README 2012-04-10 00:43:49.000000000 +0200
+++ new/doc/fonts/junicode/README 2020-02-28 23:21:39.000000000 +0100
@@ -1,5 +1,24 @@
+Junicode
+Version 1.0.2
+(c) 1998-2018 Peter S. Baker
+
This is a TrueType font for medievalists (and others) with many
OpenType features. See the documentation, Junicode.pdf, for
specimens and detailed instructions.
-License: Open Font License (http://scripts.sil.org/OFL)
+License: Open Font License (see COPYING).
+
+***
+
+Since the font is a native OpenType font with many features, it is best to
+use with fontspec and LuaLaTeX or XeLaTeX. For details on the available
+OpenType features, see doc/Junicode.pdf.
+
+For use with Type 1-based engines, simply invoke \usepackage{junicode},
+though some features will not be available.
+
+***
+
+The LaTeX support was added by Daniel Benjamin Miller. This support has been
+dedicated to the public domain. Where this is not possible, you are hereby
+given permission to use this contribution for any purpose whatsoever.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/README.TEXLIVE new/doc/fonts/junicode/README.TEXLIVE
--- old/doc/fonts/junicode/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/junicode/README.TEXLIVE 2020-02-28 23:21:39.000000000 +0100
@@ -0,0 +1,9 @@
+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/fonts/junicode
+If questions or concerns, email tex-live(a)tug.org.
+
+ homer_sample.pdf
+ Junicode.pdf
+ aelfric_job.pdf
Binary files old/doc/fonts/junicode/aelfric_job.pdf and new/doc/fonts/junicode/aelfric_job.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/aelfric_job.tex new/doc/fonts/junicode/aelfric_job.tex
--- old/doc/fonts/junicode/aelfric_job.tex 2012-04-03 01:53:05.000000000 +0200
+++ new/doc/fonts/junicode/aelfric_job.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-%&program=xelatex
-%&encoding=UTF-8 Unicode
-
-\documentclass[letterpaper]{article}
-
-\usepackage{fontspec}
-
-\setromanfont{Junicode}
-
-\newICUfeature{StyleSet}{1}{+ss01}
-\newICUfeature{StyleSet}{2}{+ss02,-liga}
-\newICUfeature{StyleSet}{3}{+ss03}
-\newICUfeature{LigType}{disc}{+dlig}
-\newICUfeature{LigType}{hist}{+hlig}
-\newICUfeature{IPAMode}{on}{+mgrk,-liga}
-\newICUfeature{Compose}{off}{-ccmp}
-\newICUfeature{Contextual}{on}{+calt}
-\newICUfeature{Swash}{on}{+swsh}
-\newICUfeature{Fractions}{on}{+frac}
-\newICUfeature{Superscripts}{on}{+sups}
-\newICUfeature{Subscripts}{on}{+subs}
-
-\frenchspacing
-
-\begin{document}
-
-\section*{Old English with Junicode}
-
-\linespread{1.1}\fontspec[Contextual=on]{Junicode}\Large Sum wer wæs ġeseten on þām lande þe is ġehāten Hus; his nama wæs Iob. Se wer wæs swīðe bilewite and rihtwīs and ondrǣdende God and forbūgende yfel. Him wǣron ācennede \mbox{seofan} suna and ðrēo dohtra. Hē hæfde seofon ðūsend scēapa and ðrēo ðūsend olfenda, fīf hund ġetȳmu oxena and fīf hund assan and ormǣte miċelne hīred.
-
-Iob cwæð, “Iċ ālȳsde hrȳmende þearfan, and ðām stēopbearne þe būton fultume wæs iċ ġehēolp, and wydewan \mbox{heortan} iċ ġefrēfrode. Iċ wæs ymbscrȳd mid rihtwīsnysse. Iċ wæs blind\-um men ēage and healtum fōt and þearfena fæder. Of flȳsum mīnra scēapa wǣron ġehlȳwde ðearfena sīdan, and iċ ðearfum ne forwyrnde þæs ðe hī ġyrndon, ne iċ ne ǣt āna mīnne hlāf būton stēopbearne, ne iċ ne blissode on mīnum meniġfealdum welum. Ne fæġnode iċ on mīnes fēondes hryre, ne læġ ælðēodiġ man wiðūtan mīnum heġum, ac mīn duru ġeopenode symle weġfērendum. Ne behȳdde iċ mīne synna, ne iċ on mīnum bōsme ne bedīġlode mīne unrihtwīsnysse.”
-
-Efne ðā ġȳt cōm se fēorða ǣrendraca inn and cwæð, “Ðīne suna and ðīne dohtra ǣton and druncon mid heora yldestan brēðer, and efne þā fǣrlīċe swēġde swīðliċ wind of ðām wēstene and tōslōh þæt hūs æt ðām fēower hwemmum þæt hit hrēosende ðīne bearn ofþrihte and ācwealde. Iċ āna ætbærst þæt iċ ðē þis cȳdde.”
-
-“Fel sceal for felle, and swā hwæt swā man hæfð hē sylð for his līfe. Āstreċe nū ðīne hand and hrepa his bān and his flǣsc; ðonne ġesīhst ðū þæt hē ðē on ansȳne wiriġð.”
-
-\pagebreak
-
-\itshape\noindent Sum wer wæs ġeseten on þām lande þe is ġehāten Hus; his nama wæs Iob. Se wer wæs swīðe bilewite and rihtwīs and ondrǣdende God and forbūgende yfel. Him wǣron ācennede \mbox{seofan} suna and ðrēo dohtra. Hē hæfde seofon ðūsend scēapa and ðrēo ðūsend olfenda, fīf hund ġetȳmu oxena and fīf hund assan and ormǣte miċelne hīred.
-
-Iob cwæð, “Iċ ālȳsde hrȳmende þearfan, and ðām stēopbearne þe būton fultume wæs iċ ġehēolp, and wydewan \mbox{heortan} iċ ġefrēfrode. Iċ wæs ymbscrȳd mid rihtwīsnysse. Iċ wæs blind\-um men ēage and healtum fōt and þearfena fæder. Of flȳsum mīnra scēapa wǣron ġehlȳwde ðearfena sīdan, and iċ ðearfum ne forwyrnde þæs ðe hī ġyrndon, ne iċ ne ǣt āna mīnne hlāf būton stēopbearne, ne iċ ne blissode on mīnum meniġfealdum welum. Ne fæġnode iċ on mīnes fēondes hryre, ne læġ ælðēodiġ man wiðūtan mīnum heġum, ac mīn duru ġeopenode symle weġfērendum. Ne behȳdde iċ mīne synna, ne iċ on mīnum bōsme ne bedīġlode mīne unrihtwīsnysse.”
-
-Efne ðā ġȳt cōm se fēorða ǣrendraca inn and cwæð, “Ðīne suna and ðīne dohtra ǣton and druncon mid heora yldestan brēðer, and efne þā fǣrlīċe swēġde swīðliċ wind of ðām wēstene and tōslōh þæt hūs æt ðām fēower hwemmum þæt hit hrēosende ðīne bearn ofþrihte and ācwealde. Iċ āna ætbærst þæt iċ ðē þis cȳdde.”
-
-“Fel sceal for felle, and swā hwæt swā man hæfð hē sylð for his līfe. Āstreċe nū ðīne hand and hrepa his bān and his flǣsc; ðonne ġesīhst ðū þæt hē ðē on ansȳne wiriġð.”
-
-\pagebreak
-
-\upshape\bfseries\noindent Sum wer wæs ġeseten on þām lande þe is ġehāten Hus; his nama wæs Iob. Se wer wæs swīðe bilewite and rihtwīs and ondrǣdende God and forbūgende yfel. Him wǣron ācennede \mbox{seofan} suna and ðrēo dohtra. Hē hæfde seofon ðūsend scēapa and ðrēo ðūsend olfenda, fīf hund ġetȳmu oxena and fīf hund assan and ormǣte miċelne hīred.
-
-Iob cwæð, “Iċ ālȳsde hrȳmende þearfan, and ðām stēopbearne þe būton fultume wæs iċ ġehēolp, and wydewan heort\-an iċ ġefrēfrode. Iċ wæs ymbscrȳd mid rihtwīsnysse. Iċ wæs blind\-um men ēage and healtum fōt and þearfena fæder. Of flȳsum mīnra scēapa wǣron ġehlȳwde ðearfena sīdan, and iċ ðearfum ne forwyrnde þæs ðe hī ġyrndon, ne iċ ne ǣt āna mīnne hlāf būton stēopbearne, ne iċ ne blissode on mīnum meniġfealdum welum. Ne fæġnode iċ on mīnes fēondes hryre, ne læġ ælðēodiġ man wiðūtan mīnum heġum, ac mīn duru ġeopenode symle weġfērendum. Ne behȳdde iċ mīne synna, ne iċ on mīnum bōsme ne bedīġlode mīne unrihtwīsnysse.”
-
-Efne ðā ġȳt cōm se fēorða ǣrendraca inn and cwæð, “Ðīne suna and ðīne dohtra ǣton and druncon mid heora yldestan brēðer, and efne þā fǣrlīċe swēġde swīðliċ wind of ðām wēst\-ene and tōslōh þæt hūs æt ðām fēower hwemmum þæt hit hrēosende ðīne bearn ofþrihte and ācwealde. Iċ āna ætbærst þæt iċ ðē þis cȳdde.”
-
-“Fel sceal for felle, and swā hwæt swā man hæfð hē sylð for his līfe. Āstreċe nū ðīne hand and hrepa his bān and his flǣsc; ðonne ġesīhst ðū þæt hē ðē on ansȳne wiriġð.”
-
-\pagebreak
-
-\noindent\itshape Sum wer wæs ġeseten on þām lande þe is ġehāten Hus; his nama wæs Iob. Se wer wæs swīðe bilewite and rihtwīs and ondrǣdende God and forbūgende yfel. Him wǣron ācennede \mbox{seofan} suna and ðrēo dohtra. Hē hæfde seofon ðūsend scēapa and ðrēo ðūsend olfenda, fīf hund ġetȳmu oxena and fīf hund assan and ormǣte miċelne hīred.
-
-Iob cwæð, “Iċ ālȳsde hrȳmende þearfan, and ðām stēopbearne þe būton fultume wæs iċ ġehēolp, and wydewan heort\-an iċ ġefrēfrode. Iċ wæs ymbscrȳd mid rihtwīsnysse. Iċ wæs blind\-um men ēage and healtum fōt and þearfena fæder. Of flȳsum mīnra scēapa wǣron ġehlȳwde ðearfena sīdan, and iċ ðearfum ne forwyrnde þæs ðe hī ġyrndon, ne iċ ne ǣt āna mīnne hlāf būton stēopbearne, ne iċ ne blissode on mīnum meniġfealdum welum. Ne fæġnode iċ on mīnes fēondes hryre, ne læġ ælðēodiġ man wiðūtan mīnum heġum, ac mīn duru ġeopenode symle weġ\-fēr\-end\-um. Ne behȳdde iċ mīne synna, ne iċ on mīnum bōsme ne bedīġlode mīne unrihtwīsnysse.”
-
-Efne ðā ġȳt cōm se fēorða ǣrendraca inn and cwæð, “Ðīne suna and ðīne dohtra ǣton and druncon mid heora yldestan brēðer, and efne þā fǣrlīċe swēġde swīðliċ wind of ðām wēst\-ene and tōslōh þæt hūs æt ðām fēower hwemmum þæt hit hrēosende ðīne bearn ofþrihte and ācwealde. Iċ āna ætbærst þæt iċ ðē þis cȳdde.”
-
-“Fel sceal for felle, and swā hwæt swā man hæfð hē sylð for his līfe. Āstreċe nū ðīne hand and hrepa his bān and his flǣsc; ðonne ġesīhst ðū þæt hē ðē on ansȳne wiriġð.”
-
-\pagebreak
-
-\upshape\mdseries\small\noindent In Junicode, special attention has been paid to letter-combinations that often look
-unattractive in Old English text: these are handled by ligatures and alternate forms of f, þ and ð.
-To take fullest advantage of typographical features for Old English, make sure these OpenType
-features are enabled in your application: ccmp (Glyph Composition/Decomposition), calt
-(Contextual Alternates), liga (Standard Ligatures), kern (Horizontal Kerning).
-\end{document}
Binary files old/doc/fonts/junicode/homer_sample.pdf and new/doc/fonts/junicode/homer_sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/junicode/homer_sample.tex new/doc/fonts/junicode/homer_sample.tex
--- old/doc/fonts/junicode/homer_sample.tex 2012-11-18 01:43:31.000000000 +0100
+++ new/doc/fonts/junicode/homer_sample.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-%&program=xelatex
-%&encoding=UTF-8 Unicode
-
-\documentclass[12pt,letterpaper,twoside,openany,showidx]{book}
-\usepackage[silent]{fontspec}
-\usepackage{xltxtra}
-\usepackage{polyglossia}
-\setdefaultlanguage{greek}
-\newICUfeature{Contextual}{on}{+calt}
-\defaultfontfeatures{Mapping=tex-text,Script=Greek,Contextual=on}
-\newcommand{\hlig}[1]{{\addfontfeature{Ligatures=Historic}{#1}}}
-\newcommand{\salt}[1]{{\addfontfeature{Style=Alternate}{#1}}}
-\setromanfont{Junicode}
-\begin{document}
-\noindent\Large\addfontfeature{Ligatures=Historic} ΜΗ̃ΝΙΝ
-ἄειδε, ΘΕᾺ, Πηληϊάδεω ἈΧΙΛΗ̃ΟΣ\\
-Οὐλομένην, ἣ μυρί᾽ Ἀχαιοῖς ἄλγε᾽ ἔθηκε·\\
-Πολλὰς δ᾽ ἰφθίμους ψυχὰς ἄϊδι προΐαψεν\\
-Ἡρώων, αὐτοὺς δ᾽ ἑλώρια τεῦχε κύνεσσιν\\
-Οἰωνοῖσί τε πᾶσι· Διὸς δ᾽ ἐτελείε\salt{τ}ο βουλή·\\
-Ἐξ οὗ δὴ τὰ πρῶτα διαστήτην ἐ\salt{ρ}ίσαν\salt{τ}ε\\
-Ἀτρεΐδης τε, ἄναξ ἀνδρῶν ϗ δῖος Ἀχιλλεύς.\\
- Τίς τ᾽ ἄρ σφωε \salt{θ}εῶν ἔριδι ξυνέηκε μάχεσθαι;\\
-Λητοῦς καὶ Διὸς υἱός· ὃ γὰρ βασιλῆϊ χολωθεὶς\\
-Νοῦσον ἀνὰ στρατὸν ὄρσε κακήν· ὀλέκον\salt{τ}ο δὲ λαοί·\\
-Οὕνεκα τὸν Χρύσην ἠτίμησ᾽ ἀρητῆρα\\
-Ἀτρεΐδης· ὃ γὰρ ἦλθε \salt{θ}οὰς ἐπὶ νῆας Ἀχαιῶν\\
-Λυσόμενός τε \salt{θ}ύγα\salt{τρα φ}έρων τ᾽ ἀπερείσι᾽ ἄποινα,\\
-Στέμμα\salt{τ᾽} ἔχων ἐν χερσὶν ἑκη\salt{β}όλου Ἀπόλλωνος,\\
-Χρυσέῳ ἀνὰ σκήπ\salt{τ}ρῳ καὶ ἐλίσσε\salt{τ}ο πάν\salt{τ}ας Ἀχαιούς,\\
-Ἀτρεΐδα δὲ μάλιστα δύω, κοσμήτορε λαῶν·\\
- Ἀτρεΐδαι τε, καὶ ἄλλοι ἐϋκνήμιδες Ἀχαιοί,\\
-Ὑμῖν μὲν \salt{θ}εοὶ δοῖεν Ὀλύμπια δώμα\salt{τ᾽} ἔχοντες\\
-Ἐκπέρσαι Πριάμοιο πόλιν, εὖ δ᾽ οἴκαδ᾽ ἱκέσθαι:\\
-Παῖδα δέ μοὶ λύσαι\salt{τ}ε \salt{φ}ίλην, τὰ δ᾽ ἄποινα δέχεσθε,\\
-Ἁζόμενοι Διὸς υἱὸν ἑκη\salt{β}όλον Ἀπόλλωνα.\\
- Ἔνθ᾽ ἄλλοι μὲν πάντες ἐπευφήμησαν Ἀχαιοὶ,\\
-Αἰδεῖσθαί \salt{θ}᾽ ἱερῆα, ϗ ἀγλαὰ δέχθαι ἄποινα·\\
-Ἀλλ᾽ οὐκ Ἀτρεΐδῃ Ἀγαμέμνονι ἥνδανε \salt{θ}υμῷ,\\
-Ἀλλὰ κακῶς ἀφίει, κρα\salt{τ}ερὸν δ᾽ ἐπὶ μῦθον ἔτελλε·\\
- Μή σε, γέρον κοίλῃσιν ἐγὼ παρὰ νηυσὶ κιχείω\\
-Ἢ νῦν δηθύνον\salt{τ᾽} ἢ ὕστερον αὖτις ἰόν\salt{τ}α,\\
-Μή νύ τοι οὐ χραίσμῃ σκῆπ\salt{τ}ρον ϗ στέμμα \salt{θ}εοῖο.\\
-Τὴν δ᾽ ἐγὼ οὐ λύσω, πρίν μιν ϗ γῆρας ἔπεισιν,\\
-Ἡμετέρῳ ἐνὶ οἴκῳ ἐν Ἄργεϊ τηλόθι πάτρης\\
-Ἱστὸν ἐποιχομένην, ϗ ἐμὸν λέχος ἀν\salt{τ}ιόωσαν·\\
-Ἀλλ᾽ ἴθι μή μ᾽ ἐρέθιζε σαώτερος ὥς κε νέηαι.\\
- Ὣς ἔφα\salt{τ᾽}· ἔδδεισεν δ᾽ ὃ γέρων, ϗ ἐπείθε\salt{τ}ο μύθῳ·\\
-Βῆ δ᾽ ἀκέων παρὰ \salt{θ}ῖνα πολυφλοίσ\salt{β}οιο \salt{θ}αλάσσης·\\
-Πολλὰ δ᾽ ἔπει\salt{τ᾽} ἀπάνευθε κιὼν ἠρᾶθ᾽ ὃ γεραιὸς\\
-Ἀπόλλωνι ἄνακ\salt{τ}ι, τὸν ἠΰκομος τέκε Λητώ·\\
- Κλῦθί μευ Ἀργυρότοξ᾽, ὃς Χρύσην ἀμφι\salt{βέβ}ηκας\\
-Κίλλάν τε ζαθέην Τενέδοιό τε ἶφι ἀνάσσεις,\\
-Σμινθεῦ εἴ πο\salt{τ}έ τοι χαρίεν\salt{τ᾽} ἐπὶ νηὸν ἔρεψα,\\
-Ἢ εἰ δή πο\salt{τ}έ τοι κατὰ πίονα μηρί᾽ ἔκηα\\
-Ταύρων ἠδ᾽ αἰγῶν, τὸ δέ μοι κρήηνον ἐέλδωρ·\\
-Τίσειαν Δαναοὶ ἐμὰ δάκρυα σοῖσι βέλεσσιν.\\
- Ὣς ἔφα\salt{τ᾽} εὐχόμενος· τοῦ δ᾽ ἔκλυε Φο\salt{ῖβ}ος Ἀπόλλων,\\
-Βῆ δὲ κα\salt{τ᾽} oὐλύμποιο καρήνων χωόμενος κῆρ,\\
-Τόξ᾽ ὤμοισιν ἔχων ἀμφηρε\salt{φ}έα τε φαρέτρην·\\
-Ἔκλαγξαν δ᾽ ἄρ᾽ ὀϊστοὶ ἐπ᾽ ὤμων χωομένοιο,\\
-Αὐτοῦ κινηθέν\salt{τ}ος· ὃ δ᾽ ἤϊε νυκ\salt{τ}ὶ ἐοικώς.\\
-Ἕζε\salt{τ᾽} ἔπει\salt{τ᾽} ἀπάνευθε νεῶν, με\salt{τὰ} δ᾽ ἰὸν ἕηκε·\\
-Δεινὴ δὲ κλαγγὴ γένε\salt{τ᾽} ἀργυρέοιο βιοῖο.\\
-Οὐρῆας μὲν πρῶτον ἐπῴχε\salt{τ}ο ϗ κύνας ἀργούς,\\
-Αὐτὰρ ἔπει\salt{τ᾽} αὐτοῖσι βέλος ἐχεπευκὲς ἐφιεὶς\\
-Βάλλ᾽· αἰεὶ δὲ πυραὶ νεκύων καίον\salt{τ}ο \salt{θ}αμειαί.\\
-Ἐννῆμαρ μὲν ἀνὰ στρατὸν ᾤχετο κῆλα \salt{θ}εοῖο,\\
-Τῇ δεκάτῃ δ᾽ ἀγορὴν δὲ καλέσσα\salt{τ}ο λαὸν Ἀχιλλεύς·\\
-Τῷ γὰρ ἐπὶ φρεσὶ \salt{θ}ῆκε \salt{θ}εὰ λευκώλενος Ἥρη·\\
-Κήδε\salt{τ}ο γὰρ Δαναῶν, ὅτι ῥα \salt{θ}νήσκον\salt{τ}ας ὁρᾶτο.\\
-Οἳ δ᾽ ἐπεὶ οὖν ἤγερθεν, ὁμηγερέες τ᾽ ἐγένον\salt{τ}ο,\\
-Τοῖσι δ᾽ ἀνιστάμενος μετέφη πόδας ὠκὺς Ἀχιλλεύς·\\
- Ἀτρεΐδη νῦν ἄμμε παλιμπλα\salt{γ}χθέντας ὀΐω\\
-Ἂψ ἀπονοστήσειν, εἴ κεν \salt{θ}άνα\salt{τ}όν γε φύγοιμεν·\\
-Εἰ δὴ ὁμοῦ πόλεμός τε δαμᾷ ϗ λοιμὸς Ἀχαιούς·\\
-Ἀλλ᾽ ἄγε δή τινα μάντιν ἐρείομεν, ἢ ἱερῆα,\\
-Ἢ καὶ ὀνειροπόλον, καὶ γάρ τ᾽ ὄναρ ἐκ Διός ἐστιν,\\
-Ὅς κ᾽ εἴποι ὅ τι τόσσον ἐχώσα\salt{τ}ο Φο\salt{ῖβ}ος Ἀπόλλων·\\
-Εἴτ᾽ ἄρ᾽ ὅ γ᾽ εὐχωλῆς ἐπιμέμφεται ἠδ᾽ ἑκατόμ\salt{β}ης·\\
-Αἴ κέν πως ἀρνῶν κνίσσης αἰγῶν τε τελείων\\
-Βούλε\salt{τ}αι ἀντιάσας ἡμῖν ἀπὸ λοιγὸν ἀμῦναι.
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/junicode.doc.tlpobj new/tlpkg/tlpobj/junicode.doc.tlpobj
--- old/tlpkg/tlpobj/junicode.doc.tlpobj 2019-02-28 03:45:29.000000000 +0100
+++ new/tlpkg/tlpobj/junicode.doc.tlpobj 2020-02-29 01:57:51.000000000 +0100
@@ -1,15 +1,12 @@
name junicode.doc
category Package
-revision 28286
+revision 53954
shortdesc doc files of junicode
relocated 1
-docfiles size=105
- RELOC/doc/fonts/junicode/Junicode.pdf
- RELOC/doc/fonts/junicode/Junicode.tex
+docfiles size=8
+ RELOC/doc/fonts/junicode/COPYING
+ RELOC/doc/fonts/junicode/ChangeLog
RELOC/doc/fonts/junicode/README
- RELOC/doc/fonts/junicode/aelfric_job.pdf
- RELOC/doc/fonts/junicode/aelfric_job.tex
+ RELOC/doc/fonts/junicode/README.TEXLIVE
RELOC/doc/fonts/junicode/fleurons
- RELOC/doc/fonts/junicode/homer_sample.pdf
- RELOC/doc/fonts/junicode/homer_sample.tex
RELOC/doc/fonts/junicode/replacements
++++++ junicode.tar.xz ++++++
++++ 10583 lines of diff (skipped)
++++++ kantlipsum.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/kantlipsum/README.md new/doc/latex/kantlipsum/README.md
--- old/doc/latex/kantlipsum/README.md 2017-11-20 23:01:33.000000000 +0100
+++ new/doc/latex/kantlipsum/README.md 2019-07-25 23:48:10.000000000 +0200
@@ -2,14 +2,16 @@
by the "Kant generator for Python" by Mark Pilgrim, described in the
book "Dive into Python".
-This is version 0.6 of the package
+This is version 0.8a of the package
Changes from earlier version:
-The `index' option for writing index entries has been added; the
-code has been polished.
+Support for printing only a few sentences from one paragraph has been added;
+the code has been polished.
- Copyright 2011-2012 Enrico Gregorio
+Version 0.8a fixes a small glitch.
+
+ Copyright 2011-2019 Enrico Gregorio
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -27,7 +29,6 @@
README (this file)
kantlipsum.dtx
-kantlipsum.ins
kantlipsum.pdf
and of the derived file
@@ -36,4 +37,4 @@
To install the distribution:
-o run "latex kantlipsum.ins"
+o run "tex kantlipsum.dtx"
Binary files old/doc/latex/kantlipsum/kantlipsum.pdf and new/doc/latex/kantlipsum/kantlipsum.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kantlipsum.doc.tlpobj new/tlpkg/tlpobj/kantlipsum.doc.tlpobj
--- old/tlpkg/tlpobj/kantlipsum.doc.tlpobj 2019-02-28 03:45:34.000000000 +0100
+++ new/tlpkg/tlpobj/kantlipsum.doc.tlpobj 2019-07-26 00:58:18.000000000 +0200
@@ -1,8 +1,8 @@
name kantlipsum.doc
category Package
-revision 45866
+revision 51727
shortdesc doc files of kantlipsum
relocated 1
-docfiles size=142
+docfiles size=144
RELOC/doc/latex/kantlipsum/README.md
RELOC/doc/latex/kantlipsum/kantlipsum.pdf
++++++ kantlipsum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/kantlipsum/kantlipsum.sty new/tex/latex/kantlipsum/kantlipsum.sty
--- old/tex/latex/kantlipsum/kantlipsum.sty 2017-11-20 23:01:33.000000000 +0100
+++ new/tex/latex/kantlipsum/kantlipsum.sty 2019-07-25 23:48:10.000000000 +0200
@@ -6,20 +6,20 @@
%%
%% kantlipsum.dtx (with options: `package')
%% ---------------------------------------------------------------
-%% The kantlipsum package --- Generate text in Kant's style
+%% The kantlipsum package --- Generate text in Kantian style
%% Maintained by Enrico Gregorio
%% E-mail: enrico DOT gregorio AT univr DOT it
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-\RequirePackage{expl3}[2017/11/14]
+\RequirePackage{expl3}[2019/07/01]
\RequirePackage{xparse}
\ProvidesExplPackage
{kantlipsum}
- {2017/11/16}
- {0.7}
+ {2019/07/23}
+ {0.8}
{Generate text in Kantian style}
-\@ifpackagelater { expl3 } { 2017/11/14 }
+\@ifpackagelater { expl3 } { 2019/07/01 }
{ }
{
\PackageError { kantlipsum } { Support~package~expl3~too~old }
@@ -43,7 +43,12 @@
}
\DeclareOption{ numbers }
- { \cs_set_protected:Nn \__kgl_number:n { #1\nobreak\enspace\textbullet\nobreak\enspace } }
+ {
+ \cs_set_protected:Nn \__kgl_number:n
+ {
+ #1\nobreak\enspace\textbullet\nobreak\enspace
+ }
+ }
\bool_new:N \g__kgl_makeindex_bool
\bool_gset_false:N \g__kgl_makeindex_bool
@@ -64,29 +69,31 @@
\int_new:N \l__kgl_end_int
\seq_new:N \g__kgl_pars_seq
\seq_new:N \g__kgl_words_seq
-\NewDocumentCommand{\kant}{s>{\SplitArgument{1}{-}}O{1-7}}
+\seq_new:N \l__kgl_sentences_seq
+\NewDocumentCommand{\kant}
+ {
+ s
+ >{\SplitArgument{1}{-}}O{1-7}
+ >{\SplitArgument{1}{-}}o}
{
\group_begin:
\IfBooleanTF{#1}
{ \cs_set_eq:NN \__kgl_par: \__kgl_star: }
{ \cs_set_eq:NN \__kgl_par: \__kgl_nostar: }
- \__kgl_process:nn #2
- \__kgl_print:
+ \IfNoValueTF{#3}
+ { \__kgl_process:nn #2 \__kgl_print: }
+ { \__kgl_process:nnnn #2 #3 \tl_use:N \l_tmpa_tl \__kgl_par: }
\group_end:
}
-\NewDocumentCommand{\kantdef}{mm}
+\NewDocumentCommand{\kantdef}
+ {
+ m
+ m
+ >{\SplitArgument{1}{-}}O{1-50}
+ }
{
\group_begin:
- \cs_set_eq:NN \__kgl_number:n \use_none:n
- \cs_set_eq:NN \__kgl_par: \prg_do_nothing:
- \cs_if_exist:NTF #1
- {
- \msg_error:nnn {kantlipsum} {already-defined} {#1}
- }
- {
- \tl_set:Nx \l_tmpa_tl { \seq_item:Nn \g__kgl_pars_seq {#2} }
- \cs_new:Npx #1 { \l_tmpa_tl }
- }
+ \__kgl_define:nnnn {#1} {#2} #3
\group_end:
}
\cs_new_protected:Nn \__kgl_process:nn
@@ -96,6 +103,13 @@
{ \int_set:Nn \l__kgl_end_int {#1} }
{ \int_set:Nn \l__kgl_end_int {#2} }
}
+\cs_new_protected:Nn \__kgl_process:nnnn
+ {
+ \tl_set:Nx \l_tmpa_tl { \seq_item:Nn \g__kgl_pars_seq {#1} }
+ \tl_if_novalue:nTF {#4}
+ { \__kgl_extract:nnV {#3} {#3} \l_tmpa_tl }
+ { \__kgl_extract:nnV {#3} {#4} \l_tmpa_tl }
+ }
\cs_new_protected:Nn \__kgl_print:
{
\int_step_function:nnnN
@@ -115,6 +129,34 @@
{ \seq_gput_right:Nn \g__kgl_pars_seq {#1\__kgl_par:} }
\cs_new_protected:Nn \__kgl_newword:n
{ \seq_gput_right:Nn \g__kgl_words_seq {#1} }
+\cs_new_protected:Nn \__kgl_define:nnnn
+ {
+ \cs_set_eq:NN \__kgl_number:n \use_none:n
+ \cs_set_eq:NN \__kgl_par: \prg_do_nothing:
+ \cs_if_exist:NTF #1
+ {
+ \msg_error:nnn {kantlipsum} {already-defined} {#1}
+ }
+ {
+ \tl_set:Nx \l_tmpa_tl { \seq_item:Nn \g__kgl_pars_seq {#2} }
+ \tl_if_novalue:nTF {#4}
+ { \__kgl_extract:nnV {#3} {#3} \l_tmpa_tl }
+ { \__kgl_extract:nnV {#3} {#4} \l_tmpa_tl }
+ \cs_new:Npx #1 { \l_tmpa_tl }
+ }
+ }
+\cs_new_protected:Nn \__kgl_extract:nnn
+ {
+ \seq_set_split:Nnn \l__kgl_sentences_seq { . } {#3}
+ \seq_clear:N \l_tmpa_seq
+ \seq_indexed_map_inline:Nn \l__kgl_sentences_seq
+ {
+ \int_compare:nT { #1 <= ##1 <= #2 }
+ {\seq_put_right:Nn \l_tmpa_seq { ##2 } }
+ }
+ \tl_set:Nx \l_tmpa_tl { \seq_use:Nn \l_tmpa_seq { .~ }. }
+ }
+\cs_generate_variant:Nn \__kgl_extract:nnn { nnV }
\group_begin:
\char_set_catcode_space:n {`\ }
\__kgl_newpara:n {As any dedicated reader can clearly see, the Ideal of
@@ -3191,7 +3233,7 @@
\group_end:
\msg_info:nnx {kantlipsum} {how-many}
{ \int_eval:n {\seq_count:N \g__kgl_pars_seq} }
-%% Copyright (C) 2011-2017 by
+%% Copyright (C) 2011-2019 by
%% Enrico Gregorio
%% enrico DOT gregorio AT univr DOT it
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kantlipsum.tlpobj new/tlpkg/tlpobj/kantlipsum.tlpobj
--- old/tlpkg/tlpobj/kantlipsum.tlpobj 2019-02-28 03:45:34.000000000 +0100
+++ new/tlpkg/tlpobj/kantlipsum.tlpobj 2019-07-26 00:58:18.000000000 +0200
@@ -1,6 +1,6 @@
name kantlipsum
category Package
-revision 45866
+revision 51727
shortdesc Generate sentences in Kant's style
relocated 1
longdesc The package spits out sentences in Kantian style; the text is
@@ -11,7 +11,7 @@
RELOC/tex/latex/kantlipsum/kantlipsum.sty
catalogue-also blindtext
catalogue-ctan /macros/latex/contrib/kantlipsum
-catalogue-date 2017-11-20 16:29:24 +0100
+catalogue-date 2019-07-25 09:17:57 +0200
catalogue-license lppl1.3c
catalogue-topics macro-supp dummy-gen
-catalogue-version 0.7
+catalogue-version 0.8a
++++++ kerkis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/kerkis/License.txt new/doc/fonts/kerkis/License.txt
--- old/doc/fonts/kerkis/License.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/kerkis/License.txt 2019-11-12 22:41:56.000000000 +0100
@@ -0,0 +1,10 @@
+The Copyright of the fonts belongs to the The Department of Mathematics of
+the University of the Aegean, Karlobasi, Samos, Greece
+
+If you want to use this font family in commercial work (like in books),
+we strongly request that you include in the Copyright section the fact
+that you are using
+"Kerkis (C) Department of Mathematics, University of the Aegean".
+
+"The Kerkis fonts and kerkis.sty are licensed under the LaTeX Project
+Public License, version 1.3c or later. See http://www.latex-project.org/lppl."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/kerkis/README new/doc/fonts/kerkis/README
--- old/doc/fonts/kerkis/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/kerkis/README 2019-11-12 22:41:56.000000000 +0100
@@ -0,0 +1,89 @@
+ The Kerkis Font Family
+ For LaTeX
+
+ version 1.1, 12/Nov/2019
+
+ Among other features, Kerkis for LaTeX makes wide use of double forms
+ for several letters according to the hellenic typographic tradition
+ that now tends to be lost. In particular the letters beta, zeta, theta,
+ rho and phi have an initial and a different middle-word form.
+
+ Old style numbers (known as lower case numbers as well) are included in
+ the small caps font. Thus they are accessible with the \textsc or
+ \scshape command.
+
+ The fonts contain a full set of latin characters with accents that
+ support properly all latin-based languages (common like German, French
+ etc and less common like Icelandic). Special ligatures for "northern"
+ languages like ij and fj etc (try the word fiji or fjord) are also
+ included and tested to work.
+
+ Kerkis is especially usefull for the creation of pdf files due to the
+ fact that the fonts are in Type1 format.
+
+ Download
+
+ Download the following zip file: Kerkis_for_LaTeX.zip from
+ http://myria.math.aegean.gr/software/kerkis/Kerkis_for_LaTeX.html
+
+ Installation
+
+ If you have the previous version of kerkis installed you must first
+ remove it or overwrite it. To do this or just to install it do the
+ following steps:
+ 1. Replace or place the type1 files: locate the old files named k.pfb,
+ ki.pfb, kb.pfb etc and delete them. Place the new files in the same
+ place you had the old ones probably in texmf/fonts/type1/kerkis or
+ in this directory (create it!) if you did not had kerkis before.
+ 2. Replace or place the afm files: locate the files k.afm,
+ ki.afm,kb.afm etc and delete them. Place the new afm files in the
+ same place you had the old ones probably in texmf/fonts/afm/kerkis
+ or in this directory (create it!) if you did not had kerkis before.
+ 3. Replace or place the tfm and vf files (k8a.tfm, ek8a.tfm, gk7a.tfm
+ etc), in texmf/fonts/tfm/kerkis and texmf/fonts/vf/kerkis.
+ 4. Replace or place the old kerkis.sty, .fd files from the tex
+ subdirectory of the distribution in texmf/tex/latex/kerkis.
+ 5. Replace or place the .enc files from the dvips subdirectory of the
+ distribution in texmf/dvips/base/kerkis (old ones might be in
+ texmf/dvips/base/).
+ 6. Place the all html files from the doc subdirectory in
+ texmf/doc/latex/kerkis.
+ 7. Place the kerkis.map file in texmf/dvips/base/kerkis. If you had
+ kerkis before edit the file psfonts.map (found in
+ texmf/dvips/config and/or texmf/dvips/base) and delete all entries
+ relating to kerkis.
+ 8. Run texhash (on unix) or refresh the filename database (in MikTeX).
+ 9. Find the file updmap.cfg open it in an editor and add the line: Map
+ kerkis.map
+ 10. Run updmap (on MikTeX I am not sure how to do this. Alternatively
+ you may append the contents of the file kerkis.map of the
+ distribution to psfonts.map after step 7 above, refresh the
+ filename database (step 8) and skip steps 9 and 10).
+ 11. Remove all bitmaps you may have from older kerkis instalations
+ (remove all .pk files in /var/lib/texmf/pk teTeX (on unix)
+ texmf-var/fonts/pk in TeXLive and localtexmf\fonts\pk in MikTeX.
+
+ You are ready to use the fonts now. Just note the following:
+ 1. Load the kerkis.sty package after you load the inputenc package with
+ the iso-8859-7 option
+
+ 2. The -j option of dvips (which is usually the default) may not work
+ properly with older TeX installations (it works with modern ones).
+ If you run into such problems with dvips, either turn it off by
+ issuing dvips -j0 file.dvi or use the bitmap generation utility
+ gfstopk by issuing dvips -V file.dvi
+
+ Stylistic issues
+ Kerkis is a Neoclassical font. We believe that its strictly
+ rationalist axis makes it ideal for scientific typesetting.
+ Moreover its moderate contrast and apperture makes it perfectly
+ readable. Its serifs are adnate so that it guides your eyes
+ smoothly on the line.
+ Kerkis is a calm and quiet face that does not interfere with the
+ expression of important ideas in your documents.
+ The latin part of the Kerkis font is URW Bookman (except some
+ characters that were missing from Bookman). URW has kindly allowed
+ us to re-distribute their Bookman inside Kerkis.
+
+ A. Tsolomitis, atsol at aegean dot gr
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/kerkis/License.txt new/doc/latex/kerkis/License.txt
--- old/doc/latex/kerkis/License.txt 2006-11-25 02:46:28.000000000 +0100
+++ new/doc/latex/kerkis/License.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-The Copyright of the fonts belongs to the The Department of Mathematics of
-the University of the Aegean, Karlobasi, Samos, Greece
-
-If you want to use this font family in commercial work (like in books),
-we strongly request that you include in the Copyright section the fact
-that you are using
-"Kerkis (C) Department of Mathematics, University of the Aegean".
-
-"The Kerkis fonts and kerkis.sty are licensed under the LaTeX Project
-Public License, version 1.3c or later. See http://www.latex-project.org/lppl."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/kerkis/README.html new/doc/latex/kerkis/README.html
--- old/doc/latex/kerkis/README.html 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/kerkis/README.html 1970-01-01 01:00:00.000000000 +0100
@@ -1,129 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <title>Kerkis for LaTeX</title>
-
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-7">
-</head>
-<body>
-<h1 align="center">The <i>Kerkis</i> Font Family </h1>
-<h1 align="center">For LaTeX</h1>
-<p>Among other features, Kerkis for LaTeX makes wide use of double forms for
-several letters according to the hellenic typographic tradition that now
-tends to be lost. In particular the letters beta, zeta, theta, rho and phi
-have an initial and a different middle-word form.</p>
-<p>Old style numbers (known as <i>lower case numbers</i> as well) are included
-in the small caps font. Thus they are accessible with the \textsc or \scshape
-command.</p>
-<p>The fonts contain a full set of latin characters with accents that support
-properly all latin-based languages (common like German, French etc and less
-common like Icelandic). Special ligatures for "northern" languages like ij
-and fj etc (try the word fiji or fjord) are also included and tested to work.
-</p>
-<p>Kerkis is especially usefull for the creation of pdf files due to the fact
-that the fonts are in Type1 format.<br>
-</p>
-<p align="center"><big><font color="#660000"><big>Download<big><br>
-</big></big></font></big></p>
-<p align="left"><big><font color="#660000"><big><big><small><small><font
- color="#000000"><small>Download the following zip file:</small> <a
- href="Kerkis_for_LaTeX.zip"><small>Kerkis_for_LaTeX.zip</small></a></font></small><a
- href="Kerkis.zip"><br>
-</a></small></big></big></font></big></p>
-<div align="left"><br>
-<big> </big></div>
-<center><font color="#660000"><big><big>Installation</big></big></font></center>
-<br>
-<br>
-<br>
-If you have the previous version of kerkis installed you <b><font
- color="#660000">must</font></b> first remove it<small> <big>or overwrite
-it</big></small>. To do this or just to install it do the following steps:<br>
-<ol>
- <li>Replace or place the type1 files: locate the old files named <small><tt>k.pfb</tt></small>,
- <small><tt>ki.pfb</tt></small>, <small><tt>kb.pfb</tt></small> etc and
-delete them. Place the new files in the same place you had the old ones probably
-in <small><tt>texmf/fonts/type1/kerkis or in this directory (create it!) if
-you did not had kerkis before.</tt></small></li>
- <li>Replace or place the afm files: locate the files <small><tt>k.afm</tt></small>,
- <small><tt>ki.afm</tt></small>,<small><tt>kb.afm</tt></small> etc and
-delete them. Place the new afm files in the same place you had the old ones
-probably in <small><tt>texmf/fonts/afm/kerkis or in this directory (create
-it!) if you did not had kerkis before.</tt></small><br>
- </li>
- <li>Replace or place the tfm and vf files (<small><tt>k8a.tfm</tt></small>,
- <small><tt>ek8a.tfm</tt></small>, <small><tt>gk7a.tfm</tt></small> etc),
-in <small><tt>texmf/fonts/tfm/kerkis </tt><big>and</big><tt>�</tt></small><small><tt>texmf/fonts/vf/kerkis.</tt></small></li>
- <li>Replace or place the old kerkis.sty, .fd files from the tex subdirectory
-of the distribution in <small><tt>texmf/tex/latex/kerkis</tt></small>.</li>
- <li>Replace or place the .enc files from the dvips subdirectory of the distribution
-in <small><tt>texmf/dvips/base</tt></small>/kerkis (old ones might be in
- <small><tt>texmf/dvips/base</tt></small>/).</li>
- <li>Place the all html files from the doc subdirectory in <small><tt>texmf/doc/latex/kerkis</tt></small>.</li>
- <li>Place the kerkis.map file in <small><tt>texmf/dvips/base</tt></small>/kerkis.
-If you had kerkis before edit the file psfonts.map (found in texmf/dvips/config
-and/or texmf/dvips/base) and delete all entries relating to kerkis.</li>
- <li>Run texhash (on unix) or refresh the filename database (in MikTeX).</li>
- <li>Find the file <small><tt>updmap.cfg</tt></small> open it in an editor
-and add the line: Map kerkis.map</li>
- <li>Run updmap (on MikTeX I am not sure how to do this. Alternatively you
-may append the contents of the file kerkis.map of the distribution to psfonts.map
-after step 7 above, refresh the filename database (step 8) and skip steps
-9 and 10).</li>
- <li>Remove all bitmaps you may have from older kerkis instalations (remove
-all .pk files in /var/lib/texmf/pk teTeX (on unix) texmf-var/fonts/pk in TeXLive
-and localtexmf\fonts\pk in MikTeX.</li>
-</ol>
-<b><font color="#660000">You are ready to use the fonts now.</font></b> Just
-note the following:
-<ol>
-1. Load the kerkis.sty package <i>after</i> you load the inputenc package
-with the iso-8859-7 option
-</ol>
-<ol>
-2. The -j option of dvips (which is usually the default) may not work properly
-with older TeX installations (it works with modern ones). If you run into
-such problems with dvips, either turn it off by issuing dvips -j0 file.dvi
-or use the bitmap generation utility gfstopk by issuing dvips -V file.dvi
-</ol>
-<ol>
-
- <center><font color="#660000"><big>Stylistic issues<br>
- <br>
- </big></font></center>
-Kerkis is a Neoclassical font. We believe that its strictly rationalist axis
-makes it ideal for scientific typesetting. Moreover its moderate contrast
-and apperture makes it perfectly readable. Its serifs are adnate so that
-it guides your eyes smoothly on the line.
- <p>Kerkis is a calm and quiet face that does not interfere with the expression
-of important ideas in your documents.</p>
-
-<p>The latin part of the Kerkis font is URW Bookman (except some characters
-that were missing from Bookman). URW has kindly allowed us to re-distribute
-their Bookman inside Kerkis.</p>
-
-<p></p>
-<p> A. Tsolomitis, atsol at aegean dot gr
-
- <center></center>
-
- <ul>
-
- </ul>
-
- <center>
- <p><img src="http://iris.math.aegean.gr/software/kerkis/kerkispoly.gif"
- height="192" width="627"></p>
- </center>
-
- <p><br>
- </p>
-
- <center><img src="http://iris.math.aegean.gr/software/kerkis/kerkis.gif"></center>
-</ol>
-<br>
-<br>
-<br>
-</body>
-</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kerkis.doc.tlpobj new/tlpkg/tlpobj/kerkis.doc.tlpobj
--- old/tlpkg/tlpobj/kerkis.doc.tlpobj 2019-02-28 03:45:35.000000000 +0100
+++ new/tlpkg/tlpobj/kerkis.doc.tlpobj 2019-11-12 23:51:31.000000000 +0100
@@ -1,8 +1,8 @@
name kerkis.doc
category Package
-revision 15878
+revision 52753
shortdesc doc files of kerkis
relocated 1
docfiles size=3
- RELOC/doc/latex/kerkis/License.txt
- RELOC/doc/latex/kerkis/README.html
+ RELOC/doc/fonts/kerkis/License.txt
+ RELOC/doc/fonts/kerkis/README
++++++ kerkis.tar.xz ++++++
Binary files old/fonts/opentype/public/kerkis/Kerkis-Bold.otf and new/fonts/opentype/public/kerkis/Kerkis-Bold.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-BoldItalic.otf and new/fonts/opentype/public/kerkis/Kerkis-BoldItalic.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-BoldSmallCaps.otf and new/fonts/opentype/public/kerkis/Kerkis-BoldSmallCaps.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-Calligraphic.otf and new/fonts/opentype/public/kerkis/Kerkis-Calligraphic.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-Italic.otf and new/fonts/opentype/public/kerkis/Kerkis-Italic.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-SemiBold-Italic.otf and new/fonts/opentype/public/kerkis/Kerkis-SemiBold-Italic.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-SemiBold.otf and new/fonts/opentype/public/kerkis/Kerkis-SemiBold.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis-SmallCaps.otf and new/fonts/opentype/public/kerkis/Kerkis-SmallCaps.otf differ
Binary files old/fonts/opentype/public/kerkis/Kerkis.otf and new/fonts/opentype/public/kerkis/Kerkis.otf differ
Binary files old/fonts/opentype/public/kerkis/KerkisSans-Bold.otf and new/fonts/opentype/public/kerkis/KerkisSans-Bold.otf differ
Binary files old/fonts/opentype/public/kerkis/KerkisSans-BoldItalic.otf and new/fonts/opentype/public/kerkis/KerkisSans-BoldItalic.otf differ
Binary files old/fonts/opentype/public/kerkis/KerkisSans-Italic.otf and new/fonts/opentype/public/kerkis/KerkisSans-Italic.otf differ
Binary files old/fonts/opentype/public/kerkis/KerkisSans-SmallCaps.otf and new/fonts/opentype/public/kerkis/KerkisSans-SmallCaps.otf differ
Binary files old/fonts/opentype/public/kerkis/KerkisSans.otf and new/fonts/opentype/public/kerkis/KerkisSans.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kerkis.tlpobj new/tlpkg/tlpobj/kerkis.tlpobj
--- old/tlpkg/tlpobj/kerkis.tlpobj 2019-02-28 03:45:35.000000000 +0100
+++ new/tlpkg/tlpobj/kerkis.tlpobj 2019-11-12 23:51:31.000000000 +0100
@@ -1,6 +1,6 @@
name kerkis
category Package
-revision 15878
+revision 52753
shortdesc Kerkis (Greek) font family
relocated 1
longdesc Sans-serif Greek fonts to match the URW Bookman set (which are
@@ -12,7 +12,7 @@
longdesc available. The philosophy, and the design process, of the
longdesc Kerkis fonts is discussed in a paper in TUGboat 23(3/4), 2002.
execute addMap kerkis.map
-runfiles size=760
+runfiles size=966
RELOC/fonts/afm/public/kerkis/Kerkis-Bold.afm
RELOC/fonts/afm/public/kerkis/Kerkis-BoldItalic.afm
RELOC/fonts/afm/public/kerkis/Kerkis-BoldSmallCaps.afm
@@ -40,6 +40,20 @@
RELOC/fonts/enc/dvips/kerkis/kmex.enc
RELOC/fonts/enc/dvips/kerkis/kmsym.enc
RELOC/fonts/map/dvips/kerkis/kerkis.map
+ RELOC/fonts/opentype/public/kerkis/Kerkis-Bold.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-BoldItalic.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-BoldSmallCaps.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-Calligraphic.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-Italic.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-SemiBold-Italic.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-SemiBold.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis-SmallCaps.otf
+ RELOC/fonts/opentype/public/kerkis/Kerkis.otf
+ RELOC/fonts/opentype/public/kerkis/KerkisSans-Bold.otf
+ RELOC/fonts/opentype/public/kerkis/KerkisSans-BoldItalic.otf
+ RELOC/fonts/opentype/public/kerkis/KerkisSans-Italic.otf
+ RELOC/fonts/opentype/public/kerkis/KerkisSans-SmallCaps.otf
+ RELOC/fonts/opentype/public/kerkis/KerkisSans.otf
RELOC/fonts/tfm/public/kerkis/ek8a.tfm
RELOC/fonts/tfm/public/kerkis/ek8r.tfm
RELOC/fonts/tfm/public/kerkis/ekb8a.tfm
@@ -272,6 +286,7 @@
RELOC/tex/latex/kerkis/t1mak.fd
RELOC/tex/latex/kerkis/t1maksf.fd
catalogue-ctan /fonts/greek/kerkis
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-11-12 10:52:49 +0100
+catalogue-license lppl1.3c
catalogue-topics font font-greek font-maths font-type1
+catalogue-version 1.1
++++++ ketcindy.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/ketcindy.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/ketcindy.doc.tar.xz differ: char 27, line 1
++++++ ketcindy.tar.xz ++++++
++++ 21556 lines of diff (skipped)
++++++ keyfloat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/keyfloat/README.txt new/doc/latex/keyfloat/README.txt
--- old/doc/latex/keyfloat/README.txt 2019-03-22 21:49:29.000000000 +0100
+++ new/doc/latex/keyfloat/README.txt 2019-09-23 22:57:22.000000000 +0200
@@ -1,7 +1,7 @@
The LaTeX keyfloat package
Provides a key/value interface for generating floats.
-v2.00 — 2019/03/21
+v2.01
Copyright 2016-2019 Brian Dunn — www.BDTechConcepts.com
LaTeX Project Public License, version 1.3
Binary files old/doc/latex/keyfloat/keyfloat.pdf and new/doc/latex/keyfloat/keyfloat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyfloat.doc.tlpobj new/tlpkg/tlpobj/keyfloat.doc.tlpobj
--- old/tlpkg/tlpobj/keyfloat.doc.tlpobj 2019-03-24 02:24:15.000000000 +0100
+++ new/tlpkg/tlpobj/keyfloat.doc.tlpobj 2019-09-24 01:53:46.000000000 +0200
@@ -1,9 +1,9 @@
name keyfloat.doc
category Package
-revision 50534
+revision 52160
shortdesc doc files of keyfloat
relocated 1
-docfiles size=129
+docfiles size=259
RELOC/doc/latex/keyfloat/README.txt
RELOC/doc/latex/keyfloat/images/image.pdf
RELOC/doc/latex/keyfloat/images/image2.pdf
++++++ keyfloat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/keyfloat/keyfloat.sty new/tex/latex/keyfloat/keyfloat.sty
--- old/tex/latex/keyfloat/keyfloat.sty 2019-03-22 21:49:29.000000000 +0100
+++ new/tex/latex/keyfloat/keyfloat.sty 2019-09-23 22:57:22.000000000 +0200
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{keyfloat}
- [2019/03/21 v2.00 Key/value interface for floats and subfloats.]
+ [2019/09/23 v2.01 Key/value interface for floats and subfloats.]
@@ -78,12 +78,22 @@
\ProvideDocumentEnvironment{tablehere}{}
- {\bigbreak\noindent\minipage{\linewidth}\def\@captype{table}}
- {\endminipage\bigbreak}
+{%
+ \vskip\intextsep\noindent%
+ \minipage{\linewidth}%
+ \def\@captype{table}%
+ \normalcolor\reset@font\normalsize%
+}%
+{\endminipage\vskip\intextsep}%
\ProvideDocumentEnvironment{figurehere}{}
- {\bigbreak\noindent\minipage{\linewidth}\def\@captype{figure}}
- {\endminipage\bigbreak}
+{%
+ \vskip\intextsep\noindent%
+ \minipage{\linewidth}%
+ \def\@captype{figure}%
+ \normalcolor\reset@font\normalsize%
+}%
+{\endminipage\vskip\intextsep}%
@@ -641,11 +651,9 @@
\setkeys{KFLT@keys}{#1}%
}
-\newcommand*{\KFLT@LWR@hook@boxouter}{}%
+\newbool{KFLT@captionistop}
-\newenvironment*{KFLT@LWR@hook@boxouter@minipage}[2][]
- {\minipage[#1]{#2}}
- {\endminipage}
+\newcommand*{\KFLT@LWR@hook@boxouter}{}%
\NewDocumentEnvironment{KFLT@boxouter}{m m}
{% boxouter
@@ -655,7 +663,7 @@
\ifnumgreater{\value{KFLT@keyfloatdepth}}{0}%
{% keyfloats
\ifbool{KFLT@keywrap}%
- {\KFLT@LWR@hook@boxouter@minipage[t]{\KFLT@rowboxwidth}}%
+ {\minipage[t]{\KFLT@rowboxwidth}}%
{\minipage[\KFLT@va]{\KFLT@rowboxwidth}}%
\captionsetup*{type=\KFLT@type}%
}% keyfloats
@@ -665,7 +673,7 @@
{%
\par\addvspace{\baselineskip}%
\noindent%
- \KFLT@LWR@hook@boxouter@minipage[t]{\linewidth}%
+ \minipage[t]{\linewidth}%
\captionsetup{type=\KFLT@type}%
}%
{% not a keywrap
@@ -673,7 +681,9 @@
{% [W]
\KFLT@findwidths%
\wrapfloat{\KFLT@type}{\KFLT@wp}%
- {\KFLT@imagewidth+2\KFLTlooseframewidth}%
+ {\KFLT@imagewidth+2\KFLTlooseframewidth}%
+ \minipage{\KFLT@imagewidth+2\KFLTlooseframewidth}%
+ \normalcolor\reset@font\normalsize%
\renewcommand{\KFLT@lw}{}%
\renewcommand{\KFLT@w}{\KFLT@imagewidth}%
}% [W]
@@ -681,13 +691,13 @@
\ifstrequal{#2}{M}%
{% [M]
\KFLT@marginfloat[\KFLT@mo]{\KFLT@type}%
- \captionsetup{type=\KFLT@type}%
}% [M]
- {% not [M}
+ {% not [M]
\ifstrequal{#2}{H}%
{% [H]
- \par\addvspace{\baselineskip}%
+ \vskip\intextsep%
\noindent\minipage[\KFLT@va]{\linewidth}%
+ \normalcolor\reset@font\normalsize%
\captionsetup{type=\KFLT@type}%
}% [H]
{% not [H]
@@ -702,14 +712,15 @@
}% not subfloat
\ifbool{KFLT@cont}{\ContinuedFloat}{}%
\KFLT@findwidths%
- \caption@iftop{\KFLT@caption{}}{}%
+ \caption@iftop{\booltrue{KFLT@captionistop}}{\boolfalse{KFLT@captionistop}}%
+ \ifbool{KFLT@captionistop}{\KFLT@caption{}}{}%
\center\unskip%
}% boxouter
{% endboxouter
\endcenter\unskip%
\addvspace{\smallskipamount}%
\KFLT@addartisttext{}%
- \caption@iftop{}{\KFLT@caption{}}%
+ \ifbool{KFLT@captionistop}{}{\KFLT@caption{}}%
\ifbool{KFLT@inkeysubfloats}%
{%
\csuse{endsub\KFLT@type}%
@@ -721,12 +732,13 @@
}% keyfloats
{% not keyfloats
\ifbool{KFLT@keywrap}{%
- \endKFLT@LWR@hook@boxouter@minipage%
+ \endminipage%
\par\addvspace{\baselineskip}%
}%
{% not keywrap
\ifstrequal{#2}{W}%
{% [W]
+ \endminipage%
\endwrapfloat%
}% [W]
{% not[W]
@@ -738,7 +750,7 @@
\ifstrequal{#2}{H}%
{%
\endminipage% [H]
- \par\addvspace{\baselineskip}%
+ \vskip\intextsep%
}%
{% not [H]
\IfBooleanTF{#1}% starred float?
@@ -966,18 +978,33 @@
\KFLT@LWR@hook@keyfloatsminipage{\KFLT@rowboxwidth}%
}%
{%
- \bigbreak%
+ \vskip\intextsep%
\KFLT@LWR@hook@keyfloatsminipage{\linewidth}%
}%
+ \normalcolor\reset@font\normalsize%
\ifbool{KFLT@inkeysubfloats}%
{}%
{\captionsetup*{type=figure}}%
}% [H] or nested
- {% figure
- \IfBooleanTF{#1}% starred figure, two-col figure in a two-col format
- {\begin{figure*}[#2]}%
- {\begin{figure}[#2]}%
- }% figure
+ {% See if [W]:
+ \ifstrequal{#2}{W}
+ {% [W]:
+ \wrapfloat{figure}{O}{.5\linewidth}%
+ \minipage{\linewidth}%
+ \normalcolor\reset@font\normalsize%
+ }%
+ {% not [H]:
+ \ifstrequal{#2}{M}%
+ {% [M]:
+ \KFLT@marginfloat{figure}%
+ }%
+ {% figure
+ \IfBooleanTF{#1}% starred figure, two-col figure in a two-col format
+ {\begin{figure*}[#2]}%
+ {\begin{figure}[#2]}%
+ }% figure
+ }% not [H]
+ }%
\ifboolexpr{%
test {\ifnumgreater{\value{KFLT@keyfloatdepth}}{1}} or
bool {KFLT@inkeysubfloats}
@@ -1001,13 +1028,26 @@
test {\ifnumgreater{\value{KFLT@keyfloatdepth}}{0}} or
bool {KFLT@keywrap}
}%
- {}{%
- \bigbreak%
+ {}{% not nested
+ \vskip\intextsep%
}%
}% was [H], etc.
{% not [H], etc.
- \IfBooleanTF{#1}% starred figure?
- {\end{figure*}}{\end{figure}}%
+ \ifstrequal{#2}{W}%
+ {% [W]:
+ \endminipage%
+ \endwrapfloat%
+ }%
+ {%
+ \ifstrequal{#2}{M}%
+ {% [M]:
+ \endKFLT@marginfloat%
+ }%
+ {% figure
+ \IfBooleanTF{#1}% starred figure?
+ {\end{figure*}}{\end{figure}}%
+ }%
+ }%
}% not [H], etc.
\addtocounter{KFLT@keyfloatdepth}{-1}%
\KFLT@envignorespaces%
@@ -1038,6 +1078,8 @@
\renewcommand{\KFLT@subgrptextalign}{}%
}
+\newbool{KFLT@subcaptionistop}
+
\NewDocumentCommand{\KFLT@subfloats}{m m m +m}
{%
\KFLT@envignorespaces%
@@ -1051,19 +1093,37 @@
bool {KFLT@keywrap}
}%
{%
- \bigbreak\noindent\begin{minipage}{\linewidth}%
+ \vskip\intextsep\noindent\begin{minipage}{\linewidth}%
+ \normalcolor\reset@font\normalsize%
}%
{%
- \IfBooleanTF{#1}%
- {\begin{\KFLT@subgrptype*}[#2]}%
- {\begin{\KFLT@subgrptype}[#2]}%
+ \ifstrequal{#2}{W}%
+ {% [W]
+ \wrapfloat{\KFLT(a)subgrptype}{O}{.5\linewidth}%
+ \setlength{\KFLT@rowboxwidth}{.5\KFLT@rowboxwidth}%
+ \minipage{\linewidth}%
+ \normalcolor\reset@font\normalsize%
+ }%
+ {% not [H]:
+ \ifstrequal{#2}{M}%
+ {% [M]:
+ \KFLT@marginfloat{\KFLT@subgrptype}%
+ \setlength{\KFLT(a)rowboxwidth}{.9\marginparwidth/\real{#3}}%
+ }% [M]
+ {% subfloat
+ \IfBooleanTF{#1}%
+ {\begin{\KFLT@subgrptype*}[#2]}%
+ {\begin{\KFLT@subgrptype}[#2]}%
+ }%
+ }% not [H]
}%
\captionsetup*{type=\KFLT@subgrptype}%
\ifbool{KFLT@subgrpcont}%
{\ContinuedFloat}%
{}%
\center\unskip%
- \caption@iftop{\KFLT@caption{subgrp}}{}%
+ \caption@iftop{\booltrue{KFLT@subcaptionistop}}{\boolfalse{KFLT@subcaptionistop}}%
+ \ifbool{KFLT@subcaptionistop}{\KFLT@caption{subgrp}}{}%
\defcounter{KFLT@numcols}{#3}%
\defcounter{KFLT@thiscol}{0}%
\begingroup%
@@ -1075,16 +1135,29 @@
\endcenter%
\par\addvspace{\bigskipamount}%
\KFLT@addartisttext{subgrp}%
- \caption@iftop{}{\KFLT@caption{subgrp}}%
+ \ifbool{KFLT@subcaptionistop}{}{\KFLT@caption{subgrp}}%
\ifboolexpr{%
test {\ifstrequal{#2}{H}} or
bool{KFLT@keywrap}
}%
- {\end{minipage}\bigbreak}% was [H]
+ {\end{minipage}\vskip\intextsep}% was [H]
{% not [H]:
- \IfBooleanTF{#1}% starred?
- {\end{\KFLT@subgrptype*}}%
- {\end{\KFLT@subgrptype}}%
+ \ifstrequal{#2}{W}%
+ {% [W]
+ \endminipage%
+ \endwrapfloat%
+ }%
+ {% not [W]:
+ \ifstrequal{#2}{M}%
+ {% [M]:
+ \endKFLT@marginfloat%
+ }% [M]
+ {% subfloat
+ \IfBooleanTF{#1}% starred?
+ {\end{\KFLT@subgrptype*}}%
+ {\end{\KFLT@subgrptype}}%
+ }%
+ }% not [W]
}% not [H]
\setboolean{KFLT@inkeysubfloats}{false}%
\KFLT@envignorespaces%
@@ -1135,6 +1208,7 @@
\captionsetup{type=#2}%
\hbox{}\vspace*{#1}%
\noindent%
+ \normalcolor\reset@font\normalsize%
}% start
{% end
\end{minipage}%
@@ -1153,9 +1227,9 @@
\newlength{\KFLT@keywrapwidth}
\newlength{\KFLT@keywrapparskip}
\newlength{\KFLT@keywrapparindent}
-\DeclareDocumentEnvironment{keywrap}{m +m}
+\DeclareDocumentEnvironment{keywrap}{m +m}%
{%
- \par%
+ \par\noindent%
\setlength{\KFLT@keywrapwidth}{\linewidth}%
\addtolength{\KFLT@keywrapwidth}{-#1}%
\addtolength{\KFLT@keywrapwidth}{-2em}%
@@ -1171,6 +1245,7 @@
\hfill%
\begin{minipage}[t]{#1}%
\booltrue{KFLT@keywrap}%
+ \normalcolor\reset@font\normalsize%
#2%
\par%
\unskip\vspace{\smallskipamount}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyfloat.tlpobj new/tlpkg/tlpobj/keyfloat.tlpobj
--- old/tlpkg/tlpobj/keyfloat.tlpobj 2019-03-24 02:24:15.000000000 +0100
+++ new/tlpkg/tlpobj/keyfloat.tlpobj 2019-09-24 01:53:47.000000000 +0200
@@ -1,6 +1,6 @@
name keyfloat
category Package
-revision 50534
+revision 52160
shortdesc Provides a key/value interface for generating floats
relocated 1
longdesc The keyfloat package provides a key/value user interface for
@@ -23,7 +23,7 @@
RELOC/tex/latex/keyfloat/keyfloat.sty
catalogue-contact-home http://bdtechconcepts.com
catalogue-ctan /macros/latex/contrib/keyfloat
-catalogue-date 2019-03-21 21:46:01 +0100
+catalogue-date 2019-09-23 11:20:39 +0200
catalogue-license lppl1.3
catalogue-topics float
-catalogue-version 2.00
+catalogue-version 2.01
++++++ keyvaltable.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/keyvaltable/README.md new/doc/latex/keyvaltable/README.md
--- old/doc/latex/keyvaltable/README.md 2018-11-03 22:07:14.000000000 +0100
+++ new/doc/latex/keyvaltable/README.md 2020-02-21 23:54:25.000000000 +0100
@@ -1,7 +1,7 @@
The keyvaltable Package
=======================
-Copyright (C) 2016-2018 Richard Grewe
+Copyright (C) 2016-2020 Richard Grewe
Released under the [LaTeX Project Public License](http://www.latex-project.org/lppl/) version 1.2 or later
Binary files old/doc/latex/keyvaltable/keyvaltable.pdf and new/doc/latex/keyvaltable/keyvaltable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyvaltable.doc.tlpobj new/tlpkg/tlpobj/keyvaltable.doc.tlpobj
--- old/tlpkg/tlpobj/keyvaltable.doc.tlpobj 2019-03-20 02:24:13.000000000 +0100
+++ new/tlpkg/tlpobj/keyvaltable.doc.tlpobj 2020-04-12 01:55:30.000000000 +0200
@@ -1,8 +1,8 @@
name keyvaltable.doc
category Package
-revision 50471
+revision 54677
shortdesc doc files of keyvaltable
relocated 1
-docfiles size=68
+docfiles size=117
RELOC/doc/latex/keyvaltable/README.md
RELOC/doc/latex/keyvaltable/keyvaltable.pdf
++++++ keyvaltable.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/keyvaltable/keyvaltable.sty new/tex/latex/keyvaltable/keyvaltable.sty
--- old/tex/latex/keyvaltable/keyvaltable.sty 2019-03-19 22:28:17.000000000 +0100
+++ new/tex/latex/keyvaltable/keyvaltable.sty 2020-04-12 00:50:13.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% keyvaltable.dtx (with options: `package')
%%
-%% Copyright (C) 2016-2018 by Richard Grewe <r-g+tex(a)posteo.net>
+%% Copyright (C) 2016-2020 by Richard Grewe <r-g+tex(a)posteo.net>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -20,197 +20,407 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{keyvaltable}
- [2019/03/17 v1.0 Package for filling tables using key-value lists]
+ [2020/04/05 v2.2 Package for filling tables using key-value lists]
+
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}
\RequirePackage{trimspaces}
\PassOptionsToPackage{table}{xcolor}
\RequirePackage{xcolor}
\RequirePackage{booktabs}
-\newcommand\kvtSet[1]{\bgroup
- \def\kvt@@presetqueue{\egroup}
- \setkeys[kvt]{defaults}{#1}{}%
- \kvt@@presetqueue}
+\newcommand\kvt@DeclareTrimListParser{%
+ \@ifstar{\kvt@DeclareTrimListParser@i{*}}
+ {\kvt@DeclareTrimListParser@i{}}}
+\newcommand\kvt@DeclareTrimListParser@i[3]{%
+ \DeclareListParser#1{#2}{#3}\expandafter
+ \patchcmd\csname etb@lst@\expandafter\@gobble\string#2\endcsname
+ {\etb@listitem}{\kvt@etb@listitem}{}
+ {\kvt@warn{Failed to patch a command defined by the etoolbox
+ package, possibly because etoolbox internals have changed.
+ You might encounter superfluous spaces.}}}
+\newcommand\kvt@etb@listitem[2]{%
+ \expandafter\expandafter\expandafter\kvt@etb@listitem@i
+ \expandafter\expandafter\expandafter{\trim@post@space@noexp{#2}}{#1}}
+\newcommand\kvt@etb@listitem@i[2]{\etb@listitem{#2}{#1}}
+\DeclareListParser{\kvt@dossvlist}{;}
+\kvt@DeclareTrimListParser*{\kvt@forpsvlist}{+}
+\kvt@DeclareTrimListParser{\kvt@dobrklist}{\\}
+\newcommand\kvt@error[2]{\PackageError{keyvaltable}{#1}{#2}}
+\newcommand\kvt@warn[1]{\PackageWarning{keyvaltable}{#1}}
+\newcommand\kvt@setkeys[2]{\setkeys[kvt]{#2}{#1}}
+\newcommand\kvt@setcmdkeys[2]{%
+ \expandafter\kvt@setkeys\expandafter{#1}{#2}}
+\newcommand\kvt@setcskeys[2]{%
+ \expandafter\kvt@setcmdkeys\expandafter{\csname #1\endcsname}{#2}}
+\newcommand\kvt@setkeys@nopresets[2]{%
+ \kvt@xkv@disablepreset[kvt]{#2}{\kvt@setkeys{#1}{#2}}}
+\newcommand\kvt@colsetkeys[2]{\setkeys[KeyValTable]{#1}{#2}}
+\newcommand\kvt@colsetcmdkeys[2]{%
+ \expandafter\kvt@colsetkeys\expandafter{#1}{#2}}
+\newcommand\kvt@colsetcskeys[2]{%
+ \expandafter\kvt@colsetcmdkeys\expandafter{\csname #1\endcsname}{#2}}
+\newcommand\kvtStrutted[2][\@firstofone]{%
+ \strut#1{#2}\ifhmode\expandafter\strut\fi}
+\newcommand\kvtSet[1]{%
+ \kvt@setkeys{#1}{global,Table,Column}%
+ \ifdefvoid\kvt@@presetqueue{}
+ {\kvt@@presetqueue\undef\kvt@@presetqueue}}
\newcommand\kvt@lazypreset[2]{%
\appto\kvt@@presetqueue{\presetkeys[kvt]{#1}{#2}{}}}
-\newcommand\kvt@addtableprop[2]{%
- \define@key[kvt]{defaults}{#1}{%
- \kvt@lazypreset{Table}{#1=##1}}%
- \presetkeys[kvt]{defaults}{#1=#2}{}%
- \define@cmdkey[kvt]{Table}{#1}{}%
- \presetkeys[kvt]{Table}{#1=#2}{}}
-\newcommand\kvt@addchoicetableprop[3]{%
- \define@choicekey[kvt]{defaults}{#1}{#3}{%
- \kvt@lazypreset{Table}{#1=##1}}%
- \presetkeys[kvt]{defaults}{#1=#2}{}%
- \define@choicekey[kvt]{Table}{#1}{#3}%
- {\csdef{cmdkvt@Table@#1}{##1}}%
- \presetkeys[kvt]{Table}{#1=#2}{}}
-\newcommand\kvt@addbooltableprop[2]{%
- \define@boolkey[kvt]{defaults}{#1}{%
- \kvt@lazypreset{Table}{#1=##1}}%
- \presetkeys[kvt]{defaults}{#1=#2}{}%
- \define@boolkey[kvt]{Table}{#1}%
- {\csdef{cmdkvt@Table@#1}{##1}}%
- \presetkeys[kvt]{Table}{#1=#2}{}}
-\newcommand\kvt@addcolumnprop[2]{%
- \define@key[kvt]{defaults}{#1}{%
- \kvt@lazypreset{Column}{#1=##1}}%
- \presetkeys[kvt]{defaults}{#1=#2}{}%
- \define@key[kvt]{Column}{#1}{%
- \csdef{kvt@col@#1@\kvt@@column}{##1}}%
- \presetkeys[kvt]{Column}{#1=#2}{}%
-}
-\newcommand\kvt@addchoicecolumnprop[4]{%
- \define@choicekey[kvt]{defaults}{#1}{#4}[#3]{%
- \kvt@lazypreset{Column}{#1=##1}}%
- \presetkeys[kvt]{defaults}{#1=#2}{}%
- \define@choicekey[kvt]{Column}{#1}{#4}[#3]%
- {\csdef{kvt@col@#1@\kvt@@column}{##1}}%
- \presetkeys[kvt]{Column}{#1=#2}{}%
-}
-\kvt@addtableprop{rowbg}{white..black!10}
-\kvt@addtableprop{headbg}{black!14}
-\kvt@addbooltableprop{showhead}{true}
-\kvt@addbooltableprop{showrules}{true}
-\kvt@addtableprop{headfmt}{}
-\kvt@addtableprop{headalign}{}
-\kvt@addtableprop{width}{\linewidth}
-\kvt@addchoicetableprop{shape}{multipage}{%
- multipage,onepage,tabular,longtable,tabularx}
-\kvt@addcolumnprop{default}{}
-\kvt@addcolumnprop{format}{\kvtStrutted}
-\kvt@addcolumnprop{align}{l}
-\kvt@addcolumnprop{head}{}
-\kvt@addchoicecolumnprop{hidden}{false}{true}{false,true}
-\kvtSet{}
+\newcommand\kvt@keysetter[5]{%
+ \ifdefvoid{#1}
+ {\kvt@lazypreset{#2}{#3=#4}}
+ {#5}}
\newcommand\kvtTableOpt[1]{\csname cmdkvt@Table@#1\endcsname}
-\newcommand\kvtStrutted[1]{\strut #1\ifhmode\expandafter\strut\fi}
+\define@cmdkey[kvt]{Table}{rowbg}{}
+\define@cmdkey[kvt]{Table}{headbg}{}
+\define@cmdkey[kvt]{Table}{headalign}{}
+\define@cmdkey[kvt]{Table}{headformat}{}
+\define@cmdkey[kvt]{Table}{width}{}
+\define@boolkey[kvt]{Table}{showhead}{}
+\define@boolkey[kvt]{Table}{showrules}{}
+\define@choicekey[kvt]{Table}{captionpos}{t,b}
+ {\csdef{cmdkvt@Table@captionpos}{#1}}
+\define@choicekey[kvt]{Table}{valign}{t,c,b}
+ {\csdef{cmdkvt@Table@valign}{#1}}
+\define@choicekey[kvt]{Table}{halign}{l,c,r}
+ {\csdef{cmdkvt@Table@halign}{#1}}
+\define@key[kvt]{Table}{style}{\kvt@UseTableStyles{#1}}
+\define@boolkey[kvt]{Table}{norowbg}[true]{%
+ \kvt@setkeys{rowbg={}}{Table}}
+\define@boolkey[kvt]{Table}{nobg}[true]{%
+ \kvt@setkeys{rowbg={},headbg={}}{Table}}
+\define@boolkey[kvt]{Table}{norules}[true]{%
+ \ifbool{#1}
+ {\kvt@setkeys{showrules=false}{Table}}
+ {\kvt@setkeys{showrules=true}{Table}}}
+\define@key[kvt]{Table}{backend}{\ifinlist{#1}{\kvt@@tablebackends}
+ {\csdef{cmdkvt@Table@shape}{#1}}
+ {\kvt@error{Table backend '#1' not known}
+ {Check for misspellings in '#1'}}}
+\define@key[kvt]{Table}{shape}{\ifinlist{#1}{\kvt@@tableshapes}
+ {\csdef{cmdkvt@Table@shape}{#1}}
+ {\ifinlist{#1}{\kvt@@tablebackends}
+ {\kvt@warn{Using a backend ('#1') as shape is deprecated.
+ Use the 'backend' option instead.}%
+ \csdef{cmdkvt@Table@shape}{#1}}
+ {\kvt@error{Table shape '#1' not known}
+ {Check for misspellings in '#1'}}}}
+\define@cmdkey[kvt]{TableEnv}{caption}{}
+\define@cmdkey[kvt]{TableEnv}{caption/lot}{}
+\define@cmdkey[kvt]{TableEnv}{caption/alt}{}
+\define@cmdkey[kvt]{TableEnv}{label}{}
+\define@boolkey[kvt]{TableEnv}{resume}[true]{%
+ \ifbool{#1}{\ifundef\kvt@@rowcountlast
+ {\kvt@error{No previous table whose counter could be resumed.}
+ {Check whether the "resume" is intentional and whether a
+ previously existing predecessor table has disappeared.}}{}}{}}
+\define@boolkey[kvt]{TableEnv}{resume*}[true]{%
+ \ifbool{#1}
+ {\ifundef\kvt@@lastenvopt
+ {\kvt@error{No previous table whose options could be resume*'d.}
+ {Check whether the "resume*" is intentional and whether a
+ previously existing predecessor table has disappeared.}}{}%
+ \kvt@setcmdkeys\kvt@@lastenvopt{Table}%
+ \kvt@setkeys{resume}{TableEnv}}
+ {}}
+\define@key[kvt]{Column}{default}{\kvt@colkeysetter{default}{#1}}
+\define@key[kvt]{Column}{format}{\kvt@colkeysetter{format}{#1}}
+\define@key[kvt]{Column}{align}{\kvt@colkeysetter{align}{#1}}
+\define@key[kvt]{Column}{head}{\kvt@colkeysetter{head}{#1}}
+\define@boolkey[kvt]{Column}{hidden}[true]{%
+ \kvt@colkeysetter{hidden}{#1}}
+\newcommand\kvt@colkeysetter[2]{%
+ \kvt@keysetter{\kvt@@column}{Column}{#1}{#2}{%
+ \csdef{kvt@col@#1@\kvt@@column}{#2}}}
+\newcommand\kvt@def@globalopt[2]{%
+ \define@key[kvt]{global}{#1/#2}{\kvt@lazypreset{#1}{#2={##1}}}}
+\newcommand\kvt@def@globalopts[2]{%
+ \forcsvlist{\kvt@def@globalopt{#1}}{#2}}
+\define@cmdkey[kvt]{ColGroup}{span}{%
+ \csgdef{kvt@colgrp@span@\kvt@@tname @\kvt@@colgrp}{#1}}
+\define@cmdkey[kvt]{ColGroup}{align}{%
+ \csgdef{kvt@colgrp@align@\kvt@@tname @\kvt@@colgrp}{#1}}
+\define@cmdkey[kvt]{ColGroup}{format}{%
+ \csgdef{kvt@colgrp@format@\kvt@@tname @\kvt@@colgrp}{#1}}
+\kvt@def@globalopts{ColGroup}{align, format}
+\define@cmdkey[kvt]{Layout}{headers}{%
+ \expandafter\kvt@parseheadrows\expandafter{\kvt@@tname}{#1}}
+\define@cmdkey[kvt]{Layout}{colgroups}{%
+ \expandafter\kvt@parsecolgroups\expandafter{\kvt@@tname}{#1}}
+\define@key[kvt]{HeadCell}{head}{%
+ \csdef{kvt@@hdcell@head@\kvt@@hdcell}{#1}}
+\define@key[kvt]{HeadCell}{align}{%
+ \csdef{kvt@@hdcell@align@\kvt@@hdcell}{#1}}
+\kvt@def@globalopts{HeadCell}{align}
+\define@cmdkey[kvt]{Row}{bg}{}
+\define@cmdkey[kvt]{Row}{format}{}
+\define@cmdkey[kvt]{Row}{format*}{}
+\define@cmdkey[kvt]{Row}{format!}{}
+\define@cmdkey[kvt]{Row}{align}{}
+\define@boolkey[kvt]{Row}{headlike}[true]{%
+ \ifbool{#1}{%
+ \edef\kvt@@opts{%
+ bg={\expandonce\cmdkvt@Table@headbg},%
+ format!={\expandonce\cmdkvt@Table@headformat},%
+ align={\expandonce\cmdkvt@Table@headalign}}%
+ \expandafter\kvt@setkeys@nopresets\expandafter{\kvt@@opts}{Row}%
+ }{}}
+\define@boolkey[kvt]{Row}{hidden}[true]{}
+\define@cmdkey[kvt]{Row}{below}{}
+\define@cmdkey[kvt]{Row}{above}{}
+\define@key[kvt]{Row}{around}{%
+ \kvt@setkeys@nopresets{below={#1},above={#1}}{Row}}
+\define@key[kvt]{Row}{style}{\kvt@UseRowStyles{#1}}
+\define@boolkey[kvt]{Row}{uncounted}[true]{}
+\define@boolkey[kvt]{Row}{expand}[true]{}
+\define@boolkey[kvt]{Row}{expandonce}[true]{}
+\kvt@def@globalopts{Row}{
+ bg,hidden,below,above,around,style,uncounted,
+ expand,expandonce}
+\AtEndOfPackage{\kvtSet{%
+ rowbg=white..black!10,
+ headbg=black!14,
+ showhead=true,
+ showrules=true,
+ headformat=\@firstofone,
+ headalign=,
+ shape=multipage,
+ width=\linewidth,
+ captionpos=b,
+ default=,
+ format=\kvtStrutted,
+ align=l,
+ head=,
+ hidden=false,
+ Row/bg={},
+ Row/hidden=false,
+ Row/above={},
+ Row/below={},
+ Row/uncounted=false,
+ Row/expand=false,
+ Row/expandonce=false,
+ ColGroup/align=c,
+ ColGroup/format=\kvtStrutted,
+ HeadCell/align=c,
+}}
\newcommand\NewKeyValTable[3][]{%
\@ifnextchar[%]
{\kvt@NewKeyValTable{#1}{#2}{#3}}%
{\kvt@NewKeyValTable{#1}{#2}{#3}[]}}
\def\kvt@NewKeyValTable#1#2#3[#4]{%
+ \ifinlist{#2}{\kvt@alltables}
+ {\kvt@error{Table type with name '#2' already defined}
+ {Check '#2' for typos and check other uses of
+ \string\NewKeyValTable}}{}%
\csdef{kvt@options@#2}{#1}%
\csdef{kvt@headings@#2}{}%
- \csedef{kvt@alignments@#2}{p{0pt}\expandonce\kvt@HackIntercolSpace}%
- \csdef{kvt@colkeys@#2}{}%
+ \csdef{kvt@alignments@#2}{}%
+ \csdef{kvt@allcolumns@#2}{}%
+ \csdef{kvt@displaycols@#2}{}%
\csdef{kvt@rowcount@#2}{0}%
\csdef{kvt@rows@#2}{}%
- \csdef{kvt@headings@#2}{\kvt@defaultheader}
+ \csdef{kvt@headings@#2}{\kvt@defaultheader}%
\listadd\kvt@alltables{#2}%
\def\do##1{%
\kvt@parsecolspec{#2}##1::\@undefined}%
\kvt@dossvlist{#3}%
+ \csdef{kvt@headrowcount@#2}{1}%
\csappto{kvt@headings@#2}{{\@nil}}%
- \ifstrempty{#4}
- {\csdef{kvt@headrowcount@#2}{1}}
- {\kvt@parseheadrows{#2}{#4}}%
+ \kvt@parselayout{#4}{#2}%
}
\def\kvt@parsecolspec#1#2:#3:#4\@undefined{%
+ \kvt@checkcolspecempty{#4}{column}{#2}%
+ \def\kvt@@column{#2}%
+ \trim@spaces@in\kvt@@column
+ \expandafter\kvt@parsecolspec@i\expandafter{\kvt@@column}{#1}{#3}}
+\newcommand\kvt@parsecolspec@i[3]{\kvt@parsecolspec@ii{#2}{#1}{#3}}
+\newcommand\kvt@parsecolspec@ii[3]{%
\def\kvt@@column{#1@#2}%
- \setkeys[kvt]{Column}{#3}%
+ \ifinlistcs{#2}{kvt@allcolumns@#1}
+ {\kvt@error{Column name '#2' declared more than once in table type
+ '#1'}{Check '#2' for typos; column names declared so far:%
+ \forlistcsloop{ }{kvt@allcolumns@#1}}}{}%
+ \listcsadd{kvt@allcolumns@#1}{#2}%
+ \kvt@setkeys{#3}{Column}%
\ifcsstring{kvt@col@hidden@#1@#2}{true}{}{%
\cseappto{kvt@alignments@#1}{\csexpandonce{kvt@col@align@#1@#2}}%
\ifcsvoid{kvt@col@head@#1@#2}%
{\csappto{kvt@headings@#1}{{#2}}}%
{\cseappto{kvt@headings@#1}{{\csexpandonce{kvt@col@head@#1@#2}}}}%
- \listcsadd{kvt@colkeys@#1}{#2}%
+ \listcsadd{kvt@displaycols@#1}{#2}%
}%
\define@cmdkey[KeyValTable]{#1}{#2}[]{}%
+ \define@key[KeyValTable]{#1}{#2*}{%
+ \csdef{cmdKeyValTable@#1@#2}{##1}%
+ \csdef{kvt@@noformat@#1@#2}{1}}%
\presetkeys[KeyValTable]{#1}{#2}{}%
-}
+ \undef\kvt@@column}
\newcommand\kvt@defaultheader{%
- \noexpand\rowcolor{\cmdkvt@Table@headbg}%
- \kvt@defaultheader@i}
-\newcommand\kvt@defaultheader@i[1]{%
- \kvt@ifnil{#1}{\noexpand\tabularnewline}{%
- \unexpanded{&}%
+ \noexpand\kvt@rowcolorornot{\cmdkvt@Table@headbg}%
+ \kvt@defaultheader@i{}}
+\newcommand\kvt@defaultheader@i[2]{%
+ \kvt@ifnil{#2}{\noexpand\tabularnewline}{%
+ \unexpanded{#1}%
\ifdefvoid\cmdkvt@Table@headalign
- {\expandonce\cmdkvt@Table@headfmt\unexpanded{#1}}
+ {\expandonce\cmdkvt@Table@headformat{\unexpanded{#2}}}
{\noexpand\multicolumn{1}{\expandonce\cmdkvt@Table@headalign}
- {\expandonce\cmdkvt@Table@headfmt\unexpanded{#1}}}%
- \kvt@defaultheader@i}}
+ {\expandonce\cmdkvt@Table@headformat{\unexpanded{#2}}}}%
+ \kvt@defaultheader@i{&}}}
\newcommand\kvt@ifnil[1]{%
\ifx\@nil#1\relax
\expandafter\@firstoftwo\else
\expandafter\@secondoftwo\fi}
-\newcommand\kvt@HackIntercolSpace{%
- @{\hspace{-.5\arrayrulewidth}}}
\newcommand\kvt@alltables{}
+\newcommand\kvt@parselayout[2]{%
+ \def\kvt@@tname{#2}%
+ \kvt@setkeys{#1}{Layout}%
+ \undef\kvt@@tname}
+\newcommand\kvt@parsecolgroups[2]{%
+ \begingroup
+ \def\kvt@@result{}%
+ \def\do##1{\kvt@parsecolgroup{#1}##1::\@undefined}%
+ \kvt@dossvlist{#2}%
+ \expandafter\endgroup\kvt@@result}
+\def\kvt@parsecolgroup#1#2:#3:#4\@undefined{%
+ \kvt@checkcolspecempty{#4}{column group}{#2}%
+ \ifinlistcs{#2}{kvt@allcolumns@#1}{\kvt@error
+ {Name `#2' cannot be used for a column group in table type `#1',
+ as it is already used for a column}
+ {Check the \string\NewKeyValTable{#1} for
+ the names of known columns and check `#2' for a typo.}}{}%
+ \ifinlistcs{#2}{kvt@grpcolkeys@#1}{\kvt@error
+ {Name `#2' is used twice in table type `#1'}
+ {Check the \string\NewKeyValTable{#1} for typos in the names of
+ columns groups.}}{}%
+ \def\kvt@@colgrp{#2}%
+ \kvt@setkeys{#3}{ColGroup}%
+ \kvt@checkcolgroupcs{kvt@colgrp@span@#1@#2}{#1}{#2}%
+ \eappto\kvt@@result{%
+ \noexpand\define@cmdkey[KeyValTable]{#1}{#2}{%
+ \ifdefvoid\kvt@@colgrp@first{}{%
+ \noexpand\kvt@xkv@disablepreset[KeyValTable]{#1}{%
+ \noexpand\setkeys[KeyValTable]{#1}{%
+ \expandonce\kvt@@colgrp@first=\noexpand\kvt@@@colgroup
+ {\unexpanded{#2}}%
+ {\expandonce\kvt@@colgrp@n}%
+ {\csexpandonce{kvt@colgrp@align@#1@#2}}%
+ {\unexpanded{##1}}}}%
+ }%
+ }}%
+ \listcsadd{kvt@grpcolkeys@#1}{#2}}
+\newcommand\kvt@checkcolspecempty[3]{%
+ \ifstrempty{#1}{}{\ifstrequal{#1}{:}{}{\kvt@error
+ {Too many ':' in definition of #2 '#3'}
+ {Check whether there is an accidental ':' that should actually be
+ a ',' or ';'.}}}}
+\newcommand\kvt@checkcolgroup[3]{%
+ \def\kvt@@psvdo##1{%
+ \ifinlistcs{##1}{kvt@allcolumns@#2}{}{\kvt@error
+ {Column `##1' referenced in column group `#3' not known
+ in table type `#2'}
+ {Check the \string\NewKeyValTable{#2} for
+ the names of known columns and check `##1' for a typo.}}%
+ \ifcsvoid{kvt@@incolgrp@##1}{}{\kvt@error
+ {Column `##1' used more than once in column group `#3' of table
+ type `#2'}
+ {Check `##1' for a typo.}}%
+ \csdef{kvt@@incolgrp@##1}{#2}%
+ }\kvt@forpsvlist{\kvt@@psvdo}{#1}%
+ \def\kvt@@colgrp@n{0}%
+ \let\kvt@@colgrp@first\relax
+ \def\kvt@@status{0}%
+ \def\kvt@@coldo##1{%
+ \ifcsvoid{kvt@@incolgrp@##1}
+ {\expandafter\ifcase\kvt@@status \or
+ \def\kvt@@status{2}\fi}%
+ {\expandafter\ifcase\kvt@@status
+ \def\kvt@@status{1}\def\kvt@@colgrp@first{##1}%
+ \or\or
+ \kvt@error{Column group `\kvt@@colgrp' must consist of only
+ consecutive columns, but it is not}%
+ {Compare `\string\kvt@@curgrp' to the column ordering as
+ specified in `\string\NewKeyValTable{#1}'}%
+ \fi
+ \edef\kvt@@colgrp@n{\the\numexpr\kvt@@colgrp@n+1\relax}%
+ \csundef{kvt@@incolgrp@##1}}%
+ }\forlistcsloop{\kvt@@coldo}{kvt@displaycols@#2}}
+\newcommand\kvt@checkcolgroupcs[3]{%
+ \expandafter\expandafter\expandafter
+ \kvt@checkcolgroup
+ \expandafter\expandafter\expandafter{\csname #1\endcsname}{#2}{#3}}
\newcommand\kvt@parseheadrows[2]{%
- \csdef{kvt@@colgroups@#1}{}%
- \csdef{kvt@headrowcount@#1}{0}%
- \bgroup
+ \ifstrempty{#2}{}{\kvt@parseheadrows@i{#2}{#1}}}
+\newcommand\kvt@parseheadrows@i[2]{%
+ \csdef{kvt@@custheadrows@#2}{}%
+ \csdef{kvt@headrowcount@#2}{0}%
+ \begingroup
\def\kvt@@parseheadrows{}%
\def\do##1{%
- \def\kvt@@tmp{##1}\trim@post@space@in\kvt@@tmp%
- \expandafter\ifstrequal\expandafter{\kvt@@tmp}{::}
+ \ifstrequal{##1}{::}
{\appto\kvt@@parseheadrows{%
- \cseappto{kvt@@colgroups@#1}{%
- \csexpandonce{kvt@headings@#1}}}}
- {\appto\kvt@@parseheadrows{\kvt@parseheadrow{#1}{##1}}}%
- \appto\kvt@@parseheadrows{\csedef{kvt@headrowcount@#1}{%
- \the\numexpr\csuse{kvt@headrowcount@#1}+1\relax}}%
- }\kvt@dobrklist{#2}%
- \expandafter\egroup\kvt@@parseheadrows
- \csletcs{kvt@headings@#1}{kvt@@colgroups@#1}}
+ \cseappto{kvt@@custheadrows@#2}{%
+ \csexpandonce{kvt@headings@#2}}}}
+ {\appto\kvt@@parseheadrows{\kvt@parseheadrow{#2}{##1}}}%
+ \appto\kvt@@parseheadrows{\csedef{kvt@headrowcount@#2}{%
+ \the\numexpr\csuse{kvt@headrowcount@#2}+1\relax}}%
+ }\kvt@dobrklist{#1}%
+ \expandafter\endgroup\kvt@@parseheadrows
+ \csletcs{kvt@headings@#2}{kvt@@custheadrows@#2}}
\newcommand\kvt@parseheadrow[2]{%
- \bgroup
+ \begingroup
\def\do##1{\kvt@parsehdcolspec{#1}##1::\@undefined}%
\kvt@dossvlist{#2}%
\let\kvt@@tmpgrphd\@empty
\kvt@@span\z@
- \undef\kvt@@curgrp \undef\kvt@@lastgrp
- \def\do##1{\letcs\kvt@@curgrp{kvt@@colgrpof@##1}%
- \ifdefequal\kvt@@curgrp\kvt@@lastgrp
+ \undef\kvt@@curhd \undef\kvt@@lasthd
+ \kvt@def@atseconduse\kvt@@switchcol{\appto\kvt@@tmpgrphd{&}}%
+ \def\do##1{\letcs\kvt@@curhd{kvt@@hdcellof@##1}%
+ \ifdefequal\kvt@@curhd\kvt@@lasthd
{\advance\kvt@@span\@ne}%
- {\ifnum\kvt@@span>\z@ \expandafter\kvt@concludecolumn\fi
- \ifdefvoid\kvt@@curgrp{}{\ifcsdef{kvt@@colgrpdone@\kvt@@curgrp}{%
- \kvt@error{Column group `\kvt@@curgrp' must consist of only
+ {\ifnum\kvt@@span>\z@ \expandafter\kvt@concludehdcolumn\fi
+ \ifdefvoid\kvt@@curhd{}{\ifcsdef{kvt@@hdcelldone@\kvt@@curhd}{%
+ \kvt@error{Header cell `\kvt@@curhd' must consist of only
consecutive columns, but it is not}%
- {Compare `|\kvt@@curgrp|' to the column ordering as specified
- in `\string\NewKeyValTable{#1}'}}{}}%
- \kvt@@span\@ne \let\kvt@@lastgrp\kvt@@curgrp}%
- }\dolistcsloop{kvt@colkeys@#1}%
- \kvt@concludecolumn
+ {Compare `\string\kvt@@curhd' to the column ordering as
+ specified in `\string\NewKeyValTable{#1}'}}{}}%
+ \kvt@@span\@ne \let\kvt@@lasthd\kvt@@curhd}%
+ }\dolistcsloop{kvt@displaycols@#1}%
+ \kvt@concludehdcolumn
\appto\kvt@@tmpgrphd{\tabularnewline}%
- \edef\do{\noexpand\csappto{kvt@@colgroups@#1}{%
- \noexpand\noexpand\noexpand\rowcolor{\noexpand\cmdkvt@Table@headbg}%
+ \edef\do{\noexpand\csappto{kvt@@custheadrows@#1}{%
+ \unexpanded{\noexpand\kvt@rowcolorornot{\cmdkvt@Table@headbg}}%
\noexpand\unexpanded{\expandonce{\kvt@@tmpgrphd}}}}%
- \expandafter\egroup\do}
+ \expandafter\endgroup\do}
+\newcommand\kvt@rowcolorornot[1]{\ifstrempty{#1}{}{\rowcolor{#1}}}
+\newcommand\kvt@rowcolorcmdornot[1]{\ifdefvoid{#1}{}{%
+ \expandafter\rowcolor\expandafter{#1}}}
+\newcount\kvt@@bodyrow
\newcount\kvt@@span
-\newcommand\kvt@concludecolumn{%
- \ifdefequal\kvt@@tmpgrphd\@empty
- {\let\kvt@@extraalign\kvt@HackIntercolSpace}
- {\let\kvt@@extraalign\@empty}%
- \appto\kvt@@tmpgrphd{&}%
- \ifdefvoid\kvt@@lastgrp{}{%
+\newcommand\kvt@concludehdcolumn{%
+ \kvt@@switchcol
+ \ifdefvoid\kvt@@lasthd{}{%
\eappto\kvt@@tmpgrphd{\noexpand\multicolumn
{\the\kvt@@span}
- {\expandonce\kvt@@extraalign
- \csexpandonce{kvt@@colgrp@align@\kvt@@lastgrp}}
- {\csexpandonce{kvt@@colgrp@head@\kvt@@lastgrp}}}%
- \cslet{kvt@@colgrpdone@\kvt@@lastgrp}{\@ne}}}
+ {\csexpandonce{kvt@@hdcell@align@\kvt@@lasthd}}
+ {\noexpand\cmdkvt@Table@headformat
+ {\csexpandonce{kvt@@hdcell@head@\kvt@@lasthd}}}}%
+ \cslet{kvt@@hdcelldone@\kvt@@lasthd}{\@ne}}}
\def\kvt@parsehdcolspec#1#2:#3:#4\@undefined{%
+ \kvt@checkcolspecempty{#4}{header cell}{#2}%
\def\kvt@@colreg##1{%
- \ifinlistcs{##1}{kvt@colkeys@#1}{}
- {\kvt@error{Column `##1' referenced in column group `#2' not known
- in table type `#1'}{Check the \string\NewKeyValTable{#1} for
- the names of known columns and check `##1' for a typo.}}%
- \ifcsmacro{kvt@@colgrpof@##1}
- {\kvt@error{Column `##1' used in more than one column group}
+ \ifinlistcs{##1}{kvt@allcolumns@#1}{}
+ {\kvt@error{Column `##1', referenced in header cell `#2', not
+ known in table type `#1'}{Check the \string\NewKeyValTable{#1}
+ for the names of known columns and check `##1' for a typo.}}%
+ \ifcsmacro{kvt@@hdcellof@##1}
+ {\kvt@error{Column `##1' used in more than one header cell}
{Check the fourth, optional argument of \string\NewKeyValTable
and eliminate multiple occurrences of column `##1'.}}
- {\csdef{kvt@@colgrpof@##1}{#2}}%
+ {\csdef{kvt@@hdcellof@##1}{#2}}%
}\kvt@forpsvlist{\kvt@@colreg}{#2}%
- \def\kvt@@colgrp{#2}%
- \setkeys[kvt]{ColGroup}{#3}}
-\define@key[kvt]{ColGroup}{head}{%
- \csdef{kvt@@colgrp@head@\kvt@@colgrp}{#1}}
-\define@key[kvt]{ColGroup}{align}{%
- \csdef{kvt@@colgrp@align@\kvt@@colgrp}{#1}}
-\presetkeys[kvt]{ColGroup}{align=c}{}%
+ \def\kvt@@hdcell{#2}%
+ \kvt@setkeys{#3}{HeadCell}}
\newcounter{kvtRow}
\newcounter{kvtTypeRow}
\newcounter{kvtTotalRow}
@@ -224,91 +434,253 @@
\csuse{the#2}}
\newcounter{kvt@LabelCtr}
\newenvironment{KeyValTable}[2][]{%
- \bgroup%
\def\Row{\kvt@AddKeyValRow
{\noalign\bgroup}{\expandafter\egroup\kvt@@row}{#2}}%
\kvt@SetOptions{#2}{#1}%
+ \ifbool{kvt@TableEnv@resume*}{}
+ {\gdef\kvt@@lastenvopt{#1}}%
\csuse{kvt@StartTable@\cmdkvt@Table@shape}{#2}%
}{%
- \csuse{kvt@EndTable@\cmdkvt@Table@shape}%
- \egroup}
-\AfterEndEnvironment{KeyValTable}{%
- \csdef{kvt@rowcount@\kvt@@recenttable}{\thekvtTypeRow}}
-\newcommand\kvt@SetOptions[2]{%
- \bgroup\edef\kvt@@do{\egroup\noexpand%
- \setkeys[kvt]{Table}%
- {\csexpandonce{kvt@options@#1},\unexpanded{#2}}%
- }\kvt@@do}
-\newcommand\kvt@StartTabularlike[5]{%
- \gdef\kvt@@recenttable{#2}%
+ \csuse{kvt@EndTable@\cmdkvt@Table@shape}}
+\newcommand\kvt@SetOptions[2]{\expandafter
+ \kvt@SetOptions@i\expandafter{\csname kvt@options@#1\endcsname}{#2}}
+\newcommand\kvt@SetOptions@i[2]{\expandafter
+ \kvt@setkeys\expandafter{#1,#2}{Table,TableEnv}}
+\define@boolkey[metatbl]{EnvProp}{isLong}{\metatbl@boolprop{isLong}{#1}}
+\define@boolkey[metatbl]{EnvProp}{isTabu}{\metatbl@boolprop{isTabu}{#1}}
+\define@boolkey[metatbl]{EnvProp}{hasWidth}{%
+ \metatbl@boolprop{hasWidth}{#1}}
+\define@boolkey[metatbl]{EnvProp}{hasCaption}{%
+ \metatbl@boolprop{hasCaption}{#1}}
+\define@boolkey[metatbl]{EnvProp}{canVAlign}{%
+ \metatbl@boolprop{canVAlign}{#1}}
+\define@boolkey[metatbl]{EnvProp}{canHAlign}{%
+ \metatbl@boolprop{canHAlign}{#1}}
+\define@cmdkey[metatbl]{EnvProp}{packages}{\metatbl@setprop{pkg}{#1}}
+\define@key[metatbl]{EnvProp}{atEnd}{\metatbl@setprop[1]{atEnd}{#1}}
+\newrobustcmd\metatblRegisterEnv[2]{%
+ \edef\metatbl@@envname{#1}%
+ \csdef{metatbl@@registered@#1}{true}%
+ \setkeys[metatbl]{EnvProp}{#2}}
+\newcommand\metatbl@setprop[3][0]{%
+ \expandafter\newcommand
+ \csname metatbl@EnvProp@#2@\metatbl@@envname\endcsname[#1]{#3}}
+\newcommand\metatbl@boolprop[2]{%
+ \providebool{metatbl@EnvProp@#1@\metatbl@@envname}%
+ \setbool{metatbl@EnvProp@#1@\metatbl@@envname}{#2}}
+\newcommand\metatblRegistered[1]{\ifcsdef{metatbl@@registered@#1}}
+\newcommand\metatblIsLong[1]{\ifbool{metatbl@EnvProp@isLong@#1}}
+\newcommand\metatblIsTabu[1]{\ifbool{metatbl@EnvProp@isTabu@#1}}
+\newcommand\metatblHasWidth[1]{\ifbool{metatbl@EnvProp@hasWidth@#1}}
+\newcommand\metatblHasCaption[1]{\ifbool{metatbl@EnvProp@hasCaption@#1}}
+\newcommand\metatblCanVAlign[1]{\ifbool{metatbl@EnvProp@canVAlign@#1}}
+\newcommand\metatblCanHAlign[1]{\ifbool{metatbl@EnvProp@canHAlign@#1}}
+\newcommand\metatblUsePackage[1]{%
+ \def\do##1{%
+ \metatbl@csnamearg\usepackage{metatbl@EnvProp@pkg@##1}}%
+ \docsvlist{#1}}
+\newcommand\metatblRequire[1]{%
+ \def\do##1{%
+ \metatbl@csnamearg\RequirePackage{metatbl@EnvProp@pkg@##1}}%
+ \docsvlist{#1}}
+\newcommand\metatblAtEnd[2]{%
+ \csname metatbl@EnvProp@atEnd@#1\endcsname{#2}}
+\newcommand\metatbl@csnamearg[2]{%
+ \expandafter\expandafter\expandafter#1%
+ \expandafter\expandafter\expandafter{\csname#2\endcsname}}
+\metatblRegisterEnv{tabular}{%
+ isLong=false, hasWidth=false, isTabu=false, hasCaption=false,
+ canVAlign=true, canHAlign=false,
+ packages={},
+ atEnd={\preto\endtabular{#1}},
+}
+\metatblRegisterEnv{tabularx}{%
+ isLong=false, hasWidth=true, isTabu=false, hasCaption=false,
+ canVAlign=true, canHAlign=false,
+ packages=tabularx,
+ atEnd={%
+ \preto\TX@endtabularx{\toks@\expandafter{\the\toks@#1}}%
+ \preto\XLT@i@TX@endtabularx{\toks@\expandafter{\the\toks@#1}}},
+}
+\metatblRegisterEnv{longtable}{%
+ isLong=true, hasWidth=false, isTabu=false, hasCaption=true,
+ canVAlign=false, canHAlign=true,
+ packages={longtable},
+ atEnd={\preto\endlongtable{#1}},
+}
+\metatblRegisterEnv{xltabular}{%
+ isLong=true, hasWidth=true, isTabu=false, hasCaption=true,
+ canVAlign=false, canHAlign=true,
+ packages=xltabular,
+ atEnd={\preto\XLT@ii@TX@endtabularx{\toks@\expandafter{\the\toks@#1}}},
+}
+\metatblRegisterEnv{tabu}{%
+ isLong=false, hasWidth=true, isTabu=true, hasCaption=false,
+ canVAlign=true, canHAlign=false,
+ packages={tabu},
+ atEnd={\preto\endtabular{#1}},
+}
+\metatblRegisterEnv{longtabu}{%
+ isLong=true, hasWidth=true, isTabu=true, hasCaption=true,
+ canVAlign=false, canHAlign=true,
+ packages={tabu,longtable},
+ atEnd={\preto\endlongtable{#1}},
+}
+\newrobustcmd\metatbl@ifhasXcolumns[1]{%
+ \begingroup
+ \def\metatbl@@branch{\@secondoftwo}%
+ \def\NC@rewrite@X{\def\metatbl@@branch{\@firstoftwo}\NC@find l}%
+ \@mkpream{#1}%
+ \expandafter\endgroup\metatbl@@branch}
+\newcommand\kvt@StartTabularlike[2]{%
+ \metatblAtEnd{#1}{\kvt@@endhook}%
+ \let\kvt@@endhook\@empty
+ \let\kvt@@prehook\@empty
\ifbool{kvt@Table@showrules}
{\def\kvt@@rule##1{\csuse{##1rule}}}
{\def\kvt@@rule##1{}}%
- \csuse{kvt@@patchenvend@#1}%
- \setcounter{kvtRow}{0}%
+ \appto\kvt@@prehook{\kvt@@rule{top}}%
+ \appto\kvt@@endhook{\kvt@@rule{bottom}}%
+ \appto\kvt@@endhook{\noalign{%
+ \csxdef{kvt@rowcount@#2}{\thekvtTypeRow}%
+ \csxdef{kvt@@rowcountlast}{\thekvtRow}}}%
+ \ifdefvoid\cmdkvt@TableEnv@caption
+ {\let\kvt@@caption@main\@empty
+ \let\kvt@@caption@alt\@empty}
+ {\metatblHasCaption{#1}
+ {\edef\kvt@@caption@main{%
+ \csexpandonce{kvt@caption@\cmdkvt@Table@captionpos}%
+ \ifcsvoid{cmdkvt@TableEnv@caption/lot}{}
+ {[{\csexpandonce{cmdkvt@TableEnv@caption/lot}}]}%
+ {\expandonce\cmdkvt@TableEnv@caption
+ \ifdefvoid\cmdkvt@TableEnv@label{}{%
+ \noexpand\label{\expandonce\cmdkvt@TableEnv@label}}}%
+ \noexpand\\}%
+ \ifcsvoid{cmdkvt@TableEnv@caption/alt}
+ {\def\kvt@@caption@alt{}}
+ {\edef\kvt@@caption@alt{%
+ \csexpandonce{kvt@caption@\cmdkvt@Table@captionpos}[]%
+ {\csexpandonce{cmdkvt@TableEnv@caption/alt}}%
+ \noexpand\\}}%
+ }{\kvt@error
+ {Caption lost, table backend '#1' does not support captions}
+ {Consider placing the KeyValTable environment inside a 'table'
+ environment and use the \string\caption\space macro inside.}}}%
+ \ifdefstring{\cmdkvt@Table@captionpos}{t}
+ {\let\kvt@@caption@headmain\kvt@@caption@main\let\kvt@@caption@footmain\@empty
+ \let\kvt@@caption@headalt\kvt@@caption@alt \let\kvt@@caption@footalt\@empty}
+ {\let\kvt@@caption@footmain\kvt@@caption@main\let\kvt@@caption@headmain\@empty
+ \let\kvt@@caption@footalt\kvt@@caption@alt \let\kvt@@caption@headalt\@empty}%
+ \ifbool{kvt@Table@showhead}
+ {\eappto\kvt@@prehook{\csuse{kvt@headings@#2}\noexpand\kvt@@rule{mid}}}
+ {}%
+ \ifdefvoid{\cmdkvt@Table@valign}{}{\metatblCanVAlign{#1}{}
+ {\undef{\cmdkvt@Table@valign}%
+ \kvt@warn{Table environment '#1' of table '#2'
+ does not support the vertical alignment option (valign).
+ Ignoring the option}}}%
+ \ifdefvoid{\cmdkvt@Table@halign}{}{\metatblCanHAlign{#1}{}
+ {\undef{\cmdkvt@Table@halign}%
+ \kvt@warn{Table environment '#1' of table '#2'
+ does not support the horizontal alignment option (halign).
+ Ignoring the option}}}%
+ \global\kvt@@bodyrow=0\relax
+ \ifbool{kvt@TableEnv@resume}
+ {\setcounter{kvtRow}{\csuse{kvt@@rowcountlast}}}
+ {\setcounter{kvtRow}{0}}%
\setcounter{kvtTypeRow}{\csuse{kvt@rowcount@#2}}%
- \bgroup\edef\kvt@@do{\egroup
- \ifbool{#4}{}{\noexpand\kvt@dottedrowcolors
- {\ifbool{kvt@Table@showhead}
- {\the\numexpr\csuse{kvt@headrowcount@#2}+1\relax}
- {1}}%
- {\expandonce\cmdkvt@Table@rowbg}}%
+ \expandafter\kvt@setrowcolors\expandafter{\cmdkvt@Table@rowbg}%
+ \begingroup\edef\kvt@@do{\endgroup
\expandafter\noexpand\csname #1\endcsname
- \ifbool{#5}
- {\ifbool{#4}
+ \ifdefvoid{\cmdkvt@Table@halign}{}
+ {\metatblIsTabu{#1}{}{[\cmdkvt@Table@halign]}}%
+ \metatblHasWidth{#1}
+ {\metatblIsTabu{#1}
{to \expandonce\cmdkvt@Table@width}
{{\expandonce\cmdkvt@Table@width}}}
{}%
+ \ifdefvoid{\cmdkvt@Table@valign}{}{[\cmdkvt@Table@valign]}%
+ \ifdefvoid{\cmdkvt@Table@halign}{}
+ {\metatblIsTabu{#1}{[\cmdkvt@Table@halign]}{}}%
{\csexpandonce{kvt@alignments@#2}}%
- \noexpand\kvt@@rule{top}%
- \ifbool{kvt@Table@showhead}
- {\csuse{kvt@headings@#2}\noexpand\kvt@@rule{mid}}
- {}%
- \ifbool{#4}
- {\noexpand\taburowcolors 2{\expandonce\cmdkvt@Table@rowbg}}{}%
- \ifbool{#3}{\noexpand\endhead}{}%
+ \expandonce\kvt@@caption@headmain
+ \expandonce\kvt@@prehook
+ \metatblIsLong{#1}{%
+ \noexpand\endfirsthead
+ \expandonce\kvt@@caption@headalt
+ \expandonce\kvt@@prehook
+ \noexpand\endhead}{}%
+ \expandonce\kvt@@caption@footmain
+ \metatblIsLong{#1}{%
+ \noexpand\endlastfoot
+ \expandonce\kvt@@caption@footalt
+ \noexpand\endfoot}{}%
}\kvt@@do}
-\newcommand\kvt@stepcounters[1][1]{%
- \addtocounter{kvtRow}{#1}%
- \addtocounter{kvtTypeRow}{#1}%
- \addtocounter{kvtTotalRow}{#1}}
-\newcommand\kvt@DefineStdTabEnv{\@dblarg\kvt@DefineStdTabEnv@i}
-\newcommand\kvt@DefineStdTabEnv@i[6][]{%
- \expandafter\newcommand\csname kvt@StartTable@#1\endcsname[1]{%
- \kvt@StartTabularlike{#2}{##1}{#3}{#4}{#5}}%
+\newcommand\kvt@caption@t{\caption}
+\newcommand\kvt@caption@b{%
+ \noalign{\parbox{0pt}{\vskip\baselineskip}}%
+ \caption}
+\newcommand\kvt@setrowcolors[1]{%
+ \ifstrempty{#1}{}{\kvt@setrowcolors@i#1\@nil}}
+\def\kvt@setrowcolors@i#1..#2\@nil{%
+ \def\kvt@@bgcolor@odd{#1}%
+ \def\kvt@@bgcolor@even{#2}}
+\newcommand\kvt@userowcolors{\ifnumodd{\the\kvt@@bodyrow}
+ {\kvt@rowcolorcmdornot{\kvt@@bgcolor@odd}}
+ {\kvt@rowcolorcmdornot{\kvt@@bgcolor@even}}}
+\newcommand\kvt@RegisterBackend[1]{%
+ \ifinlist{#1}{\kvt@@tablebackends}
+ {\kvt@error{Backend '#1' already registered}
+ {Internal error. Check use of \string\kvt(a)RegisterBackend.}}
+ {\kvt@CheckMetatblEnv{#1}%
+ \listadd{\kvt@@tablebackends}{#1}%
+ \kvt@DefineStdTabEnv{#1}{#1}}}
+\newcommand\kvt@RegisterShape[3]{%
+ \ifinlist{#1}{\kvt@@tableshapes}
+ {\kvt@error{Shape '#1' already registered}
+ {Internal error. Check use of \string\kvt(a)RegisterShape.}}
+ {\kvt@CheckMetatblEnv{#2}\kvt@CheckMetatblEnv{#3}%
+ \listadd{\kvt@@tableshapes}{#1}%
+ \ifstrequal{#2}{#3}
+ {\kvt@DefineStdTabEnv{#1}{#2}}
+ {\kvt@DefineDualTabEnv{#1}{#2}{#3}}}}
+\newcommand\kvt@CheckMetatblEnv[1]{\metatblRegistered{#1}{}
+ {\kvt@error{Environment '#1' not supported by keyvaltable}
+ {Check \string\metatblRegisterEnv\space for how to make it
+ supported.}}}
+\newcommand\kvt@@tablebackends{}
+\newcommand\kvt@@tableshapes{}
+\newcommand\kvt@DefineStdTabEnv[2]{%
+ \csdef{kvt@StartTable@#1}##1{%
+ \kvt@StartTabularlike{#2}{##1}}%
\csedef{kvt@EndTable@#1}{%
- \ifstrempty{#6}{\noexpand\kvt@@rule{bottom}}{}%
- \expandafter\noexpand\csname end#2\endcsname}%
- \ifstrempty{#6}{}{\csdef{kvt@@patchenvend@#2}{#6}}}
-\kvt@DefineStdTabEnv{tabular}{false}{false}{false}{}
-\kvt@DefineStdTabEnv{longtable}{true}{false}{false}{}
-\kvt@DefineStdTabEnv{tabularx}{false}{false}{true}{%
- \preto\TX@endtabularx{\toks@\expandafter{\the\toks@
- \kvt@@rule{bottom}}}}
-\kvt@DefineStdTabEnv{xltabular}{true}{false}{true}{%
- \preto\XLT@ii@TX@endtabularx{\toks@\expandafter{\the\toks@
- \kvt@@rule{bottom}}}}
-\kvt@DefineStdTabEnv[onepage]{tabu}{false}{true}{true}{}
-\kvt@DefineStdTabEnv[multipage]{longtabu}{true}{true}{true}{}
-\newcommand\kvt@dottedrowcolors[2]{%
- \kvt@dottedrowcolors@i{#1}#2\@nil}
-\def\kvt@dottedrowcolors@i#1#2..#3\@nil{%
- \ifnumodd{#1}
- {\rowcolors{#1}{#2}{#3}}
- {\rowcolors{#1}{#3}{#2}}}
-\define@cmdkey[kvt]{Row}{bg}{}%
-\define@boolkey[kvt]{Row}{hidden}[true]{}%
-\define@cmdkey[kvt]{Row}{below}{}
-\define@cmdkey[kvt]{Row}{above}{}
-\define@cmdkey[kvt]{Row}{around}{%
- \def\cmdkvt@Row@above{#1}\def\cmdkvt@Row@below{#1}}
+ \expandafter\noexpand\csname end#2\endcsname}}
+\newcommand\kvt@DefineDualTabEnv[3]{%
+ \expandafter\newcommand\csname kvt@StartTable@#1\endcsname[1]{%
+ \kvt@ifhasXcolumns{##1}
+ {\csedef{kvt@EndTable@#1}{%
+ \expandafter\noexpand\csname end#3\endcsname}%
+ \kvt@StartTabularlike{#3}{##1}%
+ }{\csedef{kvt@EndTable@#1}{%
+ \expandafter\noexpand\csname end#2\endcsname}%
+ \kvt@StartTabularlike{#2}{##1}}}}
+\newcommand\kvt@ifhasXcolumns[1]{%
+ \expandafter\expandafter\expandafter\metatbl@ifhasXcolumns
+ \expandafter\expandafter\expandafter{%
+ \csname kvt@alignments@#1\endcsname}}
+\kvt@RegisterBackend{tabular}
+\kvt@RegisterBackend{longtable}
+\kvt@RegisterBackend{tabularx}
+\kvt@RegisterBackend{xltabular}
+\kvt@RegisterBackend{tabu}
+\kvt@RegisterBackend{longtabu}
\newcommand\kvt@AddKeyValRow[3]{%
#1%
\@ifnextchar[%]
{\kvt@AddKeyValRow@i{#2}{#3}}
{\kvt@AddKeyValRow@i{#2}{#3}[]}}
\def\kvt@AddKeyValRow@i#1#2[#3]#4{%
- \setkeys[kvt]{Row}{#3}%
+ \kvt@setkeys{#3}{Row}%
\ifbool{kvt@Row@hidden}
{\let\kvt@@row\@empty #1}
{\kvt@AddKeyValRow@ii{#1}{#2}{#4}}}
@@ -318,38 +690,211 @@
\ifdefvoid\cmdkvt@Row@above{}{%
\eappto\kvt@@row{\noexpand\noalign{\noexpand\vspace{%
\expandonce\cmdkvt@Row@above}}}}%
- \ifdefvoid\cmdkvt@Row@bg{}{%
- \eappto\kvt@@row{\noexpand\rowcolor{\expandonce\cmdkvt@Row@bg}}}%
- \expandafter\appto\expandafter\kvt@@row\expandafter{\kvt@@everyrow}
+ \appto\kvt@@row{\noalign{\global\advance\kvt@@bodyrow\@ne}}%
+ \ifbool{kvt@Row@uncounted}{}{%
+ \appto\kvt@@row{\noalign{\kvt@stepcounters}}}%
+ \ifdefvoid\cmdkvt@Row@bg
+ {\appto\kvt@@row{\kvt@userowcolors}}
+ {\eappto\kvt@@row{\noexpand\rowcolor{\expandonce\cmdkvt@Row@bg}}}%
+ \ifdefvoid\cmdkvt@Row@align
+ {\let\kvt@@rowmkmulticolumn\@empty}
+ {\edef\kvt@@rowmkmulticolumn{%
+ \noexpand\multicolumn{1}{\expandonce\cmdkvt@Row@align}}}%
+ \ifcsvoid{cmdkvt@Row@format!}
+ {\edef\kvt@@cellfmtbuilder##1##2{%
+ \noexpand\edef##1####1{%
+ \noexpand\kvt@expandonce@onearg\noexpand\kvt@@mkmulticolumn
+ {\ifcsvoid{cmdkvt@Row@format*}{\@firstofone}
+ {\noexpand\unexpanded{\csexpandonce{cmdkvt@Row@format*}}}%
+ {\noexpand\csexpandonce{##2}{%
+ \ifdefvoid\cmdkvt@Row@format{\@firstofone}
+ {\noexpand\unexpanded{\expandonce\cmdkvt@Row@format}}%
+ {####1}}}}}}}%
+ {\edef\kvt@@cellfmtbuilder##1##2{%
+ \noexpand\edef##1####1{%
+ \noexpand\kvt@expandonce@onearg\noexpand\kvt@@mkmulticolumn{%
+ \noexpand\unexpanded{\csexpandonce{cmdkvt@Row@format!}}%
+ {####1}}}}}%
\kvt@@span=0\relax
+ \kvt@def@atseconduse\kvt@@switchcol{\appto\kvt@@row{&}}%
\def\do##1{%
- \ifcsvoid{cmdKeyValTable@#2@##1}
- {\letcs\kvt@@cell{kvt@col@default@#2@##1}}
- {\letcs\kvt@@cell{cmdKeyValTable@#2@##1}}%
- \edef\kvt@@fmtcell{\csexpandonce{kvt@col@format@#2@##1}{%
- \expandonce\kvt@@cell}}%
\ifnumgreater\kvt@@span{0}
{\advance\kvt@@span\m@ne
- \ifstrempty\kvt@@cell{\def\kvt@@fmtcell{}}{}}
- {\appto\kvt@@row{&}}%
- \expandafter\kvt@CheckMulticolumn\kvt@@cell
- \relax\relax\relax\relax\@undefined{#2}{##1}%
- \expandafter\appto\expandafter\kvt@@row\expandafter{\kvt@@fmtcell}%
- }\dolistcsloop{kvt@colkeys@#2}%
+ \ifcsvoid{cmdKeyValTable@#2@##1}{}
+ {\ifdefvoid\kvt@@curcgname
+ {\kvt@error{Column '##1' nonempty inside a
+ \string\multicolumn}{}}
+ {\kvt@error{Column '##1' nonempty inside column group
+ '\kvt@@curcgname'}{}}}}
+ {\kvt@@switchcol
+ \let\kvt@@mkmulticolumn\kvt@@rowmkmulticolumn
+ \letcs\kvt@@curcolformat{kvt@col@format@#2@##1}%
+ \ifcsvoid{cmdKeyValTable@#2@##1}
+ {\letcs\kvt@@cell{kvt@col@default@#2@##1}}
+ {\letcs\kvt@@cell{cmdKeyValTable@#2@##1}%
+ \expandafter\kvt@CheckMulticolumn\expandafter{\kvt@@cell}{#2}%
+ \ifbool{kvt@Row@expandonce}
+ {\expandafter\let\expandafter\kvt@@cell\kvt@@cell}{}%
+ \ifbool{kvt@Row@expand}
+ {\protected@edef\kvt@@cell{\kvt@@cell}}{}}%
+ \ifcsvoid{kvt@@noformat@#2@##1}
+ {\kvt@@cellfmtbuilder\kvt@@formatter{kvt@@curcolformat}}%
+ {\let\kvt@@formatter\@firstofone}%
+ \csundef{kvt@@noformat@#2@##1}%
+ \edef\kvt@@fmtcell{\expandafter\expandonce\expandafter{%
+ \expandafter\kvt@@formatter\expandafter{%
+ \kvt@@cell}}}%
+ \expandafter\appto\expandafter\kvt@@row\expandafter{%
+ \kvt@@fmtcell}}%
+ }\dolistcsloop{kvt@displaycols@#2}%
+ \undef\kvt@@cellfmtbuilder
\appto\kvt@@row{\tabularnewline}%
\ifdefvoid\cmdkvt@Row@below{}{%
\eappto\kvt@@row{\noexpand\noalign{\noexpand\vspace{%
\expandonce\cmdkvt@Row@below}}}}%
#1}
-\newcommand\kvt@everyrow[1]{\def\kvt@@everyrow{#1}}
-\newcommand\kvt@@everyrow{}
-\kvt@everyrow{\kvt@stepcounters}%
-\def\kvt@CheckMulticolumn#1#2#3#4\@undefined#5#6{%
- \ifx#1\multicolumn
- \kvt@@span=#2\relax \advance\kvt@@span\m@ne
- \edef\kvt@@fmtcell{\unexpanded{\multicolumn{#2}{#3}}%
- {\csexpandonce{kvt@col@format@#5@#6}{\expandonce{#4}}}}%
- \fi}
+\newcommand\kvt@def@atseconduse[2]{\def#1{\def#1{#2}}}
+\newcommand\kvt@expandonce@onearg[2]{%
+ \ifdefequal{#1}{\@empty}{#2}{\expandonce{#1}{#2}}}
+\newcommand\kvt@stepcounters[1][1]{%
+ \addtocounter{kvtRow}{#1}%
+ \addtocounter{kvtTypeRow}{#1}%
+ \addtocounter{kvtTotalRow}{#1}}
+\newcommand\kvt@CheckMulticolumn[2]{%
+ \kvt@CheckMulticolumn@i{#2}#1%
+ \relax\relax\relax\relax\relax\kvt@@undefined}
+\def\kvt@CheckMulticolumn@i#1#2#3#4#5#6#7\kvt@@undefined{%
+ \ifdefmacro{#2}{%
+ \ifx#2\multicolumn
+ \kvt@SetMulticolumn{#4}{#3}{#5}%
+ \let\kvt@@curcgname\@empty
+ \else\ifx#2\kvt@@@colgroup
+ \letcs\kvt@@curcolformat{kvt@colgrp@format@#1@#3}%
+ \def\kvt@@curcgname{#3}%
+ \ifdefvoid\cmdkvt@Row@align
+ {\kvt@SetMulticolumn{#5}{#4}{#6}}
+ {\expandafter
+ \kvt@SetMulticolumn\expandafter{\cmdkvt@Row@align}{#4}{#6}}%
+ \fi\fi}{}}
+\newcommand\kvt@@@colgroup{kvt@@@colgroup}
+\newcommand\kvt@SetMulticolumn[3]{%
+ \kvt@@span=#2\relax \advance\kvt@@span\m@ne
+ \def\kvt@@cell{#3}%
+ \def\kvt@@mkmulticolumn{\multicolumn{#2}{#1}}}
+\newcommand\kvtNewRowStyle{\kvt@NewStyle{row}{\kvtRenewRowStyle}}
+\newcommand\kvtRenewRowStyle{\kvt@RenewStyle{row}{\kvtNewRowStyle}}
+\newcommand\kvtNewTableStyle{\kvt@NewStyle{table}{\kvtRenewTableStyle}}
+\newcommand\kvtRenewTableStyle{\kvt@RenewStyle{table}{\kvtNewTableStyle}}
+\newcommand\kvt@NewStyle[4]{%
+ \ifcsundef{kvt@@#1style@#3}
+ {\csdef{kvt@@#1style@#3}{#4}}
+ {\kvt@error{The #1 style '#3' is already defined}{Use
+ \string#2\space to change an existing style.}}}
+\newcommand\kvt@RenewStyle[4]{%
+ \ifcsundef{kvt@@#1style@#3}
+ {\kvt@error{A #1 style '#3' is not defined}
+ {Use \string#2\space to define a new #1 style.}}
+ {\csdef{kvt@@#1style@#3}{#4}}}
+\newcommand\kvt@UseRowStyles[1]{%
+ \kvt@UseStyles{row}{Row}{\kvt@NewRowStyle}{#1}}
+\newcommand\kvt@UseTableStyles[1]{%
+ \kvt@UseStyles{table}{Table}{\kvt@NewTableStyle}{#1}}
+\newcommand\kvt@UseStyle[4]{%
+ \ifcsundef{kvt@@#1style@#4}
+ {\kvt@error{A #1 style '#4' is not defined}
+ {Use \string#3\space to define a new #1 style.}}
+ {\kvt@setcskeys{kvt@@#1style@#4}{#2}}}
+\newcommand\kvt@UseStyles[4]{%
+ \kvt@xkv@disablepreset[kvt]{#2}{%
+ \forcsvlist{\kvt@UseStyle{#1}{#2}{#3}}{#4}}}
+\newcommand\kvt@xkv@disablepreset[3][KV]{%
+ \ifnumgreater{\XKV@depth}{1}
+ {#3}
+ {\kvt@xkv@savepreset{#1}{#2}{h}%
+ \kvt@xkv@savepreset{#1}{#2}{t}%
+ #3%
+ \kvt@xkv@restorepreset{#1}{#2}{h}%
+ \kvt@xkv@restorepreset{#1}{#2}{t}}}
+\newcommand\kvt@xkv@savepreset[3]{%
+ \csletcs{kvt@@saved@preset#3}{XKV@#1@#2@preset#3}%
+ \csundef{XKV@#1@#2@preset#3}}
+\newcommand\kvt@xkv@restorepreset[3]{%
+ \csletcs{XKV@#1@#2@preset#3}{kvt@@saved@preset#3}}
+\newcommand\NewCollectedTable[2]{%
+ \ifcsvoid{kvt@@tnameof@#1}
+ {\csgdef{kvt@@tnameof@#1}{#2}}
+ {\kvt@error{Name '#1' for a row collection is already defined}
+ {Check for other \string\NewCollectedTable{#1}.}}}
+\newcommand\CollectRow[3][]{%
+ \ifcsvoid{kvt@@tnameof@#2}
+ {\kvt@error{No row collection with name '#2' defined}
+ {Use \string\NewCollectedTable in the preamble to define it.}}
+ {%
+ \begingroup
+ \kvt@setkeys{#1}{Row}%
+ \kvt@colsetcskeys{kvt@@tnameof@#2}{#3}%
+ \endgroup
+ \kvt@protected@write\@auxout{\string\kvt@RecordedRow{#1}{#2}{%
+ \kvt@coldefaults{#2}%
+ #3}}%
+ }}
+\newcommand\kvt@protected@write[2]{\protected@write{#1}
+ {\def\do##1{\def##1{\string##1}}%
+ \dolistloop{\kvt@@writeprotected@cmds}%
+ \forlistloop{\kvt@writeprotect@fmt}{\kvt@@numberformatters}}
+ {#2}}
+\newcommand\kvt@writeprotect@fmt[1]{%
+ \csletcs{kvt@@fmt@#1}{#1}%
+ \csdef{#1}##1{%
+ \ifcsdef{kvt@@c@##1}
+ {\expandafter\string\csname#1\endcsname{##1}}
+ {\csname kvt@@fmt@#1\endcsname{##1}}}}
+\newcommand\kvtDeclareTableMacros[1]{%
+ \forcsvlist{\listadd\kvt@@writeprotected@cmds}{#1}}
+\newcommand\kvt@@writeprotected@cmds{}
+\newcommand\kvtDeclareTableCounters[1]{%
+ \def\do##1{\cslet{kvt@@c@##1}\@ne}%
+ \docsvlist{#1}}
+\newcommand\kvtDeclareCtrFormatters[1]{%
+ \def\do##1{\listeadd\kvt@@numberformatters{%
+ \expandafter\@gobble\string##1}}%
+ \docsvlist{#1}}
+\newcommand\kvt@@numberformatters{}
+\kvtDeclareTableMacros{\thekvtRow,\thekvtTypeRow,\thekvtTotalRow}
+\kvtDeclareTableCounters{kvtRow,kvtTypeRow,kvtTotalRow}
+\kvtDeclareCtrFormatters{\arabic,\alph,\Alph,\roman,\Roman,\fnsymbol}
+\newcommand\kvt@coldefaults[1]{%
+ \kvt@coldefaults@i{\csuse{kvt@@tnameof@#1}}}
+\newcommand\kvt@coldefaults@i[1]{%
+ \forlistcsloop{\kvt@coldefault{#1}}{kvt@displaycols@#1}}
+\newcommand\kvt@coldefault[2]{\ifcsvoid{kvt@col@default@#1@#2}{}{%
+ #2={\csuse{kvt@col@default@#1@#2}},}}
+\newcommand\kvt@RecordedRow[3]{%
+ \csgappto{kvt@@rowsof@#2}{\Row[{#1}]{#3}}}
+\newcommand\ShowCollectedTable[2][]{%
+ \ifcsvoid{kvt@@tnameof@#2}
+ {\kvt@error{No row collection with name '#2' defined}
+ {Use \string\NewCollectedTable in the preamble to define it.}}
+ {\ifcsvoid{kvt@@rowsof@#2}
+ {\kvt@warn{No row data available for name '#2'.
+ A LaTeX rerun might be needed^^M
+ for the row data to be available}%
+ \kvt@tableofcname{#2}{#1}{???\tabularnewline}}%
+ {\kvt@tableofcname{#2}{#1}{\csuse{kvt@@rowsof@#2}}}}}
+\newcommand\kvt@tableof[3]{%
+ \begin{KeyValTable}[{#2}]{#1}%
+ #3%
+ \end{KeyValTable}}
+\newcommand\kvt@tableofcname[1]{\expandafter
+ \kvt@tableofcname@i\expandafter{\csname kvt@@tnameof@#1\endcsname}}
+\newcommand\kvt@tableofcname@i[1]{\expandafter
+ \kvt@tableof\expandafter{#1}}
+\newcommand\ShowKeyValTableFile[3][]{%
+ \IfFileExists{#3}
+ {\begin{KeyValTable}[{#1}]{#2}\@@input#3 \end{KeyValTable}}%
+ {\kvt@error{No KeyValTable file '#3'}
+ {Check whether the file really exists or whether there is a
+ typo in the argument '#3'}}}
\newcommand\ShowKeyValTable[2][]{%
\begin{KeyValTable}[#1]{#2}%
\csuse{kvt@rows@#2}%
@@ -357,23 +902,30 @@
\csdef{kvt@rows@#2}{}}
\newcommand\AddKeyValRow[1]{%
\kvt@AddKeyValRow
- {\bgroup}
- {\csxappto{kvt@rows@#1}{\expandonce{\kvt@@row}}\egroup}
+ {\begingroup}
+ {\csxappto{kvt@rows@#1}{\expandonce{\kvt@@row}}\endgroup}
{#1}}
\newenvironment{KeyValTableContent}[1]{%
\def\Row{\AddKeyValRow{#1}}}{}%
-\define@boolkey[kvt]{PackageOptions}[kvt@@]{noTabuPkg}[true]{}
+\define@cmdkey[kvt]{PackageOptions}[kvt@@pkg@]{compat}{}
\ExecuteOptionsX[kvt]<PackageOptions>{%
- noTabuPkg=false,
+ compat=2.0,
}
\ProcessOptionsX[kvt]<PackageOptions>\relax
-\ifbool{kvt@@noTabuPkg}{}{%
- \RequirePackage{longtable,tabu}}
-\DeclareListParser{\kvt@dossvlist}{;}
-\DeclareListParser*{\kvt@forpsvlist}{+}
-\DeclareListParser{\kvt@dobrklist}{\\}
-\newcommand\kvt@error[2]{\PackageError{keyvaltable}{#1}{#2}}
-\newcommand\kvt@warn[1]{\PackageWarning{keyvaltable}{#1}}
+\newcommand\kvt@IfVersion[2]{%
+ \ifdimcomp{\kvt@@pkg@compat pt}{#1}{#2pt}}
+\kvt@IfVersion{<}{2.0}{%
+ \metatblRequire{tabu,longtabu}
+ \kvt@RegisterShape{onepage}{tabu}{tabu}
+ \kvt@RegisterShape{multipage}{longtabu}{longtabu}
+}{%
+ \metatblRequire{tabularx,longtable,xltabular}
+ \kvt@RegisterShape{onepage}{tabular}{tabularx}
+ \kvt@RegisterShape{multipage}{longtable}{xltabular}
+}
+\kvt@IfVersion{<}{2.0}{%
+ \renewcommand\kvt@parselayout[2]{\kvt@parseheadrows{#2}{#1}}%
+}{}
\endinput
%%
%% End of file `keyvaltable.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/keyvaltable.tlpobj new/tlpkg/tlpobj/keyvaltable.tlpobj
--- old/tlpkg/tlpobj/keyvaltable.tlpobj 2019-03-20 02:24:13.000000000 +0100
+++ new/tlpkg/tlpobj/keyvaltable.tlpobj 2020-04-12 01:55:30.000000000 +0200
@@ -1,19 +1,20 @@
name keyvaltable
category Package
-revision 50471
-shortdesc Re-usable tables separating content and presentation
+revision 54677
+shortdesc Re-usable table layouts separating content and presentation
relocated 1
-longdesc The main goal of the keyvaltable package is to offer means for
-longdesc typesetting tables easily and yet still looking rather nicely
-longdesc in a way that separates content from presentation and with
-longdesc re-usable layout for tables of the same type. For this purpose,
-longdesc the package provides the environment KeyValTable, which allows
-longdesc one to typeset tables that have a previously defined column
-longdesc layout and whose rows can be produced in a key-value fashion.
-runfiles size=4
+longdesc The main goal of this package is to offer means for typesetting
+longdesc tables easily and yet still looking rather nicely in a way that
+longdesc separates content from presentation and with re-usable layout
+longdesc for tables of the same type. For this purpose, the package
+longdesc provides the environment KeyValTable, which allows one to
+longdesc typeset tables that have a previously defined column layout and
+longdesc whose rows can be produced in a key-value fashion.
+runfiles size=10
RELOC/tex/latex/keyvaltable/keyvaltable.sty
+catalogue-contact-bugs https://github.com/Ri-Ga/keyvaltable/issues
+catalogue-contact-repository https://github.com/Ri-Ga/keyvaltable
catalogue-ctan /macros/latex/contrib/keyvaltable
-catalogue-date 2019-03-18 21:55:33 +0100
catalogue-license lppl1.2
catalogue-topics table
-catalogue-version 1.0
+catalogue-version 2.2
++++++ kluwer.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kluwer.doc.tlpobj new/tlpkg/tlpobj/kluwer.doc.tlpobj
--- old/tlpkg/tlpobj/kluwer.doc.tlpobj 2019-02-28 03:45:58.000000000 +0100
+++ new/tlpkg/tlpobj/kluwer.doc.tlpobj 2020-03-04 23:51:46.000000000 +0100
@@ -1,6 +1,6 @@
name kluwer.doc
category Package
-revision 45756
+revision 54074
shortdesc doc files of kluwer
relocated 1
docfiles size=54
++++++ kluwer.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kluwer.tlpobj new/tlpkg/tlpobj/kluwer.tlpobj
--- old/tlpkg/tlpobj/kluwer.tlpobj 2019-02-28 03:45:58.000000000 +0100
+++ new/tlpkg/tlpobj/kluwer.tlpobj 2020-03-04 23:51:46.000000000 +0100
@@ -1,6 +1,6 @@
name kluwer
category Package
-revision 45756
+revision 54074
shortdesc Kluwer publication support
relocated 1
longdesc Most likely long obsolete, unfortunately.
++++++ knowledge.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/knowledge/README.md new/doc/latex/knowledge/README.md
--- old/doc/latex/knowledge/README.md 2019-02-15 23:22:44.000000000 +0100
+++ new/doc/latex/knowledge/README.md 2020-03-05 23:08:31.000000000 +0100
@@ -3,8 +3,8 @@
name: knowledge
license: LaTeX Project Public License version 1.2 or above
- version: v1.16
- date: 2019/02/15
+ version: v1.22
+ date: 2020/03/05
author: Thomas Colcombet
mail: thomas.colcombet(a)irif.fr
web: https://www.irif.fr/~colcombe/knowledge_en.html
Binary files old/doc/latex/knowledge/knowledge.pdf and new/doc/latex/knowledge/knowledge.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/knowledge/knowledge.tex new/doc/latex/knowledge/knowledge.tex
--- old/doc/latex/knowledge/knowledge.tex 2019-02-15 23:22:44.000000000 +0100
+++ new/doc/latex/knowledge/knowledge.tex 2020-03-05 23:08:31.000000000 +0100
@@ -4,7 +4,8 @@
\usepackage{paralist}
\usepackage[svgnames]{xcolor}
\usepackage{expl3}
-\usepackage[hidelinks]{hyperref}
+\usepackage{hyperref}
+%\usepackage{complexity}
\usepackage[quotation,scope]{knowledge}
\knowledgeconfigure{visible anchor points=false}
\knowledgeconfigure{notion,diagnose line=false}
@@ -145,7 +146,7 @@
-\knowledge{@token}{wrap=\Robustdisplay,up,md,typewriter,color=NavyBlue}
+\knowledge{{@token}}{wrap=\Robustdisplay,up,md,typewriter,color=NavyBlue}
@@ -159,6 +160,7 @@
\knowledgestyle{style}{typewriter,up,md,color=NavyBlue}
\knowledgestyle{intro style}{typewriter,up,md,color=blue}
+
\begin{scope}\label{style}
\knowledge{notion}{notion style}
\knowledge{intro notion}{notion style}
@@ -187,6 +189,10 @@
\knowledgeconfigure{quotation=false}
+\knowledge{LaTeX}[latex|LATEX|Latex]{text=\LaTeX}
+\knowledge{tex}[TeX|TEX]{text=\TeX}
+\knowledge{pdflatex}{typewriter}
+
\knowledge"{text=\quotesymbol}
\knowledge{""}{text=\quotesymbol\quotesymbol}
\knowledgeconfigure{quotation=true}
@@ -202,12 +208,12 @@
\ExplSyntaxOn
\knowledge{"..."}{kquotation,text=\kl{"}$\cdots$\kl{"}}
\knowledge{""...""}{kquotation,text=\kl{""}$\cdots$\kl{""}}
-\knowledge{"...@..."}{kquotation,text=\kl{"}$\cdots\arobas\cdots$\kl{"}}
-\knowledge{""...@...""}{kquotation,text=\kl{""}$\cdots\arobas\cdots$\kl{""}}
-\knowledge{"...@@..."}{kquotation,text=\kl{"}$\cdots\arobas\cdots\arobas\cdots$\kl{"}}
-\knowledge{""...@@...""}{kquotation,text=\kl{""}$\cdots\arobas\cdots\arobas\cdots$\kl{""}}
-\knowledge{"...@...@..."}{kquotation,text=\kl{"}$\cdots\arobas\cdots\arobas\cdots$\kl{"}}
-\knowledge{""...@...@...""}{kquotation,text=\kl{""}$\cdots\arobas\cdots\arobas\cdots$\kl{""}}
+\knowledge{{"...@..."}}{kquotation,text=\kl{"}$\cdots\arobas\cdots$\kl{"}}
+\knowledge{{""...@...""}}{kquotation,text=\kl{""}$\cdots\arobas\cdots$\kl{""}}
+\knowledge{{"...@@..."}}{kquotation,text=\kl{"}$\cdots\arobas\cdots\arobas\cdots$\kl{"}}
+\knowledge{{""...@@...""}}{kquotation,text=\kl{""}$\cdots\arobas\cdots\arobas\cdots$\kl{""}}
+\knowledge{{"...@...@..."}}{kquotation,text=\kl{"}$\cdots\arobas\cdots\arobas\cdots$\kl{"}}
+\knowledge{{""...@...@...""}}{kquotation,text=\kl{""}$\cdots\arobas\cdots\arobas\cdots$\kl{""}}
\ExplSyntaxOn
@@ -215,10 +221,9 @@
\makeatletter
\let\arobas @
\makeatother
-\knowledge{@}{kcommand,text=\arobas}
+\knowledge{{@}}{kcommand,text=\arobas}
-\knowledge{tex}{text=\TeX}
\knowledgedirective{people}{emphasize,color=DarkGray}
\knowledge{stackexchange}{people}
@@ -315,6 +320,7 @@
\knowledge{index key=}{directive}
\knowledge{index parent key=}{directive}
\knowledge{index style=}{directive}
+\knowledge{label scope}[label scope=]{option}
\knowledge{color=}{directive}
\knowledge{cyclic color}{directive}
\knowledge{colorbox=}{directive}
@@ -327,10 +333,10 @@
\knowledge{autoref target}{directive}
\knowledge{also now}{directive}
\knowledge{notion}{directive}
+\knowledge{no patch}{directive}
\knowledge{invisible=}[invisible]{directive}
\knowledge{detokenize}{directive}
\knowledge{remove space}{directive}
-
\begin{scope}\label{option}
\knowledge{hyperref}{option}
\knowledge{xcolor}{option}
@@ -354,7 +360,9 @@
\knowledge{unprotect link co}{option,text=unprotect link}
\knowledge{hyperlinks=}{option}
\knowledge{fix hyperref twocolumn}{option}
+\knowledge{diagnose help=}[diagnose help]{option}
\knowledge{diagnose line=}[diagnose line]{option}
+\knowledge{diagnose bar=}[diagnose bar]{option}
\knowledge{active}{option}
@@ -371,7 +379,11 @@
\knowledgedirective{package}{typewriter,color=DarkBlue}
\knowledge{CTAN}{color=darkgray,url={https://www.ctan.org/}}
\begin{scope}\label{package}
+ %\ExplSyntaxOn
+ %\def\mydebug{\tl_show:N\knowledge_knowledge_instance_tl}
+ %\ExplSyntaxOff
\knowledge{knowledge}{doc notion, package}
+ \knowledge{complexity}{package,url={https://www.ctan.org/pkg/complexity}}
\knowledge{expl3}{package,url={https://www.ctan.org/pkg/expl3}}
\knowledge{hyperref}{package,url={https://www.ctan.org/pkg/hyperref}}
\knowledge{tikzcd}{package,url={https://www.ctan.org/pkg/tikz-cd}}
@@ -382,8 +394,10 @@
\knowledge{xparse}{package,url={https://www.ctan.org/pkg/xparse}}
\knowledge{amsmath}{package,url={https://www.ctan.org/pkg/amsmath}}
\knowledge{amssymb}{package,url={https://www.ctan.org/pkg/amssymb}}
+ \knowledge{mathcommand}{package,url={https://www.ctan.org/pkg/mathcommand}}
\end{scope}
+
\knowledgedirective{environment}{typewriter}
\begin{scope}\label{env}
\knowledge{scope}{kenvironment}
@@ -408,7 +422,7 @@
\knowledge {unknown diagnose=}{directive}
\knowledge {suggestion=}{directive}
\knowledge {PDF string=}{directive}
- \knowledge {starred sequence}{doc notion}
+ \knowledge {stared sequence}{doc notion}
\knowledge {modifier}[modifiers|Modifiers]{doc notion}
\end{scope}
@@ -425,11 +439,28 @@
\knowledge{configuration option}[configuration options|Configuration options]{link=package option}
\knowledge{stack of visible scope instances}{notion}
\knowledge{quotation notation}{doc notion}
-\knowledge{jobname.kaux}[kaux file]{doc notion}
+\ExplSyntaxOn
+\def\klqn#1{{\kl[quotation~notation]{\tl_to_str:n{#1}}}}
+\def\klbn#1{{\kl[`\vbar'-notation]{\tl_to_str:n{#1}}}}
+\ExplSyntaxOff
+
+\knowledge{`\vbar'-notation}{doc notion}
+\knowledge{doc notion}
+ | jobname.kaux
+ | kaux file
\knowledge{undefined knowledge}[undefined knowledges|Undefined knowledges]{doc notion}
\knowledge{Non introduced autoref knowledge}{doc notion}
\knowledge{Duplicated intros}{doc notion}
-\knowledge{instance}[instances|Instances]{doc notion}
+\knowledge{doc notion}
+ | instance
+ | instances
+ | Instances
+\knowledge{doc notion}
+ | explicit scope
+ | explicit scoping
+ | Explicit scopes
+ | explicit scopes
+ | Explicit scoping
\knowledge{directive}[directives|Directives]{doc notion}
\knowledge{area}[areas|Areas]{doc notion}
\knowledge{knowledge}[knowledges|Knowledges]{doc notion}
@@ -440,7 +471,13 @@
\knowledge{knowledge style}[Knowledge styles|knowledge styles]{doc notion}
\knowledge{style}[styles|Styles|display style|display styles]{link=knowledge style}
\knowledge{category}[categories|Categories]{doc notion}
-\knowledge{scope}[scopes|Scopes]{doc notion} % separate the package
+\knowledge{doc notion}
+ | scope
+ | scopes
+ | Scopes
+\knowledge{doc notion}
+ | scopetag
+ | scopetags
\knowledge{namespace}[namespaces|Namespaces]{doc notion}
\knowledge{vertical mode}{doc notion}
\knowledge{debug mode}{doc notion}
@@ -450,10 +487,14 @@
\knowledge {\knowledge namespace}{doc notion}
\knowledge {\knowledge knowledge name}{doc notion}
+\knowledge {\knowledge optional scope}{doc notion}
+\knowledge {\knowledge synonym name}{doc notion}
\knowledge {\knowledge synonyms}[\knowledge optional argument]{doc notion}
\knowledge {\knowledge directives}[knowledge directive]{doc notion}
-\knowledge {composition mode}[composition]{option}
+\knowledge{option}
+ | composition mode
+ | composition
\knowledge {paper mode}[paper]{option}
\knowledge {electronic mode}[electronic]{option}
@@ -482,9 +523,6 @@
\knowledge {scope.sty}{link=scope option}
-\knowledge{latex}{text=\LaTeX}
-\knowledge{tex}{}
-\knowledge{pdflatex}{}
\knowledgedefault{}
@@ -565,11 +603,8 @@
\maketitle
\begin{abstract}\phantomintro(package){knowledge}%
-The "knowledge@@package" package offers automatic tools and commands
-for helping the writer of a (scientific) document to have all notions (hyper)linked
-to places where these are defined. Using the standard tools of \LaTeX{} for doing
-that would be extremely tedious.
-Eventually, it is intended to use the package for producing scientific semantic aware documents.
+The "knowledge@@package" package offers commands and notations for handling semantical notions in a (scientific) document.
+This allows to link the use of a notion to its definition, to add it to the index automatically, etc.
\end{abstract}
\ifcodeTF{\begin{quote}This version of the documentation includes a good part of the code. A casual user should \textit{a priori} not use this version of the documentation.\end{quote}}{}
@@ -587,7 +622,6 @@
\texttt{CTAN:}&\url{https://www.ctan.org/pkg/knowledge}
\end{tabular}
\end{quote}
-This is still in beta version but close to a first definitive release. A lot of functionalities are perfectly operational, and the syntax is close to stable. At any rate, if changes happen, these will only affect a few lines in the configuration of the document.
\newpage
\knowledgeconfigure{protect links}
\tableofcontents
@@ -603,18 +637,22 @@
\begin{asparaitem}
\item deactivate quotation by default in the preamble in particular for avoiding clashes with commands such as \cs\DeclareMathDelimiter.
\item make knowledge compatible with beamer (request of Patrick Aiyao He), probably use hypertarget and hyperlink instead of hyperlabel and hyperref. Seems complicated because I do not know how to know if some material is going to be displayed, and this is necessary for a complete working solution.
+I have seen Till Tantau who explained me how to test whether a material is displayed. This involves testing the counter |beamer@coveringdepth| which if higher than one when 'not displayed'.
+|beamer@slideinframe| could also be intersting.
\item make quotation work properly in the titles of section...,
\item allow to protect quotation in commands, and not only environments (for instance xymatrix)
-\item remove the warnings about redefining commands
+%\item remove the warnings about redefining commands
\item proper mathematics handling. Write a new \csintro{\NewDocumentCommand}-like macro
-\item detect using some trick that the previous compilation failed, and deactivate the Kaux file in this case
- (for the moment, removing the aux file deactivates the kaux file. This is convenient but not sufficient.)
-\item proper code for \cs{\nointro}.
+%\item detect using some trick that the previous compilation failed, and deactivate the Kaux file in this case
+% (for the moment, removing the aux file deactivates the kaux file. This is convenient but not sufficient.)
+%\item proper code for \cs{\nointro}.
\item improving the \cs{\AP} and \cs{\itemAP} commands. For the moment \cs{\AP} silently fails inside the
- optional argument of \cs{\item}, and probably elsewhere too. See how this can be improved.
+ optional argument of \cs{\item}, and probably elsewhere too. See how this can be improved. I tried to use the \cs{inner_mode} test, but it also detects situations when where \cs{\AP} si allowed (like in minipage).
\item solve the \kl(package){amsmath} problem that \cs{\label} is deactivated in unnumbered environment, while knowledge would nevertheless like to point to the place...
\item Code export and import features.
\item Pointing inside an external pdf document.
+\item Correct the use of parameters in a directive (see example 'highlight' below).
+\item Make the boolean parameters in knowledges to properly handle the false case (removing the default).
\end{asparaitem}%
}{}
@@ -656,7 +694,7 @@
\item[2017-04-09] Internal change of code, for "scope" handling and for the "quotation notation": slowly going toward an extended "quotation notation" that can make the "scope" of search explicit.
\item[2017-04-09] Added the \kl{protect quotation} configure option, that is given a list of environments, and deactivates automatically the "quotation notation" when in there environments. This is a simple code for the moment. Typically, one can use \smallcode{\cs\knowledgeconfigure\{\kl{protect quotation}=tikzcd\}}. For the moment, it is not explained in the document.
\item[2017-04-19] Changed the display code such that nested knowledges behave properly: before, the introduction would be performed for the object and the subobjects.
-\item[2017-04-20] The "electronic mode" has been added, and the `final mode` is now renamed into "paper mode". The \cs{\knowledgepackagemode} configuration variable is also available for easier scripting.
+\item[2017-04-20] The "electronic mode" has been added, and the `\texttt{final mode}' is now renamed into "paper mode". The \cs{\knowledgepackagemode} configuration variable is also available for easier scripting.
\item[2017-06-06] FAQ on deactivating the quote in "Emacs" (thanks to Sylvain Perifel).
\item[2017-06-08] Removed the \texttt{noknowledge} package and all references to it.
\item[2017-06-08] Removed the \texttt{knowledgeutils.sty} and \texttt{scopearticle.sty} which are now integrated in the main file.
@@ -694,6 +732,18 @@
\item[2018-11-22] Corrected bug for "makeidx@@package" (thanks to Sylvain Schmitz). V1.14 on "CTAN".
\item[2019-01-27] Minor improvement of the doc, and hiding links in it. V1.15.
\item[2019-02-15] Correction of a placement problem with \cs\AP. V1.16.
+\item[2019-05-23] Adding of the "`\vbar'-notation" for the \cs{\knowledge} command.
+"Explicit scopes" are introduced. Updating of the documentation. "up" directive in math mode now silently does nothing, and \cs{\knowledgedirective} now forbids redefinitions by default (thanks to Léo Stefanesco).
+\item[2019-07-02] Removing the `\texttt{kl}' and `\texttt{intro}' styles that prevented a proper configuration of "intro notion@@style" (thanks to Léo Stefanesco).
+\item[2019-10-03] Update of the documentation, and V1.17.
+\item[2019-10-27] Bug correction and added the `\textbf{patch label}' configuration directive (thanks to \href{https://becca.ooo/}{Rebecca Turner}). V1.18.
+\item[2019-11-19] Now the labels are evaluated before being written to the "kaux file" in a \cs\KAuxNewLinkScopetagInstance\ command (bug fix). V1.19.
+\item[2019-11-29] Help added in the "diagnose file". \textbf{bar suggestion} (still working) renamed to "diagnose bar", and activated by default. \textbf{patch label} is renamed into "label scope".
+\item[2019-12-02] The "kaux file" is now checked for completeness befor being used. This should avoid errors when the previous compilation failed.
+\item[2019-12-03] Corrected bug in the scope access. V1.20.
+\item[2020-01-25] Corrected bug when "knowledge@@package" is used without "hyperref@@package" (thanks to Rémi Nollet).
+\item[2020-01-25] Corrected bug that made the kaux file not stabilize (thanks to Rémi Nollet). V1.21 on CTAN.
+\item[2020-03-05] No \texttt{hidelinks} and \texttt{breaklinks} are automatically activated unless the new option \kl{no patch} is activated. Doc update. V1.22 on CTAN.
\end{compactdesc}
\normalsize
%\restoregeometry
@@ -717,8 +767,9 @@
The "knowledge@@package" package offers several capabilities for handling colors, changing the display style, defining internal and external hyperlinks, producing an index, etc...
All these possibilities arise from defining explicitly or implicitly \kl{knowledges} associated to terms in plain english (or other languages).
-We start by describing a certain number of problems/scenarii that a user may be confronted to, and show how to solve them. The hyperlinks in this document have been generated using the "knowledge@@package" package.
-In the subsequent questions, a more detailed account of how the "package@knowledge@package" works and can be parameterized is given.
+We start by describing a certain number of problems/scenarii that a user may be confronted to, and show how to solve them.
+%The hyperlinks in this document have been generated using the "knowledge@@package" package.
+In the subsequent sections, a more detailed account of how the "package@knowledge@package" works and can be parameterized is given.
There is also a file \texttt{knowledge-example.tex} that can be used as a starting point.
@@ -740,14 +791,18 @@
\begin{code}[8cm]
\cs{\usepackage}["hyperref@@package",\kl(option){quotation}]\{"knowledge@@package"\}
\end{code}
-\noindent or:
+\noindent or equivalently:
\begin{code}[8cm]
\cs\usepackage\{\kl(package){hyperref}\}\\
-\cs\usepackage[\kl(option){quotation}\footnote{If you want to use the \kl{"}$\cdots$\kl{"} notation.}]\{"knowledge@@package"\}
+\cs\usepackage[\kl(option){quotation}\footnote{If you want to use the \kl{"..."} notation.}]\{"knowledge@@package"\}
\end{code}
-Then, in the preamble (or in an external file), one uses commands of the form:
-
+Then, in the preamble (or in an external file), one uses commands of the form either:
+\begin{code}
+\cs\knowledge\{\kl{url=}\{https://en.wikipedia.org/wiki/LaTeX\}\}\par
+\qquad\kl{|}\quad latex
+\end{code}
+or equivalently
\begin{code}
\cs\knowledge\{latex\}\{\kl{url=}\{https://en.wikipedia.org/wiki/LaTeX\}\}
\end{code}
@@ -755,9 +810,9 @@
which means an hyperreference to this address.
Finally in the body of the paper, the sole extra command \cs{\kl} (or the \kl"-symbol if the \kl(option){quotation} option is activated) is used,
-with as parameter a text. This text is searched for, and the directives attached to it (here the url),
-are used for formatting its printing\footnote{This resembles a lot a macro so far. It nevertheless differs in that: (a) if not defined, it does not make the compilation fail as a macro would, and thus does not interfere with the writing process, (b) any text can be used and not only alphabetic letters as in \TeX, (c) you do not have to care about the space after, and (d)
-in fact the machinery for resolving the meaning of a knowledge is much more powerful than simple macro execution.}.
+with as parameter a text. This text is searched for, and the directives attached to it (here "url="),
+are used for formatting its printing\footnote{This resembles a lot a macro so far. It nevertheless differs in that: (a) if not defined, it does not make the compilation fail as a macro would, and thus does not interfere with the writing process, (b) any text can be used and not only alphabetic letters as in default \TeX, (c) you do not have to care about the space after, and (d)
+in fact the machinery for resolving the meaning of a knowledge is much more powerful than simple macro expansion.}.
Hence:
\marginpar{\begin{hint}
If the knowledge is not defined, this does not make the compilation fail.
@@ -772,7 +827,7 @@
This package has been written for use in \kl{"}latex\kl{"}.
\end{code}\noindent
yields
-\knowledge{urllatex}{url=https://en.wikipedia.org/wiki/LaTeX}
+\knowledge{urllatex}{url=https://en.wikipedia.org/wiki/LaTeX,color=black}
\begin{PDFoutput}
This package has been written for use in \kl[urllatex]{latex}.
\end{PDFoutput}
@@ -783,8 +838,9 @@
extra "directives":
\begin{code}[10.9cm]
\cs\knowledge\{latex\}\{\kl{url=}https://en.wikipedia.org/wiki/LaTeX,\\
-\qquad\kl{text=}\cs\LaTeX,~\kl{color=}gray\}
-\end{code}\noindent
+\indent\qquad\kl{text=}\cs\LaTeX,~\kl{color=}gray\}
+\end{code}
+\noindent
yields with the same text
\knowledge{urllatexgray}{url=https://en.wikipedia.org/wiki/LaTeX, color=gray, text=\LaTeX}
\begin{PDFoutput}
@@ -806,26 +862,28 @@
This can be achieved using a `\vbar' separated list of texts in the \kl[\knowledge synonyms]{optional parameter} of the\cs{\knowledge} command, it is possible to add a list of `synonyms', such as in:
%
\marginpar{\begin{hint}
-This is a shorthand for a \kl{synonym} (or \kl{link=}) directive.\\For instance, with the code
- \begin{code}[4.3cm]
- \cs{\knowledge}\{D. Knuth\}\\~~~~\{\kl{link=}Knuth\}
- \end{code}\noindent then \smallcode{\cs\kl\{D. Knuth\}}
- would also point to the same url.
- \begin{code}[4.3cm]
- \cs{\knowledge}\{D. Knuth\}\\~~~~\{\kl{synonym}\}
- \end{code}\noindent would also work if used just after the definition
- of \texttt{Knuth}.\\
+ Another syntax (called the "`\vbar'-notation") is:
+ \begin{code}[4.35cm]
+ \cs{\knowledge}\{"url="\dots\}\\
+ \indent~\vbar~Donald Ervin Knuth\\
+ \indent~\vbar~Donald Knuth\\
+ \indent~\vbar~D. Knuth\\
+ \indent~\vbar~Knuth
+ \end{code}
+ Other possibilities are to use the
+ "synonym" or "link=" directives.
\end{hint}}
%
-\begin{code}
+\begin{code}[12.4cm]
\cs{\knowledge}\{latex\}[LaTeX\vbar Latex\vbar LATEX]\\
- \{\kl{url=}http://en.wikipedia.org/wiki/LaTeX,~\kl{text=}\cs{\LaTeX}, \kl{color=}gray\}
+\indent\qquad\{\kl{url=}http://en.wikipedia.org/wiki/LaTeX,\\
+\indent\qquad\kl{text=}\cs{\LaTeX}, \kl{color=}gray\}
\end{code}
This is interesting for people's name that can be displayed in various ways depending on the context. Hence
%
- \begin{code}[9.8cm]
- \cs\knowledge\{Donald Ervin Knuth\}[Donald Knuth\vbar Knuth]
- \{\kl{url=}https://fr.wikipedia.org/wiki/Donald\_Knuth\}
+ \begin{code}[12.4cm]
+ \cs\knowledge\{Donald Ervin Knuth\}[Donald Knuth\vbar Knuth]\\
+ \indent\qquad\{\kl{url=}https://fr.wikipedia.org/wiki/Donald\_Knuth\}
\end{code}
\noindent would allow
\begin{center}
@@ -833,24 +891,24 @@
or simply \smallcode{\kl"Knuth\kl"}~~~as well as~~~\smallcode{\kl"Donald Knuth\kl"} and so on
\end{center} to all point to the same web address.
It is even more convenient to use it for nouns that are sometimes in plural form or at the beginning of a sentence. Hence:
-%\marginpar{%
-% \begin{hint}
-% Sometimes one wants to use a \kl{knowledge} by explicitly mentioning it:
-% \begin{code}[4.3cm]
-% \cs\kl[group]\{This object\}
-% \\ is very important.
-% \end{code}
-% or
-% \begin{code}[4.3cm]
-% \kl"This object\kl{@}group\kl"
-% \\ is very important.
-% \end{code}
-% \end{hint}}
-\begin{code}[10.6cm]
-\cs\knowledge\{group\}[groups\vbar Groups\vbar group morphism\vbar group morphisms\vbar Group morphisms]\\
- \{\kl{url=}https://en.wikipedia.org/wiki/Group\_(mathematics)\}
+\begin{code}[12.4cm]
+\cs\knowledge\{group\}[groups\vbar Groups\vbar group morphism\\
+\indent~~~~~~~~~~\vbar group morphisms\vbar Group morphisms]\\
+\indent~~~~~ \{\kl{url=}https://en.wikipedia.org/wiki/Group\_(mathematics)\}
+\end{code}
+\noindent
+or the more readable and maintainable:
+\begin{code}[12.4cm]
+\cs\knowledge\{\kl{url=}https://en.wikipedia.org/wiki/Group\_(mathematics)\}
+\indent~~~\vbar~~group\\
+\indent~~~\vbar~~groups\\
+\indent~~~\vbar~~Groups\\
+\indent~~~\vbar~~group morphism\\
+\indent~~~\vbar~~group morphisms\\
+\indent~~~\vbar~~Group morphisms
\end{code}
-\end{variation}\noindent
+\end{variation}
+\noindent
makes it possible to use the notions in many contexts:
\begin{code}
\kl"Groups\kl" form a category when equipped with \kl"group morphisms\kl".
@@ -863,12 +921,10 @@
\begin{problem}
-I am writing a long scientific document with many notions tied together
-(typically, I have made all my best for clarifying but nevertheless
-it remains obscure,
-or it is a long survey involving many subfields, or a book, or a PhD thesis\footnote{Reviewers should appreciate...}).
-I would like all the notions be linked inside the document for being able
-in one click, whenever something is used, to jump to its definition.
+I am writing a scientific document with many different definitions, typically a journal article, a PhD thesis\footnote{Reviewers should appreciate...}, or a book.
+
+I would like all the notions to be linked inside the document for being able
+in one click, whenever something is used, to jump to its definition. I also want to easily write an index.
However, I do not want it to be a hassle when writing.
\end{problem}
\medskip
@@ -883,10 +939,10 @@
%
%
-Then write the document using \cs{\intro} (or \kl{""}$\cdots$\kl{""} if \kl(option){quotation} is activated) when a notion is defined/introduced, and
+Then write the document using \cs{\intro} (or \kl{""...""} if \kl(option){quotation} is activated) when a notion is defined/introduced, and
\marginpar{\begin{hint} Using an \cs{\AP} command is strongly advised,
and allows to control more precisely where the target of hyperreferences is: at the beginning of a paragraph is better than the beginning of the section several pages before...\end{hint}}
-\cs{\kl} (or \kl{"}$\cdots$\kl{"} if \kl(option){quotation} is activated) when it is used. For instance:
+\cs{\kl} (or \kl{"..."} if \kl(option){quotation} is activated) when it is used. For instance:
\begin{code}[12cm]
\cs\AP{}
A \cs\intro\{semigroup\} is an ordered pair \verb|$(S,\cdot)$| where \verb|$\cdot$| is an
@@ -919,7 +975,7 @@
with a neutral element~$1$.
\end{PDFoutput}
\knowledgeconfigure{visible anchor points=false}%
-\kl{Undefined knowledges} are in brown (it is an important feature that the compilation does not fail: undefined knowledges should not interfere with the writing of the document, which is the purpose of all this).
+\kl{Undefined knowledges} are in brown (it is an important feature that the compilation does not fail: undefined knowledges should not interfere with the writing of the document, which is the main activity of the writer).
One can now see the list of such problems in the file `\kl{filename.diagnose}'.
One can in particular find in the "`Undefined knowledges' section":
\begin{verbatim}
@@ -947,25 +1003,52 @@
\end{PDFoutput}
\knowledgeconfigure{visible anchor points=false}%
%
-Clicking on `semigroup' now jumps to the place it was introduced, and very precisely at the
+Clicking on `semigroup' now jumps to the place where it was introduced, and very precisely at the
location of the red corner depicting the presence of the \cs{\AP}-command.
-If now one adds the option \kl{electronic} while loading the package, then the colors and the red corner disappear. When using the option \kl{paper}, the links are still there, but all texts are in black.
+If now one adds the option \kl{electronic} while loading the package, then the red corners disappear as well as the brownish undefined knowledges which become black. When using the option \kl{paper}, the links are still there, but all texts are in black.
\AP
It is very often the case that for plain english (or other languages) some terms can be used in several forms; verbs can be conjugated; nouns can be plural, and so on.
-\marginpar{\hint{ The \kl[\knowledge directives]{directives} \kl{synonym} and "link=" can be also convenient.}}%
So usually the lines added to the file look more like:
\begin{code}[10.7cm]
\cs\knowledge\{semigroup\}[semigroups\vbar Semigroups]\{\kl{notion}\}\\
\cs\knowledge\{monoid\}[monoid\vbar Monoids]\{\kl{notion}\}
\end{code}
\noindent
-Now, using code like
+or, using the more readable "`\vbar'-notation":
+\begin{code}[10.7cm]
+\cs\knowledge\{\kl{notion}\}\\
+\indent~~~\klbn|~~semigroup\\
+\indent~~~\klbn|~~semigroups\\
+\indent~~~\klbn|~~Semigroups\\
+\cs\knowledge\{\kl{notion}\}\\
+\indent~~~\klbn|~~monoid\\
+\indent~~~\klbn|~~monoids\\
+\indent~~~\klbn|~~Monoids
+\end{code}
+Now, using a text like
\begin{code}[11cm]
-\kl"Monoids\kl" and \kl{"}semigroups\kl{"} play the same role from now.
+\kl"Monoids\kl" are simply \kl{"}semigroups\kl{"} in which\dots
\end{code}
\noindent will properly be linked to the definition of a semigroup and a monoid.
+Finally, in particular for large documents, it is good to have an "index". For this,
+one should load the package "makeidx@@package" before "knowledge@@package".
+Then use it normally: putting \cs{\makeindex} in the preamble and \cs{\printindex} at the end of the document. The \cs{knowledge} commands are not easily adapted:
+\begin{code}[10.7cm]
+\cs\knowledge\{"notion","index="semigroup\}\\
+\indent~~~\vbar~~semigroup\\
+\indent~~~\vbar~~semigroups\\
+\indent~~~\vbar~~Semigroups\\
+\cs\knowledge\{"notion","index="monoid\}\\
+\indent~~~\vbar~~monoid\\
+\indent~~~\vbar~~monoids\\
+\indent~~~\vbar~~Monoids
+\end{code}
+\noindent
+Now, the index (after running \texttt{makeidx}) contains all entries and references to the use of semigroups and monoids.
+
+See Section~\ref{subsection:makeidx option} for more details on making an index.
%
%\subsection{Managing an index}
%Though it is not its primary goal, without using its hyperlinking capabilities, the "knowledge@@package" offers convenient features for easily managing data for the construction of an index.
@@ -977,13 +1060,19 @@
\label{subsection:mathematics scenario}
The examples above show various techniques for using \kl{knowledges} for enhancing the information associated to terms. In fact, these techniques are not incompatible with mathematics. Imagine, for instance that you would like each time a macro \kl[@token]{\monoid} is met, to display $\mathcal M$, you would do for instance:
-\marginpar{\begin{hint} Defining new macros is best done using \cs{\newrobustcmd} (of the \texttt{etoolbox} package), rather than the usual \cs{\newcommand} of \LaTeX. This remark is general in \LaTeX{}, unless you have very specific reason to have your macro expandable. This is even more true when using "knowledge@@package"\end{hint}.}
+\marginpar{%
+ \begin{hint}
+ Defining new macros is best done using \cs{\newrobustcmd}
+ (of the "etoolbox@@package" package), rather than \cs{\newcommand} as usual in \LaTeX.
+ This remark is general independently of the use of "knowledge@@package"
+ \end{hint}.}
\begin{code}[7cm]
\cs\newrobustcmd\kl[@token]\monoid\{\cs\mathcal\ M\}
\end{code}\noindent
Imagine that furthermore, you would like to hyperlink to the definition of a monoid. A standard \cs{\kl} command does the job\footnote{It is highly advised to not use the "quotation notation" in math mode or macros.}:
\begin{code}[9cm]
-\cs\newrobustcmd\kl[@token]\monoid\{\cs\kl[monoid]\{\cs\mathcal\ M\}\}\\~
+\cs\newrobustcmd\kl[@token]\monoid\{\cs\kl
+monoid]\{\cs\mathcal\ M\}\}\\~
What is \$\kl[@token]\monoid\$ ?
\end{code}\noindent
\noindent
@@ -1049,19 +1138,20 @@
The options that can be used in the optional parameter of \cs{\usepackage} when loading the "knowledge@@package" package belong to the following classes:
\begin{compactdesc}
\itemAP[Writing mode] The "paper", "electronic" or "composition" modes are possible ("composition" is by default) (see Section~\ref{subsubsection:writing modes} for more details).
-These modes change several default rendering settings.
-\itemAP[Other packages] some of the options concern the loading and the use of other packages (\kl(package){hyperref}, \kl(package){xcolor}, \kl (package){makeidx}, \dots). This is explained in Section~\ref{subsubsection:packages-loading}.
+These modes change several rendering settings.
+\itemAP[Other packages] some of the options concern the loading and the use of other packages (\kl(package){hyperref}, \kl(package){xcolor}, \kl (package){makeidx}, \dots). Note that these package can also be loaded before "knowledge@@package". This is explained in Section~\ref{subsubsection:packages-loading}.
\itemAP[Configuration options] as used by the command \cs{\knowledgeconfigure} can be used when loading the package.
-\itemAP[Scoping] The \kl[scope option]{scope} "option@package option" makes the package aware at a fine level of the structure of the document (see Section~\ref{subsection:scoping} for explanations). This provides, for instance, the possibility to define pieces of "knowledge" that are attached to a section of the document.
+\itemAP[Scoping] The \kl[scope option]{scope} "option@package option" makes the package aware at a fine level of the structure of the document (see Section~\ref{subsection:scoping} for explanations). This provides, for instance, the possibility to define pieces of "knowledge" that are attached to a sections of the document.
+\itemAP[Other] The "no patch" option prevents the "knowledge@@package" to apply some patches that are convenient by default.
\end{compactdesc}
\subsubsection{Writing mode}
\label{subsubsection:writing modes}
-Other "package options" of "knowledge@@package" concern the ""writing modes"". There are three of them:
+There are three ""writing modes"" usable when loading the package "knowledge@@package":
\begin{itemize}
\itemAP In ""paper"" mode, the paper is rendered as for printing: in particular, no informative colors are visible. Hyperlinks are nevertheless present.
\itemAP In ""electronic"" mode, the document has some colors witnessing the existence of the links for the reader to know that clicking is available.
-\itemAP In ""composition"" mode, the document has colors helping the writing: "undefined knowledges" appear explicitly, "anchor points" are displayed, and so on.
+\itemAP In ""composition"" mode (the default), the document has colors helping the writing: "undefined knowledges" appear explicitly, "anchor points" are displayed, and so on.
\end{itemize}
Activating the modes is obtained either at load time using one of:\\
\begin{tabular}[t]{ll}
@@ -1073,15 +1163,15 @@
\begin{tabular}[t]{ll}
&\smallcode{\cs\def\cs\knowledgepackagemode\texttt\{\kl{paper}\texttt\}}
\end{tabular}\\
-The idea is that this can be used in automatic compilation scripts. For instance, launching in a terminal:\\
+The idea is that this can be used in automatic compilation scripts. For instance, using in a terminal:
\begin{code}[12cm]
\smallcode{\texttt{pdflatex} \quotesymbol\cs\def\cs\knowledgepackagemode%
\texttt\{\kl{electronic}\texttt\}\cs\input\texttt\{file.tex\texttt\}\quotesymbol}
\end{code}
-would result in compiling `\texttt{file.tex}' using "knowledge@@package" in
+\noindent would result in compiling `\texttt{file.tex}' using "knowledge@@package" in
"electronic mode".
-The following primitives are available in order to be mode-dependent:\\
+The following primitives are available to the user for "writing mode"-sensitive configuration:
\begin{code}[11.4cm]
\AP
\csintro\IfKnowledgePaperModeTF\texttt\{true code\texttt\}\texttt\{false code\texttt\}\\
@@ -1125,7 +1215,7 @@
\itemAP[\intro{active}] The package will be loaded, and all the capabilities that it triggers are activated.
This is the implicit meaning when nothing more is specified.
\item[\intro{inactive}] The package is not loaded, and no capabilities are activated (even if it had been loaded previously by another |\usepackage| command).
-\item[\intro{compatibility}] The package is not loaded. The directives it used do not cause any error, but have no effect.
+\item[\intro{compatibility}] The package is not loaded. The directives it uses do not cause any error, but have no effect.
\item[\intro{auto}] If the package was loaded before, then the associated capabilities are activated. This is the default behavior when the package is not named while loading.
\end{description}
Currently, the packages that can be loaded are:
@@ -1137,7 +1227,7 @@
\subsubsection{Configuring and \cs{\knowledgeconfigure}}
-Some part of the configuration can be done outside of the \cs{\usepackage} command that loads the "knowledge@@package" package. \AP This is done using the
+Some part of the configuration can be done outside of the \cs{\usepackage} command that loads the "knowledge@@package" package. This is done using the
\cs{\knowledgeconfigure} command:
\begin{center}
\smallcode{\csintro\knowledgeconfigure\{\kl{configuration directives}\}}
@@ -1147,22 +1237,29 @@
""Configuration directives"" consists of a comma separated list of elements that can take the following values:
\begin{description}
-\itemAP["diagnose line="] can be set to true or false. It activates or deactivates the line numbering in the "diagnose file". False is the default.
+\itemAP["diagnose bar="] (de)activates the "`\vbar'-notation" in the "diagnose file". True by default.
+\itemAP["diagnose help="] can be set to true or false. It activates or deactivates the help in the "diagnose file". True by default.
+\itemAP["diagnose line="] can be set to true or false. It activates or deactivates the line numbering in the "diagnose file". False by default.
\itemAP[\kl{fix hyperref twocolumn}] triggers a hack that solves a known problem that may occur when "hyperref@@package" is used in two-columns mode.
+\itemAP[\kl{label scope}] enables or disables the redefined \cs{\label} command, which helps automatically define scopes (default is~\textmd{true}).
\itemAP["notion@@option"] configures the "notion" "directive" which is a refined version of "autoref".
\itemAP["protect quotation="] is followed by a comma separated list of environments in which the "quotation notation" will be automatically deactivated (surrounded by braces if more than one item in the list).
\itemAP[\intro{protect link co} and \intro{unprotect link co}] starts and ends respectively a zone in which the "knowledge@@package" package do not create hyperlinks. These can be nested.
This is typically useful around, e.g. the table of contents.
\itemAP[\kl(option){quotation}] activates the "quotation notation", which allows to use \kl{"..."}, \kl{"...@..."} and \kl{"...@...@..."}
instead of \cs{\kl} commands and \kl{""...""}, \kl{""...@...""} and \kl{""...@...@...""} instead of the \cs{\intro} command.
-\itemAP[""strict""] is a Boolean option which, when activated turns some warnings (for instance when a knowledge is redefined) into errors.
-\itemAP[\kl{visible anchor points}] is an option that makes visible or invisible the \kl{anchor points} of the \cs{\AP} and \cs{\itemAP} commands.
+\itemAP[""strict""] is a Boolean option which, when activated, turns some warnings (for instance when a knowledge is redefined) into errors.
+\itemAP[\kl{visible anchor points}] is an option that makes visible or invisible the \kl{anchor points} of the \cs{\AP} and \cs{\itemAP} commands. Usually, this is automatically set to true when the "composition mode" is used (the default),
+and to false when the "paper mode" or the "electronic mode" are used.
\end{description}
-%\subsubsection{Other configuration}
+\subsubsection{Other configuration option}
-%Another option at loading is "scope@scope option": it is used for activating some macros for keeping track of the structure of the document. This is in particular helpful for making "knowledges" attached to specific parts of the document, or helping in the resolution of ambiguities. See Section~\ref{subsection:scoping} for more information on its use.
+\begin{itemize}
+\itemAP[""no patch""] deactivates some patches which otherwise are applied automatically.
+ Currently, the option \texttt{hidelinks} and \texttt{breaklinks} of the package \kl(package){hyperref} are automatically applied, unless "no patch" is used while loading the package. Without \texttt{hidelinks} the links in the document are surrounded by red or light blue boxes (it depends also on the pdf viewer): while this may be acceptable when links are seldom used, this becomes problematic in combination with the "knowledge@@package" package. Without \texttt{breaklinks}, links are not broken as normal text: this may corrupt the appearance of paragraphs, in particular in a multi column context.
+\end{itemize}
\subsection{What is a \kl{knowledge}?}
@@ -1190,50 +1287,64 @@
\subsubsection{General description of the \cs{\knowledge} command}
The key command for introducing knowledges is \cs{\knowledge}.
-The syntax is:
+There are two syntaxes. The standard one is:
\begin{center}
\smallcode{\csintro\knowledge\{\kl[\knowledge knowledge name]{knowledge name}\}%
- [\kl[\knowledge synonyms]{synonyms}]\{\kl[\knowledge directives]{directives}\}}
+ [\kl[\knowledge synonyms]{synonym 1}\vbar\kl[\knowledge synonyms]{synonym 2}\vbar\dots]\{\kl[\knowledge directives]{directives}\}}
\end{center}
-
\AP
-The \intro[\knowledge knowledge name]{knowledge name} is a string describing the knowledge. It may use any combination of symbols (well balanced with respect to brackets).
+The second one is the ""`\vbar'-notation""\footnote{%
+ This is a non-standard "LaTeX" syntax. The rule is that each knowledge appears in a distinguished line
+ that starts with some spaces and a `$\vbar$', and ends at the end of the line.
+ Detecting the end of the line requires to change the catcode of the end of line character; this is
+ not robust for being used in an argument or a macro.
+ }:
+\begin{code}[10cm]
+\csreintro\knowledge\{\kl[\knowledge directives]{directives}\}\\
+\indent~~~~\klbn|~\kl[\knowledge knowledge name]{knowledge name}@\kl[\knowledge optional scope]{optional scope}\\
+\indent~~~~\klbn|~\kl[\knowledge synonyms]{synonym 1}@\kl[\knowledge optional scope]{optional scope}\\
+\indent~~~~\klbn|~\kl[\knowledge synonyms]{synonym 2}@\kl[\knowledge optional scope]{optional scope}\\
+\indent~~~~~~~~$\cdots$
+\end{code}
+\AP
+The \intro[\knowledge knowledge name]{knowledge name} as well as the \intro[\knowledge synonyms]{synonyms} are plain text strings describing the knowledge. It may contain any combination of symbols, including accents or special characters as long as it well bracketted.
This string will be used to fetch the \kl{knowledge}. Note (and this is a standard \kl{tex} behavior) that several consecutive spaces is the same as one or a line feed.
-\AP The \intro[\knowledge synonyms]{synonyms} are \kl[\knowledge knowledge name]{knowledge names} given in a `\vbar' separated list. This is a
-shorthand for writing `\kl{link=}' \kl[\knowledge directives]{directives}. (Note that there is another way to define synonyms using the \kl{synonym} directive).
+\AP In the normal syntax, \reintro[\knowledge synonyms]{synonyms} are given in a `\vbar' separated list, while in the "`\vbar'-notation" each of them has to be in a distinct line. \AP In the "`\vbar'-notation", an \intro[\knowledge optional scope]{optional scope} can be given after each \kl[\knowledge knowledge name]{knowledge name}/\kl[\knowledge synonyms]{synonym}.
+
+%This is a
+%shorthand for writing `\kl{link=}' \kl[\knowledge directives]{directives}. (Note that there is another way to %define synonyms using the \kl{synonym} directive).
\AP
The \intro[\knowledge directives]{directives} consists of `key=value' statements in a comma separated list.
-There are many \kl[\knowledge directives]{directives}. A list can be found in Section~\ref{subsection:directive list}. New ones can be defined using the \cs{\knowledgedirective} command.
+There are many \kl[\knowledge directives]{directives}. A list of them can be found in Section~\ref{subsection:directive list}. New ones can be defined using the \cs{\knowledgedirective} command.
\AP
The principle of the \cs{\knowledge} command is to introduce a new \kl{knowledge}, ready for being used.
However, what it does exactly depends a lot on the situations.
-First, the \kl[\knowledge directives]{directives} (a comma separated list of `key=value' commands) are parsed, and from it, the namespace and scope of the knowledge are determined, and it is decided if it will be executed immediately or postponed to the next compilation phase.
-Only then, either the \kl{knowledge} is written in the \kl{kaux file} for execution during the next compilation phase, or it is executed immediately.
-Finally, \kl[\knowledge synonyms]{synonyms} are parsed and linked to the \kl{knowledge}.
+First, the \kl[\knowledge directives]{directives} (a comma separated list of `key=value' commands) are parsed, and from it, the namespace and "scope" of the knowledge are determined, and it is decided if it will be defined immediately or postponed to the next compilation phase (using the \kl{kaux file}).
\subsubsection{Targeting and the corresponding directives}
The \cs{\knowledge} has to decide what to do when defining something. The basic behaviour is as follows.
\begin{itemize}
\item If the \cs{\knowledge} command is used in the preamble, then the \kl{knowledge} given as argument is defined immediately (the same effect can be obtained using the \kl{now} "directive"), and is accessible in the first compilation phase everywhere in the document (one extra phase is nevertheless required if \kl{autoref} or \kl{ref=} directives are used, for the "hyperref@@package" to do its job, or if "scope=" is used). This is the simplest way to use \cs\knowledge.
-\item Import/Export (\kl{not implemented}) writes a document containing a list of \cs{\knowledge} commands giving access to its content. This is to be imported by another document.
\item Otherwise, the \kl{knowledge} is written in an external file (the \kl{jobname.kaux} file), and the \kl{knowledge} will be really usable in the next compilation phase. This is particularly useful in conjunction with the \kl{scope option}: the \kl{knowledge} will have a scope depending on where it is introduced (for instance the document, or a theorem, or a lemma). The same \kl{knowledge name} can then point to different \kl{knowledges} depending on where it is used.
+\item Exporting (\kl{not implemented}) furthermore writes a document containing a list of \cs{\knowledge} commands giving access to its content. This is to be imported by another document.
\end{itemize}
The \intro{targeting directives} refine the above defined behaviour:
\begin{description}
-\itemAP[\intro{scope=}] When using a \kl[\knowledge directives]{directive} `\kl{scope=}name', the scope of the definition can be modified.
- \cs{\knowledge} will first check if there is an outer \kl{area} of this name, that accepts knowledge (only
+\itemAP[\intro{scope=} or `@' in the "`\vbar'-notation"] When using a \kl[\knowledge directives]{directive} `\kl{scope=}name' or `@name' in the "`\vbar'-notation", the scope of the definition can be modified.
+ \cs{\knowledge} will first check if there is an outer \kl{area} of this name (\texttt{theorem}, \texttt{section}, \dots), that accepts knowledge (only
"scope@@env" environments are subject to this unless \cs{\knowledgeconfigureenvironment} is used, or
the "scope@@option" "package option" is used when loading the package).
If this is the case, the knowledge will be associated to the corresponding \kl{instance}. For instance, inside a theorem, by default, the scope is the theorem, but adding the directive `\kl{scope=}section', the \kl{knowledge} becomes available in the whole section.
-If no scope is found using the above search, a label of the given name is searched for, and if it exists, the corresponding scope is chosen.
-\itemAP[\intro{export=}] (\kl{not implemented}) When using this directive, the knowledge will be (furthermore) written in another file, ready for being used in another document. In particular, the knowledge (in the other document) will point to the present one. The details on how this is supposed to work is to be specified.
+If no scope is found using the above search, an "explicit scope" of the given name is used.
+
+\itemAP[\intro{export=}] (\kl{not implemented}) When using this directive, the knowledge will be (furthermore) written to another file, ready for being used in another document. In particular, the knowledge (in the other document) will point to the present one. The details on how this is supposed to work is to be specified.
\itemAP[\intro{namespace=}] Allows to change the \kl{namespace}. In itself, this is useless. It has to be used in conjunction with new forms of \cs\kl-like commands.
\itemAP[\intro{now}] requires the \kl{knowledge} to be defined immediately. This may save one compilation phase. The drawback is that the \kl{knowledge} cannot be accessed before the \cs{\knowledge} command that has been introduced. It may help for modularity considerations. (for instance a \kl{knowledge}
-is used inside a proof, it has no sense to make it available elsewhere, and it is better style to locally define it).
+is used inside a proof, it makes no sense to make it available elsewhere, and it is better style to locally define it). This is implicit if the \cs{\knowledge} command happens in the preamble.
\itemAP[\intro{also now}] requires the \kl{knowledge} to be defined immediately as well as delayed to the next compilation phase. This is in particular how "auto references@autoref" should be handled. See the use of \cs{\knowledgenewvariant} for more examples.
\end{description}
@@ -1247,7 +1358,7 @@
The general boolean \kl[\knowledge directives]{directives} are the following:
\begin{description}
\itemAP[\intro{emphasize}] forces the text to be emphasized using `\cs{\emph}',
-\itemAP[\intro{italic}/\intro{up}] forces/unforces italic (be it in math or text mode),
+\itemAP[\intro{italic}/\intro{up}] forces/unforces italic ("up" does nothing in math mode),
\itemAP[\intro{boldface}/\intro{md}] forces/unforces boldface (be it in math or text mode),
\itemAP[\intro{smallcaps}] forces small capitals,
\itemAP[\intro{underline}] forces the text to be emphasized using `\cs{\underline}',
@@ -1278,7 +1389,7 @@
\AP The non-boolean general \kl[\knowledge directives]{directives} are the following:
\begin{compactdesc}
\itemAP[\intro{text=}\textmd{\{text\}}] will execute the \LaTeX{} code `text' instead of the key used for calling \cs\kl. For instance,
- \smallcode{\cs\knowledge \{latex\}\{\kl{text=}\cs{\LaTeX}\}} will typeset `\LaTeX{}' properly when used. Surrounding braces can be omitted if there are no commas. Be careful when linking to such knowledges, since the substitution of meaning will happen for all the knowledges linking to it.
+ \smallcode{\cs\knowledge \{latex\}\{\kl{text=}\cs{\LaTeX}\}} will typeset `\LaTeX{}' properly when used. Surrounding braces can be omitted if there are no commas. Be careful when linking to such knowledges, since the substitution of meaning will happen for all the knowledges linking to it, and this may not be the expected behaviour.
\itemAP[\intro{link=}\textmd{\{knowledge\}}] will continue searching the for linked \kl{knowledge}. Surrounding braces can be omitted if there are no commas.
This directive is often bypassed by the use of the \kl[\knowledge optional argument]{optional argument} of \cs{\knowledge} defining synonyms or the \kl{synonym} directive.
\itemAP[\intro{link scope=}\textmd{\{label\}}] will continue searching in the "scope" identified by the label. Surrounding braces can be omitted if there are no commas. If no "directive" "link=" is given, then the same key is searched for.
@@ -1286,11 +1397,12 @@
This directive is often bypassed by the use of the \kl[\knowledge optional argument]{optional argument} of \cs{\knowledge} defining synonyms or the \kl{synonym} directive.
\itemAP[\intro{synonym}] defines the knowledge as a link to the previously defined knowledge (in fact, the most recently defined that was not using \kl{synonym}). For instance
\begin{code}[11cm]
-\cs\knowledge\{Leslie Lamport\}\par
-~~~~~\{\kl{ref=}\{https://fr.wikipedia.org/wiki/Leslie\_Lamport\}\}\\
+\cs\knowledge\{Leslie Lamport\}\\
+\indent~~~~~\{\kl{ref=}\{https://fr.wikipedia.org/wiki/Leslie\_Lamport\}\}\\
\cs\knowledge\{L. Lamport\}\{\kl{synonym}\}\\
\cs\knowledge\{Lamport\}\{\kl{synonym}\}
-\end{code}\noindent
+\end{code}
+\noindent
results in the two subsequent \kl{knowledge names} to point to the first one.
\itemAP[\intro{style=}\textmd{\{knowledge style\}}] will adopt the styling option of the \kl{knowledge style}. Surrounding braces can be omitted if there are no commas.
\itemAP[\intro{wrap=}\textmd{\robustdisplay\token}] will execute the macro `\textmd{\robustdisplay\token}' with as argument the knowledge text before displaying it. For instance,
@@ -1311,7 +1423,7 @@
\begin{center}
\smallcode{\csintro{\knowledgestyle}*\{style name\}\{\kl[\knowledge directives]{directives}\}}
\end{center}
-The optional star permits to overload an existing style (otherwise, this results in an error). The \kl[\knowledge directives]{directives} follow the same structure as for a normal \cs{\knowledge}
+The optional star \texttt* permits to overload an existing style (otherwise, this results in an error). The \kl[\knowledge directives]{directives} follow the same structure as for a normal \cs{\knowledge}
command. When defined, a \kl{style} can be used in a \cs{\knowledge}
command using the \kl[\knowledge directives]{directives} `\kl{style=}style name' (it will be used when a \cs{\kl} command calls for the \kl{knowledge}) or `\kl{intro style=}style name' (that will be used by \cs{\intro} commands).
@@ -1335,10 +1447,10 @@
sequence of directives are used. \intro{Macro directives} are here for simplifying this situation (see also \cs{\knowledgedefault} and \cs{\knowledgestyle}). This is achieved using the \cs{\knowledgedirective} directive:
\marginpar{\begin{hint} This should not be confused with \kl{styles} which offer another way to control the display.\end{hint}}
\begin{center}
- \smallcode{\csintro{\knowledgedirective}\{name\}[optional parameter]\{directives\}}
+ \smallcode{\csintro{\knowledgedirective}*\{name\}[optional parameter]\{directives\}}
\end{center}
After such a command has been issued, `name' becomes a \kl[\knowledge directives]{directive}
-usable in \cs{\knowledge} commands, that amounts to execute the comma separated list `directives'. The newly created \kl[\knowledge directives]{directive} may receive a value, that is accessible as \texttt{\#1} in `directives'. The `optional parameter' gives
+usable in \cs{\knowledge} commands, that amounts to execute the comma separated list `directives'. The newly created \kl[\knowledge directives]{directive} may receive a value, that is accessible as \texttt{\#1} in `directives'. By default, it does not allow the redefinition of a directive. This can be forced using the optional \texttt*. The `optional parameter' gives
a default value. For instance:
\begin{code}
\cs\knowledgedirective\{highlight\}[brown]\{\kl{color=}\{\#1\},\kl{emphasize},\kl{md}\}\\{}
@@ -1364,12 +1476,14 @@
\subsubsection{\cs{\knowledgestyle} versus \cs{\knowledgedirective}}
\label{subsubsection:style versus macro}
+\AP
The two commands \cs{\knowledgestyle} and \cs{\knowledgedirective}
offer ways to systematize the writing of knowledges. These can seem redundant.
This is not the case, and for understanding it, it is necessary to understand a bit the way the \cs{\knowledge} command works.
+\AP
In general when a \cs{\knowledge} (or \cs{\knowledgestyle}) command is found, the \kl[\knowledge directives]{directives} are parsed and a new internal form of the \cs{\knowledge} command is written in the \kl{kaux file}, that will be executed during the next compilation of the document.
-In this phase, some first operations are performed. For instance, in an \kl{autoref} \kl[\knowledge directives]{directive}, an internal label name is constructed. Executing a \kl{knowledge macro} is done at this moment.
+In this phase, some first operations are performed. For instance, in an \kl{autoref} \kl[\knowledge directives]{directive}, an internal label name is constructed.
The postponed command is then executed during the next compilation phase (or immediately if we are in the preamble, or if the \kl{now} directive is used). The execution effectively stores the \kl{knowledge} in the system. This is only at that moment that the \kl{knowledge} becomes available to be used by \cs{\kl} and similar commands.
@@ -1409,9 +1523,9 @@
The \cs{\kl} command has one of the following syntaxes:
\begin{center}
\begin{tabular}{cc}
-&\smallcode{\csintro{\kl}(\kl[klab]{optional label})[\kl[knowledge name]{optional knowledge name}]\{text\}}\\
+&\smallcode{\csintro{\kl}(\kl[klab]{optional scope})[\kl[knowledge name]{optional knowledge name}]\{text\}}\\
or\quad&
-\smallcode{\csreintro{\kl}[\kl[knowledge name]{optional knowledge name}](\kl[klab]{optional label})\{text\}}\ .
+\smallcode{\csreintro{\kl}[\kl[knowledge name]{optional knowledge name}](\kl[klab]{optional scope})\{text\}}\ .
\end{tabular}
\end{center}
Its meaning is to search for the `optional knowledge name' if present, or for `text' otherwise. How this is exactly performed depends on the presence of the \kl[klab]{optional label}.
@@ -1436,25 +1550,26 @@
When activated, the ""quotation@@option"" mode activates shorthand
notations for the \cs{\kl} and \cs{\intro} macros. Possible syntaxes are as follows:
\begin{description}
-\itemAP[\smallcode{\kl"text\kl"}]\phantomintro{"..."}%
+\itemAP[\smallcode{\klqn"text\klqn"}]\phantomintro{"..."}%
uses the "knowledge" pointed to by `text'. Equivalent to~\texttt{\cs\kl\{text\}}.
-\itemAP[\smallcode{\kl"text@knowledge\kl"}]\phantomintro{"...@..."}%
+\itemAP[\smallcode{\klqn"text\klqn@knowledge\klqn"}]\phantomintro{"...@..."}%
uses the "knowledge" pointed to by `knowledge to display `text'. Equivalent to~\texttt{\cs\kl[knowledge]\{text\}}.
-\itemAP[\smallcode{\kl"text@@label\kl"}]\phantomintro{"...@@..."}%
- uses the "knowledge" pointed to by `text' in "scope" `scope' to display `text'. Equivalent to~\texttt{\cs\kl(label)\{text\}}.
-\itemAP[\smallcode{\kl"text@knowledge@label\kl"}]\phantomintro{"...@...@..."}%
- uses the "knowledge" pointed to by `knowledge in "scope" `scope' to display `text'. Equivalent to~\texttt{\cs\kl[knowledge](label)\{text\}}.
-\itemAP[\smallcode{\kl{""}text\kl{""}}]\phantomintro{""...""}%
+\itemAP[\smallcode{\klqn"text\klqn{@@}scope\klqn"}]\phantomintro{"...@@..."}%
+ uses the "knowledge" pointed to by `text' in "scope" `scope' to display `text'. Equivalent to~\texttt{\cs\kl(scope)\{text\}}.
+\itemAP[\smallcode{\klqn"text\klqn@knowledge\klqn@scope\klqn"}]\phantomintro{"...@...@..."}%
+ uses the "knowledge" pointed to by `knowledge in "scope" `scope' to display `text'. Equivalent to~\texttt{\cs\kl[knowledge](scope)\{text\}}.
+\itemAP[\smallcode{\klqn{""}text\klqn{""}}]\phantomintro{""...""}%
introduces the "knowledge" pointed to by `text'. Equivalent to~\texttt{\cs\intro\{text\}}.
-\itemAP[\smallcode{\kl{""}text@knowledge\kl{""}}]\phantomintro{""...@...""}%
+\itemAP[\smallcode{\klqn{""}text\klqn@knowledge\klqn{""}}]\phantomintro{""...@...""}%
introduces the "knowledge" pointed to by `knowledge while displaying `text'. Equivalent to~\texttt{\cs\intro[knowledge]\{text\}}.
-\itemAP[\smallcode{\kl{""}text@@label\kl{""}}]\phantomintro{""...@@...""}%
- introduces the "knowledge" pointed by `text' in "scope" `scope'. Equivalent to~\texttt{\cs\intro(label)\{text\}}.
-\itemAP[\smallcode{\kl{""}text@knowledge@label\kl{""}}]\phantomintro{""...@...@...""}%
- introduces the "knowledge" pointed to by `knowledge in "scope" `scope' while displaying `text'. Equivalent to~\texttt{\cs\intro[knowledge](label)\{text\}}.
+\itemAP[\smallcode{\klqn{""}text\klqn{@@}scope\klqn{""}}]\phantomintro{""...@@...""}%
+ introduces the "knowledge" pointed by `text' in "scope" `scope'. Equivalent to~\texttt{\cs\intro(scope)\{text\}}.
+\itemAP[\smallcode{\klqn{""}text\klqn@knowledge\klqn@scope\klqn{""}}]\phantomintro{""...@...@...""}%
+ introduces the "knowledge" pointed to by `knowledge in "scope" `scope' while displaying `text'.\\
+ Equivalent to~\texttt{\cs\intro[knowledge](scope)\{text\}}.
\end{description}
-\noindent\AP Activating and deactivating the "quotation notation" is obtained using:
+\noindent\AP Activating the "quotation notation" is obtained using:
\begin{center}
\smallcode{\cs\knowledgeconfigure\{"quotation@@option"\}}\ ,
\end{center}
@@ -1488,8 +1603,8 @@
\item several sets of "knowledges" may intersect but should use different "namespace",
\item some "knowledges" involve macros and for this reason should be non-expanded even if the \cs{\knowledge}
command is not met,
-\item the \cs{\knowledge} command should be performed automatically,
-\item activate or desactivate the warnings or messages in the "diagnose file".
+\item the \cs{\knowledge} command should be called implicitly,
+\item activate or deactivate the warnings or messages in the "diagnose file".
\end{itemize}
In fact, several macros in this document are instantiation of this mechanism. This is the case for for instance for \cs{\intro}, \cs{\phantomintro}, \cs{\reintro} or \cs{\mathkl} etc...
@@ -1520,14 +1635,14 @@
\end{compactdesc}
\smallskip
-\AP The second feature is to use "modifiers@@variant". These correspond to the starred version of the command.
+\AP The second feature is to use "modifiers@@variant". These correspond to the stared version of the command.
For instance, one expects `\cs{\intro}*\cs{\kl}' to reduce to `\cs{\intro}'. For this, one has to declare explicitly the reduction using:
\begin{center}
-\smallcode{\csintro{\knowledgevariantmodifier}\{"starred sequence@@variant"\}\cs\variant}\ ,
-\end{center}
-in which the "starred sequence@@variant" is of the form `\cs{variant1}*\cs{variant2}*\dots*\cs{variantk}'.
+\smallcode{\csintro{\knowledgevariantmodifier}\{"stared sequence@@variant"\}\cs\variant}\ ,
+\end{center}\AP
+in which the ""stared sequence@@variant"" is of the form `\cs{variant1}*\cs{variant2}*\dots*\cs{variantk}'.
This sequence is declared to reduce to \cs{\variant}.
-For instance, \smallcode{\cs{\knowledgevariantmodifier}\{\cs\intro*\cs\kl\}\cs\intro} declares `\cs{\intro}*\cs{\kl}' to reduce to `\cs{\intro}'.
+For instance, \smallcode{\cs{\knowledgevariantmodifier}\{\cs{\intro*}\cs\kl\}\cs\intro} declares `\cs{\intro}*\cs{\kl}' to reduce to `\cs{\intro}'.
\subsubsection{Examples of \kl{variants of \cs{\kl}}}
@@ -1555,7 +1670,7 @@
~~~~"unknown style cont=@@variant" "intro unknown cont@@style",\par
~~~~"style directive=@@variant" "intro style@intro style="\par
\}\par
-\cs\knowledgevariantmodifier\{\cs\intro*\cs\kl\}\cs\intro
+\cs\knowledgevariantmodifier\{\cs{\intro*}\cs\kl\}\cs\intro
\end{code}
Note that \cs{\reintro} and \cs{\phantomintro} are defined using similar code.
@@ -1597,7 +1712,7 @@
~~~~"unknown style=@@variant"csintro unknown,\par
~~~~"unknown style cont=@@variant"csintro unknown,\par
\}\par
-\cs\knowledgevariantmodifier\{\cs\intro*\cs\cs\}\cs\csintro\par
+\cs\knowledgevariantmodifier\{\cs{\intro*}\cs\cs\}\cs\csintro\par
\cs\knowledgevariantmodifier\{\cs\csintro*\cs\cs\}\cs\csintro\par
\cs\knowledgevariantmodifier\{\cs\cs*\cs\kl\}\cs\cs\par
\cs\knowledgevariantmodifier\{\cs\csintro*\cs\kl\}\cs\csintro
@@ -1619,14 +1734,115 @@
\label{section:scopes}\label{subsection:scoping}
\phantomintro{scoping}
-Rapidly, when long documents are in construction, one wants \kl{knowledges} to be isolated in some subparts. For instance, one may want that a temporary definition in a proof to not leak elsewhere in the document where the same term could be used with a different meaning. Some definitions may be only meaningful in, say, the current section/part. This is in particular true when one aims to track single variables: Clearly, a variable named $x$ can occur in several lemmas, but each of them correspond to a distinct `introduction' location. For handling this situation, the "knowledge@@package" package possesses some scoping features.
+\subsubsection{Principles of scoping}
+
+When writing long documents, one often wants \kl{knowledges} to be isolated in some subparts. For instance, one may want a temporary definition in a proof to not leak elsewhere in the document where the same term could be used with a different meaning. Some definitions may be only meaningful in, say, the current section/part.
+
+Two separate things have to be understood: how to define "knowledge" in a given "scope" (and create "scopes"), and how to access "knowledge" from a given "scope".
+
+\paragraph{Accessing knowledge attached to a given scope}
+This can be done directly either using the parenthesis notations of \cs{\kl} and the second \klqn@ of
+the "quotation notation":
+\begin{center}
+\begin{tabular}{ccc}
+ \smallcode{\cs\kl(scope name)\{knowledge\}}%
+ &~or~&%
+ \smallcode{\cs\kl(scope name)[knowledge]\{displayed text\}}\\
+ \smallcode{\klqn"knowledge\klqn{@@}scope\klqn"}%
+ &~or~&%
+ \smallcode{\klqn"displayed text\klqn@knowledge\klqn@scope\klqn"}
+ \end{tabular}
+\end{center}
+It works also for \cs{\intro} and with double quotes.
+
+Another option is to import the scope locally, using:
+\begin{code}[10cm]
+\cs\knowledgeimport\{\textit{scope name 1,scope name 2,}\dots\}
+\end{code}
+After this command, the knowledges will be searched automatically in the imported scopes.
+The import stops at the end of the current scoping environment.
+
+\paragraph{Attaching knowledge to a given scope}
+This can be done directly using the "scope=" "directive", for instance in:
+\begin{code}[12cm]
+\cs\knowledge\{knowledge\}\{"scope="\textit{scope name},\textit{directives}\}
+\end{code}
+\noindent
+or, this is obtained usint the "`\vbar'-notation" using `\klbn@'~:
+ \begin{code}[8cm]
+ \cs\knowledge\{\textit{directives}\}\\
+ \indent~~~\klbn|~~knowledge\klbn@\textit{scope name 1}\\
+ \indent~~~\klbn|~~synonym\klbn@\textit{scope name 2}\\
+ \indent~~~$\vdots$~~~~~~~~~~~~$\vdots$
+ \end{code}
+
+\AP
+The other possibility is to define a knowledge inside a "scope@@env" environment:
+\begin{code}[8cm]
+\cs\begin\{"scope@@env"\}\cs\label\{label\}\\
+\indent\quad\cs\knowledge\{knowledge 1\}\{\textit{directives}\}\\
+\indent\qquad$\vdots$\\
+\cs\end\{"scope@@env"\}
+\end{code}
+\noindent
+In such a code, the knowledge defined is automatically visible in the environment,
+and from outside, using the scope name \texttt{label}. Indeed, the \cs{\label} is overloaded for doing automatically a \cs{\knowledgescope} command.
+
+In fact, it is possible to do even more: other environments can be defined to behave like "scope@@env".
+
+
+\subsubsection{Scoping by examples}
-Note that the use of "scopes" may overconstrain the latex code, in particular if the "scope@@option" is used. The result is that a code that was compiling before activating the option, will not after doing it. This may happen for instance if one uses a \cs{\section} command inside a
-a \cs{theorem} environment. Of course, though this is not forbidden by "latex", this is not something that one usually wants to do. At any rate, the scope handling of the "knowledge@@package" package --- at least in its current form --- complains in such a situation. Indeed, it attempts to reconstruct a full hierarchically decomposed version of the document. In the above example, when the \cs{\section} command is met, the package attempts to close the outer section, but this would force the theorem also to be closed. However, closing a theorem requires an \cs{\end} command. Error...
+""Explicit scoping"" consists in attaching a precise scope name to a "knowledge" using the "scope=" "directive":
+\begin{code}
+\cs\knowledge\{thing\}\{"scope="s1,"color="red\}\\
+\cs\knowledge\{thing\}\{"scope="s2,"color="green\}\\
+\\
+Here, \klqn"thing\klqn" and \cs\kl\{thing\} are unknown.\\
+But \klqn"thing\klqn{@@}s1\klqn" and \cs\kl(s1)\{thing\} are in red,\\
+and \klqn"thing\klqn{@@}s2\klqn" and \cs\kl(s2)\{thing\} are in green.
+\end{code}
+The "`\vbar'-notation" can also be used for "explicit scoping".
+This is convenient, in particular for having synonyms in different scopes:
+\begin{code}
+\cs\knowledge\{"color="red\}\\
+\indent~~\klbn|~~abelian group\\
+\indent~~\klbn|~~abelian groups\\
+\indent~~\klbn|~~Abelian groups\\
+\indent~~\klbn|~~group\klbn@abelian\\
+\indent~~\klbn|~~groups\klbn@abelian\\
+\indent~~\klbn|~~Groups\klbn@abelian\\
+
+Here, general \klqn"groups\klqn" are not defined but \klqn"groups\klqn{@@}abelian\klqn" are,\\
+and correspond to \klqn"abelian groups\klqn".\\
+\cs\begin\{"scope@@env"\}\cs\knowledgeimport\{abelian\}\\
+\indent~~Her, all \klqn"groups\klqn" here are abelian.\\
+\cs\end\{"scope@@env"\}
+\end{code}
+
+
+"Scopes" can also be attached to areas in the code. It is convenient to use the usual \cs{\label} command to name them (though a priori two different spaces of naming are used).
+\begin{code}
+\textcolor{gray}{\% We declare first in the preamble the environments that can have}\\
+\textcolor{gray}{\% knowledges attached to them.}\\
+\cs\knowledgeconfigureenvironment\{theorem,lemma,proof\}\{\}\\
+\\
+\textcolor{gray}{\% and now in the main body of the document.}\\
+\cs{\begin}\{theorem\}\cs\label\{theorem:main\}\\
+\indent~~ \cs\knowledge\{rabbit\}[rabbits]\{notion\}\\
+\indent~~ In every hat, there is a \cs\kl\{rabbit\},\\
+\indent~~ \cs\AP~in which a \cs\intro\{rabbit\} is a small animal with long ears.\\
+\cs{\end}\{theorem\}\\
+Here a \kl"rabbit\kl" is an "unknown knowledge".\\
+But \kl{"}rabbits\kl[quotation notation]{@@}theorem:main\kl{"} point to Theorem~\cs\ref\{theorem:main\}.\\
+\cs\begin\{proof\}\cs\knowledgeimport\{theorem:main\}\\
+\indent~~ Now, \kl"rabbit\kl" is hyperlinked to Theorem~\cs\ref\{theorem:main\}.
+\cs\end\{proof\}
+\end{code}
\subsubsection{What is the structure of \kl{scopes} in a document}
-To start with, one needs to understand what are the possible \kl{scopes}.
+To start with, one needs to understand what are the possible \kl{scopes}. Scopes are aggregation of zones in the document.
\begin{itemize}
\itemAP By default, all the body of the document belongs to a \kl{scope} called `\texttt{document}'.
The user can open new scopes using the \intro(env){scope} environment:
@@ -1635,14 +1851,14 @@
~~\cs\knowledge\{local notion\}\{\kl{color=}green\}\par
~~Here is a \cs\kl\{local notion\} that appears in green.\par
\cs\end\{\kl(env){scope}\}\\
- But this \cs\kl\{local notion\} is undefined.
+ But here the \cs\kl\{local notion\} is undefined.
\end{code}
Note that scoping is independent from the grouping mechanism of \LaTeX.
- \AP The user can also declare an environment (existing or to exist)
- to behave like \kl(env){scope} using the
- command \cs{\knowledgeconfigureenvironment}.
- \itemAP The use of the ""scope@scope option"" \kl{configuration option} reconstructs the structure of the document, and \kl{scopes} will be created for sections, subsections, itemize, items, and so on. But be cautious, this feature, though working, may cause some compiling document to not compile anymore if some weird (and unnatural) nesting of scopes are used.
+ \AP The user can also declare environments such as \texttt{lemma}, \texttt{theorem},
+ \texttt{remark} or \texttt{proof} to behave like \kl(env){scope}. This is achieved using using
+ \cs{\knowledgeconfigureenvironment} command.
+ \itemAP The use of the ""scope@scope option"" \kl{configuration option} goes one step further, and attaches "scopes" to sections, subsections, itemize, items, and so on. But be cautious, this feature, though working, may cause some compiling document to not compile anymore if some weird (and unnatural) nesting of scopes are used (this is the case for instance when using \cs{\bibitem} and \cs{\thebibliography}, and this has to be corrected by hand).
\end{itemize}
\subsubsection{How is chosen the \kl{scope} of a \kl{knowledge}?}
@@ -1660,8 +1876,8 @@
\cs\knowledge\{one\}\{\kl{scope=}section,\kl{color=}green\}\par\noindent
\cs\knowledge\{two\}\{\kl{scope=}some label,\kl{color=}green\}\par\noindent
~\par\noindent
- \cs\begin\{\kl(env){scope}\}\cs\label\{some label\}\par\noindent
- ~~Here \cs\kl\{one\} and \cs\kl\{two\} are defined.\par\noindent
+ \cs\begin\{\kl(env){scope}\}\cs\label\{some label\}\\
+ \indent~~Here \cs\kl\{one\} and \cs\kl\{two\} are defined.\\
\cs\end\{\kl(env){scope}\}\par\noindent
Here \cs\kl\{one\} is defined but \cs\kl\{two\} isn't.\par\noindent
~\par\noindent
@@ -1672,9 +1888,32 @@
\end{code}
\end{itemize}
-\subsubsection{Accessing other scopes, the \cs{\knowledgeimport} command}
+\subsubsection{Naming "scopes": the \cs{\knowledgeimport}, \cs{\knowledgescope} and \cs{label} commands
+}
+
+It is often the case in a text, that one has to locally break the nesting structure of a document, and refer to a object local in an environment. For instance, a comment may refer to a variables/concept that has been locally used in the proof. The "knowledge@@package" provides suitable mechanisms for complex referencing of scopes. Let us explain this through an example:
+\begin{code}
+\textcolor{gray}{\% We declare first in the preamble the environments that use knowledge.}\\
+\cs\knowledgeconfigureenvironment\{definition\}\{knowledge=attracts\}\par\indent
+{[...]}\\
+\indent
+\cs\begin\{definition\}\cs\label\{somewhere\}\\
+\indent~~\cs\knowledge\{something\}\{notion\}\\
+\indent~~Here, \cs\intro\{something\} is a notion internal to the definition.
+\cs\end\{definition\}
+\end{code}
+Note here that what is important is the location of the \cs\knowledge\ command, irrespective of the location ofthe \cs\intro\ command.
+
+\AP The \cs\label\ command is used to name the "scope". In fact, the real command is
+\begin{center}
+ \smallcode{\csintro\knowledgescope\{scope name\}}
+\end{center}\noindent
+which associates a scope name to the surrounding environment (providing it has been declared possible to do it using
+\cs\knowledgeconfigureenvironment).
+\AP
+The standard \LaTeX\ command \cs\label\ is overloaded and performs implicitly a call to \cs\knowledgescope\ (this behavior can be deactivated/reactivated using the ""label scope=""\texttt{\{true,false\}} directive). The result is that the same string of characters can be used in order to name the scope, and at the same time is used as a standard \LaTeX\ label.
-Something important is missing so far: one rapidly wants to access to \kl{knowledges} that do not exist in the current \kl{scope}. For instance, a notion is used in a section of a document, and one would like to refer to it in the introduction. Another case is that of a notion or a mathematic variable that is introduced in the statement of a theorem, and should be accessible inside the proof. There are essentially two ways to access such distance \kl{knowledges}: either use the \smallcode{\cs\kl(label)\{text\}} command (or the equivalent \smallcode{\kl{"...@...@..."}} notation), or use the \cs{\knowledgeimport} command. We describe the second possibility now. The syntax is:
+\AP Something important is missing so far: one rapidly wants to access to \kl{knowledges} that do not exist in the current \kl{scope}. For instance, a notion is used in a section of a document, and one would like to refer to it in the introduction. Another case is that of a notion or a mathematic variable that is introduced in the statement of a theorem, and should be accessible inside the proof. There are essentially two ways to access such distant \kl{knowledges}: either use the \smallcode{\cs\kl(label)\{text\}} command (or the equivalent \smallcode{\kl{"...@...@..."}} notation), or use the \cs{\knowledgeimport} command. We describe the second possibility now. The syntax is:
\begin{center}
\smallcode{\csintro\knowledgeimport\{label\}}
\end{center}
@@ -1699,6 +1938,7 @@
\end{code}
+
\subsubsection{Managing scoping environments}
\AP The user can also declare an environment
@@ -1725,9 +1965,9 @@
would.
\end{remark}
-\AP The ""scope directives"" are low level and advanced features. These should not be used in general. Their list is the following:
+\AP The ""scope directives"" are low level and advanced features. These should not be used in general. The list is the following:
\begin{compactdesc}
-\itemAP[\intro(area){scope=}\texttt{true/false}] tells whether an environment should induce a scope. For the moment, this is not used (as soon as configured, it always behave like a scope).
+\itemAP[\intro(area){scope=}\texttt{true/false}] tells whether an environment should induce a scope. For the moment, this is not used (as soon as configured, it always behaves like a scope).
\itemAP[\intro(area){label=}\texttt{none/accepts}] tells whether a \cs{\label} command can refer to an "instance" of this "area",
\itemAP[\intro(area){environment=}\texttt{true/false}] should be set to true if the scope has to be opened whenever an environment of same name is opened using the \cs{\begin} and \cs{\end} commands of "latex".
\itemAP[\intro(area){autoclose=}\texttt{true/false}] means that the closure is triggered by another event (closure of another enclosing instance, or pushing of an area that requires its closure). It should be true for "latex" environments, and false when configuring, e.g, \cs{\section} to open an "scope" (since the end of the section is automatic: when another section is opened, or some higher level sectioning command).
@@ -1754,16 +1994,28 @@
\subsection{The \kl{diagnose file}}
\label{subsection:diagnose file}
-The \intro{diagnose file} is a file that is created when the "knowledge@@package" package is used. It enormously eases the use of the package, and it is a good habit to sometimes check it. It gathers a certain number of informations, that can be warning, code to be used, or simply information. This file has the name of the tex document with the extension \kl{.diagnose}. Its content is divided into clearly identified parts. Depending on the used options, some of these parts may appear or disappear.
+The \intro{diagnose file} is a file that is created when the "knowledge@@package" package is used
+(note that another file, ""jobname.kaux"" is also created by the "knowledge@@package" package, for internal use). It enormously eases the use of the package, and it is important to look into it when finalizing a document. It gathers a certain number of informations, that can be warning, code to be used, or simply information. This file has the name of the tex document with the extension \kl{.diagnose}. Its content is divided into clearly identified parts. Depending on the used options, some of these parts may appear or disappear.
\begin{description}
-\itemAP[\intro{Undefined knowledges}] in this section are listed all the knowledges that have been unsuccessfully searched for. These are given in a line of code of the form \texttt{\cs{\knowledge}\{undefined knowledge\}\{\}}. One result of this way of describing is that copying the content of this section to the document itself will solve all problems of \kl{undefined knowledges}. It is an efficient way,
-when one has written a document without caring so much about knowledges to copy the content of this section, and then modify it/reorganize it, in order to suit ones purposes. By default, no suggestion is offered (i.e., the \texttt{\{\}} braces are empty). Suggestion can be automatically configured using the "suggestion=@@variant" "directive@@variant" of the macros \cs{\knowledgenewvariant} and \cs{\knowledgesetvariant}.
+\itemAP[\intro{Undefined knowledges}] in this section are listed all the knowledges that have been unsuccessfully searched for. These are given in lines either of the form
+ \begin{quote}
+ \texttt{\cs{\knowledge}\{\textit{suggested directives}\}\\
+ \indent~~~\klbn|~~undefined knowledge}\textit{[\klbn@scope]}\\
+ \indent~~~~~~~~~~~~~~\vdots
+ \end{quote}
+ or of the form
+ \begin{quote}
+ \texttt{\cs{\knowledge}\{undefined knowledge\}\{\textit{suggested directives}\}}
+ \end{quote}
+ \AP Switching from one mode to another is obtained using the "configuration directive" "diagnose bar="\{true,false\} (default is true).
+The intent is that copying the content of this section to the document itself will solve all problems of \kl{undefined knowledges}. It is an efficient way,
+when one has written a document without caring so much about knowledges to copy the content of this section, and then modify it/reorganize it, in order to suit ones purposes. By default, no suggestion is offered, or "notion" is suggested if the "notion@@option" directive has been used. Suggestion can be automatically configured using the "suggestion=@@variant" "directive@@variant" of the macros \cs{\knowledgenewvariant} and \cs{\knowledgesetvariant}.
For instance, using:
\begin{center}
\smallcode{\cs\knowledgesetvariant\cs\kl\{"notion"\}}
\end{center}
-the "directive" "notion" is suggested for more directly copying the content.
+the "directive" "notion@@option" is suggested for more directly copying the content.
\itemAP[\intro{Autoref not introduced}] This section lists all \kl{knowledges} that were declared using the \kl{autoref} \kl[\knowledge directives]{directive} (this can be the case indirectly using, e.g. "notion"), but have not been introduced in the document . When a document reaches its final states, this section should be empty.
Usually, one should add the corresponding \cs{\intro} or \cs{\phantomintro} command somewhere in the text.
\itemAP[\intro{Autoref introduced twice}] In this section, all \kl{knowledges} that were declared using the \kl{autoref} \kl[\knowledge directives]{directive} and introduced using \cs{\intro} or \cs{\nointro}
@@ -1776,6 +2028,11 @@
\begin{center}
\smallcode{\cs\knowledgeconfigure\{""diagnose line=""true\}}
\end{center}
+\AP By default, the "diagnose file" gives suggestions to be used with the normal \cs\knowledge\ syntax.
+A "`\vbar'-notation" suggestion can be activated using:
+\begin{center}
+\smallcode{\cs\knowledgeconfigure\{""diagnose bar=""true\}}
+\end{center}
\iffalse
@@ -1834,21 +2091,31 @@
\end{center}
\itemAP[\intro{colorbox=}] surrounds the text with a colorbox of given color (following the syntax of the "xcolor@@package" package).
\end{description}
-Loading the package before is necessary for changing the options of the "xcolor@@package" package (for instance for using \kl{svgnames}).
+Loading the package before is necessary for changing
+the options of the "xcolor@@package" package
+(for instance for using \kl{svgnames}).
\subsubsection{The \kl{hyperref option}}
\label{subsection:hyperref option}
\subsubsubsection{Activating the \kl{hyperref option}}
-The \intro{hyperref option} loads the \intro(package){hyperref} and triggers a certain number of link-related features. This is done either by the command:
-\marginpar{\begin{hint}
- The "hyperref@@package" tends to surround links by boxes that do not help (this are visible in some viewers, and not in some others): this is deactivated by the "knowledge@@package" package using the "hidelinks" option of "hyperref@@package".\end{hint}}
+The \intro{hyperref option} loads the \intro(package){hyperref}
+and triggers a certain number of link-related features.
+This is done either by the command:
+\marginpar{%
+ \begin{hint}
+ The "hyperref@@package" surrounds by default links by boxes that are graphically heavy
+ (this are visible in some viewers, and not in some others): this is automatically deactivated when loading
+ the "knowledge@@package" package. Such automatic behavior can ba avoided using the \kl{no patch}
+ option at loading.
+ \end{hint}}
+%
\begin{center}
-\smallcode{%
-\cs{\usepackage}[\kl(option){hyperref}]\{\kl(package){knowledge}\}}
-\end{center}\noindent
-or by loading the "hyperref@@package" before the "knowledge@@package" package.
+ \smallcode{%
+ \cs{\usepackage}[\kl(option){hyperref}]\{\kl(package){knowledge}\}}
+\end{center}
+\noindent or by loading the "hyperref@@package" before the "knowledge@@package" package.
The \kl[\knowledge directives]{directives} activated by the package are:
\begin{compactdesc}
@@ -1885,6 +2152,7 @@
than simply the \kl{autoref} directive. Its use it already configured. \end{hint}}
\phantomintro{""}
The \intro{autoref} \kl[\knowledge directives]{directive} is among the most useful offered by the "knowledge@@package" package.
+It is very often used indirectly through directives like "notion".
When set, the \kl{knowledge} should be used with both \csintro{\intro} (exactly once) --
or the \kl{""...""} and \kl{""...@...""} notations (and variants) if \kl(option){quotation} is active -- and \cs{\kl} (possibly several times) -- or the \kl{"..."} notation if \kl(option){quotation} is active. The use of \cs{\kl}
will hyperlink to the location of the \cs{\intro}. The syntax of \cs{\intro} is the same as
@@ -2103,9 +2371,122 @@
\subsection{Dealing with math}
\label{subsection:math}
-This part is under development.
+There are essentially two ways in which one would like to use "knowledge@@package" with mathematics:
+\begin{description}
+\item[Single introduction] Some mathematical objects are introduced once and for all in the paper. In this case, all the use of the object
+should point to the same introduction location.
+\item[Variables] The more advanced case is when one wants to track variables. For instance, a macro variable~\cs\x\ could have a different meaning in two distinct theorems. This case is more similar to variables in a programming language, that have a scope.
+Here the situation is slightly more complicated since a variable could be introduced in a theorem, and then used many pages later in a proof section for instance.
+\end{description}
+The first use is fairly easy. The second one requires a bit more care. We review them one after the other.
+
+\subsubsection{Defining macros for math: the "mathcommand@@package" package}
+
+Defining macros is standard in \TeX, and it should be used systematically in writing scientific documents, in particular
+when using the "knowledge@@package" package.
+The standard way in \LaTeX\ for defining macros is to use \cs\newcommand. However, the resulting macro, if it has
+no optional parameters, is then expandable, and it is better to avoid it using instead \cs\newrobustcmd\ from the "etoolbox@@package"
+package (it has the same syntax).
+
+Another package "mathcommand@@package" has been designed to be used in conjunction with "knowledge@@package".
+We shall use it in the advanced examples below. It allows:
+\begin{itemize}
+\item to define/redefine commands to be used in math mode only. This allows for instance to use the macro \cs\c\ for producing as usual a cedilla in text mode, and at the same time some variable $\mathbf c$ in math mode. This is achieved using for instance:
+ \smallcode{\cs\renewmathcommand\cs\c\{\cs\mathbf\{c\}\}}.
+\item When redefining a command, it automatically stores the original command \cs\macro\ as \cs\LaTeXmacro. So for instance, if one wants to introduce the constant~$\pi$ in a document and have it linked, one can use:
+ \begin{code}
+ \cs\renewmathcommand\cs\pi\{\cs\kl[\cs\pi]\{\cs\LaTeXpi\}\}\\
+ \cs\knowledge\cs\pi\{notion\}\\
+ {[...]}\\
+ \cs\AP\ Let \$\cs{\intro*}\cs\pi=3.1415\$.\\
+ {[...]}\\
+ Now \$\cs\pi\$ points to the above sentence.
+ \end{code}
+ This code works because a different name \cs\LaTeXpi\ stores the original macro. Using~\cs\pi\ instead would yield an infinite loop.
+\item The package also gives access to the exponents and indices as well as primes that follow a command (see the documentation).
+\item It also has some facilities for disabling \LaTeX\ commands and provide suggestions of replacement (useful for remembering the macros and working with colleagues).
+\item Finally, it offers some commodity for redefining many variables in one command.
+ E.g. for defining \cs\calA, \cs\calB,\dots to be shortcuts for \smallcode{\cs\cal A}, \smallcode{\cs\cal B},\dots:
+ \begin{code}
+ \cs\LoopCommands\{ABCDEFGHIJKLMNOPQRSTUVWXYZ\}[cal\#1]\par
+ ~~~~\quad\{\cs\newmathcommand\#2\{\cs\cal~\#1\}\}
+ \end{code}
+\end{itemize}
+
+\subsubsection{Mathematical objects that are singly introduced}
+
+In this case, this is essentially as in text mode.
+Five points have to be kept in mind:
+\begin{itemize}
+\item Do not use the "quotation notation" in math mode and in macros. Indeed,
+ some packages, like "tikzcd@@package" use the double-quote symbol in their
+ (math) syntax. In this context, quotes have to be deactivated, and hence macros
+ that would use the "quotation notation" would suddenly not have the expected result.
+\item Do not mix the "knowledge" concerning math commands and normal text. It is in practice
+ difficult to maintain.
+\item Use the control sequence of the macro itself as the "knowledge" name.
+ This does not cause problems and is easier to maintain.
+\item Use the \cs{\intro*} notation for introducing macros.
+\item The surrounding space is broken by using the command \cs{\kl}. Commands like \cs\mathrel\ should be used to recover it.
+\end{itemize}
+These five points are illustrated in the following code:
+\begin{code}
+\cs\newrobustcmd\cs\comp\{\cs\mathrel\{\cs\kl[\cs\comp]\{\cs\circ\}\}\}\\
+\cs\knowledge\cs\comp\{notion\}\\
+{[...]}\\
+\cs\AP\ Composition is denoted \$\cs{\intro*}\cs\comp\$.\\
+{[...]}\\
+Now, each use of \$\cs\comp\$ points to its introduction.
+\end{code}
+
+Two variation may be comfortable to use.
+
+\paragraph{Disabling commands}
+When writing a paper, in particular with coauthors, one may be tempted to not always use the macros designed for each case.
+For helping to remember the macro, one can use instead (using the "mathcommand@@package" package):
+\begin{code}
+\cs\disablecommand\cs\rho\\
+\cs\suggestcommand\cs\rho\{Use \cs\myFunction.\}\\
+\cs\newrobustcmd\cs\myFunction\{\cs\kl[\cs\myFunction]\{\cs\LaTeXrho\}\}\\
+\cs\knowledge\cs\myFunction\{notion\}\\
+{[...]}\\
+\AP Let \$\cs{\intro*}\cs\myFunction(x)=[...]\$\\
+{[...]}\\
+Now, each use of \$\cs\myFunction\$ points to its introduction.
+\end{code}
+\noindent The result is that if one uses \cs\rho\ in the code, an error will be issued, and \cs\myFunction\ be suggested as a replacement.
+Note that more than one suggestions can be attached to the macro (if several macros use the symbol~$\rho$). Note also
+that in the definition of \cs\myFunction, \cs\LaTeXrho\ is used instead of~\cs\rho. Indeed, \cs\rho\ has been deactivated,
+but~\cs\LaTeXrho\ gives access to its original meaning.
+
+\paragraph{Redefining the original \TeX\ macro}
+Another situation is that one would like to use the \cs\rho\ control sequence for accessing our function instead of \cs\myFunction (simply because this is more convenient and easy to remember, and we know in advance that no confusion may arise).
+In this case, the "mathcommand@@package" package can also be of some help:
+\begin{code}
+\cs\renewmathcommand\cs\rho\{\cs\kl[\cs\rho]\{\cs\LaTeXrho\}\}\\
+\cs\knowledge\cs\rho\{notion\}\\
+{[...]}\\
+\cs\AP\ Let \$\cs{\intro*}\cs\rho(x)=[...]\$\\
+{[...]}\\
+Now, each use of \$\cs\rho\$ points to its introduction.
+\end{code}
+\noindent
+The effect of \cs\renewmathcommand\ is that it sets~\cs\LaTeXrho\ to have the same effect as the original \cs\rho\ command,
+and then redefines~\cs\rho.
+
+\subsubsection{Context dependent variables}
+
+This section is not yet written.
\iffalse
+We enter now a more advanced situation. We want to track all the variables in a mathematic document...
+the first thing to do is to give access to the "knowledge@@package" package to the scope of the document.
+The easiest way to do that is to declare in the preamble what are the environments that we want to use.
+\begin{code}
+\cs\knowledgeconfigureenvironment\{theorem,lemma,proof\}\{\}\par\noindent
+\end{code}}
+
+
The "knowledge@@package" package offers several tools for dealing with mathematics. It is mostly still experimental.
The essential goal is to be able to track the identity variables and to point each of them to its introduction.
For obtaining this, this requires:
@@ -2115,6 +2496,8 @@
\end{itemize}
\fi
+
+
\subsection{Fixes}
\label{subsection:fixes}
@@ -2129,14 +2512,14 @@
\subsection{Predefined configuration}
-\subsubsection{The "notion" directive}
+\subsubsection{The "notion@@option" directive}
-The configuration option~\kl{notion} is activated using:
+\AP The configuration option~\intro(option){notion} is activated using:
\begin{center}
-\smallcode{\cs\knowledgeconfigure\{\intro[notion option]{notion}\}}
+\smallcode{\cs\knowledgeconfigure\{\kl(option){notion}\}}
\end{center}\noindent
-It automatically configures a \kl[\knowledge directives]{directive} \intro{notion}
-which is an \kl{autoref} displayed properly:
+\AP It automatically configures a \kl[\knowledge directives]{directive} \intro{notion}
+which is an \kl{autoref} configured to be displayed in a configurable way:
\begin{itemize}
\item In \kl{paper mode}, the \cs{\intro} commands (not in math mode) are emphasized, while the \cs{\kl} commands are displayed as normal. It has the aspect of a normal paper.
\item In "electronic mode" and \kl{composition mode} (with the "xcolor@@package" package), notions are furthermore typeset in blue when introduced, and in dark blue when used. Without the \kl(package){xcolor} package, underlining draw the attention to the knowledges (not in math mode).
@@ -2152,12 +2535,12 @@
\cs\documentclass\{article\}\\
\cs\usepackage\{\kl(package){xcolor}\}\\
\cs\usepackage\{\kl(package){hyperref}\}\\
-\cs\usepackage[\kl{paper}]\{"knowledge@@package"\}\\
+\cs\usepackage[\kl{electronic}]\{"knowledge@@package"\}\\
\cs\knowledgeconfigure\{"notion@@option"\}\\
{[...]}\\
\cs\knowledge\{some text\}\{notion\}
\end{code}\noindent
-Then the paper is displayer in a colorful way. As soon as the \texttt{false} is replaced by \texttt{true}, the paper becomes black and seriously looking as it should.
+Then the paper is displayed in a colorful way.
\newpage
@@ -2172,7 +2555,7 @@
\subsection{Problem with \cs{\item} parameters}
-\paragraph{The use of~\cs{\AP} inside \cs{\item} does not work.} Do not use \cs{\AP} inside the optional argument of \cs{\item}, and rather use the command \cs{\itemAP}.
+\paragraph{The use of~\cs{\AP} inside the optional parameter of \cs{\item} does not work.} Do not use \cs{\AP} inside the optional argument of \cs{\item}, and rather use the command \cs{\itemAP}.
\paragraph{Argument of \cs{\kl} has an extra `\texttt\}'.} This is a problem of using optional parameters inside optional parameters such as in \smallcode{\cs\item[\cs\kl[test]\{Test\}]}. You can surround the content of the optional parameter by two level of curly braces as in \smallcode{\cs\item[\{\{\cs\kl[test]\{Test\}\}\}]}.
The notation \kl{"..."} does not have this issue.
@@ -2201,7 +2584,7 @@
\cs\end\{document\}
\end{code}\end{center}\noindent
will result in that both \kl{knowledges} are considered unknown in the table of contents.
-For the first one, this is due to the expansion of~$\texttt{\robustdisplay\Ltwo}$. For the second, this is due to an implicit translation of the accentuated letter into an internal sequence of commands (for instance `\'e' is translated into the internal sequence `\verb|\IeC {\'e}|'). Some solutions are as follows:
+For the first one, this is due to the expansion of~\cs\Ltwo. For the second, this is due to an implicit translation of the accentuated letter into an internal sequence of commands (for instance `\'e' is translated into the internal sequence `\verb|\IeC {\'e}|'). Some solutions are as follows:
\begin{itemize}
\item Make the macros non-expandable, for instance using \cs{\newrobustcmd} (of the \kl(package){etoolbox} package) or \cs{\NewDocumentCommand} (of the \kl(package){xparse} package, with a different handling of arguments) instead of \cs{\newcommand}. Hence:
\begin{code}
@@ -2247,7 +2630,7 @@
\label{section:tikzcd}
The package "tikzcd@@package" uses (heavily) the quotes. Thus, it conflicts with the "quotation notation".
-Some other packages may do the same. For solving this issue, the only thingd to do are:
+Some other packages may do the same. For solving this issue, the only things to do are:
\begin{itemize}
\item be sure to load these packages before "knowledge@@package", or at least be sure that the "quotation notation" is not
active when you do so, and
@@ -2274,7 +2657,7 @@
\label{section:amsmath questions}
\paragraph{The \cs{\intro} command does not work in \kl{align*} or similar environments}
-It happens that in starred environment (i.e., unnumbered), the package \kl(package){amsmath}
+It happens that in stared environment (i.e., unnumbered), the package \kl(package){amsmath}
deactivates the labels. As a consequence the command \cs{\intro}, which internally uses {\cs\label} (at least so far), does not work. For the moment, there is no real solution, but a workaround which consists in introducing the \kl{knowledge} before
the incriminated environment using \cs\phantomsection, and then use \cs{\reintro} inside the environment. Imagine for instance a command
\texttt{\robustdisplay\SomeCommand}, that inside uses \texttt{\cs\kl[\robustdisplay{\Somecommand}]}, then:
@@ -2283,7 +2666,7 @@
does not work&&works\\
\begin{code}[5cm]
\cs\begin\{\kl{align*}\}\\
- \cs\intro*\texttt{\robustdisplay{\SomeCommand}}\\
+ \cs{\intro*}\texttt{\robustdisplay{\SomeCommand}}\\
\cs\end\{\kl{align*}\}\\
\end{code}
&&
@@ -2300,14 +2683,44 @@
\paragraph{A fatal error occurs in twocolumn mode.} A workaround is to use
\smallcode{\cs\knowledgeconfigure\{\kl{fix hyperref twocolumn}\}}.
+\subsection{Name clash (eg with the "complexity@@package" package)}
+
+It may happen that an already defined command is redefined by the "knowledge@@package" package.
+This happens in particular wen used in combination with the "complexity@@package" package: both package redefine the command \cs\AP. For "complexity@@package", this denotes a complexity class, and for "knowledge@@package", it is an "anchor point".
+The problem has to be resolved by hand. The two following solutions are quick hacks:
+\begin{center}
+\begin{tabular}{ccc}
+\begin{code}[5.2cm]
+\cs\usepackage\{\kl(package){complexity}\}\\
+\cs\let\cs\compAP\robustdisplay\AP\\
+\cs\let\robustdisplay\AP\cs\undefined\\
+\cs\usepackage[...]\{"knowledge@@package"\}
+\end{code}
+&&
+\begin{code}[5.2cm]
+\cs\usepackage[...]\{"knowledge@@package"\}\\
+\cs\let\cs\kAP\robustdisplay\AP\\
+\cs\let\robustdisplay\AP\cs\undefined\\
+\cs\usepackage\{\kl(package){complexity}\}
+\end{code}\\
+for using \texttt{\robustdisplay\AP}from "knowledge@@package",
+ && for using \texttt{\robustdisplay\AP}from "complexity@@package",\\
+and \cs\compAP\ for "complexity@@package",
+ && and \cs\kAP\ for "knowledge@@package".
+\end{tabular}
+\end{center}
+
\subsection{Incorrect display}
\subsubsection{Incorrect breaking at the end of lines (in Arxiv for instance)}
+
It may happen that some hyperlinks generated by "knowledge@@package" are not broken properly
-at the end of lines. This is an issue with the \kl(package){hyperref} package. This in particularly happened for files compiled by the Arxiv system while the file on the local computer was not having any problem.
+at the end of lines. This is an issue with the \kl(package){hyperref} package. This happens in particular for files compiled by the Arxiv system while the file on the local computer was not having any problem. A workaround is to use the \kl{breaklinks} option of \kl(package){hyperref}. If you need this for Arxiv, then you also have to force the use of \cs\pdflatex\ (because the \kl{breaklinks} option does not work if compiled via the ancestral sequence TEX$\rightarrow$DVI$\rightarrow$PS$\rightarrow$PDF). This can be obtained by adding \smallcode{\cs\pdfoutput=1} within the five first lines of the preamble.
-A workaround is to use the \texttt{breaklinks} option of \kl(package){hyperref}. The preamble thus looks like:
+The preamble thus looks like:
\begin{code}[9cm]
+\cs\documentclass\{\kl{[...]}\}\par\noindent
+\cs\pdfoutput=1\par\noindent
\kl{[...]}\par\noindent
\cs\usepackage[\kl{breaklinks}]\{\kl(package){hyperref}\}\par\noindent
\kl{[...]}\par\noindent
@@ -2317,18 +2730,16 @@
\subsubsection{Red boxes around links}
-This is an annoying feature of the "hyperref@@package" package to surround all links by red boxes (that may appear or not depending on the viewer). This is very heavy in document with many links. The solution is to load the "hyperref@@package" package with the "hidelinks" option. Hence the preamble may look like:
-\begin{code}[9cm]
-\cs\usepackage{["hidelinks"]}\{"hyperref@@package"\}\par\noindent
-\cs\usepackage\{\kl(package){knowledge}\}\par\noindent
-\end{code}
+This is an annoying feature of the "hyperref@@package" package to surround all links by red boxes (that may appear or not depending on the viewer). This is very heavy in document with many links. By default, this is deactivated when using the "knowledge@@package",
+unless the "no patch" option is used when loading the package. When the "no patch" option is used, the same effect can nevertheless be obtain, eg using \smallcode{\cs\hypersetup\{hidelinks\}}.
+
\subsection{Problems with scope}
\subsubsection{Problems in combination with \cs{\bibitem} and "thebibliography@@env"}
-The "scope option" of the package triggers some analysis of the code, and restrains the structure of the code (in particular, this is because "scopes" have to be nested, and thus some not so well nested part of \LaTeX{} yields error). In particular, the "scope option" does not allow to have a \cs{\section} command inside a list.
+The "scope option" of the package triggers some analysis of the code, and restrains the structure of the code (in particular, this is because "scopes" have to be nested, and thus some not so well nested parts of \LaTeX{} yield errors). In particular, the "scope option" does not allow to have a \cs{\section} command inside a list.
However, this is what does the environment "thebibliography@@env", yielding a scoping error.
A simple hack to treat this situation:
@@ -2467,21 +2878,25 @@
\subsection{List of \kl{configuration directives} (to use with \cs{\knowledgeconfigure})}
\label{subsection:configuration directive list}
+
\begin{compactdesc}
+\item["diagnose bar="\textmd{\{true,false\}}] activates the \kl{`\vbar'-notation} in the "diagnose file" (default is false)
\item["composition"] switches to "composition mode",
\item["cyclic colors=@@option"] fixes the cyclic list of colors used by the "directive" "cyclic color".
\item["diagnose line="\textmd{\{true,false\}}] activates or deactivates the line numbering in the "diagnose file".
-\item["electronic"] switches to "electronic mode",
+\item["electronic"] switches to "electronic mode".
\item[\kl{fix hyperref twocolumn}] fixes a known problem between "hyperref@@package"
and the two column mode.
\item[\kl{hyperlinks=}\textmd{\{true,false\}}] activates or deactivates the hyperlinks.
-\item[{{\kl(option){notion}}}] activates the "notion" directive
-\item[\kl(option){quotation=}\textmd{\{true,false\}}] activates or deactivates the "quotation notation".
-\item["paper"] switches to "paper mode",
+\item[{{\kl{no patch}}}] deactivates the default patches made to other packages.
+\item[{{\kl(option){notion}}}] activates the "notion" directive.
+\item["paper"] switches to "paper mode".
+\itemAP[\kl{label scope=}\textmd{\{true,false\}}] enables or disables the redefined \cs{\label} command, which helps automatically define scopes (default is~\textmd{true}).
\item[\kl{protect link co} and \kl{unprotect link co}] starts and ends respectively a zone in which the "knowledge@@package" package does not create hyperlinks.
-\item[\kl{protect quotation=}\textmd{\{environment list\}}] declares a list of environment in which the "quotation notation" should be deactivated
+\item[\kl{protect quotation=}\textmd{\{environment list\}}] declares a list of environment in which the "quotation notation" should be deactivated.
+\item[{{\kl(option)[quotation]{quotation=}\textmd{\{true,false\}}}}] activates or deactivates the "quotation notation".
\item["strict"] is a Boolean which, when true, makes the compilation more restrictive by turning some of the warnings into errors (in particular in case of redefinition of knowledges).
-\item[\kl{visible anchor points=}\textmd{\{true,false\}}] makes the \kl{anchor points} either visible or invisible
+\item[\kl{visible anchor points=}\textmd{\{true,false\}}] makes the \kl{anchor points} either visible or invisible.
\end{compactdesc}
\newpage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/knowledge.doc.tlpobj new/tlpkg/tlpobj/knowledge.doc.tlpobj
--- old/tlpkg/tlpobj/knowledge.doc.tlpobj 2019-02-28 03:45:59.000000000 +0100
+++ new/tlpkg/tlpobj/knowledge.doc.tlpobj 2020-03-06 01:02:34.000000000 +0100
@@ -1,9 +1,9 @@
name knowledge.doc
category Package
-revision 50031
+revision 54121
shortdesc doc files of knowledge
relocated 1
-docfiles size=206
+docfiles size=223
RELOC/doc/latex/knowledge/README.md
RELOC/doc/latex/knowledge/knowledge-example.tex
RELOC/doc/latex/knowledge/knowledge.pdf
++++++ knowledge.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/knowledge/knowledge.sty new/tex/latex/knowledge/knowledge.sty
--- old/tex/latex/knowledge/knowledge.sty 2019-02-15 23:22:44.000000000 +0100
+++ new/tex/latex/knowledge/knowledge.sty 2020-03-05 23:08:31.000000000 +0100
@@ -23,12 +23,11 @@
%% LaTeX version 1999/12/01 or later.
%%
\usepackage{expl3}
-\ProvidesExplPackage{knowledge}{2019/02/16}{1.16}{}
+\ProvidesExplPackage{knowledge}{2020/03/05}{1.22}{}
%%%%%%%%%%
\RequirePackage{l3keys2e}
\RequirePackage{etoolbox}
\RequirePackage{xparse}
-\RequirePackage{etoolbox}
\bool_if_exist:NTF\knowledge_package_loaded_bool
{\endinput}
{\bool_new:N\knowledge_package_loaded_bool
@@ -160,10 +159,37 @@
\KAuxWrite*{}}
\NewDocumentCommand\KAuxClose{}
- {\iow_close:N\knowledge_kaux_iow
+ {\KAuxWrite*{\KAuxEOF {}}
+ \iow_close:N\knowledge_kaux_iow
\bool_gset_true:N\kaux_can_be_used_bool
\kaux_posttreatment_tl
}
+\cs_new:Npn\kaux_if_exist_containline:nnTF#1#2{
+ \file_if_exist:nTF{#1}{
+ \ior_open:Nn\klg_tmpa_ior{#1}
+ \bool_gset_false:N\g_tmpa_bool
+ \bool_gset_false:N\g_tmpb_bool
+ \str_gset:Nn\g_tmpb_str{#2}
+ \bool_do_until:Nn\g_tmpa_bool{
+ \ior_if_eof:NTF\klg_tmpa_ior
+ {\bool_set_true:N\g_tmpa_bool}
+ {
+ \ior_str_get:NN\klg_tmpa_ior\g_tmpa_str
+ %\iow_term:x{(\exp_not:V\g_tmpa_str)=?(\exp_not:V\g_tmpb_str)}
+ \str_if_eq:NNTF\g_tmpa_str\g_tmpb_str
+ {\bool_gset_true:N\g_tmpa_bool
+ \bool_gset_true:N\g_tmpb_bool}
+ {}
+ }}
+ \ior_close:N\klg_tmpa_ior
+ %\bool_show:N\g_tmpb_bool
+ \bool_if:NTF\g_tmpb_bool
+ }
+ {\use_ii:nn}
+}
+
+\NewDocumentCommand\IfKAuxReadyTF{}
+ {\exp_args:Nx\kaux_if_exist_containline:nnTF{\c_sys_jobname_str.kaux}{\KAuxEOF {}}}
\NewDocumentCommand\KAuxBefore{m}
{\tl_gput_right:Nn\kaux_pretreatment_tl{#1}}
\NewDocumentCommand\KAuxAfter{m}
@@ -185,6 +211,9 @@
\tl_gset:cn{kaux_\cs_to_str:N#1-args_tl}{#2}
\tl_gput_right:Nn\kaux_command_list_tl{#1}
}
+\NewKAuxCommand\KAuxEOF{m}
+ {Does~nothing,~useless~empty~argument
+ ,~and~is~searched~for~knowing~if~the~kaux~file~was~written~till~the~end.}
\NewDocumentCommand\KAuxCommand{mmm}
{ \cs_if_exist:NTF #1
{}
@@ -288,7 +317,6 @@
{\exp_not:n{\exp_after:wN\exp_args:Nc\exp_after:wN}
##1 \exp_not:c{#1_id_b:#2}}
}
-
\cs_new:Nn\cell_specialize:nnn
{\cs_new:cpx{#1_#2_id:#3}
{\exp_not:c{#1_id:n#3}{#2}}
@@ -626,7 +654,6 @@
\ior_close:N\klg_tmpa_ior
\iow_close:N\klg_tmpa_iow
\group_end:}}
-
\cs_new_protected_with_variants:Nnn\kl_compare_files:Nnn{NnV,NVn,NVV}
{\group_begin:
\bool_set_false:N\l_tmpa_bool% set when finished
@@ -668,7 +695,6 @@
{\group_end:\bool_set_true:N#1}
{\group_end:\bool_set_false:N#1}
}
-
\cs_new_protected:Nn\kl_tl_to_file:nn
{\iow_open:Nn\klg_tmpa_iow{#1}
\iow_now:Nn\klg_tmpa_iow{#2}
@@ -790,6 +816,16 @@
\cs_new:Npn\klparse_if_novalue:NTF
{\tl_if_eq:NNTF\klparse_novalue_tl}
\cs_generate_variant:Nn\tl_to_str:n{V}
+\tl_new:N\char_escape_tl
+\tl_set:Nx\char_escape_tl
+ {\expandafter\tl_head:n\expandafter{\string\escape}}
+\cs_new:Nn\debug_vars:nn{
+ \iow_term:n{---~{#1}}
+ \tl_map_inline:nn{#2}
+ {\iow_term:x{\space\space\exp_not:N##1=\space\tl_if_exist:NTF##1
+ {{\exp_not:V##1}}
+ {undefined}}}
+}
\cs_new:Nn\knowledge_info:n
{\msg_info:nnn{knowledge}{knowledge~info}{#1}}
\cs_new:Nn\knowledge_warning:n
@@ -805,18 +841,20 @@
\cs_generate_variant:Nn\knowledge_warning:n{x}
\cs_generate_variant:Nn\knowledge_error:n{x}
\msg_new:nnn{ knowledge }{ knowledge~recursion }
- { The~knowledges~are~probably~cyclic,~starting~from~'#1'~(namespace~'#2'),~
+ { The~knowledges~are~probably~cyclic,~starting~from\\<#1>~(namespace~'#2'),~
currently~at~'#3'.}
\msg_new:nnn{ knowledge }{ knowledge~unknown }
- {The~knowledge~'#1'~could~not~be~found~in~scopes~<~#3~>~(namespace~'#2').}
+ {The~knowledge~'#1'~could~not~be~found~in~scopes\\<#3>~(namespace~'#2').}
\msg_new:nnn{ knowledge }{ knowledge~unknown~in~scope }
- {The~knowledge~'#1'~could~not~be~found~in~scope~'#3'~(namespace~'#2').}
+ {The~knowledge~'#1'~could~not~be~found~in~scope\\<#3>~(namespace~'#2').}
\msg_new:nnn{ knowledge }{ knowledge~unknown~label }
- {The~label~'#2'~could~not~be~found~while~searching~for~'#1'.~Possibly~rerun~latex.}
+ {The~label~'#2'~could~not~be~found~while~searching~for:\\<#1>\\Possibly~rerun~latex.}
\msg_new:nnn{ knowledge }{ package~required }
{In~order~to~use~directive~'#1',~please~load~package~or~use~option~'#2'.}
\msg_new:nnn{ knowledge }{ knowledge~exists }
{ The~knowledge~'#1'~in~scope~'#2'~(namespace~'#3')~already~exists. }
+\msg_new:nnn{ knowledge }{ knowledgedirective~redifinition }
+ { Directive~'#1'~already~exists~(\knowledgedirective~macro). }
\msg_new:nnn{scope}{area~exists}{Area~'#1'~already~exists.}
\msg_new:nnn{scope}{area~not~exist}{Area~'#1'~does~not~exist.}
\msg_new:nnn{scope}{empty~pop}{Attempt~to~pop~an~empty~area~stack.}
@@ -832,12 +870,12 @@
\msg_new:nnn{scope}{area~not~in~context}
{\tl_if_empty:nTF{#2}{}{\exp_not:n{#2}}:
~The~area~`#1'~can't~be~found~in~context.~Possibly~rerun~latex.}
-\msg_new:nnn{knowledge}{recap~unknown~knowledge}
- {Some~knowledge~are~not~defined.~See~the~'.diagnose'~file~for~more~information.}
-\msg_new:nnn{knowledge}{recap~autoref~introduced~twice}
- {Some~knowledge~is~introduced~twice.~See~the~'.diagnose'~file~for~more~information.}
-\msg_new:nnn{knowledge}{recap~autoref~not~introduced}
- {Some~knowledge~is~used~but~not~introduced.~See~the~'.diagnose'~file~for~more~information.}
+\exp_args:Nnnx\msg_new:nnn{knowledge}{recap~unknown~knowledge}
+ {Some~knowledge~are~not~defined.~See~the~'\c_sys_jobname_str.diagnose'~file~for~more~information.}
+\exp_args:Nnnx\msg_new:nnn{knowledge}{recap~autoref~introduced~twice}
+ {Some~knowledge~is~introduced~twice.~See~the~'\c_sys_jobname_str.diagnose'~file~for~more~information.}
+\exp_args:Nnnx\msg_new:nnn{knowledge}{recap~autoref~not~introduced}
+ {Some~knowledge~is~used~but~not~introduced.~See~the~'\c_sys_jobname_str.diagnose'~file~for~more~information.}
\tl_clear_new:N\knowledge_configuration_pending_tl
\newrobustcmd\knowledgeconfigure[1]{
\keys_set:nn{ knowledge~configuration~options }{#1}
@@ -925,6 +963,13 @@
\bool_new:N\knowledge_configuration_diagnoseline_bool
\bool_set_false:N\knowledge_configuration_diagnoseline_bool
\KnowledgeConfigureBooleanOption[\knowledge_configuration_diagnoseline_bool]{diagnose~line}
+\bool_new:N\knowledge_configuration_diagnosehelp_bool
+\bool_set_true:N\knowledge_configuration_diagnosehelp_bool
+\KnowledgeConfigureBooleanOption[\knowledge_configuration_diagnosehelp_bool]{diagnose~help}
+\bool_new:N\knowledge_configuration_diagnosebar_bool
+\bool_gset_true:N\knowledge_configuration_diagnosebar_bool
+\KnowledgeConfigureBooleanOption[\knowledge_configuration_diagnosebar_bool]{bar~suggestion}%backward compatibility
+\KnowledgeConfigureBooleanOption[\knowledge_configuration_diagnosebar_bool]{diagnose~bar}
\bool_new:N\knowledge_configuration_visibleAP_bool
\KnowledgeConfigureBooleanOption[\knowledge_configuration_visibleAP_bool]{visible~anchor~points}\KnowledgeConfigureBooleanOption[\knowledge_configuration_visibleAP_bool]{visible~AP}
\bool_new:N\knowledge_hyperlinks_active_bool
@@ -934,10 +979,32 @@
\KnowledgePackageTrigger{ electronic }{\tl_set:Nn\knowledge_option_mode_tl{electronic}}
\KnowledgePackageTrigger{ composition }{\tl_set:Nn\knowledge_option_mode_tl{composition}}
\KnowledgePackageTrigger{ final }{\tl_set:Nn\knowledge_option_mode_tl{final}}
+\bool_new:N\knowledge_option_texpatch_bool
+\bool_set_true:N\knowledge_option_texpatch_bool
+\KnowledgePackageTrigger{ no patch }{\bool_set_false:N\knowledge_option_texpatch_bool}
+\tl_new:N\knowledge_option_knowledgeAP_command_tl
+\tl_set:Nn\knowledge_option_knowledgeAP_command_tl{}
+\tl_new:N\knowledge_option_complexityAP_command_tl
+\tl_set:Nn\knowledge_option_complexityAP_command_tl{}
+\KnowledgePackageTrigger{ knowledge AP }{
+ \tl_if_single_token:nTF{#1}
+ {\tl_set:Nn\knowledge_option_knowledgeAP_command_tl{#1}}
+ {\knowledge_error:n{Package~option~'knowledge~AP'~must~be~followed~by~a~single~control~sequence.}}
+}
+\KnowledgePackageTrigger{ complexity AP }{
+ \tl_if_single_token:nTF{#1}
+ {\tl_set:Nn\knowledge_option_complexityAP_command_tl{#1}}
+ {\knowledge_error:n{Package~option~'complexity~AP'~must~be~followed~by~a~single~control~sequence.}}
+}
\KnowledgeConfigureTrigger{ fix~hyperref~twocolumn }
{\knowledgeFixHyperrefTwocolumn}
\KnowledgeConfigureTrigger{ notion }
- {\KnowledgeConfigureNotion{notion}}
+ {\KnowledgeConfigureNotion{notion}
+ \knowledgesetvariant\kl{suggestion=notion}
+ \knowledgesetvariant\intro{suggestion=notion}
+ \knowledgesetvariant\phantomintro{suggestion=notion}
+ \knowledgesetvariant\reintro{suggestion=notion}
+ }
\KnowledgeConfigureTrigger{ protect~links }
{\kl_kl_nesting_incr:}
\KnowledgeConfigureTrigger{ unprotect~links }
@@ -1025,7 +1092,7 @@
\keys_set:nV{ knowledge~package~modes }{ composition }}
}
\keys_set:nV{ knowledge~package~modes }\knowledge_option_mode_tl
-\knowledge_option_aci_autoload:nnn{ hyperref }{}{\hypersetup{hidelinks}}
+\knowledge_option_aci_autoload:nnn{ hyperref }{}{}
\knowledge_option_aci_autoload:nn{ xcolor }{}
\knowledge_option_aci_autoload:nn{ makeidx }{}
\tl_const:Nn\scope_tl{SC@PE}
@@ -1219,7 +1286,7 @@
\seq_gpop:NNTF\scope_instances_stack_seq\l_tmpa_tl
{\tl_gset_eq:NN\scope_top_instance_tl\l_tmpa_tl
\int_gdecr:c{\scope_tl.area[\scope_top_area_tl].nesting_int}
- \exp_args:NV\knowledge_pop_visible_instances_to:n\scope_top_instance_tl
+ \knowledge_pop_visible_instances_to_mark:
\seq_get:NN\scope_instances_stack_seq\l_tmpa_tl
\tl_gset_eq:NN\scope_top_instance_tl\l_tmpa_tl
\tl_gset:Nx\scope_top_area_tl
@@ -1317,6 +1384,7 @@
{\scope_top_area_tl-\int_to_arabic:n{\int_use:c{\scope_tl.area[\scope_top_area_tl].count_int}}}}
{\tl_gset_eq:NN\scope_top_instance_tl\scope_top_area_tl}
%
+ \knowledge_push_visible_instance_mark:
\exp_args:Nx\knowledge_push_visible_instance:n{\scope_top_instance_tl}
\seq_gpush:Nx\scope_instances_stack_seq{\scope_top_instance_tl}
%
@@ -1366,11 +1434,6 @@
{\scope_tl.area[\tl_use:c{\scope_tl.instance[##1].area_tl}].labelizable_bool}
{\tl_set:Nn#1{##1}\seq_map_break:}{}}
}
-\cs_new:Nn\knowledge_scope_track_instance:Nn{
- \scope_area_if_exist:nTF{#2}
- {\knowledge_scope_track_instance_from_area:Nn#1{#2}}
- {\knowledge_scope_track_instance_from_label:Nn#1{#2}}
-}
\cs_new:Nn\knowledge_scope_track_instance_from_area:Nn{
\tl_set:Nn#1{}
\seq_map_inline:Nn\scope_instances_stack_seq
@@ -1383,11 +1446,11 @@
{\msg_error:nnxx{scope}{area~not~in~context}{#2}{scope=}}
{}
}
-\cs_new:Nn\knowledge_scope_track_instance_from_label:Nn{
- \tl_set:Nn#1{}
- \scopept_label_instance_if_exist:nTF{#2}
- {\tl_set:Nx#1{\scopept_label_instance_use:n{#2}}}
- {\msg_warning:nnnn{scope}{unknown~label}{#2}{scope=}}
+\cs_new:Nn\knowledge_scope_track_scope:n{
+ \scope_area_if_exist:nTF{#1}
+ {\knowledge_scope_track_instance_from_area:Nn\knowledge_knowledge_instance_tl{#1}}
+ {\tl_set:Nn\knowledge_knowledge_instance_tl{explicit-scope:#1}
+ \knowledge_scopetag_warn_if_unknown:n{#1}}
}
\bool_new:N\scopept_map_break_bool
\cs_new:Nn\scopept_map_break:
@@ -1412,25 +1475,80 @@
{\scopept_map_instance_ancestors_i:nN{##1}#2
\bool_if:NTF\scopept_map_break_bool:{\seq_map_break:}{}}
}
-\NewDocumentCommand\scopeLabel{m}
- { \kl_hide_begin:
+\tl_const:Nn\knowledge_scopetag_tl{ScpT@g}
+\cs_new:Npn\knowledge_scopetag_if_exist:nTF#1
+ {\tl_if_exist:cTF{\knowledge_scopetag_tl[#1]_bool}}
+\cs_new:Nn\knowledge_scopetag_ensure:n{
+ \knowledge_scopetag_if_exist:nTF{#1}{}
+ {\bool_new:c{\knowledge_scopetag_tl[#1]_bool}
+ \bool_gset_false:c{\knowledge_scopetag_tl[#1]_bool}
+ \seq_new:c{\knowledge_scopetag_tl[#1]_seq}
+ \seq_gput_right:cn{\knowledge_scopetag_tl[#1]_seq}{explicit-scope:#1}}}
+\cs_new:Nn\knowledge_scopetag_warn_if_unknown:n{
+ \knowledge_scopetag_if_exist:nTF{#1}{}
+ {\KAuxWriteX*{\exp_not:N\KAuxUndeclaredScopeTag{#1}}
+ \knowledge_scopetag_ensure:n{#1}}
+}
+\cs_new:Nn\knowledge_scopetag_declares:n{
+ \knowledge_scopetag_ensure:n{#1}
+ \bool_if:cTF{\knowledge_scopetag_tl[#1]_bool}
+ {}
+ {\bool_gset_true:c{\knowledge_scopetag_tl[#1]_bool}}
+ \KAuxWriteX*{\exp_not:N\KAuxDeclaredScopeTag{#1}}
+}
+\NewDocumentCommand\knowledgescope{ >{\SplitList{,}}m }{
+ \kl_hide_begin:\group_begin:
+ \ProcessList{#1}\knowledge_knowledgescope_one:n
+ \group_end:\kl_hide_end:
+}
+\cs_new:Nn\knowledge_knowledgescope_one:n{
+ \knowledge_scopetag_declares:n{#1}
\scope_get_labelizable_instance:N\l_tmpb_tl
- \KAuxWriteX*{\exp_not:n{\KAuxScopeLabel}{\exp_not:n{#1}}{\l_tmpb_tl}}
- %\tl_new:cx{\scopept_tl.label[#1].instance_tl}{\l_tmpb_tl}
- \kl_hide_end:
- \cs_if_exist:NTF\LaTeXlabel\LaTeXlabel\use_none:n{#1}}
-\let\label\scopeLabel
+ \KAuxWriteX*{\exp_not:N\KAuxNewLinkScopetagInstance{#1}{\l_tmpb_tl}}
+}
+\bool_new:N\knowledge_configuration_label_autoscope_bool
+\bool_gset_true:N\knowledge_configuration_label_autoscope_bool
+\KnowledgeConfigureBooleanOption[\knowledge_configuration_label_autoscope_bool]{patch~label}
+\KnowledgeConfigureBooleanOption[\knowledge_configuration_label_autoscope_bool]{label~scope}
+\global\let\knowledge_label_before_loading_package:n\label
+\cs_gset:Npn\label{
+ \mode_if_preamble:TF
+ \knowledge_label_in_preamble:n
+ \knowledge_label_before_loading_package:n
+}
+\cs_new:Npn\knowledge_label_in_preamble:n{
+ \bool_if:NTF
+ \knowledge_configuration_label_autoscope_bool
+ \knowledge_knowledgescope_one:n
+ \use_none:n
+}
\cs_new:Npn\knowledge_latex_label:n{
\cs_if_exist:NTF\LaTeXlabel\LaTeXlabel\label
}
+\NewKAuxCommand\KAuxUndeclaredScopeTag{m}
+ {Package~scope:~States~that~a~labelname~is~used~in~a~knowledge~definition.}
+\DeclareKAuxPhaseCommand\KAuxUndeclaredScopeTag{init}{}
+\NewKAuxCommand\KAuxDeclaredScopeTag{m}
+ {Package~scope:~States~that~a~labelname~has~been~declared.}
+\DeclareKAuxPhaseCommand\KAuxDeclaredScopeTag{init}{
+ \knowledge_scopetag_if_exist:nTF{#1}{}
+ {\bool_new:c{\knowledge_scopetag_tl[#1]_bool}}
+ \bool_gset_true:c{\knowledge_scopetag_tl[#1]_bool}
+ }
+\NewKAuxCommand\KAuxNewLinkScopetagInstance{mm}
+ {Package~scope:~Declares~that~a~label~is~declared~in~an~instance~of~a~scope.}
+\DeclareKAuxPhaseCommand\KAuxNewLinkScopetagInstance{init}{
+ \knowledge_scopetag_ensure:n{#1}
+ \seq_gput_right:cn{\knowledge_scopetag_tl[#1]_seq}{#2}
+}
\NewKAuxCommand\KAuxScopeNewInstance{mmm}
{Package~scope:~Declares~a~new~instance~of~a~scope.}
\DeclareKAuxPhaseCommand\KAuxScopeNewInstance{init}
{\tl_new:cn{\scopept_tl.instance[#2].area_tl}{#1}
\tl_new:cn{\scopept_tl.instance[#2].parent_tl}{#3}}
-\NewKAuxCommand\KAuxScopeLabel{mm}
- {Package~scope:~Links~a~label~to~the~scope~of~its~definition.}
-\DeclareKAuxPhaseCommand\KAuxScopeLabel{init}
+\NewKAuxCommand\KAuxScopeTag{mm}
+ {Package~scope:~Links~a~scopetag~to~an~instance~of~a~scope.}
+\DeclareKAuxPhaseCommand\KAuxScopeTag{init}
{\tl_if_exist:cTF{\scopept_tl.label[\tl_to_str:n{#1}].instance_tl}{}
{\tl_new:cn{\scopept_tl.label[\tl_to_str:n{#1}].instance_tl}{#2}}}
\cs_new:Npn\scopept_label_instance_if_exist:nTF#1
@@ -1477,8 +1595,13 @@
\scope_if_triggers_area:nTF{##1}
{\scope_area_pop:n{##1}}
{}}
- \kutils_secure_latex_command:N\label
- \let\label\scopeLabel
+}
+\AtBeginDocument{
+ \kutils_secure_latex_command:N\label
+ \def\label#1{\bool_if:NT
+ \knowledge_configuration_label_autoscope_bool
+ {\knowledge_knowledgescope_one:n{#1}}
+ \LaTeXlabel{#1}}
}
\NewDocumentCommand\ScopeActivate{}{
\cs_gset_eq:NN\ScopeActivate\relax
@@ -1532,9 +1655,9 @@
{\scope_area_pop:n{knowledge~import~internal}}
\NewDocumentEnvironment{knowledge~context}{m}
{\ScopeActivate\scope_area_push:n{knowledge~context~internal}
- \scopeLabel{#1}}
+ \knowledgescope{#1}}
{\scope_area_pop:n{knowledge~context~internal}}
-\KAuxBefore{\KAuxProcess{init}}
+\KAuxBefore{\IfKAuxReadyTF{\KAuxProcess{init}}{}}
\KAuxInit{}
\KAuxAfter{\KnowledgeDiagnoseOutput}
\iow_new:N\knowledge_diagnosefile_iow
@@ -1577,6 +1700,21 @@
\knowledge_diagnose:n{}
\knowledge_diagnose:n{}
%
+ \bool_if:NTF\knowledge_configuration_diagnosehelp_bool
+ {
+ \knowledge_diagnose:n{********}
+ \knowledge_diagnose:n{*~Help~*}
+ \knowledge_diagnose:n{********}
+ \knowledge_diagnose:n{}
+ \knowledge_diagnose:x{\use:c{@backslashchar}\cs_to_str:N\knowledgeconfigure{diagnose~bar=false}~deactivate~`|'-notation~in~diagnose~file.}
+ \knowledge_diagnose:x{\use:c{@backslashchar}\cs_to_str:N\knowledgeconfigure{diagnose~help=false}~deactivate~long~help~in~the~diagnose~file.}
+ \knowledge_diagnose:x{\use:c{@backslashchar}\cs_to_str:N\knowledgeconfigure{diagnose~line=true}~add~line~numbers~to~diagnose~file.}
+ \knowledge_diagnose:n{}
+ }{
+ \knowledge_diagnose:x{\use:c{@backslashchar}\cs_to_str:N\knowledgeconfigure{diagnose~help=true}~to~activate~help~in~the~diagnose~file.}
+ \knowledge_diagnose:n{}
+ }
+ %
\int_compare:nNnT\kl_digest_unknownknowledge_int>0{
\knowledge_diagnose:n{************************}
\knowledge_diagnose:n{*~Undefined~knowledges~*}
@@ -1584,6 +1722,8 @@
\knowledge_diagnose:n{}
%
\knowledge_diagnose_reset_line:
+ \bool_if:NT\knowledge_configuration_diagnosebar_bool
+ {\knowledge_diagnose:x{\use:c{@backslashchar}knowledge{ignore}}}
\KAuxProcess{diagnose-unknown-suggest}
%
\knowledge_diagnose:n{}
@@ -1660,7 +1800,7 @@
\exp_args:Nc\ktuple_if_exist:NTF{\knowledge_id:nnn{#1}{#2}{#3}}
}
\cs_generate_variant:Nn
- \knowledge_knowledge_if_exist:nnnTF{VVVTF}
+ \knowledge_knowledge_if_exist:nnnTF{VVVTF,VnVTF}
\NewDocumentCommand\NewKnowledgeParamBool{smm}{
\ktuple_new_bool_index:n{#2}
\bool_new:N#3
@@ -1690,7 +1830,6 @@
}}
}
\NewDocumentCommand\NewKnowledgeParamTl{som}{
- %\tl_show:n{#2}
\IfNoValueTF{#2}
{ \tl_set:Nn\l_tmpa_tl{#3}
\tl_remove_all:Nn\l_tmpa_tl{~}
@@ -1748,28 +1887,29 @@
\seq_new:N\knowledge_visible_instances_seq
\cs_new:Nn\knowledge_push_visible_instance:n
{\seq_gpush:Nn\knowledge_visible_instances_seq{#1}}
-\cs_new:Npn\knowledge_pop_visible_instance:
- {\seq_gpop:NN\knowledge_visible_instances_seq\l_tmpa_tl}
-\cs_new:Nn\knowledge_pop_visible_instances_to:n
+\cs_new:Nn\knowledge_push_visible_instance_mark:
+ {\seq_gpush:Nn\knowledge_visible_instances_seq{|}}
+\cs_new:Nn\knowledge_pop_visible_instances_to_mark:
{\seq_gpop:NNTF\knowledge_visible_instances_seq\l_tmpa_tl
- {\exp_args:NV\tl_if_eq:nnTF\l_tmpa_tl{#1}
+ {\exp_args:NV\tl_if_eq:nnTF\l_tmpa_tl{|}
{}
- {\knowledge_pop_visible_instances_to:n{#1}}}
- {\INTERNAL_ERROR_EMPTY_POP_VISIBLE}}
+ {\knowledge_pop_visible_instances_to_mark:}}
+ {\KNOWLEDGE_INTERNAL_ERROR:_stack_of_visible_instances_is_empty_while_popping}}
\cs_new:Nn\knowledge_show_visible_instances:
{\tl_show:x
{Visible~instances~<\seq_use:Nn\knowledge_visible_instances_seq{,}>}}
-\cs_new:Nn\knowledge_import_instance:n
- {\seq_if_in:NnTF\knowledge_visible_instances_seq{#1}
- {}{\knowledge_push_visible_instance:n{#1}}}
-\NewDocumentCommand\knowledgeimport{m}
- {\kl_hide_begin:
- \scopept_label_instance_if_exist:nTF{#1}
- {\exp_args:Nx\knowledge_import_instance:n{\scopept_label_instance_use:n{#1}}}
- {\msg_warning:nnnn{scope}{unknown~label}{#1}{\knowledgeimport}}
- \kl_hide_end:
+\NewDocumentCommand\knowledgeimport{ >{\SplitList{,}}m }{
+ \kl_hide_begin:
+ \ProcessList{#1}\knowledge_knowledgeimport:n
+ \kl_hide_end:
}
-%%
+\cs_set:Nn\knowledge_knowledgeimport:n{
+ \knowledge_scopetag_warn_if_unknown:n{#1}
+ \knowledge_scopetag_ensure:n{#1}
+ \exp_args:Nc\seq_map_function:NN
+ {\knowledge_scopetag_tl[#1]_seq}
+ \knowledge_push_visible_instance:n
+ }
\keys_define:nn { knowledge~directives } {
namespace .code:n = { \tl_set:Nn\knowledge_knowledge_namespace_tl{#1} },
append .choice:,
@@ -1784,16 +1924,14 @@
export / false .code:n = {\bool_set_false:N\knowledge_knowledge_export_bool},
export / true .code:n = {\bool_set_true:N\knowledge_knowledge_export_bool},
export .default:n = false,
- instance .code:n =
- { \tl_set:Nn\knowledge_knowledge_instance_tl{#1} },
scope .code:n =
- { \knowledge_scope_track_instance:Nn\knowledge_knowledge_instance_tl{#1} },
+ { \knowledge_scope_track_scope:n{#1}
+ \tl_gput_right:Nn\knowledge_knowledge_immediate_synonym_directives_tl{,scope = {#1}}},
synonym .code:n =
{ \bool_set_true:N\knowledge_knowledge_is_synonym_bool
\exp_args:Nnx\keys_set:nn { knowledge~directives }
- {link={\exp_not:o\knowledge_knowledge_synonym_tl},
- link~instance={\exp_not:o\knowledge_knowledge_synonyminstance_tl},
- instance={\exp_not:o\knowledge_knowledge_synonyminstance_tl}}}
+ {link={\exp_not:V\knowledge_knowledge_synonymlink_tl},
+ link~instance={\exp_not:V\knowledge_knowledge_synonyminstance_tl}}},
}
\NewKAuxCommand\KAuxKnowledge{mmmm}
{Package~knowledge:~Declares~a~knowledge.~
@@ -1827,9 +1965,9 @@
\cs_generate_variant:Nn\knowledge_new_now:nnnn{nnVn}
\cs_generate_variant:Nn\knowledge_set_now:nnnn{nnVn}
\NewDocumentCommand\knowledge{}
- {\KAuxWriteLocation\__knowledge_knowledge}
-\NewDocumentCommand\__knowledge_knowledge{t! t+ m >{\SplitList{|}}o m }
-{ \kl_hide_begin:
+ {\KAuxWriteLocation\__knowledge_knowledge_init:w}
+\NewDocumentCommand\__knowledge_knowledge_init:w{t! t+ m m}{
+ \kl_hide_begin:
\group_begin:
%
\IfBooleanTF{#1}{%
@@ -1844,26 +1982,87 @@
\tl_set_eq:NN\knowledge_namespace_tl
\knowledge_default_namespace_tl
%
+ \tl_gset:Nn\knowledge_knowledge_immediate_synonym_directives_tl{synonym}
+ %
\bool_gset_false:N\knowledge_knowledge_is_synonym_bool
%
- \use:x{
- \exp_not:n{\knowledge_knowledge_process:nn{#3}}
- {\exp_not:V\knowledge_knowledgedefault_tl,\exp_not:n{#5}}}
+ \tl_if_eq:nnTF{#4}{|}
+ {\__knowledge_knowledge_cont_barnotation:nw{#3}|}
+ {\tl_if_eq:nnTF{#4}{[}
+ {\__knowledge_knowledge_cont_classical:nw{#3}[}
+ {\__knowledge_knowledge_cont_classical:nw{#3}{#4}}}
+}
+\cs_new:Nn\__knowledge_knowledge_recallsynonym:n{
+ \bool_if:NF\knowledge_knowledge_is_synonym_bool
+ {\tl_gset:Nn\knowledge_knowledge_synonymlink_tl{#1}
+ \tl_gset_eq:NN\knowledge_knowledge_synonyminstance_tl
+ \knowledge_knowledge_instance_tl}
+}
+\cs_new:Nn\__knowledge_knowledge_end:{
+ \group_end:
+ \kl_hide_end:
+}
+\NewDocumentCommand\__knowledge_knowledge_cont_classical:nw{m >{\SplitList{|}}o m }{
+ %\iow_term:n{\__knowledge_knowledge_cont_classical~{#1}{#3}}
+ \knowledge_knowledge_setparseat:NNn\l_tmpa_tl\l_tmpb_tl{#1}
%
- \bool_if:NF\knowledge_knowledge_is_synonym_bool
- {\tl_gset:Nn\knowledge_knowledge_synonym_tl{#3}
- \tl_gset_eq:NN\knowledge_knowledge_synonyminstance_tl
- \knowledge_knowledge_instance_tl}
+ \use:x{
+ \exp_not:N\knowledge_knowledge_process:nn
+ {\exp_not:V\l_tmpa_tl}
+ {\exp_not:V\knowledge_knowledgedefault_tl,
+ \exp_not:n{#3},
+ \tl_if_empty:NTF\l_tmpb_tl{}{,scope={\exp_not:V\l_tmpb_tl}}}}
+ %
+ \exp_args:NV\__knowledge_knowledge_recallsynonym:n\l_tmpa_tl
+ %\tl_show:N\l_tmpa_tl
+ %\tl_show:N\knowledge_knowledge_instance_tl
+ %\tl_show:N\knowledge_knowledge_immediate_synonym_directives_tl
%
- \IfNoValueTF{#4}{}{
+ \IfNoValueTF{#2}{}{
\cs_set:Nn\l_tmpa_cs:n
- {\exp_args:Nnx\knowledge_knowledge_process:nn{##1}{synonym}}
- \ProcessList{#4}\l_tmpa_cs:n
+ {\exp_args:Nnx\knowledge_knowledge_process:nn{##1}
+ {\exp_not:V\knowledge_knowledge_immediate_synonym_directives_tl}}
+ \ProcessList{#2}\l_tmpa_cs:n
}
%
- \group_end:
- \kl_hide_end:
+ \__knowledge_knowledge_end:
}
+\cs_new:Npn\knowledge_knowledge_barnotation_firstline:n{}
+\cs_new:Npn\knowledge_knowledge_barnotation_nextlines:n{}
+\cs_new:Npn\__knowledge_knowledge_cont_barnotation:nw#1{
+ \cs_set:Nn\knowledge_knowledge_barnotation_firstline:n{
+ %\knowledge_knowledge_setparseat\g_tmpa_tl\g_tmpb_tl{#1}
+ %\iow_term:n{\knowledge{##1}{#1}~(first)}
+ \knowledge{##1}{#1}
+ \cs_set_eq:NN
+ \knowledge_knowledge_barnotation_exec_line:n
+ \knowledge_knowledge_barnotation_nextlines:n}
+ \cs_set:Nn\knowledge_knowledge_barnotation_nextlines:n
+ {%\iow_term:n{\exp_not:n{\knowledge{##1}}{synonym}}
+ \knowledge{##1}{synonym}}
+ \cs_set_eq:NN
+ \knowledge_knowledge_barnotation_exec_line:n
+ \knowledge_knowledge_barnotation_firstline:n
+ \kl_newknowledge_parse:w
+}
+\cs_new:Npn\kl_newknowledge_parse:w{
+ \peek_charcode_remove_ignore_spaces:NTF|
+ {\kl_insert_klendline:w\knowledge_knowledge_barnotation_exec_line:w}
+ {\__knowledge_knowledge_end:}
+}
+\cs_new:Npn\knowledge_knowledge_barnotation_exec_line:w#1\kl_end_line:{
+ \knowledge_knowledge_barnotation_exec_line:n{#1}
+ \kl_newknowledge_parse:w
+}
+\char_set_catcode_active:N\^^M
+\cs_gset:Npn\kl_insert_klendline:w{\group_begin:\catcode`\^^M=\active\kl_insert_klendline_:w}
+\cs_gset:Npn\kl_insert_klendline_:w#1^^M{\group_end:#1\kl_end_line:}
+\char_set_catcode_end_line:N\^^M
+\cs_new:Nn\knowledge_knowledge_setparseat:NNn
+ {\knowledge_knowledge_setparseat_:NNw#1#2#3@@\kl_end:}
+\cs_new:Npn\knowledge_knowledge_setparseat_:NNw#1#2#3@#4@#5\kl_end:
+ {\tl_set:Nx#1{\tl_trim_spaces:n{#3}}
+ \tl_set:Nx#2{\tl_trim_spaces:n{#4}}}
\NewDocumentCommand\knowledgestyle{ s m m }
{ \kl_hide_begin:
\group_begin:
@@ -1886,8 +2085,9 @@
\bool_new:N\knowledge_knowledge_autoref_bool
\bool_new:N\knowledge_knowledge_clear_bool
\bool_new:N\knowledge_knowledge_append_bool
-\tl_clear_new:N\knowledge_knowledge_synonym_tl
+\tl_clear_new:N\knowledge_knowledge_synonymlink_tl
\tl_clear_new:N\knowledge_knowledge_synonyminstance_tl
+\tl_clear_new:N\knowledge_knowledge_immediate_synonym_directives_tl
\tl_clear_new:N\knowledge_knowledge_export_bool
\tl_clear_new:N\knowledge_knowledge_key_tl
\tl_clear_new:N\knowledge_knowledge_namespace_tl
@@ -1913,9 +2113,9 @@
{}
%
\bool_if:NT\knowledge_knowledge_clear_bool
- {\tl_put_left:Nn\knowledge_knowledge_directives_tl{clear,}}
+ {\tl_put_left:Nn\knowledge_knowledge_directives_tl{clear,}}
\bool_if:NT\knowledge_knowledge_append_bool
- {\tl_put_left:Nn\knowledge_knowledge_directives_tl{force,}}
+ {\tl_put_left:Nn\knowledge_knowledge_directives_tl{force,}}
%
\bool_if:nTF{\knowledge_knowledge_now_bool}
{\use:x{
@@ -1964,17 +2164,24 @@
{\tl_set:Nn\knowledge_knowledge_directives_tl{#1}}
{\tl_put_right:Nn\knowledge_knowledge_directives_tl{,#1}}}
\cs_generate_variant:Nn\knowledge_delay_directive:n{x}
-\NewDocumentCommand\knowledgedirective{mom}{
+\NewDocumentCommand\knowledgedirective{smom}{
\kl_hide_begin:
- \cs_new:cn
- {knowledgedirective_#1:n}
- {\keys_set:nn{ knowledge~directives }{#3}}
- \keys_define:nn{ knowledge~directives }
- {#1 .code:n = {\use:c{knowledgedirective_#1:n}{##1}}}
- \IfNoValueF{#2}
- {\keys_define:nn{ knowledge~directives }{#1 .default:n = {#2}}}
+ \keys_if_exist:nnTF{ knowledge~directives }{ #2 }
+ {\IfBooleanTF{#1}
+ {\knowledgedirective:nnn{#2}{#3}{#4}}
+ {\msg_error:nnn{ knowledge }{ knowledgedirective~redifinition }{#2}}}
+ {\knowledgedirective:nnn{#2}{#3}{#4}}
\kl_hide_end:
}
+\cs_new:Nn\knowledgedirective:nnn{
+ \cs_set:cn
+ {knowledgedirective_#1:n}
+ {\keys_set:nn{ knowledge~directives }{#3}}
+ \keys_define:nn{ knowledge~directives }
+ {#1 .code:n = {\use:c{knowledgedirective_#1:n}{##1}}}
+ \IfNoValueF{#2}
+ {\keys_define:nn{ knowledge~directives }{#2 .default:n = {#2}}}
+}
\tl_new:N\knowledge_knowledgedefault_tl
\NewDocumentCommand\knowledgedefault{sm}{
\kl_hide_begin:
@@ -2008,14 +2215,18 @@
\tl_gnew:Nn\knowledge_display_code_tl{INTERNAL~ERROR~DISPLAY~CODE}
\NewDocumentCommand\klTKS{}{\knowledge_klTKS:nnn}
\cs_new:Nn\knowledge_klTKS:nnn{
+ %\iow_term:n{\knowledge_klTKS:nnn{#1}{#2}{#3}}
\group_begin:
%
\tl_set:Nx\knowledge_kl_linkscope_tl{\tl_to_str:n{#3}}
- \tl_set:Nn\knowledge_kl_instance_tl{}
+ \tl_set:Nn\knowledge_kl_linkinstance_tl{}
\tl_set:Nn\knowledge_kl_text_tl{#1}
\tl_set:Nx\knowledge_kl_base_key_tl{\tl_to_str:n{#2}}
\tl_set_eq:NN\knowledge_kl_key_tl\knowledge_kl_base_key_tl
\int_set_eq:NN\knowledge_kl_recursion_int\knowledge_kl_max_recursion_int
+ %\debug_vars:nn{klTKS:nnn}
+ % {\knowledge_kl_linkscope_tl\knowledge_kl_linkinstance_tl
+ % \knowledge_kl_text_tl\knowledge_kl_base_key_tl}
%
\tl_if_exist:cTF
{knowledge_kl_\tl_to_str:V\knowledge_kl_modifiers_tl _init_tl}
@@ -2033,14 +2244,14 @@
}
\int_const:Nn\knowledge_kl_max_recursion_int{40}
\int_new:N\knowledge_kl_recursion_int
-\cs_set:Nn\knowledge_kl_find:{
+\cs_new:Nn\knowledge_kl_find:{
\knowledge_kl_find_recursion_exceeded:TF
- {\knowledge_kl_error_recursion:}
- {\tl_if_empty:NTF\knowledge_kl_instance_tl
- {\tl_if_empty:NTF\knowledge_kl_linkscope_tl
- \knowledge_kl_find_withoutscope:
- \knowledge_kl_find_withscope:}
- \knowledge_kl_find_withinstance:}
+ \knowledge_kl_error_recursion:
+ {\tl_if_empty:NTF\knowledge_kl_linkscope_tl
+ {\tl_if_empty:NTF\knowledge_kl_linkinstance_tl
+ {\knowledge_kl_find_withoutscope:}
+ {\knowledge_kl_find_withinstance:}}
+ \knowledge_kl_find_withscopetag:}
}
\cs_set:Npn\knowledge_kl_find_recursion_exceeded:TF{
\int_decr:N\knowledge_kl_recursion_int
@@ -2049,29 +2260,54 @@
\cs_new:Nn\knowledge_kl_find_withinstance:{
\knowledge_knowledge_if_exist:VVVTF
\knowledge_kl_namespace_tl
- \knowledge_kl_instance_tl
+ \knowledge_kl_linkinstance_tl
\knowledge_kl_key_tl
{\knowledge_kl_exec:nnV
\knowledge_kl_namespace_tl
- \knowledge_kl_instance_tl
+ \knowledge_kl_linkinstance_tl
\knowledge_kl_key_tl}
{ \knowledge_kl_error_unknown_in_scope_firsttime: }
}
-\cs_new:Nn\knowledge_kl_find_withscope:{
- \exp_args:NV
- \scopept_label_instance_if_exist:nTF\knowledge_kl_linkscope_tl
- { \tl_set:Nx\knowledge_kl_instance_tl
- {\scopept_label_instance_use:n{\knowledge_kl_linkscope_tl}}
- \knowledge_kl_find_withinstance: }
- { \knowledge_kl_error_label_unknown: }
+\cs_new:Nn\knowledge_kl_find_withscopetag:{
+ %\debug_vars:nn{\knowledge_kl_find_withscopetag:}{\knowledge_kl_linkscope_tl}
+ \exp_args:NV\knowledge_scopetag_warn_if_unknown:n\knowledge_kl_linkscope_tl
+ \tl_clear:N\l_tmpa_tl
+ \exp_args:Nc\seq_map_function:NN
+ {\knowledge_scopetag_tl[\knowledge_kl_linkscope_tl]_seq}
+ \knowledge_kl_find_scopetag_tmpa:n
+ % tests whether the search was successful
+ \tl_if_empty:NTF\l_tmpa_tl
+ {\knowledge_kl_error_unknown_in_scope_firsttime:}
+ {\knowledge_kl_exec:VVV
+ \knowledge_kl_namespace_tl
+ \l_tmpa_tl
+ \knowledge_kl_key_tl}
+}
+\cs_new:Npn\knowledge_kl_find_scopetag_tmpa:n{
+ \knowledge_kl_find_scopetag:Nn\l_tmpa_tl
+}
+\cs_new:Nn\knowledge_kl_find_scopetag:Nn{
+ \tl_if_empty:NTF#1
+ {\knowledge_knowledge_if_exist:VnVTF
+ \knowledge_kl_namespace_tl
+ {#2}%instance
+ \knowledge_kl_key_tl
+ {\tl_set:Nn#1{#2}}
+ {}}
+ {}
}
\cs_new:Nn\knowledge_kl_find_withoutscope:{
+ %\debug_vars:nn{\knowledge_kl_find_withoutscope:}
+ % {\knowledge_kl_key_tl\knowledge_kl_linkinstance_tl}
+ %\exp_args:NVVV\knowledge_knowledge_if_exist:nnnTF
+ % \knowledge_kl_namespace_tl\knowledge_kl_linkinstance_tl\knowledge_kl_key_tl
+ % {\tl_show:n{found}}{\tl_show:n{not~found}}
\knowledge_kl_find_in_scope:VNTF
\knowledge_kl_key_tl
- \knowledge_kl_instance_tl
- {\knowledge_kl_exec:nnV
+ \knowledge_kl_linkinstance_tl
+ {\knowledge_kl_exec:VVV
\knowledge_kl_namespace_tl
- \knowledge_kl_instance_tl
+ \knowledge_kl_linkinstance_tl
\knowledge_kl_key_tl}
{\knowledge_kl_error_unknown_firsttime:}
}
@@ -2081,6 +2317,7 @@
}
\cs_new:Nn\knowledge_kl_find_in_scope:nnNTF{
\group_begin:
+ %\tl_show:n{\knowledge_kl_find_in_scope:~#1/#2/#3}
\tl_set:Nn\l_tmpa_tl{#1}
\tl_set:Nn\l_tmpb_tl{#2}
\bool_gset_false:N\g_tmpa_bool
@@ -2093,23 +2330,34 @@
{#5}
}
\cs_new:Nn\knowledge_kl_find_in_scope_test:n{
+ \tl_if_eq:nnTF{#1}{|}{}{
+ \knowledge_kl_find_in_scope_test_:n{#1}
+ \seq_if_exist:cTF{\knowledge_scopetag_tl[#1]_seq}
+ {\exp_args:Nc\seq_map_function:NN
+ {\knowledge_scopetag_tl[#1]_seq}
+ \knowledge_kl_find_in_scope_test_:n
+ }{}}
+}
+\cs_new:Nn\knowledge_kl_find_in_scope_test_:n{
\exp_args:Nc\ktuple_if_exist:NTF
{\knowledge_id:nnV{\l_tmpa_tl}{#1}\l_tmpb_tl}
{\bool_gset_true:N\g_tmpa_bool
\tl_gset:Nn\g_tmpa_tl{#1}
- \seq_map_break:}{}}
+ \seq_map_break:}{}
+}
\cs_generate_variant:Nn\knowledge_kl_find_in_scope:nnNTF{nVNTF}
\cs_generate_variant:Nn\knowledge_kl_find_in_scope:nNTF{VNTF}
\cs_new:Nn\knowledge_kl_exec:nnn{
\tl_set:Nx\knowledge_kl_resourcearguments_tl
{{#1}{#2}{\exp_not:n{#3}}}
+ %\debug_vars:nn{\knowledge_kl_exec:nnn}{\knowledge_kl_resourcearguments_tl}
\exp_args:NNc\tl_set:Nn\knowledge_kl_resourcetoken_tl
{\knowledge_id:nnn{#1}{#2}{#3}}
\expandafter\ktuple_countuse_gincr:N\knowledge_kl_resourcetoken_tl
%
\tl_clear:N\knowledge_kl_link_tl
\tl_clear:N\knowledge_kl_linkscope_tl
- \tl_clear:N\knowledge_kl_instance_tl
+ \tl_clear:N\knowledge_kl_linkinstance_tl
\tl_map_function:NN
\knowledge_kl_styledirectives_tl
\tl_clear:N
@@ -2136,7 +2384,7 @@
\knowledge_kl_compute_code:
}
}
-\cs_generate_variant:Nn\knowledge_kl_exec:nnn{nnV}
+\cs_generate_variant:Nn\knowledge_kl_exec:nnn{nnV,VVV}
\cs_new:Nn\knowledge_kl_use_styles:n
{\clist_map_function:nN{#1}\knowledge_kl_use_style:n}
\cs_generate_variant:Nn\knowledge_kl_use_styles:n {x}
@@ -2179,13 +2427,25 @@
{}
\DeclareKAuxPhaseCommand\KAuxErrorKnowledgeUnknown{diagnose-unknown-suggest}
{ \knowledge_diagnose_line:
- \tl_set_eq:Nc\l_tmpa_tl{knowledge_kl_\cs_to_str:N#5_suggestion_tl}
- \tl_if_empty:nTF{#2}{}
- {\tl_if_empty:NTF\l_tmpa_tl{}
- {\tl_put_right:Nn\l_tmpa_tl{,}}
- \tl_put_right:Nn\l_tmpa_tl{scope={#2}}}
- \knowledge_diagnose:x
- {\exp_not:n{\knowledge{#3}}{\exp_not:V\l_tmpa_tl}}
+ \tl_set_eq:Nc\l_tmpa_tl{knowledge_kl_\cs_to_str:N#5_suggestion_tl}
+ \tl_if_eq:nnTF{#1}{default}
+ {}
+ {\tl_if_empty:NTF\l_tmpa_tl{}{\tl_put_right:Nn\l_tmpa_tl{,}
+ \tl_put_right:Nn\l_tmpa_tl{namespace={#1}}}}
+
+ \bool_if:NTF\knowledge_configuration_diagnosebar_bool{
+ %\knowledge_diagnose:x{\char_escape_tl knowledge{\exp_not:V\l_tmpa_tl}}
+ \tl_set:Nn\l_tmpa_tl{~~~|~~#3}
+ \tl_if_empty:nTF{#2}{}
+ {\tl_put_right:Nn\l_tmpa_tl{@#2}}
+ \knowledge_diagnose:x{\exp_not:V\l_tmpa_tl}
+ }{
+ \tl_if_empty:nTF{#2}{}
+ {\tl_if_empty:NTF\l_tmpa_tl{}{\tl_put_right:Nn\l_tmpa_tl{,}}
+ \tl_put_right:Nn\l_tmpa_tl{scope={#2}}}
+ \knowledge_diagnose:x
+ {\char_escape_tl knowledge\exp_not:n{{#3}}{\exp_not:V\l_tmpa_tl}}
+ }
}
\cs_new:Nn\knowledge_kl_error_unknown_firsttime:
{\bool_if:cTF{\knowledge_variant_var:n{unknownwarning_bool}}
@@ -2193,7 +2453,7 @@
\msg_warning:nnxxx{ knowledge }{ knowledge~unknown }
{\exp_not:V\knowledge_kl_key_tl}
{\exp_not:V\knowledge_kl_namespace_tl}
- {\seq_use:Nn\knowledge_visible_instances_seq{~|~}}}
+ {\seq_use:Nn\knowledge_visible_instances_seq{|}}}
}{}
\bool_if:cTF{\knowledge_variant_var:n{unknowndiagnose_bool}}
{\KAuxWriteX{
@@ -2286,36 +2546,38 @@
\cs_new:Nn\knowledge_variant_var:n
{knowledge_kl_\expandafter\cs_to_str:N\knowledge_kl_command_tl _#1}
\NewDocumentCommand\knowledgenewvariant{mm}{
- \exp_args:Nc\tl_new:Nn
+ \tl_if_exist:cTF{knowledge_kl_\cs_to_str:N#1_command_tl}
+ {\knowledge_error:n{Variant~#1~already~exists~(in~\knowledgenewvariant).}}
+ {\exp_args:Nc\tl_new:Nn
{knowledge_kl_\cs_to_str:N#1_command_tl}
{#1}
- %
- %
- \NewDocumentCommand#1{s}
- {\knowledge_kl_modifiers_add:N#1
- \IfBooleanF{##1}{\knowledge_kl:w}}
- %
- \tl_new_eq:cN
- {knowledge_kl_\cs_to_str:N#1_namespace_tl}
- \knowledge_default_namespace_tl
- \tl_new:cx{knowledge_kl_\cs_to_str:N#1_suggestion_tl}{}
- \bool_new_true:c{knowledge_kl_\cs_to_str:N#1_unknownwarning_bool}
- \bool_new_true:c{knowledge_kl_\cs_to_str:N#1_unknowndiagnose_bool}
- \tl_new:cn{knowledge_kl_\cs_to_str:N#1_default_style_tl}{}
- \tl_new:cn{knowledge_kl_\cs_to_str:N#1_unknown_style_tl}{}
- \tl_new:cn{knowledge_kl_\cs_to_str:N#1_unknown_style_cont_tl}{}
- \tl_new:cx{knowledge_kl_\cs_to_str:N#1_autoknowledge_tl}{}
- \tl_new:cx{knowledge_kl_\cs_to_str:N#1_styledirectives_tl}{}
- %
- \bool_if:NT\knowledge_hyperref_active_bool
- {\exp_args:Nx\pdfstringdefDisableCommands
- {\exp_not:N\def\exp_not:N#1
- {\exp_not:N\knowledge_variant_arg_absorber:Nw
- \exp_not:c{\cs_to_str:N#1_PDFstring}}}}
- \exp_args:Nc\newcommand{\cs_to_str:N#1_PDFstring}[3]{##1}
- %
- \tl_new:cx{knowledge_kl_\tl_to_str:n{#1*} _init_tl}
- {
+ %
+ %
+ \NewDocumentCommand#1{s}
+ {\knowledge_kl_modifiers_add:N#1
+ \IfBooleanF{##1}{\knowledge_kl:w}}
+ %
+ \tl_new_eq:cN
+ {knowledge_kl_\cs_to_str:N#1_namespace_tl}
+ \knowledge_default_namespace_tl
+ \tl_new:cx{knowledge_kl_\cs_to_str:N#1_suggestion_tl}{}
+ \bool_new_true:c{knowledge_kl_\cs_to_str:N#1_unknownwarning_bool}
+ \bool_new_true:c{knowledge_kl_\cs_to_str:N#1_unknowndiagnose_bool}
+ \tl_new:cn{knowledge_kl_\cs_to_str:N#1_default_style_tl}{}
+ \tl_new:cn{knowledge_kl_\cs_to_str:N#1_unknown_style_tl}{}
+ \tl_new:cn{knowledge_kl_\cs_to_str:N#1_unknown_style_cont_tl}{}
+ \tl_new:cx{knowledge_kl_\cs_to_str:N#1_autoknowledge_tl}{}
+ \tl_new:cx{knowledge_kl_\cs_to_str:N#1_styledirectives_tl}{}
+ %
+ \bool_if:NT\knowledge_hyperref_active_bool
+ {\exp_args:Nx\pdfstringdefDisableCommands
+ {\exp_not:N\def\exp_not:N#1
+ {\exp_not:N\knowledge_variant_arg_absorber:Nw
+ \exp_not:c{\cs_to_str:N#1_PDFstring}}}}
+ \exp_args:Nc\newcommand{\cs_to_str:N#1_PDFstring}[3]{##1}
+ %
+ \tl_new:cx{knowledge_kl_\tl_to_str:n{#1*} _init_tl}
+ {
\exp_not:n{\tl_set_eq:NN\knowledge_kl_command_tl}
\exp_not:c{knowledge_kl_\cs_to_str:N#1_command_tl}
\exp_not:n{\tl_set_eq:NN\knowledge_kl_namespace_tl}
@@ -2330,10 +2592,11 @@
\exp_not:c{knowledge_kl_\cs_to_str:N#1 _styledirectives_tl}
\exp_not:c{knowledge_kl_\cs_to_str:N#1 _autoknowledge_tl}
}
- %
- %\bool_if:NT\knowledge_hyperref_active_bool
- % {\pdfstringdefDisableCommands{\let#1\knowledge_fake_kl:n}}
- %
+ %
+ %\bool_if:NT\knowledge_hyperref_active_bool
+ % {\pdfstringdefDisableCommands{\let#1\knowledge_fake_kl:n}}
+ %
+ }
\knowledgesetvariant#1{#2}
}
\DeclareExpandableDocumentCommand\knowledge_variant_arg_absorber:Nw
@@ -2345,10 +2608,14 @@
\tl_new:N\knowledge_variant_command_tl
\tl_new:N\knowledge_variant_key_tl
\NewDocumentCommand\knowledgesetvariant{mm}{
- \tl_set:Nn\knowledge_variant_command_tl{#1}
- \tl_set:Nx\knowledge_variant_key_tl{\cs_to_str:N#1}
- %
- \keys_set:nn{ knowledge~configure~variant }{#2}
+ \tl_if_exist:cTF{knowledge_kl_\cs_to_str:N#1_command_tl}
+ {
+ \tl_set:Nn\knowledge_variant_command_tl{#1}
+ \tl_set:Nx\knowledge_variant_key_tl{\cs_to_str:N#1}
+ %
+ \keys_set:nn{ knowledge~configure~variant }{#2}
+ }
+ {\knowledge_error:n{Variant~#1~does~not~exist~(in~\knowledgesetvariant).}}
}
\keys_define:nn{ knowledge~configure~variant }{
namespace .code:n =
@@ -2437,13 +2704,13 @@
\NewKnowledgeParamBool*{lowercase}\kl_lowercase_bool
\NewKnowledgeParamBool*{uppercase}\kl_uppercase_bool
\NewKnowledgeParamTl*{link}
-\NewKnowledgeParamTl*{link~scope}
-\NewKnowledgeParamTl*[\knowledge_kl_instance_tl]{link~instance}
+\NewKnowledgeParamTl*[\knowledge_kl_linkscope_tl]{link~scope}
+\NewKnowledgeParamTl*[\knowledge_kl_linkinstance_tl]{link~instance}
\NewKnowledgeParamTl*[\knowledge_kl_forcedtext_tl]{text}
\NewKnowledgeParamTl*{wrap}
\NewKnowledgeParamBool*{UnKnoWn~KNowLedGE}\kl_unknown_knowledge_bool
-\bool_gset_false:N\kl_unknown_knowledge_bool
+\bool_set_false:N\kl_unknown_knowledge_bool
\ktuple_new_int_index:n{countuse}
\ktuple_countuse_expands_to:n{}
\ktuple_new_int_index:n{countintro}
@@ -2521,7 +2788,7 @@
\int_compare:nNnT\kl_countuse_int>0
{\int_compare:nNnT\kl_countintro_int=0
{\knowledge_diagnose_line:
- \knowledge_diagnose:n{\nointro{#1}{#2}{#3}}}}
+ \knowledge_diagnose:x{\char_escape_tl nointro{\exp_not:n{#1}}{\exp_not:n{#2}}{\exp_not:n{#3}}}}}
\group_end:}
\DeclareKAuxPhaseCommand\KAuxAutoref{autoref-introduced-not-used}
{\group_begin:
@@ -2644,7 +2911,7 @@
\tl_set:Nx\l_tmpa_tl
{\int_compare:nNnTF\l_tmpa_int=1
{} {\int_to_alph:n\l_tmpa_int}}
- \exp_args:Nx\label{\exp_not:V\knowledge_kl_autoref_tl\l_tmpa_tl}}
+ \exp_args:Nx\LaTeXlabel{\exp_not:V\knowledge_kl_autoref_tl\l_tmpa_tl}}
\expandafter\ktuple_countintro_gincr:N
\knowledge_kl_resourcetoken_tl
\KAuxWriteX
@@ -2664,7 +2931,7 @@
}}{}
}
-\cs_new:Npn\kl_up:n{\mode_if_math:TF\mathup\textup}
+\cs_new:Npn\kl_up:n{\mode_if_math:TF\use:n\textup}
\cs_new:Npn\kl_md:n{\mode_if_math:TF\mathmd\textmd}
\cs_new:Npn\kl_sc:n{\mode_if_math:TF\mathsc\textsc}
\cs_new:Npn\kl_it:n{\mode_if_math:TF\mathit\textit}
@@ -2698,13 +2965,14 @@
{\exp_not:V\knowledge_kl_text_tl}
}
}
-\NewDocumentCommand\AP{}
+\NewDocumentCommand\knowledge_anchor_point_cs:{}
{\bool_if:NT\knowledge_hyperref_active_bool
{\strut\vadjust{\knowledge_AP_internal:}}}
\NewDocumentCommand\itemAP{o}{
\IfNoValueTF{#1}
- {\item\AP}
+ {\item\knowledge_anchor_point_cs:}
{\item[\knowledge_itemAP: #1]}}
+\let\AP\knowledge_anchor_point_cs:
\int_new:N\kl_hyperref_kl_nesting_count_int
\bool_new:N\kl_hyperref_active_here_bool
\bool_set_true:N\kl_hyperref_active_here_bool
@@ -2943,6 +3211,12 @@
}
\ExplSyntaxOn
\makeatother
+\bool_if:NT\knowledge_option_texpatch_bool{
+ \bool_if:NT\knowledge_hyperref_active_bool{
+ \hypersetup{breaklinks}
+ \hypersetup{hidelinks}
+ }
+}
\bool_if:NF\knowledge_option_composition_bool
{\bool_if:NF\knowledge_option_paper_bool}
{\bool_set_true:N\knowledge_option_composition_bool}
@@ -2994,14 +3268,14 @@
\knowledgenewvariant\kl{
namespace= default,
- default style= {kl,autoref link},
+ default style= {autoref link},
unknown style= kl unknown,
unknown style cont= kl unknown cont,
- style directive={style}
+ style directive= style
}
\knowledgenewvariant\intro{
namespace= default,
- default style= {intro,autoref target},
+ default style= {autoref target},
unknown style= intro unknown,
unknown style cont= intro unknown cont,
style directive= intro style
@@ -3014,11 +3288,11 @@
}
\knowledgenewvariant\reintro{
namespace=default,
- default style=intro,
unknown style=intro unknown,
unknown style cont=intro unknown cont,
style directive=intro style
}
+
\knowledgevariantmodifier{\intro*\kl}{\intro}
\knowledgevariantmodifier{\reintro*\kl}{\reintro}
@@ -3029,30 +3303,24 @@
\expandafter{\tl_to_str:n{#1}}}
\newcommand\robustdisplaybracket[1]
{[\robustdisplay{#1}]}
-
+\knowledgedirective{ignore}{}
\ExplSyntaxOff
\IfKnowledgePaperModeTF{
- \knowledgestyle{kl}{}
\knowledgestyle{kl unknown}{}
\knowledgestyle{kl unknown cont}{}
- \knowledgestyle{intro}{emphasize,index style=knowledgeIntroIndexStyle}
\knowledgestyle{intro unknown}{emphasize}
\knowledgestyle{intro unknown cont}{emphasize}
}{}
\IfKnowledgeCompositionModeTF{
\IfXcolorTF{
- \knowledgestyle{kl}{color={blue!70!black}}
\knowledgestyle{kl unknown}{color=orange}
\knowledgestyle{kl unknown cont}{color=brown}
- \knowledgestyle{intro}{emphasize,color=blue,index style=knowledgeIntroIndexStyle}
\knowledgestyle{intro unknown}{emphasize,color=orange}
\knowledgestyle{intro unknown cont}{emphasize,color=brown}
}{
- \knowledgestyle{kl}{}
\knowledgestyle{kl unknown}{underline}
\knowledgestyle{kl unknown cont}{underline}
- \knowledgestyle{intro}{emphasize,index style=introindexstyle}
\knowledgestyle{intro unknown}{emphasize,underline}
\knowledgestyle{intro unknown cont}{emphasize,underline}
}
@@ -3060,17 +3328,13 @@
\IfKnowledgeElectronicModeTF{
\IfXcolorTF{
- \knowledgestyle{kl}{color={blue!70!black}}
\knowledgestyle{kl unknown}{}
\knowledgestyle{kl unknown cont}{}
- \knowledgestyle{intro}{emphasize,color=blue,index style=introindexstyle}
\knowledgestyle{intro unknown}{emphasize}
\knowledgestyle{intro unknown cont}{emphasize}
}{
- \knowledgestyle{kl}{}
\knowledgestyle{kl unknown}{}
\knowledgestyle{kl unknown cont}{}
- \knowledgestyle{intro}{emphasize,index style=introindexstyle}
\knowledgestyle{intro unknown}{emphasize}
\knowledgestyle{intro unknown cont}{emphasize}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/knowledge.tlpobj new/tlpkg/tlpobj/knowledge.tlpobj
--- old/tlpkg/tlpobj/knowledge.tlpobj 2019-02-28 03:46:00.000000000 +0100
+++ new/tlpkg/tlpobj/knowledge.tlpobj 2020-03-06 01:02:34.000000000 +0100
@@ -1,6 +1,6 @@
name knowledge
category Package
-revision 50031
+revision 54121
shortdesc Displaying, hyperlinking, and indexing notions in a document
relocated 1
longdesc The package offers a systematic way to handle
@@ -8,12 +8,11 @@
longdesc an index. In combination with hyperref it makes it easy to have
longdesc every reference of a concept linked to its introduction. It
longdesc also offers simple notations.
-runfiles size=29
+runfiles size=32
RELOC/tex/latex/knowledge/knowledge.sty
catalogue-contact-home https://www.irif.fr/~colcombe/knowledge_en.html
catalogue-contact-repository https://www.irif.fr/~colcombe/Knowledge/
catalogue-ctan /macros/latex/contrib/knowledge
-catalogue-date 2019-02-15 19:38:03 +0100
catalogue-license lppl1.2
-catalogue-topics index label-ref
-catalogue-version 1.16
+catalogue-topics index label-ref expl3
+catalogue-version 1.22
++++++ koma-script.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/koma-script.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/koma-script.tar.xz differ: char 26, line 1
++++++ kotex-oblivoir.doc.tar.xz ++++++
++++ 7022 lines of diff (skipped)
++++++ kotex-oblivoir.tar.xz ++++++
++++ 7852 lines of diff (skipped)
++++++ kpathsea.doc.tar.xz ++++++
++++ 2810 lines of diff (skipped)
++++++ kpathsea.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/web2c/fmtutil.cnf new/texmf-dist/web2c/fmtutil.cnf
--- old/texmf-dist/web2c/fmtutil.cnf 2019-03-23 02:25:33.000000000 +0100
+++ new/texmf-dist/web2c/fmtutil.cnf 2020-04-16 01:56:36.000000000 +0200
@@ -1,27 +1,29 @@
-# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sat Mar 23 02:25:32 2019
-# $Id: fmtutil-hdr.cnf 37176 2015-05-04 02:06:19Z preining $
+# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Thu Apr 16 01:56:35 2020
+# $Id: fmtutil-hdr.cnf 53804 2020-02-16 17:57:32Z karl $
# Originally written by Thomas Esser, 1998. Public domain.
#
-# As of TeX Live 2015, fmtutil reads *all* fmtutil.cnf files found.
-# Consequently, any manual edits of this file (fmtutil.cnf in the
-# TEXMFDIST tree) will be lost on update. So don't do that.
-#
-# For guidance on how to achieve local configurations, see the man
+# For guidance on how to support local formats, see the man
# page of fmtutil, or the output of fmtutil --help.
+#
+# any manual edits of this file (fmtutil.cnf in the TEXMFDIST tree) will
+# be lost on update. So don't do that.
#
# The format of the table is:
#
# format engine pattern-file arguments
+# Either spaces or tabs can be used as separators.
#
-# The last "argument" must be the name of the file on which to run
-# the ini-engine (such as initex). If the ini-engine is e-TeX, and the
-# e-TeX extensions should be enabled, the filename must be prefixed with
-# a * character; this is essentially equivalent to the -etex option.
+# The last "argument" must be the name of the file on which to run the
+# engine (e.g., initex). If the ini-engine is e-TeX (or compatible), and
+# the e-TeX extensions need to be enabled explicitly, the filename must
+# be prefixed with a * character; this is essentially equivalent to the
+# -etex option. (So don't use it if the engine doesn't support -etex.)
#
-# fmtutil always passes the -ini option to the engine.
+# The purpose of the pattern-file is to support fmtutil's --byhyphen
+# option. It is not included in the command line to rebuild the format.
# If no pattern-file is desired, use -.
-# Either spaces or tabs can be used as separators.
-#
+# fmtutil always passes the -ini option to the engine.
+#
# Other notes:
# 1) tex and amstex just load hyphen.tex. No customization.
# You can have your own customized (via babel's hyphen.cfg)
@@ -35,7 +37,9 @@
#
# 4) usual comments start with "# ", whereas disabled configurations
# start with "#! " in this file.
-
+#
+# 5) The entries in the main TeX Live fmtutil.cnf are created from the
+# AddFormat directives in (ultimately) the *.tlpsrc files. Don't edit here.
#
# from aleph:
aleph aleph - *aleph.ini
@@ -58,10 +62,10 @@
#
# from csplain:
csplain pdftex - -etex -enc csplain-utf8.ini
-pdfcsplain pdftex - -etex -enc csplain-utf8.ini
luacsplain luatex - -etex csplain.ini
-pdfcsplain xetex - -etex csplain.ini
pdfcsplain luatex - -etex csplain.ini
+pdfcsplain pdftex - -etex -enc csplain-utf8.ini
+pdfcsplain xetex - -etex csplain.ini
#
# from eplain:
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
@@ -71,19 +75,30 @@
pdfjadetex pdftex language.dat *pdfjadetex.ini
#
# from latex-bin:
+dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
+lualatex luahbtex language.dat,language.dat.lua lualatex.ini
pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
-dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
-lualatex luatex language.dat,language.dat.lua lualatex.ini
-#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
+#
+# from latex-bin-dev:
+dvilualatex-dev luatex language.dat,language.dat.lua dvilualatex.ini
+latex-dev pdftex language.dat -translate-file=cp227.tcx *latex.ini
+lualatex-dev luahbtex language.dat,language.dat.lua lualatex.ini
+pdflatex-dev pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
#
# from lollipop:
lollipop tex - lollipop.ini
#
+# from luahbtex:
+luahbtex luahbtex language.def,language.dat.lua luatex.ini
+#
+# from luajittex:
+luajithbtex luajithbtex language.def,language.dat.lua luatex.ini
+luajittex luajittex language.def,language.dat.lua luatex.ini
+#
# from luatex:
-luatex luatex language.def,language.dat.lua luatex.ini
dviluatex luatex language.def,language.dat.lua dviluatex.ini
-luajittex luajittex language.def,language.dat.lua luatex.ini
+luatex luatex language.def,language.dat.lua luatex.ini
#
# from metafont:
mf mf-nowin - -translate-file=cp227.tcx mf.ini
@@ -103,17 +118,21 @@
# from mptopdf:
mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
#
+# from optex:
+optex luatex hyphen-lan.opm optex.ini
+#
# from pdftex:
-pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
etex pdftex language.def -translate-file=cp227.tcx *etex.ini
pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
#
# from platex:
platex eptex language.dat *platex.ini
+platex-dev eptex language.dat *platex.ini
#
# from ptex:
-ptex ptex - ptex.ini
eptex eptex language.def *eptex.ini
+ptex ptex - ptex.ini
#
# from tex:
tex tex - tex.ini
@@ -123,15 +142,19 @@
#
# from uplatex:
uplatex euptex language.dat *uplatex.ini
+uplatex-dev euptex language.dat *uplatex.ini
#
# from uptex:
-uptex uptex - uptex.ini
euptex euptex language.def *euptex.ini
+uptex uptex - uptex.ini
+#
+# from xelatex-dev:
+xelatex-dev xetex language.dat -etex xelatex.ini
#
# from xetex:
-xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
+xetex xetex language.def -etex xetex.ini
#
# from xmltex:
-xmltex pdftex language.dat *xmltex.ini
pdfxmltex pdftex language.dat *pdfxmltex.ini
+xmltex pdftex language.dat *xmltex.ini
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/web2c/texmf.cnf new/texmf-dist/web2c/texmf.cnf
--- old/texmf-dist/web2c/texmf.cnf 2019-03-25 23:15:36.000000000 +0100
+++ new/texmf-dist/web2c/texmf.cnf 2020-03-01 23:41:34.000000000 +0100
@@ -4,8 +4,9 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2018/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2018/texmf.cnf.
+% installed in /some/path/to/texlive/2020/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2020/texmf.cnf.
+% (Below, we use YYYY in place of the specific year.)
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -83,10 +84,10 @@
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2019/texmf-var
+TEXMFVAR = ~/.texlive2020/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2019/texmf-config
+TEXMFCONFIG = ~/.texlive2020/texmf-config
% This is the value manipulated by tlmgr's auxtrees subcommand in the
% root texmf.cnf. Kpathsea warns about a literally empty string for a
@@ -167,90 +168,111 @@
% formats, past or present. Not all of them are built these days.
% Plain TeX. Have the command tex check all directories as a last
-% resort, we may have plain-compatible stuff anywhere.
-TEXINPUTS.tex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+% resort, we may have plain-compatible stuff anywhere. Prefer
+% latex/ to latex-dev/, implying that we have to add a latex, element to
+% every TEXINPUTS tree that recursively searches $TEXMF/tex//, which is
+% all of them except ConTeXt.
+TEXINPUTS.tex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
% Fontinst needs to read afm files.
TEXINPUTS.fontinst = $TEXMFDOTDIR;$TEXMF/{tex,fonts/afm}//
% Other plain-based formats.
-TEXINPUTS.amstex = $TEXMFDOTDIR;$TEXMF/tex/{amstex,plain,generic,}//
-TEXINPUTS.csplain = $TEXMFDOTDIR;$TEXMF/tex/{csplain,plain,generic,}//
-TEXINPUTS.eplain = $TEXMFDOTDIR;$TEXMF/tex/{eplain,plain,generic,}//
-TEXINPUTS.ftex = $TEXMFDOTDIR;$TEXMF/tex/{formate,plain,generic,}//
-TEXINPUTS.mex = $TEXMFDOTDIR;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.texinfo = $TEXMFDOTDIR;$TEXMF/tex/{texinfo,plain,generic,}//
+TEXINPUTS.amstex = $TEXMFDOTDIR;$TEXMF/tex/{amstex,plain,generic,latex,}//
+TEXINPUTS.csplain = $TEXMFDOTDIR;$TEXMF/tex/{csplain,plain,generic,latex,}//
+TEXINPUTS.eplain = $TEXMFDOTDIR;$TEXMF/tex/{eplain,plain,generic,latex,}//
+TEXINPUTS.ftex = $TEXMFDOTDIR;$TEXMF/tex/{formate,plain,generic,latex,}//
+TEXINPUTS.mex = $TEXMFDOTDIR;$TEXMF/tex/{mex,plain,generic,latex,}//
+TEXINPUTS.texinfo = $TEXMFDOTDIR;$TEXMF/tex/{texinfo,plain,generic,latex,}//
-% LaTeX 2e specific macros are stored in latex/, macros that can only be
+% LaTeX2e specific macros are stored in latex/, macros that can only be
% used with 2.09 in latex209/. In addition, we look in the directory
% latex209, useful for macros that were written for 2.09 and do not
-% mention 2e at all, but can be used with 2e.
+% mention 2e at all, but can be used with 2e. The latex-dev/ subtree
+% may contain release candidates for testing.
TEXINPUTS.cslatex = $TEXMFDOTDIR;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
TEXINPUTS.latex = $TEXMFDOTDIR;$TEXMF/tex/{latex,generic,}//
+TEXINPUTS.latex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,latex,generic,}//
TEXINPUTS.latex209 = $TEXMFDOTDIR;$TEXMF/tex/{latex209,generic,latex,}//
TEXINPUTS.olatex = $TEXMFDOTDIR;$TEXMF/tex/{latex,generic,}//
% MLTeX.
TEXINPUTS.frlatex = $TEXMFDOTDIR;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frtex = $TEXMFDOTDIR;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.frtex = $TEXMFDOTDIR;$TEXMF/tex/{french,plain,generic,latex,}//
TEXINPUTS.mllatex = $TEXMFDOTDIR;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.mltex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.mltex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
% e-TeX.
TEXINPUTS.elatex = $TEXMFDOTDIR;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.etex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.etex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
% pdfTeX.
TEXINPUTS.pdfcslatex = $TEXMFDOTDIR;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
-TEXINPUTS.pdfcsplain = $TEXMFDOTDIR;$TEXMF/tex/{csplain,plain,generic,}//
+TEXINPUTS.pdfcsplain = $TEXMFDOTDIR;$TEXMF/tex/{csplain,plain,generic,latex,}//
TEXINPUTS.pdflatex = $TEXMFDOTDIR;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfmex = $TEXMFDOTDIR;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.utf8mex = $TEXMFDOTDIR;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdftex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdftexinfo = $TEXMFDOTDIR;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.pdfamstex = $TEXMFDOTDIR;$TEXMF/tex/{amstex,plain,generic,}//
+TEXINPUTS.pdflatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,latex,generic,}//
+TEXINPUTS.pdfmex = $TEXMFDOTDIR;$TEXMF/tex/{mex,plain,generic,latex,}//
+TEXINPUTS.utf8mex = $TEXMFDOTDIR;$TEXMF/tex/{mex,plain,generic,latex,}//
+TEXINPUTS.pdftex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
+TEXINPUTS.pdftexinfo = $TEXMFDOTDIR;$TEXMF/tex/{texinfo,plain,generic,latex,}//
+TEXINPUTS.pdfamstex = $TEXMFDOTDIR;$TEXMF/tex/{amstex,plain,generic,latex,}//
% pdfeTeX.
TEXINPUTS.pdfelatex = $TEXMFDOTDIR;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfetex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfetex = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
% LuaTeX.
-TEXINPUTS.luatex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.luajittex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.dviluatex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.lualatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luajitlatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dvilualatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luatex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,latex,}//
+TEXINPUTS.luajittex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,latex,}//
+TEXINPUTS.luahbtex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,latex,}//
+TEXINPUTS.luajithbtex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,latex,}//
+TEXINPUTS.dviluatex = $TEXMFDOTDIR;$TEXMF/tex/{luatex,plain,generic,latex,}//
+TEXINPUTS.lualatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.lualatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,lualatex,latex,luatex,generic,}//
+TEXINPUTS.luajitlatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luahblatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luahblatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,lualatex,latex,luatex,generic,}//
+TEXINPUTS.luajithblatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.dvilualatex = $TEXMFDOTDIR;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.dvilualatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,lualatex,latex,luatex,generic,}//
+
+% HarfTeX.
+TEXINPUTS.harftex = $TEXMFDOTDIR;$TEXMF/tex/{harftex,luatex,plain,generic,latex,}//
+TEXINPUTS.harflatex = $TEXMFDOTDIR;$TEXMF/tex/{harflatex,harftex,lualatex,latex,luatex,generic,}//
+TEXINPUTS.harflatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,harflatex,harftex,lualatex,latex,luatex,generic,}//
% XeTeX.
TEXINPUTS.xelatex = $TEXMFDOTDIR;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
-TEXINPUTS.xeplain = $TEXMFDOTDIR;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
-TEXINPUTS.xetex = $TEXMFDOTDIR;$TEXMF/tex/{xetex,plain,generic,}//
+TEXINPUTS.xelatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,xelatex,latex,xetex,generic,}//
+TEXINPUTS.xeplain = $TEXMFDOTDIR;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,latex,}//
+TEXINPUTS.xetex = $TEXMFDOTDIR;$TEXMF/tex/{xetex,plain,generic,latex,}//
% Omega / Aleph.
-TEXINPUTS.aleph = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.aleph = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
TEXINPUTS.elambda = $TEXMFDOTDIR;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.eomega = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
TEXINPUTS.lambda = $TEXMFDOTDIR;$TEXMF/tex/{lambda,latex,generic,}//
TEXINPUTS.lamed = $TEXMFDOTDIR;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.omega = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.omega = $TEXMFDOTDIR;$TEXMF/tex/{plain,generic,latex,}//
% p(La)TeX.
-TEXINPUTS.ptex = $TEXMFDOTDIR;$TEXMF/tex/{ptex,plain,generic,}//
+TEXINPUTS.ptex = $TEXMFDOTDIR;$TEXMF/tex/{ptex,plain,generic,latex,}//
TEXINPUTS.platex = $TEXMFDOTDIR;$TEXMF/tex/{platex,latex,generic,}//
+TEXINPUTS.platex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,platex,latex,generic,}//
-% epTeX, and for pmpost.
-TEXINPUTS.eptex = $TEXMFDOTDIR;$TEXMF/tex/{ptex,plain,generic,}//
+% epTeX, and use that engine for pmpost.
+TEXINPUTS.eptex = $TEXMFDOTDIR;$TEXMF/tex/{ptex,plain,generic,latex,}//
TEX.pmpost = eptex
% p(La)TeX-ng
-TEXINPUTS.ptex-ng = $TEXMFDOTDIR;$TEXMF/tex/{uptex,ptex,plain,generic,}//
+TEXINPUTS.ptex-ng = $TEXMFDOTDIR;$TEXMF/tex/{uptex,ptex,plain,generic,latex,}//
TEXINPUTS.platex-ng = $TEXMFDOTDIR;$TEXMF/tex/{uplatex,platex,latex,generic,}//
% (e)up(La)TeX, and for upmpost
-TEXINPUTS.uplatex = $TEXMFDOTDIR;$TEXMF/tex/{uplatex,platex,latex,generic,}//
-TEXINPUTS.uptex = $TEXMFDOTDIR;$TEXMF/tex/{uptex,ptex,plain,generic,}//
-TEXINPUTS.euptex = $TEXMFDOTDIR;$TEXMF/tex/{uptex,ptex,plain,generic,}//
+TEXINPUTS.uplatex = $TEXMFDOTDIR;$TEXMF/tex/{uplatex,platex,latex,generic,}//
+TEXINPUTS.uplatex-dev = $TEXMFDOTDIR;$TEXMF/tex/{latex-dev,uplatex,platex,latex,generic,}//
+TEXINPUTS.uptex = $TEXMFDOTDIR;$TEXMF/tex/{uptex,ptex,plain,generic,latex,}//
+TEXINPUTS.euptex = $TEXMFDOTDIR;$TEXMF/tex/{uptex,ptex,plain,generic,latex,}//
TEX.upmpost = euptex
% pBibTeX bibliographies and style files.
@@ -265,21 +287,21 @@
TEXINPUTS.context = $TEXMFDOTDIR;$TEXMF/tex/{context,plain,generic,}//
% jadetex.
-TEXINPUTS.jadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,}//
-TEXINPUTS.pdfjadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,}//
+TEXINPUTS.jadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
+TEXINPUTS.pdfjadetex = $TEXMFDOTDIR;$TEXMF/tex/{jadetex,latex,generic,latex,}//
% XMLTeX.
TEXINPUTS.xmltex = $TEXMFDOTDIR;$TEXMF/tex/{xmltex,latex,generic,}//
TEXINPUTS.pdfxmltex = $TEXMFDOTDIR;$TEXMF/tex/{xmltex,latex,generic,}//
% Miscellany, no longer built.
-TEXINPUTS.lamstex = $TEXMFDOTDIR;$TEXMF/tex/{lamstex,plain,generic,}//
-TEXINPUTS.lollipop = $TEXMFDOTDIR;$TEXMF/tex/{lollipop,plain,generic,}//
+TEXINPUTS.lamstex = $TEXMFDOTDIR;$TEXMF/tex/{lamstex,plain,generic,latex,}//
+TEXINPUTS.lollipop = $TEXMFDOTDIR;$TEXMF/tex/{lollipop,plain,generic,latex,}//
TEXINPUTS.frpdflatex = $TEXMFDOTDIR;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex = $TEXMFDOTDIR;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.frpdftex = $TEXMFDOTDIR;$TEXMF/tex/{french,plain,generic,latex,}//
% Earlier entries override later ones, so put this generic one last.
-TEXINPUTS = $TEXMFDOTDIR;$TEXMF/tex/{$progname,generic,}//
+TEXINPUTS = $TEXMFDOTDIR;$TEXMF/tex/{$progname,generic,latex,}//
% ttf2tfm.
TTF2TFMINPUTS = $TEXMFDOTDIR;$TEXMF/ttf2pk//
@@ -469,14 +491,24 @@
% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
% default expansion of TEXINPUTS will not happen and .lua files under
-% the /tex/ will not be found.
+% the /tex/ tree will not be found.
%
% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
% The default LUAINPUTS suffices for luatex and dviluatex.
%
-LUAINPUTS.lualatex = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS.dvilualatex = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
+LUAINPUTS.lualatex = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+LUAINPUTS.lualatex-dev = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{latex-dev,lualatex,latex,luatex,generic,}//
+%
+LUAINPUTS.luahblatex = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luahblatex,luahbtex,lualatex,latex,luatex,generic,}//
+LUAINPUTS.luahblatex-dev = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{latex-dev,luahblatex,luahbtex,lualatex,latex,luatex,generic,}//
+%
+LUAINPUTS.dvilualatex = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+LUAINPUTS.dvilualatex-dev = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{latex-dev,lualatex,latex,luatex,generic,}//
+%
+LUAINPUTS.harflatex = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{harflatex,harftex,lualatex,latex,luatex,generic,}//
+LUAINPUTS.harflatex-dev = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{latex-dev,harflatex,harftex,lualatex,latex,luatex,generic,}//
+%
+LUAINPUTS = $TEXMFDOTDIR;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,latex,}//
% Lua needs to look for binary lua libraries distributed with packages.
CLUAINPUTS = $TEXMFDOTDIR;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
@@ -664,6 +696,12 @@
parse_first_line.tex = f
parse_first_line.initex = f
+% Normally we mention files created by \openout in the log file,
+% but again, trip-compatibility forbids this for (ini)tex.
+log_openout = t
+log_openout.tex = f
+log_openout.initex = f
+
% Control file:line:error style messages.
file_line_error_style = f
@@ -820,13 +858,13 @@
screen_depth.mf = 1200
% BibTeX only (max_strings also determines hash_size and hash_prime).
-ent_str_size = 250
-glob_str_size = 20000
-max_strings.bibtex = 100000
-max_strings.bibtex8 = 100000
-max_strings.bibtexu = 100000
-max_strings.pbibtex = 100000
-max_strings.upbibtex = 100000
+ent_str_size = 500
+glob_str_size = 200000
+max_strings.bibtex = 200000
+max_strings.bibtex8 = 200000
+max_strings.bibtexu = 200000
+max_strings.pbibtex = 200000
+max_strings.upbibtex= 200000
% GFtype only.
line_length.gftype = 500
@@ -836,3 +874,23 @@
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
% Default is 1, to guess. Used on Windows only.
guess_input_kanji_encoding = 1
+
+% command_line_encoding
+%
+% This variable is used on Windows only, and affects 4 TeX engines:
+% uptex, euptex, pdftex, xetex, and 2 drivers: dvips, [x]dvipdfmx.
+% Several applications also are affected by the variable:
+% dvi2tty.exe, disdvi.exe, dvibook.exe, dviconcat.exe, dviselect.exe,
+% dvitodvi.exe, and dvidvi.exe.
+% Only values utf8 or utf-8 are meaningful. Other values are simply
+% ignored. If file names in sources and DVI or XDV files are ASCII
+% only, the value of command_line_encoding is irrelevant.
+% If command_line_encoding = utf8 or command_line_encoding = utf-8,
+% file names in sources and DVI or XDV files are assumed to be UTF-8.
+% Default is utf-8, from 2019-07-24, to assume UTF-8 file names.
+% In order to switch off the function, define an environment variable:
+% set command_line_encoding=none
+% or write a line:
+% command_line_encoding = none
+% in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf.
+command_line_encoding = utf-8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kpathsea.tlpobj new/tlpkg/tlpobj/kpathsea.tlpobj
--- old/tlpkg/tlpobj/kpathsea.tlpobj 2019-04-01 02:25:00.000000000 +0200
+++ new/tlpkg/tlpobj/kpathsea.tlpobj 2020-04-17 01:55:26.000000000 +0200
@@ -1,6 +1,6 @@
name kpathsea
category TLCore
-revision 50660
+revision 54764
shortdesc Path searching library for TeX-related files
longdesc Kpathsea is a library and utility programs which provide path
longdesc searching facilities for TeX file types, including the
@@ -9,7 +9,7 @@
longdesc distributed separately, but rather is released and maintained
longdesc as part of the TeX live sources.
depend kpathsea.ARCH
-runfiles size=51
+runfiles size=52
texmf-dist/web2c/amiga-pl.tcx
texmf-dist/web2c/cp1250cs.tcx
texmf-dist/web2c/cp1250pl.tcx
@@ -44,6 +44,5 @@
catalogue-contact-home http://tug.org/kpathsea
catalogue-contact-repository http://tug.org/svn/texlive/trunk/Build/source/texk/kpathsea/
catalogue-contact-support http://lists.tug.org/tex-k
-catalogue-date 2019-01-05 09:54:55 +0100
catalogue-license lgpl2.1
catalogue-topics sys-supp
++++++ kpathsea_cnf.dif ++++++
--- /var/tmp/diff_new_pack.RrmME5/_old 2020-05-29 21:29:18.881209925 +0200
+++ /var/tmp/diff_new_pack.RrmME5/_new 2020-05-29 21:29:18.881209925 +0200
@@ -1,12 +1,12 @@
---
texmf-dist/web2c/fmtutil.cnf | 17 ++---
texmf-dist/web2c/mktex.opt | 39 +++++++++--
- texmf-dist/web2c/texmf.cnf | 140 +++++++++++++++++++++++++++----------------
- 3 files changed, 127 insertions(+), 69 deletions(-)
+ texmf-dist/web2c/texmf.cnf | 141 +++++++++++++++++++++++++++----------------
+ 3 files changed, 128 insertions(+), 69 deletions(-)
--- texmf-dist/web2c/fmtutil.cnf
-+++ texmf-dist/web2c/fmtutil.cnf 2015-03-30 10:44:48.993518643 +0000
-@@ -47,10 +47,11 @@ amstex pdftex - -translate-file=cp227.tc
++++ texmf-dist/web2c/fmtutil.cnf 2020-04-20 16:19:39.729909034 +0000
+@@ -51,10 +51,11 @@ amstex pdftex - -translate-file=cp227.tc
# from context:
cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
cont-en xetex cont-usr.tex -8bit *cont-en.mkii
@@ -22,7 +22,7 @@
#
# from cslatex:
cslatex pdftex - -etex cslatex.ini
-@@ -67,8 +68,8 @@ pdfcsplain luatex - -etex csplain.ini
+@@ -71,8 +72,8 @@ pdfcsplain xetex - -etex csplain.ini
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
#
# from jadetex:
@@ -32,15 +32,15 @@
+pdfjadetex pdftex language.dat -translate-file=cp227.tcx *pdfjadetex.ini
#
# from latex-bin:
- latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-@@ -133,5 +134,5 @@ xetex xetex language.def -etex xetex.ini
- xelatex xetex language.dat -etex xelatex.ini
+ dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
+@@ -156,5 +157,5 @@ xelatex xetex language.dat -etex xelatex
+ xetex xetex language.def -etex xetex.ini
#
# from xmltex:
--xmltex pdftex language.dat *xmltex.ini
-pdfxmltex pdftex language.dat *pdfxmltex.ini
-+xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
+-xmltex pdftex language.dat *xmltex.ini
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
++xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
--- texmf-dist/web2c/mktex.opt
+++ texmf-dist/web2c/mktex.opt 2012-05-14 11:26:00.034911495 +0000
@@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':';
@@ -120,8 +120,8 @@
# Cache values that may be useful for recursive calls.
export MT_MKTEX_OPT MT_MKTEX_CNF
--- texmf-dist/web2c/texmf.cnf
-+++ texmf-dist/web2c/texmf.cnf 2019-05-29 06:12:28.489081219 +0000
-@@ -61,20 +61,20 @@
++++ texmf-dist/web2c/texmf.cnf 2020-03-26 11:28:55.266623482 +0000
+@@ -62,20 +62,20 @@
TEXMFROOT = $SELFAUTOPARENT
% The main tree of distributed packages and programs:
@@ -146,20 +146,20 @@
% Per-user texmf tree(s) -- organized per the TDS, as usual. To define
% more than one per-user tree, set this to a list of directories in
-@@ -83,10 +83,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
+@@ -84,10 +84,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
--TEXMFVAR = ~/.texlive2019/texmf-var
+-TEXMFVAR = ~/.texlive2020/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
--TEXMFCONFIG = ~/.texlive2019/texmf-config
+-TEXMFCONFIG = ~/.texlive2020/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% This is the value manipulated by tlmgr's auxtrees subcommand in the
% root texmf.cnf. Kpathsea warns about a literally empty string for a
-@@ -107,7 +107,7 @@ TEXMFAUXTREES = {}
+@@ -108,7 +108,7 @@ TEXMFAUXTREES = {}
% The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
% ever defined (the 99% common case), no extra elements will be added to
% the search paths. tlmgr takes care to end any value with a trailing comma.
@@ -168,7 +168,7 @@
% Where to look for, and where mktexlsr creates, ls-R files. By default,
% this is all and only the !! elements of TEXMF, so that mktexlsr does not
-@@ -115,24 +115,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX
+@@ -116,24 +116,23 @@ TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEX
% present, it will be used, and the disk will not (usually) be searched,
% regardless of !!. Although in principle a directory listed here need
% not contain an ls-R file, in practice they all should.
@@ -196,7 +196,7 @@
% On some systems, there will be a system tree which contains all the font
% files that may be created as well as the formats. For example
-@@ -143,7 +142,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
+@@ -144,7 +143,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
%
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
% one of the TEXMF directories (avoids overlapping ls-R files).
@@ -206,7 +206,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables.
-@@ -151,7 +151,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
+@@ -152,7 +152,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% WEB2C is for Web2C specific files. The current directory may not be
% a good place to look for them.
@@ -215,7 +215,7 @@
% This variable exists only to be redefined; it is used in nearly all
% search paths. If a document has source files not only in the current
-@@ -285,7 +285,7 @@ TEXINPUTS = $TEXMFDOTDIR;$
+@@ -307,7 +307,7 @@ TEXINPUTS = $TEXMFDOTDIR;$
TTF2TFMINPUTS = $TEXMFDOTDIR;$TEXMF/ttf2pk//
% Metafont, MetaPost inputs.
@@ -224,7 +224,7 @@
MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost//
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-@@ -295,31 +295,31 @@ MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost/
+@@ -317,31 +317,31 @@ MPINPUTS = $TEXMFDOTDIR;$TEXMF/metapost/
% We repeat the same definition three times because of the way fmtutil
% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
% will not be found.
@@ -263,7 +263,7 @@
% Similarly for the GF format, which only remains in existence because
% Metafont outputs it (and MF isn't going to change).
-@@ -415,8 +415,8 @@ MPSUPPORT = $TEXMFDOTDIR;$TEXMF/metapost
+@@ -437,8 +437,8 @@ MPSUPPORT = $TEXMFDOTDIR;$TEXMF/metapost
% For xdvi to find mime.types and .mailcap, if they do not exist in
% ~. These are single directories, not paths.
% (But the default mime.types, at least, may well suffice.)
@@ -274,7 +274,7 @@
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
-@@ -440,10 +440,10 @@ WEBINPUTS = $TEXMFDOTDIR;$TEXMF/web//
+@@ -462,10 +462,10 @@ WEBINPUTS = $TEXMFDOTDIR;$TEXMF/web//
CWEBINPUTS = $TEXMFDOTDIR;$TEXMF/cweb//
% Omega-related fonts and other files.
@@ -289,7 +289,7 @@
OTPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/otp//
OCPINPUTS = $TEXMFDOTDIR;$TEXMF/omega/ocp//
-@@ -526,32 +526,38 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scrip
+@@ -558,32 +558,38 @@ RUBYINPUTS = $TEXMFDOTDIR;$TEXMF/scrip
% explicitly list every directory. Arguably more understandable anyway.
%
TEXMFCNF = {\
@@ -353,10 +353,10 @@
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-@@ -836,3 +842,33 @@ max_cols.gftype = 8191
- % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
- % Default is 1, to guess. Used on Windows only.
- guess_input_kanji_encoding = 1
+@@ -894,3 +900,34 @@ guess_input_kanji_encoding = 1
+ % command_line_encoding = none
+ % in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf.
+ command_line_encoding = utf-8
+
+% These are xmltex specific
+main_memory.xmltex = 1500000
@@ -387,3 +387,4 @@
+hash_extra.jadetex = 25000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
++
++++++ kvmap.doc.tar.xz ++++++
Binary files old/doc/latex/kvmap/kvmap.pdf and new/doc/latex/kvmap/kvmap.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kvmap.doc.tlpobj new/tlpkg/tlpobj/kvmap.doc.tlpobj
--- old/tlpkg/tlpobj/kvmap.doc.tlpobj 2019-02-28 03:46:51.000000000 +0100
+++ new/tlpkg/tlpobj/kvmap.doc.tlpobj 2020-03-28 01:55:12.000000000 +0100
@@ -1,8 +1,8 @@
name kvmap.doc
category Package
-revision 48708
+revision 54585
shortdesc doc files of kvmap
relocated 1
-docfiles size=29
+docfiles size=28
RELOC/doc/latex/kvmap/README.md
RELOC/doc/latex/kvmap/kvmap.pdf
++++++ kvmap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/kvmap/kvmap.sty new/tex/latex/kvmap/kvmap.sty
--- old/tex/latex/kvmap/kvmap.sty 2018-09-20 23:16:51.000000000 +0200
+++ new/tex/latex/kvmap/kvmap.sty 2020-03-27 22:13:10.000000000 +0100
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% kvmap.dtx (with options: `pkg,cfg')
-%% Copyright (C) 2018 Ben Frank
+%% Copyright (C) 2020 Ben Frank
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%%
\RequirePackage{expl3}
-\ProvidesExplPackage{kvmap}{2018/09/20}{0.3.1}{Drawing karnaugh maps with LaTeX}
+\ProvidesExplPackage{kvmap}{2020/03/27}{0.3.3}{Drawing karnaugh maps with LaTeX}
\RequirePackage{xparse}
\RequirePackage{tikz}
\RequirePackage{environ}
@@ -71,7 +71,7 @@
\cs_new:Npn \__kvmap_outputmatrix:n #1
{
\int_zero:N \l_tmpa_int
-\seq_set_from_clist:Nn \l_tmpa_seq { #1 }
+\seq_set_split:Nnn \l_tmpa_seq { , } { #1 }
\seq_map_inline:Nn \l_tmpa_seq
{
\node[kvnode] ~
@@ -94,6 +94,12 @@
invert .bool_set:N = \l__kvmap_bundle_invert_bool,
invert .default:n = true,
invert .initial:n = false,
+vinvert .bool_set:N = \l__kvmap_bundle_vinvert_bool,
+vinvert .default:n = true,
+vinvert .initial:n = true,
+hinvert .bool_set:N = \l__kvmap_bundle_hinvert_bool,
+hinvert .default:n = true,
+hinvert .initial:n = true,
overlapmargins .dim_set:N = \l__kvmap_bundle_overlapmargins_dim,
overlapmargins .initial:n = { 0pt },
}
@@ -116,6 +122,7 @@
{
\int_compare_p:n { \l__kvmap_matrix_height_int - 1 = \l__kvmap_bundle_maxy_int }
&& \int_compare_p:n { 0 = \l__kvmap_bundle_miny_int }
+ && \l__kvmap_bundle_vinvert_bool
}
{
\draw[draw=\l__kvmap_bundle_color_tl,kvbundle] ~
@@ -157,6 +164,7 @@
{
\int_compare_p:n { \l__kvmap_matrix_width_int - 1 = \l__kvmap_bundle_maxx_int }
&& \int_compare_p:n { 0 = \l__kvmap_bundle_minx_int }
+ && \l__kvmap_bundle_hinvert_bool
}
{
\draw[draw=\l__kvmap_bundle_color_tl,kvbundle] ~
@@ -266,7 +274,6 @@
\seq_set_split:Nno \l_tmpa_seq { \\ } { \BODY }
\seq_remove_all:Nn \l_tmpa_seq { }
\seq_set_split:Nnx \l_tmpb_seq { & } { \seq_item:Nn \l_tmpa_seq { 1 } }
-\seq_remove_all:Nn \l_tmpb_seq { }
\int_gset:Nn \l__kvmap_matrix_width_int { \seq_count:N \l_tmpb_seq }
\int_gset:Nn \l__kvmap_matrix_height_int { \seq_count:N \l_tmpa_seq }
\seq_clear:N \l__kvmap_tmp_seq
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/kvmap.tlpobj new/tlpkg/tlpobj/kvmap.tlpobj
--- old/tlpkg/tlpobj/kvmap.tlpobj 2019-02-28 03:46:51.000000000 +0100
+++ new/tlpkg/tlpobj/kvmap.tlpobj 2020-03-28 01:55:12.000000000 +0100
@@ -1,6 +1,6 @@
name kvmap
category Package
-revision 48708
+revision 54585
shortdesc Create Karnaugh maps with LaTeX
relocated 1
longdesc This LaTeX package allows the creation of (even large) Karnaugh
@@ -13,7 +13,6 @@
catalogue-contact-bugs https://gitlab.com/benfrank/kvmap/issues
catalogue-contact-home https://gitlab.com/benfrank/kvmap
catalogue-ctan /macros/latex/contrib/kvmap
-catalogue-date 2018-09-22 04:58:35 +0200
catalogue-license lppl1.3c
catalogue-topics maths engineering
-catalogue-version 0.3.1
+catalogue-version 0.3.3
++++++ l3build.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/l3build/CHANGELOG.md new/texmf-dist/doc/latex/l3build/CHANGELOG.md
--- old/texmf-dist/doc/latex/l3build/CHANGELOG.md 2019-02-10 23:47:49.000000000 +0100
+++ new/texmf-dist/doc/latex/l3build/CHANGELOG.md 2020-03-25 22:10:32.000000000 +0100
@@ -7,6 +7,221 @@
## [Unreleased]
+## [2020-03-25]
+
+### Changed
+- Exclude `sourcefiles` entries from file clean-up
+- Adjust defaults for TeX Live 2020 LuaHBTeX usage
+
+## [2020-03-16]
+
+### Changed
+- Suppress PDF compression in DVI route
+- Suppress PDF ID data in DVI route
+- Default to `dvips` for (p)TeX
+- Refinement of `/ID` line suppression
+
+## [2020-03-13]
+
+### Changed
+- Refinement of PDF test normalisation
+
+## [2020-03-12]
+
+### Added
+- Option `ps2pdfopt`
+
+### Changed
+- Normalise `/ID` lines in PDF comparisons
+- Normalise `%%` lines in PDF comparisons
+
+### Fixed
+- Enable `cleandir()` recursively
+- Install files after *all* directory cleaning/creation
+
+## [2020-02-21]
+
+### Changed
+- Avoid temporary file when unpacking
+
+### Deprecated
+- `os_yes`: use `io.popen(...,w)` instead
+
+## [2020-02-17]
+
+### Added
+- Variable `textfiledir`
+- Table `specialtypesetting` and support data
+
+### Changed
+- Documentation improvements
+
+### Fixed
+- When `checkruns` > 1 and `recordstatus=true`, testing code would crash
+ (issue #90)
+
+## [2020-02-03]
+
+### Changed
+- Normalise out DVI header lines
+
+### Fixed
+- Allow announcement field to be empty
+ (with a warning this suppresses the CTAN announcement)
+
+## [2020-01-14]
+
+### Fixed
+
+- Allow for more extracted files from DocStrip
+
+## [2019-11-27]
+
+### Changed
+
+- `\ASSERTSTR` no longer needs e-TeX
+
+### Fixed
+
+- Installation of files using the `--full` switch
+
+## [2019-11-01]
+
+### Added
+
+- New `\ASSERT` and `\ASSERTSTR` functions (issue #102)
+
+### Changed
+
+- Avoid normalisation of (u)pTeX data when this is standard engine
+ (fixes #103)
+- Normalise Lua data references (#107)
+- Extend `runtest_task()` to pass run number
+- Allow `regression-test` to load when e-TeX is unavailable (fixes #105)
+
+### Fixed
+
+- Location of `testsuppdir` when multiple configurations are used
+
+## [2019-10-02]
+
+### Added
+
+- `docinit_hook()`
+
+### Changed
+
+- Normalise out file paths in all cases
+
+## [2019-09-30]
+
+### Added
+
+- New `flattentds` variable for controlling complex TDS structures
+- Additional notes on `texmfdir`
+
+### Fixed
+
+- Copy TDS files inside subdirectories (fixes #100)
+
+## [2019-09-29]
+
+### Fixed
+
+- Path searching if `texmfdir` is set but does not exist
+
+## [2019-09-28]
+
+### Fixed
+
+- Typesetting when using an isolated system (use of texmfdir)
+
+## [2019-09-25]
+
+### Added
+
+- New `texmfdir` variable for more complex local additions
+
+### Fixed
+
+- Clean out all configuration test dirs (see #98)
+
+## [2019-09-18]
+
+### Added
+
+- `checkinit_hook()`
+
+## [2019-09-14]
+
+### Changed
+
+- Use three typesetting runs as-standard
+- Use `pdftex` not `tex` for unpacking
+
+## [2019-08-24]
+
+### Changed
+
+- Include `LUAINPUTS` when setting `TEXINPUTS` for `checksearch = false`, etc.
+
+### Fixed
+
+- Remove `.log` file before each check run: prevent inter-engine confusion
+
+## [2019-07-31]
+
+### Fixed
+
+- Interaction between secondary files in some tests
+
+## [2019-07-30]
+
+### Added
+
+- Support for non-standard file layouts via `tdslocations` table
+
+### Changed
+
+- Only write (x)dvipdfmx specials for XeTeX and (u)pTeX (see #94)
+
+## [2019-06-27]
+
+### Changed
+
+- Back out change for normalisation of LuaTeX v1.10 stack information
+ (timing issue: will reintroduce later)
+
+### Fixed
+
+- Correct test for LuaTeX (see #93)
+
+## [2019-06-26]
+
+### Added
+
+- Support for HarfTeX (see #92)
+
+### Changed
+
+- Support for normalisation of LuaTeX v1.10 stack information
+ (may require new `.tlg` files)
+
+### Fixed
+
+- Support for spaces in paths when typesetting (see #91)
+
+## [2019-06-18]
+
+### Added
+
+- Switch `--show-log-on-error` for use with `--halt-on-error`. Results in the `.log` file
+ being show in full on the console to aid in non-interactive debugging.
+
+### Changed
+
+- Moved LuaTeX-specific font cache normalisation
+
## [2019-02-10]
### Fixed
@@ -251,7 +466,30 @@
- Rationalise short option names: removed `-d`, `-E`, `-r`
- Target `cmdcheck`: specific to LaTeX3 kernel work
-[Unreleased]: https://github.com/latex3/l3build/compare/2019-02-10...HEAD
+[Unreleased]: https://github.com/latex3/l3build/compare/2020-03-25...HEAD
+[2020-03-25]: https://github.com/latex3/l3build/compare/2020-03-16...2020-03-25
+[2020-03-16]: https://github.com/latex3/l3build/compare/2020-03-13...2020-03-16
+[2020-03-13]: https://github.com/latex3/l3build/compare/2020-03-12...2020-03-13
+[2020-03-12]: https://github.com/latex3/l3build/compare/2020-02-21...2020-03-12
+[2020-02-21]: https://github.com/latex3/l3build/compare/2020-02-17...2020-02-21
+[2020-02-17]: https://github.com/latex3/l3build/compare/2020-02-03...2020-02-17
+[2020-02-03]: https://github.com/latex3/l3build/compare/2020-01-14...2020-02-03
+[2020-01-14]: https://github.com/latex3/l3build/compare/2019-11-27...2020-01-14
+[2019-11-27]: https://github.com/latex3/l3build/compare/2019-11-01...2019-11-27
+[2019-11-01]: https://github.com/latex3/l3build/compare/2019-10-02...2019-11-01
+[2019-10-02]: https://github.com/latex3/l3build/compare/2019-09-30...2019-10-02
+[2019-09-30]: https://github.com/latex3/l3build/compare/2019-09-29...2019-09-30
+[2019-09-29]: https://github.com/latex3/l3build/compare/2019-09-28...2019-09-29
+[2019-09-28]: https://github.com/latex3/l3build/compare/2019-09-25...2019-09-28
+[2019-09-25]: https://github.com/latex3/l3build/compare/2019-09-18...2019-09-25
+[2019-09-18]: https://github.com/latex3/l3build/compare/2019-09-14...2019-09-18
+[2019-09-14]: https://github.com/latex3/l3build/compare/2019-08-24...2019-09-14
+[2019-08-24]: https://github.com/latex3/l3build/compare/2019-07-31...2019-08-24
+[2019-07-31]: https://github.com/latex3/l3build/compare/2019-07-30...2019-07-31
+[2019-07-30]: https://github.com/latex3/l3build/compare/2019-06-27...2019-07-30
+[2019-06-27]: https://github.com/latex3/l3build/compare/2019-06-26...2019-06-27
+[2019-06-26]: https://github.com/latex3/l3build/compare/2019-06-18...2019-06-26
+[2019-06-18]: https://github.com/latex3/l3build/compare/2019-02-10...2019-06-18
[2019-02-10]: https://github.com/latex3/l3build/compare/2019-02-06...2019-02-10
[2019-02-06]: https://github.com/latex3/l3build/compare/2018-12-23...2019-02-06
[2018-12-23]: https://github.com/latex3/l3build/compare/2018-12-18...2018-12-23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/l3build/README.md new/texmf-dist/doc/latex/l3build/README.md
--- old/texmf-dist/doc/latex/l3build/README.md 2019-02-10 23:47:49.000000000 +0100
+++ new/texmf-dist/doc/latex/l3build/README.md 2020-03-25 22:10:32.000000000 +0100
@@ -1,7 +1,7 @@
l3build: a testing and building system for LaTeX3
=================================================
-Release 2019-02-10
+Release 2020-03-25
Overview
--------
@@ -24,37 +24,13 @@
The issue tracker for LaTeX3 is currently located
[on GitHub](https://github.com/latex3/l3build/issues).
-The LaTeX3 Project
-------------------
+Development team
+----------------
-Development of LaTeX3 is carried out by
-[The LaTeX3 Project](http://www.latex-project.org/latex3.html). Currently,
-the team members are
-
-* Johannes Braams
-* David Carlisle
-* Robin Fairbairns
-* Morten Høgholm
-* Bruno Le Floch
-* Thomas Lotze
-* Frank Mittelbach
-* Will Robertson
-* Chris Rowley
-* Rainer Schöpf
-* Joseph Wright
-
-Former members of The LaTeX3 Project team were
-
-* Michael Downes
-* Denys Duchier
-* Alan Jeffrey
-* Martin Schröder
-
-The development team can be contacted
-by e-mail: <latex-team(a)latex-project.org>.
+The LaTeX kernel is developed by [The LaTeX3 Project](https://latex-project.org).
-----
-<p>Copyright (C) 2014-2018 The LaTeX3 Project <br />
+<p>Copyright (C) 2014-2020 The LaTeX3 Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
Binary files old/texmf-dist/doc/latex/l3build/l3build.pdf and new/texmf-dist/doc/latex/l3build/l3build.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/l3build.1 new/texmf-dist/doc/man/man1/l3build.1
--- old/texmf-dist/doc/man/man1/l3build.1 2019-02-10 23:47:49.000000000 +0100
+++ new/texmf-dist/doc/man/man1/l3build.1 2020-03-25 22:10:32.000000000 +0100
@@ -1,4 +1,4 @@
-.TH l3build 1 "2019-02-10"
+.TH l3build 1 "2020-03-25"
.SH NAME
l3build \- Checking and building packages
.SH SYNOPSIS
Binary files old/texmf-dist/doc/man/man1/l3build.man1.pdf and new/texmf-dist/doc/man/man1/l3build.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3build.doc.tlpobj new/tlpkg/tlpobj/l3build.doc.tlpobj
--- old/tlpkg/tlpobj/l3build.doc.tlpobj 2019-02-28 03:46:52.000000000 +0100
+++ new/tlpkg/tlpobj/l3build.doc.tlpobj 2020-03-26 01:56:01.000000000 +0100
@@ -1,8 +1,8 @@
name l3build.doc
category Package
-revision 49994
+revision 54544
shortdesc doc files of l3build
-docfiles size=179
+docfiles size=184
texmf-dist/doc/latex/l3build/CHANGELOG.md
texmf-dist/doc/latex/l3build/CONTRIBUTING.md
texmf-dist/doc/latex/l3build/README.md
++++++ l3build.tar.xz ++++++
++++ 1611 lines of diff (skipped)
++++++ l3experimental.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3experimental/CHANGELOG.md new/doc/latex/l3experimental/CHANGELOG.md
--- old/doc/latex/l3experimental/CHANGELOG.md 2019-03-05 23:35:14.000000000 +0100
+++ new/doc/latex/l3experimental/CHANGELOG.md 2020-01-13 22:30:36.000000000 +0100
@@ -7,39 +7,91 @@
## [Unreleased]
-## [2019-03-05]
+## [2020-01-12]
+
+### Changed
+- Track `l3kernel` changes
+
+### Fixed
+- Bounding box for clipped paths (see #660)
+
+## [2019-10-11]
+
+### Fixed
+- Error message for unknown colors (see #640)
+
+## [2019-09-28]
+
+### Changed
+- `\sys_shell_get_pwd:N` renamed as `\sys_get_shell_pwd:N`
+
+## [2019-09-19]
+
+### Changed
+- Various improvements to `l3cctab`
+
+## [2019-08-25]
+
+### Changed
+- `\draw_unit_vector:n` returns a vertical vector when the length is
+ zero (see #609)
+- Collect `pwd` data with no `\endlinechar` (see #613)
+- Default precision in `\fp_format:nn` when no style is specified
+
+### Fixed
+- Corrected behaviour of catcode tables (see #610)
+
+## [2019-07-01]
### Added
+- New module `l3pdf`
+### Changed
+- Re-order arguments for polar points (`l3draw`)
+
+### Removed
+- `l3str-convert` module: moved to `l3kernel` (`expl3` core)
+
+## [2019-05-28]
+
+### Added
+- New `l3graphics` module
+
+### Fixed
+- Missing `\scan_stop:` in benchmark code (fixes #577)
+
+## [2019-05-03]
+
+## Fixed
+
+- Clipping of paths by `l3draw`
+
+## [2019-03-05]
+
+### Added
- Support for drawing layers
-- `\draw_point:nn` to allow 'fast' processing of co-ordinates
### Changed
-
- Update `l3draw` transformation names
## [2019-01-28]
### Changed
-
- Track `expl3` changes
## [2018-10-31]
### Added
-
- New module `l3cctab`
## [2018-10-26]
### Added
-
- New module `l3benchmark`
## [2018-08-24]
### Fixed
-
- Actually distribute `l3sys-shell`
## [2018-08-23]
@@ -70,7 +122,15 @@
- New `l3color` module using `xcolor`-like expression syntax
- New `l3draw` module, based on `pgf` layer of the TikZ system
-[Unreleased]: https://github.com/latex3/latex3/compare/2019-03-05...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2020-01-12...HEAD
+[2020-01-12]: https://github.com/latex3/latex3/compare/2019-10-11...2020-01-12
+[2019-10-11]: https://github.com/latex3/latex3/compare/2019-09-28...2019-10-11
+[2019-09-28]: https://github.com/latex3/latex3/compare/2019-09-19...2019-09-28
+[2019-09-19]: https://github.com/latex3/latex3/compare/2019-08-25...2019-09-19
+[2019-08-25]: https://github.com/latex3/latex3/compare/2019-07-01...2019-08-25
+[2019-07-01]: https://github.com/latex3/latex3/compare/2019-05-28...2019-07-01
+[2019-05-28]: https://github.com/latex3/latex3/compare/2019-05-03...2019-05-28
+[2019-05-03]: https://github.com/latex3/latex3/compare/2019-03-05...2019-05-03
[2019-03-05]: https://github.com/latex3/latex3/compare/2019-01-28...2019-03-05
[2019-01-28]: https://github.com/latex3/latex3/compare/2018-10-31...2019-01-28
[2018-10-31]: https://github.com/latex3/latex3/compare/2018-10-26...2018-10-31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3experimental/README.md new/doc/latex/l3experimental/README.md
--- old/doc/latex/l3experimental/README.md 2019-03-05 23:35:14.000000000 +0100
+++ new/doc/latex/l3experimental/README.md 2020-01-13 22:30:36.000000000 +0100
@@ -1,7 +1,7 @@
Experimental LaTeX3 Concepts
============================
-Release 2019-03-05
+Release 2020-01-12
Overview
--------
@@ -25,11 +25,12 @@
* `l3cctab`
* `l3color`
* `l3draw`
+* `l3graphics`
+* `l3pdf`
* `l3str`
* `l3sys-shell`
* `xcoffins`
* `xgalley`
-* `xmarks`
`l3benchmark`
-------------
@@ -58,14 +59,25 @@
interfaces are heavily inspired by the `pgf` layer of the widely-used
TikZ system.
+`l3graphics`
+-------------
+
+This module provides interfaces for the inclusion of graphics files
+in documents, similar to the `graphics` package.
+
+`l3pdf`
+-------
+
+This module provides support for core PDF concepts such compression, objects,
+PDF version and so on.
+
`l3str`
-------
A 'string' in TeX terms is a token list in which all of the tokens have
category code 12 ('other'), with the exception of spaces which have the
-category code 10 ('space'). The `l3str` bundle consists of two parts. The
-first is `l3str` itself. This is a collection of functions to act on strings,
-including for manipulations such as UTF8 mappings in pdfTeX.
+category code 10 ('space'). The `l3strf-format` module provides methods
+for formatting such strings.
`l3sys-shell`
-------------
@@ -122,27 +134,7 @@
------------------
Development of LaTeX3 is carried out by
-[The LaTeX3 Project](http://www.latex-project.org/latex3.html). Currently,
-the team members are
-
-* Johannes Braams
-* David Carlisle
-* Robin Fairbairns
-* Morten Høgholm
-* Bruno Le Floch
-* Thomas Lotze
-* Frank Mittelbach
-* Will Robertson
-* Chris Rowley
-* Rainer Schöpf
-* Joseph Wright
-
-Former members of The LaTeX3 Project team were
-
-* Michael Downes
-* Denys Duchier
-* Alan Jeffrey
-* Martin Schröder
+[The LaTeX3 Project](https://www.latex-project.org/latex3/).
The development team can be contacted
by e-mail: <latex-team(a)latex-project.org>; for general LaTeX3 discussion
@@ -150,6 +142,6 @@
-----
-<p>Copyright (C) 1998-2011,2015-2019 The LaTeX3 Project <br />
+<p>Copyright (C) 1998-2011,2015-2020 The LaTeX3 Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
Binary files old/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf and new/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf differ
Binary files old/doc/latex/l3experimental/l3cctab/l3cctab.pdf and new/doc/latex/l3experimental/l3cctab/l3cctab.pdf differ
Binary files old/doc/latex/l3experimental/l3color/l3color.pdf and new/doc/latex/l3experimental/l3color/l3color.pdf differ
Binary files old/doc/latex/l3experimental/l3draw/l3draw-code.pdf and new/doc/latex/l3experimental/l3draw/l3draw-code.pdf differ
Binary files old/doc/latex/l3experimental/l3draw/l3draw.pdf and new/doc/latex/l3experimental/l3draw/l3draw.pdf differ
Binary files old/doc/latex/l3experimental/l3graphics/l3graphics.pdf and new/doc/latex/l3experimental/l3graphics/l3graphics.pdf differ
Binary files old/doc/latex/l3experimental/l3pdf/l3pdf-code.pdf and new/doc/latex/l3experimental/l3pdf/l3pdf-code.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3experimental/l3pdf/l3pdf-code.tex new/doc/latex/l3experimental/l3pdf/l3pdf-code.tex
--- old/doc/latex/l3experimental/l3pdf/l3pdf-code.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/l3experimental/l3pdf/l3pdf-code.tex 2019-07-02 23:03:06.000000000 +0200
@@ -0,0 +1,56 @@
+\iffalse meta-comment
+
+File: l3pdf-code.tex
+
+Copyright (C) 2019 The LaTeX3 Project
+
+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
+
+ https://www.latex-project.org/lppl.txt
+
+This file is part of the "l3experimental bundle" (The Work in LPPL)
+and all files in that bundle must be distributed together.
+
+The released version of this bundle is available from CTAN.
+
+-----------------------------------------------------------------------
+
+The development version of the bundle can be found at
+
+ https://github.com/latex3/latex3
+
+for those people who are interested.
+
+\fi
+
+\documentclass{l3doc}
+
+\begin{document}
+
+\makeatletter
+\let\DelayPrintIndex\PrintIndex
+\let\PrintIndex\@empty
+\makeatother
+
+\ExplSyntaxOn
+\clist_gput_right:Nn \g_docinput_clist
+ {
+ l3pdf.dtx ,
+ }
+\ExplSyntaxOff
+
+\part{Implementation}
+
+\def\maketitle{}
+\EnableImplementation
+\DisableDocumentation
+\DocInputAgain
+
+\clearpage
+
+\DelayPrintIndex
+
+\end{document}
Binary files old/doc/latex/l3experimental/l3pdf/l3pdf.pdf and new/doc/latex/l3experimental/l3pdf/l3pdf.pdf differ
Binary files old/doc/latex/l3experimental/l3str/l3str-convert.pdf and new/doc/latex/l3experimental/l3str/l3str-convert.pdf differ
Binary files old/doc/latex/l3experimental/l3str/l3str-format.pdf and new/doc/latex/l3experimental/l3str/l3str-format.pdf differ
Binary files old/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf and new/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf differ
Binary files old/doc/latex/l3experimental/xcoffins/xcoffins.pdf and new/doc/latex/l3experimental/xcoffins/xcoffins.pdf differ
Binary files old/doc/latex/l3experimental/xgalley/l3galley.pdf and new/doc/latex/l3experimental/xgalley/l3galley.pdf differ
Binary files old/doc/latex/l3experimental/xgalley/xgalley.pdf and new/doc/latex/l3experimental/xgalley/xgalley.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3experimental.doc.tlpobj new/tlpkg/tlpobj/l3experimental.doc.tlpobj
--- old/tlpkg/tlpobj/l3experimental.doc.tlpobj 2019-03-06 02:24:01.000000000 +0100
+++ new/tlpkg/tlpobj/l3experimental.doc.tlpobj 2020-01-14 01:54:45.000000000 +0100
@@ -1,9 +1,9 @@
name l3experimental.doc
category Package
-revision 50246
+revision 53394
shortdesc doc files of l3experimental
relocated 1
-docfiles size=1038
+docfiles size=1185
RELOC/doc/latex/l3experimental/CHANGELOG.md
RELOC/doc/latex/l3experimental/README.md
RELOC/doc/latex/l3experimental/l3benchmark/l3benchmark.pdf
@@ -12,7 +12,10 @@
RELOC/doc/latex/l3experimental/l3draw/l3draw-code.pdf
RELOC/doc/latex/l3experimental/l3draw/l3draw-code.tex
RELOC/doc/latex/l3experimental/l3draw/l3draw.pdf
- RELOC/doc/latex/l3experimental/l3str/l3str-convert.pdf
+ RELOC/doc/latex/l3experimental/l3graphics/l3graphics.pdf
+ RELOC/doc/latex/l3experimental/l3pdf/l3pdf-code.pdf
+ RELOC/doc/latex/l3experimental/l3pdf/l3pdf-code.tex
+ RELOC/doc/latex/l3experimental/l3pdf/l3pdf.pdf
RELOC/doc/latex/l3experimental/l3str/l3str-format.pdf
RELOC/doc/latex/l3experimental/l3sys-shell/l3sys-shell.pdf
RELOC/doc/latex/l3experimental/xcoffins/xcoffins.pdf
++++++ l3experimental.tar.xz ++++++
++++ 4341 lines of diff (skipped)
++++++ l3kernel.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/l3kernel.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/l3kernel.doc.tar.xz differ: char 26, line 1
++++++ l3kernel.tar.xz ++++++
++++ 17511 lines of diff (skipped)
++++++ l3packages.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3packages/CHANGELOG.md new/doc/latex/l3packages/CHANGELOG.md
--- old/doc/latex/l3packages/CHANGELOG.md 2019-03-05 23:35:14.000000000 +0100
+++ new/doc/latex/l3packages/CHANGELOG.md 2020-03-06 22:32:34.000000000 +0100
@@ -7,6 +7,58 @@
## [Unreleased]
+## [2020-03-06]
+
+### Added
+- Pre-loader file `xparse.ltx`
+
+## [2020-03-03]
+
+### Changed
+- Delimited arguments (`DdRrEet`) now allow control sequence tokens
+ as delimiters (issues #367 and #368)
+
+## [2020-02-25]
+
+### Changed
+- Issue warnings for unsupported delimiters in `xparse`
+
+## [2020-02-14]
+
+### Fixed
+- Grabbing `r`-type arguments by expandable commands (issse #672)
+
+## [2020-02-08]
+
+### Changed
+- Document that `\CurrentOption` is available and should be used in
+ `l3keys2e`
+
+## [2020-02-03]
+
+### Fixed
+- Unknown key error text after loading `l3keys2e`
+
+## [2020-01-12]
+
+### Changed
+- Track `l3kernel` changes
+
+## [2019-10-11]
+
+### Fixed
+- `xparse`: Allow processors to depend on other arguments (fixes #629)
+
+## [2019-05-28]
+
+### Fixed
+- `xparse`: Remove stray spaces in processor information
+
+## [2019-05-03]
+
+### Added
+- `xparse`: Support for `trace` package
+
## [2019-03-05]
### Added
@@ -40,7 +92,17 @@
- Switch to ISO date format
- Improve cross-module use of internal functions
-[Unreleased]: https://github.com/latex3/latex3/compare/2019-03-05...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2020-03-06...HEAD
+[2020-03-06]: https://github.com/latex3/latex3/compare/2020-03-03...2020-03-06
+[2020-03-03]: https://github.com/latex3/latex3/compare/2020-02-25...2020-03-03
+[2020-02-25]: https://github.com/latex3/latex3/compare/2020-02-14...2020-02-25
+[2020-02-14]: https://github.com/latex3/latex3/compare/2020-02-08...2020-02-14
+[2020-02-08]: https://github.com/latex3/latex3/compare/2020-02-03...2020-02-08
+[2020-02-03]: https://github.com/latex3/latex3/compare/2020-01-12...2020-02-03
+[2020-01-12]: https://github.com/latex3/latex3/compare/2019-10-11...2020-01-12
+[2019-10-11]: https://github.com/latex3/latex3/compare/2019-05-28...2019-10-11
+[2019-05-28]: https://github.com/latex3/latex3/compare/2019-05-03...2019-05-28
+[2019-05-03]: https://github.com/latex3/latex3/compare/2019-03-05...2019-05-03
[2019-03-05]: https://github.com/latex3/latex3/compare/2019-09-24...2019-03-05
[2018-09-24]: https://github.com/latex3/latex3/compare/2018-08-23...2018-09-24
[2018-08-23]: https://github.com/latex3/latex3/compare/2018-05-12...2018-08-23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3packages/README.md new/doc/latex/l3packages/README.md
--- old/doc/latex/l3packages/README.md 2019-03-05 23:35:14.000000000 +0100
+++ new/doc/latex/l3packages/README.md 2020-03-06 22:32:34.000000000 +0100
@@ -1,12 +1,12 @@
LaTeX3 High-Level Concepts
==========================
-Release 2019-03-05
+Release 2020-03-06
Overview
--------
-The `l3packages` collection is contains implementations for aspects of the
+The `l3packages` collection contains implementations for aspects of the
LaTeX3 kernel, dealing with higher-level ideas such as the Designer Interface.
The packages here are considered broadly stable (The LaTeX3 Project does not
expect the interfaces to alter radically). These packages are build on LaTeX2e
@@ -94,27 +94,7 @@
------------------
Development of LaTeX3 is carried out by
-[The LaTeX3 Project](http://www.latex-project.org/latex3.html). Currently,
-the team members are
-
-* Johannes Braams
-* David Carlisle
-* Robin Fairbairns
-* Morten Høgholm
-* Bruno Le Floch
-* Thomas Lotze
-* Frank Mittelbach
-* Will Robertson
-* Chris Rowley
-* Rainer Schöpf
-* Joseph Wright
-
-Former members of The LaTeX3 Project team were
-
-* Michael Downes
-* Denys Duchier
-* Alan Jeffrey
-* Martin Schröder
+[The LaTeX3 Project](https://www.latex-project.org/latex3/).
The development team can be contacted
by e-mail: <latex-team(a)latex-project.org>; for general LaTeX3 discussion
@@ -122,6 +102,6 @@
-----
-<p>Copyright (C) 1998-2011,2015-2019 The LaTeX3 Project <br />
+<p>Copyright (C) 1998-2012,2015-2020 The LaTeX3 Project <br />
<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
All rights reserved.</p>
Binary files old/doc/latex/l3packages/l3keys2e/l3keys2e.pdf and new/doc/latex/l3packages/l3keys2e/l3keys2e.pdf differ
Binary files old/doc/latex/l3packages/xfp/xfp.pdf and new/doc/latex/l3packages/xfp/xfp.pdf differ
Binary files old/doc/latex/l3packages/xfrac/xfrac.pdf and new/doc/latex/l3packages/xfrac/xfrac.pdf differ
Binary files old/doc/latex/l3packages/xparse/xparse.pdf and new/doc/latex/l3packages/xparse/xparse.pdf differ
Binary files old/doc/latex/l3packages/xtemplate/xtemplate.pdf and new/doc/latex/l3packages/xtemplate/xtemplate.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3packages.doc.tlpobj new/tlpkg/tlpobj/l3packages.doc.tlpobj
--- old/tlpkg/tlpobj/l3packages.doc.tlpobj 2019-03-06 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/l3packages.doc.tlpobj 2020-03-07 01:10:10.000000000 +0100
@@ -1,9 +1,9 @@
name l3packages.doc
category Package
-revision 50246
+revision 54131
shortdesc doc files of l3packages
relocated 1
-docfiles size=502
+docfiles size=501
RELOC/doc/latex/l3packages/CHANGELOG.md
RELOC/doc/latex/l3packages/README.md
RELOC/doc/latex/l3packages/l3keys2e/l3keys2e-demo.tex
++++++ l3packages.tar.xz ++++++
++++ 2891 lines of diff (skipped)
++++++ lacheck.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/lacheck.1 new/texmf-dist/doc/man/man1/lacheck.1
--- old/texmf-dist/doc/man/man1/lacheck.1 2015-04-22 12:58:54.000000000 +0200
+++ new/texmf-dist/doc/man/man1/lacheck.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,6 +1,6 @@
-.TH "LaCheck" "1" "2015-01-10" "Release 1.28"
+.TH "LaCheck" "1" "2019-07-09" "Release 1.29 (TeX Live)"
.SH NAME
-lacheck - A consistency checker for LaTeX documents.
+lacheck - a consistency checker for LaTeX documents
.SH SYNOPSIS
.B lacheck
.IR filename [ \fB.tex\fP ]
@@ -46,8 +46,7 @@
Files with suffix \`.sty\' are omitted, as they probably will cause
LaCheck to crash.
.LP
-LaCheck may be invoked from within Emacs(1) using compile:
-
+LaCheck may be invoked from within emacs(1) using M-x compile.
To run:
.B "M-x compile RET lacheck RET"
, and then
@@ -83,10 +82,9 @@
\' error may also occur, if the following sentence begins with a
lowercase letter.
.LP
-A mismatch error may cause more to follow, due to the chosen
-algorithm. In such cases just correct the
-.I "first"
-error and run LaCheck again
+A mismatch error may cause more to follow, due to the lack of good
+error recovery. In such cases, just correct the first
+error and run LaCheck again.
.LP
Braces, environments and math mode must be balanced within a file.
.LP
@@ -104,4 +102,4 @@
should be directed to the maintainers; please email tex-live(a)tug.org.
.SH AUTHOR
Kresten Krab Thorup with modifications by Per Abrahamsen.
-Currently maintained as part of TeX Live (http://tug.org/texlive).
+Currently maintained as part of TeX Live (https://tug.org/texlive).
Binary files old/texmf-dist/doc/man/man1/lacheck.man1.pdf and new/texmf-dist/doc/man/man1/lacheck.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lacheck.doc.tlpobj new/tlpkg/tlpobj/lacheck.doc.tlpobj
--- old/tlpkg/tlpobj/lacheck.doc.tlpobj 2019-03-27 02:24:11.000000000 +0100
+++ new/tlpkg/tlpobj/lacheck.doc.tlpobj 2020-03-04 23:51:47.000000000 +0100
@@ -1,7 +1,7 @@
name lacheck.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of lacheck
-docfiles size=7
+docfiles size=8
texmf-dist/doc/man/man1/lacheck.1
texmf-dist/doc/man/man1/lacheck.man1.pdf
++++++ langsci.doc.tar.xz ++++++
++++ 7313 lines of diff (skipped)
++++++ langsci.tar.xz ++++++
++++ 4623 lines of diff (skipped)
++++++ latex-bin.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dvilualatex.man1.pdf and new/texmf-dist/doc/man/man1/dvilualatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/latex.1 new/texmf-dist/doc/man/man1/latex.1
--- old/texmf-dist/doc/man/man1/latex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/latex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH LATEX 1 "30 April 2018" "Web2C 2019"
+.TH LATEX 1 "30 April 2018" "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/latex.man1.pdf and new/texmf-dist/doc/man/man1/latex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/lualatex.man1.pdf and new/texmf-dist/doc/man/man1/lualatex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/pdflatex.man1.pdf and new/texmf-dist/doc/man/man1/pdflatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-bin.doc.tlpobj new/tlpkg/tlpobj/latex-bin.doc.tlpobj
--- old/tlpkg/tlpobj/latex-bin.doc.tlpobj 2019-03-27 02:24:11.000000000 +0100
+++ new/tlpkg/tlpobj/latex-bin.doc.tlpobj 2020-04-15 01:54:53.000000000 +0200
@@ -1,6 +1,6 @@
name latex-bin.doc
category TLCore
-revision 50602
+revision 54743
shortdesc doc files of latex-bin
docfiles size=32
texmf-dist/doc/man/man1/dvilualatex.1
++++++ latex-git-log.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/latex-git-log.man1.pdf and new/texmf-dist/doc/man/man1/latex-git-log.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latex-git-log/README new/texmf-dist/doc/support/latex-git-log/README
--- old/texmf-dist/doc/support/latex-git-log/README 2013-06-27 18:44:39.000000000 +0200
+++ new/texmf-dist/doc/support/latex-git-log/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-# latex-git-log
-This program will output the entire version history as table written in LaTeX
-if it is executed within a git repository.
-
-It is intended that you redirect the standard output of this script to a file
-which can then be included from your main TeX document.
-
-Because the table can be very large you might want to put the thing on a
-landscape page.
-
-## Dependencies
-### Of this script
-This module requires these other modules and libraries:
-
- IPC::System::Simple
- Locale::Maketext::Simple
-
-Everything else should already be installed.
-
-### To compile the output
-The table is using the *longtable* package and the links to a web resource for
-each commit use the `\href` macro from *hyperref*. So these two packages have
-to be loaded.
-
-Furthermore you need to defined the macro `\longtableendfoot` which will be
-expanded on the bottom of every page if the table will be continued on the next
-page. You can defined it to a localized message to inform the reader that this
-table is not complete and will be continued.
-
-## License and development
-Copyright (C) by Robin Schneider <ypid23(a)aol.de> <br />
-Source code repository: https://github.com/ypid/typesetting/tree/master/scripts/latex-git-log <br />
-Please report bugs and feature requests at https://github.com/ypid/typesetting/issues <br />
-
-## Usage
-
- latex-git-log [options]
-
- Options:
-
- --author set this if you want the author included
- --startcommit set the start value of count commit
- --width set the width in cm of the commit message field in the LaTeX table
- --git-c-add set an base URL to link to a commit
- --user set a github user to derive the base URL
- --repo set a github repository to derive the base URL
- --lang language of the legend and all strings in the output
- --version, -v print version of this script
- --help brief help message
- --man full documentation
-
-### Description of some options
-
- --width Set the width in cm of the commit message field in the LaTeX
- table. If this parameter is not set then the table is not
- vertically limited. That means that if you have a very long
- commit message then the table will probably not fit on the page
- and you will get a "Overfull" error message from TeX.
-
- In this case you should specify the width of the column
- containing the commit messages. I normally use something like
- --width=14 for DIN A4 in landscape.
-
- --git-c-add
- Set an base URL to link to a commit. This script will
- automatically try to use the base URL for github.
-
- --lang Set the language of the legend and all strings in the output. Be
- default the language of your system is used but you can
- overwrite this with this parameter.
-
- Currently this script only supports English and German. If you
- need a translation to another language then you can either
- create a .po file or I can register this project on one of those
- websites for online translation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latex-git-log/README.md new/texmf-dist/doc/support/latex-git-log/README.md
--- old/texmf-dist/doc/support/latex-git-log/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/latex-git-log/README.md 2020-02-27 23:08:39.000000000 +0100
@@ -0,0 +1,82 @@
+# latex-git-log
+
+This program will output the entire version history as table written in LaTeX
+if it is executed within a git repository.
+
+It is intended that you redirect the standard output of this script to a file which can then be included from your main LaTeX document.
+
+Because the table can be very large you might want to put the thing on a
+landscape page.
+
+## Dependencies
+
+### Of this script
+
+This module requires these other modules and libraries:
+
+ IPC::System::Simple
+ Locale::Maketext::Simple
+
+Everything else should already be installed.
+
+### To compile the output
+
+The table is using the *longtable* package and the links to a web resource for
+each commit use the `\href` macro from *hyperref*. So these two packages have
+to be loaded.
+
+Furthermore you need to defined the macro `\longtableendfoot` which will be
+expanded on the bottom of every page if the table will be continued on the next
+page. You can defined it to a localized message to inform the reader that this
+table is not complete and will be continued.
+
+## License and development
+
+Copyright (C) 2012-2013,2017,2019-2020 Robin Schneider <ypid(a)riseup.net> <br/>
+SPDX-License-Identifier: GPL-3.0-or-later <br/>
+CTAN: https://ctan.org/pkg/latex-git-log <br/>
+Source code repository: https://github.com/ypid/typesetting/tree/master/scripts/latex-git-log <br/>
+Please report bugs and feature requests at https://github.com/ypid/typesetting/issues
+
+## Usage
+
+ latex-git-log [options]
+
+ Options:
+
+ --author set this if you want the author included
+ --startcommit set the start value of count commit
+ --width set the width in cm of the commit message field in the LaTeX table
+ --git-c-add set an base URL to link to a commit
+ --user set a github user to derive the base URL
+ --repo set a github repository to derive the base URL
+ --lang language of the legend and all strings in the output
+ --version, -v print version of this script
+ --help brief help message
+ --man full documentation
+ --range specify a git revision range
+
+### Description of some options
+
+ --width Set the width in cm of the commit message field in the LaTeX
+ table. If this parameter is not set then the table is not
+ vertically limited. That means that if you have a very long
+ commit message then the table will probably not fit on the page
+ and you will get a "Overfull" error message from TeX.
+
+ In this case you should specify the width of the column
+ containing the commit messages. I normally use something like
+ --width=14 for DIN A4 in landscape.
+
+ --git-c-add
+ Set an base URL to link to a commit. This script will
+ automatically try to use the base URL for github.
+
+ --lang Set the language of the legend and all strings in the output. By
+ default the language of your system is used but you can
+ overwrite this with this parameter.
+
+ Currently this script only supports English and German. If you
+ need a translation to another language then you can either
+ create a .po file or I can register this project on one of those
+ websites for online translation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latex-git-log/po/de.po new/texmf-dist/doc/support/latex-git-log/po/de.po
--- old/texmf-dist/doc/support/latex-git-log/po/de.po 2013-06-27 18:44:39.000000000 +0200
+++ new/texmf-dist/doc/support/latex-git-log/po/de.po 2020-02-27 23:08:39.000000000 +0100
@@ -1,10 +1,10 @@
msgid ""
msgstr ""
"Project-Id-Version: latex-git-log\n"
-"Report-Msgid-Bugs-To: ypid23(a)aol.de\n"
+"Report-Msgid-Bugs-To: ypid(a)riseup.net\n"
"POT-Creation-Date: 2013-06-15 18:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Robin Scheider <ypid23(a)aol.de>\n"
+"Last-Translator: Robin Scheider <ypid(a)riseup.net>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: DE\n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-git-log.doc.tlpobj new/tlpkg/tlpobj/latex-git-log.doc.tlpobj
--- old/tlpkg/tlpobj/latex-git-log.doc.tlpobj 2019-02-28 03:47:37.000000000 +0100
+++ new/tlpkg/tlpobj/latex-git-log.doc.tlpobj 2020-03-02 20:52:23.000000000 +0100
@@ -1,11 +1,11 @@
name latex-git-log.doc
category Package
-revision 30983
+revision 54010
shortdesc doc files of latex-git-log
-docfiles size=31
+docfiles size=36
texmf-dist/doc/man/man1/latex-git-log.1
texmf-dist/doc/man/man1/latex-git-log.man1.pdf
- texmf-dist/doc/support/latex-git-log/README
+ texmf-dist/doc/support/latex-git-log/README.md
texmf-dist/doc/support/latex-git-log/example-output.tex
texmf-dist/doc/support/latex-git-log/example.pdf
texmf-dist/doc/support/latex-git-log/example.tex
++++++ latex-git-log.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/latex-git-log/latex-git-log new/texmf-dist/scripts/latex-git-log/latex-git-log
--- old/texmf-dist/scripts/latex-git-log/latex-git-log 2013-06-27 18:44:39.000000000 +0200
+++ new/texmf-dist/scripts/latex-git-log/latex-git-log 2020-02-27 23:08:39.000000000 +0100
@@ -1,6 +1,5 @@
#!/usr/bin/env perl
-# @author Robin Schneider <ypid23(a)aol.de>
-# @licence GPLv3+ <http://www.gnu.org/licenses/gpl.html>
+# SPDX-License-Identifier: GPL-3.0-or-later
# Modules and pragmas {{{
use strict;
@@ -23,6 +22,7 @@
$dirpath = ( fileparse( abs_path($0) ) )[1];
}
# }}}
+
use Locale::Maketext::Simple (
Path => $dirpath . 'po/',
Decode => 1,
@@ -30,13 +30,14 @@
# }}}
# Optional parameters {{{
-my $print_author = 0;
-my $commit_count = 1;
-my $width = 0;
-my $lang = undef;
-my $version = 0;
-my $help = 0;
-my $man = 0;
+my $print_author = 0;
+my $commit_count = 1;
+my $width = 0;
+my $lang = undef;
+my $version = 0;
+my $help = 0;
+my $man = 0;
+my $revision_range = 0;
my ( $git_user, $git_repo, $git_commit_address );
GetOptions(
'author' => \$print_author,
@@ -49,24 +50,17 @@
'version' => \$version,
'help|?' => \$help,
'man' => \$man,
+ 'range=s' => \$revision_range,
);
-pod2usage(1) if $help;
-pod2usage( -verbose => 2, -exitstatus => 0, ) if $man;
-pod2usage( -verbose => 99, -sections => 'Version' ) if $version;
+pod2usage( -verbose => 99, -sections => [ qw(Synopsis Options) ] ) if $help;
+pod2usage( -verbose => 2, -exitstatus => 0, ) if $man;
+pod2usage( -verbose => 99, -sections => 'Version' ) if $version;
my $git_remote = ( split /\n/xms, capturex(qw(git remote -v)) )[0];
loc_lang($lang) if ( defined $lang );
-if ( not defined $git_user
- and not defined $git_repo
- and defined $git_remote
- and $git_remote =~ m#\s.*?:(?<user>\w+?)/(?<repo>.*?)\.git\ \(fetch\)\Z#xms )
-{
- $git_user = $+{user};
- $git_repo = $+{repo};
-}
say '%% This file was generated by the script latex-git-log';
my $git_command_commit_msg = '%s';
-if ( defined $git_user and defined $git_repo ) {
+if ( (defined $git_user and defined $git_repo) or $git_commit_address ) {
unless ( defined $git_commit_address ) {
$git_commit_address = "https://github.com/$+{user}/$+{repo}/commit";
}
@@ -133,15 +127,21 @@
else {
push( @git_command, qq(--pretty=format:%H %ad & $git_command_commit_msg) );
}
+if ($revision_range) {
+ push( @git_command, qq($revision_range) );
+}
@lines = reverse capturex(@git_command);
# }}}
# Get tags {{{
-my @tags_commits = capturex( 'git', 'for-each-ref', '--format=%(refname:short) %(objectname)', 'refs/tags' );
+my @tags_commits = capturex( 'git', 'log', '--tags', '--no-walk', '--pretty=\'%H %d\'' );
my %commit_tags; # The key will be a SHA1 commit hash and the value a comma separated list of all tags.
for (@tags_commits) {
- my ( $tag, $c_hash ) = split /\s/xms, $_;
- chomp($c_hash);
+ chomp;
+ m/\A'([^ ]+)\s*\(([^)]+)\)'\z/xms;
+ my $c_hash = $1;
+ my $tag = $2;
+ $tag =~ s/tag: //g;
if ( defined $commit_tags{$c_hash} ) {
$commit_tags{$c_hash} .= ", $tag";
}
@@ -185,11 +185,15 @@
for (@lines) {
next if /\A\Z/xms;
chomp;
+ if ( m/^([0-9a-f]{40})\s/g and !$which_line) {
+ $which_line ^= 1; ## additional toggle for merge commits
+ @changes = ( "-", "-", "-" );
+ }
if ($which_line) {
s/\A([0-9a-f]{40})\s//xms or die "Did not match the commit hash\n";
my $tags = exists $commit_tags{$1} ? $commit_tags{$1} : q();
my $date_author = '';
- my $c_msg;
+ my $c_msg = '';
if ($print_author) {
/(?:& )(.*?)NoTinAuthorFiled(& .*? &) (.*)/;
$date_author = latex_escape($1) . $2;
@@ -200,7 +204,7 @@
$date_author = $1;
$c_msg = $2;
}
- if ( defined $git_user and defined $git_repo ) {
+ if ( defined $git_commit_address ) {
$c_msg =~ /(.*?) & (.*)/;
$c_msg = sprintf '\\href{%s/%s}{%s}', $git_commit_address, $1, latex_escape($2);
}
@@ -224,11 +228,12 @@
__END__
# Documentation {{{
+=encoding UTF-8
=head1 NAME
latex-git-log - Generates the version history of a git project as LaTeX source code.
-=head1 SYNOPSIS
+=head1 Synopsis
latex-git-log [options]
@@ -244,8 +249,9 @@
--version, -v print version of this script
--help brief help message
--man full documentation
+ --range specify a git revision range
-=head1 OPTIONS
+=head1 Options
=over 8
@@ -266,7 +272,7 @@
=item B<--lang>
-Set the language of the legend and all strings in the output. Be default the
+Set the language of the legend and all strings in the output. By default the
language of your system is used but you can overwrite this with this parameter.
Currently this script only supports English and German. If you need a translation
@@ -281,7 +287,7 @@
latex-git-log --width=6 --lang=en > example-output.tex
-=head1 DEPENDENCIES
+=head1 Dependencies
=head2 Of this script
@@ -303,34 +309,36 @@
page. You can defined it to a localized message to inform the reader that this
table is not complete and will be continued.
-=head1 DESCRIPTION
+=head1 Description
B<This program> will output the entire version history as table written in
LaTeX if it is executed within a git repository.
It is intended that you redirect the standard output of this script to a file
-which can then be included from your main TeX document.
+which can then be included from your main LaTeX document.
Because the table can be very large you might want to put the thing on a
landscape page.
=head1 Version
-0.9
+1.0.0
-=head1 AUTHOR
+=head1 Author
-Robin Schneider <ypid23(a)aol.de>
+Robin Schneider <ypid(a)riseup.net>
=head1 Development
+CTAN: https://ctan.org/pkg/latex-git-log
+
Source code repository: https://github.com/ypid/typesetting/tree/master/scripts/latex-git-log
Please report bugs and feature requests at https://github.com/ypid/typesetting/issues
-=head1 LICENSE AND COPYRIGHT
+=head1 License and Copyright
-Copyright (C) 2012-2013 by Robin Schneider
+Copyright (C) 2012-2013,2017,2019 Robin Schneider <ypid(a)riseup.net>
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/tlpkg/tlpobj/latex-git-log.tlpobj new/tlpkg/tlpobj/latex-git-log.tlpobj
--- old/tlpkg/tlpobj/latex-git-log.tlpobj 2019-02-28 03:47:37.000000000 +0100
+++ new/tlpkg/tlpobj/latex-git-log.tlpobj 2020-03-02 20:52:23.000000000 +0100
@@ -1,6 +1,6 @@
name latex-git-log
category Package
-revision 30983
+revision 54010
shortdesc Typeset git log information
longdesc The program is run within a git repository, and outputs the
longdesc entire version history, as a LaTeX table. That output will
@@ -11,7 +11,6 @@
texmf-dist/scripts/latex-git-log/latex-git-log
catalogue-contact-repository https://github.com/ypid/typesetting/tree/master/scripts/latex-git-log
catalogue-ctan /support/latex-git-log
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license gpl3
+catalogue-license gpl3+
catalogue-topics project-mgmt
-catalogue-version 0.9
+catalogue-version 1.0.0
++++++ latex-papersize.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-papersize.doc.tlpobj new/tlpkg/tlpobj/latex-papersize.doc.tlpobj
--- old/tlpkg/tlpobj/latex-papersize.doc.tlpobj 2019-02-28 03:47:40.000000000 +0100
+++ new/tlpkg/tlpobj/latex-papersize.doc.tlpobj 2019-12-15 01:53:41.000000000 +0100
@@ -1,6 +1,6 @@
name latex-papersize.doc
category Package
-revision 42296
+revision 53131
shortdesc doc files of latex-papersize
docfiles size=1
texmf-dist/doc/support/latex-papersize/README
++++++ latex-papersize.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/latex-papersize/latex-papersize.py new/texmf-dist/scripts/latex-papersize/latex-papersize.py
--- old/texmf-dist/scripts/latex-papersize/latex-papersize.py 2016-10-17 23:30:47.000000000 +0200
+++ new/texmf-dist/scripts/latex-papersize/latex-papersize.py 2019-12-14 23:51:18.000000000 +0100
@@ -1,7 +1,7 @@
#!/usr/bin/env python
r"""
Calculate LaTeX paper and margin settings for arbitrary magnification
-(C) Silas S. Brown, 2005-2009, 2016. Version 1.62.
+(C) Silas S. Brown, 2005-2009, 2016, 2019. Version 1.63.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
This is a Python script to calculate the necessary
settings for arbitrary font and page sizes.
+Works in both Python 2 and Python 3.
BASIC USAGE
@@ -151,11 +152,16 @@
$(python latex-papersize.py 12 26 file.dvi)
"""
-import os, sys, math, commands
+import os, sys, math
+try: from commands import getoutput # Python 2
+except: from subprocess import getoutput # Python 3
+def hasKey(a,b):
+ try: return a.has_key(b) # old Python 2
+ except: return b in a # newer Python 2 + Python 3
if len(sys.argv)==2 and sys.argv[1]=="--help":
- print __doc__.strip() ; raise SystemExit
+ print(__doc__.strip()); raise SystemExit
if len(sys.argv)==2 and sys.argv[1]=="--version":
- print __doc__[:__doc__.find("\n\n")].strip() ; raise SystemExit
+ print(__doc__[:__doc__.find("\n\n")].strip()); raise SystemExit
base_pointsize = float(sys.argv[1])
desired_pointsize = float(sys.argv[2])
@@ -167,13 +173,13 @@
extra_bottom_margin_mm = 0
pageStyle = " \\pagestyle{empty}"
-if os.environ.has_key("paper_width"): paper_width=float(os.environ["paper_width"])
+if hasKey(os.environ,"paper_width"): paper_width=float(os.environ["paper_width"])
else: paper_width=210
-if os.environ.has_key("paper_height"): paper_height=float(os.environ["paper_height"])
+if hasKey(os.environ,"paper_height"): paper_height=float(os.environ["paper_height"])
else: paper_height=297
-if os.environ.has_key("margin_left"): margin_left=float(os.environ["margin_left"])
+if hasKey(os.environ,"margin_left"): margin_left=float(os.environ["margin_left"])
else: margin_left=10
-if os.environ.has_key("margin_top"): margin_top=float(os.environ["margin_top"])
+if hasKey(os.environ,"margin_top"): margin_top=float(os.environ["margin_top"])
else: margin_top=10
paper_magstep = 1.0*desired_pointsize/base_pointsize
@@ -188,15 +194,16 @@
s="\\textwidth=%.1fmm \\textheight=%.1fmm \\topmargin=%.1fmm \\marginparwidth=0mm \\oddsidemargin=%.1fmm \\evensidemargin=%.1fmm \\columnsep=%.1fmm%s" % (textwidth,textheight,margin_top_setting,margin_left_setting,margin_left_setting,margin_left_setting,pageStyle)
if sys.argv[3]=="pdftex":
s += "\\mag=%d \\pdfpagewidth=%d true mm \\pdfpageheight=%d true mm \\pdfhorigin=0 mm \\pdfvorigin=-12.95 mm \\paperwidth=%d true mm \\paperheight=%d true mm" % (1000*paper_magstep,paper_width,paper_height,paper_width,paper_height) # the -12.95mm seems to be a constant regardless of magnification (previous version had -14 but it sems -12.95 is more accurate - at least 12.9 is too small and 13 is too big). Need \paperwidth and \paperheight in there as well in case using hyperref.
- print s
+ print(s)
else:
- os.system("dvips -T %dmm,%dmm -x %d %s -o bbox_test.ps" % (paper_width*10,paper_height*10,1000*paper_magstep+0.5,sys.argv[3]))
+ r = os.system("dvips -T %dmm,%dmm -x %d %s -o bbox_test.ps" % (paper_width*10,paper_height*10,1000*paper_magstep+0.5,sys.argv[3]))
+ assert not r, "dvips failed"
# Now, that would have got the origin wrong. I can't
# figure out how dvips origin and magstep is supposed to
# interoperate, so let's work it out on a case-by-case
# basis from the bounding box.
# (Note: multiplying paper_width and paper_height by 10 above, because if dealing with very small paper sizes then this may give a reading of 0 if the origin is off the page. Increasing the paper size doesn't seem to affect the origin.)
- bbox=commands.getoutput("echo|gs -sDEVICE=bbox bbox_test.ps 2>&1|grep BoundingBox")
+ bbox=getoutput("echo|gs -sDEVICE=bbox bbox_test.ps 2>&1|grep BoundingBox")
# (previous version used 'head -1' to take only the first page, but that can cause 'broken pipe' errors if the file contains too many pages, and will give an incorrect result if there is only one line per page and it is indented on the first page, so we'll look at ALL the pages and take the outermost bounds. Will also look at high-resolution bounding boxes only, if available.)
if "HiResBoundingBox" in bbox: bbox=filter(lambda x:"HiRes" in x,bbox.split("\n"))
else: bbox=bbox.split("\n")
@@ -206,4 +213,4 @@
os.unlink("bbox_test.ps")
existing_left_margin_mm = min(map(lambda x:x[0],bbox))*25.4/72
existing_top_margin_mm = paper_height*10-max(map(lambda x:x[3],bbox))*25.4/72
- print "dvips -T %dmm,%dmm -O %.1fmm,%.1fmm -x %d %s" % (paper_width,paper_height,margin_left - existing_left_margin_mm,margin_top - existing_top_margin_mm,1000*paper_magstep+0.5,sys.argv[3])
+ print("dvips -T %dmm,%dmm -O %.1fmm,%.1fmm -x %d %s" % (paper_width,paper_height,margin_left - existing_left_margin_mm,margin_top - existing_top_margin_mm,1000*paper_magstep+0.5,sys.argv[3]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-papersize.tlpobj new/tlpkg/tlpobj/latex-papersize.tlpobj
--- old/tlpkg/tlpobj/latex-papersize.tlpobj 2019-02-28 03:47:40.000000000 +0100
+++ new/tlpkg/tlpobj/latex-papersize.tlpobj 2019-12-15 01:53:41.000000000 +0100
@@ -1,6 +1,6 @@
name latex-papersize
category Package
-revision 42296
+revision 53131
shortdesc Calculate LaTeX settings for any font and paper size
longdesc The package is a Python script, whose typical use is when
longdesc preparing printed material for users with low vision. The most
@@ -12,7 +12,6 @@
runfiles size=3
texmf-dist/scripts/latex-papersize/latex-papersize.py
catalogue-ctan /support/latex-papersize
-catalogue-date 2018-01-06 12:14:59 +0100
catalogue-license apache2
catalogue-topics layout
-catalogue-version 1.62
+catalogue-version 1.63
++++++ latex-tds.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-tds.doc.tlpobj new/tlpkg/tlpobj/latex-tds.doc.tlpobj
--- old/tlpkg/tlpobj/latex-tds.doc.tlpobj 2019-02-28 03:47:44.000000000 +0100
+++ new/tlpkg/tlpobj/latex-tds.doc.tlpobj 2020-04-16 01:57:00.000000000 +0200
@@ -1,6 +1,6 @@
name latex-tds.doc
category Package
-revision 40613
+revision 54758
shortdesc doc files of latex-tds
relocated 1
docfiles size=50
++++++ latex-tds.source.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-tds.source.tlpobj new/tlpkg/tlpobj/latex-tds.source.tlpobj
--- old/tlpkg/tlpobj/latex-tds.source.tlpobj 2019-02-28 03:47:44.000000000 +0100
+++ new/tlpkg/tlpobj/latex-tds.source.tlpobj 2020-04-16 01:57:00.000000000 +0200
@@ -1,6 +1,6 @@
name latex-tds.source
category Package
-revision 40613
+revision 54758
shortdesc source files of latex-tds
relocated 1
srcfiles size=112
++++++ latex-via-exemplos.doc.tar.xz ++++++
++++ 5419 lines of diff (skipped)
++++++ latex.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/latex.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new.3606/latex.doc.tar.xz differ: char 25, line 1
++++++ latex.tar.xz ++++++
++++ 13741 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package google-compute-engine for openSUSE:Factory checked in at 2020-05-29 21:18:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-compute-engine (Old)
and /work/SRC/openSUSE:Factory/.google-compute-engine.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-compute-engine"
Fri May 29 21:18:15 2020 rev:21 rq:810012 version:20190801
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-compute-engine/google-compute-engine.changes 2020-05-05 19:08:45.107104883 +0200
+++ /work/SRC/openSUSE:Factory/.google-compute-engine.new.3606/google-compute-engine.changes 2020-05-29 21:29:22.289220070 +0200
@@ -5 +5,2 @@
- + Do not add the created user to the adm, docker, or lxd groups
+ + Do not add the created user to the adm (CVE-2020-8903),
+ docker (CVE-2020-8907), or lxd (CVE-2020-8933) groups
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0
Hello community,
here is the log from the commit of package texlive-specs-l for openSUSE:Factory checked in at 2020-05-29 21:17:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-l (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-l.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-l"
Fri May 29 21:17:59 2020 rev:39 rq:806898 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-l/texlive-specs-l.changes 2019-11-07 23:10:57.888167258 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-l.new.3606/texlive-specs-l.changes 2020-05-29 21:28:31.277068223 +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:
----
ifetex.doc.tar.xz
ifetex.tar.xz
ifluatex.doc.tar.xz
ifluatex.tar.xz
ifxetex.doc.tar.xz
ifxetex.tar.xz
New:
----
hu-berlin-bundle.doc.tar.xz
hu-berlin-bundle.tar.xz
hvqrurl.doc.tar.xz
hvqrurl.tar.xz
hycolor.doc.tar.xz
hycolor.tar.xz
hyphen-macedonian.tar.xz
infwarerr.doc.tar.xz
infwarerr.tar.xz
inkpaper.doc.tar.xz
inkpaper.tar.xz
inputenx.doc.tar.xz
inputenx.tar.xz
intcalc.doc.tar.xz
intcalc.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-l.spec ++++++
++++ 12279 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-l/texlive-specs-l.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-l.new.3606/texlive-specs-l.spec
++++++ hvfloat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/Changes new/doc/latex/hvfloat/Changes
--- old/doc/latex/hvfloat/Changes 2019-04-07 23:26:37.000000000 +0200
+++ new/doc/latex/hvfloat/Changes 2019-09-01 23:36:30.000000000 +0200
@@ -1,4 +1,10 @@
hvfloat.sty:
+2.16 2019-08-31 - fix for \hvFloat* and full page images
+2.15 2019-05-13 - added optional arguments capFormat and subcapFormat
+ which will pass the key values to \caption or
+ \subcaption from package caption/subcaption
+2.14 2019-05-10 - changed floatCapSep into a dimen
+2.13 2019-04-08 - fix for trailing spaces
2.12a 2019-04-04 - fix for wrong index
2.12 2019-04-04 - added option left/right for twocolumn mode
2.11 2019-03-29 - fix for sub float pages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/README new/doc/latex/hvfloat/README
--- old/doc/latex/hvfloat/README 2019-04-07 23:26:37.000000000 +0200
+++ new/doc/latex/hvfloat/README 2019-05-10 23:15:26.000000000 +0200
@@ -1,10 +1,18 @@
hvfloat
-hv-float-fps (float placement setting)
+hvfloat-fps (float placement setting)
+hvfloat
Placing figures/tables with various options, like rotating
-the image/table and/or caption.
+the image/table and/or caption. Placing object and caption
+side by side in one- and twocolumn mode. Fullpage objects
+with captions on the preceeding or following page in
+one- and twocolumn mode.
+hvfloat-fps
+Simple global placement setting for floats
%% 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.
+
+hvoss(a)tug.org
\ No newline at end of file
Binary files old/doc/latex/hvfloat/after1s1c.pdf and new/doc/latex/hvfloat/after1s1c.pdf differ
Binary files old/doc/latex/hvfloat/after2s2c.pdf and new/doc/latex/hvfloat/after2s2c.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/after2s2c.tex new/doc/latex/hvfloat/after2s2c.tex
--- old/doc/latex/hvfloat/after2s2c.tex 2019-04-04 22:52:35.000000000 +0200
+++ new/doc/latex/hvfloat/after2s2c.tex 2019-09-01 23:36:30.000000000 +0200
@@ -74,7 +74,7 @@
\blinddocument
-\Blindtext
+\Blindtext \Blindtext
\end{document}
\ No newline at end of file
Binary files old/doc/latex/hvfloat/default1s1c.pdf and new/doc/latex/hvfloat/default1s1c.pdf differ
Binary files old/doc/latex/hvfloat/default1s2c.pdf and new/doc/latex/hvfloat/default1s2c.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/default1s2c.tex new/doc/latex/hvfloat/default1s2c.tex
--- old/doc/latex/hvfloat/default1s2c.tex 2019-04-04 22:52:35.000000000 +0200
+++ new/doc/latex/hvfloat/default1s2c.tex 2019-09-01 23:36:30.000000000 +0200
@@ -19,19 +19,18 @@
\hvFloat*[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
+ {A default caption of a ``default'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{fig:0}
\end{lstlisting}
-
\Float[default star]
\hvFloat*[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
+ {A default caption of a ``default'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
@@ -45,19 +44,17 @@
\hvFloat[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
+ {A default caption of a ``default'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.}%
{fig:1}
\end{lstlisting}
-
\Float[default]
\hvFloat[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
- is a ``left'' caption which means that it always appears before the object.}%
- {fig:1}
+ {A default caption of a ``default'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.}{fig1}
\blinddocument
@@ -66,4 +63,6 @@
\blindtext
-\end{document}
\ No newline at end of file
+\end{document}
+
+
Binary files old/doc/latex/hvfloat/default2s1c.pdf and new/doc/latex/hvfloat/default2s1c.pdf differ
Binary files old/doc/latex/hvfloat/default2s2c.pdf and new/doc/latex/hvfloat/default2s2c.pdf differ
Binary files old/doc/latex/hvfloat/even1s1c.pdf and new/doc/latex/hvfloat/even1s1c.pdf differ
Binary files old/doc/latex/hvfloat/even1s2c.pdf and new/doc/latex/hvfloat/even1s2c.pdf differ
Binary files old/doc/latex/hvfloat/even2s1c.pdf and new/doc/latex/hvfloat/even2s1c.pdf differ
Binary files old/doc/latex/hvfloat/even2s2c.pdf and new/doc/latex/hvfloat/even2s2c.pdf differ
Binary files old/doc/latex/hvfloat/fullpage1s2c.pdf and new/doc/latex/hvfloat/fullpage1s2c.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/fullpage1s2c.tex new/doc/latex/hvfloat/fullpage1s2c.tex
--- old/doc/latex/hvfloat/fullpage1s2c.tex 2019-04-04 22:52:35.000000000 +0200
+++ new/doc/latex/hvfloat/fullpage1s2c.tex 2019-09-01 23:36:30.000000000 +0200
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: fullpage1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: fullpage1s2c.tex 1072 2019-06-09 14:14:19Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -16,7 +16,7 @@
\subsection{\texttt{fullpage}}
\blindtext
-
+\blindtext
\verb|\includegraphics[fullpage]{tiger}|
\includegraphics[fullpage]{tiger}
Binary files old/doc/latex/hvfloat/hvfloat.pdf and new/doc/latex/hvfloat/hvfloat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/hvfloat.tex new/doc/latex/hvfloat/hvfloat.tex
--- old/doc/latex/hvfloat/hvfloat.tex 2019-04-07 23:26:37.000000000 +0200
+++ new/doc/latex/hvfloat/hvfloat.tex 2019-09-01 23:36:30.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 1038 2019-04-07 12:15:53Z herbert $
+%% $Id: hvfloat.tex 1072 2019-06-09 14:14:19Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4]{scrartcl}
@@ -33,6 +33,7 @@
\usepackage{graphicx}
\usepackage{placeins}
+\usepackage{ragged2e}
\usepackage{xcolor}
\usepackage{url}
\usepackage{booktabs,xltabular}
@@ -321,7 +322,7 @@
\Lkeyword{objectAngle} & 0 & The value for the angle if the object should be rotated. Counted anti clockwise.\\
-\Lkeyword{floatCapSep} & 5 & The additional width between the object and a left or right placed caption. The default unit is \texttt{pt}.\\
+\Lkeyword{floatCapSep} & 5pt & The additional width between the object and a left or right placed caption.\\
\Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \Lcs{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
@@ -333,6 +334,10 @@
\Lkeyword{objectFrame} & false & put a frame with no separation around the float object.\\
\Lkeyword{style} & --- & Use a defined style\\
+
+\Lkeyword{capFormat} & --- & Define formatting options for \Lcs{caption} (see documentation of package \Lpack{caption}).\\
+
+\Lkeyword{subcapFormat} & --- & Define formatting options for \Lcs{subcaption}.\\
\end{xltabular}
@@ -783,12 +788,32 @@
]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6}
+\section{Caption format}
+The \Lcs{caption} and \Lcs{subcaption} macros are fully under the control of the package \Lpack{caption}.
+The formatting can be set with the macros \Lcs{captionsetup}, \Lcs{subcaptionsetup}, or via the optional
+argument setting of \Lcs{hvFloat} with the keywords \Lkeyword{capFormat} and \Lkeyword{subcapFormat}.
+The argument itself will then be used internally by \Lcs{captionsetup} and/or \Lcs{subcaptionsetup}
+in a minipage, the reason why it will be local to the current image..
+
+\begin{lstlisting}
+\hvFloat[%
+ capPos=right,
+ capFormat={labelsep=newline,justification=RaggedRight,font={small,it},labelfont=bf}
+]{figure}{\frame{\includegraphics{images/rose}}}{\blindtext}{fig:66}
+\end{lstlisting}
+
+\Float
+\hvFloat[%
+ capPos=right,
+ capFormat={labelsep=newline,justification=RaggedRight,font={small,it},labelfont=bf}
+]{figure}{\frame{\includegraphics{images/rose}}}{\blindtext}{fig:66}
+
\section{Horizontal Position of the Float}
The caption is always near the object, only divided by the length \Ldim{floatCapSep}
which can be set by the keyword of the same name \Lkeyword{floatCapSep}. It accepts only
-a decimal number and is preset to 5. The default unit is \texttt{pt} and cannot be changed.
+a value with any allowed unit. %The default unit is \texttt{pt} and cannot be changed.
The keyword \Lkeyword{objectPos} refers always to the complete floating object: caption
\emph{and} object. The meaning of \Lkeyset{objectPos=left} is: Put the object as far as possible to the
left margin. If \Lkeyset{capPos=left} is also used, then the caption is at the left margin followed by
@@ -959,6 +984,32 @@
Caption at top inner beside the float and object position right and
the option \texttt{wide}.}{fig:811}
+The caption can be typeset completely into the margin with:
+
+\begin{lstlisting}
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\end{lstlisting}
+
+%\Float[capPos=outer]
+
+\begingroup
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\endgroup
+
\section{The star version \Lcs{hvFloat*}}\label{star-version0}
Binary files old/doc/latex/hvfloat/inner1s2c.pdf and new/doc/latex/hvfloat/inner1s2c.pdf differ
Binary files old/doc/latex/hvfloat/inner2s1c.pdf and new/doc/latex/hvfloat/inner2s1c.pdf differ
Binary files old/doc/latex/hvfloat/inner2s2c.pdf and new/doc/latex/hvfloat/inner2s2c.pdf differ
Binary files old/doc/latex/hvfloat/left2s2c.pdf and new/doc/latex/hvfloat/left2s2c.pdf differ
Binary files old/doc/latex/hvfloat/multi-after1s1c.pdf and new/doc/latex/hvfloat/multi-after1s1c.pdf differ
Binary files old/doc/latex/hvfloat/multi-default1s1c.pdf and new/doc/latex/hvfloat/multi-default1s1c.pdf differ
Binary files old/doc/latex/hvfloat/multi-default1s2c.pdf and new/doc/latex/hvfloat/multi-default1s2c.pdf differ
Binary files old/doc/latex/hvfloat/multi-default2s1c.pdf and new/doc/latex/hvfloat/multi-default2s1c.pdf differ
Binary files old/doc/latex/hvfloat/multi-default2s2c.pdf and new/doc/latex/hvfloat/multi-default2s2c.pdf differ
Binary files old/doc/latex/hvfloat/multi-inner2s2c.pdf and new/doc/latex/hvfloat/multi-inner2s2c.pdf differ
Binary files old/doc/latex/hvfloat/multi-outer2s2c.pdf and new/doc/latex/hvfloat/multi-outer2s2c.pdf differ
Binary files old/doc/latex/hvfloat/multi-right1s1c.pdf and new/doc/latex/hvfloat/multi-right1s1c.pdf differ
Binary files old/doc/latex/hvfloat/odd1s1c.pdf and new/doc/latex/hvfloat/odd1s1c.pdf differ
Binary files old/doc/latex/hvfloat/odd1s2c.pdf and new/doc/latex/hvfloat/odd1s2c.pdf differ
Binary files old/doc/latex/hvfloat/odd2s1c.pdf and new/doc/latex/hvfloat/odd2s1c.pdf differ
Binary files old/doc/latex/hvfloat/odd2s2c.pdf and new/doc/latex/hvfloat/odd2s2c.pdf differ
Binary files old/doc/latex/hvfloat/outer1s2c.pdf and new/doc/latex/hvfloat/outer1s2c.pdf differ
Binary files old/doc/latex/hvfloat/outer2s1c.pdf and new/doc/latex/hvfloat/outer2s1c.pdf differ
Binary files old/doc/latex/hvfloat/outer2s2c.pdf and new/doc/latex/hvfloat/outer2s2c.pdf differ
Binary files old/doc/latex/hvfloat/paper-after1s1c.pdf and new/doc/latex/hvfloat/paper-after1s1c.pdf differ
Binary files old/doc/latex/hvfloat/paper-default1s1c.pdf and new/doc/latex/hvfloat/paper-default1s1c.pdf differ
Binary files old/doc/latex/hvfloat/paper-default1s2c.pdf and new/doc/latex/hvfloat/paper-default1s2c.pdf differ
Binary files old/doc/latex/hvfloat/paper-default2s2c.pdf and new/doc/latex/hvfloat/paper-default2s2c.pdf differ
Binary files old/doc/latex/hvfloat/paper-inner2s2c.pdf and new/doc/latex/hvfloat/paper-inner2s2c.pdf differ
Binary files old/doc/latex/hvfloat/paper-right1s1c.pdf and new/doc/latex/hvfloat/paper-right1s1c.pdf differ
Binary files old/doc/latex/hvfloat/right1s1c.pdf and new/doc/latex/hvfloat/right1s1c.pdf differ
Binary files old/doc/latex/hvfloat/right1s2c.pdf and new/doc/latex/hvfloat/right1s2c.pdf differ
Binary files old/doc/latex/hvfloat/right2s1c.pdf and new/doc/latex/hvfloat/right2s1c.pdf differ
Binary files old/doc/latex/hvfloat/right2s2c.pdf and new/doc/latex/hvfloat/right2s2c.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hvfloat/right2s2c.tex new/doc/latex/hvfloat/right2s2c.tex
--- old/doc/latex/hvfloat/right2s2c.tex 2019-04-04 22:52:35.000000000 +0200
+++ new/doc/latex/hvfloat/right2s2c.tex 2019-09-01 23:36:30.000000000 +0200
@@ -74,7 +74,7 @@
\blinddocument
-\Blindtext
+\Blindtext \Blindtext
\end{document}
\ No newline at end of file
Binary files old/doc/latex/hvfloat/sub-after1s1c.pdf and new/doc/latex/hvfloat/sub-after1s1c.pdf differ
Binary files old/doc/latex/hvfloat/sub-after2s2c.pdf and new/doc/latex/hvfloat/sub-after2s2c.pdf differ
Binary files old/doc/latex/hvfloat/sub-default1s1c.pdf and new/doc/latex/hvfloat/sub-default1s1c.pdf differ
Binary files old/doc/latex/hvfloat/sub-default1s2c.pdf and new/doc/latex/hvfloat/sub-default1s2c.pdf differ
Binary files old/doc/latex/hvfloat/sub-default2s2c.pdf and new/doc/latex/hvfloat/sub-default2s2c.pdf differ
Binary files old/doc/latex/hvfloat/sub-right1s1c.pdf and new/doc/latex/hvfloat/sub-right1s1c.pdf differ
Binary files old/doc/latex/hvfloat/sub-right1s2c.pdf and new/doc/latex/hvfloat/sub-right1s2c.pdf differ
Binary files old/doc/latex/hvfloat/sub-right2s2c.pdf and new/doc/latex/hvfloat/sub-right2s2c.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hvfloat.doc.tlpobj new/tlpkg/tlpobj/hvfloat.doc.tlpobj
--- old/tlpkg/tlpobj/hvfloat.doc.tlpobj 2019-04-08 01:39:43.000000000 +0200
+++ new/tlpkg/tlpobj/hvfloat.doc.tlpobj 2019-09-02 01:56:27.000000000 +0200
@@ -1,9 +1,9 @@
name hvfloat.doc
category Package
-revision 50846
+revision 52010
shortdesc doc files of hvfloat
relocated 1
-docfiles size=2180
+docfiles size=2100
RELOC/doc/latex/hvfloat/CTAN.png
RELOC/doc/latex/hvfloat/Changes
RELOC/doc/latex/hvfloat/README
++++++ hvfloat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hvfloat/hvfloat.sty new/tex/latex/hvfloat/hvfloat.sty
--- old/tex/latex/hvfloat/hvfloat.sty 2019-04-07 23:26:37.000000000 +0200
+++ new/tex/latex/hvfloat/hvfloat.sty 2019-09-01 23:36:30.000000000 +0200
@@ -1,7 +1,7 @@
-%% $Id: hvfloat.sty 1039 2019-04-07 12:20:01Z herbert $
+%% $Id: hvfloat.sty 1054 2019-05-13 08:20:11Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat}[2019/02/03 rotating of floating objects]
+\ProvidesPackage{hvfloat}[2019/05/13 rotating of floating objects]
%%
%% IMPORTANT NOTICE:
%%
@@ -16,8 +16,8 @@
%% DESCRIPTION:
%% `hvfloat' offers rotating of captions and objects for floats
%%
-\def\fileversion{2.12a}
-\def\filedate{2019/04/07}
+\def\fileversion{2.15}
+\def\filedate{2019/08/31}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\let\hvFileVersion\fileversion
%
@@ -119,7 +119,7 @@
\define@key{hvSet}{objectAngle}[0]{% -360..+360
\def\hvSet@objectAngle{#1}%
}
-\define@key{hvSet}{floatCapSep}[5]{% a width with the unit pt
+\define@key{hvSet}{floatCapSep}[5pt]{% a width with the unit pt
\def\hvSet@floatCapSep{#1}%
}
\define@key{hvSet}{multiFloatSkip}[\normalbaselineskip]{% a width with the unit pt
@@ -129,9 +129,18 @@
\define@boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment
\define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text
\define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text
-\define@boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page
+
+
+\newif\ifhv@fullpage
+\newif\ifhv@FULLPAGE
+
+%\define@boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page
%\define@boolkey{hvSet}[hv@]{FullPage}[true]{}% fullpage float with caption on other page
-\define@boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page
+%\define@boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page
+
+\define@key{hvSet}{fullpage}[true]{\global\@nameuse{hv@fullpage#1}}% wegen \afterpage problem
+\define@key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv@FULLPAGE#1}}
+
\define@boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats
\ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi%
}%
@@ -146,6 +155,9 @@
{\begingroup
\edef\x{\endgroup\noexpand\setkeys{hvSet}{\@nameuse{hv@#1}}}\x}% use a defined style
}
+\define@key{hvSet}{capFormat}[]{\def\hv@caption@format{#1}}%
+\define@key{hvSet}{subcapFormat}[]{\def\hv@subcaption@format{#1}}%
+
\def\hv@set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
\let\hvFloatSet\hv@set
%
@@ -155,14 +167,17 @@
\hv@set{%
floatPos=htbp, rotAngle=0, capWidth=n, capAngle=0,
capPos=bottom, capVPos=center, objectPos=center, objectAngle=0,
- floatCapSep=5, useOBox=false, nonFloat=false,
+ floatCapSep=5pt, useOBox=false, nonFloat=false,
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
multiFloat=false,subFloat=false,
separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
+ capFormat={}, subcapFormat={},
}%
}
\newcommand\reset@special@float{%
- \hv@set{subFloat=false,fullpage=false,multiFloat=false,FULLPAGE=false}}
+ \hv@set{subFloat=false,%fullpage=false,
+ multiFloat=false,%FULLPAGE=false
+}}
\def\hv@vskip{\vspace{\hvMultiFloatSkip}}
@@ -188,9 +203,15 @@
}
%
\newcommand\figcaption[2][]{\def\@captype{figure}%
- \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup}
+ \begingroup
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \endgroup}
\newcommand\tabcaption[2][]{\def\@captype{table}%
- \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup}
+ \begingroup
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \endgroup}
%
\newlength\hv@maxImageWidth
\AtBeginDocument{\hv@maxImageWidth=\columnwidth}
@@ -271,8 +292,8 @@
\setDefaults
\def\hvFloat{\@ifnextchar*% Main macro
- {\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}%
- {\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}%
+ {\global\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}%
+ {\global\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}%
}
%\newcommand*{\hvFloat}[5][]+{%
@@ -289,7 +310,7 @@
\begingroup
\setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv@maxImageWidth=\textwidth
- \hv@capbesidefalse
+% \hv@capbesidefalse
\reset@special@float
\setcounter{hv@pfigure}{\value{figure}}%
\setcounter{hv@ptable}{\value{table}}%
@@ -361,7 +382,7 @@
\def\hvFloat@ii[#1]#2#3{%
\hv@maxImageWidth=\textwidth
- \hv@capbesidefalse
+% \hv@capbesidefalse
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
\gdef\hv@floatType{#2}%
\ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi
@@ -417,9 +438,13 @@
\ifx\hvSet@capWidth\hv@Natural% captionwidth=\linewidth-\objectwidth-separation
\ifhv@capbeside
\ifhv@wide
- \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+ \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
\else
- \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+ \ifhv@star
+ \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
+ \else
+ \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
+ \fi
\fi
\else
\setlength\hvCapWidth{\columnwidth}%
@@ -428,10 +453,10 @@
\ifhv@capbeside
\ifhv@wide
\setlength\hvCapWidth{\hvSet@capWidth\hvWideWidth}%
- \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+ \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
\else
\setlength\hvCapWidth{\hvSet@capWidth\columnwidth}%
- \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+ \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
\fi
\ifdim\hvCapWidth>\@tempdima
\setlength\hvCapWidth{\@tempdima}%
@@ -450,6 +475,7 @@
\ifx\hvSet@capAngle\hv@Zero % need rotation?
\sbox\hvCaptionBox{% NO rotation
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
\ifhv@onlyText\hv@longCap
\else
@@ -470,6 +496,7 @@
\sbox\hvCaptionBox{% Rotation
\rotatebox{\hvSet@capAngle}{%
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
\ifhv@onlyText\hv@longCap
\else
@@ -496,11 +523,14 @@
\def\fps@figure{\hvSet@floatPos}%
\ifhv@nonFloat
\begingroup% Start the nonfloat part
- \checkoddpage
- \else
- \begin{\hv@floatType}% Start the floating environment
- \checkoddpage
+ \else
+ \ifhv@star
+ \@nameuse{\hv@floatType*}% Start the floating environment *****************************
+ \else
+ \begin{\hv@floatType} % Start the floating environment
+ \fi
\fi
+ \checkoddpage
\ifx\hvSet@objectPos\hv@Right\raggedleft\fi
\ifx\hvSet@objectPos\hv@Center
\ifhv@nonFloat\hspace*{\fill}\else\centering\fi
@@ -551,24 +581,24 @@
\fi
\fi
%%%%
- \savebox{\@tempboxa}{%
- \expandafter\ifcase\the\hv@@capPos % 0 is LEFT START \ifcase
+ \savebox{\@tempboxa}{% ***** @tempbox start
+ \expandafter\ifcase\the\hv@@capPos% 0 is LEFT START \ifcase
\ifx\hvSet@capVPos\hv@Center
\put@CaptionBox
- \hspace{\hvSet@floatCapSep pt}% capfloatsep
+ \hspace{\hvSet@floatCapSep}% capfloatsep
\put@ObjectBox
\else
\ifx\hvSet@capVPos\hv@Top% caption and object at top aligned
- \put@CaptionBox[1]
- \hspace{\hvSet@floatCapSep pt}% capfloatsep
- \put@ObjectBox[1]
+ \put@CaptionBox[1]%
+ \hspace{\hvSet@floatCapSep}% capfloatsep
+ \put@ObjectBox[1]%
\else% caption on bottom
- \put@CaptionBox[2]
- \hspace{\hvSet@floatCapSep pt}% capfloatsep
- \put@ObjectBox[2]
+ \put@CaptionBox[2]%
+ \hspace{\hvSet@floatCapSep}% capfloatsep
+ \put@ObjectBox[2]%
\fi
\fi% end caption left
- \or %1 is top
+ \or%1 is top
\ifdim\wd\hvCaptionBox>\wd\hvObjectBox
\begin{minipage}{\wd\hvCaptionBox}%
\else
@@ -586,17 +616,17 @@
\or %2 is right
\ifx\hvSet@capVPos\hv@Center
\put@ObjectBox
- \hspace{\hvSet@floatCapSep pt}%
+ \hspace{\hvSet@floatCapSep}%
\put@CaptionBox
\else
\ifx\hvSet@capVPos\hv@Top
- \put@ObjectBox[1]
- \hspace{\hvSet@floatCapSep pt}% capfloatsep
- \put@CaptionBox[1]
+ \put@ObjectBox[1]%
+ \hspace{\hvSet@floatCapSep}% capfloatsep
+ \put@CaptionBox[1]%
\else
- \put@ObjectBox[2]
- \hspace{\hvSet@floatCapSep pt}% capfloatsep
- \put@CaptionBox[2]
+ \put@ObjectBox[2]%
+ \hspace{\hvSet@floatCapSep}% capfloatsep
+ \put@CaptionBox[2]%
\fi
\fi
\or %3 bottom
@@ -613,9 +643,9 @@
\ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[\hvAboveCaptionSkip]%
\usebox{\hvCaptionBox}%
\fi
- \end{minipage}
+ \end{minipage}%
\fi% \ifcase\the\hv@@capPos
- }% End savebox Object and caption
+ }% End savebox Object and caption %%%%%%%%%%%%%%%%% @tempboxa
%
% now we rotate the object and caption, if needed
%
@@ -635,7 +665,11 @@
\fi
\endgroup% End the nonfloat part
\else
- \end{\hv@floatType}% End the floating environment
+ \ifhv@star
+ \@nameuse{end\hv@floatType*}% End the floating environment
+ \else
+ \end{\hv@floatType}% End the floating environment
+ \fi
\fi
\endgroup% startet at main \hvFloat
}
@@ -712,7 +746,7 @@
\else % onecolumn
\ifoddpage
\setPageObject\setBottomCaption
- \else
+ \else% even page
\afterpage{\setPageObject\setBottomCaption}%
\fi
\fi
@@ -844,6 +878,7 @@
\def\getMultiCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\hv@cntb=\clist_count:N\l_clist_Type
@@ -868,6 +903,7 @@
}
\def\getMultiObjectAndLabel{%
\global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifx\hvSet@objectPos\hv@Right\raggedleft\else
\ifx\hvSet@objectPos\hv@Left\raggedleft\else
\ifx\hvSet@objectPos\hv@Center\centering
@@ -893,6 +929,7 @@
\def\getMultiSubCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
@@ -909,6 +946,7 @@
\def\getMultiSubObjectAndLabel{%
\global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \ifx\relax\hv@subcaption@format\relax\else\captionsetup[sub]{\hv@subcaption@format}\fi
\ifx\hvSet@objectPos\hv@Right\raggedleft\else
\ifx\hvSet@objectPos\hv@Left\raggedleft\else
\ifx\hvSet@objectPos\hv@Center\centering
@@ -949,6 +987,7 @@
\def\getSingleCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\edef\@captype{\hv@floatType}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hvfloat.tlpobj new/tlpkg/tlpobj/hvfloat.tlpobj
--- old/tlpkg/tlpobj/hvfloat.tlpobj 2019-04-08 01:39:46.000000000 +0200
+++ new/tlpkg/tlpobj/hvfloat.tlpobj 2019-09-02 01:56:29.000000000 +0200
@@ -1,6 +1,6 @@
name hvfloat
category Package
-revision 50846
+revision 52010
shortdesc Rotating caption and object of floats independently
relocated 1
longdesc This package defines a macro to place objects (tables and
@@ -17,7 +17,7 @@
RELOC/tex/latex/hvfloat/hvfloat.sty
catalogue-also rotating
catalogue-ctan /macros/latex/contrib/hvfloat
-catalogue-date 2019-04-07 17:12:28 +0200
+catalogue-date 2019-08-31 22:21:28 +0200
catalogue-license lppl
catalogue-topics float box-manip
-catalogue-version 2.12a
+catalogue-version 2.16
++++++ hypdvips.doc.tar.xz ++++++
++++ 4897 lines of diff (skipped)
++++++ hypdvips.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hypdvips/hypdvips.sty new/tex/latex/hypdvips/hypdvips.sty
--- old/tex/latex/hypdvips/hypdvips.sty 2014-06-24 01:28:40.000000000 +0200
+++ new/tex/latex/hypdvips/hypdvips.sty 2019-08-01 23:19:05.000000000 +0200
@@ -1,6 +1,6 @@
%%
%% This is file `hypdvips.sty',
-%% Copyright 2008-2014 Raimund Niedrist
+%% Copyright 2008-2019 Raimund Niedrist
%%
%% With portions written by Donald Arsenau, David Carlisle, Steven
%% Douglas Cochran, Toby Cubitt, Geoffrey Keating, Heiko Oberdiek,
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypdvips}
- [2014/06/22 v3.02
+ [2019/07/31 v3.03
Hyperref extensions for use with dvips]
\@ifpackageloaded{hyperref}
{
@@ -407,7 +407,7 @@
\pp@PScatcodes
\pp@HeaderPS{
true setglobal
- /pp.globaldict 8 dict def
+ /pp.globaldict 10 dict def
pp.globaldict /pp.gsborderwarning true put
pp.globaldict /pp.starttime realtime put
pp.globaldict /pp.warncount 0 put
@@ -782,6 +782,7 @@
} def
/pp.appendef {pop pop} def
/pp.putefnametree {} def
+ /pp.adddest {} def
%
% substitute for /EMBED-pdfmark:
%
@@ -817,6 +818,36 @@
/pp.appendef {pp.subst.appendef} def
/pp.putefnametree {pp.subst.putefnametree} def
} def
+%
+% substitute for /DEST-pdfmark:
+%
+ /pp.subst.adddest
+ {
+ true setglobal
+ View length 1 add array
+ false setglobal
+ dup 0 pp.globaldict /pp.currentpage get put
+ dup 1 View putinterval
+ pp.globaldict /pp.dests get exch Dest exch put
+ mark
+ {Catalog}
+ <<
+ /Dests pp.globaldict /pp.dests get
+ >>
+ /PUT pp.backup.pdfmark
+ } def
+ /pp.substDESTpdfmark
+ {
+ true setglobal
+ SDict /pp.globaldict get /pp.dests 65534 dict put
+ SDict /pp.globaldict get /pp.currentpage 0 put
+ false setglobal
+ userdict /eop-hook
+ {
+ SDict /pp.globaldict get dup /pp.currentpage get 1 add /pp.currentpage exch put
+ } put
+ /pp.adddest {pp.subst.adddest} def
+ } def
/pp.strippt % arguments: string
{
(pt) search
@@ -1107,6 +1138,14 @@
} def
/pp.writebrokenlink % arguments: /ANN-pdfmark with /Rect as last entry and without /ANN
{
+ counttomark 1 sub index /_objdef eq
+ {
+ counttomark -2 roll dup wcheck
+ {readonly counttomark 2 roll}
+ {pop pop}
+ ifelse
+ }
+ if
counttomark 1 add copy
pop pp.currentrect
/ANN pp.backup.pdfmark
@@ -1227,6 +1266,7 @@
ifelse
}
if
+ pp.adddest
end
currentdict /pp.pdfmarkcontent undef
}
@@ -1708,10 +1748,9 @@
{
dup 0 get 47 eq % /
{
- 1 1 index length 1 sub getinterval
+ 1 1 index length 1 sub getinterval cvn
}
if
- cvn
}
if
}
@@ -1869,10 +1908,11 @@
if
}
if
- product (AFPL Ghostscript) eq
- product (GPL Ghostscript) eq or
+ product (Ghostscript) search
{
- pp.substEMBEDpdfmark
+ pop pop pop
+ revision 914 lt {pp.substEMBEDpdfmark} if
+ revision 914 eq {pp.substDESTpdfmark} if
/BorderArrayPatch
{
[ exch
@@ -1897,7 +1937,10 @@
forall ]
} def
}
- if
+ {
+ pop
+ }
+ ifelse
<<
/DeferredMediaSelection true
/PageSize [\strip@pt\paperwidth\space pp.ptToBP \strip@pt\paperheight\space pp.ptToBP]
@@ -2287,8 +2330,16 @@
{\def\Hy@numberline#1{#1\autodot~}}
\bookmarkdefinestyle{pp@bmstyle@empty}{italic=false,bold=false,color={},rellevel=0,keeplevel=true}
-\let\pp@backup@@startsection\@startsection
-\def\@startsection#1#2#3#4#5#6{%
+\@ifundefined{scr@startsection}
+ {
+ \let\pp@backup@@startsection\@startsection
+ \def\@startsection{\pp@startsection}
+ }
+ {
+ \let\pp@backup@@startsection\scr@startsection
+ \def\scr@startsection{\pp@startsection}
+ }
+\def\pp@startsection#1#2#3#4#5#6{%
\bookmarksetup{style=pp@bmstyle@empty}%
\ifx\@M#2%
\xdef\BKM@currentlevel{1}%
@@ -3072,7 +3123,7 @@
\csname l@#1\endcsname{#2}{#3}%
\or % section
\csname l@#1\endcsname{%
- \hyper@@link{}{\Hy@tocdestname}{#2}
+ \hyper@@link{}{\Hy@tocdestname}{#2}%
}{#3}%
\or % page
\def\Hy@temp{#3}%
@@ -3080,20 +3131,20 @@
\csname l@#1\endcsname{#2}{#3}%
\else
\csname l@#1\endcsname{{#2}}{%
- \hyper@@link{}{\Hy@tocdestname}{#3}
+ \hyper@@link{}{\Hy@tocdestname}{#3}%
}%
\fi
\else % all
\def\Hy@temp{#3}%
\ifx\Hy@temp\ltx@empty
\csname l@#1\endcsname{%
- \hyper@@link{}{\Hy@tocdestname}{#2}
+ \hyper@@link{}{\Hy@tocdestname}{#2}%
}{}%
\else
\csname l@#1\endcsname{%
- \hyper@@link{}{\Hy@tocdestname}{#2}
+ \hyper@@link{}{\Hy@tocdestname}{#2}%
}{%
- \hyper@@link{}{\Hy@tocdestname}{#3}
+ \hyper@@link{}{\Hy@tocdestname}{#3}%
}%
\fi
\fi
@@ -3582,7 +3633,8 @@
\fi%
\else
\pp@tabbutton%
- \fi%
+ \fi%
+ \normalsize\hskip1pt%
}
\edef\@tablenotecolor{\@linkcolor}
@@ -3598,7 +3650,7 @@
pdfmark=/DEST,%
linktype=anchor,%
View={/\@pdfview \@pdfviewparams},%
- Dest={\(a)currentHlabel.note: \pp@string}%
+ Dest={\@currentHlabel.note:\pp@string}%
}%
}%
\renewcommand{\tnote}[1]{%
@@ -3618,7 +3670,7 @@
BorderStyle=\@pdfborderstyle,%
Color=\@tablenotebordercolor,%
View={/\@pdfview \@pdfviewparams},%
- Dest={\(a)currentHlabel.note: \pp@string}%
+ Dest={\@currentHlabel.note:\pp@string}%
}%
\fi}}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hypdvips.tlpobj new/tlpkg/tlpobj/hypdvips.tlpobj
--- old/tlpkg/tlpobj/hypdvips.tlpobj 2019-02-28 03:41:55.000000000 +0100
+++ new/tlpkg/tlpobj/hypdvips.tlpobj 2019-12-21 01:54:41.000000000 +0100
@@ -1,6 +1,6 @@
name hypdvips
category Package
-revision 34364
+revision 53197
shortdesc Hyperref extensions for use with dvips
relocated 1
longdesc The hypdvips package fixes some problems when using hyperref
@@ -13,7 +13,6 @@
RELOC/tex/latex/hypdvips/hypdvips.sty
catalogue-also breakurl
catalogue-ctan /macros/latex/contrib/hypdvips
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics hyper
-catalogue-version 3.02
+catalogue-version 3.03
++++++ hyperref.doc.tar.xz ++++++
++++ 8154 lines of diff (skipped)
++++++ hyperref.tar.xz ++++++
++++ 4380 lines of diff (skipped)
++++++ hyperxmp.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hyperxmp/README new/doc/latex/hyperxmp/README
--- old/doc/latex/hyperxmp/README 2019-04-02 23:12:27.000000000 +0200
+++ new/doc/latex/hyperxmp/README 2020-03-26 22:27:46.000000000 +0100
@@ -47,7 +47,7 @@
Copyright and license
=====================
-Copyright (C) 2019 Scott Pakin
+Copyright (C) 2011-2020 Scott Pakin
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3c of this license
Binary files old/doc/latex/hyperxmp/hyperxmp.pdf and new/doc/latex/hyperxmp/hyperxmp.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyperxmp.doc.tlpobj new/tlpkg/tlpobj/hyperxmp.doc.tlpobj
--- old/tlpkg/tlpobj/hyperxmp.doc.tlpobj 2019-04-06 23:33:04.000000000 +0200
+++ new/tlpkg/tlpobj/hyperxmp.doc.tlpobj 2020-04-16 01:56:59.000000000 +0200
@@ -1,8 +1,8 @@
name hyperxmp.doc
category Package
-revision 50812
+revision 54758
shortdesc doc files of hyperxmp
relocated 1
-docfiles size=161
+docfiles size=309
RELOC/doc/latex/hyperxmp/README
RELOC/doc/latex/hyperxmp/hyperxmp.pdf
++++++ hyperxmp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hyperxmp/hyperxmp.sty new/tex/latex/hyperxmp/hyperxmp.sty
--- old/tex/latex/hyperxmp/hyperxmp.sty 2019-04-06 23:11:36.000000000 +0200
+++ new/tex/latex/hyperxmp/hyperxmp.sty 2020-04-12 00:20:53.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2019 by Scott Pakin <scott+hyxmp(a)pakin.org>
+%% Copyright (C) 2011-2020 by Scott Pakin <scott+hyxmp(a)pakin.org>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3c of this license
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{hyperxmp}
- [2019/04/05 v4.1 Store hyperref metadata in XMP format]
+ [2020/04/08 v5.1 Store hyperref metadata in XMP format]
\edef\hyxmp@dq@code{\the\catcode`\"}
\catcode`\"=12
\def\hyxmp@driver{hpdftex}
@@ -36,8 +36,10 @@
\RequirePackage{pdfescape}
\RequirePackage{stringenc}
\RequirePackage{intcalc}
-\RequirePackage{ifxetex}
+\RequirePackage{iftex}
\RequirePackage{ifmtarg}
+\RequirePackage{etoolbox}
+\RequirePackage{ifthen}
\def\@ifmtargexp#1{\expandafter\@ifmtarg\expandafter{#1}}
\def\@ifnotmtargexp#1{\expandafter\@ifnotmtarg\expandafter{#1}}
\newcommand{\hyxmp@pdfstringdef}[2]{%
@@ -80,18 +82,72 @@
\define@key{Hyp}{pdfcaptionwriter}{\hyxmp@pdfstringdef\@pdfcaptionwriter{#1}}
\def\@pdfmetalang{}
\define@key{Hyp}{pdfmetalang}{\hyxmp@pdfstringdef\@pdfmetalang{#1}}
-\def\@pdfapart{1}
-\define@key{Hyp}{pdfapart}{\hyxmp@pdfstringdef\@pdfapart{#1}}
-\def\@pdfaconformance{B}
-\define@key{Hyp}{pdfaconformance}{\hyxmp@pdfstringdef\@pdfaconformance{#1}}
+\def\hyxmp@no@bad@parts#1\relax{%
+ \@ifnotmtarg{#1}{%
+ \PackageWarning{hyperxmp}{pdfapart and pdfuapart must be numeric}%
+ }%
+}
+\def\@pdfapart{}
+\define@key{Hyp}{pdfapart}{%
+ \afterassignment\hyxmp@no@bad@parts\@tempcnta=0#1\relax
+ \hyxmp@pdfstringdef\@pdfapart{\the\@tempcnta}%
+}
+\def\@pdfaconformance{}
+\define@key{Hyp}{pdfaconformance}{%
+ \uppercase{\hyxmp@pdfstringdef\@pdfaconformance{#1}}%
+}
+\def\@pdfuapart{}
+\define@key{Hyp}{pdfuapart}{%
+ \afterassignment\hyxmp@no@bad@parts\@tempcnta=0#1\relax
+ \hyxmp@pdfstringdef\@pdfuapart{\the\@tempcnta}%
+}
+\newcommand*{\hyxmp@set@pdfx@major}[1]{\hyxmp@set@pdfx@major@i#1!}
+\def\hyxmp@set@pdfx@major@i PDF/X-{%
+ \afterassignment\hyxmp@set@pdfx@major@ii
+ \@tempcnta=%
+}
+\def\hyxmp@set@pdfx@major@ii#1!{%
+ \edef\hyxmp@pdfx@major{\the\@tempcnta}%
+}
+\newcommand*\hyxmp@check@std[2]{%
+ \ifthenelse{\equal{#1}{#2}}%
+ {\global\let\next=\relax}%
+ {}%
+}%
+\def\@pdfxstandard{}
+\def\hyxmp@pdfx@major{}
+\define@key{Hyp}{pdfxstandard}{%
+ \hyxmp@pdfstringdef\@pdfxstandard{#1}%
+ \gdef\next{%
+ \PackageWarning{hyperxmp}{Unrecognized PDF/X standard `#1'}%
+ }%
+ \hyxmp@check@std{#1}{PDF/X-1a:2001}%
+ \hyxmp@check@std{#1}{PDF/X-1a:2003}%
+ \hyxmp@check@std{#1}{PDF/X-3:2002}%
+ \hyxmp@check@std{#1}{PDF/X-3:2003}%
+ \hyxmp@check@std{#1}{PDF/X-4}%
+ \hyxmp@check@std{#1}{PDF/X-4p}%
+ \hyxmp@check@std{#1}{PDF/X-5g}%
+ \hyxmp@check@std{#1}{PDF/X-5n}%
+ \hyxmp@check@std{#1}{PDF/X-5pg}%
+ \next
+ \hyxmp@set@pdfx@major{#1}%
+}
\edef\(a)pdfsource{\jobname.tex}
\define@key{Hyp}{pdfsource}{\hyxmp@pdfstringdef\@pdfsource{#1}}
\def\hyxmp@DocumentID{}
\define@key{Hyp}{pdfdocumentid}{\hyxmp@pdfstringdef\hyxmp@DocumentID{#1}}
\def\hyxmp@InstanceID{}
\define@key{Hyp}{pdfinstanceid}{\hyxmp@pdfstringdef\hyxmp@InstanceID{#1}}
-\def\@pdfversionid{}
+\def\@pdfversionid{1}
\define@key{Hyp}{pdfversionid}{\hyxmp@pdfstringdef\@pdfversionid{#1}}
+\RequirePackage{ifdraft}
+\ifdraft{%
+ \def\@pdfrendition{draft}%
+}{%
+ \def\@pdfrendition{default}%
+}
+\define@key{Hyp}{pdfrendition}{\hyxmp@pdfstringdef\@pdfrendition{#1}}
\def\@pdfpublication{}
\define@key{Hyp}{pdfpublication}{\hyxmp@pdfstringdef\@pdfpublication{#1}}
\def\@pdfpubtype{}
@@ -144,11 +200,31 @@
\define@key{Hyp}{pdfcontactemail}{\hyxmp@pdfstringdef\@pdfcontactemail{#1}}
\def\@pdfcontacturl{}
\define@key{Hyp}{pdfcontacturl}{\hyxmp@pdfstringdef\@pdfcontacturl{#1}}
-\def\hyxmp@suppress@pdf@metadata{%
- \global\let\PDF@FinishDoc=\@empty
+\def\hyxmp@no@info@lists{%
+ \def\hyxmp@suppress@pdf@info{%
+ \global\let\PDF@FinishDoc=\@empty
+ \PackageWarningNoLine{hyperxmp}{%
+ Suppressing the _entire_ PDF Info dictionary.\MessageBreak
+ Please notify the hyperxmp maintainer%
+ }%
+ }%
+ \let\next=\relax
+ \patchcmd
+ {\PDF@FinishDoc}%
+ {/Author(\@pdfauthor)}%
+ {}%
+ {}%
+ {\let\next=\hyxmp@suppress@pdf@info}%
+ \patchcmd
+ {\PDF@FinishDoc}%
+ {/Keywords(\@pdfkeywords)}%
+ {}%
+ {}%
+ {\let\next=\hyxmp@suppress@pdf@info}%
+ \next
}
\define@key{Hyp}{keeppdfinfo}[true]{%
- \gdef\hyxmp@suppress@pdf@metadata{}%
+ \gdef\hyxmp@no@info@lists{}%
}
\def\hyxmp@pdfauthor{}
\def\hyxmp@pdfkeywords{}
@@ -238,10 +314,10 @@
\@pdfsubject
\@pdfsubtitle
\@pdftitle
- \@pdftype
+ \@pdfuapart
\@pdfurl
- \@pdfversionid
\@pdfvolumenum
+ \@pdfxstandard
}%
\ifx\hyxmp@concated@metadata\@empty
\PackageWarningNoLine{hyperxmp}{%
@@ -251,6 +327,32 @@
provide metadata values to hyperxmp}%
\fi
}
+\newcommand*{\hyxmp@check@standards}{%
+ \ifHy@pdfa
+ \@ifmtargexp{\@pdfapart}{%
+ \PackageWarningNoLine{hyperxmp}{%
+ `pdfa' was passed to hyperref, but `pdfapart' was\MessageBreak
+ not specified.\space\space Setting pdfapart to `1' and\MessageBreak
+ pdfaconformance to `B'%
+ }%
+ \gdef\@pdfapart{1}%
+ \gdef\@pdfaconformance{B}%
+ }%
+ \fi
+ \edef\hyxmp@standards{%
+ \@pdfapart
+ \@pdfxstandard
+ \@pdfuapart
+ }%
+ \@ifnotmtargexp{\hyxmp@standards}{%
+ \@ifmtargexp{\@pdftitle}{%
+ \PackageWarningNoLine{hyperxmp}{%
+ Missing pdftitle (required for PDF standards\MessageBreak
+ compliance)%
+ }%
+ }%
+ }%
+}
\AtBeginDocument{%
\@ifpackageloaded{hyperref}{%
\ifx\@pdflang\relax
@@ -264,10 +366,6 @@
\fi
\fi
\hyxmp@xmlify\@pdfmetalang
- \ifx\@pdfdatetime\@empty
- \else
- \edef\hyxmp@today{\@pdfdatetime}%
- \fi
\@ifmtargexp{\@pdftitle}{%
\@ifnotmtargexp{\@title}{%
\hypersetup{pdftitle={\@title}}%
@@ -280,7 +378,14 @@
}%
}%
{}%
- \hyxmp@suppress@pdf@metadata
+ \@ifundefined{XeTeXversion}{}{%
+ \@ifmtargexp{\@pdfcreationdate}{%
+ \let\@pdfcreationdate=\hyxmp@today@pdf
+ }%
+ {}%
+ }%
+ \hyxmp@check@standards
+ \hyxmp@no@info@lists
\hyxmp@at@end{%
\hyxmp@find@metadata
\hyxmp@embed@packet
@@ -340,7 +445,7 @@
\def\hyxmp@first@char#1{\hyxmp@first@char@i#1\relax}
\def\hyxmp@first@char@i#1#2\relax{#1}
\def\hyxmp@as@xmp@date#1{%
- \expandafter\ifx\hyxmp@first@char@i#1\relax D%
+ \expandafter\ifnum\expandafter`\hyxmp@first@char@i#1\relax=`D
\hyxmp@pdf@to@xmp@date{#1}%
\else
#1%
@@ -433,7 +538,7 @@
\def\hyxmp@xmp@to@pdf@date@viii#1#2#3#4{%
'#1#2'%
}
-\def\hyxmp@today@define#1{%
+\def\hyxmp@today@xmp@define#1{%
\xdef#1{\the\year}%
\ifnum\month<10
\xdef#1{#1-0\the\month}%
@@ -446,28 +551,45 @@
\xdef#1{#1-\the\day}%
\fi
\@tempcnta=\time
- \divide\@tempcnta by 60%
- \ifnum\@tempcnta<10%
+ \divide\@tempcnta by 60
+ \ifnum\@tempcnta<10
\xdef#1{#1T0\the\@tempcnta}%
\else
\xdef#1{#1T\the\@tempcnta}%
\fi
- \multiply\@tempcnta by -60%
+ \multiply\@tempcnta by -60
\advance\@tempcnta by \time
- \ifnum\@tempcnta<10%
+ \ifnum\@tempcnta<10
\xdef#1{#1:0\the\@tempcnta}%
\else
\xdef#1{#1:\the\@tempcnta}%
\fi
+ \xdef#1{#1Z}%
}
-\@ifundefined{pdffeedback}{%
- \@ifundefined{pdfcreationdate}{%
- \hyxmp@today@define\hyxmp@today
- }{%
- \edef\hyxmp@today{\expandafter\hyxmp@pdf@to@xmp@date\pdfcreationdate}%
+\def\hyxmp@try@today#1#2{%
+ \@ifmtargexp{\hyxmp@today@xmp}{%
+ \@ifundefined{#1}{}{#2}%
+ }{}%
+}
+\def\hyxmp@today@xmp{}
+\hyxmp@try@today{pdfcreationdate}{%
+ \edef\hyxmp@today@xmp{\expandafter\hyxmp@pdf@to@xmp@date\pdfcreationdate}%
+}
+\hyxmp@try@today{pdffeedback}{%
+ \edef\hyxmp@today@xmp{\expandafter\hyxmp@pdf@to@xmp@date\pdffeedback creationdate}%
+}
+\hyxmp@try@today{filemoddate}{%
+ \edef\hyxmp@today@xmp{\filemoddate{\jobname.log}}%
+ \edef\next{%
+ \edef\noexpand\hyxmp@today@xmp{\noexpand\hyxmp@as@xmp@date{\hyxmp@today@xmp}}%
}%
-}{%
- \edef\hyxmp@today{\expandafter\hyxmp@pdf@to@xmp@date\pdffeedback creationdate}%
+ \next
+}%
+\hyxmp@try@today{year}{%
+ \hyxmp@today@xmp@define\hyxmp@today@xmp
+}
+\expandafter\edef\expandafter\hyxmp@today@pdf\expandafter{%
+ \expandafter\hyxmp@xmp@to@pdf@date\expandafter{\hyxmp@today@xmp}%
}
\catcode`\Q=3
\newcommand{\hyxmp@trimspaces}[1]{%
@@ -485,7 +607,6 @@
\else
\hyxmp@unicodetexfalse
\fi
-\newcommand*{\hyxmp@reencode}[1]{}
\expandafter\def\csname SE->pdfdoc@03\endcsname{0003}
\expandafter\def\csname SE->pdfdoc@15\endcsname{0015}
\newcommand*{\hyxmp@xmlify}[1]{%
@@ -496,7 +617,7 @@
\StringEncodingConvert
\hyxmp@text\hyxmp@text{utf16be}{utf32be}%
}{%
- \ifxetex
+ \ifXeTeX
\hyxmp@xetex@crap
\else
\StringEncodingConvert
@@ -678,6 +799,48 @@
\catcode0=12 %
\gdef\hyxmp@zero{^^00}%
\endgroup
+\newcommand*{\hyxmp@extra@indent}{}
+\newcommand*{\hyxmp@add@simple}[2]{%
+ \@ifnotmtargexp{#2}{%
+ \hyxmp@xmlify{#2}%
+ \hyxmp@add@to@xml{\hyxmp@extra@indent______<}%
+ \xdef\hyxmp@xml{\hyxmp@xml#1}%
+ \hyxmp@add@to@xml{>\hyxmp@xmlified</}%
+ \xdef\hyxmp@xml{\hyxmp@xml#1>^^J}%
+ }%
+}
+\newcommand*{\hyxmp@add@simple@var}[2]{%
+ \expandafter\ifx\csname#2\endcsname\relax
+ \else
+ \hyxmp@xmlify{\csname#2\endcsname}%
+ \hyxmp@add@to@xml{%
+ \hyxmp@extra@indent______<#1>\hyxmp@xmlified</#1>^^J%
+ }%
+ \fi
+}
+\newcommand*{\hyxmp@add@simple@lang}[2]{%
+ \@ifnotmtarg{#2}{%
+ \hyxmp@xmlify{#2}%
+ \expandafter\hyxmp@add@simple@lang@i\hyxmp@xmlified\relax{#1}%
+ }%
+}
+\newcommand*{\hyxmp@add@simple@lang@i}{%
+ \@ifnextchar[\hyxmp@add@simple@lang@ii{\hyxmp@add@simple@lang@ii[]}%
+}
+\def\hyxmp@add@simple@lang@ii[#1]#2\relax#3{%
+ \@ifnotmtarg{#2}{%
+ \hyxmp@xmlify{#2}%
+ \@ifmtarg{#1}{%
+ \hyxmp@add@to@xml{%
+______<#3>\hyxmp@xmlified</#3>^^J%
+ }%
+ }{%
+ \hyxmp@add@to@xml{%
+______<#3 xml:lang="#1">\hyxmp@xmlified</#3>^^J%
+ }%
+ }%
+ }%
+}
\def\hyxmp@alt@title{}
\def\hyxmp@alt@description{}
\def\hyxmp@alt@rights{}
@@ -785,9 +948,9 @@
\hyxmp@create@uuid\hyxmp@DocumentID
}
\newcommand*{\hyxmp@def@InstanceID}{%
- \hyxmp@today@define{\hyxmp@seed@string}%
+ \hyxmp@today@xmp@define{\hyxmp@seed@string}%
\edef\hyxmp@seed@string{%
- \jobname:\@pdftitle:\@pdfauthor:\hyxmp@today:\hyxmp@seed@string
+ \jobname:\@pdftitle:\@pdfauthor:\hyxmp@today@xmp:\hyxmp@seed@string
}%
\expandafter\hyxmp@seed@rng\expandafter{\hyxmp@seed@string}%
\edef\hyxmp@rand@num{\the\@tempcnta}%
@@ -830,9 +993,37 @@
\xdef\hyxmp@padding{\hyxmp@padding\hyxmp@padding}
\xdef\hyxmp@padding{\hyxmp@padding\hyxmp@padding}
\newcommand*{\hyxmp@x@default}{x-default}
+\newcommand*{\hyxmp@define@pdfproducer}{%
+ \gdef\@pdfproducer{TeX}
+ \ifLuaTeX
+ \expandafter\hyxmp@banner@to@producer\expandafter{\luatexbanner}%
+ \else
+ \ifPDFTeX
+ \expandafter\hyxmp@banner@to@producer\expandafter{\pdftexbanner}%
+ \else
+ \ifXeTeX
+ \edef\@pdfproducer{XeTeX version \the\XeTeXversion\XeTeXrevision}%
+ \fi
+ \fi
+ \fi
+}
+\def\hyxmp@banner@to@producer#1{%
+ \ifx\scantokens\relax
+ \gdef\@pdfproducer{#1}%
+ \else
+ {\scantokens{\makeatletter\hyxmp@remove@this#1\relax}}%
+ \fi
+}
+\def\hyxmp@remove@this This is #1\relax{\gdef\@pdfproducer{#1}}
+\AtBeginDocument{%
+ \ifx\@pdfproducer\relax
+ \hyxmp@define@pdfproducer
+ \fi
+}
\newcommand*{\hyxmp@pdf@schema}{%
- \hyxmp@add@simple@var{pdf:Keywords}{@pdfkeywords}%
\hyxmp@add@simple@var{pdf:Producer}{@pdfproducer}%
+ \hyxmp@add@simple@var{pdf:Keywords}{@pdfkeywords}%
+ \hyxmp@add@simple{pdf:Trapped}{\@pdftrapped}%
\@ifundefined{pdfvariable}{%
\@ifundefined{pdfminorversion}{%
}{%
@@ -842,47 +1033,6 @@
\hyxmp@add@simple{pdf:PDFVersion}{1.\the\pdfvariable minorversion}%
}%
}
-\newcommand*{\hyxmp@extra@indent}{}
-\newcommand*{\hyxmp@add@simple}[2]{%
- \@ifnotmtargexp{#2}{%
- \hyxmp@xmlify{#2}%
- \hyxmp@add@to@xml{%
- \hyxmp@extra@indent______<#1>\hyxmp@xmlified</#1>^^J%
- }%
- }%
-}
-\newcommand*{\hyxmp@add@simple@var}[2]{%
- \expandafter\ifx\csname#2\endcsname\relax
- \else
- \hyxmp@xmlify{\csname#2\endcsname}%
- \hyxmp@add@to@xml{%
- \hyxmp@extra@indent______<#1>\hyxmp@xmlified</#1>^^J%
- }%
- \fi
-}
-\newcommand*{\hyxmp@add@simple@lang}[2]{%
- \@ifnotmtarg{#2}{%
- \hyxmp@xmlify{#2}%
- \expandafter\hyxmp@add@simple@lang@i\hyxmp@xmlified\relax{#1}%
- }%
-}
-\newcommand*{\hyxmp@add@simple@lang@i}{%
- \@ifnextchar[\hyxmp@add@simple@lang@ii{\hyxmp@add@simple@lang@ii[]}%
-}
-\def\hyxmp@add@simple@lang@ii[#1]#2\relax#3{%
- \@ifnotmtarg{#2}{%
- \hyxmp@xmlify{#2}%
- \@ifmtarg{#1}{%
- \hyxmp@add@to@xml{%
-______<#3>\hyxmp@xmlified</#3>^^J%
- }%
- }{%
- \hyxmp@add@to@xml{%
-______<#3 xml:lang="#1">\hyxmp@xmlified</#3>^^J%
- }%
- }%
- }%
-}
\newcommand*{\hyxmp@rdf@dc}[3][\iffalse]{%
\@ifmtargexp{#3}{\@tempswafalse}{\@tempswatrue}%
#1
@@ -962,7 +1112,7 @@
\hyxmp@rdf@dc[\ifHy@pdfa]{description}{\@pdfsubject}%
\hyxmp@rdf@dc{rights}{\@pdfcopyright}%
\hyxmp@singleton@dc{publisher}{\@pdfpublisher}%
- \hyxmp@singleton@dc[Seq]{date}{\hyxmp@today}%
+ \hyxmp@singleton@dc[Seq]{date}{\hyxmp@today@xmp}%
\hyxmp@singleton@dc{language}{\@pdflang}%
\hyxmp@singleton@dc{type}{\@pdftype}%
\hyxmp@list@to@xml[\ifHy@pdfa]{creator}{Seq}{\hyxmp@pdfauthor}%
@@ -997,45 +1147,26 @@
\hyxmp@add@simple{xmpMM:DocumentID}{\hyxmp@DocumentID}%
\hyxmp@add@simple{xmpMM:InstanceID}{\hyxmp@InstanceID}%
\hyxmp@add@simple{xmpMM:VersionID}{\@pdfversionid}%
-}
-\newcommand*{\hyxmp@define@createdate}{%
- \@ifundefined{pdffeedback}{%
- \@ifundefined{pdfcreationdate}{%
- \hyxmp@today@define\hyxmp@createdate
- }{%
- \edef\hyxmp@createdate{\expandafter\hyxmp@pdf@to@xmp@date\pdfcreationdate}%
- }%
- }{%
- \edef\hyxmp@createdate{\expandafter\hyxmp@pdf@to@xmp@date\pdffeedback creationdate}%
- }%
+ \hyxmp@add@simple{xmpMM:RenditionClass}{\@pdfrendition}%
}
\newcommand*{\hyxmp@xmp@basic@schema}{%
- \hyxmp@define@createdate
- \@ifundefined{@pdfcreationdate}{%
- \hyxmp@add@simple{xmp:CreateDate}{\hyxmp@createdate}%
+ \@ifmtargexp{\@pdfcreationdate}{%
+ \hyxmp@add@simple{xmp:CreateDate}{\hyxmp@today@xmp}%
}{%
- \ifx\@pdfcreationdate\@empty
- \hyxmp@add@simple{xmp:CreateDate}{\hyxmp@createdate}%
- \else
- \hyxmp@add@simple{xmp:CreateDate}{%
- \expandafter\hyxmp@as@xmp@date\expandafter{\@pdfcreationdate}}%
- \fi
+ \hyxmp@add@simple{xmp:CreateDate}{%
+ \expandafter\hyxmp@as@xmp@date\expandafter{\@pdfcreationdate}}%
}%
- \@ifundefined{@pdfmoddate}{%
- \hyxmp@add@simple{xmp:ModifyDate}{\hyxmp@createdate}%
+ \@ifmtargexp{\@pdfmoddate}{%
+ \hyxmp@add@simple{xmp:ModifyDate}{\hyxmp@today@xmp}%
}{%
- \ifx\@pdfmoddate\@empty
- \hyxmp@add@simple{xmp:ModifyDate}{\hyxmp@createdate}%
- \else
- \hyxmp@add@simple{xmp:ModifyDate}{%
- \expandafter\hyxmp@as@xmp@date\expandafter{\@pdfmoddate}}%
- \fi
+ \hyxmp@add@simple{xmp:ModifyDate}{%
+ \expandafter\hyxmp@as@xmp@date\expandafter{\@pdfmoddate}}%
}%
- \ifx\@pdfmetadatetime\@empty
- \hyxmp@add@simple{xmp:MetadataDate}{\hyxmp@createdate}%
- \else
+ \@ifmtargexp{\@pdfmetadatetime}{%
+ \hyxmp@add@simple{xmp:MetadataDate}{\hyxmp@today@xmp}%
+ }{%
\hyxmp@add@simple{xmp:MetadataDate}{\@pdfmetadatetime}%
- \fi
+ }%
\hyxmp@add@simple{xmp:CreatorTool}{\@pdfcreator}%
\hyxmp@add@simple{xmp:BaseURL}{\@baseurl}%
}
@@ -1050,6 +1181,25 @@
\hyxmp@add@simple{pdfaid:conformance}{\@pdfaconformance}%
\fi
}
+\newcommand*{\hyxmp@pdfua@id@schema}{%
+ \hyxmp@add@simple{pdfuaid:part}{\@pdfuapart}%
+}
+\newcommand*{\hyxmp@pdfx@id@schema}{%
+ \@tempcnta=0\hyxmp@pdfx@major\relax
+ \ifnum\@tempcnta=0
+ \else
+ \ifnum\@tempcnta=1
+ \hyxmp@add@simple{pdfx:GTS_PDFXVersion}{PDF/X-1:2001}%
+ \hyxmp@add@simple{pdfx:GTS_PDFXConformance}{\@pdfxstandard}%
+ \else
+ \ifnum\@tempcnta<4
+ \hyxmp@add@simple{pdfx:GTS_PDFXVersion}{\@pdfxstandard}%
+ \else
+ \hyxmp@add@simple{pdfxid:GTS_PDFXVersion}{\@pdfxstandard}%
+ \fi
+ \fi
+ \fi
+}
\begingroup
\catcode`\&=12
\catcode`\#=12
@@ -1181,7 +1331,9 @@
\newcommand{\hyxmp@declare@property}[4][Text]{%
\hyxmp@add@to@xml{%
________________<rdf:li rdf:parseType="Resource">^^J%
-__________________<pdfaProperty:name>#2</pdfaProperty:name>^^J%
+__________________<pdfaProperty:name>}%
+ \xdef\hyxmp@xml{\hyxmp@xml#2}%
+ \hyxmp@add@to@xml{</pdfaProperty:name>^^J%
__________________<pdfaProperty:valueType>#1</pdfaProperty:valueType>^^J%
__________________<pdfaProperty:category>#3</pdfaProperty:category>^^J%
__________________<pdfaProperty:description>#4</pdfaProperty:description>^^J%
@@ -1197,6 +1349,17 @@
______________________</rdf:li>^^J%
}%
}
+\newcommand*{\hyxmp@pdf@extensions}{%
+ \hyxmp@begin@ext@decl
+ {Adobe PDF Schema}%
+ {pdf}%
+ {http://ns.adobe.com/pdf/1.3/}%
+ \hyxmp@declare@property
+ {Trapped}%
+ {internal}%
+ {Indication if the document has been modified to include trapping information}%
+ \hyxmp@end@ext@decl
+}%
\newcommand*{\hyxmp@mm@extensions}{%
\hyxmp@begin@ext@decl
{XMP Media Management Schema}%
@@ -1216,6 +1379,10 @@
{VersionID}%
{internal}%
{Document version identifier}%
+ \hyxmp@declare@property
+ {RenditionClass}%
+ {internal}%
+ {The manner in which a document is rendered}%
\hyxmp@end@ext@decl
}%
\newcommand*{\hyxmp@pdfa@id@extensions}{%
@@ -1234,6 +1401,48 @@
{Conformance level of PDF/A standard}%
\hyxmp@end@ext@decl
}%
+\newcommand*{\hyxmp@pdfua@id@extensions}{%
+ \hyxmp@begin@ext@decl
+ {PDF/UA Universal Accessibility Schema}%
+ {pdfuaid}%
+ {http://www.aiim.org/pdfua/ns/id/}%
+ \hyxmp@declare@property
+ [Integer]%
+ {part}%
+ {internal}%
+ {Part of ISO 14289 standard}%
+ \hyxmp@end@ext@decl
+}%
+\newcommand*{\hyxmp@pdfx@id@extensions}{%
+ \ifx\hyxmp@pdfx@major\empty
+ \else
+ \hyxmp@begin@ext@decl
+ {Adobe Document Info PDF/X eXtension Schema}%
+ {pdfx}%
+ {http://ns.adobe.com/pdfx/1.3/}%
+ \hyxmp@declare@property
+ {GTS_PDFXVersion}%
+ {internal}%
+ {ID of PDF/X standard}%
+ \hyxmp@declare@property
+ {GTS_PDFXConformance}%
+ {internal}%
+ {Conformance level of PDF/X standard}%
+ \hyxmp@end@ext@decl
+ \fi
+ \@tempcnta=0\hyxmp@pdfx@major\relax
+ \ifnum\@tempcnta>3
+ \hyxmp@begin@ext@decl
+ {PDF/X ID Schema}%
+ {pdfxid}%
+ {http://www.npes.org/pdfx/ns/id/}%
+ \hyxmp@declare@property
+ {GTS_PDFXVersion}%
+ {internal}%
+ {ID of PDF/X standard}%
+ \hyxmp@end@ext@decl
+ \fi
+}%
\newcommand*{\hyxmp@iptc@extensions}{%
\hyxmp@begin@ext@decl
{IPTC Core Schema}%
@@ -1364,9 +1573,18 @@
}%
\newcommand*{\hyxmp@declare@extensions}{%
\hyxmp@begin@extension@decls
+ \hyxmp@pdf@extensions
\hyxmp@mm@extensions
\ifHy@pdfa
- \hyxmp@mm@extensions
+ \hyxmp@pdfa@id@extensions
+ \fi
+ \ifx\@pdfuapart\@empty
+ \else
+ \hyxmp@pdfua@id@extensions
+ \fi
+ \ifx\@pdfxversion\@empty
+ \else
+ \hyxmp@pdfx@id@extensions
\fi
\ifx\hyxmp@iptc@data\@empty
\else
@@ -1407,6 +1625,9 @@
_____________________xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"^^J%
_____________________xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent\hyxmp@hash"^^J%
_____________________xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"^^J%
+_____________________xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/"^^J%
+_____________________xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"^^J%
+_____________________xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"^^J%
_____________________xmlns:prism="http://prismstandard.org/namespaces/basic/2.1/"^^J%
_____________________xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"^^J%
_____________________xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"^^J%
@@ -1424,6 +1645,8 @@
\hyxmp@photoshop@schema
\hyxmp@xmp@basic@schema
\hyxmp@pdfa@id@schema
+ \hyxmp@pdfua@id@schema
+ \hyxmp@pdfx@id@schema
\hyxmp@mm@schema
\hyxmp@iptc@schema
\hyxmp@prism@schema
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyperxmp.tlpobj new/tlpkg/tlpobj/hyperxmp.tlpobj
--- old/tlpkg/tlpobj/hyperxmp.tlpobj 2019-04-06 23:33:04.000000000 +0200
+++ new/tlpkg/tlpobj/hyperxmp.tlpobj 2020-04-16 01:57:00.000000000 +0200
@@ -1,6 +1,6 @@
name hyperxmp
category Package
-revision 50812
+revision 54758
shortdesc Embed XMP metadata within a LaTeX document
relocated 1
longdesc XMP (eXtensible Metadata Platform) is a mechanism proposed by
@@ -27,10 +27,9 @@
longdesc address/URL. Hyperxmp currently embeds XMP only within PDF
longdesc documents; it is compatible with pdfLaTeX, XeLaTeX,
longdesc LaTeX+dvipdfm, and LaTeX+dvips+ps2pdf.
-runfiles size=11
+runfiles size=13
RELOC/tex/latex/hyperxmp/hyperxmp.sty
catalogue-ctan /macros/latex/contrib/hyperxmp
-catalogue-date 2019-04-06 06:13:29 +0200
catalogue-license lppl1.3c
catalogue-topics pdf-feat
-catalogue-version 4.1
+catalogue-version 5.1
++++++ hyph-utf8.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/hyph-utf8/CHANGES new/doc/generic/hyph-utf8/CHANGES
--- old/doc/generic/hyph-utf8/CHANGES 2019-04-06 00:22:32.000000000 +0200
+++ new/doc/generic/hyph-utf8/CHANGES 2020-03-26 22:59:35.000000000 +0100
@@ -1,6 +1,24 @@
+== CTAN release 2020.03.25 ==
+
+2020-03-25
+- Major update to Spanish [es] patterns
+- Major update to Classical Latin patterns [la-x-classic]
+
+2019-12-03
+- Fixed typo in Classic Latin patterns [la-x-classic] (559f1a2)
+
+2019-05-18
+- Fixed Chinese Pinyin [zh-latn-pinyin]
+- Removed plain text files .chr.txt and .lic.txt
+
2019-04-04
- Updated German patterns [de-1901], [de-1996], and [de-ch-1901]
+2019-02-04
+- Updated Liturgical Latin patterns [la-x-liturgic], by Arnaud de Castelbajac:
+ Mainly the revision of patterns: abs-*, amb-*, ob-*, super-*, trans-*, pseudo-*, indu-*
+ and some other less systematic.
+
2019-01-01
- Updated pinyin patterns [zh-latn]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/hyph-utf8/README.md new/doc/generic/hyph-utf8/README.md
--- old/doc/generic/hyph-utf8/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/hyph-utf8/README.md 2020-03-26 22:59:35.000000000 +0100
@@ -0,0 +1,24 @@
+[![Build Status](https://travis-ci.com/hyphenation/tex-hyphen.svg?branch=master)](ht…
+
+This is the central repository for all hyphenation patterns (that we know of).
+These patterns are encoded in UTF-8, but can also be used with 8-bit TeX
+engines such as pdfTeX with the help of mechanisms provided with the package.
+It is meant to be a low-level package and is integrated with all major TeX
+distributions (TeX Live, MiKTeX, W32TeX); most TeX users should thus not
+concern themselves with this package, unless of course they’re working on the
+hyphenation patterns themselves.
+
+We upload the package to CTAN regularly and use git tags to identify versions;
+a CTAN upload has a version date in the form `yyyy-mm-dd`, corresponding to tag
+`CTAN-yyyy.mm.dd` in this git repository. Because the package contains
+contributions from many different sources that are not updated at the same
+time, we felt this was this best choice for version identifiers.
+
+If you are an author of hyphenation patterns and want to add or update them,
+please contact the maintainers through the mailing list: tex-hyphen(a)tug.org
+You can also visit the [TeX hyphenation page](http://www.hyphenation.org/tex) for more
+information and technical details.
+
+# Running
+`bundle` (or `bundle install`)
+`bundle exec rake` runs the default task in the Rakefile.
Binary files old/doc/generic/hyph-utf8/bg/azbukaExtended.pdf and new/doc/generic/hyph-utf8/bg/azbukaExtended.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/hyph-utf8/bg/azbukaExtended.tex new/doc/generic/hyph-utf8/bg/azbukaExtended.tex
--- old/doc/generic/hyph-utf8/bg/azbukaExtended.tex 2008-07-16 18:45:13.000000000 +0200
+++ new/doc/generic/hyph-utf8/bg/azbukaExtended.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,649 +0,0 @@
-\documentclass[12pt,a4paper,twosided]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T2A]{fontenc} % temporary to make MakeUppercase work.
-%\usepackage[english,bulgarian]{babel}
-\usepackage[english,bulgarian]{babel}
-\usepackage{mathptm}
-\def\№{\Romannumeral}
-
-
-\usepackage[bulgarian]{varioref} % my modified varioref.sty
- % waiting for the author of
- % varioref.sty to release this officially.
- % DO NOT DISTRIBUTE!
-
-\title{Notes on Bulgarian typesetting in \LaTeX }
-\author{Georgi Boshnakov}
-
-
-\begin{document}
-
-% \selectlanguage{bulgarian}
-
-% \selectlanguage{english}
-
-%%% "`abvg"'
-%%%
-%%% \shorthandoff{"}
-%%%
-%%% "`abvg"'
-%%%
-%%% \shorthandon{"}
-%%%
-%%% "№
-%%%
-%%%
-%%%
-%%% \foreignlanguage{english}{``This is an English phrase.''}
-
-%\enumBul
-
-% \makeatletter
-% \@Alph3, \@alph3
-
-% \enumEng
-
-% \@Alph3, \@alph3
-
-% \enumBul \@Alph3, \@alph3
-
-% \makeatother
-
-
-%%% \latintext
-%%%
-%%% \textcyrillic{АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ}
-%%%
-%%% \cyrillictext
-%%%
-%%% \textlatin{abcdefghijklmnop}
-%%%
-%%% \Bulgarian bg: ``adfafdadfafdsaf'' a' b'
-%%%
-%%% {\English eng1: ``adfafdadfafdsaf'' a' b'}
-%%%
-%%% {\selectlanguage{english} eng2: ``adfafdadfafdsaf'' a' b'}
-%%%
-%%% \selectbglanguage
-%%%
-%%%
-%%% % \selectenglanguage
-
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction} \label{sec:intro}
-
-
-This document shows some features specific to the Bulgarian typesetting with babel.
-The text is mainly English but the main language of the document, as far as \LaTeX{} is
-concerned, is Bulgarian. This is possible because the encoding T2A contains the latin
-characters. On the other hand, the effect is that English hyphenation is not turned on and
-therefore English words are not hyphenated or, if they are, they may be wrongly hyphenated.
-I have done this deliberately to emphasise that it is a good practice to change explicitly
-the language.
-
-This document was written initially for my package \texttt{bulgaria} developed in 1994-1996 to
-support Bulgarian language in the then new version of \LaTeX. Since at the time the encoding
-systems in general where in transition and because there was no standard for cyrillic ones I
-assembled some fonts to support the MIK encoding (the prevalent encoding at the time in
-Bulgaria, its origins are in DOS but it was supported in Windows as well, not by Microsoft
-though). This allowed me to introduce a fully working implementation only a few months after
-\LaTeX2e{} became the official \LaTeX{} version.
-
-I later modified this to work with the Babel system the most important change being the
-switch to the use of standard fonts and encodings.
-I handed this to the Babel developer Johannes Braams who is currently maintaining it.
-
-
-Prompted by some enquiries, I released the hyphenation stuff separately in may 2006. It can
-be found in the \texttt{language} subdirectory on CTAN or on my web page.
-
-% Note that currently the MikTeX suite replaces my hyphenation patterns (available as part of
-% the babel package) with different ones which seem not to work. So, I release my hyphenation
-% files separately as well.
-
-
-Comments and suggestions are welcome.
-I do not give my email address here (because of the spamming curse) but you can easily find
-me with a search engine.
-I will maintain the hyphenation and, if there is
-demand, release a new set of patterns to support the more stylish traditional hyphenation
-(the current patterns are the simplified ones, born in the computer age).
-
-
-\section{Language and encoding} \label{sec:langenc}
-
-
-
-There are still many encoding systems around, you need to tell \LaTeX{} which one you use.
-For example,
-\begin{verbatim}
- \usepackage[cp1251]{inputenc}
-\end{verbatim}
-specifies the cyrillic encoding typically used in Windows.
-This line should be one of the first few lines after the \verb+\documentclass+ declaration.
-
-The input encoding is completely independent of the internal encoding used by
-\LaTeX. You generally do not need to be concerned with it but for completeness here is the
-command that specifies the internal (cyrillic) encoding \texttt{T2A}:
-\begin{verbatim}
- \usepackage[T2A]{fontenc}
-\end{verbatim}
-This should not be needed but see the section about uppercase/lowercase below.
-
-To change language you may use the babel assorment of commands, say
-\begin{verbatim}
- \selectlanguage{english}
- \selectlanguage{bulgarian}
-\end{verbatim}
-see the user guide of Babel for details.
-There are useful shorthands like
-\verb+\Bul+,
-\verb+\Bg+,
-\verb+\Eng+,
-\verb+\latintext+,
-and
-\verb+\cyrillictext+.
-
-
-
-\section{Alphabet} \label{sec:alphabet}
-
-
-
-\subsection{Entering cyrillic letters}
-
-The best way to enter Bulgarian text is to type it in some of the standard encodings
-and leave \LaTeX\ to struggle with the conversion work (it knows most of the cyrillic
-encodings). To tell \LaTeX{} the input encoding, put near the beginning of your document a
-line like
-\begin{center}
-\verb+\usepackage[utf8]{inputenc}+
-\end{center}
-if you are in the modern age and/or Linux,
-or
-\begin{center}
-\verb+\usepackage[MIK]{inputenc}+
-\end{center}
-if you prefer ``classic DOS'' and the MIK encoding,
-or
-\begin{center}
-\verb+\usepackage[cp1251]{inputenc}+
-\end{center}
-if you do not know what I am talking about and are on a Windows system.
-
-This command is usually placed write after the \verb+\documentclass+ command.
-
-If you need to enter only a couple of words you may also use commands like \verb+\cyra+,
-\verb+CYRA+, \verb+\cyryu+, \verb+\CYRYU+. The number sign can be obtained by \verb+\No+ or
-\verb+\textnumero+.
-
-For example, \verb+\CYRA\CYRB\CYRV, \cyra\cyrb\cyrv+ produces
-\begin{center}
-\CYRA\CYRB\CYRV, \cyra\cyrb\cyrv
-\end{center}
-
-Accents in Bulgarian are used very rarely. This is done only to designate where the stress
-falls in certain special circumstances (mainly to avoid confusion). For example, \verb+\`{и}+
-gives \`{и}. This is unambigously a pronoun which if written without the accent may
-occasionally be confused with the conjunction и (Bulgarian for ``and'').
-
-Warning: the shorter \verb+\`и+ works in all encodings except utf8. It is prudent to always
-add the braces to avoid irritation if you decide to switch to utf8.
-
-% \"е
-
-
-\subsection{Changing letter case (Uppercase/Lowercase)}
-
-Use the \LaTeX{} commands \verb+\MakeLowercase+ and \verb+\MakeUppercase+ to change case of a
-piece of text. For example,
-
-\verb+\MakeLowercase{АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ №}+
-
-\noindent
-gives
-
-\MakeLowercase{АБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ №}
-
-\noindent
-(All letters should change to lowercase, if MakeLowercase works properly.)
-
-
-\noindent
-Similarly
-
-\verb+\MakeUppercase{абвгдежзийклмнопрстуфхцчшщъыьэюя №}+
-
-\noindent
-gives
-
-\MakeUppercase{абвгдежзийклмнопрстуфхцчшщъыьэюя №}
-
-\noindent
-% (All letters should change to uppercase, if MakeUppercase works properly.)
-
-Note that the symbol № is unchanged by both commands since it is not a regular letter.
-
-If the above commands do not change the case properly, then this should be rectified by
-including the command \verb+\usepackage[T2A]{fontenc}+ in the preamble of your document
-(this command should not be needed as T2A is the default encoding, a bug may have crawled in
-somehow). If you have the \verb+.tex+ source of this file you may wish to comment out the
-\verb+usepackage+ command for package \verb+fontenc+ and compile the file to see the
-difference, if any.
-
-
-\subsection{The symbol №}
-
-The symbol № is not particularly important but it is used occasionally, e.g.,
-
-№\,1, №\,20, №№\,1--5.
-
-The Bulgarian keyboard has a key №. The commands
-\verb+\textnumero+ and \verb+\No+ produce № as well.
-
-
- \begin{table} \label{table:No}
-\centering
-\begin{tabular}{cc}
-\LaTeX{} source & typeset output \\ \hline
-\verb+\textnumero\,3+ & \textnumero\,3 \\
-\verb+\No\,3+ & \No\,3 \\
-\verb+№\,3+ & №\,3
-\end{tabular}
-
- \end{table}
-
-
-
-% \CYRA\CYRB\CYRV, \cyra\cyrb\cyrv
-
-
-\subsection{Roman numbers}
-
-In Bulgarian texts, uppercase Roman numbers are often used for ordinal
-numbers. Most of them can be entered via the Bulgarian keyboard: the letters I and V are
-available precisely for that purpose, M and C are the same in the cyrillic alphabet, but L is
-missing. This does not matter much in the case of a computer keyboard. Even so, I prefer to
-redefine the I and V keys for more important tasks and leave the computer render a number in
-Roman form, see also the comments in section~{sec:bugs}.
-
-The command \verb+\Romannumeral+ (with shorthand \verb+\№+ defined in the preamble of this
-file) is provided for capitalised Roman numbers, e.g.:
-\verb+\№1+,
-\verb+\№8+,
-\verb+\№26+,
-\verb+\№{26}+,
-give
-\№1, \№8, \№26, and \№{26},
-respectively. This example shows also that arguments with 2 or more decimal digits have to be
-put in braces.
-
-
-\subsection{Quoting styles}
-
-The quotation marks in texts typeset in Bulgarian traditionally look like "`this"'.
-This style and the quotes themselves have been borrowed from the German language.
-
-To get traditional Bulgarian style quotes enclose the text in \verb+"`+ and \verb+"'+.
-To get the French style quotes use \verb+"<+ and \verb+">+ instead. For example,
-
-\begin{verbatim}
- ``English style quotes'' \par
- "`текст в традиционните за български текстове кавички"' \par
- "<алтернативни кавички, срещани предимно в по-стари текстове">
-\end{verbatim}
-
-\noindent
-gives
-% \selectlanguage{bulgarian}
-
-\bigskip{}
-
- ``English style quotes'' \par
- "`текст в традиционните за български текстове кавички"' \par
- "<алтернативни кавички, срещани предимно в по-стари текстове">
-
-% \selectlanguage{english}
-
-\bigskip
-
-Note that in the pre-babel \verb+bulgarian.sty+ quotes in Bulgarian texts were typeset
-automatically in the traditional Bulgarian style.
-
-
-\subsection{Dates}
-
-The command \verb+\today+ produces the current date, e.g. today is \today.
-
-In the traditional format for dates in Bulgaria uppercased roman numbers are used for the
-months, e.g. today is \todayRoman.
-
-\begin{center}
- \begin{tabular}{cc}
-\LaTeX{} source & typeset output \\ \hline
-\verb+\today+ & \today \\
-\verb+\todayRoman+ & \todayRoman
- \end{tabular}
-\end{center}
-
-
-
-\section{Hyphenation} \label{sec:hyph}
-
-
-When you choose a language for \emph{babel}, \LaTeX{} hyphenates the text
-according to the hyphenation rules of that language.
-So, normally you do not need to do anything more to get proper hyphenation.
-
-If your Bulgarian text does not get hyphenated, then you need to tell
-the \TeX{} system to load Bulgarian hyphenation rules. The details are
-system dependent but not complicated, see the documentation of your
-\TeX{} distribution for details.
-
-For example, if you are using MikTeX, start its \emph{Settings}
-utility (known also as \emph{MikTeX options}, click the
-\emph{Language} tab, tick \emph{bulgarian}, and click OK. MikTeX will
-tell you that it needs to regenerate the formats, let it do it. That
-is it. Process a document to see that hyphenation works.
-
-If you find words that do not hyphenate properly, then send me an email.
-
-
-
-
-
-
-
-
-
-
-
-\section{Enumeration} \label{sec:enum}
-
-
-
-Alphabetic enumeration is usually done with the Bulgarian alphabet but latin enumeration is
-used as well. Besides the alphabet, the style of the enumeration is somewhat different from
-the English one.
-
-We provide facilities for both cyrillic and latin enumeration. By default, the cyrillic one
-is switched on by commands changing the language to Bulgarian. The declarations
-\verb+\alphEng+ and \verb+\alphBul+ may be used to switch to and from latin enumeration, if
-desired.
-
-Note that the cyrillic enumeration here simply uses cyrillic letters wherever the standard
-\LaTeX\ enumeration style would produce alphabetic enumeration. This is definitely not
-satisfactory and a fuller implementation might change other details but this is better left
-to document classes.
-
-
-The letters й, ъ, and ь are not used for enumeration and therefore omitted. Note that the
-cyrillic letters э and ы are not part of the Bulgarian alphabet anyway.
-
-\begin{enumerate} \label{enum:1}
- \item a
-
- \begin{enumerate}
- \item aa
- \begin{enumerate}
- \item aaa
- \begin{enumerate}
- \item aaaa
-
- \item bbbb
-
- \item cccc
-
- \item dddd
-
- \end{enumerate}
-
- \item bbb
-
- \end{enumerate}
-
- \item bb
-
- \item cc
-
- \item dd
-
- \end{enumerate}
-
- \item b
-
-\end{enumerate}
-
-
-The following enumeration is preceded by the command
-\verb+\enumEng+.
-
-\enumEng
-
-\begin{enumerate} \label{enum:2}
- \item a
- \begin{enumerate}
- \item aaaaaaa
- \begin{enumerate}
- \item aaaaaaa
- \begin{enumerate}
- \item aaaaaaa
-
- \item bbbbbbb
-
- \item cccccc
-
- \end{enumerate}
-
- \item bbbbbbb
-
- \item cccccc
-
- \end{enumerate}
-
-
- \end{enumerate}
-
- \item b
-
-\end{enumerate}
-
-\section{Support for the varioref package}
-
-
-The package \texttt{varioref} allows for producing cross-references which look natural and
-generally do not require manual intervention when the context changes. Support for Bulgarian
-should be available with the next release of \LaTeX{}. This file has been produced with a
-draft version of the package.
-
-The table below is an illustration. Notice that the page reference command is the same in all cases
-but the printed text changes depending on its relative distance from the reference point.
-Also, references to the current page and the facing page are automatically varied to some
-extent.
-
-\begin{center}
-
-\begin{tabular}{l|l}
-command & typeset output \\ \hline
-\verb+\vpageref{sec:intro}+ & \vpageref{sec:intro} \\
-\verb+\vpageref{enum:1}+ & \vpageref{enum:2} \\
-\verb+\vpageref{enum:2}+ & \vpageref{enum:2} \\
-\verb+\vpageref{table:No}+ & \vpageref{table:No}
-
-\end{tabular}
-\end{center}
-
-It is instructive to see what output would have produced if the above table turned up on the
-following page. The table on the next page is generated by the same \LaTeX{} source as the
-table above. There is a \verb+\newpage+ command after this paragraph to ensure that the two
-tables are on different pages.
-
-
-\newpage
-
-\begin{center}
-
-\begin{tabular}{l|l}
-command & typeset output \\ \hline
-\verb+\vpageref{sec:intro}+ & \vpageref{sec:intro} \\
-\verb+\vpageref{enum:1}+ & \vpageref{enum:2} \\
-\verb+\vpageref{enum:2}+ & \vpageref{enum:2} \\
-\verb+\vpageref{table:No}+ & \vpageref{table:No}
-
-\end{tabular}
-\end{center}
-
-
-
-% Some text follows to illustrate the usage of the commands in the
-% \texttt{varioref}.
-% This paragraph is repeated at several places in this document, its text
-% source is exactly the same but the output depends on the relative position of the referenced
-% pages. Some silly page references follow. The introduction begins
-% \vpageref{sec:intro},
-% the enumeration \vpageref{enum:1} illustrates the default enumeration labels when
-% Bulgarian is active while the enumeration \vpageref{enum:2}
-% shows an alternative.
-% The table \vpageref{table:No} shows several ways to typeset \No.
-% The especially dull introduction starts \vpageref{sec:intro}
-% and if this sentence is on the same page as the beginning of this paragraph the wording of
-% the reference to it may be slightly different.
-
-
-% Some text follows to illustrate the usage of the commands in the
-% \texttt{varioref}.
-% This paragraph is repeated at several places in this document, its text
-% source is exactly the same but the output depends on the relative position of the referenced
-% pages. Some silly page references follow. The introduction begins
-% \vpageref{sec:intro},
-% the enumeration \vpageref{enum:1} illustrates the default enumeration labels when
-% Bulgarian is active while the enumeration \vpageref{enum:2}
-% shows an alternative.
-% The table \vpageref{table:No} shows several ways to typeset \No.
-% The especially dull introduction starts \vpageref{sec:intro}
-% and if this sentence is on the same page as the beginning of this paragraph the wording of
-% the reference to it may be slightly different.
-%
-% Some text follows to illustrate the usage of the commands in the
-% \texttt{varioref}.
-% This paragraph is repeated at several places in this document, its text
-% source is exactly the same but the output depends on the relative position of the referenced
-% pages. Some silly page references follow. The introduction begins
-% \vpageref{sec:intro},
-% the enumeration \vpageref{enum:1} illustrates the default enumeration labels when
-% Bulgarian is active while the enumeration \vpageref{enum:2}
-% shows an alternative.
-% The table \vpageref{table:No} shows several ways to typeset \No.
-% The especially dull introduction starts \vpageref{sec:intro}
-% and if this sentence is on the same page as the beginning of this paragraph the wording of
-% the reference to it may be slightly different.
-
-\section{Reporting bugs and requesting features} \label{sec:bugs}
-
-Please email me bug reports and requests for features, visit my web page at the
-University of Manchester for further information.
-
-I am using Emacs for typesetting documents. Emacs~22 has good support for essentially all
-writing systems in the world. AucTeX is an amazing Emacs package which makes an excellent
-environment for writing LaTeX (and other ``dialects'' of TeX) documents).
-Another Emacs package, ESS (Emacs speaks statistics), integrates Emacs smoothly with some of
-the major statistical systems.
-
-If you are using Emacs but have not considered AucTeX yet, do it!
-If you do computations with systems such as R, S-plus or SAS, consider ESS.
-
-If you are not an Emacs user you may consider becoming one. Together with the above tools it
-may become your basic working environment. Be prepared though for a period of familiarisation
-with the idiosyncracies of Emacs, it will help if you have a friend with some experience with
-it.
-
-
-
-
-\end{document}
-
-
-
-
-
-% \edef\myNo{\textnumero}
-
-% \expandafter\meaning\csname T2A\endcsname
-
-% \expandafter\meaning\csname T2A-cmd\endcsname
-
-% \meaning\myNo
-
-% \myNo: \csname \myNo \endcsname
-
-%\selectlanguage{bulgarian}
-% \labelenumii
-% \theenumii
-
-% \meaning\textnumero
-
-% \meaning\No
-
-% \csname TeX \endcsname
-
-
-% \Romannumeral 7
-
-% \expandafter a\csname Romannumeral \endcsname 7
-
-% \csname №\endcsname
-
-% \def\proba#1{\char#1}
-
-% \proba 88, \proba{88}
-
-% a: \expandafter\string\csname\proba157 \endcsname
-
-% char65:\ \ \expandafter\string\csname \char65 \endcsname
-
-% char157: \expandafter\string\csname \char157 \endcsname
-
-% char cyra: \expandafter\string\expandafter\csname \cyra \endcsname
-
-% \def\aaaa{aaaa}
-
-% aaaa: \expandafter\string\csname \aaaa \endcsname
-
-% \meaning\cyrzh
-
-\makeatletter
-
-\meaning\roman
-
-\meaning\alph
-
-\meaning\verbatim@font
-
-\meaning\normalfont
-
-\makeatother
-
-\meaning\bulgarianhyphenmins
-
-\meaning\englishhyphenmins
-
-cyr. enc: \cyrillicencoding
-
-\meaning\inputencoding
-
-\meaning\frac
-
-\expandafter\string\csname \the\CYRYA \endcsname
-
-\begin{verbatim}
-
-This is verbatim text. It contains both latin and cyrillic letters.
-АБВГД ЕЖЗИЙ КЛМНОП РСТУФХЦ ЧШЩЪЫ ЬЭЮЯ
-
-\end{verbatim}
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/hyph-utf8/es/README new/doc/generic/hyph-utf8/es/README
--- old/doc/generic/hyph-utf8/es/README 2010-05-30 17:51:37.000000000 +0200
+++ new/doc/generic/hyph-utf8/es/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-DIVISI'ON DE PALABRAS
-~~~~~~~~~~~~~~~~~~~~~
-
-The file eshyph.tex under /base is the base for the Spanish patters.
-It is intended mainly for backward compatibility. New systems are
-best based on CTAN:language/hyph-utf8/, which has the same patterns.
-
-Why 4.x? Well, I know at least other three files with the same name,
-so this one is the fourth (there were at least 6 or 7 patterns files).
-The others should vanish as soon as posible.
-
-(c) Javier Bezos 1993 1997.
-(c) Javier Bezos and CervanTeX 2001-2009
-Some parts, (c) by Francesc Carmona
-Licence: LPPL
-
-- division.pdf is a draft of an article (in Spanish) explaining the
-rules to be applied and how they are being translated into TeX in a
-unified set of patterns (somewhat outdated).
-- eshyph-make.lua generates the patterns, with eshyph.src for prefixes
-and special cases.
-- eshyph-test.tex makes a comparison with strict syllabic rules. It
-requires a file spanish-words.txt (not supplied) with a list of word,
-one per line. You can (should) filter the words.
-
-For bug reports and comments:
-
- http://www.tex-tipografia.com/spanish_hyphen.html
-
-I would like to thanks Francesc Carmona for his permission
-to steal parts of his work without restrictions.
-
-The contrib directory, as its name implies, is not part of the
-official bundle. It has a different set of patterns, but it does not
-follow the rules by the Spanish Academy (despite its claims).
-
-What's new in 4.5 (2009-08-01)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Missing group -gl- added (a major bug). A few minor improvements
-for "des-" and "in-".
-
-What's new in 4.4 (2009-05-19)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Some bad patterns fixed.
-
-What's new in 4.3 (2009-05-14)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Some patterns fixed, particularly for "familia", "superar", "sub-" and
-final consonants. Patterns are now generated with the help of a few
-lua/luatex files (whose status is alpha).
-
-What's new in 4.2
-~~~~~~~~~~~~~~~~~
-
-The encoding is UTF-8, so that it can be used with LuaTeX. Yet, it
-works without changes with standard TeX.
-
-What's new in 4.1
-~~~~~~~~~~~~~~~~~
-
-- Thanks to a list of about 750000 words and extensive
-tests, wrong hyphenations have been reduced dramatically
-and the number of patterns has been almost duplicated.
-
-- Since the Spanish Academy rules of 1999 are very vague,
-incomplete and even contradictory, they had to be
-completed with some traditional ones. The Academy has
-published new rules in November 2005 including many of
-the traditional ones employed here and therefore only
-minor adjustments have been necessary.
-
-- Patterns for a few verbal endings are necessary, and
-now the "voseo" forms (used in many countries of Central
-and South America) have been included.
-
-2009-05-19
-_____________________________________________________________
-Javier Bezos | http://www.cervantex.es/
-.............................................................
-TeX y tipografia | http://www.tex-tipografia.com/
\ No newline at end of file
Binary files old/doc/generic/hyph-utf8/es/division.pdf and new/doc/generic/hyph-utf8/es/division.pdf differ
Binary files old/doc/generic/hyph-utf8/hu/huhyphn.pdf and new/doc/generic/hyph-utf8/hu/huhyphn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/hyph-utf8/sa/hyphenmin.txt new/doc/generic/hyph-utf8/sa/hyphenmin.txt
--- old/doc/generic/hyph-utf8/sa/hyphenmin.txt 2010-03-28 01:10:19.000000000 +0100
+++ new/doc/generic/hyph-utf8/sa/hyphenmin.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-This is the explanation of the values of hyphenmin used in Sanskrit (and possibly Indic languages) as given by Yves Codet in a private mail on March 19, 2010:
-
-For lefthyphenmin I think 1 is correct: in Sanskrit, if we allow breaks such as "tu-dati" ("tu" = 2 characters) we must allow "pa-tati" ("pa" = 1 character).
-
-For righthyphenmin I first suggested 5, as François wrote, which should be forgotten (and forgiven :). Then I thought 3 could be good; my idea was to prohibit a break before a consonant at the end of a word, such as "apata-t" (final "t" = 2 characters). But if hyphenation patterns have precedence over hyphenmins, since patterns contain rules prohibiting such breaks, that precaution is useless, and it has a drawback: it forbids breaks such as "pata-ti" ("ti" = 2 characters) or "pata-ta" ("ta" = 1 character). If patterns do have precedence, it now seems to me that the best choice is 1 for both hyphenmins (I'm sorry, François, about my hesitations :).
-
-But if my reasoning is sound, this would be for Sanskrit and Prakrit, in whatever script they are written. Maybe there would be reasons to choose other values for some other Indian languages, which I don't know.
-
-Kind regards,
-
-Yves
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyph-utf8.doc.tlpobj new/tlpkg/tlpobj/hyph-utf8.doc.tlpobj
--- old/tlpkg/tlpobj/hyph-utf8.doc.tlpobj 2019-04-06 23:33:04.000000000 +0200
+++ new/tlpkg/tlpobj/hyph-utf8.doc.tlpobj 2020-03-26 23:29:31.000000000 +0100
@@ -1,22 +1,17 @@
name hyph-utf8.doc
category Package
-revision 50792
+revision 54568
shortdesc doc files of hyph-utf8
relocated 1
-docfiles size=196
+docfiles size=85
RELOC/doc/generic/hyph-utf8/CHANGES
RELOC/doc/generic/hyph-utf8/HISTORY
- RELOC/doc/generic/hyph-utf8/bg/azbukaExtended.pdf
- RELOC/doc/generic/hyph-utf8/bg/azbukaExtended.tex
- RELOC/doc/generic/hyph-utf8/es/README
- RELOC/doc/generic/hyph-utf8/es/division.pdf
- RELOC/doc/generic/hyph-utf8/hu/huhyphn.pdf
+ RELOC/doc/generic/hyph-utf8/README.md
RELOC/doc/generic/hyph-utf8/hyph-utf8.pdf
RELOC/doc/generic/hyph-utf8/hyph-utf8.tex
RELOC/doc/generic/hyph-utf8/hyphenation-distribution.pdf
RELOC/doc/generic/hyph-utf8/hyphenation-distribution.tex
RELOC/doc/generic/hyph-utf8/img/miktex-languages.png
RELOC/doc/generic/hyph-utf8/img/texlive-collection.png
- RELOC/doc/generic/hyph-utf8/sa/hyphenmin.txt
RELOC/doc/luatex/hyph-utf8/README
RELOC/doc/luatex/hyph-utf8/luatex-hyphen.pdf
++++++ hyph-utf8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-ec.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-ec.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-ec.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-ec.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-il2.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-il2.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-il2.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-il2.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-il3.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-il3.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-il3.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-il3.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-l7x.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-l7x.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-l7x.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-l7x.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-lmc.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-lmc.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-lmc.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-lmc.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-lth.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-lth.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-lth.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-lth.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,16 +6,16 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
% macros adapted from ConTeXt MKII; see unic-ini.mkii
\def\unicodechar#1{%
\ifcsname unichar@\number#1\endcsname
- \csname unichar@\number#1\endcsname
+ \csname unichar@\number#1\endcsname
\else
- \errmessage{Unicode character [#1] not in encoding.}%
+ \errmessage{Unicode character [#1] not in encoding.}%
\fi}
\def\utfthreeuniglyph#1#2#3%
{\expandafter\unicodechar\expandafter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-qx.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-qx.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-qx.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-qx.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-t2a.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-t2a.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-t2a.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-t2a.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,7 +6,7 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/conversions/conv-utf8-t8m.tex new/tex/generic/hyph-utf8/conversions/conv-utf8-t8m.tex
--- old/tex/generic/hyph-utf8/conversions/conv-utf8-t8m.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/conversions/conv-utf8-t8m.tex 2020-03-26 22:59:35.000000000 +0100
@@ -6,16 +6,16 @@
% This file is part of hyph-utf8 package and autogenerated.
% See http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
% macros adapted from ConTeXt MKII; see unic-ini.mkii
\def\unicodechar#1{%
\ifcsname unichar@\number#1\endcsname
- \csname unichar@\number#1\endcsname
+ \csname unichar@\number#1\endcsname
\else
- \errmessage{Unicode character [#1] not in encoding.}%
+ \errmessage{Unicode character [#1] not in encoding.}%
\fi}
\def\utfthreeuniglyph#1#2#3%
{\expandafter\unicodechar\expandafter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyph-utf8.tlpobj new/tlpkg/tlpobj/hyph-utf8.tlpobj
--- old/tlpkg/tlpobj/hyph-utf8.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyph-utf8.tlpobj 2020-03-26 23:29:31.000000000 +0100
@@ -1,6 +1,6 @@
name hyph-utf8
category Package
-revision 50792
+revision 54568
shortdesc Hyphenation patterns expressed in UTF-8
relocated 1
longdesc Modern native UTF-8 engines such as XeTeX and LuaTeX need
@@ -32,6 +32,5 @@
catalogue-contact-repository https://github.com/hyphenation/tex-hyphen
catalogue-contact-support http://tug.org/mailman/listinfo/tex-hyphen
catalogue-ctan /language/hyph-utf8
-catalogue-date 2019-04-05 10:29:28 +0200
-catalogue-license other-free
+catalogue-license mit
catalogue-topics hyphenation
++++++ hyphen-afrikaans.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-af.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-af.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-af.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-af.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt 2011-06-11 02:32:38.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-''
-’’
---
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-äÄ
-èÈ
-êÊ
-ëË
-îÎ
-ïÏ
-ôÔ
-öÖ
-ûÛ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-af.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-af.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-af.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-af.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-% title: Hyphenation patterns for Afrikaans
-% copyright: Copyright (C) 2013 Tilla Fick and Chris Swanepoel
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Afrikaans
-% tag: af
-% version: 1.0 (September 2013)
-% authors:
-% -
-% name: Tilla Fick
-% contact: fickm (at) unisa.ac.za
-% -
-% name: Chris Swanepoel
-% contact: swanecj (at) unisa.ac.za
-% -
-% email: hyphen (at) rekenaar (dot) net
-% licence:
-% name: LPPL
-% version: 1.3
-% or_later: true
-% hyphenmins:
-% generation:
-% left: 1
-% right: 1
-% typesetting:
-% left: 1
-% right: 2
-% changes:
-% - 2013-10-08 Latest change
-% texlive:
-% encoding: ec
-% babelname: afrikaans
-% message: Afrikaans hyphenation patterns
-% description: |-
-% Hyphenation patterns for Afrikaans in T1/EC and UTF-8 encodings.
-% OpenOffice includes older patterns created by a different author,
-% but the patterns packaged with TeX are considered superior in quality.
-% ==========================================
-% These patterns were generated with Opatgen from a lexicon
-% of 183 000 syllabified Afrikaans words.
-%
-% Define lefthyphenmin to one and righthyphenmin to two
-% (although righthyphenmin could technically be made one,
-% in almost all cases a value of two gives better results)
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-afrikaans.tlpobj new/tlpkg/tlpobj/hyphen-afrikaans.tlpobj
--- old/tlpkg/tlpobj/hyphen-afrikaans.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-afrikaans.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-afrikaans
category TLCore
-revision 50792
+revision 54568
shortdesc Afrikaans hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Afrikaans in T1/EC and UTF-8
@@ -10,12 +10,10 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=afrikaans lefthyphenmin=1 righthyphenmin=2 file=loadhyph-af.tex file_patterns=hyph-af.pat.txt file_exceptions=hyph-af.hyp.txt
-runfiles size=64
+runfiles size=62
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-af.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-af.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-af.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-af.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-af.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-af.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-af.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-af.pat.txt
++++++ hyphen-ancientgreek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-grc.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-grc.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-grc.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-grc.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/tex/hyph-grc-x-ibycus.tex new/tex/generic/hyph-utf8/patterns/tex/hyph-grc-x-ibycus.tex
--- old/tex/generic/hyph-utf8/patterns/tex/hyph-grc-x-ibycus.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/tex/hyph-grc-x-ibycus.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-% title: Hyphenation patterns for Ancient Greek in Ibycus encoding
-% copyright: Copyright (C) Peter Heslin
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Ancient Greek, Ibycus encoding
-% tag: grc-x-ibycus
-% version: 3.0
-% authors:
-% - name: Peter Heslin
-% licence:
-% -
-% name: LPPL
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% babelname: ibycus
-% use_old_patterns_comment: true
-% use_old_loader: true
-% legacy_patterns: ibyhyph.tex
-% message: Ancient Greek hyphenation patterns for Ibycus encoding
-% package: ancient greek
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-grc.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-grc.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-grc.chr.txt 2016-05-16 18:14:56.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-grc.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-''
-ʼʼ
-ΐΪ́
-άΆ
-έΈ
-ήΉ
-ίΊ
-ΰΫ́
-αΑ
-βΒ
-γΓ
-δΔ
-εΕ
-ζΖ
-ηΗ
-θΘ
-ιΙ
-κΚ
-λΛ
-μΜ
-νΝ
-ξΞ
-οΟ
-πΠ
-ρΡ
-ςΣ
-σΣ
-τΤ
-υΥ
-φΦ
-χΧ
-ψΨ
-ωΩ
-ϊΪ
-ϋΫ
-όΌ
-ύΎ
-ώΏ
-ϐΒ
-ϲϹ
-ἀἈ
-ἁἉ
-ἂἊ
-ἃἋ
-ἄἌ
-ἅἍ
-ἆἎ
-ἇἏ
-ἐἘ
-ἑἙ
-ἒἚ
-ἓἛ
-ἔἜ
-ἕἝ
-ἠἨ
-ἡἩ
-ἢἪ
-ἣἫ
-ἤἬ
-ἥἭ
-ἦἮ
-ἧἯ
-ἰἸ
-ἱἹ
-ἲἺ
-ἳἻ
-ἴἼ
-ἵἽ
-ἶἾ
-ἷἿ
-ὀὈ
-ὁὉ
-ὂὊ
-ὃὋ
-ὄὌ
-ὅὍ
-ὐΥ̓
-ὑὙ
-ὒΥ̓̀
-ὓὛ
-ὔΥ̓́
-ὕὝ
-ὖΥ̓͂
-ὗὟ
-ὠὨ
-ὡὩ
-ὢὪ
-ὣὫ
-ὤὬ
-ὥὭ
-ὦὮ
-ὧὯ
-ὰᾺ
-άΆ
-ὲῈ
-έΈ
-ὴῊ
-ήΉ
-ὶῚ
-ίΊ
-ὸῸ
-όΌ
-ὺῪ
-ύΎ
-ὼῺ
-ώΏ
-ᾀἈΙ
-ᾁἉΙ
-ᾂἊΙ
-ᾃἋΙ
-ᾄἌΙ
-ᾅἍΙ
-ᾆἎΙ
-ᾇἏΙ
-ᾐἨΙ
-ᾑἩΙ
-ᾒἪΙ
-ᾓἫΙ
-ᾔἬΙ
-ᾕἭΙ
-ᾖἮΙ
-ᾗἯΙ
-ᾠὨΙ
-ᾡὩΙ
-ᾢὪΙ
-ᾣὫΙ
-ᾤὬΙ
-ᾥὭΙ
-ᾦὮΙ
-ᾧὯΙ
-ᾲᾺΙ
-ᾳΑΙ
-ᾴΆΙ
-ᾶΑ͂
-ᾷΑ͂Ι
-᾽᾽
-᾿᾿
-ῂῊΙ
-ῃΗΙ
-ῄΉΙ
-ῆΗ͂
-ῇΗ͂Ι
-ῒΪ̀
-ΐΪ́
-ῖΙ͂
-ῗΪ͂
-ῢΫ̀
-ΰΫ́
-ῤΡ̓
-ῥῬ
-ῦΥ͂
-ῧΫ͂
-ῲῺΙ
-ῳΩΙ
-ῴΏΙ
-ῶΩ͂
-ῷΩ͂Ι
-’’
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-grc.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-grc.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-grc.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-grc.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-% title: Hyphenation patterns for Ancient Greek
-% copyright: Copyright (C) 2008-2016 Dimitrios Filippou
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Ancient Greek
-% tag: grc
-% version: 2016-05-12
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 1
-% authors:
-% -
-% name: Dimitrios Filippou
-% contact: dimitrios.filippou (at) riotinto.com
-% licence:
-% name: LPPL
-% url: http://www.latex-project.org/lppl/
-% changes:
-% -
-% date: 2016-05-12
-% author: Arthur Reutenauer
-% description: added support for curly beta
-% -
-% date: 2011-09-12
-% author: Dimitrios Filippou
-% description: updated headers and added the LPPL licence statement
-% -
-% date: 2008-06-06
-% author: Dimitrios Filippou
-% description: removed guillemets (»)
-% -
-% date: 2008-05-27
-% author: Dimitrios Filippou
-% texlive:
-% babelname: ancientgreek
-% use_old_patterns_comment: Old patterns work in a different way, one-to-one conversion from UTF-8 is not possible.
-% legacy_patterns: grahyph5.tex
-% message: Hyphenation patterns for Ancient Greek
-% package: ancient greek
-%
-% ==========================================
-% This file was first created by mechanical translation from
-% GRAhyph5.tex via "elhyph-utf8 -a -c" (version 0.1 by Peter
-% Heslin -- p.j.heslin at durham dot ac dot uk). Some additions
-% were also made by hand.
-%
-% Created by Dimitrios Filippou with some ideas borrowed from
-% Yannis Haralambous, Kostis Dryllerakis and Claudio Beccari.
-% Mojca Miklavec adapted it for the "hyph-utf8" package.
-%
-% These hyphenation patterns are explained in "ancient.pdf", which
-% can be found in the "elhyphen" or "hyphenation-greek" package.
-% Hyphenation examples are given in the file "anc-test.pdf", also
-% to be found in the "elhyphen" or "hyphenation-greek" package.
-% Questionable patterns are marked by three question marks "???".
-%
-% Documentation in English can be found in: D. Filippou,
-% "Hyphenation patterns for Ancient and Modern Greek," in
-% "TeX, XML, and Digital Typography" (A. Syropoulos et al.,
-% eds.), Lecture Notes in Computer Science 3130, Springer-Verlag
-% Berlin-Heidelberg, 2004. ISBN 3-540-22801-2.
-%
-% Thanks to Thomas Schmitz (thomas.schmitz at uni-bonn dot de)
-% for pointing out a few mistakes. (Marked by %%%TS%%%)
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-ancientgreek.tlpobj new/tlpkg/tlpobj/hyphen-ancientgreek.tlpobj
--- old/tlpkg/tlpobj/hyphen-ancientgreek.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-ancientgreek.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-ancientgreek
category TLCore
-revision 50805
+revision 54568
shortdesc Ancient Greek hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Ancient Greek in LGR and UTF-8
@@ -12,13 +12,9 @@
depend hyph-utf8
execute AddHyphen name=ancientgreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-grc.tex file_patterns=hyph-grc.pat.txt file_exceptions=
execute AddHyphen name=ibycus lefthyphenmin=2 righthyphenmin=2 file=ibyhyph.tex luaspecial="disabled:8-bit only"
-runfiles size=57
+runfiles size=54
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-grc.tex
- RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-grc-x-ibycus.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-grc.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-grc.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-grc.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-grc.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-grc.pat.txt
RELOC/tex/generic/hyphen/grahyph5.tex
RELOC/tex/generic/hyphen/ibyhyph.tex
++++++ hyphen-arabic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/tex/hyph-ar.tex new/tex/generic/hyph-utf8/patterns/tex/hyph-ar.tex
--- old/tex/generic/hyph-utf8/patterns/tex/hyph-ar.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/tex/hyph-ar.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-% title: (No) Hyphenation patterns for Arabic
-% copyright: Copyright (C) Arthur Reutenauer 2018
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Arabic
-% tag: ar
-% version: 0
-% authors:
-% - Arthur Reutenauer
-% licence:
-% -
-% name: MIT
-% hyphenmins:
-% typesetting:
-% left:
-% right:
-% texlive:
-% babelname: arabic
-% use_old_loader: true
-% legacy_patterns: zerohyph.tex
-% message:
-% description: Prevent hyphenation in Arabic.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-arabic.tlpobj new/tlpkg/tlpobj/hyphen-arabic.tlpobj
--- old/tlpkg/tlpobj/hyphen-arabic.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-arabic.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,11 +1,9 @@
name hyphen-arabic
category TLCore
-revision 50805
+revision 54568
shortdesc (No) Arabic hyphenation patterns.
relocated 1
longdesc Prevent hyphenation in Arabic.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=arabic lefthyphenmin= righthyphenmin= file=zerohyph.tex file_patterns=
-runfiles size=1
- RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ar.tex
++++++ hyphen-armenian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-hy.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-hy.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-hy.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-hy.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hy.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hy.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hy.chr.txt 2011-06-22 11:20:34.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hy.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-աԱ
-բԲ
-գԳ
-դԴ
-եԵ
-զԶ
-էԷ
-ըԸ
-թԹ
-ժԺ
-իԻ
-լԼ
-խԽ
-ծԾ
-կԿ
-հՀ
-ձՁ
-ղՂ
-ճՃ
-մՄ
-յՅ
-նՆ
-շՇ
-ոՈ
-չՉ
-պՊ
-ջՋ
-ռՌ
-սՍ
-վՎ
-տՏ
-րՐ
-ցՑ
-փՓ
-քՔ
-օՕ
-ևԵՒ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hy.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hy.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hy.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hy.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-% title: Hyphenation patterns for Armenian
-% copyright: Copyright (C) 2010 Sahak Petrosyan
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Armenian
-% tag: hy
-% version: May 2010
-% authors:
-% -
-% name: Sahak Petrosyan
-% contact: sahak (at) mit.edu
-% licence:
-% name: LGPL
-% url: https://www.gnu.org/licenses/lgpl-3.0.en.html
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 2
-% texlive:
-% babelname: armenian
-% message: Armenian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Armenian for Unicode engines.
-% Auto-generated from a script included in hyph-utf8.
-% ==========================================
-% Written by Sahak Petrosyan for Hyphenator.js and later adapted for TeX
-%
-% These are just primitive rules that hyphenate combinations like
-% <vowel> - <consonant><vowel>.
-%
-% File auto-generated by a script (see source/generic/hyph-utf8/languages/hy)
-%
-% Vowels: ա ե է ը ի ո օ
-% Consonants: բ գ դ զ թ ժ լ խ ծ կ հ ձ ղ ճ մ յ ն շ չ պ ջ ռ ս վ տ ր ց փ ք
-%
-% Some of the patterns below represent combinations that never
-% appear in Armenian, but they would be hyphenated according to the rules.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-armenian.tlpobj new/tlpkg/tlpobj/hyphen-armenian.tlpobj
--- old/tlpkg/tlpobj/hyphen-armenian.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-armenian.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-armenian
category TLCore
-revision 50792
+revision 54568
shortdesc Armenian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Armenian for Unicode engines.
@@ -8,10 +8,7 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=armenian lefthyphenmin=1 righthyphenmin=2 file=loadhyph-hy.tex file_patterns=hyph-hy.pat.txt file_exceptions=
-runfiles size=10
+runfiles size=8
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-hy.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-hy.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hy.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hy.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hy.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hy.pat.txt
++++++ hyphen-base.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/config/language.dat new/tex/generic/config/language.dat
--- old/tex/generic/config/language.dat 2019-04-06 23:31:48.000000000 +0200
+++ new/tex/generic/config/language.dat 2020-04-16 01:56:24.000000000 +0200
@@ -1,4 +1,4 @@
-% Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sat Apr 6 23:31:47 2019
+% Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Thu Apr 16 01:56:23 2020
% $Id: language.us 18738 2010-06-04 17:18:14Z karl $
% language.us (and the start of language.dat)
% - initial hyphenation patterns.
@@ -79,6 +79,8 @@
bulgarian loadhyph-bg.tex
% from hyphen-catalan:
catalan loadhyph-ca.tex
+% from hyphen-chinese:
+pinyin loadhyph-zh-latn-pinyin.tex
% from hyphen-churchslavonic:
churchslavonic loadhyph-cu.tex
% from hyphen-coptic:
@@ -124,9 +126,9 @@
ngerman loadhyph-de-1996.tex
swissgerman loadhyph-de-ch-1901.tex
% from hyphen-greek:
-monogreek loadhyph-el-monoton.tex
greek loadhyph-el-polyton.tex
=polygreek
+monogreek loadhyph-el-monoton.tex
% from hyphen-hungarian:
hungarian loadhyph-hu.tex
% from hyphen-icelandic:
@@ -140,8 +142,8 @@
malayalam loadhyph-ml.tex
marathi loadhyph-mr.tex
oriya loadhyph-or.tex
-panjabi loadhyph-pa.tex
pali loadhyph-pi.tex
+panjabi loadhyph-pa.tex
tamil loadhyph-ta.tex
telugu loadhyph-te.tex
% from hyphen-indonesian:
@@ -155,13 +157,15 @@
% from hyphen-kurmanji:
kurmanji loadhyph-kmr.tex
% from hyphen-latin:
-latin loadhyph-la.tex
classiclatin loadhyph-la-x-classic.tex
+latin loadhyph-la.tex
liturgicallatin loadhyph-la-x-liturgic.tex
% from hyphen-latvian:
latvian loadhyph-lv.tex
% from hyphen-lithuanian:
lithuanian loadhyph-lt.tex
+% from hyphen-macedonian:
+macedonian loadhyph-mk.tex
% from hyphen-mongolian:
mongolian loadhyph-mn-cyrl.tex
mongolianlmc loadhyph-mn-cyrl-x-lmc.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/config/language.dat.lua new/tex/generic/config/language.dat.lua
--- old/tex/generic/config/language.dat.lua 2019-04-06 23:31:57.000000000 +0200
+++ new/tex/generic/config/language.dat.lua 2020-04-16 01:56:32.000000000 +0200
@@ -1,4 +1,4 @@
--- Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Sat Apr 6 23:31:56 2019
+-- Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Thu Apr 16 01:56:32 2020
-- $Id: language.us.lua 18737 2010-06-04 17:09:02Z karl $
--[[
language.us.dat (and the start of language.dat.lua), used by:
@@ -40,7 +40,7 @@
righthyphenmin = 2,
synonyms = { 'german-x-latest' },
patterns = 'hyph-de-1901.pat.txt',
- hyphenation = 'hyph-de-1901.hyp.txt',
+ hyphenation = '',
},
['ngerman-x-2019-04-04'] = {
loader = 'dehyphn-x-2019-04-04.tex',
@@ -48,7 +48,7 @@
righthyphenmin = 2,
synonyms = { 'ngerman-x-latest' },
patterns = 'hyph-de-1996.pat.txt',
- hyphenation = 'hyph-de-1996.hyp.txt',
+ hyphenation = '',
},
-- from hyphen-afrikaans:
['afrikaans'] = {
@@ -128,6 +128,15 @@
patterns = 'hyph-ca.pat.txt',
hyphenation = 'hyph-ca.hyp.txt',
},
+-- from hyphen-chinese:
+ ['pinyin'] = {
+ loader = 'loadhyph-zh-latn-pinyin.tex',
+ lefthyphenmin = 1,
+ righthyphenmin = 2,
+ synonyms = { },
+ patterns = 'hyph-zh-latn-pinyin.pat.txt',
+ hyphenation = '',
+ },
-- from hyphen-churchslavonic:
['churchslavonic'] = {
loader = 'loadhyph-cu.tex',
@@ -305,14 +314,6 @@
hyphenation = '',
},
-- from hyphen-greek:
- ['monogreek'] = {
- loader = 'loadhyph-el-monoton.tex',
- lefthyphenmin = 1,
- righthyphenmin = 1,
- synonyms = { },
- patterns = 'hyph-el-monoton.pat.txt',
- hyphenation = '',
- },
['greek'] = {
loader = 'loadhyph-el-polyton.tex',
lefthyphenmin = 1,
@@ -321,6 +322,14 @@
patterns = 'hyph-el-polyton.pat.txt',
hyphenation = '',
},
+ ['monogreek'] = {
+ loader = 'loadhyph-el-monoton.tex',
+ lefthyphenmin = 1,
+ righthyphenmin = 1,
+ synonyms = { },
+ patterns = 'hyph-el-monoton.pat.txt',
+ hyphenation = '',
+ },
-- from hyphen-hungarian:
['hungarian'] = {
loader = 'loadhyph-hu.tex',
@@ -404,14 +413,6 @@
patterns = 'hyph-or.pat.txt',
hyphenation = '',
},
- ['panjabi'] = {
- loader = 'loadhyph-pa.tex',
- lefthyphenmin = 1,
- righthyphenmin = 1,
- synonyms = { },
- patterns = 'hyph-pa.pat.txt',
- hyphenation = '',
- },
['pali'] = {
loader = 'loadhyph-pi.tex',
lefthyphenmin = 1,
@@ -420,6 +421,14 @@
patterns = 'hyph-pi.pat.txt',
hyphenation = '',
},
+ ['panjabi'] = {
+ loader = 'loadhyph-pa.tex',
+ lefthyphenmin = 1,
+ righthyphenmin = 1,
+ synonyms = { },
+ patterns = 'hyph-pa.pat.txt',
+ hyphenation = '',
+ },
['tamil'] = {
loader = 'loadhyph-ta.tex',
lefthyphenmin = 1,
@@ -482,20 +491,20 @@
hyphenation = '',
},
-- from hyphen-latin:
- ['latin'] = {
- loader = 'loadhyph-la.tex',
+ ['classiclatin'] = {
+ loader = 'loadhyph-la-x-classic.tex',
lefthyphenmin = 2,
righthyphenmin = 2,
synonyms = { },
- patterns = 'hyph-la.pat.txt',
+ patterns = 'hyph-la-x-classic.pat.txt',
hyphenation = '',
},
- ['classiclatin'] = {
- loader = 'loadhyph-la-x-classic.tex',
+ ['latin'] = {
+ loader = 'loadhyph-la.tex',
lefthyphenmin = 2,
righthyphenmin = 2,
synonyms = { },
- patterns = 'hyph-la-x-classic.pat.txt',
+ patterns = 'hyph-la.pat.txt',
hyphenation = '',
},
['liturgicallatin'] = {
@@ -524,6 +533,15 @@
patterns = 'hyph-lt.pat.txt',
hyphenation = '',
},
+-- from hyphen-macedonian:
+ ['macedonian'] = {
+ loader = 'loadhyph-mk.tex',
+ lefthyphenmin = 2,
+ righthyphenmin = 2,
+ synonyms = { },
+ patterns = 'hyph-mk.pat.txt',
+ hyphenation = '',
+ },
-- from hyphen-mongolian:
['mongolian'] = {
loader = 'loadhyph-mn-cyrl.tex',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/config/language.def new/tex/generic/config/language.def
--- old/tex/generic/config/language.def 2019-04-06 23:31:53.000000000 +0200
+++ new/tex/generic/config/language.def 2020-04-16 01:56:28.000000000 +0200
@@ -50,6 +50,8 @@
\addlanguage{bulgarian}{loadhyph-bg.tex}{}{2}{2}
% from hyphen-catalan:
\addlanguage{catalan}{loadhyph-ca.tex}{}{2}{2}
+% from hyphen-chinese:
+\addlanguage{pinyin}{loadhyph-zh-latn-pinyin.tex}{}{1}{2}
% from hyphen-churchslavonic:
\addlanguage{churchslavonic}{loadhyph-cu.tex}{}{1}{2}
% from hyphen-coptic:
@@ -95,9 +97,9 @@
\addlanguage{ngerman}{loadhyph-de-1996.tex}{}{2}{2}
\addlanguage{swissgerman}{loadhyph-de-ch-1901.tex}{}{2}{2}
% from hyphen-greek:
-\addlanguage{monogreek}{loadhyph-el-monoton.tex}{}{1}{1}
\addlanguage{greek}{loadhyph-el-polyton.tex}{}{1}{1}
\addlanguage{polygreek}{loadhyph-el-polyton.tex}{}{1}{1}
+\addlanguage{monogreek}{loadhyph-el-monoton.tex}{}{1}{1}
% from hyphen-hungarian:
\addlanguage{hungarian}{loadhyph-hu.tex}{}{2}{2}
% from hyphen-icelandic:
@@ -111,8 +113,8 @@
\addlanguage{malayalam}{loadhyph-ml.tex}{}{1}{1}
\addlanguage{marathi}{loadhyph-mr.tex}{}{1}{1}
\addlanguage{oriya}{loadhyph-or.tex}{}{1}{1}
-\addlanguage{panjabi}{loadhyph-pa.tex}{}{1}{1}
\addlanguage{pali}{loadhyph-pi.tex}{}{1}{2}
+\addlanguage{panjabi}{loadhyph-pa.tex}{}{1}{1}
\addlanguage{tamil}{loadhyph-ta.tex}{}{1}{1}
\addlanguage{telugu}{loadhyph-te.tex}{}{1}{1}
% from hyphen-indonesian:
@@ -126,13 +128,15 @@
% from hyphen-kurmanji:
\addlanguage{kurmanji}{loadhyph-kmr.tex}{}{2}{2}
% from hyphen-latin:
-\addlanguage{latin}{loadhyph-la.tex}{}{2}{2}
\addlanguage{classiclatin}{loadhyph-la-x-classic.tex}{}{2}{2}
+\addlanguage{latin}{loadhyph-la.tex}{}{2}{2}
\addlanguage{liturgicallatin}{loadhyph-la-x-liturgic.tex}{}{2}{2}
% from hyphen-latvian:
\addlanguage{latvian}{loadhyph-lv.tex}{}{2}{2}
% from hyphen-lithuanian:
\addlanguage{lithuanian}{loadhyph-lt.tex}{}{2}{2}
+% from hyphen-macedonian:
+\addlanguage{macedonian}{loadhyph-mk.tex}{}{2}{2}
% from hyphen-mongolian:
\addlanguage{mongolian}{loadhyph-mn-cyrl.tex}{}{2}{2}
\addlanguage{mongolianlmc}{loadhyph-mn-cyrl-x-lmc.tex}{}{2}{2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-base.tlpobj new/tlpkg/tlpobj/hyphen-base.tlpobj
--- old/tlpkg/tlpobj/hyphen-base.tlpobj 2019-04-07 01:38:03.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-base.tlpobj 2020-04-17 01:55:25.000000000 +0200
@@ -1,6 +1,6 @@
name hyphen-base
category TLCore
-revision 50826
+revision 54763
shortdesc core hyphenation support files
relocated 1
longdesc Includes Knuth's original hyphen.tex, zerohyph.tex to disable
++++++ hyphen-basque.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-eu.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-eu.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-eu.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-eu.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-eu.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-eu.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-eu.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-eu.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-ñÑ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-eu.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-eu.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-eu.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-eu.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-% copyright: Copyright (C) 1997, 2008 Juan M. Aguirregabiria
-% title: Hyphenation patterns for Basque
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information on the package,
-% and http://tp.lc.ehu.es/jma/basque.html for details on Basque hyphenation.
-% language:
-% name: Basque
-% tag: eu
-% version: June 2008
-% authors:
-% -
-% name: Juan M. Aguirregabiria
-% contact: juanmari.aguirregabiria (at) ehu.es
-% licence:
-% text: >
-% Permission is hereby granted, free of charge, to any person obtaining
-% a copy of this file and any associated documentation
-% (the "Data Files") to deal in the Data Files
-% without restriction, including without limitation the rights to use,
-% copy, modify, merge, publish, distribute, and/or sell copies of
-% the Data Files, and to permit persons to whom the Data Files
-% are furnished to do so, provided that
-% (a) this copyright and permission notice appear with all copies
-% of the Data Files,
-% (b) this copyright and permission notice appear in associated
-% documentation, and
-% (c) there is clear notice in each modified Data File
-% as well as in the documentation associated with the Data File(s)
-% that the data has been modified.
-%
-% THE DATA FILES ARE 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 OF THIRD PARTY RIGHTS.
-% IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-% NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-% DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-% DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-% TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-% PERFORMANCE OF THE DATA FILES.
-%
-% Except as contained in this notice, the name of a copyright holder
-% shall not be used in advertising or otherwise to promote the sale,
-% use or other dealings in these Data Files without prior
-% written authorization of the copyright holder.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - >
-% February 1997 Patterns created by Juan M. Aguirregabiria, based on the
-% shyphen.sh script for Spanish by Julio Sanchez, September 1991.
-% - >
-% 26 June 2008 Generating script rewritten in Ruby and adapted for native
-% UTF-8 TeX engines, patterns renamed from bahyph.tex to
-% hyph-eu.tex and added to the hyph-utf8 package. Functionality should
-% not change apart from adding ñ by default.
-% texlive:
-% encoding: ec
-% babelname: basque
-% legacy_patterns: bahyph.tex
-% message: Basque hyphenation patterns
-% description: Hyphenation patterns for Basque in T1/EC and UTF-8 encodings.
-% ==========================================
-%
-% Open vowels: a e o
-% Closed vowels: i u
-% Consonants: b c d f g j k l m n ñ p q r s t v w x y z
-%
-% Some of the patterns below represent combinations that never
-% happen in Basque. Would they happen, they would be hyphenated
-% according to the rules.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-basque.tlpobj new/tlpkg/tlpobj/hyphen-basque.tlpobj
--- old/tlpkg/tlpobj/hyphen-basque.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-basque.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-basque
category TLCore
-revision 50792
+revision 54568
catalogue bahyph
shortdesc Basque hyphenation patterns.
relocated 1
@@ -8,15 +8,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=basque lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eu.tex file_patterns=hyph-eu.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-eu.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-eu.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-eu.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eu.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eu.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eu.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eu.pat.txt
catalogue-ctan /language/basque
-catalogue-date 2016-11-05 05:59:04 +0100
catalogue-license other-free
catalogue-topics basque hyphenation
++++++ hyphen-belarusian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-be.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-be.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-be.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-be.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-be.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-be.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-be.chr.txt 2017-05-18 06:05:56.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-be.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-''
-’’
---
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-йЙ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-ыЫ
-ьЬ
-эЭ
-юЮ
-яЯ
-ёЁ
-іІ
-ўЎ
-ґҐ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-be.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-be.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-be.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-be.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,70 +0,0 @@
-% title: Hyphenation patterns for Belarusian
-% copyright: Copyright (C) 2016 Maksim Salau
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% source: https://github.com/hyphenation/hyph-be
-% language:
-% name: Belarusian
-% tag: be
-% version: 1.01 (October 2016)
-% authors:
-% -
-% name: Maksim Salau
-% contact: maksim.salau (at) gmail.com
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% changes:
-% - Version 1.01 <2016/10/03> Added YAML header
-% - Version 1.00 <2016/09/29> Initial version
-% texlive:
-% encoding: t2a
-% babelname: belarusian
-% message: Belarusian hyphenation patterns
-% description:
-% Belarusian hyphenation patterns in T2A and UTF-8 encodings
-% ==========================================
-%
-% Many thanks to Aleś Bułojčyk <alex73mail(a)gmail.com> and
-% Sviatlana Liasovich <xelj.gjkz(a)bk.ru> for their work on
-% Belarusian hyphenation dictionary for OpenOffice.
-% http://extensions.services.openoffice.org/en/project/dict-be-official
-%
-% Створана адпаведна правілаў, зацверджаных законам
-% ад 23 лiпеня 2008 г. No 420-З
-% Аб Правiлах беларускай арфаграфii i пунктуацыi
-% http://academy.edu.by/files/zak_420-3.pdf
-%
-% РАЗДЗЕЛ I. АРФАГРАФIЯ
-% ГЛАВА 8 ПРАВIЛЫ ПЕРАНОСУ
-% § 41. Правiлы пераносу простых, складаных, складанаскарочаных слоў,
-% умоўных графiчных скарачэнняў i iншых знакаў
-%
-% Based on rules approved by the law No 420-3 dated 23 July 2008
-% About Belarusian orthography and punctuation
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-belarusian.tlpobj new/tlpkg/tlpobj/hyphen-belarusian.tlpobj
--- old/tlpkg/tlpobj/hyphen-belarusian.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-belarusian.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,18 +1,15 @@
name hyphen-belarusian
category TLCore
-revision 50792
+revision 54568
shortdesc Belarusian hyphenation patterns.
relocated 1
longdesc Belarusian hyphenation patterns in T2A and UTF-8 encodings
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=belarusian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-be.tex file_patterns=hyph-be.pat.txt file_exceptions=
-runfiles size=32
+runfiles size=30
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-be.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-be.t2a.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-be.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-be.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-be.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-be.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-be.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-be.pat.txt
++++++ hyphen-bulgarian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-bg.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-bg.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-bg.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-bg.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-bg.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-bg.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-bg.chr.txt 2018-04-08 22:03:05.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-bg.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-йЙ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-щЩ
-ъЪ
-юЮ
-яЯ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,895 +0,0 @@
-% copyright: Copyright (C) 2000, 2004, 2017 Anton Zinoviev
-% title: Hyphenation patterns for Bulgarian
-% version: 21 October 2017
-% language:
-% name: Bulgarian
-% tag: bg
-% notice: >
-% This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% The Bulgarian patterns used to come from another file,
-% by Georgi Boshnakov, named bghyphen.tex
-% authors:
-% -
-% name: Anton Zinoviev
-% contact: anton:lml.bas.bg
-% licence:
-% text: > # Seems equivalent to 3-clause BSD
-% This software may be used, modified, copied, distributed, and sold,
-% both in source and binary form provided that the above copyright
-% notice and these terms are retained. The name of the author may not
-% be used to endorse or promote products derived from this software
-% without prior permission. THIS SOFTWARE IS PROVIDES "AS IS" AND
-% ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED. IN NO EVENT
-% SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT
-% OF THE USE OF THIS SOFTWARE.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes: See below
-% texlive:
-% encoding: t2a
-% message: Bulgarian hyphenation patterns
-% description: Hyphenation patterns for Bulgarian in T2A and UTF-8 encodings.
-% babelname: bulgarian
-% ==========================================
-% Copyright (C) 2000,2004,2017 by Anton Zinoviev <anton(a)lml.bas.bg>
-%
-% This software may be used, modified, copied, distributed, and sold,
-% both in source and binary form provided that the above copyright
-% notice and these terms are retained. The name of the author may not
-% be used to endorse or promote products derived from this software
-% without prior permission. THIS SOFTWARE IS PROVIDES "AS IS" AND
-% ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED. IN NO EVENT
-% SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT
-% OF THE USE OF THIS SOFTWARE.
-%
-% Bulgarian hyphenation patterns
-%
-% Generated by ./hyph-bg.sh --safe-morphology --standalone-tex
-%
-% Both left and right hyphenmins should be set to 2.
-%
-% % Automated Bulgarian Hyphenation
-% % Anton Zinoviev
-% % 21 October 2017
-%
-% Principles of the Bulgarian hyphenation
-% =======================================
-%
-% One specificity of the Bulgarian language is that the average length
-% of the words is greater than in English. When typesetting a Bulgarian
-% text, hyphenation is more important than when typesetting an English
-% text. Knuth's algorithm for line-breaking is such that in most
-% English paragraphs no hyphenation will be used. With a Bulgarian
-% text, however, even the Knuth's algorithm will use hyphenation in most
-% paragraphs. Hyphenation becomes an absolute necessity if we want to
-% obtain nice, justified paragraphs when using a software with dumb
-% line-breaking algorithm, such as LibreOffice.
-%
-% According to Decree 936 of the Council of Ministers promulgated on 27
-% November 1950, the Institute for Bulgarian Language at the Bulgarian
-% Academy of Sciences is authorised to publish the rules of the
-% orthography of the Bulgarian language (within certain limits).
-%
-% Hyphenation rules between 1945 and 1983
-% ---------------------------------------
-%
-% Between 1945 and 1983 Bulgarian used syllable hyphenation with two
-% morphological exceptions: hyphenation is preferred between a prefix
-% and a stem and at the boundary of compound words. The following were
-% the rules governing the hyphenation:
-%
-% 1. One letter does not stay alone. Words of one syllable can not be
-% hyphenated.
-% 2. No hyphenation before or after ь.
-% 3. In a sequence of vowels at least one vowel stays before the
-% hyphen.
-% 4. A single consonant between two vowels links with the second vowel.
-% For example по-ле /po-le/, ра-бо-та /ra-bo-ta/.
-% 5. In a sequence of consonants between two vowels, at least one
-% consonant stays with the second vowel. For example те-сто /te-sto/
-% or тес-то /tes-to/.[^b]
-% 6. In a sequence of consonants between two vowels, if the first
-% consonant is sonorant (й /y/, л /l/, м /m/, н /n/, р /r/), then it
-% stays with the first vowel. For example гер-дан /ger-dan/, сен-ки
-% /sen-ki/.
-% 7. The hyphenation separates two successive equal consonants. For
-% example времен-но /vremen-no/, пролет-та /prolet-ta/.
-% 8. When the letters дж /dzh/ and дз /dz/ denote a single consonant,
-% then they are not separated. For example боя-джия /boya-dzhiya/
-% but not бояд-жия /boyad-zhiya/. When these letters denote two
-% consonants, then the normal rules apply: над-живявам
-% /nad-zhivyavam/.
-% 9. Word prefixes may not be broken. Compound words are hyphenated
-% either at the boundary of the components or the hyphenation rules
-% are applied to each of the components separately. For example:
-% пред-упреждавам /pred-uprezhdavam/ (not пре-дупреждавам
-% /pre-duprezhdavam/), пред-известие /pred-izvestie/ (not
-% пре-дизвестие /pre-dizvestie/), за-движвам /za-dvizhvam/ (not
-% зад-вижвам /zad-vizhvam/), авто-клуб /avto-klub/ (not авток-луб
-% /avtok-lub/), вакуум-апарат /vakuum-aparat/ (not вакуу-мапарат
-% /vakuu-maparat/).
-%
-% In some rare cases the proper application of rule 9 depends on the
-% semantics of the word. For example пре-дреша /pre-dresha/ 'change
-% clothes' but пред-реша /pred-resha/ 'predetermine' or прес-пите
-% /pres-pite/ 'the snow-drifts' but пре-спите /pre-spite/ 'sleep for a
-% while/overnight'.
-%
-% [^b]: In several publications this rule is formulated with the
-% additional restriction that the sequence of consonants begins with
-% an obstruent. I believe this restriction is unintentional. It
-% makes no sense to forbid a hyphenation of the form AB-A but to
-% permit ABB-A (A denotes a vowel and B – a consonant).
-%
-% Hyphenation rules between 1983 and 2012
-% ---------------------------------------
-%
-% The Orthographic dictionary published by the Institute for Bulgarian
-% language in 1983 introduced new hyphenation rules. The complexity of
-% the previous rules was the main reason for the change. The new rules
-% aimed at two objectives: simplicity and unambiguity.
-%
-% The new rules are:
-%
-% 1. A consonant between two vowels links with the second vowel. For
-% example ви-со-чи-на /vi-so-chi-na/.
-% 2. In a sequence of two or more consonants between two vowels, at
-% least one consonant stays with first vowel and at least one with
-% the second vowel. For example сес-тра /ses-tra/ and сест-ра
-% /sest-ra/.
-% 3. Two equal consonants are separated. For example плен-ник
-% /plen-nik/.
-% 4. In a sequence of two or more vowels, the first vowel stays before
-% the hyphen. For example пре-одолея /pre-odoleya/ and прео-долея
-% /preo-doleya/.
-% 5. In a sequence of three or more vowels, the last vowel stays after
-% the hyphen. For example мао-изъм /mao-izam/ but not маои-зъм
-% /maoi-zam/.
-% 6. The letter й /y/ between a vowel and a consonant stays with the
-% vowel. For example май-ка /may-ka/.
-% 7. When a sequence of two or more consonants follows й /y/ then at
-% least one consonant links with й /y/. For example айс-берг
-% /ays-berg/ (not ай-сберг /ay-sberg/).
-% 8. The letter й /y/ between two vowels links with the second vowel.
-% For example ма-йор /ma-yor/.
-% 9. No hyphenation before or after ь.
-% 10. When the letters дж /dzh/ denote a single consonant, then they are
-% not separated. For example су-джук /su-dzhuk/ (not суд-жук
-% /sud-zhuk/) but над-живея /nad-zhiveya/.
-% 11. There must be at least one vowel before and after the hyphen.
-% 12. One letter does not stay alone.
-%
-% The total disregard of the morphology by these rules leads to some
-% strange results. For example пре-дизвестие /pre-dizvestie/ is
-% permitted and пред-известие /pred-izvestie/ is forbidden, зад-вижвам
-% /zad-vizhvam/ is permitted and за-движвам /za-dvizhvam/ is forbidden,
-% авток-луб /avtok-lub/ is permitted and авто-клуб /avto-klub/ is
-% forbidden, вакуу-мапарат /vakuu-maparat/ is permitted and
-% вакуум-апарат /vakuum-aparat/ is forbidden. Because of this, the new
-% rules were not universally accepted. The old rules are still
-% mentioned in various places in Internet, they are included even in
-% some grammar books published by the publishing houses of the Ministry
-% of Education and of Sofia University. The software developers,
-% however, soon came into love with the new hyphenation rules.
-%
-% Hyphenation rules after 2012
-% ----------------------------
-%
-% In 2012 new rules came into force. There are two differences with
-% respect to the previous rules:
-%
-% 1. Rule 5 of the previous rules is revoked. For example маои-зъм
-% /maoi-zam/ becomes a valid hyphenation.
-% 2. The new rules permit morphologically based hyphenation (however it
-% is not obligatory). For example пред-известие /pred-izvestie/,
-% за-движвам /za-dvizhvam/, авто-клуб /avto-klub/, вакуум-апарат
-% /vakuum-aparat/ are valid hyphenations.
-%
-% Good hyphenation is a complex matter and it seems the linguists at the
-% Institute for Bulgarian Language have recognised this. They no longer
-% attempt to provide universal rules about everything. Instead, they
-% provide some very permissible rules while the good application of
-% these rules is leaved to the discretion and the experience of the
-% printers and the developers of hyphenation software.
-%
-% It makes sense to use at least two different sets of hyphenation rules
-% for Bulgarian. In most cases a more restrictive version should be
-% used, one which attempts to eliminate the controversial cases of
-% hyphenation. When typesetting a Bulgarian text in a narrow newspaper
-% column, however, it will be appropriate to use more liberal
-% hyphenation rules. It should be noted that one of the reasons for the
-% hyphenation reform in 1983 was the desire to fix the chaotic
-% hyphenation in the Bulgarian newspapers at that time.
-%
-% Computer implementations
-% ========================
-%
-% Mathematical analysis of the Bulgarian hyphenation
-% --------------------------------------------------
-%
-% The earliest mathematical analysis of the Bulgarian hyphenation rules
-% belongs to Veska Noncheva.[^1] In 1988 she proposed a mathematical
-% formalisation of the hyphenation rules in a table with 22 rows.[^2]
-%
-% [^1]: <http://www.researchgate.net/profile/Veska_Noncheva>
-%
-% [^2]: Нончева В. Алгоритъм за автоматично пренасяне на думи в
-% българския език. Математика и математическо
-% образование. Сб. доклади на 17. ПК на СМБ. С., БАН, 1988, 479-482.
-%
-% In the same year Eugene Belogay[^3] proposed an alternative
-% formalisation with only 9 rules.[^4] Belogay proved that his rules are
-% consistent and that they form a minimal set. The rules of Belogay
-% have negative character – every hyphenation which is not forbidden by
-% a rule is possible hyphenation.
-%
-% [^3]: <http://www.linkedin.com/in/belogay>
-%
-% [^4]: Белогай Е. Алгоритъм за автоматично пренасяне на думи. Компютър
-% за вас (1988) 3, 12-14.
-%
-% The following are the first 7 rules, as formulated by Belogay:
-%
-% 1. Б-А
-% 2. А-ББ
-% 3. Б-ТТ, ТТ-Б
-% 4. ААА-Б
-% 5. й-ББ
-% 6. Б-ь
-% 7. д-ж
-%
-% Here А denotes an arbitrary vowel letter, Б denotes an arbitrary
-% consonant letter (including ь and й), ТТ denotes a sequence of two
-% equal consonant letters and the letters й, ь, д and ж denote
-% themselves. For example the rule "Б-А" says that we are not permitted
-% to separate a consonant letter from immediately following vowel
-% letter.
-%
-% The eighth rule of Belogay says that hyphenation is forbidden before
-% the first and after the last vowel letter. The ninth rule of Belogay
-% says that hyphenation is forbidden immediately after the first or
-% immediately before the last letter of the word.
-%
-% Notice that is is very easy to translate the rules of Belogay in the
-% form, required for the hyphenation algorithm of Knuth and Liang used
-% in TeX.[^a] Let us remind that this algorithm matches the word with a
-% set of string patterns in which the odd numbers say hyphenation is
-% permitted in this position and even numbers say the hyphenation is
-% forbidden. When two patterns give conflicting numbers for the same
-% position, then the greater number wins.
-%
-% First, since the rules of Belogay are negative (they say where
-% hyphenation is forbidden, not where it is permitted), we have to
-% permit the hyphenation everywhere:
-%
-% 1. А1
-% 2. Б1
-%
-% Then, the first seven rules of Belogay obtain the form:
-%
-% 1. Б2А
-% 2. А2ББ
-% 3. Б2ТТ ТТ2Б
-% 4. ААА2Б
-% 5. й2ББ
-% 6. Б2ь
-% 7. д2ж
-%
-% Since no Bulgarian word starts with more that four consonants and no
-% Bulgarian word ends with more than three consonants, the eighth rule
-% of Belogay can be translated in the following way:
-%
-% 1. .Б2
-% 2. .ББ2
-% 3. .БББ2
-% 4. 2Б.
-% 5. 2ББ.
-%
-% The ninth rule of Belogay means that left and right hyphen mins should
-% be set to 2.
-%
-% The work of Eugene Belogay was not limited to merely a mathematical
-% analysis of the Bulgarian hyphenation rules. In his paper he
-% published a short algorithm in Pascal which implements these rules.
-% It didn't take long for this algorithm to be used in various text
-% processing software. The algorithm of Belogay was famous for many
-% years. Even as late as 1997 in one book about TeX, the author didn't
-% care to give any explanations but simply wrote about "the algorithm of
-% Belogay" as something well known to the reader.[^5]
-%
-% [^a]: Liang, Franklin Mark. Word Hy-phen-a-tion by
-% Com-put-er (Doctoral Dissertation). Stanford University, 1983
-%
-% [^5]: Василев В. Ултимативният ТеХ. Удоволствието да правим
-% предпечатна подготовка сами. София, Интела, 1997, 36
-%
-% Bulgarian hyphenation in TeX
-% ----------------------------
-%
-% One unfortunate design decision of Knuth was that the hyphenation
-% algorithm of TeX applied the hyphenation patterns not to the input
-% character codes but to the internal codes of the glyphs in the font.
-% This created a problem for the Cyrillic languages because in TeX the
-% Cyrillic fonts did not have standardised encoding. Perhaps this is
-% one of the reasons why the earliest implementations of the Bulgarian
-% hyphenation in TeX did not rely on the internal hyphenation algorithm
-% of TeX. Instead, external tools were used to insert soft hyphens in
-% all Bulgarian words. For example such a tool would replace the word
-% сричкопренасяне /srichkoprenasyane/ with
-% срич\\-коп\\-ре\\-на\\-ся\\-не /srich\\-kop\\-re\\-na\\-sya\\-ne/.
-% The saying "To every disadvantage there is a corresponding advantage"
-% is true – since Cyrillic and Latin letters use different character
-% codes, an external tool could easily insert soft hyphens in all
-% Bulgarian words while leaving the TeX commands intact.
-%
-% The earliest known attempt to use the hyphenation algorithm of TeX for
-% Bulgarian was made by Ognyan Tonev in 1990.[^6] He described his work
-% as "a not very good translation of the rules. I work in this
-% direction. But I don't have a 100% working complect of patterns. So,
-% the copy I send to you[^7] is only a beta-version." The hyphenation
-% patterns of Tonev don't work correctly and it seems he never completed
-% his work.
-%
-% [^6]: The author of this text was unable to find current information
-% about Ognyan Tonev in Internet. Apparently in 1990 he worked in
-% the Center of Informatics and Computer Technology of the Bulgarian
-% Academy of Sciences.
-%
-% [^7]: To Yannis Haralambous,
-% <http://perso.telecom-bretagne.eu/yannisharalambous>
-%
-% The first usable Bulgarian hyphenation patterns for TeX were developed
-% by Georgi Boshnakov[^8] in 1994. In order to solve the encoding
-% problem, Boshnakov had developed TeX fonts supporting the MIK encoding
-% (the prevalent encoding at that time in Bulgaria). This allowed him
-% to introduce a fully working implementation only a few months after
-% LaTeX2e became the official LaTeX version. Later Boshnakov modified
-% his work with the Babel system. The hyphenation patterns of Boshnakov
-% did their job well enough, so that for almost quarter a century after
-% their initial creation, they remained the only Bulgarian hyphenation
-% patterns in the standard distributions of TeX and CTAN.
-%
-% [^8]: <http://www.maths.manchester.ac.uk/~gb/>
-%
-% There are some similarities between the patterns of Boshnakov and the
-% patterns of Belogay. The following are the main differences.
-%
-% First, Boshnakov used an ingenious and more compact implementation of
-% the second and the third rule. Instead of {А2ББ, Б2ТТ, ТТ2Б}, or
-% 8×22×22+22×22+22×22=4840 patterns in total, Boshnakov has patterns of
-% the form 2Б3Б2 and 4Т3Т4, or only 22×22=484 in total, with the same
-% effect.
-%
-% The second main difference between the patterns of Boshnakov and the
-% patterns of Belogay concerns the letter combination дж /dzh/. In
-% Bulgarian this letter combination can denote either a single
-% consonant, or a sequence of two consonants and the hyphenation rules
-% change respectively. Unfortunately, it is impossible to know the
-% meaning of дж /dzh/ without a vocabulary. The solution of Belogay was
-% a cautious one – his rules do the hyphenation in a way which will be
-% correct regardless of whether дж /dzh/ is a single consonant or a
-% sequence of two consonant. On the other hand, the approach of
-% Boshnakov is a bold one – since дж /dzh/ is more often a single
-% consonant, his rules assume that it is always a single consonant. The
-% number of the cases when this decision leads to bad hyphenations is
-% insignificant in comparison with the cases in which we obtain improved
-% hyphenation.
-%
-% The third main difference between the patterns of Boshnakov and the
-% patterns of Belogay concerns the eighth rule – its implementation in
-% the rules of Boshnakov is rather limited which leads to wrong
-% hyphenations like бри-дж /bri-dzh/. A full implementation of this
-% rule would require 11660 patterns in total and this would be too much
-% for the computers in 1994.
-%
-% Later developments
-% ------------------
-%
-% In 1995 Atanas Topalov defended a Masters thesis in the Faculty of
-% Mathematics and Informatics at Sofia University titled "Algorithms and
-% software about text processing".[^9] One of the main topics in his
-% thesis was the Bulgarian hyphenation. Topalov criticised vehemently
-% the official hyphenation rules and their total disregard of the
-% morphology. He wrote:
-%
-% > If we look at the history of the problems of the hyphenation, we
-% > will discover something very strange. Instead of the expected
-% > involvement with the depths and aspiration for more admissible and
-% > satisfactory style, we can find a growing tendency for
-% > simplification. One unpleasant discovery is that the development of
-% > the hyphenation software stays firmly on the principle "let us do
-% > the easiest thing". The earliest works which have been studied are
-% > from 1978. It turned out that they present the best approach
-% > concerning the automated hyphenation. The authors have chosen the
-% > most difficult but the most correct (from literary point of view)
-% > method for hyphenation, namely the morphological approach.
-%
-% Topalov proposed his own hyphenation algorithm. The hyphenation it
-% generated was smooth and easy to read. One obvious defect of the
-% algorithm of Topalov was that it contradicted the official hyphenation
-% rules at that time. One can argue, however, that his algorithm is
-% compatible with the current hyphenation rules.
-%
-% [^9]: The thesis of Atanas Topalov can be accessed at the author's
-% website <http://www.mind-print.com>
-%
-% In 1999 Svetla Koeva[^10] wrote a paper about the automated Bulgarian
-% hyphenation.[^11] At that time she was a junior member of the
-% Department of Computational Linguistics at the Institute for Bulgarian
-% Language but now she is a director of the whole institute. The paper
-% of Koeva contains a list of hyphenation patterns which can be used as
-% a basis of automated hyphenation. In 2004 with the help of Stoyan
-% Mihov[^12] the rules of Koeva were formalised with regular relations
-% and rewriting rules. They were implemented in a software product
-% named ItaEst which provided Bulgarian hyphenation and grammar checking
-% for various software products of Microsoft and Apple.
-%
-% [^10]: <http://dcl.bas.bg/svetla_koeva/>
-%
-% [^11]: Коева, Светла. Правила за пренасяне на части от думите на нов
-% ред. Български език. 1999/2000, 1, 84-86
-%
-% [^12]: <http://lml.bas.bg/~stoyan/>
-%
-% The main differences between the hyphenation of Koeva and the official
-% hyphenation rules effective after 2012 is that the separation of a
-% long sequence of consonants between two vowels is done according to
-% the rules valid before 1983. For example се-стра /se-stra/ and
-% ай-сберг /ay-sberg/ are permitted. The main difference between the
-% hyphenation of Koeva and the official hyphenation rules effective
-% before 1983 is that the rules of Koeva disregard the morphology of the
-% words. The following rule of Koeva is specific: in a sequence of two
-% sonorant consonants between two vowels, we are permitted to separate
-% the first vowel from the first consonant, for example материа-лна
-% /materia-lna/.
-%
-% In 2000 Anton Zinoviev[^13] created new hyphenation patterns for TeX.
-% He didn't know about the previous work of Boshnakov and he didn't
-% bother to make his work available in the various TeX distributions and
-% CTAN. His work was used mostly by the local Linux enthusiasts and the
-% colleagues of Zinoviev. In 2001 Radostin Radnev[^14] created a free
-% grammar dictionary of Bulgarian[^15] where he used the hyphenation
-% patterns of Zinoviev. From there the work of Zinoviev propagated to
-% OpenOffice, LibreOffice and various online dictionaries, including
-% <http://bg.wiktionary.org> and <http://rechnik.chitanka.info>.
-%
-% [^13]: The author of this text.
-%
-% [^14]: <http://bg.linkedin.com/in/radostinradnev>
-%
-% [^15]: <http://bgoffice.sourceforge.net/>
-%
-% The following are the main differences between the hyphenation of
-% Zinoviev and the hyphenation of Boshnakov.
-%
-% First, the eighth rule of Belogay is fully implemented.
-%
-% Second, the rules of Zinoviev try to detect when the letters дж /dzh/
-% (and дз /dz/) denote a single consonant and when they denote a
-% sequence of two consonants. By default, however, Zinoviev (like
-% Boshnakov) assumes that дж /dzh/ is a single consonant and hyphenates
-% accordingly.
-%
-% Third, the rules of Zinoviev disable some cases of unpleasant
-% hyphenations:
-%
-% 1. In a consonant sequence like тст /tst/, the two equal consonants т
-% /t/ are separated. For example братст-во /bratst-vo/ is forbidden
-% while братс-тво /brats-tvo/ and брат-ство /brat-stvo/ are
-% permitted.
-% 2. The hyphenation is forbidden after a sonorant consonant following
-% an obstruent consonant. For example отм-ра /otm-ra/ is forbidden
-% and от-мра /ot-mra/ is permitted.
-% 3. The hyphenation separates two consecutive kindred voiced/voiceless
-% consonants. For example субп-родукт /subp-roduct/ is forbidden and
-% суб-продукт /sub-product/ is permitted.
-%
-% At the start of his work on the Bulgarian hyphenation, Zinoviev had
-% the opportunity to discuss the hyphenation with Svetla Koeva. He
-% remembers that some cases of unpleasant hyphenation were suggested to
-% him by Koeva. Unfortunately, he hasn't taken notes so now he doesn't
-% know which cases of unpleasant hyphenation have been suggested to him
-% by Koeva and which are his own findings.
-%
-% The present work
-% ================
-%
-% Motivation
-% ----------
-%
-% The present work was carried out on the initiative of the leader of
-% the Bulgarian localisation team of Mozilla, who contacted Zinoviev,
-% Boshnakov and the maintainers of the TeX hyphenation patterns.[^17]
-% This work pursues the following main objectives:
-%
-% 1. to update the hyphenation patterns in accordance with the current
-% hyphenation rules;
-% 2. to generate the hyphenation patterns by a publicly available
-% script;
-% 3. to make the hyphenation patterns customisable;
-% 4. to provide documentation for the future developers.
-%
-% [^16]: <http://mozillians.org/en-US/u/stoyan/>
-%
-% [^17]: <http://hyphenation.org>
-%
-% The current official hyphenating rules for Bulgarian are rather
-% liberal. Very often, in a long sequence of consonants we are
-% permitted to split the word at any position, for example аген-т-с-т-во
-% /agen-t-s-t-vo/. This is prone to many unusual and unexpected results
-% that interrupt the attention of the reader or deceive his expectations
-% during the movement of his eyes to the next line. On the other hand,
-% in order to produce nice justified paragraphs there is no need for so
-% many hyphenation possibilities. It would be sufficient even if only
-% one possible separation between any two syllables was permitted.
-%
-% Therefore, it makes sense to use a more restrictive version of the
-% Bulgarian hyphenation, one which eliminates the controversial cases of
-% hyphenation. Only when typesetting a Bulgarian text in a very narrow
-% newspaper column it will be appropriate to use a more liberal version.
-% It should be noted that some specialised English dictionaries also
-% separate the word-division positions into two categories – preferred
-% positions and less recommended positions.
-%
-% There are two methods to determine the optimal division within a
-% sequence of consonants between two vowels:
-%
-% * we can hyphenate according to the syllables in the word or
-% * we can hyphenate morphologically.
-%
-% Hyphenation according to the syllables in the word
-% --------------------------------------------------
-%
-% Let us look at the properties of the Bulgarian syllables. All
-% syllables have the following structure:
-%
-% > onset - nucleus - code
-%
-% The nucleus in Bulgarian is always a vowel. Both the onset and the
-% code are (possibly empty) sequences of consonants.
-%
-% The Bulgarian syllables adhere to the Sonority Sequencing Principle.
-% According to this principle, the consonants within the onset have
-% raising sonority and the consonants within the code have decreasing
-% sonority.
-%
-% Several grammar books agree that the following sonority scale is valid
-% for Bulgarian:
-%
-% > voiceless obtrusive < voiced obtrusive < sonorant consonant < vowel
-%
-% According to the investigations of the author, the only exception to
-% this law is due to the letter в /v/ which is a voiced obtrusive but it
-% can be used also as a voiceless obtrusive. This exception is due to a
-% spelling particularity of the Bulgarian language. Whenever the letter
-% в /v/ seemingly violates the Sonority Sequencing Principle, in the
-% spoken language this letter is read as ф /f/, that is as a voiceless
-% obtrusive (for example the word отвсякъде /otvsyakade/ is read as
-% отфсякъде /otfsyakade/).[^18]
-%
-% [^18]: No Primitive Slavonic word contains the phoneme ф /f/.
-% Therefore, we can safely assume that in the Primitive Slavonic
-% language the consonant ф /f/ was a positional variant of the consonant
-% в /v/.
-%
-% The author has found that the sonorant consonants in Bulgarian have
-% their own sonority scale:
-%
-% > м /m/ < н /n/ < л /l/ < р /r/ < й /y/
-%
-% Only a few words such as жанр /zhanr/ and химн /himn/ violate this
-% scale. Such words are always loan-words and their pronunciation is
-% somewhat problematic for the native Bulgarian speakers.
-%
-% In addition to the Sonority Sequencing Principle, the consonant
-% clusters within the Bulgarian syllable adhere to the following
-% additional principles:
-%
-% 1. Both in the onset and in the code, the labial and dorsal plosives
-% precede the coronal plosives and affricates.
-% 2. If the onset or the code contains two plosives or affricates, then
-% there are no fricatives between them. Few words with the Latin
-% root 'text' are exceptions: контекст /kontekst/.
-% 3. If the onset or the code contains two fricatives other than в /v/,
-% then there are no plosives or affricates between them.
-% 4. If the onset or the code contains two plosives or affricates, then
-% they both have equal sonority (both are voiced, or both are
-% voiceless).
-% 5. If the onset or the code contains two fricatives other than в /v/,
-% then they both have equal sonority (both are voiced, or both are
-% voiceless).
-% 6. Neither the onset, nor the code may contain two labial plosives, or
-% two coronal plosives or affricates or two dorsal plosives.
-% 7. Neither the onset, nor the code may contain two equal consonants
-% with the exception of в /v/ (for example втвърди /vtvardi/).[^19]
-%
-% [^19]: Actually, the letter в /v/ is not a real exception because in
-% all such cases this letter denotes two different consonants – в /v/
-% and ф /f/. Only in the Russian loan-word взвод /vzvod/ the two
-% letters в /v/ denote a repeating consonant в /v/.
-%
-% From all these properties of the Bulgarian syllable we can deduce the
-% following hyphenation rules:
-%
-% 1. In a sequence МК where М is a consonant with higher sonority than
-% K, we are not permitted to hyphenate before М. Exception: when М
-% is в /v/ and К is a voiceless consonant.
-% 2. In a sequence КМ where М is a consonant with higher sonority than
-% K, we are not permitted to hyphenate after М.
-% 3. In a sequence KBT where K and T are plosives or affricates and B is
-% fricative, we separate K from T.
-% 4. In a sequence CKB where K is a plosive or affricate and C and B are
-% fricatives other than в /v/, we separate C from B.
-% 5. If in a consonant sequence a coronal plosive or affricate Т is
-% followed by a labial or dorsal plosive К, then we separate Т from К.
-% 6. If a consonant sequence contains two plosives or affricates, one
-% voiced and one voiceless, then we separate them.
-% 7. If a consonant sequence contains two fricatives other than в /v/,
-% one voiced and one voiceless, then we separate them.
-% 8. If a consonant sequence contains two labial plosives or two coronal
-% plosives or affricates or two dorsal plosives then they are
-% separated.
-% 9. If a consonant sequence contains two equal consonants (not
-% necessarily consecutive), then they are separated.
-%
-% With so many prohibitive rules, a question arises: if we apply all
-% these rules, aren't we going to eliminate too many hyphenation
-% possibilities? The answer is no. It can be demonstrated that between
-% any two consecutive syllables at least one separation point will be
-% permitted.
-%
-%
-% Hyphenation according to the morphology
-% ---------------------------------------
-%
-% Between 1983 and 2012 the official orthographic rules of the
-% Bulgarian language forbade morphologically based hyphenation. After
-% 2012 such hyphenation is permitted (but not obligatory).
-%
-% The most important case when it is very desirable to use
-% morphologically based hyphenation is the case of the compound words.
-% Divisions such as авток-луб /avtok-lub/ and вакуу-мапарат
-% /vakuu-maparat/ are extremely irritating even if they are formally
-% correct. Unfortunately, we do not have a vocabulary of the compound
-% Bulgarian words that would permit us to produce rules for automated
-% hyphenation. Therefore, the current Bulgarian hyphenation patterns do
-% not attempt to apply morphological hyphenation to such words.
-%
-% Second in importance (but far more significant in terms of numbers) is
-% the case with the word prefixes. While the eyes of the reader still
-% look at the start of the word, the word is still unknown to him. At
-% this point, it is very important not to deceive his expectations. For
-% example, when the reader sees над- /nad-/ at the end of the line, he
-% will expect that this is the prefix над- /nad-/ with semantics 'attain
-% more than'. This expectation will be fooled if this wasn't really a
-% prefix, but a deceiving (while formally correct) hyphenation of the
-% word надремя /nadremya/ 'have dozed enough' where the real prefix is
-% not над- /nad-/ but на- /na-/ with semantics 'achieve a state after
-% accumulation'. Such hyphenation distracts the reader and makes the
-% reading more difficult.
-%
-% Third in importance is the case with the word suffixes. With respect
-% to the hyphenation rules we can divide the suffixes into three
-% categories:
-%
-% 1. Suffixes starting with a vowel, for example -ар /-ar/. It is not
-% appropriate to follow the morphology with such suffixes because
-% this will contradict the whole hyphenation tradition of the
-% Bulgarian language. For example крав-ар /krav-ar/ is unwarranted.
-% 2. Suffixes starting with one consonant, for example -ка /-ka/.
-% Usually with such suffixes the syllable boundary in the word
-% coincides with morpheme boundary so no specific cares are
-% necessary, for example кравар-ка /kravar-ka/. The exceptions are
-% rare, for example: обек-тната /obek-tnata/ instead of обект-ната
-% /obekt-nata/.
-% 3. Suffixes starting with more than one consonant (-ски /-ski/, -ство
-% /-stvo/). It is possible to use morphological hyphenation rules
-% with such suffixes.
-%
-% Even if it is possible to use morphological hyphenation with the
-% suffixes of the third category, it turns out, this is not as useful as
-% it is with the case of the prefixes. When the eyes of the reader have
-% reached this part of the word, the word is already more or less known
-% to the reader. Therefore, at this point the morphological hyphenation
-% does not provide any significant advantages in comparison to the
-% simpler hyphenation based only on the syllables in the word. Consider
-% for example the word геройс-тво /geroys-tvo/ with suffix -ство
-% /-stvo/. When the reader sees геройс- /geroys-/ at the end of the
-% line this will give him an early clue that the suffix of the word is
-% -ство /-stvo/. Such non-morphological hyphenation does not deceive
-% the expectations of the reader. On the contrary, it makes the reading
-% easier because it gives clues to the reader about what follows on the
-% next line.
-%
-% Because of these considerations, the current Bulgarian hyphenation
-% patterns do not attempt to use morphological hyphenation with respect
-% to the suffixes of the words. Though it would be useful to implement
-% rules about the suffixes of the second cateogory. Hopefully, some
-% future version will have such rules.
-%
-% Occasionally,[^20] a fourth morphological requirement is stated: that
-% hyphenation should conform with the boundary between the word and the
-% definitive articles -та /-ta/ and -те /-te/ (postfixed in Bulgarian).
-% There is no need to pay attention to this rule because it seems to be
-% satisfied by its own nature. The author has searched in a dictionary
-% with over 860000 Bulgarian words for cases when the hyphenation rules
-% would hyphenate badly with respect to the definitive article. He was
-% unable to find even one such case with the hyphenation rules valid
-% after 1983 and only about 10 cases with the rules valid before 1983
-% (one of them is живопи-ста /zhivopi-sta/ instead of живопис-та
-% /zhivopis-ta/).
-%
-% One unavoidable characteristic of any morphologically based automated
-% hyphenation is that it can create wrong hyphenations. Because of
-% this, one useful option is to use the morphology in a safe way – to
-% use it in order to forbid bad hyphenations but to create no new
-% hyphenation possibilities solely on the basis of the morphology.
-%
-% Take for example the word дозрея /dozreya/ 'ripen fully'. According
-% to the phonological rules, we should hyphenate it as доз-рея
-% /doz-reya/. According to the morphology, however, we should hyphenate
-% as до-зрея /do-zreyq/ because this word is formed with the prefix до-
-% /do-/ with semantics 'complete or supplement' and this semantics would
-% be lost if the reader sees доз- /doz-/ at the end of the line.
-% Therefore, there are three methods to hyphenate this word:
-%
-% 1. доз-рея /doz-reya/ when morphology is not used;
-% 2. до-зрея /do-zreya/ when morphology is fully used;
-% 3. дозрея /dozreya/ (no hyphenation) when morphology is used in a safe
-% way.
-%
-% The option to use the morphology in a safe way is very attractive when
-% the software uses a smart line-breaking algorithm which can produce
-% good results even with less hyphenation possibilities. TeX is one
-% such software. It should be noted that this option does not eliminate
-% too many hyphenation possibilities because the morpheme boundaries
-% most of the time are also syllable boundaries.
-%
-% [^20]: Правописен и правоговорен наръчник. Състав. Иван Хаджов,
-% Цв. Минков; Ред. Ив. Хаджов и др. София, Бълг. кн., 1945
-%
-% The following are results of a statistics about the quality of the
-% morphological rules (the number after the sign ± is the expected
-% standard deviation of our estimations):
-%
-% With the option `--morphology`:
-%
-% * in 0.1% ±0.3% of the dictionary words the morphological patterns
-% create very wrong hyphenation;
-% * in 89.8% ±0.1% of the dictionary words the morphological patterns
-% hyphenate identically with the case when no morphology patterns are
-% used;
-% * in 0.3% ±0.2% of the dictionary words the morphological patterns
-% hyphenate differently in comparison to the case when no morphology
-% patterns are used and the word is hyphenated in a way which
-% contradicts the morphology;
-% * in 0.6% ±0.1% of the dictionary words the morphological patterns
-% hyphenate differently in comparison to the case when no morphology
-% patterns are used and there is a possible hyphenation which is
-% compatible with the word morphology but which is nevertheless
-% forbidden by the morphology patterns.
-%
-% With the option `--safe-morphology`:
-%
-% * in 0% of the dictionary words the morphological patterns create very
-% wrong hyphenation;
-% * in 90.0% ±0.1% of the dictionary words the morphological patterns
-% hyphenate identically with the case when no morphology patterns are
-% used;
-% * in 0.3% ±0.2% of the dictionary words the morphological patterns
-% hyphenate differently in comparison to the case when no morphology
-% patterns are used and the word is hyphenated in a way which
-% contradicts the morphology;
-% * in 0.6% ±0.1% of the dictionary words the morphological patterns
-% hyphenate differently in comparison to the case when no morphology
-% patterns are used and there is a possible hyphenation which is
-% compatible both with the word morphology and with the syllable
-% boundaries but which is nevertheless forbidden by the morphology
-% patterns.
-%
-% Notice that the morphological patterns create a different hyphenation
-% only in about 10% of the words. The following explanation can be
-% given for this surprising fact. First, the natural evolution of the
-% human languages tends to simplify the complex sequences of consonants.
-% Therefore, no morpheme contains a complex sequence of consonants. And
-% second, the Bulgarian orthography is morphological. This means that
-% the morphemes are written according to their actual pronunciation,
-% however the simplifications in the spoken languages which take place
-% at the morpheme boundaries are not taken into account in the
-% orthography. The independent operation of these two factors leads to
-% the result that most of the time the morpheme boundaries coincide with
-% the conventional syllable boundaries. The main exception to this is
-% when a morpheme starts with a vowel, in this case its syllable will
-% include one or more consonants of the preceeding morpheme. The second
-% exception is when a morpheme ends with a vowel and the next morpheme
-% starts with a sequence of two or more consonants.
-%
-% Usage of the script `hyph-bg.sh`
-% --------------------------------
-%
-% The `hyph-bg.sh` is all-in-one script which can generate both
-% documentation (this text) and Bulgarian hyphenation patterns. When
-% given the option `--help` the script gives short usage instructions:
-%
-% ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-% hyph-bg.sh --help
-% Show this info
-% hyph-bg.sh [--doc-html | --doc-latex | --doc-txt]
-% Print documentation in various formats
-% hyph-bg.sh [other options]
-% Generate Bulgarian hyphenation patterns
-%
-% Options when generating hyphenation patterns:
-%
-% --standalone-tex
-% Produce hyphenation patterns for TeX with \patterns{ ... }.
-%
-% --no-hyphen-mins
-% Hyphenation patterns which do not require hyphen mins.
-% Otherwise: both left and right hyphen mins should be set to 2.
-%
-% --safe-dz
-% Do not try to guess whether DZ is a single consonant or not.
-% Only use hyphenation which will be correct in both cases.
-%
-% --permissible
-% Permit any formally correct hyphenation, including unnatural
-% divisions, such as studen-tstvo. Useful for educational tools
-% or when typesetting Bulgarian text in a very short column.
-%
-% --morphology
-% Apply morphology when hyphenating, for example: za-dvizhvam.
-% May hyphenate incorrectly in some cases.
-%
-% --safe-morphology
-% Apply morphology when hyphenating. Never hyphenates incorrectly
-% but may prohibit some correct hyphenations.
-%
-% --no-morphology
-% Disregard the morphology. Default.
-%
-% --1945
-% Hyphenate according to the rules effective between 1945 and 1982
-%
-% --1983
-% Hyphenate according to the rules effective between 1983 and 2011
-%
-% --2012
-% Hyphenate according to the rules effective after 2012. Default.
-% ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-%
-% The following are the recommended ways to generate hyphenation
-% patterns by this script:
-%
-% `hyph-bg.sh --standalone-tex --safe-morphology`
-% : For TeX. Apply the morphology in a safe way when the software
-% uses a smart line-breaking algorithm.
-%
-% `hyph-bg.sh`
-% : For most other software.
-%
-% `hyph-bg.sh --no-hyphen-mins`
-% : The current versions of Mozilla (as of 2017) seem to ignore the
-% hyphen mins in words that contain a dash.
-%
-% `hyph-bg.sh --morphology`
-% : For professional typography with human proof-reader.
-%
-% `hyph-bg.sh --permissible`
-% : For educational tools and online dictionaries which can show only one
-% kind of hyphenation.
-%
-% Notice that some specialised English dictionaries separate the
-% word-division positions into two categories – preferred positions and
-% less recommended positions. It would be best if the Bulgarian online
-% dictionaries could do the same. For example hyphen "-" can be used to
-% display the preferred positions and dot "." – the less recommended
-% positions. If a word-division position is permitted only by the
-% patterns of `hyph-bg.sh --permissible`, then this position is less
-% recommended.
-%
-
-\message{Bulgarian hyphenation patterns (options: --safe-morphology --standalone-tex, version 21 October 2017)}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-bulgarian.tlpobj new/tlpkg/tlpobj/hyphen-bulgarian.tlpobj
--- old/tlpkg/tlpobj/hyphen-bulgarian.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-bulgarian.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-bulgarian
category TLCore
-revision 50792
+revision 54568
shortdesc Bulgarian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Bulgarian in T2A and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=bulgarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-bg.tex file_patterns=hyph-bg.pat.txt file_exceptions=
-runfiles size=81
+runfiles size=69
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-bg.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-bg.t2a.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-bg.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-bg.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-bg.pat.txt
++++++ hyphen-catalan.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-ca.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-ca.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-ca.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-ca.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ca.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ca.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ca.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ca.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-xX
-yY
-zZ
-àÀ
-çÇ
-èÈ
-éÉ
-íÍ
-ïÏ
-òÒ
-óÓ
-úÚ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ca.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ca.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ca.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ca.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-% title: Hyphenation patterns for Catalan
-% copyright: Copyright (C) December 1991-January 1995, July 2003 Gonçal Badenes
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Catalan
-% tag: ca
-% version: 1.11 15 July 2003 15:08:12 CET
-% authors:
-% -
-% name: Gonçal Badenes
-% contact: g.badenes (at) ieee.org
-% -
-% name: Francina Turon
-% licence:
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% generation:
-% left: 2
-% right: 2
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - Version 1.11 2003-07-15 Identical to version 1.10 except for the updated copyright notice.
-% - Version 1.10 1995-01-17
-% texlive:
-% encoding: ec
-% babelname: catalan
-% legacy_patterns: cahyph.tex
-% message: Catalan hyphenation patterns
-% description: Hyphenation patterns for Catalan in T1/EC and UTF-8 encodings.
-% ==========================================
-%
-% This patterns have been created using standard, conservative
-% hyphenation rules for catalan. The results have refined running them
-% through patgen. In that way, the number of hits has been increased.
-%
-% These rules produce no wrong patterns (Results checked against the
-% “Diccionari Ortogràfic i de Pronúncia”, Enciclopèdia
-% Catalana. The percentage of valid hyphen misses is lower than 1%
-%
-% Some of the patterns below represent combinations that never
-% happen in Catalan. We have tried to keep them to a minimum.
-%
-% Please report any problem you might have to the authors!!!
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-catalan.tlpobj new/tlpkg/tlpobj/hyphen-catalan.tlpobj
--- old/tlpkg/tlpobj/hyphen-catalan.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-catalan.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,17 +1,15 @@
name hyphen-catalan
category TLCore
-revision 50792
+revision 54568
shortdesc Catalan hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Catalan in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=catalan lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ca.tex file_patterns=hyph-ca.pat.txt file_exceptions=hyph-ca.hyp.txt
-runfiles size=10
+runfiles size=8
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ca.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-ca.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ca.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ca.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ca.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ca.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ca.pat.txt
++++++ hyphen-chinese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
@@ -26,7 +26,7 @@
% 8-bit engine (such as TeX or pdfTeX)
\message{EC Pinyin Hyphenation Patterns (with tone markers) 2018-11-25 (WL)}
% Legacy file contains patterns for pinyin without tone markers
- \input pyhyph.tex
+ \input hyph-zh-latn-pinyin.ec.tex
\fi\else
% pTeX
\message{EC Pinyin Hyphenation Patterns (with tone markers) 2018-11-25 (WL)}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex new/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex
--- old/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex 2013-05-08 01:38:30.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex 2019-05-22 03:06:57.000000000 +0200
@@ -1,14 +1,65 @@
-% pTeX-friendly hyphenation patterns
+% title: Hyphenation patterns for Chinese pinyin (Mandarin), without tone
+% markers
%
-% language: pinyin (zh-latn-pinyin)
-% encoding: ec
+% version: 2018-11-25
%
-% This file has been auto-generated from hyph-zh-latn-pinyin.tex
-% with a script [texmf]/scripts/generic/hyph-utf8/generate-ptex-patterns.rb
-% See the original file for details about author, licence etc.
+% authors:
+% -
+% name: Werner Lemberg
+% contact: wl (at) gnu.org
%
-\bgroup
+% copyright: Copyright (C) 1994-2018 Werner Lemberg
+%
+% licence:
+% name: MIT
+% url: http://opensource.org/licenses/mit-license.php
+% text: >
+% 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:
+%
+% 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.
+%
+% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33…
+%
+% language:
+% name: Mandarin Chinese, pinyin transliteration
+% tag: zh-latn-pinyin
+%
+% hyphenmins:
+% generation:
+% left: 1
+% right: 2
+% typesetting:
+% left: 1
+% right: 2
+
+% ==========================================
+
+%
+% The used patgen parameters are
+%
+% 1 1 | 2 5 | 1 1 1
+% 2 2 | 2 5 | 1 2 1
+%
+
\lccode"FC="FC
+
\patterns{
a1b
a1c
@@ -41,6 +92,7 @@
e1m
e1p
e1q
+e1r
e1s
e1t
e1w
@@ -134,31 +186,26 @@
o1x
o1y
o1z
-1ra
-r1b
-r1c
-r1d
-1re
-r1f
-r1g
-r1h
-1ri
-r1j
-r1k
-r1l
-r1m
-r1n
-1ro
-r1p
-r1q
-r1r
-r1s
-r1t
-1ru
-r1w
-r1x
-r1y
-r1z
+2r1b
+2r1c
+2r1d
+2r1f
+2r1g
+2r1h
+2r1j
+2r1k
+2r1l
+2r1m
+2r1n
+2r1p
+2r1q
+2r1r
+2r1s
+2r1t
+2r1w
+2r1x
+2r1y
+2r1z
u1b
u1c
u1d
@@ -198,8 +245,11 @@
^^fc1x
^^fc1y
^^fc1z
-'1a
-'1e
-'1o
}
-\egroup
+
+\endinput
+
+%%% Local Variables:
+%%% mode: tex
+%%% coding: utf-8
+%%% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/quote/hyph-quote-zh-latn-pinyin.tex new/tex/generic/hyph-utf8/patterns/quote/hyph-quote-zh-latn-pinyin.tex
--- old/tex/generic/hyph-utf8/patterns/quote/hyph-quote-zh-latn-pinyin.tex 2011-06-22 11:20:34.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/quote/hyph-quote-zh-latn-pinyin.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-\bgroup
-\lccode`\’=`\’
-\patterns{
-’1a
-’1e
-’1o
-}
-\egroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex new/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex
--- old/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex 2019-05-22 03:06:57.000000000 +0200
@@ -54,7 +54,7 @@
% texlive:
% encoding: ec
% babelname: pinyin
-% legacy_patterns: pyhyph.tex
+% legacy_patterns: hyph-zh-latn-pinyin.ec.tex
% message: Pinyin Hyphenation Patterns (with tone markers) 2018-11-25 (WL)
% package: chinese
% use_old_patterns_comment: Legacy file contains patterns for pinyin without tone markers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/tex-8bit/pyhyph.tex new/tex/generic/hyph-utf8/patterns/tex-8bit/pyhyph.tex
--- old/tex/generic/hyph-utf8/patterns/tex-8bit/pyhyph.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/tex-8bit/pyhyph.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,253 +0,0 @@
-% title: Hyphenation patterns for Chinese pinyin (Mandarin), without tone
-% markers
-%
-% version: 2018-11-25
-%
-% authors:
-% -
-% name: Werner Lemberg
-% contact: wl (at) gnu.org
-%
-% copyright: Copyright (C) 1994-2018 Werner Lemberg
-%
-% licence:
-% name: MIT
-% url: http://opensource.org/licenses/mit-license.php
-% text: >
-% 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:
-%
-% 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.
-%
-% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33…
-%
-% language:
-% name: Mandarin Chinese, pinyin transliteration
-% tag: zh-latn-pinyin
-%
-% hyphenmins:
-% generation:
-% left: 1
-% right: 2
-% typesetting:
-% left: 1
-% right: 2
-
-\message{Pinyin Hyphenation Patterns (without tone markers) 2018-11-25 (WL)}
-
-%
-% The used patgen parameters are
-%
-% 1 1 | 2 5 | 1 1 1
-% 2 2 | 2 5 | 1 2 1
-%
-
-\patterns{
-a1b
-a1c
-a1d
-a1f
-a1g
-a1h
-a1j
-a1k
-a1l
-a1m
-a1p
-a1q
-a1r
-a1s
-a1t
-a1w
-a1x
-a1y
-a1z
-e1b
-e1c
-e1d
-e1f
-e1g
-e1h
-e1j
-e1k
-e1l
-e1m
-e1p
-e1q
-e1r
-e1s
-e1t
-e1w
-e1x
-e1y
-e1z
-1ga
-g1b
-g1c
-g1d
-1ge
-g1f
-g1g
-g1h
-g1j
-g1k
-g1l
-g1m
-g1n
-1go
-g1p
-g1q
-g1r
-g1s
-g1t
-1gu
-g1w
-g1x
-g1y
-g1z
-i1b
-i1c
-i1d
-i1f
-i1g
-i1h
-i1j
-i1k
-i1l
-i1m
-i1p
-i1q
-i1r
-i1s
-i1t
-i1w
-i1x
-i1y
-i1z
-1na
-n1b
-n1c
-n1d
-1ne
-n1f
-n1h
-1ni
-n1j
-n1k
-n1l
-n1m
-n1n
-1no
-n1p
-n1q
-n1r
-n1s
-n1t
-1nu
-1n^^fc
-n1w
-n1x
-n1y
-n1z
-o1b
-o1c
-o1d
-o1f
-o1g
-o1h
-o1j
-o1k
-o1l
-o1m
-o1p
-o1q
-o1r
-o1s
-o1t
-o1w
-o1x
-o1y
-o1z
-2r1b
-2r1c
-2r1d
-2r1f
-2r1g
-2r1h
-2r1j
-2r1k
-2r1l
-2r1m
-2r1n
-2r1p
-2r1q
-2r1r
-2r1s
-2r1t
-2r1w
-2r1x
-2r1y
-2r1z
-u1b
-u1c
-u1d
-u1f
-u1g
-u1h
-u1j
-u1k
-u1l
-u1m
-u1p
-u1q
-u1r
-u1s
-u1t
-u1w
-u1x
-u1y
-u1z
-^^fc1b
-^^fc1c
-^^fc1d
-^^fc1f
-^^fc1g
-^^fc1h
-^^fc1j
-^^fc1k
-^^fc1l
-^^fc1m
-^^fc1n
-^^fc1p
-^^fc1q
-^^fc1r
-^^fc1s
-^^fc1t
-^^fc1w
-^^fc1x
-^^fc1y
-^^fc1z
-}
-
-\endinput
-
-%%% Local Variables:
-%%% mode: tex
-%%% coding: utf-8
-%%% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.chr.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-wW
-xX
-yY
-zZ
-àÀ
-áÁ
-èÈ
-éÉ
-ìÌ
-íÍ
-òÒ
-óÓ
-ùÙ
-úÚ
-üÜ
-āĀ
-ēĒ
-ěĚ
-īĪ
-ōŌ
-ūŪ
-ǎǍ
-ǐǏ
-ǒǑ
-ǔǓ
-ǖǕ
-ǘǗ
-ǚǙ
-ǜǛ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-% title: Hyphenation patterns for Chinese pinyin (Mandarin), with tone
-% markers
-%
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-%
-% version: 2018-11-25
-%
-% authors:
-% -
-% name: Werner Lemberg
-% contact: wl (at) gnu.org
-%
-% copyright: Copyright (C) 1994-2018 Werner Lemberg
-%
-% licence:
-% name: MIT
-% url: http://opensource.org/licenses/mit-license.php
-% text: >
-% 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:
-%
-% 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.
-%
-% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33…
-%
-% language:
-% name: Mandarin Chinese, pinyin transliteration
-% tag: zh-latn-pinyin
-%
-% hyphenmins:
-% generation:
-% left: 1
-% right: 2
-% typesetting:
-% left: 1
-% right: 2
-% texlive:
-% encoding: ec
-% babelname: pinyin
-% legacy_patterns: pyhyph.tex
-% message: Pinyin Hyphenation Patterns (with tone markers) 2018-11-25 (WL)
-% package: chinese
-% use_old_patterns_comment: Legacy file contains patterns for pinyin without tone markers
-%
-% ==========================================
-%
-% The used patgen parameters are
-%
-% 1 1 | 2 5 | 1 1 1
-% 2 2 | 2 5 | 1 2 1
-%
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyphen/pyhyph.tex new/tex/generic/hyphen/pyhyph.tex
--- old/tex/generic/hyphen/pyhyph.tex 2019-04-06 00:35:28.000000000 +0200
+++ new/tex/generic/hyphen/pyhyph.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,236 +0,0 @@
-% This is the file pyhyph.tex of the CJK package
-% for hyphenating Chinese pinyin syllables.
-%
-% We use the latin-1 character code for `umlaut u' (0xfc). Additionally,
-% the quote character "'" is used in its standard sense (resolving syllabic
-% ambiguities).
-%
-% created by Werner Lemberg <wl(a)gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-% Copyright (C) 1994-2015 Werner Lemberg <wl(a)gnu.org>
-%
-% 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 in doc/COPYING; if not, write to the Free
-% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-% MA 02110-1301 USA
-
-\message{Hyphenation patterns for unaccented pinyin syllables (CJK 4.8.4)}
-
-\begingroup
-
-\catcode"0FC = 11 % umlaut u
-\catcode"027 = 11 % quote (')
-\lccode"0FC = "0FC
-\lccode"027 = "027
-
-\patterns{
-a1b
-a1c
-a1d
-a1f
-a1g
-a1h
-a1j
-a1k
-a1l
-a1m
-a1p
-a1q
-a1r
-a1s
-a1t
-a1w
-a1x
-a1y
-a1z
-e1b
-e1c
-e1d
-e1f
-e1g
-e1h
-e1j
-e1k
-e1l
-e1m
-e1p
-e1q
-e1s
-e1t
-e1w
-e1x
-e1y
-e1z
-1ga
-g1b
-g1c
-g1d
-1ge
-g1f
-g1g
-g1h
-g1j
-g1k
-g1l
-g1m
-g1n
-1go
-g1p
-g1q
-g1r
-g1s
-g1t
-1gu
-g1w
-g1x
-g1y
-g1z
-i1b
-i1c
-i1d
-i1f
-i1g
-i1h
-i1j
-i1k
-i1l
-i1m
-i1p
-i1q
-i1r
-i1s
-i1t
-i1w
-i1x
-i1y
-i1z
-1na
-n1b
-n1c
-n1d
-1ne
-n1f
-n1h
-1ni
-n1j
-n1k
-n1l
-n1m
-n1n
-1no
-n1p
-n1q
-n1r
-n1s
-n1t
-1nu
-1n^^fc
-n1w
-n1x
-n1y
-n1z
-o1b
-o1c
-o1d
-o1f
-o1g
-o1h
-o1j
-o1k
-o1l
-o1m
-o1p
-o1q
-o1r
-o1s
-o1t
-o1w
-o1x
-o1y
-o1z
-1ra
-r1b
-r1c
-r1d
-1re
-r1f
-r1g
-r1h
-1ri
-r1j
-r1k
-r1l
-r1m
-r1n
-1ro
-r1p
-r1q
-r1r
-r1s
-r1t
-1ru
-r1w
-r1x
-r1y
-r1z
-u1b
-u1c
-u1d
-u1f
-u1g
-u1h
-u1j
-u1k
-u1l
-u1m
-u1p
-u1q
-u1r
-u1s
-u1t
-u1w
-u1x
-u1y
-u1z
-^^fc1b
-^^fc1c
-^^fc1d
-^^fc1f
-^^fc1g
-^^fc1h
-^^fc1j
-^^fc1k
-^^fc1l
-^^fc1m
-^^fc1n
-^^fc1p
-^^fc1q
-^^fc1r
-^^fc1s
-^^fc1t
-^^fc1w
-^^fc1x
-^^fc1y
-^^fc1z
-'1a
-'1e
-'1o
-}
-\endgroup
-
-\lefthyphenmin 1
-\righthyphenmin 1
-
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-chinese.tlpobj new/tlpkg/tlpobj/hyphen-chinese.tlpobj
--- old/tlpkg/tlpobj/hyphen-chinese.tlpobj 2019-04-06 23:33:05.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-chinese.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,22 +1,16 @@
name hyphen-chinese
category TLCore
-revision 50821
+revision 54568
shortdesc Chinese pinyin hyphenation patterns.
relocated 1
-longdesc Hyphenation patterns for unaccented transliterated Mandarin
-longdesc Chinese (pinyin) in T1/EC and UTF-8 encodings. The latter can
-longdesc hyphenate pinyin with or without tone markers; the former only
-longdesc without.
+longdesc Hyphenation patterns for transliterated Mandarin Chinese
+longdesc (pinyin) in T1/EC and UTF-8 encodings. The latter can hyphenate
+longdesc pinyin with or without tone markers; the former only without.
depend hyphen-base
depend hyph-utf8
-runfiles size=10
+execute AddHyphen name=pinyin lefthyphenmin=1 righthyphenmin=2 file=loadhyph-zh-latn-pinyin.tex file_patterns=hyph-zh-latn-pinyin.pat.txt file_exceptions=
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-zh-latn-pinyin.ec.tex
- RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-zh-latn-pinyin.tex
- RELOC/tex/generic/hyph-utf8/patterns/tex-8bit/pyhyph.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-zh-latn-pinyin.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-zh-latn-pinyin.pat.txt
- RELOC/tex/generic/hyphen/pyhyph.tex
++++++ hyphen-churchslavonic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-cu.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-cu.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-cu.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-cu.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cu.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cu.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cu.chr.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cu.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-̀̀
-́́
-̆̆
-̇̇
-̈̈
-̏̏
-̑̑
-̾̾
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-йЙ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-щЩ
-ъЪ
-ыЫ
-ьЬ
-эЭ
-юЮ
-ѐЀ
-ёЁ
-єЄ
-ѕЅ
-іІ
-їЇ
-ѝЍ
-ѡѠ
-ѣѢ
-ѧѦ
-ѯѮ
-ѱѰ
-ѳѲ
-ѵѴ
-ѷѶ
-ѹѸ
-ѻѺ
-ѽѼ
-ѿѾ
-҃҃
-҆҆
-҇҇
-ӓӒ
-ӥӤ
-ӧӦ
-ӭӬ
-ӱӰ
-ӹӸ
-ᲂО
-ᲆЪ
-ⷠⷠ
-ⷡⷡ
-ⷢⷢ
-ⷣⷣ
-ⷤⷤ
-ⷥⷥ
-ⷦⷦ
-ⷧⷧ
-ⷨⷨ
-ⷩⷩ
-ⷪⷪ
-ⷫⷫ
-ⷬⷬ
-ⷭⷭ
-ⷮⷮ
-ⷯⷯ
-ⷰⷰ
-ⷱⷱ
-ⷲⷲ
-ⷳⷳ
-ⷴⷴ
-ⷵⷵ
-ⷶⷶ
-ⷷⷷ
-ⷸⷸ
-ⷹⷹ
-ⷺⷺ
-ⷻⷻ
-ⷼⷼ
-ⷽⷽ
-ⷾⷾ
-ⷿⷿ
-ⸯⸯ
-ꙋꙊ
-ꙍꙌ
-ꙗꙖ
-ꙴꙴ
-ꙵꙵ
-ꙶꙶ
-ꙷꙷ
-ꙸꙸ
-ꙹꙹ
-ꙺꙺ
-ꙻꙻ
-꙼꙼
-꙽꙽
-꙾꙾
-ꙿꙿ
-︦︦
-︮︮
-︯︯
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cu.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cu.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cu.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cu.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-% title: Hyphenation patterns for Church Slavonic
-% copyright: Copyright (C) 2016 Aleksandr Andreev, Mike Kroutikov
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Church Slavonic
-% tag: cu
-% version: 1.1
-% authors:
-% -
-% name: Aleksandr Andreev
-% contact: aleksandr.andreev (at) gmail.com
-% -
-% name: Mike Kroutikov
-% contact: pgmmpk (at) gmail.com
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% changes:
-% - 2016-04-16 Latest change
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 2
-% texlive:
-% babelname: churchslavonic
-% message: Church Slavonic hyphenation patterns
-% description: Hyphenation patterns for Church Slavonic in UTF-8 encoding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-churchslavonic.tlpobj new/tlpkg/tlpobj/hyphen-churchslavonic.tlpobj
--- old/tlpkg/tlpobj/hyphen-churchslavonic.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-churchslavonic.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,16 +1,14 @@
name hyphen-churchslavonic
category TLCore
-revision 50792
+revision 54568
shortdesc Church Slavonic hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Church Slavonic in UTF-8 encoding
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=churchslavonic lefthyphenmin=1 righthyphenmin=2 file=loadhyph-cu.tex file_patterns=hyph-cu.pat.txt file_exceptions=hyph-cu.hyp.txt
-runfiles size=72
+runfiles size=70
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-cu.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-cu.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cu.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cu.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cu.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cu.pat.txt
++++++ hyphen-coptic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-cop.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-cop.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-cop.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-cop.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cop.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cop.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cop.chr.txt 2011-06-22 11:20:34.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cop.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-̀̀
-̈̈
-ϣϢ
-ϥϤ
-ϧϦ
-ϩϨ
-ϫϪ
-ϭϬ
-ϯϮ
-ⲁⲀ
-ⲃⲂ
-ⲅⲄ
-ⲇⲆ
-ⲉⲈ
-ⲍⲌ
-ⲏⲎ
-ⲑⲐ
-ⲓⲒ
-ⲕⲔ
-ⲗⲖ
-ⲙⲘ
-ⲛⲚ
-ⲝⲜ
-ⲟⲞ
-ⲡⲠ
-ⲣⲢ
-ⲥⲤ
-ⲧⲦ
-ⲩⲨ
-ⲫⲪ
-ⲭⲬ
-ⲯⲮ
-ⲱⲰ
-ⳉⳈ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cop.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cop.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cop.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cop.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,206 +0,0 @@
-% title: Hyphenation patterns for Coptic
-% copyright: Copyright (C) 2004—2010 Claudio Beccari
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Coptic
-% tag: cop
-% authors:
-% -
-% name: Claudio Beccari
-% contact: claudio.beccari (at) gmail.com
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 1
-% changes:
-% - 2004-10-03 Last modification to date
-% texlive:
-% babelname: coptic
-% use_old_patterns_comment: "TODO: automatic conversion could be done, but was too complicated; leave for later."
-% legacy_patterns: copthyph.tex
-% message: Coptic hyphenation patterns
-% description: |-
-% Hyphenation patterns for Coptic in UTF-8 encoding
-% as well as in ASCII-based encoding for 8-bit engines.
-% The latter can only be used with special Coptic fonts (like CBcoptic).
-% The patterns are considered experimental.
-% ==========================================
-%
-% Unicode (UTF-8) patterns generated by copthyph-utf8 script
-%
-% These patterns for use with XeTeX should be considered experimental
-% and are provided with no warranty or support!
-%
-% Changes made to the original (non-Unicode) patterns
-% * catcode and lccode settings disabled
-% * Letters within the patterns mapped to Unicode as follows:
-% # => ⲯ
-% ) => ⲝ
-% + => ⲫ
-% . => .
-% / => ϩ
-% 1 => OMIT
-% 2 => ⳉ
-% 3 => ϯ
-% 8 => ⲑ
-% 9 => ⲓ̈
-% ; => ϫ
-% > => ⲙ̀
-% ? => ⲛ̀
-% a => ⲁ
-% b => ⲃ
-% c => ⲥ
-% d => ⲇ
-% e => ⲉ
-% f => ϥ
-% g => ⲅ
-% h => ⲏ
-% i => ⲓ
-% j => ϧ
-% k => ⲕ
-% l => ⲗ
-% m => ⲙ
-% n => ⲛ
-% o => ⲟ
-% p => ⲡ
-% q => ϭ
-% r => ⲣ
-% s => OMIT
-% t => ⲧ
-% u => ⲩ
-% v => ⲩ̈
-% w => ⲱ
-% x => ⲭ
-% y => ϣ
-% z => ⲍ
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Hyphenation patterns for Coptic valid for the "copto" font which
-% does not comply with any official encoding scheme (does really exist
-% out here an official TeX compliant font encoding for coptic fonts?)
-% **********************************************
-% VVVVERY EXPERIMENTAL !!!!!!!!!!!!
-%
-% This pattern set allows hyphenation just before or between consonants
-% No attempt is made to distinguish diphthongs and/or hyathi.
-%
-% Rules 1. a consonant followed by a vowel belong to the same syllable
-% 2. a group of consonants is divided in such a way that the right
-% syllable consonants may appear also at the beginning
-% of a Coptic word
-%
-% Compound words are divided without any attention to component words;
-% manual intervention is required in case of bad divisions.
-%
-% The decimal TeX charcodes, the Coptic glyphs and the corresponding ASCII
-% signs (if any) are in the following table.
-% 21 "trema" \textendash
-% 22 "emdash" \texemdash
-% 33 "threepoints" %
-% 35 epsi #
-% 36 Epsi $
-% 40 Thida (
-% 41 exi )
-% 42 Exi *
-% 43 phi +
-% 44 Phi ,
-% 45 "hyphen" -
-% 46 "period" .
-% 47 hori /
-% 48 Hori 0
-% 49 "ligature1" 1
-% 50 hori akh 2
-% 51 ti 3
-% 52 Ti 4
-% 53 "crux" 5
-% 56 thida 8
-% 57 i-trema 9
-% 58 "very short dash" :
-% 59 giangia ;
-% 60 Giangia <
-% 61 "double sloping dash" =
-% 62 em (`m) >
-% 64 en (`n) ?
-% 65 Alpha A
-% 66 Bida, Vida B
-% 67 Cima C
-% 68 Dalda D
-% 69 Ei E
-% 70 Fei F
-% 71 Gamma G
-% 72 Ita H
-% 73 Iauda I
-% 74 Hei J
-% 75 Kabba K
-% 76 Laula L
-% 77 Mi, Mei M
-% 78 Ni, Nei N
-% 79 O O
-% 80 Pi, Pei P
-% 81 Shima Q
-% 82 Ro R
-% 83 "ligatureS" S
-% 84 Tau T
-% 85 Ue U
-% 86 "crucicula" V
-% 87 Omega W
-% 88 Chi X
-% 89 Shei Y
-% 90 Zida Z
-% 91 "open bracket" [
-% 93 "closed bracket" ]
-% 96 "grave accent" `
-% 97 alpha a
-% 98 bida, vida b
-% 99 cima c
-%100 dalda d
-%101 ei e
-%102 fei f
-%103 gamma g
-%104 ita h
-%105 iauda i
-%106 hei j
-%107 kabba k
-%108 laula l
-%109 mi, mei m
-%110 ni, nei n
-%111 o o
-%112 pi, pei p
-%113 shima q
-%114 ro r
-%115 "ligatures" s
-%116 tau t
-%117 ue u
-%118 ue-trema v
-%119 omega w
-%120 chi x
-%121 shei y
-%122 zida z
-%
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-coptic.tlpobj new/tlpkg/tlpobj/hyphen-coptic.tlpobj
--- old/tlpkg/tlpobj/hyphen-coptic.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-coptic.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-coptic
category TLCore
-revision 50792
+revision 54568
shortdesc Coptic hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Coptic in UTF-8 encoding as well as in
@@ -10,11 +10,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=coptic lefthyphenmin=1 righthyphenmin=1 file=loadhyph-cop.tex file_patterns=hyph-cop.pat.txt file_exceptions=
-runfiles size=11
+runfiles size=8
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-cop.tex
RELOC/tex/generic/hyph-utf8/patterns/tex-8bit/copthyph.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-cop.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cop.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cop.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cop.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cop.pat.txt
++++++ hyphen-croatian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-hr.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-hr.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-hr.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-hr.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hr.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hr.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hr.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hr.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-zZ
-ćĆ
-čČ
-đĐ
-šŠ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hr.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hr.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hr.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hr.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-% title: Hyphenation patterns for Croatian
-% copyright: Copyright (C) 1994, 1996, 2011, 2015 Igor Marinović
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Croatian
-% tag: hr
-% authors:
-% -
-% name: Igor Marinović
-% contact: marinowski (at) gmail.com
-% licence:
-% - This file is available under any of these licences:
-% -
-% name: LPPL
-% version: 1
-% or_later: true
-% url: http://www.latex-project.org/lppl/lppl-1-0.html
-% -
-% text: >
-% Permission is hereby granted, free of charge, to any person obtaining
-% a copy of this file and any associated documentation
-% (the "Data Files") to deal in the Data Files
-% without restriction, including without limitation the rights to use,
-% copy, modify, merge, publish, distribute, and/or sell copies of
-% the Data Files, and to permit persons to whom the Data Files
-% are furnished to do so, provided that
-% (a) this copyright and permission notice appear with all copies
-% of the Data Files,
-% (b) this copyright and permission notice appear in associated
-% documentation, and
-% (c) there is clear notice in each modified Data File
-% as well as in the documentation associated with the Data File(s)
-% that the data has been modified.
-%
-% THE DATA FILES ARE 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 OF THIRD PARTY RIGHTS.
-% IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-% NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-% DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-% DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-% TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-% PERFORMANCE OF THE DATA FILES.
-%
-% Except as contained in this notice, the name of a copyright holder
-% shall not be used in advertising or otherwise to promote the sale,
-% use or other dealings in these Data Files without prior
-% written authorization of the copyright holder.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - Late 1994 first version
-% - Beginning of 1996 much more improved version (date of last change: 19.03.1996).
-% - In summer 2008 patterns incorporated into hyph-utf8 and renamed from hrhyph.tex to hyph-hr.tex.
-% - 06.06.2011 LPPL licence added.
-% texlive:
-% encoding: ec
-% babelname: croatian
-% legacy_patterns: hrhyph.tex
-% message: Croatian hyphenation patterns
-% description: Hyphenation patterns for Croatian in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-croatian.tlpobj new/tlpkg/tlpobj/hyphen-croatian.tlpobj
--- old/tlpkg/tlpobj/hyphen-croatian.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-croatian.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-croatian
category TLCore
-revision 50792
+revision 54568
catalogue hrhyph
shortdesc Croatian hyphenation patterns.
relocated 1
@@ -8,15 +8,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=croatian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hr.tex file_patterns=hyph-hr.pat.txt file_exceptions=
-runfiles size=11
+runfiles size=9
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-hr.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-hr.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-hr.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hr.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hr.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hr.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hr.pat.txt
catalogue-ctan /language/hyphenation/hrhyph.tex
-catalogue-date 2018-01-06 12:14:59 +0100
catalogue-license lppl1.3
catalogue-topics hyphenation croatian
++++++ hyphen-czech.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-cs.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-cs.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-cs.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-cs.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cs.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cs.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cs.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cs.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-áÁ
-éÉ
-íÍ
-óÓ
-úÚ
-ýÝ
-čČ
-ďĎ
-ěĚ
-ňŇ
-řŘ
-šŠ
-ťŤ
-ůŮ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cs.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cs.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cs.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cs.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-% title: Hyphenation patterns for Czech
-% copyright: Copyright (C) 1995 Pavel Ševeček
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Czech
-% tag: cs
-% version: v3, 1995
-% authors:
-% -
-% name: Pavel Ševeček
-% affiliation: Lingea s.r.o., Brno, Czech Republic
-% contact: pavel (at) lingea.cz
-% licence:
-% name: GPL
-% version: 2
-% or_later: true
-% url: http://www.gnu.org/licenses/gpl.html
-% hyphenmins:
-% generation:
-% left: 2
-% right: 2
-% typesetting:
-% left: 2
-% right: 3
-% texlive:
-% encoding: ec
-% babelname: czech
-% legacy_patterns: czhyph.tex
-% message: Czech hyphenation patterns
-% description: |-
-% Hyphenation patterns for Czech in T1/EC and UTF-8 encodings.
-% Original patterns 'czhyphen' are still distributed in the 'csplain'
-% package and loaded with ISO Latin 2 encoding (IL2).
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-czech.tlpobj new/tlpkg/tlpobj/hyphen-czech.tlpobj
--- old/tlpkg/tlpobj/hyphen-czech.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-czech.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-czech
category TLCore
-revision 50792
+revision 54568
shortdesc Czech hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Czech in T1/EC and UTF-8 encodings.
@@ -9,11 +9,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=czech lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cs.tex file_patterns=hyph-cs.pat.txt file_exceptions=hyph-cs.hyp.txt
-runfiles size=23
+runfiles size=21
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-cs.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-cs.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-cs.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cs.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cs.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cs.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cs.pat.txt
++++++ hyphen-danish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-da.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-da.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-da.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-da.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-da.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-da.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-da.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-da.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-åÅ
-æÆ
-øØ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-da.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-da.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-da.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-da.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-% title: Hyphenation patterns for Danish
-% copyright: Copyright (C) 1994 Frank Jensen
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Danish
-% tag: da
-% version: 2011-01-11
-% authors:
-% -
-% name: Frank Jensen
-% contact: frank.jensen (at) hugin.com
-% licence:
-% - This file is available under any of these licences:
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: http://www.latex-project.org/lppl/lppl-1-3.html
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2011-01-11 - remove support for OT1 encoding
-% texlive:
-% encoding: ec
-% babelname: danish
-% legacy_patterns: dkhyph.tex
-% message: Danish hyphenation patterns
-% description: Hyphenation patterns for Danish in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-danish.tlpobj new/tlpkg/tlpobj/hyphen-danish.tlpobj
--- old/tlpkg/tlpobj/hyphen-danish.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-danish.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-danish
category TLCore
-revision 50792
+revision 54568
catalogue dkhyphen
shortdesc Danish hyphenation patterns.
relocated 1
@@ -8,15 +8,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=danish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-da.tex file_patterns=hyph-da.pat.txt file_exceptions=
-runfiles size=10
+runfiles size=8
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-da.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-da.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-da.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-da.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-da.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-da.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-da.pat.txt
catalogue-ctan /language/hyphenation/dkhyphen
-catalogue-date 2016-11-05 05:59:04 +0100
catalogue-license lppl
catalogue-topics hyphenation danish
++++++ hyphen-dutch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-nl.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-nl.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-nl.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-nl.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-nl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-nl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-nl.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-nl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-äÄ
-çÇ
-èÈ
-éÉ
-êÊ
-ëË
-îÎ
-ïÏ
-ñÑ
-öÖ
-ûÛ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-nl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-nl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-nl.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-nl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-% title: Hyphenation patterns for Dutch
-% copyright: Copyright (C) 1996 Piet Tutelaers
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Dutch
-% tag: nl
-% version: 1.1 (November 1996)
-% licence:
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/
-% authors:
-% -
-% name: Piet Tutelaers
-% contact: P.T.H.Tutelaers (at) tue.nl
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - Version 1.1 November 1996
-% - Copyright changed March 2000
-% texlive:
-% encoding: ec
-% babelname: dutch
-% legacy_patterns: nehyph96.tex
-% message: Dutch hyphenation patterns
-% description: |-
-% Hyphenation patterns for Dutch in T1/EC and UTF-8 encodings.
-% These patterns don't handle cases like 'menuutje' > 'menu-tje',
-% and don't hyphenate words that have different hyphenations according
-% to their meaning.
-% known_bugs:
-% xi-ii: 'when we’d expect xiii for a roman number (see GitHub issue #29)'
-% ==========================================
-% PURPOSE: 8-bit hyphenation patterns for TeX based upon the new Dutch
-% spelling, officially since 1 August 1996. These patterns follow
-% the new hyphenation rules in the ‘Woordenlijst Nederlandse
-% Taal, SDU Uitgevers, Den Haag 1995’ (the so called ‘Groene
-% Boekje’) described in section 5.2 (Het afbreekteken).
-%
-% The main differences with our earlier patterns based upon the
-% CELEX dictionary are:
-% (1) provide 8-bit patterns based upon the T1 character encoding
-% (the encoding for DC/EC compatible TeX fonts)
-% (2) don’t hyphenate if this results in a syllable of one letter
-% before or after the hyphen (hence hyphens in a-drenaline,
-% studi-o, mensa-pen and vide-oachtig are invalid)
-% (3) handle words derived from other languages (‘bastaard
-% woorden’) according to the new rules
-%
-% Like the CELEX patterns these patterns don’t hyphenate:
-% (4) in a changing syllable (menuutje can not be hyphenated as
-% menu-tje)
-% (5) in words that have different hyphenations according to
-% there meaning (buur-tje/buurt-je)
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-dutch.tlpobj new/tlpkg/tlpobj/hyphen-dutch.tlpobj
--- old/tlpkg/tlpobj/hyphen-dutch.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-dutch.tlpobj 2020-03-26 23:29:32.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-dutch
category TLCore
-revision 50792
+revision 54568
catalogue nehyph
shortdesc Dutch hyphenation patterns.
relocated 1
@@ -11,16 +11,13 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=dutch lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nl.tex file_patterns=hyph-nl.pat.txt file_exceptions=hyph-nl.hyp.txt
-runfiles size=68
+runfiles size=66
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-nl.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-nl.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-nl.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nl.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nl.pat.txt
catalogue-ctan /language/hyphenation/nehyph.tex
-catalogue-date 2018-01-06 12:14:59 +0100
catalogue-license lppl
catalogue-topics hyphenation dutch
catalogue-version 1.1
++++++ hyphen-english.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-en-gb.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-en-gb.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-en-gb.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-en-gb.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-en-us.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-en-us.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-en-us.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-en-us.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-% title: Hyphenation patterns for British English
-% copyright: Copyright (C) 1992, 1996, 2005, 2016 Dominik Wujastyk, Graham Toal
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: English, British spelling
-% tag: en-gb
-% authors:
-% -
-% name: Dominik Wujastyk
-% contact: wujastyk (at) gmail.com
-% -
-% name: Graham Toal
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% changes:
-% - Version 1.0 Released 17 April 1992.
-% - Revision 2.0 1996/09/10 15:04:04 ucgadkw
-% o added list of hyphenation exceptions at the end of this file.
-% - Version 1.0a. Released 18th October 2005/PT.
-% texlive:
-% synonyms:
-% - british
-% - UKenglish
-% encoding: ascii
-% babelname: ukenglish
-% legacy_patterns: ukhyphen.tex
-% message: Hyphenation patterns for British English
-% package: english
-% ==========================================
-% This file has been renamed from ukhyphen.tex to hyph-en-gb.tex in June 2008
-% for consistency with other files with hyphenation patterns in hyph-utf8 package.
-% No other changes made. See http://www.hyphenation.org/tex for more details.
-%
-% Created by Dominik Wujastyk and Graham Toal using Frank Liang's PATGEN 1.0.
-% Like the US patterns, these UK patterns correctly hyphenate about 90% of
-% the words in the input list, and produce no hyphens not in the list
-% (see TeXbook pp. 451--2).
-%
-% These patterns are based on a file of 114925 British-hyphenated words
-% generously made available to Dominik Wujastyk by Oxford University Press.
-% This list of words is copyright to the OUP and may not be redistributed.
-% The hyphenation break points in the words in the abovementioned file is
-% also copyright to the OUP.
-%
-% We are very grateful to Oxford University Press for allowing us to use
-% their list of hyphenated words to produce the following TeX hyphenation
-% patterns. This file of hyphenation patterns may be freely distributed.
-%
-% These patterns require a value of about 14000 for TeX's pattern memory size.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-% title: Hyphenation patterns for American English
-% copyright: Copyright (C) 1990, 2004, 2005 Gerard D.C. Kuiken
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: English, American spelling
-% tag: en-us
-% version: 2005-05-30
-% authors:
-% -
-% name: Gerard D.C. Kuiken
-% licence:
-% text: >
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% changes:
-% March 1, 1990 Initial release
-% May 30, 2005 Added copyright notice, no patterns change.
-% texlive:
-% encoding: ascii
-% babelname: usenglishmax
-% legacy_patterns: ushyphmax.tex
-% message: Hyphenation patterns for American English
-% package: english
-% known_bugs:
-% de-mo-c-rat: 'instead of dem-o-crat (see GitHub issue #15)'
-% ==========================================
-%
-% ushyphmax.tex -- patterns for more hyphenation pattern memory (12000+).
-% Also known as ushyphen.max.
-%
-% Needs extended pattern memory.
-% Hyphenation trie becomes 7283 with 377 ops.
-%
-% These patterns are based on the Hyphenation Exception Log
-% published in TUGboat, Volume 10 (1989), No. 3, pp. 337-341,
-% and a large number of incorrectly hyphenated words not yet published.
-% If added to Liang's before the closing bracket } of \patterns,
-% the patterns run errorfree as far as known at this moment.
-%
-% These patterns find all admissible hyphens of the words in
-% the Exception Log. ushyph2.tex is a smaller set.
-%
-% Please send bugs or suggestions to tex-live (at) tug.org.
-%
-% 2005-05-30 (karl): in the past, ushyphmax.tex was a file containing
-% only the additional patterns, without the \patterns command, etc.
-% This turned out not to be very useful, since in practice the TeX
-% distributions need one self-contained file for a language. Therefore,
-% ushyphmax.tex now contains both the additional patterns from
-% Dr. Kuiken, and the original patterns and hyphenations from Knuth's
-% hyphen.tex.
-%
-% The Plain TeX hyphenation tables.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-english.tlpobj new/tlpkg/tlpobj/hyphen-english.tlpobj
--- old/tlpkg/tlpobj/hyphen-english.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-english.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,28 +1,24 @@
name hyphen-english
category TLCore
-revision 50792
+revision 54568
shortdesc English hyphenation patterns.
relocated 1
longdesc Additional hyphenation patterns for American and British
-longdesc English in ASCII encoding. The American English patterns
+longdesc English in ASCII encoding. The American English patterns
longdesc (usenglishmax) greatly extend the standard patterns from Knuth
-longdesc to find many additional hyphenation points. British English
+longdesc to find many additional hyphenation points. British English
longdesc hyphenation is completely different from US English, so has its
longdesc own set of patterns.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=ukenglish synonyms=british,UKenglish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-en-gb.tex file_patterns=hyph-en-gb.pat.txt file_exceptions=hyph-en-gb.hyp.txt
execute AddHyphen name=usenglishmax lefthyphenmin=2 righthyphenmin=3 file=loadhyph-en-us.tex file_patterns=hyph-en-us.pat.txt file_exceptions=hyph-en-us.hyp.txt
-runfiles size=54
+runfiles size=50
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-en-gb.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-en-us.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-en-gb.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-en-us.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-gb.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-en-us.pat.txt
++++++ hyphen-esperanto.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-eo.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-eo.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-eo.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-eo.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-eo.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-eo.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-eo.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-eo.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-zZ
-ĉĈ
-ĝĜ
-ĥĤ
-ĵĴ
-ŝŜ
-ŭŬ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-eo.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-eo.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-eo.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-eo.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-% title: Hyphenation patterns for Esperanto
-% copyright: Copyright (C) 1999 Sergei B. Pokrovsky (Sergio Pokrovskij)
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Esperanto
-% tag: eo
-% version: 1.0 1999-08-10
-% authors:
-% -
-% name: Sergei B. Pokrovsky
-% contact: pok (at) iis.nsk.su
-% licence:
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/
-% changes:
-% - 1999-07-25 0.0 First try with the hyphenation patterns by Paul Peeraerts
-% - 1999-08-10 1.0 Complete redesign of the patterns by S.B. Pokrovsky
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: il3
-% babelname: esperanto
-% legacy_patterns: eohyph.tex
-% message: Esperanto hyphenation patterns
-% description: |-
-% Hyphenation patterns for Esperanto ISO Latin 3 and UTF-8 encodings.
-% Note that TeX distributions don't ship any suitable fonts in Latin 3
-% encoding, so unless you create your own font support or want to use
-% MlTeX, using native Unicode engines is highly recommended.
-% ==========================================
-% More documentation can be found near the end of this file.
-%
-\begingroup
-% Makrooj por la finaĵoj:
-\def\adj#1{#1a. #1aj. #1ajn. #1an. #1e.}
-\edef\nom#1{\adj{#1} #1o. #1oj. #1ojn. #1on.}
-\def\ver#1{#1as. #1i. #1is. #1os. #1u. #1us.}
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-esperanto.tlpobj new/tlpkg/tlpobj/hyphen-esperanto.tlpobj
--- old/tlpkg/tlpobj/hyphen-esperanto.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-esperanto.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-esperanto
category TLCore
-revision 50792
+revision 54568
shortdesc Esperanto hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Esperanto ISO Latin 3 and UTF-8
@@ -11,11 +11,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=esperanto lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eo.tex file_patterns=hyph-eo.pat.txt file_exceptions=
-runfiles size=18
+runfiles size=16
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-eo.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-eo.il3.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-eo.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eo.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eo.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eo.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-eo.pat.txt
++++++ hyphen-estonian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-et.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-et.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-et.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-et.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-et.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-et.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-et.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-et.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-aA
-bB
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-zZ
-äÄ
-õÕ
-öÖ
-üÜ
-šŠ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-et.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-et.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-et.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-et.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-% title: Hyphenation patterns for Estonian
-% copyright: Copyright (C) 2004-2015 Enn Saar
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Estonian
-% tag: et
-% authors:
-% -
-% name: Enn Saar
-% contact: saar (at) aai.ee
-% licence:
-% - This file is dual-licensed under both these licences, at your discretion:
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% status: author-maintained
-% url: http://www.latex-project.org/lppl.txt
-% changes:
-% - 2004-04-13 latest changes
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% texlive:
-% encoding: ec
-% babelname: estonian
-% legacy_patterns: ethyph.tex
-% message: Estonian hyphenation patterns
-% description: Hyphenation patterns for Estonian in T1/EC and UTF-8 encodings.
-%
-% ==========================================
-% The patterns were generated long ago by applying patgen to
-% an Estonian dictionary; a few patterns were added later manually
-% to prohibit aa-bits type cases.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-estonian.tlpobj new/tlpkg/tlpobj/hyphen-estonian.tlpobj
--- old/tlpkg/tlpobj/hyphen-estonian.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-estonian.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-estonian
category TLCore
-revision 50792
+revision 54568
shortdesc Estonian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Estonian in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=estonian lefthyphenmin=2 righthyphenmin=3 file=loadhyph-et.tex file_patterns=hyph-et.pat.txt file_exceptions=
-runfiles size=23
+runfiles size=21
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-et.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-et.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-et.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-et.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-et.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-et.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-et.pat.txt
++++++ hyphen-ethiopic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-mul-ethi.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-mul-ethi.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-mul-ethi.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-mul-ethi.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.chr.txt 2018-11-04 21:26:59.000000000 +0100
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,455 +0,0 @@
-ሀሀ
-ሁሁ
-ሂሂ
-ሃሃ
-ሄሄ
-ህህ
-ሆሆ
-ሇሇ
-ለለ
-ሉሉ
-ሊሊ
-ላላ
-ሌሌ
-ልል
-ሎሎ
-ሏሏ
-ሐሐ
-ሑሑ
-ሒሒ
-ሓሓ
-ሔሔ
-ሕሕ
-ሖሖ
-ሗሗ
-መመ
-ሙሙ
-ሚሚ
-ማማ
-ሜሜ
-ምም
-ሞሞ
-ሟሟ
-ሠሠ
-ሡሡ
-ሢሢ
-ሣሣ
-ሤሤ
-ሥሥ
-ሦሦ
-ሧሧ
-ረረ
-ሩሩ
-ሪሪ
-ራራ
-ሬሬ
-ርር
-ሮሮ
-ሯሯ
-ሰሰ
-ሱሱ
-ሲሲ
-ሳሳ
-ሴሴ
-ስስ
-ሶሶ
-ሷሷ
-ሸሸ
-ሹሹ
-ሺሺ
-ሻሻ
-ሼሼ
-ሽሽ
-ሾሾ
-ሿሿ
-ቀቀ
-ቁቁ
-ቂቂ
-ቃቃ
-ቄቄ
-ቅቅ
-ቆቆ
-ቇቇ
-ቈቈ
-ቊቊ
-ቋቋ
-ቌቌ
-ቍቍ
-ቐቐ
-ቑቑ
-ቒቒ
-ቓቓ
-ቔቔ
-ቕቕ
-ቖቖ
-ቘቘ
-ቚቚ
-ቛቛ
-ቜቜ
-ቝቝ
-በበ
-ቡቡ
-ቢቢ
-ባባ
-ቤቤ
-ብብ
-ቦቦ
-ቧቧ
-ቨቨ
-ቩቩ
-ቪቪ
-ቫቫ
-ቬቬ
-ቭቭ
-ቮቮ
-ቯቯ
-ተተ
-ቱቱ
-ቲቲ
-ታታ
-ቴቴ
-ትት
-ቶቶ
-ቷቷ
-ቸቸ
-ቹቹ
-ቺቺ
-ቻቻ
-ቼቼ
-ችች
-ቾቾ
-ቿቿ
-ኀኀ
-ኁኁ
-ኂኂ
-ኃኃ
-ኄኄ
-ኅኅ
-ኆኆ
-ኇኇ
-ኈኈ
-ኊኊ
-ኋኋ
-ኌኌ
-ኍኍ
-ነነ
-ኑኑ
-ኒኒ
-ናና
-ኔኔ
-ንን
-ኖኖ
-ኗኗ
-ኘኘ
-ኙኙ
-ኚኚ
-ኛኛ
-ኜኜ
-ኝኝ
-ኞኞ
-ኟኟ
-አአ
-ኡኡ
-ኢኢ
-ኣኣ
-ኤኤ
-እእ
-ኦኦ
-ኧኧ
-ከከ
-ኩኩ
-ኪኪ
-ካካ
-ኬኬ
-ክክ
-ኮኮ
-ኯኯ
-ኰኰ
-ኲኲ
-ኳኳ
-ኴኴ
-ኵኵ
-ኸኸ
-ኹኹ
-ኺኺ
-ኻኻ
-ኼኼ
-ኽኽ
-ኾኾ
-ዀዀ
-ዂዂ
-ዃዃ
-ዄዄ
-ዅዅ
-ወወ
-ዉዉ
-ዊዊ
-ዋዋ
-ዌዌ
-ውው
-ዎዎ
-ዏዏ
-ዐዐ
-ዑዑ
-ዒዒ
-ዓዓ
-ዔዔ
-ዕዕ
-ዖዖ
-ዘዘ
-ዙዙ
-ዚዚ
-ዛዛ
-ዜዜ
-ዝዝ
-ዞዞ
-ዟዟ
-ዠዠ
-ዡዡ
-ዢዢ
-ዣዣ
-ዤዤ
-ዥዥ
-ዦዦ
-ዧዧ
-የየ
-ዩዩ
-ዪዪ
-ያያ
-ዬዬ
-ይይ
-ዮዮ
-ዯዯ
-ደደ
-ዱዱ
-ዲዲ
-ዳዳ
-ዴዴ
-ድድ
-ዶዶ
-ዷዷ
-ዸዸ
-ዹዹ
-ዺዺ
-ዻዻ
-ዼዼ
-ዽዽ
-ዾዾ
-ዿዿ
-ጀጀ
-ጁጁ
-ጂጂ
-ጃጃ
-ጄጄ
-ጅጅ
-ጆጆ
-ጇጇ
-ገገ
-ጉጉ
-ጊጊ
-ጋጋ
-ጌጌ
-ግግ
-ጎጎ
-ጏጏ
-ጐጐ
-ጒጒ
-ጓጓ
-ጔጔ
-ጕጕ
-ጘጘ
-ጙጙ
-ጚጚ
-ጛጛ
-ጜጜ
-ጝጝ
-ጞጞ
-ጟጟ
-ጠጠ
-ጡጡ
-ጢጢ
-ጣጣ
-ጤጤ
-ጥጥ
-ጦጦ
-ጧጧ
-ጨጨ
-ጩጩ
-ጪጪ
-ጫጫ
-ጬጬ
-ጭጭ
-ጮጮ
-ጯጯ
-ጰጰ
-ጱጱ
-ጲጲ
-ጳጳ
-ጴጴ
-ጵጵ
-ጶጶ
-ጷጷ
-ጸጸ
-ጹጹ
-ጺጺ
-ጻጻ
-ጼጼ
-ጽጽ
-ጾጾ
-ጿጿ
-ፀፀ
-ፁፁ
-ፂፂ
-ፃፃ
-ፄፄ
-ፅፅ
-ፆፆ
-ፇፇ
-ፈፈ
-ፉፉ
-ፊፊ
-ፋፋ
-ፌፌ
-ፍፍ
-ፎፎ
-ፏፏ
-ፐፐ
-ፑፑ
-ፒፒ
-ፓፓ
-ፔፔ
-ፕፕ
-ፖፖ
-ፗፗ
-ፘፘ
-ፙፙ
-ፚፚ
-፡፡
-።።
-ᎀᎀ
-ᎁᎁ
-ᎂᎂ
-ᎃᎃ
-ᎄᎄ
-ᎅᎅ
-ᎆᎆ
-ᎇᎇ
-ᎈᎈ
-ᎉᎉ
-ᎊᎊ
-ᎋᎋ
-ᎌᎌ
-ᎍᎍ
-ᎎᎎ
-ᎏᎏ
-ⶀⶀ
-ⶁⶁ
-ⶂⶂ
-ⶃⶃ
-ⶄⶄ
-ⶅⶅ
-ⶆⶆ
-ⶇⶇ
-ⶈⶈ
-ⶉⶉ
-ⶊⶊ
-ⶋⶋ
-ⶌⶌ
-ⶍⶍ
-ⶎⶎ
-ⶏⶏ
-ⶐⶐ
-ⶑⶑ
-ⶒⶒ
-ⶓⶓ
-ⶔⶔ
-ⶕⶕ
-ⶖⶖ
-ⶠⶠ
-ⶡⶡ
-ⶢⶢ
-ⶣⶣ
-ⶤⶤ
-ⶥⶥ
-ⶦⶦ
-ⶨⶨ
-ⶩⶩ
-ⶪⶪ
-ⶫⶫ
-ⶬⶬ
-ⶭⶭ
-ⶮⶮ
-ⶰⶰ
-ⶱⶱ
-ⶲⶲ
-ⶳⶳ
-ⶴⶴ
-ⶵⶵ
-ⶶⶶ
-ⶸⶸ
-ⶹⶹ
-ⶺⶺ
-ⶻⶻ
-ⶼⶼ
-ⶽⶽ
-ⶾⶾ
-ⷀⷀ
-ⷁⷁ
-ⷂⷂ
-ⷃⷃ
-ⷄⷄ
-ⷅⷅ
-ⷆⷆ
-ⷈⷈ
-ⷉⷉ
-ⷊⷊ
-ⷋⷋ
-ⷌⷌ
-ⷍⷍ
-ⷎⷎ
-ⷐⷐ
-ⷑⷑ
-ⷒⷒ
-ⷓⷓ
-ⷔⷔ
-ⷕⷕ
-ⷖⷖ
-ⷘⷘ
-ⷙⷙ
-ⷚⷚ
-ⷛⷛ
-ⷜⷜ
-ⷝⷝ
-ⷞⷞ
-ꬁꬁ
-ꬂꬂ
-ꬃꬃ
-ꬄꬄ
-ꬅꬅ
-ꬆꬆ
-ꬉꬉ
-ꬊꬊ
-ꬋꬋ
-ꬌꬌ
-ꬍꬍ
-ꬎꬎ
-ꬑꬑ
-ꬒꬒ
-ꬓꬓ
-ꬔꬔ
-ꬕꬕ
-ꬖꬖ
-ꬠꬠ
-ꬡꬡ
-ꬢꬢ
-ꬣꬣ
-ꬤꬤ
-ꬥꬥ
-ꬦꬦ
-ꬨꬨ
-ꬩꬩ
-ꬪꬪ
-ꬫꬫ
-ꬬꬬ
-ꬭꬭ
-ꬮꬮ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-% title: Hyphenation patterns for languages written in the Ethiopic script
-% copyright: Copyright (C) 2011, 2016 Arthur Reutenauer
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Multiple languages using the Ethiopic script
-% tag: mul-ethi
-% version: 0.2 2016-05-22
-% authors:
-% - name: Arthur Reutenauer
-% - name: Mojca Miklavec
-% licence:
-% - name: MIT
-% - url: https://opensource.org/licenses/MIT
-% - text: >
-% This file is available under the terms of the MIT licence.
-% 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:
-%
-% 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.
-% hyphenmins:
-% generation:
-% left: 1
-% right: 1
-% texlive:
-% synonyms:
-% - amharic
-% - geez
-% babelname: ethiopic
-% message: Pan-Ethiopic hyphenation patterns
-% description: |-
-% Hyphenation patterns for languages written using the Ethiopic script
-% for Unicode engines. They are not supposed to be linguistically
-% relevant in all cases and should, for proper typography, be replaced
-% by files tailored to individual languages.
-% ==========================================
-% This is a generated file. If you wish to edit it, consider adapting the
-% generating programme
-% (https://github.com/hyphenation/tex-hyphen/blob/master/hyph-utf8/source/gene…).
-%
-% The BCP 47 language tag for that file is “mul-ethi” to reflect the fact that
-% it can be used by multiple languages (and a single script, Ethiopic). It is,
-% though, not supposed to be linguistically relevant and should, for proper
-% typography, be replaced by files tailored to individual languages. What we
-% do for the moment is to simply allow break on either sides of Ethiopic
-% syllables, and to forbid it before some punctuation marks particular to
-% the Ethiopic script (which we thus make letters for this purpose).
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-ethiopic.tlpobj new/tlpkg/tlpobj/hyphen-ethiopic.tlpobj
--- old/tlpkg/tlpobj/hyphen-ethiopic.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-ethiopic.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-ethiopic
category TLCore
-revision 50792
+revision 54568
shortdesc Hyphenation patterns for Ethiopic scripts.
relocated 1
longdesc Hyphenation patterns for languages written using the Ethiopic
@@ -11,10 +11,7 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=ethiopic synonyms=amharic,geez lefthyphenmin=1 righthyphenmin=1 file=loadhyph-mul-ethi.tex file_patterns=hyph-mul-ethi.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-mul-ethi.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-mul-ethi.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mul-ethi.pat.txt
++++++ hyphen-farsi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/tex/hyph-fa.tex new/tex/generic/hyph-utf8/patterns/tex/hyph-fa.tex
--- old/tex/generic/hyph-utf8/patterns/tex/hyph-fa.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/tex/hyph-fa.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-% title: (No) Hyphenation patterns for Persian
-% copyright: Copyright (C) Arthur Reutenauer 2018
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Persian
-% tag: fa
-% version: 0
-% authors:
-% - Arthur Reutenauer
-% licence:
-% -
-% name: MIT
-% hyphenmins:
-% typesetting:
-% left:
-% right:
-% texlive:
-% babelname: farsi
-% synonyms:
-% - persian
-% use_old_loader: true
-% legacy_patterns: zerohyph.tex
-% message:
-% description: Prevent hyphenation in Persian.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-farsi.tlpobj new/tlpkg/tlpobj/hyphen-farsi.tlpobj
--- old/tlpkg/tlpobj/hyphen-farsi.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-farsi.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,11 +1,9 @@
name hyphen-farsi
category TLCore
-revision 50805
+revision 54568
shortdesc (No) Persian hyphenation patterns.
relocated 1
longdesc Prevent hyphenation in Persian.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=farsi synonyms=persian lefthyphenmin= righthyphenmin= file=zerohyph.tex file_patterns=
-runfiles size=1
- RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-fa.tex
++++++ hyphen-finnish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-fi.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-fi.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-fi.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-fi.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-fi.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-fi.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-fi.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-fi.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-yY
-äÄ
-öÖ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-fi.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-fi.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-fi.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-fi.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-% title: Hyphenation patterns for Finnish
-% copyright: Copyright (C) 1986, 1988, 1989 Kauko Saarinen
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Finnish
-% tag: fi
-% version: 2.2
-% authors:
-% -
-% name: Kauko Saarinen
-% affiliation: Computing Centre, University of Jyväskylä, Finland
-% licence:
-% - text: Patterns may be freely distributed
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - First release 1986-01 by Kauko Saarinen,
-% - >
-% Completely rewritten 1988-01. The new patterns make
-% much less mistakes with foreign and compound words.
-% The article "Automatic Hyphenation of Finnish"
-% by Professor Fred Karlsson is also referred
-% - 1989-03-08 (vers. 2.2), some vowel triples by Fred Karlsson added.
-% - 1995-01-09: added \uccode and \lccode by Thomas Esser
-% texlive:
-% encoding: ec
-% babelname: finnish
-% legacy_patterns: fihyph.tex
-% message: Finnish hyphenation patterns
-% description: Hyphenation patterns for Finnish in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-finnish.tlpobj new/tlpkg/tlpobj/hyphen-finnish.tlpobj
--- old/tlpkg/tlpobj/hyphen-finnish.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-finnish.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-finnish
category TLCore
-revision 50792
+revision 54568
catalogue fihyph
shortdesc Finnish hyphenation patterns.
relocated 1
@@ -8,15 +8,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=finnish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-fi.tex file_patterns=hyph-fi.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-fi.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-fi.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-fi.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fi.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fi.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fi.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fi.pat.txt
catalogue-ctan /language/hyphenation/fihyph
-catalogue-date 2016-07-20 08:22:15 +0200
catalogue-license pd
catalogue-topics hyphenation finnish
++++++ hyphen-french.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-fr.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-fr.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-fr.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-fr.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt 2011-06-11 02:32:38.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-''
-’’
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-àÀ
-âÂ
-çÇ
-èÈ
-éÉ
-êÊ
-îÎ
-ïÏ
-ôÔ
-ûÛ
-œŒ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-fr.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-fr.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-fr.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-fr.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-% title: Hyphenation patterns for French
-% copyright: Copyright (C) 1994-2002 Daniel Flipo, Bernard Gaulle, 2016 Arthur Reutenauer
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: French
-% tag: fr
-% version: V2.13 2016/05/12
-% authors:
-% -
-% name: Daniel Flipo
-% -
-% name: Bernard Gaulle
-% note: deceased
-% -
-% name: Arthur Reutenauer
-% contact: arthur (at) reutenauer.eu
-% -
-% email: cesure-l (at) gutenberg (dot} eu (dot) org
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% synonyms:
-% - patois
-% - francais
-% encoding: ec
-% babelname: french
-% legacy_patterns: frhyph.tex
-% message: French hyphenation patterns
-% description: Hyphenation patterns for French in T1/EC and UTF-8 encodings.
-% ==========================================
-%%%%%%%% The most famous good guys who worked hard to obtain something usable.
-% Jacques Desarmenien, Universite de Strasbourg :
-% - << how to run TeX in a French environment: hyphenation, fonts,
-% typography. >> in Tugboat, 5 (1984) 91-102. and TeX85 conference
-% - << La division par ordinateur des mots francais :
-% application a TeX >> in TSI vol. 5 No 4, 1986 (C) AFCET-
-% Gauthier-Villars
-% Norman Buckle, UQAH (nb; many additions)
-% Michael Ferguson, INRS-Telecommunications (mjf) June 1988
-% Justin Bur, Universite de Montreal (jbb; checked against original list)
-% all patterns including apostrophe missing from nb list
-% after that, GUTenberg and specially Daniel Flipo and Bernard Gaulle
-% did their best effort to improve the list of patterns.
-%
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-french.tlpobj new/tlpkg/tlpobj/hyphen-french.tlpobj
--- old/tlpkg/tlpobj/hyphen-french.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-french.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,18 +1,15 @@
name hyphen-french
category TLCore
-revision 50792
+revision 54568
shortdesc French hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for French in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=french synonyms=patois,francais lefthyphenmin=2 righthyphenmin=2 file=loadhyph-fr.tex file_patterns=hyph-fr.pat.txt file_exceptions=
-runfiles size=18
+runfiles size=16
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-fr.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-fr.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-fr.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-fr.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fr.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fr.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fr.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fr.pat.txt
++++++ hyphen-friulan.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-fur.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-fur.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-fur.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-fur.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-fur.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-fur.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-fur.chr.txt 2012-04-12 02:10:55.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-fur.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-''
-’’
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-çÇ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-fur.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-fur.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-fur.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-fur.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-% title: Hyphenation patterns for Friulan
-% copyright: Copyright (C) 2012 Claudio Beccari
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Friulan
-% tag: fur
-% version: 1.1 2012/04/10
-% authors:
-% -
-% name: Claudio Beccari
-% contact: claudio.beccari (at) gmail.com
-% licence:
-% - This file is available under any of the following licences, at your option:
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: http://www.latex-project.org/lppl.txt
-% status: maintained
-% maintainer: Claudio Beccari
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2012-01-14 - First release 1.0
-% - 2012-02-10 - Version 1.1. Fix inconsistencies.
-% texlive:
-% encoding: ec
-% babelname: friulan
-% message: Friulan hyphenation patterns
-% description: |-
-% Hyphenation patterns for Friulan in ASCII encoding.
-% They are supposed to comply with the common spelling of the
-% Friulan (Furlan) language as fixed by the Regional Law N.15/96
-% dated November 6, 1996 and its following amendments.
-%
-% ==========================================
-% These hyphenation patterns for the Friulan language are supposed to comply
-% with the common spelling of the Friulan (Furlan) language as fixed by the
-% Regional Law N.15/96 dated November 6, 1996 and its following amendments.
-% They were initially obtained by merging the consonantic endings to the Italian
-% patterns and adding the necessary patterns for the special Friulan digraphs
-% used in this language and for the \c{c} consonant. The common Latin roots
-% of both languages helped a lot in this adaptation.
-% Digraphs: cj, gj, gl, gn, sj, ss.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-friulan.tlpobj new/tlpkg/tlpobj/hyphen-friulan.tlpobj
--- old/tlpkg/tlpobj/hyphen-friulan.tlpobj 2019-04-06 23:33:06.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-friulan.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-friulan
category TLCore
-revision 50792
+revision 54568
shortdesc Friulan hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Friulan in ASCII encoding. They are
@@ -10,12 +10,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=friulan lefthyphenmin=2 righthyphenmin=2 file=loadhyph-fur.tex file_patterns=hyph-fur.pat.txt file_exceptions=
-runfiles size=8
+runfiles size=6
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-fur.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-fur.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-fur.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-fur.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fur.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fur.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fur.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-fur.pat.txt
++++++ hyphen-galician.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-gl.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-gl.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-gl.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-gl.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-gl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-gl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-gl.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-gl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-xX
-yY
-zZ
-áÁ
-éÉ
-íÍ
-ïÏ
-ñÑ
-óÓ
-úÚ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-gl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-gl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-gl.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-gl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-% title: Hyphenation patterns for Galician
-% copyright: Copyright (C) 2006, 2007, 2008, 2010 Javier A. Múgica
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Galician
-% tag: gl
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% version: 2.4 2010/04/23
-% authors:
-% -
-% name: Javier A. Múgica
-% contact: javier (at) digi21.eu
-% licence:
-% name: LPPL
-% version: 1.3
-% status: maintained
-% maintainer: Javier A. Múgica
-% url: https://latex-project.org/lppl/lppl-1-3.html
-% texlive:
-% encoding: ec
-% babelname: galician
-% legacy_patterns: glhyph.tex
-% message: Galician hyphenation patterns
-% description: Hyphenation patterns for Galician in T1/EC and UTF-8 encodings.
-% ==========================================
-% Generated with the mkpattern utility (v. 1.2), on 2010/04/23
-% The original source file were glpatter-utf8.tex
-% This is a generated file
-%
-% Note that there is no 'j' nor 'y' in Galician
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-galician.tlpobj new/tlpkg/tlpobj/hyphen-galician.tlpobj
--- old/tlpkg/tlpobj/hyphen-galician.tlpobj 2019-04-06 23:33:07.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-galician.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-galician
category TLCore
-revision 50792
+revision 54568
shortdesc Galician hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Galician in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=galician lefthyphenmin=2 righthyphenmin=2 file=loadhyph-gl.tex file_patterns=hyph-gl.pat.txt file_exceptions=
-runfiles size=21
+runfiles size=19
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-gl.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-gl.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-gl.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-gl.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-gl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-gl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-gl.pat.txt
++++++ hyphen-georgian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-ka.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-ka.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-ka.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-ka.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ka.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ka.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ka.chr.txt 2014-05-07 00:09:48.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ka.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-აა
-ბბ
-გგ
-დდ
-ეე
-ვვ
-ზზ
-თთ
-იი
-კკ
-ლლ
-მმ
-ნნ
-ოო
-პპ
-ჟჟ
-რრ
-სს
-ტტ
-უუ
-ფფ
-ქქ
-ღღ
-ყყ
-შშ
-ჩჩ
-ცც
-ძძ
-წწ
-ჭჭ
-ხხ
-ჯჯ
-ჰჰ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ka.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ka.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ka.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ka.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-% title: Hyphenation patterns for Georgian
-% copyright: Copyright (C) 2013 Levan Shoshiashvili
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% source: http://tex.tsu.ge
-% language:
-% name: Georgian
-% tag: ka
-% version: 0.3 (April 2013)
-% authors:
-% -
-% name: Levan Shoshiashvili
-% contact: shoshia (at) hotmail.com
-% licence:
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: http://www.latex-project.org/lppl.txt
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 2
-% changes:
-% - 2013-04-15, version 0.3 Patterns regenerated with lefthyphenmin=1
-% - 2013-03-01, version 0.2 Hyphenation patterns are regenerated from new wordlist
-% (bigger wordlist, 150K words total, some words are fixed)
-% - 2013-02-25, version 0.1 First release
-% texlive:
-% encoding: t8m
-% babelname: georgian
-% message: Georgian hyphenation patterns
-% description: Hyphenation patterns for Georgian in T8M, T8K and UTF-8 encodings.
-% ==========================================
-% Generated using patgen2.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-georgian.tlpobj new/tlpkg/tlpobj/hyphen-georgian.tlpobj
--- old/tlpkg/tlpobj/hyphen-georgian.tlpobj 2019-04-06 23:33:07.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-georgian.tlpobj 2020-03-26 23:29:33.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-georgian
category TLCore
-revision 50792
+revision 54568
shortdesc Georgian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Georgian in T8M, T8K and UTF-8
@@ -8,11 +8,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=georgian lefthyphenmin=1 righthyphenmin=2 file=loadhyph-ka.tex file_patterns=hyph-ka.pat.txt file_exceptions=
-runfiles size=26
+runfiles size=24
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ka.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-ka.t8m.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ka.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ka.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ka.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ka.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ka.pat.txt
++++++ hyphen-german.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1901.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1901.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1901.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1901.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1996.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1996.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1996.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1996.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-de-ch-1901.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-de-ch-1901.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-de-ch-1901.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-de-ch-1901.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.chr.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-ßSS
-àÀ
-áÁ
-âÂ
-äÄ
-çÇ
-èÈ
-éÉ
-êÊ
-ëË
-íÍ
-ïÏ
-ñÑ
-óÓ
-ôÔ
-öÖ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-% title: Hyphenation patterns for German, traditional orthography
-%
-% notice: TeX-Trennmuster für die traditionelle deutsche Rechtschreibung
-%
-% version: 2019-04-04
-%
-% authors:
-% -
-% name: Deutschsprachige Trennmustermannschaft
-% contact: trennmuster(a)dante.de
-%
-% copyright: >
-% Copyright (C) 2009-2018
-% Stephan Hennig, Werner Lemberg, Günter Milde,
-% Sander van Geloven, Georg Pfeiffer, Gisbert W. Selke,
-% Tobias Wendorf
-%
-% licence:
-% name: MIT
-% url: http://opensource.org/licenses/mit-license.php
-% text: >
-% 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:
-%
-% 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.
-%
-% source: http://repo.or.cz/w/wortliste.git?a=commit;h=33b65bf6af8a2009ecce1a43d6670f…
-%
-% language:
-% name: German, traditional spelling
-% tag: de-1901
-%
-% hyphenmins:
-% generation:
-% left: 2
-% right: 2
-% typesetting:
-% left: 2
-% right: 2
-%
-% texlive:
-% encoding: ec
-% use_old_patterns_comment: Kept for the sake of backward compatibility, but newer and better patterns by WL are available.
-% babelname: german
-% legacy_patterns: dehypht.tex
-% message: German hyphenation patterns (traditional orthography)
-% package: german
-%
-% ===========================================================================
-
-\message{German Hyphenation Patterns (Traditional Orthography) `dehypht-x' 2019-04-04 (WL)}
-
-%
-% The used patgen parameters are
-%
-% 1 1 | 1 5 | 1 1 1
-% 2 2 | 2 6 | 1 2 1
-% 3 3 | 3 7 | 1 1 1
-% 4 4 | 4 8 | 1 4 1
-% 5 5 | 5 9 | 1 1 1
-% 6 6 | 6 10 | 1 6 1
-% 7 7 | 7 11 | 1 4 1
-% 8 8 | 8 12 | 1 8 1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.chr.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-ßSS
-àÀ
-áÁ
-âÂ
-äÄ
-çÇ
-èÈ
-éÉ
-êÊ
-ëË
-íÍ
-ïÏ
-ñÑ
-óÓ
-ôÔ
-öÖ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-% title: Hyphenation patterns for German, reformed orthography (2006)
-%
-% notice: TeX-Trennmuster für die reformierte (2006) deutsche Rechtschreibung
-%
-% version: 2019-04-04
-%
-% authors:
-% -
-% name: Deutschsprachige Trennmustermannschaft
-% contact: trennmuster(a)dante.de
-%
-% copyright: >
-% Copyright (C) 2013-2018
-% Stephan Hennig, Werner Lemberg, Günter Milde,
-% Sander van Geloven, Georg Pfeiffer, Gisbert W. Selke,
-% Tobias Wendorf
-%
-% licence:
-% name: MIT
-% url: http://opensource.org/licenses/mit-license.php
-% text: >
-% 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:
-%
-% 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.
-%
-% source: http://repo.or.cz/w/wortliste.git?a=commit;h=33b65bf6af8a2009ecce1a43d6670f…
-%
-% language:
-% name: German, reformed spelling
-% tag: de-1996
-%
-% hyphenmins:
-% generation:
-% left: 2
-% right: 2
-% typesetting:
-% left: 2
-% right: 2
-%
-% texlive:
-% encoding: ec
-% babelname: ngerman
-% use_old_patterns_comment: Kept for the sake of backward compatibility, but newer and better patterns by WL are available.
-% legacy_patterns: dehyphn.tex
-% message: German hyphenation patterns (reformed orthography)
-% package: german
-%
-% ===========================================================================
-
-\message{German Hyphenation Patterns (Reformed Orthography, 2006) `dehyphn-x' 2019-04-04 (WL)}
-
-%
-% The used patgen parameters are
-%
-% 1 1 | 1 5 | 1 1 1
-% 2 2 | 2 6 | 1 2 1
-% 3 3 | 3 7 | 1 1 1
-% 4 4 | 4 8 | 1 4 1
-% 5 5 | 5 9 | 1 1 1
-% 6 6 | 6 10 | 1 6 1
-% 7 7 | 7 11 | 1 4 1
-% 8 8 | 8 12 | 1 8 1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.chr.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-ßSS
-àÀ
-áÁ
-âÂ
-äÄ
-çÇ
-èÈ
-éÉ
-êÊ
-ëË
-íÍ
-ïÏ
-ñÑ
-óÓ
-ôÔ
-öÖ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-% title: Hyphenation patterns for German, Switzerland (Hochdeutsch, traditional orthography)
-%
-% notice: TeX-Trennmuster für die traditionelle deutsch-schweizerische
-% Rechtschreibung
-%
-% version: 2019-04-04
-%
-% authors:
-% -
-% name: Deutschsprachige Trennmustermannschaft
-% contact: trennmuster(a)dante.de
-%
-% copyright: >
-% Copyright (C) 2009-2018
-% Stephan Hennig, Werner Lemberg, Günter Milde,
-% Sander van Geloven, Georg Pfeiffer, Gisbert W. Selke,
-% Tobias Wendorf
-%
-% licence:
-% name: MIT
-% url: http://opensource.org/licenses/mit-license.php
-% text: >
-% 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:
-%
-% 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.
-%
-% source: http://repo.or.cz/w/wortliste.git?a=commit;h=33b65bf6af8a2009ecce1a43d6670f…
-%
-% language:
-% name: German, traditional Swiss spelling
-% tag: de-CH-1901
-%
-% hyphenmins:
-% generation:
-% left: 2
-% right: 2
-% typesetting:
-% left: 2
-% right: 2
-%
-% texlive:
-% encoding: ec
-% babelname: swissgerman
-% message: Swiss-German hyphenation patterns (traditional orthography)
-% package: german
-%
-% ===========================================================================
-
-\message{Swiss-German Hyphenation Patterns (Traditional Orthography) `dehyphts-x' 2019-04-04 (WL)}
-
-%
-% The used patgen parameters are
-%
-% 1 1 | 1 5 | 1 1 1
-% 2 2 | 2 6 | 1 2 1
-% 3 3 | 3 7 | 1 1 1
-% 4 4 | 4 8 | 1 4 1
-% 5 5 | 5 9 | 1 1 1
-% 6 6 | 6 10 | 1 6 1
-% 7 7 | 7 11 | 1 4 1
-% 8 8 | 8 12 | 1 8 1
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-german.tlpobj new/tlpkg/tlpobj/hyphen-german.tlpobj
--- old/tlpkg/tlpobj/hyphen-german.tlpobj 2019-04-06 23:33:07.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-german.tlpobj 2020-04-16 01:57:00.000000000 +0200
@@ -1,7 +1,6 @@
name hyphen-german
category TLCore
-revision 50792
-catalogue dehyph
+revision 54758
shortdesc German hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for German in T1/EC and UTF-8 encodings,
@@ -14,13 +13,13 @@
longdesc suitable for Swiss Standard German (Hochdeutsch) not the
longdesc Alemannic dialects spoken in Switzerland (Schwyzerduetsch).
longdesc There are no known patterns for written Schwyzerduetsch.
-depend hyphen-base
-depend hyph-utf8
depend dehyph
+depend hyph-utf8
+depend hyphen-base
execute AddHyphen name=german lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1901.tex file_patterns=hyph-de-1901.pat.txt file_exceptions=
execute AddHyphen name=ngerman lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1996.tex file_patterns=hyph-de-1996.pat.txt file_exceptions=
execute AddHyphen name=swissgerman lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-ch-1901.tex file_patterns=hyph-de-ch-1901.pat.txt file_exceptions=
-runfiles size=412
+runfiles size=406
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1901.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-de-1996.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-de-ch-1901.tex
@@ -30,20 +29,6 @@
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-de-1901.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-de-1996.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-de-ch-1901.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1901.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-1996.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-de-ch-1901.pat.txt
-catalogue-alias ghyphen gnhyph
-catalogue-ctan /language/hyphenation/dehyph
-catalogue-date 2018-09-01 15:39:22 +0200
-catalogue-license lppl1
-catalogue-topics german hyphenation
++++++ hyphen-greek.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-greek.doc.tlpobj new/tlpkg/tlpobj/hyphen-greek.doc.tlpobj
--- old/tlpkg/tlpobj/hyphen-greek.doc.tlpobj 2019-04-06 23:33:07.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-greek.doc.tlpobj 2020-03-26 23:29:34.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-greek.doc
category TLCore
-revision 50792
+revision 54568
shortdesc doc files of hyphen-greek
relocated 1
docfiles size=463
++++++ hyphen-greek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-el-monoton.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-el-monoton.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-el-monoton.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-el-monoton.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-el-polyton.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-el-polyton.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-el-polyton.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-el-polyton.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt 2011-06-22 11:20:34.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-''
-ʼʼ
-ΐΪ́
-άΆ
-έΈ
-ήΉ
-ίΊ
-ΰΫ́
-αΑ
-βΒ
-γΓ
-δΔ
-εΕ
-ζΖ
-ηΗ
-θΘ
-ιΙ
-κΚ
-λΛ
-μΜ
-νΝ
-ξΞ
-οΟ
-πΠ
-ρΡ
-ςΣ
-σΣ
-τΤ
-υΥ
-φΦ
-χΧ
-ψΨ
-ωΩ
-ϊΪ
-ϋΫ
-όΌ
-ύΎ
-ώΏ
-ϲϹ
-άΆ
-έΈ
-ήΉ
-ίΊ
-όΌ
-ύΎ
-ώΏ
-᾽᾽
-᾿᾿
-’’
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-% title: Hyphenation patterns for Modern Greek, monotonic
-% copyright: Copyright (C) 2008-2011 Dimitrios Filippou
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Modern Greek, monotonic spelling
-% tag: el-monoton
-% version: 5.0
-% authors:
-% -
-% name: Dimitrios Filippou
-% contact: dimitrios.filippou (at) riotinto.com
-% licence:
-% name: LPPL
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 1
-% changes:
-% - Created: June 6, 2008
-% - Last modified: Sept. 12, 2011
-% texlive:
-% babelname: monogreek
-% use_old_patterns_comment: Old patterns work in a different way, one-to-one conversion from UTF-8 is not possible.
-% legacy_patterns: grmhyph5.tex
-% message: Hyphenation patterns for uni-accent (monotonic) Modern Greek
-% package: greek
-% ==========================================
-% This file was first created by mechanical translation from
-% GRMhyph5.tex via "elhyph-utf8 -m -c" (version 0.1 by Peter
-% Heslin -- p.j.heslin at durham dot ac dot uk). Some additions
-% were also made by hand.
-%
-% Created by Dimitrios Filippou with some ideas borrowed from
-% Yannis Haralambous, Kostis Dryllerakis and Claudio Beccari.
-% Mojca Miklavec adapted it for the "hyph-utf8" package.
-%
-% These hyphenation patterns are explained in "modern.pdf", which
-% can be found in the "elhyphen" or "hyphenation-greek" package.
-%
-% Documentation in English can be found in: D. Filippou,
-% "Hyphenation patterns for Ancient and Modern Greek," in
-% "TeX, XML, and Digital Typography" (A. Syropoulos et al.,
-% eds.), Lecture Notes in Computer Science 3130, Springer-Verlag
-% Berlin-Heidelberg, 2004. ISBN 3-540-22801-2.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt 2011-06-22 11:20:34.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,157 +0,0 @@
-''
-ʼʼ
-ΐΪ́
-άΆ
-έΈ
-ήΉ
-ίΊ
-ΰΫ́
-αΑ
-βΒ
-γΓ
-δΔ
-εΕ
-ζΖ
-ηΗ
-θΘ
-ιΙ
-κΚ
-λΛ
-μΜ
-νΝ
-ξΞ
-οΟ
-πΠ
-ρΡ
-ςΣ
-σΣ
-τΤ
-υΥ
-φΦ
-χΧ
-ψΨ
-ωΩ
-ϊΪ
-ϋΫ
-όΌ
-ύΎ
-ώΏ
-ϲϹ
-ἀἈ
-ἁἉ
-ἂἊ
-ἃἋ
-ἄἌ
-ἅἍ
-ἆἎ
-ἇἏ
-ἐἘ
-ἑἙ
-ἒἚ
-ἓἛ
-ἔἜ
-ἕἝ
-ἠἨ
-ἡἩ
-ἢἪ
-ἣἫ
-ἤἬ
-ἥἭ
-ἦἮ
-ἧἯ
-ἰἸ
-ἱἹ
-ἲἺ
-ἳἻ
-ἴἼ
-ἵἽ
-ἶἾ
-ἷἿ
-ὀὈ
-ὁὉ
-ὂὊ
-ὃὋ
-ὄὌ
-ὅὍ
-ὐΥ̓
-ὑὙ
-ὒΥ̓̀
-ὓὛ
-ὔΥ̓́
-ὕὝ
-ὖΥ̓͂
-ὗὟ
-ὠὨ
-ὡὩ
-ὢὪ
-ὣὫ
-ὤὬ
-ὥὭ
-ὦὮ
-ὧὯ
-ὰᾺ
-άΆ
-ὲῈ
-έΈ
-ὴῊ
-ήΉ
-ὶῚ
-ίΊ
-ὸῸ
-όΌ
-ὺῪ
-ύΎ
-ὼῺ
-ώΏ
-ᾀἈΙ
-ᾁἉΙ
-ᾂἊΙ
-ᾃἋΙ
-ᾄἌΙ
-ᾅἍΙ
-ᾆἎΙ
-ᾇἏΙ
-ᾐἨΙ
-ᾑἩΙ
-ᾒἪΙ
-ᾓἫΙ
-ᾔἬΙ
-ᾕἭΙ
-ᾖἮΙ
-ᾗἯΙ
-ᾠὨΙ
-ᾡὩΙ
-ᾢὪΙ
-ᾣὫΙ
-ᾤὬΙ
-ᾥὭΙ
-ᾦὮΙ
-ᾧὯΙ
-ᾲᾺΙ
-ᾳΑΙ
-ᾴΆΙ
-ᾶΑ͂
-ᾷΑ͂Ι
-᾽᾽
-᾿᾿
-ῂῊΙ
-ῃΗΙ
-ῄΉΙ
-ῆΗ͂
-ῇΗ͂Ι
-ῒΪ̀
-ΐΪ́
-ῖΙ͂
-ῗΪ͂
-ῢΫ̀
-ΰΫ́
-ῤΡ̓
-ῥῬ
-ῦΥ͂
-ῧΫ͂
-ῲῺΙ
-ῳΩΙ
-ῴΏΙ
-ῶΩ͂
-ῷΩ͂Ι
-’’
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-% title: Hyphenation patterns for Modern Greek, polytonic
-% copyright: Copyright (C) 2008-2011 Dimitrios Filippou
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Modern Greek, polytonic spelling
-% tag: el-polyton
-% version: 5.0
-% authors:
-% -
-% name: Dimitrios Filippou
-% contact: dimitrios.filippou (at) riotinto.com
-% licence:
-% name: LPPL
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 1
-% right: 1
-% changes:
-% - Created: June 6, 2008
-% - Last modified: Sept. 12, 2011
-% texlive:
-% synonyms:
-% - polygreek
-% babelname: greek
-% use_old_patterns_comment: Old patterns work in a different way, one-to-one conversion from UTF-8 is not possible.
-% legacy_patterns: grphyph5.tex
-% message: Hyphenation patterns for multi-accent (polytonic) Modern Greek
-% package: greek
-% ==========================================
-% This file was first created by mechanical translation from
-% GRPhyph5.tex via "elhyph-utf8 -p -c" (version 0.1 by Peter
-% Heslin -- p.j.heslin at durham dot ac dot uk). Some additions
-% were also made by hand.
-%
-% Created by Dimitrios Filippou with some ideas borrowed from
-% Yannis Haralambous, Kostis Dryllerakis and Claudio Beccari.
-% Mojca Miklavec adapted it for the "hyph-utf8" package.
-%
-% These hyphenation patterns are explained in "modern.pdf", which
-% can be found in the "elhyphen" or "hyphenation-greek" package.
-% Questionable patterns are marked by three question marks "???".
-%
-% Documentation in English can be found in: D. Filippou,
-% "Hyphenation patterns for Ancient and Modern Greek," in
-% "TeX, XML, and Digital Typography" (A. Syropoulos et al.,
-% eds.), Lecture Notes in Computer Science 3130, Springer-Verlag
-% Berlin-Heidelberg, 2004. ISBN 3-540-22801-2.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-greek.tlpobj new/tlpkg/tlpobj/hyphen-greek.tlpobj
--- old/tlpkg/tlpobj/hyphen-greek.tlpobj 2019-04-06 23:33:08.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-greek.tlpobj 2020-03-26 23:29:37.000000000 +0100
@@ -1,34 +1,27 @@
name hyphen-greek
category TLCore
-revision 50792
+revision 54568
catalogue elhyphen
shortdesc Modern Greek hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Modern Greek in monotonic and
-longdesc polytonic spelling in LGR and UTF-8 encodings. Patterns in
+longdesc polytonic spelling in LGR and UTF-8 encodings. Patterns in
longdesc UTF-8 use two code positions for each of the vowels with acute
longdesc accent (a.k.a tonos, oxia), e.g., U+03AC, U+1F71 for alpha.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=monogreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-monoton.tex file_patterns=hyph-el-monoton.pat.txt file_exceptions=
execute AddHyphen name=greek synonyms=polygreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-polyton.tex file_patterns=hyph-el-polyton.pat.txt file_exceptions=
-runfiles size=24
+runfiles size=20
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-el-monoton.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-el-polyton.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-el-monoton.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-el-polyton.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-monoton.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-el-polyton.pat.txt
RELOC/tex/generic/hyphen/grmhyph5.tex
RELOC/tex/generic/hyphen/grphyph5.tex
catalogue-ctan /language/hyphenation/elhyphen
-catalogue-date 2016-07-20 08:10:44 +0200
catalogue-license other-free
catalogue-topics greek hyphenation
catalogue-version 5
++++++ hyphen-hungarian.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-hungarian.doc.tlpobj new/tlpkg/tlpobj/hyphen-hungarian.doc.tlpobj
--- old/tlpkg/tlpobj/hyphen-hungarian.doc.tlpobj 2019-04-06 23:33:08.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-hungarian.doc.tlpobj 2020-03-26 23:29:37.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-hungarian.doc
category TLCore
-revision 50792
+revision 54568
shortdesc doc files of hyphen-hungarian
relocated 1
docfiles size=76
++++++ hyphen-hungarian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-hu.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-hu.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-hu.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-hu.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hu.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hu.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hu.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hu.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-áÁ
-äÄ
-éÉ
-íÍ
-óÓ
-öÖ
-úÚ
-üÜ
-őŐ
-űŰ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hu.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hu.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hu.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hu.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-% title: Hyphenation patterns for Hungarian
-% copyright: Copyright (C) 2003 Bence Nagy
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Hungarian
-% tag: hu
-% version: 2011-08-15
-% authors:
-% -
-% name: Bence Nagy
-% contact: bence.nagy (at) gmail.com
-% licence:
-% - This file is available under any of these licences, at your option:
-% -
-% name: MPL
-% version: 1.1
-% initial_developer: Bence Nagy
-% contributors:
-% - Bence Nagy
-% url: https://www.mozilla.org/en-US/MPL/1.1/
-% -
-% name: GPL
-% version: 2.0
-% url: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-% -
-% name: LGPL
-% version: 2.1
-% url: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: ec
-% babelname: hungarian
-% legacy_patterns: huhyphn.tex
-% message: Hungarian hyphenation patterns
-% description: Hyphenation patterns for Hungarian in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-hungarian.tlpobj new/tlpkg/tlpobj/hyphen-hungarian.tlpobj
--- old/tlpkg/tlpobj/hyphen-hungarian.tlpobj 2019-04-06 23:33:08.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-hungarian.tlpobj 2020-03-26 23:29:38.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-hungarian
category TLCore
-revision 50792
+revision 54568
catalogue hungarian
shortdesc Hungarian hyphenation patterns.
relocated 1
@@ -9,15 +9,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=hungarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hu.tex file_patterns=hyph-hu.pat.txt file_exceptions=
-runfiles size=417
+runfiles size=415
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-hu.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-hu.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-hu.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hu.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hu.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hu.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hu.pat.txt
catalogue-ctan /language/hungarian/hyphenation
-catalogue-date 2016-11-05 05:59:04 +0100
catalogue-license gpl
catalogue-topics hyphenation hungarian
++++++ hyphen-icelandic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-is.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-is.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-is.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-is.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-is.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-is.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-is.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-is.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-áÁ
-æÆ
-éÉ
-íÍ
-ðÐ
-óÓ
-öÖ
-úÚ
-ýÝ
-þÞ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-is.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-is.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-is.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-is.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-% title: Hyphenation patterns for Icelandic
-% copyright: Copyright (C) 1988, 2004 Jörgen Pind
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Icelandic
-% tag: is
-% authors:
-% -
-% name: Jörgen Pind
-% affiliation: Institute of Lexicography, Univ. of Iceland
-% contact: jorgen (at) lexis.hi.is
-% licence:
-% name: LPPL
-% version: 1.2
-% or_later: true
-% url: http://www.latex-project.org/lppl.txt
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - Nov 2 1988: Latest pattern change
-% - Mar 2 2004: Uploaded a new version to CTAN, with a clarified license
-% statement, at the request of the author, Jörgen Pind.
-% Kristinn Gylfason (kristgy(a)ieee.org)
-% texlive:
-% encoding: ec
-% babelname: icelandic
-% legacy_patterns: icehyph.tex
-% message: Icelandic hyphenation patterns
-% description: Hyphenation patterns for Icelandic in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-icelandic.tlpobj new/tlpkg/tlpobj/hyphen-icelandic.tlpobj
--- old/tlpkg/tlpobj/hyphen-icelandic.tlpobj 2019-04-06 23:33:08.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-icelandic.tlpobj 2020-03-26 23:29:38.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-icelandic
category TLCore
-revision 50792
+revision 54568
catalogue icehyph
shortdesc Icelandic hyphenation patterns.
relocated 1
@@ -9,15 +9,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=icelandic lefthyphenmin=2 righthyphenmin=2 file=loadhyph-is.tex file_patterns=hyph-is.pat.txt file_exceptions=
-runfiles size=25
+runfiles size=23
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-is.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-is.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-is.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-is.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-is.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-is.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-is.pat.txt
catalogue-ctan /language/hyphenation/icehyph.tex
-catalogue-date 2016-11-05 05:59:04 +0100
catalogue-license lppl
catalogue-topics hyphenation icelandic
++++++ hyphen-indic.tar.xz ++++++
++++ 1778 lines of diff (skipped)
++++++ hyphen-indonesian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-id.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-id.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-id.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-id.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-id.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-id.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-id.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-id.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-id.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-id.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-id.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-id.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-% title: Hyphenation patterns for Bahasa Indonesia
-% copyright: Copyright (C) 1996, 1997 Jörg Knappen, Terry Mart
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Bahasa Indonesia, Indonesian
-% tag: id
-% version: 1.3 19-SEP-1997
-% authors:
-% -
-% name: Jörg Knappen
-% contact: knappen (at) vkpmzd.kph.uni-mainz.de
-% -
-% name: Terry Mart
-% contact: mart (at) kph.uni-mainz.de
-% licence:
-% name: GPL
-% version: 2
-% url: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: ascii
-% babelname: indonesian
-% legacy_patterns: inhyph.tex
-% message: Indonesian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Indonesian (Bahasa Indonesia) in ASCII
-% encoding. They are probably also usable for Malay (Bahasa Melayu).
-% ==========================================
-% The patterns are probably also usable for Bahasa Melayu
-%
-% For bug reports, improvements, and suggestions, contact
-%
-% Jörg Knappen
-% jk Unternehmensberatung
-% Barbarossaring 43
-% 55118 Mainz
-%
-% knappen (at) vkpmzd.kph.uni-mainz.de
-%
-% or:
-% Terry Mart
-%
-% Institut fuer Kernphysik
-% Universitaet Mainz
-% 55099 Mainz
-% Germany
-%
-% phone : +49 6131 395174
-% fax : +49 6131 395474
-% email : mart (at) kph.uni-mainz.de
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-indonesian.tlpobj new/tlpkg/tlpobj/hyphen-indonesian.tlpobj
--- old/tlpkg/tlpobj/hyphen-indonesian.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-indonesian.tlpobj 2020-03-26 23:29:38.000000000 +0100
@@ -1,18 +1,16 @@
name hyphen-indonesian
category TLCore
-revision 50792
+revision 54568
shortdesc Indonesian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Indonesian (Bahasa Indonesia) in ASCII
-longdesc encoding. They are probably also usable for Malay (Bahasa
+longdesc encoding. They are probably also usable for Malay (Bahasa
longdesc Melayu).
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=indonesian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-id.tex file_patterns=hyph-id.pat.txt file_exceptions=hyph-id.hyp.txt
-runfiles size=6
+runfiles size=4
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-id.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-id.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-id.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-id.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-id.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-id.pat.txt
++++++ hyphen-interlingua.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-ia.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-ia.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-ia.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-ia.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ia.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ia.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ia.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ia.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ia.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ia.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ia.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ia.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-% title: Hyphenation patterns for Interlingua
-% copyright: Copyright (C) 1989-2005 Peter Kleiweg
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Interlingua
-% tag: ia
-% version: 0.2c 2005-06-28
-% authors:
-% -
-% name: Peter Kleiweg
-% contact: p.c.j.kleiweg (at) rug.nl
-% licence:
-% name: LPPL
-% version: 1.3
-% status: maintained
-% maintainer: Peter Kleiweg
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - Version 0.2b. Released 3 July 2001.
-% - Version 0.2c. Released 28 June 2005 (added LPPL header)
-% texlive:
-% encoding: ascii
-% babelname: interlingua
-% legacy_patterns: iahyphen.tex
-% message: Hyphenation patterns for Interlingua
-% description: Hyphenation patterns for Interlingua in ASCII encoding.
-% ==========================================
-% About Interlingua: http://www.interlingua.com/
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-interlingua.tlpobj new/tlpkg/tlpobj/hyphen-interlingua.tlpobj
--- old/tlpkg/tlpobj/hyphen-interlingua.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-interlingua.tlpobj 2020-03-26 23:29:38.000000000 +0100
@@ -1,16 +1,14 @@
name hyphen-interlingua
category TLCore
-revision 50792
+revision 54568
shortdesc Interlingua hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Interlingua in ASCII encoding.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=interlingua lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ia.tex file_patterns=hyph-ia.pat.txt file_exceptions=hyph-ia.hyp.txt
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ia.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ia.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ia.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ia.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ia.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ia.pat.txt
++++++ hyphen-irish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-ga.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-ga.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-ga.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-ga.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ga.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ga.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ga.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ga.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-áÁ
-éÉ
-íÍ
-óÓ
-úÚ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ga.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ga.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ga.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ga.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-% title: Hyphenation patterns for Irish
-% copyright: Copyright (C) 2004-2015 Kevin P. Scannell
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information on the package,
-% and http://borel.slu.edu/fleiscin/index.html for details on Irish hyphenation.
-% language:
-% name: Irish
-% tag: ga
-% version: 1.0 (2004-01-23:15:46:12 CST)
-% authors:
-% -
-% name: Kevin P. Scannell
-% contact: scanell (at) slu.edu
-% licence:
-% - This file available under any of these licences:
-% -
-% name: GPL
-% version: 2
-% or_later: true
-% url: http://www.gnu.org/licenses/gpl-2.0.html
-% text: >
-% 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.
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% texlive:
-% encoding: ec
-% babelname: irish
-% legacy_patterns: gahyph.tex
-% message: Irish hyphenation patterns
-% description: Hyphenation patterns for Irish (Gaeilge) in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-irish.tlpobj new/tlpkg/tlpobj/hyphen-irish.tlpobj
--- old/tlpkg/tlpobj/hyphen-irish.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-irish.tlpobj 2020-03-26 23:29:38.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-irish
category TLCore
-revision 50792
+revision 54568
shortdesc Irish hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Irish (Gaeilge) in T1/EC and UTF-8
@@ -8,11 +8,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=irish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-ga.tex file_patterns=hyph-ga.pat.txt file_exceptions=hyph-ga.hyp.txt
-runfiles size=40
+runfiles size=38
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ga.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-ga.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ga.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ga.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ga.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ga.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ga.pat.txt
++++++ hyphen-italian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-it.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-it.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-it.chr.txt 2011-06-11 02:32:38.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-it.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-''
-’’
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-it.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-it.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-it.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-it.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,73 +0,0 @@
-% title: Hyphenation patterns for Italian
-% copyright: Copyright (C) 2008-2011 Claudio Beccari
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Italian
-% tag: it
-% version: 4.9 2014/04/22
-% authors:
-% -
-% name: Claudio Beccari
-% contact: claudio.beccari (at) gmail.com
-% licence:
-% - This file is available under any of the following licences:
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: http://www.latex-project.org/lppl.txt
-% status: maintained
-% maintainer: Claudio Beccari, e-mail claudio dot beccari at gmail dot com
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2014-04-22 - Add few patterns involving `h'
-% - 2011-08-16 - Change the licence from GNU LGPL into LPPL v1.3.
-% - 2010-05-24 - Fix for Italian patterns for proper hyphenation of -ich and Ljubljana.
-% - 2008-06-09 - Import of original ithyph.tex into hyph-utf8 package.
-% - 2008-03-08 - (last change in ithyph.tex)
-% texlive:
-% encoding: ascii
-% babelname: italian
-% legacy_patterns: ithyph.tex
-% message: Italian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Italian in ASCII encoding.
-% Compliant with the Recommendation UNI 6461 on hyphenation
-% issued by the Italian Standards Institution
-% (Ente Nazionale di Unificazione UNI).
-% ==========================================
-%
-% These hyphenation patterns for the Italian language are supposed to comply
-% with the Recommendation UNI 6461 on hyphenation issued by the Italian
-% Standards Institution (Ente Nazionale di Unificazione UNI). No guarantee
-% or declaration of fitness to any particular purpose is given and any
-% liability is disclaimed.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-italian.tlpobj new/tlpkg/tlpobj/hyphen-italian.tlpobj
--- old/tlpkg/tlpobj/hyphen-italian.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-italian.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-italian
category TLCore
-revision 50792
+revision 54568
catalogue ithyph
shortdesc Italian hyphenation patterns.
relocated 1
@@ -11,16 +11,12 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=italian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-it.tex file_patterns=hyph-it.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-it.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-it.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-it.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-it.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-it.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-it.pat.txt
catalogue-ctan /language/hyphenation/ithyph.tex
-catalogue-date 2018-10-09 09:22:45 +0200
catalogue-license lgpl
catalogue-topics hyphenation italian
catalogue-version 4.8g
++++++ hyphen-kurmanji.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-kmr.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-kmr.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-kmr.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-kmr.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-çÇ
-êÊ
-îÎ
-ûÛ
-şŞ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-% title: Hyphenation patterns for Kurmanji (Northern Kurdish)
-% – as spoken in Turkey and by the Kurdish diaspora in Europe
-% copyright: Copyright (C) 2009 Jörg Knappen, Medeni Shemdê
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% version: 1.0
-% language:
-% name: Kurmanji, Northern Kurdish
-% tag: kmr
-% authors:
-% -
-% name: Jörg Knappen
-% contact: jknappen (at) web.de
-% -
-% name: Medeni Shemdê
-% licence:
-% name: LPPL
-% version: 1.3
-% status: maintained
-% maintainer: Jörg Knappen
-% url: https://latex-project.org/lppl/lppl-1-3.html
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2009-06-29 last_modified
-% texlive:
-% encoding: ec
-% babelname: kurmanji
-% legacy_patterns: kmrhyph.tex
-% message: Kurmanji hyphenation patterns
-% description: |-
-% Hyphenation patterns for Kurmanji (Northern Kurdish) as spoken in
-% Turkey and by the Kurdish diaspora in Europe, in T1/EC and UTF-8
-% encodings.
-% ==========================================
-% The patterns are generated by patgen from a word list of approx. 2500
-% hyphenated words provided by Medeni Shemdê
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-kurmanji.tlpobj new/tlpkg/tlpobj/hyphen-kurmanji.tlpobj
--- old/tlpkg/tlpobj/hyphen-kurmanji.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-kurmanji.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-kurmanji
category TLCore
-revision 50792
+revision 54568
shortdesc Kurmanji hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Kurmanji (Northern Kurdish) as spoken
@@ -9,11 +9,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=kurmanji lefthyphenmin=2 righthyphenmin=2 file=loadhyph-kmr.tex file_patterns=hyph-kmr.pat.txt file_exceptions=
-runfiles size=6
+runfiles size=4
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-kmr.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-kmr.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-kmr.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-kmr.pat.txt
++++++ hyphen-latin.tar.xz ++++++
++++ 70912 lines of diff (skipped)
++++++ hyphen-latvian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-lv.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-lv.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-lv.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-lv.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-lv.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-lv.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-lv.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-lv.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-zZ
-āĀ
-čČ
-ēĒ
-ģĢ
-īĪ
-ķĶ
-ļĻ
-ņŅ
-šŠ
-ūŪ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-lv.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-lv.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-lv.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-lv.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-% title: Hyphenation patterns for Latvian
-% copyright: Copyright (C) 2004-2005 Janis Vilims
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% source: >
-% Latvian Lingucomponents for OpenOffice,
-% http://sourceforge.net/projects/openoffice-lv
-% language:
-% name: Latvian
-% tag: lv
-% version: 0.3, 2005-09-14
-% authors:
-% -
-% name: Janis Vilims
-% contact: jvilims (at) apollo.lv
-% licence:
-% - This file is available under any of the following licences, at your option:
-% -
-% name: LGPL
-% version: 2.1
-% url: http://www.gnu.org/copyleft/lesser.txt
-% -
-% name: GPL
-% version: 2
-% or_later: true
-% url: http://www.gnu.org/licenses/gpl.html
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: l7x
-% babelname: latvian
-% message: Latvian hyphenation patterns
-% description: Hyphenation patterns for Latvian in L7X and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-latvian.tlpobj new/tlpkg/tlpobj/hyphen-latvian.tlpobj
--- old/tlpkg/tlpobj/hyphen-latvian.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-latvian.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-latvian
category TLCore
-revision 50792
+revision 54568
shortdesc Latvian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Latvian in L7X and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=latvian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-lv.tex file_patterns=hyph-lv.pat.txt file_exceptions=
-runfiles size=70
+runfiles size=68
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-lv.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-lv.l7x.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-lv.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lv.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lv.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lv.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lv.pat.txt
++++++ hyphen-lithuanian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-lt.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-lt.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-lt.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-lt.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-lt.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-lt.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-lt.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-lt.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-wW
-yY
-zZ
-ąĄ
-čČ
-ėĖ
-ęĘ
-įĮ
-šŠ
-ūŪ
-ųŲ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-lt.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-lt.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-lt.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-lt.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,70 +0,0 @@
-% title: Hyphenation patterns for Lithuanian
-% copyright: Copyright (C) 1992 Sigitas Tolušis, Yannis Haralambous
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% source: http://www.vtex.lt/tex/littex/index.html
-% language:
-% name: Lithuanian
-% tag: lt
-% authors:
-% -
-% name: Vytas Statulevičius
-% contact: vytas (at) vtex.lt
-% -
-% name: Sigitas Tolušis
-% contact: sigitas (at) vtex.lt
-% -
-% name: Yannis Haralambous
-% contact: yannis.haralambous (at) telecom-bretagne.eu
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% changes:
-% - First version in LT encoding (modified T1): Vytas Statulevičius <vytas at vtex.lt>
-% and Yannis Haralambous (Vilnius, March 4, 1992)
-% - Conversion into Latin 7 and aditional support files (babel, fonts):
-% Sigitas Tolušis <sigitas at vtex.lt> (2002-11-20)
-% - Adaptation for hyph-utf8: Mojca & Arthur (see below), October 2008
-% hyphenmins:
-% generation:
-% left: 2
-% right: 2
-% texlive:
-% encoding: l7x
-% babelname: lithuanian
-% message: Lithuanian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Lithuanian in L7X and UTF-8 encodings.
-% \lefthyphenmin and \righthyphenmin have to be at least 2.
-%
-% ==========================================
-% A note about lefthyphenmin/righthyphenmin (by Sigitas, February 2009):
-%
-% At the moment the lefthyphenmin & righthyphenmin are both set to 2.
-% The Lithuanian patterns were build earlier then the latest grammatical rules
-% took place in 1997. At that time it was forbidden to leave one character at boundary.
-% One may change it to one now, but from typographical point of view there is no need to do
-% any changes. Even more, changing lefthyphen and righthyphen to 1 requires
-% to review and maybe rebuild the patterns file.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-lithuanian.tlpobj new/tlpkg/tlpobj/hyphen-lithuanian.tlpobj
--- old/tlpkg/tlpobj/hyphen-lithuanian.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-lithuanian.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-lithuanian
category TLCore
-revision 50792
+revision 54568
shortdesc Lithuanian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Lithuanian in L7X and UTF-8 encodings.
@@ -8,11 +8,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=lithuanian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-lt.tex file_patterns=hyph-lt.pat.txt file_exceptions=
-runfiles size=12
+runfiles size=10
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-lt.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-lt.l7x.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-lt.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lt.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lt.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lt.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-lt.pat.txt
++++++ hyphen-mongolian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl-x-lmc.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl-x-lmc.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl-x-lmc.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl-x-lmc.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-йЙ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-щЩ
-ъЪ
-ыЫ
-ьЬ
-эЭ
-юЮ
-яЯ
-ёЁ
-үҮ
-өӨ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-% title: Hyphenation patterns for Mongolian, Cyrillic script
-% copyright: Copyright (C) 2007-2015 by Dorjgotov Batmunkh
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Mongolian, Cyrillic script
-% tag: mn-cyrl
-% version: v1.2 2008/03/23
-% authors:
-% -
-% name: Dorjgotov Batmunkh
-% affiliation: National University of Mongolia
-% contact: bataak (at) gmail.com
-% licence:
-% - This file is available under any of the following licenses:
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: http://www.latex-project.org/lppl/lppl-1-3.txt
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2008/03/23 v1.2
-% - 2008/06/08 Patterns added to hyph-utf8
-% - 2015/12/05 Patterns released under the MIT license
-% texlive:
-% encoding: t2a
-% babelname: mongolian
-% legacy_patterns: mnhyphn.tex
-% message: (New) Mongolian hyphenation patterns
-% package: mongolian
-% ==========================================
-% Special thanks to: Jim Hefferon and Robin Fairbairns
-%
-% There are few basic rules in mongolian
-%
-% 1. If there is a consonant then it can use hyphen before it.
-% And if there're two consonants then it can use hyphen before second consonant.
-% Are there three consonants then it can put hyphen before third consonant,
-% also are there four consonants then it can use hyphen before fourth consonant.
-% 2. In the case of hardsign or softsign, it's possible to hyphen after these signs.
-% For instance, байгуулъ-я, үзүүль-е
-% 3. However one vowel can be belong to a syllable, it's not possible to use hyphen.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-mongolian.tlpobj new/tlpkg/tlpobj/hyphen-mongolian.tlpobj
--- old/tlpkg/tlpobj/hyphen-mongolian.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-mongolian.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-mongolian
category TLCore
-revision 50792
+revision 54568
shortdesc Mongolian hyphenation patterns in Cyrillic script.
relocated 1
longdesc Hyphenation patterns for Mongolian in T2A, LMC and UTF-8
@@ -10,14 +10,11 @@
depend hyph-utf8
execute AddHyphen name=mongolian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl.tex file_patterns=hyph-mn-cyrl.pat.txt file_exceptions=
execute AddHyphen name=mongolianlmc lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl-x-lmc.tex luaspecial="disabled:only for 8bit montex with lmc encoding"
-runfiles size=22
+runfiles size=20
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl-x-lmc.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-mn-cyrl.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-mn-cyrl-x-lmc.lmc.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-mn-cyrl.t2a.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl-x-lmc.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-mn-cyrl.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-mn-cyrl.pat.txt
++++++ hyphen-norwegian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-nb.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-nb.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-nb.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-nb.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-nn.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-nn.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-nn.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-nn.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-nb.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-nb.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-nb.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-nb.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-åÅ
-æÆ
-èÈ
-éÉ
-êÊ
-òÒ
-óÓ
-ôÔ
-øØ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-nb.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-nb.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-nb.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-nb.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-% title: Hyphenation patterns for Norwegian, bokmål
-% copyright: Copyright (C) 2004–2005 Rune Kleveland, Ole Michael Selberg, 2007 Karl Ove Hufthammer
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Norwegian Bokmål, bokmål, norsk bokmål
-% tag: nb
-% authors:
-% - name: Rune Kleveland
-% - name: Ole Michael Selberg
-% - name: Karl Ove HuftHammer
-% version: 2007-02-10
-% licence:
-% text: >
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% synonyms:
-% - norwegian
-% - norsk
-% encoding: ec
-% babelname: bokmal
-% message: Norwegian Bokmal hyphenation patterns
-% package: norwegian
-% ==========================================
-% This file contains hyphenation patterns for Norwegian Bokmål.
-% It uses the Norwegian hyphenation patterns from hyph-no.tex,
-% created by Rune Kleveland and Ole Michael Selberg. Please see
-% that file for copyright information on those patterns.
-%
-% The patterns in hyph-no.tex are based on both Norwegian Bokmål
-% and Norwegian Nynorsk, and works about equally well for both
-% languages. This file, hyph-nb.tex, contains only a few hyphenation
-% exceptions, for words that needs to be hyphenated differently for
-% the two languages.
-%
-% Please send bugs or suggestions to karl(a)huftis.org.
-%
-
-\input hyph-no.tex
-
-\hyphenation{
-at-ten-de
-be-tre
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-nn.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-nn.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-nn.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-nn.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-åÅ
-æÆ
-èÈ
-éÉ
-êÊ
-òÒ
-óÓ
-ôÔ
-øØ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-nn.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-nn.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-nn.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-nn.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-% title: Hyphenation patterns for Norwegian, nynorsk
-% copyright: Copyright (C) 2007 Karl Ove Hufthammer
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Norwegian Nynorsk, nynorsk
-% tag: nn
-% authors:
-% - name: Karl Ove Hufthammer
-% - name: Rune Kleveland
-% - name: Ole Michael Selberg
-% version: 2007-02-10
-% licence:
-% text: >
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: ec
-% babelname: nynorsk
-% message: Norwegian Nynorsk hyphenation patterns
-% package: norwegian
-% ==========================================
-% This file contains hyphenation patterns for Norwegian Nynorsk.
-% It uses the Norwegian hyphenation patterns from hyph-no.tex,
-% created by Rune Kleveland and Ole Michael Selberg. Please see
-% that file for copyright information on those patterns.
-%
-% The patterns in hyph-no.tex are based on both Norwegian Bokmål
-% and Norwegian Nynorsk, and works about equally well for both
-% languages. This file, hyph-nn.tex, contains only a few hyphenation
-% exceptions, for words that needs to be hyphenated differently for
-% the two languages.
-%
-% Please send bugs or suggestions to karl(a)huftis.org.
-%
-
-\input hyph-no.tex
-
-\hyphenation{
-att-en-de
-bet-re
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-norwegian.tlpobj new/tlpkg/tlpobj/hyphen-norwegian.tlpobj
--- old/tlpkg/tlpobj/hyphen-norwegian.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-norwegian.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-norwegian
category TLCore
-revision 50792
+revision 54568
shortdesc Norwegian Bokmal and Nynorsk hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Norwegian Bokmal and Nynorsk in T1/EC
@@ -9,7 +9,7 @@
depend hyph-utf8
execute AddHyphen name=bokmal synonyms=norwegian,norsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nb.tex file_patterns=hyph-nb.pat.txt file_exceptions=hyph-nb.hyp.txt
execute AddHyphen name=nynorsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nn.tex file_patterns=hyph-nn.pat.txt file_exceptions=hyph-nn.hyp.txt
-runfiles size=252
+runfiles size=248
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-nb.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-nn.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-nb.ec.tex
@@ -17,11 +17,7 @@
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-nb.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-nn.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-no.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nb.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nb.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nb.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nb.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nn.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nn.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nn.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-nn.pat.txt
++++++ hyphen-occitan.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-oc.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-oc.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-oc.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-oc.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-oc.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-oc.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-oc.chr.txt 2016-02-17 22:45:32.000000000 +0100
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-oc.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-''
-’’
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-zZ
-çÇ
-ïÏ
-üÜ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-oc.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-oc.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-oc.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-oc.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-% title: Hyphenation patterns for Occitan
-% copyright: Copyright (C) 2016 Claudio Beccari
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Occitan
-% tag: oc
-% version: 0.1 2016/02/04
-% authors:
-% -
-% name: Claudio Beccari
-% contact: claudio.beccari (at) gmail.com
-% licence:
-% - This file is available under any of the following licences:
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% -
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: ec
-% babelname: occitan
-% message: Occitan hyphenation patterns
-% description: |-
-% Hyphenation patterns for Occitan in T1/EC and UTF-8 encodings.
-% They are supposed to be valid for all the Occitan variants
-% spoken and written in the wide area called 'Occitanie' by the French.
-% It ranges from the Val d'Aran within Catalunya, to the South Western
-% Italian Alps encompassing the southern half of the French pentagon.
-% ==========================================
-% Patterns for the Occitan language; they are supposed to be valid
-% for all the Occitan variants spoken and written in the wide area
-% called “Occitanie” by the French. It ranges from the Val d'Aran
-% within Catalunya, to the South Western Italian Alps encompassing
-% the southern half of the French pentagon.
-%
-% For more information please read the babel-occitan documentation.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-occitan.tlpobj new/tlpkg/tlpobj/hyphen-occitan.tlpobj
--- old/tlpkg/tlpobj/hyphen-occitan.tlpobj 2019-04-06 23:33:09.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-occitan.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-occitan
category TLCore
-revision 50792
+revision 54568
shortdesc Occitan hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Occitan in T1/EC and UTF-8 encodings.
@@ -12,12 +12,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=occitan lefthyphenmin=2 righthyphenmin=2 file=loadhyph-oc.tex file_patterns=hyph-oc.pat.txt file_exceptions=
-runfiles size=8
+runfiles size=6
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-oc.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-oc.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-oc.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-oc.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-oc.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-oc.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-oc.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-oc.pat.txt
++++++ hyphen-piedmontese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-pms.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-pms.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-pms.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-pms.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-pms.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-pms.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-pms.chr.txt 2013-02-22 01:24:10.000000000 +0100
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-pms.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-''
-’’
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-pms.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-pms.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-pms.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-pms.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-% title: Hyphenation patterns for Piedmontese
-% copyright: Copyright (C) 2013 Claudio Beccari
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Piedmontese
-% tag: pms
-% version: 1.0 2013/02/14
-% authors:
-% -
-% name: Claudio Beccari
-% contact: claudio.beccari (at) gmail.com
-% licence:
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: https://latex-project.org/lppl/
-% status: maintained
-% maintainer: Claudio Beccari, e-mail claudio dot beccari at gmail dot com
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2013-02-14 - First release 1.0
-% texlive:
-% encoding: ascii
-% babelname: piedmontese
-% message: Piedmontese hyphenation patterns
-% description: |-
-% Hyphenation patterns for Piedmontese in ASCII encoding.
-% Compliant with 'Gramatica dla lengua piemonteisa' by Camillo Brero.
-% ==========================================
-% These hyphenation patterns for the Piedmontese language are supposed to comply
-% with the common spelling of the Piedmontese language as fixed by the
-% "Gramatica dla lengua piemonteisa" by Camillo Brero.
-% They were initially obtained by merging the consonant endings to the Italian
-% patterns and adding the necessary patterns for the special Piedmontese digraphs
-% used in this language. The common Latin roots of both languages helped a lot
-% in this adaptation.
-% Digraphs: cc, ch, gi, gh, gn, ss.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-piedmontese.tlpobj new/tlpkg/tlpobj/hyphen-piedmontese.tlpobj
--- old/tlpkg/tlpobj/hyphen-piedmontese.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-piedmontese.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-piedmontese
category TLCore
-revision 50792
+revision 54568
shortdesc Piedmontese hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Piedmontese in ASCII encoding.
@@ -9,11 +9,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=piedmontese lefthyphenmin=2 righthyphenmin=2 file=loadhyph-pms.tex file_patterns=hyph-pms.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-pms.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-pms.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-pms.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pms.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pms.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pms.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pms.pat.txt
++++++ hyphen-polish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-pl.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-pl.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-pl.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-pl.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-pl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-pl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-pl.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-pl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-óÓ
-ąĄ
-ćĆ
-ęĘ
-łŁ
-ńŃ
-śŚ
-źŹ
-żŻ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-pl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-pl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-pl.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-pl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-% title: Hyphenation patterns for Polish
-% copyright: Copyright (C) 1987-1995 Hanna Kołodziejska, Bogusław Jackowski, Marek Ryćko
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Polish
-% tag: pl
-% version: 3.0a, Wednesday, May 17th, 1995
-% authors:
-% -
-% name: Hanna Kołodziejska
-% -
-% name: Bogusław Jackowski
-% contact: b_jackowski (at) gust.org.pl
-% -
-% name: Marek Ryćko
-% contact: marek (at) do.com.pl
-% licence:
-% - This file is made available under any of the following licences:
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% - text: >
-% This macro file belongs to the public domain
-% under the conditions specified by the author of TeX:
-%
-% “Macro files like PLAIN.TEX should not be changed in any way,
-% except with respect to preloaded fonts,
-% unless the changes are authorized by the authors of the macros.”
-%
-% Donald E. Knuth
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - The first version of the patterns was developed
-% by Hanna Kołodziejska (1987).
-% - The adaptation to the LeX format (see below) and extensive modification
-% were done by Bogusław Jackowski & Marek Ryćko (1987--1989).
-% - The hyphenation rules were further improved and adapted to the
-% TeX 3.x requirements by Hanna Kołodziejska (1991).
-% - Lone-standing version (3.0a) of patterns was prepared (under pressure
-% from LaTeX users) by Bogusław Jackowski and Marek Ryćko, following
-% Mariusz Olko's suggestions, 1995.
-% - The LeX format mentioned above was the first version of the adaptation
-% of TeX to the Polish language. The next version is called MeX.
-% texlive:
-% encoding: qx
-% babelname: polish
-% legacy_patterns: plhyph.tex
-% message: Polish hyphenation patterns
-% description: |-
-% Hyphenation patterns for Polish in QX and UTF-8 encodings.
-% These patterns are also used by Polish TeX formats MeX and LaMeX.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-polish.tlpobj new/tlpkg/tlpobj/hyphen-polish.tlpobj
--- old/tlpkg/tlpobj/hyphen-polish.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-polish.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-polish
category TLCore
-revision 50792
+revision 54568
catalogue plhyph
shortdesc Polish hyphenation patterns.
relocated 1
@@ -10,16 +10,13 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=polish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-pl.tex file_patterns=hyph-pl.pat.txt file_exceptions=hyph-pl.hyp.txt
-runfiles size=30
+runfiles size=28
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-pl.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-pl.qx.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-pl.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pl.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pl.pat.txt
catalogue-ctan /language/polish/plhyph.tex
-catalogue-date 2016-07-17 15:05:50 +0200
catalogue-license knuth
catalogue-topics hyphenation polish
catalogue-version 3.0a
++++++ hyphen-portuguese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-pt.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-pt.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-pt.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-pt.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-pt.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-pt.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-pt.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-pt.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
---
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-zZ
-áÁ
-âÂ
-ãÃ
-çÇ
-éÉ
-êÊ
-íÍ
-óÓ
-ôÔ
-õÕ
-úÚ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-pt.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-pt.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-pt.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-pt.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-% title: Hyphenation patterns for Portuguese
-% copyright: Copyright (C) 1987, 1994, 1996, 2015 Pedro J. de Rezende, 1996, 2015 J. Joao Dias Almeida
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Portuguese
-% tag: pt
-% version: 1.3 2015-12-08
-% authors:
-% -
-% name: Pedro J. de Rezende
-% contact: rezende (at) ic.unicamp.br
-% -
-% name: J. Joao Dias Almeida
-% contact: jj (at) di.uminho.pt
-% licence:
-% name: BSD 3-clause licence
-% url: https://opensource.org/licenses/BSD-3-Clause
-% text: >
-% Redistribution and use in source and binary forms, with or without
-% modification, are permitted provided that the following conditions
-% are met:
-% * Redistributions of source code must retain the above copyright
-% notice, this list of conditions and the following disclaimer.
-% * Redistributions in binary form must reproduce the above copyright
-% notice, this list of conditions and the following disclaimer in the
-% documentation and/or other materials provided with the
-% distribution.
-% * Neither the name of the University of Campinas, of the University
-% of Minho 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 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-% A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PEDRO J. DE
-% REZENDE OR J.JOAO DIAS ALMEIDA BE LIABLE FOR ANY DIRECT, INDIRECT,
-% INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-% BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-% OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-% AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-% LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-% WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-% POSSIBILITY OF SUCH DAMAGE.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% changes:
-% - Version 1.3 Release date: 12/08/2015 Pedro J. de Rezende and J. Joao Dias Almeida
-% - Version 1.2 Release date: 07/21/1996 Pedro J. de Rezende and J. Joao Dias Almeida
-% - Version 1.1 Release date: 04/12/1994 Pedro J. de Rezende
-% - Version 1.0 Release date: 02/13/1987 Pedro J. de Rezende
-% texlive:
-% synonyms:
-% - portuges
-% encoding: ec
-% babelname: portuguese
-% legacy_patterns: pthyph.tex
-% message: Portuguese hyphenation patterns
-% description: Hyphenation patterns for Portuguese in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-portuguese.tlpobj new/tlpkg/tlpobj/hyphen-portuguese.tlpobj
--- old/tlpkg/tlpobj/hyphen-portuguese.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-portuguese.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-portuguese
category TLCore
-revision 50792
+revision 54568
shortdesc Portuguese hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Portuguese in T1/EC and UTF-8
@@ -8,11 +8,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=portuguese synonyms=portuges lefthyphenmin=2 righthyphenmin=3 file=loadhyph-pt.tex file_patterns=hyph-pt.pat.txt file_exceptions=hyph-pt.hyp.txt
-runfiles size=8
+runfiles size=6
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-pt.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-pt.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-pt.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pt.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pt.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pt.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pt.pat.txt
++++++ hyphen-romanian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-ro.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-ro.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-ro.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-ro.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ro.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ro.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ro.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ro.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-xX
-zZ
-îÎ
-ăĂ
-șȘ
-țȚ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ro.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ro.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ro.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ro.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-% title: Hyphenation patterns for Romanian
-% copyright: Copyright (C) 1995-1996 Adrian Rezus
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Romanian
-% tag: ro
-% version: 1.1 <29.10.1996> R [7.11.1996]
-% authors:
-% -
-% name: Adrian Rezus
-% contact: adriaan (at) sci.kun.nl, adriaan (at) cs.kun.nl
-% licence:
-% - text: [None]
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - ROHYPHEN.TEX 1.0 <10.02.1995>: Plain TeX and LaTeX 2.09.
-% - ROHYPHEN.TEX 1.1 <29.10.1996>: Plain TeX and LaTeX2e.
-% texlive:
-% encoding: ec
-% babelname: romanian
-% legacy_patterns: rohyphen.tex
-% message: Romanian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Romanian in T1/EC and UTF-8 encodings.
-% The UTF-8 patterns use U+0219 for the character 's with comma accent'
-% and U+021B for 't with comma accent', but we may consider using U+015F
-% and U+0163 as well in the future.
-% Generated by PatGen2-output hyphen-level 9.
-% ==========================================
-% Contents: 647 Romanian hyphen patterns, with diacritics.
-% NB Romanian has STRUCTURAL HYPHEN-AMBIGUA:
-% i.e., words that canNOT be hyphenated correctly without
-% additional (e.g., semantic, stress-mark) information.
-% original patterns generated by PatGen2-output hyphen-level 9: do NOT modify the list by hand!
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-romanian.tlpobj new/tlpkg/tlpobj/hyphen-romanian.tlpobj
--- old/tlpkg/tlpobj/hyphen-romanian.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-romanian.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-romanian
category TLCore
-revision 50792
+revision 54568
shortdesc Romanian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Romanian in T1/EC and UTF-8 encodings.
@@ -11,11 +11,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=romanian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ro.tex file_patterns=hyph-ro.pat.txt file_exceptions=
-runfiles size=8
+runfiles size=6
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ro.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-ro.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ro.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ro.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ro.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ro.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ro.pat.txt
++++++ hyphen-romansh.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-rm.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-rm.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-rm.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-rm.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-rm.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-rm.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-rm.chr.txt 2012-04-12 02:10:55.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-rm.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-''
-’’
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-rm.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-rm.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-rm.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-rm.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-% title: Hyphenation patterns for Romansh
-% copyright: Copyright (C) 2011 Claudio Beccari
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Romansh
-% tag: rm
-% version: 1.1 2012/04/10
-% authors:
-% -
-% name: Claudio Beccari
-% contact: claudio.beccari (at) gmail.com
-% licence:
-% - This file may be distributed under any of the following licences:
-% -
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% -
-% name: LPPL
-% version: 1.3
-% or_later: true
-% status: maintained
-% maintainer: Claudio Beccari, e-mail claudio dot beccari at gmail dot com
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2012-01-14 - First release 1.0
-% - 2012-04-10 - Version 1.1. Fix inconsistencies.
-% texlive:
-% encoding: ascii
-% babelname: romansh
-% message: Romansh hyphenation patterns
-% description: |-
-% Hyphenation patterns for Romansh in ASCII encoding.
-% They are supposed to comply with the rules indicated by the Lia
-% Rumantscha (Romansh language society).
-% ==========================================
-% These hyphenation patterns for the Romansh language are supposed to comply
-% with the rules indicated by the Lia Rumantscha (Romansh language society).
-% They were initially obtained by merging the consonantic endings to the Italian
-% patterns and adding the necessary patterns for the special Romansch di-, try- and
-% tetra-graphs used in this language. The common Latin roots of both languages helped
-% a lot in this adaptation.
-% Digraphs: ch, gh, gl, gn, tg
-% Trigraphs: sch
-% Tetragraphs: tsch
-%
-% First part is identical to what is contained in hyph-quote-rm.tex
-% It must be repeated because that file is read only when creating format files
-% for UTF-8 aware engines (XeXeX, LuaTeX)
-%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-romansh.tlpobj new/tlpkg/tlpobj/hyphen-romansh.tlpobj
--- old/tlpkg/tlpobj/hyphen-romansh.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-romansh.tlpobj 2020-03-26 23:29:39.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-romansh
category TLCore
-revision 50792
+revision 54568
shortdesc Romansh hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Romansh in ASCII encoding. They are
@@ -9,11 +9,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=romansh lefthyphenmin=2 righthyphenmin=2 file=loadhyph-rm.tex file_patterns=hyph-rm.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-rm.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-rm.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-rm.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-rm.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-rm.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-rm.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-rm.pat.txt
++++++ hyphen-russian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-ru.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-ru.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-ru.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-ru.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ru.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ru.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ru.chr.txt 2010-06-01 03:39:02.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ru.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
---
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-йЙ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-щЩ
-ъЪ
-ыЫ
-ьЬ
-эЭ
-юЮ
-яЯ
-ёЁ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-ru.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-ru.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-ru.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-ru.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-% title: Hyphenation patterns for Russian
-% copyright: Copyright (C) 1999-2003 Alexander I. Lebedev
-% notice:
-% This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Russian
-% tag: ru
-% version: 2003/03/10
-% authors:
-% -
-% name: Alexander I. Lebedev
-% contact: swan (at) scon155.phys.msu.su
-% licence:
-% name: LPPL
-% version: 1.2
-% or_later: true
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: t2a
-% babelname: russian
-% use_old_patterns_comment: The old system allows choosing patterns and encodings manually. That mechanism needs to be implemented first in this package, so we still fall back on old system.
-% legacy_patterns: ruhyphen.tex
-% message: Russian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Russian in T2A and UTF-8 encodings.
-% For 8-bit engines, the 'ruhyphen' package provides a number of
-% different pattern sets, as well as different (8-bit) encodings, that
-% can be chosen at format-generation time. The UTF-8 version only
-% provides the default pattern set. A mechanism similar to the one used
-% for 8-bit patterns may be implemented in the future.
-% ==========================================
-% Patterns were generated with patgen from a 990,000-word list and then
-% manually corrected.
-%
-% The program consists of the files ruhyphal.tex, cyryoal.tex and two
-% document files README.ruhyphal and hyphen.rules. The file cyryoal.tex
-% can be regenerated using mkcyryo script (a part of ruhyphen package)
-% and the latest release of rus-ispell dictionaries
-% <ftp://scon155.phys.msu.su/pub/russian/ispell/>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-russian.tlpobj new/tlpkg/tlpobj/hyphen-russian.tlpobj
--- old/tlpkg/tlpobj/hyphen-russian.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-russian.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,24 +1,22 @@
name hyphen-russian
category TLCore
-revision 50792
+revision 54568
shortdesc Russian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Russian in T2A and UTF-8 encodings.
longdesc For 8-bit engines, the 'ruhyphen' package provides a number of
longdesc different pattern sets, as well as different (8-bit) encodings,
-longdesc that can be chosen at format-generation time. The UTF-8
-longdesc version only provides the default pattern set. A mechanism
-longdesc similar to the one used for 8-bit patterns may be implemented
-longdesc in the future.
+longdesc that can be chosen at format-generation time. The UTF-8 version
+longdesc only provides the default pattern set. A mechanism similar to
+longdesc the one used for 8-bit patterns may be implemented in the
+longdesc future.
depend hyphen-base
depend hyph-utf8
depend ruhyphen
execute AddHyphen name=russian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ru.tex file_patterns=hyph-ru.pat.txt file_exceptions=hyph-ru.hyp.txt
-runfiles size=65
+runfiles size=63
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ru.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-ru.t2a.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ru.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ru.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ru.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ru.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ru.pat.txt
++++++ hyphen-sanskrit.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-sanskrit.doc.tlpobj new/tlpkg/tlpobj/hyphen-sanskrit.doc.tlpobj
--- old/tlpkg/tlpobj/hyphen-sanskrit.doc.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-sanskrit.doc.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-sanskrit.doc
category TLCore
-revision 50792
+revision 54568
shortdesc doc files of hyphen-sanskrit
relocated 1
docfiles size=1
++++++ hyphen-sanskrit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-sa.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-sa.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-sa.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-sa.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sa.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sa.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sa.chr.txt 2011-09-15 00:22:41.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sa.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,483 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-yY
-àÀ
-áÁ
-èÈ
-éÉ
-ìÌ
-íÍ
-ïÏ
-ñÑ
-òÒ
-óÓ
-ùÙ
-úÚ
-üÜ
-āĀ
-īĪ
-śŚ
-ūŪ
-̀̀
-́́
-̃̃
-̄̄
-̇̇
-̈̈
-̐̐
-̣̣
-̥̥
-̮̮
-̱̱
-ँँ
-ंं
-ःः
-अअ
-आआ
-इइ
-ईई
-उउ
-ऊऊ
-ऋऋ
-ऌऌ
-एए
-ऐऐ
-ओओ
-औऔ
-कक
-खख
-गग
-घघ
-ङङ
-चच
-छछ
-जज
-झझ
-ञञ
-टट
-ठठ
-डड
-ढढ
-णण
-तत
-थथ
-दद
-धध
-नन
-पप
-फफ
-बब
-भभ
-मम
-यय
-रर
-लल
-ळळ
-वव
-शश
-षष
-सस
-हह
-ऽऽ
-ाा
-िि
-ीी
-ुु
-ूू
-ृृ
-ॄॄ
-ेे
-ैै
-ोो
-ौौ
-््
-॑॑
-॒॒
-ॠॠ
-ॡॡ
-ॢॢ
-ॣॣ
-ঁঁ
-ংং
-ঃঃ
-অঅ
-আআ
-ইই
-ঈঈ
-উউ
-ঊঊ
-ঋঋ
-ঌঌ
-এএ
-ঐঐ
-ওও
-ঔঔ
-কক
-খখ
-গগ
-ঘঘ
-ঙঙ
-চচ
-ছছ
-জজ
-ঝঝ
-ঞঞ
-টট
-ঠঠ
-ডড
-ঢঢ
-ণণ
-তত
-থথ
-দদ
-ধধ
-নন
-পপ
-ফফ
-বব
-ভভ
-মম
-যয
-রর
-লল
-শশ
-ষষ
-সস
-হহ
-়়
-ঽঽ
-াা
-িি
-ীী
-ুু
-ূূ
-ৃৃ
-ৄৄ
-েে
-ৈৈ
-োো
-ৌৌ
-্্
-ৎৎ
-ৗৗ
-ড়ড়
-ঢ়ঢ়
-য়য়
-ৠৠ
-ৡৡ
-ৢৢ
-ৣৣ
-ઁઁ
-ંં
-ઃઃ
-અઅ
-આઆ
-ઇઇ
-ઈઈ
-ઉઉ
-ઊઊ
-ઋઋ
-ઌઌ
-એએ
-ઐઐ
-ઓઓ
-ઔઔ
-કક
-ખખ
-ગગ
-ઘઘ
-ઙઙ
-ચચ
-છછ
-જજ
-ઝઝ
-ઞઞ
-ટટ
-ઠઠ
-ડડ
-ઢઢ
-ણણ
-તત
-થથ
-દદ
-ધધ
-નન
-પપ
-ફફ
-બબ
-ભભ
-મમ
-યય
-રર
-લલ
-ળળ
-વવ
-શશ
-ષષ
-સસ
-હહ
-ઽઽ
-ાા
-િિ
-ીી
-ુુ
-ૂૂ
-ૃૃ
-ૄૄ
-ેે
-ૈૈ
-ોો
-ૌૌ
-્્
-ૠૠ
-ૡૡ
-ૢૢ
-ૣૣ
-ఁఁ
-ంం
-ఃః
-అఅ
-ఆఆ
-ఇఇ
-ఈఈ
-ఉఉ
-ఊఊ
-ఋఋ
-ఌఌ
-ఎఎ
-ఏఏ
-ఐఐ
-ఒఒ
-ఓఓ
-ఔఔ
-కక
-ఖఖ
-గగ
-ఘఘ
-ఙఙ
-చచ
-ఛఛ
-జజ
-ఝఝ
-ఞఞ
-టట
-ఠఠ
-డడ
-ఢఢ
-ణణ
-తత
-థథ
-దద
-ధధ
-నన
-పప
-ఫఫ
-బబ
-భభ
-మమ
-యయ
-రర
-ఱఱ
-లల
-ళళ
-వవ
-శశ
-షష
-సస
-హహ
-ాా
-ిి
-ీీ
-ుు
-ూూ
-ృృ
-ౄౄ
-ెె
-ేే
-ైై
-ొొ
-ోో
-ౌౌ
-్్
-ౕౕ
-ౖౖ
-ౠౠ
-ౡౡ
-ಂಂ
-ಃಃ
-ಅಅ
-ಆಆ
-ಇಇ
-ಈಈ
-ಉಉ
-ಊಊ
-ಋಋ
-ಌಌ
-ಎಎ
-ಏಏ
-ಐಐ
-ಒಒ
-ಓಓ
-ಔಔ
-ಕಕ
-ಖಖ
-ಗಗ
-ಘಘ
-ಙಙ
-ಚಚ
-ಛಛ
-ಜಜ
-ಝಝ
-ಞಞ
-ಟಟ
-ಠಠ
-ಡಡ
-ಢಢ
-ಣಣ
-ತತ
-ಥಥ
-ದದ
-ಧಧ
-ನನ
-ಪಪ
-ಫಫ
-ಬಬ
-ಭಭ
-ಮಮ
-ಯಯ
-ರರ
-ಱಱ
-ಲಲ
-ಳಳ
-ವವ
-ಶಶ
-ಷಷ
-ಸಸ
-ಹಹ
-ಽಽ
-ಾಾ
-ಿಿ
-ೀೀ
-ುು
-ೂೂ
-ೃೃ
-ೄೄ
-ೆೆ
-ೇೇ
-ೈೈ
-ೊೊ
-ೋೋ
-ೌೌ
-್್
-ೕೕ
-ೖೖ
-ೞೞ
-ೠೠ
-ೡೡ
-ೱೱ
-ೲೲ
-ംം
-ഃഃ
-അഅ
-ആആ
-ഇഇ
-ഈഈ
-ഉഉ
-ഊഊ
-ഋഋ
-ഌഌ
-എഎ
-ഏഏ
-ഐഐ
-ഒഒ
-ഓഓ
-ഔഔ
-കക
-ഖഖ
-ഗഗ
-ഘഘ
-ങങ
-ചച
-ഛഛ
-ജജ
-ഝഝ
-ഞഞ
-ടട
-ഠഠ
-ഡഡ
-ഢഢ
-ണണ
-തത
-ഥഥ
-ദദ
-ധധ
-നന
-പപ
-ഫഫ
-ബബ
-ഭഭ
-മമ
-യയ
-രര
-ററ
-ലല
-ളള
-ഴഴ
-വവ
-ശശ
-ഷഷ
-സസ
-ഹഹ
-ാാ
-ിി
-ീീ
-ുു
-ൂൂ
-ൃൃ
-െെ
-േേ
-ൈൈ
-ൊൊ
-ോോ
-ൌൌ
-്്
-ൗൗ
-ൠൠ
-ൡൡ
-ൺൺ
-ൻൻ
-ർർ
-ൽൽ
-ൾൾ
-ൿൿ
-ḍḌ
-ḥḤ
-ḫḪ
-ḷḶ
-ṁṀ
-ṃṂ
-ṅṄ
-ṇṆ
-ṣṢ
-ṭṬ
-ẖH̱
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sa.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sa.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sa.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sa.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-% title: Hyphenation patterns for Sanskrit and Prakrit, Latin transliteration,
-% and Devanāgari, Bengali, Gujarati, Kannada, Malayalam, and Telugu scripts
-% copyright: Copyright (C) 2006-2011 Yves Codet
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Sanskrit
-% tag: sa
-% version: 0.6
-% authors:
-% -
-% name: Yves Codet
-% contact: ycodet (at) club-internet.fr
-% licence:
-% text: You may freely use, copy, modify and/or distribute this file.
-% hyphenmins:
-% generation:
-% left: 1
-% right: 1
-% typesetting:
-% left: 1
-% right: 3
-% changes:
-% - Created: April 1st, 2005
-% - First release: June 8th, 2006
-% - Revised: September 14th, 2011
-% texlive:
-% babelname: sanskrit
-% message: Sanskrit hyphenation patterns
-% description: |-
-% Hyphenation patterns for Sanskrit and Prakrit in transliteration,
-% and in Devanagari, Bengali, Kannada, Malayalam and Telugu scripts
-% for Unicode engines.
-% ==========================================
-% Created by Yves Codet. Special thanks to Jonathan Kew and Benjamin Varghese who provided very useful informations.
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-sanskrit.tlpobj new/tlpkg/tlpobj/hyphen-sanskrit.tlpobj
--- old/tlpkg/tlpobj/hyphen-sanskrit.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-sanskrit.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-sanskrit
category TLCore
-revision 50792
+revision 54568
shortdesc Sanskrit hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Sanskrit and Prakrit in
@@ -9,10 +9,7 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=sanskrit lefthyphenmin=1 righthyphenmin=3 file=loadhyph-sa.tex file_patterns=hyph-sa.pat.txt file_exceptions=
-runfiles size=8
+runfiles size=6
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-sa.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sa.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sa.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sa.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sa.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sa.pat.txt
++++++ hyphen-serbian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-cyrl.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-cyrl.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-cyrl.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-cyrl.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-latn.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-latn.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-latn.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-latn.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.chr.txt 2011-06-11 02:32:38.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-ђЂ
-јЈ
-љЉ
-њЊ
-ћЋ
-џЏ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-% title: Hyphenation patterns for Serbo-Croatian, Cyrillic script
-% copyright: Copyright (C) 1990, 2008 Dejan Muhamedagić
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Serbocroatian, Cyrillic script
-% tag: sh-cyrl
-% version: 2.02 Jun 22, 2008
-% authors:
-% -
-% name: Dejan Muhamedagić
-% contact: dejan (at) hello-penguin.com
-% licence:
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% generation:
-% left: 1
-% right: 2
-% typesetting:
-% left: 2 # But 1 is also possible
-% right: 2
-% texlive:
-% encoding: t2a
-% babelname: serbianc
-% legacy_patterns: srhyphc.tex
-% message: Serbian hyphenation patterns in Cyrillic script
-% package: serbian
-% ==========================================
-% Osnovni skup paterna dobijen je na osnovu fonoloških osobina
-% srpskohrvatskog jezika. Pravila i preporuke sam preuzeo iz:
-%
-% M. Pešikan, J. Jerković, M. Pižurica:
-% Pravopis srpskoga jezika
-% Matica srpska, Novi Sad, 1995.
-%
-% U drugom delu se nalaze izuzeci od fonoloških pravila bazirani
-% na boljem psihološkom prelomu reči. Izradjen je korišćenjem
-% sledećih rečnika:
-%
-% Rečnik srpskohrvatskoga književnog jezika
-% Matica srpska, Matica hrvatska, Novi Sad, Zagreb, 1967-1976.
-%
-% Milan Vujaklija: Leksikon stranih reči i izraza
-% Prosveta, Beograd, 1992.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.chr.txt 2011-06-11 02:32:38.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-zZ
-ćĆ
-čČ
-đĐ
-šŠ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-% title: Hyphenation patterns for Serbo-Croatian, Latin script
-% copyright: Copyright (C) 1990, 2008 Dejan Muhamedagić
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Serbocroatian, Latin script
-% tag: sh-latn
-% version: 2.02 22 June 2008
-% authors:
-% -
-% name: Dejan Muhamedagić
-% contact: dejan (at) hello-penguin.com
-% licence:
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% generation:
-% left: 1
-% right: 2
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: ec
-% babelname: serbian
-% legacy_patterns: shhyphl.tex
-% message: Serbian hyphenation patterns in Latin script
-% package: serbian
-% ==========================================
-% Osnovni skup paterna dobijen je na osnovu fonoloških osobina
-% srpskohrvatskog jezika. Pravila i preporuke sam preuzeo iz:
-%
-% M. Pešikan, J. Jerković, M. Pižurica:
-% Pravopis srpskoga jezika
-% Matica srpska, Novi Sad, 1995.
-%
-% U drugom delu se nalaze izuzeci od fonoloških pravila bazirani
-% na boljem psihološkom prelomu reči. Izradjen je korišćenjem
-% sledećih rečnika:
-%
-% Rečnik srpskohrvatskoga književnog jezika
-% Matica srpska, Matica hrvatska, Novi Sad, Zagreb, 1967-1976.
-%
-% Milan Vujaklija: Leksikon stranih reči i izraza
-% Prosveta, Beograd, 1992.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-ђЂ
-јЈ
-љЉ
-њЊ
-ћЋ
-џЏ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.lic.txt 2016-02-13 01:08:09.000000000 +0100
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-% This file has been converted for the hyph-utf8 project from srhyphc.tex,
-% whose authors have been identified as Aleksandar Jelenak <ajelenak AT
-% yahoo.com>, Dejan Muhamedagić (2003-06-09). The licence terms are unchanged.
-%
-% See http://www.hyphenation.org for details on the project.
-%------------------------------------------------------------------------------
-%
-% This is `srhyphc.tex' file. It contains hyphenation patterns for Serbian
-% language in the Cyrillic alphabet. TeX font encoding is T2A.
-%
-% This file is distributed under the terms of the GNU General Public License.
-% Latest version of the license is at <http://www.gnu.org/copyleft/gpl.html>.
-%
-% Version: 1.0a
-% Last change: 2003-06-09
-%
-% Credits:
-% - Initial hyphenation patterns for T1 font encoding by Dejan Muhamedagić
-% - Improvements and adaptation to T2A font encoding by Strahinja Radić
-% - Further improvements and integration into one file by Aleksandar Jelenak
-%
-% Current maintainer: Aleksandar Jelenak <ajelenak AT yahoo.com>
-%
-% \message{Serbian Cyrillic Hyphenation Patterns `srhyphc.tex' v1.0a <2003-06-09>}
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-serbian.tlpobj new/tlpkg/tlpobj/hyphen-serbian.tlpobj
--- old/tlpkg/tlpobj/hyphen-serbian.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-serbian.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-serbian
category TLCore
-revision 50792
+revision 54568
catalogue srhyphc
shortdesc Serbian hyphenation patterns.
relocated 1
@@ -14,7 +14,7 @@
depend hyph-utf8
execute AddHyphen name=serbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-latn.tex file_patterns=hyph-sh-latn.pat.txt,hyph-sh-cyrl.pat.txt file_exceptions=hyph-sh-latn.hyp.txt,hyph-sh-cyrl.hyp.txt
execute AddHyphen name=serbianc lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-cyrl.tex file_patterns=hyph-sh-latn.pat.txt,hyph-sh-cyrl.pat.txt file_exceptions=hyph-sh-latn.hyp.txt,hyph-sh-cyrl.hyp.txt
-runfiles size=76
+runfiles size=70
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-cyrl.tex
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-sr-latn.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-sh-cyrl.t2a.tex
@@ -22,21 +22,14 @@
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sh-cyrl.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sh-latn.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sr-cyrl.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-cyrl.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sh-latn.pat.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sr-cyrl.pat.txt
catalogue-also shhyphl
catalogue-ctan /language/hyphenation/srhyphc.tex
-catalogue-date 2016-11-05 05:59:04 +0100
catalogue-license gpl
catalogue-topics hyphenation serbian
catalogue-version 1.0a
++++++ hyphen-slovak.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-sk.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-sk.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-sk.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-sk.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sk.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sk.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sk.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sk.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-áÁ
-äÄ
-éÉ
-íÍ
-óÓ
-ôÔ
-úÚ
-ýÝ
-čČ
-ďĎ
-ľĽ
-ňŇ
-ŕŔ
-šŠ
-ťŤ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sk.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sk.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sk.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sk.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-% title: Hyphenation patterns for Slovak
-% copyright: Copyright (C) 1992 Jana Chlebíková
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% version: 2.0 1992-04-24
-% language:
-% name: Slovak
-% tag: sk
-% authors:
-% -
-% name: Jana Chlebíková
-% affiliation: Department of Informatics Education, Comenius University, 842 15 Bratislava, Slovakia
-% contact: chlebikj (at) dcs.fmph.uniba.sk
-% licence:
-% name: GPL
-% version: 2
-% or_later: true
-% url: http://www.gnu.org/licenses/gpl.html
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% texlive:
-% encoding: ec
-% babelname: slovak
-% legacy_patterns: skhyph.tex
-% message: Slovak hyphenation patterns
-% description: |-
-% Hyphenation patterns for Slovak in T1/EC and UTF-8 encodings.
-% Original patterns 'skhyphen' are still distributed in the 'csplain'
-% package and loaded with ISO Latin 2 encoding (IL2).
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-slovak.tlpobj new/tlpkg/tlpobj/hyphen-slovak.tlpobj
--- old/tlpkg/tlpobj/hyphen-slovak.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-slovak.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-slovak
category TLCore
-revision 50792
+revision 54568
shortdesc Slovak hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Slovak in T1/EC and UTF-8 encodings.
@@ -9,11 +9,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=slovak lefthyphenmin=2 righthyphenmin=3 file=loadhyph-sk.tex file_patterns=hyph-sk.pat.txt file_exceptions=hyph-sk.hyp.txt
-runfiles size=21
+runfiles size=19
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-sk.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-sk.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sk.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sk.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sk.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sk.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sk.pat.txt
++++++ hyphen-slovenian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-sl.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-sl.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-sl.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-sl.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sl.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sl.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sl.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sl.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-čČ
-šŠ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sl.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sl.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sl.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sl.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-% title: Hyphenation patterns for Slovenian
-% copyright: Copyright (C) 1990 Matjaž Vrečko
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Slovenian
-% tag: sl
-% version: 2.3
-% authors:
-% -
-% name: Matjaž Vrečko
-% affiliation: TeXCeX
-% contact: matjaz (at) mg-soft.si
-% licence:
-% - This file is available under any of these licences:
-% -
-% name: LPPL
-% version: 1
-% or_later: true
-% url: http://www.latex-project.org/lppl/lppl-1-0.html
-% -
-% name: MIT
-% url: https://opensource.org/licences/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 1990 First version of `hyphen.si' (Matjaž Vrečko, TeXCeX)
-%
-% - >
-% Some cosmetic changes done later on, but none of these apply any more;
-% the patterns are still the same as they were originally:
-% - 1994-05-17 Use of code page 852 in patterns (Leon Žlajpah)
-% - 1995-04-06 Release of `sihyph21.tex'
-% - 1995-06-20 >
-% Added \slovenehyphenmins
-% Release of `sihyph22.tex'
-% - 1997-15-04 >
-% Some changes concerning "c, "s, "z and ...
-% Release of `sihyph23.tex'
-% - 2007-01-20 >
-% `sihyph23.tex' renamed to `slhyph.tex'
-% (sl is the proper language code for Slovenian)
-% texlive:
-% synonyms:
-% - slovene
-% encoding: ec
-% babelname: slovenian
-% legacy_patterns: sihyph.tex
-% message: Slovenian hyphenation patterns
-% description: Hyphenation patterns for Slovenian in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-slovenian.tlpobj new/tlpkg/tlpobj/hyphen-slovenian.tlpobj
--- old/tlpkg/tlpobj/hyphen-slovenian.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-slovenian.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-slovenian
category TLCore
-revision 50792
+revision 54568
shortdesc Slovenian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Slovenian in T1/EC and UTF-8
@@ -8,11 +8,8 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=slovenian synonyms=slovene lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sl.tex file_patterns=hyph-sl.pat.txt file_exceptions=
-runfiles size=10
+runfiles size=8
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-sl.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-sl.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sl.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sl.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sl.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sl.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sl.pat.txt
++++++ hyphen-spanish.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-spanish.doc.tlpobj new/tlpkg/tlpobj/hyphen-spanish.doc.tlpobj
--- old/tlpkg/tlpobj/hyphen-spanish.doc.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-spanish.doc.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-spanish.doc
category TLCore
-revision 50792
+revision 54568
shortdesc doc files of hyphen-spanish
relocated 1
docfiles size=36
++++++ hyphen-spanish.tar.xz ++++++
++++ 7590 lines of diff (skipped)
++++++ hyphen-swedish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-sv.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-sv.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-sv.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-sv.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sv.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sv.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sv.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sv.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-äÄ
-åÅ
-éÉ
-öÖ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-sv.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-sv.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-sv.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-sv.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-% title: Hyphenation patterns for Swedish
-% copyright: Copyright (C) 1994 Jan Michael Rynning
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Swedish
-% tag: sv
-% version: 1994-03-03
-% authors:
-% -
-% name: Jan Michael Rynning
-% contact: jmr (at) incolumitas.se
-% licence:
-% name: LPPL
-% version: 1.2
-% or_later: true
-% hyphenmins:
-% generation:
-% left: 1
-% right: 2
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 1991-01-08: First version available for anonymous FTP.
-% - 1991-08-08: Changed \aa to \aa0 at end of line, to stop TeX from
-% concatenating the patterns.
-% - 1991-09-03: Cleaned up lots of inconsistencies in the dictionary.
-% As a consequence, the patterns shrunk a lot. Also added some 4000
-% one-syllable words, some of which were hyphenated by the old
-% patterns, and some 1500 compound words, about half of which were
-% incorrectly hyphenated by the old patterns.
-% - 1991-11-01: Added another some 6200 compound words, all of which were
-% incorrectly hyphenated by the old patterns.
-% - 1991-11-13: Added another some 6500 compound words, all of which were
-% incorrectly hyphenated by the old patterns.
-% - 1992-01-30: Changed macros to ^^, for use with LaTeX and dc fonts.
-% - 1994-03-03: The hyphenated dictionary now contains about 118,000 words.
-% The hyphenation now works much better for compound words.
-% Patgen parameters 1 2 20, 2 1 8, 1 4 7, 3 2 1, 1 10000 4.
-% texlive:
-% encoding: ec
-% message: Swedish hyphenation patterns
-% legacy_patterns: svhyph.tex
-% description: Hyphenation patterns for Swedish in T1/EC and UTF-8 encodings.
-% babelname: swedish
-% ==========================================
-% These hyphenation patterns work quite well for simple words, but not
-% quite as well for compound words. I'm working on improving the quality,
-% by adding more words. If you know any Swedish words which are not
-% correctly hypheneted using these patterns, or if you have questions or
-% comments, please contact me:
-%
-% Jan Michael Rynning <jmr(a)incolumitas.se>
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-swedish.tlpobj new/tlpkg/tlpobj/hyphen-swedish.tlpobj
--- old/tlpkg/tlpobj/hyphen-swedish.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-swedish.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-swedish
category TLCore
-revision 50792
+revision 54568
shortdesc Swedish hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Swedish in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=swedish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sv.tex file_patterns=hyph-sv.pat.txt file_exceptions=
-runfiles size=27
+runfiles size=25
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-sv.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-sv.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-sv.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sv.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sv.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sv.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-sv.pat.txt
++++++ hyphen-thai.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-th.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-th.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-th.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-th.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-th.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-th.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-th.chr.txt 2013-05-08 01:38:30.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-th.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-กก
-ขข
-ฃฃ
-คค
-ฅฅ
-ฆฆ
-งง
-จจ
-ฉฉ
-ชช
-ซซ
-ฌฌ
-ญญ
-ฎฎ
-ฏฏ
-ฐฐ
-ฑฑ
-ฒฒ
-ณณ
-ดด
-ตต
-ถถ
-ทท
-ธธ
-นน
-บบ
-ปป
-ผผ
-ฝฝ
-พพ
-ฟฟ
-ภภ
-มม
-ยย
-รร
-ฤฤ
-ลล
-ฦฦ
-วว
-ศศ
-ษษ
-สส
-หห
-ฬฬ
-ออ
-ฮฮ
-ะะ
-ัั
-าา
-ำำ
-ิิ
-ีี
-ึึ
-ืื
-ุุ
-ูู
-ฺฺ
-เเ
-แแ
-โโ
-ใใ
-ไไ
-ๅๅ
-็็
-่่
-้้
-๊๊
-๋๋
-์์
-ํํ
-๎๎
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-th.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-th.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-th.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-th.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-% title: Hyphenation patterns for Thai
-% copyright: Copyright (C) 2012-2013 Theppitak Karoonboonyanan
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Thai
-% tag: th
-% authors:
-% -
-% name: Theppitak Karoonboonyanan
-% contact: theppitak (at) gmail.com
-% licence:
-% name: LPPL
-% version: 1.3
-% or_later: true
-% status: maintained
-% maintainer: Theppitak Karoonboonyanan
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% texlive:
-% encoding: lth
-% babelname: thai
-% message: Thai hyphenation patterns
-% description: Hyphenation patterns for Thai in LTH and UTF-8 encodings.
-% ==========================================
-% https://linux.thai.net/projects/thailatex
-% https://github.com/tlwg/thailatex
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-thai.tlpobj new/tlpkg/tlpobj/hyphen-thai.tlpobj
--- old/tlpkg/tlpobj/hyphen-thai.tlpobj 2019-04-06 23:33:10.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-thai.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-thai
category TLCore
-revision 50792
+revision 54568
shortdesc Thai hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Thai in LTH and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=thai lefthyphenmin=2 righthyphenmin=3 file=loadhyph-th.tex file_patterns=hyph-th.pat.txt file_exceptions=
-runfiles size=57
+runfiles size=55
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-th.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-th.lth.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-th.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-th.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-th.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-th.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-th.pat.txt
++++++ hyphen-turkish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-tr.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-tr.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-tr.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-tr.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-tr.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-tr.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-tr.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-tr.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-vV
-yY
-zZ
-âÂ
-çÇ
-îÎ
-öÖ
-ûÛ
-üÜ
-ğĞ
-ıI
-şŞ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-tr.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-tr.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-tr.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-tr.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-% title: Hyphenation patterns for Turkish
-% copyright: Copyright (C) 1987 Pierre A. MacKay, 2008, 2011 TUG
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Turkish
-% tag: tr
-% authors:
-% -
-% name: Pierre A. MacKay
-% -
-% name: H. Turgut Uyar
-% contact: uyar (at) itu.edu.tr
-% -
-% name: S. Ekin Kocabas
-% contact: kocabas (at) stanford.edu
-% -
-% name: Mojca Miklavec
-% licence:
-% name: LPPL
-% version: 1
-% or_later: true
-% url: https://latex-project.org/lppl/lppl-1-0.html
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - 2008-06-25/27/28 - create this file by adapting Ottoman rules for modern Turkish
-% - 2011-08-10 - add LPPL licence with permission of Pierre A. MacKay
-% texlive:
-% encoding: ec
-% babelname: turkish
-% legacy_patterns: tkhyph.tex
-% message: Turkish hyphenation patterns
-% description: |-
-% Hyphenation patterns for Turkish in T1/EC and UTF-8 encodings.
-% Auto-generated from a script included in the distribution.
-% The patterns for Turkish were first produced for the Ottoman Texts
-% Project in 1987 and were suitable for both Modern Turkish and Ottoman
-% Turkish in Latin script, however the required character set didn't fit
-% into EC encoding, so support for Ottoman Turkish had to be dropped to
-% keep compatibility with 8-bit engines.
-% ==========================================
-% This file is auto-generated from
-% source/generic/hyph-utf8/languages/tr/generate_patterns_tr.rb
-% that is part of hyph-utf8.
-% Please don't modify this file; modify the generating script instead.
-%
-% Credits:
-% - algorithm developed by P. A. MacKay for the Ottoman Texts Project in 1987
-% - rules adapted for modern Turkish by H. Turgut Uyar <uyar at itu.edu.tr>
-% - initiative to improve Turkish patterns by S. Ekin Kocabas <kocabas at stanford.edu>
-% - script written by Mojca Miklavec <mojca.miklavec.lists at gmail.com> in June 2008
-%
-% See also:
-% - http://mirror.ctan.org/language/turkish/hyphen/turk_hyf.c
-% - http://www.tug.org/TUGboat/Articles/tb09-1/tb20mackay.pdf
-%
-% Differences with Ottoman patterns:
-% - adapted for the use on modern TeX engines, using UTF-8 charactes
-% - only letters for Modern Turkish + âîû (the first one often needed, the other two don't hurt)
-% - (if needed, support for Ottoman Turkish might be provided separately under language code 'ota')
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-turkish.tlpobj new/tlpkg/tlpobj/hyphen-turkish.tlpobj
--- old/tlpkg/tlpobj/hyphen-turkish.tlpobj 2019-04-06 23:33:11.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-turkish.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-turkish
category TLCore
-revision 50792
+revision 54568
catalogue tkhyph
shortdesc Turkish hyphenation patterns.
relocated 1
@@ -14,15 +14,11 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=turkish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tr.tex file_patterns=hyph-tr.pat.txt file_exceptions=
-runfiles size=7
+runfiles size=5
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-tr.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-tr.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-tr.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tr.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tr.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tr.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tr.pat.txt
catalogue-ctan /language/hyphenation/tkhyph.tex
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics hyphenation turkish
++++++ hyphen-turkmen.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-tk.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-tk.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-tk.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-tk.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-tk.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-tk.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-tk.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-tk.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
---
-aA
-bB
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-wW
-yY
-zZ
-äÄ
-çÇ
-öÖ
-üÜ
-ýÝ
-ňŇ
-şŞ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-tk.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-tk.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-tk.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-tk.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-% title: Hyphenation patterns for Turkmen
-% copyright: Copyright (C) 2010-2015 Nazar Annagurban
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Turkmen
-% tag: tk
-% version: 0.1 16 March 2010
-% authors:
-% -
-% name: Nazar Annagurban
-% contact: nazartm (at) gmail.com
-% licence:
-% name: MIT
-% url: https://opensource.org/licenses/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: ec
-% babelname: turkmen
-% message: Turkmen hyphenation patterns
-% description: Hyphenation patterns for Turkmen in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-turkmen.tlpobj new/tlpkg/tlpobj/hyphen-turkmen.tlpobj
--- old/tlpkg/tlpobj/hyphen-turkmen.tlpobj 2019-04-06 23:33:11.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-turkmen.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-turkmen
category TLCore
-revision 50792
+revision 54568
shortdesc Turkmen hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Turkmen in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=turkmen lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tk.tex file_patterns=hyph-tk.pat.txt file_exceptions=
-runfiles size=16
+runfiles size=14
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-tk.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-tk.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-tk.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tk.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tk.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tk.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-tk.pat.txt
++++++ hyphen-ukrainian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-uk.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-uk.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-uk.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-uk.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-uk.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-uk.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-uk.chr.txt 2011-06-11 02:32:38.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-uk.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-''
-’’
---
-аА
-бБ
-вВ
-гГ
-дД
-еЕ
-жЖ
-зЗ
-иИ
-йЙ
-кК
-лЛ
-мМ
-нН
-оО
-пП
-рР
-сС
-тТ
-уУ
-фФ
-хХ
-цЦ
-чЧ
-шШ
-щЩ
-ьЬ
-юЮ
-яЯ
-єЄ
-іІ
-їЇ
-ґҐ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-uk.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-uk.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-uk.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-uk.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-% title: Hyphenation patterns for Ukrainian
-% copyright: Copyright (C) 1998-2001 Maksym Polyakov
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Ukrainian
-% tag: uk
-% version: 2001/05/10
-% authors:
-% -
-% name: Maksym Polyakov
-% contact: polyama (at) auburn.edu, mpoliak (at) i.com.ua
-% licence:
-% name: LPPL
-% url: https://latex-project.org/lppl/
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% texlive:
-% encoding: t2a
-% babelname: ukrainian
-% use_old_patterns_comment: The old system allows choosing patterns and encodings manually. That mechanism needs to be implemented first in this package, so we still fall back on old system.
-% legacy_patterns: ukrhyph.tex
-% message: Ukrainian hyphenation patterns
-% description: |-
-% Hyphenation patterns for Ukrainian in T2A and UTF-8 encodings.
-% For 8-bit engines, the 'ukrhyph' package provides a number of
-% different pattern sets, as well as different (8-bit) encodings, that
-% can be chosen at format-generation time. The UTF-8 version only
-% provides the default pattern set. A mechanism similar to the one used
-% for 8-bit patterns may be implemented in the future.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-ukrainian.tlpobj new/tlpkg/tlpobj/hyphen-ukrainian.tlpobj
--- old/tlpkg/tlpobj/hyphen-ukrainian.tlpobj 2019-04-06 23:33:11.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-ukrainian.tlpobj 2020-03-26 23:29:40.000000000 +0100
@@ -1,25 +1,22 @@
name hyphen-ukrainian
category TLCore
-revision 50792
+revision 54568
shortdesc Ukrainian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Ukrainian in T2A and UTF-8 encodings.
longdesc For 8-bit engines, the 'ukrhyph' package provides a number of
longdesc different pattern sets, as well as different (8-bit) encodings,
-longdesc that can be chosen at format-generation time. The UTF-8
-longdesc version only provides the default pattern set. A mechanism
-longdesc similar to the one used for 8-bit patterns may be implemented
-longdesc in the future.
+longdesc that can be chosen at format-generation time. The UTF-8 version
+longdesc only provides the default pattern set. A mechanism similar to
+longdesc the one used for 8-bit patterns may be implemented in the
+longdesc future.
depend hyphen-base
depend hyph-utf8
depend ukrhyph
execute AddHyphen name=ukrainian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-uk.tex file_patterns=hyph-uk.pat.txt file_exceptions=
-runfiles size=43
+runfiles size=41
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-uk.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-uk.t2a.tex
RELOC/tex/generic/hyph-utf8/patterns/quote/hyph-quote-uk.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-uk.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-uk.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-uk.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-uk.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-uk.pat.txt
++++++ hyphen-uppersorbian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-hsb.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-hsb.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-hsb.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-hsb.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-wW
-yY
-zZ
-óÓ
-ćĆ
-čČ
-ěĚ
-łŁ
-ńŃ
-řŘ
-šŠ
-źŹ
-žŽ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-% title: Hyphenation patterns for Upper Sorbian
-% copyright: Copyright (C) 1997 Eduard Werner
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Upper Sorbian
-% tag: hsb
-% version: 1997-03-22
-% authors:
-% -
-% name: Eduard Werner
-% contact: edi.werner (at) gmx.de
-% licence:
-% name: LPPL
-% version: 1.3
-% or_later: true
-% url: http://www.latex-project.org/lppl.txt
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 2
-% changes:
-% - Completely new revision 1997, March 22
-% texlive:
-% encoding: ec
-% babelname: uppersorbian
-% legacy_patterns: sorhyph.tex
-% message: Upper Sorbian hyphenation patterns
-% description: Hyphenation patterns for Upper Sorbian in T1/EC and UTF-8 encodings.
-% ==========================================
-% č - ccaron
-% ć - cacute
-% ě - ecaron
-% ł - lslash
-% ń - nacute
-% ó - oacute
-% ř - rcaron
-% š - scaron
-% ž - zcaron
-% ź - zacute
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-uppersorbian.tlpobj new/tlpkg/tlpobj/hyphen-uppersorbian.tlpobj
--- old/tlpkg/tlpobj/hyphen-uppersorbian.tlpobj 2019-04-06 23:33:11.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-uppersorbian.tlpobj 2020-03-26 23:29:41.000000000 +0100
@@ -1,6 +1,6 @@
name hyphen-uppersorbian
category TLCore
-revision 50792
+revision 54568
shortdesc Upper Sorbian hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Upper Sorbian in T1/EC and UTF-8
@@ -8,11 +8,9 @@
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=uppersorbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hsb.tex file_patterns=hyph-hsb.pat.txt file_exceptions=hyph-hsb.hyp.txt
-runfiles size=14
+runfiles size=12
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-hsb.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-hsb.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-hsb.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.chr.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-hsb.pat.txt
++++++ hyphen-welsh.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/loadhyph/loadhyph-cy.tex new/tex/generic/hyph-utf8/loadhyph/loadhyph-cy.tex
--- old/tex/generic/hyph-utf8/loadhyph/loadhyph-cy.tex 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/loadhyph/loadhyph-cy.tex 2020-03-26 22:59:35.000000000 +0100
@@ -5,7 +5,7 @@
% source/generic/hyph-utf8/generate-pattern-loaders.rb
% See also http://tug.org/tex-hyphen
%
-% Copyright 2008-2019 TeX Users Group.
+% Copyright 2008-2020 TeX Users Group.
% You may freely use, modify and/or distribute this file.
% (But consider adapting the scripts if you need modifications.)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cy.chr.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cy.chr.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cy.chr.txt 2010-05-30 18:01:26.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cy.chr.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-lL
-mM
-nN
-oO
-pP
-rR
-sS
-tT
-uU
-wW
-yY
-áÁ
-âÂ
-êÊ
-ëË
-ïÏ
-ôÔ
-öÖ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/hyph-utf8/patterns/txt/hyph-cy.lic.txt new/tex/generic/hyph-utf8/patterns/txt/hyph-cy.lic.txt
--- old/tex/generic/hyph-utf8/patterns/txt/hyph-cy.lic.txt 2019-04-06 00:22:32.000000000 +0200
+++ new/tex/generic/hyph-utf8/patterns/txt/hyph-cy.lic.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-% title: Hyphenation patterns for Welsh
-% copyright: Copyright (C) 1996 Yannis Haralambous
-% notice: This file is part of the hyph-utf8 package.
-% See http://www.hyphenation.org/tex for more information.
-% language:
-% name: Welsh
-% tag: cy
-% version: 1996
-% authors:
-% -
-% name: Yannis Haralambous
-% contact: yannis.haralambous (at) imt-atlantique.fr
-% licence:
-% - This file is available under any of these licences:
-% -
-% name: LPPL
-% status: maintained
-% maintainer: Yannis Haralambous
-% version: 1.0
-% or_later: true
-% url: http://www.latex-project.org/lppl/lppl-1-0.html
-% -
-% name: MIT
-% url: https://opensource.org/licences/MIT
-% text: >
-% 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:
-%
-% 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.
-% hyphenmins:
-% typesetting:
-% left: 2
-% right: 3
-% changes:
-% - 1996 - last change to patterns
-% - 2008 - inclusion into hyph-utf8 and file rename (cyhyph.tex -> hyph-cy.tex)
-% - June 2011 - added LPPL licence
-% - March 2016 - added MIT licence
-% texlive:
-% encoding: ec
-% babelname: welsh
-% legacy_patterns: cyhyph.tex
-% message: Welsh hyphenation patterns
-% description: Hyphenation patterns for Welsh in T1/EC and UTF-8 encodings.
-%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hyphen-welsh.tlpobj new/tlpkg/tlpobj/hyphen-welsh.tlpobj
--- old/tlpkg/tlpobj/hyphen-welsh.tlpobj 2019-04-06 23:33:11.000000000 +0200
+++ new/tlpkg/tlpobj/hyphen-welsh.tlpobj 2020-03-26 23:29:41.000000000 +0100
@@ -1,17 +1,14 @@
name hyphen-welsh
category TLCore
-revision 50792
+revision 54568
shortdesc Welsh hyphenation patterns.
relocated 1
longdesc Hyphenation patterns for Welsh in T1/EC and UTF-8 encodings.
depend hyphen-base
depend hyph-utf8
execute AddHyphen name=welsh lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cy.tex file_patterns=hyph-cy.pat.txt file_exceptions=
-runfiles size=37
+runfiles size=35
RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-cy.tex
RELOC/tex/generic/hyph-utf8/patterns/ptex/hyph-cy.ec.tex
RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-cy.tex
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cy.chr.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cy.hyp.txt
- RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cy.lic.txt
RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-cy.pat.txt
++++++ icite.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/icite/README.md new/doc/latex/icite/README.md
--- old/doc/latex/icite/README.md 2019-03-17 22:38:40.000000000 +0100
+++ new/doc/latex/icite/README.md 2020-03-06 22:30:42.000000000 +0100
@@ -17,7 +17,7 @@
icite – Indices locorum citatorum
-Copyright ⓒ 2019 Robert Alessi
+Copyright ⓒ 2019--2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi:
@@ -53,7 +53,7 @@
License applicable to the documentation
---------------------------------------
-Copyright ⓒ 2019 Robert Alessi
+Copyright ⓒ 2019--2020 Robert Alessi
The documentation file `icite.pdf` that is generated from the
`icite.dtx` source file is licensed under the Creative Commons
@@ -64,11 +64,10 @@
Installation
============
-1. Run `'latex icite.ins'` to produce the `icite.sty`
- file;
+1. Run `'latex icite.ins'` to produce the `icite.sty` file.
2. To finish the installation you have to move the `icite.sty` file into
- a directory where LaTeX can find them. See the FAQ on `texfaq.org`
+ a directory where LaTeX can find it. See the FAQ on `texfaq.org`
at <https://texfaq.org/FAQ-inst-wlcf> for more on this.
Development, Git Repository
Binary files old/doc/latex/icite/icite.pdf and new/doc/latex/icite/icite.pdf differ
Binary files old/doc/latex/icite/samples/icite-biblatex.pdf and new/doc/latex/icite/samples/icite-biblatex.pdf differ
Binary files old/doc/latex/icite/samples/icite-minimal.pdf and new/doc/latex/icite/samples/icite-minimal.pdf differ
Binary files old/doc/latex/icite/samples/icite-nobiblatex.pdf and new/doc/latex/icite/samples/icite-nobiblatex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/icite.doc.tlpobj new/tlpkg/tlpobj/icite.doc.tlpobj
--- old/tlpkg/tlpobj/icite.doc.tlpobj 2019-03-18 02:24:46.000000000 +0100
+++ new/tlpkg/tlpobj/icite.doc.tlpobj 2020-03-24 01:59:09.000000000 +0100
@@ -1,9 +1,9 @@
name icite.doc
category Package
-revision 50429
+revision 54512
shortdesc doc files of icite
relocated 1
-docfiles size=103
+docfiles size=101
RELOC/doc/latex/icite/README.md
RELOC/doc/latex/icite/icite.pdf
RELOC/doc/latex/icite/samples/bibsample.bib
++++++ icite.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/icite/icite.sty new/tex/latex/icite/icite.sty
--- old/tex/latex/icite/icite.sty 2019-03-17 22:38:40.000000000 +0100
+++ new/tex/latex/icite/icite.sty 2020-03-06 22:30:42.000000000 +0100
@@ -6,7 +6,9 @@
%%
%% icite.dtx (with options: `package')
%%
-%% Copyright (C) 2019 by Robert Alessi <alessi(a)robertalessi.net>
+%% icite -- Indices locorum citatorum
+%%
+%% Copyright (C) 2019--2020 by Robert Alessi <alessi(a)robertalessi.net>
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi(a)robertalessi.net>
@@ -32,7 +34,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{icite}
- [2019/03/17 v1.2 Make Indices locorum citatorum]
+ [2020/03/05 v1.3a Make Indices locorum citatorum]
\RequirePackage{xkeyval}
\DeclareOptionX{citecmd}[cite]{\def\ic@dfltcit{#1}}
\newif\ifdefault@index
@@ -135,6 +137,7 @@
\index{\@sortedauthor!\@sortedtitle}%
\fi\fi%
}{%
+ \bgroup%
\DTLforeach*{icite@indices}{%
\icite@subtype=subtype,\icite@index=index}{%
\ifx\@subtype\icite@subtype%
@@ -147,7 +150,8 @@
\else%
\index{\@sortedauthor!\@sortedtitle}%
\fi\fi%
- \fi}}
+ \fi}%
+ \egroup}%
\ifno@bibengine
\ifx\@shorthand\empty%
\@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}%
@@ -167,6 +171,7 @@
\index{\@sortedauthor!\@sortedtitle!#1}%
\fi\fi%
}{%
+ \bgroup%
\DTLforeach*{icite@indices}{%
\icite@subtype=subtype,\icite@index=index}{%
\ifx\@subtype\icite@subtype%
@@ -179,13 +184,14 @@
\else%
\index{\@sortedauthor!\@sortedtitle!#1}%
\fi\fi%
- \fi}}%
+ \fi}%
+ \egroup}%
\ifno@bibengine
\ifx\@shorthand\empty%
\@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}%
\ic@titpgdelim{#1}%
\else%
- \@shorthand, {#1}%
+ \@shorthand\ic@titpgdelim{#1}%
\fi%
\else%
\fi%
@@ -199,6 +205,7 @@
\index{\@sortedauthor!\@sortedtitle!#2}%
\fi\fi%
}{%
+ \bgroup%
\DTLforeach*{icite@indices}{%
\icite@subtype=subtype,\icite@index=index}{%
\ifx\@subtype\icite@subtype%
@@ -211,13 +218,14 @@
\else%
\index{\@sortedauthor!\@sortedtitle!#2}%
\fi\fi%
- \fi}}%
+ \fi}%
+ \egroup}%
\ifno@bibengine
\ifx\@shorthand\empty%
#1 \@useauthor\ic@authtitdelim\TitleStyle{\@usetitle}%
\ic@titpgdelim{#2}%
\else%
- #1 \@shorthand, {#2}%
+ #1 \@shorthand\ic@titpgdelim{#2}%
\fi
\else%
\fi%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/icite.tlpobj new/tlpkg/tlpobj/icite.tlpobj
--- old/tlpkg/tlpobj/icite.tlpobj 2019-03-18 02:24:46.000000000 +0100
+++ new/tlpkg/tlpobj/icite.tlpobj 2020-03-24 01:59:09.000000000 +0100
@@ -1,6 +1,6 @@
name icite
category Package
-revision 50429
+revision 54512
shortdesc Indices locorum citatorum
relocated 1
longdesc The package is designed to produce from BibTeX or BibLaTeX
@@ -14,7 +14,6 @@
catalogue-contact-home http://www.robertalessi.net/icite
catalogue-contact-repository http://git.robertalessi.net/icite
catalogue-ctan /macros/latex/contrib/icite
-catalogue-date 2019-03-17 20:42:34 +0100
-catalogue-license gpl3+cc-by-sa-4
+catalogue-license gpl3+ cc-by-sa-4
catalogue-topics biblatex index bibtex-supp humanities cite-supp
-catalogue-version 1.2
+catalogue-version 1.3a
++++++ idxcmds.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/idxcmds.doc.tlpobj new/tlpkg/tlpobj/idxcmds.doc.tlpobj
--- old/tlpkg/tlpobj/idxcmds.doc.tlpobj 2019-02-28 03:42:20.000000000 +0100
+++ new/tlpkg/tlpobj/idxcmds.doc.tlpobj 2020-03-26 01:56:01.000000000 +0100
@@ -1,6 +1,6 @@
name idxcmds.doc
category Package
-revision 38115
+revision 54554
shortdesc doc files of idxcmds
relocated 1
docfiles size=105
++++++ idxcmds.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/idxcmds.tlpobj new/tlpkg/tlpobj/idxcmds.tlpobj
--- old/tlpkg/tlpobj/idxcmds.tlpobj 2019-02-28 03:42:21.000000000 +0100
+++ new/tlpkg/tlpobj/idxcmds.tlpobj 2020-03-26 01:56:01.000000000 +0100
@@ -1,15 +1,14 @@
name idxcmds
category Package
-revision 38115
+revision 54554
shortdesc Semantic commands for adding formatted index entries
relocated 1
longdesc The package provides commands for adding formatted index
longdesc entries; it arises from the author's work on large documents.
runfiles size=3
RELOC/tex/latex/idxcmds/idxcmds.sty
-catalogue-contact-repository https://bitbucket.org/cgnieder/idxcmds/
+catalogue-contact-repository https://github.com/cgnieder/idxcmds/
catalogue-ctan /macros/latex/contrib/idxcmds
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics index
catalogue-version 0.2c
++++++ ifptex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ifptex/LICENSE new/doc/generic/ifptex/LICENSE
--- old/doc/generic/ifptex/LICENSE 2017-05-05 00:14:01.000000000 +0200
+++ new/doc/generic/ifptex/LICENSE 2019-11-03 23:42:02.000000000 +0100
@@ -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/generic/ifptex/README-ja.md new/doc/generic/ifptex/README-ja.md
--- old/doc/generic/ifptex/README-ja.md 2017-10-06 22:19:48.000000000 +0200
+++ new/doc/generic/ifptex/README-ja.md 2019-11-03 23:42:02.000000000 +0100
@@ -9,15 +9,17 @@
### システム要件
- - TeX フォーマット: plain TeX、LaTeX (および他の plain 互換なもの)
- - TeX エンジン: 不問
- - DVI ウェア(DVI 出力時): 不問
+ * TeX フォーマット: plain TeX、LaTeX、INI モード
+ * TeX エンジン: 不問
+ * DVI ウェア(DVI 出力時): 不問
+ * 依存パッケージ:
+ - iftex
### インストール
TDS 1.1 に準拠するシステムの場合、以下のようにファイルを移動する:
- - `*.sty` → $TEXMF/tex/latex/ifptex
+ - `*.sty` → $TEXMF/tex/generic/ifptex
この後必要に応じて mktexlsr を実行する。
@@ -38,19 +40,19 @@
注意:e-TeX拡張の有無は区別されない。
- * `\ifpTeX`(又は `\ifptex`)[if-トークン]
+ * `\ifptex`(又は `\ifpTeX`)[if-トークン]
pTeX(upTeX、pTeX-ng を含む)を使っているか。
- * `\ifstrictpTeX`(又は `\ifstrictptex`)[if-トークン]
+ * `\ifstrictptex`(又は `\ifstrictpTeX`)[if-トークン]
pTeX(upTeX、pTeX-ng ではなく)を使っているか。
- * `\ifupTeX`(又は `\ifuptex`) [if-トークン]
+ * `\ifuptex`(又は `\ifupTeX`) [if-トークン]
upTeX(pTeX-ng を含む)を使っているか。
- * `\ifstrictupTeX`(又は `\ifstrictuptex`) [if-トークン]
+ * `\ifstrictuptex`(又は `\ifstrictupTeX`) [if-トークン]
upTeX(pTeX-ng ではなく)を使っているか。
- * `\ifnativeupTeX` [if-トークン]
+ * `\ifnativeuptex`(又は `\ifnativeupTeX`) [if-トークン]
upTeX を内部文字コードが Unicode の状態で使っているか。
- * `\ifpTeXng`(又は `\ifptexng`)[if-トークン]
+ * `\ifptexng`(又は `\ifpTeXng`)[if-トークン]
pTeX-ng を使っているか。
- ※一応 `\ifstrictpTeXng`(`\ifstrictptexng`)もある。
+ ※一応 `\ifstrictptexng`(`\ifstrictpTeXng`)もある。
* `\RequirepTeX`
`\ifpTeX` 不成立の場合はエラーを出す。
* `\RequireStirctpTeX`
@@ -86,6 +88,11 @@
更新履歴
--------
+ * Version 2.0 〈2019/11/01〉
+ - LaTeX チームによる新しい iftex パッケージと動作を整合させる。
+ - 特に、iftex を中で読み込むようにする。
+ - `\if...tex` について常に小文字のみの名前を用意する。
+ - INI モードでの読込に対応。
* Version 1.2c 〈2017/10/04〉
- バグ修正。
* Version 1.2b 〈2017/09/20〉
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ifptex/README.md new/doc/generic/ifptex/README.md
--- old/doc/generic/ifptex/README.md 2017-10-06 22:19:48.000000000 +0200
+++ new/doc/generic/ifptex/README.md 2019-11-03 23:42:02.000000000 +0100
@@ -9,15 +9,17 @@
### System Requirements
- - TeX format: plain TeX, LaTeX (and any plain-compatible ones).
- - TeX engine: Anything.
- - DVI driver (in DVI mode): Anything.
+ * TeX format: plain TeX, LaTeX, and INI mode.
+ * TeX engine: Anything.
+ * DVI driver (in DVI mode): Anything.
+ * Dependent packages:
+ - iftex
### Installation
In a system compliant to TDS 1.1, move the files as follows:
- - `*.sty` → $TEXMF/tex/latex/ifptex
+ - `*.sty` → $TEXMF/tex/generic/ifptex
And rehash your TEXMF trees if necessary.
@@ -42,17 +44,17 @@
NB: Here “e-TeX-ness” is not considered.
- * `\ifpTeX` (or `\ifptex`) [if-token]
+ * `\ifptex` (or `\ifpTeX`) [if-token]
Whether the engine is pTeX (including upTeX or pTeX-ng).
- * `\ifstrictpTeX` (or `\ifstrictptex`) [if-token]
+ * `\ifstrictptex` (or `\ifstrictpTeX`) [if-token]
Whether the engine is pTeX but *not* upTeX or pTeX-ng.
- * `\ifupTeX` (or `\ifuptex`) [if-token]
+ * `\ifuptex` (or `\ifupTeX`) [if-token]
Whether the engine is upTeX (including pTeX-ng).
- * `\ifstrictupTeX` (or `\ifstrictuptex`) [if-token]
+ * `\ifstrictuptex` (or `\ifstrictupTeX`) [if-token]
Whether the engine is upTeX but *not* pTeX-ng.
- * `\ifnativeupTeX` [if-token]
+ * `\ifnativeuptex` (or `\ifnativeupTeX`) [if-token]
Whether the engine is upTeX and its internal encoding is Unicode.
- * `\ifpTeXng` (or `\ifptexng`) [if-token]
+ * `\ifptexng` (or `\ifpTeXng`) [if-token]
Whether the engine is pTeX-ng.
* `\RequirepTeX`
Issues an error if `\ifpTeX` fails.
@@ -92,6 +94,12 @@
Revision History
----------------
+ * Version 2.0 〈2019/11/01〉
+ - Adjust to work better with the new iftex package maintanined
+ by the LaTeX3 Project.
+ - Now iftex is loaded inside ifptex.
+ - Provide always all-lowercase `\if...tex` commands.
+ - Support for loading in INI mode.
* Version 1.2c 〈2017/10/04〉
* Version 1.2b 〈2017/09/20〉
* Version 1.2a 〈2017/09/15〉
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifptex.doc.tlpobj new/tlpkg/tlpobj/ifptex.doc.tlpobj
--- old/tlpkg/tlpobj/ifptex.doc.tlpobj 2019-02-28 03:42:24.000000000 +0100
+++ new/tlpkg/tlpobj/ifptex.doc.tlpobj 2019-11-04 01:54:08.000000000 +0100
@@ -1,6 +1,6 @@
name ifptex.doc
category Package
-revision 45485
+revision 52626
shortdesc doc files of ifptex
relocated 1
docfiles size=3
++++++ ifptex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/ifptex/ifptex.sty new/tex/generic/ifptex/ifptex.sty
--- old/tex/generic/ifptex/ifptex.sty 2017-10-06 22:19:48.000000000 +0200
+++ new/tex/generic/ifptex/ifptex.sty 2019-11-03 23:42:02.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'ifptex.sty'.
%%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -9,50 +9,78 @@
%%
%
%% avoid multiple loading
-\csname\if11bxipIfptexLoaded\fi\endcsname
+\csname\if11bxipIfptexLoaded\fi\endcsname%
%% code guards
-\edef\x{%
+\begingroup\count255\catcode61\global\catcode61\catcode48%
+\catcode91=1\catcode93=2\xdef\bxipIfptexLoaded[%
+\catcode61=\the\count255%
+\catcode13=\the\catcode13%
\catcode32=\the\catcode32%
-\catcode33=\the\catcode33%
\catcode35=\the\catcode35%
-\catcode42=\the\catcode42%
+\catcode123=\the\catcode123%
+\catcode125=\the\catcode125%
+\endlinechar=\the\endlinechar]%
+\endgroup\catcode32=10\catcode13=5\endlinechar=13\relax%
+\catcode35=6 \catcode123=1 \catcode125=2
+\edef\bxipIfptexLoaded{\bxipIfptexLoaded
+\catcode33=\the\catcode33%
+\catcode34=\the\catcode34%
+\catcode39=\the\catcode39%
+\catcode45=\the\catcode45%
+\catcode46=\the\catcode46%
+\catcode47=\the\catcode47%
+\catcode58=\the\catcode58%
\catcode60=\the\catcode60%
\catcode62=\the\catcode62%
+\catcode63=\the\catcode63%
\catcode64=\the\catcode64%
\catcode91=\the\catcode91%
\catcode93=\the\catcode93%
+\catcode96=\the\catcode96%
\relax}
-\catcode32=10\relax
-\catcode33=11 %<">
-\catcode35=6 %<#>
-\catcode42=12 %<*>
-\catcode60=12 %<<>
-\catcode62=12 %<>>
-\catcode64=11 %<@>
-\catcode91=12 %<[>
-\catcode93=12 %<]>
-\edef\bxip@restore@codes{\x
+\catcode33=12 % <!>
+\catcode34=12 % <">
+\catcode39=12 % <'>
+\catcode45=12 % <->
+\catcode46=12 % <.>
+\catcode47=12 % </>
+\catcode58=12 % <:>
+\catcode60=12 % <<>
+\catcode62=12 % <>>
+\catcode63=12 % <?>
+\catcode64=11 % <@>
+\catcode91=12 % <[>
+\catcode93=12 % <]>
+\catcode96=12 % <`>
+\edef\bxip@restore@codes{\bxipIfptexLoaded
\noexpand\let\noexpand\bxip@restore@codes\relax}
\def\bxipIfptexLoaded{\endinput}
%% check for LaTeX
\ifx\RequirePackage\@undefined %<*!LaTeX>
\let\bxip@latex=f
- \long\def\x#1\ProvidesPackage#2[#3]{%
+ \long\def\bxip@input#1\ProvidesPackage#2[#3]{%
+ \def\bxip@input\RequirePackage##1[##2]{\input ##1.sty\relax}%
\immediate\write-1{Package: #2 #3}}
- \expandafter\x
+ \expandafter\bxip@input
\else %<*LaTeX>
- \let\bxip@latex=t \let\x\relax
+ \let\bxip@latex=t
+ \let\bxip@input\relax
\fi %</LaTeX>
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ifptex}[2017/10/04 v1.2c pTeX checker]
+\ProvidesPackage{ifptex}[2019/11/01 v2.0 pTeX checker]
\def\bxip@pkgname{ifptex}
-%% enter the big group
-\begingroup
+%% packages
+\ifx\newif\@undefined\else
+\bxip@input
+\RequirePackage{iftex}[2013/04/04]% v0.2
+\fi
+%=======================================
+\begingroup % entering a big group
%--------------------------------------- helpers
%% \bxip@csletcs{<csnameA>}{<csnameB>}
@@ -96,18 +124,28 @@
\gdef\bxip@check@version@a#1#2#3#4#5#6\relax#7{%
\bxip@err@required{#7 v.>=\number#2#3#4.#5#6}}
-%% \bxip@err@required{<string>}
-% NB: Now the same style as in ifxetex is used.
-\gdef\bxip@err@required#1{%
- \begingroup
- \errorcontextlines=-1\relax
- \newlinechar=10\relax
- \errmessage{^^J
- ********************************************^^J
- * #1 is required to compile this document.^^J
- * Sorry!^^J
+%% \bxip@Require\ifXXX{<string>}\fi
+% (Equivalent to \IFTEX@Require of iftex.)
+\gdef\bxip@Require#1#2#3{%
+ #1\else
+ \newlinechar64\relax
+ \errorcontextlines-1\relax
+ \immediate\write20{@
+ ********************************************@
+ * #2 is required to compile this document.@
+ * Sorry!@
********************************************}%
- \endgroup}
+ % do a hard stop
+ \batchmode\read-1to\bxip@tmpa
+ #3}
+\gdef\bxip@err@required#1{\bxip@Require\iftrue{#1}\fi}
+
+%% \bxip@protected
+\let\bxip@protected\protected
+\ifx\directlua\@undefined\else
+ \directlua{tex.enableprimitives('bxip@', {'protected'})}
+\fi
+\bxip@csletcs{bxip@protected}{bxip@protected}
%--------------------------------------- guess version
@@ -135,12 +173,13 @@
%--------------------------------------- public stuffs
% Note:
-% 1) Names '\ifFooTeX' are used in iftex.
+% 1) Names '\ifFooTeX' were used in old iftex.
% 2) Names '\iffootex' are used in ifxetex/ifluatex/....
-% My preferences are:
+% My preferences used to be:
% - '\ifwhateverFooTeX' and '\RequireWhateverFooTeX'.
-% But I also provide aliases '\iffootex' and '\ifstrictfootex' for
-% compatibility with 1) and the old ifuptex.
+% But now I adopt the preferences of new iftex:
+% - '\ifwhateverfootex' and '\RequireWhateverFooTeX'.
+% I also provide aliases '\ifwhateverFooTeX' for compatibility.
%%<+> \ifpTeX
\global\bxip@false{ifpTeX}
@@ -161,6 +200,8 @@
\fi
%%<+> \ifuptex == \ifupTeX
\global\bxip@csletcs{ifuptex}{ifupTeX}
+%%<+> \ifnativeuptex == \ifnativeupTeX
+\global\bxip@csletcs{ifnativeuptex}{ifnativeupTeX}
%%<+> \ifpTeXng
\global\bxip@false{ifpTeXng}
@@ -192,29 +233,29 @@
\global\bxip@csletcs{ifstrictptexng}{ifstrictpTeXng}
%%<+> \RequirepTeX
-\gdef\RequirepTeX{%
- \ifpTeX\else \bxip@err@required{(u)pTeX}\fi}
+\bxip@protected\gdef\RequirepTeX{%
+ \bxip@Require\ifpTeX{(u)pTeX}\fi}
%%<+> \RequireStrictpTeX
-\gdef\RequireStrictpTeX{%
- \ifstrictpTeX\else \bxip@err@required{pTeX (not upTeX)}\fi}
+\bxip@protected\gdef\RequireStrictpTeX{%
+ \bxip@Require\ifstrictpTeX{pTeX (not upTeX)}\fi}
%%<+> \RequireupTeX
-\gdef\RequireupTeX{%
- \ifupTeX\else \bxip@err@required{upTeX}\fi}
+\bxip@protected\gdef\RequireupTeX{%
+ \bxip@Require\ifupTeX{upTeX}\fi}
%%<+> \RequireStrictupTeX
-\gdef\RequireStrictupTeX{%
- \ifstrictupTeX\else \bxip@err@required{upTeX (not pTeX-ng)}\fi}
+\bxip@protected\gdef\RequireStrictupTeX{%
+ \bxip@Require\ifstrictupTeX{upTeX (not pTeX-ng)}\fi}
%%<+> \RequireNativeupTeX
-\gdef\RequireNativeupTeX{%
- \ifnativeupTeX\else \bxip@err@required{upTeX in Unicode}\fi}
+\bxip@protected\gdef\RequireNativeupTeX{%
+ \bxip@Require\ifnativeupTeX{upTeX in Unicode}\fi}
%%<+> \RequirepTeXng
-\gdef\RequirepTeXng{%
- \ifpTeXng\else \bxip@err@required{pTeX-ng}\fi}
+\bxip@protected\gdef\RequirepTeXng{%
+ \bxip@Require\ifpTeXng{pTeX-ng}\fi}
%%<+> \RequireStrictpTeXng
-\gdef\RequireStrictpTeXng{%
- \ifstrictpTeXng\else \bxip@err@required{pTeX-ng}\fi}
+\bxip@protected\gdef\RequireStrictpTeXng{%
+ \bxip@Require\ifstrictpTeXng{pTeX-ng}\fi}
%--------------------------------------- KanjiKoodo declaration
-\ifpTeX
+\ifpTeX \ifx t\bxip@latex
%% \bxip@def@str\CS{<strcode>}
\def\bxip@def@str#1#2{%
@@ -283,7 +324,7 @@
\epTeXinputencoding utf8}% unterminated
\fi
-\fi
+\fi\fi
%--------------------------------------- deprecated stuffs
%%<+>D \ifNativeupTeX == \ifnativeupTeX
@@ -317,6 +358,10 @@
%--------------------------------------- all done
\endgroup
+% clean up
+\let\bxip@latex\@undefined
+\let\bxip@input\@undefined
+\let\bxip@protected\@undefined
\bxip@restore@codes
\endinput
%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/ifptex/ifuptex.sty new/tex/generic/ifptex/ifuptex.sty
--- old/tex/generic/ifptex/ifuptex.sty 2017-10-06 22:19:48.000000000 +0200
+++ new/tex/generic/ifptex/ifuptex.sty 2019-11-03 23:42:02.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'ifuptex.sty'.
%%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -11,42 +11,52 @@
% NOTE: Now ifuptex is merely an alias to ifptex.
%
%% avoid multiple loading
-\csname\if11bxipIfuptexLoaded\fi\endcsname
+\csname\if11bxipIfuptexLoaded\fi\endcsname%
%% code guards
-\edef\x{%
+\begingroup\count255\catcode61\global\catcode61\catcode48%
+\catcode91=1\catcode93=2\xdef\bxipIfuptexLoaded[%
+\catcode61=\the\count255%
+\catcode13=\the\catcode13%
\catcode32=\the\catcode32%
+\catcode35=\the\catcode35%
+\catcode123=\the\catcode123%
+\catcode125=\the\catcode125%
+\endlinechar=\the\endlinechar]%
+\endgroup\catcode32=10\catcode13=5\endlinechar=13\relax%
+\catcode35=6 \catcode123=1 \catcode125=2
+\edef\bxipIfuptexLoaded{\bxipIfuptexLoaded
\catcode45=\the\catcode45%
\catcode46=\the\catcode46%
\catcode47=\the\catcode47%
\catcode58=\the\catcode58%
\catcode64=\the\catcode64%
\relax}
-\catcode32=10\relax
\catcode45=12 % <->
\catcode46=12 % <.>
\catcode47=12 % </>
\catcode58=12 % <:>
\catcode64=11 % <@>
-\edef\bxip@up@restore@codes{\x
+\edef\bxip@up@restore@codes{\bxipIfuptexLoaded
\noexpand\let\noexpand\bxip@up@restore@codes\relax}
\def\bxipIfuptexLoaded{\endinput}
%% check for LaTeX
-\ifx\RequirePackage\@undefined % non-LaTeX
- \long\def\x#1\ProvidesPackage#2[#3]{%
- \def\x\RequirePackage##1[##2]{\input ##1.sty\relax}%
+\ifx\RequirePackage\@undefined %<*!LaTeX>
+ \long\def\bxip@input#1\ProvidesPackage#2[#3]{%
+ \def\bxip@input\RequirePackage##1[##2]{\input ##1.sty\relax}%
\immediate\write-1{Package: #2 #3}}
- \expandafter\x
-\else % LaTeX
- \let\x\relax
-\fi
+ \expandafter\bxip@input
+\else %<*LaTeX>
+ \let\bxip@input\relax
+\fi %</LaTeX>
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ifuptex}[2017/10/04 v1.2c upTeX checker]
+\ProvidesPackage{ifuptex}[2019/11/01 v2.0 pTeX checker]
%% load ifptex
-\x\RequirePackage{ifptex}[2017/10/04]
+\bxip@input
+\RequirePackage{ifptex}[2019/11/01]
%% all done
\bxip@up@restore@codes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ifptex.tlpobj new/tlpkg/tlpobj/ifptex.tlpobj
--- old/tlpkg/tlpobj/ifptex.tlpobj 2019-02-28 03:42:24.000000000 +0100
+++ new/tlpkg/tlpobj/ifptex.tlpobj 2019-11-04 01:54:08.000000000 +0100
@@ -1,6 +1,6 @@
name ifptex
category Package
-revision 45485
+revision 52626
shortdesc Check if the engine is pTeX or one of its derivatives
relocated 1
longdesc The ifptex package is a counterpart of ifxetex, ifluatex, etc.
@@ -11,7 +11,7 @@
RELOC/tex/generic/ifptex/ifuptex.sty
catalogue-contact-repository https://github.com/zr-tex8r/ifptex
catalogue-ctan /macros/generic/ifptex
-catalogue-date 2017-10-05 23:03:57 +0200
+catalogue-date 2019-11-03 16:36:10 +0100
catalogue-license mit
catalogue-topics env-query japanese
-catalogue-version 1.2c
+catalogue-version 2.0
++++++ iftex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/iftex/README new/doc/generic/iftex/README
--- old/doc/generic/iftex/README 2013-04-05 01:11:11.000000000 +0200
+++ new/doc/generic/iftex/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-_________________
-The iftex package
-v0.2
-
-This very simple package, for both Plain TeX and LaTeX,
-defines the \ifPDFTeX, \ifXeTeX, and \ifLuaTeX boolean
-for testing whether PDFTeX, or XeTeX, or LuaTeX is being
-used for typesetting.
-
-Also provides the \RequirePDFTeX, \RequireXeTeX, and \RequireLuaTeX
-command which throws an error if PDFTeX, XeTeX and LuaTeX (respectively)
-is not the engine in use.
-
-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 do not send any direct emails to us; we will not
-answer any direct emails. Instead please use the issue tracker:
- <https://github.com/persian-tex/iftex/issues>
-In doing so, please always explain your issue well enough, always include
-a minimal working examples showing the issue, and always choose the appropriate
-label for your query (i.e. if you are reporting any bugs, choose `bug' label).
-
-Current version release date: 2013/04/04
-______________
-Persian TeX Group
-persian-tex(a)tug.org
-
-Copyright 2010–2013
-Distributed under the LaTeX Project Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/iftex/README.md new/doc/generic/iftex/README.md
--- old/doc/generic/iftex/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/iftex/README.md 2019-11-01 22:55:07.000000000 +0100
@@ -0,0 +1,65 @@
+# iftex
+
+## TeX Engine Detection
+
+This iftex package provides a suite of commands for detecting
+different TeX variants.
+
+For each supported engine, tests are provided of the form
+
+ \ifpdftex which is true if PDFTeX is in use and \RequirePDFTeX
+ which stops the run with an error message if PDFTeX is not being used.
+
+The package (which works with plain TeX as well as LaTeX) has tests
+for:
+
+eTeX, PDFTeX, XeTeX, LuaTeX, LuaHBTeX, pTeX, upTeX, pTeX-ng, VTeX, Aleph.
+
+
+In addition, an \iftutex test is true for XeTeX and LuaTeX, and
+an \ifpdf test is provided to test the PDF or DVI output mode.
+
+## Compatibility Packages
+
+In addition to the main iftex.sty package, small wrapper packages are
+provided
+
+ifetex.sty ifluatex.sty ifvtex.sty ifxetex.sty ifpdf.sty
+
+These include iftex and in some cases emulate some additional
+commands to allow these packages to replace the original packages in TeX
+distributions. It is recommended that new documents do not use these
+packages, but instead load iftex.sty directly.
+
+This package may be used on any format (it may be loaded into initex)
+it does not assume LaTeX.
+
+
+----
+
+This is a merger and simplification of several packages
+Based on a suggestion of Norbert Preining
+
+https://github.com/bidi-tex/iftex/issues/1
+
+
+ * ifetex: Martin Scharrer
+ * ifxetex: Will Robertson
+ * iftex: Persian TeX Group / Vafa Khalighi
+ * ifluatex, ifvtex: Heiko Oberdiek
+ * ifptex: Takayuki Yato
+ * ifpdf: Heiko Oberdiek and LaTeX3 Project
+
+
+The existing if(u)ptex packages do far more extensive testing to
+distinguish different variants which are not copied here.
+
+A document specifically for Japanese texts may need the finer grained
+tests of the ifptex package which has tests for particular versions
+of the pTeX (Japanese TeX) variant in use, and for the mode that is
+active.
+
+This generic package only has coarser tests for the tex variant in
+use, so is sufficient for example to distinguish upTeX from pTeX, and
+to distinguish both of those from LuaTeX.
+
Binary files old/doc/generic/iftex/iftex.pdf and new/doc/generic/iftex/iftex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/iftex/iftex.tex new/doc/generic/iftex/iftex.tex
--- old/doc/generic/iftex/iftex.tex 2013-04-05 01:11:11.000000000 +0200
+++ new/doc/generic/iftex/iftex.tex 2019-11-09 23:02:15.000000000 +0100
@@ -1,80 +1,199 @@
-\documentclass{artikel3}
-\usepackage{calc}
-\usepackage{pifont}
-\usepackage{bbding}
-\usepackage[colorlinks=true,linkcolor=mybrown,urlcolor=mygreen]{hyperref}
-\usepackage{bidicode}
-\newcounter{local}
-\renewcommand\theenumi{\protect\setcounter{local}%
- {201+\the\value{enumi}}\protect\ding{\value{local}}}
-\renewcommand\labelenumi{\theenumi}
-\renewcommand\labelitemi{\HandRight}
-\renewcommand\labelitemii{\HandRightUp}
-\renewcommand\labelitemiii{\HandCuffRight}
-\renewcommand\labelitemiv{\HandPencilLeft}
-\definecolor{mybrown}{rgb}{.6,0,0}
-\definecolor{mygreen}{rgb}{0,.43,0}
-\definecolor{Orange}{rgb}{1,.4,.2}
-\newcommand\PDFTeX{PDF\TeX}
-\newcommand\XeTeX{Xe\TeX}
-\newcommand\LuaTeX{Lua\TeX}
-\title{The \textsf{iftex} Package\\ \href{https://github.com/persian-tex/iftex}{\texttt{https://github.com/persian-tex/iftex}}}
-\author{Persian TeX Group\\ \href{mailto:persian-tex@tug.org}{\texttt{persian-tex@tug.org}}}
-\date{Version 0.2}
+\documentclass{article}
+\usepackage[T1]{fontenc}
+\usepackage{hyperref}
+\hypersetup{colorlinks}
+\usepackage{iftex}
+
+\title{The iftex package}
+\author{The \LaTeX\ Project Team\thanks{%
+\url{https://github.com/latex3/iftex}}}
+
+\date{\csname ver(a)iftex.sty\endcsname}
+
+\newcommand\cs[1]{{\ttfamily\textbackslash #1}}
+\renewcommand*\descriptionlabel[1]{\makebox[\dimexpr\textwidth][l]{%
+ \normalfont\bfseries #1}}
+
\begin{document}
+
\maketitle
\tableofcontents
+
+
\section{Introduction}
-This package provides a way to check if a document is being processed with \PDFTeX, or \XeTeX, or \LuaTeX.
-\section{Loading The Package}
-The package can be loaded in the usual way both in Plain \TeX\ and \LaTeX.
-\subsection{Loading The Package in Plain \TeX}
-\begin{BDef}
-\Lcs{input}\quad \Larg{iftex.sty}
-\end{BDef}
-\subsection{Loading The Package in \LaTeX}
-\begin{BDef}
-\Lcs{usepackage}\Largb{iftex}
-\end{BDef}
-\section{Defined Conditionals}
-\subsection{For \PDFTeX}
-\begin{BDef}
-\Lcs{ifPDFTeX}\\
-\qquad\Larga{material for \PDFTeX}\\
-\Lcs{else}\\
-\qquad\Larga{material not for \PDFTeX}\\
-\Lcs{fi}
-\end{BDef}
-\subsection{For \XeTeX}
-\begin{BDef}
-\Lcs{ifXeTeX}\\
-\qquad\Larga{material for \XeTeX}\\
-\Lcs{else}\\
-\qquad\Larga{material not for \XeTeX}\\
-\Lcs{fi}
-\end{BDef}
-\subsection{For \LuaTeX}
-\begin{BDef}
-\Lcs{ifLuaTeX}\\
-\qquad\Larga{material for \LuaTeX}\\
-\Lcs{else}\\
-\qquad\Larga{material not for \LuaTeX}\\
-\Lcs{fi}
-\end{BDef}
-\section{Defined Commands}
-\subsection{For \PDFTeX}
-\begin{BDef}
-\Lcs{RequirePDFTeX}
-\end{BDef}
-This command tests for \PDFTeX\ use and throws an error if a different engine is being used.
-\subsection{For \XeTeX}
-\begin{BDef}
-\Lcs{RequireXeTeX}
-\end{BDef}
-This command tests for \XeTeX\ use and throws an error if a different engine is being used.
-\subsection{For \LuaTeX}
-\begin{BDef}
-\Lcs{RequireLuaTeX}
-\end{BDef}
-This command tests for \LuaTeX\ use and throws an error if a different engine is being used.
-\end{document}
\ No newline at end of file
+This original \textsf{iftex} was written as part of the \textsf{bidi}
+collection (by the Persian TeX Group / Vafa Khalighi)
+and provided checks for whether a document was being
+processed with PDF\TeX, or Xe\TeX, or Lua\TeX. This version recodes
+the package and incorporates similar tests from the \textsf{ifetex}
+package by Martin Scharrer, the \textsf{ifxetex} package by Will
+Robertson, the \textsf{ifluatex} and \textsf{ifvtex}
+packages from Heiko Oberdiek and parts of \textsf{ifptex} by Takayuki
+Yato.
+
+For each \TeX\ variant engine supported two commands are provided:
+\begin{itemize}
+\item
+ a conditional, \verb|\iffootex| that is true if the \textsf(footex)
+engine (or a compatible extension) is being used.
+
+For compatibility with earlier packages which did not all use the same
+naming convention all these conditionals are provided in two forms, a
+lowercase name \verb|\iffootex| and a mixed case name \verb|\iffooTeX|.
+
+\item a command \verb|RequireFooTeX| which checks that \textsf{footex}
+ is being used, and stops the run with an error message if a
+ different engine is detected.
+\end{itemize}
+
+\section{Loading the package}
+The package can be loaded in the usual way in both Plain \TeX\ and \LaTeX.
+\subsection{Loading the package in plain \TeX}
+\begin{verbatim}
+\input iftex.sty
+\end{verbatim}
+
+\subsection{Loading the package in \LaTeX}
+\begin{verbatim}
+\usepackage{iftex}
+\end{verbatim}
+
+\subsection{Loading the package in ini\TeX}
+The package assumes no existing macros and may be loaded
+during format setup in a format without the plain \TeX\ or \LaTeX\
+format being loaded. From an initial ini\TeX\ setup the package may
+be loaded as for plain \TeX.
+
+\section{Engine test conditionals}
+All the conditionals defined here are used in the same way:
+\begin{verbatim}
+\ifluatex
+ luatex specific code
+\else
+ code for other engines
+\fi
+\end{verbatim}
+
+
+
+\begin{description}
+\item[\cs{ifetex}, \cs{ifeTeX}]
+True if an e\TeX\ enabled format is in use. (This is necessarily true
+in all \LaTeX\ variants.)
+\item[\cs{ifpdftex}, \cs{ifPDFTeX}]
+True if PDF\TeX\ is in use (whether writing PDF or DVI), so this is
+true for documents processed with both the \textsf{latex} and
+\textsf{pdflatex} commands.
+\item[\cs{ifxetex}, \cs{ifXeTeX}]
+True if Xe\TeX\ is in use.
+\item[\cs{ifluatex}, \cs{ifLuaTeX}]
+True if Lua\TeX\ and extensions such as LuaHB\TeX\ are in use.
+\item[\cs{ifluahbtex}, \cs{ifLuaHBTeX}]
+True if the \textsf{luaharftex} Lua module is available.
+This will be true in \textsf{luahbtex} and may be true in
+\textsf{luatex} if a binary Lua \textsf{luaharftex} module has been
+compiled and is available in Lua's search path.
+\item[\cs{ifptex}, \cs{ifpTeX}]
+True if any of the p\TeX\ variants are in use.
+\item[\cs{ifuptex}, \cs{ifupTeX}]
+True if any of the up\TeX\ variants are in use. (\verb|\ifetex| could
+be used in addition to distinguish \textsf{uptex} and \textsf{euptex}.)
+\item[\cs{ifptexng}, \cs{ifpTeXng}]
+True if p\TeX-ng (Asiatic p\TeX) is in use.
+\item[\cs{ifvtex}, \cs{ifVTeX}]
+True if V\TeX\ is in use.
+\item[\cs{ifalephtex}, \cs{ifAlephTeX}]
+True if Aleph is in use. (The \textsf{aleph}-based \LaTeX\ command is
+\textsf{lamed}.)
+\item[\cs{iftutex}, \cs{ifTUTeX}]
+This is not strictly an engine variant, but it is true if
+\verb|\Umathchardef| is available, which essentially means that it is
+true for Lua\TeX\ and Xe\TeX, allowing constructs such as
+\begin{verbatim}
+\iftutex
+ \usepackage{fontspec}
+ \setmainfont{TeX Gyre Termes}
+ \usepackage{unicode-math}
+ \setmathfont{Stix Two Math}
+\else
+ \usepackage{newtxtext,newtxmath}
+\fi
+\end{verbatim}
+
+\end{description}
+
+\section{Requiring specific engines}
+For each supported engine, the package provides a command
+\verb|\Require...| which checks that the document is being processed
+with a suitable engine, and stops with an error message if not.
+
+\begin{description}
+\item[\cs{RequireeTeX}]
+\item[\cs{RequirePDFTeX}]
+\item[\cs{RequireXeTeX}]
+\item[\cs{RequireLuaTeX}]
+\item[\cs{RequireLuaHBTeX}]
+\item[\cs{RequirepTeX}]
+\item[\cs{RequireupTeX}]
+\item[\cs{RequirepTeXng}]
+\item[\cs{RequireVTeX}]
+\item[\cs{RequireAlephTeX}]
+\item[\cs{RequireTUTeX}]
+\end{description}
+
+
+\section{Output mode conditional}
+This package also provides an \verb|\ifpdf| conditional that is true
+if the format is set up to output in PDF mode rather than DVI. This is
+equivalent to the test in the existing \textsf{ifpdf} package.
+
+Unlike the engine tests above this is defined as if by \verb|\newif|
+with user-documented commands \verb|\pdftrue| and \verb|\pdffalse| that can
+change the boolean value. These would be needed to reset the boolean
+if the output mode is reset (for example by setting
+\verb|\pdfoutput=0| in PDF\LaTeX).
+
+Unlike the original \textsf{ifpdf} package, the version here also
+detects PDF output mode if running in V\TeX.
+
+\section{Additional packages}
+This extended \textsf{iftex} is designed to replace the original
+\textsf{iftex} and also the packages
+\textsf{ifetex},
+\textsf{ifluatex},
+\textsf{ifvtex},
+\textsf{ifxetex},
+\textsf{ifpdf}.
+
+This collection includes small packages with these names that include
+the main \textsf{iftex} package, and in some cases define additional
+commands for increased compatibility. These packages should mean that
+authors do not need to change existing documents, although it is
+recommended that new documents use the \textsf{iftex} package
+directly.
+
+
+Note that while this package provides basic support for detecting
+p\TeX\ (Japanese \TeX) variants and is broadly compatible with the
+\textsf{ifptex} package, the \textsf{ifptex} package has many more detailed
+tests for p\TeX\ variants and this package does \emph{not} replace the
+\textsf{ifptex} (or \textsf{ifxptex}) packages, which are maintained
+by their original authors and recommended for Japanese documents that
+need fine control over the Japanese \TeX\ system in use.
+
+\section{Compatibility with \textsf{scrbase}}
+The \textsf{scrbase} package (which is automatically included in the
+popular \textsf{KOMA-Script} classes) by default defines
+\verb|\ifpdftex| and \verb|\ifVTeX| with a different syntax. If you
+use the \textsf{scrbase} option \verb|internalonly| then
+\textsf{scrbase} will not define these and the definitions as
+described here will take effect. This is recommended and will not
+affect any \textsf{scrbase} package code as internally
+\textsf{scrbase} uses private versions of those commands prefixed with
+\verb|\scr@|. However this package detects if the \textsf{scrbase}
+definitions are in effect and if so does not redefine them, for
+compatibility with existing documents. The \textsf{iftex} versions
+will still be available under the names \verb|\ifPDFTeX| and
+\verb|\ifvtex|.
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iftex.doc.tlpobj new/tlpkg/tlpobj/iftex.doc.tlpobj
--- old/tlpkg/tlpobj/iftex.doc.tlpobj 2019-02-28 03:42:25.000000000 +0100
+++ new/tlpkg/tlpobj/iftex.doc.tlpobj 2020-03-08 01:33:32.000000000 +0100
@@ -1,9 +1,9 @@
name iftex.doc
category Package
-revision 29654
+revision 54159
shortdesc doc files of iftex
relocated 1
-docfiles size=10
- RELOC/doc/generic/iftex/README
+docfiles size=56
+ RELOC/doc/generic/iftex/README.md
RELOC/doc/generic/iftex/iftex.pdf
RELOC/doc/generic/iftex/iftex.tex
++++++ iftex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/iftex/ifetex.sty new/tex/generic/iftex/ifetex.sty
--- old/tex/generic/iftex/ifetex.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/generic/iftex/ifetex.sty 2019-11-01 22:55:07.000000000 +0100
@@ -0,0 +1,18 @@
+% Compatibility stub package for ifetex
+
+%% LaTeX3 Project
+%%
+%% 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 original ifetex package was written by Martin Scharrer
+
+\ifx\RequirePackage\undefined
+ \input iftex.sty
+\else
+ \ProvidesPackage{ifetex}[2019/10/25 v1.3 ifetex legacy package. Use iftex instead.]
+ \RequirePackage{iftex}
+ \newcommand*\NeedsETeX[1][]{\RequireeTeX}
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/iftex/ifluatex.sty new/tex/generic/iftex/ifluatex.sty
--- old/tex/generic/iftex/ifluatex.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/generic/iftex/ifluatex.sty 2019-11-01 22:55:07.000000000 +0100
@@ -0,0 +1,17 @@
+% Compatibility stub package for ifluatex
+
+%% LaTeX3 Project
+%%
+%% 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 original ifluatex package was written by Heiko Oberdiek
+
+\ifx\RequirePackage\undefined
+ \input iftex.sty
+\else
+ \ProvidesPackage{ifluatex}[2019/10/25 v1.5 ifluatex legacy package. Use iftex instead.]
+ \RequirePackage{iftex}
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/iftex/ifpdf.sty new/tex/generic/iftex/ifpdf.sty
--- old/tex/generic/iftex/ifpdf.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/generic/iftex/ifpdf.sty 2019-11-01 22:55:07.000000000 +0100
@@ -0,0 +1,17 @@
+% Compatibility stub package for ifpdf
+
+%% LaTeX3 Project
+%%
+%% 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 original ifpdf package was written by Heiko Oberdiek
+
+\ifx\RequirePackage\undefined
+ \input iftex.sty
+\else
+ \ProvidesPackage{ifpdf}[2019/10/25 v3.4 ifpdf legacy package. Use iftex instead.]
+ \RequirePackage{iftex}
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/iftex/iftex.sty new/tex/generic/iftex/iftex.sty
--- old/tex/generic/iftex/iftex.sty 2013-04-05 01:11:11.000000000 +0200
+++ new/tex/generic/iftex/iftex.sty 2020-03-07 22:40:16.000000000 +0100
@@ -1,97 +1,241 @@
+%% iftex TeX engine tests
+
+%% LaTeX3 Project
+%%
+%% 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.
+%%
+%% Using ideas from:
%%
-%% This is file `iftex.sty',
+%% ifetex Martin Scharrer
+%% ifxetex Will Robertson
+%% iftex 0.2 Persian TeX Group / Vafa Khalighi
+%% ifluatex ifvtex Heiko Oberdiek
+%% ifptex Takayuki YATO
+%% ifpdf Heiko Oberdiek and LaTeX3 Project
+
+% Only load once (not needed in LaTeX, but does no harm).
+\csname IFTEX\string @loaded\endcsname
+\expandafter\let\csname IFTEX\string @loaded\endcsname\endinput
+
+% File loadable in initex
+% require { } # with standard catcodes.
+\catcode123=1
+\catcode125=2
+\catcode35=6
-%%
-%% __________________________________
-%% Copyright © 2010–2013 Persian TeX Group
-%%
-%% License information appended.
-%%
-%%
-\csname iftexloaded\endcsname
-\let\iftexloaded\endinput
+
+% ProvidesPackage declaration in LaTeX
+\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{iftex}
- [2013/04/04 v0.2 Provides if(tex) conditional for PDFTeX, XeTeX, and LuaTeX]
+ \ProvidesPackage{iftex}[2020/03/06 v1.0d TeX engine tests]
\fi
-\def\RequirePDFTeX{%
- \ifPDFTeX\else
- \begingroup
- \errorcontextlines=-1\relax
- \newlinechar=10\relax
- \errmessage{^^J
- ********************************************^^J
- * PDFTeX is required to compile this document.^^J
- * Sorry!^^J
- ********************************************}%
- \endgroup
- \fi}
-\def\RequireXeTeX{%
- \ifXeTeX\else
- \begingroup
- \errorcontextlines=-1\relax
- \newlinechar=10\relax
- \errmessage{^^J
- ********************************************^^J
- * XeTeX is required to compile this document.^^J
- * Sorry!^^J
- ********************************************}%
- \endgroup
- \fi}
-\def\RequireLuaTeX{%
- \ifLuaTeX\else
- \begingroup
- \errorcontextlines=-1\relax
- \newlinechar=10\relax
- \errmessage{^^J
- ********************************************^^J
- * LuaTeX is required to compile this document.^^J
- * Sorry!^^J
+
+% Save @ catcode, to restore at end, not needed in LaTeX.
+\expandafter\chardef\csname IFTEX\string @atcatcode\endcsname\catcode64
+\catcode 64 11
+
+% Message format used in several pre-existing if*tex packages
+% Modified here to do a hard stop and not show any error context lines.
+\def\IFTEX@Require#1#2#3{%
+ #1\else
+ \newlinechar 64\relax
+ \errorcontextlines -1\relax
+ \immediate\write20{@
+ ********************************************@
+ * #2 is required to compile this document.@
+ * Sorry!@
********************************************}%
- \endgroup
- \fi}
-\expandafter\ifx\csname ifPDFTeX\endcsname\relax\else
- \expandafter\endinput
+ \batchmode\read -1 to \@tempa
+ #3%
+}
+
+
+% eTeX \protected if available.
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname protected\endcsname\relax
+ \let\IFTEX@protected\relax
+\else
+ \let\IFTEX@protected\protected
\fi
-\expandafter\ifx\csname ifXeTeX\endcsname\relax\else
- \expandafter\endinput
+
+% make sure \detokenize and \protected are available in lualatex,
+% but avoid defining them after the package if not already defined.
+ {
+ \catcode34 12 % "
+ \catcode40 12 % (
+ \catcode41 12 % )
+ \catcode44 12 % ,
+ \catcode46 12 % .
+ \expandafter\ifx\csname directlua\endcsname\relax\else
+ \directlua{tex.enableprimitives("IFTEX@", {"detokenize","protected"})}
+ \fi
+ }
+
+% \Require... commands that stop if the wrong engine detected.
+\IFTEX@protected\def\RequireeTeX{\IFTEX@Require\ifetex{eTeX}\fi}
+\IFTEX@protected\def\RequirePDFTeX{\IFTEX@Require\ifpdftex{pdfTeX}\fi}
+\IFTEX@protected\def\RequireXeTeX{\IFTEX@Require\ifxetex{XeTeX}\fi}
+\IFTEX@protected\def\RequireLuaTeX{\IFTEX@Require\ifluatex{LuaTeX}\fi}
+\IFTEX@protected\def\RequireLuaHBTeX{\IFTEX@Require\ifluahbtex{LuaHBTeX}\fi}
+\IFTEX@protected\def\RequirepTeX{\IFTEX@Require\ifptex{pTeX}\fi}
+\IFTEX@protected\def\RequireupTeX{\IFTEX@Require\ifuptex{upTeX}\fi}
+\IFTEX@protected\def\RequirepTeXng{\IFTEX@Require\ifptexng{pTeX-ng}\fi}
+\IFTEX@protected\def\RequireVTeX{\IFTEX@Require\ifvtex{VTeX}\fi}
+% alephtex as aleph name too generic
+\IFTEX@protected\def\RequireAlephTeX{\IFTEX@Require\ifalephtex{Aleph}\fi}
+% tutex == has \Umathchardef == XeTeX or Lua(HB)TeX currently
+\IFTEX@protected\def\RequireTUTeX{\IFTEX@Require\iftutex{LuaTeX or XeTeX}\fi}
+
+
+% As a matter of policy over-write any existing \if*tex macro and set
+% by the tests here.
+
+% \csname and \let construct useful for hiding \ifzzz tokens from
+% outer level \if tests.
+\def\IFTEX@let#1#2{%
+ \expandafter\let\csname if#1\expandafter\endcsname
+ \csname if#2\endcsname}
+
+% etex (should always be true in latex based formats)
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+ \IFTEX@let{etex}{false}
+\else
+ \IFTEX@let{etex}{true}
\fi
-\expandafter\ifx\csname ifLuaTeX\endcsname\relax\else
- \expandafter\endinput
+\IFTEX@let{eTeX}{etex}
+
+% pdftex (including in dvi mode)
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdftexversion\endcsname\relax
+ \IFTEX@let{pdftex}{false}
+\else
+ \IFTEX@let{pdftex}{true}
\fi
-\newif\ifPDFTeX
+\IFTEX@let{PDFTeX}{pdftex}
+
+% xetex
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfmatch\endcsname\relax
- \PDFTeXfalse
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \IFTEX@let{xetex}{false}
\else
- \PDFTeXtrue
+ \IFTEX@let{xetex}{true}
\fi
-\newif\ifXeTeX
+\IFTEX@let{XeTeX}{xetex}
+
+
+% luatex (including luahbtex)
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax
- \XeTeXfalse
+\expandafter\ifx\csname directlua\endcsname\relax
+ \IFTEX@let{luatex}{false}
\else
- \XeTeXtrue
+ \IFTEX@let{luatex}{true}
\fi
-\newif\ifLuaTeX
+\IFTEX@let{LuaTeX}{luatex}
+
+
+% luahbtex (or luatex + luaharfbuzz)
+% Use luaharfbuzz test rather than status.luatex_engine=="luahbtex"
+% for issue #2.
+\IFTEX@let{luahbtex}{false}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname directlua\endcsname\relax
- \LuaTeXfalse
\else
- \LuaTeXtrue
+ \directlua{\IFTEX@detokenize{
+ if(pcall(require, 'luaharfbuzz')) then
+ tex.print("\\let\\ifluahbtex\\iftrue ")
+ end
+ }}
+
\fi
-%%
-%% Copyright © 2010–2013 by Persian TeX Group <persian-tex(a)tug.org>
-%%
-%% 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 "maintained" (as per LPPL maintenance status)
-%% by Persian TeX Group.
-%%
-%%
-%%
-%%
-%%
-%% End of file `iftex.sty'.
+\IFTEX@let{LuaHBTeX}{luahbtex}
+
+
+% ptex (including all variants)
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname kanjiskip\endcsname\relax
+ \IFTEX@let{ptex}{false}
+\else
+ \IFTEX@let{ptex}{true}
+\fi
+\IFTEX@let{pTeX}{ptex}
+
+% uptex (including euptex)
+\ifx\enablecjktoken \@undefined
+ \IFTEX@let{uptex}{false}
+\else
+ \IFTEX@let{uptex}{true}
+\fi
+\IFTEX@let{upTeX}{uptex}
+
+% ptex-ng
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ngbanner\endcsname\relax
+ \IFTEX@let{ptexng}{false}
+\else
+ \IFTEX@let{ptexng}{true}
+\fi
+\IFTEX@let{pTeXng}{ptexng}
+
+% vtex
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname VTeXversion\endcsname\relax
+ \IFTEX@let{vtex}{false}
+\else
+ \IFTEX@let{vtex}{true}
+\fi
+\IFTEX@let{VTeX}{vtex}
+
+% aleph
+\IFTEX@let{alephtex}{false}
+\ifptex\else
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname omathchardef\endcsname\relax
+\else
+ \IFTEX@let{alephtex}{true}
+\fi
+\fi
+\IFTEX@let{AlephTeX}{alephtex}
+
+
+% tutex (LuaTeX or XeTeX)
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname Umathchardef\endcsname\relax
+ \IFTEX@let{tutex}{false}
+\else
+ \IFTEX@let{tutex}{true}
+\fi
+\IFTEX@let{TUTeX}{tutex}
+
+% Output mode
+% declare as if with \newif
+\def\pdftrue{\let\ifpdf\iftrue}
+\def\pdffalse{\let\ifpdf\iffalse}
+\pdffalse
+\ifluatex
+\directlua{\IFTEX@detokenize{
+if (tex.outputmode or tex.pdfoutput or 0) > 0 then
+ tex.print('\\pdftrue')
+end
+}}
+\else
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdfoutput\endcsname\relax
+\ifvtex
+ \ifnum\OpMode=3 %
+ \pdftrue
+ \fi
+\fi
+\else
+ \ifnum\pdfoutput>0 %
+ \pdftrue
+ \fi
+\fi
+\fi
+
+
+% restore things
+\catcode64 \IFTEX@atcatcode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/iftex/ifvtex.sty new/tex/generic/iftex/ifvtex.sty
--- old/tex/generic/iftex/ifvtex.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/generic/iftex/ifvtex.sty 2019-11-01 22:55:07.000000000 +0100
@@ -0,0 +1,45 @@
+% Compatibility stub package for ifvtex
+
+%% LaTeX3 Project
+%%
+%% 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 original ifvtex package was written by Heiko Oberdiek
+
+\ifx\RequirePackage\undefined
+ \input iftex.sty
+\else
+ \ProvidesPackage{ifvtex}[2019/10/25 v1.7 ifvtex legacy package. Use iftex instead.]
+ \RequirePackage{iftex}
+\fi
+
+
+\IFTEX@let{vtexdvi}{false}
+\IFTEX@let{vtexpdf}{false}
+\IFTEX@let{vtexps}{false}
+\IFTEX@let{vtexhtml}{false}
+\IFTEX@let{vtexgex}{false}
+
+\ifvtex
+ \ifcase\OpMode\relax
+ \IFTEX@let{vtexdvi}{true}
+ \or % 1
+ \IFTEX@let{vtexpdf}{true}
+ \or % 2
+ \IFTEX@let{vtexps}{true}
+ \or % 3
+ \IFTEX@let{vtexps}{true}
+ \or\or\or\or\or\or\or % 10
+ \IFTEX@let{vtexhtml}{true}
+ \fi
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname gexmode\endcsname\relax
+ \else
+ \ifnum\gexmode>0 %
+ \IFTEX@let{vtexgex}{true}
+ \fi
+ \fi
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/iftex/ifxetex.sty new/tex/generic/iftex/ifxetex.sty
--- old/tex/generic/iftex/ifxetex.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/generic/iftex/ifxetex.sty 2019-11-01 22:55:07.000000000 +0100
@@ -0,0 +1,17 @@
+% Compatibility stub package for ifxetex
+
+%% LaTeX3 Project
+%%
+%% 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 original ifxetex package was written by Will Robertson
+
+\ifx\RequirePackage\undefined
+ \input iftex.sty
+\else
+ \ProvidesPackage{ifxetex}[2019/10/25 v0.7 ifxetex legacy package. Use iftex instead.]
+ \RequirePackage{iftex}
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iftex.tlpobj new/tlpkg/tlpobj/iftex.tlpobj
--- old/tlpkg/tlpobj/iftex.tlpobj 2019-02-28 03:42:25.000000000 +0100
+++ new/tlpkg/tlpobj/iftex.tlpobj 2020-03-08 01:33:32.000000000 +0100
@@ -1,6 +1,6 @@
name iftex
category Package
-revision 29654
+revision 54159
shortdesc Am I running under pdfTeX, XeTeX or LuaTeX?
relocated 1
longdesc The package, which works both for Plain TeX and for LaTeX,
@@ -9,13 +9,17 @@
longdesc also provides the \RequirePDFTeX, \RequireXeTeX, and
longdesc \RequireLuaTeX commands which throw an error if pdfTeX, XeTeX
longdesc or LuaTeX (respectively) is not the engine in use.
-runfiles size=1
+runfiles size=7
+ RELOC/tex/generic/iftex/ifetex.sty
+ RELOC/tex/generic/iftex/ifluatex.sty
+ RELOC/tex/generic/iftex/ifpdf.sty
RELOC/tex/generic/iftex/iftex.sty
-catalogue-also ifpdf ifluatex
-catalogue-contact-bugs https://github.com/bidi-tex/iftex/issues
-catalogue-contact-repository https://github.com/bidi-tex/iftex
+ RELOC/tex/generic/iftex/ifvtex.sty
+ RELOC/tex/generic/iftex/ifxetex.sty
+catalogue-also ifetex ifluatex ifpdf ifvtex ifxetex
+catalogue-contact-bugs https://github.com/latex3/iftex/issues
+catalogue-contact-repository https://github.com/latex3/iftex
catalogue-ctan /macros/latex/contrib/iftex
-catalogue-date 2018-11-28 19:50:39 +0100
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics env-query
-catalogue-version 0.2
+catalogue-version 1.0d
++++++ impatient-cn.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/impatient-cn.doc.tlpobj new/tlpkg/tlpobj/impatient-cn.doc.tlpobj
--- old/tlpkg/tlpobj/impatient-cn.doc.tlpobj 2019-02-28 03:42:33.000000000 +0100
+++ new/tlpkg/tlpobj/impatient-cn.doc.tlpobj 2020-03-04 23:51:07.000000000 +0100
@@ -1,6 +1,6 @@
name impatient-cn.doc
category Package
-revision 45751
+revision 54080
shortdesc doc files of impatient-cn
relocated 1
docfiles size=1289
++++++ impatient-fr.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/impatient-fr.doc.tlpobj new/tlpkg/tlpobj/impatient-fr.doc.tlpobj
--- old/tlpkg/tlpobj/impatient-fr.doc.tlpobj 2019-02-28 03:42:36.000000000 +0100
+++ new/tlpkg/tlpobj/impatient-fr.doc.tlpobj 2020-03-04 23:51:08.000000000 +0100
@@ -1,6 +1,6 @@
name impatient-fr.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of impatient-fr
relocated 1
docfiles size=625
++++++ impatient.doc.tar.xz ++++++
++++ 4430 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/ChangeLog new/doc/plain/impatient/ChangeLog
--- old/doc/plain/impatient/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/plain/impatient/ChangeLog 2020-01-04 23:06:54.000000000 +0100
@@ -0,0 +1,100 @@
+2020-01-03 Karl Berry <karl(a)freefriends.org>
+
+ * Version 2020 released to ctan.org.
+
+ * config.tex: make non-empty for CTAN.
+ * Makefile (files): include cn fr artwork subdirs for CTAN.
+
+2020-01-02 Karl Berry <karl(a)freefriends.org>
+
+ * README: mention diffs/ subdir, etc.
+ * NEWS: urls for previous releases; remove autoconfery.
+ * preface.tex: give ctan url at end of preface, and no email.
+
+2020-01-01 Karl Berry <karl(a)freefriends.org>
+
+ * book.sdx (\unorderedlist): correct name from \unnumberedlist
+ index entry. Manually edited generated index file here.
+ (PDF p.388 = printed p.368)
+
+ * concepts.tex (class): has class, not is in class. (PDF p.76 =
+ printed p.56)
+
+ * concepts.tex (category code, character): reword to reduce
+ confusion of (say) character code 65 with
+ typesetting a letter A.
+ Also, it's not plain tex that defines what the catcodes are.
+ Lots more could be done. (PDF pp.74-75 = printed pp.54-55)
+
+ * concepts.tex (category code): explicit kern to avoid $c$grok
+ without space. (PDF p.73 = printed p.53)
+
+ * xmptext.tex (A ruled table): fl would be a ligature.
+ * xmptext.tex (A ruled table): reword \vtop comment.
+ (PDF p.57 = printed p.37)
+
+ * usingtex.tex (Math formulas): mention that \TeX\ does its own
+ spacing math. (PDF p.36 = printed p.16)
+
+ * usingtex.tex (Spaces): supposed to produce -> supposed to
+ do. (PDF p.32 = printed p.12)
+
+ * usebook.tex: mention that chapter (section) 13 is also random access.
+ (PDF p.21 = printed p.1)
+
+ * genops.tex: avoid horrible language list that's now in
+ \fmtversion, running off the page. (PDF p.245 = printed p.225)
+
+ * usingtex.tex: force \eject to avoid underfull \vbox.
+ (PDF p.34 = printed p.14)
+
+ * macros.tex (\hand): the right-pointing hand is \char"2B in
+ pzdr. Report from Will Adams.
+
+ * xmptext.tex: "pages 97 and 100", using new \xrefndelim.
+ (PDF p.46 = printed p.26)
+ * macros.tex (\xrefndelim): new macro.
+
+2020-01-01 Karl Berry <karl(a)freefriends.org>
+
+ Because we no longer have that erroneous extra stretchability from
+ the \fontdimen example:
+
+ * fdl.tex: use \spaceskip twice to avoid overfull boxes.
+
+ * genops.tex (\showlists): reword to avoid overfull box.
+ (PDF p.273 = printed p.253)
+
+ * genops.tex: reword "stream numbers...\newread" sentence to
+ avoid overfull box. (PDF p.268 = printed p.248)
+
+2020-01-01 Karl Berry <karl(a)freefriends.org>
+
+ Following bugs reported recently by David Fuchs,
+ and by others in the past:
+
+ * paras.tex (\parshape): explicitly save and restore \fontdimen
+ since those assignments are global. Mention this in description.
+ (PDF pp.138-9 = printed pp.118-9)
+
+ * genops.tex (Naming and reserving registers, etc.): reword first
+ item to avoid the doubling of \fontdimen3, which is not grouped,
+ thus affects all subsequent text (!). (PDF p.264 = printed p.244)
+
+ (\fontdimen): show the save and restore of \fontdimen value
+ in the example. (PDF p.243 = printed p.223)
+
+ * paras.tex (\everypar): remove \vglue hack for \secondprinting
+ to avoid overwriting text. A blank line before \example solves it
+ well enough. (PDF p.133 = printed p.113)
+
+ * errata.future: page 113 overlap now fixed; updates for all other
+ changes as needed.
+
+2020-01-01 Karl Berry <karl(a)freefriends.org>
+
+ * copyrght.tex: 2020
+
+ * Start from CTAN release of 13 November 2014 (393 PDF pages).
+ The version at https://savannah.gnu.org/projects/teximpatient has
+ been moved to git, but, it seems, no substantive changes made.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/Makefile new/doc/plain/impatient/Makefile
--- old/doc/plain/impatient/Makefile 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/Makefile 2020-01-04 23:06:54.000000000 +0100
@@ -1,15 +1,20 @@
+# $Id: Makefile,v 1.2 2020/01/03 22:17:40 karl Exp $
# public domain
all: book.dvi book.pdf #book.html
-book.dvi: fdl.tex preface.tex
- tex '\nonstopmode\input book'
-book.pdf: fdl.tex preface.tex
- pdftex '\nonstopmode\input book'
+book.dvi: *.tex
+ texfot tex '\nonstopmode\input book'
+book.pdf: *.tex
+ texfot pdftex '\nonstopmode\input book'
book.html:
httex book.tex
+files = ChangeLog Makefile NEWS README *.icn \
+ *.tex book.aux book.idx book.toc book.ccs book.sdx book.pdf \
+ diffs cn fr artwork
+
+dist = impatient
dist: all
rm -f x.tex
- tar czf impatient.tgz Makefile README *.icn \
- *.tex book.aux book.idx book.toc book.ccs book.sdx \
- book.dvi book.pdf
+ tar -czf $(dist).tar.gz --transform='s,^,$(dist)/,' $(files)
+ tar tf $(dist).tar.gz | head -4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/NEWS new/doc/plain/impatient/NEWS
--- old/doc/plain/impatient/NEWS 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/NEWS 2020-01-04 23:06:54.000000000 +0100
@@ -1,21 +1,34 @@
-$Id: NEWS,v 1.3 2014/11/13 17:07:59 karl Exp $
+$Id: NEWS,v 1.3 2020/01/02 23:44:18 karl Exp $
This NEWS file records noteworthy changes, very tersely.
- Copyright 2013, 2014 Karl Berry.
+ Copyright 2013-2020 Karl Berry.
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.
+ Version 2020
+- released on ctan.org only, as someone else is maintaining the GNU package.
+- small bug fixes to text; see ChangeLog.
+- remove Autoconf infrastructure, too much for here.
+- still looking for a maintainer; see README and errata.future for ideas.
+ I (Karl) don't plan to make further releases unless significant bugs
+ are found.
Version 2.4 (13 November 2014)
- Chinese translation.
- fixes from new Chinese translator, Zou Hu.
+- available from https://ftp.gnu.org/gnu/teximpatient/teximpatient-2.4.tar.gz
Version 2.3 (21 May 2013)
- first release on ftp.gnu.org. Now looking for a maintainer.
-- update to GFDLv1.3.
+- update to GFDLv1.3+.
- simple configure script and Makefile added.
- no changes to the text.
- There is now a `NEWS' file (this one), giving a history of
user-visible changes.
+- available from https://ftp.gnu.org/gnu/teximpatient/teximpatient-2.3.tar.gz
+
+ first free edition.
+- available from https://tug.org/historic/
+ as systems/texlive/2011/tlnet-final/archive/impatient.doc.tar.xz.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/README new/doc/plain/impatient/README
--- old/doc/plain/impatient/README 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/README 2020-01-04 23:06:54.000000000 +0100
@@ -1,27 +1,32 @@
-$Id: README,v 1.5 2014/11/13 17:07:59 karl Exp $
-This is the README file for the GNU (free documentation) edition of the
+$Id: README,v 1.2 2020/01/02 23:36:14 karl Exp $
+This is the README file for the CTAN (free documentation) edition of the
book TeX for the Impatient, released under the GNU Free Documentation
License. (This README file itself is public domain.)
-Primary distribution point: ftp://ftp.gnu.org/gnu/teximpatient/
- automatic redirection: http://ftpmirror.gnu.org/teximpatient
- list of mirrors for manual selection: http://www.gnu.org/prep/ftp.html
-
-Home page: http://www.gnu.org/software/teximpatient/
-
-Development sources, etc.: http://savannah.gnu.org/projects/teximpatient/
-
Information about the free edition is included at the end of the preface
and on the copyright page.
-A French translation is included in the distribution,
-and a Chinese translation is at https://bitbucket.org/zohooo/impatient
-(with PDF at
-http://zoho.is-programmer.com/user_files/zoho/epics/tex-impatient-cn.pdf).
+Home page: https://ctan.org/pkg/impatient/
+Chinese and French translations (independently maintained), as well as
+all sources and PDFs, are available from there.
+
+The book is looking for a maintainer; see README and errata.future for
+ideas. I (Karl) don't plan to make any more releases, unless significant
+bugs are found. But you can email me at karl(a)freefriends.org if need be.
+
+For convenience, the diffs between all the free releases
+are in the diffs/ subdirectory. To download the full releases, see
+the urls in NEWS.
+
+
+There is also a GNU package for the book, which is maintained
+separately. Its home page: https://gnu.org/software/teximpatient/
+The GNU version does not, at this writing, include the fixes made in
+2020 (see NEWS and ChangeLog).
Original high-resolution scans of the artwork are available from
http://ftpmirror.gnu.org/teximpatient/artwork. Reduced-size bitmaps are
-in the artwork/ subdirectory here.
+in the artwork/ subdirectory on CTAN.
Some random thoughts for people thinking of working with the source:
@@ -29,8 +34,8 @@
- See errata.future for some relatively small ideas for enhancements.
- You may want to translate the source into some more standard
-format, such as Texinfo; we used many homegrown macros mostly to make
-typing and markup easier.
+format, such as Texinfo; we used many homegrown macros, mostly just
+to make typing and markup easier.
- You may also want to redo the index creation to use makeindex or some
other standard program, instead of the homegrown Icon programs (or else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/book.ccs new/doc/plain/impatient/book.ccs
--- old/doc/plain/impatient/book.ccs 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/plain/impatient/book.ccs 2020-01-04 23:06:54.000000000 +0100
@@ -0,0 +1,94 @@
+\doconcept{active character}{43}
+\doconcept{alignment}{44}
+\doconcept{anatomy of T\kern -.1667em\lower .5ex\hbox {E}\kern -.125emX\hbox {}\hbox {}}{46}
+\doconcept{argument}{48}
+\doconcept{ASCII}{49}
+\doconcept{assignment}{49}
+\doconcept{badness}{50}
+\doconcept{baseline}{51}
+\doconcept{box}{51}
+\doconcept{category code}{53}
+\doconcept{character}{55}
+\doconcept{class}{56}
+\doconcept{command}{56}
+\doconcept{conditional test}{57}
+\doconcept{control sequence}{57}
+\doconcept{control symbol}{58}
+\doconcept{control word}{58}
+\doconcept{decimal constant}{58}
+\doconcept{delimiter}{58}
+\doconcept{demerits}{60}
+\doconcept{depth}{60}
+\doconcept{dimension}{60}
+\doconcept{display math}{61}
+\doconcept{escape character}{61}
+\doconcept{family}{62}
+\doconcept{file}{62}
+\doconcept{file name}{63}
+\doconcept{font}{64}
+\doconcept{footer}{65}
+\doconcept{format file}{65}
+\doconcept{global}{65}
+\doconcept{glue}{66}
+\doconcept{group}{68}
+\doconcept{hbox}{69}
+\doconcept{header}{69}
+\doconcept{height}{69}
+\doconcept{horizontal list}{69}
+\doconcept{horizontal mode}{69}
+\doconcept{hyphenation}{70}
+\doconcept{input stream}{70}
+\doconcept{insertion}{70}
+\doconcept{interline glue}{70}
+\doconcept{item}{71}
+\doconcept{justified text}{71}
+\doconcept{kern}{71}
+\doconcept{leaders}{72}
+\doconcept{ligature}{73}
+\doconcept{line break}{74}
+\doconcept{list}{75}
+\doconcept{log file}{75}
+\doconcept{macro}{75}
+\doconcept{magnification}{78}
+\doconcept{margins}{79}
+\doconcept{mark}{79}
+\doconcept{math mode}{80}
+\doconcept{mathcode}{80}
+\doconcept{mathematical unit}{81}
+\doconcept{mode}{81}
+\doconcept{muglue}{82}
+\doconcept{number}{82}
+\doconcept{ordinary mode}{83}
+\doconcept{outer}{83}
+\doconcept{output routine}{83}
+\doconcept{output stream}{84}
+\doconcept{page}{84}
+\doconcept{page break}{85}
+\doconcept{page builder}{86}
+\doconcept{page layout}{86}
+\doconcept{paragraph}{86}
+\doconcept{parameter}{87}
+\doconcept{penalty}{88}
+\doconcept{plain T\kern -.1667em\lower .5ex\hbox {E}\kern -.125emX\hbox {}\hbox {}}{88}
+\doconcept{primitive}{88}
+\doconcept{reference point}{88}
+\doconcept{register}{89}
+\doconcept{restricted mode}{90}
+\doconcept{rule}{90}
+\doconcept{script size}{91}
+\doconcept{scriptscript size}{91}
+\doconcept{shrink}{91}
+\doconcept{space}{91}
+\doconcept{stretch}{92}
+\doconcept{strut}{92}
+\doconcept{style}{92}
+\doconcept{T\kern -.1667em\lower .5ex\hbox {E}\kern -.125emX\hbox {}\hbox {}\ M\kern -.11em\lower .5ex\hbox {E}\kern -.125em X\hbox {}}{93}
+\doconcept{text math}{93}
+\doconcept{text size}{93}
+\doconcept{token}{93}
+\doconcept{unit of measure}{93}
+\doconcept{vbox}{94}
+\doconcept{vertical list}{94}
+\doconcept{vertical mode}{94}
+\doconcept{whatsit}{94}
+\doconcept{width}{95}
Binary files old/doc/plain/impatient/book.pdf and new/doc/plain/impatient/book.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/book.sdx new/doc/plain/impatient/book.sdx
--- old/doc/plain/impatient/book.sdx 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/book.sdx 2020-01-04 23:06:54.000000000 +0100
@@ -1562,7 +1562,7 @@
\indexentry {0}{unhcopy}{C}{\ic \pp{165}\c 337}
\indexentry {0}{units of measure}{N}{\ic 60\c 61\c \pp{93}}
\indexentry {0}{unkern}{C}{\ic \pp{172}\c 337}
-\indexentry {0}{unnumberedlist}{C}{\ic \pp{298}}
+\indexentry {0}{unorderedlist}{C}{\ic \pp{298}}
\indexentry {0}{unpenalty}{C}{\ic \pp{172}\c 337}
\indexentry {0}{unskip}{C}{\ic \pp{172}\c 337}
\indexentry {0}{unvbox}{C}{\ic \pp{165}\c 337}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/concepts.tex new/doc/plain/impatient/concepts.tex
--- old/doc/plain/impatient/concepts.tex 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/concepts.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: concepts.tex,v 1.5 2020/01/01 23:55:26 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -755,7 +756,7 @@
(the usual escape character) is $92$. If
you type `|\char92 grok|', it is \emph{not} equivalent to |\grok|.
Instead it tells \TeX\ to
-typeset `$c$grok', where $c$ is the character in position $92$
+typeset `$c$\kern.075em grok', where $c$ is the character in position $92$
of the code table for the current font.
You can use the ^|\catcode| command \ctsref{\catcode} to reassign the
@@ -765,10 +766,11 @@
to ``letter''. You then can use `|@|' in the name of a control
sequence.
-Here is a list of the category codes as they're defined in
-\refterm{\plainTeX} (see \xref{twocarets} for an explanation of
+Here is a list of the category codes defined by \TeX,
+(see \xref{twocarets} for an explanation of
the |^^| notation),
-together with the characters in each category:
+together with the characters in each category (as assigned
+by \TeX\ and \refterm{\plainTeX}):
\xrdef{catcodes}
\vskip\abovedisplayskip
@@ -841,8 +843,7 @@
The characters in categories $11$ (letter) and $12$
(other character) act as \refterm{commands:command}
that mean
-``produce a \refterm{box} containing this character
-typeset in the current font''.
+``typeset the character with this code from the current font''.
The only distinction between letters and ``other'' characters is
that letters can appear in \refterm{control word}s but
``other'' characters~can't.
@@ -874,7 +875,7 @@
\csdisplay
\def\foo{\catcode`\$ = 11 }% Make $ be a letter.
\foo$ % Produces a `$'.
-\foo$ % Undefined control sequence `foo$'.
+\foo$ % Undefined control sequence `\foo$'.
|
\noindent
This bit of \TeX\ code produces `\$' in the typeset output. When
@@ -968,11 +969,12 @@
An output character is a character to be typeset.
A command for producing an output character has the meaning
-``Produce a \refterm{box} containing
+``Typeset
character number $n$ from the current \refterm{font}'',
where $n$ is determined by the command.
-\TeX\ produces your typeset document by combining such boxes with
-other typographical \hbox{elements} and arranging them
+\TeX\ produces your typeset document by combining such characters
+with
+other typographical \hbox{elements} in boxes, and arranging them
on the page.
An input character whose category code is $11$ (^{letter}) or $12$ (other)
@@ -992,7 +994,7 @@
The \defterm{class} of a \refterm{character} specifies that character's
role in math formulas. The class of a character is encoded in its
\refterm{mathcode}. ^^{mathcodes//class encoded in} For example, the
-equals sign `|=|' is in class $3$ (Relation). \TeX\ uses its knowledge
+equals sign `|=|' has class $3$ (Relation). \TeX\ uses its knowledge
of character classes to decide how much space to put between different
components of a math formula. \margin{clarifying material added} For
example, here's a math formula shown first as \TeX\ normally prints it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/config.tex new/doc/plain/impatient/config.tex
--- old/doc/plain/impatient/config.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/config.tex 2020-01-04 23:06:54.000000000 +0100
@@ -0,0 +1,7 @@
+% $Id: config.tex,v 1.2 2020/01/03 22:06:33 karl Exp $
+% This is part of the book TeX for the Impatient.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% See file fdl.tex for copying conditions.
+%
+% Configuration overrides for typesetting TeX for the Impatient.
+% See macros.tex for some of the possible conditionals.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/configure.ac new/doc/plain/impatient/configure.ac
--- old/doc/plain/impatient/configure.ac 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/configure.ac 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-dnl $Id: configure.ac,v 1.4 2014/11/13 17:08:00 karl Exp $
-dnl public domain
-dnl configure.ac for TeX for the Impatient.
-
-AC_INIT([teximpatient], [2.4], [impatient(a)tug.org])
-AC_CONFIG_SRCDIR([book.tex])
-
-AC_PROG_INSTALL
-AC_PROG_MKDIR_P
-AC_PATH_PROG([ICON], [icon])
-AC_PATH_PROG([TEX], [tex])
-AC_PATH_PROG([PDFTEX], [pdftex])
-AC_PATH_PROG([HTTEX], [httex])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/copyrght.tex new/doc/plain/impatient/copyrght.tex
--- old/doc/plain/impatient/copyrght.tex 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/copyrght.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: copyrght.tex,v 1.2 2020/01/01 19:15:37 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003, 2013 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -20,7 +21,7 @@
\bigskip
-\noindent Copyright \copyright{} 2003, 2013 Paul~W. Abrahams,
+\noindent Copyright \copyright{} 2003--2020 Paul~W. Abrahams,
Kathryn~A. Hargreaves, and Karl Berry.
\bigskip
Binary files old/doc/plain/impatient/diffs/impatient-2.0-2.3.diff.gz and new/doc/plain/impatient/diffs/impatient-2.0-2.3.diff.gz differ
Binary files old/doc/plain/impatient/diffs/impatient-2.3-2.4.diff.gz and new/doc/plain/impatient/diffs/impatient-2.3-2.4.diff.gz differ
Binary files old/doc/plain/impatient/diffs/impatient-2.4-2020.diff.gz and new/doc/plain/impatient/diffs/impatient-2.4-2020.diff.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/errata.future new/doc/plain/impatient/errata.future
--- old/doc/plain/impatient/errata.future 2011-01-29 00:17:53.000000000 +0100
+++ new/doc/plain/impatient/errata.future 2020-01-04 23:06:54.000000000 +0100
@@ -1,39 +1,31 @@
-$Id: errata.future,v 1.2 2011/01/27 22:16:24 karl Exp $
+$Id: errata.future,v 1.7 2020/01/02 23:45:45 karl Exp $
-Ideas for future changes. Did not make these in the free edition since
-I didn't want to change the page breaks because I didn't want to install
-Icon so I could regenerate the index -- aside from lack of time and
-inclination. :) See the README.
+Ideas for future changes. (This file is public domain.)
+Did not make these in the free edition since I didn't want to change the
+page breaks because I didn't want to install Icon (or more likely
+rewrite to use makeindex or texindex) so I could regenerate the index.
+See the README.
- incorporate the images in the artwork/ subdirectory.
- discuss CTAN, other Internet resources, plain or generic macro
packages, and so on.
-- extend with descriptions of e-TeX, pdftex, omega.
+- extend with descriptions of e-TeX, pdftex, xetex, luatex.
-- html output, perhaps using tex2page.
- http://www.ccs.neu.edu/home/dorai/tex2page/tex2page-doc.html
- (tex4ht did nothing useful with it, but maybe with work ...)
+- html output, perhaps using tex2page,
+ http://www.ccs.neu.edu/home/dorai/tex2page/tex2page-doc.html
+ though more likely using tex4ht, with work:
+ https://tug.org/tex4ht
+- use pdftex's hz line breaking for better-looking paragraphs (and to
+ reduce rewriting for overfull boxes).
-from Will Adams:
- - p. 105 (and throughout) the encoding for Zapf Dingbats doesn't
-agree w/ what was used and instead of a right pointing hand dingbat, a
-Star of David appears on the .pdf
-
- - p. 113 - text overlaps / crashes here, I think 'cause some stuff
-escaped out of Verbatim mode.
-
- - colophon - this appears on a verso, not a recto, which I find a bit odd.
-
-One last bit of consideration is how you want to handle the cover /
-frontmatter.
-
-
-from Karl and Kathy:
+
+From Karl and Kathy (now in 2020 ... some of these changes seem unnecessary
+to Karl, but leaving them listed for any future maintainer to consider):
* The default values should probably be in roman everywhere. I don't
think `6pt plus 1pt minus 2pt' looks bad in roman any more, which was
@@ -73,28 +65,15 @@
too high and too far to the left. This is probably a consequence of
\chapter changing and \shortchapter not.
-
+
(The rest of the changes are by page number.)
-1 Section 13 is also designed to be accessed randomly. Also, wouldn't it
-be better to use section names as well as numbers?
+1 It would be nice to use section names as well as numbers.
7 (first para) local information tells you => local information will
tell you, since they couldn't have found it yet.
-9 (first para) by typing something => by first typing something, since
-they have to do more to input screed.
-(bottom) unclosed left parenthesis => unmatched left parenthesis.
-
-10 The third in the subsection (with ``typeset me'') looks like it has
-extra space in it.
-
-12 (bottom) supposed to produce => supposed to do, because the macro
-might not be supposed to produce anything at all.
-
-16 Say that TeX does its own spacing in formulas. This is probably the
-most crucial fact about doing math in TeX. Index `spacing, in formulas'
-and `formulas, spacing in'.
+16 Index `spacing, in formulas' and `formulas, spacing in'.
(math formulas) can appear in text ... or set off => can appear in
text ... or can appear set off, for structure.
enclose a text formula in => enclose a text formula within
@@ -109,8 +88,8 @@
(bottom) is defined in plain TeX => is either a primitive or defined
in plain TeX.
-22 You use the en-dash in the place where an em-dash should be in the
-last sentence.
+22 There's an en-dash in the place (before the first "like so") where an
+em-dash should be in the last sentence. Needs rewording.
23 (three instances near the top) The comments should have periods at
the end and be capitalized properly. We are remarkably inconsistent on
@@ -123,13 +102,6 @@
hard time => If we hadn't ..., you would have had ..., to remove the
time warp.
-25 % The left brace start => % The { starts, to shorten the line.
-(middle) % Skips like this => % Skips like that, because one of the
-skips was just given.
-
-26 fonts won't give you => fonts don't give you
-page 100 and page 97 => pages 97 and 100
-
32 (bottom) try to use these commands => try to use those commands,
since the commands are above the comment.
Also, they can get lists with more levels than one by using the Eplain
@@ -138,12 +110,6 @@
34 The title might be better as `Using non-Computer Modern fonts' or
something, since we haven't said what the first source is.
-37 (towards the top) => Use \vtop for short multiline entries => Use
-\vtop to get whole paragraphs, since ``multiline entries'' is a pretty
-stupid term (that I wrote).
-(towards the bottom) % without the kern, the `f' and `l' would be too
-close => % Without the kern, the `f' and `l' would be a ligature.
-
44 (after example input) Put the page reference (p.176) after the
`\settabs 2 \columns'.
@@ -168,19 +134,6 @@
(the list) the box (or rule) => the box or rule, because the rule
case isn't subordinate or anything. This is in both items.
-53 In `cgrok', the `c' is too close to the `grok'. I realize it
-shouldn't be a full space, but right now they're practically touching.
-Italic correction? Explicit space?
-
-54 (first line) It would be nice to say the names of categories 11--13.
-(third para from top) Chars in categories 11 and 12 don't mean
-``produce a box containing this character typeset in the current font''.
-They don't produce a box, for one thing. And they don't typeset ``this
-character'', either. They typeset whatever is in the font at their
-character code. I don't know how you want to explain this, but I think
-this is seriously wrong.
-(example) control sequence `foo$' => control sequence `\foo$'
-
55 (second para) Same problem with characters vs. character code. The
input letter `h' is not transformed into the letter `h' typeset in the
current font. It's transformed into the character at position 104.
@@ -192,15 +145,6 @@
(two more paras) An example showing the 64 less/greater stuff would be
nice.
-56 (under class) is in class 3 => has class 3, because the class is
-really an attribute of a character, not an external set of characters.
-(before class example) Wouldn't ``arbitrarily changed'' be better
-than ``randomly changed''? (Unless you really used a random number
-generator.)
-(first para of command concept): same problem with characters. TeX
-doesn't construct a box containing that character typeset in the current
-font.
-
57 (under control sequence) with an escape character, usually a
backslash (\) => with an escape character, which is usually the
backslash character, since \ isn't always an escape character.
@@ -234,7 +178,7 @@
66 (example) the shrinks are 1 and 3, whereas the shrinks on the next
page are 2 and 6. Might as well make them all the same.
-69 {\TeX} => \TeX{} (if we must keep this horrible example).
+69 {\TeX} => \TeX{} (if we must keep this example).
71 The item concept is pretty useless as it is; it would be nice to say
what the possible items were, and clearly distinguish items from tokens,
@@ -243,8 +187,8 @@
72 (towards the bottom) insured that the dots => made the dots, because
we've done something active than ``insure''.
-73 (ligature) the '' and , in office'', aren't kerned. You put
-``office'' in an \hbox for some reason.
+73 (ligature) the '' and , in office'', aren't kerned. The word
+``office'' is in an \hbox, not sure why.
80 (math mode) Should say that display math gives you space above and
below the formula.
@@ -257,12 +201,10 @@
217 \mathsurround should make an index entry for `formulas, spacing
around' or something like that.
-224 I think `Converting information to tokens' is really a misnomer.
-How about just calling it `Conversions' and making `Environmental
-information' its own section.
+224 I think `Converting information to tokens' is really a misnomer.
+Maybe just call it `Conversions' and making `Environmental information'
+its own section.
263 `Ending the job' should be next to `Initializing TeX'.
294 Have an index entry for `logos'.
-
-298 \unnumberedlist has become \unorderedlist.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/fdl.tex new/doc/plain/impatient/fdl.tex
--- old/doc/plain/impatient/fdl.tex 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/fdl.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,3 +1,4 @@
+% $Id: fdl.tex,v 1.3 2020/01/01 23:22:02 karl Exp $
% This file is a chapter. It must be included in a larger document to work
% properly.
@@ -104,6 +105,7 @@
An image format is not Transparent if used for any substantial amount
of text. A copy that is not ``Transparent'' is called ``Opaque''.
+{\spaceskip = 3.33pt plus 4pt
Examples of suitable formats for Transparent copies include plain
ASCII without markup, Texinfo input format, \LaTeX\ input format, SGML
or XML using a publicly available DTD, and standard-conforming simple
@@ -113,7 +115,7 @@
proprietary word processors, SGML or XML for which the DTD and/or
processing tools are not generally available, and the
machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
+processors for output purposes only.}
The ``Title Page'' means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
@@ -494,8 +496,9 @@
%\end{quote}
\smallskip
+{\spaceskip = 3.33pt plus 4pt
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with...Texts.'' line with this:
+replace the ``with...Texts.'' line with this:}
\smallskip
{\narrower\obeylines\eightrm\baselineskip=10pt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/genops.tex new/doc/plain/impatient/genops.tex
--- old/doc/plain/impatient/genops.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/genops.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: genops.tex,v 1.6 2020/01/01 23:12:25 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -128,17 +129,17 @@
save and restore their original settings explicitly.
\example
Here's a line printed normally.\par
-\fontdimen2\font = 3\fontdimen2\font
-% Triple the interword spacing.
+\dimen0=\fontdimen2\font
+\fontdimen2\font=3\fontdimen2\font % triple word spacing
\noindent Here's a really spaced-out line.
+\fontdimen2\font=\dimen0
|
\produces
Here's a line printed normally.\par
-\dimen0 = \fontdimen2\font % to undo global assignment
-\fontdimen2\font = 3\fontdimen2\font
-% triple the interword spacing
+\dimen0=\fontdimen2\font
+\fontdimen2\font=3\fontdimen2\font % triple word spacing
\noindent Here's a really spaced-out line.
-\fontdimen2\font = \dimen0
+\fontdimen2\font=\dimen0
\endexample
\enddesc
@@ -317,13 +318,13 @@
These commands produce the name and version number
of the \TeX\ format,
e.g., \minref{\plainTeX} or ^{\LaTeX}, that you're using.
+The |\fmtversion| string contains a long list of supported languages,
+so is omitted here.
\example
-This book was produced with the \fmtname\ format,
-version~\fmtversion.
+This book was produced with the \fmtname\ format.
|
\produces
-This book was produced with the \fmtname\ format,
-version~\fmtversion.
+This book was produced with the \fmtname\ format.
\endexample
\enddesc
@@ -333,7 +334,9 @@
This command produces the base
name of the file with which \TeX\ was invoked.
For example, if your main input file is |hatter.tex|,
-|\jobname| will expand to |hatter|.
+|\jobname|
+{\parfillskip=0pt\par\eject\noindent}
+will expand to |hatter|.
|\jobname| is most useful when you're
creating an auxiliary file to be associated with a document.
^^{auxiliary files}
@@ -1641,11 +1644,8 @@
These commands
reserve and name an entity of the indicated type:
\ulist
-{\tolerance = 5000
-\fontdimen3\the\font = 2\fontdimen3\the\font % allow spaces to stretch more
-\li |\new!-count|, |\newdimen|, |\newskip|, |\new!-mu!-skip|, |\new!-toks|,
-and |\new!-box| each reserve a \minref{register} of the indicated type.
-}
+\li |\newcount|, |\newdimen|, |\newskip|, |\newmuskip|, |\newtoks|,
+|\newbox| each reserve a \minref{register} of the indicated type.
^^{count registers//reserved by \b\tt\\newcount\e}
^^{dimension registers//reserved by \b\tt\\newdimen\e}
^^{skip registers//reserved by \b\tt\\newskip\e}
@@ -1884,8 +1884,8 @@
file. You can then read from several different positions within
the file, one for each input stream.
-You should allocate stream numbers for |\openin| using
-|\new!-read| (\xref{\@newread}).
+You should allocate |\openin| stream numbers with
+|\newread| (\xref{\@newread}).
\example
\newread\auxfile \openin\auxfile = addenda.aux
% \auxfile now denotes the number of this opening
@@ -2285,7 +2285,7 @@
leading dots in the log indicates the number of
levels of nesting of inner boxes.
\li |\showlists| records
-the contents of each list that \TeX\ is currently constructing.
+the contents of each of the lists that \TeX\ is currently constructing.
(These lists are nested one within another.)
See \knuth{pages~88--89} for further information about interpreting
the output of |\showlists|.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/macros.tex new/doc/plain/impatient/macros.tex
--- old/doc/plain/impatient/macros.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/macros.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: macros.tex,v 1.4 2020/01/01 23:22:22 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
%
% Macros for typesetting TeX for the Impatient.
@@ -2061,7 +2062,7 @@
\def\emph#1{{\it #1}\itcorr} % Emphasize.
\def\ftp{{\tt ftp}}
\def\gffile{{\tt .gf} file}
-\def\hand{{\handfont A}}
+\def\hand{{\handfont \char"2B}}
\def\ifatest{{\tt \\if} test}
\chardef\inches = "7D
\def\knuth#1{#1 of \texbook}
@@ -2156,6 +2157,7 @@
\def\@ctsref#1{(\xref{#1})\endgroup}
\def\xrefdelim[#1]{page~\xrefn{#1}} % this form doesn't need braces
+\def\xrefndelim[#1]{\xrefn{#1}} % this form doesn't need braces
% This command comes at the beginning of chapters, after the \chapter
% command and before the text. Hence the \par in the template
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/paras.tex new/doc/plain/impatient/paras.tex
--- old/doc/plain/impatient/paras.tex 2014-11-14 00:48:37.000000000 +0100
+++ new/doc/plain/impatient/paras.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: paras.tex,v 1.4 2020/01/01 19:16:14 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003, 2014 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -1008,14 +1009,8 @@
By default |\everypar| is empty, but you can
take extra actions at the start of every paragraph by putting
the commands for those actions into a token list
-%
-% This \vglue makes the example overwrite the example, but since we are
-% not reprinting this page, it doesn't matter. For reasons I did not
-% attempt to track down, a page break happened before the example,
-% unlike in the first printing.
-%
-\secondprinting{\vglue-48pt}
and assigning that token list to |\everypar|.
+
\example
\everypar = {$\Longrightarrow$\enspace}
Now pay attention!!\par
@@ -1333,39 +1328,45 @@
paragraph.
If you specify |\hangafter| and |\hangindent| as well as |\par!-shape|,
\TeX\ ignores the ^|\hangafter| and ^|\hangindent|.
+
+By the way, the following example saves and restores |\fontdimen| values
+explicitly, using temporary registers, since |\fontdimen| changes are
+always global (see \xref\fontdimen).
+
\ifodd\pageno\vfill\eject\fi % so the wineglass is on a single page.
\example
% A small font and close interline spacing make this work
\smallskip\font\sixrm=cmr6 \sixrm \baselineskip=7pt
-\fontdimen3\font = 1.8pt \fontdimen4\font = 0.9pt
-\noindent \hfuzz 0.1pt
+\dimen0=\fontdimen3\font \dimen2=\fontdimen4\font
+\fontdimen3\font=1.8pt \fontdimen4\font=.9pt
+\noindent \hfuzz=.1pt
\parshape 30 0pt 120pt 1pt 118pt 2pt 116pt 4pt 112pt 6pt
108pt 9pt 102pt 12pt 96pt 15pt 90pt 19pt 84pt 23pt 77pt
27pt 68pt 30.5pt 60pt 35pt 52pt 39pt 45pt 43pt 36pt 48pt
27pt 51.5pt 21pt 53pt 16.75pt 53pt 16.75pt 53pt 16.75pt 53pt
16.75pt 53pt 16.75pt 53pt 16.75pt 53pt 16.75pt 53pt 16.75pt
53pt 14.6pt 48pt 24pt 45pt 30.67pt 36.5pt 51pt 23pt 76.3pt
-The wines of France and California may be the best
-known, but they are not the only fine wines. Spanish
-wines are often underestimated, and quite old ones may
-be available at reasonable prices. For Spanish wines
-the vintage is not so critical, but the climate of the
-Bordeaux region varies greatly from year to year. Some
-vintages are not as good as others,
-so these years ought to be
-s\kern -.1pt p\kern -.1pt e\kern -.1pt c\hfil ially
-n\kern .1pt o\kern .1pt t\kern .1pt e\kern .1pt d\hfil:
-1962, 1964, 1966. 1958, 1959, 1960, 1961, 1964,
-1966 are also good California vintages.
-Good luck finding them!!
+The wines of France and California may be the best known,
+but they are not the only fine wines. Spanish wines are
+often underestimated, and quite old ones may be available at
+reasonable prices. For Spanish wines the vintage is not so
+critical, but the climate of the Bordeaux region varies
+greatly from year to year. Some vintages are not as good as
+others, so these years ought to be s\kern -.1pt p\kern -.1pt
+e\kern -.1pt c\hfil ially n\kern .1pt o\kern .1pt
+t\kern .1pt e\kern .1pt d\hfil: 1962, 1964, 1966. 1958,
+1959, 1960, 1961, 1964, 1966 are also good California
+vintages. Good luck finding them!!
+\fontdimen3\font=\dimen0 \fontdimen4\font=\dimen2
|
%\margin{Wineglass text replaced because of permissions problem.}
\produces
% A small font and close interline spacing make this work
\smallskip\font\sixrm=cmr6 \sixrm \baselineskip=7pt
-\fontdimen3\font = 1.8pt \fontdimen4\font = 0.9pt
-\noindent \hfuzz 0.1pt
+\dimen0=\fontdimen3\font \dimen2=\fontdimen4\font
+\fontdimen3\font=1.8pt \fontdimen4\font=0.9pt
+\noindent \hfuzz=0.1pt % reordered to save a line
\parshape 30 0pt 120pt 1pt 118pt 2pt 116pt 4pt 112pt 6pt 108pt 9pt 102pt
12pt 96pt 15pt 90pt 19pt 84pt 23pt 77pt 27pt 68pt 30.5pt 60pt 35pt 52pt
39pt 45pt 43pt 36pt 48pt 27pt 51.5pt 21pt 53pt 16.75pt 53pt 16.75pt
@@ -1384,6 +1385,7 @@
1962, 1964, 1966. 1958, 1959, 1960, 1961, 1964,
1966 are also good California vintages.
Good luck finding them!
+\fontdimen3\font=\dimen0 \fontdimen4\font=\dimen2
\endexample
\eix^^{indentation}
\enddesc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/preface.tex new/doc/plain/impatient/preface.tex
--- old/doc/plain/impatient/preface.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/preface.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: preface.tex,v 1.2 2020/01/02 23:34:37 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -146,12 +147,12 @@
details.
We don't plan to make any further changes or additions to the book
-ourselves, except for correction of any outright errors reported to us,
-and perhaps inclusion of the illustrations.
+ourselves, except possibly for correction of important errors reported
+to us.
-Our distribution of the book is at {\tt
-ftp://tug.org/tex/impatient}. You can reach us by email at {\tt
-impatient(a)tug.org}.
+Our distribution of the book is at {\tt https://ctan.org/pkg/impatient}.
+See the {\tt README} in the distribution for more information about
+different versions, translations, contact information, etc.
\pagebreak
\byebye
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/usebook.tex new/doc/plain/impatient/usebook.tex
--- old/doc/plain/impatient/usebook.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/usebook.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: usebook.tex,v 1.2 2020/01/01 23:24:23 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -15,7 +16,8 @@
which tell you what you need to know in order to get started using \TeX.
If you've already had experience using \TeX, it will still be helpful
to know what kinds of information are in these sections of the book.
-Sections~\chapternum{concepts}--\chapternum{tips}, which
+Sections~\chapternum{concepts}--\chapternum{tips} and
+\chapternum{capsule}, which
occupy most of
the rest of the book, are designed to be accessed randomly.
Nevertheless, if you're the kind of person who likes to read reference manuals,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/usingtex.tex new/doc/plain/impatient/usingtex.tex
--- old/doc/plain/impatient/usingtex.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/usingtex.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,6 @@
+% $Id: usingtex.tex,v 1.5 2020/01/01 23:29:59 karl Exp $
% This is part of the book TeX for the Impatient.
-% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
% See file fdl.tex for copying conditions.
\input macros
@@ -352,7 +353,7 @@
If you are defining your own macros, you need to be particularly careful about
where you put ends of line in their definitions.
It's all too easy to define a macro that produces an
-^{unwanted space} in addition to whatever else it's supposed to produce.
+^{unwanted space} in addition to whatever else it's supposed to do.
We discuss this problem elsewhere since it's somewhat
technical; see \xrefpg{unwantedspace}.
@@ -463,13 +464,11 @@
are the preferred \TeX\ style.
For example:
-\vbox{%
\csdisplay
There is no `q' in this sentence.
``Talk, child,'' said the Unicorn.
She said, ``\thinspace`Enough!!', he said.''
|
-}%
These three lines yield:
\display{\par\restoreplainTeX
There is no `q' in this sentence.
@@ -484,11 +483,14 @@
nearly equally spaced quotation marks in a row.
\TeX\ has three kinds of ^{dashes}:
-\ulist\compact
+\ulist
\li Short ones (hyphens) like this ( - ). You get them by typing~`^|-|'.
\li Medium ones (en-dashes) like this ( -- ). You get them by typing~`^|--|'.
\li Long ones (em-dashes) like this ( --- ). You get them by typing~`^|---|'.
\endulist
+\vskip0pt plus2pt % this page is spacey, just live with it
+\eject
+
\noindent
Typically you'd use hyphens to indicate compound words like
``will-o'-the-wisp'',
@@ -614,7 +616,10 @@
\display{\centereddisplays
If $a<b$, then the relation $$e^a < e^b$$ holds.}
\smallskip
-\noindent \chapterref{math} describes the commands that are useful
+\noindent \TeX\ does its own spacing inside math, ignoring any spaces in
+the input.
+
+\chapterref{math} describes the commands that are useful
in math formulas.
\eix^^{math}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/doc/plain/impatient/xmptext.tex new/doc/plain/impatient/xmptext.tex
--- old/doc/plain/impatient/xmptext.tex 2005-12-29 01:34:36.000000000 +0100
+++ new/doc/plain/impatient/xmptext.tex 2020-01-04 23:06:54.000000000 +0100
@@ -1,5 +1,5 @@
~% This is part of the book TeX for the Impatient.
-~% Copyright (C) 2003 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
+~% Copyright (C) 2003-2020 Paul W. Abrahams, Kathryn A. Hargreaves, Karl Berry.
~% See file fdl.tex for copying conditions.
% TeX ignores anything on a line after a %
% The next two lines define fonts for the title
@@ -131,7 +131,7 @@
el\` eve\/}, for German words such as {\it Schu\ss\/},
and for words in several other languages as well.
You'll find a complete list of \TeX's accents and letters
-of European languages on !xrefdelim[accents] and !xrefdelim[fornlets].
+of European languages on pages~!xrefndelim[fornlets] and~!xrefndelim[accents].
You can also get Greek letters such as ``$\alpha$'' and
``$\Omega$'' for use in math, card suits such as
@@ -336,12 +336,12 @@
% present in every row of the table; otherwise, the boxes
% won't butt together properly, and the rules won't join.
\halign{\tabskip = .7em plus 1em % glue between columns
-% Use \vtop for short multiline entries in the first column.
+% Use \vtop for whole paragraphs in the first column.
% Typeset the lines ragged right, without hyphenation.
\vtop{\hsize=6pc\pretolerance = 10000\hbadness = 10000
\normalbaselines\noindent\it#\strut}%
&\vrule #&#\hfil &\vrule #% the rules and middle column
-% Use \vtop to get whole paragraphs in the last column.
+% Use \vtop for whole paragraphs in the last column.
&\vtop{\hsize=11pc \parindent=0pt \normalbaselineskip=12pt
\normalbaselines \rightskip=3pt plus2em #}\cr
% The table rows begin here.
@@ -355,7 +355,7 @@
\bf Name&&\bf Name &&\omit \bf Characteristics \hfil\cr
\tableskip Pleurotus ostreatus&&Oyster mushroom&&
Grows in shelf\kern 1pt like clusters on stumps or logs,
- % without the kern, the `f' and `l' would be too close
+ % Without the kern, the `f' and `l' would be a ligature.
pink-gray oyster-shaped caps, stem short or absent.\cr
\tableskip Lactarius hygrophoroides&&Milky hygroph&&
Butterscotch-brown cap and stem, copious white latex,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tlpkg/tlpobj/impatient.doc.tlpobj new/tlpkg/tlpobj/impatient.doc.tlpobj
--- old/tlpkg/tlpobj/impatient.doc.tlpobj 2019-02-28 03:42:32.000000000 +0100
+++ new/tlpkg/tlpobj/impatient.doc.tlpobj 2020-03-04 23:51:06.000000000 +0100
@@ -1,23 +1,25 @@
name impatient.doc
category Package
-revision 35573
+revision 54080
shortdesc doc files of impatient
relocated 1
-docfiles size=605
+docfiles size=616
+ RELOC/doc/plain/impatient/ChangeLog
RELOC/doc/plain/impatient/Makefile
- RELOC/doc/plain/impatient/Makefile.in
RELOC/doc/plain/impatient/NEWS
RELOC/doc/plain/impatient/README
RELOC/doc/plain/impatient/backm.tex
+ RELOC/doc/plain/impatient/book.ccs
RELOC/doc/plain/impatient/book.pdf
RELOC/doc/plain/impatient/book.sdx
RELOC/doc/plain/impatient/book.tex
RELOC/doc/plain/impatient/capsule.tex
RELOC/doc/plain/impatient/concepts.tex
RELOC/doc/plain/impatient/config.tex
- RELOC/doc/plain/impatient/configure
- RELOC/doc/plain/impatient/configure.ac
RELOC/doc/plain/impatient/copyrght.tex
+ RELOC/doc/plain/impatient/diffs/impatient-2.0-2.3.diff.gz
+ RELOC/doc/plain/impatient/diffs/impatient-2.3-2.4.diff.gz
+ RELOC/doc/plain/impatient/diffs/impatient-2.4-2020.diff.gz
RELOC/doc/plain/impatient/eplain.tex
RELOC/doc/plain/impatient/errata.future
RELOC/doc/plain/impatient/errors.tex
++++++ import.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/import/README new/doc/latex/import/README
--- old/doc/latex/import/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/import/README 2020-04-12 00:52:54.000000000 +0200
@@ -0,0 +1,15 @@
+import.sty Version 6.2 01-Apr-2020
+Donald Arseneau (asnd(a)triumf.ca) Vancouver, Canada.
+
+This software is in the public domain; free of any restrictions.
+All right are waived. No obligations are acknowleged.
+
+Two new LaTeX commands, "\import {<full-path>} {<file>}" and
+"\subimport {<path-extension>} {<file>}" are defined to input
+a file from another directory, allowing that file to find its
+own inputs (using \input, \includegraphics etc.) in that directory.
+Alias command names are "\inputfrom" and "\subinputfrom".
+
+Also provided are \includefrom and \subincludefrom, which are
+based on the \include command, rather than \input.
+
Binary files old/doc/latex/import/import.pdf and new/doc/latex/import/import.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/import/import.tex new/doc/latex/import/import.tex
--- old/doc/latex/import/import.tex 2010-03-07 18:06:31.000000000 +0100
+++ new/doc/latex/import/import.tex 2020-04-12 00:52:54.000000000 +0200
@@ -6,11 +6,10 @@
\usepackage{lmodern}
\usepackage[T1]{fontenc}
\usepackage{textcomp}
-\usepackage{booktabs}
\usepackage{microtype}
-\usepackage{hyperref}
+%\usepackage{hyperref}
-\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
+%\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
\newcommand*{\pkg}[1]{\textsf{#1}}
\newcommand*{\cls}[1]{\textsf{#1}}
\newcommand*{\cs}[1]{\texttt{\textbackslash#1}}
@@ -22,19 +21,13 @@
\newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle}
\newcommand*{\marg}[1]{\texttt{\{}\meta{#1}\texttt{\}}}
\newcommand*{\oarg}[1]{\texttt{[}\meta{#1}\texttt{]}}
-\newcommand*{\BibTeX}{Bib\kern-0.08em\TeX\@\xspace}
-\newcommand*{\BigTeX}{Big\kern-0.08em\TeX\@\xspace}
+\renewcommand{\^}{\nolinebreak[2]}
+%\addtokomafont{title}{\rmfamily}
-\pdfstringdefDisableCommands{%
- \def\BibTeX{BibTeX\xspace}%
- \def\BigTeX{BigTeX\space}%
-}
-
-\addtokomafont{title}{\rmfamily}
-
-\title{The \pkg{import} package\thanks{This manual corresponds to \pkg{import}~v5.1, dated~23--Mar--2009.}}
-\author{Donald Arseneau (\mail{asnd(a)triumf.ca})}
-\date{23--Mar--2009}
+\title{The import package}
+\author{Donald Arseneau (\texttt{asnd(a)triumf.ca})}
+\date{Version 6.2, \quad 01--Apr--2020}
+\setlength{\parskip}{5pt plus 2pt minus 1pt}
\begin{document}
@@ -43,60 +36,84 @@
This software is in the public domain; free of any restrictions.
-Two new \LaTeX\ commands, ``\cmd{\import}\marg{full\_path}\marg{file}''\\ and
-``\cmd{\subimport}\-\marg{path\_extension}\marg{file}'' are defined to input a file
-from another directory, allowing that file to find its own inputs
-(using ``\cmd{\input}'', ``\cmd{\includegraphics}'' etc.)\ in that directory.
+\medskip
-Alias command names are ``\cmd{\inputfrom}'' and ``\cmd{\subinputfrom}''.
+Two new \LaTeX\ commands:
+\begin{verse}
+ \cmd{\import} \marg{full-path} \marg{file}\hspace{8em} and\\[2pt]
+ \cmd{\subimport} \marg{path-extension} \marg{file}
+\end{verse}
+are defined to input a file from another directory, allowing that file
+to find its own inputs (using \cmd{\input}, \cmd{\includegraphics}
+etc.\@) in that directory.
-Also provided are ``\cmd{\includefrom}'' and ``\cmd{\subincludefrom}'', which are
-based on the ``\cmd{\include}'' command, rather than ``\cmd{\input}''. There are
-also ``\texttt{*}'' variants described below.
+Alias command names are ``\cmd{\inputfrom}'' and ``\cmd{\subinputfrom}''.
+(If \cmd{\import} was defined previously, it will not be redefined.)
+Also provided are the similar commands ``\cmd{\includefrom}'' and
+``\cmd{\subincludefrom}'', which are based on the \cmd{\include} command,
+rather than \cmd{\input}.
-For example, if a remote file ``\texttt{/usr5/friend/work/report.tex}'' has contents:
+For example, if a remote file \texttt{/user/friend/work/report.tex} has
+contents:
%
\begin{verbatim}
-My graph: \includegraphics{picture}
-\input{explanation}
+ My graph: \includegraphics{picture}
+ \input{explanation}
\end{verbatim}
%
-then you can safely input that file in your own document with the command
-``\verb+\import{/usr5/friend/work/}{report}+''; the explanation and picture will
-be taken from the ``\texttt{/usr5/friend/work/}'' directory.
-
-The ``\cmd{\subimport}'' command takes a relative path instead of a full absolute
-file path, and it allows imported files to import files themselves, using
-their own directory as the root of another ``\meta{path\_extension}''. Do not use
-both ``\cmd{\import}'' and ``\cmd{\subimport}'' in the same file.
-
+then you can input that file to a document with
+\verb+\import{/user/friend/+\^\verb+work/}+\^\verb+{report}+
+so that both the explanation and picture will be taken from the
+\texttt{/user/friend/\^work/} directory.
+
+The \meta{full-path} argument for \cmd{\import} can be a full absolute path
+or a relative path starting from the main working directory for the document.
+The \cmd{\subimport} command facilitates nesting of file imports. It takes a
+relative \meta{path-extension} based on the location of the current imported file.
For example, if a file is imported (using either command) from directory
-``\texttt{abc/}'' and that file contains the command ``\verb+\subimport{lmn/}{xyz}+'' then
-file ``\texttt{abc/lmn/xyz.tex}'' is input, and any ``\cmd{\input}'' commands in that file
-will read files from directory ``\texttt{abc/lmn/}''.
-
-Note that the sub-import path is merely appended to the current import
-path. Mistakes from this method must be rectified by ``\cmd{\import@path@fix}''.
-
-Depending on on how your \TeX\ system is configured, if a file with the
-same name as the import file exists in the current directory or in the
-\texttt{TEXINPUTS} path, that other file will be read in preference to one in the
-import directory. So here is the real behavior of the previous example:
-Given the sequence ``\verb+\import{abc/}{one}+'', ``\verb+\subimport{lmn/uvw/}{two}+'' (in
-file \texttt{one}), ``\verb+\input{three}+'' (in file \texttt{two}), \LaTeX\ first looks for \texttt{three.tex}
-in the \texttt{TEXINPUTS} search path; if not found, it tries ``\texttt{abc/lmn/uvw/three}'';
-if that doesn't exist, it tries ``\texttt{abc/three}''; if still not found, it tries
-the defined ``\cmd{\input@path}'', if there is one.
+\texttt{abc/} and that file contains the command \verb+\subimport{lmn/}{xyz}+ then
+file \texttt{abc/lmn/xyz.tex} is input, and any \cmd{\input} commands in that file
+will read files from directory \texttt{abc/lmn/}.\footnote{~Note that the sub-import
+ path is merely appended to the current import path. Syntactical mistakes from this
+ method may be corrected by \cmd{\import@path@fix}.}
+
+Depending on on how your \TeX\ system is configured, if a file does not
+exist in the specified import directory, it will be looked for in previous
+import directories (when nesting \cmd{\subimport} files), then in any
+directory listed in the pre-existing \cmd{\input@path}, then in the current
+working directory, and finally in the \texttt{TEXINPUTS} path. Therefore, for
+\cmd{\import} and for other \cmd{\input} used within an imported file,
+a file found on the path of import(s) will be read in preference to others with
+the same name located elsewhere. So here is the real behavior of the previous
+example: Given the nested sequence:
+\begin{verse}
+\verb+\import{abc/}{one}+\quad (in main document);\\
+\verb+\subimport{lmn/uvw/}{two}+\quad (in file \texttt{abc/one.tex});\\
+\verb+\input{three}+\quad (in file \texttt{abc/lmn/uvw/two.tex});
+\end{verse}
+\LaTeX\ first looks for \texttt{abc/lmn/uvw/three} (or \texttt{abc/lmn/uvw/three.tex});\\
+if not found, it tries \texttt{abc/three} (or \texttt{abc/three.tex});\\
+if still not found, it looks in the \cmd{\input@path}, if there was one defined;\\
+if \cmd{\input@path} was not defined, or if the file was not found on it,
+\LaTeX\ then tries to open \texttt{three} in the main document directory;\\
+finally, if still not found, it searches the \texttt{TEXINPUTS} search path.
+
+Historically, `star' versions of the commands were defined (to avoid searching
+the \texttt{TEXINPUTS} path) but now the ``$*$'' is ignored.
-To avoid searching the \texttt{TEXINPUTS} path when importing files, use the `star'
-versions of the commands: ``\cmd{\import*}'' and ``\cmd{\subimport*}''.
-A hook ``\cmd{\import@path@fix}'' is provided to reformat the import path
+A command ``\cmd{\import@path@fix}'' is provided to reformat the import path
to fit the syntax of a particular operating system. It \emph{could} be
-defined to convert unix-style path names to the local format, but
-all it does now is remove ``\texttt{][}'' from VMS sub-import directories.
+defined to convert unix-style path names to the local format. The default
+definition ensures paths end with a single ``\texttt{/}'' on most systems
+(unless the path is empty), but on VMS systems it removes
+``\texttt{]\hspace{-2pt}[}'' from within combined paths.
+
+Note that the import package works by manipulating the internal `commands'
+\cmd{\input@path} and \cmd{\Ginput@path}, so may behave badly if you
+redefine them manually, or via another package, within the document.
-Presently, the paths are defined ``locally'' so input files must have
-balanced grouping.
+Presently, the paths are defined `locally' (not globally) so input files must
+have balanced grouping.
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/import.doc.tlpobj new/tlpkg/tlpobj/import.doc.tlpobj
--- old/tlpkg/tlpobj/import.doc.tlpobj 2019-02-28 03:42:38.000000000 +0100
+++ new/tlpkg/tlpobj/import.doc.tlpobj 2020-04-12 01:55:29.000000000 +0200
@@ -1,8 +1,9 @@
name import.doc
category Package
-revision 17361
+revision 54683
shortdesc doc files of import
relocated 1
-docfiles size=64
+docfiles size=63
+ RELOC/doc/latex/import/README
RELOC/doc/latex/import/import.pdf
RELOC/doc/latex/import/import.tex
++++++ import.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/import/import.sty new/tex/latex/import/import.sty
--- old/tex/latex/import/import.sty 2009-03-27 18:38:44.000000000 +0100
+++ new/tex/latex/import/import.sty 2020-04-12 00:52:54.000000000 +0200
@@ -1,63 +1,48 @@
-% import.sty Ver 5.1 23-Mar-2009 Donald Arseneau (asnd(a)triumf.ca)
+% import.sty Ver 6.2 01-Apr-2020 Donald Arseneau (asnd(a)triumf.ca)
%
% This software is in the public domain; free of any restrictions.
%
-% Two new \LaTeX\ commands, "\import {full_path} {file}" and
-% "\subimport {path_extension} {file}" are defined to input a file
+% Two new \LaTeX\ commands, "\import {<full-path>} {<file>}" and
+% "\subimport {<path-extension>} {<file>}" are defined to input a file
% from another directory, allowing that file to find its own inputs
% (using "\input", "\includegraphics" etc.) in that directory.
-%
% Alias command names are "\inputfrom" and "\subinputfrom".
%
% Also provided are "\includefrom" and "\subincludefrom", which are
-% based on the "\include" command, rather than "\input". There are
-% also "*" variants described below.
+% based on the "\include" command, rather than "\input".
%
-% For example, if a remote file "/usr5/friend/work/report.tex" has contents:
+% For example, if a remote file "/user/friend/work/report.tex" has contents:
%
% My graph: \includegraphics{picture}
% \input{explanation}
%
% then you can safely input that file in your own document with the command
-% "\import{/usr5/friend/work/}{report}"; the explanation and picture will
-% be taken from the "/usr5/friend/work/" directory.
+% "\import{/user/friend/work/}{report}"; the explanation and picture will
+% be taken from the "/user/friend/work/" directory.
%
-% The "\subimport" command takes a relative path instead of a full absolute
-% file path, and it allows imported files to import files themselves, using
-% their own directory as the root of another "path_extension". Do not use
-% both "\import" and "\subimport" in the same file.
+% The <full-path> argument for "\import" can be a full absolute path
+% or a relative path starting from the main working directory for the document.
+% The "\subimport" command facilitates nesting of file imports. It takes a
+% relative <path-extension> based on the location of the current file.
%
% For example, if a file is imported (using either command) from directory
% "abc/" and that file contains the command "\subimport{lmn/}{xyz}" then
% file "abc/lmn/xyz.tex" is input, and any "\input" commands in that file
-% will read files from directory "abc/lmn/".
+% will read files from directory "abc/lmn/".
%
-% Note that the sub-import path is merely appended to the current import
-% path. Mistakes from this method must be rectified by "\import@path@fix".
-%
-% Depending on on how your \TeX\ system is configured, if a file with the
-% same name as the import file exists in the current directory or in the
-% TEXINPUTS path, that other file will be read in preference to one in the
-% import directory. So here is the real behavior of the previous example:
-% Given the sequence "\import{abc/}{one}", "\subimport{lmn/uvw/}{two}" (in
-% file one), "\input{three}" (in file two), \LaTeX\ first looks for three.tex
-% in the TEXINPUTS search path; if not found, it tries "abc/lmn/uvw/three";
-% if that doesn't exist, it tries "abc/three"; if still not found, it tries
-% the defined "\input@path", if there is one.
-%
-% To avoid searching the TEXINPUTS path when importing files, use the `star'
-% versions of the commands: "\import*" and "\subimport*".
+% Find more documentation in import.tex or import.pdf.
%
% A hook "\import@path@fix" is provided to reformat the import path
% to fit the syntax of a particular operating system. It *could* be
-% defined to convert unix-style path names to the local format, but
-% all it does now is remove "][" from VMS sub-import directories.
+% defined to convert unix-style path names to the local format. The default
+% definition ensures paths end with "/" on most systems, but removes
+% "][" from within sub-import directory paths on VMS systems.
%
-% Presently, the paths are defined ``locally'' so input files must have
-% balanced grouping.
+% Presently, the paths are defined `locally' (not globally) so input
+% files must have balanced grouping.
%====================== END INSTRUCTIONS ===========================
-\ProvidesPackage{import}[2009/03/23 \space v 5.1]
+\ProvidesPackage{import}[2020/04/01 \space v 6.2]
\ProcessOptions
\@ifundefined{import}{%
@@ -72,8 +57,9 @@
\newcommand{\includefrom}{\global\let\import@path\@empty \@doimport\include}
\newcommand{\subincludefrom}{\@doimport\include}
+% Consume now-meaningless "*"
\def\@doimport#1{\@ifstar
- {\@sub@import#1\@iffileonpath}{\@sub@import#1\IfFileExists}}
+ {\@sub@import#1\im@iffileexists}{\@sub@import#1\im@iffileexists}}
% #1 = import command, #2 = switch for *, #3 = import path extension
\def\@sub@import#1#2#3{%
@@ -94,22 +80,79 @@
% #6 = previous \IfFileExists. #7 = file name.
%
\def\@import#1#2#3#4#5#6#7{%
- \gdef\import@path{#4}%
- \protected@edef\input@path{{\import@path@fix{#4}}#2}%
- \protected@edef\Ginput@path{{\import@path@fix{#4}}#3}%
- #1{#7}%
+ \protected@xdef\import@path{\import@path@fix{#4}}%
+ \protected@edef\input@path{{\import@path}#2}%
+ \protected@edef\Ginput@path{{\import@path}#3}%
+ \protected@edef\import@path@file{% use full path/file for non-*
+ \import@path #7}%
+%
+ \expandafter#1\expandafter{\import@path@file}%
+%
\let\IfFileExists#6% restore after \import*
\gdef\import@path{#5}%
\def\input@path{#2}\ifx\input@path\@empty \let\input@path\@undefined \fi
\def\Ginput@path{#3}\ifx\Ginput@path\@empty \let\Ginput@path\@undefined \fi
}
-\let\im@@IfFileExists\IfFileExists
+% Our version of \IfFileExists that gives priority to files on \input@path,
+% #1 = file name, #2 = action when exists, #3 = action when not exists
+% In 2020 LaTeX redefines \IfFileExists, so I need two variants.
+\@ifundefined{IfFileExists@}{% pre-2020
+\long\def \im@iffileexists#1#2#3{%
+ \let\@filef@und\@undefined
+ \ifx\input@path\@undefined\else
+ \@iffileonpath{#1}{% (also defines \@filef@und)
+ \def\reserved@a{#2}%
+ }{}% no action yet for not found
+ \fi
+ \ifx\@filef@und\@undefined % not found on \input@path
+ \openin\@inputcheck#1 %
+ \ifeof\@inputcheck
+ \def\reserved@a{#3}%
+ \else
+ \closein\@inputcheck
+ \edef\@filef@und{#1 }%
+ \def\reserved@a{#2}%
+ \fi\fi
+ \reserved@a}
+}{% ca 2020
+\DeclareRobustCommand\im@iffileexists[1]{%
+ \set@curr@file{#1}%
+ \expandafter\im@iffileexists@\expandafter{\@curr@file}}
+\long\def \im@iffileexists@#1#2#3{%
+ \let\@filef@und\@undefined
+ \ifx\input@path\@undefined\else
+ \@iffileonpath{#1}{% (also defines \@filef@und)
+ \def\reserved@a{#2}%
+ }{}% no action yet for not found
+ \fi
+ \ifx\@filef@und\@undefined % not found on \input@path
+ \openin\@inputcheck"#1" %
+ \ifeof\@inputcheck
+ \def\reserved@a{#3}%
+ \else
+ \closein\@inputcheck
+ \edef\@filef@und{"#1" }%
+ \def\reserved@a{#2}%
+ \fi\fi
+ \reserved@a}
+ }
+
+\let\im@@IfFileExists\IfFileExists % remember original
\gdef\import@path{}
\let\import@path@fix\@firstofone % default
-% Check for vms file names and set \import@path@fix appropriately
+% Check for "./" currdir, and make \import@path@fix ensure trailing /
+\gdef\(a)gtempa{./}
+\ifx\@gtempa\@currdir % *x style paths
+\gdef\import@path@fix#1{\ifx\delimiter#1\delimiter\else
+ \@ensure@one@trailing@slash#1///\delimiter\fi}%
+ \gdef\@ensure@one@trailing@slash#1///#2\delimiter{#1/}%
+\fi
+
+% Check for "[]" currdir (VMS file names) and set \import@path@fix appropriately
+% \subimport{[.subdir]}{file}
\gdef\@gtempa{[]}
\ifx\@gtempa\@currdir % VMS directory syntax
\gdef\import@path@fix#1{\@gobbleVMSbrack#1][>}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/import.tlpobj new/tlpkg/tlpobj/import.tlpobj
--- old/tlpkg/tlpobj/import.tlpobj 2019-02-28 03:42:38.000000000 +0100
+++ new/tlpkg/tlpobj/import.tlpobj 2020-04-12 01:55:29.000000000 +0200
@@ -1,6 +1,6 @@
name import
category Package
-revision 17361
+revision 54683
shortdesc Establish input relative to a directory
relocated 1
longdesc The commands \import{full_path}{file} and
@@ -11,7 +11,6 @@
runfiles size=2
RELOC/tex/latex/import/import.sty
catalogue-ctan /macros/latex/contrib/import
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics file-control
-catalogue-version 5.1
+catalogue-version 6.2
++++++ inconsolata.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/inconsolata/README new/doc/fonts/inconsolata/README
--- old/doc/fonts/inconsolata/README 2018-01-15 23:20:31.000000000 +0100
+++ new/doc/fonts/inconsolata/README 2019-06-23 22:59:54.000000000 +0200
@@ -8,11 +8,19 @@
part of all distributions of LaTeX version 2003/12/01 or later. Those files and
LaTeX support file zi4.sty are
- Copyright (c) 2013--2018 Michael Sharpe
+ Copyright (c) 2013--2019 Michael Sharpe
Files provided "as is", with no warranties.
-Current version: 1.114
+Current version: 1.121
+
+Changes in version 1.121
+Corrected an error in i4-ot1-0.enc. (Thanks, Takuo Watanabe.)
+
+Changes in version 1.12
+1. Added standard text ligatures, excepting f-ligatures, to improve rendering of text blocks other than verbatim.
+2. Changed the sty file to be better support the use of Inconsolata and Inconsolata Narrow as limited text fonts.
+3. Documentation additions and correction.
Changes in version 1.114
Corrected error in the fd files that did not permit multiple calls to \usefont under some circumstances. (Thanks Haruhiko Okumura.)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/inconsolata/afmcmds.txt new/doc/fonts/inconsolata/afmcmds.txt
--- old/doc/fonts/inconsolata/afmcmds.txt 2016-12-31 02:18:47.000000000 +0100
+++ new/doc/fonts/inconsolata/afmcmds.txt 2019-05-18 23:14:55.000000000 +0200
@@ -1,144 +1,143 @@
+afm2tfm Inconsolata-zi4r -T i4-t1-0.enc -v t1-zi4r-0 t1-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-t1-1.enc -v t1-zi4r-1 t1-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-t1-2.enc -v t1-zi4r-2 t1-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-t1-3.enc -v t1-zi4r-3 t1-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-t1-4.enc -v t1-zi4r-4 t1-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-t1-5.enc -v t1-zi4r-5 t1-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-t1-6.enc -v t1-zi4r-6 t1-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-t1-7.enc -v t1-zi4r-7 t1-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-t1-0.enc -v t1-zi4b-0 t1-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-t1-1.enc -v t1-zi4b-1 t1-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-t1-2.enc -v t1-zi4b-2 t1-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-t1-3.enc -v t1-zi4b-3 t1-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-t1-4.enc -v t1-zi4b-4 t1-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-t1-5.enc -v t1-zi4b-5 t1-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-t1-6.enc -v t1-zi4b-6 t1-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-t1-7.enc -v t1-zi4b-7 t1-zi4b-7
+
+afm2tfm Inconsolata-zi4r -T i4-ot1-0.enc -v ot1-zi4r-0 ot1-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-ot1-1.enc -v ot1-zi4r-1 ot1-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-ot1-2.enc -v ot1-zi4r-2 ot1-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-ot1-3.enc -v ot1-zi4r-3 ot1-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-ot1-4.enc -v ot1-zi4r-4 ot1-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-ot1-5.enc -v ot1-zi4r-5 ot1-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-ot1-6.enc -v ot1-zi4r-6 ot1-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-ot1-7.enc -v ot1-zi4r-7 ot1-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-ot1-0.enc -v ot1-zi4b-0 ot1-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-ot1-1.enc -v ot1-zi4b-1 ot1-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-ot1-2.enc -v ot1-zi4b-2 ot1-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-ot1-3.enc -v ot1-zi4b-3 ot1-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-ot1-4.enc -v ot1-zi4b-4 ot1-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-ot1-5.enc -v ot1-zi4b-5 ot1-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-ot1-6.enc -v ot1-zi4b-6 ot1-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-ot1-7.enc -v ot1-zi4b-7 ot1-zi4b-7
+
+afm2tfm Inconsolata-zi4r -T i4-ly1-0.enc -v ly1-zi4r-0 ly1-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-ly1-1.enc -v ly1-zi4r-1 ly1-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-ly1-2.enc -v ly1-zi4r-2 ly1-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-ly1-3.enc -v ly1-zi4r-3 ly1-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-ly1-4.enc -v ly1-zi4r-4 ly1-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-ly1-5.enc -v ly1-zi4r-5 ly1-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-ly1-6.enc -v ly1-zi4r-6 ly1-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-ly1-7.enc -v ly1-zi4r-7 ly1-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-ly1-0.enc -v ly1-zi4b-0 ly1-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-ly1-1.enc -v ly1-zi4b-1 ly1-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-ly1-2.enc -v ly1-zi4b-2 ly1-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-ly1-3.enc -v ly1-zi4b-3 ly1-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-ly1-4.enc -v ly1-zi4b-4 ly1-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-ly1-5.enc -v ly1-zi4b-5 ly1-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-ly1-6.enc -v ly1-zi4b-6 ly1-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-ly1-7.enc -v ly1-zi4b-7 ly1-zi4b-7
+
+afm2tfm Inconsolata-zi4r -T i4-qx-0.enc -v qx-zi4r-0 qx-zi4r-0
+afm2tfm Inconsolata-zi4r -T i4-qx-1.enc -v qx-zi4r-1 qx-zi4r-1
+afm2tfm Inconsolata-zi4r -T i4-qx-2.enc -v qx-zi4r-2 qx-zi4r-2
+afm2tfm Inconsolata-zi4r -T i4-qx-3.enc -v qx-zi4r-3 qx-zi4r-3
+afm2tfm Inconsolata-zi4r -T i4-qx-4.enc -v qx-zi4r-4 qx-zi4r-4
+afm2tfm Inconsolata-zi4r -T i4-qx-5.enc -v qx-zi4r-5 qx-zi4r-5
+afm2tfm Inconsolata-zi4r -T i4-qx-6.enc -v qx-zi4r-6 qx-zi4r-6
+afm2tfm Inconsolata-zi4r -T i4-qx-7.enc -v qx-zi4r-7 qx-zi4r-7
+afm2tfm Inconsolata-zi4b -T i4-qx-0.enc -v qx-zi4b-0 qx-zi4b-0
+afm2tfm Inconsolata-zi4b -T i4-qx-1.enc -v qx-zi4b-1 qx-zi4b-1
+afm2tfm Inconsolata-zi4b -T i4-qx-2.enc -v qx-zi4b-2 qx-zi4b-2
+afm2tfm Inconsolata-zi4b -T i4-qx-3.enc -v qx-zi4b-3 qx-zi4b-3
+afm2tfm Inconsolata-zi4b -T i4-qx-4.enc -v qx-zi4b-4 qx-zi4b-4
+afm2tfm Inconsolata-zi4b -T i4-qx-5.enc -v qx-zi4b-5 qx-zi4b-5
+afm2tfm Inconsolata-zi4b -T i4-qx-6.enc -v qx-zi4b-6 qx-zi4b-6
+afm2tfm Inconsolata-zi4b -T i4-qx-7.enc -v qx-zi4b-7 qx-zi4b-7
-
-afm2tfm Inconsolata-zi4r -T i4-t1-0.enc t1-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-1.enc t1-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-2.enc t1-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-3.enc t1-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-4.enc t1-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-5.enc t1-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-6.enc t1-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-t1-7.enc t1-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-0.enc t1-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-1.enc t1-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-2.enc t1-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-3.enc t1-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-4.enc t1-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-5.enc t1-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-6.enc t1-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-t1-7.enc t1-zi4b-7.tfm
-
-afm2tfm Inconsolata-zi4r -T i4-ot1-0.enc ot1-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-1.enc ot1-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-2.enc ot1-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-3.enc ot1-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-4.enc ot1-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-5.enc ot1-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-6.enc ot1-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-ot1-7.enc ot1-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-0.enc ot1-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-1.enc ot1-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-2.enc ot1-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-3.enc ot1-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-4.enc ot1-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-5.enc ot1-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-6.enc ot1-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-ot1-7.enc ot1-zi4b-7.tfm
-
-afm2tfm Inconsolata-zi4r -T i4-ly1-0.enc ly1-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-1.enc ly1-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-2.enc ly1-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-3.enc ly1-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-4.enc ly1-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-5.enc ly1-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-6.enc ly1-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-ly1-7.enc ly1-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-0.enc ly1-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-1.enc ly1-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-2.enc ly1-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-3.enc ly1-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-4.enc ly1-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-5.enc ly1-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-6.enc ly1-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-ly1-7.enc ly1-zi4b-7.tfm
-
-afm2tfm Inconsolata-zi4r -T i4-qx-0.enc qx-zi4r-0.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-1.enc qx-zi4r-1.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-2.enc qx-zi4r-2.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-3.enc qx-zi4r-3.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-4.enc qx-zi4r-4.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-5.enc qx-zi4r-5.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-6.enc qx-zi4r-6.tfm
-afm2tfm Inconsolata-zi4r -T i4-qx-7.enc qx-zi4r-7.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-0.enc qx-zi4b-0.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-1.enc qx-zi4b-1.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-2.enc qx-zi4b-2.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-3.enc qx-zi4b-3.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-4.enc qx-zi4b-4.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-5.enc qx-zi4b-5.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-6.enc qx-zi4b-6.tfm
-afm2tfm Inconsolata-zi4b -T i4-qx-7.enc qx-zi4b-7.tfm
-
-afm2tfm Inconsolata-zi4r -T i4-ts1.enc ts1-zi4r.tfm
-afm2tfm Inconsolata-zi4b -T i4-ts1.enc ts1-zi4b.tfm
+afm2tfm Inconsolata-zi4r -T i4-ts1.enc ts1-zi4r
+afm2tfm Inconsolata-zi4b -T i4-ts1.enc ts1-zi4b
# same again with narrow
-afm2tfm InconsolataN-Regular -T i4-t1-0.enc t1-zi4nr-0.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-1.enc t1-zi4nr-1.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-2.enc t1-zi4nr-2.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-3.enc t1-zi4nr-3.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-4.enc t1-zi4nr-4.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-5.enc t1-zi4nr-5.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-6.enc t1-zi4nr-6.tfm
-afm2tfm InconsolataN-Regular -T i4-t1-7.enc t1-zi4nr-7.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-0.enc t1-zi4nb-0.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-1.enc t1-zi4nb-1.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-2.enc t1-zi4nb-2.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-3.enc t1-zi4nb-3.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-4.enc t1-zi4nb-4.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-5.enc t1-zi4nb-5.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-6.enc t1-zi4nb-6.tfm
-afm2tfm InconsolataN-Bold -T i4-t1-7.enc t1-zi4nb-7.tfm
-
-afm2tfm InconsolataN-Regular -T i4-ot1-0.enc ot1-zi4nr-0.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-1.enc ot1-zi4nr-1.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-2.enc ot1-zi4nr-2.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-3.enc ot1-zi4nr-3.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-4.enc ot1-zi4nr-4.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-5.enc ot1-zi4nr-5.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-6.enc ot1-zi4nr-6.tfm
-afm2tfm InconsolataN-Regular -T i4-ot1-7.enc ot1-zi4nr-7.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-0.enc ot1-zi4nb-0.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-1.enc ot1-zi4nb-1.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-2.enc ot1-zi4nb-2.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-3.enc ot1-zi4nb-3.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-4.enc ot1-zi4nb-4.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-5.enc ot1-zi4nb-5.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-6.enc ot1-zi4nb-6.tfm
-afm2tfm InconsolataN-Bold -T i4-ot1-7.enc ot1-zi4nb-7.tfm
-
-afm2tfm InconsolataN-Regular -T i4-ly1-0.enc ly1-zi4nr-0.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-1.enc ly1-zi4nr-1.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-2.enc ly1-zi4nr-2.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-3.enc ly1-zi4nr-3.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-4.enc ly1-zi4nr-4.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-5.enc ly1-zi4nr-5.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-6.enc ly1-zi4nr-6.tfm
-afm2tfm InconsolataN-Regular -T i4-ly1-7.enc ly1-zi4nr-7.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-0.enc ly1-zi4nb-0.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-1.enc ly1-zi4nb-1.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-2.enc ly1-zi4nb-2.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-3.enc ly1-zi4nb-3.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-4.enc ly1-zi4nb-4.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-5.enc ly1-zi4nb-5.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-6.enc ly1-zi4nb-6.tfm
-afm2tfm InconsolataN-Bold -T i4-ly1-7.enc ly1-zi4nb-7.tfm
-
-afm2tfm InconsolataN-Regular -T i4-qx-0.enc qx-zi4nr-0.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-1.enc qx-zi4nr-1.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-2.enc qx-zi4nr-2.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-3.enc qx-zi4nr-3.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-4.enc qx-zi4nr-4.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-5.enc qx-zi4nr-5.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-6.enc qx-zi4nr-6.tfm
-afm2tfm InconsolataN-Regular -T i4-qx-7.enc qx-zi4nr-7.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-0.enc qx-zi4nb-0.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-1.enc qx-zi4nb-1.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-2.enc qx-zi4nb-2.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-3.enc qx-zi4nb-3.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-4.enc qx-zi4nb-4.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-5.enc qx-zi4nb-5.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-6.enc qx-zi4nb-6.tfm
-afm2tfm InconsolataN-Bold -T i4-qx-7.enc qx-zi4nb-7.tfm
+afm2tfm InconsolataN-Regular -T i4-t1-0.enc -v t1-zi4nr-0 t1-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-t1-1.enc -v t1-zi4nr-1 t1-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-t1-2.enc -v t1-zi4nr-2 t1-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-t1-3.enc -v t1-zi4nr-3 t1-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-t1-4.enc -v t1-zi4nr-4 t1-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-t1-5.enc -v t1-zi4nr-5 t1-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-t1-6.enc -v t1-zi4nr-6 t1-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-t1-7.enc -v t1-zi4nr-7 t1-zi4nr-7
+
+afm2tfm InconsolataN-Bold -T i4-t1-0.enc -v t1-zi4nb-0 t1-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-t1-1.enc -v t1-zi4nb-1 t1-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-t1-2.enc -v t1-zi4nb-2 t1-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-t1-3.enc -v t1-zi4nb-3 t1-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-t1-4.enc -v t1-zi4nb-4 t1-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-t1-5.enc -v t1-zi4nb-5 t1-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-t1-6.enc -v t1-zi4nb-6 t1-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-t1-7.enc -v t1-zi4nb-7 t1-zi4nb-7
+
+afm2tfm InconsolataN-Regular -T i4-ot1-0.enc -v ot1-zi4nr-0 ot1-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-ot1-1.enc -v ot1-zi4nr-1 ot1-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-ot1-2.enc -v ot1-zi4nr-2 ot1-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-ot1-3.enc -v ot1-zi4nr-3 ot1-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-ot1-4.enc -v ot1-zi4nr-4 ot1-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-ot1-5.enc -v ot1-zi4nr-5 ot1-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-ot1-6.enc -v ot1-zi4nr-6 ot1-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-ot1-7.enc -v ot1-zi4nr-7 ot1-zi4nr-7
+afm2tfm InconsolataN-Bold -T i4-ot1-0.enc -v ot1-zi4nb-0 ot1-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-ot1-1.enc -v ot1-zi4nb-1 ot1-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-ot1-2.enc -v ot1-zi4nb-2 ot1-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-ot1-3.enc -v ot1-zi4nb-3 ot1-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-ot1-4.enc -v ot1-zi4nb-4 ot1-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-ot1-5.enc -v ot1-zi4nb-5 ot1-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-ot1-6.enc -v ot1-zi4nb-6 ot1-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-ot1-7.enc -v ot1-zi4nb-7 ot1-zi4nb-7
+
+afm2tfm InconsolataN-Regular -T i4-ly1-0.enc -v ly1-zi4nr-0 ly1-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-ly1-1.enc -v ly1-zi4nr-1 ly1-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-ly1-2.enc -v ly1-zi4nr-2 ly1-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-ly1-3.enc -v ly1-zi4nr-3 ly1-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-ly1-4.enc -v ly1-zi4nr-4 ly1-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-ly1-5.enc -v ly1-zi4nr-5 ly1-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-ly1-6.enc -v ly1-zi4nr-6 ly1-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-ly1-7.enc -v ly1-zi4nr-7 ly1-zi4nr-7
+afm2tfm InconsolataN-Bold -T i4-ly1-0.enc -v ly1-zi4nb-0 ly1-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-ly1-1.enc -v ly1-zi4nb-1 ly1-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-ly1-2.enc -v ly1-zi4nb-2 ly1-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-ly1-3.enc -v ly1-zi4nb-3 ly1-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-ly1-4.enc -v ly1-zi4nb-4 ly1-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-ly1-5.enc -v ly1-zi4nb-5 ly1-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-ly1-6.enc -v ly1-zi4nb-6 ly1-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-ly1-7.enc -v ly1-zi4nb-7 ly1-zi4nb-7
+
+afm2tfm InconsolataN-Regular -T i4-qx-0.enc -v qx-zi4nr-0 qx-zi4nr-0
+afm2tfm InconsolataN-Regular -T i4-qx-1.enc -v qx-zi4nr-1 qx-zi4nr-1
+afm2tfm InconsolataN-Regular -T i4-qx-2.enc -v qx-zi4nr-2 qx-zi4nr-2
+afm2tfm InconsolataN-Regular -T i4-qx-3.enc -v qx-zi4nr-3 qx-zi4nr-3
+afm2tfm InconsolataN-Regular -T i4-qx-4.enc -v qx-zi4nr-4 qx-zi4nr-4
+afm2tfm InconsolataN-Regular -T i4-qx-5.enc -v qx-zi4nr-5 qx-zi4nr-5
+afm2tfm InconsolataN-Regular -T i4-qx-6.enc -v qx-zi4nr-6 qx-zi4nr-6
+afm2tfm InconsolataN-Regular -T i4-qx-7.enc -v qx-zi4nr-7 qx-zi4nr-7
+afm2tfm InconsolataN-Bold -T i4-qx-0.enc -v qx-zi4nb-0 qx-zi4nb-0
+afm2tfm InconsolataN-Bold -T i4-qx-1.enc -v qx-zi4nb-1 qx-zi4nb-1
+afm2tfm InconsolataN-Bold -T i4-qx-2.enc -v qx-zi4nb-2 qx-zi4nb-2
+afm2tfm InconsolataN-Bold -T i4-qx-3.enc -v qx-zi4nb-3 qx-zi4nb-3
+afm2tfm InconsolataN-Bold -T i4-qx-4.enc -v qx-zi4nb-4 qx-zi4nb-4
+afm2tfm InconsolataN-Bold -T i4-qx-5.enc -v qx-zi4nb-5 qx-zi4nb-5
+afm2tfm InconsolataN-Bold -T i4-qx-6.enc -v qx-zi4nb-6 qx-zi4nb-6
+afm2tfm InconsolataN-Bold -T i4-qx-7.enc -v qx-zi4nb-7 qx-zi4nb-7
-afm2tfm InconsolataN-Regular -T i4-ts1.enc ts1-zi4nr.tfm
-afm2tfm InconsolataN-Bold -T i4-ts1.enc ts1-zi4nb.tfm
+afm2tfm InconsolataN-Regular -T i4-ts1.enc ts1-zi4nr
+afm2tfm InconsolataN-Bold -T i4-ts1.enc ts1-zi4nb
Binary files old/doc/fonts/inconsolata/inconsolata-doc.pdf and new/doc/fonts/inconsolata/inconsolata-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/inconsolata/inconsolata-doc.tex new/doc/fonts/inconsolata/inconsolata-doc.tex
--- old/doc/fonts/inconsolata/inconsolata-doc.tex 2016-12-31 02:18:47.000000000 +0100
+++ new/doc/fonts/inconsolata/inconsolata-doc.tex 2019-05-18 23:14:55.000000000 +0200
@@ -4,16 +4,16 @@
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
\usepackage{booktabs}
-\pdfmapfile{=zi4.map}
+%\pdfmapfile{=zi4.map}
%SetFonts
-% libertine text and newtxmath
-%\usepackage{lmodern}
-\usepackage[osf,sups]{baskervillef}
+% inconsolata text
+\usepackage[nott]{inconsolata}
+\let\ttdefault\rmdefault
\usepackage[T1]{fontenc}
%\usepackage[scaled=.83]{beramono}
-\usepackage[varqu]{zi4}
+%\usepackage[varqu]{zi4}
%\usepackage{amsmath,amsthm}
-\usepackage[baskerville]{newtxmath}
+\usepackage{newtxmath}
\usepackage{textcomp}
%\renewcommand\rmdefault{LinuxLibertineT-OsF}
%\usepackage[supstfm=libertinesups,%
@@ -30,36 +30,38 @@
\begin{document}
%\show\textquotesingle
\maketitle
-The package provides updated PostScript and Opentype versions of Raph Levien's fine sans serif typewriter font
+The package provides updated \emph{PostScript} and Opentype versions of Raph Levien's fine sans serif typewriter font
\texttt{Inconsolata} in regular and bold weights, adding some glyphs which may optionally replace existing \texttt{quotedbl} and \texttt{quotesingle} and lower-case~L, along with new slashed zero, \texttt{arrowright} and \texttt{arrowleft} glyphs. As of version 1.11, narrower renditions are also provided, with widths reduced from 500 units to 450 units. \LaTeX\ support files are also provided for both.
\section*{\LaTeX\ usage}
-To use {\texttt{Inconsolata} as your typewriter font, add \verb|\usepackage{inconsolata}| (or \verb|\usepackage{zi4}|) to your preamble after any other packages that might load another typewriter font. This
+To use {\texttt{Inconsolata} as your typewriter font, add the line \verb|\usepackage{inconsolata}| (or, equivalently, \verb|\usepackage{zi4}|) to your preamble after any other packages that might load another typewriter font. This
will change the typewriter font family to \texttt{zi4}, the family name used
by this package, which replaces the old \textsf{inconsolata}, where the family name was \texttt{fi4}. (The original {\tt inconsolata} is now obsolete and is no longer distributed as part of \TeX Live.)
-As with Karl Berry's original \texttt{inconsolata} package, the new package offers four basic encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---, plus a \texttt{TS1} text comanion encoding. It provides the following options which some may find improve its utility for displaying verbatim text such as code fragments.
+As with Karl Berry's original \texttt{inconsolata} package, the new package offers four basic encodings---\texttt{T1}, \texttt{LY1}, \texttt{OT1} and \texttt{QX}---plus a \texttt{TS1} text companion encoding. It provides the following options which some may find improve its utility for displaying verbatim text such as code fragments.
\begin{itemize}
-\item The option \texttt{scaled=x} (or \texttt{scale=x}) allows you to scale all typewriter text and verbatim text by the factor \texttt{x}.
+\item With option {\bf nott}, the effect is to make {\tt zi4} the default Roman font rather than the default Typewriter font, turning on hyphenation and variable spacing. If this option is specified, it would be a good idea to choose a serifed Typewriter for the sake of contrast. As there are neither italics nor small caps available, you will need to find another way to emphasize small portions of text, and bold would seem to be the easiest to set.
+(This document is typeset using this option.)
+\item The option \textbf{scaled=x} (or \textbf{scale=x}) allows you to scale all typewriter text and verbatim text by the factor \textbf{x}.
\item
-The default zero in \texttt{zi4} is now slashed. The unslashed zero may be specified with the option \texttt{var0}.
+The default zero in \textbf{zi4} is now slashed. The unslashed zero may be specified with the option \textbf{var0}.
\item For those who find the default lower-case L(\texttt{l}) a bit too close to the numeral~\texttt{1}, there is an option \texttt{varl} which substitutes a more distinctive shape for all glyphs related to lower-case L.
-\item The \texttt{zi4} package loads the \texttt{textcomp} package, which points to a TS$1$-encoded font that has been modified to have uncurved left and right quotes, especially important in code fragments, by use of \texttt{textcomp} glyphs \verb|\textasciigrave| and \verb|\textquotesingle|. The \texttt{varqu} option provides further upright quote forms for glyphs that are not part of the \texttt{textcomp} package, such as
+\item The main package loads the \textbf{textcomp} package, which points to a TS$1$-encoded font that has been modified to have uncurved left and right quotes, especially important in code fragments, by use of \texttt{textcomp} glyphs \verb|\textasciigrave| and \verb|\textquotesingle|. The \textbf{varqu} option provides further upright quote forms for glyphs that are not part of the \texttt{textcomp} package, such as
the default double quote glyph \texttt{quotedbl} and \texttt{quotesingle}, which by default have a small slant. (Note that the latter is not part of all encodings---it is present in \texttt{OT1}, \texttt{LY1} and \texttt{QX}, but not in \texttt{T1}.)
\item The package loads \texttt{upquote} by default, but provides an option \texttt{noupquote} to override it.
\item (new in v.1.11) The option \texttt{narrow} causes the narrow versions to be used, having widths reduced by 10\%.
\item (new in v.1.11) The default behavior of {\tt inconsolata} is to prevent all automatic hyphenation, to permit spacing to stretch and shrink, and to place some extra space after a line ending period. This version offers the following options to change the default behavior.
\begin{itemize}
\item
-Option {\tt hyphenate} allows automatic hyphenation to occur, which may be useful if your usage is simply to have blocks of text is quasi-typewritten form, though with variable word-spacing.
-\item option {\tt mono} forces the behavior to mimic that of the Computer Modern Typewriter font---all spaces have the same width as the glyphs, and a full extra space is inserted after a line-ending period.
-\item You may modify individual {\tt fontdimen} values that govern this behavior by means of the options {\tt spacing}, {\tt stretch}, {\tt shrink} and {\tt extrasp}. These will override any values changed by the option {\tt mono}, for example, giving you a way to get monospacing but prevent extra space after a period, with
+Option \textbf{hyphenate} allows automatic hyphenation to occur, which may be useful if your usage is simply to have blocks of text in quasi-typewritten form, though with variable word-spacing.
+\item option \textbf{mono} forces the behavior to mimic that of the Computer Modern Typewriter font---all spaces have the same width as the glyphs, and a full extra space is inserted after a line-ending period.
+\item You may modify individual {\tt fontdimen} values that govern this behavior by means of the options \textbf{spacing}, \textbf{stretch}, {\tt shrink} and {\tt extrasp}. These will override any values changed by the option \textbf{mono}, for example, giving you a way to get monospacing but prevent extra space after a period, with
\begin{verbatim}
\usepackage[mono,extrasp=0em]{inconsolata}
\end{verbatim}
\end{itemize}
\end{itemize}
-When used in ordinary typewriter mode (ie, with \verb|\texttt{}| or the deprecated form \verb|{\tt }|), left and right quotes are rendered as in ordinary text. For example,
+When used in ordinary typewriter mode (i.e., with \verb|\texttt{}| or the deprecated form \verb|{\tt }|), left and right quotes are rendered as in ordinary text. For example,
\begin{verbatim}
\texttt{`xy' " \textasciigrave \textquotesingle}
\end{verbatim}
@@ -70,9 +72,29 @@
renders as you would expect it in code samples:
\verb|`xy' "|
+\textbf{TeX Ligatures:} As of version {\tt 1.12}, text mode follows the usual TeX ligature rules with the exception of the f-ligatures, at least in T1 and LY1. Behavior on OT1 and QX encodings is limited to a subset of those rules. So, for example, in T1 and LY1:
+\begin{center}
+ \begin{tabular}{@{} cc @{}}
+ \toprule
+ Input & Output \\
+ \midrule
+ \verb|\texttt{a-b}| & a-b \\ %\texttt{a-b} \\
+ \verb|\texttt{a--b}| & a--b\\ %\texttt{a--b} \\
+ \verb|\texttt{a---b}| & a--b \\ %\texttt{a---b} \\
+ \verb|\texttt{<<a>>}| & <<a>> \\ %\texttt{<<a>>} \\
+ \verb|\texttt{?`}| & ?` \\ %\texttt{?`} \\
+ \verb|\texttt{!`}| & !` \\ %\texttt{!`} \\
+ \verb|\texttt{``}| & `` \\ %\texttt{``} \\
+ \verb|\texttt{''}| & '' \\ %\texttt{''} \\
+ \bottomrule
+ \end{tabular}
+\end{center}
+
+Obviously, the distinctions between {\tt hyphen}, {\tt endash} and {\tt emdash} are subtle, as is to be expected given that the glyphs are of fixed width.
+
\textbf{Note on the QX encoding:} The encoding files used as part of this package, derived from the \texttt{inconsolata} package, seem to have some inconsistencies with \texttt{qxenc.def} made necessary as a compromise to get text and verbatim modes functioning for a wide class of common characters.
-In the following examples, the claim that all encodings render the same applies only to the very limited selection of quote glyphs tested. In practice, QX encoding behaves worse than the others for \texttt{zi4}.
+In the following examples, the claim that all encodings render the same applies only to the very limited selection of quote glyphs tested. In practice, QX encoding behaves worse than the others for \texttt{inconsolata}/\texttt{zi4}.
\section*{Effects of the options varqu, noupquote}
@@ -114,7 +136,7 @@
\DeclareTextSymbol{\textquotesingle}{TS1}{39}
\usepackage{upquote}
\end{verbatim}
-which is built-in to the \texttt{zi4.sty} code and need not be repeated.
+which is built-in to the \texttt{inconsolata.sty} (\textsc{aka} \texttt{zi4.sty}) code and need not be repeated.
\section*{Opentype issues} The package includes four Opentype fonts named \textsf{Inconsolatazi4-Regular}, \textsf{Inconsolatazi4-Bold}, \textsf{InconsolataN-Regular} and \textsf{InconsolataN-Bold}, the last two being for the narrow variant. The narrow and the normal width versions may be loaded using \texttt{fontspec}:
\begin{verbatim}
\fontspec{inconsolata} % normal width, slashed zero, curly quotes, default l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inconsolata.doc.tlpobj new/tlpkg/tlpobj/inconsolata.doc.tlpobj
--- old/tlpkg/tlpobj/inconsolata.doc.tlpobj 2019-02-28 03:42:40.000000000 +0100
+++ new/tlpkg/tlpobj/inconsolata.doc.tlpobj 2020-03-24 01:59:09.000000000 +0100
@@ -1,9 +1,9 @@
name inconsolata.doc
category Package
-revision 46319
+revision 54512
shortdesc doc files of inconsolata
relocated 1
-docfiles size=161
+docfiles size=149
RELOC/doc/fonts/inconsolata/OFL.txt
RELOC/doc/fonts/inconsolata/README
RELOC/doc/fonts/inconsolata/afmcmds.txt
++++++ inconsolata.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-0.enc new/fonts/enc/dvips/inconsolata/i4-ly1-0.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-0.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-0.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding0 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-1.enc new/fonts/enc/dvips/inconsolata/i4-ly1-1.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-1.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-1.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding1 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-2.enc new/fonts/enc/dvips/inconsolata/i4-ly1-2.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-2.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-2.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding2 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-3.enc new/fonts/enc/dvips/inconsolata/i4-ly1-3.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-3.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-3.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding3 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-4.enc new/fonts/enc/dvips/inconsolata/i4-ly1-4.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-4.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-4.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding4 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-5.enc new/fonts/enc/dvips/inconsolata/i4-ly1-5.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-5.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-5.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding5 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-6.enc new/fonts/enc/dvips/inconsolata/i4-ly1-6.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-6.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-6.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding6 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ly1-7.enc new/fonts/enc/dvips/inconsolata/i4-ly1-7.enc
--- old/fonts/enc/dvips/inconsolata/i4-ly1-7.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ly1-7.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4LY1Encoding7 [
/.notdef % 0x00 0
/Euro % 0x01 1 /Uni20AC
@@ -157,8 +164,8 @@
/quotedblleft % 0x93 147
/quotedblright % 0x94 148
/bullet % 0x95 149
-/.notdef % 0x96 150 /endash
-/.notdef % 0x97 151 /emdash
+/endash %/.notdef % 0x96 150 /endash
+/emdash %/.notdef % 0x97 151 /emdash
/tilde % 0x98 152
/trademark % 0x99 153
/scaron % 0x9A 154
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-0.enc new/fonts/enc/dvips/inconsolata/i4-ot1-0.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-0.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-0.enc 2019-06-23 22:59:54.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding0 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-1.enc new/fonts/enc/dvips/inconsolata/i4-ot1-1.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-1.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-1.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding1 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-2.enc new/fonts/enc/dvips/inconsolata/i4-ot1-2.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-2.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-2.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding2 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-3.enc new/fonts/enc/dvips/inconsolata/i4-ot1-3.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-3.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-3.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding3 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-4.enc new/fonts/enc/dvips/inconsolata/i4-ot1-4.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-4.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-4.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding4 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-5.enc new/fonts/enc/dvips/inconsolata/i4-ot1-5.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-5.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-5.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding5 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-6.enc new/fonts/enc/dvips/inconsolata/i4-ot1-6.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-6.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-6.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding6 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-ot1-7.enc new/fonts/enc/dvips/inconsolata/i4-ot1-7.enc
--- old/fonts/enc/dvips/inconsolata/i4-ot1-7.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-ot1-7.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,10 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+%
/zi4OT1TypewriterEncoding7 [
/.notdef
/.notdef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-0.enc new/fonts/enc/dvips/inconsolata/i4-qx-0.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-0.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-0.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,13 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
% There appear to be inconsistencies here with qxenc.def, eg /quotesingle, quotedbl, /dotaccent, /backslash and a number of others
+%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding0 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-1.enc new/fonts/enc/dvips/inconsolata/i4-qx-1.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-1.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-1.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding1 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-2.enc new/fonts/enc/dvips/inconsolata/i4-qx-2.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-2.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-2.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding2 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-3.enc new/fonts/enc/dvips/inconsolata/i4-qx-3.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-3.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-3.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding3 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-4.enc new/fonts/enc/dvips/inconsolata/i4-qx-4.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-4.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-4.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding4 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-5.enc new/fonts/enc/dvips/inconsolata/i4-qx-5.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-5.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-5.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding5 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-6.enc new/fonts/enc/dvips/inconsolata/i4-qx-6.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-6.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-6.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding6 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-qx-7.enc new/fonts/enc/dvips/inconsolata/i4-qx-7.enc
--- old/fonts/enc/dvips/inconsolata/i4-qx-7.enc 2016-02-17 22:44:57.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-qx-7.enc 2019-05-18 23:14:55.000000000 +0200
@@ -7,6 +7,12 @@
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4QXTTEncoding7 [
/.notdef
/.notdef % /Delta xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-0.enc new/fonts/enc/dvips/inconsolata/i4-t1-0.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-0.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-0.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding0 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/endash % 0x15 U+2013
+/emdash %/emdash % 0x16 U+2014
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
@@ -194,7 +201,7 @@
/ydieresis % 0xB8 U+00FF
/zacute % 0xB9 U+017A
/zcaron % 0xBA U+017E
-/zdotaccent % 0xBB zdotaccent U+017C awaiting raph fix xx
+/zdotaccent % 0xBB =U+017C
/.notdef % 0xBC ij U+0133 xx
/exclamdown % 0xBD U+00A1
/questiondown % 0xBE U+00BF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-1.enc new/fonts/enc/dvips/inconsolata/i4-t1-1.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-1.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-1.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding1 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-2.enc new/fonts/enc/dvips/inconsolata/i4-t1-2.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-2.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-2.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding2 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-3.enc new/fonts/enc/dvips/inconsolata/i4-t1-3.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-3.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-3.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding3 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-4.enc new/fonts/enc/dvips/inconsolata/i4-t1-4.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-4.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-4.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding4 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-5.enc new/fonts/enc/dvips/inconsolata/i4-t1-5.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-5.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-5.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding5 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-6.enc new/fonts/enc/dvips/inconsolata/i4-t1-6.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-6.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-6.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding6 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/inconsolata/i4-t1-7.enc new/fonts/enc/dvips/inconsolata/i4-t1-7.enc
--- old/fonts/enc/dvips/inconsolata/i4-t1-7.enc 2016-02-12 01:19:51.000000000 +0100
+++ new/fonts/enc/dvips/inconsolata/i4-t1-7.enc 2019-05-18 23:14:55.000000000 +0200
@@ -6,6 +6,13 @@
% 4: VarQ (quotes)
% For example, 5=1+4 means variant l shape and variant quotes, but no variant 0
%
+% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+% LIGKERN quoteleft quoteleft =: quotedblleft ;
+% LIGKERN quoteright quoteright =: quotedblright ;
+% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+% LIGKERN greater greater =: guillemotright ;
+%
/zi4T1Encoding7 [
/uni02CB % 0x00 U+0060
/acute % 0x01 U+00B4
@@ -28,8 +35,8 @@
/quotedblbase % 0x12 U+201E
/guillemotleft % 0x13 U+00AB
/guillemotright % 0x14 U+00BB
-/.notdef % 0x15 endash U+2013 xx
-/.notdef % 0x16 emdash U+2014 xx
+/endash %/.notdef % 0x15 endash U+2013 xx
+/emdash %/.notdef % 0x16 emdash U+2014 xx
/.notdef % 0x17 U+200B
/.notdef % 0x18 perthousandzero xx
/dotlessi % 0x19 U+0131
Binary files old/fonts/opentype/public/inconsolata/InconsolataN-Bold.otf and new/fonts/opentype/public/inconsolata/InconsolataN-Bold.otf differ
Binary files old/fonts/opentype/public/inconsolata/InconsolataN-Regular.otf and new/fonts/opentype/public/inconsolata/InconsolataN-Regular.otf differ
Binary files old/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf and new/fonts/opentype/public/inconsolata/Inconsolatazi4-Bold.otf differ
Binary files old/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf and new/fonts/opentype/public/inconsolata/Inconsolatazi4-Regular.otf differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-0.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-2.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-4.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-6.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4b-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4b-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nb-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4nr-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-0.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-2.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-4.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-6.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ly1-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/ly1-zi4r-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-0.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-2.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-4.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-6.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4b-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4b-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nb-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4nr-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-0.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-2.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-4.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-6.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ot1-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/ot1-zi4r-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-0.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-2.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-4.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-6.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4b-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4b-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nb-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4nr-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-0.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-2.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-4.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-6.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/qx-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/qx-zi4r-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-0.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-2.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-4.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-6.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4b-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4b-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-0.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-2.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-4.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-6.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nb-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nb-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-0.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-2.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-4.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-6.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4nr-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4nr-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-0.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-0.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-1.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-1.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-2.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-2.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-3.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-3.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-4.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-4.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-5.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-5.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-6.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-6.tfm differ
Binary files old/fonts/tfm/public/inconsolata/t1-zi4r-7.tfm and new/fonts/tfm/public/inconsolata/t1-zi4r-7.tfm differ
Binary files old/fonts/tfm/public/inconsolata/ts1-zi4nb.tfm and new/fonts/tfm/public/inconsolata/ts1-zi4nb.tfm differ
Binary files old/fonts/type1/public/inconsolata/Inconsolata-zi4b.pfb and new/fonts/type1/public/inconsolata/Inconsolata-zi4b.pfb differ
Binary files old/fonts/type1/public/inconsolata/Inconsolata-zi4r.pfb and new/fonts/type1/public/inconsolata/Inconsolata-zi4r.pfb differ
Binary files old/fonts/type1/public/inconsolata/InconsolataN-Bold.pfb and new/fonts/type1/public/inconsolata/InconsolataN-Bold.pfb differ
Binary files old/fonts/type1/public/inconsolata/InconsolataN-Regular.pfb and new/fonts/type1/public/inconsolata/InconsolataN-Regular.pfb differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/inconsolata.sty new/tex/latex/inconsolata/inconsolata.sty
--- old/tex/latex/inconsolata/inconsolata.sty 2017-01-05 23:59:08.000000000 +0100
+++ new/tex/latex/inconsolata/inconsolata.sty 2019-05-18 23:14:55.000000000 +0200
@@ -1,9 +1,9 @@
-% Copyright 2014--2017 Michael Sharpe
+% Copyright 2014--2019 Michael Sharpe
% Based initially on Karl Berry's inconsolata.sty.
% You may freely use, modify and/or distribute this file.
-\def\fileversion{1.112}
-\def\filedate{2017/01/04}
+\def\fileversion{1.12}
+\def\filedate{2019/05/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{inconsolata}[\filedate\space v\fileversion]
\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
@@ -21,11 +21,11 @@
\def\zifour(a)sp{.5em}
\def\zifour(a)stretch{.25em}
\def\zifour(a)shrink{.167em}
-\def\zifour(a)extrasp{.167em}
+\def\zifour@extrasp{0em}
\def\zifour(a)spn{.45em}
\def\zifour(a)stretchn{.225em}
\def\zifour(a)shrinkn{.15em}
-\def\zifour(a)extraspn{.15em}
+\def\zifour@extraspn{0em}
% by default, change \tt to mean zi4.
\newcommand*{\zifour@default}{%
@@ -40,16 +40,19 @@
% \edef\x{\endgroup
% \noexpand\setkeys{zifour}{\CurrentOption}}%
% \x}
-
+\def\zifour@hyph{\hyphenchar\font=\m@ne}
\DeclareOptionX{hyphenate}{%
- \zifour@hyphentrue}
+ \def\zifour@hyph{}}
\DeclareOptionX{mono}{%
\zifour@monotrue}
% option [nott] to avoid changing tt.
\DeclareOptionX{nott}{%
- \renewcommand*{\zifour@default}{}%
+ \def\zifour@hyph{}\zifour@monofalse%
+ \def\zifour@extrasp{0em}%
+ \renewcommand*{\zifour@default}{%
+ \renewcommand*{\rmdefault}{zi4}}%
}
% option [noupquote] to prevent loading upquote.
\DeclareOptionX{noupquote}{%
@@ -78,6 +81,7 @@
\gdef\zifour@extraspx{#1}}
\ProcessOptionsX
+\zifour@default
\ifzifour@mono%
\def\zifour@stretch{0em}
@@ -99,12 +103,14 @@
\ifdefined\zifour@shrinkx\let\zifour@shrink\zifour@shrinkx\fi
\ifdefined\zifour@extraspx\let\zifour@extrasp\zifour@extraspx\fi
-\ifzifour@hyphen%
- \def\zifour@hyph{}
-\else%
- \def\zifour@hyph{\hyphenchar\font=\m@ne}
-\fi
-\def\zifour@spc{%
+%\ifzifour@hyphen%
+% \edef\zifour@hyph{\hyphenchar\font=45 }
+%\else%
+% \edef\zifour@hyph{\hyphenchar\font=\m@ne}
+%\fi
+%\show\zifour@hyph
+
+\edef\zifour@spc{%
\fontdimen2\font=\zifour@sp%
\fontdimen3\font=\zifour@stretch%
\fontdimen4\font=\zifour@shrink%
@@ -112,7 +118,6 @@
\zifour@hyph%
} % used to change default text spacing via fd files
%\show\zifour@spc
-\zifour@default
\edef\zifour@opt{\the\zifour@ocount}
\ifzifour@altzero
\advance\zifour@ocount -\tw@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/inconsolata/zi4.sty new/tex/latex/inconsolata/zi4.sty
--- old/tex/latex/inconsolata/zi4.sty 2017-01-05 23:59:08.000000000 +0100
+++ new/tex/latex/inconsolata/zi4.sty 2019-05-18 23:14:55.000000000 +0200
@@ -1,9 +1,9 @@
-% Copyright 2014--2017 Michael Sharpe
+% Copyright 2014--2019 Michael Sharpe
% Based initially on Karl Berry's inconsolata.sty.
% You may freely use, modify and/or distribute this file.
-\def\fileversion{1.112}
-\def\filedate{2017/01/04}
+\def\fileversion{1.12}
+\def\filedate{2019/05/17}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zi4}[\filedate\space v\fileversion]
\message{`inconsolata-zi4' v\fileversion, \filedate\space Text macros for Inconsolata (msharpe)}
@@ -21,11 +21,11 @@
\def\zifour(a)sp{.5em}
\def\zifour(a)stretch{.25em}
\def\zifour(a)shrink{.167em}
-\def\zifour(a)extrasp{.167em}
+\def\zifour@extrasp{0em}
\def\zifour(a)spn{.45em}
\def\zifour(a)stretchn{.225em}
\def\zifour(a)shrinkn{.15em}
-\def\zifour(a)extraspn{.15em}
+\def\zifour@extraspn{0em}
% by default, change \tt to mean zi4.
\newcommand*{\zifour@default}{%
@@ -40,16 +40,19 @@
% \edef\x{\endgroup
% \noexpand\setkeys{zifour}{\CurrentOption}}%
% \x}
-
+\def\zifour@hyph{\hyphenchar\font=\m@ne}
\DeclareOptionX{hyphenate}{%
- \zifour@hyphentrue}
+ \def\zifour@hyph{}}
\DeclareOptionX{mono}{%
\zifour@monotrue}
% option [nott] to avoid changing tt.
\DeclareOptionX{nott}{%
- \renewcommand*{\zifour@default}{}%
+ \def\zifour@hyph{}\zifour@monofalse%
+ \def\zifour@extrasp{0em}%
+ \renewcommand*{\zifour@default}{%
+ \renewcommand*{\rmdefault}{zi4}}%
}
% option [noupquote] to prevent loading upquote.
\DeclareOptionX{noupquote}{%
@@ -78,6 +81,7 @@
\gdef\zifour@extraspx{#1}}
\ProcessOptionsX
+\zifour@default
\ifzifour@mono%
\def\zifour@stretch{0em}
@@ -99,12 +103,14 @@
\ifdefined\zifour@shrinkx\let\zifour@shrink\zifour@shrinkx\fi
\ifdefined\zifour@extraspx\let\zifour@extrasp\zifour@extraspx\fi
-\ifzifour@hyphen%
- \def\zifour@hyph{}
-\else%
- \def\zifour@hyph{\hyphenchar\font=\m@ne}
-\fi
-\def\zifour@spc{%
+%\ifzifour@hyphen%
+% \edef\zifour@hyph{\hyphenchar\font=45 }
+%\else%
+% \edef\zifour@hyph{\hyphenchar\font=\m@ne}
+%\fi
+%\show\zifour@hyph
+
+\edef\zifour@spc{%
\fontdimen2\font=\zifour@sp%
\fontdimen3\font=\zifour@stretch%
\fontdimen4\font=\zifour@shrink%
@@ -112,7 +118,6 @@
\zifour@hyph%
} % used to change default text spacing via fd files
%\show\zifour@spc
-\zifour@default
\edef\zifour@opt{\the\zifour@ocount}
\ifzifour@altzero
\advance\zifour@ocount -\tw@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inconsolata.tlpobj new/tlpkg/tlpobj/inconsolata.tlpobj
--- old/tlpkg/tlpobj/inconsolata.tlpobj 2019-02-28 03:42:40.000000000 +0100
+++ new/tlpkg/tlpobj/inconsolata.tlpobj 2020-03-24 01:59:09.000000000 +0100
@@ -1,6 +1,6 @@
name inconsolata
category Package
-revision 46319
+revision 54512
shortdesc A monospaced font, with support files for use with TeX
relocated 1
longdesc Inconsolata is a monospaced font designed by Raph Levien. This
@@ -10,7 +10,7 @@
longdesc shapelier lower-case L, plus metric files for use with TeX, and
longdesc LaTeX font definition and other relevant files.
execute addMap zi4.map
-runfiles size=318
+runfiles size=300
RELOC/fonts/enc/dvips/inconsolata/i4-ly1-0.enc
RELOC/fonts/enc/dvips/inconsolata/i4-ly1-1.enc
RELOC/fonts/enc/dvips/inconsolata/i4-ly1-2.enc
@@ -196,7 +196,6 @@
RELOC/tex/latex/inconsolata/zi4.sty
catalogue-contact-home http://levien.com/type/myfonts/inconsolata.html
catalogue-ctan /fonts/inconsolata
-catalogue-date 2018-01-15 07:32:06 +0100
-catalogue-license oflapache2lppl1.3
+catalogue-license ofl apache2 lppl1.3
catalogue-topics font font-mono font-type1 font-otf font-t1enc
-catalogue-version 1.114
+catalogue-version 1.121
++++++ initials.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/initials.doc.tlpobj new/tlpkg/tlpobj/initials.doc.tlpobj
--- old/tlpkg/tlpobj/initials.doc.tlpobj 2019-02-28 03:42:42.000000000 +0100
+++ new/tlpkg/tlpobj/initials.doc.tlpobj 2020-03-04 23:51:09.000000000 +0100
@@ -1,6 +1,6 @@
name initials.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of initials
relocated 1
docfiles size=24
++++++ initials.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/initials.tlpobj new/tlpkg/tlpobj/initials.tlpobj
--- old/tlpkg/tlpobj/initials.tlpobj 2019-02-28 03:42:45.000000000 +0100
+++ new/tlpkg/tlpobj/initials.tlpobj 2020-03-04 23:51:09.000000000 +0100
@@ -1,10 +1,10 @@
name initials
category Package
-revision 15878
+revision 54080
shortdesc Adobe Type 1 decorative initial fonts
relocated 1
-longdesc For each font, at least an .pfb and .tfm file is provided, with
-longdesc a .fd file for use with LaTeX.
+longdesc For each font, at least a .pfb and a .tfm file is provided,
+longdesc with an .fd file for use with LaTeX.
execute addMap Acorn.map
execute addMap AnnSton.map
execute addMap ArtNouv.map
@@ -168,6 +168,5 @@
RELOC/tex/latex/initials/Typocaps.fd
RELOC/tex/latex/initials/Zallman.fd
catalogue-ctan /fonts/initials
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-type1 font-decor
++++++ inline-images.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inline-images.doc.tlpobj new/tlpkg/tlpobj/inline-images.doc.tlpobj
--- old/tlpkg/tlpobj/inline-images.doc.tlpobj 2019-02-28 03:42:47.000000000 +0100
+++ new/tlpkg/tlpobj/inline-images.doc.tlpobj 2020-03-04 23:51:10.000000000 +0100
@@ -1,6 +1,6 @@
name inline-images.doc
category Package
-revision 48415
+revision 54080
shortdesc doc files of inline-images
relocated 1
docfiles size=37
++++++ inline-images.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inline-images.tlpobj new/tlpkg/tlpobj/inline-images.tlpobj
--- old/tlpkg/tlpobj/inline-images.tlpobj 2019-02-28 03:42:47.000000000 +0100
+++ new/tlpkg/tlpobj/inline-images.tlpobj 2020-03-04 23:51:11.000000000 +0100
@@ -1,6 +1,6 @@
name inline-images
category Package
-revision 48415
+revision 54080
shortdesc Inline images in base64 encoding
relocated 1
longdesc The package provides a command \inlineimg to dynamically create
@@ -9,10 +9,9 @@
longdesc must be run with option --shell-escape. Program base64.
runfiles size=1
RELOC/tex/latex/inline-images/inline-images.sty
-catalogue-contact-bugs https://mrw.sh/templates/inline-images/issues
-catalogue-contact-home https://mrw.sh/templates/inline-images
+catalogue-contact-bugs https://mrw.dev/templates/inline-images/issues
+catalogue-contact-home https://mrw.dev/templates/inline-images
catalogue-ctan /macros/latex/contrib/inline-images
-catalogue-date 2018-08-18 05:31:14 +0200
catalogue-license lgpl3
catalogue-topics image-supp
catalogue-version 1.0
++++++ inriafonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inriafonts.doc.tlpobj new/tlpkg/tlpobj/inriafonts.doc.tlpobj
--- old/tlpkg/tlpobj/inriafonts.doc.tlpobj 2019-02-28 03:42:48.000000000 +0100
+++ new/tlpkg/tlpobj/inriafonts.doc.tlpobj 2020-03-24 01:59:10.000000000 +0100
@@ -1,6 +1,6 @@
name inriafonts.doc
category Package
-revision 49826
+revision 54512
shortdesc doc files of inriafonts
relocated 1
docfiles size=46
++++++ inriafonts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/inriafonts.tlpobj new/tlpkg/tlpobj/inriafonts.tlpobj
--- old/tlpkg/tlpobj/inriafonts.tlpobj 2019-02-28 03:42:48.000000000 +0100
+++ new/tlpkg/tlpobj/inriafonts.tlpobj 2020-03-24 01:59:10.000000000 +0100
@@ -1,6 +1,6 @@
name inriafonts
category Package
-revision 49826
+revision 54512
shortdesc Inria fonts with LaTeX support
relocated 1
longdesc Inria is a free font designed by Black[Foundry] for Inria
@@ -865,7 +865,6 @@
RELOC/tex/latex/inriafonts/TS1InriaSerif-TLF.fd
RELOC/tex/latex/inriafonts/TS1InriaSerif-TOsF.fd
catalogue-ctan /fonts/inriafonts
-catalogue-date 2019-01-28 05:39:57 +0100
-catalogue-license ofllppl
+catalogue-license ofl lppl
catalogue-topics font font-sans font-serif font-body font-otf font-type1 font-t1enc font-proportional
catalogue-version 1.0
++++++ intopdf.doc.tar.xz ++++++
Binary files old/doc/latex/intopdf/intopdf.pdf and new/doc/latex/intopdf/intopdf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/intopdf.doc.tlpobj new/tlpkg/tlpobj/intopdf.doc.tlpobj
--- old/tlpkg/tlpobj/intopdf.doc.tlpobj 2019-02-28 03:43:03.000000000 +0100
+++ new/tlpkg/tlpobj/intopdf.doc.tlpobj 2019-05-29 01:38:46.000000000 +0200
@@ -1,8 +1,8 @@
name intopdf.doc
category Package
-revision 46988
+revision 51247
shortdesc doc files of intopdf
relocated 1
-docfiles size=103
+docfiles size=99
RELOC/doc/latex/intopdf/README.md
RELOC/doc/latex/intopdf/intopdf.pdf
++++++ intopdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/intopdf/intopdf.sty new/tex/latex/intopdf/intopdf.sty
--- old/tex/latex/intopdf/intopdf.sty 2018-03-16 22:30:59.000000000 +0100
+++ new/tex/latex/intopdf/intopdf.sty 2019-05-28 23:23:18.000000000 +0200
@@ -18,11 +18,11 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{expl3}
+\RequirePackage{expl3,xparse}
\ProvidesExplPackage
{intopdf}
- {2018/03/15}
- {0.1.0}
+ {2019/05/28}
+ {0.2.1}
{Embed non-PDF files into PDF with hyperlink}
\RequirePackage{hyperref}
@@ -91,15 +91,15 @@
#3
\__intopdf_annot_end:
}
-\cs_new_protected:Nn\intopdf_attach_link:nnnn{
+\cs_new_protected:Nn\intopdf_attach_link:nnnnn{
\__intopdf_pdfstream_file:nn{
- /Subtype /\__intopdf_escape_name:n{#2}
- }{#1}
+ /Subtype /\__intopdf_escape_name:n{#3}
+ }{#2}
\__intopdf_pdfobj:n{
/Type /Filespec
/F \__intopdf_escape_string:n{#1}
/EF << /F \__intopdf_lastobj_ref: >>
- /Desc \__intopdf_escape_string:n{#3}
+ /Desc \__intopdf_escape_string:n{#4}
}%
\__intopdf_annot:nnn{
\Hy@setpdfborder
@@ -117,14 +117,17 @@
/FS \__intopdf_lastobj_ref:
/F\c_space_tl 416
/CA\c_space_tl 0
- /Contents \__intopdf_escape_string:n{#3}
+ /Contents \__intopdf_escape_string:n{#4}
}{
- #4
+ #5
}
}
}
-\cs_new_protected:Npn\attachandlink#1[#2]#3#4{
- \intopdf_attach_link:nnnn{#1}{#2}{#3}{#4}
+\cs_new_protected:Npn \intopdf_attach_link:nnnn #1{
+ \intopdf_attach_link:nnnnn{#1}{#1}
+}
+\NewDocumentCommand\attachandlink{O{#2}mr[]mm}{
+ \intopdf_attach_link:nnnnn{#1}{#2}{#3}{#4}{#5}
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/intopdf.tlpobj new/tlpkg/tlpobj/intopdf.tlpobj
--- old/tlpkg/tlpobj/intopdf.tlpobj 2019-02-28 03:43:03.000000000 +0100
+++ new/tlpkg/tlpobj/intopdf.tlpobj 2019-05-29 01:38:46.000000000 +0200
@@ -1,6 +1,6 @@
name intopdf
category Package
-revision 46988
+revision 51247
shortdesc Embed non-PDF files into PDF with hyperlink
relocated 1
longdesc The package allows to embed non-PDF files (e.g., BibTeX) into
@@ -9,7 +9,7 @@
RELOC/tex/latex/intopdf/intopdf.sty
catalogue-contact-repository https://github.com/zauguin/intopdf
catalogue-ctan /macros/latex/contrib/intopdf
-catalogue-date 2018-04-29 07:15:59 +0200
+catalogue-date 2019-05-28 09:36:39 +0200
catalogue-license lppl1.3c
catalogue-topics hyper pdf-feat
-catalogue-version 0.1.0
+catalogue-version 0.2.1
++++++ iodhbwm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/README.md new/doc/latex/iodhbwm/README.md
--- old/doc/latex/iodhbwm/README.md 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/README.md 2020-04-14 23:04:51.000000000 +0200
@@ -1,33 +1,34 @@
-iodhbwm
-=======
+# iodhbwm
[![CTAN](https://img.shields.io/ctan/v/iodhbwm.svg)](https://www.ctan.org/pkg/iodhbwm)
[![GitHub license](https://img.shields.io/github/license/faltfe/iodhbwm.svg?style=fla…
[![Build Status](https://img.shields.io/travis/faltfe/iodhbwm/master.svg?style=flat-…
---------------------------------------------------------------------------
+---
+
This project provides the _unofficial_ template of the [DHBW Mannheim](http://www.dhbw-mannheim.de) for
the creation of bachelor thesis, studies or project work with _LaTeX_. The goal of the package is
the quick creation of a basic framework without much effort.
The documentation is currently only available in German.
---------------------------------------------------------------------------
+---
Felix Faltin
-Web: <https://github.com/faltfe/iodhbwm>
+Web: <https://github.com/faltfe/iodhbwm>
E-Mail: ffaltin91(a)gmail.com
---------------------------------------------------------------------------
-Copyright 2018 Felix Faltin
+---
+
+Copyright 2018-2020 Felix Faltin
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
of this license or (at your option) any later version.
The latest version of this license is in
- <http://www.latex-project.org/lppl.txt>
+<http://www.latex-project.org/lppl.txt>
and version 1.3 or later is part of all distributions of LaTeX
version 2005/12/01 or later.
@@ -35,9 +36,9 @@
The Current Maintainer of this work is Felix Faltin.
---------------------------------------------------------------------------
+---
If you have any ideas, questions, suggestions or bugs to report, please
feel free to contact me.
---------------------------------------------------------------------------
\ No newline at end of file
+---
Binary files old/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.pdf and new/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.tex new/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.tex
--- old/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.tex 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.tex 2019-05-21 23:02:41.000000000 +0200
@@ -1,6 +1,6 @@
% ---------------------------------------------------
-% Date: 12.12.2018
-% Version: v0.1
+% Date: 15.05.2019
+% Version: v1.1.0
% Autor: Felix Faltin <ffaltin91[at]gmail.com>
% Repository: https://github.com/faltfe/iodhbwm
% ---------------------------------------------------
Binary files old/doc/latex/iodhbwm/examples/appendix/iodhbwm-appendix.pdf and new/doc/latex/iodhbwm/examples/appendix/iodhbwm-appendix.pdf differ
Binary files old/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.pdf and new/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.tex new/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.tex
--- old/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.tex 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.tex 2019-09-18 23:57:32.000000000 +0200
@@ -1,6 +1,6 @@
% ---------------------------------------------------
-% Date: 08.10.2018
-% Version: v0.1
+% Date: 08.08.2019
+% Version: v1.1.1
% Autor: Felix Faltin <ffaltin91[at]gmail.com>
% Repository: https://github.com/faltfe/iodhbwm
% ---------------------------------------------------
@@ -47,6 +47,5 @@
\end{lstlisting}
\blindtext
-
- \Blinddocument
+
\end{document}
Binary files old/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.pdf and new/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.tex new/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.tex
--- old/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.tex 2019-05-21 23:02:41.000000000 +0200
@@ -0,0 +1,46 @@
+% ---------------------------------------------------
+% Date: 15.05.2019
+% Version: v1.1.0
+% Autor: Felix Faltin <ffaltin91[at]gmail.com>
+% Repository: https://github.com/faltfe/iodhbwm
+% ---------------------------------------------------
+% --- --- --- --- -- Class options -- --- --- --- ---
+% ---------------------------------------------------
+\documentclass[
+ load-dhbw-templates, % Allow \dhbw* commands
+ auto-intro-pages, % Takes care about titlepage, abstract, ToC, etc.
+ add-tocs-to-toc, % Add LoF, LoT, etc. to ToC
+ mainlanguage = ngerman, % Set main document language
+ debug % Provide \lipsum, \blindtext
+]{iodhbwm}
+\usepackage[T1]{fontenc}
+
+% ---------------------------------------------------
+% --- --- --- --- - Necessary setup - --- --- --- ---
+% ---------------------------------------------------
+\dhbwsetup{%
+ author = Max Mustermann,
+ thesis type = PA,
+ thesis title = Einführungsbeispiel mit empfohlenen Einstellungen,
+ student id = 12345,
+ location = Musterstadt,
+ institute = Musterwerke GmbH,
+ course/id = Txxxx,
+ supervisor = Felix Faltin,
+ processing period = {01.01.17 -- 31.01.17},
+ intro/roman page numbers
+}
+
+\begin{document}
+ \chapter{Testbild}
+ \blindtext
+
+ \begin{figure}
+ \includegraphics[width=.5\linewidth]{example-image-a}
+ \caption{Example image a}
+ \end{figure}
+
+ \blindtext
+
+ \Blinddocument
+\end{document}
Binary files old/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.pdf and new/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.tex new/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.tex
--- old/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.tex 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.tex 2019-05-21 23:02:41.000000000 +0200
@@ -1,6 +1,6 @@
% ---------------------------------------------------
-% Date: 08.10.2018
-% Version: v0.1
+% Date: 15.05.2019
+% Version: v1.1.0
% Autor: Felix Faltin <ffaltin91[at]gmail.com>
% Repository: https://github.com/faltfe/iodhbwm
% ---------------------------------------------------
Binary files old/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.pdf and new/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.tex new/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.tex
--- old/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.tex 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.tex 2019-05-21 23:02:41.000000000 +0200
@@ -1,6 +1,6 @@
% ---------------------------------------------------
-% Date: 08.10.2018
-% Version: v0.1
+% Date: 15.05.2019
+% Version: v1.1.0
% Autor: Felix Faltin <ffaltin91[at]gmail.com>
% Repository: https://github.com/faltfe/iodhbwm
% ---------------------------------------------------
Binary files old/doc/latex/iodhbwm/examples/listings/iodhbwm-listings-color.pdf and new/doc/latex/iodhbwm/examples/listings/iodhbwm-listings-color.pdf differ
Binary files old/doc/latex/iodhbwm/examples/listings/iodhbwm-listings.pdf and new/doc/latex/iodhbwm/examples/listings/iodhbwm-listings.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/examples/listings/iodhbwm-listings.tex new/doc/latex/iodhbwm/examples/listings/iodhbwm-listings.tex
--- old/doc/latex/iodhbwm/examples/listings/iodhbwm-listings.tex 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/examples/listings/iodhbwm-listings.tex 2019-09-18 23:57:32.000000000 +0200
@@ -1,6 +1,6 @@
% ---------------------------------------------------
-% Date: 12.12.2018
-% Version: v0.1
+% Date: 08.09.2019
+% Version: v1.1.1
% Autor: Felix Faltin <ffaltin91[at]gmail.com>
% Repository: https://github.com/faltfe/iodhbwm
% ---------------------------------------------------
Binary files old/doc/latex/iodhbwm/examples/references/iodhbwm-references.pdf and new/doc/latex/iodhbwm/examples/references/iodhbwm-references.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/english/dhbw-declaration.def new/doc/latex/iodhbwm/i18n/english/dhbw-declaration.def
--- old/doc/latex/iodhbwm/i18n/english/dhbw-declaration.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/english/dhbw-declaration.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,37 @@
+\clearpage
+
+\ifcsdef{chapter}%
+{\chapter*{Declaration}}%
+{\section*{Declaration}}
+
+\thispagestyle{empty}
+
+\bigskip
+
+I hereby assure you that I have written my \getThesisType{} on the\bigskip
+
+\textsc{Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+{\bfseries \getThesisTitle}
+
+\ifcsempty{iodhbwm@thesis@second@title}{}{%
+\bigskip
+\textsc{Subject B}\par%
+{\bfseries \getThesisSecondTitle}%
+}{}\bigskip
+
+independently and that I have not used any other sources and aids than those indicated.
+
+
+I also assure you that the electronic version submitted is the same as the printed version.$^\ast$
+
+{\small$^\ast$ if both versions are required.}
+
+\vfill
+
+\begin{tabular}{l}
+\hline
+\getLocation, \getDate
+\end{tabular}
+
+\clearpage
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-ba.def new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-ba.def
--- old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-ba.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-ba.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,57 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.7cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \centering
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ {\bfseries \getThesisTitle}\smallskip
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\Large Bachelor's thesis}
+
+ \bigskip
+ for the degree
+
+ \textsc{\large \getBachelorDegree}
+
+ \bigskip
+ of the course \getCourseName\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \vfill
+
+ by\par
+ {\bfseries\large \getAuthor}\bigskip
+
+ Submission on \getSubmissionDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
+ Apprenticing company: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
+ Company's supervisor: & \getSupervisor\\
+ University's reviewer: & \getReviewer\\
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-pa.def new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-pa.def
--- old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-pa.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-pa.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,59 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.5cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \Large\textsc{Project report}
+
+ \normalsize
+ of the course \getCourseName\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Subject B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \getDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
+ Apprenticing company: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}%
+ Supervisor: & \getSupervisor\\
+ Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-sa.def new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-sa.def
--- old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-sa.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-sa.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,59 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.5cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \Large\textsc{Study report}
+
+ \normalsize
+ of the course \getCourseName\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Subject B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \getDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
+% Apprenticing company: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}%
+ Supervisor: & \getSupervisor\\
+% Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage.def new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage.def
--- old/doc/latex/iodhbwm/i18n/english/dhbw-titlepage.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/english/dhbw-titlepage.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,55 @@
+\begin{titlepage}
+ \centering
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{example-image}
+ \end{minipage}
+
+ \bigskip
+
+ \Large\textsc{Report}
+
+ \normalsize
+ of the course Information Technology\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Subject B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \today
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ Department: & \getInstituteSection\\
+ Apprenticing company: & \getInstitute\\
+ Location: & \getLocation\\
+ Supervisor: & \getSupervisor\\
+ Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/ngerman/dhbw-declaration.def new/doc/latex/iodhbwm/i18n/ngerman/dhbw-declaration.def
--- old/doc/latex/iodhbwm/i18n/ngerman/dhbw-declaration.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/ngerman/dhbw-declaration.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,35 @@
+\ifcsdef{chapter}%
+{\chapter*{Erklärung}}%
+{\section*{Erklärung}}
+
+\thispagestyle{empty}
+
+\bigskip
+
+Ich versichere hiermit, dass ich meine \getThesisType{} mit dem\bigskip
+
+\textsc{Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+{\bfseries \getThesisTitle}
+
+\ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \bigskip
+ \textsc{Thema B}\par%
+ {\bfseries \getThesisSecondTitle}%
+}{}\bigskip
+
+selbstständig verfasst und keine anderen als die angegebenen Quellen und Hilfsmittel benutzt habe.
+
+
+Ich versichere zudem, dass die eingereichte elektronische Fassung mit der gedruckten Fassung übereinstimmt.$^\ast$
+
+{\small$^\ast$ falls beide Fassungen gefordert sind}
+
+\vfill
+
+\begin{tabular}{l}
+ \hline
+ \getLocation, den \getDate
+\end{tabular}
+
+\clearpage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-ba.def new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-ba.def
--- old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-ba.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-ba.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,57 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.7cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \centering
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ {\bfseries \getThesisTitle}\smallskip
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\Large Bachelorarbeit}
+
+ \bigskip
+ für die Prüfung zum
+
+ \textsc{\large \getBachelorDegree}
+
+ \bigskip
+ des Studiengangs \getCourseName\par
+ der Dualen Hochschule Baden-Württemberg \getDHBWLocation
+
+ \vfill
+
+ von\par
+ {\bfseries\large \getAuthor}\bigskip
+
+ Abgabe am \getSubmissionDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Bearbeitungszeitraum: & \getProcessingPeriod\\
+ Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}%
+ Ausbildungsbetrieb: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
+ Betreuer des Ausbildungsbetriebs: & \getSupervisor\\
+ Gutachter der Dualen Hochschule: & \getReviewer\\
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-pa.def new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-pa.def
--- old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-pa.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-pa.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,59 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.5cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \Large\textsc{Projektarbeit}
+
+ \normalsize
+ des Studiengangs \getCourseName\par
+ der Dualen Hochschule Baden-Württemberg \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Thema B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \getDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Bearbeitungszeitraum: & \getProcessingPeriod\\
+ Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}%
+ Ausbildungsbetrieb: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
+ Betreuer: & \getSupervisor\\
+ Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-sa.def new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-sa.def
--- old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-sa.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-sa.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,46 @@
+\begin{titlepage}
+ \centering
+ \includegraphics[height=1.7cm]{\getDHBWLogo}
+
+ \Large\textsc{Studienarbeit}
+
+ \normalsize
+ des Studiengangs \getCourseName\par
+ der Dualen Hochschule Baden-Württemberg \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Thema B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ von\par
+ {\bfseries\large \getAuthor}\par
+ \getDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Bearbeitungszeitraum: & \getProcessingPeriod\\
+ Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
+% Abteilung: & \getInstituteSection\\
+ Ausbildungsbetrieb: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
+ Betreuer: & \getSupervisor\\
+% Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage.def new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage.def
--- old/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage.def 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,55 @@
+\begin{titlepage}
+ \centering
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{example-image}
+ \end{minipage}
+
+ \bigskip
+
+ \Large\textsc{Arbeit}
+
+ \normalsize
+ des Studiengangs Informationstechnik\par
+ der Dualen Hochschule Baden-Württemberg \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Thema B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ \centering{\bfseries\large \getAuthor}\par
+ \today
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Bearbeitungszeitraum: & \getProcessingPeriod\\
+ Matrikelnummer, Kurs: & \getStudentId\\
+ Abteilung: & \getInstituteSection\\
+ Ausbildungsfirma: & \getInstitute\\
+ Standort: & \getLocation\\
+ Betreuer: & \getSupervisor\\
+ Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
Binary files old/doc/latex/iodhbwm/iodhbwm.pdf and new/doc/latex/iodhbwm/iodhbwm.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/iodhbwm.tex new/doc/latex/iodhbwm/iodhbwm.tex
--- old/doc/latex/iodhbwm/iodhbwm.tex 2018-12-21 00:38:12.000000000 +0100
+++ new/doc/latex/iodhbwm/iodhbwm.tex 2020-04-14 23:04:51.000000000 +0200
@@ -1,5 +1,6 @@
\documentclass[babel=ngerman,highlight=false]{skdoc}
\usepackage[T1]{fontenc}
+%\usepackage[utf8]{inputenc}
\usepackage{lmodern}
\usepackage{enumitem}
\usepackage[most]{tcolorbox}
@@ -8,7 +9,7 @@
%\usepackage{showframe}
\package[vcs=https://github.com/faltfe/iodhbwm,ctan=iodhbwm]{iodhbwm}
-\version{1.0}
+\version{1.2}
\title{iodhbwm Klasse}
\author{Felix Faltin}
@@ -149,9 +150,9 @@
\newcommand{\Version}[1]{\marginpar[\raggedleft v#1]{\raggedright v#1}}
\begin{document}
- \changes{0.4-alpha}{Add print option, auto-intro-pages and some new commands}
- \changes{0.4a-alpha}{Rename \opt{intro/add custom list} into \opt{intro/append custom content}}%
- \changes{0.4.1-alpha}{Unterstützung eines Anhang wurde hinzugefügt}%
+ \changes{1.1}{Erweiterung der Optionen}%
+ \changes{1.1.1}{Kleinere Fehlerbehebungen innerhalb von listings}
+ \changes{1.2}{Bereitstellung Englischer Vorlagen (Danke an mickmack1213)}
\maketitle
@@ -172,7 +173,11 @@
\clearpage
\tableofcontents
-
+
+ \clearpage
+ \PrintChanges
+ \clearpage
+
\section{Konventionen}
% \begin{sourcecode}[listing side comment, comment={Ich bin ein Kommentar},title={Hello world example}]
%% Hello again
@@ -275,8 +280,6 @@
\Option{mainlanguage}\WithValues{babel language}\AndDefault{empty}
Im Gegensatz zu \classOption{\opt{language}} wird mit der Option ausschließlich die Hauptsprache gesetzt, welche im Dokument benutzt wird. Die Sprache wird zusätzlich an entsprechende Pakete übergeben.
-
-
\begin{sourcecode}[listing only]
\documentclass[%
language = english,
@@ -291,12 +294,8 @@
\Option{print-}\WithValues{true, false}\AndDefault{false}
Bei Aktivierung der Option wird die farbige Darstellung von Links deaktiviert. Dies wird durch \verb|\hypersetup{hidelinks}| erreicht.\medskip
- \Option{print}\WithValues{true, false}\AndDefault{false}
- Im Gegensatz zu der Option \classOption{\opt{print-}} schaltet die Option zusätzlich noch die Darstellung von Quelltext um. Die farbige Überschrift wird entfernt und durch eine einfache Überschrift ersetzt, welche durch einen Rahmen abgegrenzt ist.
-
- \begin{warning}{Verschiebungen von Texten}
- Bei der Verwendung von \opt{print} wird der Quelltext anders formatiert. Dadurch kann es unter Umständen zu Verschiebungen des Layouts kommen. Dieses Verhalten ist nicht vollständig beabsichtigt, bot jedoch vorläufig die einfachste Umsetzung. An einer adäquaten Lösung wird gearbeitet.
- \end{warning}
+ \Option{print}\WithValues{}
+ Im Gegensatz zu der Option \classOption{\opt{print-}} schaltet die Option \textit{zusätzlich} noch die Darstellung von Quelltext um. Die farbige Überschrift wird durch eine einfache Überschrift ersetzt. Zusätzliche wird der Quelltext in schwarzer Farbe dargestellt.
\subsubsection{Darstellung der Verzeichnisse}
Die DHBW gibt eine gewissen Struktur der Arbeit vor. Um dem Autor die Arbeit etwas zu erleichtern, bietet die Klasse drei Optionen an, welche eine automatisierte Darstellung der Verzeichnisse vornimmt. Alle Optionen sind nur in Kombination mit \classOption{\opt{load-dhbw-templates}} wirksam. Im \Cref{subsub:options-tocs} werden weitere paketseitige Einstellungen beschrieben, mit welchen die zu erstellenden Verzeichnisse angepasst werden können.\medskip
@@ -340,7 +339,7 @@
\end{hint}
\medskip
- \Option{add-bibliography-}\WithValues{true, false}\AndDefault{false}
+ \Option{add-bibliography-}\WithValues{}
Die Option verhält sich ähnlich wie \classOption{\opt{add-bibliography}} mit dem Unterschied, dass am Ende des Dokuments kein Literaturverzeichnis abgebildet wird. Zusätzlich werden die Verlinkungen zum Literaturverzeichnis deaktiviert. Möchte man ein manuelles Literaturverzeichnis, so sollte die Verlinkung wieder aktiviert werden.
\begin{sourcecode}[listing only]
@@ -441,7 +440,7 @@
Mit der Option wird das Datum angegeben.\medskip
\Option{submission date}\WithValues{\meta{value}}\AndDefault{\opt{date}}
- Mit der Option wird das Abgabedatum angegeben. Standardmäßig entspricht der Wert der Option \setupOption{\opt{date}} und hat nur Einfluss auf \setupOption{\opt{bachelor type} = \meta{BA}}.\medskip
+ Mit der Option wird das Abgabedatum angegeben. Standardmäßig entspricht der Wert der Option \setupOption{\opt{date}} und hat nur Einfluss auf \setupOption{\opt{thesis type} = \meta{BA}}.\medskip
\Option{location}\WithValues{\meta{value}}
Mit Setzen der Option wird der Ort angegeben, an welchem die Arbeit erstellt wurde.\medskip
@@ -483,6 +482,17 @@
\Option{reviewer}\WithValues{\meta{value}}
Bei Bachelorarbeiten \setupOption{\opt{thesis type}=\meta{BA}} ist es üblich einen Gutachter anzugeben. Dieser wird durch die Angabe eines \setupOption{\opt{reviewer}} übergeben.
+
+ \subsubsection{Angaben zur DHBW}
+ \Option{dhbw location}\WithValues{\meta{value}}\AndDefault{Mannheim}
+ \Version{1.1.0}Die Option erlaubt eine Änderung des DHBW Standortes. Als Standardeinstellung ist die DHBW Mannheim gesetzt. Der Standort wird automatisch auf den mitgelieferten Titelseiten angepasst.
+
+ \Option{dhbw logo}\WithValues{\meta{value}}\AndDefault{dhbw-logo}
+ \Version{1.1.0}Ein alternatives Logo der DHBW kann mithilfe dieser Option angegeben werden. Die Dateiendung sollte, wie in \LaTeX{} üblich, weggelassen werden.
+
+ \begin{warning}{Abmaße beachten}
+ Wenn ein eigenes Logo gesetzt wird, müssen die Dimensionen beachtet werden. Das bereitgestellte Logo hat eine Abmessung von $540 \times 264~px$.
+ \end{warning}
\subsubsection{Optionen zur automatisierten Erstellung von Verzeichnissen}\label{subsub:options-tocs}
Im Abschnitt~\ref{subsub:format} wurde die Option \classOption{\opt{auto-intro-pages}} beschrieben. Durch die nachfolgenden Optionen können weitere Konfigurationen vorgenommen werden. Insbesondere handelt es sich dabei um die Möglichkeit, nur bestimmte Verzeichnisse oder Seiten anzuzeigen. Die meisten der Optionen sind selbsterklärend.\medskip
@@ -508,9 +518,6 @@
Erstellen des Tabellenverzeichnisses (List of Tables $\stackrel{\wedge}{=}$ LoT)
\medskip
- \Option{intro/append custom content}\WithValues{\meta{value}}
- In manchen Fällen kann es vorkommen, dass eigene Verzeichnisse hinzugefügt werden sollen. Die Option \setupOption{\opt{intro/append custom content}} nimmt als Argument gültigen \LaTeX{} Quelltext entgegen und führt diesen aus.\medskip
-
\Option{intro/print all lists}\WithValues{true, false}\AndDefault{false}
Durch Setzen der Option werden alle Verzeichnisse (ToC, LoF und LoT) automatisch generiert. Das Abbildungs- und Tabellenverzeichnis werden jedoch nur dargestellt, wenn diese mindestens einen Eintrag enthalten.
\medskip
@@ -526,6 +533,17 @@
aktiviert. Ein Abstract wird nur gedruckt, wenn eine Datei angegeben ist und die Datei existiert.
\medskip
+
+ \Option{intro/append custom content}\WithValues{\meta{value}}
+ In manchen Fällen kann es vorkommen, dass eigene Verzeichnisse hinzugefügt werden sollen. Die Option \setupOption{\opt{intro/append custom content}} nimmt als Argument gültigen \LaTeX{} Quelltext entgegen und führt diesen aus.\medskip
+
+
+ \Option{intro/roman page numbers}\WithValues{true, false}\AndDefault{false}
+ \Version{1.1.0}Bei Aktivierung der Option wird die Nummerierung innerhalb der Verzeichnisse auf Römisch umgeschaltet. Des Weiteren werden die Römischen Seitenzahlen für die Verzeichnisse ebenfalls im Inhalsverzeichnis angezeigt.
+
+ \begin{hint}{}
+ Bei Aktivierung der Option \setupOption{\opt{intro/roman page numbers}=\meta{true}} erfolgt eine Abweichung von den Richtlinien der DHBW.
+ \end{hint}
\subsection{Anhang}
\LaTeX{} stellt das Makro \Macro\appendix bereit, um dem Dokument mitzuteilen, dass anschließend der Anhang folgt. Die DHBW empfiehlt bei der Erstellung die folgenden Dinge zu beachten:
@@ -541,7 +559,7 @@
\begin{sourcecode}[listing only]
\dhbwsetup{
- intro/append custom content = {\listofappendencies}
+ intro/append custom content = {\listofappendices}
}
\end{sourcecode}
@@ -596,6 +614,10 @@
\DescribeMacro\getReviewer{} Abfrage des Gutachters für eine Bachelorarbeit, welcher durch \setupOption{\opt{reviewer}} übergeben wurde.
\DescribeMacro\getBachelorDegree{} Abfrage des Bearbeitungszeitraums, welcher durch \setupOption{\opt{author}} übergeben wurde.
+
+ \DescribeMacro\getDHBWLocation{}\Version{1.1.0}Abfrage des DHBW Standorts, welcher durch die \setupOption{\opt{dhbw location}} gesetzt wurde.
+
+ \DescribeMacro\getDHBWLogo{}\Version{1.1.0}Abfrage des DHBW Logo, welches durch die \setupOption{\opt{dhbw logo}} gesetzt wurde.
\section{Beispiele und Anwendungen}
Alle Beispiele sind auf \url{https://github.com/faltfe/iodhbwm/tree/master/doc/examples} zu finden.
@@ -638,8 +660,6 @@
\end{itemize}
-
-
\subsection{Verwendung von Parts}
In manchen Arbeiten kann es vorkommen, dass mit \Macro\part{} gearbeitet werden soll. Insbesondere bei Arbeiten mit zwei oder mehreren Themen kann der Wunsch aufkommen, dass der Abschnitt auch mit dem Wort \enquote{Thema} bezeichnet werden soll. Diese Änderung ist wie folgt möglich:
@@ -663,12 +683,11 @@
Um die Autovervollständigung für \thepackage{} zu aktiveren, müssen die Dateien \file{iodhbwm.cwl} und \file{iodhbwm-template.cwl} nach \path|%appdata%\texstudio\completion\user| beziehungsweise nach \path|.config/texstudio/completion/user| kopiert werden.
\section{Installation}
+ \subsection{CTAN}
+ Das Bundle wird ebenfalls über CTAN zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen.
\subsection{Lokale Installation}
Eine eigene Installation des Pakets kann in einem lokalen texmf Ordner (lokales Repository) erfolgen. Das Bundle kann manuell aus dem Git-Repository heruntergeladen werden.
-
- \subsection{CTAN}
- Das Bundle wird ebenfalls über CTAN (mit Release der Version v1.0) zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen.
-
+
\subsubsection{MiKTeX}
\begin{enumerate}
\item Lokales Repository anlegen, welches der \href{http://tug.ctan.org/tds/tds.html}{Verzeichnisstruktur für \LaTeX{} Dateien} entspricht. Die Verzeichnisstruktur könnte wie folgt aussehen:\par \verb|C:\Users\<username>\localtexmf\tex\latex\iodhbwm|
@@ -692,8 +711,6 @@
Eine ausführliche Beschreibung befindet sich auf \url{https://tex.stackexchange.com/a/73017/142408}.
-% \PrintChanges
-
\PrintIndex
\end{document}
Binary files old/doc/latex/iodhbwm/test-doc.pdf and new/doc/latex/iodhbwm/test-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/iodhbwm/test-doc.tex new/doc/latex/iodhbwm/test-doc.tex
--- old/doc/latex/iodhbwm/test-doc.tex 2019-01-27 23:48:33.000000000 +0100
+++ new/doc/latex/iodhbwm/test-doc.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-% ---------------------------------------------------
-% Date: 12.11.2018
-% Version: v0.1
-% Autor: Felix Faltin <ffaltin91[at]gmail.com>
-% Repository: https://github.com/faltfe/iodhbwm
-% ---------------------------------------------------
-% --- --- --- --- -- Class options -- --- --- --- ---
-% ---------------------------------------------------
-\documentclass[
-add-bibliography-, % Include bibliography (needs biber run)
-bib-file = biblatex-examples.bib, % Set bibliography file
-language = ngerman, % Set main document language
-debug % Provide \lipsum, \blindtext
-]{iodhbwm}
-\usepackage[T1]{fontenc}
-%\usepackage[utf8]{inputenc} % UTF-8 is default at the latest release
-
-% ---------------------------------------------------
-% --- --- - Change default biblatex options - --- ---
-% ---------------------------------------------------
-% You can almost change every option with this command. There are
-% only some exception like the backend and the style.
-% If you want to change the citeystyle have a look at the custom
-% cite style example or see the documentation for biblatex/citestyle
-% option.
-% ---------------------------------------------------
-% Change the sorting and supress the DOI output
-\ExecuteBibliographyOptions{hyperref=true}
-
-% ---------------------------------------------------
-% --- --- --- --- Begin actual content -- --- --- ---
-% ---------------------------------------------------
-\begin{document}
- \blindtext \cite{doody}
-
-% \nocite{*} % Cite every entry from the passed file
- \printbibliography
-
- % ---------------------------------------------------
-\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iodhbwm.doc.tlpobj new/tlpkg/tlpobj/iodhbwm.doc.tlpobj
--- old/tlpkg/tlpobj/iodhbwm.doc.tlpobj 2019-02-28 03:43:05.000000000 +0100
+++ new/tlpkg/tlpobj/iodhbwm.doc.tlpobj 2020-04-15 01:54:51.000000000 +0200
@@ -1,9 +1,9 @@
name iodhbwm.doc
category Package
-revision 49838
+revision 54734
shortdesc doc files of iodhbwm
relocated 1
-docfiles size=1232
+docfiles size=1240
RELOC/doc/latex/iodhbwm/README.md
RELOC/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.pdf
RELOC/doc/latex/iodhbwm/examples/abstract/iodhbwm-auto-sections-with-abstract.tex
@@ -26,6 +26,8 @@
RELOC/doc/latex/iodhbwm/examples/customizing/iodhbwm-print.tex
RELOC/doc/latex/iodhbwm/examples/customizing/iodhbwm-replace-part-naming.pdf
RELOC/doc/latex/iodhbwm/examples/customizing/iodhbwm-replace-part-naming.tex
+ RELOC/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.pdf
+ RELOC/doc/latex/iodhbwm/examples/customizing/iodhbwm-roman-numbers.tex
RELOC/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.pdf
RELOC/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-advanced-starter.tex
RELOC/doc/latex/iodhbwm/examples/how-to-use-iodhbwm/iodhbwm-recommended-starter.pdf
@@ -46,7 +48,15 @@
RELOC/doc/latex/iodhbwm/examples/titlepages/iodhbwm-titlepage-logo.pdf
RELOC/doc/latex/iodhbwm/examples/titlepages/iodhbwm-titlepage-logo.tex
RELOC/doc/latex/iodhbwm/examples/titlepages/my-titlepage.tex
+ RELOC/doc/latex/iodhbwm/i18n/english/dhbw-declaration.def
+ RELOC/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-ba.def
+ RELOC/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-pa.def
+ RELOC/doc/latex/iodhbwm/i18n/english/dhbw-titlepage-sa.def
+ RELOC/doc/latex/iodhbwm/i18n/english/dhbw-titlepage.def
+ RELOC/doc/latex/iodhbwm/i18n/ngerman/dhbw-declaration.def
+ RELOC/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-ba.def
+ RELOC/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-pa.def
+ RELOC/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage-sa.def
+ RELOC/doc/latex/iodhbwm/i18n/ngerman/dhbw-titlepage.def
RELOC/doc/latex/iodhbwm/iodhbwm.pdf
RELOC/doc/latex/iodhbwm/iodhbwm.tex
- RELOC/doc/latex/iodhbwm/test-doc.pdf
- RELOC/doc/latex/iodhbwm/test-doc.tex
++++++ iodhbwm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/dhbw-declaration.def new/tex/latex/iodhbwm/dhbw-declaration.def
--- old/tex/latex/iodhbwm/dhbw-declaration.def 2018-12-21 00:38:12.000000000 +0100
+++ new/tex/latex/iodhbwm/dhbw-declaration.def 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-\ifcsdef{chapter}%
-{\chapter*{Ehrenwörtliche Erklärung}}%
-{\section*{Ehrenwörtliche Erklärung}}
-
-\thispagestyle{empty}
-
-\vspace{5cm}
-Gemäß \S 5 (3) der Studien- und Prüfungsordnung DHBW Technik vom 22. September 2011.\\
-Ich habe die vorliegende Arbeit selbstständig verfasst und keine anderen als die angegebenen Quellen und Hilfsmittel verwendet.
-
-\vfill
-
-\begin{tabular}{l}
- \hline
- \getLocation, den \getDate
-\end{tabular}
-
-\clearpage
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/dhbw-titlepage-ba.def new/tex/latex/iodhbwm/dhbw-titlepage-ba.def
--- old/tex/latex/iodhbwm/dhbw-titlepage-ba.def 2018-12-21 00:38:12.000000000 +0100
+++ new/tex/latex/iodhbwm/dhbw-titlepage-ba.def 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-\begin{titlepage}
- \centering
- \ifcsempty{iodhbwm@institute@logo}{%
- \includegraphics[height=1.7cm]{dhbw-logo}
- }{%
- \begin{minipage}[c]{.25\textwidth}
- \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo}
- \end{minipage}
- \hfill
- \begin{minipage}[c]{.25\textwidth}
- \centering
- \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
- \end{minipage}
- }
-
- \bigskip
-
- \rule{\textwidth}{.5mm}\bigskip
-
- {\bfseries \getThesisTitle}\smallskip
-
- \rule{\textwidth}{.5mm}\bigskip
-
- \textsc{\Large Bachelorarbeit}
-
- \bigskip
- für die Prüfung zum
-
- \textsc{\large \getBachelorDegree}
-
- \bigskip
- des Studiengangs \getCourseName\par
- der Dualen Hochschule Baden-Württemberg Mannheim
-
- \vfill
-
- von\par
- {\bfseries\large \getAuthor}\bigskip
-
- Abgabe am \getSubmissionDate
-
- \vfill
-
- \small{%
- \begin{tabularx}{\textwidth}{@{}lX@{}}
- \toprule
- Bearbeitungszeitraum: & \getProcessingPeriod\\
- Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
- \ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}%
- Ausbildungsfirma: & \getInstitute\\
- \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
- Betreuer der Ausbildungsfirma: & \getSupervisor\\
- Gutachter der Dualen Hochschule: & \getReviewer\\
- \end{tabularx}
- }
- \cleardoublepage
-\end{titlepage}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/dhbw-titlepage-pa.def new/tex/latex/iodhbwm/dhbw-titlepage-pa.def
--- old/tex/latex/iodhbwm/dhbw-titlepage-pa.def 2018-12-21 00:38:12.000000000 +0100
+++ new/tex/latex/iodhbwm/dhbw-titlepage-pa.def 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-\begin{titlepage}
- \centering
- \ifcsempty{iodhbwm@institute@logo}{%
- \includegraphics[height=1.5cm]{dhbw-logo}
- }{%
- \begin{minipage}[c]{.25\textwidth}
- \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo}
- \end{minipage}
- \hfill
- \begin{minipage}[c]{.25\textwidth}
- \raggedleft
- \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
- \end{minipage}
- }
-
- \bigskip
-
- \Large\textsc{Projektarbeit}
-
- \normalsize
- des Studiengangs \getCourseName\par
- der Dualen Hochschule Baden-Württemberg Mannheim
-
- \rule{\textwidth}{.5mm}\bigskip
-
- \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
-
- {\bfseries \getThesisTitle}\bigskip
-
- \ifcsempty{iodhbwm@thesis@second@title}{}{%
- \textsc{\large Thema B}\par
- %\tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}
- {\bfseries \getThesisSecondTitle}
- }{}
-
- \rule{\textwidth}{.5mm}
-
- \vfill
-
- \par
- {\bfseries\large \getAuthor}\par
- \getDate
-
- \vfill
-
- \small{%
- \begin{tabularx}{\textwidth}{@{}lX@{}}
- \toprule
- Bearbeitungszeitraum: & \getProcessingPeriod\\
- Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
- \ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}%
- Ausbildungsfirma: & \getInstitute\\
- \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
- Betreuer: & \getSupervisor\\
- Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
- \end{tabularx}
- }
- \cleardoublepage
-\end{titlepage}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/dhbw-titlepage-sa.def new/tex/latex/iodhbwm/dhbw-titlepage-sa.def
--- old/tex/latex/iodhbwm/dhbw-titlepage-sa.def 2018-12-21 00:38:12.000000000 +0100
+++ new/tex/latex/iodhbwm/dhbw-titlepage-sa.def 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-\begin{titlepage}
- \centering
- \includegraphics[height=1.7cm]{dhbw-logo}
-
- \Large\textsc{Studienarbeit}
-
- \normalsize
- des Studiengangs \getCourseName\par
- der Dualen Hochschule Baden-Württemberg Mannheim
-
- \rule{\textwidth}{.5mm}\bigskip
-
- \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
-
- {\bfseries \getThesisTitle}\bigskip
-
- \ifcsempty{iodhbwm@thesis@second@title}{}{%
- \textsc{\large Thema B}\par
- %\tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}
- {\bfseries \getThesisSecondTitle}
- }{}
-
- \rule{\textwidth}{.5mm}
-
- \vfill
-
- von\par
- {\bfseries\large \getAuthor}\par
- \getDate
-
- \vfill
-
- \small{%
- \begin{tabularx}{\textwidth}{@{}lX@{}}
- \toprule
- Bearbeitungszeitraum: & \getProcessingPeriod\\
- Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
-% Abteilung: & \getInstituteSection\\
- Ausbildungsfirma: & \getInstitute\\
- \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
- Betreuer: & \getSupervisor\\
-% Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
- \end{tabularx}
- }
- \cleardoublepage
-\end{titlepage}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/dhbw-titlepage.def new/tex/latex/iodhbwm/dhbw-titlepage.def
--- old/tex/latex/iodhbwm/dhbw-titlepage.def 2018-12-21 00:38:12.000000000 +0100
+++ new/tex/latex/iodhbwm/dhbw-titlepage.def 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-\begin{titlepage}
- \begin{minipage}[c]{.30\textwidth}
- \includegraphics[height=1.7cm]{dhbw-logo}
- \end{minipage}
- \hfill
- \begin{minipage}[c]{.30\textwidth}
- \centering
- \includegraphics[height=1.7cm]{example-image}
- \end{minipage}
- \hfill
- \begin{minipage}[c]{.30\textwidth}
- \raggedleft
- \includegraphics[height=1.7cm]{example-image}
- \end{minipage}
-
- \begin{center}
- \Large\textsc{Arbeit}
-
- \normalsize
- des Studiengangs Informationstechnik\par
- der Dualen Hochschule Baden-Württemberg Mannheim
- \end{center}
-
- \rule{\textwidth}{.5mm}\bigskip
- % \begin{minipage}[t]{.45\textwidth}
- % \centering\textsc{Thema A}
- %
- % \bfseries\large \dots
- % \hfill
- % \begin{minipage}[t]{.45\textwidth}
- % \centering\textsc{Thema B}
- %
- % \tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}\par
- %
- % \bfseries\large \dots
- % \end{minipage}
- % \\[1em]
-
- \centering\textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
-
- {\bfseries \getThesisTitle}\bigskip
-
- \ifcsempty{iodhbwm@thesis@second@title}{}{%
- \textsc{\large Thema B}\par
- %\tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}
- {\bfseries \getThesisSecondTitle}
- }{}
-
- \rule{\textwidth}{.5mm}
-
- \vfill
-
- \begin{center}
- von\par
- \centering{\bfseries\large \getAuthor}\par
- \today
- \end{center}
-
- \vfill
-
- \small{%
- \begin{tabularx}{\textwidth}{@{}lX@{}}
- \toprule
- Bearbeitungszeitraum: & \getProcessingPeriod\\
- Matrikelnummer, Kurs: & \getStudentId\\
- Abteilung: & \getInstituteSection\\
- Ausbildungsfirma: & \getInstitute\\
- Standort: & \getLocation\\
- Betreuer: & \getSupervisor\\
- Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
- \end{tabularx}
- }
- \cleardoublepage
-\end{titlepage}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/iodhbwm-i18n.def new/tex/latex/iodhbwm/iodhbwm-i18n.def
--- old/tex/latex/iodhbwm/iodhbwm-i18n.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/iodhbwm/iodhbwm-i18n.def 2020-04-14 23:04:51.000000000 +0200
@@ -0,0 +1,36 @@
+\newcommand{\@addlanguage}[7]{%
+ \iflanguage{#1}{
+ \renewcommand*{\iodhbwm@file@prefix}{i18n/#1/dhbw}
+
+ \def\iodhbwm@bachelor@type@boe{#2}
+ \def\iodhbwm@bachelor@type@bos{#3}
+ \def\iodhbwm@bachelor@type@boa{#4}
+
+ \def\iodhbwm@thesis@type@ba{#5}
+ \def\iodhbwm@thesis@type@pa{#6}
+ \def\iodhbwm@thesis@type@sa{#7}
+
+ \booltrue{iodhbwm@if@supported@language}
+ }%
+ {}%
+}
+
+% ################################################################
+% ### ADD SUPPORTED LANGUAGES HERE
+% ################################################################
+
+% english
+\@addlanguage{english}
+ {Bachelor of Engineering}
+ {Bachelor of Science}
+ {Bachelor of Arts}
+ {bachelor's thesis}
+ {project report}
+ {study report}
+
+% ################################################################
+
+% Print waring if an unsupported language is used
+\ifbool{iodhbwm@if@supported@language}{}{%
+ \PackageWarning{\iodhbwm@pkg@name}{The passed language `\iodhbwm@main@language` was not found.\MessageBreak Using ngerman instead.}
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/iodhbwm-templates.sty new/tex/latex/iodhbwm/iodhbwm-templates.sty
--- old/tex/latex/iodhbwm/iodhbwm-templates.sty 2018-12-21 00:38:12.000000000 +0100
+++ new/tex/latex/iodhbwm/iodhbwm-templates.sty 2020-04-14 23:04:51.000000000 +0200
@@ -7,7 +7,7 @@
% Felix Faltin
% E-Mail: ffaltin91(a)gmail.com
% ----------------------------------------------------------
-% Copyright 2017 Felix Faltin
+% Copyright 2017-2020 Felix Faltin
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,8 +23,8 @@
%
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@pkg@version}{v1.0}
-\newcommand*{\iodhbwm@pkg@date}{2018-12-20}
+\newcommand*{\iodhbwm@pkg@version}{v1.2.1}
+\newcommand*{\iodhbwm@pkg@date}{2020-04-13}
\newcommand*{\iodhbwm@pkg@info}{Inoffical DHBW Mannheim thesis package}
\newcommand*{\iodhbwm@pkg@name}{iodhbwm-templates}
@@ -66,22 +66,40 @@
\newbool{iodhbwm@if@print@lot}
\newbool{iodhbwm@if@print@lof}
\newbool{iodhbwm@if@print@location}
+\newbool{iodhbwm@if@oldpagestyle}
+\newbool{iodhbwm@if@supported@language}
+
+% ----------------------------------------------------------
+% Define language depended settings
+% ----------------------------------------------------------
+% Default language: ngerman
+\newcommand*{\iodhbwm@file@prefix}{i18n/ngerman/dhbw}
+
+\def\iodhbwm@bachelor@type@boe{Bachelor of Engineering}
+\def\iodhbwm@bachelor@type@bos{Bachelor of Science}
+\def\iodhbwm@bachelor@type@boa{Bachelor of Arts}
+
+\def\iodhbwm@thesis@type@ba{Bachelorarbeit}
+\def\iodhbwm@thesis@type@pa{Projektarbeit}
+\def\iodhbwm@thesis@type@sa{Studienarbeit}
+
+\iflanguage{ngerman}{\booltrue{iodhbwm@if@supported@language}}{}
+\input{iodhbwm-i18n.def}
% ----------------------------------------------------------
% Define internal commands
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@file@prefix}{dhbw}
\newcommand*{\iodhbwm@file@ending}{.def}
\edef\iodhbwm@file@titlepage@default{\iodhbwm@file@prefix-titlepage\iodhbwm@file@ending}
\edef\iodhbwm@file@titlepage@ba{\iodhbwm@file@prefix-titlepage-ba\iodhbwm@file@ending}
\edef\iodhbwm@file@titlepage@sa{\iodhbwm@file@prefix-titlepage-sa\iodhbwm@file@ending}
\edef\iodhbwm@file@titlepage@pa{\iodhbwm@file@prefix-titlepage-pa\iodhbwm@file@ending}
\edef\iodhbwm@file@declaration@default{\iodhbwm@file@prefix-declaration\iodhbwm@file@ending}
-\edef\iodhbw@file@abstract@default{\iodhbwm@file@prefix-abstract.inc}
+\edef\iodhbwm@file@abstract@default{\iodhbwm@file@prefix-abstract.inc}
-\def\iodhbwm@bachelor@type@boe{Bachelor of Engineering}
-\def\iodhbwm@bachelor@type@bos{Bachelor of Science}
-\def\iodhbwm@bachelor@type@boa{Bachelor of Arts}
+
+\def\iodhbwm@dhbw@location@default{Mannheim}
+\def\iodhbwm@dhbw@logo@default{dhbw-logo}
%---------------------------------------------------
% Defining package options
@@ -95,8 +113,8 @@
declaration/.default = \iodhbwm@file@declaration@default,
declaration = \iodhbwm@file@declaration@default,
abstract/.store in = \@iodhbwm@file@abstract,
- abstract/.default = \iodhbw@file@abstract@default,
- abstract = = \iodhbw@file@abstract@default,
+ abstract/.default = \iodhbwm@file@abstract@default,
+ abstract = = \iodhbwm@file@abstract@default,
bachelor degree type/.store in = \iodhbwm@bachelor@degree,
bachelor degree type/.default = \iodhbwm@bachelor@type@boe,
bachelor degree type = \iodhbwm@bachelor@type@boe,
@@ -104,10 +122,22 @@
bachelor degree/BoE/.estyle = {/dhbw/bachelor degree type = \iodhbwm@bachelor@type@boe},
bachelor degree/BoS/.estyle = {/dhbw/bachelor degree type = \iodhbwm@bachelor@type@bos},
bachelor degree/BoA/.estyle = {/dhbw/bachelor degree type = \iodhbwm@bachelor@type@boa},
+ thesis type name/.store in = \iodhbwm@thesis@type,
+ thesis type name/.default = \iodhbwm@thesis@type@ba,
+ thesis type name = \iodhbwm@thesis@type@ba,
thesis type/.is choice,
- thesis type/BA/.estyle = {/dhbw/titlepage = \iodhbwm@file@titlepage@ba},
- thesis type/SA/.estyle = {/dhbw/titlepage = \iodhbwm@file@titlepage@sa},
- thesis type/PA/.estyle = {/dhbw/titlepage = \iodhbwm@file@titlepage@pa},
+ thesis type/BA/.estyle = {%
+ /dhbw/titlepage = \iodhbwm@file@titlepage@ba,%
+ /dhbw/thesis type name = \iodhbwm@thesis@type@ba%
+ },
+ thesis type/SA/.estyle = {%
+ /dhbw/titlepage = \iodhbwm@file@titlepage@sa,%
+ /dhbw/thesis type name = \iodhbwm@thesis@type@sa%
+ },
+ thesis type/PA/.estyle = {%
+ /dhbw/titlepage = \iodhbwm@file@titlepage@pa,%
+ /dhbw/thesis type name = \iodhbwm@thesis@type@pa%
+ },
thesis title/.store in = \iodhbwm@thesis@title,
thesis title = {},
thesis second title/.store in = \iodhbwm@thesis@second@title,
@@ -119,9 +149,15 @@
\def\iodhbwm@date@submission{#1}%
},
date = \today,
- submission date/.store in = \iodhbwm@date@submission,
+ submission date/.store in = \iodhbwm@date@submission,
location/.store in = \iodhbwm@location,
location = {},
+ dhbw location/.store in = \iodhbwm@dhbw@location,
+ dhbw location/.default = \iodhbwm@dhbw@location@default,
+ dhbw location = \iodhbwm@dhbw@location@default,
+ dhbw logo/.store in = \iodhbwm@dhbw@logo,
+ dhbw logo/.default = \iodhbwm@dhbw@logo@default,
+ dhbw logo = \iodhbwm@dhbw@logo@default,
institute/.store in = \iodhbwm@institute,
institute section/.store in = \iodhbwm@institute@section,
institute section = {},
@@ -139,15 +175,15 @@
processing period = {},
reviewer/.store in = \iodhbwm@reviewer,
reviewer = {},
- titlepage/print location/.is if = iodhbwm@if@print@location,
- intro/print titlepage/.is if = iodhbwm@if@print@titlepage,
- intro/print abstract/.is if = iodhbwm@if@print@abstract,
- intro/abstract file/.search also = {/dhbw/abstract},
- intro/print declaration/.is if = iodhbwm@if@print@declaration,
- intro/print toc/.is if = iodhbwm@if@print@toc,
- intro/print lof/.is if = iodhbwm@if@print@lof,
- intro/print lot/.is if = iodhbwm@if@print@lot,
- intro/print all lists/.style = {%
+ titlepage/print location/.is if = iodhbwm@if@print@location,
+ intro/print titlepage/.is if = iodhbwm@if@print@titlepage,
+ intro/print abstract/.is if = iodhbwm@if@print@abstract,
+ intro/abstract file/.search also = {/dhbw/abstract},
+ intro/print declaration/.is if = iodhbwm@if@print@declaration,
+ intro/print toc/.is if = iodhbwm@if@print@toc,
+ intro/print lof/.is if = iodhbwm@if@print@lof,
+ intro/print lot/.is if = iodhbwm@if@print@lot,
+ intro/print all lists/.style = {%
/dhbw/intro/print toc = true,
/dhbw/intro/print lot = true,
/dhbw/intro/print lof = true
@@ -158,8 +194,9 @@
/dhbw/intro/print declaration = true,
/dhbw/intro/print abstract = true
},
- intro/append custom content/.store in = \iodhbwm@append@custom@content,
- intro/append custom content = {}
+ intro/append custom content/.store in = \iodhbwm@append@custom@content,
+ intro/append custom content = {},
+ intro/roman page numbers/.is if = iodhbwm@if@oldpagestyle
}
\newrobustcmd\dhbwsetup[1]{\pgfqkeys{/dhbw}{#1}}
@@ -297,6 +334,25 @@
}}{See documentation for more information}%
}{\iodhbwm@bachelor@degree}%
}
+\newcommand{\getThesisType}{%
+ \ifdefempty{\iodhbwm@thesis@type}{%
+ \PackageError{\iodhbwm@pkg@name}{%
+ Option thesis type required!\MessageBreak
+ Please use\MessageBreak\protect\dhbwsetup{\MessageBreak
+ \space\space thesis type = BA | SA | PA\MessageBreak
+ }}{See documentation for more information}%
+ }{\iodhbwm@thesis@type}%
+}
+\newcommand{\getDHBWLocation}{%
+ \ifdefempty{\iodhbwm@dhbw@location}{%
+ \PackageError{\iodhbwm@pkg@name}{%
+ Option dhbw location required!\MessageBreak
+ Please use\MessageBreak\protect\dhbwsetup{\MessageBreak
+ \space\space dhbw location = {Your DHBW Location}\MessageBreak
+ }}{See documentation for more information}%
+ }{\iodhbwm@dhbw@location}%
+}
+\newcommand{\getDHBWLogo}{\iodhbwm@dhbw@logo}
% ----------------------------------------------------------
% Commands for structuring
@@ -338,10 +394,14 @@
% Switch pagestyle
% Deactivate page numbers in ToC
\newcommand{\dhbwfrontmatter}{%
- \pagestyle{empty}
- \renewcommand*{\chapterpagestyle}{empty}
- \hypersetup{pageanchor=false}
- \addtocontents{toc}{\booltrue{iodhbwm@if@toc@unnumbered}}
+ \ifbool{iodhbwm@if@oldpagestyle}{%
+ \pagenumbering{Roman}%
+ }{%
+ \pagestyle{empty}%
+ \renewcommand*{\chapterpagestyle}{empty}%
+ \hypersetup{pageanchor=false}%
+ \addtocontents{toc}{\booltrue{iodhbwm@if@toc@unnumbered}}%
+ }%
}
% Switch pagestyle
@@ -429,4 +489,4 @@
}%
}
-\endinput
\ No newline at end of file
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/iodhbwm/iodhbwm.cls new/tex/latex/iodhbwm/iodhbwm.cls
--- old/tex/latex/iodhbwm/iodhbwm.cls 2019-01-27 23:48:33.000000000 +0100
+++ new/tex/latex/iodhbwm/iodhbwm.cls 2020-04-14 23:04:51.000000000 +0200
@@ -7,7 +7,7 @@
% Felix Faltin
% E-Mail: ffaltin91(a)gmail.com
% ----------------------------------------------------------
-% Copyright 2017-2019 Felix Faltin
+% Copyright 2017-2020 Felix Faltin
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,8 +23,8 @@
%
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@cls@version}{v1.0.1}
-\newcommand*{\iodhbwm@cls@date}{2019-01-27}
+\newcommand*{\iodhbwm@cls@version}{v1.2.1}
+\newcommand*{\iodhbwm@cls@date}{2020-04-13}
\newcommand*{\iodhbwm@cls@info}{Inoffical DHBW Mannheim thesis class}
\ProvidesClass{iodhbwm}[%
@@ -204,6 +204,7 @@
\definecolor{DHBW-blue}{HTML}{026f93}
\definecolor{DHBW-darkblue}{HTML}{23527c}
\definecolor{DHBW-light}{HTML}{ffffff}
+\definecolor{DHBW-light-gray}{HTML}{f2f2f2}
\definecolor{DHBW-font}{HTML}{5c6971}
\definecolor{DHBW-dark-font}{HTML}{333333}
@@ -322,8 +323,11 @@
showstringspaces=false,
tabsize=2,
breaklines=true,
- xleftmargin=17pt,
- framexleftmargin=17pt,
+ xleftmargin=3em,
+ framexleftmargin=3em,
+ aboveskip=\baselineskip,
+ frame=tb,
+ captionpos=t,
}
\DeclareCaptionFont{DHBWlisting}{\color{DHBW-light}}
@@ -336,54 +340,44 @@
\DeclareCaptionFormat{listingprint}{%
\colorbox{white}{%
- \parbox{\dimexpr\textwidth-2\fboxsep\relax}{#1#2#3}%
+ \parbox{\dimexpr\textwidth-2\fboxsep\relax}{#1#2#3}
}%
}
\captionsetup[lstlisting]{%
- format=listing,
+ format=listingprint,
singlelinecheck=false,
margin=0pt
}%
\ifbool{iodhbwm@cls@if@print}{%
\captionsetup[lstlisting]{%
- format=listingprint,
- singlelinecheck=false,
- margin=0pt,
font={print,sf},
}%
\lstset{
- basicstyle=\footnotesize\ttfamily\color{DHBW-dark-font},
+ basicstyle=\scriptsize\ttfamily\color{DHBW-dark-font},
backgroundcolor=\color{DHBW-light},
rulecolor=\color{black},
commentstyle=\color{DHBW-font},
keywordstyle=\color{DHBW-dark-font},
- numberstyle=\scriptsize\color{DHBW-font},
- stringstyle=\color{DHBW-dark-font},
- frame=tb,
- captionpos=b,
- aboveskip=\baselineskip
+ numberstyle=\scriptsize\ttfamily\color{DHBW-font},
+ stringstyle=\color{DHBW-dark-font}
}%
}{%
\captionsetup[lstlisting]{%
format=listing,
- singlelinecheck=false,
- margin=0pt,
font={DHBWlisting,sf},
}%
\lstset{
- basicstyle=\footnotesize\ttfamily\color{DHBW-dark-font},
- backgroundcolor=\color{DHBW-light},
+ basicstyle=\scriptsize\ttfamily\color{DHBW-dark-font},
+ backgroundcolor=\color{DHBW-light-gray},
rulecolor=\color{DHBW-red},
commentstyle=\color{DHBW-font},
keywordstyle=\color{DHBW-darkblue},
- numberstyle=\scriptsize\color{DHBW-font},
- stringstyle=\color{purple},
- frame=b,
- captionpos=t,
+ numberstyle=\scriptsize\ttfamily\color{DHBW-font},
+ stringstyle=\color{purple}
}
}
}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/iodhbwm.tlpobj new/tlpkg/tlpobj/iodhbwm.tlpobj
--- old/tlpkg/tlpobj/iodhbwm.tlpobj 2019-02-28 03:43:08.000000000 +0100
+++ new/tlpkg/tlpobj/iodhbwm.tlpobj 2020-04-15 01:54:53.000000000 +0200
@@ -1,25 +1,20 @@
name iodhbwm
category Package
-revision 49838
+revision 54734
shortdesc Unofficial template of the DHBW Mannheim
relocated 1
longdesc This package provides an unofficial template of the DHBW
longdesc Mannheim for the creation of bachelor thesis, studies or
longdesc project work with LaTeX. The aim of the package is the quick
longdesc creation of a basic framework without much effort.
-runfiles size=24
- RELOC/tex/latex/iodhbwm/dhbw-declaration.def
+runfiles size=20
RELOC/tex/latex/iodhbwm/dhbw-logo.png
- RELOC/tex/latex/iodhbwm/dhbw-titlepage-ba.def
- RELOC/tex/latex/iodhbwm/dhbw-titlepage-pa.def
- RELOC/tex/latex/iodhbwm/dhbw-titlepage-sa.def
- RELOC/tex/latex/iodhbwm/dhbw-titlepage.def
+ RELOC/tex/latex/iodhbwm/iodhbwm-i18n.def
RELOC/tex/latex/iodhbwm/iodhbwm-templates.sty
RELOC/tex/latex/iodhbwm/iodhbwm.cls
catalogue-contact-bugs https://github.com/faltfe/iodhbwm/issues
catalogue-contact-repository https://github.com/faltfe/iodhbwm/
catalogue-ctan /macros/latex/contrib/iodhbwm
-catalogue-date 2019-01-27 14:22:03 +0100
catalogue-license lppl1.3
-catalogue-topics class dissertation
-catalogue-version 1.0.1
+catalogue-topics class dissertation misc-paper
+catalogue-version 1.2.1
1
0