summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/generic/chemfig/README4
-rw-r--r--macros/generic/chemfig/chemfig-en.pdfbin1087379 -> 1087261 bytes
-rw-r--r--macros/generic/chemfig/chemfig-fr.pdfbin1115561 -> 1115526 bytes
-rw-r--r--macros/generic/chemfig/chemfig.tex30
-rw-r--r--macros/latex/contrib/asmeconf/README.md6
-rw-r--r--macros/latex/contrib/asmeconf/asmeconf-sample.bib470
-rw-r--r--macros/latex/contrib/asmeconf/asmeconf-template.pdfbin419299 -> 425075 bytes
-rw-r--r--macros/latex/contrib/asmeconf/asmeconf-template.tex235
-rw-r--r--macros/latex/contrib/asmeconf/asmeconf.bst275
-rw-r--r--macros/latex/contrib/asmeconf/asmeconf.cls8
-rw-r--r--macros/latex/contrib/embedfile/embedfile.dtx35
-rw-r--r--macros/latex/contrib/embedfile/embedfile.pdfbin391565 -> 397083 bytes
-rw-r--r--macros/latex/contrib/iodhbwm/tex/iodhbwm-i18n.def (renamed from macros/latex/contrib/iodhbwm/tex/i18n.def)0
-rw-r--r--macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty6
-rw-r--r--macros/latex/contrib/iodhbwm/tex/iodhbwm.cls4
-rw-r--r--macros/latex/contrib/latex-tds/README947
-rw-r--r--macros/latex/contrib/latex-tds/README.html2897
-rw-r--r--macros/latex/contrib/latex-tds/README.pdfbin104081 -> 0 bytes
-rw-r--r--macros/latex/contrib/media4svg/ChangeLog4
-rw-r--r--macros/latex/contrib/media4svg/README.md2
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-1.svg14
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-2.svg10
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-3.svg8
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-4.svg12
-rw-r--r--macros/latex/contrib/media4svg/media4svg.sty53
-rw-r--r--macros/luatex/latex/emojicite/LICENSE.txt416
-rw-r--r--macros/luatex/latex/emojicite/README.md72
-rw-r--r--macros/luatex/latex/emojicite/emojicite-doc.pdfbin0 -> 175903 bytes
-rw-r--r--macros/luatex/latex/emojicite/emojicite-doc.tex182
-rw-r--r--macros/luatex/latex/emojicite/emojicite.sty101
-rw-r--r--macros/luatex/latex/emojicite/example.tex12
31 files changed, 1490 insertions, 4313 deletions
diff --git a/macros/generic/chemfig/README b/macros/generic/chemfig/README
index ebfc2cb79f..145bdfed79 100644
--- a/macros/generic/chemfig/README
+++ b/macros/generic/chemfig/README
@@ -2,9 +2,9 @@ ___________________________________
The
Chemfig package
- v1.51
+ v1.52
- 2020/04/06
+ 2020/04/14
___________________________________
Maintainer: Christian Tellechea
diff --git a/macros/generic/chemfig/chemfig-en.pdf b/macros/generic/chemfig/chemfig-en.pdf
index 306b0e9e16..250d8500c9 100644
--- a/macros/generic/chemfig/chemfig-en.pdf
+++ b/macros/generic/chemfig/chemfig-en.pdf
Binary files differ
diff --git a/macros/generic/chemfig/chemfig-fr.pdf b/macros/generic/chemfig/chemfig-fr.pdf
index 295e912146..4e63fadd1d 100644
--- a/macros/generic/chemfig/chemfig-fr.pdf
+++ b/macros/generic/chemfig/chemfig-fr.pdf
Binary files differ
diff --git a/macros/generic/chemfig/chemfig.tex b/macros/generic/chemfig/chemfig.tex
index 77bc5b8811..bf66ce58d1 100644
--- a/macros/generic/chemfig/chemfig.tex
+++ b/macros/generic/chemfig/chemfig.tex
@@ -4,9 +4,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\CFname {chemfig} %
-\def\CFver {1.51} %
+\def\CFver {1.52} %
% %
-\def\CFdate {2020/04/06} %
+\def\CFdate {2020/04/14} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -499,18 +499,20 @@
}%
{\scantokens\expandafter{%
\the\toks0{%
- \csname CF_exec%
- \ifdim\csname CF_currentangle\endcsname pt>90pt
- \ifdim\csname CF_currentangle\endcsname pt<270pt
- first%
+ \expanded{% bugfix 1.52
+ \csname CF_exec%
+ \ifdim\csname CF_currentangle\endcsname pt>90pt
+ \ifdim\csname CF_currentangle\endcsname pt<270pt
+ first%
+ \else
+ second%
+ \fi
\else
second%
\fi
- \else
- second%
- \fi
- \endcsname
- {#2}{#3}%
+ \endcsname
+ {\unexpanded{#2}}{\unexpanded{#3}}%
+ }%
}%
}%
}%
@@ -3066,4 +3068,8 @@ v1.5 2020/03/05
- ajout d'une section dans le manuel (placement des atomes)
----------------------------------------------------------------------
v1.51 2020/04/06
- - bug corrig dans \chargerect_a et \chargeline_a \ No newline at end of file
+ - bug corrig dans \chargerect_a et \chargeline_a
+----------------------------------------------------------------------
+v1.52 2020/04/14
+ - bug : dfinition corrige de \CFthesubmol dans \def_submolc pour
+ qu'elle se dveloppe en 1 coup seulement \ No newline at end of file
diff --git a/macros/latex/contrib/asmeconf/README.md b/macros/latex/contrib/asmeconf/README.md
index 87f8916cbb..e611fea975 100644
--- a/macros/latex/contrib/asmeconf/README.md
+++ b/macros/latex/contrib/asmeconf/README.md
@@ -1,7 +1,7 @@
#asmeconf: A template for ASME conference papers#
- Version 1.17 dated 2020/02/29.
+ Version 1.18 dated 2020/04/14.
####Overview####
This class provides a template to format ASME Conference papers according to
@@ -37,7 +37,7 @@
- support hyperref package (hyperlinks to figures, tables, references, web)
-- support pdf bookmarks
+- support pdf bookmarks and metadata
- enable various math and text features with newtxmath and newtxtext packages
@@ -67,6 +67,8 @@
####Change log####
+ v1.18 (2020/04/14): edit and expand documentation; revise sample .bib file; extensive edits to asmeconf.bst, to better support hyperlinks, to correct eid error, and for better conformance to ASME style (details listed in .bst file); add foreign language example.
+
v1.17: set T1 font encoding with utf-8 input, ensure LuaLaTeX compatibility; load hologo and metalogo packages; edit documentation.
v1.16: remove xpatch and comment packages from class file; disable \\( and \\) in pdf bookmarks to avoid warnings; edit documentation.
diff --git a/macros/latex/contrib/asmeconf/asmeconf-sample.bib b/macros/latex/contrib/asmeconf/asmeconf-sample.bib
index 3b4e5194e2..6cd209464b 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-sample.bib
+++ b/macros/latex/contrib/asmeconf/asmeconf-sample.bib
@@ -1,200 +1,179 @@
-%% Revised 2 October 2019
+%% Revised 14 April 2020
+%% John H. Lienhard, MIT
@article{ning2002,
- title = {On the Sliding Friction Characteristics of Unidirectional Continuous FRP Deposits},
- journal = {ASME Journal of Tribology},
- year = {2002},
- volume = {48},
- number = {5},
- pages = {2000--2008},
- author = {Xiang Ning and Mary Rose Lovell},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
+ author = {Xiang Ning and Mary Rose Lovell},
+ title = {On the Sliding Friction Characteristics of Unidirectional Continuous FRP Deposits},
+ journal = {ASME Journal of Tribology},
+ year = {2002},
+ volume = {48},
+ number = {5},
+ pages = {2000--2008},
+ doi = {10.1115/1.4042912},
}
-%% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
+%% article supports these fields: author, year, title, journal, volume, number, pages OR eid (and numpages),
+%% doi, url, eprint with archive, note.
+%% There's no need to give the URL if it is simply the DOI, since the DOI itself will be hyperlinked.
+%% url = {https://doi.org/10.1115/1.4042912}. ASME requests that a URL point to the abstract.
@BOOK{gibson2008,
- title = {The Big Book of Cellular Studies},
+ title = {The Big Book of Cellular Studies},
publisher = {John Wiley and Sons},
- year = {2008},
- author = {Tom A. Gibson and Matthew A. Tucker},
- address = {New York},
+ year = {2008},
+ author = {Tom A. Gibson and Matthew A. Tucker},
+ address = {New York},
}
-%% If a URL or DOI is available, it may be included as in the article above.
+%% book supports these fields: author OR editor, year, title, edition, series, volume OR number
+%% publisher, address, doi, url, eprint with archive, note.
@INCOLLECTION{stevens1999,
- title = {Stochastic Fields and Their Digital Simulation},
- publisher = {Martimius Publishers},
- pages = {22--36},
- year = {1999},
+ author = {Thomas T. Stevens},
+ title = {Stochastic Fields and Their Digital Simulation},
booktitle = {Stochastic Methods},
- author = {Thomas T. Stevens},
- address = {Dordrecht},
+ publisher = {Martimius Publishers},
+ address = {Dordrecht},
+ year = {1999},
+ pages = {22--36},
}
-%% If a URL or DOI is available, it may be included as in the article above.
-
+%% incollection supports these fields: author, year, title, booktitle, edition, editor, series,
+%% volume OR number, publisher, address, type,
+%% chapter, pages, doi, note, eprint with archive, url, urldate.
+%% type = { } changes default "Chap." to something else.
@inproceedings{wions2005,
- author = {Thomas Wions and Christopher D. Mills},
- title = {Structural Dynamics in Parallel Manipulation},
+ author = {Thomas Wions and Christopher D. Mills},
+ title = {Struct\-ur\-al Dynamics in Parallel Manipulation},
booktitle = {Proceedings of the ASME IDETC/CIE},
- year = {2005},
- pages = {777--798},
- number = {DETC2005-99532},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
- venue = {New Orleans, LA},
- confmonth = {September 10--13},
+ number = {DETC2005-99532},
+ venue = {New Orleans, LA},
+ eventdate = {September 10--13},
+ year = {2005},
+ pages = {777--798},
+ doi = {10.1115/1.4042912},
+ url = {https://doi.org/10.1115/1.4042912},
}
-% Note that venue and confmonth are specific to this .bst style
-% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
-
+%% inproceedings supports these fields: author, year, title, booktitle, edition, editor, volume,
+%% organization OR publisher, address, venue, eventdate,
+%% [paper] number, pages, doi, note, eprint with archive, url, urldate.
+%% Note that venue and eventdate are specific to the asmeconf.bst style.
+%% There's really no need to give the URL if it is simply the DOI because the DOI itself will be hyperlinked.
+%% ASME requests that the URL point to the abstract.
@phdthesis{smith2002,
- author = {Robert Smith},
- title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Non-Steady Motion},
- school = {Rochester Institute of Technology},
- address = {Rochester, NY},
- year = {2002},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
+ author = {Robert Smith},
+ title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Non-Steady Motion},
+ school = {Rochester Institute of Technology},
+ address = {Rochester, NY},
+ year = {2002},
+ doi = {10.1115/1.4042912},
+ url = {https://doi.org/10.1115/1.4042912},
}
-% type = {Sc{D} Thesis}, could be added to change the type of thesis. See example below.
-% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
-
-
-@techreport{watson1982,
- author = {David Watson},
- title = {Evaporative Heat Transfer in the Contact Line of a Mixture},
- year = {1982},
- number = {HTL-26, CFD-4},
- institution = {Iowa State University},
- address = {Ames, IA},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
-}
-% type can be changed here also, see example below
-% see example below.
+% type = {Sc{D} {T}hesis}, could be added to change the type of thesis. See two examples below.
+% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
+% eprint with archive is also supported.
+%% ASME requests that the URL point to the abstract.
@mastersthesis{smith1998,
- author = {Robert Smith},
- title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Steady Motion},
- school = {Rochester Institute of Technology},
- address = {Rochester, NY},
- year = {1998},
+ author = {Robert Smith},
+ title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Steady Motion},
+ school = {Rochester Institute of Technology},
+ address = {Rochester, NY},
+ year = {1998},
}
+%% mastersthesis supports these fields: author, year, title, type, school, address, note.
+%% These fields are also supported, but don't use them all: doi, eprint with archive, url, urldate, urltype
+%% type={} can optionally be used to change the type of thesis. Default is "Master's thesis"
@mastersthesis{smith1996,
-author = {Robert Smith},
-title = {Cylindrical Surfaces Involved in a Steady Motion},
-type = {{BS} Thesis},
-school = {Rochester Institute of Technology},
-address = {Rochester, NY},
-year = {1996},
+ author = {Robert Smith},
+ title = {Cylindrical Surfaces Involved in a Steady Motion},
+ type = {{BS} {T}hesis},
+ school = {Rochester Institute of Technology},
+ address = {Rochester, NY},
+ year = {1996},
}
+%% To get a bachelor's thesis, use type = {} as above.
-
-@techreport{watson1981,
-author = {David Watson},
-title = {Evaporative Heat Transfer in the Contact Line of a Mixture},
-year = {1981},
-number = {TN-1234},
-institution = {National Aeronautics and Space Administration},
-address = {Washington, DC},
-URL = {https://doi.org/10.1115/1.4042912},
-type = {NASA Technical Memorandum No.}
+@techreport{watson1982,
+ author = {David Watson},
+ title = {Evaporative Heat Transfer in the Contact Line of a Mixture},
+ institution = {Iowa State University},
+ address = {Ames, IA},
+ number = {HTL-26, CFD-4},
+ year = {1982},
+ doi = {10.1115/1.4042912},
+ url = {https://doi.org/10.1115/1.4042912},
}
-
-@BOOK{bejan,
- title = {Advanced Engineering Thermodynamics},
- publisher = {John Wiley {\&} Sons, Inc.},
- year = {1988},
- author = {Adrian Bejan},
- address = {New York, NY},
+%% techreport supports the fields: author, title, number, institution, address, year, doi, url,
+%% eprint with archive, note.
+% if type = is omitted, it will default to "Tech. Rep." See the example below for changing this.
+
+@techreport{reynolds58,
+ author = {W. C. Reynolds and W. M. Kays and S. J. Kline},
+ title = {Heat Transfer in the Incompressible Turbulent Boundary Layer. {I}--{C}onstant Wall Temperature},
+ type = {Memorandum},
+ institution = {NASA},
+ address = {Washington, DC},
+ number = {12-1-58W},
+ year = {1958},
+ eprint = {2060/19980228020},
+ archive = hdl,
}
+% if type = is omitted, it will default to "Tech. Rep."
@incollection{DKE70,
- author = {Donald K. Edwards},
- title = {Thermal Radiation Measurements},
- editor = {Ernst R. G. Eckert and Richard J. Goldstein},
- booktitle = {Measurement Techniques in Heat Transfer},
- chapter = {9},
- pages = {353--396},
- volume ={130},
- series ={{AGARD}ograph},
- month = {November},
- type = {{C}hapter},
- publisher = {Technivision Services},
- address = {Slough, England},
- year ={1970},
- note ={Published by the Advisory Group for Aerospace Research and Development of {NATO}},
-}
-
-@incollection{Lienhard2017,
- author = {John H. Lienhard and Karan H. Mistry and Mostafa H. Sharqawy and Gregory P. Thiel},
- title ={Thermodynamics, Exergy, and Energy Efficiency in Desalination Systems},
- editor = {Hassan A. Arafat},
- booktitle = {Desalination Sustainability},
- chapter = 4,
- pages = {127--206},
- publisher ={Elsevier Publishing Co.},
- address = {Amsterdam},
- year =2017,
- month = {June},
- url = {https://www.elsevier.com/books/desalination-sustainability/unknown/978-0-12-809791-5},
+ author = {Donald K. Edwards},
+ title = {Thermal Radiation Measurements},
+ editor = {Ernst R. G. Eckert and Richard J. Goldstein},
+ booktitle = {Measurement Techniques in Heat Transfer},
+ chapter = {9},
+ pages = {353--396},
+ volume = {130},
+ series = {{AGARD}ograph},
+ publisher = {Technivision Services},
+ address = {Slough, England},
+ year = {1970},
+ note = {Published by the Advisory Group for Aerospace Research and Development of {NATO}},
}
+%% If you need to change "Chap." to something else, use for example: type = {{C}hapter},
+%% It's uncommon to have the "series" field as above.
@article{Lienhard2019b,
- title = "Exterior Shape Factors from Interior Shape Factors",
- journal = {J. Heat Transfer},
- year = "2019",
- doi = "10.1115/1.4042912",
- author = {Lienhard, V, John H.},
- eid = {061301},
- volume = {141},
- number = {6},
+ author = {Lienhard, V, John H.},
+ title = {Exterior Shape Factors from Interior Shape Factors},
+ journal = jht,
+ doi = {10.1115/1.4042912},
+ volume = {141},
+ number = {6},
+ eid = {061301},
+ year = {2019},
}
+%% Note eid field rather than page numbers. Will not produce "pp." before the eid number.
+%% May include numpages = {} to get "eid (numpages pages)"
+%% Note use of jht macro for title title (produces "ASME J. Heat Transfer"). All ASME journals have macros.
-@misc{narayan2017,
- author = {Prakash Narayan Govindan and Steven Lam and Maximus G. {St. John}},
- title = {Systems including a condensing apparatus such as a bubble column condenser},
- year = {2017},
+@misc{govindan2017,
+ author = {Prakash Narayan Govindan and Steven Lam and Maximus G. {St. John}},
+ title = {Systems Including a Condensing Apparatus Such As a Bubble Column Condenser},
howpublished = {US Patent {\#}9700811},
+ year = {2017},
+ url = {https://patents.google.com/patent/US9700811B2},
}
-@conference{Swaminathan2017IDABRO,
- Author = {Swaminathan, Jaichander and Stover, Richard L. and Tow, Emily W. and Warsinger, David M. and Lienhard, John H.},
- Booktitle = {Proceedings of IDA World Congress on Desalination and Water Reuse},
- Title = {Effect of practical losses on optimal design of batch {RO} systems},
- Year = {2017},
- Month = 10,
- Publisher = {International Desalination Association},
- address = {Topsfield, MA},
- venue ={S{\~a}o Paulo, Brazil},
- confmonth = {October 15--20},
- number = {IDA17WC-58334},
- eprint = {1721.1/111971},
- archive = hndl,
-}
-% number = {Paper No.\ IDA17WC-58334}, could be used instead.
-% url = {http://hdl.handle.net/1721.1/111971},
-
@misc{Fong2015,
- title = {Analytical Methods for Squaring the Disc},
- author = {Chamberlain Fong},
+ title = {Analytical Methods for Squaring the Disc},
+ author = {Chamberlain Fong},
howpublished = {{\itshape ArXiv e-prints}},
- eprint = {1509.06344},
- archive=arxiv,
- year = {2015},
- month = {sep},
+ year = {2015},
+ eprint = {1509.06344},
+ archive = arxiv,
}
-% URL = {https://arxiv.org/abs/1509.06344v3},
+% eprint + arxiv produces the same result as: url = {https://arxiv.org/abs/1509.06344v3},
@manual{GSL,
- title = {{GNU} Scientific Library Release 2.4},
- URL = {https://www.gnu.org/software/gsl/},
- author = {Mark Galassi
+ title = {{GNU} Scientific Library Release 2.4},
+ author = {Mark Galassi
and Jim Davies
and James Theiler
and Brian Gough
@@ -203,109 +182,150 @@ type = {NASA Technical Memorandum No.}
and Michael Booth
and Fabrice Rossi
and Rhys Ulerich},
- year = 2017,
- organization = {Free Software Foundation},
- address = {Boston, MA},
- month = {June},
+ organization = {Free Software Foundation},
+ address = {Boston, MA},
+ year = 2017,
+ url = {https://www.gnu.org/software/gsl/},
}
+%% manual supports these fields: author, year, title, edition, organization, address, doi, eprint with archive, urldate, url, note.
@online{mpl,
- title={mpl colormaps},
- author={St{\'e}fan {van der Walt} and Nathaniel Smith},
- URL = {http://bids.github.io/colormap/},
- urldate = {26 August 2018},
- year = 2015,
- organization = {GitHub},
- address = {San Francisco, CA},
- month = {September},
+ title = {mpl colormaps},
+ author = {St{\'e}fan {van der Walt} and Nathaniel Smith},
+ organization = {GitHub},
+ address = {San Francisco, CA},
+ year = 2015,
+ url = {http://bids.github.io/colormap/},
+ urldate = {August 26, 2018},
}
-
+%% online supports these fields: author OR editor, year, title, organization, address,
+%% note, url OR eprint with archive, urldate, urltype
+%% You can change "Accessed" with "urltype", e.g., urltype = {retrieved},
@BOOK{johnson1980,
- title = {Title of edited book},
+ editor = {Howard Johnson},
+ title = {Title of Edited Book},
publisher = {John Wiley and Sons, Inc.},
- year = {1980},
- editor = {Howard Johnson},
- address = {New York, NY},
+ address = {New York, NY},
+ year = {1980},
}
@proceedings{proceedings,
- title = {The title of the proceedings},
- year = 2015,
- editor = {Howard Johnson},
- volume = 2,
- address = {Address of publisher},
- organization = {The organization},
- publisher = {Name of publisher},
- note = {Optional note}
+ title = {The Title of the Proceedings},
+ year = 2015,
+ editor = {Al Yankovich and Howard Stern},
+ volume = {15},
+ organization = {Organization},
+ venue = {Boston, MA},
+ eventdate = {April 27--28},
+ url = {http://web.mit.edu},
+ note = {Optional note},
}
-% series = {Series A,
+%% proceedings supports these fields: author OR editor, year, title, edition, editor,
+%% series, volume OR number, organization, publisher,
+%% address [of organization or publisher], venue, eventdate,
+%% doi, url, eprint with archive.
+%% The organization will appear as author/editor if those fields are empty.
+%% In most instances, the publisher is the organization so only one should be given
@online{amsmath,
-author = {{American Mathematical Society} and {LATEX3 Project}},
-title = {User's Guide for the \textsf{amsmath} Package, Version 2.1},
-year = {2018},
-organization = {Comprehensive \TeX\ Archive Network},
-url = {https://ctan.org/tex-archive/macros/latex/required/amsmath/amsldoc.pdf},
-urldate = {5 July 2019},
+ author = {{American Mathematical Society} and {LATEX3 Project}},
+ title = {User's Guide for the \textsf{amsmath} Package, Version 2.1},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2018},
+ url = {https://ctan.org/tex-archive/macros/latex/required/amsmath/amsldoc.pdf},
+ urldate = {July 5, 2019},
}
-%% urltype = {retrieved},
@online{sharpe1,
-author = {Michael Sharpe},
-title = {New {TX} font package, Version 1.554},
-year = {2018},
-organization = {Comprehensive \TeX\ Archive Network},
-url = {https://ctan.org/pkg/newtx},
-urldate = {27 April 2019},
+ author = {Michael Sharpe},
+ title = {New {TX} Font Package, Version 1.554},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2018},
+ url = {https://ctan.org/pkg/newtx},
+ urldate = {April 27, 2019},
}
@online{sharpe2,
-author = {Michael Sharpe},
-title = {The \textsf{mathalfa} package, Version 1.10},
-year = {2018},
-organization = {Comprehensive \TeX\ Archive Network},
-url = {https://ctan.org/pkg/mathalfa},
-urldate = {27 April 2019},
+ author = {Michael Sharpe},
+ title = {The \textsf{mathalfa} Package, Version 1.10},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2018},
+ url = {https://ctan.org/pkg/mathalfa},
+ urldate = {April 27, 2019},
}
- @online{tolusis,
- author = {Sigitas Tolu{\v{s}}is},
- title = {The \textsf{flushend} package},
- year = {2017},
+@online{tolusis,
+ author = {Sigitas Tolu{\v{s}}is},
+ title = {The \textsf{flushend} Package, Version 3.3},
organization = {Comprehensive \TeX\ Archive Network},
- url = {https://www.ctan.org/pkg/flushend},
- urldate = {October 1, 2019},
- version = {3.3},
+ year = {2017},
+ url = {https://www.ctan.org/pkg/flushend},
+ urldate = {October 1, 2019},
}
@online{bottcher,
- author = {Stephan I. B{\"o}ttcher and Uwe L{\"u}ck},
- title = {\textsf{lineno.sty}: A {\LaTeX} package to attach line numbers to paragraphs},
- year = {2005},
+ author = {Stephan I. B{\"o}ttcher and Uwe L{\"u}ck},
+ title = {\textsf{lineno.sty}: A {\LaTeX} Package to Attach Line Numbers to Paragraphs, Version 4.41},
organization = {Comprehensive \TeX\ Archive Network},
- url = {https://www.ctan.org/pkg/lineno},
- urldate = {August 17, 2019},
- version = {4.41},
+ year = {2005},
+ url = {https://www.ctan.org/pkg/lineno},
+ urldate = {August 17, 2019},
}
@online{oostrum,
- author = {Piet van Oostrum},
- title = {The \textsf{fancyhdr} and \textsf{extramarks} packages},
- year = {2019},
+ author = {Piet van Oostrum},
+ title = {The \textsf{fancyhdr} and \textsf{extramarks} Packages, Version 3.10},
organization = {Comprehensive \TeX\ Archive Network},
- url = {https://www.ctan.org/pkg/lineno},
- urldate = {August 17, 2019},
- version = {3.10},
+ year = {2019},
+ url = {https://www.ctan.org/pkg/lineno},
+ urldate = {August 17, 2019},
}
@online{fairbairns,
- author = {Robin Fairbairns and Sebastian Rahtz and Leonor Barroca},
- title = {A package for rotated objects in \LaTeX},
- year = {2016},
+ author = {Robin Fairbairns and Sebastian Rahtz and Leonor Barroca},
+ title = {A Package for Rotated Objects in \LaTeX, Version 2.16d},
organization = {Comprehensive \TeX\ Archive Network},
- url = {https://www.ctan.org/pkg/rotating},
- urldate = {October 2, 2019},
- version = {v2.16d},
-}
+ year = {2016},
+ url = {https://www.ctan.org/pkg/rotating},
+ urldate = {October 2, 2019},
+}
+
+@BOOK{book,
+ author = {James Tiberius Kirk},
+ year = {2288},
+ title = {Decline and Fall of the Romulan Empire},
+ edition = {7},
+ series = {Humankind's Greatest Writings},
+ volume = {23},
+ url = {http://web.mit.edu},
+ publisher = {Vulcan Free Press},
+ address = {T'Paal},
+ note = {to appear},
+}
+
+@inbook{inbook,
+ author = {Winston S. Churchill},
+ year = {1948},
+ title = {The Gathering Storm},
+ edition = {1},
+ series = {The Second World War},
+ volume = {1},
+ chapter = {5},
+ pages = {66--89},
+ publisher = {Houghton Mifflin Co.},
+ address = {Boston},
+ note = {{``The Locust Years''}},
+}
+%% inbook supports these fields: author OR editor, year, title, edition, version, series, volume OR number, doi, url, eprint with archive, publisher, address, note. type={} field changes "Chap." to something else.
+
+@book{fourier1822,
+ author = {Jean Baptiste Joseph Fourier},
+ year = {1822},
+ title = {Th\'{e}orie Analytique de la Chaleur},
+ publisher = {Firmin Didot, P\`{e}re et Fils},
+ address = {Paris},
+ url = {https://archive.org/details/analyticaltheory00fourrich},
+}
+
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.pdf b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
index 6e64eb32b9..840922971e 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.pdf
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.pdf
Binary files differ
diff --git a/macros/latex/contrib/asmeconf/asmeconf-template.tex b/macros/latex/contrib/asmeconf/asmeconf-template.tex
index 4010bd1f0e..af6ca23847 100644
--- a/macros/latex/contrib/asmeconf/asmeconf-template.tex
+++ b/macros/latex/contrib/asmeconf/asmeconf-template.tex
@@ -3,10 +3,11 @@
%% This file is asmeconf-template.tex, a template to format ASME Conference papers according to
%% the requirements on ASME's conference web pages.
%%
-%% This file is version 1.17 dated 2020/02/29
+%% This file is version 1.18 dated 2020/04/14
%%
%% As of version 1.11, this template follows ASME's newer conference guidelines first posted July 2019.
-%% The new guidelines have changed the requested author block formatting (old format is also supported)
+%% The new guidelines have changed the requested author block formatting to be inline.
+%% (This template supports the old grid format as a package option.)
%% Nomenclature now follows the abstract. Abstract is in italics.
%%
%% Author: John H. Lienhard V
@@ -85,8 +86,7 @@
%% Class options are described above.
-\documentclass[varvw,largesc,upint,mathalfa=cal=euler,colorlinks,hyphenate,balance]{asmeconf} % <=== remove colorlinks for submission to ASME
-
+\documentclass[varvw,largesc,upint,mathalfa=cal=euler,hyphenate,balance,lang-second=french,lang=english,colorlinks]{asmeconf} % <=== remove colorlinks before submission to ASME!
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%% Fields to be completed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -104,7 +104,7 @@
\begin{document}
-% Change these fields to the right content for your conference!
+% Change these fields to the right content for your conference.
% You can comment these out if for some reason you don't want a header.
% Use title case (first letters capitalized), not all capitals
@@ -140,8 +140,9 @@
\maketitle
-%%% For tracking various versions of your draft. Change text to suit your own needs. Remove from final version.
-%%% \date{..} is the same command.
+%%% Use this footnote for tracking various versions of your draft. Change text to suit your own needs.
+%%% Remove from final version.
+%%% \date{..} calls the same command.
\versionfootnote{Documentation for \texttt{asmeconf.cls}. Version \versionno; \today.}% <=== Delete before final submission.
@@ -158,7 +159,7 @@
%%
%% Abstract should be no more than 200 words
\begin{abstract}
-This paper is an example and template for typesetting ASME Conference Papers in {\upshape\LaTeX} using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of early 2020. The class is compatible with the {\upshape\texttt{hyperref}} package for producing pdf files with links. The optional argument of \verb|\section| has been modified for manually setting pdf bookmarks when macros or complicated mathematics are included in section headings. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class may be invoked with several options, most of which address math fonts. The class calls a number of packages, all of which are in {\upshape\TeX\ Live} and on CTAN. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
+This paper is an example of and a template for typesetting ASME Conference Papers in {\upshape\LaTeX} using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of early 2020. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class is compatible with the {\upshape\texttt{hyperref}} package, so that pdfs will contain internal and external hyperlinks, pdf bookmarks, and metadata. Links may be colored, for online use, or black, for publication. Section headers may contain mathematics, references, citations, and footnotes. The class enables inline author names, following ASME's current style, but is backward compatible to the traditional block style. The class includes many options, e.g., for math fonts. The class calls a number of packages, all of which are in {\upshape\TeX\ Live} and on CTAN. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
\end{abstract}
%%%%%%%%% NOMENCLATURE (OPTIONAL) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -193,7 +194,7 @@ This paper is an example and template for typesetting ASME Conference Papers in
\section{Introduction}
The \texttt{asmeconf} class file will typeset papers with margins, fonts, headings, captions, and reference formats that follow those specified for conference papers of the American Society of Mechanical Engineers (ASME). Internal and external hyperlinks will be set automatically, and the pdf file will contain bookmarks and metadata. This class is not a publication of ASME.
-The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract. This class loads a number of other packages, all of which are contained in up-to-date versions of \href{https://www.tug.org/texlive/}{\TeX\ Live}, \href{http://www.tug.org/mactex/}{Mac\TeX}, and similar distributions. If you find you are missing one of these packages, you may obtain it from CTAN (\href{http://ctan.org}{ctan.org}).
+The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract. This class loads a number of other packages, all of which are contained in up-to-date versions of \href{https://www.tug.org/texlive/}{\TeX\ Live}, \href{http://www.tug.org/mactex/}{Mac\TeX}, and similar distributions. If you find you are missing one of these packages, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}).
\subsection{Essential Initial Commands}
To begin, fill in the fields to be completed at top of the \texttt{asmeconf-template.tex} file. These fields include the headers for your conference and your paper number. Specified metadata will be placed into the pdf file itself.
@@ -201,30 +202,36 @@ The title should be placed into \verb|\title{..}|.
Put author names into the \verb|\SetAuthors{name, name,...}| command in the desired order; follow the syntax illustrated \texttt{asmeconf-template.tex} file. Put each distinct address sequentially into a separate \verb|\SetAffiliation{n}{address}|, where $n = 1,2,\ldots$ Tag each author with the right affiliation by putting \verb|\affil{n}| after that author's name inside the \verb|\SetAuthors{..| command.
-Author addresses are to be kept short. List the author institution, and the City, State (US authors), City, Province, Canada (Canadian authors), or City, Country (other international authors).
+Author addresses are to be kept short. List the author institution, and the City, State (US authors), City, Province, Canada (Canadian authors), or City, Country (for other international authors).
One author (or more) may be designated as the corresponding author by placing \verb|\CorrespondingAuthor{email}| after \verb|\affil{#}|. Two or more authors may be joint first authors by putting \verb|\JointFirstAuthor| after \verb|\affil{#}|.
After setting up the headers, authors, and title, issue the \verb|\maketitle| command.
-The abstract text must be placed into \verb|\begin{abstract}..\end{abstract}|. The abstract will automatically be italicized. Keywords may optionally be including using the \verb|\keywords{..}| command. This command \textit{must} be issued before the abstract environment.
+The abstract text must be placed into \verb|\begin{abstract}| \ldots \verb|\end{abstract}|. The abstract will automatically be italicized. Keywords may be included using the \verb|\keywords{..}| command. The \texttt{keyword} command \textit{must} be issued before the abstract environment.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Equations and Nomenclature}
-Equations are typeset in the usual way. The class file loads the \texttt{amsmath} and \texttt{mathtools} packages. Further, the \texttt{newtxmath} package used for the math fonts includes many additional features (see Sect.~\ref{sec:moremath}).
+
+\section{Referring to Citations, Figures, and Equations}
+Citations are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982}.
+A specific reference may be named with an abbreviation, as in Ref.~\cite{watson1982}.
+See the \texttt{asmeconf-sample.bib} file and Sect.~\ref{sec:references} for examples of how to enter your references.
+
+For ASME conference papers, the labels Equation and Figure should be abbreviated when they do not start a sentence, as in Eq.~\eqref{eqn:dw} and Fig.~\ref{fig:1}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:dw} is spelled out when it starts a sentence.
+
+Equations are typeset in the usual way and will be automatically numbered. The class file loads the \texttt{amsmath} and \texttt{mathtools} packages. Further, the \texttt{newtxmath} package used for the math fonts includes many additional features (see Sect.~\ref{sec:moremath}).
\begin{equation}\label{eqn:fourier}
\vec{q} = -k\nabla T
\end{equation}
-ASME prefers SI units. U.S.\ style units may follow in parentheses. Be sure to put your symbols into the nomenclature list, including the units.
-
-For ASME conference papers, the labels Equation and Figure should be abbreviated when they do not start a sentence, as in Eq.~\eqref{eqn:dw} and Fig.~\ref{fig:1}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:dw} is spelled out when it starts a sentence.
+ASME prefers SI units. (U.S.\ style units may follow in parentheses.) Be sure to put all symbols into the nomenclature list, including their units.
%%%%%%%%%%%%% begin figure %%%%%%%%%%%%%%%%%
%% captions go below figures
+
\begin{figure}
\centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
\caption{Figure caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
@@ -234,15 +241,17 @@ For ASME conference papers, the labels Equation and Figure should be abbreviated
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%% Use title case for subsections and subsubsections
+
\section{Section Headings and Captions}
-ASME requires that section headings and captions be set in an uppercase, sans serif font. The class will do this automatically. You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and mathematics into headings and captions directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes in tables, use the \texttt{tablefootnote} package.}\footnote{Sequential footnote.}
+ASME requires that section headings and captions be set in an uppercase, sans serif font. The class will do this automatically. You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and mathematics into headings and captions directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes in tables, use the \texttt{tablefootnote} package.}\footnote{Sequential footnotes are automatically separated by a comma.}
Text in section headings and captions will not be capitalized if enclosed in a \verb|\NoCaseChange{..}| command.
Sections may either be numbered or left unnumbered.
-Simple mathematical expressions can be used in either captions or section headings. For a section heading that includes more complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmeconf-template.tex} source file for examples of this. These bookmarks should usually be text expressions, although some math is supported.
+Simple mathematical expressions can be used in either captions or section headings. For a section heading that includes more complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmeconf-template.tex} source file for examples of this procedure. These bookmarks should usually be text expressions, although some math is supported.
If you wish to override the default math format in captions, put \verb|\mathversion{normal}| in the caption.
@@ -293,16 +302,71 @@ Our competitor's test & 72.321 & 141.384 \\
\section{Tables and Figures}
Table \ref{tab:1} is an example of a simple table. Table captions should be placed above tables.
-The class loads the \texttt{booktabs} package (used for horizontal rules in both Table \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Table \ref{tab:2}). Table \ref{tab:3} is an example of a table that spans two columns.
+The class loads the \texttt{booktabs} package (used for horizontal rules in both Table \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Table \ref{tab:2}). Table \ref{tab:3} is an example of a table that spans two columns. Two column tables (and figures) will always float to the top of a later page.
-Figure captions go below figures. Figure~\ref{fig:2} is an example of a figure that spans two columns and includes subfigures. The text in figures (and tables) should be no smaller than 6~point type. Images in figures are handles by the standard \texttt{graphicx} package.
+Figure captions go below figures. Figure~\ref{fig:2} is an example of a figure that spans two columns and includes subfigures. The text in figures (and tables) should be no smaller than 6~point type. Images in figures are handled by the standard \texttt{graphicx} package.
Landscape figures and tables may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| in your \texttt{.tex} file's preamble and using the \texttt{sidewaystable*} and \texttt{sidewaysfigure*} environments~\cite{fairbairns}.
+%%%%%%%%%%%%%%% begin two column table %%%%%%%%%%%%%%%%%%
+\begin{table*}
+\caption{A table spanning two columns\label{tab:3}}%
+\centering{%
+\begin{tabular*}{0.8\textwidth}{@{\hspace*{1.5em}}@{\extracolsep{\fill}}ccc!{\hspace*{3.em}}ccc@{\hspace*{1.5em}}}
+\toprule
+\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{11pt}} &
+\multicolumn{1}{c}{$\textrm{erf}(x)$} &
+\multicolumn{1}{c!{\hspace*{3.em}}}{$\textrm{erfc}(x)$} &
+\multicolumn{1}{c}{$x$} &
+\multicolumn{1}{c}{$\textrm{erf}(x)$} &
+\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \midrule
+0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980\rule{0pt}{11pt} \\
+0.05 & 0.05637 & 0.94363 & 1.20 & 0.91031 & 0.08969 \\
+0.10 & 0.11246 & 0.88754 & 1.30 & 0.93401 & 0.06599 \\
+0.15 & 0.16800 & 0.83200 & 1.40 & 0.95229 & 0.04771 \\
+0.20 & 0.22270 & 0.77730 & 1.50 & 0.96611 & 0.03389 \\
+0.30 & 0.32863 & 0.67137 & 1.60 & 0.97635 & 0.02365 \\
+0.40 & 0.42839 & 0.57161 & 1.70 & 0.98379 & 0.01621 \\
+0.50 & 0.52050 & 0.47950 & 1.80 & 0.98909 & 0.01091 \\
+0.60 & 0.60386 & 0.39614 & 1.82\makebox[0pt][l]{14} & 0.99000 & 0.01000 \\
+0.70 & 0.67780 & 0.32220 & 1.90 & 0.99279 & 0.00721 \\
+0.80 & 0.74210 & 0.25790 & 2.00 & 0.99532 & 0.00468 \\
+0.90 & 0.79691 & 0.20309 & 2.50 & 0.99959 & 0.00041 \\
+1.00 & 0.84270 & 0.15730 & 3.00 & 0.99998 & 0.00002 \\[2pt]
+\bottomrule\end{tabular*}
+}
+\end{table*}
+
+%%%%%%%%%%%%%%%%% end two column table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{If you have text in a section heading or caption that you do not want to be capitalized, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command.}}\label{sec:references}
+
+The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX} style follows the reference styles shown on ASME's conference web site in early 2020. Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution. Citations and references are managed by the standard \texttt{natbib} package. Nevertheless, a few comments are necessary.
+
+%% sub-subsections should *not* be numbered
+
+\subsubsection*{DOI, URL, and eprint} Include DOI numbers when they are available. URL's may alternatively be given. ASME requests that URLs point to a document's abstract.
+
+Elementary support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hdl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hdl}, \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
+
+\subsubsection*{Online Sources} A bibliography field \verb|@online{..| is included for citation of online sources, such as web pages. A \texttt{url} or \texttt{eprint} with \texttt{archive} must be included. See the examples of use in the \texttt{asmeconf-sample.bib} file.
+
+\subsubsection*{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{Accessed `date',}. The word ``Accessed'' may be changed using the \verb|urltype={..}| field.
+
+\subsubsection*{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference.
+
+\subsubsection*{Capitalization of Titles} ASME's bibliography style requires that document titles be in title case. The first letters of principal words are capitalized. Do this when writing the \texttt{.bib} file.
+
+
-%%%%%%%%%%%%%%%%% begin wide figure %%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% begin two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{figure*}[t]
+\begin{figure*}
\begin{subfigure}[t]{0.5\textwidth} %subfigure is basically the same as minipage
\vbox{
\vspace*{1.7em}
@@ -313,7 +377,7 @@ Landscape figures and tables may be produced at full-page size by putting \verb|
}
\subcaption{Interior region\label{fig:interior-region}}
\end{subfigure}%
-%%%%%%%%%%%%% no spaces or line breaks between these two minipages
+%%%%%%%%%%%%% no spaces or line breaks between these two subfigures
\begin{subfigure}[t]{0.5\textwidth}
\centering{%
\includegraphics{sample-figure-2b.pdf}
@@ -322,36 +386,16 @@ Landscape figures and tables may be produced at full-page size by putting \verb|
\caption{A figure with two subfigures \cite{Lienhard2019b}}\label{fig:2}
\end{figure*}
-%%%%%%%%%%%%%%%%%%% end wide figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{If you have text in a section heading or caption that you do not want to be capitalized, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command.}}
-
-Citations are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed as well if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982,smith1998}. See the \texttt{asmeconf-sample.bib} file for examples of how to enter your references. Citations and references are managed by the standard \texttt{natbib} package.
-
-The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX} style follows the reference styles posted on ASME's conference web site in early 2020. Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution. Nevertheless, a few comments are necessary.
-
-%% subsubsections are not numbered
-\subsubsection*{DOI, URL, and eprint} Include DOI numbers when they are available. URL's may alternatively be given.
-
-Elementary support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hndl, jstore}, or \texttt{pubmed} (e.g., \texttt{archive=hndl}, \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
-
-\subsubsection*{Online Sources} A bibliography field \verb|@online{..| is included for citation of online sources, such as web pages. See the examples of use in the \texttt{asmeconf-sample.bib} file.
-
-\subsubsection*{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{accessed `date',}. The word ``accessed'' may be changed using the \verb|urltype={..}| field.
-
-\subsubsection*{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference.
+%%%%%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%% MORE ON MATH %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Dealing with complicated math in a section or subsection heading:
-%% the optional argument to \section will provide the pdf bookmark
-%% without losing characters or producing warnings/errors.
+%% the optional argument to \section will provide the pdf bookmark
+%% without losing characters or producing warnings/errors.
%%
-%% In this heading, u is forced to be upright with \mathrm{u}
+%% In this heading, letter u is forced to be upright with \mathrm{u}
%%
\section[More on math: u\cdot\omega=0]{More on math: $\vec{\mathrm{u}}\cdot\vec{\omega}=0$}\label{sec:moremath}
@@ -360,11 +404,11 @@ In most cases, the need for a wide equation can be eliminated by using one of th
\texttt{multline} environment:
\begin{multline}\label{eqn:energy}
\frac{\partial}{\partial t}\left[\rho\bigl(e + \lvert\vec{u}\rvert^2\big/2\bigr)\right] + \nabla\cdot\left[\rho\bigl(h + \lvert\vec{u}\rvert^2\big/2 \bigr)\vec{u}\right] \\
- ={}-\nabla \cdot \vec{q} + \rho \vec{u}\cdot\vec{g}+ \frac{\partial}{\partial x_j}\left(d_{ji}u_i\right) + \dot{Q}_v
+ ={}-\nabla \cdot \vec{q} + \rho \vec{u}\cdot\vec{g}+ \frac{\partial}{\partial x_j}\bigl(d_{ji}u_i\bigr) + \dot{Q}_v
\end{multline}
An example using \texttt{align} appears in Appendix~\ref{appendix:a}.
-An alternative solution may be to set large equations into two-column-wide tables or figures. (You can find code online that sets equations across two columns, but the results may be sketchy.)
+An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks.
Math italics are used for roman and greek letters by default. If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
\begin{equation}\label{eqn:dw}
@@ -372,30 +416,32 @@ Math italics are used for roman and greek letters by default. If you want an up
\end{equation}
To get additional symbols in bold math, you can use the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class.
-The class file also provides upright sans-serif greek letters with \verb|\sfalpha| and similar expressions (e.g.\ $\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots \bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how greek letters are presented).
+The class file also provides upright sans-serif greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how greek letters are presented).
-\subsection{The \texttt{newtxmath} and \texttt{mathalpha} packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes a large number of options for mathematics. Most options can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
+\subsection{The \texttt{newtxmath} and \texttt{mathalpha} Packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes a large number of options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
\begin{quote}
\verb|\documentclass[upint]{asmeconf}|.
\end{quote}
These math options are discussed further in the \texttt{asmejour-template.tex} file.
-In addition, many options for calligraphic, script, and fraktur fonts are available as options to the \texttt{mathalfa} package, which is also loaded. These may be invoked, for example, as
+In addition, many options for calligraphic, fraktur, and script fonts are available as options to the \texttt{mathalfa} package, which is also loaded. These may be invoked, for example, as
\begin{center}
\verb|\documentclass[mathalfa=cal=euler]{asmeconf}|
\end{center}
which selects the Euler font for \verb|\mathcal| (this is our default). To find all the font options, refer to the \texttt{mathalfa} package documentation \cite{sharpe2}.
-The typewriter font loaded is \texttt{inconsolata} (which is sans serif), as suggested by the \texttt{newtx} package documentation. The class is not set up for use with the \texttt{fontspec} or \texttt{unicode-math} packages.
+The typewriter font loaded is \texttt{inconsolata} (which is sans serif), as suggested by the \texttt{newtx} package documentation.
+The \texttt{asmeconf} class is not set up for use with the \texttt{fontspec} or \texttt{unicode-math} packages.
-%%%%%%%%%%%%%%% ADDITIONAL PACKAGE OPTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%% ADDITIONAL PACKAGE OPTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Additional Options for \NoCaseChange{\texttt{asmeconf.cls}}}
The class accepts a number of options in addition to those already described. These options are discussed next.
\subsection{Colored hyperlinks}
-ASME requires that all text be in black when the paper is submitted for publication. For other uses, authors may
+ASME requires that all text be \textbf{in black} when the paper is submitted for publication. For other uses, authors may
obtain colored hyperlinks with the [\texttt{colorlinks}] option.
\subsection{Final Column Balancing} The option \texttt{[balance]} invokes the the \texttt{flushend} package~\cite{tolusis}.
@@ -403,7 +449,7 @@ This package will attempt to give equal height to the two columns on the last pa
\subsection{Line Numbers} The option \texttt{[lineno]} invokes the the \texttt{lineno} package~\cite{bottcher}. This option will produce line numbers in the margins. You must run \LaTeX\ \textit{twice} for proper placement of the numbers. Tables, captions, and footnotes will not be numbered. Line numbers can be helpful for review and editing, but should not be used in your final manuscript. See the documentation of the \texttt{lineno} package for further commands to control line numbering.
-The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is disabled when this option is called.
+The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is automatically disabled when this option is called.
\subsection{Changing the Footer Text} The option \texttt{[nofoot]} will omit the ASME copyright from the first page footer.
The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum}, so you can change them in any way you like using the commands of that package. Only the default arrangement of footers matches ASME's style, however.
@@ -417,44 +463,15 @@ Hyphenation is normally suppressed for typewriter mode because this font is ofte
\subsection{Support for Other Languages} The package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:c} for details.
-
-%%%%%%%%%%%%%%% begin two column table %%%%%%%%%%%%%%%%%%
-\begin{table*}[t]
-\caption{A table spanning two columns\label{tab:3}}%
-\centering{%
-\begin{tabular*}{0.8\textwidth}{@{\hspace*{1.5em}}@{\extracolsep{\fill}}ccc!{\hspace*{3.em}}ccc@{\hspace*{1.5em}}}
-\toprule
-\multicolumn{1}{@{\hspace*{1.5em}}c}{$x$\rule{0pt}{11pt}} &
-\multicolumn{1}{c}{$\textrm{erf}(x)$} &
-\multicolumn{1}{c!{\hspace*{3.em}}}{$\textrm{erfc}(x)$} &
-\multicolumn{1}{c}{$x$} &
-\multicolumn{1}{c}{$\textrm{erf}(x)$} &
-\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \midrule
-0.00 & 0.00000 & 1.00000 & 1.10 & 0.88021 & 0.11980\rule{0pt}{11pt} \\
-0.05 & 0.05637 & 0.94363 & 1.20 & 0.91031 & 0.08969 \\
-0.10 & 0.11246 & 0.88754 & 1.30 & 0.93401 & 0.06599 \\
-0.15 & 0.16800 & 0.83200 & 1.40 & 0.95229 & 0.04771 \\
-0.20 & 0.22270 & 0.77730 & 1.50 & 0.96611 & 0.03389 \\
-0.30 & 0.32863 & 0.67137 & 1.60 & 0.97635 & 0.02365 \\
-0.40 & 0.42839 & 0.57161 & 1.70 & 0.98379 & 0.01621 \\
-0.50 & 0.52050 & 0.47950 & 1.80 & 0.98909 & 0.01091 \\
-0.60 & 0.60386 & 0.39614 & 1.82\makebox[0pt][l]{14} & 0.99000 & 0.01000 \\
-0.70 & 0.67780 & 0.32220 & 1.90 & 0.99279 & 0.00721 \\
-0.80 & 0.74210 & 0.25790 & 2.00 & 0.99532 & 0.00468 \\
-0.90 & 0.79691 & 0.20309 & 2.50 & 0.99959 & 0.00041 \\
-1.00 & 0.84270 & 0.15730 & 3.00 & 0.99998 & 0.00002 \\[2pt]
-\bottomrule\end{tabular*}
-}
-\end{table*}
-
-%%%%%%%%%%%%%%%% end two column table %%%%%%%%%%%%%%%%%%%
-
-
+%%%%% Conclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Conclusion}
Provide a brief conclusion (3-4 lines).
-\section*{Acknowledgment}
+
+%%%%% Acknowledgments %%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section*{Acknowledgments}
Place any acknowledgments here.
@@ -462,26 +479,26 @@ Place any acknowledgments here.
%%% REFERENCES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% Put your references into your .bib file in the usual way. Run latex once, bibtex once, then latex twice.
-%% This specific .bst style allows: venue = {location of conference}, and confmonth = {Month days}
+%% The asmeconf.bst style allows: venue = {Location of Conference}, and eventdate = {Month, days}
+%% for @inproceedings and @proceedings
%%
-\nocite{*} %% <=== delete this line unless you want to typeset the entire contents of your .bib file.
+\nocite{*} %% <=== Delete this line unless you want to typeset the entire contents of your .bib file!
\bibliographystyle{asmeconf} %% .bst file following ASME conference format. Do not change.
\bibliography{asmeconf-sample} %% <=== change this to name of your bib file
-
-
%%% APPENDICES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
%% Note that appendices will be "numbered" A, B, C, ... etc. Use \section, not \section*
-%% Equations should be numbered sequentially following those in the paper. Don't reset the equation counter.
+%% Equations will be numbered sequentially following those in the paper. Do not reset the equation counter.
%% Here we use the optional argument for the pdf bookmark.
\section[The vector product A\times B]{The vector product $\vec{A}\times\vec{B}$}\label{appendix:a}
-This is just a brief illustration of an appendix, showing numbering of the appendix and equations. Equations are numbered
+
+This brief illustration of an appendix shows the numbering of the appendix and equations. Equations are numbered
consecutively, following those in the paper.
\begin{align}
\frac{d\Gamma}{dt} &{}= \int_{\mathcal{C}} \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{r}\\
@@ -492,8 +509,8 @@ consecutively, following those in the paper.
\section{Option to use an author grid}\label{appendix:b}
-ASME's most recent templates place author names inline, with affiliations for all authors in rows below. This style is the
-default for this template.
+ASME's most recent templates place author names inline, with affiliations for all authors in rows below.
+This style is the default for this template.
The historical style of authors with affiliation in a grid of blocks may be invoked with
the option [\texttt{oldauthors}]. When using this form, the author names and addresses should be entered as below:
@@ -507,16 +524,21 @@ the option [\texttt{oldauthors}]. When using this form, the author names and ad
\noindent\hbox{}\hfil\verb|Institution \\ City, Country}|
\verb|\SetAuthorBlock{\CorrespondingAuthor{John Lienhard%|
\hbox{}\hfil\verb|}{lienhard@mit.edu}}{Institution \\ City, State}|
+
+Directly usable code is contained at the very end of the \texttt{asmeconf-template.tex} file.
-%% directly usable code follows \end{document}, below.
+%% directly usable code follows the \end{document} command below.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Language Support}\label{appendix:c}
ASME publishes in English, but the \texttt{babel} package is loaded for
-users who may wish to include other languages. Options are supported to load a primary language, \texttt{lang=}, as well
-as a secondary and tertiary language, \texttt{lang-second} and \texttt{lang-third}. The primary language must be specified explicitly if a secondary language is loaded. If no language option is given, the package defaults to English.
+users who may wish to include other languages. Options are supported to load a primary language, \texttt{lang=},
+as well as a secondary and tertiary language, \texttt{lang-second} and \texttt{lang-third}.
+The primary language must be specified explicitly if a secondary language is loaded.
+If no language option is given, the package defaults to English. An example of use is
+shown in \selectlanguage{french}\appendixname\ \ref{app:fourier}.\selectlanguage{english}
The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English. Users may additionally change ``Keywords'', ``Nomenclature'', ``Corresponding author'', and ``Joint first authors'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, \verb|\CAwords|, and \verb|\JAwords|. Changes to the page footer were described earlier. The pdf bookmark for ``Appendices'' may be changed by renewing \verb|\appendicesname|.
@@ -527,6 +549,15 @@ Font encoding is set to T1 with utf-8 input supported:
No effort has been made to support customization of language-specific fonts, although this is possible by modifying the class file (examples are given in the \texttt{newtx} documentation). The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}. Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
+\selectlanguage{french}
+\section{Discours Préliminaire de Fourier}\label{app:fourier}
+
+Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle.
+
+La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}.
+
+\selectlanguage{english}
+
\end{document}
@@ -548,7 +579,7 @@ No effort has been made to support customization of language-specific fonts, alt
% Can omit second argument of \CorrespondingAuthor if putting email into address
% i.e., can just use \CorrespondingAuthor{name}.
-% Can also put multiple emails and use command more than once for multiple corresponding authors.
+% Can also put multiple emails in the command and use more than once for multiple corresponding authors.
\SetAuthorBlock{\CorrespondingAuthor{John H.\ Lienhard V}{lienhard@mit.edu}}{%
Massachusetts Institute of Technology \\ Cambridge, MA}
diff --git a/macros/latex/contrib/asmeconf/asmeconf.bst b/macros/latex/contrib/asmeconf/asmeconf.bst
index 961645f7fe..1388b084f8 100644
--- a/macros/latex/contrib/asmeconf/asmeconf.bst
+++ b/macros/latex/contrib/asmeconf/asmeconf.bst
@@ -1,10 +1,10 @@
%%%%%
%%%%% *** This .bst produces the reference format for ASME conference papers. ***
-%%%%% *** Follows the examples given on ASME's conference web pages in early 2019. ***
+%%%%% *** Follows the examples given on ASME's conference web pages in early 2020. ***
%%%%% *** https://www.asme.org/shop/proceedings/conference-publications/references ***
-%%%%% *** The examples given by ASME do not cover all possibilities ***
+%%%%% *** The examples given by ASME do *not* cover all possibilities ***
%%%%%
-%%%%% This file is version 1.1 dated 2019/07/07
+%%%%% This file is version 1.11 dated 2020/04/14
%%%%%
%%%%% Author: John H. Lienhard V
%%%%% Department of Mechanical Engineering
@@ -26,13 +26,29 @@
%%%%% Added: urlprefix = {}, format.web.urldate, bbl.urldate; urltype field changes "accessed" to something else.
%%%%% Added: venue and eventdate to @inproceedings
%%%%%
+%%%%% Edits in version 1.11, 2020/04/14:
+%%%%% correct error in journal eid code.
+%%%%% remove comma between Vol. and No. in article, per ASME style
+%%%%% capitalize "Thesis", per ASME style
+%%%%% insert "." after techreport number, per ASME style
+%%%%% edits to @inbook, @proceedings, @incollection related to chapter and series.
+%%%%% make punctuation after "(ed.)" consistent across entries.
+%%%%% adjust block breaks in @online.
+%%%%% allow for venue and eventdate in @proceedings
+%%%%% add macros for ASME journal titles. add hdl as an equivalent to hndl archive macro.
+%%%%% add numpages functionality for eid: "eid (numpages pages)"
+%%%%% remove "doi" field from @online (since doi is a digital object identifier, not a web page).
+%%%%% add "urldate" to eprint format, for optional use.
+%%%%% warn in @online not to use both eprint and url, and warn if neither is given.
+%%%%% remove series and add volume to @inproceedings.
+%%%%%
%%%%% Feel free to edit this file to suit your own needs, but please make note of changes in this header.
%%%%%
%%=========================================================
%% LICENSE:
%% This file is a derivative work from the generated file, as envisioned by the LaTeX Project Public License.
%%
-%% Copyright (c) 2019 John Lienhard
+%% Copyright (c) 2020 John Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -319,6 +335,9 @@ FUNCTION {bbl.nr}
FUNCTION {bbl.in}
{ "in" }
+FUNCTION {bbl.paperno}
+{ "" }
+
FUNCTION {bbl.pages}
{ "pp." }
@@ -335,10 +354,10 @@ FUNCTION {bbl.techrep}
{ "Technical Report" }
FUNCTION {bbl.mthesis}
-{ "Master's thesis" }
+{ "Master's Thesis" }
FUNCTION {bbl.phdthesis}
-{ "Ph.D. thesis" }
+{ "Ph.D. Thesis" }
FUNCTION {bbl.first}
{ "1st" }
@@ -368,7 +387,7 @@ FUNCTION {bbl.th}
{ "th" }
FUNCTION {bbl.urldate}
- { "accessed" }
+ { "Accessed" }
MACRO {jan} {"Jan."}
@@ -420,13 +439,75 @@ MACRO {arxiv} {"https://arxiv.org/abs/"}
MACRO {googlebooks} {"http://books.google.com/books?id="}
+MACRO {hdl} {"http://hdl.handle.net/"}
MACRO {hndl} {"http://hdl.handle.net/"}
MACRO {jstor} {"http://www.jstor.org/stable/"}
+MACRO {oclc} {"http://www.worldcat.org/oclc/"}
+
MACRO {pubmed} {"http://www.ncbi.nlm.nih.gov/pubmed/"}
+MACRO {amr} {"Appl. Mech. Rev."}
+
+MACRO {lds} {"ASME Letters Dynamic Systems"}
+
+MACRO {jru} {"ASME J. Risk Uncertainty"}
+
+MACRO {jsbc} {"ASME J. Sustainable Bldg. and Cities"}
+
+MACRO {jam} {"ASME J. Appl. Mech."}
+
+MACRO {jbe} {"ASME J. Biomed. Eng."}
+
+MACRO {jcnd} {"ASME J. Comput. Nonlin. Dyn."}
+
+MACRO {jcise} {"ASME J. Comput. Inf. Sci. Eng."}
+
+MACRO {jds} {"J. Dyn. Syst.-T. ASME"}
+
+MACRO {jep} {"ASME J. Electron. Packag."}
+
+MACRO {jert} {"ASME J. Energy Resour."}
+
+MACRO {jegtp} {"ASME J. Eng. Gas Turbines Power"}
+
+MACRO {jem} {"ASME J. Eng. Mater."}
+
+MACRO {jfe} {"ASME J. Fluids Eng."}
+
+MACRO {jfcst} {"ASME J. Fuel Cell Sci. Tech."}
+
+MACRO {jht} {"ASME J. Heat Transfer"}
+
+MACRO {jmse} {"ASME J. Manuf. Sci. E."}
+
+MACRO {jmd} {"ASME J. Mech. Des."}
+
+MACRO {jmr} {"ASME J. Mech. Robot."}
+
+MACRO {jmdv} {"ASME J. Med. Devices"}
+
+MACRO {jmnm} {"ASME J. Micro Nano-Manuf."}
+
+MACRO {jnem} {"ASME J. Nanotech Eng. Med."}
+
+MACRO {joma} {"ASME J. Offshore Mech. Arct."}
+
+MACRO {jpv} {"ASME J. Press. Vess."}
+
+MACRO {jse} {"ASME J. Sol. Energy"}
+
+MACRO {jtsea} {"ASME J. Therm. Sci. Eng. Appl."}
+
+MACRO {jtb} {"ASME J. Tribol."}
+
+MACRO {jtm} {"ASME J. Turbomach."}
+
+MACRO {jva} {"ASME J. Vib. Acoust."}
+
+
MACRO {acmcs} {"ACM Computing Surveys"}
MACRO {acta} {"Acta Informatica"}
@@ -504,21 +585,6 @@ FUNCTION {bibinfo.warn}
if$
}
-
-FUNCTION {format.eprint}
-{ eprint duplicate$ empty$
- 'skip$
- { "\eprint"
- archive empty$
- { "there's an eprint but no archive in " cite$ * warning$ }
- { "[" * archive * "]" * }
- if$
- "{" * swap$ * "}" *
- }
- if$
-}
-
-
FUNCTION {format.web.urldate}
{ urldate empty$
{""}
@@ -537,6 +603,20 @@ FUNCTION {format.web.urldate}
if$
}
+FUNCTION {format.eprint}
+{ eprint duplicate$ empty$
+ 'skip$
+ { "\eprint"
+ archive empty$
+ { "there's an eprint but no archive in " cite$ * warning$ }
+ { "[" * archive * "]" * }
+ if$
+ "{" * swap$ * "}" *
+ format.web.urldate swap$ *
+ }
+ if$
+}
+
FUNCTION {format.url}
{
url
@@ -616,7 +696,6 @@ FUNCTION {get.bbl.editor}
FUNCTION {format.editors}
{ editor "editor" format.names duplicate$ empty$ 'skip$
{
- "," *
" " *
get.bbl.editor
"(" swap$ * ")" *
@@ -788,6 +867,20 @@ FUNCTION {format.bvolume}
}
if$
}
+
+FUNCTION {format.paper.number}
+{ number "number" bibinfo.check
+ type duplicate$ empty$
+ { pop$ bbl.paperno }
+ 'skip$
+ if$
+ "type" bibinfo.check
+ swap$ duplicate$ empty$
+ { pop$ "t" change.case$ }
+ { tie.or.space.prefix * * }
+ if$
+}
+
FUNCTION {format.number.series}
{ volume empty$
{ number empty$
@@ -800,7 +893,7 @@ FUNCTION {format.number.series}
if$
number tie.or.space.prefix "number" bibinfo.check * *
bbl.in space.word *
- series "series" bibinfo.check *
+ series emphasize "series" bibinfo.check *
}
if$
}
@@ -939,19 +1032,21 @@ FUNCTION {format.journal.eid}
{ eid "eid" bibinfo.check
duplicate$ empty$ 'pop$
{ swap$ duplicate$ empty$ 'skip$
- {
+ {
" " *
- }
- if$
- swap$ *
- numpages empty$ 'skip$
- { bbl.eidpp numpages tie.or.space.prefix
- "numpages" bibinfo.check * *
- " (" swap$ * ")" * *
+ format.year * ": " *
+ swap$
+ *
+ numpages empty$ 'skip$
+ { numpages bbl.eidpp tie.or.space.prefix
+ "numpages" bibinfo.check * *
+ " (" swap$ * ")" * *
+ }
+ if$
}
if$
- }
- if$
+ }
+ if$
}
FUNCTION {format.vol.num.pages}
{ volume field.or.null
@@ -969,14 +1064,14 @@ FUNCTION {format.vol.num.pages}
'skip$
if$
swap$
- ", " bbl.nr * number tie.or.space.prefix pop$ * swap$ *
+ " " bbl.nr * number tie.or.space.prefix pop$ * swap$ *
}
if$ *
}
FUNCTION {format.chapter.pages}
{ chapter empty$
- { "" }
+ 'format.pages
{ type empty$
{ bbl.chapter }
{ type "l" change.case$
@@ -985,6 +1080,10 @@ FUNCTION {format.chapter.pages}
if$
chapter tie.or.space.prefix
"chapter" bibinfo.check
+ pages empty$
+ 'skip$
+ { ", " * format.pages * }
+ if$
* *
}
if$
@@ -1003,7 +1102,7 @@ FUNCTION {format.in.ed.booktitle}
"" *
" " *
get.bbl.editor
- "(" swap$ * ") " *
+ "(" swap$ * "). " *
* swap$
* }
if$
@@ -1193,7 +1292,6 @@ FUNCTION {book}
{ output.bibitem
author empty$
{ format.editors "author and editor" output.check
- add.blank
}
{ format.authors output.nonnull
crossref missing$
@@ -1227,6 +1325,7 @@ FUNCTION {book}
format.note output
fin.entry
}
+
FUNCTION {booklet}
{ output.bibitem
format.authors output
@@ -1263,22 +1362,23 @@ FUNCTION {inbook}
new.block
crossref missing$
{
+ format.bvolume output
format.number.series output
+ new.block
+ new.sentence
format.publisher.address output
- format.bvolume output
- format.chapter.pages "chapter and pages" output.check
new.block
new.sentence
}
{
- format.chapter.pages "chapter and pages" output.check
new.block
format.book.crossref output.nonnull
}
if$
format.date "year" output.check
date.block
- format.pages "pages" output.check
+ format.chapter.pages "chapter and pages" output.check
+ new.block
format.doi output
new.block
format.eprint output
@@ -1297,9 +1397,9 @@ FUNCTION {incollection}
crossref missing$
{ format.in.ed.booktitle "booktitle" output.check
format.edition output
+ new.block
format.number.series output
format.bvolume output
- format.chapter.pages output
new.sentence
format.publisher.address output
}
@@ -1309,7 +1409,7 @@ FUNCTION {incollection}
if$
format.date "year" output.check
conf.date.block
- format.pages "pages" output.check
+ format.chapter.pages "pages" output.check
format.doi output
new.block
format.eprint output
@@ -1327,8 +1427,13 @@ FUNCTION {inproceedings}
new.block
crossref missing$
{ format.in.ed.booktitle "booktitle" output.check
+ volume empty$ 'skip$
+ { bbl.volume volume tie.or.space.prefix
+ "volume" bibinfo.check * * output
+ }
+ if$
new.sentence
- format.number.series output
+ format.paper.number output
conf.date.block
format.pages "pages" output.check
new.sentence
@@ -1355,6 +1460,7 @@ FUNCTION {inproceedings}
fin.entry
}
FUNCTION {conference} { inproceedings }
+
FUNCTION {manual}
{ output.bibitem
author empty$
@@ -1435,6 +1541,46 @@ FUNCTION {misc}
empty.misc.check
}
+FUNCTION {online}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check
+ }
+ { format.authors output.nonnull
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ new.block
+ format.title
+ "title" output.check
+ new.block
+ organization "organization" bibinfo.warn output
+ address "address" bibinfo.check output
+ format.date "year" output.check
+ new.block
+ url empty$
+ { eprint empty$
+ { "missing url and eprint in" cite$ * warning$ }
+ { format.eprint output }
+ if$
+ }
+ { "url and eprint" eprint either.or.check
+ format.url "url" bibinfo.warn output
+ }
+ if$
+ new.block
+ format.note output
+ fin.entry
+}
+
+FUNCTION {electronic} { online }
+
+FUNCTION {www} { online }
+
+
FUNCTION {phdthesis}
{ output.bibitem
format.authors "author" output.check
@@ -1461,11 +1607,16 @@ FUNCTION {proceedings}
editor empty$
{ organization "organization" bibinfo.check output
}
- { format.editors output.nonnull }
+ { format.editors output.nonnull
+ }
if$
new.block
format.btitle "title" output.check
format.bvolume output
+ new.block
+ venue "venue" output.check
+ eventdate "eventdate" output.check
+ new.block
editor empty$
{ publisher empty$
{ format.number.series output }
@@ -1490,7 +1641,7 @@ FUNCTION {proceedings}
if$
}
if$
- format.date "year" output.check
+ format.date "year" output.check
format.doi output
new.block
format.eprint output
@@ -1508,6 +1659,7 @@ FUNCTION {techreport}
"title" output.check
new.block
format.tr.number output.nonnull
+ new.block
institution "institution" bibinfo.warn output
address "address" bibinfo.check output
new.block
@@ -1521,35 +1673,6 @@ FUNCTION {techreport}
fin.entry
}
-FUNCTION {online}
-{ output.bibitem
- author empty$
- { format.editors "author and editor" output.check
- }
- { format.authors output.nonnull
- crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
- if$
- }
- if$
- format.title
- "title" output.check
- new.block
- organization "organization" bibinfo.warn output
- address "address" bibinfo.check output
- format.date "year" output.check
- format.doi output
- format.note output
- format.eprint output
- format.url "url" bibinfo.warn output
- fin.entry
-}
-
-FUNCTION {electronic} { online }
-
-FUNCTION {www} { online }
-
FUNCTION {unpublished}
{ output.bibitem
format.authors "author" output.check
diff --git a/macros/latex/contrib/asmeconf/asmeconf.cls b/macros/latex/contrib/asmeconf/asmeconf.cls
index 11cf01aba5..be225271d9 100644
--- a/macros/latex/contrib/asmeconf/asmeconf.cls
+++ b/macros/latex/contrib/asmeconf/asmeconf.cls
@@ -1,13 +1,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% This file provides the asmeconf class for formatting conference papers according to
-%% ASME conference requirements as represented on ASME's conference web pages in mid-2019.
+%% ASME conference requirements as represented on ASME's conference web pages in 2020.
%%
%% Please note that ASME's journals follow specifications different from ASME conference papers.
%%
-%% This file is version 1.17 dated 2020/02/29.
- \def\versionno{1.17}
- \def\versiondate{2020/02/29\space}
+%% This file is version 1.18 dated 2020/04/14.
+ \def\versionno{1.18}
+ \def\versiondate{2020/04/14\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
diff --git a/macros/latex/contrib/embedfile/embedfile.dtx b/macros/latex/contrib/embedfile/embedfile.dtx
index 1fb0ed84b6..dbdfbaeafc 100644
--- a/macros/latex/contrib/embedfile/embedfile.dtx
+++ b/macros/latex/contrib/embedfile/embedfile.dtx
@@ -1,12 +1,12 @@
% \iffalse meta-comment
%
% File: embedfile.dtx
-% Version: 2019/12/03 v2.9
+% Version: 2020-04-14 v2.10
% Info: Embed files into PDF
%
% Copyright (C)
% 2006-2011 Heiko Oberdiek
-% 2016-2019 Oberdiek Package Support Group
+% 2016-2020 Oberdiek Package Support Group
% https://github.com/ho-tex/embedfile/issues
%
% This work may be distributed and/or modified under the
@@ -89,7 +89,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: embedfile 2019/12/03 v2.9 Embed files into PDF (HO)}
+\Msg{* Package: embedfile 2020-04-14 v2.10 Embed files into PDF (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -101,11 +101,11 @@
This is a generated file.
Project: embedfile
-Version: 2019/12/03 v2.9
+Version: 2020-04-14 v2.10
Copyright (C)
2006-2011 Heiko Oberdiek
- 2016-2019 Oberdiek Package Support Group
+ 2016-2020 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -179,7 +179,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{embedfile.drv}%
- [2019/12/03 v2.9 Embed files into PDF (HO)]%
+ [2020-04-14 v2.10 Embed files into PDF (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
@@ -193,7 +193,7 @@ and the derived files
% \GetFileInfo{embedfile.drv}
%
% \title{The \xpackage{embedfile} package}
-% \date{2019/12/03 v2.9}
+% \date{2020-04-14 v2.10}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/embedfile/issues}}}
%
@@ -201,7 +201,7 @@ and the derived files
%
% \begin{abstract}
% This package embeds files to a PDF document.
-% Currently the only supported driver is \pdfTeX\ $>=$ 1.30 in PDF mode.
+% Currently the only supported drivers are \pdfTeX\ $>=$ 1.30 and lua\TeX\ in PDF mode.
% \end{abstract}
%
% \tableofcontents
@@ -302,6 +302,9 @@ and the derived files
% for a list of officially registered types.
% \item[\xoption{desc}]
% The description for the file.
+% \item[\xoption{afrelationship}]
+% This adds the /AFRelationship key to the filespec dicrectory. The value is
+% a pdf name with or without the leading slash.%
% \item[\xoption{stringmethod}]
% The package must convert the values of the keys \xoption{ucfilespec}
% and \xoption{desc} into a PDF string (before version 2.4: \xoption{filespec}
@@ -620,7 +623,7 @@ You need Acrobat Reader 8 or higher.
%<*dtxattach>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dtx-attach}
- [2019/12/03 v2.9 Embed \string\jobname.dtx (HO)]%
+ [2020-04-14 v2.10 Embed \string\jobname.dtx (HO)]%
\RequirePackage{embedfile}[2019/12/03]
\embedfile[%
stringmethod=escape,%
@@ -711,7 +714,7 @@ You need Acrobat Reader 8 or higher.
\fi
\expandafter\x\csname ver@embedfile.sty\endcsname
\ProvidesPackage{embedfile}%
- [2019/12/03 v2.9 Embed files into PDF (HO)]%
+ [2020-04-14 v2.10 Embed files into PDF (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1376,6 +1379,7 @@ You need Acrobat Reader 8 or higher.
% \end{macro}
% \begin{macro}{\EmFi@embedfile}
% \begin{macrocode}
+\def\EmFi@removeslash#1{\if/#1\else#1\fi}%
\def\EmFi@embedfile[#1]#2{%
\ifEmFi@finished
\EmFi@Error{%
@@ -1412,7 +1416,8 @@ You need Acrobat Reader 8 or higher.
\ifx\EmFi@afrelationship\ltx@empty
\let\EmFi@@afrelationship\ltx@empty
\else
- \EmFi@convert\EmFi@afrelationship\EmFi@@afrelationship
+ \expandafter\edef\expandafter\EmFi@@afrelationship\expandafter
+ {\expandafter\EmFi@removeslash\EmFi@afrelationship}
\fi
\ifEmFi@item
\let\do\EmFi@do
@@ -1454,7 +1459,7 @@ You need Acrobat Reader 8 or higher.
\fi
\ifx\EmFi@@afrelationship\ltx@empty
\else
- /AFRelationship\EmFi@@afrelationship%
+ /AFRelationship/\pdf@escapename{\EmFi@@afrelationship}%
\fi
/EF<<%
/F \the\pdflastobj\ltx@space 0 R%
@@ -1947,7 +1952,7 @@ You need Acrobat Reader 8 or higher.
% \end{Version}
% \begin{Version}{2018/11/01 v2.8}
% \item
-% Remove luatex85 package depenency.
+% Remove luatex85 package dependency.
% \end{Version}
% \begin{Version}{2019/12/03 v2.9}
% \item
@@ -1957,6 +1962,10 @@ You need Acrobat Reader 8 or higher.
% \item
% update to use \xpackage{iftex}
% \end{Version}
+% \begin{Version}{2020-04-14 v2.10}
+% \item Fix issue \#4, the value of afrelationship should not be
+% converted but name escaped.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/macros/latex/contrib/embedfile/embedfile.pdf b/macros/latex/contrib/embedfile/embedfile.pdf
index a91594eaf5..66682ebd9f 100644
--- a/macros/latex/contrib/embedfile/embedfile.pdf
+++ b/macros/latex/contrib/embedfile/embedfile.pdf
Binary files differ
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n.def b/macros/latex/contrib/iodhbwm/tex/iodhbwm-i18n.def
index 42dda7a3ff..42dda7a3ff 100644
--- a/macros/latex/contrib/iodhbwm/tex/i18n.def
+++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm-i18n.def
diff --git a/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty b/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty
index b52807439e..15ef8e9317 100644
--- a/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty
+++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty
@@ -23,8 +23,8 @@
%
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@pkg@version}{v1.2}
-\newcommand*{\iodhbwm@pkg@date}{2020-04-01}
+\newcommand*{\iodhbwm@pkg@version}{v1.2.1}
+\newcommand*{\iodhbwm@pkg@date}{2020-04-13}
\newcommand*{\iodhbwm@pkg@info}{Inoffical DHBW Mannheim thesis package}
\newcommand*{\iodhbwm@pkg@name}{iodhbwm-templates}
@@ -84,7 +84,7 @@
\def\iodhbwm@thesis@type@sa{Studienarbeit}
\iflanguage{ngerman}{\booltrue{iodhbwm@if@supported@language}}{}
-\input{i18n.def}
+\input{iodhbwm-i18n.def}
% ----------------------------------------------------------
% Define internal commands
diff --git a/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls b/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
index c1ffa62ff6..2c3e62ea26 100644
--- a/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
+++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
@@ -23,8 +23,8 @@
%
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@cls@version}{v1.2}
-\newcommand*{\iodhbwm@cls@date}{2020-04-01}
+\newcommand*{\iodhbwm@cls@version}{v1.2.1}
+\newcommand*{\iodhbwm@cls@date}{2020-04-13}
\newcommand*{\iodhbwm@cls@info}{Inoffical DHBW Mannheim thesis class}
\ProvidesClass{iodhbwm}[%
diff --git a/macros/latex/contrib/latex-tds/README b/macros/latex/contrib/latex-tds/README
deleted file mode 100644
index e44f39c4bb..0000000000
--- a/macros/latex/contrib/latex-tds/README
+++ /dev/null
@@ -1,947 +0,0 @@
-============================
-README for project latex-tds
-============================
-
-Heiko Oberdiek
-2014/11/12
-
-
-Table of Contents
-=================
-
- 1. Project latex-tds
- 1.1. How it has started
- 1.2. Goals of the project
- 1.3. Scope
- 1.4. Module list
- 2. Abbreviations, Glossary
- 3. Download
- 4. Installation Hints
- 4.1. Hints
- 5. Copyright, License
- 6. Manifest
- 6.1. Documentation
- 6.2. Licenses
- 6.3. Scripts
- 6.4. Configuration
- 6.5. Documentation driver
- 6.6. Patches
- 7. Design Principles
- 8. Remarks
- 8.1. Base
- 8.2. Tools
- 8.3. Knuth
- 8.4. e-TeX
- 9. Build Hints
- 10. History
-
-
-1. Project latex-tds
-=====================
-
-Bundle `latex-tds' provides a set of ZIP file modules containing TDS-compliant
-trees for items of the LaTeX distribution (both the base system and required
-packages), together with `user-friendly' documentation (PDF files with
-navigation support using bookmarks and links).
-
-Version:
-
- 2014/11/12
-
-Author:
-
- Heiko Oberdiek
-
-Email and bug report address:
-
- heiko.oberdiek at googlemail.com
-
-CTAN home page with distribution files:
-
- CTAN:macros/latex/contrib/latex-tds/
-
-Source repository (without distribution files):
-
- https://github.com/oberdiek/latex-tds
-
-1.1. How it has started
-------------------------
-
-The project started as I wanted to install the new LaTeX release 2005/12/01
-that was announced at 2006/04/27. However the files are not packed in TDS
-format, ready for unpacking in the destination directory. And the documentation
-files were not yet generated or the provided PDF files are lacking of basic
-features such as bookmarks or link support. Thus this project has started. I
-thought it could be finished during the afternoon at the day of the
-announcement …
-
-1.2. Goals of the project
---------------------------
-
- • From the sources a TDS compliant tree is constructed and populated. The
- zipped result is distributed.
-
- • All the documentation is generated from the sources. The PDF files are user
- friendly and provide navigational support with bookmarks and links.
-
- • The PDF files are post-processed to reduce the file size.
-
-1.3. Scope
------------
-
-I do not have the time to assemble a TeX distribution with thousands of
-packages. Therefore I restricted myself to the LaTeX base distribution and the
-required bundles. In the following I will use the term ‘module’ for a package
-bundle.
-
-1.4. Module list
------------------
-
-The link addresses are the sources for the modules.
-
-base
-
- CTAN:macros/latex/base.zip
- CTAN:macros/latex/doc.zip
- http://www.latex-project.org/guides/lb2.err
- http://www.latex-project.org/guides/lgc2.err
- http://www.latex-project.org/guides/manual.err
- http://www.latex-project.org/guides/tlc2.err
-
-tools
-
- CTAN:macros/latex/required/tools.zip
-
-cyrillic
-
- CTAN:macros/latex/required/cyrillic.zip
-
-amslatex
-
- CTAN:install/macros/latex/required/amslatex/amscls.tds.zip
- CTAN:install/macros/latex/required/amslatex/math.tds.zip
- CTAN:macros/latex/contrib/amsrefs.zip
- CTAN:macros/latex/required/amslatex.zip
- ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip
- ftp://ftp.ams.org/pub/tex/amscls.zip
- ftp://ftp.ams.org/pub/tex/amsmath.zip
- patch/amsbooka.zip
-
-amsfonts
-
- CTAN:install/fonts/amsfonts.tds.zip
-
-psnfss
-
- CTAN:macros/latex/required/psnfss.zip
-
-tds
-
- CTAN:tds.zip
-
-knuth
-
- CTAN:systems/knuth/dist/errata.zip
- CTAN:systems/knuth/dist/etc.zip
- CTAN:systems/knuth/dist/mfware.zip
- CTAN:systems/knuth/dist/texware.zip
- CTAN:systems/knuth/dist/web.zip
- CTAN:systems/knuth/dist/tex.zip
- CTAN:systems/knuth/dist/mf.zip
-
-etex
-
- CTAN:systems/e-tex/v2.1/etex_doc.zip
-
-
-2. Abbreviations, Glossary
-===========================
-
-CTAN
-
- Comprehensive TeX Archive Network.
- FAQ entry: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives
- For example, you can resolve the prefix CTAN: by using http://
- mirror.ctan.org/.
-
-latex-tds
-
- The name of this project.
-
-TDS
-
- TeX Directory Structure.
- FAQ entry: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds
- Specification: http://www.ctan.org/pkg/tds
-
-
-3. Download
-============
-
-The home of the project is located at:
-
-CTAN:macros/latex/contrib/latex-tds/
-
-The following files can be downloaded:
-
- • README, README.html, README.pdf: The README file in different formats.
-
- • <module>.tds.zip: The module distribution files, see section ‘Module list’
- above for the available modules.
-
- • source.tds.zip: The sources, mainly the build script, configuration and
- driver files, and patches. Some of the used tools are not provided, see
- section ‘Build Hints’.
-
- • latex-tds.tds.zip: The universe, the contents of all the ZIP files above,
- merged together.
-
-
-4. Installation Hints
-======================
-
-Hopefully the result of this project helps you in the installation process. You
-get a TDS compliant tree just by unpacking.
-
-Example:
-
- cd /some/where/texmf
- unzip latex-tds
-
-or unzip’s option -d:
-
- unzip latex-tds -d /some/where/texmf
-
-Instead of the universe ZIP file single modules can be selected.
-
-Important to remember, point your unpack process right in the root directory of
-your TDS tree. The directory structure in the ZIP files start with the
-top-level directories:
-
- doc/latex/base/...
- tex/latex/tools/...
- source/...
-
-Rationale: The root directory of a TDS tree can have different names, such as
-texmf-dist, texmf-local, …
-
-4.1. Hints
------------
-
- • Refresh the file name database.
-
- • Be aware that unpacking can insert and update files, but never deletes
- obsolete ones. Remainders of previous releases can cause trouble.
-
- • Depending on the module further installation steps can be necessary,
- consult the module’s own documentation.
-
-4.1.1. Module base
-
- • The default texsys.cfg that LaTeX provides is put into TDS:tex/latex/base.
- It must be removed, if you need a specialized version. Consult your TeX
- distribution and TDS:doc/latex/base/source2e.pdf (module ltdirchk). Usually
- changes are not required for many TeX distributions such as Unix (web2c),
- MikTeX, …
-
- • Formats need rebuilding (e.g., fmtutil).
-
-4.1.2. Module psnfss
-
- • The map files need further configuring (e.g., updmap).
-
-4.1.3. Module graphics
-
- • Module graphics does not provide all driver files, because some are
- developed independently (pdftex.def, …).
-
-
-5. Copyright, License
-======================
-
-Copyright © 2006-2014 Heiko Oberdiek.
-
-License is LPPL 1.3c:
-
-This work may be distributed and/or modified under the conditions of the LaTeX
-Project Public License, either version 1.3 of this license or (at your option)
-any later version. The latest version of this license is in
-
- http://www.latex-project.org/lppl.txt
-
-and version 1.3c or later is part of all distributions of LaTeX version 2005/12
-/01 or later.
-
-This work has the LPPL maintenance status ‘maintained’.
-
-The Current Maintainer of this work is Heiko Oberdiek.
-
-See the following section ‘Manifest’ for a list of all files belonging to the
-project ‘latex-tds’.
-
-
-6. Manifest
-============
-
-Included are the projects ‘adjust_checksum’ and ‘ziptimetree’. They are
-projects of their own.
-
-6.1. Documentation
--------------------
-
-README plain text file
-
-README.html standalone HTML file
-
-README.pdf PDF version
-
-README.asciidoc main source code in text document format AsciiDoc
-
-README-docinfo.html source code, read by asciidoc to generate
- README.html
-
-6.2. Licenses
---------------
-
-license/lppl.txt LPPL (The LaTeX Project Public License) for
- latex-tds and adjust_checksum
-
-license/ziptimetree/lgpl.txt LGPL (GNU Lesser General Public License) for
- ziptimetree, check-ascii, check-eolspaces
-
-6.3. Scripts
--------------
-
-build.pl main script for building the distribution
-
-lib/adjust_checksum.pl Perl script that runs a DTX file through LaTeX
- and corrects its \Checksum if necessary
-
-lib/check-ascii.pl Perl script that looks for non-ASCII characters
-
-lib/check-eolspaces.pl Perl script that looks for trailing spaces
-
-lib/check-tds-installation.pl Perl script that compares a module with an
- installation inside a TDS tree.
-
-lib/ziptimetree.pl Perl script that generates a ZIP file from a
- directory tree with sorted entries (LGPL)
-
-6.4. Configuration
--------------------
-
-tex/docstrip.cfg enables TDS feature and creates directories
-
-tex/errata.cfg for errata lists of latex/base
-
-tex/fix-expl3-lua.ini fix for expl3, if used in format file
-
-tex/hyperref.cfg hyperref configuration file
-
-tex/ltnews.cfg for LaTeX News of latex/base
-
-tex/ltugboat.cls setup for class ltugboat
-
-tex/ltxdoc.cfg setup for class ltxdoc
-
-tex/ltxguide.cfg setup for the guide manuals in latex/base and
- required/psnfss
-
-tex/lualatex-tds.ini init file for format generation for LuaTeX
-
-tex/lualatex-tds2.ini init file for LuaTeX format without LM Math
-
-tex/manual.cfg setup for errata list of the LaTeX manual in latex/
- base
-
-tex/pdflatex-tds.ini init file for format generation for pdfTeX
-
-tex/tdsguide.cfg setup for class tdsguide.cls
-
-6.5. Documentation driver
---------------------------
-
-tex/ams.drv generic doc driver for files from the amslatex
- bundle
-
-tex/doc_lppl.tex doc driver for base/lppl.tex
-
-tex/errata.all doc driver for knuth/errata/errata.pdf
-
-tex/errata.drv doc driver for knuth/errata/errata_*.pdf
-
-tex/errorlog.drv doc driver for knuth/errata/errorlog.tex
-
-tex/etex_man.drv doc driver for etex/etex_man.tex
-
-tex/knuth.drv doc driver for knuth/{texware,mfware,etc}+/*.web+
-
-tex/knuth-outline.tex outline file list for module knuth
-
-tex/ltnews.tex master file that merges all base/ltnews*.tex
-
-tex/ltxcheck.drv doc driver with patches for ltxcheck.tex
-
-tex/psnfss2e.drv doc driver with patches for psnfss2e.tex
-
-tex/tools-overview.cls class for tools.tex
-
-tex/tools.tex master file for tools overview, generated by the
- build.pl script from tools/manifest.txt
-
-6.6. Patches
--------------
-
-Diff/patch file Patched file
-
-patch/amsbooka.zip amslatex/amsbooka.*
-
-patch/amsclass.dtx.diff amslatex/amsclass.dtx
-
-patch/amsfndoc.def.diff amsfonts/amsfndoc.def
-
-patch/amsfndoc.tex.diff amsfonts/amsfndoc.tex
-
-patch/amsldoc.tex.diff amslatex/amsldoc.tex
-
-patch/changes.tex.diff amslatex/amsrefs/changes.tex
-
-patch/encguide.tex.diff base/encguide.tex
-
-patch/errorlog.tex.diff knuth/errata/errorlog.tex
-
-patch/logmac.tex.diff knuth/errata/logmac.tex
-
-patch/source2e.tex.diff base/source2e.tex
-
-patch/tlc2.err.diff base/tlc2.err
-
-patch/trapman.tex.diff knuth/mf/trapman.tex
-
-patch/tripman.tex.diff knuth/tex/tripman.tex
-
-patch/utf8ienc.dtx.diff base/utf8ienc.dtx
-
-patch/webman.tex.diff knuth/web/webman.tex
-
-
-7. Design Principles
-=====================
-
- • Compliance with the latest TDS specification.
-
- • No redundancy.
-
- • User friendly PDF files with navigational support:
-
- □ bookmarks
-
- □ links
-
- • Complete documentation. The documentation generation with enhanced PDF
- files is the tricky part and should be saved from the user.
-
- • Output format of generated documentation is PDF, see above. Other formats
- such as DVI or PS are not generated and provided.
-
- • Documentation bundles are preferred to many partial documentation files
- (e.g. source2e.pdf or ltnews.pdf).
-
- • If several expansion stages of a documentation are available, then just the
- most complete expansion stage should be used.
-
- • Files that do not fit in a program sub tree of TDS stay below TDS:source
- (e.g. latexbug.el from latex/base). Then they do not get lost at least.
-
- • Page layout: a4paper with reduced vertical margins (exception: ltnews).
- (This also decreases the page number usually.)
-
- • …
-
-
-8. Remarks
-===========
-
-8.1. Base
-----------
-
- • source2e.pdf is used instead of many single lt*.pdf files.
-
- • ltnews.pdf is introduced to avoid cluttering the doc directory with many
- single sheet ltnews*.pdf files.
-
- • Patch for ltfssdcl.dtx: Checksum fixed.
-
- • …
-
-8.2. Tools
------------
-
- • Added: tools.pdf as overview/contents/index file with links and short
- descriptions of the single packages. (It uses the data from manifest.txt).
-
- • …
-
-8.3. Knuth
------------
-
- • Current CTAN → TDS mapping in use: CTAN:systems/knuth/dist → TDS:<toplevel>
- /knuth
-
- • Unsure where to put trip/trap files. Currently they are put in TDS:source,
- because the documentation files (tripman.pdf, trapman.pdf) are in TDS:doc.
- They lists the trip/trap files already.
-
- • Not covered is CTAN:systems/knuth/dist/lib/ In TeX Live 2007/2008 the files
- are installed at different locations:
-
- texmf-dist/fonts/source/public/mflogo/logo10.mf
- texmf-dist/fonts/source/public/mflogo/logo8.mf
- texmf-dist/fonts/source/public/mflogo/logo9.mf
- texmf-dist/fonts/source/public/mflogo/logobf10.mf
- texmf-dist/fonts/source/public/mflogo/logo.mf
- texmf-dist/fonts/source/public/mflogo/logosl10.mf
- texmf-dist/fonts/source/public/misc/grayf.mf
- texmf-dist/fonts/source/public/misc/manfnt.mf
- texmf-dist/fonts/source/public/misc/slant.mf
- texmf-dist/metafont/base/expr.mf
- texmf-dist/metafont/base/io.mf
- texmf-dist/metafont/base/null.mf
- texmf-dist/metafont/base/plain.mf
- texmf-dist/metafont/misc/3test.mf
- texmf-dist/metafont/misc/6test.mf
- texmf-dist/metafont/misc/rtest.mf
- texmf-dist/metafont/misc/test.mf
- texmf-dist/metafont/misc/waits.mf
- texmf-dist/metafont/misc/ztest.mf
- texmf-dist/mft/base/cmbase.mft
- texmf-dist/mft/base/plain.mft
- texmf-dist/tex/generic/misc/null.tex
- texmf-dist/tex/plain/base/manmac.tex
- texmf-dist/tex/plain/base/mftmac.tex
- texmf-dist/tex/plain/base/plain.tex
- texmf-dist/tex/plain/base/story.tex
- texmf-dist/tex/plain/base/testfont.tex
- texmf-dist/tex/plain/base/webmac.tex
- texmf/tex/generic/hyphen/hyphen.tex
-
-8.4. e-TeX
------------
-
- • Only the manual ‘etex_man’ is covered by this module.
-
-
-9. Build Hints
-===============
-
-The most important advice I can give: ‘Forget it’! The purpose of the source
-files are rather to show, what was done in which way. The *.zip with TDS trees
-are the goal of the project, not the build process. Some remarks, if someone
-wants to build the modules himself:
-
- • TeX compiler: LuaTeX and pdfTeX (≥ 1.30).
-
- • An up-to-date LaTeX installation, at least TeX Live 2012.
-
- • Additional packages can be necessary, e.g. CTAN:language/armenian/
- armtex.zip is not part of TeX Live 2012.
-
- • Most of the PDF files are generated using lualatex and package ‘fontspec’
- that uses the Latin Modern fonts as default. They are available as OpenType
- fonts. LuaTeX generates with OpenType fonts considerably smaller PDF files.
- Also PDF object stream compression is used (PDF 1.5). Therefore the further
- post-processing of PDF files are currently dropped.
-
- • (Outdated since 2011-07-01) PDF post-processing, I have used two steps:
-
- 1. First step:
-
- 1. I have written a tool that analyzes page stream contents and
- optimizes them (removal of unnecessary color settings, minimize
- translation operations, …) → pdfbox-rewrite.jar.
-
- 2. For reading and writing the PDF file I have used PDFBox →
- PDFBox-0.7.2.jar (http://pdfbox.apache.org/).
-
- 3. To get better results I patched some of the classes of PDFBox
- (especially the write module) → pdfbox-rewrite.jar.
-
- 2. The final conversion step was done by Multivalent, because it makes a
- very good job in PDF compression: → Multivalent20060102.jar (http://
- multivalent.sourceforge.net/)
-
- Multivalent and PDFBox are available, pdfbox-rewrite.jar, however, is just
- a first prototype, not ripe for a release. Therefore this step of
- post-processing is optional for the project latex-tds. The build script
- looks for the library and skips this steps automatically if necessary. If
- you give the build script the option --nopostprocess, then it will skip the
- postprocess steps (building is faster, the pdf files a little larger).
- Install the jar files in the directory lib where they are expected by the
- build script.
-
- • Unix, Perl background is expected.
-
- • No support or documentation.
-
-
-10. History
-============
-
-2006/04/27
- □ Start of the project (without babel, amslatex, psnfss).
-
-2006/06/01
- □ Module amslatex added.
-
-2006/06/03
- □ Modules psnfss and babel added, now all modules are covered.
-
-2006/06/07
- □ The project uploaded to CTAN.
-
-2006/07/31
- □ Index added to base/classes.dtx.
-
- □ ZIP files renamed: *-tds.zip → *.zip
-
- □ Comment added to ZIP files.
-
- □ Update of readme.txt.
-
-2006/08/26
- □ Module tds for CTAN:tds/ added.
-
- □ Obsolete hyphenation patterns added to babel’s source directory to
- avoid violation of LPPL.
-
- □ Script adjust_checksum added and scripts are put below TDS:scripts.
-
- □ TDS:makeindex/base/ renamed to TDS:makeindex/latex/
-
- □ Exception for sample2e.tex and small2e.tex that now go into TDS:tex/
- latex/base/.
-
-2006/08/28
- □ Default texsys.cfg is generated.
-
- □ adjust_checksum.pl and ziptimetree.pl now moved from the scripts branch
- to TDS:source/latex/latex-tds/lib/.
-
-2006/12/27
- □ Fix of ltxguide.cfg that had loaded doc.sty that disturbs the verbatim
- stuff in fntguide.tex.
-
-2007/01/08
- □ Fix for documentation of longtable.
-
-2007/03/19
- □ Patch for babel/latin.dtx added (babel/3922).
-
-2007/09/04
- □ A minor update on CTAN regarding babel: iahyphen.tex, icehyph.tex, and
- lahyph.tex are now symbolic links to their location in CTAN:language/
- hyphenation/. Therefore also lahyph.tex is now installed in TDS:tex/
- generic/hyphen/.
-
-2007/10/18
- □ Update of module amslatex because of updated package amsrefs.
-
- □ Fix in latin.dtx.diff.
-
-2007/10/24
- □ Update of babel.
-
- □ Update of amsrefs (TDS:tex/latex/amscls → TDS:tex/latex/amsrefs).
-
-2008/04/01
- □ Update of babel (2008/03/17).
-
-2008/04/02
- □ Fix: latex/base/*.err added to TDS:source/latex/base/.
-
-2008/04/05
- □ Using .tds.zip instead of .zip to follow CTAN:install's naming
- conventions.
-
-2008/06/28
- □ Update of babel (2008/06/01).
-
- □ Babel documentation: table of contents reformatted.
-
-2008/07/07
- □ Update of babel (2008/07/06).
-
-2008/07/10
- □ Module knuth added.
-
- □ Update of babel (2008/07/07).
-
-2008/07/11
- □ Fixes and additions for module knuth.
-
-2008/07/25
- □ Module amslatex: instr-l.tex vanished from CTAN (but not at AMS side).
-
- □ Some unwanted spaces in generated PDF files fixed. (Caused by a wrong
- package file that was found on my system first.)
-
-2008/08/10
- □ Module latex3 added.
-
- □ Module base: CTAN hyperlinks fixed.
-
- □ Module amslatex: Outdated URL fixed in amsldoc.tex.
-
- □ Module babel: Problem with already defined \meta in tb1604.tex fixed.
-
-2008/09/06
- □ Module base:
-
- ☆ Using uptodate versions from LaTeX project page for errata lists.
-
- ☆ lgc2.err added (LaTeX Graphics Companion, 2. ed.).
-
- ☆ Various fixes in errata lists.
-
- □ Module tools: array.dtx: documentation fixed (tools/4044).
-
-2008/09/10
- □ Module base: Missing title date for utf8ienc.pdf fixed.
-
-2009/09/05
- □ Module amslatex: updated.
-
- □ Module latex3: xpackages updated.
-
- □ Module latex3: expl3 removed, because nothing to do.
-
-2009/09/25
- □ Module amslatex: updated.
-
- □ Module babel: updated.
-
- □ Update of LaTeX, release 2009/09/24.
-
-2009/12/07
- □ Module amslatex: Unhappily the .zip files are quite a mess, because
- they contain a mixup of old and new versions. Tried to sort this out
- and fix the last update.
-
- □ Module latex3: xpackages removed, because nothing to do.
-
- □ Module latex3 removed, nothing left to do.
-
-2010/05/04
- □ Module base: page layout for source2e fixed (changes, index).
-
- □ Module base: update of .err files.
-
-2010/10/27
- □ Module amslatex: amscls and amsrefs updated.
-
- □ Module etex added (only for etex_man).
-
- □ Erratas updated.
-
-2011/03/10
- □ Module base: patch for latex/4148 (Missing \label and \ref in
- lppl.tex).
-
-2011/04/18
- □ Module amslatex: There is an outdated version of amsthm.sty in
- CTAN:install/macros/latex/required/amslatex/amscls.tds.zip. The package
- amsthm.sty is now generated from the source.
-
- □ Using TDS tree for missing packages that are not part of TeX Live.
- Module base: CTAN:language/armenian/armtex.zip.
-
-2011/06/24
- □ Module amslatex: Two downloads from AMS server removed, because the
- files are not longer available (and they are on CTAN).
-
- □ Module amslatex: 00readme.txt and amsrefs.dtx taken from CTAN:macros/
- latex/contrib/amsrefs.zip instead of CTAN:install/macros/latex/contrib/
- amsrefs.tds.zip because the later archive file is out of sync.
-
-2011/06/30
- □ Module base:
-
- ☆ Update of LaTeX, release 2011/06/27.
-
- ☆ Patch ltpatch.ltx to match the kernel version.
-
- ☆ Patch lppl.tex.diff removed (no longer needed).
-
- ☆ Patch ltfssdcl.dtx.diff added (checksum fixed).
-
- □ Module tools: Release 2011/06.
-
- □ Module babel: Release 2011/06.
-
-2011/07/01
- □ PDF generation:
-
- ☆ Use of LuaTeX instead of pdfTeX for most of the files.
-
- ☆ Use of package ‘fontspec’ with Latin Modern fonts as default in
- OpenType format (smaller PDF file sizes). The post-processing of
- PDF files is skipped.
-
- ☆ Various patches and fixes for LuaLaTeX and package ‘fontspec’.
-
- □ Module base:
-
- ☆ Update of LaTeX.
-
- ☆ Patches ltpatch.ltx.diff and ltfssdcl.dtx.diff removed (no longer
- needed).
-
- □ Module tools: Update.
-
-2011/07/03
- □ build.pl:
-
- ☆ Caching for PDF generation added.
-
- ☆ ‘FINAL’ markers in the output of build.pl for final (Lua|pdf)TeX
- runs.
-
-2011/07/26
- □ PDF generation: Use of package unicode-math with Latin Modern Math
- where possible.
-
-2011/08/10
- □ Update of tools.
-
-2011/10/05
- □ Update of tools (varioref).
-
-2011/11/16
- □ Update of babel.
-
-2012/05/12
- □ Update of amslatex (amsrefs).
-
- □ Update of readme.txt that is renamed to README (CTAN convention).
-
- □ Update of tlc2.err.
-
-2013/02/14
- □ Update of amslatex (amsrefs).
-
- □ Module amslatex: cite-x*.tex, jb.bib in TDS:source/, because these
- files are now classified as test files.
-
- □ Module base: lb2.err and tlc2.err updated.
-
- □ Change in version control system from CVS to git with public source
- repository.
-
-2013/02/15
- □ Module amsfonts added.
-
-2013/02/25
- □ Patch file lb2.err.diff removed by call of sed inside build.pl.
-
- □ README rewritten in text document format AsciiDoc and added as HTML and
- PDF files.
-
- □ README.asciidoc updated.
-
- □ Makefile: Target ‘check-links’ added.
-
-2013/02/26
- □ README generated from README.asciidoc via README.html.
-
-2013/02/27
- □ README.asciidoc: Additions and updates.
-
- □ README.pdf generated by wkhtmltopdf via README.html.
-
-2013/03/07
- □ Update of amslatex (amsrefs 2013/03/06 v2.13).
-
-2013/03/10
- □ Update of amslatex (amsrefs 2013/03/07 v2.14).
-
-2013/03/30
- □ Update of babel (3.9) including reorganization of language files.
-
-2014/02/03
- □ Removal of module babel. It has a new maintainer and the languages are
- now maintained separately.
-
- □ Update of knuth (2014/01/19).
-
- □ Update of base (errata lists: lb2.err, tlc2.err).
-
-2014/05/03
- □ Update of LaTeX, release 2014/05/01 using public subversion repository
- of LaTeX2e. Modules: base, cyrillic, graphics, tools.
-
- □ Line ends are normalized in source text files of the LaTeX modules.
- Trailing spaces are removed and the line ends are Unix line ends.
-
- □ Update of armtex (needed to generate module base).
-
- □ New options --vcs and --vcs-update for using the files of the public
- source repository of the LaTeX project.
-
-2014/05/05
- □ Using LaTeX modules from CTAN.
-
-2014/05/08
- □ Update of base and graphics.
-
- □ README.html with Unix line ends.
-
- □ ZIP file for CTAN upload with top level directory latex-tds.
-
-2014/05/10
- □ Module cyrillic: Missing 00readme.txt added.
-
-2014/05/15
- □ Module base: fix-cm updated (2014/05/13 v1.1q).
-
- □ Module tools: tabularx updated (2014/05/13 v2.10).
-
- □ Module tools: readme.txt renamed to 00readme.txt.
-
- □ Module knuth: .web files are put below TDS:web/knuth//.
-
-2014/05/16
- □ Module base: Formatting of ltnews.pdf fixed.
-
- □ fix-expl3-lua.ini added to support putting package expl into a format.
-
- □ Script check-tds-installation.pl added.
-
- □ Module amslatex: TDS:bibtex/bst/ams renamed to TDS:bibtex/bst/amscls.
-
-2014/05/21
- □ Module amslatex: Sources for amsbooka added.
-
-2014/06/12
- □ Module base: Update of fixltx2e.dtx.
-
-2014/09/17
- □ Module tools: Update of packages varioref and multicol.
-
- □ Module base: Update of fixltx2e.
-
-2014/11/03
- □ Module base: Update (2014-10-12).
-
- □ Module tools: Update (2014-10-28).
-
-2014/11/12
- □ Module graphics: Update (2014-11-07).
-
- □ Modules base, cyrillic, graphics, tools: 00readme.txt renamed to
- README.
-
- □ Module amslatex: Missing amsbooka.zip added to directory patch (until
- it is resolved at the AMS side).
-
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-Last updated 2014-11-11 22:53:51 CET
diff --git a/macros/latex/contrib/latex-tds/README.html b/macros/latex/contrib/latex-tds/README.html
deleted file mode 100644
index 2241a1950f..0000000000
--- a/macros/latex/contrib/latex-tds/README.html
+++ /dev/null
@@ -1,2897 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.7" />
-<meta name="description" content="Bundle `latex-tds' provides a set of ZIP file modules containing TDS-compliant trees for items of the LaTeX distribution (both the base system and required packages), together with `user-friendly' documentation (PDF files with navigation support using bookmarks and links)." />
-<title>README for project latex-tds</title>
-<style type="text/css">
-/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
-
-/* Default font. */
-body {
- font-family: Georgia,serif;
-}
-
-/* Title font. */
-h1, h2, h3, h4, h5, h6,
-div.title, caption.title,
-thead, p.table.header,
-#toctitle,
-#author, #revnumber, #revdate, #revremark,
-#footer {
- font-family: Arial,Helvetica,sans-serif;
-}
-
-body {
- margin: 1em 5% 1em 5%;
-}
-
-a {
- color: blue;
- text-decoration: underline;
-}
-a:visited {
- color: fuchsia;
-}
-
-em {
- font-style: italic;
- color: navy;
-}
-
-strong {
- font-weight: bold;
- color: #083194;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #527bbd;
- margin-top: 1.2em;
- margin-bottom: 0.5em;
- line-height: 1.3;
-}
-
-h1, h2, h3 {
- border-bottom: 2px solid silver;
-}
-h2 {
- padding-top: 0.5em;
-}
-h3 {
- float: left;
-}
-h3 + * {
- clear: left;
-}
-h5 {
- font-size: 1.0em;
-}
-
-div.sectionbody {
- margin-left: 0;
-}
-
-hr {
- border: 1px solid silver;
-}
-
-p {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-ul, ol, li > p {
- margin-top: 0;
-}
-ul > li { color: #aaa; }
-ul > li > * { color: black; }
-
-pre {
- padding: 0;
- margin: 0;
-}
-
-#author {
- color: #527bbd;
- font-weight: bold;
- font-size: 1.1em;
-}
-#email {
-}
-#revnumber, #revdate, #revremark {
-}
-
-#footer {
- font-size: small;
- border-top: 2px solid silver;
- padding-top: 0.5em;
- margin-top: 4.0em;
-}
-#footer-text {
- float: left;
- padding-bottom: 0.5em;
-}
-#footer-badges {
- float: right;
- padding-bottom: 0.5em;
-}
-
-#preamble {
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-div.imageblock, div.exampleblock, div.verseblock,
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
-div.admonitionblock {
- margin-top: 1.0em;
- margin-bottom: 1.5em;
-}
-div.admonitionblock {
- margin-top: 2.0em;
- margin-bottom: 2.0em;
- margin-right: 10%;
- color: #606060;
-}
-
-div.content { /* Block element content. */
- padding: 0;
-}
-
-/* Block element titles. */
-div.title, caption.title {
- color: #527bbd;
- font-weight: bold;
- text-align: left;
- margin-top: 1.0em;
- margin-bottom: 0.5em;
-}
-div.title + * {
- margin-top: 0;
-}
-
-td div.title:first-child {
- margin-top: 0.0em;
-}
-div.content div.title:first-child {
- margin-top: 0.0em;
-}
-div.content + div.title {
- margin-top: 0.0em;
-}
-
-div.sidebarblock > div.content {
- background: #ffffee;
- border: 1px solid #dddddd;
- border-left: 4px solid #f0f0f0;
- padding: 0.5em;
-}
-
-div.listingblock > div.content {
- border: 1px solid #dddddd;
- border-left: 5px solid #f0f0f0;
- background: #f8f8f8;
- padding: 0.5em;
-}
-
-div.quoteblock, div.verseblock {
- padding-left: 1.0em;
- margin-left: 1.0em;
- margin-right: 10%;
- border-left: 5px solid #f0f0f0;
- color: #888;
-}
-
-div.quoteblock > div.attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-
-div.verseblock > pre.content {
- font-family: inherit;
- font-size: inherit;
-}
-div.verseblock > div.attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
-div.verseblock + div.attribution {
- text-align: left;
-}
-
-div.admonitionblock .icon {
- vertical-align: top;
- font-size: 1.1em;
- font-weight: bold;
- text-decoration: underline;
- color: #527bbd;
- padding-right: 0.5em;
-}
-div.admonitionblock td.content {
- padding-left: 0.5em;
- border-left: 3px solid #dddddd;
-}
-
-div.exampleblock > div.content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
-
-div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
-a.image:visited { color: white; }
-
-dl {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-dt {
- margin-top: 0.5em;
- margin-bottom: 0;
- font-style: normal;
- color: navy;
-}
-dd > *:first-child {
- margin-top: 0.1em;
-}
-
-ul, ol {
- list-style-position: outside;
-}
-ol.arabic {
- list-style-type: decimal;
-}
-ol.loweralpha {
- list-style-type: lower-alpha;
-}
-ol.upperalpha {
- list-style-type: upper-alpha;
-}
-ol.lowerroman {
- list-style-type: lower-roman;
-}
-ol.upperroman {
- list-style-type: upper-roman;
-}
-
-div.compact ul, div.compact ol,
-div.compact p, div.compact p,
-div.compact div, div.compact div {
- margin-top: 0.1em;
- margin-bottom: 0.1em;
-}
-
-tfoot {
- font-weight: bold;
-}
-td > div.verse {
- white-space: pre;
-}
-
-div.hdlist {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-div.hdlist tr {
- padding-bottom: 15px;
-}
-dt.hdlist1.strong, td.hdlist1.strong {
- font-weight: bold;
-}
-td.hdlist1 {
- vertical-align: top;
- font-style: normal;
- padding-right: 0.8em;
- color: navy;
-}
-td.hdlist2 {
- vertical-align: top;
-}
-div.hdlist.compact tr {
- margin: 0;
- padding-bottom: 0;
-}
-
-.comment {
- background: yellow;
-}
-
-.footnote, .footnoteref {
- font-size: 0.8em;
-}
-
-span.footnote, span.footnoteref {
- vertical-align: super;
-}
-
-#footnotes {
- margin: 20px 0 20px 0;
- padding: 7px 0 0 0;
-}
-
-#footnotes div.footnote {
- margin: 0 0 5px 0;
-}
-
-#footnotes hr {
- border: none;
- border-top: 1px solid silver;
- height: 1px;
- text-align: left;
- margin-left: 0;
- width: 20%;
- min-width: 100px;
-}
-
-div.colist td {
- padding-right: 0.5em;
- padding-bottom: 0.3em;
- vertical-align: top;
-}
-div.colist td img {
- margin-top: 0.3em;
-}
-
-@media print {
- #footer-badges { display: none; }
-}
-
-#toc {
- margin-bottom: 2.5em;
-}
-
-#toctitle {
- color: #527bbd;
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 1.0em;
- margin-bottom: 0.1em;
-}
-
-div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
- margin-top: 0;
- margin-bottom: 0;
-}
-div.toclevel2 {
- margin-left: 2em;
- font-size: 0.9em;
-}
-div.toclevel3 {
- margin-left: 4em;
- font-size: 0.9em;
-}
-div.toclevel4 {
- margin-left: 6em;
- font-size: 0.9em;
-}
-
-span.aqua { color: aqua; }
-span.black { color: black; }
-span.blue { color: blue; }
-span.fuchsia { color: fuchsia; }
-span.gray { color: gray; }
-span.green { color: green; }
-span.lime { color: lime; }
-span.maroon { color: maroon; }
-span.navy { color: navy; }
-span.olive { color: olive; }
-span.purple { color: purple; }
-span.red { color: red; }
-span.silver { color: silver; }
-span.teal { color: teal; }
-span.white { color: white; }
-span.yellow { color: yellow; }
-
-span.aqua-background { background: aqua; }
-span.black-background { background: black; }
-span.blue-background { background: blue; }
-span.fuchsia-background { background: fuchsia; }
-span.gray-background { background: gray; }
-span.green-background { background: green; }
-span.lime-background { background: lime; }
-span.maroon-background { background: maroon; }
-span.navy-background { background: navy; }
-span.olive-background { background: olive; }
-span.purple-background { background: purple; }
-span.red-background { background: red; }
-span.silver-background { background: silver; }
-span.teal-background { background: teal; }
-span.white-background { background: white; }
-span.yellow-background { background: yellow; }
-
-span.big { font-size: 2em; }
-span.small { font-size: 0.6em; }
-
-span.underline { text-decoration: underline; }
-span.overline { text-decoration: overline; }
-span.line-through { text-decoration: line-through; }
-
-div.unbreakable { page-break-inside: avoid; }
-
-
-/*
- * xhtml11 specific
- *
- * */
-
-tt {
- font-family: "Courier New", Courier, monospace;
- font-size: inherit;
- color: navy;
-}
-
-div.tableblock {
- margin-top: 1.0em;
- margin-bottom: 1.5em;
-}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-weight: bold;
- color: #527bbd;
-}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
- border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
- border-left-style: none;
- border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
- border-top-style: none;
- border-bottom-style: none;
-}
-
-
-/*
- * html5 specific
- *
- * */
-
-.monospaced {
- font-family: "Courier New", Courier, monospace;
- font-size: inherit;
- color: navy;
-}
-
-table.tableblock {
- margin-top: 1.0em;
- margin-bottom: 1.5em;
-}
-thead, p.tableblock.header {
- font-weight: bold;
- color: #527bbd;
-}
-p.tableblock {
- margin-top: 0;
-}
-table.tableblock {
- border-width: 3px;
- border-spacing: 0px;
- border-style: solid;
- border-color: #527bbd;
- border-collapse: collapse;
-}
-th.tableblock, td.tableblock {
- border-width: 1px;
- padding: 4px;
- border-style: solid;
- border-color: #527bbd;
-}
-
-table.tableblock.frame-topbot {
- border-left-style: hidden;
- border-right-style: hidden;
-}
-table.tableblock.frame-sides {
- border-top-style: hidden;
- border-bottom-style: hidden;
-}
-table.tableblock.frame-none {
- border-style: hidden;
-}
-
-th.tableblock.halign-left, td.tableblock.halign-left {
- text-align: left;
-}
-th.tableblock.halign-center, td.tableblock.halign-center {
- text-align: center;
-}
-th.tableblock.halign-right, td.tableblock.halign-right {
- text-align: right;
-}
-
-th.tableblock.valign-top, td.tableblock.valign-top {
- vertical-align: top;
-}
-th.tableblock.valign-middle, td.tableblock.valign-middle {
- vertical-align: middle;
-}
-th.tableblock.valign-bottom, td.tableblock.valign-bottom {
- vertical-align: bottom;
-}
-
-
-/*
- * manpage specific
- *
- * */
-
-body.manpage h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
-}
-body.manpage h2 {
- border-style: none;
-}
-body.manpage div.sectionbody {
- margin-left: 3em;
-}
-
-@media print {
- body.manpage div#toc { display: none; }
-}
-</style>
-<script type="text/javascript">
-/*<![CDATA[*/
-var asciidoc = { // Namespace.
-
-/////////////////////////////////////////////////////////////////////
-// Table Of Contents generator
-/////////////////////////////////////////////////////////////////////
-
-/* Author: Mihai Bazon, September 2002
- * http://students.infoiasi.ro/~mishoo
- *
- * Table Of Content generator
- * Version: 0.4
- *
- * Feel free to use this script under the terms of the GNU General Public
- * License, as long as you do not remove or alter this notice.
- */
-
- /* modified by Troy D. Hanson, September 2006. License: GPL */
- /* modified by Stuart Rackham, 2006, 2009. License: GPL */
-
-// toclevels = 1..4.
-toc: function (toclevels) {
-
- function getText(el) {
- var text = "";
- for (var i = el.firstChild; i != null; i = i.nextSibling) {
- if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
- text += i.data;
- else if (i.firstChild != null)
- text += getText(i);
- }
- return text;
- }
-
- function TocEntry(el, text, toclevel) {
- this.element = el;
- this.text = text;
- this.toclevel = toclevel;
- }
-
- function tocEntries(el, toclevels) {
- var result = new Array;
- var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
- // Function that scans the DOM tree for header elements (the DOM2
- // nodeIterator API would be a better technique but not supported by all
- // browsers).
- var iterate = function (el) {
- for (var i = el.firstChild; i != null; i = i.nextSibling) {
- if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
- var mo = re.exec(i.tagName);
- if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
- result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
- }
- iterate(i);
- }
- }
- }
- iterate(el);
- return result;
- }
-
- var toc = document.getElementById("toc");
- if (!toc) {
- return;
- }
-
- // Delete existing TOC entries in case we're reloading the TOC.
- var tocEntriesToRemove = [];
- var i;
- for (i = 0; i < toc.childNodes.length; i++) {
- var entry = toc.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div'
- && entry.getAttribute("class")
- && entry.getAttribute("class").match(/^toclevel/))
- tocEntriesToRemove.push(entry);
- }
- for (i = 0; i < tocEntriesToRemove.length; i++) {
- toc.removeChild(tocEntriesToRemove[i]);
- }
-
- // Rebuild TOC entries.
- var entries = tocEntries(document.getElementById("content"), toclevels);
- for (var i = 0; i < entries.length; ++i) {
- var entry = entries[i];
- if (entry.element.id == "")
- entry.element.id = "_toc_" + i;
- var a = document.createElement("a");
- a.href = "#" + entry.element.id;
- a.appendChild(document.createTextNode(entry.text));
- var div = document.createElement("div");
- div.appendChild(a);
- div.className = "toclevel" + entry.toclevel;
- toc.appendChild(div);
- }
- if (entries.length == 0)
- toc.parentNode.removeChild(toc);
-},
-
-
-/////////////////////////////////////////////////////////////////////
-// Footnotes generator
-/////////////////////////////////////////////////////////////////////
-
-/* Based on footnote generation code from:
- * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
- */
-
-footnotes: function () {
- // Delete existing footnote entries in case we're reloading the footnodes.
- var i;
- var noteholder = document.getElementById("footnotes");
- if (!noteholder) {
- return;
- }
- var entriesToRemove = [];
- for (i = 0; i < noteholder.childNodes.length; i++) {
- var entry = noteholder.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
- entriesToRemove.push(entry);
- }
- for (i = 0; i < entriesToRemove.length; i++) {
- noteholder.removeChild(entriesToRemove[i]);
- }
-
- // Rebuild footnote entries.
- var cont = document.getElementById("content");
- var spans = cont.getElementsByTagName("span");
- var refs = {};
- var n = 0;
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnote") {
- n++;
- var note = spans[i].getAttribute("data-note");
- if (!note) {
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- spans[i].setAttribute("data-note", note);
- }
- noteholder.innerHTML +=
- "<div class='footnote' id='_footnote_" + n + "'>" +
- "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
- n + "</a>. " + note + "</div>";
- var id =spans[i].getAttribute("id");
- if (id != null) refs["#"+id] = n;
- }
- }
- if (n == 0)
- noteholder.parentNode.removeChild(noteholder);
- else {
- // Process footnoterefs.
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnoteref") {
- var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
- href = href.match(/#.*/)[0]; // Because IE return full URL.
- n = refs[href];
- spans[i].innerHTML =
- "[<a href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- }
- }
- }
-},
-
-install: function(toclevels) {
- var timerId;
-
- function reinstall() {
- asciidoc.footnotes();
- if (toclevels) {
- asciidoc.toc(toclevels);
- }
- }
-
- function reinstallAndRemoveTimer() {
- clearInterval(timerId);
- reinstall();
- }
-
- timerId = setInterval(reinstall, 500);
- if (document.addEventListener)
- document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
- else
- window.onload = reinstallAndRemoveTimer;
-}
-
-}
-asciidoc.install(2);
-/*]]>*/
-</script>
-<meta name="author" content="Heiko Oberdiek" />
-<meta name="date" content="2014-11-11" />
-</head>
-<body class="article">
-<div id="header">
-<h1>README for project latex-tds</h1>
-<span id="author">Heiko Oberdiek</span><br />
-<span id="revdate">2014/11/12</span>
-<div id="toc">
- <div id="toctitle">Table of Contents</div>
- <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
-</div>
-</div>
-<div id="content">
-<div class="sect1">
-<h2 id="_project_latex_tds">1. Project latex-tds</h2>
-<div class="sectionbody">
-<div class="quoteblock">
-<div class="content">
-<div class="paragraph"><p>Bundle `latex-tds' provides a set of ZIP file modules containing TDS-compliant trees for items of the LaTeX distribution (both the base system and required packages), together with `user-friendly' documentation (PDF files with navigation support using bookmarks and links).</p></div>
-</div>
-<div class="attribution">
-</div></div>
-<div class="dlist"><dl>
-<dt class="hdlist1">
-Version:
-</dt>
-<dd>
-<p>
- 2014/11/12
-</p>
-</dd>
-<dt class="hdlist1">
-Author:
-</dt>
-<dd>
-<p>
- Heiko Oberdiek
-</p>
-</dd>
-<dt class="hdlist1">
-Email and bug report address:
-</dt>
-<dd>
-<p>
- heiko.oberdiek at googlemail.com
-</p>
-</dd>
-<dt class="hdlist1">
-CTAN home page with distribution files:
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/macros/latex/contrib/latex-tds/">CTAN:macros/latex/contrib/latex-tds/</a>
-</p>
-</dd>
-<dt class="hdlist1">
-Source repository (without distribution files):
-</dt>
-<dd>
-<p>
- <a href="https://github.com/oberdiek/latex-tds">https://github.com/oberdiek/latex-tds</a>
-</p>
-</dd>
-</dl></div>
-<div class="sect2">
-<h3 id="_how_it_has_started">1.1. How it has started</h3>
-<div class="paragraph"><p>The project started as I wanted to install the new LaTeX release 2005/12/01
-that was announced at 2006/04/27. However the files are not packed in
-TDS format, ready for unpacking in the destination directory. And
-the documentation files were not yet generated or the provided
-PDF files are lacking of basic features such as bookmarks or link support.
-Thus this project has started. I thought it could be finished during
-the afternoon at the day of the announcement &#8230;</p></div>
-</div>
-<div class="sect2">
-<h3 id="_goals_of_the_project">1.2. Goals of the project</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-From the sources a TDS compliant tree is constructed and populated.
- The zipped result is distributed.
-</p>
-</li>
-<li>
-<p>
-All the documentation is generated from the sources. The PDF files
- are user friendly and provide navigational support with bookmarks
- and links.
-</p>
-</li>
-<li>
-<p>
-The PDF files are post-processed to reduce the file size.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_scope">1.3. Scope</h3>
-<div class="paragraph"><p>I do not have the time to assemble a TeX distribution with
-thousands of packages. Therefore I restricted myself to the
-LaTeX base distribution and the required bundles.
-In the following I will use the term &#8216;module&#8217; for a package bundle.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_module_list">1.4. Module list</h3>
-<div class="paragraph"><p>The link addresses are the sources for the modules.</p></div>
-<div class="dlist"><dl>
-<dt class="hdlist1">
-<strong>base</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/macros/latex/base.zip">CTAN:macros/latex/base.zip</a><br />
- <a href="http://mirror.ctan.org/macros/latex/doc.zip">CTAN:macros/latex/doc.zip</a><br />
- <a href="http://www.latex-project.org/guides/lb2.err">http://www.latex-project.org/guides/lb2.err</a><br />
- <a href="http://www.latex-project.org/guides/lgc2.err">http://www.latex-project.org/guides/lgc2.err</a><br />
- <a href="http://www.latex-project.org/guides/manual.err">http://www.latex-project.org/guides/manual.err</a><br />
- <a href="http://www.latex-project.org/guides/tlc2.err">http://www.latex-project.org/guides/tlc2.err</a><br />
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>tools</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/macros/latex/required/tools">CTAN:macros/latex/required/tools.zip</a>
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>cyrillic</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/macros/latex/required/cyrillic.zip">CTAN:macros/latex/required/cyrillic.zip</a>
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>amslatex</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/install/macros/latex/required/amslatex/amscls.tds.zip">CTAN:install/macros/latex/required/amslatex/amscls.tds.zip</a><br />
- <a href="http://mirror.ctan.org/install/macros/latex/required/amslatex/math.tds.zip">CTAN:install/macros/latex/required/amslatex/math.tds.zip</a><br />
- <a href="http://mirror.ctan.org/macros/latex/contrib/amsrefs.zip">CTAN:macros/latex/contrib/amsrefs.zip</a><br />
- <a href="http://mirror.ctan.org/macros/latex/required/amslatex.zip">CTAN:macros/latex/required/amslatex.zip</a><br />
- <a href="ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip">ftp://ftp.ams.org/pub/tex/amsrefs/amsrefs.zip</a><br />
- <a href="ftp://ftp.ams.org/pub/tex/amscls.zip">ftp://ftp.ams.org/pub/tex/amscls.zip</a><br />
- <a href="ftp://ftp.ams.org/pub/tex/amsmath.zip">ftp://ftp.ams.org/pub/tex/amsmath.zip</a><br />
- patch/amsbooka.zip
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>amsfonts</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/install/fonts/amsfonts.tds.zip">CTAN:install/fonts/amsfonts.tds.zip</a>
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>psnfss</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/macros/latex/required/psnfss.zip">CTAN:macros/latex/required/psnfss.zip</a>
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>tds</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/tds.zip">CTAN:tds.zip</a>
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>knuth</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/systems/knuth/dist/errata.zip">CTAN:systems/knuth/dist/errata.zip</a><br />
- <a href="http://mirror.ctan.org/systems/knuth/dist/etc.zip">CTAN:systems/knuth/dist/etc.zip</a><br />
- <a href="http://mirror.ctan.org/systems/knuth/dist/mfware.zip">CTAN:systems/knuth/dist/mfware.zip</a><br />
- <a href="http://mirror.ctan.org/systems/knuth/dist/texware.zip">CTAN:systems/knuth/dist/texware.zip</a><br />
- <a href="http://mirror.ctan.org/systems/knuth/dist/web.zip">CTAN:systems/knuth/dist/web.zip</a><br />
- <a href="http://mirror.ctan.org/systems/knuth/dist/tex.zip">CTAN:systems/knuth/dist/tex.zip</a><br />
- <a href="http://mirror.ctan.org/systems/knuth/dist/mf.zip">CTAN:systems/knuth/dist/mf.zip</a>
-</p>
-</dd>
-<dt class="hdlist1">
-<strong>etex</strong>
-</dt>
-<dd>
-<p>
- <a href="http://mirror.ctan.org/systems/e-tex/v2.1/etex_doc.zip">CTAN:systems/e-tex/v2.1/etex_doc.zip</a>
-</p>
-</dd>
-</dl></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_abbreviations_glossary">2. Abbreviations, Glossary</h2>
-<div class="sectionbody">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-CTAN
-</dt>
-<dd>
-<p>
- Comprehensive TeX Archive Network.<br />
- FAQ entry: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives</a><br />
- For example, you can resolve the prefix <tt>CTAN:</tt> by using
- <tt>http://mirror.ctan.org/</tt>.
-</p>
-</dd>
-<dt class="hdlist1">
-latex-tds
-</dt>
-<dd>
-<p>
- The name of this project.
-</p>
-</dd>
-<dt class="hdlist1">
-TDS
-</dt>
-<dd>
-<p>
- TeX Directory Structure.<br />
- FAQ entry: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds</a><br />
- Specification: <a href="http://www.ctan.org/pkg/tds">http://www.ctan.org/pkg/tds</a>
-</p>
-</dd>
-</dl></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_download">3. Download</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The home of the project is located at:</p></div>
-<div class="quoteblock">
-<div class="content">
-<div class="paragraph"><p><a href="http://mirror.ctan.org//macros/latex/contrib/latex-tds/">CTAN:macros/latex/contrib/latex-tds/</a></p></div>
-</div>
-<div class="attribution">
-</div></div>
-<div class="paragraph"><p>The following files can be downloaded:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<tt>README</tt>, <tt>README.html</tt>, <tt>README.pdf</tt>:
- The README file in different formats.
-</p>
-</li>
-<li>
-<p>
-<tt>&lt;module&gt;.tds.zip</tt>: The module distribution files,
- see section &#8216;<a href="#_module_list">Module list</a>&#8217; above
- for the available modules.
-</p>
-</li>
-<li>
-<p>
-<tt>source.tds.zip</tt>: The sources, mainly the build script, configuration and
- driver files, and patches.
- Some of the used tools are not provided, see section
- &#8216;<a href="#_build_hints">Build Hints</a>&#8217;.
-</p>
-</li>
-<li>
-<p>
-<tt>latex-tds.tds.zip</tt>: The universe, the contents of all the ZIP files above,
- merged together.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_installation_hints">4. Installation Hints</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Hopefully the result of this project helps you in the installation
-process. You get a TDS compliant tree just by unpacking.</p></div>
-<div class="paragraph"><p>Example:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt> cd /some/where/texmf
- unzip latex-tds</tt></pre>
-</div></div>
-<div class="paragraph"><p>or unzip&#8217;s option <tt>-d</tt>:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt> unzip latex-tds -d /some/where/texmf</tt></pre>
-</div></div>
-<div class="paragraph"><p>Instead of the universe ZIP file single modules can be selected.</p></div>
-<div class="paragraph"><p>Important to remember, point your unpack process right in
-the root directory of your TDS tree. The directory structure
-in the ZIP files start with the top-level directories:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt> doc/latex/base/...
- tex/latex/tools/...
- source/...</tt></pre>
-</div></div>
-<div class="paragraph"><p>Rationale: The root directory of a TDS tree can have different
-names, such as texmf-dist, texmf-local, &#8230;</p></div>
-<div class="sect2">
-<h3 id="_hints">4.1. Hints</h3>
-<div class="openblock">
-<div class="content">
-<div class="ulist"><ul>
-<li>
-<p>
-Refresh the file name database.
-</p>
-</li>
-<li>
-<p>
-Be aware that unpacking can insert and update files, but never
- deletes obsolete ones. Remainders of previous releases can
- cause trouble.
-</p>
-</li>
-<li>
-<p>
-Depending on the module further installation steps can be
- necessary, consult the module&#8217;s own documentation.
-</p>
-</li>
-</ul></div>
-</div></div>
-<div class="sect3">
-<h4 id="_module_base">4.1.1. Module base</h4>
-<div class="ulist"><ul>
-<li>
-<p>
-The default <tt>texsys.cfg</tt> that LaTeX provides is put
- into <tt>TDS:tex/latex/base</tt>. It must be removed, if you need
- a specialized version. Consult your TeX distribution
- and <tt>TDS:doc/latex/base/source2e.pdf</tt> (module ltdirchk).
- Usually changes are not required for many TeX distributions
- such as Unix (web2c), MikTeX, &#8230;
-</p>
-</li>
-<li>
-<p>
-Formats need rebuilding (e.g., fmtutil).
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect3">
-<h4 id="_module_psnfss">4.1.2. Module psnfss</h4>
-<div class="ulist"><ul>
-<li>
-<p>
-The map files need further configuring (e.g., updmap).
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect3">
-<h4 id="_module_graphics">4.1.3. Module graphics</h4>
-<div class="ulist"><ul>
-<li>
-<p>
-Module graphics does not provide all driver files, because some are
- developed independently (<tt>pdftex.def</tt>, &#8230;).
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_copyright_license">5. Copyright, License</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Copyright &#169; 2006-2014 Heiko Oberdiek.</p></div>
-<div class="paragraph"><p>License is <strong>LPPL 1.3c</strong>:</p></div>
-<div class="paragraph"><p>This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3
-of this license or (at your option) any later version.
-The latest version of this license is in</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt> http://www.latex-project.org/lppl.txt</tt></pre>
-</div></div>
-<div class="paragraph"><p>and version 1.3c or later is part of all distributions of LaTeX
-version 2005/12/01 or later.</p></div>
-<div class="paragraph"><p>This work has the LPPL maintenance status &#8216;maintained&#8217;.</p></div>
-<div class="paragraph"><p>The Current Maintainer of this work is Heiko Oberdiek.</p></div>
-<div class="paragraph"><p>See the following section &#8216;<a href="#_manifest">Manifest</a>&#8217; for a list of all files
-belonging to the project &#8216;latex-tds&#8217;.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_manifest">6. Manifest</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Included are the projects &#8216;adjust_checksum&#8217; and &#8216;ziptimetree&#8217;.
-They are projects of their own.</p></div>
-<div class="sect2">
-<h3 id="_documentation">6.1. Documentation</h3>
-<div class="tableblock">
-<table rules="rows"
-width="100%"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="30%" />
-<col width="70%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>README </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">plain text file</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>README.html </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">standalone HTML file</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>README.pdf </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">PDF version</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>README.asciidoc </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">main source code in text document format <a href="http://www.methods.co.nz/asciidoc/">AsciiDoc</a></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>README-docinfo.html </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">source code, read by asciidoc to generate <tt>README.html</tt></p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_licenses">6.2. Licenses</h3>
-<div class="tableblock">
-<table rules="rows"
-width="100%"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="30%" />
-<col width="70%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>license/lppl.txt </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">LPPL (The LaTeX Project Public License)
- for latex-tds and adjust_checksum</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>license/ziptimetree/lgpl.txt </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">LGPL (GNU Lesser General Public License)
- for ziptimetree, check-ascii, check-eolspaces</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_scripts">6.3. Scripts</h3>
-<div class="tableblock">
-<table rules="rows"
-width="100%"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="30%" />
-<col width="70%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>build.pl </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">main script for building the distribution</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>lib/adjust_checksum.pl </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">Perl script that runs a DTX file through
- LaTeX and corrects its <tt>\Checksum</tt> if necessary</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>lib/check-ascii.pl </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">Perl script that looks for non-ASCII characters</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>lib/check-eolspaces.pl </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">Perl script that looks for trailing spaces</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>lib/check-tds-installation.pl </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">Perl script that compares a module with
- an installation inside a TDS tree.</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>lib/ziptimetree.pl </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">Perl script that generates a ZIP file from
- a directory tree with sorted entries (LGPL)</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_configuration">6.4. Configuration</h3>
-<div class="tableblock">
-<table rules="rows"
-width="100%"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="30%" />
-<col width="70%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/docstrip.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">enables TDS feature and creates directories</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/errata.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">for errata lists of latex/base</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/fix-expl3-lua.ini </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">fix for expl3, if used in format file</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/hyperref.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">hyperref configuration file</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ltnews.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">for LaTeX News of latex/base</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ltugboat.cls </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">setup for class ltugboat</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ltxdoc.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">setup for class ltxdoc</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ltxguide.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">setup for the guide manuals in latex/base
- and required/psnfss</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/lualatex-tds.ini </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">init file for format generation for LuaTeX</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/lualatex-tds2.ini </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">init file for LuaTeX format without LM Math</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/manual.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">setup for errata list of the LaTeX manual
- in latex/base</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/pdflatex-tds.ini </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">init file for format generation for pdfTeX</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/tdsguide.cfg </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">setup for class <tt>tdsguide.cls</tt></p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_documentation_driver">6.5. Documentation driver</h3>
-<div class="tableblock">
-<table rules="rows"
-width="100%"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="30%" />
-<col width="70%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ams.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">generic doc driver for files from the
- amslatex bundle</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/doc_lppl.tex </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver for <tt>base/lppl.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/errata.all </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver for <tt>knuth/errata/errata.pdf</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/errata.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver for <tt>knuth/errata/errata_*.pdf</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/errorlog.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver for <tt>knuth/errata/errorlog.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/etex_man.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver for <tt>etex/etex_man.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/knuth.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver for <tt>knuth/</tt>{<tt>texware</tt>,<tt>mfware</tt>,<tt>etc</tt>}+/*.web+</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/knuth-outline.tex </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">outline file list for module knuth</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ltnews.tex </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">master file that merges all <tt>base/ltnews*.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/ltxcheck.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver with patches for <tt>ltxcheck.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/psnfss2e.drv </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">doc driver with patches for <tt>psnfss2e.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/tools-overview.cls </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">class for <tt>tools.tex</tt></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>tex/tools.tex </tt></pre></div></td>
-<td align="left" valign="top"><p class="table">master file for tools overview, generated
- by the <tt>build.pl</tt> script from <tt>tools/manifest.txt</tt></p></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_patches">6.6. Patches</h3>
-<div class="tableblock">
-<table rules="rows"
-width="100%"
-frame="hsides"
-cellspacing="0" cellpadding="4">
-<col width="30%" />
-<col width="70%" />
-<thead>
-<tr>
-<th align="left" valign="top">Diff/patch file</th>
-<th align="left" valign="top">Patched file</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/amsbooka.zip </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>amslatex/amsbooka.*</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/amsclass.dtx.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>amslatex/amsclass.dtx</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/amsfndoc.def.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>amsfonts/amsfndoc.def</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/amsfndoc.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>amsfonts/amsfndoc.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/amsldoc.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>amslatex/amsldoc.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/changes.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>amslatex/amsrefs/changes.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/encguide.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>base/encguide.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/errorlog.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>knuth/errata/errorlog.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/logmac.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>knuth/errata/logmac.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/source2e.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>base/source2e.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/tlc2.err.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>base/tlc2.err</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/trapman.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>knuth/mf/trapman.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/tripman.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>knuth/tex/tripman.tex</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/utf8ienc.dtx.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>base/utf8ienc.dtx</tt></pre></div></td>
-</tr>
-<tr>
-<td align="left" valign="top"><div class="literal"><pre><tt>patch/webman.tex.diff </tt></pre></div></td>
-<td align="left" valign="top"><div class="literal"><pre><tt>knuth/web/webman.tex</tt></pre></div></td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_design_principles">7. Design Principles</h2>
-<div class="sectionbody">
-<div class="ulist"><ul>
-<li>
-<p>
-Compliance with the latest TDS specification.
-</p>
-</li>
-<li>
-<p>
-No redundancy.
-</p>
-</li>
-<li>
-<p>
-User friendly PDF files with navigational support:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-bookmarks
-</p>
-</li>
-<li>
-<p>
-links
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Complete documentation. The documentation generation with
- enhanced PDF files is the tricky part and should be saved
- from the user.
-</p>
-</li>
-<li>
-<p>
-Output format of generated documentation is PDF, see above.
- Other formats such as DVI or PS are not generated and provided.
-</p>
-</li>
-<li>
-<p>
-Documentation bundles are preferred to many partial documentation
- files (e.g. <tt>source2e.pdf</tt> or <tt>ltnews.pdf</tt>).
-</p>
-</li>
-<li>
-<p>
-If several expansion stages of a documentation are available,
- then just the most complete expansion stage should be used.
-</p>
-</li>
-<li>
-<p>
-Files that do not fit in a program sub tree of TDS stay below
- <tt>TDS:source</tt> (e.g. <tt>latexbug.el</tt> from latex/base). Then they do not
- get lost at least.
-</p>
-</li>
-<li>
-<p>
-Page layout: <tt>a4paper</tt> with reduced vertical margins (exception: ltnews).
- (This also decreases the page number usually.)
-</p>
-</li>
-<li>
-<p>
-&#8230;
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_remarks">8. Remarks</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_base">8.1. Base</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<tt>source2e.pdf</tt> is used instead of many single <tt>lt*.pdf</tt> files.
-</p>
-</li>
-<li>
-<p>
-<tt>ltnews.pdf</tt> is introduced to avoid cluttering the doc directory
- with many single sheet <tt>ltnews*.pdf</tt> files.
-</p>
-</li>
-<li>
-<p>
-Patch for <tt>ltfssdcl.dtx</tt>: Checksum fixed.
-</p>
-</li>
-<li>
-<p>
-&#8230;
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_tools">8.2. Tools</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Added: <tt>tools.pdf</tt> as overview/contents/index file with links
- and short descriptions of the single packages. (It uses
- the data from <tt>manifest.txt</tt>).
-</p>
-</li>
-<li>
-<p>
-&#8230;
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_knuth">8.3. Knuth</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Current CTAN &#8594; TDS mapping in use:
- <tt>CTAN:systems/knuth/dist</tt> &#8594; <tt>TDS:&lt;toplevel&gt;/knuth</tt>
-</p>
-</li>
-<li>
-<p>
-Unsure where to put trip/trap files. Currently they are
- put in <tt>TDS:source</tt>, because the documentation files
- (<tt>tripman.pdf</tt>, <tt>trapman.pdf</tt>) are in <tt>TDS:doc</tt>. They lists the
- trip/trap files already.
-</p>
-</li>
-<li>
-<p>
-Not covered is
- <a href="http://mirror.ctan.org/systems/knuth/dist/lib/">CTAN:systems/knuth/dist/lib/</a>
- In TeX Live 2007/2008 the files are installed at different
- locations:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><tt>texmf-dist/fonts/source/public/mflogo/logo10.mf
-texmf-dist/fonts/source/public/mflogo/logo8.mf
-texmf-dist/fonts/source/public/mflogo/logo9.mf
-texmf-dist/fonts/source/public/mflogo/logobf10.mf
-texmf-dist/fonts/source/public/mflogo/logo.mf
-texmf-dist/fonts/source/public/mflogo/logosl10.mf
-texmf-dist/fonts/source/public/misc/grayf.mf
-texmf-dist/fonts/source/public/misc/manfnt.mf
-texmf-dist/fonts/source/public/misc/slant.mf
-texmf-dist/metafont/base/expr.mf
-texmf-dist/metafont/base/io.mf
-texmf-dist/metafont/base/null.mf
-texmf-dist/metafont/base/plain.mf
-texmf-dist/metafont/misc/3test.mf
-texmf-dist/metafont/misc/6test.mf
-texmf-dist/metafont/misc/rtest.mf
-texmf-dist/metafont/misc/test.mf
-texmf-dist/metafont/misc/waits.mf
-texmf-dist/metafont/misc/ztest.mf
-texmf-dist/mft/base/cmbase.mft
-texmf-dist/mft/base/plain.mft
-texmf-dist/tex/generic/misc/null.tex
-texmf-dist/tex/plain/base/manmac.tex
-texmf-dist/tex/plain/base/mftmac.tex
-texmf-dist/tex/plain/base/plain.tex
-texmf-dist/tex/plain/base/story.tex
-texmf-dist/tex/plain/base/testfont.tex
-texmf-dist/tex/plain/base/webmac.tex
-texmf/tex/generic/hyphen/hyphen.tex</tt></pre>
-</div></div>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_e_tex">8.4. e-TeX</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Only the manual &#8216;etex_man&#8217; is covered by this module.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_build_hints">9. Build Hints</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The most important advice I can give: &#8216;Forget it&#8217;!
-The purpose of the source files are rather to show, what was
-done in which way.
-The <tt>*.zip</tt> with TDS trees are the goal of the project, not the
-build process. Some remarks, if someone wants to build the
-modules himself:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-TeX compiler: LuaTeX and pdfTeX (&ge; 1.30).
-</p>
-</li>
-<li>
-<p>
-An up-to-date LaTeX installation, at least TeX Live 2012.
-</p>
-</li>
-<li>
-<p>
-Additional packages can be necessary, e.g.
- <a href="http://mirror.ctan.org/language/armenian/armtex.zip">CTAN:language/armenian/armtex.zip</a>
- is not part of TeX Live 2012.
-</p>
-</li>
-<li>
-<p>
-Most of the PDF files are generated using lualatex and package
- &#8216;fontspec&#8217; that uses the Latin Modern fonts as default. They
- are available as OpenType fonts. LuaTeX generates with OpenType
- fonts considerably smaller PDF files. Also PDF object stream
- compression is used (PDF 1.5). Therefore the further
- post-processing of PDF files are currently dropped.
-</p>
-</li>
-<li>
-<p>
-(Outdated since 2011-07-01) PDF post-processing, I have used two steps:
-</p>
-<div class="openblock">
-<div class="content">
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-First step:
-</p>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-I have written a tool that analyzes page stream contents and
- optimizes them (removal of unnecessary color settings, minimize
- translation operations, &#8230;)
- &#8594; <tt>pdfbox-rewrite.jar</tt>.
-</p>
-</li>
-<li>
-<p>
-For reading and writing the PDF file I have used PDFBox
- &#8594; <tt>PDFBox-0.7.2.jar</tt> (<a href="http://pdfbox.apache.org/">http://pdfbox.apache.org/</a>).
-</p>
-</li>
-<li>
-<p>
-To get better results I patched some of the classes
- of PDFBox (especially the write module)
- &#8594; <tt>pdfbox-rewrite.jar</tt>.
-</p>
-</li>
-</ol></div>
-</li>
-<li>
-<p>
-The final conversion step was done by Multivalent, because
- it makes a very good job in PDF compression:
- &#8594; <tt>Multivalent20060102.jar</tt> (<a href="http://multivalent.sourceforge.net/">http://multivalent.sourceforge.net/</a>)
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>Multivalent and PDFBox are available, <tt>pdfbox-rewrite.jar</tt>, however,
- is just a first prototype, not ripe for a release.
- Therefore this step of post-processing is optional for the
- project latex-tds. The build script looks for the library and
- skips this steps automatically if necessary.
- If you give the build script the option <tt>--nopostprocess</tt>,
- then it will skip the postprocess steps (building is faster,
- the pdf files a little larger).
- Install the jar files in the directory <tt>lib</tt> where
- they are expected by the build script.</p></div>
-</div></div>
-</li>
-<li>
-<p>
-Unix, Perl background is expected.
-</p>
-</li>
-<li>
-<p>
-No support or documentation.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_history">10. History</h2>
-<div class="sectionbody">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-2006/04/27
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Start of the project (without babel, amslatex, psnfss).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/06/01
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex added.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/06/03
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Modules psnfss and babel added, now all modules are covered.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/06/07
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-The project uploaded to CTAN.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/07/31
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Index added to base/classes.dtx.
-</p>
-</li>
-<li>
-<p>
-ZIP files renamed: <tt>*-tds.zip</tt> &#8594; <tt>*.zip</tt>
-</p>
-</li>
-<li>
-<p>
-Comment added to ZIP files.
-</p>
-</li>
-<li>
-<p>
-Update of <tt>readme.txt</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/08/26
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module tds for <a href="http://mirror.ctan.org/tds/">CTAN:tds/</a> added.
-</p>
-</li>
-<li>
-<p>
-Obsolete hyphenation patterns added to babel&#8217;s source directory
- to avoid violation of LPPL.
-</p>
-</li>
-<li>
-<p>
-Script adjust_checksum added and scripts are put below <tt>TDS:scripts</tt>.
-</p>
-</li>
-<li>
-<p>
-<tt>TDS:makeindex/base/</tt> renamed to <tt>TDS:makeindex/latex/</tt>
-</p>
-</li>
-<li>
-<p>
-Exception for <tt>sample2e.tex</tt> and <tt>small2e.tex</tt> that now go into
- <tt>TDS:tex/latex/base/</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/08/28
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Default <tt>texsys.cfg</tt> is generated.
-</p>
-</li>
-<li>
-<p>
-<tt>adjust_checksum.pl</tt> and <tt>ziptimetree.pl</tt> now moved from the <tt>scripts</tt>
- branch to <tt>TDS:source/latex/latex-tds/lib/</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2006/12/27
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Fix of <tt>ltxguide.cfg</tt> that had loaded doc.sty that disturbs the
- verbatim stuff in <tt>fntguide.tex</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2007/01/08
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Fix for documentation of longtable.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2007/03/19
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Patch for <tt>babel/latin.dtx</tt> added (babel/3922).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2007/09/04
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-A minor update on CTAN regarding babel:
- <tt>iahyphen.tex</tt>, <tt>icehyph.tex</tt>, and <tt>lahyph.tex</tt> are now symbolic links
- to their location in <a href="http://mirror.ctan.org/language/hyphenation/">CTAN:language/hyphenation/</a>.
- Therefore also
- <tt>lahyph.tex</tt> is now installed in <tt>TDS:tex/generic/hyphen/</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2007/10/18
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of module amslatex because of updated package amsrefs.
-</p>
-</li>
-<li>
-<p>
-Fix in <tt>latin.dtx.diff</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2007/10/24
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of babel.
-</p>
-</li>
-<li>
-<p>
-Update of amsrefs (<tt>TDS:tex/latex/amscls</tt> &#8594; <tt>TDS:tex/latex/amsrefs</tt>).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/04/01
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of babel (2008/03/17).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/04/02
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Fix: <tt>latex/base/*.err</tt> added to <tt>TDS:source/latex/base/</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/04/05
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Using <tt>.tds.zip</tt> instead of .zip to follow <tt>CTAN:install</tt>'s naming
- conventions.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/06/28
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of babel (2008/06/01).
-</p>
-</li>
-<li>
-<p>
-Babel documentation: table of contents reformatted.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/07/07
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of babel (2008/07/06).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/07/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module knuth added.
-</p>
-</li>
-<li>
-<p>
-Update of babel (2008/07/07).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/07/11
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Fixes and additions for module knuth.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/07/25
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: <tt>instr-l.tex</tt> vanished from CTAN (but not at AMS side).
-</p>
-</li>
-<li>
-<p>
-Some unwanted spaces in generated PDF files fixed.
- (Caused by a wrong package file that was found on my system first.)
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/08/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module latex3 added.
-</p>
-</li>
-<li>
-<p>
-Module base: CTAN hyperlinks fixed.
-</p>
-</li>
-<li>
-<p>
-Module amslatex: Outdated URL fixed in <tt>amsldoc.tex</tt>.
-</p>
-</li>
-<li>
-<p>
-Module babel: Problem with already defined <tt>\meta</tt> in <tt>tb1604.tex</tt> fixed.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/09/06
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Using uptodate versions from LaTeX project page for errata lists.
-</p>
-</li>
-<li>
-<p>
-<tt>lgc2.err</tt> added (LaTeX Graphics Companion, 2. ed.).
-</p>
-</li>
-<li>
-<p>
-Various fixes in errata lists.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Module tools: <tt>array.dtx</tt>: documentation fixed (tools/4044).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2008/09/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: Missing title date for utf8ienc.pdf fixed.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2009/09/05
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: updated.
-</p>
-</li>
-<li>
-<p>
-Module latex3: xpackages updated.
-</p>
-</li>
-<li>
-<p>
-Module latex3: expl3 removed, because nothing to do.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2009/09/25
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: updated.
-</p>
-</li>
-<li>
-<p>
-Module babel: updated.
-</p>
-</li>
-<li>
-<p>
-Update of LaTeX, release 2009/09/24.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2009/12/07
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: Unhappily the <tt>.zip</tt> files are quite a mess,
- because they contain a mixup of old and new versions.
- Tried to sort this out and fix the last update.
-</p>
-</li>
-<li>
-<p>
-Module latex3: xpackages removed, because nothing to do.
-</p>
-</li>
-<li>
-<p>
-Module latex3 removed, nothing left to do.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2010/05/04
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: page layout for source2e fixed (changes, index).
-</p>
-</li>
-<li>
-<p>
-Module base: update of <tt>.err</tt> files.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2010/10/27
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: amscls and amsrefs updated.
-</p>
-</li>
-<li>
-<p>
-Module etex added (only for etex_man).
-</p>
-</li>
-<li>
-<p>
-Erratas updated.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/03/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: patch for latex/4148 (Missing <tt>\label</tt> and <tt>\ref</tt> in <tt>lppl.tex</tt>).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/04/18
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: There is an outdated version of amsthm.sty in
- <a href="http://mirror.ctan.org/install/macros/latex/required/amslatex/amscls.tds.zip">CTAN:install/macros/latex/required/amslatex/amscls.tds.zip</a>.
- The package <tt>amsthm.sty</tt> is now generated from the source.
-</p>
-</li>
-<li>
-<p>
-Using TDS tree for missing packages that are not part of TeX Live.
- Module base: <a href="http://mirror.ctan.org/language/armenian/armtex.zip">CTAN:language/armenian/armtex.zip</a>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/06/24
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: Two downloads from AMS server removed, because
- the files are not longer available (and they are on CTAN).
-</p>
-</li>
-<li>
-<p>
-Module amslatex: 00readme.txt and amsrefs.dtx taken from
- <a href="http://mirror.ctan.org/macros/latex/contrib/amsrefs.zip">CTAN:macros/latex/contrib/amsrefs.zip</a> instead of
- <a href="http://mirror.ctan.org/install/macros/latex/contrib/amsrefs.tds.zip">CTAN:install/macros/latex/contrib/amsrefs.tds.zip</a>
- because the later archive file is out of sync.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/06/30
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of LaTeX, release 2011/06/27.
-</p>
-</li>
-<li>
-<p>
-Patch <tt>ltpatch.ltx</tt> to match the kernel version.
-</p>
-</li>
-<li>
-<p>
-Patch <tt>lppl.tex.diff</tt> removed (no longer needed).
-</p>
-</li>
-<li>
-<p>
-Patch <tt>ltfssdcl.dtx.diff</tt> added (checksum fixed).
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Module tools: Release 2011/06.
-</p>
-</li>
-<li>
-<p>
-Module babel: Release 2011/06.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/07/01
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-PDF generation:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Use of LuaTeX instead of pdfTeX for most of the files.
-</p>
-</li>
-<li>
-<p>
-Use of package &#8216;fontspec&#8217; with Latin Modern fonts as
- default in OpenType format (smaller PDF file sizes).
- The post-processing of PDF files is skipped.
-</p>
-</li>
-<li>
-<p>
-Various patches and fixes for LuaLaTeX and package &#8216;fontspec&#8217;.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Module base:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of LaTeX.
-</p>
-</li>
-<li>
-<p>
-Patches <tt>ltpatch.ltx.diff</tt> and <tt>ltfssdcl.dtx.diff</tt> removed
- (no longer needed).
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Module tools: Update.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/07/03
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-build.pl:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Caching for PDF generation added.
-</p>
-</li>
-<li>
-<p>
-&#8216;FINAL&#8217; markers in the output of <tt>build.pl</tt>
- for final (Lua|pdf)TeX runs.
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/07/26
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-PDF generation: Use of package unicode-math with Latin Modern Math
- where possible.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/08/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of tools.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/10/05
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of tools (varioref).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2011/11/16
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of babel.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2012/05/12
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of amslatex (amsrefs).
-</p>
-</li>
-<li>
-<p>
-Update of <tt>readme.txt</tt> that is renamed to <tt>README</tt> (CTAN convention).
-</p>
-</li>
-<li>
-<p>
-Update of <tt>tlc2.err</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/02/14
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of amslatex (amsrefs).
-</p>
-</li>
-<li>
-<p>
-Module amslatex: <tt>cite-x*.tex</tt>, <tt>jb.bib</tt> in <tt>TDS:source/</tt>, because
- these files are now classified as test files.
-</p>
-</li>
-<li>
-<p>
-Module base: <tt>lb2.err</tt> and <tt>tlc2.err</tt> updated.
-</p>
-</li>
-<li>
-<p>
-Change in version control system from CVS to git with public
- source repository.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/02/15
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amsfonts added.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/02/25
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Patch file <tt>lb2.err.diff</tt> removed by call of sed inside <tt>build.pl</tt>.
-</p>
-</li>
-<li>
-<p>
-<tt>README</tt> rewritten in text document format <a href="http://www.methods.co.nz/asciidoc/">AsciiDoc</a>
- and added as HTML and PDF files.
-</p>
-</li>
-<li>
-<p>
-<tt>README.asciidoc</tt> updated.
-</p>
-</li>
-<li>
-<p>
-<tt>Makefile</tt>: Target &#8216;check-links&#8217; added.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/02/26
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-<tt>README</tt> generated from <tt>README.asciidoc</tt> via <tt>README.html</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/02/27
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-<tt>README.asciidoc</tt>: Additions and updates.
-</p>
-</li>
-<li>
-<p>
-<tt>README.pdf</tt> generated by wkhtmltopdf via <tt>README.html</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/03/07
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of amslatex (amsrefs 2013/03/06 v2.13).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/03/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of amslatex (amsrefs 2013/03/07 v2.14).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2013/03/30
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of babel (3.9) including reorganization of language files.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/02/03
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Removal of module babel. It has a new maintainer and the
- languages are now maintained separately.
-</p>
-</li>
-<li>
-<p>
-Update of knuth (2014/01/19).
-</p>
-</li>
-<li>
-<p>
-Update of base (errata lists: <tt>lb2.err</tt>, <tt>tlc2.err</tt>).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/03
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of LaTeX, release 2014/05/01
- using public subversion repository of LaTeX2e.
- Modules: base, cyrillic, graphics, tools.
-</p>
-</li>
-<li>
-<p>
-Line ends are normalized in source text files of the LaTeX modules.
- Trailing spaces are removed and the line ends are Unix line ends.
-</p>
-</li>
-<li>
-<p>
-Update of armtex (needed to generate module base).
-</p>
-</li>
-<li>
-<p>
-New options <tt>--vcs</tt> and <tt>--vcs-update</tt> for using the files of
- the public source repository of the LaTeX project.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/05
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Using LaTeX modules from CTAN.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/08
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Update of base and graphics.
-</p>
-</li>
-<li>
-<p>
-<tt>README.html</tt> with Unix line ends.
-</p>
-</li>
-<li>
-<p>
-ZIP file for CTAN upload with top level directory <tt>latex-tds</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/10
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module cyrillic: Missing <tt>00readme.txt</tt> added.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/15
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: <tt>fix-cm</tt> updated (2014/05/13 v1.1q).
-</p>
-</li>
-<li>
-<p>
-Module tools: <tt>tabularx</tt> updated (2014/05/13 v2.10).
-</p>
-</li>
-<li>
-<p>
-Module tools: <tt>readme.txt</tt> renamed to <tt>00readme.txt</tt>.
-</p>
-</li>
-<li>
-<p>
-Module knuth: <tt>.web</tt> files are put below <tt>TDS:web/knuth//</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/16
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: Formatting of <tt>ltnews.pdf</tt> fixed.
-</p>
-</li>
-<li>
-<p>
-<tt>fix-expl3-lua.ini</tt> added to support putting package expl into a format.
-</p>
-</li>
-<li>
-<p>
-Script <tt>check-tds-installation.pl</tt> added.
-</p>
-</li>
-<li>
-<p>
-Module amslatex: <tt>TDS:bibtex/bst/ams</tt> renamed to <tt>TDS:bibtex/bst/amscls</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/05/21
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module amslatex: Sources for <tt>amsbooka</tt> added.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/06/12
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: Update of <tt>fixltx2e.dtx</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/09/17
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module tools: Update of packages <tt>varioref</tt> and <tt>multicol</tt>.
-</p>
-</li>
-<li>
-<p>
-Module base: Update of <tt>fixltx2e</tt>.
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/11/03
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module base: Update (2014-10-12).
-</p>
-</li>
-<li>
-<p>
-Module tools: Update (2014-10-28).
-</p>
-</li>
-</ul></div>
-</dd>
-<dt class="hdlist1">
-2014/11/12
-</dt>
-<dd>
-<div class="ulist"><ul>
-<li>
-<p>
-Module graphics: Update (2014-11-07).
-</p>
-</li>
-<li>
-<p>
-Modules base, cyrillic, graphics, tools:
- <tt>00readme.txt</tt> renamed to <tt>README</tt>.
-</p>
-</li>
-<li>
-<p>
-Module amslatex: Missing <tt>amsbooka.zip</tt> added to directory <tt>patch</tt>
- (until it is resolved at the AMS side).
-</p>
-</li>
-</ul></div>
-</dd>
-</dl></div>
-</div>
-</div>
-</div>
-<div id="footnotes"><hr /></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2014-11-11 22:53:51 CET
-</div>
-</div>
-</body>
-</html>
diff --git a/macros/latex/contrib/latex-tds/README.pdf b/macros/latex/contrib/latex-tds/README.pdf
deleted file mode 100644
index f0d1e77345..0000000000
--- a/macros/latex/contrib/latex-tds/README.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/media4svg/ChangeLog b/macros/latex/contrib/media4svg/ChangeLog
index 17962b8f39..aed1d22826 100644
--- a/macros/latex/contrib/media4svg/ChangeLog
+++ b/macros/latex/contrib/media4svg/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-14
+ * v0.4
+ * fix: playback control via keyboard in Firefox
+
2020-04-13
* v0.2
* fix: playback control on touch screens; expl3 fix
diff --git a/macros/latex/contrib/media4svg/README.md b/macros/latex/contrib/media4svg/README.md
index 8b8f376bde..cfdb7027e8 100644
--- a/macros/latex/contrib/media4svg/README.md
+++ b/macros/latex/contrib/media4svg/README.md
@@ -1,6 +1,6 @@
# The `media4svg` LaTeX Package
-Version 0.2, 2020/04/13
+Version 0.3, 2020/04/14
© 2020--today, Alexander Grahn
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-1.svg b/macros/latex/contrib/media4svg/example/beamer-example-1.svg
index 7ec641a064..729a51b1b9 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-1.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-1.svg
@@ -9,12 +9,12 @@ function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:ec-lmr9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmtt9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAkIAA0AAAAAEUwAAAi0AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICpd4kzQLOAABNgIkAz4EIAWCJgdYG+kNYB6FTdlulI6kzOuXpBlHP0/bvj8XsGYYyqRntAfaKsBMMPt1Mrs/h40SlRet/aLT2Irggedy/+Zo+EWlPQ8w4aIFehgGMjXQyCO8/gewjjj93I8o4k08cYRGJMZn37Zv9vZtDHOtEBpZxBK3hIQEjaMRkpWesDFavW7FbcMgon5UAgCg0+HJ8bcHAQBePx3HXa9GIYFeAC/AuXHOAIDrjUd/MPHCATjmAra8yLeWH3I6AUBnXfjbPxL1oQc+BKm4J5WC5LGBRW0ETysNIHL35dExS9euR58l1lg3CdnDFNGmM3KBZX/bPXHLsH322m2XnSGbC6XAC0DhuBxEf4TsXAC8BJbobfvP98nBr8T5QABBJxJLwH8ZGBQcIgWZLZ4K14IDTf+Y7yX3SCjLBbz1SfVzHjyVHsZydl8efHD37k0eh+NzxjwMSZEZYWURiECKjpKIf7OfD9KgJOSLRCioBZ4WIT2I4ohsy6KQDcUQaChK9bVphHsRPMdZLNbDYHwWnDjhQh0MhnkxGBsyXX0UnLgrk4OxPHAeMe7hWv7K9gqAfeeCJyauHEHMLMZOg3MMd00gJmjHA9w1A87q6lcCmz2BAh4F9+6LDWykrO3o1clOj0ZmcdPT4JzBXWVTuGtkADmcr4yGn8TY+4iZq4EOfGUxYsax+AgcZ/8+2L73cNccwpzTGDuLBhROzeIRw7iuEO5jbMDyKhnQIEvkDjysSa2HDmMVB+UrHYRrYItFGF937sIB5ODvgQmPqPkMWQW6VZghSBGLX3nEbBnZbPjQmNEV5zE27XQ49XWT4NzWHxgiqB+EmP3jp48fH8YwNogNciMm+BROFvQjUdsS8Ihp50P2MfPEZa+zJ5y5krjhsWvHpqBjkEVga15nxtlR55grFsAszrDWiPHsPo+xlsNrcprb7cYa9u/DOezeV/IVtzg13Mcmx9LYxWZSjC1n9lWEU4DA3adkhcXOzLJm901uko1qJojcvAGzcjM9o2f8OMZWI+MkStmhond5B1M6ft0xi5g7uOvYWH/gUAliUNaijLjw5OQgOEv2XbPPgPMuxjrSAdnvD05GrZe7sAOVA6ti69mm+rjHg5BVBvcwkEykWIyHypfgnDy5V2yOG1F53FXWvyHbTD2M96+tV6Mnvm5orL9bOzAhb8Ccinkc28cxdlQxHYLhUX6RqfOEek6ND9l3jckiK1Hez3LUYPl+vNrB1QxoWm2vxnLVUmPPd02HeTr+Ed/F48b47CjA+xVFeCfQMNT/bnw55fH1fExer72uf2KMNKWYIs6fBc6qKbqOS5OB/THN2TyrmgxL/HRLHU2R9J80CXMxSkKpEhM/LeYT7w2715+2rxksDavdvKDFvrjdJvtEJL4VGHD34tEoS11Ohr2p5MsbX4ooTZkUpD7eEBlfGx8ZYeg0RAw0mPAhwXtFasIjn1i76ttloesfyQLH/A0Jh+VpFqPuaTRcmJvSVJZf61haIxH/I5yYLzQERxtN2rXqcEbfDMU+m6tfxlRlbzwiBemeJila+4tAqQpVKQVqi33d5qZCW0VdkimtRperzc80xBXVWYE7wDS/CuQP+tmqX/s1rthckZct5G8KEDLq7Nitz6rthSP596S1WmJy4cECVYT832uK4loyCUu44PFDSWPn6qaGjU/VN/2XaTUUyHtC8aLn0a2yDH3cg3w4GpPRZmnKsZpbNRRJt+m6NCSlCThzXbqVmp9wpT7wTdUNIOYDoSeC4M/NwZURqZfvxuW2NdviPqVC/XfvEOdqSq3/rbw8P8iqLP1quuBDI54XuCxg4kywKH9EjzxPP7Bh11JK/F/JsezyNcVrJvGJrX0dZJu5IL/dTCkf2dIiWj9VvxACd9SUpi9bCtJ7FCKX6tY11GnIF3+m35qtj2EWE0E/9SvzYXJPvfeUE1dKk8AdRH9TQV+J02eWqFMYxmyoUHx1iU/RJL2TLoj6W0TS9Y/8wTRjjssXaj+OFJ5E3koyoPMHLzxd8KLYoAnIBb1Oe2V3PxwwZSuz6cL36d4hI6twi9Sanmtay4wfiU2Na53jmRsLvLNKWhb1zLKW2eMTSu3WcmCXqULq0XiIk7tZFi76eLlfe+Czyo7sErUUpFeFXLmu/Mr4tW9l8erSlgVlwUcEksEAuL0xve3SpgJ8viAq6EIm+X9uBiYPE6uUhJUmg5dV2swF/vUd+bjZvGmqgt8rjJUP25plZan1vxAof0GDGPlLktKUCkXarAQuOsMiwhFMK2XCc5Tgwx3xtO+oIEquvryqyBxR/Wl+pS3NUl+SlGKa7BJ76mPl2rafRQrfKwYhQW37x5oXsiXKry7xn+vBD89SmlUWWGXdibtDpiH9WcqFJeWm7wTEd5byhaVKDTL5j+dIeu2DzDoSUSHNZ0JkUun9oOIyZCLNjEeupUnhP+J5cjEleixQR94PLA1DdFD1w2Al/5GYqtF75UHwlZqio9dtXfB8dFyY1TKtvputMbtR9B2bISlwiV/y/KqtLDUfI/ob+Zcur1guRq4QXo9JN/9aIhISN28GiN97JCiXgWxLDpV9ae2Swu4BZx1CYNgd9uHBV+ZD3l5v3gdwOYDuyfX0AlyrN/pz8kIcAqcvLXkYhluEaT/54txPvni/8p/fKUIfjgcAfHGACCAAMq8+JNj+6f+L3Sy8kAAKuMGn+ybpESeCka9Q8SIpFYoXp7lEVyaXT3pDQ4hYLBVgslwVb6zWE1WChd7m8NXtqji88B/SuMI1pnnBDSm8F8UJdlYU+wEHRnwaVz5JmpcgzP28ieyDBRZaYYVksOC0YsW1Ya7FFlnR3GeZHl1IZnpGpBQkYXUHnSAhR5jEKuJOUWZGBv6TxO3wZT1dpFlvJFPIrg6dDnhfborVxel+3kABHHPFMsv16UUhIV0q+Lnv+ia9EXSqISzZtyQDtrIv1xUI9tIiAQKRsuXIk69AoWJlylWoVMXOoUatOvUaNAE=) format('woff2');}
-@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJEAA0AAAAABVQAAAHvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCJgcsG1oEIB4H1e0dxldMkX/YYqIiqNb+7dm7ex8wqOheAAAcKSAJPuUJXIQExQ5IxlEa18bmv6/P5Wn4Q8FcgGMUlNE1eIFVcRFF62NqPdqKlLHarv2vLrF27ENSJiHg9eOPt+Dt8xFZjkfqHTcVpEvpBa7gcfHJ0EgkRQYgAGDJrpk7MNSsrO3//talByAAGTJ0EmCGTKCTXB9U5EIy1Kz/wPX/rywAokIAIiFJIAiizD/nYHM1nUX8J4EC1KOC7ugHyDFIAknK86ZojIaiKV/VUNQ3RX1R/6belfmpXtPpaMwbspK7VzZU79Te+VxaY9CTzu3qMG3KxRbv+neulcoDs14+2DJ29NTRv7v9jOXgXhg84X5N7tewKsV7RrIkFcigkHpRiT+B48uBYHp1WK/NLRN+1zZkX3ahDVVSNT1ArQSC9ADr0kJIVQEAKGK/KsRCUip+w2aBQrMEEkJgikGAWrsESAqNAmR62CBAocFtASpqPZGJvE5SD+WZOdryQkfnt1a0uuuAg447biwHDh4/PpZZDjvkxPDCMbvtVBpmkCFK45R22m6gqZ5AhxoejejYMENiHx2R+djuneWwQUPKceXO7QNdFGuGDh84YuB1aGKVnY45bq9zXRrqlnmWtA8dNIRrbrUBJK0uOL1Ve30BAA==) format('woff2');}
-@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAS4AA0AAAAACOgAAARkAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCJgc8Gy4HUZQwThrEj8TYVsFeIjRKYIip36+P7Snux/Mf+9HOfV8WE8+uielm0+lioUCJJnEzyTSSiLSV//+97L7R2eY1S2YqDAsyqZRKK01WRgV9LsD8lwb4/+/dx3eufRqbvs3KEiuygMYa9LI1qJ/hIoqWT4ECCXwCdWLKMPNGGanXy7Tt1iZ4//xeCHwomHgE+F5iwp+7U6dzQEfdr3d4WHblj60pSteAqbgzpy+6JgHYKreZPmooogq8d0s1S2qBEd36KgQLCFwGZpmKr7eVCzcBQsVjpciWOyrQu7EqlQo8ct0Vl511pmCH9IQnKRQ34bqhtDpkjxrgbAzGGueXjDcBX25p3QQyqgITwTxgBcgikEsAtNiEB0p71Vu96KXa5IyttUkZT+umZU7GZUYGsjYTMqlNTs43SISFpICeMkEi4vAbfXUmMOjNI4Bcyg0Q6gJy9yCiVX0EIcS7+2ElMtYwnwzQxbuvYuxVw3zcgAB+I4dP8PT6rgEkx/vxHMl3lneFhA7iboA+jgM0zACmVRZFZO1AHAOJnNM9vxAap2MYaDJI/fIg7hcvpXthZolD2/YOqIypuXsQcYS1jbg5xVitSmZzIjYNUXWZ5R7E9Q53Q7iqb9cAnX389PFCjHcDyeeIXSGI4GHEDeLdxXdPAg8ncgMDCdLdZxnbZVCCUO15/jzxqUmnnlENYQ2SBvutybNHAxfRKnsamfzZap8ENSGHy9u3LyxYuL28YV88bD18NP28w/mMQ+e2gSLTrecxa+ng5PB5tyhXVAHpr4L2r8qYXMAuepBwcFVopH1CAH2YOhyS5O8AK162Me0xqUnubolJ0R1sW+b5Q9lZpw5lwhPKm431ZvwNhB6+ymBtN1O9AN7a2WFWRhLbQJtsB6lOCL1XojVdZpCw0K5fTQ6FI+mVm/3E+pHrdsbFb92ZEOEnFbp5moQ5hkUjF49WwXcvS30DD0UH8DjsTPstmjph5pEQ52RhUCMzVDlqO1ju8Kvb4We5dyTa2mTqxjElvkt23VzgqKssjjGN0zFQyoWhmNQl0fqb+jUvEahtea8+J26vA3TrnTsUbeftGVDLfLZUMqZafUKzaWIG/k9ER+30SPGylIVsYD6+CAxYui2B8YiMsdUpmLek7omTTVCsk3QAPInN2x8NtP4pnvTdT41syotAA50Xr/YZGpCnhhCWH1h9Knayzf8xuPn7rPwQi0aVNVgFGKNAqJejShH1P9Sg4IMm5BoxICdATRdV/ztbceLrOhENW/KPeb5aDt/O4lopWCiEiQ4SgUIEu0kAGOMiBEpngoDGClEQ6Iz3WEBvjFcaaccq41DVxmHT1c4s3Lm9Ka66LstSS1mA6zeWLrUAB+XItozuly8Fi6IgIUOxQmElMt4aAhg5Zcxk4RRkcfhZl1idn8JS2yQyyopiE42z+LS2XGlsYvxKVwM4c3fyLZWW2RcrLlsKPq1nb5XIIGsaoi0BCq+biCgz6NKn3D/twoOXQME=) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+<![CDATA[@font-face{font-family:ec-lmr9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmtt9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJEAA0AAAAABVQAAAHvAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCJgcsG1oEAJ4HmVtK859sVYh76MK1TYqgfq235+3ufeCQorsAAMhUFJAEj5LAxcaBYgck4ygBq576IbbWWP77+gyeG9fDCnhGQ3k1l1sRTe+Rep/+Ime8c9M/GCuZzaeOoEkIeP3o41V4+3zqyxiP1COuKEhn03Ocx+Pik0GRSIoMQADAwu3TtmKQ6Vmr/32sTvdBADJkaC/AVJlAe7meKMmFZJDp/4Hr/19ZAESJAERCEhAjsDL/nIPIlXQK8Z8EClCLErqgNyBHfwkkKc8boj7qioZ8eV1R2xC1Re2bWufnpFoNJ6I+r8s0dy+rq1yvvv65/Mr7N972tpMnnqnt/7Ty3ukv7m8cNWLSiN+df8YScDcMGHuvKvdrsKXiPVWzZJVgBgtLUJbiz0Dx5UAwpd2dzxsY+7u6LvtyDEWokCrpPqolEKT7WJ3mQaoIAEARe1Qg5pGS+g0bBAqNEkgIgYn6A6ptFyAp1AuQ6WqtAIU61wQoqfZYJvIaSS2cZmZqRQvtnN5a0uyGvfY54ohR7N135Mgopjtgv6PrC4ftsE3ZYP0NVDZa2TZb9LPXr2iDDHVnc7CBiZ+OgH94x7by4P4Dy6PL27b0s7FpOWhov6wMHshjuW0OO2KXtd3Mtcu9S9oH9R/IttBuAElqCq5v3UYvAA==) format('woff2');}
+@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATAAA0AAAAACOgAAARqAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCJgc8Gy4HUZQvTh3iR0Lm5o3mEeEQR6iaIrO2WB3OPFD5LR7+2Q933/sy+fsboh7xZJKWMS1BLUJIUE3iMp7wSCLSdvg/vKe9dE5mpBM62MmkTDqpGekD+El/XgH8X136+LP0T6XTW0uxiCVkASqt0MVaoXwMG9FTileBBCTgFSgTphhGPfHCbTemX9t0rcM53wsBX1be3Ad823S5OXdHHoh7KvJ6vsXNA8Vva1marBSECnfmwHHXJABr5RbjOh0R+cK7sHSxpGc4iUu+icAMnE4CkwjjUFvLhZsAoeJRUmTL7UK9m+7zvbtXLhw9dHD3LkGcoiZ4E4nkIbgvKKUKWaN6uOpFn36/pDFALjc3zwDRlaAF04AFIGaBOAFAiVUYIJVXo1SrPtQvMxR9Z30wGqwbF9KBxoTgiaXBH4NtWijaaKq2HJ5yfxv9hz96dGQCT70ZKIFj9BOUv2xvPkUI9iMUrZqbj+EU4qw3RZug19wcxrCoelM0DVAomjkcaNqNiieInnjM5wWKYLkiJPQpug/wSBJAjZKAEWyLNZjvIDQJibTTTFyYTRA5DIRAEP/gU/SYeYzoRfGNgI7tFLD10Kp8itCot4PQUuuYWWNJ0ioyDWHfc8sPEPrh6H0IZz+qeIKzWztbVzHsJghwnEcrQhA0mzj/FKtcn24HBnaEfjLwMvPpWSYqtDcQZOR5/jxmB2/HW/xK2BXWFfviZMmXgQoE255ATEaL7ZPgIKRx+3ap/Ip86faVmngobmxO73XozWjoKQGjTLcHi5Slg5PDr0ruXO4dSP8YVHs6Q3CFUphLqD8dGmmfEEA04o0hSf4OcPLDLfJ2TGqSu1tiUvQd6lZmb0N2VkdDJizh3lSsN+mvzeXhaxys5maqGcA4JxlmpcuyDbTJdtBXDyGqWaqiBtoJ8naP+QytvkjfLfRjakWeL4+LLy5PiPDT53LzNAlzDItGXDxucv7zstTS9jC6Awwacyb8FITfmHkkxDlZaB8Y6LAd1Rwsy/yOyvwsq19EW5sIX3plzO8yGDXndNQwXo8xjVPXNjZURmJSlaK1Cvo1K3HyXfrGL3Ww2gHua/Y0RNt5ewYckr8sjUlT1UdcZmOZJPx/Ex1V7pHiZWkQcpH88T4w4FhJAukRGWOrviKjdLTkZBMU66QeAI/D6o0LPaW/Ro/r6odFFuljoIDKx9fqGB0QTw1BMH/9j4hYoY3/eLHiz7vyQ8zqjPMwV9ArQZAvOmMR2UGOCHLQQJzBBMRekONFZedwHhSfD6n4V1P8Zx7PzKdvRzHVBAuFoLUNN0iEwFYsAHodh4BUGRCgsEAUBFQaDwSo9XqpEGWf1I+pFnYQVSuT0OfWxhh2VpZjjrEAZ88dO2YBtsmR7Tjuly8FBWeExQDOCo6SSG9rmKANmSQsnBGDBPysi1nnp1D4OpYBboVTiXpV/FbN0ETvRhgZWAEMo+Q7Jq2yP1dCtTR8Ws9fyzKAqhnItgJIsq5FSBNo0GK8f9aFBy+BggEAAA==) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
text.f0 {font-family:ec-lmtt9;font-size:8.966376px}
text.f1 {font-family:ec-lmss8;font-size:7.471995px}
text.f2 {font-family:ec-lmss9;font-size:8.966376px}
@@ -76,7 +76,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='139.582264' y='23.053108'>AlexG<tspan x='117.332358' y='64.44107'>13th</tspan>
+<text class='f9' x='139.582264' y='23.053108'>AlexG<tspan x='117.332358' y='64.44107'>14th</tspan>
<tspan x='142.180895'>April</tspan>
<tspan x='170.392903'>2020</tspan>
</text>
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-2.svg b/macros/latex/contrib/media4svg/example/beamer-example-2.svg
index ec3d697ea7..4861e76921 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-2.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-2.svg
@@ -9,10 +9,10 @@ function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmri10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAQIAA0AAAAAB4QAAAOzAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCLwcuGy4GEdWivUB8HKZbfBmoZP4Vy1n+g4Bqs6p7JKQnLhATfE2FZEUE7hxWxX9nqhDY7lu7wFKMMIJAQw48wk1/7z4uWgP40T//5xvsk67VXrpVukACLdy0LLBIizHULmDK2tWu8lJsjMV4ibq7CBCAVy69vwXg7Wt+Le8W8bRYgwF55HUgIiPx8Xg5kI2OmYULe9d1GA8EmK/lRv2Gym1YGJbXSj6vE+6eApfmoXMDNjYSBJjK/GhUbJPtqs21irAQAwRcIwBJrRegNIzuIxjkeznkQkBUFAnABBAHFPgBxAQAdOBEAtBJMvVSkSxGiZ7CMuL1gZahxoU2qXDajVcvqPCtXSI0yIp0O3x9+/bNIvSyCr9K8DUr8sYrYmDwxJULDw4otfuN69cPW5GbLA6p8Ia0V1VYhHxviNDzKtx/Vw3fusq9ZU9WWtCKbM7cf96KEMwavIHgRiuSO2jz7t5K7htRKa/Uf4fCN++7fvr0djE7dEqFjxBMP0rw1bxXVfiUCBUO2i92PM7rv4Wgto/t2lbi3Qm+Nb1y4sQWaP3V4Ff/YU2uRtptfc6KDDr/hnBss2373P5o8CPnK/X6dlMPxw50H0ouaLw9uyapTfmQuYPVF4uVUTLaOXj3tsWdu9a1b1rv11TV/9l1B5e2n5GYfrO8Xau9KTH5KTn496xWibHtq0uWNM7IT09vvrdFk/erhzYb1PNKxYAmPdu97ai5MPMndyuVqDq2+vqbjJyKzMldqysM9UFCztby3TnXcl7d13JyT2fbrGdaa55HNmpy8K+MopXFOc9fa7lU48r8fH968rfJcc+f8OY5Fn5SNrxF8fcl+bcrD/8dM/3p8h9r/MnywmRP96Ks3/YVq2aNN51JKz3uyHn/WM+lmkqM7V9lX9o8Iz8zs63n6QYtCpzzRt3YVz3AOX1s7eUKAM4KXM3Pxeh85z1rGu8iXJN2QDXUsP0tU/ybMPHOAgg8P77EGpXY/DebpX1xlPwSR/Q3ravcBthIAALyRn9jqOaF6AdaVwQAAAAw22QcAGKBeMzSvPSTW+iHAKbR6AAkEARojRMAsKlDAJBMCQQATSljFBgsu/ebYt1GIzIWKQ4QaLqSDgwZPH22KYXj1BRTzTKRhxtT9qyJnqa0o+mmmfP6WeoF2Hk5udk1ZRcwTu1s38V7+BJ/JXq5Uz5bhbbPqg/YvU63vak9MK6WyIETj6/WX3u72QQDBcwy20Tyrp2HMM8rc5nH6Ya4yIIrgGQF8yfRSWe9DQUA) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARkAA0AAAAACFgAAAQOAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCJgc2G70GIB4FbuwM6Jyo5HwzwVZUFDzPs6l/7iOk9NE6yTQdqTnJRDXNTIRu+wJfzIXnH+7defcPbXERjcVpgFGBp6nFBV4EM/87Cub/msdReO9A7x8dyVp8QFEJdPMGmXARRJXNKoCGo70J2gbdDcJVXgoQwMu3vXcG4K27uhuut9RrdQId1FXdDUKQIi9eKVCs2QCcrIEtJh9HLAEy7zLc//uYlQfEgCDYDWzvWhlfwiBsvYjRoIBFicpYaqU11r/rfwDwEsSn/r/WBc51tjOzEJgnPQhlJICiCCFi+H8iHRBFDixAtlzHS2YnIH8EgAbggI6QCcgOAIiAZgqAEqEWxeu3kUqJS0zKxJZSsG6+DBLbzI9kbFNvl+lBNbdeycXJzov7tlyi8cuFl17Zae6pp4and5h/9tl324USXCXmdMIr8ZAOXuHAq2EbbYcDHR/QwWV3Xfea+MOuft4On+10Jj72deDc8IoObnvuNZH88HTxXxtWzg5fvz+d0Re/fvft3bNfPbeTLcFlYkzdOpdLNJfbYY95/lU6uOLAlSXv1dIFMbHWW7V4Qi3pKZkDja8Emev8lofDIdcygCmBc4rW4r/OYk0BU2lHJb4Cmh2o7Z9rL37oquRZ1lmfuY9lH2t+6tjEbJngJ9xvS6y5d33zSM7ExLjExpULNiYqL1qw+Mvl/ZY5M+a+N3rh619XYkzT7VULA527xXffn5Td3z5/3s72y1LDRxyTe8yW2Kv3j8o7dNrnHSb3mleSe3JFbdsjNzjPcdoax7b6dJzg1Tjnm91mDCiNFS8pmJrdkJmx5dC8hfsPzqgblhzgDjj4XbUa4X67oKpT6fBslB9vnVC24UgNd/Writxj0okbJ4wo7jU7/lRp7J7au534NaX8cfoYd82GrHm9Wk+afCP3VxfsPTI7c+9R9+070JabzJ83zlp4XvXQk6oG3/fYN7OCFd8uwRi7vw07cgq8oqKtG0fMHtmzz0dN9c6phUWnxmqH9ertze42bGx688TExNHunu4zawYljD43WeWWVI4E4EahZX5TToRvUzdGzXdKlKFULbABm6r2UFT+0Yj8sgDBSfcfn51f2P9XyzY+P5SNWvL/Ok/nAWBRAATqZt5jVt4DqAcRttO1miRA9qCeSuJSUTczqyKSMvyVsurpOhOgDRYBoIAAFUOae4NlGQGgmPKKfAyV5gAm25nm6JD6t9OQNhdFAwLDaCXAFOdvG1XkUk7W2sSTwprzJi8FI623zpbs9zdZbilXSrNWrr5cSy3WNFTXQHvS5u4Jk9Jq4QtaqPqm5UvdVHOr29ddurhpFXVJ8NJN3Zuus8KQMcImm61cWTOXdjU797v5veZWVnUwWwmgBIf+V7VyH6OMNt4kUz0AAAA=) format('woff2');}
+<![CDATA[@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmri10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAP8AA0AAAAAB4QAAAOoAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCLwcuGy4GIB6HsWN6SUYyQttrPcAeoZITfOxH2/e+nEoyBY+iks1LMAlJLFSaWCjXaB5JDIl28n/f6d9pPVtjU2GDWkq++k5S0M9UAfzP/+UO9wL+dM/v+QY70rvG2rpVeoEEWrhpWWCRFmOovYApm1f5timccD+bhyxsThch4Ou2ewMAfNvtfrruRnkfdYAg+ZBvN4DHMorfwMzKZKMQ3nDhkYse6QAuqCpUF83F5hAQLMsXnh+YhA9EwaUDBKwGGjVKXFCgarEEYRjbvw2yiJqAaySS+h/wBbH0ESryvUazBkAsBj5Qg1Y04x9A9AFQYiU+UEpZlpMhHUkoEBFVW3mKEGw+x+nDXLk9V7Zg7r4xxIkieH7zu4eH+xHnEuZeAfZVgnf9Mopkr+zYcmQG41fXd++eJ3h7oe4m5vbIXcFcxDG7jjjnMDd8rIf3XcUYmFCSYxO8fsXpzQQP2ErRPcDuJXiqUf3jsxXV68zUSuEjCu+9b/f69cOojLOGuQvAll8E9hW1K5i7hjiaUdOoeKwWPgBsbS+NDXlq3OB90x0rKwNAGzsNvvIPs9nJcxs8S/CiNl9HtKciQ8/IY9HHqMtZAsNCAo9EIxlz0hrWw8omUi76MRXR+HkdFpw4TUWPD9V5+2a622aZ8+OlC8qZsw3uxZLyn/TdnCZlhNW7VcD8dTuWbNphrFNvraAuL28/6WBzzzjWLipwh0GETaDbLZrJlpKPDCcs2bzL6dVrBRUDxTxfYwNB/FtC5Yn+uMoulStTjnmBlKvSOmf+zCOtbGZ/Kmi1aquc2+XYwA9vq9TN5aXfSIudW2Gp0Woe68U7aL/TUd9vOP9LePvTqd+yftykKc3011L6OqWN7db0bZDTXaap3FsKbODHHU0njMgGewV1RUVXZrOFgwZVmbRnyjiCKko13W4AgDcIVm3YJCzgL2ujkOAPxPDzBQXlRwWDfEso5gxD74wQzMYNn06StP8vQhR/rpJfQlv8yu/LNwSgUYIgn/7/CrEFCyze5/cFBACo4xrQAHEQIGahtGAJywEIg1A7TQAkQmALCoBGFyGQau0CFCalKKi0eLW/1uQL8IuySWoFgsI+8qDSr/nsWrdlyFegVA4mBrh+ozSHOdTvUqRQ+etLZclAYqEwkGyRMqQx3R1LyUzm0U5jYWRgW4W2l2ZlkCyKQdqSGWmmRCFsMc1NG5rF2ARwSoZSZXLIuyQmYR5emcuYFAOIi3DgCgApCvUn0ckewWIB) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARUAA0AAAAACFgAAAP/AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCJgc2G70GIB6FcbNzhIhKE9+ZQtStRVDs97p3DwKEOtEApL5QmahE+NhMXF2Fqq6q7VS2sg5Yo0aD2rTZxKF1UqclNSepuZyI0XM4EfWfSRX8z/81j6OsQO9Gn2QtPqArWrZwg0y4CKLKZhVAw9HeBG1vOsVasCJs6lS7gqCWQsDrPU/mAW8Oplw8e5O4E9NQkfeyg+ABUuIjPmTQ+aoAmtgEbHF5ndoCaPwOOfc/UlUeowMBOwpyjBvJK7Zo6ykcgk7NUq2hVWfd9Pwd/wPALYhP/d982cUXnk+DQEDUECyJBMkcQavw/5QVqGmiGRjX4ngzORgQ/yNBK+gHwxB9QOwAoMQCGUjlas2tfqlwJzZER5wJTaxhXVMST2ilqaKMVlIDSYnoid3rccdU1NkINFlF0ctJq9fb186eLc21rV+48CBtTsQNRFkCaT28oMRbGHVbKkd5Y5TdMUpcc2DLHSIkb7xKS5ft58NXgRKZbbcocc+VO4SYSnOJcCesHC3dPWoso1bePbjXPfv2YnuaiGuIPHXrvFtF4QkthdYJGyhx3aj1mm8jcUGUWOnzaE6oLD1J2Sj/W2LZFiHopJS4GV2YIjKzKIoId1s8QEQqJSrxFtCqLVHxz6WLH9pDv0Cz4A13puJM4IXJbDXJFVjus5Wm9sCnU+o8Npvt3bmhN+u+oqH5fXt0G1Na+ySj8e5Hd8gnjB0ejSIl3eLjp/kVIzvq6wZ3rDGkpE7STuqnu3003WTMnLe2BeF1VtqZbt7lp7YxVzCnG0NrIu1yeS9mqdKlNNZaZ9liVlTRq6y035i6xpGjS32S9bFc7Ogvnn2Eo7SZh711SoUKv9jgXOde4yncVfCw4CYZ2e25qZbh1TYXrHWHvA8yNpus8YM1TuK63ZDNxKt1fsF2vLzdMHx8ReXwCUdGjCqXJhPqsjWNSzyTZngkHDnzqUrs9LkF8tj99RqkNuMtLPr3Tq1OC4t8EeDLzDa3mK3zTg6P4KtdkrOMffPYvAxuWEhmOSghY7Heg7MyjgR4SrC4ukOtwDfDdpXykUbJZeIMLIeV4nxYRf7sCPllguDRbrVdvXnM12Za/vZRNqrV/495MY+BZgmCfH68R1U+AfIVgsu3RlfogTgDHKtbJQe32InJsIB+mO4D5+TggKDVJgWUgEMyIoG9aXaNgFRpV0GFeTWESpvHvWvNnqEQpRapFQBROGRFqAwStq11W40b3fXBM8DNbR/eAOzrqYd+4vf7aNeKYxAoGCcKp1WzgFB1guaFKANnEGzFF7RQ9T7trZwhMJiL4lqbA6pIWpgPCbiQhuBqQEOrPvrqXFnKpVRz4H03Px8YjKpOZCsBSOxs/Ve18pJ0GXLkK3IMAA==) format('woff2');}
text.f4 {font-family:ec-lmr12;font-size:14.346196px}
text.f5 {font-family:ec-lmtt10;font-size:10.909088px}
text.f7 {font-family:ec-lmri10;font-size:10.909088px}
@@ -47,7 +47,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<svg height='0' id='msvg@kbdCtrl@0' onfocus='' onkeydown='if($("0").controls){return;}switch(event.key){case" ":if($("0").paused){$("0").play();}else{$("0").pause();}break;case"ArrowUp":if(event.ctrlKey){$("0").muted=false;}else{try{$("0").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("0").muted=true;}else{try{$("0").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("0").currentTime-=$("0").duration/10;}else{$("0").currentTime-=$("0").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("0").currentTime+=$("0").duration/10;}else{$("0").currentTime+=$("0").duration/100;}break;case"Home":$("0").currentTime=0;break;case"End":$("0").currentTime=$("0").duration;break;}' width='0'/>
<foreignObject cursor='pointer' height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("0").paused){$("0").play();}else{$("0").pause();}return;' transform='translate(23.862603,8.940526)' width='261.81812'>
-<video height='100%' id='msvg@0' onmousedown='event.preventDefault();event.stopPropagation();event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();event.target.play();' onplaying='$("kbdCtrl@0").focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
+<video height='100%' id='msvg@0' onkeydown='if(event.target.controls){return;}switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;}' onmousedown='event.preventDefault();event.stopPropagation();event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();event.target.play();' onplaying='$("kbdCtrl@0").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
<source src='data:audio/mpeg;base64,
AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQACn0NtZGF0AAACrgYF//+q3EXpvebZSLeWLNgg2SPu
73gyNjQgLSBjb3JlIDE0OCByMjc5NSBhYWE5YWE4IC0gSC4yNjQvTVBFRy00IEFWQyBjb2RlYyAtIENvcHlsZWZ0IDIwMDMt
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-3.svg b/macros/latex/contrib/media4svg/example/beamer-example-3.svg
index 0640c2aa5d..6e87b41283 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-3.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-3.svg
@@ -9,9 +9,9 @@ function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUcAA0AAAAACXgAAATFAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCJgc4G6kHUZQPTgLix0FOxmtKiHKJuFzObaW8bBS/F//j4fv9fr/2Pvci5pkElSGphig2nRDFKilIyX9+8xTfz+O23of+00Z7OKsJIxMxOm+763FRWfkfCzD/1zwNOivgbydydk1wQL0orOANaG+iAyqiiLQCah6OEpA2ANugu0G4ynMh4OfOf7Ph196l4jpHtsW7mnzIfXgCyfhP3oqT/iKww0MPzqMrABzpKlTDX17uNNjNW7x3ohK+dQcjeA4iPfRwuyOVajVq1qGrATEq7m+LLTDXHDNMLwRaNBGURCLJHXiLv4aqRhOatUCrNmH/s9kLREMJ2sEQMAHiHsQnoMIiTtHU7uRNs6pWQi+Mwyik8XMCGQI48atpI0tkjwi+Nk9F8HEzg9npkvn7MbvVRjV37kbjgzG3biHmJtYCQrMGePRqjGEVobFHmF2LuIQmeM0CoJc4zzhDaA4tQnk0xlxm1iyTWYRmx409W0AXsWsRPws0awCOYvY60Dc0OZCjok0PY3bl3o03ERO57hKhuWA2B+AZg1nJ5uuY3XnxJkLamllrG8NUn3nrkFKFl93at6t79o0FZgRiVyLu1BEOvXxXSe8iZi3HV9NrQuuQfheVPhExS80PYva65U3Mnt4/W4LRoLA9Yr3jlsoVoNZdvhGDbAypaLfrrGoj43lME74ByhEG+jBmEZdAGOHr16OA4NBb9uzoPUY1Wo5VsGLNDKBN1XlzEUPUHYpmhVnujBmExiJ/1qx1uwjruaK5L6mT6pMe51W6hNBBFBBobjW1RJwQms9/mF2UqF+u9oufUVfvSkqULVJDaYtSQpY2t5SyzUJHuKpvnn/EsQ8PTjnYXlqrf23RrC0tAh0LdgqtsGmN0C247wpcUjncvpTFud/24FGqetjw4qLe4SsVUdHjxeM7jG4citUaOfOVSZpvkYF4mq1TzvHNkosws0FCiPxNk+WOkkV8q+xgQyP9Cp0MdYsqu2NkUemwEdnOkdbBVPCIjw5k4iFCx97MMEotgC+kLFnaMgaTMsZejxqvJLckR+v75hufNTTa77RPYrzeEMxIKyZYZ3dy5Q+tZN/ooB/6Za02NcI/iVE9ZpOfWZca8CKnZGROIZXjqb0JqSplUsu76gZw9kbJ4Bh17uDYg0N0DrpWpihRVLrQIWKqfdjBk+/z2JoPFRDd72/s610gjWoynUBO2G0MKSHNXyTZxo7d/ayxuyLJH75MIY+4pyOSKk0ViUsqUbNZGsfcj2RSixHpsm70xMrAKpFWGxOTNNHP0hgAALYg8AzaKuTBB8UWAf9+CeNy1BaEi/DV9qAA/dcoemUEAAjg761Lr4t1g36ICO6rA/agivsa74pZ7kSLBEF+mdvIKzJAGYWEg2+PG9aA2AX5g0tSbGObqdBjXWSoeEsagwySrw9CuwM8kAiBVR4AtDiHQKp1KNIVCwqAWruP7k1afCuiapXaAKDYYABqQ5h1m/RY4VajNnIKcHvXJlcArGnWpCP7+DbVKlEUPMhQAlAqlXMfajYQckqnV0IpyFzwrTBUvq26klJ4yKgAqrLcfRWtlJIr3b3cryhDAGcm3aZd7coRinw1L9zZ55d7yGBVH8xWAkAKvva/clstixUnSZoMOXIBAAAA) format('woff2');}
+<![CDATA[@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUgAA0AAAAACXgAAATMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCJgc4G6kHUZROThvi52HsQNtqhiQDC0lLU4opaD6PQ+XEMoLvbZb9/owW4QBnj1DSEaL2CAyEqSs3RwSRU2cuZxwC4GAelmxONnekOkBHtHdOJ+NA/Kz+B4iNWsLj83/N01jaBfC3iczWxleNixbdm+iAiigirYCah6MEpA3ANuhuEK7yXAj44PVPm+DDd1Zed50jNcWTSqSH0jt4BKTjM5VWjBTMBNfw0K39q05iu+uz4n8H+9PrervpmdeHVcLn1WB4bmusQwdut13NGRdccq3r/4ecTt7fdWnXolm9ukJwiDoCFomHJNDBY+avIS+hDvUaoFGTsP++dBPifyXQDAZgGHET8RogxzSpyGk18aYpzxdHRww4G5SBqhBDaQAHfTVRqAx1IOYX5aMxPyplEamj2tYQmdGkW1omZDd8Hz+G7CMkAjA3DHJmCCEwiDkdiMgI5MWcy3A7uLPboP4q5jY7YQKDEC/b2CjXiLn5h8vToB2SEcgfDbhhACIPAPOQiwWxNCN/BpGBlYlHkPUavY25mwrNQBYRauoBIgu3HkEoyjWuzQ6jfObjTSsa9T5eXeye/bBdAUMyAHmnjiWmb1dpmxR2hGNDzHBkFEp2oegTIdujuIHIA+VHiFxZa6IQHBTVgcRLj1WuQK2auRGWbAzSjPEDQk+wZuc5j3FwAiLAnEEE8mKIIHrwwBtgHmZ6eb73GLmwD9Ggf7ge3Ckfl9ACWVx3KFy/Qnx9PeaUEhsbRxexRotQyxv1S3GXTG/Q4lhQV8jRSVGtJk040C2R/1VMSpBkZpx9QH1BoZEKZbVFVVp1ixWlkl66JZ1tFlzrQe9rdfA8//nlZV2t2yOS9zsbp7cIiCmRasZSc6uneNILI5CpWB3RSSco99tevg6LO3wkNWXvkQFLb58y4bIdMg83/USONbyVC7dLkRKu1dKPvTBF3QINRRQWcpAPsdCjOvnVYlykZSSzxCLjttAxO46lpB8+GmPgpeGi7nL0i65K0CYW01GQ9o4TAN9VzENUt5xEKuasjoR6mZXKdIiPpF2i7DVpmTX9VUp2TBoMVlFjXcSWQrJ/t4TY+Tj/lszYqpkn+D8ock9u8jOLqx+wVqmOjKpWsSpTXwkMo62Ct3ysbgDee5h28GRc/MFTG4eYWHStbEqQUHqHrmeNjvvGpU8JJO+zRFlW3TJvwJxZB0esvDjoseGPvTnA5sWXfqRiBoy/4ZaHB0ytbpznx2qVd6cuhhfHtjQ0Hq3FpcFb05C5w+/akhrDJ714/+M1p/6Glqt3rQ5+fO6wAeClMH3hy/W5b6uvK31csmeJakEypES1h+viH43GKweCv26uee6I+MJfG3D2+QF70K7/P2YK6XU0SCBIr5vb2J+VIRsshA03xzl9EJtI75uUCqPjFSOiQ19WVsRXRsRtulJJF7SPZlvlICEElpoGaNAvOmAlLWwRZMY4CEqaPdW9ToM3ZCJvlDQBQGatLlAywF3r1unwtPMuuKqiyvkLVytVVrvkomuzj7/qlJpC1TRlhfkKNSdMHco1YBUz2YSsKiu+FYbKXz1VK6rTysX8onZi6ip0KVyZOTWyVcvl2K3mqmucWZmei11Nd2efvzKtbFXDbCWQBKP5r9xWs6yx1kZbbbfHPg==) format('woff2');}
text.f4 {font-family:ec-lmr12;font-size:14.346196px}
text.f5 {font-family:ec-lmtt10;font-size:10.909088px}
text.f9 {font-family:ec-lmr10;font-size:10.909088px}
@@ -39,7 +39,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<svg height='0' id='msvg@kbdCtrl@1' onfocus='' onkeydown='if($("1").controls){return;}switch(event.key){case" ":if($("1").paused){$("1").play();}else{$("1").pause();}break;case"ArrowUp":if(event.ctrlKey){$("1").muted=false;}else{try{$("1").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("1").muted=true;}else{try{$("1").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("1").currentTime-=$("1").duration/10;}else{$("1").currentTime-=$("1").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("1").currentTime+=$("1").duration/10;}else{$("1").currentTime+=$("1").duration/100;}break;case"Home":$("1").currentTime=0;break;case"End":$("1").currentTime=$("1").duration;break;}' width='0'/>
<foreignObject cursor='pointer' height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("1").paused){$("1").play();}else{$("1").pause();}return;' transform='translate(23.862603,17.070044)' width='261.81812'>
-<video height='100%' id='msvg@1' onmousedown='event.preventDefault();event.stopPropagation();event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();event.target.play();' onplaying='$("kbdCtrl@1").focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
+<video height='100%' id='msvg@1' onkeydown='if(event.target.controls){return;}switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;}' onmousedown='event.preventDefault();event.stopPropagation();event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();event.target.play();' onplaying='$("kbdCtrl@1").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
<source src='https://interactive-examples.mdn.mozilla.net/media/examples/flower.webm' type='audio/mpeg'/>
</video>
</foreignObject>
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-4.svg b/macros/latex/contrib/media4svg/example/beamer-example-4.svg
index 9a74558f8d..f83eea5f42 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-4.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-4.svg
@@ -9,12 +9,12 @@ function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKoAA0AAAAABdAAAAJUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCGgcqG9AEIB6HsXukhFiJSVm9s3iAX/ffuXfmeQVFoYLITL8uFcmKvE5yAzQ+sZ97M4sWRUQT9zN5KRGXaBlOW11TN8OxOeAH8NceKEyLPu4SDwMtHdPWxriAXyiNIm5vZlZMtKltaVcS6RAC3OrpHnh4v6S1h2RI2CJHXBcvYkMiKjxnCZEoVwIQAGD0wsQc0J4ivs/ypsb33CAAEiRohgT6owhohqoVSKUC2mdZ+Wz2FAkIeQIgREQACPNT5NLWcTUIWSaCFBRRxmywFkCKHsigmKYdQu2MVwuVXPV0IuWUV+4OVbvK6+rdRnniF7+NuFNZf8+s9WFjFH/9MdE78xsum/8ePn76btW9MyeOYOg7iNvlBeSZVHV3jTta7yvte9Hq8uTLPU5eXpsvXiiWLo0YvrflfEjua12b7dbF58re64FYRlOoWPHvhsK8V5/+9fH5xGJ6sG/1ETN5I/t+0lLngct8MbjQfLd5AojzE3J356qjAJwLevb/K6TecS6fe6wpSYTAJmwO+vV8+Fu58GQSAp1vTrsyq2b/b8VK8nI3fLR1diUpxvegKIJAfJ9d0U2GAElRIDnSZAgJMESYCDcSUpMxQUQQMJgRQNFCJBAV1EICidb6SCCnYpcA8nJOS4S0JKoBFSSGEoGcBn625ZXtN9bCysPexBV+K3MCI50c3eHM1cqCmJWRmZiX2MzBlcVkt7AxsHeqlRnhsSVVc10txFajWewVzw5XC1gWm8FuOI+rgIkWrm42Ad1iFkZmuBf5LUYzgkXHvBVXixmI+1xipggTURE=) format('woff2');}
-@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAVwAA0AAAAAClgAAAUbAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICoociBcLJgABNgIkA0gEIAWCJgdGG0QIUZQwTgPEj8TY1sHW6SLE0USZHWfL6nD4n//wnfbnDoqZpCnEVFkktYetk9ZrZ9fpPkFZUV8P+hNhcLttqhlngWP8+Q8MMHDOYdiwQPagt1ibVxXIfWSPEsukBE7RUwHKmQ+A911/y3XLlVg8b9v8kdgJAAHABfftVwHg+nbL1sXEGOhZPMBs6g7AuIymO3LDAAx4FiZMeGrrWzUIoMK8+V+Gzp60383CNkvkSWiZiRTlYC8E8sXC51aoUkvmMGSWOeadEMSAaZ9pe+zyg4995B1veyuC5UAeYNmIAcDoTGYCLwsO4CHiARZPeHkL+FGIBqOPCb78yLniuhhA/6sAAH8AkAhIB3IC/QEAAA6AGQMAYLqJ25k4qNNuHBcXExkoLSEqb919yEgB8SSO3ptEQZTBoHcqkEiBJPJGThN5YaZ20vKj4NIuk1O/Io5P+MmqH5/oFlwXsUq9JI5P2tJiIsFORjKQqIpk4IwmXmAMrMCJrJERZzovV2vu8+QML6n6dvdlnVj22amfktSfLmHVRcGlKZfowhUyss7uUFTfxDng4qxgynWI2qpXP038dHQ5Tc4zV46IGNDCTJdzkses+vbjKuekkReYArpIb+Be12IZBpzltAldlaOgGSXhA7r3JVXkBU40sU7BpVxDigRGDOzw02dvvQZoMDpSOPkGnOlzV0hbdYWOSyBVISBnPLeBStJVTgc0OkIXc/1Z0AfytgouIpEEEiBAZFaJ43rc616vP4493H7Y3JnJ161rGC91VCmVyqLFlXKV4piwdModk17x8SeTXPvOvfiCfcw+6ir9vPYAihoHw+hfuUx+kvwnadVnf7iNhW57VnuW3W2vba+1A7ubR2b+Nxjy2va0rNaqMkdjqUnDzDpTxrBzYYttsOFR/RM5sMtammFpayhdONhm0mZULh9cvULDx3H1Dke93JTBV1flK2mG3PQ1zKvlhZk2qWC0LCe5VRr38fX2/sOcKkWFPqeKrMmCzxP56ro8vaSpp7aierje/MOYoeroecvwsmd2r9hkb2/Jxh53a3LZRK1hZMP+oQ11akWxRZY2B301YJvUJst6Z5u1QD6Ez6+PLc+t79UXbXIMrNrUqzfm8JV1FrlY7aPK4u3/7KusMKfU5BnK8b671d2K22lvP9Vd3BbZNtRtbahp2i//ZcvVLZHPJLxLxnjswD53Sscvgfs3BtY81dezdvNg/7q13b1r1zkkb0nuLCiSutokVbYWKEobfr7d27Gp2l5vy2ldIf+2taVp5rpBCTW6fVHT1QUV1tbearSsqJ1FZT1d9ftbLzUOdVcDapjPO3kW/Zdni59dWb+yvVjFJq25Tl4iAOC7IPv53pPDz3nfefA3EcIycgYezMt5vwf9A01EvTMBIODIHOtwn6nw9xLZJ3eIRQFX3Ns9CfACAwQ9hjl5xTqXAwBzG8G29c9UcQBQEzDPKe+Yvl4ZhxUw5xcTc0xiAyTmmAR/k5ajrQEiyCC6AeT0FecKQAlL0nGolgJAgyhlXgovDCMAAAMeBshkkaibyUPEa8s94IUtWBDnDQYCIEwWtfyZPII5T/WAr49MM91cc1lh2jd3rhWoNtMM8w67zzFiSKw8ZjlisO1ahwzIClUTaK58g2XC8+QY8eEy0H/OyFBsnjkn1hY7NJBVRYGKuflZlqzH2wCgLaU55hqrrMilqmbBa4bKueYcVLUiWx0AA7P6/yJ8XLJUGSaqVK1GrRat2khkKh0A) format('woff2');}
-@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARcAA0AAAAACFgAAAQFAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCLwc2G9EGUZQvShXgZ0LmdoVm4TjhNKcq6raQporFTvzi2Qg+9qPte19OJYk3F0ySWBRLRwpiGQ/1MlYCTSyRSAzNjuqy6sQ9awQyj9S8DnTp/zcgwFno+b/c4X9njQ2ycZGlEd7/jTloTNEEosDCMTeGZ0dWAJi6sS6KQSH59d9fACmouxDwfs+XefDhwFLRNke2xSMVeTtf4e42Ob6yDAVS1aRpEqh46qZvDoBravJXtqRcoEYAChQYgMA5igIDlKwBzRqldE2JcjX/A3PLVLXw/+V55571Wo6aoCYS6aL2wCqES1X6Fw2NTYis0WwE4n8JmkEv0A1iCsRFAErMUABZbCW/rCwn40IBMkfqCCNj5F2zhDJVKa6p4OxOPDTD2TbgDupceZIkhuHZvRFJTLfaG+A2MUweXYqyO+fMwVixcwHGQ4AgFFg3dVjowdjAHKFUO0cBENpsIkFiM3Q787jzztDQ+eH4uI5bfrPk8G3Y4dqwp/hjkA//7GyFwEkdyjN/fXDp7M64OFPTVezWnFXJDK+di2JwCQ70j93at2ke2Lz//G7b1av3rweX8FDcnDl4aNUMdIaG5ZcpQx7cunBGpjUSMBNyaBWf37NgAUIRo0kgDtoYgkbRUoxEmgvUFjzTOJNwxux6iUSbRoYe9PdISfHhXVP10TZ3UQdj9jxu4KxrqrG1nyBAJ7mtK9UiUGr0QR1uSGnvjlO6/goeCJcYymUGXS872ZMCDWTwXyo3NHkx0RXmQ6e0fqEHyiKmtiZkWqoC9yHbfcJ8zfTOmT/Wz27D+WZVN5oONHSt61KpaQ3tbPVdHxXf8KwKEvp6RySUneINz+rUszgj0my/CC3BA2GZgSyAWKRtJKCSsqFMbljeGppWEYsaWcx+NlxoKVwm8CYyKEb8655p8dj4F41BlVJ9DWWCmF3uFv7MwsoiqmhA9Uaf7cpnD5rYsu8e2ZIE90ssTZD5oHC3bZipL3O4Z5wBx1opEiqD/seUkCj8YIhll7SSbZVz16ooE/dfDTNPVPwMH0v44h3u0ZTqq8ANAHthdmtHQ+mn1V5dfYK0IgkRXuAVoRCq4w+mRf40hODX7fx+ie7yu7Gl+LHEHdr6X8rHaJQgyMeSdiQlFXLpEJfZZhTyqCf9BCcU6zQEEEJodpgSSITAfmYANLoJgVRrh+UUJmXKKi1ebK81eacQZZPUCpYVTuLKKv36P1DrttGuUjVqWLIAu7dqaiwtAI4qV6aG/36VfLk0WDFjQYMTDbmymZrrZDxL1mabXmDFwgKf1GKTq/JzNazMLDScNHKvmXqCOG9pbWpj+uQVBrhw5qtUK/SORkMe/eANuJGlmQV4dsKI9QDkKu5o/oF19FHhIkWJFSceAAAA) format('woff2');}
-@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAI0AA0AAAAABSgAAAHgAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCJgcqGzkEIB6FcYysYROPerxMb6MSQbXfZ8/ue/8QVIDcAap/F1CpyCgAKh93JxOWyZeB8sTGMKpUVFzqnm9/+gJaoLEo6RpeorkN/lWwTRJr3G/y1nij4W7AA/Cv5/VAfrDAE4p02mfPS5JQoIlEnnHmrr32UdJch9uDpIxCwPN7nxS8ezSda3PkelxSkk6nxzhrl4rPwkgkZQuAAICNh+oWMGQo91ZDtqWGIyAAGRmLBJiVBRYpLEOhEBiqKn/i6g0CokYAIiEBUvkcsvYqy9MpEFUlgQI0o8BiLAcUGJVAKor+aCs7ik1tZevf+db2PH9Gaj8z19aR5s5G7phZ/jU3fultSf4muJ4tthcHuhngZhib/ZsKfyatlR8QzokzMMOS81Et/hcUdw4EOy9efba7a/Zfc1v+vdX+cnl1OS2kBpolEKRGpWzLdUgLAgBQ5LrlkOvkuhmBwoAEEkJgHQE0O4RAUmoXIFtlBwKlNlcEqGl2XxZFi6QVyLINNFYaNL+2ptsNJ2wej4ITJ5+ngPUOu7d74jbo6CaNGrdM3TIHNdhUkyATptzpQCeNe34yAv09dHokgV7pXcMqAhVhzAnfdzrYpHN7TMpiLY9a6N1RH0oA1djB/Zxw1XSgylAgBnqd) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAW0AA0AAAAACiAAAAVdAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCJgc8GzsIUZQvThHix0FOxmueRXNqRU3v2E6zsgntUERERIHQ8CV4ntjM3h8gMqwLWfMkNXMqJqHtGZyYegZzzQS8BWZp0Rwmar+JvUw8/2cB5rlfXqbV86Nv944gCQ4oqiwqDYooIvloNLABRvKAaD62DWOXPXkSIACv3P5+D8Dbd3djdvNFnpMTsUAdo+4BArBAPiAuChSWAYEhgHfS8uFL1ZPZZThpXeao23m2M53hdBWV6L0aYVSTRd9bQA4GJpNYjMsy1rKBzWxlV1o0ENa/bbvExS5yjrOd6QynJAQmCYEgiChAwV+BjYH8tyrof0CYSBQ0NkAGoFdM7QIkLQWxmXPKgCqQq0F+LRSaQAeq6DFRXs43UqZZIbnSKVnSJFViS74kgSqzorxCeoptZZqnnqEekf6l9IbOwK6fBWbJDKG5wg4kRftzUOzA+/WSM1dmrmlteN2kHVy/6ibsQk3Kh+INLck9r/1rlFxVPw894pxLnbgA1+rSX7ODm9Xn3UcumJ5fhjNS17R/Vbz1/f1zVxQT7hF+B7rQo264bj5wT3+2Un8w3hvav9Z/xqUHbuiHn3RrQjcS49ZV7pfMoLsT6QjKHkjOIC65ec8dpZ5XXhsstcWfgtY05kI7QVTZ1ULaW7wxgfu1f/7eM5GWbghK3BureDftAGBwJ+KFbsqMlMKr/ozrS5UfCQZfB1Z4R4TvMRT5gpLqMHUpqauYZR4uoK0e1D40bNGiX71mAcmUWt3dHKxxhfTbcwabpAqm+ZUKeHZNef1l/LN7Bnp6OsKDoVe1P0UX1Z8xD725uhmQes4OvOfeJGNnR85+4Tw+63GlJVNdFYmuK0bqKYwzjBR1hFOTU1LhH+3LrO+R6wH5MgJMaVN+pfqcsvvOAiVT/o+qits+vWgdUweLZbGYkSm2M3S3VKUyJaJOy6r/vy/aZGJqJFMvR4cM1gxW01U2V31ee72jV9zEWzGWHGJnIivpLCGcetjhe/Ejl87tUR0aVvrFKi6v7RURoy/guTdGxcwE/qjKno6SyKRUfUyNvPOqjvIOetXv5K3IYeH0tQVkpHeJo6o0GraqpxueoU5F8EyZleLlmVERtLi43LPZXNRQxLD8+4ZK+2Myq770jIUPG39i9QZnbR1RmSyrz3COTVauTpy0CqK4urR/1p2Oy75zOdbEsP9lLyuO6qo629mrgVunTG3ts+nuMRO91B1S3laPAU9fD9lX7TO7sOaoKOWd+67SoLEci8+XGtImOejo7Ld+fsx3EYTs5wsV9hRLghuOGGb66vQloRhpuF9jcEL/RG2iaw8/Ks/K2XoGWO7RpbU1AxgWSXyNlcfdSeM0IPkz8qSls/Pr6HY1B13wuRU/1DEJVr7UHF2w7G9SNtPKtHHr+EWwsrX/jI7Ew0+3bZSRVK2kYWgi6+hp5uYtNSdzp1YtKahqaxzfvuHa2TLzIQDcJHT2uzls8l3ippD1bolsKGELxsBYwnZnSP7VWHnNAgg8+YT+rwtP9PstQhpfnDZ+iLy0hnLV7UAEBYCAuj3djTnqbADlIoTNM2UNMQAZD+psWuRrauQWamV5leQQUw5Otajo2kdFQslT1t0QIJOBmAAoQBBgEB0AQITlSAd+iwyKgEEd8wALm7MWh4hwBwZiRlFoAIDBKPIAiyK8W0PkcBlrWcdm4iRg7brN8QSMYAPr2Zp9/s2sYBkOCTrowqEPDstwae9V2kCNk1R1S+gJutR8uQzqvXnFMifR0eX0cZa57WMRlaLxZHu39utbF8wwsc1sYdWYPQ7xsel4ztA63tHFWPUMrQtQBH3mP8LbJBnGCEYxkclMYTozmQcAAAA=) format('woff2');}
+<![CDATA[@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAK4AA0AAAAABdAAAAJjAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCGgcqG9AEUZQMxhCAnwe2e5QiEFaUZQw7YWDzzWDZRM7feBEP3+9HO/e+9/+qJFM8FJMsIo3pzCYqnpjOdOskKpGGR7zRVuB5mtv7Q0MkTqN5pxQRu9sqNTCwLl9symAVkD5BCYpiGhwhtgtFdW11dQmI/D91MxybA34ATwsoTMfyLvEw0NIxbW2MCzihNIq43ak1almYzbLLoWQXAj48ft2Cj2+H37dmKQfimYZ8kG/xKN0qvosjSU0XgACAY3emB7DIy3+brQv5TwUBKCiYIGC3nsCEvhmoqsDi5uWzm18JEC0BiEQCQJyfMpw6m/cgNpeggk504xqsAlTsZIDOWpdiKFt7o6fJ0nFJyqC0N9G9DcqcASKdfLWCQD0LxM5LuxRiFtds8Ho2u5KdH55ewveRV2dHGBgC7M6RK9WDN7mCs0Pe+Z0B0kBwDqwSOt9I5A9HplMO+018XaqWTKeqOpW3ETfYPJJARIr63lsSHV99+f/3kyTVfRndkaEfla3hyBJj3h805iSvK0s+3duEr6HcdpA7wJuwa/e/o/orvWmbzypTkgO0oA3nILaxVrF4siDY8g4aXx3Y/b+zp/w4DkOtzUpn/oNOCYL8xzvMygFQOgXAZbUcYIFyQN6iIqjOGYNECOwXAHS6Q0DqMEhAMWtBQKPHcwFajZeKqF1SP3RQHDQBjXG/da1uL5xwdNZ52FL4rswOR729tPMjytmRKRGImBqmvScltqmxjC/ZRCTw2hKqUOejmQSR2Zj7p4pBjDOf6SQqgzOOFO0a0WmKBSJcjLxxEBEtPDfvqjiCPOgUuSI8hU4A) format('woff2');}
+@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAV4AA0AAAAAClgAAAUkAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICoociBcLJgABNgIkA0gEIAWCJgdGG0QIIC4KY3Bek9w6mtCIqeQr+7azIMJcWXVLHpDGYQBPCMgJz4YAjwB/l9cB/QLH633Ngjwz+ebT5q+TFdHdXQmWAiq4UlFd/gMDeMBNFYoYLaTPyu/AOYdBm23/QZLeYm0ekVQNcr/gLVIskxI4RU+RYHjmA+Btswlj0j5l6zrV/YKopQAB+PKZXw4D/PBil8f7eNGM7CYA3aYvAnnSXX6loSgogcH4hYsOmGIoA6AzbabQ0xihH/GGm8k0U5mb0CqDKG4Z99kiFMBg6YwBMwSJcppooe2pIEil1N2nbSpMCAkWRxKwTKKAakxigdNgIUAgAUOSVNrxo/CZMF9+ClAQ2VVFXQ4gT6UAFAKgClALJAb5BwCwQD0UAO0GOxks1GgjaytKfslITSmu0tY4n4RSWJJipaoUpXQZPVEnXoqID0Ib+cDNjZ40ue9y0TuJs+99XtMHLbOPmj3jcl+xbuhbn9f82f4R4sZJKBnxQ71kbJg/cJoxznoTqp8bv+sWnXslcXh6qHDp3Dfat+OJpw+qDj37lnVfuVxE39LJbyU0cbcNYb7Bz+GrTcZkZiEkWrfvcpXLo8EnEn/67bueiVGY4Zuc5PdbZi89UjiHwgKnBTSR7tjXXFMdoTTW0ga6IkcyCge5c3Tzr4f6wFmf38QuN2QNYS+nPrDOgysnjgBzhSZ28kyM08e/lWjdCm1fQypCQKv//ACHhHKdvN5U31T5KtefhezE7RdcTsSLE4fD6zqfl806kDr6W4V3hr1Tb8RGv56bbLNqyUD1tKtbTwxU2tVb8yl/tvPRY81zr3++f9+4arFqRn3SfJu2fcqSvB4P7kh+VftXom4v7v3C0mfETZ5N4jnR7DGLAK/0q2z8P6n4/hdq1nUbNJJdHRHR2DOi9pThThdfZvvR6+HgIvmcesNOZFN3lqGIaI6+v2xkIAeOVuwlSVbi2ODXresOui60Ya1RPdxJvpHHsirN1tVuPBteIJ3+p14NnJa4PDTE5G/C1SpBt57bBZWj0KwzVlg3n54e2vW9L5pM6Vu8tmZa9Li2wKvPDFit2Z1jq5y8NXmLhemUOwmei7sxkd+DCBHyECcjd7n6w/TV26xFQte0VDo0PUawb/Xr0nMnUbJiry7tLj16l86b15i2h3bi4DMDzrnhY82TO0YpUSoqL+BsJsetwf+1aijsTF2sfFrCStgGN92zOn4J+PrjxA3zYwvH5iaVjI+NKhobH4+DBg3OkylwPsKMcDJKEfz+ZczwaaNo5be6B8i/5/o7GsfLMJiyYpfjw5LOnLvICK415iavjqPzrbcGfN1ncoERYGjJ8FONmgh/drfbvdY66FEymI6clpUAcEeo3+ZU0vJ7ozuJ4CeEGpUysIEDKe9NyCNoEOqWBRB4d+qd1WMj2vyf8ubhE2Jc4af0F/0ISKEQdB796ClGmAYA+guCLVpIZpIFIH0B3UMnnU6xfjvWa009+YNm8j5VtDBV5H0q8z+DTAMGamHhVcppYQbL2NRCYpCEZGphGYcCggAd2IxNSjEFLwCUgAykG6owih7gOTI5QYpnMYhNozgQuqEH0fSAYsTbJijABWZRTyutcDBrdmsrB3SjkQbaLi/fQiXlZNKIejSgAq2owGRK2RSqJLCGNFFMxEY00PPhMtC6pbI8c/vmrZl8Znnppioy5N22c9MJ2b61FRBRTgutVFeW5VJUM/GaIf+2zVuhqplsJQCKmQv9IrxZNWpQm2Z0wYgJMy7cIDAEhgA=) format('woff2');}
+@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARgAA0AAAAACFgAAAQJAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCLwc2G9EGAI7UTvmHgWgQ8bjlz77IQXLiEqgaXMUkFROg9VT9i6hQ+v8Tlwv3Atm+wbNMf832ojFFE4gCC6M1aWwMLA+8CzS2dAib3GoGbcVFgAC8cvv7JwHevif0zGG3qCQ5iAFqt7oH8CZF+YCAWgsq7ufEW/josNnhmYDLSvV3PIMJ6jSmHasd2UIpbxQti8N1OgIWPhQKl4UsYWU8YO1ilg8Rv/DJJx7L2hIThAZQgOLE54JKI6VjjH+R4PND08rUOkDiUSSweJme6SCNIGOn60AzCgC1ZXR+na5XSa60iF8saZA+y4ptJOljDnaWG7X2HM28ccTrEr3kkTdsj4tmoWtEQ7x6eIDIa7b3xgMXiBs9ftyytOhpy9pDxLYVG0rylGHLciCHGXUfN+Da8Ix4A+SvA3H5k+jre0LXvLFjIq/mrbzhvcacbfDq2+exUZIjduzYEgSBpFDhU1cVV3KjY8a4Ei/gUNkxk7J3xQmpIZh79/l1r9557Uki19311G3tLrvsrquIPGvtGXP8uLXn0qOwS3olz1H5jXtuONMRcbmGezQZufdSvnb76dMiFUNNQBzogxUNVftib0jZad/pz0sfH/d480sLCyuS3xh8T9+ekyaFsl9MCFW0dPXTkHEyq/+xbpMb2rTm9qucuDk22elfVP+jn5eLkr9/KDH2X+6HeefrSoprY19F2b361xYTLyqpa/zyYGxIKCVx068p/XXppnaNRFxgAq7G3BQaEm6ufrLlk5pZqO6UW8fL6+9eG7vyrDh5ytotbOd7ITM8dMZSMob7DBu3eJ8+fL7aPyNzb5HbOqw898O8xbXFBWSHtxsOXsmoKy6pW7Jp8JSlo2VdetrODJ7eOO/C3D72tMT6nJd6TRlrNfydnJpUlBSuK84ddWsPp2/avGXzk/J3Jby8o90ln3+4PqP4j55u4bgez6ZbcqdfmXdbuyFN4TRv24FUHtyUWJiUmvJvk12o/kwtKH62fDCXJg9eOsIl9F+pW3jE2A6vG/drn6E9108OdwfgJqGl680JOt8FbzKNd6FMU4CKr/ENwCBpyr9YJuqrEUDgp8j6i6amdP3NZ2tfPMT9gMQ4hToN+FAACKjT8b+ZoJIA1EOHWVdJlIE8dP5u/elMIp0opR95CGARQgdAAYIAPWkGAHzMRgBQmCQjAGhUMR0BwMDmAgQAEz8PoCG6H0UiYJvGALJsBtnsfIJJOtewkEWsZCUBHFi4aOXKgAOtLGExK8fnlzOHWZQSpBmHUjpTyixcmtwxnTZAW/jcEMSh+EktZ/byObNKg81OaefSWW5TJhAnA22bTqVBZxqMYRbLWcG87GA0OCPLO+B+gWaHzAEi9gLqUdxv/YF1citDGc4IRjOGsQAAAA==) format('woff2');}
+@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAI4AA0AAAAABSgAAAHhAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCJgcqGzkEIB4Hdgz5F2FoWfKNh//fz7d97n0vRVCUlCAFTn8JZBUSyN/4Lk9gJAyimjVq3KymSWKN+5XG8uDN8S97wAPw3vWBJBB4QpFOe3YuSUKBJhJ5xqmeu/ZIhGmK7uCQGIWAj69/aofvPixemyM34rGSdCd9wD27VPxsUiSSshOAAIAVO5dsx1hjc+/WWGtT024EICNjgABtssAAhSoKhcDYVsufuPWNAKJCACIhAVL5HLL2KrV0BtFqSaAAHVFgIGqAAnUJpKLoG13KbsXKLmXnf6907pqv3JW63r3cpVu6fC9yt9m1ZsfmX9VWV/+3OiNGDqsPGxkHjpgOnoUJbc87FP6ZbKX8Aak5WQzMsLR4UYn/C4o7B4INN1zc1KPtv45d8t9H7S9rrfb0JTXRUQJBarbarc0NSF8EAKDIDTXIDXLDbIFCPwkkhMB8dUBHOwVISl0FyIZZL0CpiycCVHT0RhZFJ0lnIM+W681L/V1ZW9HTU/sdcMwxM9l/4NixmSx1yEHHhyeO2mWHqsnqJqpqqNphm/GW+oQ2yVQ3mJNNTPxkBPKju3ZUJ9cnVhvVHdvGq9hITJo6vlMmT5Sx0g5HHbNH2d7LVcu9O+on1SdSLezYNj7hqulClaFATEy6AwAAAA==) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWoAA0AAAAACiAAAAVTAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCJgc8GzsIIB6Hsduk02li+w5gyCqcVo8sB1YJK1iRI4fAiewwHoGTA/QBgXXH0hH4AMAHiIEnAOLf3f2XWMQtwyygtraAqf4HmA06ccyWaUWjte1GkAQDiipbW5ZBEUUkj0YDG+BHgeH7s/0wdtmTRwEgAHh97j0XALx1ueqxm030lFbBCHBLucsAdFBC70MpDlAcowEAnQCEOq3qQepp05v8f76eOYcnnZkNzhxViZxlJEbm0f9nRQEM4NHJAA6DjTLWBJNM/9KAG/O+3R677bLFZi4brY0QeMgDIEhDHAAOkiUIMEDzWxX4P8ATXt4AgwAAPgDdzJkOgP5XINp3RiTABHQYoF8Q8nkAFlwxyIPzGr4Wx/NRFEgZ5EdJZCKBgskG9L4VpVGUS4LRl7erB2I/qy3MB4J+CLzzIGM4IOjxxLTDRILe0OJ0nTzYxJhB3SgIevMht+QgBqdGpG4/nvKMaU1wHtKPkMq2PO7EDzTVpTYLemv0tqvkjANHTpDd2cS0Z6Sevnz5/oEwOB7T1ok7PaLF33r9cn/uCG0woRamNfWf9vj6iS30cbd28SSxnXvGI+Srb+xENYKS6zY729N6+Xyp69PmbRECafvJ2A1zYdpL9P7VMtqd1N2R15j24IpLZNQNjlP0xk9qq6ADVsdEvFIr2Z1pTZr9uJpxWy8/hqHvGtO6DUWzoFQ6EbIXzkPMeYQW0EY3mEYGgRixpqYqCJzTffHsYG1Dqd+udpyFU+zWU41UhZpSfV9ED9dWl2tduJvYxLT9oaH6xiOkHtYOwvlU0Bt6tQrmzV6bP5PvNd6zDNy/YcFoR2dJtI0zBZvG2URp/Nhx4+Ef7adDPRad7h2cFMn9vwiLHhD5rtzXUh7xPWfCm415oXnl7apOxJhLyqU2xV2rlZDJcUOCkm3/vmtOKisvSdJpSf/y7H7W/IxK5dPY4zIb6g6L2m2raFOWHN8xLnr81XU9dn/gwPop3syjKuKnGiU11z5oWGFk90u7Q8wVkX8pyUFD4iaHKI3lJQ0zFl2bMc8efyFo6DQeG0aJgld+eHslUdxhjO5eHBwSOMivS+M4e/dJC/oOmDu/e3KluVgunv9dgtT2uuAXHxFc1eiBPyTbMnmUxiTbvHgfeZlNcnfs5Ia3FK0W+11oP/hXn/Yxwzz/bEtDF3dV6S/PypJWd+m6us+GS2062m3txn1dPQKPmvvPXtzYY/aSa3OcDbmfUvu29RqwPaFiTXzZtXvf9NSGfTsI/W/4gOjuMWNo7MJhprq7DxwgiVnu19jWoXh0LsucGSHO9wuYFIzqkx+am93bVDUmfLm0/EIoOsyxP4rdQxOnztRC063t8vHjaummpRNJL5O9+w7+e4w/uvVcaXX7/iSlbtm4bvSCjyePS4rnKKHS6rekWyV/OiYgsKtpoGhKS2yfPvboocjKCgCAm5AxTnny+Nbq9jC+UyIaOFkLyoAyytp9HvSPRtNbJgAEPLhy+kw//6JfvQTD56eNVYN+VhzcOQBe4AAABHDnDE3PbE6Cc4AsGuv70kiYAaD2ALcZKfUVYuo0YpNSUwXAHBlytbzon42ohBQU480QAF+U4gEAHAACAShjAQCAF4agDiJG+KDINSBOb64RAjbN94AXzsMA4r3BgQGAa0CdIK4RodRrPRBgH0YZbQKFFUbtCYoVqDHWGJOyLz/BUIPJrCwyyQrIBnNI71XVQFJkKROqVaYBXy4Duk8YOli2WjLlAnmwI30s8pJPyUqPCNbMboDdYBNMNHzMQZkyNjOeMzRXLJkYqwVD6wDgECy+/whvYlOlRp2OOuuiuwa9AQA=) format('woff2');}
text.f2 {font-family:ec-lmss9;font-size:8.966376px}
text.f4 {font-family:ec-lmr12;font-size:14.346196px}
text.f5 {font-family:ec-lmtt10;font-size:10.909088px}
diff --git a/macros/latex/contrib/media4svg/media4svg.sty b/macros/latex/contrib/media4svg/media4svg.sty
index f0451ae7ec..5738846318 100644
--- a/macros/latex/contrib/media4svg/media4svg.sty
+++ b/macros/latex/contrib/media4svg/media4svg.sty
@@ -38,8 +38,8 @@
\RequirePackage{xparse}
\RequirePackage{atbegshi}
-\def\g@msvg@date@tl{2020/04/13}
-\def\g@msvg@version@tl{0.2}
+\def\g@msvg@date@tl{2020/04/14}
+\def\g@msvg@version@tl{0.3}
\ProvidesExplPackage{media4svg}{\g@msvg@date@tl}{\g@msvg@version@tl}
{acrobat-9/X compatible media}
@@ -275,7 +275,7 @@
}else{
$("\g_msvg_id_tl").pause();
}
- return;% <-- this prevents download-video? dialogue in Chrome
+ return;% <-- this prevents download-video-? dialogue in Chrome
'~
cursor='pointer'
}
@@ -284,9 +284,52 @@
x="0"~y="0"~
id='msvg@\g_msvg_id_tl'~
width='100\msvg_percent:'~height='100\msvg_percent:'~
- \g_msvg_controls_tl \g_msvg_autoplay_tl \g_msvg_loop_tl \g_msvg_muted_tl
+ \g_msvg_controls_tl\g_msvg_autoplay_tl\g_msvg_loop_tl\g_msvg_muted_tl
\tl_if_blank:VT\g_msvg_controls_tl{
- onplaying='$("kbdCtrl@\g_msvg_id_tl").focus();'~
+ onplaying=' % in Chrome, keyboard control
+ $("kbdCtrl@\g_msvg_id_tl").focus();% via separate <svg> element
+ event.target.focus(); % Firefox
+ '~
+ onkeydown='
+ if(event.target.controls){return;}
+ switch(event.key){
+ case "~":
+ if(event.target.paused){
+ event.target.play();
+ }else{
+ event.target.pause();
+ }
+ break;
+ case "ArrowUp":
+ if(event.ctrlKey){event.target.muted=false;}else{
+ try{event.target.volume+=0.02;}catch(e){}}
+ break;
+ case "ArrowDown":
+ if(event.ctrlKey){event.target.muted=true;}else{
+ try{event.target.volume-=0.02;}catch(e){}}
+ break;
+ case "ArrowLeft":
+ if(event.ctrlKey){
+ event.target.currentTime-=event.target.duration/10;
+ }else{
+ event.target.currentTime-=event.target.duration/100;
+ }
+ break;
+ case "ArrowRight":
+ if(event.ctrlKey){
+ event.target.currentTime+=event.target.duration/10;
+ }else{
+ event.target.currentTime+=event.target.duration/100;
+ }
+ break;
+ case "Home":
+ event.target.currentTime=0;
+ break;
+ case "End":
+ event.target.currentTime=event.target.duration;
+ break;
+ }
+ '~
onmouseup='event.preventDefault();event.stopPropagation();
event.target.play();'~
onmousedown='event.preventDefault();event.stopPropagation();
diff --git a/macros/luatex/latex/emojicite/LICENSE.txt b/macros/luatex/latex/emojicite/LICENSE.txt
new file mode 100644
index 0000000000..0d1c9ab323
--- /dev/null
+++ b/macros/luatex/latex/emojicite/LICENSE.txt
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 2020 Leon Sixt
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
diff --git a/macros/luatex/latex/emojicite/README.md b/macros/luatex/latex/emojicite/README.md
new file mode 100644
index 0000000000..7c72f2552c
--- /dev/null
+++ b/macros/luatex/latex/emojicite/README.md
@@ -0,0 +1,72 @@
+# emojicite
+
+[[CTAN](https://www.ctan.org/tex-archive/macros/luatex/latex/emojicite)] |
+[[PDF Docu](http://mirrors.ctan.org/macros/luatex/latex/emojicite/emojicite-doc.pdf)]
+
+Scientific publications are too dry. Too much math, too little emotions. Science
+needs emojis!
+Leave a small heart to value the hard work gone into a paper (Smith, 2014 ❤️ ).
+Flag self-citations as in (Sixt et al., 2019 🤳)
+Finally, you can express what you truly think directly as in (Wakefield et. al, 1998 🤦).
+We could also indicate, how thoroughly we read papers (Van Wesel et al., 2014 🙈)
+
+## Basic Usage
+
+```
+\documentclass{article}
+
+\usepackage{emojicite}
+\setcitestyle{authoryear, round}
+\bibliographystyle{plainnat}
+
+\begin{document}
+
+\emojicitep{einstein, kissing-heart}
+
+\bibliography{bibliography}
+\end{document}
+```
+
+See [example.tex](./example.tex) for basic usage.
+
+## Examples
+
+Table 1: How did you liked the cited work?
+
+| Citation | Emoji | Description |
+|--------------------------------|:--------------:|:---------------------|
+| (Einstein, 1905 😘) | kissing-heart | I like this work. Here is a kiss.
+| (Shannon, 1948 🙇) | bow | Wow, I can only bow to this work.
+| (Kim et al., 2017 👍) | +1 | Good work!
+| (Zhang and Cheok, 2016 😕 ) | confused | I am confused by this work.
+| (Le Cun et al., 1989 🥱) | yawning-face | Boring work.
+| (Tishby and Zaslavsky, 2015 🤨)| raised-eyebrow | I have some serious questions...
+| (Wakefield et al., 1998 🤦) | facepalm | omg, this work sucks!
+
+
+Table 2: How thoroughly have you read the work?
+
+| Citation | Emoji | Description |
+|--------------------------------|:--------------:|:---------------------|
+| (Kingma and Welling, 2013 🤓) | nerd-face | I know everything about this work.
+| (Kim et al., 2017 🎓) | graduation-cap | I know this work well.
+| (Shannon, 1948 🤔) | thinking | I read it but I still have questions.
+| (Jones, 1972 🙈) | see-no-evil | Ups, I did not read this work in-depth.
+| (Einstein, 1905 🤷) | shrug | too long; did not read
+
+See [PDF Docu](http://mirrors.ctan.org/macros/luatex/latex/emojicite/emojicite-doc.pdf) for more examples.
+
+
+## Requirements
+
+The package requires the Tex Live 2020 distributon and you need to use lualatex.
+If you use the `latexmk` tool, simple use `latexmk -pdflua`. See the
+[emoji](https://github.com/stone-zeng/latex-emoji) package for are in-depth
+description on the requirements.
+
+
+-----
+
+Copyright (C) 2020 by Leon Sixt.
+
+🙏 to Xiangdong Zeng creator of [emoji](https://github.com/stone-zeng/latex-emoji)
diff --git a/macros/luatex/latex/emojicite/emojicite-doc.pdf b/macros/luatex/latex/emojicite/emojicite-doc.pdf
new file mode 100644
index 0000000000..4ef79c3566
--- /dev/null
+++ b/macros/luatex/latex/emojicite/emojicite-doc.pdf
Binary files differ
diff --git a/macros/luatex/latex/emojicite/emojicite-doc.tex b/macros/luatex/latex/emojicite/emojicite-doc.tex
new file mode 100644
index 0000000000..baf37b8991
--- /dev/null
+++ b/macros/luatex/latex/emojicite/emojicite-doc.tex
@@ -0,0 +1,182 @@
+\documentclass{l3doc}
+\usepackage{fontspec}
+\usepackage{emojicite}
+\usepackage{listings}
+\usepackage{float}
+\usepackage{array,booktabs,fontspec,geometry,graphicx,longtable,xcolor}
+
+\setcitestyle{authoryear, round}
+\bibliographystyle{plainnat}
+\hypersetup{citecolor=black}
+
+
+\definecolor{mygreen}{rgb}{0,0.6,0}
+\definecolor{mygray}{rgb}{0.5,0.5,0.5}
+\definecolor{mymauve}{rgb}{0.58,0,0.82}
+
+\lstset{
+ backgroundcolor=\color{white}, % choose the background color; you must add \usepackage{color} or \usepackage{xcolor}; should come as last argument
+ basicstyle=\small, % the size of the fonts that are used for the code
+ breakatwhitespace=false, % sets if automatic breaks should only happen at whitespace
+ breaklines=true, % sets automatic line breaking
+ captionpos=b, % sets the caption-position to bottom
+ commentstyle=\color{mygreen}, % comment style
+ deletekeywords={...}, % if you want to delete keywords from the given language
+ escapeinside={\%*}{*)}, % if you want to add LaTeX within your code
+ extendedchars=true, % lets you use non-ASCII characters; for 8-bits encodings only, does not work with UTF-8
+ firstnumber=1, % start line enumeration with line 1000
+ frame=single, % adds a frame around the code
+ keepspaces=true, % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
+ keywordstyle=\color{blue}, % keyword style
+ language=Octave, % the language of the code
+ morekeywords={*,...}, % if you want to add more keywords to the set
+ numbers=left, % where to put the line-numbers; possible values are (none, left, right)
+ numbersep=5pt, % how far the line-numbers are from the code
+ numberstyle=\tiny\color{mygray}, % the style that is used for the line-numbers
+ rulecolor=\color{black}, % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. comments (green here))
+ showspaces=false, % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
+ showstringspaces=false, % underline spaces within strings only
+ showtabs=false, % show tabs within strings adding particular underscores
+ stepnumber=1, % the step between two line-numbers. If it's 1, each line will be numbered
+ stringstyle=\color{mymauve}, % string literal style
+ tabsize=2, % sets default tabsize to 2 spaces
+ title=\lstname % show the filename of files included with \lstinputlisting; also try caption instead of title
+}
+
+\setlength{\parskip}{0.0em}
+\setlength\parindent{0pt}
+
+\makeatletter
+\ExplSyntaxOn
+\def\@fnsymbol#1{
+ \ensuremath{
+ \ifcase #1
+ \or \text{\emoji{globe-with-meridians}}
+ \or \text{\emoji{email}}
+ \fi}}
+\ExplSyntaxOff
+\makeatother
+
+
+\title{The \pkg{emojicite} package \thanks{\url{https://github.com/berleon/emojicite}} \\
+ Adds Emojis to Citations \\
+ \normalsize (requires Lua\LaTeX)}
+ \author{Leon Sixt \thanks{\url{mail@leon-sixt.com}}}
+\date{\emoji{date} 2020/04/13\quad v0.1}
+
+
+\begin{document}
+\maketitle
+
+\tableofcontents
+
+\setlength{\parskip}{0.5em}
+
+\section{Introduction}
+
+Scientific publications are too dry. Too much math, too little emotions. Science
+needs emojis!
+Leave a small heart to value the hard work gone into a paper \emojicitep{smith2014honey, heart}.
+Finally, you can express what you truly think as in \emojicitep{wakefield1998retracted, facepalm}.
+We could also indicate, how thoroughly we read papers \emojicitep{van2014difference, see-no-evil}.
+
+\begin{verbatim}
+ \emojicitep{van2014difference, see-no-evil}.
+\end{verbatim}
+
+
+The package is based on the \pkg{emoji} package\footnote{\url{https://ctan.org/pkg/emoji}}.
+See their documentation for the emoji codes\footnote{\url{http://mirrors.ctan.org/macros/luatex/latex/emoji/emoji-doc.pdf}}. You can also use \texttt{\textbackslash setemojifont\{\dots\}} to select a different emoji font.
+
+
+%\emojicitep{wakefield1998retracted, facepalm, see-no-evil}
+You can use up to two emojis \emojicitep{shannon1948, bow, thinking}. The package also supports
+to cite multiple works as in \emojicitep{sixt2019explanations, selfie; adebayo2018sanity, +1}.
+\pkg{emojicite} does not support more than two emojis.
+\texttt{\textbackslash emojicitep\{wakefield1998retracted, facepalm, roll-eyes, shrug\}}
+renders as \emojicitep{wakefield1998retracted, facepalm, roll-eyes, shrug}.
+Let's ensure science does not get to emotional \emoji{point-up-2}\emoji{neutral-face}.
+
+\newpage
+\subsection{Example}
+
+\lstinputlisting[language=Tex,caption={Output of the example is: \emojicitep{einstein, kissing-heart} }]{example.tex}
+\subsection{Requirements}
+
+The package works with the Tex Live 2020 distributon and you need to use \texttt{lualatex}.
+If you use the \texttt{latexmk} tool, use it with this flag: \texttt{latexmk -pdflua}.
+See the \pkg{emoji} package for are an in-depth description of the requirements.
+
+
+\section{Examplary Usage}
+
+Here are some emoji, I found fitting.
+
+\begin{table}[H]
+ \centering
+ \caption{How did you liked the cited work?}
+ \begin{tabular}{l l l}
+ %\hline \hline
+ \textbf{Citation} & \textbf{Emoji} & \textbf{Description} \\ \hline
+ \emojicitep{einstein, kissing-heart} & \texttt{kissing-heart} & I like this work. Here is a kiss. \\
+ \emojicitep{shannon1948, bow} &\texttt{bow} & Wow, I can only bow to this work. \\
+ \emojicitep{kim2017interpretability, +1} &\texttt{+1} & Good work! \\
+ \emojicitep{zhang20167kissing, confused} &\texttt{confused} & I am confused by this work. \\
+ \emojicitep{le1989gemini, yawning-face} & \texttt{yawning-face} & Boring work.\\
+ \emojicitep{tishby2015deep, raised-eyebrow} &\texttt{raised-eyebrow}& I have some serious questions...\\
+ \emojicitep{wakefield1998retracted, facepalm} &\texttt{facepalm}& omg, this work sucks! \\
+ \end{tabular}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \caption{How thoroughly have you read the work?}
+ \begin{tabular}{l l l}
+ \textbf{Citation} & \textbf{Emoji} & \textbf{Description} \\ \hline
+ \emojicitep{kingma2013auto, nerd-face} & \texttt{nerd-face}& I know everything about this work. \\
+ \emojicitep{kim2017interpretability, graduation-cap} & \texttt{graduation-cap}& I know this work well. \\
+ \emojicitep{shannon1948, thinking} &\texttt{thinking}& I read it but I still have questions. \\
+ \emojicitep{jones1972statistical, see-no-evil} &\texttt{see-no-evil}& Ups, I did not read this work in-depth. \\
+ \emojicitep{einstein, shrug} &\texttt{shrug}& too long; did not read \\
+ \end{tabular}
+\end{table}
+
+
+\begin{table}[H]
+ \centering
+ \caption{Special emojis}
+ \begin{tabular}{l l l}
+
+ \textbf{Citation} & \textbf{Emoji} & \textbf{Description} \\ \hline
+ \emojicitep{sixt2019explanations, selfie} & \texttt{selfie} & Citing myself. It just fits perfectly.\\
+ \emojicitep{blei2003latent, writing-hand, +1} & \texttt{writing-hand, +1} & Well written work.\\
+ \end{tabular}
+\end{table}
+
+\begin{table}[H]
+ \centering
+ \caption{Short summary of papers}
+ \begin{tabular}{l l l}
+
+ \textbf{Citation} & \textbf{Emoji} & \textbf{Description} \\ \hline
+ \emojicitep{watson1953molecular, dna} & \texttt{dna} & Helix structure of DNA.\\
+ \emojicitep{smith2014honey, grimacing, bee} & \texttt{grimacing, bee} & Getting sting by honey bees. \\
+ \emojicitep{zhang20167kissing, kissing-heart, robot} & \texttt{kissing-heart, robot} & Kissing machine. \\
+ \emojicitep{nakanishi2014remote, handshake, mechanical-arm} & \texttt{handshake, mechanical-arm} & Handshake machine. \\
+ \end{tabular}
+\end{table}
+
+
+\section{Limitations}
+
+Currently, only the name-year format is supported but using a number format is also simple wrong.
+Unfortunatly, the Tex Live package required by this verison is not yet available
+on ArXiv. If you want to publish on ArXiv, you probably would have to upload the PDF.
+Another problem could be that scientific journals and conferences might not see
+the same great value in emojis \emoji{roll-eyes}. Every revolution requires
+a bit of time.
+
+
+
+\bibliography{bibliography}
+\end{document}
diff --git a/macros/luatex/latex/emojicite/emojicite.sty b/macros/luatex/latex/emojicite/emojicite.sty
new file mode 100644
index 0000000000..3b459046b3
--- /dev/null
+++ b/macros/luatex/latex/emojicite/emojicite.sty
@@ -0,0 +1,101 @@
+%%
+%% Copyright (C) 2020 by Leon Sixt <ctan@leon-sixt.de>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Leon Sixt.
+%%
+\NeedsTeXFormat{LaTeX2e}[2020/02/02]
+\ProvidesExplPackage{emoji}{2020/04/14}{0.1}{Add Emojis to Citations (in LuaLaTeX)}
+
+\usepackage{emoji}
+\usepackage{natbib}
+
+\usepackage{xparse}
+\ExplSyntaxOn
+
+\makeatletter
+\NewDocumentCommand{\emojicite}{m}
+ {
+ \mjb_multicitep:n { #1 }
+ }
+\makeatother
+
+
+\makeatletter
+\NewDocumentCommand{\emojicitep}{m}
+ {
+ \NAT@open
+ \mjb_multicitep:n { #1 }
+ \NAT@close
+ }
+\makeatother
+
+\seq_new:N \l_mjb_multicite_in_seq
+\seq_new:N \l_mjb_multicite_out_seq
+\seq_new:N \l_mjb_cite_seq
+
+\cs_new_protected:Npn \mjb_multicitep:n #1
+ {
+ \seq_set_split:Nnn \l_mjb_multicite_in_seq { ; } { #1 }
+ \seq_clear:N \l_mjb_multicite_out_seq
+ \seq_map_inline:Nn \l_mjb_multicite_in_seq
+ {
+ \mjb_cite_process:n { ##1 }
+ }
+ \seq_use:Nn \l_mjb_multicite_out_seq { ;~ }
+ }
+
+\cs_new_protected:Npn \mjb_cite_process:n #1
+{
+ \seq_set_split:Nnn \l_mjb_cite_seq { , } { #1 }
+ \int_compare:nTF { \seq_count:N \l_mjb_cite_seq == 1 }
+ {
+ \seq_put_right:Nn \l_mjb_multicite_out_seq
+ { \citeauthor{#1},~\citeyear{#1} }
+ }
+ {
+ \int_compare:nTF { \seq_count:N \l_mjb_cite_seq == 2 }
+ {
+ \seq_put_right:Nx \l_mjb_multicite_out_seq
+ {
+ \exp_not:N \citeauthor{\seq_item:Nn \l_mjb_cite_seq { 1 }},~
+ \exp_not:N \citeyear{\seq_item:Nn \l_mjb_cite_seq { 1 }}~
+ \emoji{\seq_item:Nn \l_mjb_cite_seq { 2 }}
+ }
+ }
+ % we can handle up to 2 emojis
+ {
+ \int_compare:nTF { \seq_count:N \l_mjb_cite_seq == 3 }
+ {
+ \seq_put_right:Nx \l_mjb_multicite_out_seq
+ {
+ \exp_not:N \citeauthor{\seq_item:Nn \l_mjb_cite_seq { 1 }},~
+ \exp_not:N \citeyear{\seq_item:Nn \l_mjb_cite_seq { 1 }}~
+ \emoji{\seq_item:Nn \l_mjb_cite_seq { 2 }}
+ \emoji{\seq_item:Nn \l_mjb_cite_seq { 3 }}
+ }
+ }
+ {
+ \seq_put_right:Nx \l_mjb_multicite_out_seq
+ {
+ \exp_not:N \citeauthor{\seq_item:Nn \l_mjb_cite_seq { 1 }},~
+ \exp_not:N \citeyear{\seq_item:Nn \l_mjb_cite_seq { 1 }}~
+ \exp_not:N \textbf{emojicite~does~not~support~more~than~two~emojis}.
+ }
+ }
+ }
+ }
+ }
+\ExplSyntaxOff
+
diff --git a/macros/luatex/latex/emojicite/example.tex b/macros/luatex/latex/emojicite/example.tex
new file mode 100644
index 0000000000..5a43430434
--- /dev/null
+++ b/macros/luatex/latex/emojicite/example.tex
@@ -0,0 +1,12 @@
+\documentclass{article}
+
+\usepackage{emojicite}
+\setcitestyle{authoryear, round}
+\bibliographystyle{plainnat}
+
+\begin{document}
+
+\emojicitep{einstein, kissing-heart}
+
+\bibliography{bibliography}
+\end{document}