Hello community,
here is the log from the commit of package texlive-specs-f for openSUSE:Factory checked in at 2020-05-29 21:17:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-f (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-f"
Fri May 29 21:17:13 2020 rev:40 rq:806888 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-f/texlive-specs-f.changes 2019-11-07 23:10:16.952118864 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/texlive-specs-f.changes 2020-05-29 21:24:53.628416723 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink
+
+- Enhance spec file generator to find missing .so man page
+ links for better dependency resolution (bsc#1171682)
+
+-------------------------------------------------------------------
+Wed May 13 13:59:14 UTC 2020 - Dr. Werner Fink
+
+- Modify patch texdoc_cnf.dif to ignore tlpkg/texlive.tlpdb as
+ kpathsea uses the ls-R files as well
+
+-------------------------------------------------------------------
+Tue May 12 09:03:38 UTC 2020 - Dr. Werner Fink
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink
+
+- Add Requires to tex(epstopdf-base.sty) to fix package split
+ of texlive-epstopdf
+
+-------------------------------------------------------------------
+Mon May 4 09:00:25 UTC 2020 - Dr. Werner Fink
+
+- Skip *-dev packages from file dependendcy scanner as otherwise
+ we see doubling name space for some style files like amsmath.sty
+
+-------------------------------------------------------------------
+Mon Apr 27 06:52:15 UTC 2020 - Dr. Werner Fink
+
+- Add patch pythontex_p2top3.dif and a removes file to fully
+ switch pythontex packages of TeXLive to python3
+
+-------------------------------------------------------------------
+Mon Apr 20 10:29:02 UTC 2020 - Dr. Werner Fink
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
csvmerge.doc.tar.xz
csvmerge.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-f.spec ++++++
++++ 15479 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-f/texlive-specs-f.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/texlive-specs-f.spec
++++++ context-french.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-french.doc.tlpobj new/tlpkg/tlpobj/context-french.doc.tlpobj
--- old/tlpkg/tlpobj/context-french.doc.tlpobj 2019-02-28 03:29:48.000000000 +0100
+++ new/tlpkg/tlpobj/context-french.doc.tlpobj 2020-03-10 01:48:31.000000000 +0100
@@ -1,6 +1,6 @@
name context-french.doc
category ConTeXt
-revision 47085
+revision 54215
shortdesc doc files of context-french
relocated 1
docfiles size=113
++++++ context-french.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-french.tlpobj new/tlpkg/tlpobj/context-french.tlpobj
--- old/tlpkg/tlpobj/context-french.tlpobj 2019-02-28 03:29:48.000000000 +0100
+++ new/tlpkg/tlpobj/context-french.tlpobj 2020-03-10 01:48:31.000000000 +0100
@@ -1,14 +1,13 @@
name context-french
category ConTeXt
-revision 47085
+revision 54215
shortdesc Support for writing French in ConTeXt
relocated 1
longdesc Deals with spacing around French punctuation; the package is
-longdesc distributed for ConTeXt Mark iv only.
+longdesc distributed for ConTeXt Mark IV only.
depend context
runfiles size=1
RELOC/tex/context/third/french/t-french.mkiv
catalogue-ctan /macros/context/contrib/context-french
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics french
++++++ context-handlecsv.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/handlecsv/VERSION new/doc/context/third/handlecsv/VERSION
--- old/doc/context/third/handlecsv/VERSION 2019-04-02 23:10:25.000000000 +0200
+++ new/doc/context/third/handlecsv/VERSION 2019-06-03 23:34:31.000000000 +0200
@@ -1 +1 @@
-2019.03.30
+2019.05.27
Binary files old/doc/context/third/handlecsv/handlecsv.epub and new/doc/context/third/handlecsv/handlecsv.epub differ
Binary files old/doc/context/third/handlecsv/handlecsv.pdf and new/doc/context/third/handlecsv/handlecsv.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-handlecsv.doc.tlpobj new/tlpkg/tlpobj/context-handlecsv.doc.tlpobj
--- old/tlpkg/tlpobj/context-handlecsv.doc.tlpobj 2019-04-03 01:24:52.000000000 +0200
+++ new/tlpkg/tlpobj/context-handlecsv.doc.tlpobj 2019-06-04 01:39:14.000000000 +0200
@@ -1,9 +1,9 @@
name context-handlecsv.doc
category ConTeXt
-revision 50709
+revision 51306
shortdesc doc files of context-handlecsv
relocated 1
-docfiles size=252
+docfiles size=249
RELOC/doc/context/third/handlecsv/VERSION
RELOC/doc/context/third/handlecsv/handlecsv.epub
RELOC/doc/context/third/handlecsv/handlecsv.pdf
++++++ context-handlecsv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/context/third/handlecsv/t-handlecsv-extra.lua new/tex/context/third/handlecsv/t-handlecsv-extra.lua
--- old/tex/context/third/handlecsv/t-handlecsv-extra.lua 2018-04-09 23:13:49.000000000 +0200
+++ new/tex/context/third/handlecsv/t-handlecsv-extra.lua 2019-06-03 23:34:31.000000000 +0200
@@ -1,14 +1,14 @@
-- %D \module
-- %D [ file=t-handlecsv-extra.lua,
--- %D version=2018.02.26,
+-- %D version=2019.05.27,
-- %D title=HandleCSV extra,
-- %D subtitle=CSV file analysis - extended functions and macros,
-- %D author=Jaroslav Hajtmar,
--- %D date=2018-02-26,
+-- %D date=2019-05-27,
-- %D copyright=Jaroslav Hajtmar,
-- %D license=GNU General Public License]
--
--- %C Copyright (C) 2018 Jaroslav Hajtmar
+-- %C Copyright (C) 2019 Jaroslav Hajtmar
-- %C
-- %C This program is free software: you can redistribute it and/or modify
-- %C it under the terms of the GNU General Public License as published by
@@ -61,6 +61,63 @@
+-- function thirddata.handlecsv.cr_lines(s)
+-- return s:gsub('\r\n?', '\n'):gmatch('(.-)\n')
+-- end
+
+
+function thirddata.handlecsv.file2Array(filename)
+-- read CSV file into line array
+local linesarray={}
+ for line in io.lines (filename) do
+ linesarray[#linesarray+1]=line
+ end
+return linesarray
+end
+
+
+
+function thirddata.handlecsv.writefileinreverseorder(inpfilename,outfilename)
+-- write CSV file <inpfilename> into reverse order CSV file <outfilename>
+ local tLines = thirddata.handlecsv.file2Array(inpfilename)
+ local outfile = io.open(outfilename, "w")
+ local ifrom=#tLines
+ local ito=1
+ if thirddata.handlecsv.gCSVHeader then -- when CSV file is with header, then header line is first line
+ outfile:write(tLines[1])
+ outfile:write("\r\n")
+ ito=2
+ end
+ for i = ifrom, ito, -1 do -- write rest of lines in reverse order
+ outfile:write(tLines[i])
+ outfile:write("\r\n")
+ end
+outfile:flush()
+outfile:close()
+end
+
+
+
+function thirddata.handlecsv.deletefile(filename)
+-- remove file from disk
+ os.remove(filename)
+end
+
+
+function thirddata.handlecsv.varreverseorder(csvfilename)
+-- CSV file <csvfilename> is stored in variable array gTableRows['csvfilename'][row][column]
+-- this function rearrange gTableRows into reverse order
+local templine={}
+for i = 1, math.floor(thirddata.handlecsv.gNumRows[csvfilename]/2) do
+templine=thirddata.handlecsv.gTableRows[csvfilename][i]
+thirddata.handlecsv.gTableRows[csvfilename][i]=thirddata.handlecsv.gTableRows[csvfilename][thirddata.handlecsv.gNumRows[csvfilename]-i+1]
+thirddata.handlecsv.gTableRows[csvfilename][thirddata.handlecsv.gNumRows[csvfilename]-i+1]=templine
+end
+end
+
+
+
+
-- ConTeXt source:
local string2print=[[%
@@ -68,16 +125,24 @@
\def\addleading#1#2#3{\ctxlua{context(thirddata.handlecsv.addleadingcharacters('#1','#2','#3'))}}
\def\addzeros#1#2{\ctxlua{context(thirddata.handlecsv.addleadingzeros('#1','#2'))}}
\def\zeroed#1{\ctxlua{context(thirddata.handlecsv.addzeros('#1'))}}
+% \def\zeroedlineno{\ctxlua{context(string.rep( "0",(tostring(thirddata.handlecsv.numrows())):len() - (tostring(thirddata.handlecsv.linepointer())):len()) .. thirddata.handlecsv.linepointer())}}% from Pablo
\def\zeroedlineno{\zeroed{\lineno}}% from Pablo (and simplified by him)
+\def\writefileinreverseorderfromto#1#2{\ctxlua{thirddata.handlecsv.writefileinreverseorder('#1','#2')}}%
+\def\writecurrfileinreverseorderto#1{\ctxlua{thirddata.handlecsv.writefileinreverseorder(thirddata.handlecsv.gCurrentlyProcessedCSVFile,'#1')}}%
+\def\deletefile#1{\ctxlua{thirddata.handlecsv.deletefile('#1')}}%
+\def\reverseorderof#1{\ctxlua{thirddata.handlecsv.varreverseorder('#1')}}
+\def\reverseorder{\ctxlua{thirddata.handlecsv.varreverseorder(thirddata.handlecsv.gCurrentlyProcessedCSVFile)}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Complete listing macros and commands that can be used (to keep track of all defined macros):
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \addleading{}{}{}, \addzeros{}{}, \zeroed{}, \zeroedlineno (from Pablo)
-%
-
-
+% \writefileinreverseorderfromto{<inpfilename>}{<outfilename>} % create file <outfilename> in reverse order of file <inpfilename>
+% \writecurrfileinreverseorderto{<outfilename>} % create file <outfilename> in reverse order
+% \deletefile{<filename>} % close and delete file <filename>
+% \reverseorderof{<csvfilename>} % reverse order of opened CSV file <csvfilename>
+% \reverseorder % reverse order of currently processed CSV file
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-handlecsv.tlpobj new/tlpkg/tlpobj/context-handlecsv.tlpobj
--- old/tlpkg/tlpobj/context-handlecsv.tlpobj 2019-04-03 01:24:52.000000000 +0200
+++ new/tlpkg/tlpobj/context-handlecsv.tlpobj 2019-06-04 01:39:15.000000000 +0200
@@ -1,12 +1,12 @@
name context-handlecsv
category ConTeXt
-revision 50709
+revision 51306
shortdesc Data merging for automatic document creation
relocated 1
longdesc The package handles csv data merging for automatic document
longdesc creation.
depend context
-runfiles size=21
+runfiles size=22
RELOC/tex/context/third/handlecsv/t-handlecsv-extra.lua
RELOC/tex/context/third/handlecsv/t-handlecsv-tools.lua
RELOC/tex/context/third/handlecsv/t-handlecsv.lua
@@ -15,6 +15,6 @@
catalogue-contact-repository https://github.com/ousia/handlecsv
catalogue-contact-support https://github.com/ousia/handlecsv/issues
catalogue-ctan /macros/context/contrib/context-handlecsv
-catalogue-date 2018-09-25 05:27:36 +0200
+catalogue-date 2019-06-03 05:38:18 +0200
catalogue-license gpl3
catalogue-topics context csv-support
++++++ context-letter.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/letter/README new/doc/context/third/letter/README
--- old/doc/context/third/letter/README 2011-12-20 02:25:08.000000000 +0100
+++ new/doc/context/third/letter/README 2020-01-23 18:40:40.000000000 +0100
@@ -17,5 +17,17 @@
Letters
-------
+\usemodule[letter]
+
+\startletter
+...
+\stopletter
+
Memos
------
\ No newline at end of file
+-----
+
+\usemodule[memo]
+
+\startmemo
+...
+\stopmemo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/letter/VERSION new/doc/context/third/letter/VERSION
--- old/doc/context/third/letter/VERSION 2018-03-23 03:04:47.000000000 +0100
+++ new/doc/context/third/letter/VERSION 2020-01-21 22:43:28.000000000 +0100
@@ -1 +1 @@
-2017.08.27
+2020.01.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-letter.doc.tlpobj new/tlpkg/tlpobj/context-letter.doc.tlpobj
--- old/tlpkg/tlpobj/context-letter.doc.tlpobj 2019-02-28 03:29:49.000000000 +0100
+++ new/tlpkg/tlpobj/context-letter.doc.tlpobj 2020-01-24 01:57:07.000000000 +0100
@@ -1,6 +1,6 @@
name context-letter.doc
category ConTeXt
-revision 47085
+revision 53499
shortdesc doc files of context-letter
relocated 1
docfiles size=2
++++++ context-letter.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/context/third/letter/base/s-cor-00.lua new/tex/context/third/letter/base/s-cor-00.lua
--- old/tex/context/third/letter/base/s-cor-00.lua 2013-01-10 00:40:24.000000000 +0100
+++ new/tex/context/third/letter/base/s-cor-00.lua 2020-01-20 23:24:36.000000000 +0100
@@ -85,7 +85,7 @@
function correspondence.file(environment,name)
local environment = environment
local name = name
- commands.uselibrary {
+ resolvers.uselibrary {
name = name,
patterns = patterns[environment],
action = action,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-letter.tlpobj new/tlpkg/tlpobj/context-letter.tlpobj
--- old/tlpkg/tlpobj/context-letter.tlpobj 2019-02-28 03:29:49.000000000 +0100
+++ new/tlpkg/tlpobj/context-letter.tlpobj 2020-01-24 01:57:07.000000000 +0100
@@ -1,6 +1,6 @@
name context-letter
category ConTeXt
-revision 47085
+revision 53499
shortdesc ConTeXt package for writing letters
relocated 1
longdesc A means of writing 'vanilla' letters and memos is provided,
@@ -77,6 +77,5 @@
RELOC/tex/context/third/letter/style/resume-imp-classic.mkiv
RELOC/tex/context/third/letter/style/resume-imp-default.mkiv
catalogue-ctan /macros/context/contrib/context-letter
-catalogue-date 2018-08-11 15:29:10 +0200
catalogue-license gpl
catalogue-topics letter
++++++ context.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-f/context.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/context.doc.tar.xz differ: char 122916, line 485
++++++ context.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-f/context.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/context.tar.xz differ: char 26, line 1
++++++ cooking-units.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cooking-units/README.md new/doc/latex/cooking-units/README.md
--- old/doc/latex/cooking-units/README.md 2018-04-30 19:05:54.000000000 +0200
+++ new/doc/latex/cooking-units/README.md 2020-01-14 22:51:33.000000000 +0100
@@ -55,7 +55,7 @@
-------
This material is subject to the LaTeX Project Public License 1.3c or later. See
- https://ctan.org/license/lppl1.3c
+ https://www.latex-project.org/lppl/
for the details of that license.
Binary files old/doc/latex/cooking-units/cooking-units.pdf and new/doc/latex/cooking-units/cooking-units.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cooking-units.doc.tlpobj new/tlpkg/tlpobj/cooking-units.doc.tlpobj
--- old/tlpkg/tlpobj/cooking-units.doc.tlpobj 2019-02-28 03:29:59.000000000 +0100
+++ new/tlpkg/tlpobj/cooking-units.doc.tlpobj 2020-01-15 01:54:35.000000000 +0100
@@ -1,8 +1,8 @@
name cooking-units.doc
category Package
-revision 48748
+revision 53403
shortdesc doc files of cooking-units
relocated 1
-docfiles size=162
+docfiles size=172
RELOC/doc/latex/cooking-units/README.md
RELOC/doc/latex/cooking-units/cooking-units.pdf
++++++ cooking-units.tar.xz ++++++
++++ 2027 lines of diff (skipped)
++++++ cormorantgaramond.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cormorantgaramond/README new/doc/fonts/cormorantgaramond/README
--- old/doc/fonts/cormorantgaramond/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/cormorantgaramond/README 2020-04-12 23:27:51.000000000 +0200
@@ -0,0 +1,76 @@
+This is the README for the cormorantgaramond package,
+version 3.601 (2020-04-12).
+
+This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
+support for the Cormorant Garamond family of fonts, designed by
+Christian Thalman of Catharsis Fonts.
+
+While this project was heavily inspired by Claude Garamont's
+immortal legacy, Christian did not use any specific font as
+a starting point or direct reference for the designs. Most
+glyphs were drawn from scratch; when he needed guidance on
+a specific character, he searched for the term Garamond and
+skimmed through the results for a general impression.
+
+The family includes light, regular, medium, semi-bold and
+bold weights, with italics.
+
+To install this package on a TDS-compliant
+TeX system download the file
+"tex-archive"/install/fonts/cormorantgaramond.tds.zip,
+where the preferred URL for "tex-archive" is
+http://mirror.ctan.org. Unzip the archive at the root of
+an appropriate texmf tree, likely a personal or local
+tree. If necessary, update the file-name database (e.g.,
+texhash). Update the font-map files by enabling the Map file
+CormorantGaramond.map.
+
+To use, add
+
+\usepackage{CormorantGaramond}
+
+to the preamble of your document. Options include:
+
+oldstyle,osf old-style figures
+lining,nf,lf lining figures
+
+proportional,p varying-width figures
+tabular,t fixed-width figures
+
+The defaults are lining and proportional.
+
+Small caps are available in all weights.
+
+Use options
+
+light, l for light weight instead of regular
+semibold, sb for semi-bold weight instead of bold
+medium for medium weight instead of bold
+
+Slanted variants are not supported; the italic variants will
+be automatically substituted. Font encodings supported are
+OT1, T1, TS1, LY1 and T2A/B/C.
+
+Options scaled=<number> or scale=<number> may be used to adjust
+fontsizes. The type1 option may be used by xelatex or lualatex users
+who prefer to use type1 fonts or to avoid fontspec.
+
+Commands \oldstylenums{...} and \liningnums{...} are defined to allow
+for local use of old-style figures or lining figures, respectively.
+Similarly, \tabularnums{...} and \proportionalnums{...} allow for local
+use of monospaced or varying-width figures, respectively.
+
+Superior numbers (for footnote markers) are available
+using \sufigures or \textsu{...}. Inferior numbers (for
+subscripts) are available using \infigures or \textinf{...}.
+
+The original fonts are available at
+https://fonts.google.com and are licensed
+under the SIL Open Font License, (version 1.1); the text may
+be found in the doc directory.
+
+The type1 versions were created using fontforge. The
+support files were created using autoinst and otftotfm and
+are licensed under the terms of the LaTeX Project Public
+License. The maintainer of this package is Bob Tennent (rdt
+at cs.queensu.ca)
Binary files old/doc/fonts/cormorantgaramond/cormorantgaramond.pdf and new/doc/fonts/cormorantgaramond/cormorantgaramond.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cormorantgaramond/cormorantgaramond.tex new/doc/fonts/cormorantgaramond/cormorantgaramond.tex
--- old/doc/fonts/cormorantgaramond/cormorantgaramond.tex 2016-08-16 23:45:09.000000000 +0200
+++ new/doc/fonts/cormorantgaramond/cormorantgaramond.tex 2019-12-09 22:50:53.000000000 +0100
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
+\usepackage[T2A,T1]{fontenc}
\usepackage{CormorantGaramond}
\usepackage{lipsum}
\begin{document}
@@ -8,49 +8,56 @@
\textbf{Cormorant Garamond}
\end{center}
-\section{Regular}
+\subsection*{Regular}
\lipsum[1]
-\section{Italic}
+\subsection*{Italic}
\textit{\lipsum[2]}
-\section{Bold}
+\subsection*{Bold}
\textbf{\lipsum[3]}
-\section{Bold Italic}
+\subsection*{Bold Italic}
\textbf{\textit{\lipsum[4]}}
-\section{Small Caps}
+\subsection*{Small Caps}
\textsc{\lipsum[5]}
-\section{Default Numbers}
+\subsection*{Default Numbers}
1234567890
-\section{Oldstyle Numbers}
+\subsection*{Oldstyle Numbers}
\oldstylenums{1234567890}
-\section{Lining Numbers}
+\subsection*{Lining Numbers}
\liningnums{1234567890}
-\section{Tabular Numbers}
+\subsection*{Tabular Numbers}
\tabularnums{1234567890}
-\section{Proportional Numbers}
+\subsection*{Proportional Numbers}
\proportionalnums{1234567890}
-\section{Superior Numbers}
+\subsection*{Superior Numbers}
X\textsu{1234567890}
-\section{Inferior Numbers}
+\subsection*{Inferior Numbers}
X\textinf{1234567890}
+\subsection*{Cyrillic}
+
+{\ifxetex\else\ifluatex\else\fontencoding{T2A}\selectfont\fi\fi
+Съешь ещё этих мягких французских булок да
+выпей чаю!}
+
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj new/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj
--- old/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj 2019-02-28 03:30:03.000000000 +0100
+++ new/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj 2020-04-13 01:54:42.000000000 +0200
@@ -1,9 +1,10 @@
name cormorantgaramond.doc
category Package
-revision 41865
+revision 54696
shortdesc doc files of cormorantgaramond
relocated 1
-docfiles size=15
+docfiles size=42
RELOC/doc/fonts/cormorantgaramond/OFL.txt
+ RELOC/doc/fonts/cormorantgaramond/README
RELOC/doc/fonts/cormorantgaramond/cormorantgaramond.pdf
RELOC/doc/fonts/cormorantgaramond/cormorantgaramond.tex
++++++ cormorantgaramond.tar.xz ++++++
++++ 21034 lines of diff (skipped)
++++++ countriesofeurope.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/Changes new/doc/fonts/countriesofeurope/Changes
--- old/doc/fonts/countriesofeurope/Changes 2018-12-28 22:34:41.000000000 +0100
+++ new/doc/fonts/countriesofeurope/Changes 2019-10-04 22:49:55.000000000 +0200
@@ -1,2 +1,3 @@
+0.23 2019-10-03 - added color and Ligature option
0.22 2018-12-27 - added OpenType font and outline option
0.21 2012-04-18 - first CTAN version
\ No newline at end of file
Binary files old/doc/fonts/countriesofeurope/CountriesofEurope.pdf and new/doc/fonts/countriesofeurope/CountriesofEurope.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/CountriesofEurope.tex new/doc/fonts/countriesofeurope/CountriesofEurope.tex
--- old/doc/fonts/countriesofeurope/CountriesofEurope.tex 2018-12-28 22:34:41.000000000 +0100
+++ new/doc/fonts/countriesofeurope/CountriesofEurope.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,210 +0,0 @@
-
-%---------------------------
-\listfiles
-
-\documentclass{article}
-\usepackage{ifluatex}
-\ifluatex\else
- \pdfmapfile{+CountriesofEurope.map} % only needed, if the map is not enabled with updmap
-\fi
-\usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e,libertinus}
-\usepackage[Scale=7.5]{CountriesofEurope}
-
-\makeatletter
-\newcommand\Country[2][]{{%
- \tabular{|>{\Centering}p{2.5cm}|}\hline
- \strut\footnotesize\texttt{\textbackslash#2}\\\hline
- \parbox[c][3.2cm]{2cm}{\EUCountry[#1]{#2}}\\\hline
- \endtabular}}
-
-\makeatother
-
-\newcounter{N}
-
-\begin{document}
-\author{Rolf Niepraschk \and Herbert Voß}
-\title{Package \texttt{CountriesofEurope}}
-\maketitle
-
-
-\begin{sloppypar}
-This package defines the two macros \verb|\CountriesofEuropeFamily| and \verb|\EUCountry[options]{name}|,
-which allow to print one of the european countries as a single character with the given scaling or
-with an individual scaling.
-
-The first one switches
-to the font encoding \verb|U| (Type 1) or \verb|TU| (OpenType) and loads the font and the second
-one does the same but also with
-printing the character which the given name, e.\,g. for Finland: \verb|\EUCountry[Scale=0.2]{Germany}|$\rightarrow$%
-\EUCountry[Scale=0.2]{Germany}.
-\end{sloppypar}
-
-The font can be loaded
-with an optional argument for the scaling factor, which is preset to 1:
-
-\begin{verbatim}
-\usepackage[Scale=10]{CountriesofEurope}% scaled to 10
-\end{verbatim}
-
-The countris itself are available by a macro from the following list. The characters are
-at the position 128--166 in the Type~1 font \verb|CountriesofEurope.pfb| and also available
-with the \verb|\char| primitive. The following table shows the countries in their original size
-with a scaling of 7.5:
-
-\begin{longtable}{cccc}
-\Country{Albania} &
-\Country{Andorra} &
-\Country{Austria} &
-\Country{Belarus} \\
-\Country{Belgium} &
-\Country{Bosnia} &
-\Country{Bulgaria} &
-\Country{Croatia} \\
-\Country{Czechia} &
-\Country{Denmark} &
-\Country{Estonia} &
-\Country{Finland} \\
-\Country{France} &
-\Country{Germany} &
-\Country{GreatBritain} &
-\Country{Greece} \\
-\Country{Hungary} &
-\Country{Iceland} &
-\Country{Ireland} &
-\Country{Italy} \\
-\Country{Latvia} &
-\Country{Liechtenstein} &
-\Country{Lithuania} &
-\Country{Luxembourg} \\
-\Country{Macedonia} &
-\Country{Malta} &
-\Country{Moldova} &
-\Country{Montenegro} \\
-\Country{Netherlands} &
-\Country{Norway} &
-\Country{Poland} &
-\Country{Portugal} \\
-\Country{Romania} &
-\Country{Serbia} &
-\Country{Slovakia} &
-\Country{Slovenia} \\
-\Country{Spain} &
-\Country{Sweden} &
-\Country{Switzerland}
-
-\end{longtable}
-
-\noindent\rule{\textwidth}{.5mm}
-
-
-The countries in the original size with the given bounding box and the text command \verb|\huge|:
-
-% \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
-
-\medskip
-
-\begingroup
-\fboxsep=0pt
-\noindent%
-\ifluatex
- \fontspec{CountriesofEurope.otf}
- \huge
- \setcounter{N}{63724}%
- \whiledo{\value{N} > 63686}{%
- \fbox{\symbol{\value{N}}}%
- \addtocounter{N}{-1}}
-\else
- \huge
- \setcounter{N}{128}%
- \whiledo{\value{N} < 167}{%
- \fbox{\symbol{\value{N}}}%
- \stepcounter{N}}
-\fi
-\endgroup
-
-
-\clearpage
-
-All countries can be printed as outline, e.\,g.:
-
-\verb|\EUCountry[Scale=37.5,outline]{Germany}|
-
-\EUCountry[Scale=5,outline]{Germany}
-
-
-
-
-\ifluatex
- \fontspec{CountriesofEurope.otf}
-\else
- \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
-\fi
-
-\begin{longtable}{cccc}
-\Country[outline]{Albania} &
-\Country[outline]{Andorra} &
-\Country[outline]{Austria} &
-\Country[outline]{Belarus} \\
-\Country[outline]{Belgium} &
-\Country[outline]{Bosnia} &
-\Country[outline]{Bulgaria} &
-\Country[outline]{Croatia} \\
-\Country[outline]{Czechia} &
-\Country[outline]{Denmark} &
-\Country[outline]{Estonia} &
-\Country[outline]{Finland} \\
-\Country[outline]{France} &
-\Country[outline]{Germany} &
-\Country[outline]{GreatBritain} &
-\Country[outline]{Greece} \\
-\Country[outline]{Hungary} &
-\Country[outline]{Iceland} &
-\Country[outline]{Ireland} &
-\Country[outline]{Italy} \\
-\Country[outline]{Latvia} &
-\Country[outline]{Liechtenstein} &
-\Country[outline]{Lithuania} &
-\Country[outline]{Luxembourg} \\
-\Country[outline]{Macedonia} &
-\Country[outline]{Malta} &
-\Country[outline]{Moldova} &
-\Country[outline]{Montenegro} \\
-\Country[outline]{Netherlands} &
-\Country[outline]{Norway} &
-\Country[outline]{Poland} &
-\Country[outline]{Portugal} \\
-\Country[outline]{Romania} &
-\Country[outline]{Serbia} &
-\Country[outline]{Slovakia} &
-\Country[outline]{Slovenia} \\
-\Country[outline]{Spain} &
-\Country[outline]{Sweden} &
-\Country[outline]{Switzerland}
-
-\end{longtable}
-
-
-\rmfamily
-
-The countries are internally defined as a ligature so that abreviations of the countries can be
-used for printing:
-
-\begin{verbatim}
-\CountriesofEuropeFamily
-ge au
-\end{verbatim}
-
-\ifluatex
- \fontspec{CountriesofEurope.otf}
-\else
- \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
-\fi
-\CountriesofEuropeFamily
-ge au
-
-
-
-
-
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/README new/doc/fonts/countriesofeurope/README
--- old/doc/fonts/countriesofeurope/README 2018-12-28 22:34:41.000000000 +0100
+++ new/doc/fonts/countriesofeurope/README 2019-10-04 22:49:55.000000000 +0200
@@ -4,7 +4,6 @@
and can be used under the Open Font License.
All other files are copyrighted by Rolf Niepraschk and
-Herbert Voß and can be used under the LaTeX Public Project Licence.
+Herbert Voß and can be used under the LaTeX Project Public Licence.
-v0.22 2018-12-27
hvoss@tug.org
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/countriesofeurope.bib new/doc/fonts/countriesofeurope/countriesofeurope.bib
--- old/doc/fonts/countriesofeurope/countriesofeurope.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/countriesofeurope/countriesofeurope.bib 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,18 @@
+@ctan{countriesofeurope,
+title = {The Countriesofeurope package},
+subtitle = {A font with the images of the countries of Europe},
+author = {Zimmermann, Ingo and Voß, Herbert and Niepraschk, Rolf},
+url = {http://www.ctan.org/pkg/countriesofeurope},
+urldate = {2019-10-203},
+date = {2019-10-03},
+version = {0.23}
+}
+
+@online{ingofonts,
+title={Fonts and typography that leave a mark},
+author={Ingo Zimmermann},
+url={http://www.ingoFonts.de},
+urldate = {2019-10-03},
+note={for corporate design, promotion, web, publishing. Buy fonts directly from the maker. At ingoFonts you’ll find fonts of all styles,
+ including free test versions of all fonts to download and try out.},
+}
Binary files old/doc/fonts/countriesofeurope/countriesofeurope.pdf and new/doc/fonts/countriesofeurope/countriesofeurope.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/countriesofeurope.tex new/doc/fonts/countriesofeurope/countriesofeurope.tex
--- old/doc/fonts/countriesofeurope/countriesofeurope.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/countriesofeurope/countriesofeurope.tex 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,315 @@
+%\listfiles
+%% $Id: countriesofeurope.tex 1095 2019-10-03 06:05:39Z herbert $
+\documentclass[11pt,english,BCOR=10mm,DIV=13,toc=bibliography,parskip=false,
+ headings=small,headinclude=false,footinclude=false,oneside]{pst-doc}
+\usepackage[Scale=7.5]{countriesofeurope}
+\let\pstFV\fileversion
+
+\usepackage{ifluatex}
+\usepackage{dtk-logos}
+\ifluatex\else
+ \pdfmapfile{+countriesofeurope.map} % only needed, if the map is not enabled with updmap
+\fi
+\usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e,libertinus}
+
+\makeatletter
+\newcommand\Country[2][]{{%
+ \tabular{|>{\Centering}p{2.5cm}|}\hline
+ \strut\footnotesize\texttt{\textbackslash#2}\\\hline
+ \parbox[c][3.2cm]{2cm}{\EUCountry[#1]{#2}}\\\hline
+ \endtabular}}
+
+\makeatother
+
+\newcounter{N}
+
+\renewcommand\bgImage{%
+ \EUCountry[Scale=3,outline,fillcolor=blue!20,linecolor=black]{Germany}}
+
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+\begin{document}
+
+\title{Package \texttt{countriesofeurope}}
+\subtitle{Printing all european countries as a character of a font (v.\,0.23)}
+\author{Rolf Niepraschk\\Herbert Voß\\Ingo Zimmermann}
+\docauthor{Herbert Voß}
+\date{\today}
+\maketitle
+
+\section{Introduction}
+
+\begin{sloppypar}
+This package defines the two macros \Lcs{countriesofeuropefamily} (short version is \Lcs{CoEF})
+and \Lcs{EUCountry}\verb|[options]{name}|,
+which allow to print one of the european countries as a single character with the given scaling or
+with an individual scaling.
+
+The first one switches
+to the font encoding \verb|U| (Type 1) or \verb|TU| (OpenType) and loads the font and the second
+one does the same but also with
+printing the character which the given name, e.\,g. for Finland: \verb|\EUCountry[Scale=0.2]{Germany}|$\rightarrow$%
+\EUCountry[Scale=0.2]{Germany}.
+\end{sloppypar}
+
+The font can be loaded
+with an optional argument for the scaling factor, which is preset to 1:
+
+\begin{verbatim}
+\usepackage[Scale=10]{countriesofeurope}% scaled to 10
+\end{verbatim}
+
+
+\section{Default use}
+
+The countris itself are available by a macro from the following list. The characters are
+at the position 128--166 in the Type~1 font \LFile{countriesofeurope.pfb} and also available
+with the \verb|\char| primitive. The following table shows the countries in their original size
+with a scaling of 7.5:
+
+\begin{longtable}{cccc}
+\Country{Albania} &
+\Country{Andorra} &
+\Country{Austria} &
+\Country{Belarus} \\
+\Country{Belgium} &
+\Country{Bosnia} &
+\Country{Bulgaria} &
+\Country{Croatia} \\
+\Country{Czechia} &
+\Country{Denmark} &
+\Country{Estonia} &
+\Country{Finland} \\
+\Country{France} &
+\Country{Germany} &
+\Country{GreatBritain} &
+\Country{Greece} \\
+\Country{Hungary} &
+\Country{Iceland} &
+\Country{Ireland} &
+\Country{Italy} \\
+\Country{Latvia} &
+\Country{Liechtenstein} &
+\Country{Lithuania} &
+\Country{Luxembourg} \\
+\Country{Macedonia} &
+\Country{Malta} &
+\Country{Moldova} &
+\Country{Montenegro} \\
+\Country{Netherlands} &
+\Country{Norway} &
+\Country{Poland} &
+\Country{Portugal} \\
+\Country{Romania} &
+\Country{Serbia} &
+\Country{Slovakia} &
+\Country{Slovenia} \\
+\Country{Spain} &
+\Country{Sweden} &
+\Country{Switzerland}
+
+\end{longtable}
+
+
+\noindent\rule{\textwidth}{.5mm}
+
+The countries in the original size with the given bounding box and the text command \verb|\huge|:
+
+% \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+
+\medskip
+
+\begingroup
+\fboxsep=0pt
+\noindent%
+\ifluatex
+ \fontspec[Scale=1]{countriesofeurope.otf}
+ \huge
+ \setcounter{N}{63724}%
+ \whiledo{\value{N} > 63686}{%
+ \fbox{\symbol{\value{N}}}%
+ \addtocounter{N}{-1}}
+\else
+ \huge
+ \setcounter{N}{128}%
+ \whiledo{\value{N} < 167}{%
+ \fbox{\symbol{\value{N}}}%
+ \stepcounter{N}}
+\fi
+\endgroup
+
+\rmfamily
+
+\section{Outline font}
+
+All countries can be printed as outline, e.\,g.:
+
+\verb|\EUCountry[Scale=37.5,outline]{Germany}|
+
+\EUCountry[Scale=5,outline]{Germany}
+
+
+
+
+\begingroup
+\ifluatex
+ \CoEF
+\else
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+\fi
+
+\begin{longtable}{cccc}
+\Country[outline]{Albania} &
+\Country[outline]{Andorra} &
+\Country[outline]{Austria} &
+\Country[outline]{Belarus} \\
+\Country[outline]{Belgium} &
+\Country[outline]{Bosnia} &
+\Country[outline]{Bulgaria} &
+\Country[outline]{Croatia} \\
+\Country[outline]{Czechia} &
+\Country[outline]{Denmark} &
+\Country[outline]{Estonia} &
+\Country[outline]{Finland} \\
+\Country[outline]{France} &
+\Country[outline]{Germany} &
+\Country[outline]{GreatBritain} &
+\Country[outline]{Greece} \\
+\Country[outline]{Hungary} &
+\Country[outline]{Iceland} &
+\Country[outline]{Ireland} &
+\Country[outline]{Italy} \\
+\Country[outline]{Latvia} &
+\Country[outline]{Liechtenstein} &
+\Country[outline]{Lithuania} &
+\Country[outline]{Luxembourg} \\
+\Country[outline]{Macedonia} &
+\Country[outline]{Malta} &
+\Country[outline]{Moldova} &
+\Country[outline]{Montenegro} \\
+\Country[outline]{Netherlands} &
+\Country[outline]{Norway} &
+\Country[outline]{Poland} &
+\Country[outline]{Portugal} \\
+\Country[outline]{Romania} &
+\Country[outline]{Serbia} &
+\Country[outline]{Slovakia} &
+\Country[outline]{Slovenia} \\
+\Country[outline]{Spain} &
+\Country[outline]{Sweden} &
+\Country[outline]{Switzerland}
+
+\end{longtable}
+
+\endgroup
+
+
+\section{Ligatures}
+\rmfamily
+
+The countries are internally defined as a ligature so that abreviations of the countries can be
+used for printing.
+%
+%\begin{verbatim}
+%\CoEF ge au
+%\end{verbatim}
+%
+These Ligatures are enabled by default!
+
+%\begin{verbatim}
+%\defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common}
+%\end{verbatim}
+
+%leads to
+
+\begingroup
+\ifluatex
+ \CoEF
+% \defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common}
+\else
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+\fi
+\verb|{\CoEF ge GE}| $\rightarrow$ {\CoEF ge GE}
+\endgroup
+
+
+
+
+\def\TAB#1{\tabular[b]{@{}l@{}}#1\endtabular}
+\begin{longtable}{ll ll}\toprule
+\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule
+\endfirsthead
+\midrule
+\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule
+\endhead
+AL & \CoEF AL & AN & \CoEF AN \\\hline
+AU & \CoEF AU & BELA & \CoEF BELA \\\hline
+BELG & \CoEF BELG & BO & \CoEF BO\\\hline
+BU & \CoEF BU & CR & \CoEF CR\\\hline
+CZ & \CoEF CZ & \TAB{DAN\\DAE} & \CoEF DAN\\\hline
+EST & \CoEF EST & FI & \CoEF FI \\\hline
+FR & \CoEF FR & GE & \CoEF GE \\
+\TAB{EN\\GREA\\BR} & \CoEF BR & GRI & \CoEF GRI \\\hline
+HU & \CoEF HU & IC & \CoEF IC \\\hline
+IR & \CoEF IR & IT & \CoEF IT \\\hline
+LA & \CoEF LA & LIE & \CoEF LIE\\\hline
+LIT & \CoEF LIT & LU & \CoEF LU \\\hline
+MAC & \CoEF MAC & MAL & \CoEF MAL\\\hline
+MOL & \CoEF MOL & MON & \CoEF MON \\\hline
+NE & \CoEF NE & NO & \CoEF NO\\\hline
+POL & \CoEF POL & POR & \CoEF POR \\\hline
+RO & \CoEF RO & SE & \CoEF SE \\\hline
+SLOVA& \CoEF SLOVA& SLOVE& \CoEF SLOVE \\\hline
+SP & \CoEF SP & \TAB{SWE\\SV} & \CoEF SWE\\\hline
+SWI & \CoEF SWI & & \\\bottomrule
+\end{longtable}
+
+
+%\defaultfontfeatures[\countriesofeuropefamily]{Ligatures=NoCommon}
+
+
+%The Ligatures can also be enabled by
+
+%\begin{verbatim}
+%\usepackage[Ligatures=Common]{countriesofeurope}
+%\end{verbatim}
+
+
+\rmfamily
+\section{Color options}
+
+
+
+With the optional arguments \Lkeyword{fillcolor} and \Lkeyword{linecolor} the countries can printed with
+different colors. The option \Lkeyword{fillcolor} is only valiD, if the option \Lkeyword{outline} is
+set, too.
+
+
+
+\verb|\EUCountry[Scale=37.5,outline,fillcolor=blue!20,linecolor=blue]{Germany}|
+\ifluatex
+ \fontspec{countriesofeurope.otf}
+\else
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+\fi
+
+
+\fbox{\EUCountry[Scale=5,outline,fillcolor=blue!20,linecolor=blue]{Germany}}
+
+
+
+\rmfamily
+\bgroup
+\raggedright
+\nocite{*}
+%\bibliographystyle{plain}
+\printbibliography
+\egroup
+
+\printindex
+
+
+
+
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/countriesofeurope.doc.tlpobj new/tlpkg/tlpobj/countriesofeurope.doc.tlpobj
--- old/tlpkg/tlpobj/countriesofeurope.doc.tlpobj 2019-02-28 03:30:12.000000000 +0100
+++ new/tlpkg/tlpobj/countriesofeurope.doc.tlpobj 2020-03-24 01:57:10.000000000 +0100
@@ -1,10 +1,11 @@
name countriesofeurope.doc
category Package
-revision 49525
+revision 54512
shortdesc doc files of countriesofeurope
relocated 1
-docfiles size=23
+docfiles size=30
RELOC/doc/fonts/countriesofeurope/Changes
- RELOC/doc/fonts/countriesofeurope/CountriesofEurope.pdf
- RELOC/doc/fonts/countriesofeurope/CountriesofEurope.tex
RELOC/doc/fonts/countriesofeurope/README
+ RELOC/doc/fonts/countriesofeurope/countriesofeurope.bib
+ RELOC/doc/fonts/countriesofeurope/countriesofeurope.pdf
+ RELOC/doc/fonts/countriesofeurope/countriesofeurope.tex
++++++ countriesofeurope.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/countriesofeurope/CountriesofEurope.afm new/fonts/afm/public/countriesofeurope/CountriesofEurope.afm
--- old/fonts/afm/public/countriesofeurope/CountriesofEurope.afm 2018-12-28 22:34:41.000000000 +0100
+++ new/fonts/afm/public/countriesofeurope/CountriesofEurope.afm 1970-01-01 01:00:00.000000000 +0100
@@ -1,114 +0,0 @@
-StartFontMetrics 2.0
-Comment Generated by FontForge 20090914
-Comment Creation Date: Mon Apr 16 13:36:09 2012
-FontName CountriesofEurope
-FullName Countries of Europe
-FamilyName Countries of Europe
-Weight Roman
-Notice (Copyright (c) 2012 by Ingo Zimmermann. Font may be used under the OFL.)
-ItalicAngle 0
-IsFixedPitch false
-UnderlinePosition -100
-UnderlineThickness 50
-Version 001.001
-EncodingScheme AdobeStandardEncoding
-FontBBox -101 -226 955 1299
-CapHeight 757
-XHeight 507
-Ascender 379
-Descender -135
-StartCharMetrics 92
-C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
-C 65 ; WX 643 ; N A ; B -28 -4 522 756 ;
-C 66 ; WX 615 ; N B ; B 0 -4 472 756 ;
-C 67 ; WX 556 ; N C ; B -30 -11 461 762 ;
-C 68 ; WX 651 ; N D ; B 0 -3 527 755 ;
-C 69 ; WX 527 ; N E ; B 0 0 394 752 ;
-C 70 ; WX 499 ; N F ; B 0 -4 394 752 ;
-C 71 ; WX 654 ; N G ; B -30 -6 502 762 ;
-C 72 ; WX 671 ; N H ; B 0 -4 509 756 ;
-C 73 ; WX 265 ; N I ; B 0 -4 103 756 ;
-C 74 ; WX 291 ; N J ; B -71 -15 139 756 ;
-C 75 ; WX 618 ; N K ; B 0 -4 523 757 ;
-C 76 ; WX 459 ; N L ; B 0 0 364 756 ;
-C 77 ; WX 804 ; N M ; B 0 -4 642 755 ;
-C 78 ; WX 711 ; N N ; B 0 -4 549 756 ;
-C 79 ; WX 671 ; N O ; B -30 -11 547 762 ;
-C 80 ; WX 588 ; N P ; B 0 -4 464 752 ;
-C 81 ; WX 703 ; N Q ; B -30 -4 665 762 ;
-C 82 ; WX 620 ; N R ; B 0 -5 496 754 ;
-C 83 ; WX 589 ; N S ; B -20 -11 456 758 ;
-C 84 ; WX 493 ; N T ; B -101 -4 408 752 ;
-C 85 ; WX 671 ; N U ; B 0 -11 519 756 ;
-C 86 ; WX 632 ; N V ; B -40 -4 513 759 ;
-C 87 ; WX 935 ; N W ; B -60 -4 830 759 ;
-C 88 ; WX 622 ; N X ; B -60 -5 508 759 ;
-C 89 ; WX 574 ; N Y ; B -60 -4 479 759 ;
-C 90 ; WX 545 ; N Z ; B -34 0 440 752 ;
-C 97 ; WX 500 ; N a ; B -20 -7 357 507 ;
-C 98 ; WX 514 ; N b ; B 0 -8 400 756 ;
-C 99 ; WX 376 ; N c ; B -30 -8 271 506 ;
-C 100 ; WX 512 ; N d ; B -30 -8 369 756 ;
-C 101 ; WX 496 ; N e ; B -30 -6 386 507 ;
-C 102 ; WX 315 ; N f ; B 0 -4 230 759 ;
-C 103 ; WX 512 ; N g ; B -30 -225 369 507 ;
-C 104 ; WX 519 ; N h ; B 0 -4 380 756 ;
-C 105 ; WX 237 ; N i ; B -7 -3 98 682 ;
-C 106 ; WX 247 ; N j ; B -81 -222 104 682 ;
-C 107 ; WX 474 ; N k ; B 0 -7 390 756 ;
-C 108 ; WX 234 ; N l ; B 0 -4 90 757 ;
-C 109 ; WX 770 ; N m ; B 0 -4 631 505 ;
-C 110 ; WX 509 ; N n ; B 0 -4 370 507 ;
-C 111 ; WX 492 ; N o ; B -30 -8 381 507 ;
-C 112 ; WX 514 ; N p ; B 0 -226 400 507 ;
-C 113 ; WX 512 ; N q ; B -30 -226 369 507 ;
-C 114 ; WX 329 ; N r ; B 0 -4 243 507 ;
-C 115 ; WX 449 ; N s ; B -20 -7 325 507 ;
-C 116 ; WX 310 ; N t ; B 0 -4 225 640 ;
-C 117 ; WX 506 ; N u ; B 0 -10 371 504 ;
-C 118 ; WX 481 ; N v ; B -50 -4 395 505 ;
-C 119 ; WX 768 ; N w ; B -50 -4 682 505 ;
-C 120 ; WX 504 ; N x ; B -42 -6 410 507 ;
-C 121 ; WX 513 ; N y ; B 0 -225 370 501 ;
-C 122 ; WX 448 ; N z ; B -21 0 324 500 ;
-C -1 ; WX 174 ; N Albania ; B 18 0 163 275 ;
-C -1 ; WX 59 ; N Andorra ; B 25 1 48 26 ;
-C -1 ; WX 514 ; N Austria ; B 6 1 485 251 ;
-C -1 ; WX 554 ; N Belarus ; B 22 -35 540 462 ;
-C -1 ; WX 253 ; N Belgium ; B 10 0 229 190 ;
-C -1 ; WX 311 ; N Bosnia ; B 10 0 287 250 ;
-C -1 ; WX 463 ; N Bulgaria ; B 19 0 443 330 ;
-C -1 ; WX 436 ; N Croatia ; B 23 0 415 370 ;
-C -1 ; WX 455 ; N Czechia ; B 23 0 439 233 ;
-C -1 ; WX 404 ; N Denmark ; B 29 -3 403 299 ;
-C -1 ; WX 342 ; N Estonia ; B 20 -3 317 208 ;
-C -1 ; WX 580 ; N Finland ; B 14 -42 569 974 ;
-C -1 ; WX 938 ; N France ; B 9 -142 918 800 ;
-C -1 ; WX 578 ; N Germany ; B 23 -23 556 715 ;
-C -1 ; WX 533 ; N GreatBritain ; B 4 -134 520 955 ;
-C -1 ; WX 749 ; N Greece ; B 10 -30 737 647 ;
-C -1 ; WX 444 ; N Hungary ; B 16 1 428 295 ;
-C -1 ; WX 452 ; N Iceland ; B 24 -1 438 343 ;
-C -1 ; WX 320 ; N Ireland ; B 13 0 296 335 ;
-C -1 ; WX 876 ; N Italy ; B 13 -29 863 953 ;
-C -1 ; WX 425 ; N Latvia ; B 24 6 404 236 ;
-C -1 ; WX 65 ; N Liechtenstein ; B 40 1 48 22 ;
-C -1 ; WX 347 ; N Lithuania ; B 13 1 325 257 ;
-C -1 ; WX 89 ; N Luxembourg ; B 32 1 79 72 ;
-C -1 ; WX 221 ; N Macedonia ; B 25 1 203 160 ;
-C -1 ; WX 47 ; N Malta ; B 1 3 32 30 ;
-C -1 ; WX 282 ; N Moldova ; B 7 -5 269 262 ;
-C -1 ; WX 154 ; N Montenegro ; B 19 0 146 154 ;
-C -1 ; WX 259 ; N Netherlands ; B 6 0 238 266 ;
-C -1 ; WX 959 ; N Norway ; B 9 -29 955 1299 ;
-C -1 ; WX 655 ; N Poland ; B 23 0 628 523 ;
-C -1 ; WX 325 ; N Portugal ; B 20 5 318 487 ;
-C -1 ; WX 668 ; N Romania ; B 17 0 650 466 ;
-C -1 ; WX 347 ; N Serbia ; B 14 0 335 408 ;
-C -1 ; WX 371 ; N Slovakia ; B 23 0 360 190 ;
-C -1 ; WX 233 ; N Slovenia ; B 12 0 217 152 ;
-C -1 ; WX 943 ; N Spain ; B 24 -118 939 746 ;
-C -1 ; WX 538 ; N Sweden ; B 15 -60 524 1274 ;
-C -1 ; WX 331 ; N Switzerland ; B 19 -12 312 178 ;
-EndCharMetrics
-EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/countriesofeurope/countriesofeurope.afm new/fonts/afm/public/countriesofeurope/countriesofeurope.afm
--- old/fonts/afm/public/countriesofeurope/countriesofeurope.afm 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/afm/public/countriesofeurope/countriesofeurope.afm 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,114 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20090914
+Comment Creation Date: Mon Apr 16 13:36:09 2012
+FontName CountriesofEurope
+FullName Countries of Europe
+FamilyName Countries of Europe
+Weight Roman
+Notice (Copyright (c) 2012 by Ingo Zimmermann. Font may be used under the OFL.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.001
+EncodingScheme AdobeStandardEncoding
+FontBBox -101 -226 955 1299
+CapHeight 757
+XHeight 507
+Ascender 379
+Descender -135
+StartCharMetrics 92
+C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
+C 65 ; WX 643 ; N A ; B -28 -4 522 756 ;
+C 66 ; WX 615 ; N B ; B 0 -4 472 756 ;
+C 67 ; WX 556 ; N C ; B -30 -11 461 762 ;
+C 68 ; WX 651 ; N D ; B 0 -3 527 755 ;
+C 69 ; WX 527 ; N E ; B 0 0 394 752 ;
+C 70 ; WX 499 ; N F ; B 0 -4 394 752 ;
+C 71 ; WX 654 ; N G ; B -30 -6 502 762 ;
+C 72 ; WX 671 ; N H ; B 0 -4 509 756 ;
+C 73 ; WX 265 ; N I ; B 0 -4 103 756 ;
+C 74 ; WX 291 ; N J ; B -71 -15 139 756 ;
+C 75 ; WX 618 ; N K ; B 0 -4 523 757 ;
+C 76 ; WX 459 ; N L ; B 0 0 364 756 ;
+C 77 ; WX 804 ; N M ; B 0 -4 642 755 ;
+C 78 ; WX 711 ; N N ; B 0 -4 549 756 ;
+C 79 ; WX 671 ; N O ; B -30 -11 547 762 ;
+C 80 ; WX 588 ; N P ; B 0 -4 464 752 ;
+C 81 ; WX 703 ; N Q ; B -30 -4 665 762 ;
+C 82 ; WX 620 ; N R ; B 0 -5 496 754 ;
+C 83 ; WX 589 ; N S ; B -20 -11 456 758 ;
+C 84 ; WX 493 ; N T ; B -101 -4 408 752 ;
+C 85 ; WX 671 ; N U ; B 0 -11 519 756 ;
+C 86 ; WX 632 ; N V ; B -40 -4 513 759 ;
+C 87 ; WX 935 ; N W ; B -60 -4 830 759 ;
+C 88 ; WX 622 ; N X ; B -60 -5 508 759 ;
+C 89 ; WX 574 ; N Y ; B -60 -4 479 759 ;
+C 90 ; WX 545 ; N Z ; B -34 0 440 752 ;
+C 97 ; WX 500 ; N a ; B -20 -7 357 507 ;
+C 98 ; WX 514 ; N b ; B 0 -8 400 756 ;
+C 99 ; WX 376 ; N c ; B -30 -8 271 506 ;
+C 100 ; WX 512 ; N d ; B -30 -8 369 756 ;
+C 101 ; WX 496 ; N e ; B -30 -6 386 507 ;
+C 102 ; WX 315 ; N f ; B 0 -4 230 759 ;
+C 103 ; WX 512 ; N g ; B -30 -225 369 507 ;
+C 104 ; WX 519 ; N h ; B 0 -4 380 756 ;
+C 105 ; WX 237 ; N i ; B -7 -3 98 682 ;
+C 106 ; WX 247 ; N j ; B -81 -222 104 682 ;
+C 107 ; WX 474 ; N k ; B 0 -7 390 756 ;
+C 108 ; WX 234 ; N l ; B 0 -4 90 757 ;
+C 109 ; WX 770 ; N m ; B 0 -4 631 505 ;
+C 110 ; WX 509 ; N n ; B 0 -4 370 507 ;
+C 111 ; WX 492 ; N o ; B -30 -8 381 507 ;
+C 112 ; WX 514 ; N p ; B 0 -226 400 507 ;
+C 113 ; WX 512 ; N q ; B -30 -226 369 507 ;
+C 114 ; WX 329 ; N r ; B 0 -4 243 507 ;
+C 115 ; WX 449 ; N s ; B -20 -7 325 507 ;
+C 116 ; WX 310 ; N t ; B 0 -4 225 640 ;
+C 117 ; WX 506 ; N u ; B 0 -10 371 504 ;
+C 118 ; WX 481 ; N v ; B -50 -4 395 505 ;
+C 119 ; WX 768 ; N w ; B -50 -4 682 505 ;
+C 120 ; WX 504 ; N x ; B -42 -6 410 507 ;
+C 121 ; WX 513 ; N y ; B 0 -225 370 501 ;
+C 122 ; WX 448 ; N z ; B -21 0 324 500 ;
+C -1 ; WX 174 ; N Albania ; B 18 0 163 275 ;
+C -1 ; WX 59 ; N Andorra ; B 25 1 48 26 ;
+C -1 ; WX 514 ; N Austria ; B 6 1 485 251 ;
+C -1 ; WX 554 ; N Belarus ; B 22 -35 540 462 ;
+C -1 ; WX 253 ; N Belgium ; B 10 0 229 190 ;
+C -1 ; WX 311 ; N Bosnia ; B 10 0 287 250 ;
+C -1 ; WX 463 ; N Bulgaria ; B 19 0 443 330 ;
+C -1 ; WX 436 ; N Croatia ; B 23 0 415 370 ;
+C -1 ; WX 455 ; N Czechia ; B 23 0 439 233 ;
+C -1 ; WX 404 ; N Denmark ; B 29 -3 403 299 ;
+C -1 ; WX 342 ; N Estonia ; B 20 -3 317 208 ;
+C -1 ; WX 580 ; N Finland ; B 14 -42 569 974 ;
+C -1 ; WX 938 ; N France ; B 9 -142 918 800 ;
+C -1 ; WX 578 ; N Germany ; B 23 -23 556 715 ;
+C -1 ; WX 533 ; N GreatBritain ; B 4 -134 520 955 ;
+C -1 ; WX 749 ; N Greece ; B 10 -30 737 647 ;
+C -1 ; WX 444 ; N Hungary ; B 16 1 428 295 ;
+C -1 ; WX 452 ; N Iceland ; B 24 -1 438 343 ;
+C -1 ; WX 320 ; N Ireland ; B 13 0 296 335 ;
+C -1 ; WX 876 ; N Italy ; B 13 -29 863 953 ;
+C -1 ; WX 425 ; N Latvia ; B 24 6 404 236 ;
+C -1 ; WX 65 ; N Liechtenstein ; B 40 1 48 22 ;
+C -1 ; WX 347 ; N Lithuania ; B 13 1 325 257 ;
+C -1 ; WX 89 ; N Luxembourg ; B 32 1 79 72 ;
+C -1 ; WX 221 ; N Macedonia ; B 25 1 203 160 ;
+C -1 ; WX 47 ; N Malta ; B 1 3 32 30 ;
+C -1 ; WX 282 ; N Moldova ; B 7 -5 269 262 ;
+C -1 ; WX 154 ; N Montenegro ; B 19 0 146 154 ;
+C -1 ; WX 259 ; N Netherlands ; B 6 0 238 266 ;
+C -1 ; WX 959 ; N Norway ; B 9 -29 955 1299 ;
+C -1 ; WX 655 ; N Poland ; B 23 0 628 523 ;
+C -1 ; WX 325 ; N Portugal ; B 20 5 318 487 ;
+C -1 ; WX 668 ; N Romania ; B 17 0 650 466 ;
+C -1 ; WX 347 ; N Serbia ; B 14 0 335 408 ;
+C -1 ; WX 371 ; N Slovakia ; B 23 0 360 190 ;
+C -1 ; WX 233 ; N Slovenia ; B 12 0 217 152 ;
+C -1 ; WX 943 ; N Spain ; B 24 -118 939 746 ;
+C -1 ; WX 538 ; N Sweden ; B 15 -60 524 1274 ;
+C -1 ; WX 331 ; N Switzerland ; B 19 -12 312 178 ;
+EndCharMetrics
+EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc new/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc
--- old/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc 2018-12-28 22:34:41.000000000 +0100
+++ new/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-
-/CountriesofEurope [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
- /space /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%40
- /.notdef /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /.notdef /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
- /Albania /Andorra /Austria /Belarus /Belgium /Bosnia /Bulgaria /Croatia
- /Czechia /Denmark /Estonia /Finland /France /Germany /GreatBritain /Greece
-%90
- /Hungary /Iceland /Ireland /Italy /Latvia /Liechtenstein /Lithuania /Luxembourg
- /Macedonia /Malta /Moldova /Montenegro /Netherlands /Norway /Poland /Portugal
-%A0
- /Romania /Serbia /Slovakia /Slovenia /Spain /Sweden /Switzerland /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm CountriesofEurope.otf foo'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc new/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc
--- old/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,52 @@
+
+/countriesofeurope [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /space /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%30
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%40
+ /.notdef /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef
+%60
+ /.notdef /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /.notdef /.notdef /.notdef /.notdef /.notdef
+%80
+ /Albania /Andorra /Austria /Belarus /Belgium /Bosnia /Bulgaria /Croatia
+ /Czechia /Denmark /Estonia /Finland /France /Germany /GreatBritain /Greece
+%90
+ /Hungary /Iceland /Ireland /Italy /Latvia /Liechtenstein /Lithuania /Luxembourg
+ /Macedonia /Malta /Moldova /Montenegro /Netherlands /Norway /Poland /Portugal
+%A0
+ /Romania /Serbia /Slovakia /Slovenia /Spain /Sweden /Switzerland /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm countriesofeurope.otf foo'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/countriesofeurope/CountriesofEurope.map new/fonts/map/dvips/countriesofeurope/CountriesofEurope.map
--- old/fonts/map/dvips/countriesofeurope/CountriesofEurope.map 2018-12-28 22:34:41.000000000 +0100
+++ new/fonts/map/dvips/countriesofeurope/CountriesofEurope.map 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-CountriesofEurope CountriesofEurope "CountriesofEurope ReEncodeFont" http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{CountriesofEurope}%
- [2018/12/27 v0.22 CountriesofEurope Font (hv,RN)]
-
-\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx}
-
-\newcommand*\CountriesofEurope@scale{1}
-\RequirePackage{xkeyval}
-\DeclareOptionX{Scale}{\renewcommand*\CountriesofEurope@scale{#1}}
-\ProcessOptionsX\relax
-
-\newif\ifCoE@outline
-
-\def\CoE@boolkey#1#2{\csname CoE@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
-
-\define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}}
-\define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}}
-%
-\def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x}
-
-\setCoEkeys{outline=false,Scale=1}
-
-\newif\if@CoE@newengine \@CoE@newenginefalse
-\ifxetex\@CoE@newenginetrue
-\else
- \ifluatex\@CoE@newenginetrue\fi
-\fi
-
-\if@CoE@newengine
- \def\set@Outline{\pdfextension literal direct { 1 Tr 0 w }\relax}
- \def\unset@Outline{\pdfextension literal direct { 0 Tr 0 w }\relax}
-\else
- \def\set@Outline{\pdfliteral direct { 1 Tr 0 w }\relax}
- \def\unset@Outline{\pdfliteral direct { 0 Tr 0 w }\relax}
-\fi
-
-\newcommand\EUCountry[2][]{{%
- \expandafter\setCoEkeys\expandafter{#1}%
- \CountriesofEuropeFamily\scalebox{\CoE@Scale}{%
- \ifCoE@outline\set@Outline\fi
- \csname#2\endcsname
- \ifCoE@outline\unset@Outline\fi
- }}}
-
-\if@CoE@newengine
- \RequirePackage{fontspec}
- \newfontface\CountriesofEuropeFamily{CountriesofEurope.otf}[Scale=\CountriesofEurope@scale]
- \let\CoEF\CountriesofEuropeFamily
- \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724
- \DeclareTextCommand{\Andorra}{TU}{\char"F8EB}
- \DeclareTextCommand{\Austria}{TU}{\char"F8EA}
- \DeclareTextCommand{\Belarus}{TU}{\char"F8E9}
- \DeclareTextCommand{\Belgium}{TU}{\char"F8E8}
- \DeclareTextCommand{\Bosnia}{TU}{\char"F8E7}
- \DeclareTextCommand{\Bulgaria}{TU}{\char"F8E6}
- \DeclareTextCommand{\Croatia}{TU}{\char"F8E5}
- \DeclareTextCommand{\Czechia}{TU}{\char"F8E4}
- \DeclareTextCommand{\Denmark}{TU}{\char"F8E3}
- \DeclareTextCommand{\Estonia}{TU}{\char"F8E2}
- \DeclareTextCommand{\Finland}{TU}{\char"F8E1}
- \DeclareTextCommand{\France}{TU}{\char"F8E0}
- \DeclareTextCommand{\Germany}{TU}{\char"F8DF}
- \DeclareTextCommand{\GreatBritain}{TU}{\char"F8DE}
- \DeclareTextCommand{\Greece}{TU}{\char"F8DD}
- \DeclareTextCommand{\Hungary}{TU}{\char"F8DC}
- \DeclareTextCommand{\Iceland}{TU}{\char"F8DB}
- \DeclareTextCommand{\Ireland}{TU}{\char"F8DA}
- \DeclareTextCommand{\Italy}{TU}{\char"F8D9}
- \DeclareTextCommand{\Latvia}{TU}{\char"F8D8}
- \DeclareTextCommand{\Liechtenstein}{TU}{\char"F8D7}
- \DeclareTextCommand{\Lithuania}{TU}{\char"F8D6}
- \DeclareTextCommand{\Luxembourg}{TU}{\char"F8D5}
- \DeclareTextCommand{\Macedonia}{TU}{\char"F8D4}
- \DeclareTextCommand{\Malta}{TU}{\char"F8D3}
- \DeclareTextCommand{\Moldova}{TU}{\char"F8D2}
- \DeclareTextCommand{\Montenegro}{TU}{\char"F8D1}
- \DeclareTextCommand{\Netherlands}{TU}{\char"F8D0}
- \DeclareTextCommand{\Norway}{TU}{\char"F8CF}
- \DeclareTextCommand{\Poland}{TU}{\char"F8CE}
- \DeclareTextCommand{\Portugal}{TU}{\char"F8CD}
- \DeclareTextCommand{\Romania}{TU}{\char"F8CC}
- \DeclareTextCommand{\Serbia}{TU}{\char"F8CB}
- \DeclareTextCommand{\Slovakia}{TU}{\char"F8CA}
- \DeclareTextCommand{\Slovenia}{TU}{\char"F8C9}
- \DeclareTextCommand{\Spain}{TU}{\char"F8C8}
- \DeclareTextCommand{\Sweden}{TU}{\char"F8C7}
- \DeclareTextCommand{\Switzerland}{TU}{\char"F8C6}% 63686
-\else
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
- \DeclareFontFamily{U}{CountriesofEurope}{}
- \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[\CountriesofEurope@scale]CountriesofEurope}{}
- \providecommand\CountriesofEuropeFamily{\usefont{U}{CountriesofEurope}{m}{n}}
- \DeclareTextCommand{\Albania}{U}{\char128}
- \DeclareTextCommand{\Andorra}{U}{\char129}
- \DeclareTextCommand{\Austria}{U}{\char130}
- \DeclareTextCommand{\Belarus}{U}{\char131}
- \DeclareTextCommand{\Belgium}{U}{\char132}
- \DeclareTextCommand{\Bosnia}{U}{\char133}
- \DeclareTextCommand{\Bulgaria}{U}{\char134}
- \DeclareTextCommand{\Croatia}{U}{\char135}
- \DeclareTextCommand{\Czechia}{U}{\char136}
- \DeclareTextCommand{\Denmark}{U}{\char137}
- \DeclareTextCommand{\Estonia}{U}{\char138}
- \DeclareTextCommand{\Finland}{U}{\char139}
- \DeclareTextCommand{\France}{U}{\char140}
- \DeclareTextCommand{\Germany}{U}{\char141}
- \DeclareTextCommand{\GreatBritain}{U}{\char142}
- \DeclareTextCommand{\Greece}{U}{\char143}
- \DeclareTextCommand{\Hungary}{U}{\char144}
- \DeclareTextCommand{\Iceland}{U}{\char145}
- \DeclareTextCommand{\Ireland}{U}{\char146}
- \DeclareTextCommand{\Italy}{U}{\char147}
- \DeclareTextCommand{\Latvia}{U}{\char148}
- \DeclareTextCommand{\Liechtenstein}{U}{\char149}
- \DeclareTextCommand{\Lithuania}{U}{\char150}
- \DeclareTextCommand{\Luxembourg}{U}{\char151}
- \DeclareTextCommand{\Macedonia}{U}{\char152}
- \DeclareTextCommand{\Malta}{U}{\char153}
- \DeclareTextCommand{\Moldova}{U}{\char154}
- \DeclareTextCommand{\Montenegro}{U}{\char155}
- \DeclareTextCommand{\Netherlands}{U}{\char156}
- \DeclareTextCommand{\Norway}{U}{\char157}
- \DeclareTextCommand{\Poland}{U}{\char158}
- \DeclareTextCommand{\Portugal}{U}{\char159}
- \DeclareTextCommand{\Romania}{U}{\char160}
- \DeclareTextCommand{\Serbia}{U}{\char161}
- \DeclareTextCommand{\Slovakia}{U}{\char162}
- \DeclareTextCommand{\Slovenia}{U}{\char163}
- \DeclareTextCommand{\Spain}{U}{\char164}
- \DeclareTextCommand{\Sweden}{U}{\char165}
- \DeclareTextCommand{\Switzerland}{U}{\char166}
-\fi
-% otftotfm --encoding=CountriesofEurope.enc --no-map CountriesofEurope.otf CountriesofEurope
-
-\endinput
-
-
-%80
- \Albania \Andorra \Austria \Belarus \Belgium \Bosnia \Bulgaria \Croatia
- \Czechia \Denmark \Estonia \Finland \France \Germania \GreatBritain \Greece
-%90
- \Hungary \Iceland \Ireland \Italy \Latvia \Liechtenstein \Lithuania \Luxembourg
- \Macedonia \Malta \Moldova \Montenegro \Netherlands \Norway \Poland \Portugal
-%A0
- \Romania \Serbia \Slovakia \Slovenia \Spain \Sweden \Switzerland
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/countriesofeurope/countriesofeurope.sty new/tex/latex/countriesofeurope/countriesofeurope.sty
--- old/tex/latex/countriesofeurope/countriesofeurope.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/countriesofeurope/countriesofeurope.sty 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,183 @@
+%% This is file `CountriesofEurope.sty',
+%%
+%% Copyright (C) 2016-
+%% Rolf Niepraschk, Herbert Voss
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{countriesofeurope}%
+ [2018/12/29 v0.23 countriesofeurope Font (hv,RN)]
+\PassOptionsToPackage{rgb}{xcolor}
+\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx,xcolor}
+
+\newcommand*\countriesofeurope@scale{1}
+\newcommand*\countriesofeurope@ligatures{ResetAll}
+\RequirePackage{xkeyval}
+\DeclareOptionX{Scale}{\renewcommand*\countriesofeurope@scale{#1}}
+\DeclareOptionX{Ligatures}{\renewcommand*\countriesofeurope@ligatures{#1}}
+\ProcessOptionsX\relax
+
+\newif\ifCoE@outline
+
+\def\CoE@boolkey#1#2{\csname CoE@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
+
+\define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}}
+\define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}}
+\define@key{CoE}{fillcolor}[]{\def\CoE@fillcolor{#1}}
+\define@key{CoE}{linecolor}[black]{\def\CoE@linecolor{#1}}
+%
+\def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x}
+
+\setCoEkeys{outline=false,Scale=1,fillcolor=,linecolor=black}
+
+\def\getPDFsyntax#1,#2,#3\@nil#4{\gdef#4{#1 #2 #3}}
+\def\getPDFcolor#1#2{\extractcolorspecs{#1}\Col@A\Col@B\relax
+ \expandafter\getPDFsyntax\Col@B\@nil#2\relax
+}
+
+\newif\if@CoE@newengine \@CoE@newenginefalse
+\ifxetex\@CoE@newenginetrue
+\else
+ \ifluatex\@CoE@newenginetrue\fi
+\fi
+
+\if@CoE@newengine
+ \def\set@Outline{%
+ \ifx\CoE@fillcolor\@empty
+ \pdfextension literal direct { 1 Tr 0 w }\relax
+ \else
+ \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor
+ \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor
+ \pdfextension literal direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax
+ \fi}
+ \def\unset@Outline{\pdfextension literal direct{ 0 Tr 0 w }\relax}%
+\else
+ \def\set@Outline{%
+ \ifx\relax\CoE@fillcolor\relax
+ \pdfliteral direct { 1 Tr 0 w }\relax
+ \else
+ \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor
+ \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor
+ \pdfliteral direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax
+ \fi}%
+ \def\unset@Outline{\pdfliteral direct{ 0 Tr 0 w }\relax}%
+\fi
+
+\newcommand\EUCountry[2][]{{%
+ \expandafter\setCoEkeys\expandafter{#1}%
+ \countriesofeuropefamily\scalebox{\CoE@Scale}{%
+ \ifCoE@outline\set@Outline\fi%
+ \csname#2\endcsname%
+ \ifCoE@outline\unset@Outline\fi%
+ }}}
+
+\if@CoE@newengine
+ \RequirePackage{fontspec}
+ \newfontface\countriesofeuropefamily{countriesofeurope.otf}%
+ [Scale=\countriesofeurope@scale,Ligatures=\countriesofeurope@ligatures]
+ \let\CoEF\countriesofeuropefamily
+ \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724
+ \DeclareTextCommand{\Andorra}{TU}{\char"F8EB}
+ \DeclareTextCommand{\Austria}{TU}{\char"F8EA}
+ \DeclareTextCommand{\Belarus}{TU}{\char"F8E9}
+ \DeclareTextCommand{\Belgium}{TU}{\char"F8E8}
+ \DeclareTextCommand{\Bosnia}{TU}{\char"F8E7}
+ \DeclareTextCommand{\Bulgaria}{TU}{\char"F8E6}
+ \DeclareTextCommand{\Croatia}{TU}{\char"F8E5}
+ \DeclareTextCommand{\Czechia}{TU}{\char"F8E4}
+ \DeclareTextCommand{\Denmark}{TU}{\char"F8E3}
+ \DeclareTextCommand{\Estonia}{TU}{\char"F8E2}
+ \DeclareTextCommand{\Finland}{TU}{\char"F8E1}
+ \DeclareTextCommand{\France}{TU}{\char"F8E0}
+ \DeclareTextCommand{\Germany}{TU}{\char"F8DF}
+ \DeclareTextCommand{\GreatBritain}{TU}{\char"F8DE}
+ \DeclareTextCommand{\Greece}{TU}{\char"F8DD}
+ \DeclareTextCommand{\Hungary}{TU}{\char"F8DC}
+ \DeclareTextCommand{\Iceland}{TU}{\char"F8DB}
+ \DeclareTextCommand{\Ireland}{TU}{\char"F8DA}
+ \DeclareTextCommand{\Italy}{TU}{\char"F8D9}
+ \DeclareTextCommand{\Latvia}{TU}{\char"F8D8}
+ \DeclareTextCommand{\Liechtenstein}{TU}{\char"F8D7}
+ \DeclareTextCommand{\Lithuania}{TU}{\char"F8D6}
+ \DeclareTextCommand{\Luxembourg}{TU}{\char"F8D5}
+ \DeclareTextCommand{\Macedonia}{TU}{\char"F8D4}
+ \DeclareTextCommand{\Malta}{TU}{\char"F8D3}
+ \DeclareTextCommand{\Moldova}{TU}{\char"F8D2}
+ \DeclareTextCommand{\Montenegro}{TU}{\char"F8D1}
+ \DeclareTextCommand{\Netherlands}{TU}{\char"F8D0}
+ \DeclareTextCommand{\Norway}{TU}{\char"F8CF}
+ \DeclareTextCommand{\Poland}{TU}{\char"F8CE}
+ \DeclareTextCommand{\Portugal}{TU}{\char"F8CD}
+ \DeclareTextCommand{\Romania}{TU}{\char"F8CC}
+ \DeclareTextCommand{\Serbia}{TU}{\char"F8CB}
+ \DeclareTextCommand{\Slovakia}{TU}{\char"F8CA}
+ \DeclareTextCommand{\Slovenia}{TU}{\char"F8C9}
+ \DeclareTextCommand{\Spain}{TU}{\char"F8C8}
+ \DeclareTextCommand{\Sweden}{TU}{\char"F8C7}
+ \DeclareTextCommand{\Switzerland}{TU}{\char"F8C6}% 63686
+\else
+\RequirePackage[T1]{fontenc}
+\RequirePackage{textcomp}
+ \DeclareFontFamily{U}{countriesofeurope}{}
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[\countriesofeurope@scale]countriesofeurope}{}
+ \providecommand\countriesofeuropefamily{\usefont{U}{countriesofeurope}{m}{n}}
+ \DeclareTextCommand{\Albania}{U}{\char128}
+ \DeclareTextCommand{\Andorra}{U}{\char129}
+ \DeclareTextCommand{\Austria}{U}{\char130}
+ \DeclareTextCommand{\Belarus}{U}{\char131}
+ \DeclareTextCommand{\Belgium}{U}{\char132}
+ \DeclareTextCommand{\Bosnia}{U}{\char133}
+ \DeclareTextCommand{\Bulgaria}{U}{\char134}
+ \DeclareTextCommand{\Croatia}{U}{\char135}
+ \DeclareTextCommand{\Czechia}{U}{\char136}
+ \DeclareTextCommand{\Denmark}{U}{\char137}
+ \DeclareTextCommand{\Estonia}{U}{\char138}
+ \DeclareTextCommand{\Finland}{U}{\char139}
+ \DeclareTextCommand{\France}{U}{\char140}
+ \DeclareTextCommand{\Germany}{U}{\char141}
+ \DeclareTextCommand{\GreatBritain}{U}{\char142}
+ \DeclareTextCommand{\Greece}{U}{\char143}
+ \DeclareTextCommand{\Hungary}{U}{\char144}
+ \DeclareTextCommand{\Iceland}{U}{\char145}
+ \DeclareTextCommand{\Ireland}{U}{\char146}
+ \DeclareTextCommand{\Italy}{U}{\char147}
+ \DeclareTextCommand{\Latvia}{U}{\char148}
+ \DeclareTextCommand{\Liechtenstein}{U}{\char149}
+ \DeclareTextCommand{\Lithuania}{U}{\char150}
+ \DeclareTextCommand{\Luxembourg}{U}{\char151}
+ \DeclareTextCommand{\Macedonia}{U}{\char152}
+ \DeclareTextCommand{\Malta}{U}{\char153}
+ \DeclareTextCommand{\Moldova}{U}{\char154}
+ \DeclareTextCommand{\Montenegro}{U}{\char155}
+ \DeclareTextCommand{\Netherlands}{U}{\char156}
+ \DeclareTextCommand{\Norway}{U}{\char157}
+ \DeclareTextCommand{\Poland}{U}{\char158}
+ \DeclareTextCommand{\Portugal}{U}{\char159}
+ \DeclareTextCommand{\Romania}{U}{\char160}
+ \DeclareTextCommand{\Serbia}{U}{\char161}
+ \DeclareTextCommand{\Slovakia}{U}{\char162}
+ \DeclareTextCommand{\Slovenia}{U}{\char163}
+ \DeclareTextCommand{\Spain}{U}{\char164}
+ \DeclareTextCommand{\Sweden}{U}{\char165}
+ \DeclareTextCommand{\Switzerland}{U}{\char166}
+\fi
+% otftotfm --encoding=countriesofeurope.enc --no-map countriesofeurope.otf countriesofeurope
+
+\endinput
+
+
+%80
+ \Albania \Andorra \Austria \Belarus \Belgium \Bosnia \Bulgaria \Croatia
+ \Czechia \Denmark \Estonia \Finland \France \Germania \GreatBritain \Greece
+%90
+ \Hungary \Iceland \Ireland \Italy \Latvia \Liechtenstein \Lithuania \Luxembourg
+ \Macedonia \Malta \Moldova \Montenegro \Netherlands \Norway \Poland \Portugal
+%A0
+ \Romania \Serbia \Slovakia \Slovenia \Spain \Sweden \Switzerland
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/countriesofeurope.tlpobj new/tlpkg/tlpobj/countriesofeurope.tlpobj
--- old/tlpkg/tlpobj/countriesofeurope.tlpobj 2019-02-28 03:30:12.000000000 +0100
+++ new/tlpkg/tlpobj/countriesofeurope.tlpobj 2020-03-24 01:57:10.000000000 +0100
@@ -1,6 +1,6 @@
name countriesofeurope
category Package
-revision 49525
+revision 54512
shortdesc A font with the images of the countries of Europe
relocated 1
longdesc The bundle provides a font "CountriesOfEurope" (in Adobe Type 1
@@ -8,17 +8,16 @@
longdesc for its use. The font provides glyphs with a filled outline of
longdesc the shape of each country; each glyph is at the same
longdesc cartographic scale.
-execute addMap CountriesofEurope.map
+execute addMap countriesofeurope.map
runfiles size=72
- RELOC/fonts/afm/public/countriesofeurope/CountriesofEurope.afm
- RELOC/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc
- RELOC/fonts/map/dvips/countriesofeurope/CountriesofEurope.map
- RELOC/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf
- RELOC/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm
- RELOC/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb
- RELOC/tex/latex/countriesofeurope/CountriesofEurope.sty
+ RELOC/fonts/afm/public/countriesofeurope/countriesofeurope.afm
+ RELOC/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc
+ RELOC/fonts/map/dvips/countriesofeurope/countriesofeurope.map
+ RELOC/fonts/opentype/public/countriesofeurope/countriesofeurope.otf
+ RELOC/fonts/tfm/public/countriesofeurope/countriesofeurope.tfm
+ RELOC/fonts/type1/public/countriesofeurope/countriesofeurope.pfb
+ RELOC/tex/latex/countriesofeurope/countriesofeurope.sty
catalogue-ctan /fonts/countriesofeurope
-catalogue-date 2018-12-28 07:23:42 +0100
-catalogue-license lppl
+catalogue-license ofl lppl
catalogue-topics font font-type1 font-novelty
-catalogue-version 0.22
+catalogue-version 0.23
++++++ covington.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/README new/doc/latex/covington/README
--- old/doc/latex/covington/README 2018-12-10 23:57:48.000000000 +0100
+++ new/doc/latex/covington/README 2020-01-02 23:11:37.000000000 +0100
@@ -3,7 +3,7 @@
LaTeX macros for Linguistics
-Copyright 1991--2018 Michael A. Covington
+Copyright 1991--2020 Michael A. Covington
Robin Fairbairns
Juergen Spitzmueller
@@ -31,6 +31,27 @@
== CHANGES ==
+* Version 2.4 (2020-01-02):
+ - Fix definition of covexercise if no subsection counter exists.
+
+* Version 2.3 (2019-06-21):
+ - Add preamble option to subexamples environment.
+ - Allow to use covington together with the drs package.
+ - Documentation fixes and restructuring.
+
+* Version 2.2 (2019-06-04):
+ - Add new option owncounter that makes covington use an own counter for examples
+ (rather than the equation counter).
+ - Add starred \exampleno* command that outputs the current example number value
+ without stepping it.
+ - Add macros \covexamplefs and \covexamplenofs for global setting of example text
+ markup.
+
+* Version 2.1 (2019-05-12):
+ - Add new option noglossbreaks that tries to prevent page breaks within glosses.
+ - Add \glosspreamble command and preamble gloss macro option for arbitrary text
+ preceding glosses.
+
* Version 2.0 (2018-12-10):
- Add new gloss macros (\digloss and \trigloss) for a more convenient,
flexible and robust gloss insertion.
Binary files old/doc/latex/covington/covington.pdf and new/doc/latex/covington/covington.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/covington.tex new/doc/latex/covington/covington.tex
--- old/doc/latex/covington/covington.tex 2018-12-10 23:57:48.000000000 +0100
+++ new/doc/latex/covington/covington.tex 2020-01-02 23:11:37.000000000 +0100
@@ -94,8 +94,8 @@
%
% Titling
%
-\def\pversion{Version 2.0}
-\def\pdate{December 10, 2018}
+\def\pversion{Version 2.4}
+\def\pdate{January 2, 2020}
\title{\textbf{The \cvt\ Package\\Macros for Linguistics}}
\author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -118,7 +118,7 @@
\clearpage
-\section{Introduction}
+\section{Introduction}\label{sec:intro}
This is the documentation for \MakeLowercase{\pversion}
of \cvt\ (\pdate), which is a \LaTeX\ package providing macros
@@ -138,23 +138,40 @@
This applies to the \jenv{example}, \jenv{examples}, \jenv{subexamples} and \jenv{exercise} environments,
which are by default not touched if they are already defined before \cvt\ is loaded.
See sec.~\ref{sec:ex}, \ref{sec:exs}, \ref{sec:subexs} and \ref{sec:exercises} for details.
+
\item{\joption{keeplayout}:} Do not tweak the layout.
\Cvt\ sets \jfcsmacro{raggedbottom} and redefines the value of the \jfcsmacro{textfloatsep} length.
This just follows the preferences of the original package author and is not necessary
for the package's functionality. Yet for backwards compatibility reasons, we cannot change this.
Thus, we provide the option described here to opt out this presetting.
+
+\item{\joption{noglossbreaks}:} If this option is set, \cvt\ will try hard to prevent page breaks within glosses.
+
+ If this option is not set, page breaks can occur between interlinearized text and free translation of a gloss, as
+ well as between gloss preamble and interlinearized text, which is usually not what you will want.
+ Nonetheless the option is not set by default. This is for backwards compatibility reasons (in order to not change
+ page breaking of existing documents). Note that page breaks might still occur in some cases even if the option is set.
+ In order to prevent them definitely, you can put the gloss in a parbox or minipage.
+
+\item{\joption{owncounter}:} Use an own counter for numbered examples.
+
+ By default, \cvt\ uses \LaTeX's equation counter for example numbering, so that if you use equations and numbered examples
+ in the same paper, you get a single continuous series of numbers. While some people (including the original author of this package)
+ consider this a feature, others might prefer to number equations and linguistic examples separately. If you count to the latter sort,
+ use this option.
\end{description}
%
+Please note the following package-related caveats:
+\begin{itemize}
+ \item If you are using \cvt\ and the \textsf{uga} (University of Georgia thesis style) package together, you should load \textsf{uga} before \cvt.
+ \item If you are using \cvt\ with \textsf{beamer-article}, you should load \textsf{beamer-article} before \cvt.
+ \item If you are using \cvt\ with the \textsf{drs} package, you should load \textsf{drs} before \cvt. See sec.~\ref{sec:drs}.
+\end{itemize}
+%
In what follows we presume that you know how to use \LaTeX\ and have
-access to \LaTeX\ manuals. Note that \cvt\ does not
-provide any special fonts or character sets. However, it can be used in
-combination with other style sheets that do.
-
-If you are using \cvt\ and \texttt{uga.sty} (UGa thesis style)
-together, you should load \texttt{uga} before \cvt.
+access to \LaTeX\ manuals.
-
\section{Stacked diacritics}\label{sec:accents}
\LaTeX\ provides a generous range of diacritics that can be placed on or below any
@@ -224,15 +241,13 @@
\begin{flushleft}
This is a sentence. \hfill (\exampleno)
\end{flushleft}
-The example counter is actually the same as \LaTeX's equation counter,
-so that if you use equations and numbered examples in the same
-paper, you get a single continuous series of numbers. If you want to
-output the number without stepping it, use \jfcsmacro{theequation}.
+If you want to output the (current) number without stepping it, the starred form \jcsmacro{exampleno*} will do that.
Normally, however, you do not need to manually place \jcsmacro{exampleno} yourselves,
as in the example above. For the common case where example numbers in parentheses are
placed left to the example, \cvt\ provides more convenient solutions. These are described in turn.
+
\subsection[The \texttt{example} environment]{The \jenv{example} environment}\label{sec:ex}
The \jenv{example} environment (alias \jenv{covexample}) displays a single example
@@ -283,7 +298,7 @@
\item[(b)] This is the second sentence.
\end{itemize}
\end{example}
-However, the \jenv{examples} and \jenv{subexamples} environments, described in turn, are usually more
+However, the \jenv{subexamples} environment, described in sec.~\ref{sec:subexs}, is usually more
convenient for this task.
\subsection[The \texttt{examples} environment]{The \jenv{examples} environment}\label{sec:exs}
@@ -341,26 +356,41 @@
\item This is the first sentence.\label{sbex}
\item This is the second sentence.
\end{subexamples}
+%
Again, \cvt\ checks if there is already an \jenv{subexamples} environment defined,
and if this is the case, \cvt\ does not define its own one. The alias environment \jenv{covsubexamples}
is always available as a fallback. If you use the package option \joption{force}, \cvt\ will override
existing \jenv{subexamples} environments. The package will issue a warning if \jenv{subexamples} is already defined.
-
-\subsection{Customizing the numbering}\label{sec:custno}
-
-You can change the display of the example number by redefining (via \jfcsmacro{renewcommand*}) the macro
-\jcsmacro{covexnumber} which has the following default definition:
-\begin{lstlisting}[moretexcs={covexnumber}]
-\newcommand*\covexnumber[1]{(#1)}
+\medskip
+\noindent The \jenv{subexamples} environment provides the following option:
+\begin{description}
+ \item[\joption{preamble=\{\jparam{arbitrary text}\}}] Arbitrary text that is inserted in the first line
+ (after the main number and before the first sub-example, which then follows in a new line).
+ This might be useful, for instance, to give context information, to specify the language or the source
+ in case of cited sub-examples. You can globally set the markup of this preamble text (see sec.~\ref{sec:custno}).
+\end{description}
+%
+For instance,
+\begin{lstlisting}
+\begin{subexamples}[preamble={Here are two sentences}]
+\item This is the first sentence.
+\item This is the second sentence.
+\end{subexamples}
\end{lstlisting}
-
-In the same vein, you can customize the display of the subexample letter by redefining (also via \jfcsmacro{renewcommand*})
-the macro \jcsmacro{covsubexnumber} which has the following default definition:
-\begin{lstlisting}[moretexcs={covsubexnumber}]
-\newcommand*\covsubexnumber[1]{(#1)}
+or, respectively:
+\begin{lstlisting}
+\begin{covsubexamples}[preamble={Here are two sentences}]
+\item This is the first sentence.
+\item This is the second sentence.
+\end{covsubexamples}
\end{lstlisting}
-
+prints as:
+\begin{subexamples}[preamble={Here are two sentences}]
+ \item This is the first sentence.
+ \item This is the second sentence.
+\end{subexamples}
+%
The distance between example number and subnumber (letter) can be changed via the length \jcsmacro{examplenumbersep}
(which is preset to \texttt{0pt}). The distance between example subnumber and text can be changed via the length
\jcsmacro{subexamplenumbersep} (preset to \texttt{0pt} as well). In both cases, a positive value will increase, a negative
@@ -383,6 +413,44 @@
\egroup
+\subsection{Customizing number display and example markup}\label{sec:custno}
+
+You can change the display of the example number by redefining (via \jfcsmacro{renewcommand*}) the macro
+\jcsmacro{covexnumber}, which has the following default definition:
+\begin{lstlisting}[moretexcs={covexnumber}]
+\newcommand*\covexnumber[1]{(#1)}
+\end{lstlisting}
+%
+with the variable \texttt{\#1} representing the number.
+
+In the same vein, you can customize the display of the subexample letter by redefining
+the macro \jcsmacro{covsubexnumber}, which has the following default definition:
+\begin{lstlisting}[moretexcs={covsubexnumber}]
+\newcommand*\covsubexnumber[1]{(#1)}
+\end{lstlisting}
+%
+To remove the parentheses from the subexample letter, for instance, to this:
+\begin{lstlisting}[moretexcs={covsubexnumber}]
+\renewcommand*\covsubexnumber[1]{#1}
+\end{lstlisting}
+%
+\noindent You can also customize the markup of the example sentences by redefining the macro
+\jcsmacro{covexamplefs} (which is empty by default). To have all example sentences italicized, for instance, do:
+\begin{lstlisting}[moretexcs={covexamplefs}]
+\renewcommand*{\covexamplefs}{\itshape}
+\end{lstlisting}
+%
+Note that this does, deliberately, not include the numbers, since those are controlled by another font setting macro,
+\jcsmacro{covexamplenofs}, which defaults to \jfcsmacro{normalfont}. Of course you are free to redefine this as well,
+if you wish do to so.
+
+Finally, you can customize the markup of the sub-example preamble text by redefining the macro
+\jcsmacro{subexpreamblefs}, which also defaults to \jfcsmacro{normalfont}. To have it italicized, analogously do:
+\begin{lstlisting}[moretexcs={\subexpreamblefs}]
+\renewcommand*{\subexpreamblefs}{\itshape}
+\end{lstlisting}
+
+
\subsection{Referring to examples}\label{sec:ref}
References to examples and sub-examples can be made the usual way via the \jcsmacro{ref} command
@@ -442,10 +510,35 @@
quotation marks (using the language-sensitive \textsf{csquotes} \cite{csquotes} macros if
this package is loaded). This can be customized, though, via the macro options or globally
(for the latter, see sec.~\ref{sec:glossfc}).
+ \item By default, page breaks might occur within glosses. In order to prevent it, the option
+ \joption{noglossbreaks} (see sec.~\ref{sec:intro}) will help in many cases.
+ If it doesn't, you can wrap the whole gloss into a minipage or parbox.
+ \item The words do not have to be typed lining up; \TeX\ counts and aligns them.
+ \item On the other hand, multiple blanks are ignored, so you can, but do not need to,
+ use the space key to line up the words to your liking in the \TeX\ file.
+ The example above could thus also have been input like this, with no change to the output:
+\begin{lstlisting}[moretexcs={digloss}]
+\digloss{Dit is een Nederlands voorbeeld}
+ {This is a Dutch example}
+ {This is an example in Dutch.}
+\end{lstlisting}
+ \item If the words in the two languages do not correspond one-to-one, you can use curly brackets
+ to group words and a pair of empty curly brackets to mark null forms.
+ For example, to print
+ \digloss{Dit is een voorbeeldje in het Nederlands}
+ {This is a {little example} in {} Dutch}
+ {This is a little example in Dutch.}
+ you would type:
+\begin{lstlisting}[moretexcs={digloss}]
+\digloss{Dit is een voorbeeldje in het Nederlands}
+ {This is a {little example} in {} Dutch}
+ {This is a little example in Dutch.}
+\end{lstlisting}
\end{itemize}
\medskip
-\noindent The following \joption{\jparam{options}} (key-value pairs) are provided for either macro:
+\noindent The following \joption{\jparam{options}} (key-value pairs) are provided for the two gloss macro:%
+\footnote{Please consult sec.~\ref{sec:glossex} below for examples that showcase these options.}
\begin{description}
\item[\joption{ex=\jparam{true|false}}] Default: \emph{false}. Wraps the gloss in an example environment
@@ -456,14 +549,22 @@
first line of the gloss. This can be useful when no translation, but an aligned number or something similar,
is to be inserted right to the gloss (please refer to sec.~\ref{sec:glossex} for an example).
\item[\joption{fsi=\{\jparam{font settings}\}}] Adjusts the font settings of the first gloss line.
- Valid values are \LaTeX\ font switches such as \jfcsmacro{textit}, \jfcsmacro{bfseries} etc.
+ Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
\item[\joption{fsii=\{\jparam{font settings}\}}] Adjusts the font settings of the second gloss line.
- Valid values are \LaTeX\ font switches such as \jfcsmacro{textit}, \jfcsmacro{bfseries} etc.
+ Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
\item[\joption{fsiii=\{\jparam{font settings}\}}] Adjusts the font settings of the third gloss line.
- Valid values are \LaTeX\ font switches such as \jfcsmacro{textit}, \jfcsmacro{bfseries} etc.
+ Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
+ \item[\joption{preamble=\{\jparam{arbitrary text}\}}] Arbitrary text that is inserted on an own line
+ before the interlinearized gloss. This might be useful, for instance, to give context information,
+ to specify the language or the source in case of cited glosses.
+
+ The advantages over just adding a line manually above the gloss are that you can globally set the
+ markup (see sec.~\ref{sec:glossfc}), and that such lines are kept on the same page than the gloss
+ with the option \joption{noglossbreaks} (at least as long as preamble does not exceed one line).
+ Furthermore, this option is the only way to add such text when the \joption{ex} option is used.
\end{description}
%
-If given as the argument to a \jcsmacro{digloss} or \jcsmacro{trigloss} macro, the options will only apply to
+If given as optional arguments to a \jcsmacro{digloss} or \jcsmacro{trigloss} macro, the options will only apply to
this very gloss. If you want to make a permanent change, you can use the macro
\begin{itemize}
\item \jcsmacro{setglossoptions\{\jparam{options}\}}
@@ -471,22 +572,6 @@
and pass either of the above options to it. This will apply to all subsequent glosses (until further global
change and unless the setting is altered locally via macro option).
-Notice, finally, that the words do not have to be typed lining up; instead, \TeX\
-counts them. If the words in the two languages do not correspond
-one-to-one, you can use curly brackets to group words.
-For example, to print
-\digloss{Dit is een voorbeeldje in het Nederlands}
- {This is a {little example} in {} Dutch}
- {This is a little example in Dutch.}
-you would type:
-\begin{lstlisting}[moretexcs={digloss}]
-\digloss{Dit is een voorbeeldje in het Nederlands}
- {This is a {little example} in {} Dutch}
- {This is a little example in Dutch.}
-\end{lstlisting}
-%
-Please consult sec.~\ref{sec:glossex} below for more examples.
-
\subsection{Glossing with low-level commands}\label{sec:glosscmds}
The gloss macros described above build on low-level commands\footnote{The commands are adapted
@@ -527,10 +612,18 @@
and a smarter way to insert a translation line. Other than \jcsmacro{glt}, it marks up
(by default: enquotes) the translation line. Also, it does not add an empty line if the
translation is empty. This command has been introduced in \cvt\ 2.0.
+ \item[\jcsmacro{glosspreamble\{\jparam{arbitrary text}\}}] lets you enter text that is printed immediately
+ before the interlinearized gloss (on a line of its own). This might be useful, for instance,
+ to give context information, to specify the language or the source in case of cited glosses.
+ The advantages over just adding a line manually above the gloss are that you can globally set the markup
+ (see sec.~\ref{sec:glossfc}) and that such lines are kept on the same page than the gloss with the option
+ \joption{noglossbreaks}. Note, however, that page breaks might occur if this text spans multiple lines.
+ In this case, you can wrap the whole gloss into a minipage.
+ This command has been introduced in \cvt\ 2.1.
\item[\jcsmacro{glend}] ends the special \jfenv{flushleft}-like environment.
\end{description}
%
-Using the low-level commands, the examples given above would be
+Using the low-level commands, the examples given in the previous section would be
coded as follows:
\begin{lstlisting}[moretexcs={gll,glt,glend}]
\gll Dit is een Nederlands voorbeeld.
@@ -605,10 +698,16 @@
If not, a fallback quotation (using English single quotation marks) is used. The usage of
\textsf{csquotes} is highly recommended!
+The markup of the preamble line (which is not marked up at all by default) can be customized
+by redefining the macro:
+\begin{lstlisting}[moretexcs={glosslinetrans,covenquote}]
+\newcommand*\glosslinepreamble[1]{#1}
+\end{lstlisting}
+
\subsection{Examples}\label{sec:glossex}
-This section gives some further examples. First, a sentence with three lines aligned,
+This section gives some further examples. First, a sentence with three lines aligned,
instead of just two:
\trigloss[fsii={\normalfont\scshape}]
{Hoc est aliud exemplum}
@@ -638,7 +737,8 @@
{This has number}
{\hfill (\exampleno)}
\end{lstlisting}
-Finally we'll put a glossed sentence inside the \texttt{example}
+%
+Third, we'll put a glossed sentence inside the \texttt{example}
environment, which is a very common way of using it:
\digloss[ex]{Hoc habet numerum praepositum}
{This has number preposed}
@@ -657,6 +757,25 @@
{This one has a number in front of it.}
\end{example}
\end{lstlisting}
+%
+And finally, an example that uses the \emph{Leipzig glossing rules} (\cite{leipzig},
+cited example: p.~2) and also exemplifies the use of \joption{preamble}:
+\digloss[ex, preamble={Lezgian (Haspelmath 1993:207)}]
+ {Gila abur-u-n ferma hami�alu\v{g} g�\v{g}�na amuq'-da-\v{c}.}
+ {now they-\textsc{obl-gen} farm forever behind stay-\textsc{fut-neg}}
+ {Now their farm will not stay behind forever.}
+This has been input as follows:
+\begin{lstlisting}[moretexcs={digloss},basicstyle={\footnotesize\ttfamily}]
+\digloss[ex,preamble={Lezgian (Haspelmath 1993:207)}]
+ {Gila abur-u-n ferma hami�alu\v{g} g�\v{g}�na amuq'-da-\v{c}.}
+ {now they-\textsc{obl-gen} farm forever behind stay-\textsc{fut-neg}}
+ {Now their farm will not stay behind forever.}
+\end{lstlisting}
+%
+Of course, you would use \jfcsmacro{cite} in a real document for the citation.
+Also, if you adhere to the \emph{Leipzig glossing rules}, you might want to check out the \textsf{leipzig}
+\LaTeX\ package \cite{leipzig-ltx} that facilitates the use of the gloss abbreviations that have
+been entered and marked-up manually here.
\section{Phrase structure rules}
@@ -676,7 +795,7 @@
\fs{case:nom \\ person:P}
\end{lstlisting}
-The feature structure can appear anywhere --- in continuous text, in a
+The feature structure can appear anywhere -- in continuous text, in a
displayed environment such as \jfenv{flushleft}, or inside a
phrase-structure rule, or even inside another feature structure.
@@ -702,84 +821,122 @@
\end{lstlisting}
-\section{Discourse Representation Structures}
+\section{Discourse Representation Structures}\label{sec:drs}
-Several macros in \cvt\ facilitate display of discourse
-Representation Structures (\textsc{drs}es) in the box notation introduced by
-Hans Kamp. The simplest one is \jcsmacro{drs}, which takes two arguments:
+Several macros in \cvt\ facilitate display of \emph{Discourse Representation Structures}
+(\textsc{drs}es) in the box notation introduced by Hans Kamp \cite{kamp}.
+The simplest one is \jcsmacro{drs}, which takes two arguments:
a list of discourse variables joined by \verb"~", and a list of \textsc{drs}
-conditions separated by \verb"\\". Nesting is permitted. Note that the
-\jcsmacro{drs} macro itself does not give you a displayed environment; you
+conditions separated by \verb"\\". Nesting is permitted.
+
+Note that the \jcsmacro{drs} macro itself does not give you a displayed environment; you
must use \jfenv{flushleft} or the like to display the \textsc{drs}.
-Here are some examples:
-\begin{minipage}{.5\textwidth}
+\medskip
+\noindent Here are some examples:
+
\begin{lstlisting}[moretexcs={drs}]
\begin{flushleft}
- \drs{X}{donkey(X)\\green(X)}
+ \drs{X}
+ {
+ donkey(X)\\
+ green(X)
+ }
\end{flushleft}
\end{lstlisting}
-\end{minipage}\hfill
-\begin{minipage}{.4\textwidth}
+%
+prints as:
\begin{flushleft}
-\drs{X}{donkey(X)\\green(X)}
+\drs{X}
+ {
+ donkey(X)\\
+ green(X)
+ }
\end{flushleft}
-\end{minipage}
\medskip
-\begin{minipage}{.5\textwidth}
\begin{lstlisting}[moretexcs={drs}]
\begin{flushleft}
\drs{X}
- {named(X,`Pedro') \\
- \drs{Y}{donkey(Y)\\owns(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{feeds(X,Y)}
- }
-\end{flushleft}
-\end{lstlisting}
-\end{minipage}\hfill
-\begin{minipage}{.4\textwidth}
- \begin{flushleft}
- \drs{X}
- {named(X,`Pedro') \\
- \drs{Y}{donkey(Y)\\owns(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{feeds(X,Y)}
- }
- \end{flushleft}
-\end{minipage}
+ {
+ named(X,`Pedro')\\
+ \drs{Y}
+ {
+ donkey(Y)\\
+ owns(X,Y)
+ }
+ ~~{\large $\Rightarrow$}~
+ \drs{~}
+ {feeds(X,Y)}
+ }
+\end{flushleft}
+\end{lstlisting}
+%
+comes out as:
+\begin{flushleft}
+ \drs{X}
+ {
+ named(X,`Pedro')\\
+ \drs{Y}
+ {
+ donkey(Y)\\
+ owns(X,Y)
+ }
+ ~~{\large $\Rightarrow$}~
+ \drs{~}
+ {feeds(X,Y)}
+ }
+\end{flushleft}
+%
+Note that the alignment of the input is fairly free, so you can also write the
+two arguments of \jcsmacro{drs} in one line, like:
+\begin{lstlisting}[moretexcs={drs}]
+\drs{X}{donkey(X)\\green(X)}
+\end{lstlisting}
\medskip
-
-\noindent To display a sentence above the \textsc{drs}, use \jcsmacro{sdrs}, as in:
-
+\noindent To display a sentence above the \textsc{drs}, use \jcsmacro{sdrs}, which has one
+extra argument for this purpose, as in:
\begin{lstlisting}[moretexcs={sdrs}]
\begin{flushleft}
- \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
+ \sdrs{A donkey is green.}
+ {X}
+ {donkey(X)\\green(X)}
\end{flushleft}
\end{lstlisting}
which prints as:
-
+%
\begin{flushleft}
- \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
+ \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
\end{flushleft}
-
+%
Some \textsc{drs} connectives are also provided (normally for forming
\textsc{drs}es that are to be nested within other \textsc{drs}es).
-The macro \jcsmacro{negdrs} forms a \textsc{drs} preceded by a negation symbol:
+The macro \jcsmacro{negdrs} forms a \textsc{drs} preceded by a negation symbol, so
\begin{lstlisting}[moretexcs={negdrs}]
-\negdrs{X}{donkey(X)\\green(X)}
+\negdrs{X}
+ {
+ donkey(X)\\
+ green(X)
+ }
\end{lstlisting}
+%
+comes out as
+%
\begin{flushleft}
\negdrs{X}{donkey(X)\\green(X)}
\end{flushleft}
Finally, \jcsmacro{ifdrs} forms a pair of \textsc{drs}es joined by a big arrow,
like this:
\begin{lstlisting}[moretexcs={ifdrs}]
-\ifdrs{X}{donkey(X)\\hungry(X)}
- {~}{feeds(Pedro,X)}
+\ifdrs{X}
+ {
+ donkey(X)\\
+ hungry(X)
+ }
+ {~}
+ {feeds(Pedro,X)}
\end{lstlisting}
\begin{flushleft}
\ifdrs{X}{donkey(X)\\hungry(X)}
@@ -787,7 +944,24 @@
\end{flushleft}
If you have an ``if''-structure appearing among ordinary predicates
inside a \textsc{drs}, you may prefer to use \jcsmacro{alifdrs}, which is just like
-\jcsmacro{ifdrs} but shifted slightly to the left for better alignment.
+\jcsmacro{ifdrs} but shifted slightly to the left for better alignment:
+\begin{flushleft}
+\alifdrs{X}{donkey(X)\\hungry(X)}
+ {~}{feeds(Pedro,X)}
+\end{flushleft}
+
+\medskip
+\noindent Note that for more extended \textsc{drs} representations, dedicated packages are meanwhile available,
+most notably the \textsf{drs} \cite{drs} and the \textsf{sdrt} \cite{sdrt} package.
+Both packages actually draw on \cvt, add some additional features and, in some cases, tweak the layout to
+(what strikes those package authors) the better. If the rather basic \textsc{drs} macros provided by \cvt\
+do not suit you, please check if one of those packages does.
+
+Note, though, that while \textsf{sdrt} introduces new (capitalized) macro naming which lets the package peacefully
+coexist with \cvt, \textsf{drs} simply re-uses \cvt's macro names, which makes the two packages incompatible.
+In order to fix this, \cvt\ checks whether the \textsc{drs} macros are already defined when it is loaded; if so, it does not define its own ones.
+So if you want to use the \textsc{drs} macros of the \textsf{drs} package together with \cvt's non-\textsc{drs} features, you can do so,
+provided that \textsf{drs} is loaded \emph{before} \cvt. In that case, \cvt's own \textsc{drs} macros are disabled.
\section{Exercises}\label{sec:exercises}
@@ -912,7 +1086,7 @@
\begin{flushleft}
\lstinline[moretexcs={either,psr}]"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E}
\end{flushleft}
-
+%
That's all there is for now.
Suggestions for improving \cvt\ are welcome, and bug
reports are actively solicited (via \url{https://github.com/jspitz/covington}). Please note, however, that this is free
@@ -921,6 +1095,37 @@
\section{Release history}
+\subsection*{2.4 (2020 January 2)}
+
+\begin{itemize}
+ \item Fix definition of covexercise theorem when no subsection counter is defined.
+\end{itemize}
+
+\subsection*{2.3 (2019 June 21)}
+
+\begin{itemize}
+ \item Add preamble option to subexamples environment. See sec.~\ref{sec:subexs}.
+ \item Allow to use \cvt\ together with the \textsf{drs} package.
+ \item Documentation fixes and restructuring.
+\end{itemize}
+
+\subsection*{2.2 (2019 June 4)}
+
+\begin{itemize}
+ \item Add new option \joption{owncounter} that makes \cvt\ use an own counter for examples (rather than the equation counter).
+ \item Add starred \jcsmacro{exampleno*} command that outputs the current example number value without stepping it.
+ See sec.~\ref{sec:exno}.
+ \item Add macros \jcsmacro{covexamplefs} and \jcsmacro{covexamplenofs} for global setting of example text markup.
+ See sec.~\ref{sec:custno}.
+\end{itemize}
+
+\subsection*{2.1 (2019 May 12)}
+
+\begin{itemize}
+ \item Add new option \joption{noglossbreaks} that tries to prevent page breaks within glosses.
+ \item Add \jcsmacro{glosspreamble} command and \joption{preamble} gloss macro option for arbitrary text preceding glosses.
+\end{itemize}
+
\subsection*{2.0 (2018 December 10)}
\begin{itemize}
@@ -1044,11 +1249,25 @@
\end{itemize}
\begin{thebibliography}{99}
+ \bibitem{leipzig} Bickel, Balthasar, Bernard Comrie, and Martin Haspelmath:
+ \emph{The Leipzig glossing rules: Conventions for interlinear morpheme
+ by morpheme glosses}. Revised version of February 2008. Department
+ of Linguistics, Max Plank Institute for Evolutionary Anthropology.
+ \url{http://www.eva.mpg.de/lingua/resources/glossing-rules.php}.
+ \bibitem{drs} Dimitriadis, Alexis: \emph{drs -- Typeset Discourse Representation Structures (DRS)}.
+ June 10, 2010. \url{https://ctan.org/pkg/drs}.
+ \bibitem{sdrt} Isambert, Paul: \emph{sdrt -- Macros for Segmented Discourse Representation Theory}.
+ May 13, 2007. \url{https://ctan.org/pkg/sdrt}.
+ \bibitem{kamp} Kamp, Hans: A Theory of Truth and Semantic Representation.
+ In Jeroen A.\,G. Groenendijk, Theo M.\,V. Janssen, and Martin J.\,B. Stokhof (eds.):
+ Formal Methods in the Study of Language. Amsterdam: Mathematics Center, 1981, 277--322.
\bibitem{csquotes} Lehman, Philipp and Joseph Wright:
- \emph{csquotes -- Context sensitive quotation facilities}. April 4, 2018.
- \url{http://www.ctan.org/pkg/csquotes}.
+ \emph{csquotes: Context sensitive quotation facilities}. April 4, 2018.
+ \url{https://www.ctan.org/pkg/csquotes}.
\bibitem{pakin} Pakin, Scott: The Comprehensive \LaTeX\ Symbol List.
- November 30, 2015. \url{http://www.ctan.org/pkg/comprehensive}.
+ November 30, 2015. \url{https://www.ctan.org/pkg/comprehensive}.
+ \bibitem{leipzig-ltx} Weber, Nathalie: \emph{leipzig: Typeset and index linguistic
+ gloss abbreviations}. June 16, 2017. \url{https://ctan.org/pkg/leipzig}.
\end{thebibliography}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/covington.doc.tlpobj new/tlpkg/tlpobj/covington.doc.tlpobj
--- old/tlpkg/tlpobj/covington.doc.tlpobj 2019-02-28 03:30:14.000000000 +0100
+++ new/tlpkg/tlpobj/covington.doc.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,9 +1,9 @@
name covington.doc
category Package
-revision 49376
+revision 53303
shortdesc doc files of covington
relocated 1
-docfiles size=146
+docfiles size=133
RELOC/doc/latex/covington/README
RELOC/doc/latex/covington/covington.pdf
RELOC/doc/latex/covington/covington.tex
++++++ covington.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/covington/covington.sty new/tex/latex/covington/covington.sty
--- old/tex/latex/covington/covington.sty 2018-12-10 23:57:48.000000000 +0100
+++ new/tex/latex/covington/covington.sty 2020-01-02 23:11:37.000000000 +0100
@@ -42,14 +42,18 @@
%%% Metadata
%%%
-\def\filedate{2018/12/10}
-\def\fileversion{2.0}
+\def\filedate{2020/01/02}
+\def\fileversion{2.4}
\def\filename{covington.sty}
% Force redefinition of environments?
\newif\ifforceredef\forceredeffalse
% Tweak text layout?
\newif\iftweaklayout\tweaklayouttrue
+% Prevent page breaks in glosses
+\newif\ifnoglossbreaks\noglossbreaksfalse
+% Use own example counter
+\newif\ifownexcounter\ownexcounterfalse
\@ifundefined{ProvidesPackage}{%
\typeout{* covington.sty : Covington's linguistic macros, \fileversion\ \filedate *}
@@ -58,6 +62,8 @@
[\filedate\space v\fileversion\space Covington's linguistic macros]
\DeclareOption{force}{\forceredeftrue}
\DeclareOption{keeplayout}{\tweaklayoutfalse}
+\DeclareOption{noglossbreaks}{\noglossbreakstrue}
+\DeclareOption{owncounter}{\ownexcountertrue}
\ProcessOptions
}
@@ -126,9 +132,12 @@
%%% Example numbering
%%%
-% Example numbering uses the same counter as LaTeX's equation numbering.
+% Example numbering uses the same counter as LaTeX's equation numbering
+% by default.
% Thus, you can use \label and \ref to refer to numbered examples in
% exactly the same way as with equations.
+% As of v. 2.2, it is also possible to use an own counter and thus separate
+% equations from linguistic examples.
% \exampleno increments the counter and gives you its current value.
% You can use it anywhere to generate an example number.
@@ -140,12 +149,23 @@
% This is a sentence. \hfill (\exampleno)
% \end{flushleft}
-\newcommand{\exampleno}{\refstepcounter{equation}\theequation}
+\ifownexcounter
+ \newcounter{covex}
+ \newcommand{\@exampleno}{\refstepcounter{covex}\thecovex}
+\else
+ \newcommand{\@exampleno}{\refstepcounter{equation}\theequation}
+\fi
+\newcommand*\@@exampleno{\ifownexcounter\thecovex\else\theequation\fi}
+\newcommand*\exampleno{\@ifstar{\@@exampleno}{\@exampleno}}
%%%
%%% The 'example' environment
%%%
+% Font setting possibility for example sentences
+\newcommand*\covexamplefs{}
+\newcommand*\covexamplenofs{\normalfont}
+
% example is an environment for displaying a single numbered
% example, preceded by its number. Example of use:
%
@@ -212,7 +232,7 @@
%
% New in 1.8 (2018-12-07): Allow to redefine label (\covexnumber)
-\newcounter{equationsave} % used in trick with equation number
+\newcounter{covexsave} % used in trick with example number
\newlength\examplenumbersep
\setlength\examplenumbersep{0pt}
@@ -221,17 +241,23 @@
\newenvironment{covexamples}% % define "example" environment
{%
-\begin{list}{\covexnumber{\theequation}}%
+\begin{list}{\covexamplenofs\covexnumber{\@@exampleno}}%
{%
\addtolength{\labelwidth}{\examplenumbersep}%
\addtolength{\leftmargin}{\examplenumbersep}%
-\setcounter{equationsave}{\arabic{equation}}%
-\usecounter{equation}% % sets it to zero, unwantedly
-\setcounter{equation}{\arabic{equationsave}}% % restores previous value
+\ifownexcounter
+ \setcounter{covexsave}{\arabic{covex}}%
+ \usecounter{covex}% % sets it to zero, unwantedly
+ \setcounter{covex}{\arabic{covexsave}}% % restores previous value
+\else
+ \setcounter{covexsave}{\arabic{equation}}%
+ \usecounter{equation}% % sets it to zero, unwantedly
+ \setcounter{equation}{\arabic{covexsave}}% % restores previous value
+\fi
\setlength{\listparindent}{0pt}%
\def\makelabel##1{##1\hfil}% % put labels flushleft in space available
}%
-\raggedright}% % text is flushleft, not justified
+\raggedright\covexamplefs}% % text is flushleft, not justified
{\end{list}}
\@ifundefined{examples}{%
@@ -268,27 +294,34 @@
\newcommand*\covsubexnumber[1]{(#1)}
-\newenvironment{covsubexamples}% % define "subexamples" environment
+% 2019-06-21 (v. 2.3): optional preceding subexample text
+\define@key{cov@subex}{preamble}{\def\cov@sxp{#1}}
+\newcommand*\subexpreamblefs{\normalfont}
+
+\newenvironment{covsubexamples}[1][]% % define "subexamples" environment
{%
- \begin{covexample}
+ \ifx#1\empty\else\setkeys{cov@subex}{#1}\fi%
+ \begin{covexample}%
+ \@ifundefined{cov@sxp}{}{\subexpreamblefs\cov@sxp}% insert preamble if given
\begin{enumerate}
\addtolength{\labelsep}{\subexamplenumbersep}%
\renewcommand\theenumi{\alph{enumi}}
- \renewcommand\labelenumi{\covsubexnumber{\theenumi}}
- \renewcommand\p@enumi{\theequation\,}%
+ \renewcommand\labelenumi{\covexamplenofs\covsubexnumber{\theenumi}}
+ \renewcommand\p@enumi{\@@exampleno\,}%
\setlength{\listparindent}{0pt}%
\def\makelabel##1{##1\hfil}% % put labels flushleft in space available
}%
{%
+ \let\cov@sxp\relax
\end{enumerate}
\end{covexample}
}
\@ifundefined{subexamples}{%
- \newenvironment{subexamples}{\begin{covsubexamples}}{\end{covsubexamples}}
+ \newenvironment{subexamples}[1][]{\begin{covsubexamples}[#1]}{\end{covsubexamples}}
}{%
\ifforceredef
- \renewenvironment{subexamples}{\begin{covsubexamples}}{\end{covsubexamples}}
+ \renewenvironment{subexamples}[1][]{\begin{covsubexamples}[#1]}{\end{covsubexamples}}
\cov@warning{The subexamples environment was already defined. Redefining it.}
\else
\cov@warning{The subexamples environment was already defined.^^J
@@ -357,27 +390,38 @@
{\def\cov@selfnt{\selectfont}}
% Thanks to Hans-Peter Kolb for this macro.
-\def\gll % Introduces 2-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \catcode`\^^M=12
- \twosent
- }
+% Try to prevent page breaks in glosses if noglossbreaks option is set
+\def\cov@nopagebreak{}
+\ifnoglossbreaks
+\def\cov@nopagebreak{\let\reserved@e\vadjust\let\reserved@f\nobreak}
+\fi
-\def\glll % Introduces 3-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \catcode`\^^M=12
- \threesent
- }
+% 2019-05-07: optional preceding gloss text (non-interlinearized)
+\newcommand*\glosslinepreamble[1]{#1}
+\def\cov@glp{}
+\newcommand*\glosspreamble[1]{\def\cov@glp{#1}}
+
+\def\gll{% % Introduces 2-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \catcode`\^^M=12
+ \twosent
+}
+
+\def\glll{% % Introduces 3-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \catcode`\^^M=12
+ \threesent
+}
% The following two \x.. versions introduce special forms of glossing
@@ -386,27 +430,27 @@
% Inspired by this post of David Carlisle to the mentioned stackexchange thread:
% http://tex.stackexchange.com/a/169744/19291
% These macros require the gloss lines to be ended explicitly with \xgle
-\def\xgll % Introduces 2-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \ignorespaces\xtwosent
- }
-
-\def\xglll % Introduces 3-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \ignorespaces\xthreesent
- }
+\def\xgll{% % Introduces 2-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \ignorespaces\xtwosent
+}
+
+\def\xglll{% % Introduces 3-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \ignorespaces\xthreesent
+}
-\def\glt{{\hskip -\glossglue}\unhbox\gline\smallskip\newline} % \newline was \\
+\def\glt{{\hskip -\glossglue}\cov@nopagebreak\unhbox\gline\smallskip\cov@nopagebreak\newline} % \newline was \\
% Introduces translation.
% Required even if no translation follows.
@@ -414,7 +458,10 @@
% Alternative to glt, when one wants to
% put a number but no translation.
-\def\glend{\end{flushleft}} % Ends the gloss environment.
+\def\glend{%
+ \end{flushleft}%
+ \def\cov@glp{}%
+} % Ends the gloss environment.
% The following TeX code is adapted, with permission, from:
% gloss.tex: Macros for vertically aligning words in consecutive sentences.
@@ -488,11 +535,13 @@
\gdef\twosent#1^^M#2^^M% #1 = first line, #2 = second line
{\getwords(\lineone,\eachwordone)#1 ^^M%
\getwords(\linetwo,\eachwordtwo)#2 ^^M%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
\global\setbox\gline=\hbox{\unhbox\gline
\hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
}%
@@ -507,12 +556,14 @@
{\getwords(\lineone,\eachwordone)#1 ^^M%
\getwords(\linetwo,\eachwordtwo)#2 ^^M%
\getwords(\linethree,\eachwordthree)#3 ^^M%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
\lastword{\eachwordthree}{\linethree}{\wordthree}%
\global\setbox\gline=\hbox{\unhbox\gline
\hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
\nointerlineskip
@@ -546,11 +597,13 @@
\gdef\xtwosent#1\xgle#2\xgle% #1 = first line, #2 = second line
{\xgetwords(\lineone,\eachwordone)#1 \xgle%
\xgetwords(\linetwo,\eachwordtwo)#2 \xgle%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \global\setbox\gline=\hbox{\unhbox\gline%
+ \hskip\glossglue%
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
}%
@@ -565,12 +618,14 @@
{\xgetwords(\lineone,\eachwordone)#1 \xgle%
\xgetwords(\linetwo,\eachwordtwo)#2 \xgle%
\xgetwords(\linethree,\eachwordthree)#3 \xgle%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
\lastword{\eachwordthree}{\linethree}{\wordthree}%
\global\setbox\gline=\hbox{\unhbox\gline
\hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
\nointerlineskip
@@ -647,6 +702,11 @@
\define@key{gcovington}{fsii}{\def\glosslinetwo{#1}}
\define@key{gcovington}{fsiii}{\def\glosslinethree{#1}}
%
+% 4. Gloss preamble text
+\def\cov@gglp{}
+\define@key{covington}{preamble}{\def\cov@lglp{#1}}
+\define@key{gcovington}{preamble}{\def\cov@gglp{#1}}
+%
% General setting option
\newcommand*\setglossoptions[1]{\setkeys{gcovington}{#1}}
%
@@ -669,6 +729,8 @@
\@ifundefined{lglosslineone}{}{\def\glosslineone{\lglosslineone}}%
\@ifundefined{lglosslinetwo}{}{\def\glosslinetwo{\lglosslinetwo}}%
\@ifundefined{lglosslinethree}{}{\def\glosslinethree{\lglosslinethree}}%
+ \@ifundefined{cov@lglp}{}{\def\cov@gglp{\cov@lglp}}%
+ \ifx\cov@gglp\empty\else\def\cov@glp{\cov@gglp}\fi%
\xgll #2\xgle
#3\xgle
\ifgtright
@@ -683,6 +745,7 @@
\let\lglosslineone\relax%
\let\lglosslinetwo\relax%
\let\lglosslinethree\relax%
+ \let\cov@lglp\relax%
}
% 2. \trigloss[<opts>]{}{}{}{<translation>}
@@ -704,6 +767,8 @@
\@ifundefined{lglosslineone}{}{\def\glosslineone{\lglosslineone}}%
\@ifundefined{lglosslinetwo}{}{\def\glosslinetwo{\lglosslinetwo}}%
\@ifundefined{lglosslinethree}{}{\def\glosslinethree{\lglosslinethree}}%
+ \@ifundefined{cov@lglp}{}{\def\cov@gglp{\cov@lglp}}%
+ \ifx\cov@gglp\empty\else\def\cov@glp{\cov@gglp}\fi%
\xglll #2\xgle
#3\xgle
#4\xgle
@@ -829,8 +894,11 @@
%
% Example: \negdrs{X}{donkey(X)\\green(X)}
+% 2019-06-21 (v. 2.3): Do not define the macros if already defined.
+% This allows to use covington with the drs package.
+
-\newcommand{\drs}[2]
+\providecommand{\drs}[2]
{
{
\cov@emphasized
@@ -850,24 +918,24 @@
}
}
-\newcommand{\sdrs}[3]
+\providecommand{\sdrs}[3]
{\begin{tabular}{l}
\mbox{\cov@emphasized #1} \\
~ \\
\drs{#2}{#3}
\end{tabular}}
-\newcommand{\ifdrs}[4]
+\providecommand{\ifdrs}[4]
{
\mbox{\drs{#1}{#2}~~{\large $\Rightarrow$}~\drs{#3}{#4}}
}
-\newcommand{\alifdrs}[4]
+\providecommand{\alifdrs}[4]
{
\mbox{$\!\!\!$\drs{#1}{#2}~~{\large $\Rightarrow$}~\drs{#3}{#4}}
}
-\newcommand{\negdrs}[2]
+\providecommand{\negdrs}[2]
{
\mbox{{\large $\neg$}\drs{#1}{#2}}
}
@@ -883,7 +951,7 @@
%
% New in 1.1 (2016-07-06):
% We provide a covexercise environment and only (re)define
-% example if it does not yet exist or if redefinition is
+% exercise if it does not yet exist or if redefinition is
% forced by the "force" option. This prevents clashes
% with packages/classes that roll their own exercise environment.
@@ -900,7 +968,11 @@
% large curly brackets. Good for alternatives
% within sentences or PS-rules.
-\newtheorem{covexercise}{Exercise}[subsection]
+\ifcsname c@subsection\endcsname
+ \newtheorem{covexercise}{Exercise}[subsection]
+\else
+ \newtheorem{covexercise}{Exercise}
+\fi
% Exercise numbering resets to 0 not only at the start of
% a subsection, but also at the start of a section or chapter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/covington.tlpobj new/tlpkg/tlpobj/covington.tlpobj
--- old/tlpkg/tlpobj/covington.tlpobj 2019-02-28 03:30:14.000000000 +0100
+++ new/tlpkg/tlpobj/covington.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,6 +1,6 @@
name covington
category Package
-revision 49376
+revision 53303
shortdesc Linguistic support
relocated 1
longdesc Numerous minor LaTeX enhancements for linguistics, including
@@ -13,7 +13,6 @@
catalogue-contact-bugs https://github.com/jspitz/covington/issues
catalogue-contact-repository https://github.com/jspitz/covington
catalogue-ctan /macros/latex/contrib/covington
-catalogue-date 2018-12-10 10:20:35 +0100
catalogue-license lppl1.3
catalogue-topics linguistic
-catalogue-version 2.0
+catalogue-version 2.4
++++++ cqubeamer.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cqubeamer.doc.tlpobj new/tlpkg/tlpobj/cqubeamer.doc.tlpobj
--- old/tlpkg/tlpobj/cqubeamer.doc.tlpobj 2019-02-28 03:30:14.000000000 +0100
+++ new/tlpkg/tlpobj/cqubeamer.doc.tlpobj 2020-03-24 01:57:10.000000000 +0100
@@ -1,6 +1,6 @@
name cqubeamer.doc
category Package
-revision 47630
+revision 54512
shortdesc doc files of cqubeamer
relocated 1
docfiles size=787
++++++ cqubeamer.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cqubeamer.tlpobj new/tlpkg/tlpobj/cqubeamer.tlpobj
--- old/tlpkg/tlpobj/cqubeamer.tlpobj 2019-02-28 03:30:15.000000000 +0100
+++ new/tlpkg/tlpobj/cqubeamer.tlpobj 2020-03-24 01:57:11.000000000 +0100
@@ -1,6 +1,6 @@
name cqubeamer
category Package
-revision 47630
+revision 54512
shortdesc LaTeX Beamer Template for Chongqing University
relocated 1
longdesc This package provides a LaTeX beamer template designed for
@@ -14,7 +14,6 @@
catalogue-contact-bugs https://github.com/CQUtug/CQUBeamer
catalogue-contact-repository https://github.com/Godblesswz/CQUBeamerTemplate
catalogue-ctan /macros/xetex/latex/cqubeamer
-catalogue-date 2018-05-12 04:59:36 +0200
-catalogue-license mitcc-by-4
+catalogue-license mit cc-by-4
catalogue-topics presentation xetex doc-templ chinese
catalogue-version 1.0
++++++ cquthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/Makefile new/doc/latex/cquthesis/Makefile
--- old/doc/latex/cquthesis/Makefile 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,92 +0,0 @@
-# Makefile for CQUThesis
-# Adapted from Thuthesis Makefile
-
-# Compiling method: latexmk/xelatex/pdflatex
-METHOD = latexmk
-# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex -quiet -halt-on-error -interaction=nonstopmode
-# Basename of thesis
-THESISMAIN = main
-
-
-PACKAGE=cquthesis
-SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
-THESISCONTENTS=$(THESISMAIN).tex contents/*.tex $(FIGURES)
-# NOTE: update this to reflect your local file types.
-# 注意:下列内容可能需要根据你的实际情况调整
-FIGURES=$(wildcard figures/*.eps figures/*.pdf figures/*.jpg figures/*.jpeg figures/*.png)
-BIBFILE=ref/refs.bib
-SHUJICONTENTS=$(SHUJIMAIN).tex
-CLSFILES=dtx-style.sty $(PACKAGE).cls $(PACKAGE).cfg
-
-# make deletion work on Windows
-ifdef SystemRoot
- RM = del /Q
- OPEN = start
-else
- RM = rm -f
- OPEN = open
-endif
-
-.PHONY: all clean cleanall cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
-
-all: doc thesis
-
-cls: $(CLSFILES)
-
-doc: $(PACKAGE).pdf
-
-$(CLSFILES): $(SOURCES)
- latex $(PACKAGE).ins
-
-viewdoc: doc
- $(OPEN) $(PACKAGE).pdf
-
-viewthesis: thesis
- $(OPEN) $(THESISMAIN).pdf
-
-thesis: $(THESISMAIN).pdf
-
-ifeq ($(METHOD),latexmk)
-
-$(PACKAGE).pdf: $(CLSFILES)
- xelatex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- xelatex $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
-
-$(THESISMAIN).pdf: $(CLSFILES)
- $(METHOD) $(LATEXMKOPTS) $(THESISMAIN)
-
-else ifneq (,$(filter $(METHOD),xelatex pdflatex))
-
-$(PACKAGE).pdf: $(CLSFILES)
- $(METHOD) $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- $(METHOD) $(PACKAGE).dtx
- $(METHOD) $(PACKAGE).dtx
- $(METHOD) $(PACKAGE).dtx
-
-$(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
- $(METHOD) $(THESISMAIN)
- $(METHOD) $(THESISMAIN)
-
-$(THESISMAIN).bbl: $(BIBFILE)
- $(METHOD) $(THESISMAIN)
- -bibtex $(THESISMAIN)
- $(RM) $(THESISMAIN).pdf
-
-else
-$(error Unknown METHOD: $(METHOD))
-
-endif
-
-clean:
- latexmk -c $(PACKAGE).dtx $(THESISMAIN)
- -@$(RM) *~
-
-cleanall: clean
- -@$(RM) $(PACKAGE).pdf $(THESISMAIN).pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/README new/doc/latex/cquthesis/README
--- old/doc/latex/cquthesis/README 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-# CQUThesis v1.30 (2018/02/23)
-[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis)
-[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis)
-[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest)
-[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.30.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
-[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
-
-**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
-
-![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11...)
-
-# Deployment
-## Download
-Version | Link | Description
---- | --- | ---
-Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes
-Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev.
-Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live
-
-## Installation
-Unzip all files to a new folder as your future work folder:
-* Windows users may easily double-click on `makewin.bat`;
-* Linux or Mac users may start the terminal:
-```
-cd path/to/cquthesis
-make thesis
-```
-If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder.
-
-# Question, Contribution and Contact
-Feel free to raise any question, and any possible contribution is highly appreciated.
-* [Github Issues](https://github.com/nanmu42/CQUThesis/issues);
-* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95)
-
-Writing in English or Chinese is needed.
-
-# Acknowledgements
-The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
-
-* [The CTeX Community](https://github.com/CTeX-org/ctex-kit)
-* [XUE, Ruini](https://github.com/xueruini/thuthesis)
-* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
-
-# About the Author
-Zhennan Li (i at nanmu dot me) proudly presents this work for you.
-
-# License
-This whole project may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in:
-
-http://www.latex-project.org/lppl.txt
-
-and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/README-Chinese.md new/doc/latex/cquthesis/README-Chinese.md
--- old/doc/latex/cquthesis/README-Chinese.md 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/README-Chinese.md 2019-10-13 00:06:46.000000000 +0200
@@ -1,8 +1,8 @@
-# 嗨,这里是CQUThesis! v1.30 (2018/02/23)
+# 嗨,这里是CQUThesis!
[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis)
[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis)
[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest)
-[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.30.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.40.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/README.md new/doc/latex/cquthesis/README.md
--- old/doc/latex/cquthesis/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cquthesis/README.md 2019-10-13 00:06:46.000000000 +0200
@@ -0,0 +1,52 @@
+# About CQUThesis
+[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis)
+[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis)
+[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest)
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.40.svg)](https://github.com/nanmu42/CQUThesis/commits/master)
+[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
+
+**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
+
+![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11...)
+
+# Deployment
+## Download
+Version | Link | Description
+--- | --- | ---
+Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes
+Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev.
+Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live
+
+## Installation
+Unzip all files to a new folder as your future work folder:
+* Windows users may easily double-click on `makewin.bat`;
+* Linux or Mac users may start the terminal:
+```
+cd path/to/cquthesis
+make thesis
+```
+If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder.
+
+# Question, Contribution and Contact
+Feel free to raise any question, and any possible contribution is highly appreciated.
+* [Github Issues](https://github.com/nanmu42/CQUThesis/issues);
+* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95)
+
+Writing in English or Chinese is needed.
+
+# Acknowledgements
+The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
+
+* [The CTeX Community](https://github.com/CTeX-org/ctex-kit)
+* [XUE, Ruini](https://github.com/xueruini/thuthesis)
+* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
+
+# About the Author
+Zhennan Li (i at nanmu dot me) proudly presents this work for you.
+
+# License
+This whole project may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in:
+
+http://www.latex-project.org/lppl.txt
+
+and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
Binary files old/doc/latex/cquthesis/cquthesis.pdf and new/doc/latex/cquthesis/cquthesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/dtx-style.sty new/doc/latex/cquthesis/dtx-style.sty
--- old/doc/latex/cquthesis/dtx-style.sty 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/dtx-style.sty 2019-10-13 00:06:46.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2018 by Zhennan Li
+%% Copyright (C) 2016-2019 by Zhennan Li
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any later
@@ -23,8 +23,6 @@
\RequirePackage[bottom,perpage,hang,]{footmisc}
\RequirePackage{hypdoc}
\RequirePackage[UTF8,scheme=chinese]{ctex}
-\RequirePackage{newpxtext}
-\RequirePackage{newpxmath}
\RequirePackage[
top=2.5cm, bottom=2.5cm,
left=4cm, right=2cm,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cquthesis.doc.tlpobj new/tlpkg/tlpobj/cquthesis.doc.tlpobj
--- old/tlpkg/tlpobj/cquthesis.doc.tlpobj 2019-02-28 03:30:15.000000000 +0100
+++ new/tlpkg/tlpobj/cquthesis.doc.tlpobj 2019-10-13 01:55:12.000000000 +0200
@@ -1,13 +1,12 @@
name cquthesis.doc
category Package
-revision 46863
+revision 52355
shortdesc doc files of cquthesis
relocated 1
-docfiles size=304
+docfiles size=315
RELOC/doc/latex/cquthesis/CONTRIBUTORS.md
- RELOC/doc/latex/cquthesis/Makefile
- RELOC/doc/latex/cquthesis/README
RELOC/doc/latex/cquthesis/README-Chinese.md
+ RELOC/doc/latex/cquthesis/README.md
RELOC/doc/latex/cquthesis/contents/ack.tex
RELOC/doc/latex/cquthesis/contents/analysis.tex
RELOC/doc/latex/cquthesis/contents/appendix.tex
++++++ cquthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cquthesis/cquthesis.cfg new/tex/latex/cquthesis/cquthesis.cfg
--- old/tex/latex/cquthesis/cquthesis.cfg 2018-03-06 23:52:46.000000000 +0100
+++ new/tex/latex/cquthesis/cquthesis.cfg 2019-10-13 00:06:46.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2018 by Zhennan Li
+%% Copyright (C) 2016-2019 by Zhennan Li
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any later
@@ -22,7 +22,7 @@
%% This is the configuration file of the cquthesis package with LaTeX2e.
%%
\ProvidesFile{cquthesis.cfg}
-[2018/02/23 v1.30 Chongqing University Thesis Template]
+[2019/10/12 v1.40 Chongqing University Thesis Template]
\def\cqueqshortname {式}
\def\cqu@denotation@name {主要符号对照表}
\def\shorttablename {表}
@@ -133,7 +133,7 @@
{More than 10 footnotes in a single page are not supported.}{}
\fi
}{}{}
-\theoremsymbol{\ensuremath{\square}}
+\theoremsymbol{\ensuremath{\ding{110}}}
\newtheorem*{proof}{证明}
\theoremstyle{plain}
\theoremsymbol{}
@@ -151,9 +151,9 @@
\newtheorem{problem}{问题}[chapter]
\newtheorem{conjecture}{猜想}[chapter]
\sisetup{%
-list-final-separator = {和},
-list-pair-separator = {和},
-range-phrase = {$ \sim $},
+list-final-separator = { 和 },
+list-pair-separator = { 和 },
+range-phrase = {~},
}%\sisetup
\AtBeginDocument{%
\def\figureautorefname{图}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cquthesis/cquthesis.cls new/tex/latex/cquthesis/cquthesis.cls
--- old/tex/latex/cquthesis/cquthesis.cls 2018-03-06 23:52:46.000000000 +0100
+++ new/tex/latex/cquthesis/cquthesis.cls 2019-10-13 00:06:46.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2018 by Zhennan Li
+%% Copyright (C) 2016-2019 by Zhennan Li
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any later
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{cquthesis}
-[2018/02/23 v1.30 Chongqing University Thesis Template]
+[2019/10/12 v1.40 Chongqing University Thesis Template]
\hyphenation{Cqu-Thesis}
\newcommand{\cquthesis}{\textsc{CquThesis}}
\def\version{1.30}
@@ -106,7 +106,6 @@
\RequirePackage{fontspec}
\RequirePackage{amsmath}
\RequirePackage[defaultsups]{newtxtext}
-\RequirePackage{newtxmath}
\RequirePackage{pifont}
\RequirePackage{CJKfntef}
\RequirePackage{newfloat}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cquthesis.tlpobj new/tlpkg/tlpobj/cquthesis.tlpobj
--- old/tlpkg/tlpobj/cquthesis.tlpobj 2019-02-28 03:30:16.000000000 +0100
+++ new/tlpkg/tlpobj/cquthesis.tlpobj 2019-10-13 01:55:13.000000000 +0200
@@ -1,6 +1,6 @@
name cquthesis
category Package
-revision 46863
+revision 52355
shortdesc LaTeX Thesis Template for Chongqing University
relocated 1
longdesc CQUThesis stands for Chongqing University Thesis Template for
@@ -17,7 +17,7 @@
catalogue-contact-development https://github.com/nanmu42/CQUThesis/blob/master/CONTRIBUTORS.md
catalogue-contact-repository https://github.com/nanmu42/CQUThesis
catalogue-ctan /macros/latex/contrib/cquthesis
-catalogue-date 2018-05-06 17:51:43 +0200
+catalogue-date 2019-10-12 15:19:03 +0200
catalogue-license lppl1.3
catalogue-topics dissertation class chinese
-catalogue-version 1.30
+catalogue-version 1.40
++++++ crimson.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimson.doc.tlpobj new/tlpkg/tlpobj/crimson.doc.tlpobj
--- old/tlpkg/tlpobj/crimson.doc.tlpobj 2019-02-28 03:30:16.000000000 +0100
+++ new/tlpkg/tlpobj/crimson.doc.tlpobj 2020-03-24 01:57:11.000000000 +0100
@@ -1,6 +1,6 @@
name crimson.doc
category Package
-revision 43525
+revision 54512
shortdesc doc files of crimson
relocated 1
docfiles size=12
++++++ crimson.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimson.tlpobj new/tlpkg/tlpobj/crimson.tlpobj
--- old/tlpkg/tlpobj/crimson.tlpobj 2019-02-28 03:30:16.000000000 +0100
+++ new/tlpkg/tlpobj/crimson.tlpobj 2020-03-24 01:57:11.000000000 +0100
@@ -1,6 +1,6 @@
name crimson
category Package
-revision 43525
+revision 54512
shortdesc Crimson fonts with LaTeX support
relocated 1
longdesc This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX
@@ -114,6 +114,5 @@
RELOC/tex/latex/crimson/crimson.sty
catalogue-also crimsonpro
catalogue-ctan /fonts/crimson
-catalogue-date 2018-12-22 13:05:48 +0100
-catalogue-license ofllppl
+catalogue-license ofl lppl
catalogue-topics font font-serif font-t1enc font-proportional font-otf font-type1
++++++ crimsonpro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/crimsonpro/README new/doc/fonts/crimsonpro/README
--- old/doc/fonts/crimsonpro/README 2018-12-22 22:53:22.000000000 +0100
+++ new/doc/fonts/crimsonpro/README 2019-10-23 23:47:49.000000000 +0200
@@ -1,5 +1,5 @@
This is the README for the CrimsonPro package,
-version 2018-12-18.
+version 2019-10-21.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the CrimsonPro family of fonts (version 1.001),
Binary files old/doc/fonts/crimsonpro/crimsonpro-samples.pdf and new/doc/fonts/crimsonpro/crimsonpro-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/crimsonpro/crimsonpro-samples.tex new/doc/fonts/crimsonpro/crimsonpro-samples.tex
--- old/doc/fonts/crimsonpro/crimsonpro-samples.tex 2018-12-22 22:53:22.000000000 +0100
+++ new/doc/fonts/crimsonpro/crimsonpro-samples.tex 2019-10-23 23:47:49.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass{article}
-\usepackage[LY1]{fontenc}
-\usepackage{CrimsonPro}
+\usepackage[T1]{fontenc}
+\usepackage[sb,m]{CrimsonPro}
\usepackage{lipsum}
\begin{document}
\sloppy
@@ -18,8 +18,6 @@
\textbf{\textit{\lipsum[4]}}
-\rm
-
\section*{Default Numbers}
1234567890
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimsonpro.doc.tlpobj new/tlpkg/tlpobj/crimsonpro.doc.tlpobj
--- old/tlpkg/tlpobj/crimsonpro.doc.tlpobj 2019-02-28 03:30:17.000000000 +0100
+++ new/tlpkg/tlpobj/crimsonpro.doc.tlpobj 2020-03-24 01:57:12.000000000 +0100
@@ -1,9 +1,9 @@
name crimsonpro.doc
category Package
-revision 49568
+revision 54512
shortdesc doc files of crimsonpro
relocated 1
-docfiles size=12
+docfiles size=24
RELOC/doc/fonts/crimsonpro/OFL.txt
RELOC/doc/fonts/crimsonpro/README
RELOC/doc/fonts/crimsonpro/crimsonpro-samples.pdf
++++++ crimsonpro.tar.xz ++++++
++++ 15057 lines of diff (skipped)
++++++ crossreftools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossreftools.doc.tlpobj new/tlpkg/tlpobj/crossreftools.doc.tlpobj
--- old/tlpkg/tlpobj/crossreftools.doc.tlpobj 2019-02-28 03:30:28.000000000 +0100
+++ new/tlpkg/tlpobj/crossreftools.doc.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name crossreftools.doc
category Package
-revision 49589
+revision 54080
shortdesc doc files of crossreftools
relocated 1
docfiles size=100
++++++ crossreftools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossreftools.tlpobj new/tlpkg/tlpobj/crossreftools.tlpobj
--- old/tlpkg/tlpobj/crossreftools.tlpobj 2019-02-28 03:30:28.000000000 +0100
+++ new/tlpkg/tlpobj/crossreftools.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name crossreftools
category Package
-revision 49589
+revision 54080
shortdesc Expandable extraction of cleveref data
relocated 1
longdesc This package extracts information from cross-referencing
@@ -9,9 +9,7 @@
runfiles size=4
RELOC/tex/latex/crossreftools/crossreftools.sty
catalogue-also cleveref
-catalogue-contact-home http://www.ich-rede-mich-um-kopf-und-kragen.de
catalogue-ctan /macros/latex/contrib/crossreftools
-catalogue-date 2019-01-03 16:16:07 +0100
catalogue-license lppl1.3
catalogue-topics label-ref
catalogue-version 0.9
++++++ csbulletin.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csbulletin/README new/doc/latex/csbulletin/README
--- old/doc/latex/csbulletin/README 2019-01-13 00:06:52.000000000 +0100
+++ new/doc/latex/csbulletin/README 2020-03-20 22:27:05.000000000 +0100
@@ -1,5 +1,5 @@
=============================================================================
-Package: csbulletin Version 1.2 12 January 2019
+Package: csbulletin 10 January 2020
=============================================================================
The package provides the class for articles for the CSTUG Bulletin
Binary files old/doc/latex/csbulletin/csbulletin.pdf and new/doc/latex/csbulletin/csbulletin.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csbulletin/csbulletin.tex new/doc/latex/csbulletin/csbulletin.tex
--- old/doc/latex/csbulletin/csbulletin.tex 2019-01-13 00:06:52.000000000 +0100
+++ new/doc/latex/csbulletin/csbulletin.tex 2020-03-20 22:27:05.000000000 +0100
@@ -1,9 +1,8 @@
%% $Id$
\documentclass{csbulletin}
-\DeclareRobustCommand\version{\unskip~v.\,1.2}
+\DeclareRobustCommand\version{\unskip~2020/01/10}
\let\pkg\textsc
-\usepackage[utf8]{inputenc}
\usepackage[pdftitle=LaTeX\ Class\ for\ CSTUG\ Bulletin, pdfauthor={Zdenek\ Wagner, Vit\ Novotny},
pdfkeywords=CSTUG\ Bulletin,bookmarks=false]{hyperref}
@@ -23,6 +22,7 @@
ve stylu pro Zpravodaj, autoři se tedy mohou podívat přímo do zdrojového kódu tohoto manuálu a
napsat svůj článek obdobně.
\end{abstract}
+\klicovaslova: \LaTeX, styl, dokumentová třída, Zpravodaj \CSTUG, dokumentace
\section{English introduction}
\begin{otherlanguage}{english}
@@ -51,7 +51,8 @@
\begin{itemize}
\item Balíček \pkg{csbulacronym} definuje běžné akronymy robustním způsobem pomocí \cmd{DeclareRobustCommand} a
-některé speciální akronymy, jako je např. makro \cmd{cstug} pro \cstug. Soubor je dodáván společně s~třídou \pkg{csbulletin}. Definice se používají i mimo Zpravodaj, proto jsou v~samostatném souboru.
+některé speciální akronymy, jako je např. makro \cmd{cstug} pro \cstug. Soubor je dodáván společně s~třídou
+\pkg{csbulletin}. Definice se používají i mimo Zpravodaj, proto jsou v~samostatném souboru.
\item \pkg{fontenc} s~parametrem T1
@@ -104,11 +105,14 @@
kurzívou na konci článku. Poté použijte makro \cmd{maketitle}.
Abstrakt článku v~jazyce článku zapište v~prostředí \texttt{abstract}. Ve výjimečných případech lze
-abstrakt vynechat.
+abstrakt vynechat. Za prostředí \texttt{abstract} volitelně uveďte jedno a více klíčových slov
+oddělených čárkou a předznamenaných příkazem \cmd{klicovaslova:}, \cmd{klucoveslova:} nebo
+\cmd{keywords:} podle jazyka článku.
Na konci článku uveďte anglický souhrn v~prostředí \texttt{summary}. Anglický název bude vzat
z~příkazu \cmd{EnglishTitle}, přepnutí jazyka se též provede automaticky. Anglický souhrn nemusí být
-přesným překladem abstraktu.
+přesným překladem abstraktu. Na závěr prostředí \texttt{summary} volitelně uveďte jedno a více
+anglických klíčových slov oddělených čárkou a předznamenaných příkazem \cmd{keywords:}.
Redakce se postará o~jazykovou korekturu anglického souhrnu. V~případě, že jej autor nedodá,
postará se o~překlad redakce.
@@ -139,6 +143,7 @@
sdružení uživatelů \TeX u). You can see the structure of a document by looking to the source file
of this manual. The package can be used and distributed according to the \LaTeX\ Project Public
License.
+ \keywords: \LaTeX, style, document class, \CSTUG{} Bulletin, documentation
\end{summary}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csbulletin.doc.tlpobj new/tlpkg/tlpobj/csbulletin.doc.tlpobj
--- old/tlpkg/tlpobj/csbulletin.doc.tlpobj 2019-02-28 03:30:32.000000000 +0100
+++ new/tlpkg/tlpobj/csbulletin.doc.tlpobj 2020-03-20 23:58:20.000000000 +0100
@@ -1,9 +1,9 @@
name csbulletin.doc
category Package
-revision 49681
+revision 54433
shortdesc doc files of csbulletin
relocated 1
-docfiles size=72
+docfiles size=73
RELOC/doc/latex/csbulletin/LICENSE.txt
RELOC/doc/latex/csbulletin/README
RELOC/doc/latex/csbulletin/csbulletin.pdf
++++++ csbulletin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulacronym.sty new/tex/latex/csbulletin/csbulacronym.sty
--- old/tex/latex/csbulletin/csbulacronym.sty 2017-02-21 01:27:57.000000000 +0100
+++ new/tex/latex/csbulletin/csbulacronym.sty 2020-03-20 22:27:05.000000000 +0100
@@ -1,4 +1,4 @@
-\ProvidesPackage{csbulacronym}[2008/04/27 Acronyms for CSTUG bulletin]
+\ProvidesPackage{csbulacronym}[2020/01/10 Acronyms for CSTUG bulletin]
\PackageInfo{csbulacronym}{$Id$}
%==================================================== TeX logos
@@ -39,8 +39,6 @@
\DeclareRobustCommand\PiCTeX{\PiC\kern-.11em\TeX}
\DeclareRobustCommand\SliTeX{{\rm S\kern-.06em{\sc l\kern-.035emi}\kern-.06em\TeX}}
\let\SLiTeX\SliTeX
-\let\Protected@TeX\TeX
-\DeclareRobustCommand\TeX{\Protected@TeX}
\DeclareRobustCommand\WPtoLaTeX{%
W\kern-.06em\hbox{P}\kern-.2em\lower.7ex\hbox{2}\kern-.07em\LaTeX}
\let\Protected@LaTeX\LaTeX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulletin.cls new/tex/latex/csbulletin/csbulletin.cls
--- old/tex/latex/csbulletin/csbulletin.cls 2019-01-13 00:06:52.000000000 +0100
+++ new/tex/latex/csbulletin/csbulletin.cls 2020-03-20 22:27:05.000000000 +0100
@@ -1,4 +1,4 @@
-\ProvidesClass{csbulletin}[2019/01/12 CSTUG Bulletin class]
+\ProvidesClass{csbulletin}[2020/01/10 CSTUG Bulletin class]
\ClassInfo{csbulletin}{$Id$}
% Switch
@@ -79,7 +79,7 @@
\ifpdf
\IfFileExists{microtype.sty}{\RequirePackage
- [protrusion=false,expansion=true,stretch=8,shrink=24,step=4]{microtype}}{}
+ [protrusion=true,expansion=true,stretch=8,shrink=24,step=4]{microtype}}{}
\fi
\IfFileExists{array.sty}{\RequirePackage{array}}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulobalka.sty new/tex/latex/csbulletin/csbulobalka.sty
--- old/tex/latex/csbulletin/csbulobalka.sty 2019-01-13 00:06:52.000000000 +0100
+++ new/tex/latex/csbulletin/csbulobalka.sty 2020-03-20 22:27:05.000000000 +0100
@@ -1,4 +1,4 @@
-\ProvidesPackage{csbulobalka}[2017/02/17 Obalka + tiraz]
+\ProvidesPackage{csbulobalka}[2020/01/10 Obalka + tiraz]
\PackageInfo{csbulobalka}{$Id$}
%
% 3/4/2003 pridal jsem vetveni pro novou adresu sdruzeni (PS)
@@ -258,7 +258,9 @@
Tisk: & WOW, s.\,r.\,o., Praha 1, Washingtonova 25\\
\else
\ifnum\the\rok>2015
+\ifnum\the\rok<2019
Tisk: & ASMETI, Kl\'{a}\v{s}tern\'{i} 1187, 735\,11 Orlov\'{a} \\
+\fi
\else
Tisk a distribuce: &
KONVOJ, spol. s r.\,o., Berkova 22, 612\,00 Brno,\\
@@ -315,7 +317,7 @@
\tir@ni www server sdru\v zen\'i:\\
%\pdfurl{http://www.cstug.cz/}{\path|http://www.cstug.cz/|}
-\texttt{http://www.cstug.cz}
+\texttt{https://www.cstug.cz}
\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csbulletin.tlpobj new/tlpkg/tlpobj/csbulletin.tlpobj
--- old/tlpkg/tlpobj/csbulletin.tlpobj 2019-02-28 03:30:32.000000000 +0100
+++ new/tlpkg/tlpobj/csbulletin.tlpobj 2020-03-20 23:58:20.000000000 +0100
@@ -1,6 +1,6 @@
name csbulletin
category Package
-revision 49681
+revision 54433
shortdesc LaTeX class for articles submitted to the CSTUG Bulletin (Zpravodaj)
relocated 1
longdesc The package provides the class for articles for the CSTUG
@@ -14,7 +14,5 @@
RELOC/tex/latex/csbulletin/csbulobalka.sty
RELOC/tex/latex/csbulletin/csbulv1.cls
catalogue-ctan /macros/latex/contrib/csbulletin
-catalogue-date 2019-01-12 11:49:08 +0100
catalogue-license lppl1.3
catalogue-topics journalpub class
-catalogue-version 1.2
++++++ cslatex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/cslatex.man1.pdf and new/texmf-dist/doc/man/man1/cslatex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/pdfcslatex.man1.pdf and new/texmf-dist/doc/man/man1/pdfcslatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cslatex.doc.tlpobj new/tlpkg/tlpobj/cslatex.doc.tlpobj
--- old/tlpkg/tlpobj/cslatex.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cslatex.doc.tlpobj 2020-03-14 01:42:05.000000000 +0100
@@ -1,6 +1,6 @@
name cslatex.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of cslatex
docfiles size=14
texmf-dist/doc/man/man1/cslatex.1
++++++ cslatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cslatex.tlpobj new/tlpkg/tlpobj/cslatex.tlpobj
--- old/tlpkg/tlpobj/cslatex.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cslatex.tlpobj 2020-03-14 01:42:05.000000000 +0100
@@ -1,16 +1,18 @@
name cslatex
category Package
-revision 50602
+revision 54276
shortdesc LaTeX support for Czech/Slovak typesetting
depend latex
depend cm
depend csplain
depend hyphen-base
+depend l3kernel
depend latex-fonts
+depend unicode-data
depend tex-ini-files
depend cslatex.ARCH
-execute AddFormat name=cslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,latex-fonts,latex
-execute AddFormat name=pdfcslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,latex-fonts,latex,tex-ini-files
+execute AddFormat name=cslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,l3kernel,latex-fonts,latex,unicode-data
+execute AddFormat name=pdfcslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,l3kernel,latex-fonts,latex,unicode-data,tex-ini-files
runfiles size=46
texmf-dist/tex/cslatex/base/cslatex.ini
texmf-dist/tex/cslatex/base/czech.sty
@@ -52,6 +54,5 @@
texmf-dist/tex/cslatex/cspsfonts/xl2pzc.fd
catalogue-contact-home http://petr.olsak.net/cstex/
catalogue-ctan /macros/cstex/base/cslatex.tar.gz
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license gpl
catalogue-topics czech slovak format
++++++ csplain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/csplain.ini new/texmf-dist/tex/csplain/base/csplain.ini
--- old/texmf-dist/tex/csplain/base/csplain.ini 2019-03-19 22:27:38.000000000 +0100
+++ new/texmf-dist/tex/csplain/base/csplain.ini 2020-02-13 23:09:47.000000000 +0100
@@ -274,6 +274,9 @@
* More hyphen patterns preloaded in pdftex: (pdf)csplain
* Only three hyphen patterns preloaded in xetex: pdfcsplain
+ Feb. 2020
+* hyphen.lan: skip loading patters when missing file
+
COPYRIGHT
=========
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/hyphen.lan new/texmf-dist/tex/csplain/base/hyphen.lan
--- old/texmf-dist/tex/csplain/base/hyphen.lan 2019-03-19 22:27:38.000000000 +0100
+++ new/texmf-dist/tex/csplain/base/hyphen.lan 2020-02-13 23:09:47.000000000 +0100
@@ -3,6 +3,7 @@
% Created by Oldrich Ulrych, January 5, 1993
% General changes by Petr Olsak November 2012
% More default preloaded patterns March 2019
+% Skip loading patterns when missing file Feb. 2020
% See the end of this file for more inforamtion
@@ -10,7 +11,8 @@
\input il2code % extra codes for czech / slovak letters in ISO-8859-2 encoding
-\def\loadpatterns #1#2 #3 #4#5#6#7#8#9{\ifx#1\undefined \else \global\chardef#1=#2
+\def\loadpatterns #1#2 #3 #4#5#6 #7#8#9{\ifx#1\undefined \else
+ \ishyphen{#7}{#3}\iftrue \global\chardef#1=#2
\begingroup \language=#2 \def\doaccents{\def\csaccentsmessage{}\csaccents}
\let\global=\relax
\message{Loading #4 encoding, \string#1=#2 (#3).} #5
@@ -18,15 +20,20 @@
\expandafter \gdef \csname lan:#2\endcsname {#3}
\expandafter \gdef \csname #3lang\endcsname {\langpatterntest#9%
\language=#9\relax \initlanguage{#3}\frenchspacing
- \lefthyphenmin=#6\righthyphenmin=#7%
+ \sethyphenmins#6%
\message{#3 hyphenation used (\string\language=\the\language).
\string\frenchspacing\space is set on.}}
\ifx#8\relax \else
\expandafter\gdef\expandafter#8\expandafter{#8\let#9#1}\fi
\xdef\pattlist{\pattlist #1=#2 }
\global\advance\numpatterns by1
- \fi
+ \fi\fi
}
+\def\sethyphenmins#1#2{\lefthyphenmin=#1\righthyphenmin=#2\relax}
+\def\ishyphen#1#2#3{\openin7=#1 \ifeof7
+ \message{Warning: Hyphenation (#2) cannot be loaded, missing "#1" file.}
+ \else \closein7 }
+
\def\langpatterntest#1{\ifx\undefined#1\langpatterntestA#1\fi}
\def\langpatterntestA#1{%
\errmessage{Pattern \noexpand#1 ins't supported in ISO-8859-2.
@@ -190,117 +197,117 @@
\def\patt{hyphenation patterns }
\loadpatterns \enPatt 0 en {US English \patt in ASCII}
- {\input hyphen.ex }23 \relax \enPatt
+ {\input hyphen.ex }23 {hyphen.tex} \relax \enPatt
\loadpatterns \enusPatt 100 enus {US English extended \patt in ASCII}
- {\input hyph-en-us }23 \relax \enusPatt
+ {\input hyph-en-us }23 {hyph-en-us} \relax \enusPatt
\loadpatterns \engbPatt 101 engb {UK English \patt in ASCII}
- {\input hyph-en-gb }23 \relax \engbPatt
+ {\input hyph-en-gb }23 {hyph-en-gb} \relax \engbPatt
\loadpatterns \itPatt 102 it {Italian \patt in ASCII}
- {\lccode`\'=`\' \input hyph-it }22 \relax \itPatt
+ {\lccode`\'=`\' \input hyph-it }22 {hyph-it} \relax \itPatt
\loadpatterns \iaPatt 103 ia {Interlingua \patt in ASCII}
- {\input hyph-ia }22 \relax \iaPatt
+ {\input hyph-ia }22 {hyph-ia} \relax \iaPatt
\loadpatterns \idPatt 104 id {Indonesian \patt in ASCII}
- {\input hyph-id }23 \relax \idPatt
+ {\input hyph-id }23 {hyph-id} \relax \idPatt
\loadpatterns \csILtwo 5 cs {Czech \patt in ISO-8859-2}
- {\doaccents \input czhyphen.tex \input czhyphen.ex }23 \iltwolangs \csPatt
+ {\doaccents \input czhyphen.tex \input czhyphen.ex }23 {czhyphen} \iltwolangs \csPatt
\loadpatterns \skILtwo 6 sk {Slovak \patt in ISO-8859-2}
- {\doaccents \input skhyphen.tex \input skhyphen.ex }23 \iltwolangs \skPatt
+ {\doaccents \input skhyphen.tex \input skhyphen.ex }23 {skhyphen} \iltwolangs \skPatt
\begingroup \ifx\Cork\undefined \input t1code \input conv-utf8-ec \fi
\loadpatterns \csCork 15 cs {Czech \patt in Cork}
- {\input hyph-cs.tex }23 \corklangs \csPatt
+ {\input hyph-cs.tex }23 {hyph-cs} \corklangs \csPatt
\loadpatterns \skCork 16 sk {Slovak \patt in Cork}
- {\input hyph-sk.tex }23 \corklangs \skPatt
+ {\input hyph-sk.tex }23 {hyph-sk} \corklangs \skPatt
\loadpatterns \deCork 21 de {German \patt in Cork}
- {\input hyph-de-1996 }22 \corklangs \dePatt
+ {\input hyph-de-1996 }22 {hyph-de-1996} \corklangs \dePatt
\loadpatterns \frCork 22 fr {French \patt in Cork}
- {\lccode`\'=`\' \input hyph-fr }23 \corklangs \frPatt
+ {\lccode`\'=`\' \input hyph-fr }23 {hyph-fr} \corklangs \frPatt
\loadpatterns \plCork 23 pl {Polish \patt in Cork}
- {\input hyph-pl }22 \corklangs \plPatt
+ {\input hyph-pl }22 {hyph-pl} \corklangs \plPatt
\loadpatterns \cyCork 24 cy {Welsh \patt in Cork}
- {\input hyph-cy }23 \corklangs \cyPatt
+ {\input hyph-cy }23 {hyph-cy} \corklangs \cyPatt
\loadpatterns \daCork 25 da {Danish \patt in Cork}
- {\input hyph-da }22 \corklangs \daPatt
+ {\input hyph-da }22 {hyph-da} \corklangs \daPatt
\loadpatterns \esCork 26 es {Spanish \patt in Cork}
- {\input hyph-es }22 \corklangs \esPatt
+ {\input hyph-es }22 {hyph-es} \corklangs \esPatt
\loadpatterns \slCork 28 sl {Slovenian \patt in Cork}
- {\input hyph-sl }22 \corklangs \slPatt
+ {\input hyph-sl }22 {hyph-sl} \corklangs \slPatt
\loadpatterns \fiCork 29 fi {Finnish \patt in Cork}
- {\input hyph-fi }22 \corklangs \fiPatt
+ {\input hyph-fi }22 {hyph-fi} \corklangs \fiPatt
\loadpatterns \huCork 30 hu {Hungarian \patt in Cork}
- {\input hyph-hu }22 \corklangs \huPatt
+ {\input hyph-hu }22 {hyph-hu} \corklangs \huPatt
\loadpatterns \trCork 31 tr {Turkish \patt in Cork}
- {\input hyph-tr }22 \corklangs \trPatt
+ {\input hyph-tr }22 {hyph-tr} \corklangs \trPatt
\loadpatterns \etCork 32 et {Estonian \patt in Cork}
- {\input hyph-et }23 \corklangs \etPatt
+ {\input hyph-et }23 {hyph-et} \corklangs \etPatt
\loadpatterns \euCork 33 eu {Basque \patt in Cork}
- {\input hyph-eu }22 \corklangs \euPatt
+ {\input hyph-eu }22 {hyph-eu} \corklangs \euPatt
\loadpatterns \gaCork 34 ga {Irish \patt in Cork}
- {\input hyph-ga }23 \corklangs \gaPatt
+ {\input hyph-ga }23 {hyph-ga} \corklangs \gaPatt
\loadpatterns \nbCork 35 nb {Norwegian Bokmal \patt in Cork}
- {\input hyph-nb }22 \corklangs \nbPatt
+ {\input hyph-nb }22 {hyph-nb} \corklangs \nbPatt
\loadpatterns \nnCork 36 nn {Norwegian Nynorsk \patt in Cork}
- {\input hyph-nn }22 \corklangs \nnPatt
+ {\input hyph-nn }22 {hyph-nn} \corklangs \nnPatt
\loadpatterns \nlCork 37 nl {Dutch \patt in Cork}
- {\input hyph-nl }22 \corklangs \nlPatt
+ {\input hyph-nl }22 {hyph-nl} \corklangs \nlPatt
\loadpatterns \ptCork 38 pt {Portuguese \patt in Cork}
- {\lccode`\-=`\- \input hyph-pt }23 \corklangs \ptPatt
+ {\lccode`\-=`\- \input hyph-pt }23 {hyph-pt} \corklangs \ptPatt
\loadpatterns \roCork 39 ro {Romanian \patt in Cork}
- {\input hyph-ro }22 \corklangs \roPatt
+ {\input hyph-ro }22 {hyph-ro} \corklangs \roPatt
\loadpatterns \hrCork 40 hr {Croatian \patt in Cork}
- {\input hyph-hr }22 \corklangs \hrPatt
+ {\input hyph-hr }22 {hyph-hr} \corklangs \hrPatt
\loadpatterns \zhCork 41 zh {Unaccented Pinyin Syllables \patt in Cork}
- {\lccode`\'=`\' \input hyph-zh-latn-pinyin.ec }11 \corklangs \zhPatt
+ {\lccode`\'=`\' \input hyph-zh-latn-pinyin.ec }11 {hyph-zh-latn-pinyin.ec} \corklangs \zhPatt
\loadpatterns \isCork 42 is {Icelandic \patt in Cork}
- {\input hyph-is }22 \corklangs \isPatt
+ {\input hyph-is }22 {hyph-is} \corklangs \isPatt
\loadpatterns \hsbCork 43 hsb {EC Upper Sorbian \patt in Cork}
- {\input hyph-hsb }22 \corklangs \hsbPatt
+ {\input hyph-hsb }22 {hyph-hsb} \corklangs \hsbPatt
\loadpatterns \afCork 44 af {Afrikaans \patt in Cork}
- {\lccode`\-=`\- \lccode`\'=`\' \input hyph-af }22 \corklangs \afPatt
+ {\lccode`\-=`\- \lccode`\'=`\' \input hyph-af }22 {hyph-af} \corklangs \afPatt
\loadpatterns \glCork 45 gl {Galician \patt in Cork}
- {\input hyph-gl }22 \corklangs \glPatt
+ {\input hyph-gl }22 {hyph-gl} \corklangs \glPatt
\loadpatterns \kmrCork 46 kmr {Kurmanji \patt in Cork}
- {\input hyph-kmr }22 \corklangs \kmrPatt
+ {\input hyph-kmr }22 {hyph-kmr} \corklangs \kmrPatt
\loadpatterns \tkCork 47 tk {Turkmen \patt in Cork}
- {\lccode`\-=`\- \input hyph-tk }22 \corklangs \tkPatt
+ {\lccode`\-=`\- \input hyph-tk }22 {hyph-tk} \corklangs \tkPatt
\loadpatterns \laCork 48 la {Latin \patt in Cork}
- {\lccode`\'=`\' \input hyph-la }22 \corklangs \laPatt
+ {\lccode`\'=`\' \input hyph-la }22 {hyph-la} \corklangs \laPatt
\endgroup
@@ -308,172 +315,172 @@
\ifx\UnicodeLcUc y \input uni-lcuc \let\robustpatterns=\relax \fi
\loadpatterns \csUnicode 115 cs {Czech \patt in Unicode}
- {\robustpatterns \input hyph-cs.tex }23 \unicodelangs \csPatt
+ {\robustpatterns \input hyph-cs.tex }23 {hyph-cs} \unicodelangs \csPatt
\loadpatterns \skUnicode 116 sk {Slovak \patt in Unicode}
- {\robustpatterns \input hyph-sk.tex }23 \unicodelangs \skPatt
+ {\robustpatterns \input hyph-sk.tex }23 {hyph-sk} \unicodelangs \skPatt
\loadpatterns \deUnicode 121 de {German \patt in Unicode}
- {\robustpatterns \input hyph-de-1996 }22 \unicodelangs \dePatt
+ {\robustpatterns \input hyph-de-1996 }22 {hyph-de-1996} \unicodelangs \dePatt
\loadpatterns \frUnicode 122 fr {French \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-fr }23 \unicodelangs \frPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-fr }23 {hyph-fr} \unicodelangs \frPatt
\loadpatterns \plUnicode 123 pl {Polish \patt in Unicode}
- {\robustpatterns \input hyph-pl }22 \unicodelangs \plPatt
+ {\robustpatterns \input hyph-pl }22 {hyph-pl} \unicodelangs \plPatt
\loadpatterns \cyUnicode 124 cy {Welsh \patt in Unicode}
- {\robustpatterns \input hyph-cy }23 \unicodelangs \cyPatt
+ {\robustpatterns \input hyph-cy }23 {hyph-cy} \unicodelangs \cyPatt
\loadpatterns \daUnicode 125 da {Danish \patt in Unicode}
- {\robustpatterns \input hyph-da }22 \unicodelangs \daPatt
+ {\robustpatterns \input hyph-da }22 {hyph-da} \unicodelangs \daPatt
\loadpatterns \esUnicode 126 es {Spanish \patt in Unicode}
- {\robustpatterns \input hyph-es }22 \unicodelangs \esPatt
+ {\robustpatterns \input hyph-es }22 {hyph-es} \unicodelangs \esPatt
\loadpatterns \slUnicode 128 sl {Slovenian \patt in Unicode}
- {\robustpatterns \input hyph-sl }22 \unicodelangs \slPatt
+ {\robustpatterns \input hyph-sl }22 {hyph-sl} \unicodelangs \slPatt
\loadpatterns \fiUnicode 129 fi {Finnish \patt in Unicode}
- {\robustpatterns \input hyph-fi }22 \unicodelangs \fiPatt
+ {\robustpatterns \input hyph-fi }22 {hyph-fi} \unicodelangs \fiPatt
\loadpatterns \huUnicode 130 hu {Hungarian \patt in Unicode}
- {\robustpatterns input hyph-hu }22 \unicodelangs \huPatt
+ {\robustpatterns input hyph-hu }22 {hyph-hu} \unicodelangs \huPatt
\loadpatterns \trUnicode 131 tr {Turkish \patt in Unicode}
- {\robustpatterns \input hyph-tr }22 \unicodelangs \trPatt
+ {\robustpatterns \input hyph-tr }22 {hyph-tr} \unicodelangs \trPatt
\loadpatterns \etUnicode 132 et {Estonian \patt in Unicode}
- {\robustpatterns \input hyph-et }23 \unicodelangs \etPatt
+ {\robustpatterns \input hyph-et }23 {hyph-et} \unicodelangs \etPatt
\loadpatterns \euUnicode 133 eu {Basque \patt in Unicode}
- {\robustpatterns \input hyph-eu }22 \unicodelangs \euPatt
+ {\robustpatterns \input hyph-eu }22 {hyph-eu} \unicodelangs \euPatt
\loadpatterns \gaUnicode 134 ga {Irish \patt in Unicode}
- {\robustpatterns \input hyph-ga }23 \unicodelangs \gaPatt
+ {\robustpatterns \input hyph-ga }23 {hyph-ga} \unicodelangs \gaPatt
\loadpatterns \nbUnicode 135 nb {Norwegian Bokmal \patt in Unicode}
- {\robustpatterns \input hyph-nb }22 \unicodelangs \nbPatt
+ {\robustpatterns \input hyph-nb }22 {hyph-nb} \unicodelangs \nbPatt
\loadpatterns \nnUnicode 136 nn {Norwegian Nynorsk \patt in Unicode}
- {\robustpatterns \input hyph-nn }22 \unicodelangs \nnPatt
+ {\robustpatterns \input hyph-nn }22 {hyph-nn} \unicodelangs \nnPatt
\loadpatterns \nlUnicode 137 nl {Dutch \patt in Unicode}
- {\robustpatterns \input hyph-nl }22 \unicodelangs \nlPatt
+ {\robustpatterns \input hyph-nl }22 {hyph-nl} \unicodelangs \nlPatt
\loadpatterns \ptUnicode 138 pt {Portuguese \patt in Unicode}
- {\robustpatterns \lccode`\-=`\- \input hyph-pt }23 \unicodelangs \ptPatt
+ {\robustpatterns \lccode`\-=`\- \input hyph-pt }23 {hyph-pt} \unicodelangs \ptPatt
\loadpatterns \roUnicode 139 ro {Romanian \patt in Unicode}
- {\robustpatterns \input hyph-ro }22 \unicodelangs \roPatt
+ {\robustpatterns \input hyph-ro }22 {hyph-ro} \unicodelangs \roPatt
\loadpatterns \hrUnicode 140 hr {Croatian \patt in Unicode}
- {\robustpatterns \input hyph-hr }22 \unicodelangs \hrPatt
+ {\robustpatterns \input hyph-hr }22 {hyph-hr} \unicodelangs \hrPatt
\loadpatterns \zhUnicode 141 zh {Unaccented Pinyin Syllables \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-zh-latn-pinyin }11 \unicodelangs \zhPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-zh-latn-pinyin }11 {hyph-zh-latn-pinyin} \unicodelangs \zhPatt
\loadpatterns \isUnicode 142 is {Icelandic \patt in Unicode}
- {\robustpatterns \input hyph-is }22 \unicodelangs \isPatt
+ {\robustpatterns \input hyph-is }22 {hyph-is} \unicodelangs \isPatt
\loadpatterns \hsbUnicode 143 hsb {EC Upper Sorbian \patt in Unicode}
- {\robustpatterns \input hyph-hsb }22 \unicodelangs \hsbPatt
+ {\robustpatterns \input hyph-hsb }22 {hyph-hsb} \unicodelangs \hsbPatt
\loadpatterns \afUnicode 144 af {Afrikaans \patt in Unicode}
{\robustpatterns \lccode`\-=`\- \lccode`\'=`\'
- \input hyph-af }22 \corklangs \afPatt
+ \input hyph-af }22 {hyph-af} \corklangs \afPatt
\loadpatterns \glUnicode 145 gl {Galician \patt in Unicode}
- {\robustpatterns \input hyph-gl }22 \corklangs \glPatt
+ {\robustpatterns \input hyph-gl }22 {hyph-gl} \corklangs \glPatt
\loadpatterns \kmrUnicode 146 kmr {Kurmanji \patt in Unicode}
- {\robustpatterns \input hyph-kmr }22 \corklangs \kmrPatt
+ {\robustpatterns \input hyph-kmr }22 {hyph-kmr} \corklangs \kmrPatt
\loadpatterns \tkUnicode 147 tk {Turkmen \patt in Unicode}
- {\robustpatterns \lccode`\-=`\- \input hyph-tk }22 \corklangs \tkPatt
+ {\robustpatterns \lccode`\-=`\- \input hyph-tk }22 {hyph-tk} \corklangs \tkPatt
\loadpatterns \laUnicode 148 la {Latin \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-la }22 \unicodelangs \laPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-la }22 {hyph-la} \unicodelangs \laPatt
\loadpatterns \elmUnicode 201 elm {Modern Monotonic Greek \patt in Unicode}
{\lccode`\'=`\' \lccode"2019="2019 \lccode"02BC="02BC \lccode"1FBD="1FBD \lccode"1FBF="1FBF
- \robustpatterns \input hyph-el-monoton }11 \unicodelangs \elmPatt
+ \robustpatterns \input hyph-el-monoton }11 {hyph-el-monoton} \unicodelangs \elmPatt
\loadpatterns \elpUnicode 202 elp {Modern Polytonic Greek \patt in Unicode}
{\lccode`\'=`\' \lccode"2019="2019 \lccode"02BC="02BC \lccode"1FBD="1FBD \lccode"1FBF="1FBF
- \robustpatterns \input hyph-el-polyton }11 \unicodelangs \elpPatt
+ \robustpatterns \input hyph-el-polyton }11 {hyph-el-polyton} \unicodelangs \elpPatt
\loadpatterns \grcUnicode 203 grc {Ancient Greek \patt in Unicode}
{\lccode`\'=`\' \lccode"2019="2019 \lccode"02BC="02BC \lccode"1FBD="1FBD \lccode"1FBF="1FBF
- \robustpatterns \input hyph-grc }11 \unicodelangs \grcPatt
+ \robustpatterns \input hyph-grc }11 {hyph-grc} \unicodelangs \grcPatt
\loadpatterns \caUnicode 204 ca {Catalan \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-ca }22 \unicodelangs \caPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-ca }22 {hyph-ca} \unicodelangs \caPatt
\loadpatterns \copUnicode 205 cop {Coptic \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-cop }11 \unicodelangs \copPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-cop }11 {hyph-cop} \unicodelangs \copPatt
\loadpatterns \mnUnicode 206 mn {Mongolian \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-mn-cyrl }22 \unicodelangs \mnPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-mn-cyrl }22 {hyph-mn-cyrl} \unicodelangs \mnPatt
\loadpatterns \saUnicode 207 sa {Sanskrit \patt in Unicode}
{\robustpatterns \lccode"200C="200C \lccode"200D="200D
- \input hyph-sa }15 \unicodelangs \saPatt
+ \input hyph-sa }15 {hyph-sa} \unicodelangs \saPatt
\loadpatterns \ruUnicode 208 ru {Russian \patt in Unicode}
- {\robustpatterns \lccode`\-=`\- \input hyph-ru }22 \unicodelangs \ruPatt
+ {\robustpatterns \lccode`\-=`\- \input hyph-ru }22 {hyph-ru} \unicodelangs \ruPatt
\loadpatterns \ukUnicode 209 uk {Ukrainian \patt in Unicode}
{\robustpatterns \lccode`\'=`\' \lccode`\-=`\-
- \input hyph-uk }22 \unicodelangs \ukPatt
+ \input hyph-uk }22 {hyph-uk} \unicodelangs \ukPatt
\loadpatterns \hyUnicode 210 hy {Armenian \patt in Unicode}
- {\robustpatterns \input hyph-hy }12 \unicodelangs \hyPatt
+ {\robustpatterns \input hyph-hy }12 {hyph-hy} \unicodelangs \hyPatt
\loadpatterns \asUnicode 211 as {Assamesse \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-as }11 \unicodelangs \asPatt
+ \robustpatterns \input hyph-as }11 {hyph-as} \unicodelangs \asPatt
\loadpatterns \hiUnicode 212 hi {Hindi \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-hi }11 \unicodelangs \hiPatt
+ \robustpatterns \input hyph-hi }11 {hyph-hi} \unicodelangs \hiPatt
\loadpatterns \knUnicode 213 kn {Kannada \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-kn }11 \unicodelangs \knPatt
+ \robustpatterns \input hyph-kn }11 {hyph-kn} \unicodelangs \knPatt
%\loadpatterns \loUnicode 214 lo {Lao \patt in Unicode}
-% {\robustpatterns \input hyph-lo }11 \unicodelangs \loPatt
+% {\robustpatterns \input hyph-lo }11 {hyph-lo} \unicodelangs \loPatt
\loadpatterns \lvUnicode 215 lv {Latvian \patt in Unicode}
- {\robustpatterns \input hyph-lv }22 \unicodelangs \lvPatt
+ {\robustpatterns \input hyph-lv }22 {hyph-lv} \unicodelangs \lvPatt
\loadpatterns \ltUnicode 216 lt {Lithuanian \patt in Unicode}
- {\robustpatterns \input hyph-lt }22 \unicodelangs \ltPatt
+ {\robustpatterns \input hyph-lt }22 {hyph-lt} \unicodelangs \ltPatt
\loadpatterns \mlUnicode 217 ml {Malayalam \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-ml }11 \unicodelangs \mlPatt
+ \robustpatterns \input hyph-ml }11 {hyph-ml} \unicodelangs \mlPatt
\loadpatterns \mrUnicode 218 mr {Marathi \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-mr }11 \unicodelangs \mrPatt
+ \robustpatterns \input hyph-mr }11 {hyph-mr} \unicodelangs \mrPatt
\loadpatterns \orUnicode 219 or {Oriya \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-or }11 \unicodelangs \orPatt
+ \robustpatterns \input hyph-or }11 {hyph-or} \unicodelangs \orPatt
\loadpatterns \paUnicode 220 pa {Panjabi \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-pa }11 \unicodelangs \paPatt
+ \robustpatterns \input hyph-pa }11 {hyph-pa} \unicodelangs \paPatt
\loadpatterns \taUnicode 221 ta {Tamil \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-ta }11 \unicodelangs \taPatt
+ \robustpatterns \input hyph-ta }11 {hyph-ta} \unicodelangs \taPatt
\loadpatterns \teUnicode 222 te {Telugu \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-te }11 \unicodelangs \tePatt
+ \robustpatterns \input hyph-te }11 {hyph-te} \unicodelangs \tePatt
\message{\the\numpatterns\space patterns preloaded: \pattlist}
\message{Defaults: \string\language=\the\language,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/lua-hyphen.lan new/texmf-dist/tex/csplain/base/lua-hyphen.lan
--- old/texmf-dist/tex/csplain/base/lua-hyphen.lan 2019-03-19 22:27:38.000000000 +0100
+++ new/texmf-dist/tex/csplain/base/lua-hyphen.lan 2019-05-01 00:33:28.000000000 +0200
@@ -4,7 +4,7 @@
\global\chardef\enPatt=0
\gdef\pattlist{\enPatt=0}
\gdef\langlist{en(USpreloaded)}
-\gdef\enlang{\uselang{en}\enPatt23\nonfrenchspacing} % \lefthyph=2 \righthyph=3
+\gdef\enlang{\dolangua{en}\enPatt23\nonfrenchspacing} % \lefthyph=2 \righthyph=3
\input uni-lcuc % \lccodes, \uccodes in unicode
@@ -14,7 +14,7 @@
\def\next{\expandafter\noexpand\csname #1lang\endcsname}
\expandafter\xdef \csname #1lang\endcsname {%
\noexpand\loadpattrs #2 #4
- \gdef\next{\noexpand\uselang{#1}#3#5}%
+ \gdef\next{\noexpand\dolangua{#1}#3#5}%
\next
}
\xdef\langlist{\langlist\space #1(#2)}
@@ -25,11 +25,11 @@
luatexhyphen.loadlanguage("#1",#2)
}%
}
-\def\uselang#1#2#3#4{\language=#2\lefthyphenmin=#3\righthyphenmin=#4\relax
- \frenchspacing % \nonfrenchspacing can be set in \setlanguage{lan}
- \setlanguage{#1}%
+\def\dolangua#1#2#3#4{\language=#2\lefthyphenmin=#3\righthyphenmin=#4\relax
+ \frenchspacing % \nonfrenchspacing can be set in \initlanguage{lan}
+ \initlanguage{#1}%
}
-\def\setlanguage#1{}
+\def\initlanguage#1{}
\preplang enus usenglishmax \enusPatt 100 23
\preplang engb ukenglish \engbPatt 101 23
@@ -113,19 +113,19 @@
\global\chardef\csPatt=115
\gdef\lan:115{cs}
\gdef\cslang{\loadpattrs czech 115
- \gdef\cslang{\uselang{cs}\csPatt23}%
+ \gdef\cslang{\dolangua{cs}\csPatt23}%
\cslang}
\xdef\langlist{\langlist\space #1(#2)}
-and \uselang{cs}\csPatt23 does:
+and \dolangua{cs}\csPatt23 does:
\language=\csPatt \lefthyphenmin=2 \righthyphenmin=3
- \frenchspacing \setlanguage{cs}
+ \frenchspacing \initlanguage{cs}
-finally \setlanguage{cs} does nothing by default. But user can redefine
+finally \initlanguage{cs} does nothing by default. But user can redefine
it and specify another features for selected lanuages here. For example:
-\def\setlanguage#1{\csname set#1lang\endcsname}
+\def\initlanguage#1{\csname set#1lang\endcsname}
\def\setenuslang {\nonfrenchspacing}
\def\setcslang {...czech specific}
\def\setpllang {...polish specific}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex new/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex
--- old/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex 2019-05-01 00:33:28.000000000 +0200
@@ -0,0 +1,173 @@
+% The file cs-ebgaramond.tex (C) Petr Krajník, 2019
+% Use "\input cs-ebgaramond" to set the EB Garamond font family in text mode
+
+\ifx\ffdecl\undefined \input ff-mac \fi
+
+\ffdecl [EB Garamond]
+ {\bmed \bsemi \bext \linn \oldn \tabn \propn \caps \swash}
+ {\rm \bf \it \bi} {+exchars} {TX} {8t 7t U}
+\ffvars {Regular}{\boldV}{Italic}{\boldV Italic}
+
+% Default font settings
+\def\resetbold{\ffsetV{bold}{Bold}\ffsetX}
+\def\resetnum {\tabn\linn} % Tabular lining numbers
+\def\resetfeat{\ffsetV{feat}{}\ffsetX}
+
+% Bold variants
+\def\bmed {\ffsetV{bold}{Medium}\ffsetX}
+\def\bsemi{\ffsetV{bold}{SemiBold}\ffsetX}
+\def\bext {\ffsetV{bold}{ExtraBold}\ffsetX}
+\resetbold %% Default bold is Bold
+
+\ismacro\fotenc{U}\iftrue
+
+ % Figures
+ \def\tabn{\ffsetV{tabn}{;+tnum}\ffsetX} \def\propn{\ffsetV{tabn}{;+pnum}\ffsetX}
+ \def\linn{\ffsetV{numb}{;+lnum}\ffsetX} \def\oldn {\ffsetV{numb}{;+onum}\ffsetX}
+ \resetnum
+
+ % Features
+ \def\caps {\ffsetV{feat}{;+smcp}\ffsetX}
+ \def\swash{\ffsetV{feat}{;+swsh}\ffsetX}
+ \resetfeat
+
+ \def\ffnamegen{"[EBGaramond-\ffvarV]:\fontfeatures\tabnV\numbV\featV"}
+ \useff{+kern;+liga}\fam % Load default \tenrm, \tenbf, \tenit and \tenbi
+
+\else %% Classic TeX Fonts
+
+ \ismacro\fotenc{8t}\iftrue \def\ffenc{t1}\fi
+ \ismacro\fotenc{7t}\iftrue \def\ffenc{ot1}\fi
+
+ % Figures
+ \def\tabn{\ffsetV{tabn}{t}\ffsetX} \def\propn{\ffsetV{tabn}{}\ffsetX}
+ \def\linn{\ffsetV{numb}{lf}\ffsetX} \def\oldn {\ffsetV{numb}{osf}\ffsetX}
+ \resetnum
+
+ % Features
+ \def\caps {\ffsetV{feat}{-sc}\ffsetX}
+ \def\swash{\ffsetV{feat}{-swash}\ffsetX}
+ \resetfeat
+
+ \def\ffnamegen{EBGaramond-\ffvarV-\tabnV\numbV\featV-\ffenc}
+ \ffsetX\fam % Load default \tenrm, \tenbf, \tenit and \tenbi
+
+ \input exchars % 7c encoding implemented by exchars macro
+ \def\setexfamilyG #1 #2 {% Set EBGaramond Family: #1 = figures; #2 = features
+ \setexfont {EBGaramond-Regular-#1#2-\ffenc} TS1 EBGaramond-Regular-#1-ts1
+ \setexfont {EBGaramond-Medium-#1#2-\ffenc} TS1 EBGaramond-Medium-#1-ts1
+ \setexfont {EBGaramond-SemiBold-#1#2-\ffenc} TS1 EBGaramond-SemiBold-#1-ts1
+ \setexfont {EBGaramond-Bold-#1#2-\ffenc} TS1 EBGaramond-Bold-#1-ts1
+ \setexfont {EBGaramond-ExtraBold-#1#2-\ffenc} TS1 EBGaramond-ExtraBold-#1-ts1
+ \setexfont {EBGaramond-Italic-#1#2-\ffenc} TS1 EBGaramond-Italic-#1-ts1
+ \setexfont {EBGaramond-MediumItalic-#1#2-\ffenc} TS1 EBGaramond-MediumItalic-#1-ts1
+ \setexfont {EBGaramond-SemiBoldItalic-#1#2-\ffenc} TS1 EBGaramond-SemiBoldItalic-#1-ts1
+ \setexfont {EBGaramond-BoldItalic-#1#2-\ffenc} TS1 EBGaramond-BoldItalic-#1-ts1
+ \setexfont {EBGaramond-ExtraBoldItalic-#1#2-\ffenc} TS1 EBGaramond-ExtraBoldItalic-#1-ts1
+ }
+ \setexfamilyG lf {} \setexfamilyG lf -sc \setexfamilyG lf -swash
+ \setexfamilyG tlf {} \setexfamilyG tlf -sc \setexfamilyG tlf -swash
+ \setexfamilyG osf {} \setexfamilyG osf -sc \setexfamilyG osf -swash
+ \setexfamilyG tosf {} \setexfamilyG tosf -sc \setexfamilyG tosf -swash
+
+ \ifx\mubyte\undefined \else \mubyte\euro ^^e2^^82^^ac\endmubyte \fi
+ \let\euro=\exeuro
+
+\fi
+\tenrm % don't remember to initialize the family with normal font.
+
+\ifx\loadmathfonts\relax \endinput \fi
+\ifx\mathpreloaded X\else \input tx-math \fi
+
+\endinput
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+This file implements EBGaramond font support for plainTeX.
+
+ Requirements
+--------------
+This file needs three packages from CTAN.
+The "ebgaramond" package for the base font files.
+And also ffmac and tx-math macro from the "csplain" package.
+
+ Supported switches
+--------------------
+\bmed......Set default bold to Medium.
+\bsemi.....Set default bold to SemiBold.
+\bext......Set default bold to BoldExtended.
+\linn......Lining numbers. All numbers are on the baseline.
+\oldn......Old style numbers.
+\tabn......Tabular numbers. All number have the same width.
+\propn.....Proportional numbers.
+\caps......Small Caps.
+\swash.....Swash on some glyphs.
+
+We can reset feature groups to font default by:
+\resetbold...Reset default bold.
+\resetnum....Reset number options.
+\resetfeat...Reset features.
+
+ Omitted features
+-----------------
+I decided to omit upper and lower indexes as we can do this
+via TeXs math mode. Additionally that features doesn't worked
+with the whole T1 encoding and so their usage was very limited.
+
+Also omitted is the "titling" style (OpenType "case" font feature),
+because I haven't noticed any change over the original font.
+Maybe this is bug in the font OTF sources...
+
+In T1 code there is no space for additional "st" and other
+discretionary ligatures that are set with the \swash switch.
+To match T1 visual style the "dlig" font feature was omitted
+in Unicode fonts. Users of Unicode TeX can turn it on with
+\useff{+dlig} if they want. Then it matches the 7t encoding.
+
+ Math support
+--------------
+Default math uses the TX-Math macro which uses italic
+instead of math italic to match the text font. The results
+are good and usable, but far from perfect...
+
+There is also math package for this font "ebgaramond-maths".
+Unfortunately it replaces only math italic font, and only a part,
+so we get only a better Greek alphabet. Symbols as vector arrow
+are missing, so this will not work anymore and other problems.
+If you want a better matching Greek glyphs you can still use it.
+
+ \input cs-ebgaramond
+ \ffalias {txr}{EBGaramond-Regular-lf-ot1}
+ \ffalias{txmi}{EBGaramond12-Italic--oml-ebgaramond} % ebgaramond-maths
+
+But be warned about problems and missing glyphs.
+In the future I will try to make a math font macro for this font.
+
+If we use Unicode TeX we can use Uni-Math and Garamond-Math.otf font
+from "Garamond-Math" package that perfectly matches. But the math font
+is under development and can have bugs or other problems.
+ But tests showed that it works very nice!
+
+ \let\loadmathfonts=\relax
+ \input cs-ebgaramond
+ \def\unimathfont{[Garamond-Math]}
+ \input uni-math
+
+"ebgaramond-math" is also a CTAN package.
+
+ Limitations
+-------------
+One limitation is, that if we use \tabn\linn\caps
+we get old style tabular lining numbers and not lining tabular normal numbers.
+This problem/inconsistency came from the base *.otf files.
+
+The TS1 fonts has many holes.
+
+Some imperfections in math mode due the used TX-Math font.
+
+
+%%%%%%%%%%%%%% History of versions:
+
+Apr.2019 First version of this font file.
+
+%%%%%%%%%%%%%% EOF cs-ebgaramond.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/exchars.tex new/texmf-dist/tex/csplain/fonts/exchars.tex
--- old/texmf-dist/tex/csplain/fonts/exchars.tex 2016-05-10 23:27:39.000000000 +0200
+++ new/texmf-dist/tex/csplain/fonts/exchars.tex 2019-05-01 00:33:28.000000000 +0200
@@ -77,15 +77,15 @@
\declexfamily cs-qagr Adventor {\setexfamilyB qag r b ri bi cs }
\declexfamily cs-qbkr Bonum {\setexfamilyB qbk r b ri bi cs }
\declexfamily cs-qhvr Heros {\setexfamilyB qhv r b ri bi cs }
-\declexfamily cs-qcsr Pagella {\setexfamilyB qcs r b ri bi cs }
-\declexfamily cs-qplr Schola {\setexfamilyB qpl r b ri bi cs }
+\declexfamily cs-qcsr Schola {\setexfamilyB qcs r b ri bi cs }
+\declexfamily cs-qplr Pagella {\setexfamilyB qpl r b ri bi cs }
\declexfamily cs-qcrr Cursor {\setexfamilyB qcr r b ri bi cs }
\declexfamily ec-qtmr Termes {\setexfamilyB qtm r b ri bi ec }
\declexfamily ec-qagr Adventor {\setexfamilyB qag r b ri bi ec }
\declexfamily ec-qbkr Bonum {\setexfamilyB qbk r b ri bi ec }
\declexfamily ec-qhvr Heros {\setexfamilyB qhv r b ri bi ec }
-\declexfamily ec-qcsr Pagella {\setexfamilyB qcs r b ri bi ec }
-\declexfamily ec-qplr Schola {\setexfamilyB qpl r b ri bi ec }
+\declexfamily ec-qcsr Schola {\setexfamilyB qcs r b ri bi ec }
+\declexfamily ec-qplr Pagella {\setexfamilyB qpl r b ri bi ec }
\declexfamily ec-qcrr Cursor {\setexfamilyB qcr r b ri bi ec }
\declexfamily cs-lmr10 LMfonts {\setexfamilyB lm r10 bx10 ri10 bxi10 cs }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/luafonts.tex new/texmf-dist/tex/csplain/fonts/luafonts.tex
--- old/texmf-dist/tex/csplain/fonts/luafonts.tex 2016-05-12 23:32:17.000000000 +0200
+++ new/texmf-dist/tex/csplain/fonts/luafonts.tex 2019-05-01 00:33:28.000000000 +0200
@@ -9,8 +9,8 @@
\ifeof15 \else \closein15 %%%%%%%%%%%%% ltluatex exists
\expandafter\ifx\csname e@alloc@attribute@count\endcsname \relax
- \csname newcount\expandafter \endcsname \csname e@alloc@attribute@count\endcsname \fi
-\csname e@alloc@attribute@count\endcsname=-1
+ \csname newcount\expandafter \endcsname \csname e@alloc@attribute@count\endcsname
+ \csname e@alloc@attribute@count\endcsname=-1 \fi
\message{processing ltluatex.lua (3)}
\directlua{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/uni-math.tex new/texmf-dist/tex/csplain/fonts/uni-math.tex
--- old/texmf-dist/tex/csplain/fonts/uni-math.tex 2016-06-07 01:01:45.000000000 +0200
+++ new/texmf-dist/tex/csplain/fonts/uni-math.tex 2019-05-01 00:33:28.000000000 +0200
@@ -1,8 +1,8 @@
% uni-math.tex
-%%%%%%%%%%%%%%%%%%
-% Petr Olsak 2016
+%%%%%%%%%%%%%%%%%%%%%%%%
+% Petr Olsak 2016, 2019
-\def\unimathversion{May 2016} % Warning: this is at beta testing state
+\def\unimathversion{Mar. 2019} % Warning: this is at beta testing state
% Macros for loading Unicode math fonts in XeTeX or LuaTeX
@@ -26,7 +26,11 @@
\fi\fi % lua code to re-define \font primitive
\def\umathname#1#2{"#1:\mfontfeatures#2"}
-\def\mfontfeatures{mode=base;script=math;}
+\ifx\directlua\undefined
+ \def\mfontfeatures{script=math;} % XeTeX
+\else
+ \def\mfontfeatures{mode=base;script=math;} % LuaTeX
+\fi
\ifx\unimathfont\relax\else % \relax ... font will be declared later
\ifx\unimathfont\undefined \def\unimathfont{??}\fi
@@ -37,12 +41,15 @@
\message{uni-math WARNING: \string\unimathfont{\unimathfont} isn't loadable.}
\bgroup
\toks0={Examples:^^J
- \def\unimathfont{[xits-math]} ... XITS MATH^^J
+ \def\unimathfont{[XITSMath-Regular]} ... XITS MATH^^J
\def\unimathfont{[latinmodern-math]} ... Latin Modern Math^^J
\def\unimathfont{[texgyretermes-math]} ... TeXGyre Termes Math^^J
\def\unimathfont{[texgyrebonum-math]} ... TeXGyre Bonum Math^^J
\def\unimathfont{[texgyrepagella-math]} ... TeXGyre Pagella Math^^J
\def\unimathfont{[texgyreschola-math]} ... TeXGyre Schola Math^^J
+ \def\unimathfont{[texgyredejavu-math]} ... TeXGyre DeJaVu Math^^J
+ \def\unimathfont{[LibertinusMath-Regular]} ... Libertinus Math^^J
+ \def\unimathfont{[FiraMath-Regular]} ... Fira Math^^J
\def\unimathfont{[Asana-Math]} ... Asana Math^^J
\let\unimathfont=\relax ... Don't load the font right now.^^J
Note brackets if direct file name is used. Don't use quotes "...".
@@ -170,7 +177,7 @@
\chardef\ncharsnA="1D5A0 \chardef\ncharsna="1D5BA
\chardef\ncharbsA="1D5D4 \chardef\ncharbsa="1D5EE
\chardef\ncharsiA="1D608 \chardef\ncharsia="1D622
-\chardef\ncharsxA="1D63C \chardef\ncharbsx="1D656
+\chardef\ncharsxA="1D63C \chardef\ncharsxa="1D656
\chardef\ncharttA="1D670 \chardef\nchartta="1D68A
\protected\def\rmvariables {\umathrange{A-Z}\ncharrmA \umathrange{a-z}\ncharrma}
@@ -264,7 +271,7 @@
}
\catcode`#=14
\everypar={\setbox0=\lastbox \par \p}
- \input MathClass.txt
+ \input MathClass-15.txt
\endgroup
\begingroup % \input unicode-math-table.tex:
@@ -314,7 +321,91 @@
\def\overrightarrow {\Umathaccent 7 1 "020D7 }
\def\overleftrightarrow {\Umathaccent 7 1 "020E1 }
-\let\loadmathfonts=\relax % we need no more 8bit math fonts
+% corrections:
+
+\mathchardef\ldotp="612E
+\let\|=\Vert
+
+\let\setminus=\smallsetminus
+\let\diamond=\smwhtdiamond
+\let\bullet=\smblkcircle
+\let\circ=\vysmwhtcircle
+\let\bigcirc=\mdlgwhtcircle
+\let\to=\rightarrow
+\let\le=\leq
+\let\ge=\geq
+\let\neq=\ne
+\protected\def\triangle{\mathord{\bigtriangleup}}
+\let\emptyset=\varnothing
+\let\hbar=\hslash
+\let\land=\wedge
+\let\lor=\vee
+\let\owns=\ni
+\let\gets=\leftarrow
+\let\mathring=\ocirc
+\let\lnot=\neg
+\let\longdivision=\longdivisionsign
+\let\backepsilon=\upbackepsilon
+\let\eth=\matheth
+\let\dbkarow=\dbkarrow
+\let\drbkarow=\drbkarrow
+\let\hksearow=\hksearrow
+\let\hkswarow=\hkswarrow
+
+\let\varepsilon=\epsilon
+\let\upalpha=\mupalpha
+\let\upbeta=\mupbeta
+\let\upgamma=\mupgamma
+\let\updelta=\mupdelta
+\let\upepsilon=\mupvarepsilon
+\let\upvarepsilon=\mupvarepsilon
+\let\upzeta=\mupzeta
+\let\upeta=\mupeta
+\let\uptheta=\muptheta
+\let\upiota=\mupiota
+\let\upkappa=\mupkappa
+\let\uplambda=\muplambda
+\let\upmu=\mupmu
+\let\upnu=\mupnu
+\let\upxi=\mupxi
+\let\upomicron=\mupomicron
+\let\uppi=\muppi
+\let\uprho=\muprho
+\let\upvarrho=\mupvarrho
+\let\upvarsigma=\mupvarsigma
+\let\upsigma=\mupsigma
+\let\uptau=\muptau
+\let\upupsilon=\mupupsilon
+\let\upvarphi=\mupvarphi
+\let\upchi=\mupchi
+\let\uppsi=\muppsi
+\let\upomega=\mupomega
+\let\upvartheta=\mupvartheta
+\let\upphi=\mupphi
+\let\upvarpi=\mupvarpi
+
+\protected\def\not#1{%
+ \expandafter\ifx \csname not!\string#1\endcsname \relax
+ \mathrel{\mathord{\rlap{\kern1pt/}}\mathord{#1}}%
+ \else \csname not!\string#1\endcsname
+ \fi
+}
+\def\negationof#1#2{\expandafter\let \csname not!\string#1\endcsname =#2}
+\negationof = \neq
+\negationof < \nless
+\negationof > \ngtr
+\negationof \gets \nleftarrow
+\negationof \simeq \nsime
+\negationof \equal \ne
+\negationof \le \nleq
+\negationof \ge \ngeq
+\negationof \greater \ngtr
+\negationof \forksnot \forks
+\negationof \in \notin
+
+% we need no more 8bit math fonts
+
+\let\loadmathfonts=\relax
\endinput
@@ -335,7 +426,18 @@
by:
\def\boldmath{%
- \loadumathfamily 1 {[xits-mathbold]}{} % Base font
+ \loadumathfamily 1 {[xitsmath-bold]}{} % Base font
+ \loadmathfamily 4 rsfs % script
+ \setmathdimens
+}
+
+XITSmath-bold needs correction: the norm symbol ||x|| is missing here. So, you
+can define:
+
+\def\boldmath{%
+ \loadumathfamily 1 {[xitsmath-bold]}{} % Base font
\loadmathfamily 4 rsfs % script
+ \loadumathfamily 5 {[xitsmath-regular]}{}
+ \def\|{\Udelimiter 0 5 "02016 }% % norm delimiter from family 5
\setmathdimens
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/fontfam-global.tex new/texmf-dist/tex/csplain/opmac/fontfam-global.tex
--- old/texmf-dist/tex/csplain/opmac/fontfam-global.tex 2016-06-07 01:01:45.000000000 +0200
+++ new/texmf-dist/tex/csplain/opmac/fontfam-global.tex 2019-05-01 00:33:28.000000000 +0200
@@ -46,6 +46,11 @@
\setfontfam [Heuristica] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t U) {\input cs-heuristica}
\setfontfam [Baskervald X] {\caps} {\rm \it \bf \bi} {} {TX} (8t U) {\input cs-baskerx}
\famalias{baskervald}{baskervaldx}
+\setfontfam [EB Garamond] {\bmed \bsemi \bext \linn \oldn \tabn \propn \caps \swash}
+ {\rm \it \bf \bi} {} {TX} (8t 7t U) {\input cs-ebgaramond}
+\famalias{gramanond}{ebgaramond}
+
+
\setfontfam [Linux Libertine] {\mono \sans \caps} {\rm \it \bf \bi} {} {TX} (U sU) {\input cs-libertine}
\famalias{libertine}{linuxlibertine} \famalias{linlibertine}{linuxlibertine}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/opmac-xetex.tex new/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
--- old/texmf-dist/tex/csplain/opmac/opmac-xetex.tex 2016-03-12 00:39:54.000000000 +0100
+++ new/texmf-dist/tex/csplain/opmac/opmac-xetex.tex 2020-02-13 23:09:47.000000000 +0100
@@ -53,9 +53,10 @@
% \pdfcolorstack is implemented by \special{color push <text>} and \special{color pop}
-\def\colorstackpush#1{\colorspecialinit \special{color push cmyk #1}}
+\def\formatcmyk#1{cmyk #1} \def\formatrgb#1{rgb #1} \def\pdfblackcolor{gray 0}
+\def\colorstackpush#1{\colorspecialinit \special{color push #1}}
\def\colorstackpop{\special{color pop}}
-\def\colorstackset#1{\colorspecialinit \special{color pop}\special{color push cmyk #1}}
+\def\colorstackset#1{\colorspecialinit \special{color pop}\special{color push #1}}
\def\colorspecialinit{\special{color push gray 0}\gdef\colorspecialinit{}}
%\def\special#1{\message{special:{#1}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/opmac.tex new/texmf-dist/tex/csplain/opmac/opmac.tex
--- old/texmf-dist/tex/csplain/opmac/opmac.tex 2019-03-13 21:56:52.000000000 +0100
+++ new/texmf-dist/tex/csplain/opmac/opmac.tex 2020-04-12 23:29:46.000000000 +0200
@@ -5,7 +5,7 @@
%% The history of versions is at the end of this file, after \endpinput
\ifx\OPmacversion\undefined \else \endinput \fi
-\def\OPmacversion{Mar. 2019}
+\def\OPmacversion{Apr. 2020}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -861,32 +861,38 @@
\def\White{\setcmykcolor{0 0 0 0}}
\def\Grey{\setcmykcolor{0 0 0 0.5}}
\def\LightGrey{\setcmykcolor{0 0 0 0.2}}
-\def\Black{\setcmykcolor{0 0 0 1}}
+\def\Black{\setcolor{\pdfblackcolor}}
-\def\setcmykcolor#1{\global\let\ensureblacko=\ensureblackoA
+\def\setcmykcolor#1{\setcolor{\formatcmyk{#1}}}
+\def\setrgbcolor#1{\setcolor{\formatrgb{#1}}}
+\def\formatcmyk#1{#1 k #1 K}
+\def\formatrgb#1{#1 rg #1 RG}
+
+\def\setcolor#1{\global\let\ensureblacko=\ensureblackoA
\iflocalcolor \edef\currentcolor{#1}\colorstackpush\currentcolor \aftergroup\colorstackpop
\else \xdef\currentcolor{#1}\colorstackset\currentcolor \fi
}
-\def\pdfblackcolor{0 0 0 1}
-\xdef\currentcolor{\pdfblackcolor}
+
+\def\pdfblackcolor{0 g 0 G}
+\edef\currentcolor{\pdfblackcolor}
\def\ensureblacko#1{#1}
\def\ensureblackoA#1{\colorstackpush\pdfblackcolor #1\colorstackpop}
\ifx\pdfcolorstackinit\undefined
- \def\colorstackpush#1{\pdfliteral{#1 k #1 K}}
+ \def\colorstackpush#1{\pdfliteral{#1}}
\def\colorstackpop{\colorstackpush\currentcolor}
\let\colorstackset=\colorstackpush
\else
- \mathchardef\colorstackcnt=\pdfcolorstackinit page {0 g 0 G}
- \def\colorstackpush#1{\pdfcolorstack\colorstackcnt push{#1 k #1 K}}
+ \mathchardef\colorstackcnt=0 % Implicit stack usage
+ \def\colorstackpush#1{\pdfcolorstack\colorstackcnt push{#1}}
\def\colorstackpop{\pdfcolorstack\colorstackcnt pop}
- \def\colorstackset#1{\pdfcolorstack\colorstackcnt set{#1 k #1 K}}
+ \def\colorstackset#1{\pdfcolorstack\colorstackcnt set{#1}}
\fi
-\addprotect\setcmykcolor \addprotect\localcolor \addprotect\longlocalcolor
+\addprotect\setcolor \addprotect\localcolor \addprotect\longlocalcolor
\ifpdftex\else
- \def\setcmykcolor#1{} \def\pdfliteral#1{}
+ \def\setcolor#1{} \def\pdfliteral#1{}
\fi
\def\draft{\addto\prepghook{\draftbox{\tenbf DRAFT}\nointerlineskip}}
@@ -1166,20 +1172,21 @@
\def\scantabdata#1{\let\next=\scantabdata
\ifx\relax#1\let\next=\relax
\else\ifx|#1\addtabvrule
- \else\isinlist{123456789}#1\iftrue \def\next{\scantabdataC#1}%
- \else \expandafter\ifx\csname tabdeclare#1\endcsname \relax
- \expandafter\ifx\csname paramtabdeclare#1\endcsname \relax
- \opwarning{tab-declarator "#1" unknown, ignored}%
- \else \def\next{\expandafter \scantabdataB \csname paramtabdeclare#1\endcsname}\fi
- \else \def\next{\expandafter\scantabdataA \csname tabdeclare#1\endcsname}%
- \fi\fi\fi\fi \next
+ \else\ifx(#1\def\next{\scantabdataE}%
+ \else\isinlist{123456789}#1\iftrue \def\next{\scantabdataC#1}%
+ \else \expandafter\ifx\csname tabdeclare#1\endcsname \relax
+ \expandafter\ifx\csname paramtabdeclare#1\endcsname \relax
+ \opwarning{tab-declarator "#1" unknown, ignored}%
+ \else \def\next{\expandafter\scantabdataB\csname paramtabdeclare#1\endcsname}\fi
+ \else \def\next{\expandafter\scantabdataA \csname tabdeclare#1\endcsname}%
+ \fi\fi\fi\fi\fi \next
}
\def\scantabdataA#1{\addtabitem \expandafter\addtabdata\expandafter{#1\tabstrutA}\scantabdata}
\def\scantabdataB#1#2{\addtabitem\expandafter\addtabdata\expandafter{#1{#2}\tabstrutA}\scantabdata}
\def\scantabdataC {\def\tmpb{}\afterassignment\scantabdataD \tmpnum=}
\def\scantabdataD#1{\loop \ifnum\tmpnum>0 \advance\tmpnum by-1 \addto\tmpb{#1}\repeat
- \expandafter\scantabdata\tmpb
-}
+ \expandafter\scantabdata\tmpb}
+\def\scantabdataE#1){\addtabdata{#1}\scantabdata}
\def\tabdeclarec{\tabiteml\hfil##\unsskip\hfil\tabitemr}
\def\tabdeclarel{\tabiteml##\unsskip\hfil\tabitemr}
\def\tabdeclarer{\tabiteml\hfil##\unsskip\tabitemr}
@@ -1223,16 +1230,11 @@
\vbox to\tmpdim{}\ddlinedata \crcr \noalign{\gdef\tabstrutA{\tabstrut}}}
\def\mspan{\omit \tabdata={\tabstrut}\let\tmpa=\relax \afterassignment\mspanA \mscount=}
-\def\mspanA[#1]{\loop \ifnum\mscount>1 \csname span\endcsname \omit \advance\mscount by-1 \repeat
- \mspanB#1\relax}
-\def\mspanB#1{\ifx\relax#1\def\tmpa{\def\tmpa####1}%
- \expandafter\tmpa\expandafter{\the\tabdata\ignorespaces}\expandafter\tmpa\else
- \ifx |#1\ifx\tmpa\vrule\addtabdata{\kern\vvkern}\fi \addtabdata{\vrule}\let\tmpa=\vrule
- \else \let\tmpa=\relax
- \ifx c#1\addtabdata{\tabiteml\hfil\ignorespaces##1\unsskip\hfil\tabitemr}\fi
- \ifx l#1\addtabdata{\tabiteml\ignorespaces##1\unsskip\hfil\tabitemr}\fi
- \ifx r#1\addtabdata{\tabiteml\hfil\ignorespaces##1\unsskip\tabitemr}\fi
- \fi \expandafter\mspanB \fi}
+\def\mspanA[#1]#2{\loop \ifnum\mscount>1 \csname span\endcsname \omit \advance\mscount -1 \repeat
+ \colnum=0 \def\tmpa{}\tabdata={}\scantabdata#1\relax
+ \setbox0=\vbox{\halign\expandafter{\the\tabdata\cr#2\cr}\global\setbox8=\lastbox}%
+ \setbox0=\hbox{\unhbox8 \unskip \global\setbox8=\lastbox}%
+ \unhbox8 \ignorespaces}
\newdimen\drulewidth \drulewidth=0.4pt
\let\orihrule=\hrule \let\orivrule=\vrule
@@ -1311,19 +1313,17 @@
\newcount\fnotenumlocal
\newif\iflocfnum \locfnumtrue
-\long\def\fnote#1{\global\advance \fnotenum by1 \leavevmode
+\long\def\fnoteG#1#2{\global\advance \fnotenum by1
+ \ifx\relax#1\relax\else\leavevmode\fi
\iflocfnum \openref\wref\Xfnote{}%
\isdefined{fn:\the\fnotenum}\iftrue
\else\opwarning{unknown \noexpand\fnote mark. TeX me again}\fi\fi
- \fnmarkx{\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}%
-}
-\def\fnotemark#1{{\advance\fnotenum by#1\relax
- \isdefined{fn:\the\fnotenum}\iftrue\thefnote
- \else$^?$\opwarning{unknown \string\fnotemark. TeX me again}\fi}%
-}
-\long\def\fnotetext#1{\global\advance \fnotenum by1 \openref\wref\Xfnote{}%
- {\everypar={}\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}%
+ #1{\everypar={}\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#2}}%
}
+\def\fnote{\fnoteG\fnmarkx}
+\def\fnotetext{\fnoteG{}}
+
+\def\fnotemark#1{{\advance\fnotenum by#1\relax \fnmarkx}}
\def\fnmarkx{\isdefined{fn:\the\fnotenum}\iftrue\thefnote\else$^?$\fi}
\def\thefnote{$^{\locfnum}$}
\def\locfnum{\csname fn:\the\fnotenum\endcsname}
@@ -1337,7 +1337,7 @@
\newdimen\mnoteskip \mnoteskip=0pt
\long\def\mnote#1{\ifvmode \hbox{\vbox to\ht\strutbox{}\mnoteA{#1}}\nobreak\vskip-\baselineskip
- \else \strut\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}%
+ \else \lower\dp\strutbox\hbox{}\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}%
\fi
}
\long\def\mnoteA#1{\global\advance \mnotenum by1
@@ -1857,6 +1857,12 @@
\boxlines added.
\titskip introduced.
\fnote corrected: \iflocfnum\openref.
+May 2019 \table declarator () added.
+Jun. 2019 \mspan improved.
+Jul. 2019 \fnoteG introduced, \fnotemark bug fixed (if \runningfnotes).
+ \colorstackcnt=0 used, \setrgbcolor, \formatcmyk, \formatrgb introduced.
+Apr. 2020 \mnote: \strut -> \lower\dp\strutbox\hbox{}
+ \mspan: \cr#2\crcr -> \cr#2\cr (empty text must be formated too)
%%%%%%%%%%%%%% End of opmac.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csplain.tlpobj new/tlpkg/tlpobj/csplain.tlpobj
--- old/tlpkg/tlpobj/csplain.tlpobj 2019-03-25 02:25:11.000000000 +0100
+++ new/tlpkg/tlpobj/csplain.tlpobj 2020-04-13 01:54:51.000000000 +0200
@@ -1,6 +1,6 @@
name csplain
category Package
-revision 50572
+revision 54699
shortdesc Plain TeX multilanguage support
longdesc CSplain is a small extension of basic Plain TeX macros, the
longdesc formats csplain and pdfcsplain can be generated. It supports:
@@ -20,6 +20,7 @@
depend tex
depend cm
depend cs
+depend hyph-utf8
depend hyphen-base
depend plain
depend enctex
@@ -27,12 +28,12 @@
depend luatex
depend luatex85
depend csplain.ARCH
-execute AddFormat name=csplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyphen-base,plain,enctex
-execute AddFormat name=pdfcsplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyphen-base,plain,enctex,tex-ini-files
-execute AddFormat name=luacsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyphen-base,plain,tex-ini-files,luatex,luatex85
-execute AddFormat name=pdfcsplain engine=xetex options="-etex csplain.ini" fmttriggers=cm,cs,hyphen-base,plain
-execute AddFormat name=pdfcsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyphen-base,plain,tex-ini-files,luatex,luatex85
-runfiles size=213
+execute AddFormat name=csplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,enctex
+execute AddFormat name=pdfcsplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,enctex,tex-ini-files
+execute AddFormat name=luacsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,tex-ini-files,luatex,luatex85
+execute AddFormat name=pdfcsplain engine=xetex options="-etex csplain.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain
+execute AddFormat name=pdfcsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,tex-ini-files,luatex,luatex85
+runfiles size=216
texmf-dist/tex/csplain/base/csenc-k.tex
texmf-dist/tex/csplain/base/csenc-p.tex
texmf-dist/tex/csplain/base/csenc-u.tex
@@ -76,6 +77,7 @@
texmf-dist/tex/csplain/fonts/cs-bonum.tex
texmf-dist/tex/csplain/fonts/cs-charter.tex
texmf-dist/tex/csplain/fonts/cs-cursor.tex
+ texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex
texmf-dist/tex/csplain/fonts/cs-heros.tex
texmf-dist/tex/csplain/fonts/cs-heuristica.tex
texmf-dist/tex/csplain/fonts/cs-iwona.tex
@@ -115,6 +117,5 @@
texmf-dist/tex/csplain/opmac/pdfuni.tex
catalogue-contact-home http://petr.olsak.net/csplain-e.html
catalogue-ctan /macros/cstex/base/csplain.tar.gz
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license other-free
catalogue-topics czech slovak format
++++++ csquotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csquotes/README.md new/doc/latex/csquotes/README.md
--- old/doc/latex/csquotes/README.md 2016-02-02 00:01:46.000000000 +0100
+++ new/doc/latex/csquotes/README.md 2019-12-07 00:10:42.000000000 +0100
@@ -16,7 +16,7 @@
## License
-Copyright (c) 2003-2011 Philipp Lehman, 2015 Joseph Wright.
+Copyright (c) 2003-2011 Philipp Lehman, 2015-2019 Joseph Wright.
Permission is granted to copy, distribute and/or modify this
software under the terms of the LaTeX Project Public License (LPPL),
version 1.3c or any later version.
Binary files old/doc/latex/csquotes/csquotes.pdf and new/doc/latex/csquotes/csquotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csquotes/csquotes.tex new/doc/latex/csquotes/csquotes.tex
--- old/doc/latex/csquotes/csquotes.tex 2018-05-02 19:53:44.000000000 +0200
+++ new/doc/latex/csquotes/csquotes.tex 2019-12-07 00:10:42.000000000 +0100
@@ -18,8 +18,8 @@
url={http://www.ctan.org/pkg/csquotes/},
author={Philipp Lehman, Joseph Wright},
email={joseph.wright@morningstar2.co.uk},
- revision={v5.2d},
- date={2018/04/13}}
+ revision={v5.2j},
+ date={2019-12-06}}
\hypersetup{%
pdftitle={The csquotes Package},
@@ -110,7 +110,7 @@
\subsection{License}
-Copyright © 2003--2011 Philipp Lehman, 2015--2018 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/}
+Copyright © 2003--2011 Philipp Lehman, 2015--2019 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/}
\subsection{Contributions}
@@ -136,32 +136,36 @@
\optitem[tryonce]{autostyle}{\opt{true}, \opt{false}, \opt{try}, \opt{once}, \opt{tryonce}}
-This option controls multilingual support. It requires either the \sty{babel} package or the \sty{polyglossia} package.\footnote{Note that \sty{polyglossia} support is currently in a preliminary state because \sty{polyglossia} is lacking a proper interface for other packages. In practice, this means that \sty{csquotes} can detect the language (\eg \texttt{english}) but not the language variant (\eg \texttt{british}).} \kvopt{autostyle}{true} continuously adapts the quote style to the current document language; \opt{once} will only adapt the style once so that it matches the main language of the document. \kvopt{autostyle}{try} and \opt{tryonce} are similar to \opt{true} and \opt{once} if multilingual support is available but will not issue any warnings if not (\ie if neither \sty{babel} nor \sty{polyglossia} have been loaded). The short form \opt{autostyle} is equivalent to \kvopt{autostyle}{true}. See also \secref{bas:set}.
+This option controls multilingual support. It requires either the \sty{babel} package or the \sty{polyglossia} package.\footnote{Note that \sty{polyglossia} support requires \sty{polyglossia}~v1.45 (2019/10/27) or above. With older \sty{polyglossia} versions language variants will not be detected as expected.} \kvopt{autostyle}{true} continuously adapts the quote style to the current document language; \opt{once} will only adapt the style once so that it matches the main language of the document. \kvopt{autostyle}{try} and \opt{tryonce} are similar to \opt{true} and \opt{once} if multilingual support is available but will not issue any warnings if not (\ie if neither \sty{babel} nor \sty{polyglossia} have been loaded). The short form \opt{autostyle} is equivalent to \kvopt{autostyle}{true}. See also \secref{bas:set}.
\begin{table}
-\tablesetup
-\begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
- \toprule
- \multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
- \cmidrule(r){1-1}\cmidrule{2-2}
- austrian & quotes, guillemets \\
- croatian & quotes, guillemets, guillemets\*\\
- czech & quotes, guillemets \\
- danish & quotes, guillemets, topquotes \\
- english & american, british\\
- french & quotes, quotes\*, guillemets, guillemets\*\\
- galician & quotes, guillemets \\
- german & quotes, guillemets, swiss \\
- italian & guillemets, quotes \\
- latvian & \\
- norwegian & guillemets, quotes \\
- portuguese & portuguese, brazilian \\
- spanish & spanish, mexican \\
- swedish & quotes, guillemets, guillemets\*\\
- \bottomrule
-\end{tabularx}
-\caption[Language Options]{Language Options Defined by Default}
-\label{tab:lng}
+ \tablesetup
+ \begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
+ \toprule
+ \multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
+ \cmidrule(r){1-1}\cmidrule{2-2}
+ austrian & quotes, guillemets \\
+ croatian & quotes, guillemets, guillemets\* \\
+ czech & quotes, guillemets \\
+ danish & quotes, guillemets, topquotes \\
+ english & american, british \\
+ estonian & \\
+ french & quotes, quotes\*, guillemets, guillemets\* \\
+ galician & quotes, guillemets \\
+ german & quotes, guillemets, swiss \\
+ hungarian & \\
+ italian & guillemets, quotes \\
+ latvian & \\
+ norwegian & guillemets, quotes \\
+ polish & guillemets, guillemets\* \\
+ portuguese & portuguese, brazilian \\
+ serbian & quotes, guillemets, german \\
+ spanish & spanish, mexican \\
+ swedish & quotes, guillemets, guillemets\* \\
+ \bottomrule
+ \end{tabularx}
+ \caption[Language Options]{Language Options Defined by Default}
+ \label{tab:lng}
\end{table}
\varitem{language}{\prm{variant}}
@@ -629,31 +633,32 @@
If available, this package will load the configuration file \path{csquotes.cfg}. You may use this file to define new quote styles and aliases or redefine existing ones.
\begin{table}
-\tablesetup
-\begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
- \toprule
- \multicolumn{1}{@{}H}{Quote style} & \multicolumn{1}{@{}H}{Style variants} \\
- \cmidrule(r){1-1}\cmidrule{2-2}
- austrian & quotes, guillemets \\
- croatian & quotes, guillemets, guillemets\*\\
- czech & quotes, guillemets \\
- danish & quotes, guillemets \\
- dutch & -- \\
- english & american, british\\
- finnish & -- \\
- french & quotes, quotes\*, guillemets, guillemets\*\\
- german & quotes, guillemets, swiss \\
- greek & -- \\
- italian & guillemets, quotes \\
- norwegian & guillemets, quotes \\
- portuguese & portuguese, brazilian \\
- russian & -- \\
- spanish & spanish, mexican \\
- swedish & quotes, guillemets, guillemets\*\\
- \bottomrule
-\end{tabularx}
-\caption[Styles and Variants]{Quote Styles and Style Variants Defined by Default}
-\label{tab:sty}
+ \tablesetup
+ \begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
+ \toprule
+ \multicolumn{1}{@{}H}{Quote style} & \multicolumn{1}{@{}H}{Style variants} \\
+ \cmidrule(r){1-1}\cmidrule{2-2}
+ austrian & quotes, guillemets \\
+ croatian & quotes, guillemets, guillemets\* \\
+ czech & quotes, guillemets \\
+ danish & quotes, guillemets \\
+ dutch & -- \\
+ english & american, british \\
+ finnish & -- \\
+ french & quotes, quotes\*, guillemets, guillemets\* \\
+ german & quotes, guillemets, swiss \\
+ greek & -- \\
+ italian & guillemets, quotes \\
+ norwegian & guillemets, quotes \\
+ portuguese & portuguese, brazilian \\
+ russian & -- \\
+ serbian & quotes, guillemets, german \\
+ spanish & spanish, mexican \\
+ swedish & quotes, guillemets, guillemets\* \\
+ \bottomrule
+ \end{tabularx}
+ \caption[Styles and Variants]{Quote Styles and Style Variants Defined by Default}
+ \label{tab:sty}
\end{table}
\subsection{Defining Quote Styles}
@@ -686,46 +691,31 @@
\end{ltxsyntax}
\begin{table}
-\tablesetup
-\begin{tabularx}{\columnwidth}{@{}Q@{}X@{}Q@{}X@{}}
- \toprule
- \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} &
- \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} \\
- \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
- american & english/american &
- newzealand & english/british \\
- australian & english/british &
- ngerman & german \\
- austrian & austrian/quotes &
- norsk & norwegian \\
- brazil & brazilian &
- norwegian & norwegian/guillemets \\
- brazilian & portuguese/brazilian &
- nswissgerman & swissgerman \\
- british & english/british &
- nynorsk & norwegian \\
- canadian & english/american &
- portuges & portuguese \\
- croatian & croatian/quotes &
- portuguese & portuguese/portuguese \\
- danish & danish/quotes &
- spanish & spanish/spanish \\
- english & english/american &
- swedish & swedish/quotes \\
- french & french/quotes &
- swiss & german/swiss \\
- german & german/quotes &
- swissgerman & german/swiss \\
- italian & italian/guillemets &
- UKenglish & british \\
- mexican & spanish/mexican &
- USenglish & american \\
- naustrian & austrian &
- \\
- \bottomrule
-\end{tabularx}
-\caption[Language Aliases]{Language Aliases Defined by Default}
-\label{tab:als}
+ \tablesetup
+ \begin{tabularx}{\columnwidth}{@{}Q@{}X@{}Q@{}X@{}}
+ \toprule
+ \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} &
+ \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} \\
+ \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
+ american & english/american & newzealand & english/british \\
+ australian & english/british & ngerman & german \\
+ austrian & austrian/quotes & norsk & norwegian \\
+ brazil & brazilian & norwegian & norwegian/guillemets \\
+ brazilian & portuguese/brazilian & nswissgerman & swissgerman \\
+ british & english/british & nynorsk & norwegian \\
+ canadian & english/american & portuges & portuguese \\
+ croatian & croatian/quotes & portuguese & portuguese/portuguese \\
+ danish & danish/quotes & serbian & serbian/quotes \\
+ english & english/american & spanish & spanish/spanish \\
+ french & french/quotes & swedish & swedish/quotes \\
+ german & german/quotes & swiss & german/swiss \\
+ italian & italian/guillemets & swissgerman & german/swiss \\
+ mexican & spanish/mexican & UKenglish & british \\
+ naustrian & austrian & USenglish & american \\
+ \bottomrule
+ \end{tabularx}
+ \caption[Language Aliases]{Language Aliases Defined by Default}
+ \label{tab:als}
\end{table}
\subsection{Defining Package Options}
@@ -1051,7 +1041,7 @@
You may redefine the above hooks to change the format of the printed output. For example, if you prefer replacements to be indicated by «[\textellipsis text]» rather than «[\textellipsis\unkern] [text]», redefine \cmd{mktextelpins} accordingly:
\begin{ltxcode}
-\newcommand{<<\mktextelpins>>}[1]{[\textellipsis #1]}
+\renewcommand{<<\mktextelpins>>}[1]{[\textellipsis #1]}
\end{ltxcode}
%
The \cmd{unkern} in the default definitions is required because \cmd{textellipsis} adds asymmetric kerning by default. The kerning after the final dot is similar to the spacing between the dots, which is fine if \cmd{textellipsis} is followed by any text, but undesirable if it is enclosed in brackets.
@@ -1553,8 +1543,33 @@
\begin{changelog}
+\begin{release}{5.2j}{2019-12-04}
+\item Fix issue with some combinations of language and document class
+\item Added support for Latin quotations
+\end{release}
+
+
+\begin{release}{5.2i}{2019-12-02}
+\item Fix issue with \cmd{csq@mainlang}
+\end{release}
+
+\begin{release}{5.2h}{2019-11-15}
+\item Fix issue with \cmd{langname}
+\end{release}
+
+\begin{release}{5.2g}{2019-11-14}
+\item Fix issue with \cmd{languagename}
+\end{release}
+
+\begin{release}{5.2f}{2019-11-11}
+\item Added language option \opt{serbian}\see{opt:opt}
+\item Improved \sty{polyglossia} support\see{opt:opt}
+\end{release}
+
\begin{release}{5.2d}{2018-04-13}
\item Update for \LaTeX{} kernel changes in 2018
+\item Added language option \opt{estonian}\see{opt:opt}
+\item Added language option \opt{polish}\see{opt:opt}
\end{release}
\begin{release}{5.2c}{2018-02-11}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csquotes.doc.tlpobj new/tlpkg/tlpobj/csquotes.doc.tlpobj
--- old/tlpkg/tlpobj/csquotes.doc.tlpobj 2019-02-28 03:30:33.000000000 +0100
+++ new/tlpkg/tlpobj/csquotes.doc.tlpobj 2019-12-07 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name csquotes.doc
category Package
-revision 47564
+revision 53041
shortdesc doc files of csquotes
relocated 1
docfiles size=103
++++++ csquotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csq-compat.def new/tex/latex/csquotes/csq-compat.def
--- old/tex/latex/csquotes/csq-compat.def 2018-05-02 19:53:44.000000000 +0200
+++ new/tex/latex/csquotes/csq-compat.def 2019-12-07 00:10:42.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{csq-compat.def}
- [2018/04/113 v5.2d csquotes backwards compatibility (JAW)]
+ [2019-12-06 v5.2j csquotes backwards compatibility (JAW)]
\def\csq@getversion#1{%
\expandafter\csq@getversion@i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csquotes.def new/tex/latex/csquotes/csquotes.def
--- old/tex/latex/csquotes/csquotes.def 2018-05-02 19:53:44.000000000 +0200
+++ new/tex/latex/csquotes/csquotes.def 2019-12-07 00:10:42.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{csquotes.def}
- [2018/04/13 v5.2d csquotes generic definitions (JAW)]
+ [2019-12-06 v5.2j csquotes generic definitions (JAW)]
% Set defaults
@@ -159,6 +159,11 @@
{\guillemotright}
{\textquotedblleft}
{\textquotedblright}
+\DeclareQuoteStyle{hungarian}
+ {\quotedblbase}
+ {\textquotedblright}
+ {\guillemotright}
+ {\guillemotleft}
\DeclareQuoteStyle{icelandic}
{\quotedblbase}
{\textquotedblleft}
@@ -227,6 +232,24 @@
{\guillemotright}
{\quotedblbase}
{\textquotedblleft}
+\DeclareQuoteStyle[quotes]{serbian}% verified
+ {\quotedblbase}
+ {\textquotedblright}
+ [0.05em]
+ {\textquoteright}
+ {\textquoteright}
+\DeclareQuoteStyle[guillemets]{serbian}% verified
+ {\guillemotright}
+ {\guillemotleft}
+ [0.025em]
+ {\textquoteright}
+ {\textquoteright}
+\DeclareQuoteStyle[german]{serbian}% verified
+ {\quotedblbase}
+ {\textquotedblleft}
+ [0.05em]
+ {\textquoteright}
+ {\textquoteright}
\DeclareQuoteStyle[mexican]{spanish}
{\textquotedblleft}
{\textquotedblright}
@@ -296,9 +319,16 @@
\DeclareQuoteAlias[guillemets]{polish}{polish}
\DeclareQuoteAlias[brazilian]{portuguese}{brazilian}
\DeclareQuoteAlias[portuguese]{portuguese}{portuguese}
+\DeclareQuoteAlias[quotes]{serbian}{serbian}
\DeclareQuoteAlias[mexican]{spanish}{mexican}
\DeclareQuoteAlias[spanish]{spanish}{spanish}
\DeclareQuoteAlias[quotes]{swedish}{swedish}
+\DeclareQuoteAlias{italian}{latin/italianguillemets}
+\DeclareQuoteAlias[italianguillemets]{latin}{latin}
+\DeclareQuoteAlias{german}{latin/germanquotes}
+\DeclareQuoteAlias[guillemets]{german}{latin/germanguillemets}
+\DeclareQuoteAlias{british}{latin/britishquotes}
+\DeclareQuoteAlias{american}{latin/americanquotes}
% Babel aliases
@@ -307,12 +337,14 @@
\DeclareQuoteAlias{brazilian}{brazil}
\DeclareQuoteAlias{british}{UKenglish}
\DeclareQuoteAlias{british}{ukenglish}
+\DeclareQuoteAlias{hungarian}{magyar}
\DeclareQuoteAlias{german}{ngerman}
\DeclareQuoteAlias{austrian}{naustrian}
\DeclareQuoteAlias{swissgerman}{nswissgerman}
\DeclareQuoteAlias{norwegian}{norsk}
\DeclareQuoteAlias{norwegian}{nynorsk}
\DeclareQuoteAlias{portuguese}{portuges}
+\DeclareQuoteAlias{serbian}{serbianc}
% Language options
@@ -325,6 +357,7 @@
\DeclareQuoteOption{german}
\DeclareQuoteOption{icelandic}
\DeclareQuoteOption{italian}
+\DeclareQuoteOption{latin}
\DeclareQuoteOption{latvian}
\DeclareQuoteOption{norwegian}
\DeclareQuoteOption{polish}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csquotes.sty new/tex/latex/csquotes/csquotes.sty
--- old/tex/latex/csquotes/csquotes.sty 2018-05-02 19:53:44.000000000 +0200
+++ new/tex/latex/csquotes/csquotes.sty 2019-12-07 00:10:42.000000000 +0100
@@ -1,5 +1,5 @@
% Copyright (c) 2003-2011 Philipp Lehman.
-% (c) 2015-2018 Joseph Wright.
+% (c) 2015-2019 Joseph Wright.
%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{csquotes}
- [2018/04/13 v5.2d context-sensitive quotations (JAW)]
+ [2019-12-06 v5.2j context-sensitive quotations (JAW)]
%% Compatibility and requirements
@@ -207,6 +207,9 @@
\protected\def\csq@warning#1{%
\PackageWarning{csquotes}{#1}}
+\protected\def\csq@warning@noline#1{%
+ \PackageWarningNoLine{csquotes}{#1}}
+
\protected\def\csq@info#1{%
\iftoggle{csq@quiet}
{}
@@ -779,32 +782,46 @@
\def\csq@resetstyle{%
\ifnum\csq@reset=\@ne
- \ifx\csq@currentstyle\languagename
- \else
- \ifcsundef{csq@qstyle@\languagename}
- {\csq@warn@style\languagename
- \csq@setstyle{fallback}}
- {\csq@setstyle{\languagename}}%
- \fi
+ \ifundef\babelname
+ {\ifundef\languagename
+ {\csq@warn@multilang{Cannot detect current language}}
+ {\csq@resetstyle@i{\languagename}}}%
+ {\csq@resetstyle@i{\babelname}}%
+ \fi}
+
+\def\csq@resetstyle@i#1{%
+ \ifx\csq@currentstyle#1\relax
+ \else
+ \ifcsundef{csq@qstyle@#1}
+ {\csq@warn@style#1
+ \csq@setstyle{fallback}}
+ {\csq@setstyle{#1}}%
\fi}
\def\csq@savelang{%
\ifdef\csq@mainlang
{}
- {\edef\csq@mainlang{\languagename}}}
+ {\ifdef\babelname
+ {\edef\csq@mainlang{\babelname}}
+ {\ifdef\languagename
+ {\edef\csq@mainlang{\languagename}}
+ {\csq@warn@multilang{Cannot detect main document language}}}}}
+
+\newcommand*{\csq@otherlang@star}{\csuse{otherlanguage*}}
+\newcommand*{\csq@otherlang@star@end}{\csuse{endotherlanguage*}}
\def\csq@resetlang{%
\ifdef\csq@mainlang
- {\csuse{otherlanguage*}{\csq@mainlang}%
+ {\expandafter\csq@otherlang@star\expandafter{\csq@mainlang}%
\let\csq@resetlang\relax}
{}}
\protected\long\def\csq@switchlang#1{%
\ifdef\csq@mainlang
{\begingroup
- \csuse{otherlanguage*}{\csq@mainlang}%
+ \expandafter\csq@otherlang@star\expandafter{\csq@mainlang}%
#1%
- \csuse{endotherlanguage*}%
+ \csq@otherlang@star@end
\endgroup}
{#1}}
@@ -812,9 +829,9 @@
\def\csq@lang#1{%
\csq@savelang
- \lowercase{\csuse{otherlanguage*}{#1}}}
+ \lowercase{\csq@otherlang@star{#1}}}
\def\csq@endlang{%
- \csuse{endotherlanguage*}}
+ \csq@otherlang@star@end}
\def\csq@nolang#1{%
\begingroup
@@ -1139,10 +1156,10 @@
{\csq@getpunct{%
\ifboolexpr{ bool {inner} and bool {hmode} }
{\csq@bquote@ii}
- {\ifbool{csdisplay}
- {\csq@bquote@i}
- {\iftoggle{csq@parbox}\csq@bquote@ii\csq@bquote@i}}%
- {#1}{#2}{#3}{#4}{#5}{#6}}}}
+ {\ifbool{csdisplay}
+ {\csq@bquote@i}
+ {\iftoggle{csq@parbox}\csq@bquote@ii\csq@bquote@i}}%
+ {#1}{#2}{#3}{#4}{#5}{#6}}}}
% {<init>}{<endinit>}{<citehook>}{<cite>}{<punct>}{<text>}{<apunct>}<tpunct>
@@ -1325,8 +1342,8 @@
{\ifdimgreater\lastskip\z@
{\unskip\unspace}
{\ifnumgreater\lastpenalty\z@
- {\unpenalty\unspace}
- {}}}
+ {\unpenalty\unspace}
+ {}}}
{}}
% {<punct>}{<cite>}
@@ -1762,8 +1779,8 @@
\def\@inpenc@undefined@##1{\def\inputencodingname{##1}}%
\@inpenc@undefined
\ifdefstring\inputencodingname{utf8}
- {\aftergroup\@firstoftwo}
- {\aftergroup\@secondoftwo}%
+ {\aftergroup\@firstoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup}}}
{\def\csq@ifutfenc{%
\csq@ifucs
@@ -2138,7 +2155,7 @@
\def\openinnerquote{\csq@pdf@oiqmark}%
\def\closeinnerquote{\csq@pdf@ciqmark}}
-%% Author interface to internal marks
+%% Author interface to internal marks
\newrobustcmd*{\initoquote}{%
\csq@resetstyle
@@ -2250,7 +2267,14 @@
\@ifpackageloaded{polyglossia}
{\@ifpackagelater{polyglossia}{2009/11/20}
{\let\@frenchquotespace\@empty}
- {}}
+ {}%
+ \@ifpackagelater{polyglossia}{2019/10/27}
+ {}
+ {\csq@warning@noline{%
+ Outdated 'polyglossia' version detected.\MessageBreak
+ csquotes works best with 'polyglossia' v1.45\MessageBreak
+ (2019/10/27) or above, but you are using\MessageBreak
+ '\csuse{ver@polyglossia.sty}'}}}
{}}
% German
@@ -2392,19 +2416,21 @@
{\csq@info{Checking for multilingual support..}%
\@ifpackageloaded{polyglossia}
{\csq@info{... found 'polyglossia' package}%
- \def\csq@main@language{\xpg@main@language}%
- \csq@hook@multilang}
+ \ifundef\mainbabelname
+ {\def\csq@main@language{\xpg@main@language}}
+ {\def\csq@main@language{\mainbabelname}}%
+ \csq@hook@multilang}
{\@ifpackageloaded{babel}
- {\csq@info{... found 'babel' package}%
+ {\csq@info{... found 'babel' package}%
\def\csq@main@language{\bbl@main@language}%
\csq@hook@multilang}
- {\csq@info{... none found}%
+ {\csq@info{... none found}%
\csq@hook@nomultilang}}}
{\@ifpackageloaded{polyglossia}
{}
{\@ifpackageloaded{babel}
- {}
- {\csq@hook@nomultilang}}}%
+ {}
+ {\csq@hook@nomultilang}}}%
\undef\csq@hook@multilang
\undef\csq@hook@nomultilang
\@ifpackageloaded{hyperref}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csquotes.tlpobj new/tlpkg/tlpobj/csquotes.tlpobj
--- old/tlpkg/tlpobj/csquotes.tlpobj 2019-02-28 03:30:34.000000000 +0100
+++ new/tlpkg/tlpobj/csquotes.tlpobj 2019-12-07 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name csquotes
category Package
-revision 47564
+revision 53041
shortdesc Context sensitive quotation facilities
relocated 1
longdesc This package provides advanced facilities for inline and
@@ -17,13 +17,14 @@
longdesc well as the optional active quotes are freely configurable. The
longdesc package is dependent on e-TeX, and requires the author's
longdesc etoolbox package.
-runfiles size=23
+depend etoolbox
+runfiles size=25
RELOC/tex/latex/csquotes/csq-compat.def
RELOC/tex/latex/csquotes/csquotes.cfg
RELOC/tex/latex/csquotes/csquotes.def
RELOC/tex/latex/csquotes/csquotes.sty
catalogue-ctan /macros/latex/contrib/csquotes
-catalogue-date 2018-04-13 09:47:11 +0200
+catalogue-date 2019-12-06 17:13:27 +0100
catalogue-license lppl1.3c
catalogue-topics quote-marks etex
-catalogue-version 5.2d
+catalogue-version 5.2j
++++++ css-colors.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/css-colors.doc.tlpobj new/tlpkg/tlpobj/css-colors.doc.tlpobj
--- old/tlpkg/tlpobj/css-colors.doc.tlpobj 2019-02-28 03:30:34.000000000 +0100
+++ new/tlpkg/tlpobj/css-colors.doc.tlpobj 2020-03-24 01:57:17.000000000 +0100
@@ -1,6 +1,6 @@
name css-colors.doc
category Package
-revision 43961
+revision 54512
shortdesc doc files of css-colors
relocated 1
docfiles size=521
++++++ css-colors.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/css-colors.tlpobj new/tlpkg/tlpobj/css-colors.tlpobj
--- old/tlpkg/tlpobj/css-colors.tlpobj 2019-02-28 03:30:35.000000000 +0100
+++ new/tlpkg/tlpobj/css-colors.tlpobj 2020-03-24 01:57:18.000000000 +0100
@@ -1,6 +1,6 @@
name css-colors
category Package
-revision 43961
+revision 54512
shortdesc Named colors for web-safe design
relocated 1
longdesc This package defines web-safe colors for use with D.P.
@@ -9,7 +9,6 @@
runfiles size=2
RELOC/tex/latex/css-colors/css-colors.sty
catalogue-ctan /macros/latex/contrib/css-colors
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics colour
catalogue-version 1.02
++++++ cstex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/cstex/opmac-d.tex new/doc/cstex/opmac-d.tex
--- old/doc/cstex/opmac-d.tex 2019-03-13 21:57:13.000000000 +0100
+++ new/doc/cstex/opmac-d.tex 2020-02-13 23:10:16.000000000 +0100
@@ -8,7 +8,7 @@
% UTF-8 encTeX has a conflict with DocByTeX
\chyph
-\def\projectversion{Mar. 2019}
+\def\projectversion{July 2019}
\def\headtitle{OPmac}
\widowpenalty=10000
@@ -1647,39 +1647,62 @@
\inext{Blue}{\empty}{+-}
-Makro \db setcmykcolor "{<CMYK barva>}" nastav� po�adovanou barvu.
+OPmac preferuje barevn� model CMYK, proto je v��e pou�ito k definici barev
+makro \db setcmykcolor. Je ov�em mo�n� pou��t tak� \db setrgbcolor, co� na RGB
+za��zen�ch (monitorech) d� skoro jist� j�sav�j�� barvy. M��ete tedy marka
+pro jednotliv� barvy p�edefinovat, nap�. "\def\Red{\setrgbcolor{1 0 0}}",
+ale je vhodn� oba barevn� modely v jednom dokumentu nem�chat. Tisk�rny
+p�ij�maj� jedin� CMYK, ide�ln� i s konkr�tn�m barevn�m profilem.
+
+\inext{setcmykcolor}{setrgbcolor}{++}
+
+Makra \db formatcmyk a \db formatrgb p�ipravuj� argument s po�adovanou
+barvou do form�tu podle PDF standardu, tj. nap�. "1 1 0 0 k 1 1 0 0 K"
+v p��pad� CMYK a barvy modr�.
+Pov�imn�te si, �e se sou�asn�
+pracuje s barvou textu "<c> <m> <y> <k> k" i s barvou tenk�ch linek
+"<c> <m> <y> <k> K".
+Pon�kud jin� standard je pak pou�it v souboru
+"opmac-xetex.tex" p�i pou�it� Xe\TeX{}u.
+Ve "\write" p��kazech se sice
+makra "\formatcmyk" a "\setcmykcolor" expanduj�, ale expanze se zastav�
+u "\setcolor", proto�e toto makro je deklarov�no pomoc� "\addprotect".
+
+\inext{formatcmyk}{\empty}{+-}
+
+Makro \db setcolor "{<barva>}" nastav� po�adovanou barvu.
Nejprve p�epne makro "\ensureblacko" do aktivn�ho stavu. V tomto stavu makro
setrv� pr�v� tehdy, kdy� je v dokumentu pou�it aspo� jednou p�ep�na� barvy.
-D�le makro "\setcmykcolor" nastav� p�i
+D�le makro "\setcolor" nastav� p�i
"\localcolorfalse" barvu p��mo a p�i "\localocolortrue" barvu vlo�� do
z�sobn�ku a pomoc� "\aftergroup" zajist� n�vrat k p�vodn� hodnot�.
-Nav�c nastav� na odpov�daj�c� hodnotu makro \db currentcolor.
+Nav�c nastav� na odpov�daj�c� hodnotu makro "\currentcolor".
-\inext{setcmykcolor}{^^B\cbrace}{++}
+\inext{setcolor}{^^B\cbrace}{++}
-Makro "\currentcolor" je nastaveno na v�choz� hodnotu \db pdfblackcolor
+Makro \db currentcolor je nastaveno na v�choz� hodnotu \db pdfblackcolor
\inext{pdfblackcolor}{currentcolor}{++}
Makro \db ensureblacko "{<sazba>}" je pou�ito pro sazbu z�hlav� a z�pat� ve
v�stupn� rutin� v~makru "\opmacoutput". Implicitn� se "\ensureblacko{<sazba>}" chov�
stejn� jako samotn� "<sazba>", ale po pou�it� p�ep�na�e barvy
-"\setcmykcolor" za�ne fungovat jako \db ensureblackoA, co� zajist� bravu
+"\setcolor" za�ne fungovat jako \db ensureblackoA, co� zajist� bravu
"<sazby>" v~�ern�m. Je to provedeno tak, �e je na za��tku "<sazby>"
alokov�na nov� �rove� z�sobn�ku barev s v�choz� �ernou barvou a na konci
"<sazby>" je tato �rove� z�sobn�ku ukon�ena.
\inext{ensureblacko}{\empty}{+-}
-Makra \db colorstackpush "{<CMYK barva>}" a \db colorstackpop implementuj�
+Makra \db colorstackpush "{<barva>}" a \db colorstackpop implementuj�
pr�ci se z�sobn�kem barev za pou�it� odpov�daj�c�ch \TeX{}ov�ch primitiv�.
+Je pou�it implicitn� inicializovan� z�sobn�k \db colorstackcnt k s ��slem nula
+(d�kuji P. Krajn�kovi za tip).
Nen�-li p��tomen pdf\TeX{} ve verzi aspo� 1.40, je barva nastavena pomoc�
"\pdfliteral" (co� v komplikovan�j��ch p��padech p�i p�echodu na dal��
str�nky nefunguje spr�vn�), jinak je pou�it "\pdfcolorstack", kter� je
-inicializov�n pomoc� "\pdfcolorstackinit". Pov�imn�te si, �e se sou�asn�
-pracuje s barvou textu "<c> <m> <y> <k> k" i s barvou tenk�ch linek
-"<c> <m> <y> <k> K".
-Kone�n� makro \db colorstackset "{<CMYK barva>}" nastavuje barvu p��mo s
+inicializov�n pomoc� "\pdfcolorstackinit".
+Kone�n� makro \db colorstackset "{<barva>}" nastavuje barvu p��mo s
um�st�n�m t�to bravy na vrchol z�sobn�ku m�sto bravy p�edchoz�.
\inext{pdfcolorstack}{\empty}{+-}
@@ -2081,12 +2104,12 @@
\inext{scantabdata}{^^B\cbrace}{++}
-Pomocn� makra \db scantabdataA a \db scantabdataB
+Pomocn� makra \db scantabdataA, \db scantabdataB a \db scantabdataE
�e�� p��pady, kdy deklar�tor nem� nebo m� parametr. D�le makra
\db scantabdataC a \db scantabdataD se staraj� o p��padn� opakov�n� �seku
deklarace.
-\inext{scantabdataA}{^^B\cbrace}{++}
+\inext{scantabdataA}{scantabdataE}{++}
OPmac p�eddefinuje �ty�i "" pro sloupce tabulky, sice "<znaky>"
"c", "l", "r", "p" v~makrech \db tabdeclarec, \db tabdeclarel, \db
@@ -2173,9 +2196,10 @@
Makro \db mspan "<��slo>[<deklarace>]{<text>}" p�ekon� "<��slo>" sloupc� a
d�le "<text>" v tomto prostoru form�tuje podle "<deklarace>". K tomu ��elu
-provede "\multispan" pomoc� "\loop" v \db mspanA a d�le p�iprav� t�lo
-form�tovac�ho makra postupn�m �ten�m deklarace pomoc� \db mspanB. V z�v�ru
-je toto t�lo pou�ito v~makru "\tmpa", kter� je nakonec spu�t�no.
+provede "\multispan" pomoc� "\loop" v \db mspanA a d�le
+vytvo�� lok�ln� tabulku "\halign" s jedn�m sloupcem podle deklarace. Na
+konci makra "\mspanA" pot�ebujeme z�skat vznikl� "\hbox" a rozbalit ho
+pomoc� "\unhbox".
\inext{mspan}{\empty}{+-}
@@ -2267,33 +2291,35 @@
\subsec Pozn�mky pod �arou a na okraji str�nek
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Makro \db fnote p�edpokl�d�, �e spr�vn� ��slo pozn�mky na dan� str�nce je
+Makro "\fnote" p�edpokl�d�, �e spr�vn� ��slo pozn�mky na dan� str�nce je
p�ipraveno v makru "\fn:<��slo>", kde "<��slo>" je celkov� ��slo pozn�mky nap���
cel�m dokumentem sledovan� glob�ln�m ��ta�em \db fnotenum.
-Makro ohl�s� svou existenci do REF souboru z�znamem "\Xfnote" (bez
+
+\inext{fnotenum}{\empty}{+-}
+
+Makro "\fnote" ohl�s� svou existenci do REF souboru z�znamem "\Xfnote" (bez
parametru). D�le vytiskne zna�ku pomoc� "\fnmarkx" a ve skupin� p�ejde na
men�� sazbu a zavol� plain\TeX{}ov� makro "\vfootnote", kter� vlo�� sazbu
pomoc� tzv. insertu (TBN, kapitola~6.7). Plain\TeX{}ov� nastaven� t�to
-t��dy insertu nen� makrem OPmac nijak m�n�no.
+t��dy insertu nen� makrem OPmac nijak m�n�no. To v�e je �e�eno v intern�m makru
+\db fnoteG "{}{<text>}".
-\inext{fnotenum}{^^B\cbrace}{++}
+\inext{fnoteG}{^^B\cbrace}{++}
+
+Kone�n� makro \db fnote je implementov�no pomoc� "\fnoteG" se zna�kou
+"\fnmarkx" zat�mco makro \db fnotetext d�l� to sam�, ale zna�ka v textu je
+pr�zdn�.
+
+\inext{fnote}{fnotetext}{++}
Makro \db fnotemark p�i�te lok�ln� k "\fnotenum" sv�j parametr a vytiskne
odpov�daj�c� zna�ku. Cel� pr�ce makra prob�h� ve skupin�, tak�e po ukon�en�
makra se "\fnotenum" vr�t� do sv� p�vodn� hodnoty.
-
-\inext{fnotemark}{^^B\cbrace}{++}
-
-Makro \db fnotetext teprve zvedne ��ta� "\fnotenum" glob�ln� a vytiskne
-pozn�mku pomoc� plain\TeX{}ov�ho "\vfootnote".
-
-\inext{fnotetext}{^^B\cbrace}{++}
-
Makro \db fnmarkx vytiskne otazn�k nebo \db thefnote. P�edpokl�d� se, �e si
u�ivatel p�edefinuje "\thefnote" k obrazu sv�mu. Lok�ln� ��slo pozn�mky na
str�nce m� p�ipraveno v makru \db locfnum.
-\inext{fnmarkx}{\empty}{+-}
+\inext{fnotemark}{\empty}{+-}
P�i �ten� REF souboru se pro ka�dou stranu p�e�te nejprve "\Xpage", co�
je makro, kter� pronuluje \db fnotenumlocal.
Binary files old/doc/cstex/opmac-u-en.pdf and new/doc/cstex/opmac-u-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/cstex/opmac-u-en.tex new/doc/cstex/opmac-u-en.tex
--- old/doc/cstex/opmac-u-en.tex 2019-03-22 16:55:47.000000000 +0100
+++ new/doc/cstex/opmac-u-en.tex 2019-06-04 23:24:07.000000000 +0200
@@ -789,11 +789,14 @@
To avoid the problems with narrow left-right aligned paragraphs you can write
"p{<size>\raggedright}", then the paragraph will be only left aligned.
+You can use "(<text>)" in the "<declaration>" then this text is applied in
+each line of table. For example "r(\kern10pt)l" adds more 10 pt space
+between "r" and "l" rows.
+
An arbitrary part of the "<declaration>" can be repeated by a "<number>"
prefixed. For example ``"3c"'' means ``"ccc"'' or ``"c 3{|c}"'' means
``"c|c|c|c"''. Note that spaces in the <declaration> are ignored and you
-can use them in
-order to more legibility.
+can use them in order to more legibility.
The command "\cr" used in the "<data>" part of the table (the end row
separator) is generally known.
@@ -830,9 +833,9 @@
If there is an item which spans to more than one column in the table then you can use
"\multispan{<number>}" macro from plain \TeX{} or "\mspan<number>[<declaration>]{<text>}"
from OPmac, which spans <number> columns and formats the <text> by the
-<declaration>. The <declaration> must include exactly one letter ``"c"'' or
-``"l"'' or ``"r"'' and may include characters ``"|"''
-for vertical rules. If your table includes vertical rules and you want to
+<declaration>. The <declaration> must include a declaration of right one column
+with the same syntax as comon "\table" <declaration>.
+If your table includes vertical rules and you want to
create continuous vertical rules by "\mspan", then use rules in
only after ``"c"'', ``"l"'' or ``"r"'' letter in "\mspan" <declaration>. The
exception is only in the case when "\mspan" includes first
Binary files old/doc/cstex/opmac-u.pdf and new/doc/cstex/opmac-u.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/cstex/opmac-u.tex new/doc/cstex/opmac-u.tex
--- old/doc/cstex/opmac-u.tex 2019-03-22 16:55:47.000000000 +0100
+++ new/doc/cstex/opmac-u.tex 2019-06-04 23:24:07.000000000 +0200
@@ -985,6 +985,10 @@
hned za přidat třeba "\raggedright" a odstavec bude formátován
s~nezarovnaným pravým okrajem, například "p{42mm\raggedright}".
+Pokud v <deklaraci> použijete "(<text>)", je tento text aplikován v každém
+řádku tabulky v~místě odpovídajícím umístění v <deklaraci>. Například "r(\kern10pt)l"
+vloží mezi sloupce "r" a "l" dodatečnou desetibodovou mezeru.
+
V <deklaraci> je možné místo opakování stejného deklarátoru použít číslo
následované deklarátorem, tedy třeba "4c" je totéž jako "cccc". Opakovat se
mohou celé úseky <deklarace>, pokud za číslem pokračuje úsek ve svorkách.
@@ -1060,12 +1064,12 @@
Chcete-li přesáhnout jedním údajem více sloupců tabulky, můžete použít
plain\TeX{}ové makro "\multispan{<číslo>}" nebo makro z OPmac
"\mspan<číslo>[<deklarace>]{<text>}", které přesáhne <číslo> sloupců a <text>
-v tomto prostoru formátuje podle <deklarace>, která obsahuje právě jedno
-písmeno "c", "l" nebo "r" (označující způsob formátování) a dále může obsahovat
-jeden nebo více znaků "|" (označující svislé čáry). Máte-li v tabulce svislé čáry
+v tomto prostoru formátuje podle <deklarace>, která obsahuje deklaraci právě
+jednoho sloupce podle stejných pravidel jako je <deklarace> "\table".
+Máte-li v~tabulce svislé čáry
a chcete, aby svislé čáry z "\mspan" na ně navazovaly, pak použijte v
"\mspan" čáry před údajem "c", "l" nebo "r" jedině v případě, že "\mspan" zasahuje do
-prvního sloupce. V ostatních případech používejte čáry výhradně na konci
+prvního sloupce. V~ostatních případech používejte čáry výhradně na konci
<deklarace>, protože každý sloupec (s výjimkou prvního) přidává případné
svislé čáry jen na svůj konec.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cstex.doc.tlpobj new/tlpkg/tlpobj/cstex.doc.tlpobj
--- old/tlpkg/tlpobj/cstex.doc.tlpobj 2019-03-24 02:24:10.000000000 +0100
+++ new/tlpkg/tlpobj/cstex.doc.tlpobj 2020-02-14 01:54:47.000000000 +0100
@@ -1,6 +1,6 @@
name cstex.doc
category Package
-revision 50527
+revision 53767
shortdesc doc files of cstex
relocated 1
docfiles size=1156
++++++ csvsimple.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/CHANGES new/doc/latex/csvsimple/CHANGES
--- old/doc/latex/csvsimple/CHANGES 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/CHANGES 2019-05-05 20:07:04.000000000 +0200
@@ -1,7 +1,7 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -102,3 +102,8 @@
'filter strcmp', 'filter not strcmp'
- code optimizations
- documentation revised
+
+version 1.21 (2019/04/09):
+- spurious blank in sorting code removed
+- package 'pgfrcs' added as required package
+- (#3): introduction augmented with additional hints for first time users
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/README new/doc/latex/csvsimple/README
--- old/doc/latex/csvsimple/README 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/README 2019-05-05 20:07:04.000000000 +0200
@@ -1,7 +1,7 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
Binary files old/doc/latex/csvsimple/csvsimple-example.pdf and new/doc/latex/csvsimple/csvsimple-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/csvsimple-example.tex new/doc/latex/csvsimple/csvsimple-example.tex
--- old/doc/latex/csvsimple/csvsimple-example.tex 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/csvsimple-example.tex 2019-05-05 20:07:04.000000000 +0200
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%% csvsimple-example.tex: an example for csvsimple
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
Binary files old/doc/latex/csvsimple/csvsimple.pdf and new/doc/latex/csvsimple/csvsimple.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/csvsimple.tex new/doc/latex/csvsimple/csvsimple.tex
--- old/doc/latex/csvsimple/csvsimple.tex 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/csvsimple.tex 2019-05-05 20:07:04.000000000 +0200
@@ -1,10 +1,10 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -124,8 +124,8 @@
pdfkeywords={csv file, comma separated values, key value syntax}
}
-\def\version{1.20}%
-\def\datum{2016/07/01}%
+\def\version{1.21}%
+\def\datum{2019/04/09}%
\makeindex
@@ -166,20 +166,35 @@
The |csvsimple| package is applied to the processing of
CSV\footnote{CSV file: file with comma separated values.} files.
This processing is controlled by key value assignments according to the
-syntax of |pgfkeys| \cite{tantau:2015a}. Sample applications of the package
+syntax of |pgfkeys| \cite{tantau:tikz}. Sample applications of the package
are tabular lists, serial letters, and charts.
-An alternative to |csvsimple| is the |datatool| package \cite{talbot:2016a}
+An alternative to |csvsimple| is the |datatool| package \cite{talbot:datatool}
which provides considerably more functions and allows sorting of data by \LaTeX.
|csvsimple| has a different approach for the user interface and
is deliberately restricted to some basic functions with fast
-processing speed. Sorting is not supported directly but can be done
-with external tools, see Section~\ref{sec:Sorting} on page~\pageref{sec:Sorting}.
+processing speed.
+
+Mind the following restrictions:
+\begin{itemize}
+\item Sorting is not supported directly but can be done
+ with external tools, see \Fullref{sec:Sorting}.
+\item Values are expected to be comma separated, but the package
+ provides support for other separators, see \Fullref{sec:separators}.
+\item Values are expected to be not quoted or quoted with
+ curly braces |{}| of \TeX\ groups. Other quotes like doublequotes
+ are not supported directly, but can be achieved
+ with external tools, see \Fullref{sec:importeddata}.
+\item Every data line is expected to contain the same amount of values.
+ Unfeasible data lines are silently ignored by default, but this can
+ be configured, see \Fullref{sec:consistency}.
+\end{itemize}
+
\subsection{Loading the Package}
The package |csvsimple| loads the packages
-|pgfkeys| \cite{tantau:2015a},
-|etoolbox| \cite{lehmann:2015a},
+|pgfkeys| \cite{tantau:tikz},
+|etoolbox| \cite{lehmannwright:etoolbox},
and |ifthen| \cite{carlisle:2014c}.
|csvsimple| itself is loaded in the usual manner in the preamble:
\begin{dispListing}
@@ -191,6 +206,8 @@
and
|booktabs| \cite{fear:2016a}.
+
+\clearpage
\subsection{First Steps}
Every line of a processable CSV file has to contain an identical amount of
comma\footnote{See \refKey{/csv/separator} for other separators than comma.} separated values. The curly braces |{}| of \TeX\ groups can be used
@@ -211,7 +228,7 @@
\csvlisting{grade}
-
+\smallskip
The most simple way to display a CSV file in tabular form is the processing
with the \refCom{csvautotabular} command.
@@ -237,6 +254,7 @@
\end{dispExample}
+\clearpage
|\csvreader| is controlled by a plenty of options. For example, for table
applications line breaks are easily inserted by
\refKey{/csv/late after line}. This defines a macro execution just before
@@ -253,6 +271,7 @@
\end{tabular}
\end{dispExample}
+\smallskip
An even more comfortable and preferrable way to create a table is setting
appropriate option keys. Note, that this gives you the possibility to create a
|pgfkeys| style which contains the whole table creation.
@@ -265,7 +284,7 @@
{\thecsvrow & \firstname~\name & \matnumber}%
\end{dispExample}
-\clearpage
+\smallskip
The next example shows such a style definition with the convenience macro
\refCom{csvstyle}. Here, we see again the automated assignment of header
entries to column names by \refKey{/csv/head to column names}.
@@ -284,6 +303,7 @@
\end{dispExample}
+\clearpage
Another way to address columns is to use their roman numbers.
The direct addressing is done by |\csvcoli|, |\csvcolii|, |\csvcoliii|, \ldots:
@@ -295,6 +315,7 @@
{\thecsvrow & \csvcolii~\csvcoli & \csvcoliii}%
\end{dispExample}
+\smallskip
And yet another method to assign macros to columns is to use arabic numbers
for the assignment:
@@ -306,7 +327,7 @@
{\thecsvrow & \firstname~\name & \matnumber}%
\end{dispExample}
-\clearpage
+\smallskip
For recurring applications, the |pgfkeys| syntax allows to create own styles
for a consistent and centralized design. The following example is easily
modified to obtain more or less option settings.
@@ -327,6 +348,7 @@
\end{dispExample}
+\clearpage
Alternatively, column names can be set by \refCom{csvnames}
and style definitions by \refCom{csvstyle}.
With this, the last example is rewritten as follows:
@@ -344,7 +366,7 @@
{\thecsvrow & \firstname~\name & \grade}%
\end{dispExample}
-\clearpage
+\smallskip
The data lines of a CSV file can also be filtered. In the following example,
a certificate is printed only for students with grade unequal to 5.0.
@@ -640,7 +662,7 @@
\end{docCommand}
-\begin{docCommand}[doc updated=2016-00-00]{csvlinetotablerow}{}
+\begin{docCommand}[doc updated=2016-07-01]{csvlinetotablerow}{}
Typesets the current processed data line with |&| between the entries.
%Most users will never apply this command.
\end{docCommand}
@@ -757,8 +779,7 @@
\end{dispExample}
Additional command definition keys are provided for the supported tables,
-see section \ref{subsec:tabsupport} from page
-\pageref{subsec:tabsupport}.
+see Section~\ref{subsec:tabsupport} from page~\pageref{subsec:tabsupport}.
\subsection{Header Processing and Column Name Assignment}%
@@ -797,11 +818,11 @@
\clearpage
-\subsection{Consistency Check}%
+\subsection{Consistency Check}\label{sec:consistency}%
\begin{docCsvKey}{check column count}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
- This key defines, if the number of entries in a data line is checked against
- an expected value.\\
+ This key defines, wether the number of entries in a data line is checked against
+ an expected value or not.\\
If |true|, every non consistent line is ignored without announcement.\\
If |false|, every line is accepted and may produce an error during
further processing.
@@ -834,7 +855,7 @@
\clearpage
\subsection{Filtering}%
-\begin{docCsvKey}[][doc new=2016-00-00]{filter test}{=\meta{condition}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{filter test}{=\meta{condition}}{no default}
Only data lines which fulfill a logical \meta{condition} are accepted.
For the \meta{condition}, every single test normally employed like
\begin{dispListing}
@@ -844,7 +865,7 @@
\begin{dispListing}
filter test=\iftest{some testing},
\end{dispListing}
- For |\iftest|, tests from the |etoolbox| package \cite{lehmann:2015a} like
+ For |\iftest|, tests from the |etoolbox| package \cite{lehmannwright:etoolbox} like
|\ifnumcomp|, |\ifdimgreater|, etc. and from \Fullref{sec:stringtests} can be used.
\begin{dispExample}
@@ -873,10 +894,10 @@
\end{docCsvKey}
-\begin{docCsvKey}[][doc new=2016-00-00]{filter expr}{=\meta{condition}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{filter expr}{=\meta{condition}}{no default}
Only data lines which fulfill a logical \meta{condition} are accepted.
For the \meta{condition}, every boolean expression
- from the |etoolbox| package \cite{lehmann:2015a} is feasible.
+ from the |etoolbox| package \cite{lehmannwright:etoolbox} is feasible.
To preprocess the data line before testing the \meta{condition},
the option key \refKey{/csv/before filter} can be used.
\begin{dispExample}
@@ -893,7 +914,7 @@
\end{docCsvKey}
\clearpage
-\begin{docCsvKey}[][doc new=2016-00-00]{filter ifthen}{=\meta{condition}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{filter ifthen}{=\meta{condition}}{no default}
Only data lines which fulfill a logical \meta{condition} are accepted.
For the \meta{condition}, every term from the |ifthen| \cite{carlisle:2014c} package
is feasible.
@@ -949,7 +970,7 @@
\enlargethispage*{2cm}
-\begin{docCsvKey}[][doc new=2016-00-00]{full filter}{=\meta{code}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{full filter}{=\meta{code}}{no default}
Technically, this key is an alias for \refKey{/csv/before filter}.
Philosophically, \refKey{/csv/before filter} computes something before
a filter condition is set, but \refKey{/csv/full filter} should implement
@@ -1147,7 +1168,7 @@
\end{docCsvKey}
\clearpage
-\subsection{Separators}%
+\subsection{Separators}\label{sec:separators}%
\begin{docCsvKey}{separator}{=\meta{sign}}{no default, initially |comma|}
\catcode `|=12
Sets the \meta{sign} which is treates as separator between the data values
@@ -1277,7 +1298,7 @@
This allows to access an external tool for sorting.
\emph{Which tool} is your choice.
-\csvsorter\ \cite{sturm:2014j}
+\csvsorter\ \cite{sturm:csvsorter}
was written as a companion tool for |csvsimple|.
It is an open source Java command-line tool for sorting CSV files, available at\\
\url{http://T-F-S.github.io/csvsorter/}\quad or\quad
@@ -1289,7 +1310,7 @@
following options.
\begin{enumerate}\bfseries
-\item To use the sorting options, you have to install \csvsorter\ \cite{sturm:2014j} before!\\
+\item To use the sorting options, you have to install \csvsorter\ \cite{sturm:csvsorter} before!\\
|csvsimple| v1.12 or newer needs \csvsorter\ v0.94 of newer!
\item You have to give permission to call external tools during
compilation, i.\,e.\ the command-line options for |latex| have to include
@@ -1436,7 +1457,7 @@
\section{String Tests}\label{sec:stringtests}%
The following string tests are complementing the string tests
-from the |etoolbox| \cite{lehmann:2015a} package. They all do the same, i.e.,
+from the |etoolbox| \cite{lehmannwright:etoolbox} package. They all do the same, i.e.,
comparing expanded strings for equality.
\begin{itemize}
\item\refCom{ifcsvstrcmp} is the most efficient method, because it uses
@@ -1449,7 +1470,7 @@
\end{itemize}
\medskip
-\begin{docCommand}[doc new=2016-00-00]{ifcsvstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise.
The comparison is done using |\pdfstrcmp|, if compilation is done with pdf\LaTeX.
The comparison is done using |\pdf@strcmp|, if the package |pdftexcmds| is
@@ -1459,18 +1480,18 @@
\end{docCommand}
-\begin{docCommand}[doc new=2016-00-00]{ifcsvnotstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvnotstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are \emph{not} equal, and \meta{false} otherwise.
The implementation uses \refCom{ifcsvstrcmp}.
\end{docCommand}
-\begin{docCommand}[doc new=2016-00-00]{ifcsvstrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvstrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise.
The strings are expanded with |\edef| in the test.
\end{docCommand}
-\begin{docCommand}[doc new=2016-00-00]{ifcsvprostrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvprostrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise.
The strings are expanded with |\protected@edef| in the test, i.e. parts of the
strings which are protected stay unexpanded.
@@ -1734,10 +1755,10 @@
\csvlisting{data_numbers}
-The |siunitx| \cite{wright:2016a} package provides a new column type |S|
+The |siunitx| \cite{wright:siuntix} package provides a new column type |S|
which can align material using a number of different strategies.
The following example demonstrates the application with CSV reading.
-The package documentation \cite{wright:2016a} contains a huge amount
+The package documentation \cite{wright:siuntix} contains a huge amount
of formatting options.
\begin{dispExample}
@@ -1758,7 +1779,7 @@
the line reading code of |csvsimple| which actually is present at the
first column. To avoid this problem, the content of the first column
could be formatted not by the table format definition, but by using a
-suitable |\tablenum| formatting directly, see |siunitx| \cite{wright:2016a}.
+suitable |\tablenum| formatting directly, see |siunitx| \cite{wright:siuntix}.
Another and very nifty workaround suggested by Enrico Gregorio is to
add an invisible dummy column with |c@{}| as first column:
@@ -1863,7 +1884,7 @@
\clearpage
-\subsection{Imported CSV data}\label{importeddata}%
+\subsection{Imported CSV data}\label{sec:importeddata}%
If data is imported from other applications, there is not always a choice
to format in comma separated values with curly brackets.
@@ -1998,12 +2019,12 @@
% Actually, it is not a good idea to include the references like this!
% Do not follow this bad example ...
\begin{tcbverbatimwrite}{\jobname.bib}
-@manual{tantau:2015a,
+@manual{tantau:tikz,
author = {Till Tantau},
title = {The TikZ and PGF Packages},
- subtitle = {Manual for version 3.0.1a},
+ subtitle = {Manual for version 3.1.2},
url = {http://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf},
- date = {2015-08-29},
+ date = {2019-04-04},
}
@manual{carlisle:2014c,
@@ -2015,19 +2036,20 @@
}
-@manual{talbot:2016a,
- author = {Nicola L. C. Talbot},
- title = {User Manual for the datatool bundle version 2.25},
- url = {http://mirrors.ctan.org/macros/latex/contrib/datatool/datatool-user.pdf},
- date = {2016-01-18},
+@manual{talbot:datatool,
+ author = {Nicola L. C. Talbot},
+ title = {User Manual for the datatool bundle version 2.31},
+ url = {http://mirrors.ctan.org/macros/latex/contrib/datatool/datatool-user.pdf},
+ date = {2018-12-07},
+ language = {english}
}
-@manual{sturm:2014j,
+@manual{sturm:csvsorter,
author = {Thomas F. Sturm},
title = {The CSV-Sorter program},
- subtitle = {Manual for version 0.94 beta},
+ subtitle = {Manual for version 0.95 beta},
url = {http://T-F-S.github.io/csvsorter/csvsorter.pdf},
- date = {2014-07-14},
+ date = {2018-01-11},
language = {english}
}
@@ -2048,19 +2070,19 @@
language = {english}
}
-@manual{wright:2016a,
+@manual{wright:siuntix,
author = {Joseph Wright},
title = {siunitx --- A comprehensive (SI) units package},
url = {http://mirror.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf},
- date = {2016-03-01},
+ date = {2018-05-17},
language = {english}
}
-@manual{lehmann:2015a,
+@manual{lehmannwright:etoolbox,
author = {Philipp Lehman and Joseph Wright},
title = {The etoolbox Package},
url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/etoolbox.pdf},
- date = {2015-08-02},
+ date = {2018-08-19},
}
\end{tcbverbatimwrite}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csvsimple.doc.tlpobj new/tlpkg/tlpobj/csvsimple.doc.tlpobj
--- old/tlpkg/tlpobj/csvsimple.doc.tlpobj 2019-02-28 03:30:38.000000000 +0100
+++ new/tlpkg/tlpobj/csvsimple.doc.tlpobj 2019-05-06 01:38:21.000000000 +0200
@@ -1,9 +1,9 @@
name csvsimple.doc
category Package
-revision 41597
+revision 51010
shortdesc doc files of csvsimple
relocated 1
-docfiles size=243
+docfiles size=246
RELOC/doc/latex/csvsimple/CHANGES
RELOC/doc/latex/csvsimple/README
RELOC/doc/latex/csvsimple/amountsort.xml
++++++ csvsimple.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csvsimple/csvsimple.sty new/tex/latex/csvsimple/csvsimple.sty
--- old/tex/latex/csvsimple/csvsimple.sty 2016-07-02 00:04:23.000000000 +0200
+++ new/tex/latex/csvsimple/csvsimple.sty 2019-05-05 20:07:04.000000000 +0200
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%% csvsimple.sty: Simple LaTeX CSV file processing
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,9 +18,9 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple}[2016/07/01 version 1.20 LaTeX CSV file processing]
+\ProvidesPackage{csvsimple}[2019/04/09 version 1.21 LaTeX CSV file processing]
-\RequirePackage{pgfkeys,ifthen,etoolbox,shellesc}
+\RequirePackage{pgfrcs,pgfkeys,ifthen,etoolbox,shellesc}
%---- general
@@ -148,7 +148,7 @@
\def\csv@preprocessor@csvsorter#1#2#3{%
\begingroup%
- \typeout{}
+ \typeout{}%
\immediate\openout\csv@out=\csv@csvsorter@token%
\immediate\write\csv@out{\string\makeatletter\string\csv@error{Call of CSV-Sorter failed! Use '-shell-escape' option or check log file '\csv@csvsorter@log'.}{}}%
\immediate\closeout\csv@out%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csvsimple.tlpobj new/tlpkg/tlpobj/csvsimple.tlpobj
--- old/tlpkg/tlpobj/csvsimple.tlpobj 2019-02-28 03:30:39.000000000 +0100
+++ new/tlpkg/tlpobj/csvsimple.tlpobj 2019-05-06 01:38:22.000000000 +0200
@@ -1,19 +1,20 @@
name csvsimple
category Package
-revision 41597
+revision 51010
shortdesc Simple CSV file processing
relocated 1
longdesc The package provides a simple LaTeX interface for the
longdesc processing of files with comma separated values (CSV); it
longdesc relies on the key value syntax supported by pgfkeys to simplify
-longdesc usage. Filtering and table generation is especially supported;
+longdesc usage. Filtering and table generation are especially supported;
longdesc however, this lightweight tool offers no support for data
-longdesc sorting or data base storage.
+longdesc sorting or data base storage. The package depends on etoolbox,
+longdesc ifthen, pgfrcs, pgfkeys, and shellesc.
runfiles size=7
RELOC/tex/latex/csvsimple/csvsimple.sty
catalogue-also csvtools datatool
catalogue-ctan /macros/latex/contrib/csvsimple
-catalogue-date 2016-07-01 18:34:08 +0200
+catalogue-date 2019-04-28 12:45:29 +0200
catalogue-license lppl1.3
catalogue-topics data-import data-disp csv-support
-catalogue-version 1.20
+catalogue-version 1.21
++++++ ctan-o-mat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctan-o-mat.1 new/texmf-dist/doc/man/man1/ctan-o-mat.1
--- old/texmf-dist/doc/man/man1/ctan-o-mat.1 2017-11-25 21:59:19.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ctan-o-mat.1 2019-07-08 19:37:34.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
Binary files old/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf and new/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
--- old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat 2019-07-08 19:37:34.000000000 +0200
@@ -0,0 +1,21 @@
+#/bin/sh
+##-----------------------------------------------------------------------------
+## This file is part of ctan-o-mat.
+## This program is distributed under BSD-like license. See file LICENSE
+##
+## (c) 2016-2017 Gerd Neugebauer
+##
+## Net: gene@gerd-neugebauer.de
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of a 3-clause BSD-like license as stated in the
+## file LICENSE contained in this distribution.
+##
+## You should have received a copy of the LICENSE along with this
+## program; if not, see the repository under http://***.
+##
+##-----------------------------------------------------------------------------
+
+exec perl "$0.pl" "$@"
+
+#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat
--- old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat 2019-07-08 19:37:34.000000000 +0200
@@ -0,0 +1,21 @@
+@echo off
+@rem --------------------------------------------------------------------------
+@rem This file is part of ctan-o-mat.
+@rem This program is distributed under BSD-like license. See file LICENSE
+@rem
+@rem (c) 2016-2017 Gerd Neugebauer
+@rem
+@rem Net: gene@gerd-neugebauer.de
+@rem
+@rem This program is free software; you can redistribute it and/or modify
+@rem it under the terms of a 3-clause BSD-like license as stated in the
+@rem file LICENSE contained in this distribution.
+@rem
+@rem You should have received a copy of the LICENSE along with this
+@rem program; if not, see the repository under http://***.
+@rem
+@rem --------------------------------------------------------------------------
+
+"perl ctan-o-mat.pl %*"
+
+@rem --------------------------------------------------------------------------
Binary files old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf and new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj new/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj
--- old/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj 2019-02-28 03:30:39.000000000 +0100
+++ new/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj 2019-07-09 01:53:26.000000000 +0200
@@ -1,12 +1,15 @@
name ctan-o-mat.doc
category Package
-revision 46938
+revision 51578
shortdesc doc files of ctan-o-mat
-docfiles size=16
+docfiles size=26
texmf-dist/doc/man/man1/ctan-o-mat.1
texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
texmf-dist/doc/support/ctan-o-mat/LICENSE
texmf-dist/doc/support/ctan-o-mat/README.md
+ texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
+ texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat
+ texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf
texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pkg
texmf-dist/doc/support/ctan-o-mat/lib/md2ltx.pl
texmf-dist/doc/support/ctan-o-mat/makefile
++++++ ctan-o-mat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ctan-o-mat/ctan-o-mat new/texmf-dist/scripts/ctan-o-mat/ctan-o-mat
--- old/texmf-dist/scripts/ctan-o-mat/ctan-o-mat 2018-03-13 00:04:35.000000000 +0100
+++ new/texmf-dist/scripts/ctan-o-mat/ctan-o-mat 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#/bin/sh
-##-----------------------------------------------------------------------------
-## This file is part of ctan-o-mat.
-## This program is distributed under BSD-like license. See file LICENSE
-##
-## (c) 2016-2017 Gerd Neugebauer
-##
-## Net: gene@gerd-neugebauer.de
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of a 3-clause BSD-like license as stated in the
-## file LICENSE contained in this distribution.
-##
-## You should have received a copy of the LICENSE along with this
-## program; if not, see the repository under http://***.
-##
-##-----------------------------------------------------------------------------
-
-exec perl "$0.pl" "$@"
-
-#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctan-o-mat.tlpobj new/tlpkg/tlpobj/ctan-o-mat.tlpobj
--- old/tlpkg/tlpobj/ctan-o-mat.tlpobj 2019-02-28 03:30:39.000000000 +0100
+++ new/tlpkg/tlpobj/ctan-o-mat.tlpobj 2019-07-09 01:53:26.000000000 +0200
@@ -1,6 +1,6 @@
name ctan-o-mat
category Package
-revision 46938
+revision 51578
shortdesc Upload or validate a package for CTAN
longdesc This program can be used to automate the upload of a package to
longdesc CTAN. The description of the package is contained in a
@@ -16,8 +16,7 @@
longdesc validation retrieves the known attributes and the basic
longdesc constraints from the server.
depend ctan-o-mat.ARCH
-runfiles size=6
- texmf-dist/scripts/ctan-o-mat/ctan-o-mat
+runfiles size=5
texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
catalogue-contact-bugs https://github.com/ge-ne/ctan-o-mat/issues
catalogue-contact-home https://github.com/ge-ne/ctan-o-mat
++++++ ctanbib.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/ctanbib.man1.pdf and new/texmf-dist/doc/man/man1/ctanbib.man1.pdf differ
Binary files old/texmf-dist/doc/support/ctanbib/ctanbib-doc.pdf and new/texmf-dist/doc/support/ctanbib/ctanbib-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex new/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex
--- old/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex 2019-03-11 23:03:21.000000000 +0100
+++ new/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex 2019-09-21 23:52:54.000000000 +0200
@@ -18,6 +18,7 @@
\section{Introduction}
This package provides script named \package{ctanbib} which can be used for retrieving of the bibliographic information for packages hosted on CTAN.
+
\section{Usage}
@@ -26,6 +27,8 @@
\noindent\package{ctanbib [options] $\langle$packagename$\rangle$ > filename.bib}
+The \texttt{curl} utility needs to be installed on the user's system in order to support the package info download.
+
\section{Available options}
@@ -96,6 +99,11 @@
\section{Changelog}
\begin{changelog}
+ \change{2019-09-21}{Try to find the author in full CTAN author list if the author cannot be found in the package info}
+ \change{2019-09-16}{Use the CTAN API 2.0 to fetch the package info}
+ \change{2019-05-04}{Version 0.1c released}
+ \change{2019-05-04}{Use the \texttt{curl} command to download the package info}
+ \change{2019-05-04}{Added information about the need to have the \texttt{curl} command installed}
\change{2019-03-11}{Version 0.1b released}
\change{2018-09-10}{Added support for institutional names}
\change{2018-09-10}{Escape TeX commands in the title and subtitle}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanbib.doc.tlpobj new/tlpkg/tlpobj/ctanbib.doc.tlpobj
--- old/tlpkg/tlpobj/ctanbib.doc.tlpobj 2019-03-12 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/ctanbib.doc.tlpobj 2019-09-22 01:55:47.000000000 +0200
@@ -1,6 +1,6 @@
name ctanbib.doc
category Package
-revision 50340
+revision 52145
shortdesc doc files of ctanbib
docfiles size=17
texmf-dist/doc/man/man1/ctanbib.1
++++++ ctanbib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ctanbib/ctanbib new/texmf-dist/scripts/ctanbib/ctanbib
--- old/texmf-dist/scripts/ctanbib/ctanbib 2019-03-11 23:03:21.000000000 +0100
+++ new/texmf-dist/scripts/ctanbib/ctanbib 2019-09-21 23:52:54.000000000 +0200
@@ -27,7 +27,7 @@
]])
os.exit(1)
elseif arg[1]=="--version" or arg[1]=="-v" then
- print "ctanbib version v0.1b"
+ print "ctanbib version 0.1d"
os.exit(1)
elseif arg[1]=="--ctan" or arg[1]=="-c" then
table.remove(arg, 1)
@@ -35,7 +35,8 @@
end
local pkgname = arg[1]
-local url = "https://www.ctan.org/xml/pkg/" .. pkgname
+local url = "https://www.ctan.org/xml/2.0/pkg/" .. pkgname .. "?author-name=true"
+local authors_url = "https://ctan.org/xml/2.0/authors"
-- change that for different title scheme
local titleformat = "The %s package"
@@ -56,7 +57,8 @@
local load_xml = function(url)
- local command = io.popen("wget -qO- ".. url,"r")
+ -- local command = io.popen("wget -qO- ".. url,"r")
+ local command = io.popen("curl -sS ".. url,"r")
local info = command:read("*all")
command:close()
@@ -75,18 +77,52 @@
end)
end
+-- we need to use this method temporarily because of a bug in
+-- CTAN API
+local author_list
+local fetch_author_list = function()
+ if author_list then return author_list end
+ local authors = load_xml(authors_url)
+ author_list = {}
+ for _, author in ipairs(authors:query_selector("author")) do
+ -- save all authors under they ID
+ local id = author:get_attribute("id")
+ author_list[id] = author
+ end
+ return author_list
+end
+
+local process_author = function(author)
+ local current = {}
+ current[#current+1] = author:get_attribute("familyname")
+ current[#current+1] = author:get_attribute("givenname")
+ -- the author is an organization
+ if #current == 1 then
+ return "{" .. current[1] .. "}"
+ elseif #current > 1 then
+ return table.concat(current, ", ")
+ end
+ return nil -- no author
+end
+
+-- get the author name and surname
+local get_author = function(author)
+ local name = process_author(author)
+ if name then return name end
+ -- if the package XML doesn't contain author name,
+ -- we need to fetch the authors list from CTAN and find
+ -- it here
+ local author_list = fetch_author_list()
+ local id = author:get_attribute("id")
+ -- try to find the author id in list of authors
+ -- if everything fails, just return an empty group
+ return process_author(author_list[id]) or "{}"
+end
+
local get_authors = function(a)
local retrieved_authors = {}
for _, author in ipairs(a) do
- local current = {}
- current[#current+1] = author:get_attribute("familyname")
- current[#current+1] = author:get_attribute("givenname")
- -- the author is an organization
- if #current == 1 then
- table.insert(retrieved_authors, "{" .. current[1] .. "}")
- else
- table.insert(retrieved_authors, table.concat(current, ", "))
- end
+ table.insert(retrieved_authors, get_author(author))
end
return table.concat(retrieved_authors," and ")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanbib.tlpobj new/tlpkg/tlpobj/ctanbib.tlpobj
--- old/tlpkg/tlpobj/ctanbib.tlpobj 2019-03-12 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/ctanbib.tlpobj 2019-09-22 01:55:47.000000000 +0200
@@ -1,6 +1,6 @@
name ctanbib
category Package
-revision 50340
+revision 52145
shortdesc Export CTAN entries to bib format
longdesc This package provides a Lua script which can be used for
longdesc retrieving bibliographic information in BibLaTeX format for
@@ -12,7 +12,7 @@
catalogue-contact-bugs https://github.com/michal-h21/ctanbib/issues
catalogue-contact-repository https://github.com/michal-h21/ctanbib
catalogue-ctan /support/ctanbib
-catalogue-date 2019-03-11 20:15:45 +0100
+catalogue-date 2019-09-21 20:28:25 +0200
catalogue-license lppl1.3
catalogue-topics bibtex-gen ctan luatex use-lua
-catalogue-version 0.1b
+catalogue-version 0.1d
++++++ ctex.doc.tar.xz ++++++
Binary files old/doc/latex/ctex/ctex.pdf and new/doc/latex/ctex/ctex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctex.doc.tlpobj new/tlpkg/tlpobj/ctex.doc.tlpobj
--- old/tlpkg/tlpobj/ctex.doc.tlpobj 2019-04-08 01:39:33.000000000 +0200
+++ new/tlpkg/tlpobj/ctex.doc.tlpobj 2019-11-08 01:55:55.000000000 +0100
@@ -1,8 +1,8 @@
name ctex.doc
category Package
-revision 50843
+revision 52683
shortdesc doc files of ctex
relocated 1
-docfiles size=261
+docfiles size=262
RELOC/doc/latex/ctex/README.md
RELOC/doc/latex/ctex/ctex.pdf
++++++ ctex.tar.xz ++++++
++++ 1908 lines of diff (skipped)
++++++ ctie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctie.1 new/texmf-dist/doc/man/man1/ctie.1
--- old/texmf-dist/doc/man/man1/ctie.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ctie.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH CTIE 1 "7 April 2010" "Web2C 2019"
+.TH CTIE 1 "7 April 2010" "Web2C 2020"
.\"=====================================================================
.SH NAME
ctie \- merge or apply CWEB change files
Binary files old/texmf-dist/doc/man/man1/ctie.man1.pdf and new/texmf-dist/doc/man/man1/ctie.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctie.doc.tlpobj new/tlpkg/tlpobj/ctie.doc.tlpobj
--- old/tlpkg/tlpobj/ctie.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/ctie.doc.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name ctie.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of ctie
docfiles size=6
texmf-dist/doc/man/man1/ctie.1
++++++ curve2e.doc.tar.xz ++++++
++++ 1761 lines of diff (skipped)
++++++ curve2e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/curve2e/curve2e-v161.sty new/tex/latex/curve2e/curve2e-v161.sty
--- old/tex/latex/curve2e/curve2e-v161.sty 2019-03-30 22:26:00.000000000 +0100
+++ new/tex/latex/curve2e/curve2e-v161.sty 2020-01-18 22:21:16.000000000 +0100
@@ -6,12 +6,9 @@
%%
%% curve2e.dtx (with options: `v161')
%%
-%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2020 Claudio Beccari all rights reserved.
%% License information appended
%%
-
-
-
\NeedsTeXFormat{LaTeX2e}[2016/01/01]
\ProvidesPackage{curve2e-v161}%
[2019/02/07 v.1.61 Extension package for pict2e]
@@ -889,16 +886,15 @@
%%
-%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
%% this license is at: http://www.latex-project.org/lppl.txt
%%
-%% This work is "author-maintained"
+%% This work is "maintained"
%%
%% This work consists of file curve2e.dtx, and the derived files
%% curve2e.sty and curve2e.pdf, plus the auxiliary derived files
-%% README.txt and manifest.txt.
+%% README.txt and curve2e-v161.sty.
%%
%%
%% End of file `curve2e-v161.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/curve2e/curve2e.sty new/tex/latex/curve2e/curve2e.sty
--- old/tex/latex/curve2e/curve2e.sty 2019-03-30 22:26:00.000000000 +0100
+++ new/tex/latex/curve2e/curve2e.sty 2020-04-12 00:22:35.000000000 +0200
@@ -6,20 +6,17 @@
%%
%% curve2e.dtx (with options: `package')
%%
-%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2020 Claudio Beccari all rights reserved.
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2019/01/01]
\ProvidesPackage{curve2e}%
- [2019-03-29 v.2.0.1 Extension package for pict2e]
-
-
-
+ [2020-04-02 v.2.2.6 Extension package for pict2e]
\IfFileExists{xfp.sty}{%
- \RequirePackage{color}
- \RequirePackageWithOptions{pict2e}[2014/01/01]
- \@ifl@aded{sty}{xparse}{}{\RequirePackage{xparse}}
- \@ifl@aded{sty}{xfp}{}{\RequirePackage{xfp}}%
+ \RequirePackage{color}
+ \RequirePackageWithOptions{pict2e}[2014/01/01]
+ \@ifl@aded{sty}{xparse}{}{\RequirePackage{xparse}}
+ \@ifl@aded{sty}{xfp}{}{\RequirePackage{xfp}}%
}{%
\RequirePackage{curve2e-v161}%
\PackageWarningNoLine{curve2e}{%
@@ -35,6 +32,15 @@
***************************************\MessageBreak}%
\endinput
}
+\ExplSyntaxOn
+\AtBeginDocument{%
+\ProvideExpandableDocumentCommand\fptest{m m m}{%
+ \fp_compare:nTF{#1}{#2}{#3}}
+\ProvideExpandableDocumentCommand\fpdowhile{m m}{%
+ \fp_do_while:nn{#1}{#2}}
+}
+\ExplSyntaxOff
+
\def\TRON{\tracingcommands\tw@ \tracingmacros\tw@}%
\def\TROF{\tracingcommands\z@ \tracingmacros\z@}%
\ifx\undefined\@tdA \newdimen\@tdA \fi
@@ -48,7 +54,8 @@
\@wholewidth#1\@halfwidth.5\@wholewidth\ignorespaces}%
\newcommand\defaultlinethickness[1]{\defaultlinewidth=#1\relax
\def\thicklines{\linethickness{\defaultlinewidth}}%
-\def\thinlines{\linethickness{.5\defaultlinewidth}}\thinlines \ignorespaces}%
+\def\thinlines{\linethickness{.5\defaultlinewidth}}\thinlines
+ \ignorespaces}%
\def\LIne(#1){{\GetCoord(#1)\@tX\@tY
\moveto(0,0)
\pIIe@lineto{\@tX\unitlength}{\@tY\unitlength}\strokepath}\ignorespaces
@@ -63,86 +70,133 @@
\edef\sc@lelen{\fpeval{1 / abs(\d@mX)}}\relax
\@linelen=\sc@lelen\@linelen
\fi
- \moveto(0,0)
- \pIIe@lineto{\d@mX\@linelen}{\d@mY\@linelen}%
+ \moveto(0,0)\pIIe@lineto{\d@mX\@linelen}{\d@mY\@linelen}%
\strokepath
\fi
\endgroup\ignorespaces}%
-\ifx\Dashline\undefined
- \def\Dashline{\@ifstar{\Dashline@@}{\Dashline@}}
+\let\originalmoveto\moveto
+\let\originallineto\lineto
+\let\originalcurveto\curveto
+
+\def\moveto(#1){\GetCoord(#1)\MTx\MTy
+ \originalmoveto(\MTx,\MTy)\ignorespaces}
+\def\lineto(#1){\GetCoord(#1)\LTx\LTy
+ \originallineto(\LTx,\LTy)\ignorespaces}
+\def\curveto(#1)(#2)(#3){\GetCoord(#1)\CTpx\CTpy
+ \GetCoord(#2)\CTsx\CTsy\GetCoord(#3)\CTx\CTy
+ \originalcurveto(\CTpx,\CTpy)(\CTsx,\CTsy)(\CTx,\CTy)\ignorespaces}
+
+\def\IsPolar#1:#2?{\def\@TempOne{#2}\unless\ifx\@TempOne\empty
+ \expandafter\@firstoftwo\else
+ \expandafter\@secondoftwo\fi}
- \def\Dashline@(#1)(#2)#3{%
- \bgroup
- \countdef\NumA3254\countdef\NumB3252\relax
- \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
- \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
- \SubVect\V@ttA from\V@ttB to\V@ttC
- \ModOfVect\V@ttC to\DlineMod
- \DivideFN\DlineMod by#3 to\NumD
- \NumA=\fpeval{trunc(\NumD,0)}\relax
- \unless\ifodd\NumA\advance\NumA\@ne\fi
- \NumB=\NumA \divide\NumB\tw@
- \DividE\DlineMod\p@ by\NumA\p@ to\D@shMod
- \DividE\p@ by\NumA\p@ to \@tempa
- \MultVect\V@ttC by\@tempa,0 to\V@ttB
- \MultVect\V@ttB by 2,0 to\V@ttC
- \advance\NumB\@ne
- \edef\@mpt{\noexpand\egroup
- \noexpand\multiput(\V@ttA)(\V@ttC){\number\NumB}%
- {\noexpand\LIne(\V@ttB)}}%
- \@mpt\ignorespaces}%
+\ifx\Dashline\undefined
+ \def\Dashline{\@ifstar{\Dashline@}{\Dashline@}}% bckwd compatibility
\let\Dline\Dashline
- \def\Dashline@@(#1)(#2)#3{\put(#1){\Dashline@(0,0)(#2){#3}}}
+ \def\Dashline@(#1)(#2)#3{\put(#1){%
+ \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
+ \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
+ \IsPolar#2:?{% Polar
+ \Dashline@@(0,0)(\V@ttB){#3}}%
+ {% Cartesian
+ \SubVect\V@ttA from\V@ttB to\V@ttC
+ \Dashline@@(0,0)(\V@ttC){#3}%
+ }
+}}
+
+ \def\Dashline@@(#1)(#2)#3{%
+ \countdef\NumA3254\countdef\NumB3252\relax
+ \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
+ \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
+ \SubVect\V@ttA from\V@ttB to\V@ttC
+ \ModOfVect\V@ttC to\DlineMod
+ \DivideFN\DlineMod by#3 to\NumD
+ \NumA=\fpeval{trunc(\NumD,0)}\relax
+ \unless\ifodd\NumA\advance\NumA\@ne\fi
+ \NumB=\NumA \divide\NumB\tw@
+ \DividE\DlineMod\p@ by\NumA\p@ to\D@shMod
+ \DividE\p@ by\NumA\p@ to \@tempa
+ \Multvect{\V@ttC}{\@tempa,0}\V@ttB
+ \Multvect{\V@ttB}{2,0}\V@ttC
+ \advance\NumB\@ne
+ \put(\V@ttA){\multiput(0,0)(\V@ttC){\NumB}{\LIne(\V@ttB)}}
+ \ignorespaces}
\fi
\ifx\Dotline\undefined
- \def\Dotline{\@ifstar{\Dotline@@}{\Dotline@}}
- \def\Dotline@(#1)(#2)#3{%
- \bgroup
- \countdef\NumA 3254\relax \countdef\NumB 3255\relax
- \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
- \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
- \SubVect\V@ttA from\V@ttB to\V@ttC
- \ModOfVect\V@ttC to\DotlineMod
- \DivideFN\DotlineMod by#3 to\NumD
- \NumA=\fpeval{trunc(\NumD,0)}\relax
- \DivVect\V@ttC by\NumA,0 to\V@ttB
- \advance\NumA\@ne
- \edef\@mpt{\noexpand\egroup
- \noexpand\multiput(\V@ttA)(\V@ttB){\number\NumA}%
- {\noexpand\makebox(0,0){\noexpand\circle*{0.5}}}}%
- \@mpt\ignorespaces}%
-
- \def\Dotline@@(#1)(#2)#3{\put(#1){\Dotline@(0,0)(#2){#3}}}%
+ \providecommand\Dotline{}
+ \RenewDocumentCommand\Dotline{R(){0,0} R(){1,0} m O{1mm}}{%
+ \put(#1){\edef\Diam{\fpeval{{#4}/\unitlength}}%
+ \IsPolar#2:?{\CopyVect#2to\DirDot}%
+ {\SubVect#1from#2to\DirDot}%
+ \countdef\NumA=3254\relax
+ \ModAndAngleOfVect\DirDot to\ModDirDot and\AngDirDot
+ \edef\NumA{\fpeval{trunc(\ModDirDot/{#3},0)}}%
+ \edef\ModDirDot{\fpeval{\ModDirDot/\NumA}}%
+ \multiput(0,0)(\AngDirDot:\ModDirDot){\inteval{\NumA+1}}%
+ {\makebox(0,0){\circle*{\Diam}}}}\ignorespaces}
\fi
\AtBeginDocument{\@ifpackageloaded{eso-pic}{%
\renewcommand\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}}{}}%
-\def\GetCoord(#1)#2#3{%
-\expandafter\SplitNod@\expandafter(#1)#2#3\ignorespaces}
-\def\SplitNod@(#1)#2#3{\isnot@polar#1:!!(#1)#2#3}%
-\def\isnot@polar#1:#2!!{\def\@tempOne{#2}\ifx\@tempOne\empty
-\expandafter\@firstoftwo\else
-\expandafter\@secondoftwo\fi
-{\SplitNod@@}{\SplitPolar@@}}
-
-\def\SplitNod@@(#1,#2)#3#4{\edef#3{#1}\edef#4{#2}}%
-\def\SplitPolar@@(#1:#2)#3#4{\DirFromAngle#1to\@DirA
-\ScaleVect\@DirA by#2to\@DirA
-\expandafter\SplitNod@@\expandafter(\@DirA)#3#4}
+\def\GetCoord(#1)#2#3{\bgroup\edef\x{\egroup\noexpand\IsPolar#1:?}\x
+{% Polar
+ \bgroup\edef\x{\egroup\noexpand\SplitPolar(#1)}\x\SCt@X\SCt@Y}%
+{% Cartesian
+ \bgroup\edef\x{\egroup\noexpand\SplitCartesian(#1)}\x\SCt@X\SCt@Y}%
+ \edef#2{\SCt@X}\edef#3{\SCt@Y}\ignorespaces}
+
+\def\SplitPolar(#1:#2)#3#4{%
+ \edef#3{\fpeval{#2 * cosd#1}}\edef#4{\fpeval{#2 * sind#1}}}
+
+\def\SplitCartesian(#1,#2)#3#4{\edef#3{#1}\edef#4{#2}}
\let\originalput\put
\def\put(#1){\bgroup\GetCoord(#1)\@tX\@tY
\edef\x{\noexpand\egroup\noexpand\originalput(\@tX,\@tY)}\x}
-
-\let\originalmultiput\multiput
-\let\original@multiput\@multiput
-
-\long\def\@multiput(#1)#2#3{\bgroup\GetCoord(#1)\@mptX\@mptY
-\edef\x{\noexpand\egroup\noexpand\original@multiput(\@mptX,\@mptY)}%
-\x{#2}{#3}\ignorespaces}
-
-\gdef\multiput(#1)#2{\bgroup\GetCoord(#1)\@mptX\@mptY
-\edef\x{\noexpand\egroup\noexpand\originalmultiput(\@mptX,\@mptY)}\x(}%)
+\RenewDocumentCommand{\multiput}{O{0,0} d() d() m m o }{%
+ \IfNoValueTF{#2}{\PackageError{curve2e}%
+ {\string\multiput\space initial point coordinates missing}%
+ {Nothing done}
+ }%
+ {\IfNoValueTF{#3}{\PackageError{curve2e}
+ {\string\multiput\space Increment components missing}%
+ {Nothing done}
+ }%
+ {\put(#1){\let\c@multicnt\@multicnt
+ \CopyVect #2 to \R
+ \CopyVect#3 to\D
+ \@multicnt=#4\relax
+ \@whilenum \@multicnt > \z@\do{%
+ \put(\R){#5}%
+ \IfValueTF{#6}{#6}{\AddVect#3 and\R to \R}%
+ \advance\@multicnt\m@ne
+ }%
+ }%
+ }%
+ }\ignorespaces
+}
+\NewDocumentCommand{\xmultiput}{O{0,0} d() d() m m o }{%
+\IfNoValueTF{#2}{\PackageError{curve2e}{%
+ \string\Xmultiput\space initial point coordinates missing}%
+ {Nothing done}}%
+ {\IfNoValueTF{#3}{\PackageError{curve2e}{%
+ \string\Xmultiput\space Increment components missing}%
+ {Nothing done}}%
+ {\put(#1)%
+ {\let\c@multicnt\@multicnt
+ \CopyVect #2 to \R
+ \CopyVect #3 to \D
+ \@multicnt=\@ne
+ \fpdowhile{\value{multicnt} < \inteval{#4+1}}% Test
+ {%
+ \put(\R){#5}
+ \IfValueTF{#6}{#6}{%
+ \AddVect#3 and\R to \R}
+ \advance\@multicnt\@ne
+ }
+ }
+ }}\ignorespaces
+}
\def\vector(#1)#2{%
\begingroup
\GetCoord(#1)\d@mX\d@mY
@@ -188,7 +242,7 @@
\def\VVECTOR(#1)(#2){{\SubVect#1from#2to\@tempb
\ScaleVect\@tempb by0.5to\@tempb
\AddVect\@tempb and#1to\@tempb
-\VECTOR(\@tempb)(#2)\VECTOR(\@tempb)(#1)\ignorespaces}}
+\VECTOR(\@tempb)(#2)\VECTOR(\@tempb)(#1)}\ignorespaces}
\let\lp@r( \let\rp@r)
\renewcommand*\polyline[1][\beveljoin]{\p@lylin@[#1]}
@@ -223,77 +277,59 @@
\endgroup
\ignorespaces}}
-\def\GraphGrid(#1,#2){\bgroup\textcolor{red}{\linethickness{.1\p@}%
+\def\@picture(#1,#2)(#3,#4){%
+ \edef\pict@urcorner{#1,#2}% New statement
+ \edef\pict@llcorner{#3,#4}% New statement
+ \@picht#2\unitlength
+ \setbox\@picbox\hb@xt@#1\unitlength\bgroup
+ \hskip -#3\unitlength
+ \lower #4\unitlength\hbox\bgroup
+ \ignorespaces}
+\def\Gr@phGrid(#1,#2){\bgroup\textcolor{red}{\linethickness{.1\p@}%
\RoundUp#1modulo10to\@GridWd \RoundUp#2modulo10to\@GridHt
\@tempcnta=\@GridWd \divide\@tempcnta10\relax \advance\@tempcnta\@ne
\multiput(0,0)(10,0){\@tempcnta}{\line(0,1){\@GridHt}}%
\@tempcnta=\@GridHt \divide\@tempcnta10\advance\@tempcnta\@ne
\multiput(0,0)(0,10){\@tempcnta}{\line(1,0){\@GridWd}}\thinlines}%
\egroup\ignorespaces}
-\def\RoundUp#1modulo#2to#3{\expandafter\@tempcnta\Integer#1.??%
-\count254\@tempcnta\divide\count254by#2\relax
-\multiply\count254by#2\relax
-\count252\@tempcnta\advance\count252-\count254
-\ifnum\count252>0\advance\count252-#2\relax
-\advance\@tempcnta-\count252\fi\edef#3{\number\@tempcnta}\ignorespaces}%
+
+\NewDocumentCommand\AutoGrid{d() d()}{\bgroup%
+\put(\pict@llcorner){\expandafter\Gr@phGrid\expandafter(\pict@urcorner)}%
+\egroup\ignorespaces}
+
+\NewDocumentCommand\GraphGrid{r() d()}{%
+\IfValueTF{#2}{\put(#1){\Gr@phGrid(#2)}}%
+ {\put(0,0){\Gr@phGrid(#1)}}}
+
+\def\RoundUp#1modulo#2to#3{\edef#3{\fpeval{(ceil(#1/#2,0))*#2}}}%
\def\Integer#1.#2??{#1}%
-\def\DividE#1by#2to#3{%
- \edef#3{\fpeval{#1 / #2}}\relax
-}
+\def\DividE#1by#2to#3{\edef#3{\fpeval{#1 / #2}}}
\let\DivideFN\DividE
\def\MultiplY#1by#2to#3{\edef#3{\fpeval{#1 * #2}}}\relax
\let\MultiplyFN\MultiplY
\unless\ifdefined\Numero
- \def\Numero#1#2{\bgroup\dimen3254=#2\relax
- \edef\x{\noexpand\egroup\noexpand\edef\noexpand#1{%
- \strip@pt\dimen3254}}\x\ignorespaces}%
+ \def\Numero#1#2{\edef#1{\fpeval{round(#2,6)}}\ignorespaces}%
\fi
\def\SinOf#1to#2{\edef#2{\fpeval{round(sind#1,6)}}}\relax
\def\CosOf#1to#2{\edef#2{\fpeval{round(cosd#1,6)}}}\relax
-\def\ArgOfVect#1to#2{\bgroup\GetCoord(#1){\t@X}{\t@Y}%
-\def\s@gno{}%
-\ifdim\t@X\p@=\z@
- \ifdim\t@Y\p@=\z@
- \def\ArcTan{0}% vettore nullo
- \else
- \def\ArcTan{90}% vettore verticale
- \ifdim\t@Y\p@<\z@\def\ArcTan{-90}\fi
- \fi
-\else
- \ifdim\t@Y\p@=\z@% vettore orizzontale
- \ifdim\t@X\p@<\z@
- \def\ArcTan{180}%
- \else
- \def\ArcTan{0}%
- \fi
- \else % vettore qualsiasi
- \edef\ArcTan{\fpeval{atand(\t@Y / \t@X)}}\relax
- \ifdim\t@X\p@<\z@% vettore nei quadranti di sinistra
- \ifdim\t@Y\p@<\z@
- \edef\ArcTan{\fpeval{\ArcTan - 180}}\relax
- \else
- \edef\ArcTan{\fpeval{\ArcTan + 180}}\relax
- \fi
- \fi
- \fi
-\fi
-\edef\x{\noexpand\egroup\noexpand\edef\noexpand#2{\ArcTan}}%
-\x\ignorespaces}
+\def\ArgOfVect#1to#2{\GetCoord(#1){\t@X}{\t@Y}%
+\fptest{\t@X=\z@ && \t@Y=\z@}{\edef#2{0}%
+\PackageWarning{curve2e}{Null vector}{Check your data\MessageBreak
+Computations go on, but the results may be meaningless}}{%
+\edef#2{\fpeval{round(atand(\t@Y,\t@X),6)}}}\ignorespaces}
\def\MakeVectorFrom#1#2to#3{\edef#3{#1,#2}\ignorespaces}%
\def\CopyVect#1to#2{\edef#2{#1}\ignorespaces}%
\def\ModOfVect#1to#2{\GetCoord(#1)\t@X\t@Y
-\edef#2{\fpeval{sqrt(\t@X*\t@X + \t@Y*\t@Y)}}\relax
+\edef#2{\fpeval{round(sqrt(\t@X*\t@X + \t@Y*\t@Y),6)}}%
\ignorespaces}%
\def\DirOfVect#1to#2{\GetCoord(#1)\t@X\t@Y
\ModOfVect#1to\@tempa
-\unless\ifdim\@tempa\p@=\z@
- \DividE\t@X\p@ by\@tempa to\t@X
- \DividE\t@Y\p@ by\@tempa to\t@Y
-\fi
-\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
+\fptest{\@tempa=\z@}{}{%
+ \edef\t@X{\fpeval{round(\t@X/\@tempa,6)}}%
+ \edef\t@Y{\fpeval{round(\t@Y/\@tempa,6)}}%
+}\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
\def\ModAndDirOfVect#1to#2and#3{%
-\GetCoord(#1)\t@X\t@Y
\ModOfVect#1to#2%
\DirOfVect#1to#3\ignorespaces}%
\def\DistanceAndDirOfVect#1minus#2to#3and#4{%
@@ -304,42 +340,54 @@
\def\YpartOfVect#1to#2{%
\GetCoord(#1)\@tempa#2\ignorespaces}%
\def\DirFromAngle#1to#2{%
-\CosOf#1to\t@X
-\SinOf#1to\t@Y
+\edef\t@X{\fpeval{round(cosd#1,6)}}%
+\edef\t@Y{\fpeval{round(sind#1,6)}}%
\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
\def\ScaleVect#1by#2to#3{\GetCoord(#1)\t@X\t@Y
-\edef\t@X{\fpeval{#2 * \t@X}}\relax
-\edef\t@Y{\fpeval{#2 * \t@Y}}\relax
+\edef\t@X{\fpeval{#2 * \t@X}}%
+\edef\t@Y{\fpeval{#2 * \t@Y}}%
\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
\def\ConjVect#1to#2{\GetCoord(#1)\t@X\t@Y
\edef\t@Y{-\t@Y}%
\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
\def\AddVect#1and#2to#3{\GetCoord(#1)\tu@X\tu@Y
\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\tu@X + \td@X}}\relax
-\edef\t@Y{\fpeval{\tu@Y + \td@Y}}\relax
+\edef\t@X{\fpeval{\tu@X + \td@X}}%
+\edef\t@Y{\fpeval{\tu@Y + \td@Y}}%
\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
\def\SubVect#1from#2to#3{\GetCoord(#1)\tu@X\tu@Y
\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\td@X - \tu@X}}\relax
-\edef\t@Y{\fpeval{\td@Y - \tu@Y}}\relax
+\edef\t@X{\fpeval{\td@X - \tu@X}}%
+\edef\t@Y{\fpeval{\td@Y - \tu@Y}}%
\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
-\def\MultVect#1by{\@ifstar{\@ConjMultVect#1by}{\@MultVect#1by}}%
-\def\@MultVect#1by#2to#3{\GetCoord(#1)\tu@X\tu@Y
-\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\tu@X * \td@X - \tu@Y * \td@Y}}\relax
-\edef\t@Y{\fpeval{\tu@Y * \td@X + \tu@X * \td@Y}}\relax
-\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
-\def\@ConjMultVect#1by#2to#3{\GetCoord(#1)\tu@X\tu@Y
-\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\tu@X * \td@X + \tu@Y * \td@Y}}\relax
-\edef\t@Y{\fpeval{\tu@Y * \td@X - \tu@X * \td@Y}}\relax
-\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}
-\def\DivVect#1by#2to#3{\ModAndDirOfVect#2to\@Mod and\@Dir
-\edef\@Mod{\fpeval{1 / \@Mod}}\relax
+\def\ModAndAngleOfVect#1to#2and#3{\ModOfVect#1to#2\relax
+\ArgOfVect#1to#3\ignorespaces}
+\newcount\MV@C
+\NewDocumentCommand\Multvect{m s m s m}{%
+\MV@C=0
+\ModAndAngleOfVect#1to\MV@uM and\MV@uA
+\ModAndAngleOfVect#3to\MV@dM and\MV@dA
+\IfBooleanT{#2}{\MV@C=1}\relax
+\IfBooleanT{#4}{\MV@C=1}\relax
+\unless\ifnum\MV@C=0\edef\MV@dA{-\MV@dA}\fi
+\edef\MV@rM{\fpeval{round((\MV@uM * \MV@dM),6)}}%
+\edef\MV@rA{\fpeval{round((\MV@uA + \MV@dA),6)}}%
+\GetCoord(\MV@rA:\MV@rM)\t@X\t@Y
+\MakeVectorFrom\t@X\t@Y to#5}
+\def\MultVect#1by{\@ifstar{\let\MV@c\@ne\@MultVect#1by}%
+ {\let\MV@c\empty\@MultVect#1by}}
+
+\def\@MultVect#1by#2to#3{%
+ \unless\ifx\MV@c\empty\Multvect{#1}{#2}*{#3}\else
+ \Multvect{#1}{#2}{#3}\fi}
+\def\DivVect#1by#2to#3{\Divvect{#1}{#2}{#3}}
+
+\NewDocumentCommand\Divvect{ m m m }{%
+\ModAndDirOfVect#2to\@Mod and\@Dir
+\edef\@Mod{\fpeval{1 / \@Mod}}%
\ConjVect\@Dir to\@Dir
\ScaleVect#1by\@Mod to\@tempa
-\MultVect\@tempa by\@Dir to#3\ignorespaces}%
+\Multvect{\@tempa}{\@Dir}#3\ignorespaces}%
\def\Arc(#1)(#2)#3{\begingroup
\@tdA=#3\p@
\unless\ifdim\@tdA=\z@
@@ -363,14 +411,13 @@
\CopyVect#2to\@pPun
\CopyVect#1to\@Cent \GetCoord(\@pPun)\@pPunX\@pPunY
\@@Arc\strokepath\ignorespaces}%
-\def\@@Arc{%
-\pIIe@moveto{\@pPunX\unitlength}{\@pPunY\unitlength}%
+\def\@@Arc{\pIIe@moveto{\@pPunX\unitlength}{\@pPunY\unitlength}%
\ifdim\@tdA>180\p@
\advance\@tdA-180\p@
\Numero\@gradi\@tdA
\SubVect\@pPun from\@Cent to\@V
\AddVect\@V and\@Cent to\@sPun
- \MultVect\@V by0,-1.3333333to\@V
+ \Multvect{\@V}{0,-1.3333333to}\@V
\if\Segno-\ScaleVect\@V by-1to\@V\fi
\AddVect\@pPun and\@V to\@pcPun
\AddVect\@sPun and\@V to\@scPun
@@ -385,7 +432,7 @@
\ifdim\@tdA>\z@
\DirFromAngle\@gradi to\@Dir \if\Segno-\ConjVect\@Dir to\@Dir \fi
\SubVect\@Cent from\@pPun to\@V
- \MultVect\@V by\@Dir to\@V
+ \Multvect{\@V}{\@Dir}\@V
\AddVect\@Cent and\@V to\@sPun
\@tdA=.5\@tdA \Numero\@gradi\@tdA
\DirFromAngle\@gradi to\@Phimezzi
@@ -403,10 +450,10 @@
\fi
\SubVect\@sPun from\@pPun to\@V
\DirOfVect\@V to\@V
- \MultVect\@Phimezzi by\@V to\@Phimezzi
+ \Multvect{\@Phimezzi}{\@V}\@Phimezzi
\AddVect\@sPun and\@Phimezzi to\@scPun
\ScaleVect\@V by-1to\@V
- \MultVect\@mPhimezzi by\@V to\@mPhimezzi
+ \Multvect{\@mPhimezzi}{\@V}\@mPhimezzi
\AddVect\@pPun and\@mPhimezzi to\@pcPun
\GetCoord(\@pcPun)\@pcPunX\@pcPunY
\GetCoord(\@scPun)\@scPunX\@scPunY
@@ -445,16 +492,16 @@
\@tdD=57.29578\@tdD \Numero\DeltaGradi\@tdD
\@tdD=\ifx\Segno--\fi\@gradi\p@ \Numero\@tempa\@tdD
\DirFromAngle\@tempa to\@Dir
-\MultVect\@V by\@Dir to\@sPun
+\Multvect{\@V}{\@Dir}\@sPun
\edef\@tempA{\ifx\Segno-\m@ne\else\@ne\fi}%
-\MultVect\@sPun by 0,\@tempA to\@vPun
+\Multvect{\@sPun}{0,\@tempA}\@vPun
\DirOfVect\@vPun to\@Dir
\AddVect\@sPun and #1 to \@sPun
\GetCoord(\@sPun)\@tdX\@tdY
\@tdD\ifx\Segno--\fi\DeltaGradi\p@
\@tdD=.5\@tdD \Numero\DeltaGradi\@tdD
\DirFromAngle\DeltaGradi to\@Dird
-\MultVect\@Dir by*\@Dird to\@Dir
+\Multvect{\@Dir}*{\@Dird}\@Dir%
\GetCoord(\@Dir)\@xnum\@ynum
\put(\@tdX,\@tdY){\vector(\@xnum,\@ynum){0}}%
\@tdE =\ifx\Segno--\fi\DeltaGradi\p@
@@ -480,34 +527,34 @@
\@tdD=\DeltaGradi\p@ \@tdD=57.29578\@tdD \Numero\DeltaGradi\@tdD
\@tdD=\if\Segno--\fi\@gradi\p@ \Numero\@tempa\@tdD
\DirFromAngle\@tempa to\@Dir
-\MultVect\@V by\@Dir to\@sPun% corrects the end point
+\Multvect{\@V}{\@Dir}\@sPun% corrects the end point
\edef\@tempA{\if\Segno--\fi1}%
-\MultVect\@sPun by 0,\@tempA to\@vPun
+\Multvect{\@sPun}{0,\@tempA}\@vPun
\DirOfVect\@vPun to\@Dir
\AddVect\@sPun and #1 to \@sPun
\GetCoord(\@sPun)\@tdX\@tdY
\@tdD\if\Segno--\fi\DeltaGradi\p@
\@tdD=.5\@tdD \Numero\@tempB\@tdD
\DirFromAngle\@tempB to\@Dird
-\MultVect\@Dir by*\@Dird to\@Dir
+\Multvect{\@Dir}*{\@Dird}\@Dir
\GetCoord(\@Dir)\@xnum\@ynum
-\put(\@tdX,\@tdY){\vector(\@xnum,\@ynum){0}}% end point arrowt ip
+\put(\@tdX,\@tdY){\vector(\@xnum,\@ynum){0}}% end point arrow tip
\@tdE =\DeltaGradi\p@
\advance\@tdA -2\@tdE \Numero\@gradi\@tdA
\CopyVect#1to\@Cent \GetCoord(\@pPun)\@pPunX\@pPunY
\SubVect\@Cent from\@pPun to \@V
\edef\@tempa{\if\Segno-\else-\fi\@ne}%
-\MultVect\@V by0,\@tempa to\@vPun
+\Multvect{\@V}{0,\@tempa}\@vPun
\@tdE\if\Segno--\fi\DeltaGradi\p@
\Numero\@tempB{0.5\@tdE}%
\DirFromAngle\@tempB to\@Dird
-\MultVect\@vPun by\@Dird to\@vPun% corrects the starting point
+\Multvect{\@vPun}{\@Dird}\@vPun% corrects the starting point
\DirOfVect\@vPun to\@Dir\GetCoord(\@Dir)\@xnum\@ynum
\put(\@pPunX,\@pPunY){\vector(\@xnum,\@ynum){0}}% starting point arrow tip
\edef\@tempa{\if\Segno--\fi\DeltaGradi}%
\DirFromAngle\@tempa to \@Dir
\SubVect\@Cent from\@pPun to\@V
-\MultVect\@V by\@Dir to\@V
+\Multvect{\@V}{\@Dir}\@V
\AddVect\@Cent and\@V to\@pPun
\GetCoord(\@pPun)\@pPunX\@pPunY
\@@Arc
@@ -552,6 +599,7 @@
\StartCurveAt#1WithDir{#3}\relax
\CbezierTo#2WithDir#4AndDists#5And{#6}\CurveFinish}
+
\def\@isTension#1;#2!!{\def\@tempA{#1}%
\def\@tempB{#2}\unless\ifx\@tempB\empty\strip@semicolon#2\fi}
@@ -562,12 +610,14 @@
\expandafter\DirOfVect\@tempA to\@Duno
\bgroup\unless\ifx\@tempB\empty\GetCoord(\@tempB)\@Tzero\@Tuno\fi
\DistanceAndDirOfVect\@Puno minus\@Pzero to\@Chord and\@DirChord
-\MultVect\@Dzero by*\@DirChord to \@Dpzero
-\MultVect\@Duno by*\@DirChord to \@Dpuno
+\Multvect{\@Dzero}*{\@DirChord}\@Dpzero
+\Multvect{\@Duno}*{\@DirChord}\@Dpuno
\GetCoord(\@Dpzero)\@DXpzero\@DYpzero
\GetCoord(\@Dpuno)\@DXpuno\@DYpuno
\DivideFN\@Chord by2 to\@semichord
-\ifdim\@DXpzero\p@=\z@
+\fptest{\@DYpuno=0 && \@DYpzero=0}{\GetCoord(\@Puno)\@tX\@tY
+ \pIIe@lineto{\@tX\unitlength}{\@tY\unitlength}}%
+{\ifdim\@DXpzero\p@=\z@
\@tdA=1.333333\p@
\Numero\@KCzero{\@semichord\@tdA}%
\fi
@@ -614,11 +664,11 @@
\GetCoord(\@CPuno)\@XCPuno\@YCPuno
\pIIe@curveto{\@XCPzero\unitlength}{\@YCPzero\unitlength}%
{\@XCPuno\unitlength}{\@YCPuno\unitlength}%
- {\@XPuno\unitlength}{\@YPuno\unitlength}\egroup
+ {\@XPuno\unitlength}{\@YPuno\unitlength}}\egroup
\CopyVect\@Puno to\@Pzero
\CopyVect\@Duno to\@Dzero
\ignorespaces}%
-\def\Curve{\@ifstar{\let\fillstroke\fillpath\Curve@}%
+\def\Curve{\@killglue\@ifstar{\let\fillstroke\fillpath\Curve@}%
{\let\fillstroke\strokepath\Curve@}}
\def\Curve@(#1)<#2>{%
@@ -651,7 +701,7 @@
\def\QurveTo#1WithDir#2{%
\edef\@Puno{#1}\DirOfVect#2to\@Duno\bgroup
\DistanceAndDirOfVect\@Puno minus\@Pzero to\@Chord and\@DirChord
-\MultVect\@Dzero by*\@Duno to \@Scalar
+\Multvect{\@Dzero}*{\@Duno}\@Scalar
\YpartOfVect\@Scalar to \@YScalar
\ifdim\@YScalar\p@=\z@
\PackageWarning{curve2e}%
@@ -661,8 +711,8 @@
a dotted line.\MessageBreak}%
\Dotline(\@Pzero)(\@Puno){2}\relax
\else
-\MultVect\@Dzero by*\@DirChord to \@Dpzero
-\MultVect\@Duno by*\@DirChord to \@Dpuno
+\Multvect{\@Dzero}*{\@DirChord}\@Dpzero
+\Multvect{\@Duno}*{\@DirChord}\@Dpuno
\GetCoord(\@Dpzero)\@DXpzero\@DYpzero
\GetCoord(\@Dpuno)\@DXpuno\@DYpuno
\MultiplyFN\@DXpzero by\@DXpuno to\@XXD
@@ -706,16 +756,15 @@
\ignorespaces}
%%
-%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
%% this license is at: http://www.latex-project.org/lppl.txt
%%
-%% This work is "author-maintained"
+%% This work is "maintained"
%%
%% This work consists of file curve2e.dtx, and the derived files
%% curve2e.sty and curve2e.pdf, plus the auxiliary derived files
-%% README.txt and manifest.txt.
+%% README.txt and curve2e-v161.sty.
%%
%%
%% End of file `curve2e.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/curve2e.tlpobj new/tlpkg/tlpobj/curve2e.tlpobj
--- old/tlpkg/tlpobj/curve2e.tlpobj 2019-04-01 02:24:55.000000000 +0200
+++ new/tlpkg/tlpobj/curve2e.tlpobj 2020-04-16 01:56:55.000000000 +0200
@@ -1,6 +1,6 @@
name curve2e
category Package
-revision 50663
+revision 54758
shortdesc Extensions for package pict2e
relocated 1
longdesc The package extends the drawing capacities of the pict2e that
@@ -14,7 +14,6 @@
RELOC/tex/latex/curve2e/curve2e-v161.sty
RELOC/tex/latex/curve2e/curve2e.sty
catalogue-ctan /macros/latex/contrib/curve2e
-catalogue-date 2019-03-30 09:54:39 +0100
catalogue-license lppl1.3c
catalogue-topics graphics graphics-in-tex graphics-curve
-catalogue-version 2.0.1
+catalogue-version 2.2.6
++++++ cweb.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/ctangle.man1.pdf and new/texmf-dist/doc/man/man1/ctangle.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ctwill-refsort.man1.pdf and new/texmf-dist/doc/man/man1/ctwill-refsort.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ctwill-twinx.man1.pdf and new/texmf-dist/doc/man/man1/ctwill-twinx.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctwill.1 new/texmf-dist/doc/man/man1/ctwill.1
--- old/texmf-dist/doc/man/man1/ctwill.1 2019-03-10 23:18:24.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ctwill.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 2.7
+.\" Automatically generated by Pandoc 2.9.1.1
.\"
-.TH "CTWILL" "1" "March 10, 2019" "Web2c 2019" "General Commands Manual"
+.TH "CTWILL" "1" "December 7, 2019" "Web2c 2020" "General Commands Manual"
.hy
.SH NAME
.PP
@@ -238,7 +238,7 @@
.PD 0
.P
.PD
-As of 2019, \f[B]ctwill\f[R] and its utilities \f[B]ctwill-refsort\f[R] and
-\f[B]ctwill-twinx\f[R] have been fully integrated with the extended CWEBbin
-system that serves as the basis for CWEB in TeX\ Live; see the project
+\f[B]ctwill\f[R] and its utilities \f[B]ctwill-refsort\f[R] and \f[B]ctwill-twinx\f[R]
+have been fully integrated with the CWEBbin extension that serves as the
+basis for CWEB in TeX\ Live; see the project
page (https://github.com/ascherer/cwebbin).
Binary files old/texmf-dist/doc/man/man1/ctwill.man1.pdf and new/texmf-dist/doc/man/man1/ctwill.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/cweave.man1.pdf and new/texmf-dist/doc/man/man1/cweave.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/cweb.1 new/texmf-dist/doc/man/man1/cweb.1
--- old/texmf-dist/doc/man/man1/cweb.1 2019-03-10 23:18:24.000000000 +0100
+++ new/texmf-dist/doc/man/man1/cweb.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 2.7
+.\" Automatically generated by Pandoc 2.9.1.1
.\"
-.TH "CWEB" "1" "January 27, 2019" "Web2c 2019" "General Commands Manual"
+.TH "CWEB" "1" "December 7, 2019" "Web2c 2020" "General Commands Manual"
.hy
.SH NAME
.PP
-ctangle, cweave \[en] translate CWEB to TeX
+ctangle, cweave \[en] translate CWEB to C/C++ and/or TeX
.SH SYNOPSIS
.PP
\f[B]ctangle\f[R] [\f[I]options\f[R]] \f[I]webfile\f[R][.w]
@@ -164,7 +164,5 @@
.PD 0
.P
.PD
-As of 2019, the CWEB system in TeX\ Live is based on the CWEBbin
-extension that collects ideas and improvements from numerous
-contributors; see the project
+CWEB in TeX\ Live is based on the CWEBbin extension; see the project
page (https://github.com/ascherer/cwebbin).
Binary files old/texmf-dist/doc/man/man1/cweb.man1.pdf and new/texmf-dist/doc/man/man1/cweb.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cweb.doc.tlpobj new/tlpkg/tlpobj/cweb.doc.tlpobj
--- old/tlpkg/tlpobj/cweb.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cweb.doc.tlpobj 2020-03-14 01:42:05.000000000 +0100
@@ -1,6 +1,6 @@
name cweb.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of cweb
docfiles size=136
texmf-dist/doc/man/man1/ctangle.1
++++++ cweb.tar.xz ++++++
++++ 2597 lines of diff (skipped)
++++++ cyrillic-bin.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/rubibtex.man1.pdf and new/texmf-dist/doc/man/man1/rubibtex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/rumakeindex.man1.pdf and new/texmf-dist/doc/man/man1/rumakeindex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj new/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj
--- old/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj 2020-01-27 01:40:46.000000000 +0100
@@ -1,6 +1,6 @@
name cyrillic-bin.doc
category TLCore
-revision 50602
+revision 53559
shortdesc doc files of cyrillic-bin
docfiles size=12
texmf-dist/doc/man/man1/rubibtex.1
++++++ cyrillic-bin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive/rubibtex.sh new/texmf-dist/scripts/texlive/rubibtex.sh
--- old/texmf-dist/scripts/texlive/rubibtex.sh 2013-04-08 17:51:20.000000000 +0200
+++ new/texmf-dist/scripts/texlive/rubibtex.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# rubibtex, based on the original version contained in the t2 bundle.
-# Thomas Esser, Public Domain.
-
-progname=rubibtex
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-job=$1
-backup="$tmpdir/orig.aux"
-
-case $job in
- "")
- echo "usage: $progname file" >&2
- exit 1
-esac
-
-if test ! -f "$job.aux"; then
- echo "$progname: file \`$job.aux' does not exist." >&2
- exit 1
-fi
-
-trap '
- rm -rf "$tmpdir"
- exit 1
-' 1 2 3 7 13 15
-(umask 077; mkdir "$tmpdir") \
- || { echo "$progname: could not create directory \`$tmpdir'" >&2; exit 1; }
-
-cat <"$job.aux" >"$backup" || {
- echo "$progname: could not create backup of file \`$job.aux' as \`$backup'." >&2
- rm -rf "$tmpdir"
- exit 1
-}
-
-sed '
- /^\\citation/ {
- s/\\IeC {\\CYRA }/�/g
- s/\\IeC {\\CYRB }/�/g
- s/\\IeC {\\CYRV }/�/g
- s/\\IeC {\\CYRG }/�/g
- s/\\IeC {\\CYRD }/�/g
- s/\\IeC {\\CYRE }/�/g
- s/\\IeC {\\CYRYO }/�/g
- s/\\IeC {\\CYRZH }/�/g
- s/\\IeC {\\CYRZ }/�/g
- s/\\IeC {\\CYRI }/�/g
- s/\\IeC {\\CYRISHRT }/�/g
- s/\\IeC {\\CYRK }/�/g
- s/\\IeC {\\CYRL }/�/g
- s/\\IeC {\\CYRM }/�/g
- s/\\IeC {\\CYRN }/�/g
- s/\\IeC {\\CYRO }/�/g
- s/\\IeC {\\CYRP }/�/g
- s/\\IeC {\\CYRR }/�/g
- s/\\IeC {\\CYRS }/�/g
- s/\\IeC {\\CYRT }/�/g
- s/\\IeC {\\CYRU }/�/g
- s/\\IeC {\\CYRF }/�/g
- s/\\IeC {\\CYRH }/�/g
- s/\\IeC {\\CYRC }/�/g
- s/\\IeC {\\CYRCH }/�/g
- s/\\IeC {\\CYRSH }/�/g
- s/\\IeC {\\CYRSHCH }/�/g
- s/\\IeC {\\CYRHRDSN }/�/g
- s/\\IeC {\\CYRERY }/�/g
- s/\\IeC {\\CYRSFTSN }/�/g
- s/\\IeC {\\CYREREV }/�/g
- s/\\IeC {\\CYRYU }/�/g
- s/\\IeC {\\CYRYA }/�/g
- s/\\IeC {\\cyra }/�/g
- s/\\IeC {\\cyrb }/�/g
- s/\\IeC {\\cyrv }/�/g
- s/\\IeC {\\cyrg }/�/g
- s/\\IeC {\\cyrd }/�/g
- s/\\IeC {\\cyre }/�/g
- s/\\IeC {\\cyryo }/�/g
- s/\\IeC {\\cyrzh }/�/g
- s/\\IeC {\\cyrz }/�/g
- s/\\IeC {\\cyri }/�/g
- s/\\IeC {\\cyrishrt }/�/g
- s/\\IeC {\\cyrk }/�/g
- s/\\IeC {\\cyrl }/�/g
- s/\\IeC {\\cyrm }/�/g
- s/\\IeC {\\cyrn }/�/g
- s/\\IeC {\\cyro }/�/g
- s/\\IeC {\\cyrp }/�/g
- s/\\IeC {\\cyrr }/�/g
- s/\\IeC {\\cyrs }/�/g
- s/\\IeC {\\cyrt }/�/g
- s/\\IeC {\\cyru }/�/g
- s/\\IeC {\\cyrf }/�/g
- s/\\IeC {\\cyrh }/�/g
- s/\\IeC {\\cyrc }/�/g
- s/\\IeC {\\cyrch }/�/g
- s/\\IeC {\\cyrsh }/�/g
- s/\\IeC {\\cyrshch }/�/g
- s/\\IeC {\\cyrhrdsn }/�/g
- s/\\IeC {\\cyrery }/�/g
- s/\\IeC {\\cyrsftsn }/�/g
- s/\\IeC {\\cyrerev }/�/g
- s/\\IeC {\\cyryu }/�/g
- s/\\IeC {\\cyrya }/�/g
- }
-' <"$backup" >"$job.aux"
-
-bibtex "$job"
-
-cat "$backup" > "$job.aux"
-rm -rf "$tmpdir"
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive/rumakeindex.sh new/texmf-dist/scripts/texlive/rumakeindex.sh
--- old/texmf-dist/scripts/texlive/rumakeindex.sh 2013-04-08 17:51:20.000000000 +0200
+++ new/texmf-dist/scripts/texlive/rumakeindex.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-BASE=`basename "$1" .idx`
-IDX=$BASE.idx
-IND=$BASE.ind
-ILG=$BASE.ilg
-
-sed '
-/^\\indexentry{/ {
-s/\\IeC {\\CYRA }/�/g
-s/\\IeC {\\cyra }/�/g
-s/\\IeC {\\CYRB }/�/g
-s/\\IeC {\\cyrb }/�/g
-s/\\IeC {\\CYRV }/�/g
-s/\\IeC {\\cyrv }/�/g
-s/\\IeC {\\CYRG }/�/g
-s/\\IeC {\\cyrg }/�/g
-s/\\IeC {\\CYRD }/�/g
-s/\\IeC {\\cyrd }/�/g
-s/\\IeC {\\CYRE }/�/g
-s/\\IeC {\\cyre }/�/g
-s/\\IeC {\\CYRYO }/�/g
-s/\\IeC {\\cyryo }/�/g
-s/\\IeC {\\CYRZH }/�/g
-s/\\IeC {\\cyrzh }/�/g
-s/\\IeC {\\CYRZ }/�/g
-s/\\IeC {\\cyrz }/�/g
-s/\\IeC {\\CYRI }/�/g
-s/\\IeC {\\cyri }/�/g
-s/\\IeC {\\CYRISHRT }/�/g
-s/\\IeC {\\cyrishrt }/�/g
-s/\\IeC {\\CYRK }/�/g
-s/\\IeC {\\cyrk }/�/g
-s/\\IeC {\\CYRL }/�/g
-s/\\IeC {\\cyrl }/�/g
-s/\\IeC {\\CYRM }/�/g
-s/\\IeC {\\cyrm }/�/g
-s/\\IeC {\\CYRN }/�/g
-s/\\IeC {\\cyrn }/�/g
-s/\\IeC {\\CYRO }/�/g
-s/\\IeC {\\cyro }/�/g
-s/\\IeC {\\CYRP }/�/g
-s/\\IeC {\\cyrp }/�/g
-s/\\IeC {\\CYRR }/�/g
-s/\\IeC {\\cyrr }/�/g
-s/\\IeC {\\CYRS }/�/g
-s/\\IeC {\\cyrs }/�/g
-s/\\IeC {\\CYRT }/�/g
-s/\\IeC {\\cyrt }/�/g
-s/\\IeC {\\CYRU }/�/g
-s/\\IeC {\\cyru }/�/g
-s/\\IeC {\\CYRF }/�/g
-s/\\IeC {\\cyrf }/�/g
-s/\\IeC {\\CYRH }/�/g
-s/\\IeC {\\cyrh }/�/g
-s/\\IeC {\\CYRC }/�/g
-s/\\IeC {\\cyrc }/�/g
-s/\\IeC {\\CYRCH }/�/g
-s/\\IeC {\\cyrch }/�/g
-s/\\IeC {\\CYRSH }/�/g
-s/\\IeC {\\cyrsh }/�/g
-s/\\IeC {\\CYRSHCH }/�/g
-s/\\IeC {\\cyrshch }/�/g
-s/\\IeC {\\CYRHRDSN }/�/g
-s/\\IeC {\\cyrhrdsn }/�/g
-s/\\IeC {\\CYRERY }/�/g
-s/\\IeC {\\cyrery }/�/g
-s/\\IeC {\\CYRSFTSN }/�/g
-s/\\IeC {\\cyrsftsn }/�/g
-s/\\IeC {\\CYREREV }/�/g
-s/\\IeC {\\cyrerev }/�/g
-s/\\IeC {\\CYRYU }/�/g
-s/\\IeC {\\cyryu }/�/g
-s/\\IeC {\\CYRYA }/�/g
-s/\\IeC {\\cyrya }/�/g
-}' $IDX | makeindex -t $ILG | tr '������������������������������������������������������������������' \
- '�����������ų�����������������������������������������������������' > $IND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive-extra/rubibtex.sh new/texmf-dist/scripts/texlive-extra/rubibtex.sh
--- old/texmf-dist/scripts/texlive-extra/rubibtex.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/texlive-extra/rubibtex.sh 2020-01-27 00:58:37.000000000 +0100
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# rubibtex, based on the original version contained in the t2 bundle.
+# Thomas Esser, Public Domain.
+
+progname=rubibtex
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
+job=$1
+backup="$tmpdir/orig.aux"
+
+case $job in
+ "")
+ echo "usage: $progname file" >&2
+ exit 1
+esac
+
+if test ! -f "$job.aux"; then
+ echo "$progname: file \`$job.aux' does not exist." >&2
+ exit 1
+fi
+
+trap '
+ rm -rf "$tmpdir"
+ exit 1
+' 1 2 3 7 13 15
+(umask 077; mkdir "$tmpdir") \
+ || { echo "$progname: could not create directory \`$tmpdir'" >&2; exit 1; }
+
+cat <"$job.aux" >"$backup" || {
+ echo "$progname: could not create backup of file \`$job.aux' as \`$backup'." >&2
+ rm -rf "$tmpdir"
+ exit 1
+}
+
+sed '
+ /^\\citation/ {
+ s/\\IeC {\\CYRA }/�/g
+ s/\\IeC {\\CYRB }/�/g
+ s/\\IeC {\\CYRV }/�/g
+ s/\\IeC {\\CYRG }/�/g
+ s/\\IeC {\\CYRD }/�/g
+ s/\\IeC {\\CYRE }/�/g
+ s/\\IeC {\\CYRYO }/�/g
+ s/\\IeC {\\CYRZH }/�/g
+ s/\\IeC {\\CYRZ }/�/g
+ s/\\IeC {\\CYRI }/�/g
+ s/\\IeC {\\CYRISHRT }/�/g
+ s/\\IeC {\\CYRK }/�/g
+ s/\\IeC {\\CYRL }/�/g
+ s/\\IeC {\\CYRM }/�/g
+ s/\\IeC {\\CYRN }/�/g
+ s/\\IeC {\\CYRO }/�/g
+ s/\\IeC {\\CYRP }/�/g
+ s/\\IeC {\\CYRR }/�/g
+ s/\\IeC {\\CYRS }/�/g
+ s/\\IeC {\\CYRT }/�/g
+ s/\\IeC {\\CYRU }/�/g
+ s/\\IeC {\\CYRF }/�/g
+ s/\\IeC {\\CYRH }/�/g
+ s/\\IeC {\\CYRC }/�/g
+ s/\\IeC {\\CYRCH }/�/g
+ s/\\IeC {\\CYRSH }/�/g
+ s/\\IeC {\\CYRSHCH }/�/g
+ s/\\IeC {\\CYRHRDSN }/�/g
+ s/\\IeC {\\CYRERY }/�/g
+ s/\\IeC {\\CYRSFTSN }/�/g
+ s/\\IeC {\\CYREREV }/�/g
+ s/\\IeC {\\CYRYU }/�/g
+ s/\\IeC {\\CYRYA }/�/g
+ s/\\IeC {\\cyra }/�/g
+ s/\\IeC {\\cyrb }/�/g
+ s/\\IeC {\\cyrv }/�/g
+ s/\\IeC {\\cyrg }/�/g
+ s/\\IeC {\\cyrd }/�/g
+ s/\\IeC {\\cyre }/�/g
+ s/\\IeC {\\cyryo }/�/g
+ s/\\IeC {\\cyrzh }/�/g
+ s/\\IeC {\\cyrz }/�/g
+ s/\\IeC {\\cyri }/�/g
+ s/\\IeC {\\cyrishrt }/�/g
+ s/\\IeC {\\cyrk }/�/g
+ s/\\IeC {\\cyrl }/�/g
+ s/\\IeC {\\cyrm }/�/g
+ s/\\IeC {\\cyrn }/�/g
+ s/\\IeC {\\cyro }/�/g
+ s/\\IeC {\\cyrp }/�/g
+ s/\\IeC {\\cyrr }/�/g
+ s/\\IeC {\\cyrs }/�/g
+ s/\\IeC {\\cyrt }/�/g
+ s/\\IeC {\\cyru }/�/g
+ s/\\IeC {\\cyrf }/�/g
+ s/\\IeC {\\cyrh }/�/g
+ s/\\IeC {\\cyrc }/�/g
+ s/\\IeC {\\cyrch }/�/g
+ s/\\IeC {\\cyrsh }/�/g
+ s/\\IeC {\\cyrshch }/�/g
+ s/\\IeC {\\cyrhrdsn }/�/g
+ s/\\IeC {\\cyrery }/�/g
+ s/\\IeC {\\cyrsftsn }/�/g
+ s/\\IeC {\\cyrerev }/�/g
+ s/\\IeC {\\cyryu }/�/g
+ s/\\IeC {\\cyrya }/�/g
+ }
+' <"$backup" >"$job.aux"
+
+bibtex "$job"
+
+cat "$backup" > "$job.aux"
+rm -rf "$tmpdir"
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive-extra/rumakeindex.sh new/texmf-dist/scripts/texlive-extra/rumakeindex.sh
--- old/texmf-dist/scripts/texlive-extra/rumakeindex.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/texlive-extra/rumakeindex.sh 2020-01-27 00:58:37.000000000 +0100
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+BASE=`basename "$1" .idx`
+IDX=$BASE.idx
+IND=$BASE.ind
+ILG=$BASE.ilg
+
+sed '
+/^\\indexentry{/ {
+s/\\IeC {\\CYRA }/�/g
+s/\\IeC {\\cyra }/�/g
+s/\\IeC {\\CYRB }/�/g
+s/\\IeC {\\cyrb }/�/g
+s/\\IeC {\\CYRV }/�/g
+s/\\IeC {\\cyrv }/�/g
+s/\\IeC {\\CYRG }/�/g
+s/\\IeC {\\cyrg }/�/g
+s/\\IeC {\\CYRD }/�/g
+s/\\IeC {\\cyrd }/�/g
+s/\\IeC {\\CYRE }/�/g
+s/\\IeC {\\cyre }/�/g
+s/\\IeC {\\CYRYO }/�/g
+s/\\IeC {\\cyryo }/�/g
+s/\\IeC {\\CYRZH }/�/g
+s/\\IeC {\\cyrzh }/�/g
+s/\\IeC {\\CYRZ }/�/g
+s/\\IeC {\\cyrz }/�/g
+s/\\IeC {\\CYRI }/�/g
+s/\\IeC {\\cyri }/�/g
+s/\\IeC {\\CYRISHRT }/�/g
+s/\\IeC {\\cyrishrt }/�/g
+s/\\IeC {\\CYRK }/�/g
+s/\\IeC {\\cyrk }/�/g
+s/\\IeC {\\CYRL }/�/g
+s/\\IeC {\\cyrl }/�/g
+s/\\IeC {\\CYRM }/�/g
+s/\\IeC {\\cyrm }/�/g
+s/\\IeC {\\CYRN }/�/g
+s/\\IeC {\\cyrn }/�/g
+s/\\IeC {\\CYRO }/�/g
+s/\\IeC {\\cyro }/�/g
+s/\\IeC {\\CYRP }/�/g
+s/\\IeC {\\cyrp }/�/g
+s/\\IeC {\\CYRR }/�/g
+s/\\IeC {\\cyrr }/�/g
+s/\\IeC {\\CYRS }/�/g
+s/\\IeC {\\cyrs }/�/g
+s/\\IeC {\\CYRT }/�/g
+s/\\IeC {\\cyrt }/�/g
+s/\\IeC {\\CYRU }/�/g
+s/\\IeC {\\cyru }/�/g
+s/\\IeC {\\CYRF }/�/g
+s/\\IeC {\\cyrf }/�/g
+s/\\IeC {\\CYRH }/�/g
+s/\\IeC {\\cyrh }/�/g
+s/\\IeC {\\CYRC }/�/g
+s/\\IeC {\\cyrc }/�/g
+s/\\IeC {\\CYRCH }/�/g
+s/\\IeC {\\cyrch }/�/g
+s/\\IeC {\\CYRSH }/�/g
+s/\\IeC {\\cyrsh }/�/g
+s/\\IeC {\\CYRSHCH }/�/g
+s/\\IeC {\\cyrshch }/�/g
+s/\\IeC {\\CYRHRDSN }/�/g
+s/\\IeC {\\cyrhrdsn }/�/g
+s/\\IeC {\\CYRERY }/�/g
+s/\\IeC {\\cyrery }/�/g
+s/\\IeC {\\CYRSFTSN }/�/g
+s/\\IeC {\\cyrsftsn }/�/g
+s/\\IeC {\\CYREREV }/�/g
+s/\\IeC {\\cyrerev }/�/g
+s/\\IeC {\\CYRYU }/�/g
+s/\\IeC {\\cyryu }/�/g
+s/\\IeC {\\CYRYA }/�/g
+s/\\IeC {\\cyrya }/�/g
+}' $IDX | makeindex -t $ILG | tr '������������������������������������������������������������������' \
+ '�����������ų�����������������������������������������������������' > $IND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic-bin.tlpobj new/tlpkg/tlpobj/cyrillic-bin.tlpobj
--- old/tlpkg/tlpobj/cyrillic-bin.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cyrillic-bin.tlpobj 2020-01-27 01:40:46.000000000 +0100
@@ -1,8 +1,8 @@
name cyrillic-bin
category TLCore
-revision 50602
+revision 53559
shortdesc Cyrillic bibtex and makeindex
depend cyrillic-bin.ARCH
runfiles size=2
- texmf-dist/scripts/texlive/rubibtex.sh
- texmf-dist/scripts/texlive/rumakeindex.sh
+ texmf-dist/scripts/texlive-extra/rubibtex.sh
+ texmf-dist/scripts/texlive-extra/rumakeindex.sh
++++++ dad.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dad.doc.tlpobj new/tlpkg/tlpobj/dad.doc.tlpobj
--- old/tlpkg/tlpobj/dad.doc.tlpobj 2019-02-28 03:31:01.000000000 +0100
+++ new/tlpkg/tlpobj/dad.doc.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,6 +1,6 @@
name dad.doc
category Package
-revision 47027
+revision 54191
shortdesc doc files of dad
relocated 1
docfiles size=76
++++++ dad.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dad.tlpobj new/tlpkg/tlpobj/dad.tlpobj
--- old/tlpkg/tlpobj/dad.tlpobj 2019-02-28 03:31:01.000000000 +0100
+++ new/tlpkg/tlpobj/dad.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,14 +1,13 @@
name dad
category Package
-revision 47027
+revision 54191
shortdesc Simple typesetting system for mixed Arabic/Latin documents
relocated 1
longdesc This package allows simple typesetting in Arabic script,
longdesc intended for mixed Arabic/Latin script usage in situations
-longdesc where heavy-duty solutions are discouraged. The system
-longdesc operates with both Unicode and transliterated input, allowing
-longdesc the user to choose the most appropriate approach for every
-longdesc situation.
+longdesc where heavy-duty solutions are discouraged. The system operates
+longdesc with both Unicode and transliterated input, allowing the user
+longdesc to choose the most appropriate approach for every situation.
execute addMap dad.map
runfiles size=2588
RELOC/fonts/afm/public/dad/Dad-bold.afm
@@ -31,7 +30,6 @@
RELOC/tex/lualatex/dad/T1dad.fd
RELOC/tex/lualatex/dad/dad.sty
catalogue-ctan /language/arabic/dad
-catalogue-date 2018-03-19 16:37:57 +0100
catalogue-license lppl
catalogue-topics arabic luatex font-type1
catalogue-version 1.2
++++++ dashundergaps.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dashundergaps/README.md new/doc/latex/dashundergaps/README.md
--- old/doc/latex/dashundergaps/README.md 2018-06-24 23:57:27.000000000 +0200
+++ new/doc/latex/dashundergaps/README.md 2020-01-23 18:53:38.000000000 +0100
@@ -12,11 +12,11 @@
https://github.com/FrankMittelbach/fmitex/
-The license is LPPL.
+The license is LPPL 1.3c.
-----
-Copyright (C) 2018 Frank Mittelbach<br />
+Copyright (C) 2018-2020 Frank Mittelbach<br />
https://latex-project.org/ <br />
All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dashundergaps/changes.txt new/doc/latex/dashundergaps/changes.txt
--- old/doc/latex/dashundergaps/changes.txt 2018-11-19 22:55:47.000000000 +0100
+++ new/doc/latex/dashundergaps/changes.txt 2020-02-11 23:09:42.000000000 +0100
@@ -1,3 +1,21 @@
+2020-02-11 Frank Mittelbach
+
+ * dashundergaps.dtx: Expand argument up front to work around
+ ulem restrictions when possible (gh/10)
+
+2020-01-22 Frank Mittelbach
+
+ * dashundergaps.dtx (subsection{Loading and fixing/changing \pkg{ulem}}):
+ Adjusted definition to new ulem release
+
+ * Some release cleanup.
+
+2019-07-14 Frank Mittelbach
+
+ * dashundergaps.dtx (subsection{The main implementation part}):
+ As the code doesn't run with expl3 versions prior to mid 2018, we
+ check against that (github/7).
+
2018-11-09 Frank Mittelbach
* dashundergaps.dtx v2.0d
Binary files old/doc/latex/dashundergaps/dashundergaps-code.pdf and new/doc/latex/dashundergaps/dashundergaps-code.pdf differ
Binary files old/doc/latex/dashundergaps/dashundergaps-doc.pdf and new/doc/latex/dashundergaps/dashundergaps-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dashundergaps/l3doc-TUB.cls new/doc/latex/dashundergaps/l3doc-TUB.cls
--- old/doc/latex/dashundergaps/l3doc-TUB.cls 2018-11-19 22:55:47.000000000 +0100
+++ new/doc/latex/dashundergaps/l3doc-TUB.cls 2020-01-23 18:53:38.000000000 +0100
@@ -891,7 +891,7 @@
\tl_greplace_all:Nno \g__codedoc_base_name_tl
{ ~ } { \c_catcode_other_space_tl }
\seq_get:NN #1 \l__codedoc_tmpa_tl
- \str_if_eq_x:nnTF { \l__codedoc_tmpa_tl } { \scan_stop: }
+ \str_if_eq:eeTF { \l__codedoc_tmpa_tl } { \scan_stop: }
{
\seq_gclear:N \g__codedoc_variants_seq
\__codedoc_names_typeset_auxii:x { \g__codedoc_base_name_tl }
@@ -954,7 +954,7 @@
#1
{
\l__codedoc_tmpa_tl
- \str_if_eq_x:nnF { \l__codedoc_tmpb_tl } { \scan_stop: }
+ \str_if_eq:eeF { \l__codedoc_tmpb_tl } { \scan_stop: }
{ : \l__codedoc_tmpb_tl }
\bool_if:NT \l__codedoc_macro_TF_bool { TF }
}
@@ -2098,7 +2098,7 @@
\tl_if_empty:nTF {#3}
{ { } { } { } }
{
- \str_if_eq_x:nnTF {#3} { TeX }
+ \str_if_eq:eeTF {#3} { TeX }
{
{ TeX~and~LaTeX2e }
{ \string\TeX{}~and~\string\LaTeXe{} }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashundergaps.doc.tlpobj new/tlpkg/tlpobj/dashundergaps.doc.tlpobj
--- old/tlpkg/tlpobj/dashundergaps.doc.tlpobj 2019-02-28 03:31:07.000000000 +0100
+++ new/tlpkg/tlpobj/dashundergaps.doc.tlpobj 2020-02-12 01:54:47.000000000 +0100
@@ -1,9 +1,9 @@
name dashundergaps.doc
category Package
-revision 49198
+revision 53756
shortdesc doc files of dashundergaps
relocated 1
-docfiles size=270
+docfiles size=284
RELOC/doc/latex/dashundergaps/README.md
RELOC/doc/latex/dashundergaps/changes.txt
RELOC/doc/latex/dashundergaps/dashundergaps-code.pdf
++++++ dashundergaps.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dashundergaps/dashundergaps.sty new/tex/latex/dashundergaps/dashundergaps.sty
--- old/tex/latex/dashundergaps/dashundergaps.sty 2018-11-19 22:55:47.000000000 +0100
+++ new/tex/latex/dashundergaps/dashundergaps.sty 2020-02-11 23:09:42.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2018 Frank Mittelbach
+%% Copyright 2018-2020 Frank Mittelbach
%%
%% This file was generated from file(s) of the LaTeX `dashundergaps Bundle'.
%% --------------------------------------------------------------------------
@@ -32,25 +32,23 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: dashundergaps.dtx (C) Copyright 2018 Frank Mittelbach
+%% File: dashundergaps.dtx (C) Copyright 2018-2020 Frank Mittelbach
-\def\dashundergapsdate {2018/11/18}
-\def\dashundergapsversion{v2.0d}
+\def\dashundergapsdate {2020-02-11} % don't forget to also adjust build.lua!
+\def\dashundergapsversion{v2.0g}
\RequirePackage[normalem]{ulem}
-\def\dotuline{\bgroup
+\protected\def\dotuline{\leavevmode\bgroup
\UL@setULdepth
+ \ifx\UL@on\UL@onin \advance\ULdepth2\p@\fi
\markoverwith{\begingroup
- \advance\ULdepth0.08ex
\lower\ULdepth\hbox{\normalfont \kern.1em .\kern.04em}%
\endgroup}%
\ULon}
-\MakeRobust\dotuline
-\def\uwave{\bgroup
+\protected\def\uwave{\leavevmode\bgroup
\UL@setULdepth
\advance\ULdepth 0.6\p@
\markoverwith{\lower\ULdepth\hbox{\sixly \char58}}\ULon}
-\MakeRobust\uwave
\def\fmdug@ublank{\bgroup\let\UL@leadtype\@empty\ULon}
\def\UL@dischyp{\global\setbox\UL@hyphenbox\hbox
{\ifnum \hyphenchar\font<\z@ \string-\else \char\hyphenchar\font \fi}%
@@ -64,12 +62,27 @@
\let\fmdug@box\box
\RequirePackage{xparse,l3keys2e}
+\@ifpackagelater{expl3}{2018-06-24}
+ {}
+ {%
+ \PackageError{dashundergaps}{Support package l3kernel too old}
+ {%
+ Please install an up to date version of l3kernel\MessageBreak
+ using your TeX package manager or from CTAN.\MessageBreak
+ \MessageBreak
+ Loading dashundergaps will abort!%
+ }%
+ \endinput
+ }
\ProvidesExplPackage{dashundergaps}
{\dashundergapsdate}
{\dashundergapsversion}
{Dashing and underlining phantom text}
-\DeclareDocumentCommand \gap { som } { \__fmdug_gap:nnn {#1}{#2}{#3} }
+\DeclareDocumentCommand \gap { som }
+ {
+ \protected@edef\next{#3}
+ \__fmdug_gap:nno {#1}{#2}{ \next } }
\NewDocumentCommand \dashundergapssetup { m }
{ \keys_set:nn {fmdug} {#1} \ignorespaces }
\DeclareDocumentCommand \TeacherModeOn {}
@@ -249,6 +262,7 @@
{ \l__fmdug_gapnum_format_tl }
\group_end:
}
+\cs_generate_variant:Nn \__fmdug_gap:nnn {nno}
\cs_new:Npn \__fmdug_display_total_gaps: {
\vfill \centering
\bfseries Total~ Gaps:~ \thetotalgapnumber
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashundergaps.tlpobj new/tlpkg/tlpobj/dashundergaps.tlpobj
--- old/tlpkg/tlpobj/dashundergaps.tlpobj 2019-02-28 03:31:08.000000000 +0100
+++ new/tlpkg/tlpobj/dashundergaps.tlpobj 2020-02-12 01:54:47.000000000 +0100
@@ -1,6 +1,6 @@
name dashundergaps
category Package
-revision 49198
+revision 53756
shortdesc Produce gaps that are underlined, dotted or dashed
relocated 1
longdesc The package provides commands (\underline, \dotuline and
@@ -10,11 +10,8 @@
longdesc a 'fill-in block' for student evaluation sheets.
runfiles size=3
RELOC/tex/latex/dashundergaps/dashundergaps.sty
-catalogue-contact-bugs https://github.com/FrankMittelbach/fmitex/issues
-catalogue-contact-home https://www.latex-project.org
catalogue-contact-repository https://github.com/FrankMittelbach/fmitex
catalogue-ctan /macros/latex/contrib/dashundergaps
-catalogue-date 2018-11-18 22:46:59 +0100
-catalogue-license lppl
+catalogue-license lppl1.3c
catalogue-topics underline line-patt
-catalogue-version 2.0d
+catalogue-version 2.0g
++++++ datatool.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/CHANGES new/doc/latex/datatool/CHANGES
--- old/doc/latex/datatool/CHANGES 2018-12-07 23:50:44.000000000 +0100
+++ new/doc/latex/datatool/CHANGES 2019-09-28 23:32:49.000000000 +0200
@@ -1,3 +1,26 @@
+v2.32 (2019-09-27):
+
+ * datagidx.sty:
+
+ - added check for new 2019/10/01 LaTeX kernel when defining
+ \datagidxstripaccents.
+
+ ** Pre version 2.32 accent stripping in \newterm won't work with new LaTeX kernel. **
+
+ * datatool-base.sty:
+
+ - added \ifdtlcompareskipcs
+ (see https://www.dickimaw-books.com/bugtracker.php?action=view&key=99)
+
+ - bug fix (\dtlcompare not finding word breaks)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=100)
+
+ - bug fix (error if first command in assignment list is equal to \relax)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=106)
+
+ - bug fix (removed \relax from definitions of \DTLiffirstrow and \DTLiflastrow)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=130)
+
v2.31 (2018-12-07):
* datatool-base.sty:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/README new/doc/latex/datatool/README
--- old/doc/latex/datatool/README 2018-12-07 23:50:44.000000000 +0100
+++ new/doc/latex/datatool/README 2019-09-28 23:32:49.000000000 +0200
@@ -1,6 +1,6 @@
-LaTeX Bundle : datatool v2.31
+LaTeX Bundle : datatool v2.32
-Last Modified : 2018-12-07
+Last Modified : 2019-09-27
Author : Nicola Talbot
Binary files old/doc/latex/datatool/datatool-code.pdf and new/doc/latex/datatool/datatool-code.pdf differ
Binary files old/doc/latex/datatool/datatool-user.pdf and new/doc/latex/datatool/datatool-user.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/datatool-user.tex new/doc/latex/datatool/datatool-user.tex
--- old/doc/latex/datatool/datatool-user.tex 2018-12-07 23:50:44.000000000 +0100
+++ new/doc/latex/datatool/datatool-user.tex 2019-09-28 23:32:49.000000000 +0200
@@ -103,11 +103,11 @@
\MakeShortVerb{"}
- \title{User Manual for datatool bundle version~2.31}
+ \title{User Manual for datatool bundle version~2.32}
\author{Nicola L.C. Talbot\\
\url{http://www.dickimaw-books.com/}}
- \date{2018-12-07}
+ \date{2019-09-27}
\maketitle
\pagenumbering{roman}
@@ -122,7 +122,7 @@
\item[\url{datatool-code.pdf}]
Advanced users wishing to know more about the inner workings of
all the packages provided in the \styfmt{datatool} bundle should
- read \qt{Documented Code for datatool v2.31}
+ read \qt{Documented Code for datatool v2.32}
\item[INSTALL] Installation instructions.
@@ -130,6 +130,13 @@
\item[README] Package summary.
\end{description}
+Additional online resources:
+\begin{itemize}
+\item \styfmt{datatool} FAQ:
+\href{https://www.dickimaw-books.com/faqs/datatoolfaq.html}{dickimaw-books.com/faqs/datatoolfaq.html}
+\item Bug tracker: \href{https://www.dickimaw-books.com/bugtracker.php}{dickimaw-books.com/bugtracker.php}
+\item \styfmt{datatool} performance: \href{https://www.dickimaw-books.com/gallery/datatool-performance.shtml}{dickimaw-books.com/gallery/datatool-performance.shtml}
+\end{itemize}
\begin{important}
There's an old adage, ``use the right tool for the right job.''
@@ -2266,7 +2273,26 @@
\begin{definition}[\DescribeMacro\dtlicompare]
\cs{dtlicompare}\marg{register}\marg{A}\marg{B}
\end{definition}
-A case-insensitive comparison.
+A case-insensitive comparison. The two above commands work in much
+the same way except that the first compares character codes and the
+second compares the lowercase character codes. If control sequences
+are found then the comparison is determined by the conditional:
+\begin{definition}[\DescribeMacro\ifdtlcompareskipcs]
+\cs{ifdtlcompareskipcs}
+\end{definition}
+This is switched on with:
+\begin{definition}[\DescribeMacro\dtlcompareskipcstrue]
+\cs{dtlcompareskipcstrue}
+\end{definition}
+and switched off with:
+\begin{definition}[\DescribeMacro\dtlcompareskipcsfalse]
+\cs{dtlcompareskipcsfalse}
+\end{definition}
+The default setting is false (off). If true control sequences will
+be skipped. If false control sequences will considered as having the
+code 0.
+
+There are also two comparison commands designed for indexes:
\begin{definition}[\DescribeMacro\dtlwordindexcompare]
\cs{dtlwordindexcompare}\marg{register}\marg{A}\marg{B}
\end{definition}
@@ -2276,7 +2302,7 @@
\cs{dtlletterindexcompare}\marg{register}\marg{A}\marg{B}
\end{definition}
English letter-ordering comparison for indexes.
-Those last two commands are described in more detail in
+These last two commands are described in more detail in
\sectionref{sec:sort}.
For example:
@@ -6782,9 +6808,8 @@
name and text fields are set to \verb|mac\'edoine|.
\begin{important}
-The first letter must be grouped if it's an accent or ligature or a
-character outside the range \texttt{a}\ldots\texttt{z} or
-\texttt{A}\ldots\texttt{Z}.
+The first letter must be grouped if it's an accent or ligature
+command.
\end{important}
\item This example must have the sort and label fields set manually
@@ -6793,29 +6818,32 @@
\newterm[label=elite,sort=elite]{{\'e}lite}
\end{verbatim}
-\item The same applies if you are using the \sty{inputenc} package:
+\item This used to also apply when using the \sty{inputenc} package
+with older versions of \styfmt{datatool-base} and \styfmt{mfirstuc}.
+However now it's no longer necessary for accents:
\begin{verbatim}
-\newterm[label=elite,sort=elite]{{é}lite}
+\newterm{élite}
+\end{verbatim}
+
+\item Commands such as \ics{oe} aren't dealt with, so you must
+manually set the label and sort key:
+\begin{verbatim}
+\newterm[label=manoeuvre,sort=manoeuvre]{man\oe uvre}
\end{verbatim}
\item The same applies to plural terms set explicitly:
\begin{verbatim}
\newterm
[%
- plural={{œ}sophagi},%
+ plural={{\oe}sophagi},%
label={oesophagus},%
sort={oesophagus}%
]
- {{œ}sophagus}
-\end{verbatim}
-
-\item Commands such as \ics{oe} aren't dealt with, so you must
-manually set the label and sort key:
-\begin{verbatim}
-\newterm[label=manoeuvre,sort=manoeuvre]{man\oe uvre}
+ {{\oe}sophagus}
\end{verbatim}
-\item The same applies if you are using the \sty{inputenc} package:
+\item The same applies if you are using the \sty{inputenc} package
+to enter ligatures:
\begin{verbatim}
\newterm[label=manoeuvre,sort=manoeuvre]{manœuvre}
\end{verbatim}
Binary files old/doc/latex/datatool/samples/sample-autokeys.pdf and new/doc/latex/datatool/samples/sample-autokeys.pdf differ
Binary files old/doc/latex/datatool/samples/sample-barchart.pdf and new/doc/latex/datatool/samples/sample-barchart.pdf differ
Binary files old/doc/latex/datatool/samples/sample-datatooltk.pdf and new/doc/latex/datatool/samples/sample-datatooltk.pdf differ
Binary files old/doc/latex/datatool/samples/sample-dict.pdf and new/doc/latex/datatool/samples/sample-dict.pdf differ
Binary files old/doc/latex/datatool/samples/sample-europecv-bib.pdf and new/doc/latex/datatool/samples/sample-europecv-bib.pdf differ
Binary files old/doc/latex/datatool/samples/sample-gidx.pdf and new/doc/latex/datatool/samples/sample-gidx.pdf differ
Binary files old/doc/latex/datatool/samples/sample-glossary.pdf and new/doc/latex/datatool/samples/sample-glossary.pdf differ
Binary files old/doc/latex/datatool/samples/sample-index.pdf and new/doc/latex/datatool/samples/sample-index.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/samples/sample-index.tex new/doc/latex/datatool/samples/sample-index.tex
--- old/doc/latex/datatool/samples/sample-index.tex 2013-01-16 00:01:04.000000000 +0100
+++ new/doc/latex/datatool/samples/sample-index.tex 2019-09-28 23:32:49.000000000 +0200
@@ -70,12 +70,10 @@
% other encodings.)
\newterm{macramé}
- % Take care if the first letter starts with an accent.
- % The initial accented letter must be grouped to ensure it works
- % with \makefirstuc, but this will make the default label '{e}lite'
- % rather than 'elite', so let's override the default:
+\newterm{élite}
-\newterm[label=elite]{{é}lite}
+ % Terms with ligatures need to have the label set explicitly:
+\newterm[label=manoeuvre]{manœuvre}
% Sometimes the default sort may not suit your requirements. In
% which case you can override it:
@@ -676,7 +674,8 @@
\gls{ma},
\gls{macabre},
\gls{macrame},
-\gls{macedoine}.
+\gls{macedoine},
+\gls{manoeuvre}.
\Gls{elite},
\gls{deem},
Binary files old/doc/latex/datatool/samples/sample-mail-merge.pdf and new/doc/latex/datatool/samples/sample-mail-merge.pdf differ
Binary files old/doc/latex/datatool/samples/sample-piechart.pdf and new/doc/latex/datatool/samples/sample-piechart.pdf differ
Binary files old/doc/latex/datatool/samples/sample-sort.pdf and new/doc/latex/datatool/samples/sample-sort.pdf differ
Binary files old/doc/latex/datatool/samples/sample-student-scores.pdf and new/doc/latex/datatool/samples/sample-student-scores.pdf differ
Binary files old/doc/latex/datatool/samples/sample-two-per-row.pdf and new/doc/latex/datatool/samples/sample-two-per-row.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datatool.doc.tlpobj new/tlpkg/tlpobj/datatool.doc.tlpobj
--- old/tlpkg/tlpobj/datatool.doc.tlpobj 2019-02-28 03:31:09.000000000 +0100
+++ new/tlpkg/tlpobj/datatool.doc.tlpobj 2019-11-07 18:45:46.000000000 +0100
@@ -1,6 +1,6 @@
name datatool.doc
category Package
-revision 49344
+revision 52663
shortdesc doc files of datatool
relocated 1
docfiles size=812
++++++ datatool.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/databar.sty new/tex/latex/datatool/databar.sty
--- old/tex/latex/datatool/databar.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/databar.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `databar.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databar}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{dataplot}
\newif\ifDTLcolorbarchart
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/databib.sty new/tex/latex/datatool/databib.sty
--- old/tex/latex/datatool/databib.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/databib.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `databib.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databib}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{datatool}
\newcommand*{\dtlbib@style}{plain}
\define@choicekey{databib.sty}{style}{plain,abbrv,alpha}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datagidx.sty new/tex/latex/datatool/datagidx.sty
--- old/tex/latex/datatool/datagidx.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datagidx.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datagidx.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datagidx}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{datatool}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}
@@ -2221,15 +2221,31 @@
\def\{{\expandafter\@gobble\string\{}%
\def\}{\expandafter\@gobble\string\}}%
}
-\newcommand*{\datagidxstripaccents}{%
- \let\add@accent@\@secondoftwo
- \let\@text@composite@x\@secondoftwo
- \let\@tabacckludge\@secondoftwo
- \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
- \def\IeC##1{\@gobbletwo##1}%
+\@ifl@t@r\fmtversion{2019/10/01}
+{%
+ \newcommand*{\datagidxstripaccents}{%
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
+ \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
+ \def\IeC##1{\@gobbletwo##1}%
+ \let\UTFviii@two@octets\UTFviii@two@octets@combine
+ }%
+}
+{%
+ \newcommand*{\datagidxstripaccents}{%
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
+ \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
+ \def\IeC##1{\@gobbletwo##1}%
+ }%
}
\providecommand{\newterm}{\datagidx@newterm}
\@onlypreamble\newterm
@@ -3215,16 +3231,7 @@
{%
\ifcsdef{datagidx@prev@loc@\Label}%
{%
- \protected@edef\@prev@location{%
- \csname datagidx@prev@loc@\Label\endcsname}%
- \@onelevel@sanitize\@prev@location
- \protected@edef\@cur@location{\CurrentLocation}%
- \@onelevel@sanitize\@cur@location
- \ifdefequal{\@prev@location}{\@cur@location}%
- {}%
- {%
- \global\let\@datagidx@dorerun@warn\@data@rerun@warn
- }%
+ \dtlgidx@checklocationchange
}%
{%
\global\let\@datagidx@dorerun@warn\@data@rerun@warn
@@ -3248,6 +3255,18 @@
{}%
}%
}
+\newcommand*{\dtlgidx@checklocationchange}{%
+ \protected@edef\@prev@location{%
+ \csname datagidx@prev@loc@\Label\endcsname}%
+ \@onelevel@sanitize\@prev@location
+ \protected@edef\@cur@location{\CurrentLocation}%
+ \@onelevel@sanitize\@cur@location
+ \ifdefequal{\@prev@location}{\@cur@location}%
+ {}%
+ {%
+ \global\let\@datagidx@dorerun@warn\@data@rerun@warn
+ }%
+}
\newcommand{\datagidx@doifdisplayed}[1]{%
\DTLifnull{\Location}%
{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datapie.sty new/tex/latex/datatool/datapie.sty
--- old/tex/latex/datatool/datapie.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datapie.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datapie.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datapie}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\newif\ifDTLcolorpiechart
\DTLcolorpiecharttrue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/dataplot.sty new/tex/latex/datatool/dataplot.sty
--- old/tex/latex/datatool/dataplot.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/dataplot.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `dataplot.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{dataplot}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{tikz}
\RequirePackage{datatool}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool-base.sty new/tex/latex/datatool/datatool-base.sty
--- old/tex/latex/datatool/datatool-base.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool-base.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-base.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-base}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{etoolbox}
\RequirePackage{amsmath}
\RequirePackage{xkeyval}
@@ -1435,8 +1435,7 @@
\dtl@split@str##2\@nil
}%
}%
- \def\dtl@split@str##1#2\@nil{%
- \def#4{##1}}%
+ \def\dtl@split@str##1#2\@nil{\def#4{##1}}%
\dtl@splitstr#1#2\@nil
}
\newcommand{\DTLsubstituteall}[3]{%
@@ -1698,6 +1697,8 @@
#4%
}%
}
+\newif\ifdtlcompareskipcs
+\dtlcompareskipcsfalse
\newcommand*{\dtlcompare}[3]{%
\dtl@subnobrsp{#2}{\@dtl@argA}%
\dtl@subnobrsp{#3}{\@dtl@argB}%
@@ -1717,87 +1718,123 @@
#1=1\relax
}%
{%
- \DTLsubstituteall{\@dtl@argA}{ }{\space }%
- \DTLsubstituteall{\@dtl@argB}{ }{\space }%
+ \dtl@setwordbreaksnohyphens{\@dtl@argA}{\@dtl@wordbreak}%
+ \let\@dtl@argA\dtl@string
+ \dtl@setwordbreaksnohyphens{\@dtl@argB}{\@dtl@wordbreak}%
+ \let\@dtl@argB\dtl@string
\expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
\let\dtl@firstA=\dtl@first
\let\dtl@restA=\dtl@rest
\expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
\let\dtl@firstB=\dtl@first
\let\dtl@restB=\dtl@rest
- \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}{%
- \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}{%
- \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
- \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
- \ifnum\dtl@codeA=-1\relax
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
- \dtl@donext
- \else
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- \fi
- \else
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
- \else
- \ifnum\dtl@codeA<\dtl@codeB
- #1=-1\relax
- \else
- \ifnum\dtl@codeA>\dtl@codeB
- #1=1\relax
+ \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}%
+ {%
+ \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}%
+ {%
+ \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
+ \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
+ \let\dtl@donextcompare\@firstofone
+ \ifdtlcompareskipcs
+ \ifnum\dtl@codeA=0\relax
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\else
- \ifdefempty{\dtl@restA}%
- {%
- \ifdefempty{\dtl@restB}%
- {%
- #1=0\relax
- }%
- {%
- #1=-1\relax
- }%
- }%
- {%
- \ifdefempty{\restB}%
- {%
- #1=1\relax
- }%
- {%
- \protected@edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
- \dtl@donext
- }%
- }%
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\fi
\fi
- \fi
- \fi
- }{%
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- }}{%
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
+ \dtl@donextcompare
+ {%
+ \ifnum\dtl@codeA=-1\relax
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ \fi
+ \else
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \ifnum\dtl@codeA<\dtl@codeB
+ #1=-1\relax
+ \else
+ \ifnum\dtl@codeA>\dtl@codeB
+ #1=1\relax
+ \else
+ \ifdefempty{\dtl@restA}%
+ {%
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=0\relax
+ }%
+ {%
+ #1=-1\relax
+ }%
+ }%
+ {%
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=1\relax
+ }%
+ {%
+ \protected@edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+ \dtl@donext
+ }%
+ }%
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ }%
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
}%
}%
}%
@@ -2216,63 +2253,92 @@
{%
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
- \ifnum\dtl@codeA=-1\relax
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlicompare{\noexpand#1}%
- {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
- \dtl@donext
+ \let\dtl@donextcompare\@firstofone
+ \ifdtlcompareskipcs
+ \ifnum\dtl@codeA=0\relax
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\else
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\fi
- \else
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
+ \fi
+ \dtl@donextcompare
+ {%
+ \ifnum\dtl@codeA=-1\relax
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare{\noexpand#1}%
+ {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ \fi
\else
- \ifnum\dtl@codeA<\dtl@codeB
- #1=-1\relax
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
\else
- \ifnum\dtl@codeA>\dtl@codeB
- #1=1\relax
+ \ifnum\dtl@codeA<\dtl@codeB
+ #1=-1\relax
\else
- \ifdefempty{\dtl@restA}%
- {%
- \ifdefempty{\dtl@restB}%
- {%
- #1=0\relax
- }%
+ \ifnum\dtl@codeA>\dtl@codeB
+ #1=1\relax
+ \else
+ \ifdefempty{\dtl@restA}%
{%
- #1=-1\relax
- }%
- }%
- {%
- \ifdefempty{\restB}%
- {%
- #1=1\relax
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=0\relax
+ }%
+ {%
+ #1=-1\relax
+ }%
}%
{%
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=1\relax
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
+ }%
}%
- }%
+ \fi
\fi
\fi
\fi
- \fi
+ }%
}%
{%
\edef\dtl@donext{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool-fp.sty new/tex/latex/datatool/datatool-fp.sty
--- old/tex/latex/datatool/datatool-fp.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool-fp.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-fp.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-fp}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{fp}
\RequirePackage{datatool-base}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool-pgfmath.sty new/tex/latex/datatool/datatool-pgfmath.sty
--- old/tex/latex/datatool/datatool-pgfmath.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool-pgfmath.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-pgfmath.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{pgfrcs,pgfkeys,pgfmath}
\ProcessOptionsX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool.sty new/tex/latex/datatool/datatool.sty
--- old/tex/latex/datatool/datatool.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
@@ -637,7 +637,7 @@
{%
{%
\dtlgetrow{#1}{#2}%
- \@dtl@assign{#3}{#1}%
+ \@dtl@assign{#3}{#1}%
}%
}%
{%
@@ -1330,7 +1330,7 @@
\gdef\DTLiffirstrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =1\relax
+ =1 %space intended
##1%
\else
##2%
@@ -1341,7 +1341,7 @@
\gdef\DTLiflastrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =\csname dtlrows@#2\endcsname\relax
+ =\csname dtlrows@#2\endcsname
##1%
\else
##2%
@@ -1380,10 +1380,7 @@
\expandafter\global
\csname @dtl@next\romannumeral\dtlforeachlevel\endcsname
= \dtlafterrow
- \ifx\relax#3\relax
- \else
- \@dtl@assign{#3}{#2}%
- \fi
+ \ifblank{#3}{}{\@dtl@assign{#3}{#2}}%
\ifthenelse{#1}%
{%
\refstepcounter{DTLrow\romannumeral\dtlforeachlevel}%
@@ -1484,7 +1481,7 @@
\gdef\DTLiffirstrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =1\relax
+ =1 % space intended
##1%
\else
##2%
@@ -1495,7 +1492,7 @@
\gdef\DTLiflastrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =\csname dtlrows@#2\endcsname\relax
+ =\csname dtlrows@#2\endcsname
##1%
\else
##2%
@@ -1522,11 +1519,11 @@
\expandafter\global
\csname @dtl@cur\romannumeral\dtlforeachlevel\endcsname
= \expandafter{\dtl@thisrow}%
- \ifx\relax#3\relax
- \else
+ \ifblank{#3}{}
+ {%
\dtlcurrentrow=\expandafter{\dtl@thisrow}%
\@dtl@assign{#3}{#2}%
- \fi
+ }%
\ifthenelse{#1}%
{%
\refstepcounter{DTLrow\romannumeral\dtlforeachlevel}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/person.sty new/tex/latex/datatool/person.sty
--- old/tex/latex/datatool/person.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/person.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `person.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{person}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{datatool}
\newcounter{people}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datatool.tlpobj new/tlpkg/tlpobj/datatool.tlpobj
--- old/tlpkg/tlpobj/datatool.tlpobj 2019-02-28 03:31:12.000000000 +0100
+++ new/tlpkg/tlpobj/datatool.tlpobj 2019-11-07 18:45:47.000000000 +0100
@@ -1,6 +1,6 @@
name datatool
category Package
-revision 49344
+revision 52663
shortdesc Tools to load and manipulate data
relocated 1
longdesc The tools comprise six packages: datatool.sty: databases may be
@@ -30,6 +30,10 @@
longdesc document, thus avoiding cumbersome use of "he/she", etc. The
longdesc drawing packages make use of PGF/TikZ for their output. The
longdesc bundle supersedes and replaces the author's csvtools bundle.
+depend fp
+depend substr
+depend xfor
+depend xkeyval
runfiles size=119
RELOC/bibtex/bst/datatool/databib.bst
RELOC/tex/latex/datatool/databar.sty
@@ -43,7 +47,7 @@
RELOC/tex/latex/datatool/datatool.sty
RELOC/tex/latex/datatool/person.sty
catalogue-ctan /macros/latex/contrib/datatool
-catalogue-date 2018-12-07 19:56:10 +0100
+catalogue-date 2019-09-27 21:27:57 +0200
catalogue-license lppl1.3
catalogue-topics data-import data-disp data-manip
-catalogue-version 2.31
+catalogue-version 2.32
++++++ datetime2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2/CHANGES new/doc/latex/datetime2/CHANGES
--- old/doc/latex/datetime2/CHANGES 2018-07-21 00:07:31.000000000 +0200
+++ new/doc/latex/datetime2/CHANGES 2020-03-03 23:57:40.000000000 +0100
@@ -1,3 +1,17 @@
+1.5.6 (2020-03-02):
+
+ * removed spurious space in \DTMsetregional
+
+1.5.5 (2019-11-11):
+
+ * added check for \TrackIfKnownLanguage (provided by tracklang v1.3.9)
+
+ * added \DTMfinaldot and starred versions of \DTMdate and \DTMDate
+
+1.5.4 (2019-10-21):
+
+ * renamed scratch variables to avoid conflict
+
1.5.3 (2018-07-20):
* Bug fix: removed unwanted \relax inserted in negative time zones
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2/README new/doc/latex/datetime2/README
--- old/doc/latex/datetime2/README 2018-07-21 00:07:31.000000000 +0200
+++ new/doc/latex/datetime2/README 2020-03-03 23:57:40.000000000 +0100
@@ -1,8 +1,15 @@
-LaTeX Package : datetime2 v1.5.3
-
-Last Modified : 2018-07-20
+LaTeX Package : datetime2 v1.5.6 (2020-03-02)
Author : Nicola Talbot
+ https://www.dickimaw-books.com/contact
+
+LICENCE
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3
+for the details of that license.
+
+Copyright 2015-2020 Nicola Talbot
Provides commands for formatting dates, times and time zones.
Language and regional support is provided by independently
@@ -11,8 +18,5 @@
The datetime2 package replaces the datetime package, which is now
obsolete.
-This material is subject to the LaTeX Project Public License.
-See http://www.ctan.org/license/lppl1.3 for the details of that license.
-
http://www.dickimaw-books.com/
Binary files old/doc/latex/datetime2/datetime2.pdf and new/doc/latex/datetime2/datetime2.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-babel.pdf and new/doc/latex/datetime2/samples/datetime2-sample-babel.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-calc.pdf and new/doc/latex/datetime2/samples/datetime2-sample-calc.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf and new/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf and new/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-journal.pdf and new/doc/latex/datetime2/samples/datetime2-sample-journal.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-styles.pdf and new/doc/latex/datetime2/samples/datetime2-sample-styles.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-xe.pdf and new/doc/latex/datetime2/samples/datetime2-sample-xe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2.doc.tlpobj new/tlpkg/tlpobj/datetime2.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2.doc.tlpobj 2019-02-28 03:31:14.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2.doc.tlpobj 2020-03-04 23:50:32.000000000 +0100
@@ -1,9 +1,9 @@
name datetime2.doc
category Package
-revision 48236
+revision 54080
shortdesc doc files of datetime2
relocated 1
-docfiles size=265
+docfiles size=266
RELOC/doc/latex/datetime2/CHANGES
RELOC/doc/latex/datetime2/README
RELOC/doc/latex/datetime2/datetime2.pdf
++++++ datetime2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2/datetime2-calc.sty new/tex/latex/datetime2/datetime2-calc.sty
--- old/tex/latex/datetime2/datetime2-calc.sty 2018-07-21 00:07:31.000000000 +0200
+++ new/tex/latex/datetime2/datetime2-calc.sty 2020-03-03 23:57:40.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2.dtx (with options: `datetime2-calc.sty,package')
%%
%% datetime2.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2020 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2018/07/20 v1.5.3 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2020/03/02 v1.5.6 (NLCT)]
\RequirePackage{pgfkeys}
\RequirePackage{pgfcalendar}
\newcount\@dtm@julianday
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2/datetime2.sty new/tex/latex/datetime2/datetime2.sty
--- old/tex/latex/datetime2/datetime2.sty 2018-07-21 00:07:31.000000000 +0200
+++ new/tex/latex/datetime2/datetime2.sty 2020-03-03 23:57:40.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2.dtx (with options: `datetime2.sty,package')
%%
%% datetime2.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2020 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2018/07/20 v1.5.3 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2020/03/02 v1.5.6 (NLCT) date and time formats]
\RequirePackage{tracklang}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}[2006/11/18]
@@ -129,10 +129,10 @@
\define@boolkey{datetime2.sty}[DTM]{showzoneminutes}[true]{}
\DTMshowzoneminutestrue
\newcommand*{\DTMifcaseregional}[3]{#1}
-\define@choicekey{datetime2.sty}{useregional}[\val\nr]%
+\define@choicekey{datetime2.sty}{useregional}[\@dtm@useregional@val\@dtm@useregional@nr]%
{false,text,numeric,num}[text]%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@useregional@nr\relax
\renewcommand*{\DTMifcaseregional}[3]{##1}%
\or
\renewcommand*{\DTMifcaseregional}[3]{##2}%
@@ -185,12 +185,28 @@
\DeclareOptionX*{%
\ifcsundef{@tracklang@add@\CurrentOption}%
{%
- \PackageError{datetime2}{`\CurrentOption' is not a recognised dialect.
- \MessageBreak Perhaps you have misspelt it or the
- \MessageBreak named dialect may be unsupported or
- \MessageBreak perhaps you forgot to use the `style' key}%
- {Any options that aren't described in the manual are assumed
- \MessageBreak to be language or dialect names.}%
+ \ifundef\TrackIfKnownLanguage
+ {%
+ \PackageError{datetime2}{Unrecognised dialect `\CurrentOption'.
+ If you are using a valid ISO language code
+ please update tracklang.sty to at least v1.3.9}%
+ {Any options that aren't described in the manual are assumed
+ \MessageBreak to be language or dialect names.}%
+ }%
+ {%
+ \TrackIfKnownLanguage{\CurrentOption}%
+ {\renewcommand*{\DTMifcaseregional}[3]{#2}}%
+ {%
+ \PackageError{datetime2}{`\CurrentOption' is not a recognised dialect
+ \MessageBreak and doesn't contain a known language code.
+ \MessageBreak Perhaps you have misspelt it or the
+ \MessageBreak named dialect may be unsupported or
+ \MessageBreak perhaps you forgot the `<key>=' part
+ \MessageBreak for example, `style=\CurrentOption'}%
+ {Any options that aren't described in the manual are assumed
+ \MessageBreak to be language or dialect names.}%
+ }%
+ }%
}%
{%
\TrackPredefinedDialect{\CurrentOption}%
@@ -476,14 +492,29 @@
\number#1\dtm@yearmonthsep\DTMtwodigits{#2}\dtm@monthdaysep\DTMtwodigits{#3}%
}%
\newcommand*{\DTMDisplaydate}{\DTMdisplaydate}
-\newrobustcmd*{\DTMdate}[1]{%
+\newcommand*{\DTMfinaldot}{.}
+\newrobustcmd*{\DTMdate}{\@ifstar\@sDTMdate\@DTMdate}
+\newcommand*{\@DTMdate}[1]{%
\expandafter\@dtm@parsedate#1\@dtm@endparsedate
\DTMdisplaydate{\@dtm@year}{\@dtm@month}{\@dtm@day}{\@dtm@dow}%
}
-\newrobustcmd*{\DTMDate}[1]{%
+\newcommand*{\@sDTMdate}[1]{%
+ {%
+ \let\DTMfinaldot\empty
+ \@DTMdate{#1}%
+ }%
+}
+\newrobustcmd*{\DTMDate}{\@ifstar\@sDTMDate\@DTMDate}
+\newcommand*{\@DTMDate}[1]{%
\expandafter\@dtm@parsedate#1\@dtm@endparsedate
\DTMDisplaydate{\@dtm@year}{\@dtm@month}{\@dtm@day}{\@dtm@dow}%
}
+\newcommand*{\@sDTMDate}[1]{%
+ {%
+ \let\DTMfinaldot\empty
+ \@DTMDate{#1}%
+ }%
+}
\newcommand*{\DTMcurrenttime}{%
\DTMdisplaytime
{\@dtm@currenthour}%
@@ -900,9 +931,9 @@
\DTMsetstyle{default}%
}%
{%
- \ifcsdef{date\languagename}
+ \ifcsdef{date\languagename}%
{%
- \csuse{date\languagename}
+ \csuse{date\languagename}%
}%
{%
\ForEachTrackedDialect{\@dtm@thisdialect}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2.tlpobj new/tlpkg/tlpobj/datetime2.tlpobj
--- old/tlpkg/tlpobj/datetime2.tlpobj 2019-02-28 03:31:15.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2
category Package
-revision 48236
+revision 54080
shortdesc Formats for dates, times and time zones
relocated 1
longdesc This package provides commands for formatting dates, times and
@@ -19,7 +19,6 @@
RELOC/tex/latex/datetime2/datetime2.sty
catalogue-contact-home http://www.dickimaw-books.com/faqs/datetime2faq.html
catalogue-ctan /macros/latex/contrib/datetime2
-catalogue-date 2018-07-20 14:37:08 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.5.3
+catalogue-version 1.5.6