diff options
Diffstat (limited to 'macros/latex/contrib')
26 files changed, 245 insertions, 136 deletions
diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/README.md b/macros/latex/contrib/beamer-contrib/beamerswitch/README.md index 78923edafb..b2bba3935e 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/README.md +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/README.md @@ -88,7 +88,7 @@ first three steps. ## Licence -Copyright 2016–2019 Alex Ball. +Copyright 2016–2020 Alex Ball. This work consists of the file beamerswitch.dtx and a Makefile. diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-article.pdf b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-article.pdf Binary files differindex fb0f88db16..462f7f4e94 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-article.pdf +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-article.pdf diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-handout.pdf b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-handout.pdf Binary files differindex bc273c67fb..6b4de86e8a 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-handout.pdf +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-handout.pdf diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-trans.pdf b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-trans.pdf Binary files differindex 77ddeb0dfa..194dbf7fae 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-trans.pdf +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example-trans.pdf diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example.pdf b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example.pdf Binary files differindex 59f55e434d..9e92dcb904 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example.pdf +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch-example.pdf diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.dtx b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.dtx index c61a227ede..e683b58287 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.dtx +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.dtx @@ -93,7 +93,7 @@ first three steps. ## Licence -Copyright 2016–2019 Alex Ball. +Copyright 2016–2020 Alex Ball. This work consists of the file beamerswitch.dtx and a Makefile. @@ -193,7 +193,7 @@ See: http://www.latex-project.org/lppl.txt \endpreamble \postamble -Copyright (C) 2016-2019 by Alex Ball <ab318@bath.ac.uk> +Copyright (C) 2016-2020 by Alex Ball <ab318@bath.ac.uk> \endpostamble \usedir{tex/latex/\jobname} @@ -228,7 +228,7 @@ Copyright (C) 2016-2019 by Alex Ball <ab318@bath.ac.uk> %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<class>\ProvidesClass{beamerswitch} %<*class> - [2019/06/06 v1.6 Convenient mode selection in Beamer documents] + [2020/01/20 v1.6.1 Convenient mode selection in Beamer documents] %</class> %<*driver> \documentclass[12pt]{article} @@ -2710,6 +2710,7 @@ suggestions for improvements or new features to the % \end{macrocode} % % \begin{macro}{bsw@punct@test} +% \changes{v1.6.1}{2020/01/20}{Update expl3 syntax} % Of course, we would rather not bother the user with this, so we introduce a % command for testing the title for final punctuation. % @@ -2727,7 +2728,7 @@ suggestions for improvements or new features to the \NewDocumentCommand{\bsw@punct@test}{m}{\l_bsw_punct_test:n {#1}} \cs_new_protected:Nn \l_bsw_punct_test:n { - \str_case_x:nnTF { \str_item:nn {#1} {-1} } + \str_case_e:nnTF { \str_item:nn {#1} {-1} } { { , } { } { ; } { } diff --git a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.pdf b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.pdf Binary files differindex 5f976ef64c..d5fe18fa20 100644 --- a/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.pdf +++ b/macros/latex/contrib/beamer-contrib/beamerswitch/beamerswitch.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.bbx index 3777684037..ecb1218b8e 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.bbx @@ -9,12 +9,12 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is Maïeul Rouquette %0. Preamble \ProvidesFile{bookinother.bbx} -[2017/11/19 v2.3.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2020/01/20 v2.3.2 biblatex bibliography style to have entry type for book edited in other entry type (MR)] \RequireBiber \RequirePackage{xpatch} @@ -62,7 +62,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} - + \DeclareBibliographyDriver{ininarticle}{% \usebibmacro{bibindex}% @@ -106,7 +106,7 @@ \setunit{\bibpagerefpunct}\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} - + \DeclareBibliographyDriver{ininbook}{% @@ -242,7 +242,7 @@ \newunit \usebibmacro{bybookineditor}% \newunit\newblock - \usebibmacro{in:}% + \usebibmacro{in:}% \usebibmacro{bybookauthor}% \setunit{\printdelim{nametitledelim}}\newblock \usebibmacro{booktitle}% @@ -417,7 +417,7 @@ {}% } {} - {\bookinother@patch@failed{article}} + {\bookinother@patch@failed{article}} @@ -491,7 +491,7 @@ % 5. Inheritance \DeclareDataInheritance{article}{bookinarticle,inarticle}{ - \inherit{author}{bookauthor}% + \inherit{author}{bookauthor}% \inherit{ineditor}{bookeditor}% \inherit{title}{maintitle}% \inherit{subtitle}{mainsubtitle}% @@ -550,7 +550,7 @@ } \DeclareDataInheritance{thesis,phdthesis,mathesis}{bookinthesis,inthesis,inphdthesis,inmathesis,bookinphdthesis,bookinmathesis}{ - \inherit{author}{bookauthor}% + \inherit{author}{bookauthor}% \inherit{title}{booktitle}% \inherit{titleaddon}{booktitleaddon}% \inherit{subtitle}{booksubtitle}% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.dbx index 77556e5359..82ad22c3b2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.dbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/bookinother.dbx @@ -9,11 +9,25 @@ % version 2005/12/01 or later. % % This work has the LPPL maintenance status `maintained'. -% +% % The Current Maintainer of this work is Maïeul Rouquette % This work consists of the files realauthor.dbx, realauthor.bbx \ProvidesFile{bookinother.dbx} -[2017/11/19 v2.3.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)] +[2020/01/20 v2.3.2 biblatex bibliography style to have entry type for book edited in other entry type (MR)] + +%0. New entrytypes +\DeclareDatamodelEntrytypes{ + bookinarticle, + inarticle, + bookinthesis, bookinmathesis, bookinphdthesis, + inthesis, inmathesis, inphdthesis, + bookincollection, bookinproceedings, bookinreference, + bookinincollection, bookininproceedings, bookininreference, + inincollection, ininproceedings, ininreference, + bookinjournal, + ininbook, bookininbook, + ininarticle, bookininarticle, +} %1. New fields diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.pdf Binary files differindex 279530637b..2f1ac2c44d 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.tex b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.tex index 5a87f70b9c..a716a9faaa 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/biblatex-bookinother.tex @@ -24,8 +24,8 @@ subtitle={New data types}, email={maieul <at> maieul <dot> net}, author={Maïeul Rouquette}, - revision={2.3.1}, - date={19/11/2017}, + revision={2.3.2}, + date={20/01/2020}, url={https://github.com/maieul/biblatex-bookinarticle}} % biblatex @@ -48,19 +48,19 @@ \section{Introduction} \subsection{Aim} -The default \biblatex's styles provide an entry type called \bibtype{bookinbook}. -However, it can happen, especially in classical philology, that a book is edited in other entry type. +The default \biblatex's styles provide an entry type called \bibtype{bookinbook}. +However, it can happen, especially in classical philology, that a book is edited in other entry type. For example a book can be edited in article, in proceedings, in a thesis etc. This package provides new bibliographic entry types. \subsection{History} -Originally, the package was called \pkg{biblatex-bookinarticle}, because it provided only a new \bibtype{bookinarticle} entry type. -However, many new types were added. +Originally, the package was called \pkg{biblatex-bookinarticle}, because it provided only a new \bibtype{bookinarticle} entry type. +However, many new types were added. Changing the name was required, and when the loading's way has changed, a good occasion happened. \subsection{Credits} -This package was created for Maïeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licensed on the \emph{\LaTeX\ Project Public License}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}. +This package was created for Maïeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licensed on the \emph{\LaTeX\ Project Public License}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}. All issues can be submitted, in French or English, in the GitHub issues page\footnote{\url{https://github.com/maieul/biblatex-bookinarticle/issues}.}. @@ -70,9 +70,9 @@ All issues can be submitted, in French or English, in the GitHub issues page\foo The package provides: \begin{itemize} - \item New entry types. - \item Inheritance's mechanism for these entry types. - \item Integration of the entry types following the standard bibliography's styles of biblatex. + \item New entry types. + \item Inheritance's mechanism for these entry types. + \item Integration of the entry types following the standard bibliography's styles of biblatex. \item Integration of the new fields of the \pkg{biblatex-morenames} package. \item New fields when required and not defined in \pkg{biblatex-morenames} package. \end{itemize} @@ -81,10 +81,10 @@ The package provides: \section{Loading package} The package requires \emph{biblatex} 3.4 or later. - + As the package defines new fields, you must load it as a \verb+bibstyle+ option of \biblatex package. - + \begin{minted}{latex} \usepackage[citestyle=yourcitationstyle,bibstyle=bookinother]{biblatex} \end{minted} @@ -92,9 +92,9 @@ As the package defines new fields, you must load it as a \verb+bibstyle+ option Notes that the \namebibstyle{bookinother} bibliography's style automatically loads \namebibstyle{verbose} bibliography's style, which means it is compatible with all the \emph{verbose-xxx} and \namebibstyle{authortitle-xxx} bibliography's styles of \biblatex, because all of them are identical to the \namebibstyle{verbose} \textbf{bibliography style}. Hoewever, if you want to use an other bibliography's style, you can use the \pkg{biblatex-multiple-dm} package, but the uniformity can't be assured. - + In any case, you can choose your own \textbf{citation style}. - + \label{morenames}If you need to use this package with package which also requires loading \emph{via} the \verb+bibstyle+ option, as for example \pkg{biblatex-morenames}, just use the \pkg{biblatex-multiple-dm} package, in the following way: \begin{minted}{latex} @@ -116,14 +116,14 @@ If you want to use this package with \namebibstyle{alphabetic-xxx} or \namebibst The package provides new entry types in the form of \bibtype{bookin\meta{othertype}}. The best way to manage these entry types is to use the crossref mechanism of biber. - So the \bibfield{crossref} field of a \bibtype{bookin\meta{othertype}} entry should refers to the main \bibtype{\meta{othertype}} entry. + So the \bibfield{crossref} field of a \bibtype{bookin\meta{othertype}} entry should refers to the main \bibtype{\meta{othertype}} entry. The package also provides new \bibtype{in\meta{othertype}} entry types. The only differences with the \bibtype{bookin\meta{othertype}} entry types is that the \bibfield{title} is, with standard styles, printed in roman font and wrapped in quotation marks. - + \subsection{Fields} -In the following parts of this handbook, we will describe, for each entry type, the fields inheritance mechanism. +In the following parts of this handbook, we will describe, for each entry type, the fields inheritance mechanism. Here is a list of fields which are NOT inherited : \begin{itemize} @@ -131,17 +131,17 @@ Here is a list of fields which are NOT inherited : \item \bibfield{bookineditor} means the editor of the edited (ancient) book. If this field is equal to the \bibfield{editor} field, the last one is not printed. \item \bibfield{title} means the title of the edited (ancient) book. \item \bibfield{subtitle} means the subtitle of the edited (ancient) book. - + \end{itemize} If you use the \bibfield{ineditor} field of the \pkg{biblatex-morenames} package, it will be inherited as \bibfield{bookeditor} field. Note that the package takes account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded. -Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type. +Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type. Use the \pkg{biblatex-morenames} package to add this field to the style of \bibtype{bookinbook}. - - + + % Here, a loop on the entry type, to automatically generate the handbook \def\firstofthree#1#2#3{#1} @@ -155,9 +155,9 @@ Use the \pkg{biblatex-morenames} package to add this field to the style of \bibt \subsubsection{Meaning} For book edited in a \bibtype{\entrytype} entry. \subsubsection{.bib example} - + \inputminted[breaklines]{latex}{example-bookin\entrytype.bib} - + \subsubsection{Fields inheritance} The graph~\ref{example-bookin\entrytype} shows the fields inheritance. \begin{figure} @@ -165,12 +165,12 @@ Use the \pkg{biblatex-morenames} package to add this field to the style of \bibt \includegraphics[height=0.9\textheight]{example-bookin\entrytype.pdf} \label{example-bookin\entrytype} \caption{Inheritance related to the \bibtype{bookin\entrytype} entry type} - \end{figure} + \end{figure} \subsubsection{Output example} \begin{quotation} \cite{\entrykey} \end{quotation} - \entrymore + \entrymore } % For each entry of the csvlist: @@ -221,6 +221,9 @@ The ways new entry types are printed are derived from the \verb+standard.bbx+ bi \begin{changelog} +\begin{release}{2.3.2}{2020-12-20} + \item Declare correctly the new entrytypes to Biber. +\end{release} \begin{release}{2.3.1}{2017-11-19} \item Fix volume format for \bibtype{bookinjournal} type. \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinarticle.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinarticle.pdf Binary files differindex c2242b9b6e..cce51ac30a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinarticle.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinarticle.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookincollection.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookincollection.pdf Binary files differindex 103429b150..e26357a8a1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookincollection.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookincollection.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininarticle.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininarticle.pdf Binary files differindex d97de7e6c3..1b902c6224 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininarticle.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininarticle.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininbook.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininbook.pdf Binary files differindex fd7c24f29f..539b094c70 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininbook.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininbook.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinincollection.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinincollection.pdf Binary files differindex e49d3231a3..2d3dc6897b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinincollection.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinincollection.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininproceedings.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininproceedings.pdf Binary files differindex cac6d3f611..a5905dedbd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininproceedings.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookininproceedings.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinjournal.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinjournal.pdf Binary files differindex d686d638a7..c26afe3567 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinjournal.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinjournal.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinproceedings.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinproceedings.pdf Binary files differindex b5544d14b4..c8d964ee4b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinproceedings.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinproceedings.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinthesis.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinthesis.pdf Binary files differindex 6dc2de37f2..3ea21cbd4a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinthesis.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-bookinother/documentation/example-bookinthesis.pdf diff --git a/macros/latex/contrib/wasysym/README.md b/macros/latex/contrib/wasysym/README.md new file mode 100644 index 0000000000..59dbe70589 --- /dev/null +++ b/macros/latex/contrib/wasysym/README.md @@ -0,0 +1,81 @@ +# Interface to the wasy fonts for LaTeX2e. + +## License + +This material is subject to the LATEX Project Public License 1.3c. + +wasysym does work with the old wasy-fonts but some characters are +missing and others may come out wrong. Therefore I suggest +to upgrade to wasy. + +The WASY fonts are provided as METAFONT fonts. +There is a package wasy-type1 that contains the outline fonts. + +Bug reports (and enhancements) to + +Axel Kielhorn +tex@axelkielhorn.de + +Please note that the EC fonts (former DC fonts) come with +a textcompanion font that contains a lot of special characters. +Use the textcomp package to access these symbols. + +Many TeX fonts are now supporting a wide range of Unicode symbols. +You may look there first. + +This package supports the WASY fonts version 2.4 or +wasy-type1 version 001.001. +When used with older versions some characters may be missing. + +## Changes: + +1.0b +: Corrected mathcode of integrals (now 1) (=mathop) + +1.0c +: The command is textwasy as defined and not textlasy as + shown in the margin + +1.0d +: Adapted to LaTeX2e[1994/06/01] + +1.0e +: Changed some symbols from mathrel to mathbin as in latexsym + Changed the way the documentation is generated form + latex2e-beta to official LaTeX2e-way. + +1.0f +: Corrected \dh and \Dh definition for T1 encoding + Renamed \Dh to \DH as in T1 encoding but keeping the old + name for compatibility + +1.0g +: Reinserted the \hbox commands, wasysym now works in mathmode again + +1.0f +: Changed most \hbox commands to \mbox (thanks to Donald Arseneau) + Donald added partial support for AMSmath + +1.0i +: Changed license to LPPL, some documentation updates. + +2.0 +: Changed the way integrals are handled + Corrected some definitions (missing \leavevmode) + +2.0a +: Removed \rm from \DH command. It now works in + italic and bold as well, but the italic version looks + somewhat strange. I suggest using a T1 encoded font instead. + +2.3 +: Updated to support version 2.3 of the WASY fonts. + New characters added: \Paragraph, \euro and \applecmd. + Support for the bold and slanted version of wasy10. + +2.4 +: Updated to support version 2.4 of the WASY fonts. + New characters added: \longs (Unicode 017f) and \roundz a variant of the + letter z that got reintroduced to german writing with the + Vereinfachte Ausgangsschrift. + diff --git a/macros/latex/contrib/wasysym/wasysym.dtx b/macros/latex/contrib/wasysym/wasysym.dtx index f698cc1e3f..2e8aef9c94 100644 --- a/macros/latex/contrib/wasysym/wasysym.dtx +++ b/macros/latex/contrib/wasysym/wasysym.dtx @@ -1,20 +1,18 @@ % \iffalse meta-comment % % Copyright 1994 - 99 by Axel Kielhorn -% Copyright 2003 Axel Kielhorn, Walter Schmidt +% Copyright 2003, 2019 Axel Kielhorn, Walter Schmidt % % This program can be redistributed and/or modified under the terms % of the LaTeX Project Public License Distributed from CTAN % archives in directory macros/latex/base/lppl.txt; either -% version 1 of the License, or any later version. +% version 1.3c of the License, or any later version. % % IMPORTANT NOTICE: % % For error reports in case of UNCHANGED versions contact -% A.Kielhorn@web.de +% tex@axelkielhorn.de % -% You are not allowed to change this file. -% % Changes: % 1.0b corrected mathcode for integrals (now 1) % 1.0c Minor corrections @@ -35,6 +33,13 @@ % time. % \overstrike macro renamed to \wasy@over to avoid potential % clashes +% 2.0a Removed \rm from \DH command. It now works in +% italic and bold as well, but the italic version looks +% somewhat strange. I suggest using a T1 encoded font instead. +% 2.3 Updated to support version 2.3 of the WASY fonts.2.4 Updated to support version 2.4 of the WASY fonts. +% 2.4 New characters added: \longs (Unicode 017f) and +% \roundz a variant of the letter z that got reintroduced to +% german writing with the Vereinfachte Ausgangsschrift. % \fi % % \CheckSum{844} @@ -59,13 +64,14 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{wasysym} %<fd|fdvar>\ProvidesFile{uwasy.fd}% -%<-driver> [2003/10/30 v2.0 +%<-driver> [2020/01/19 v2.4 %<package> Wasy-2 symbol support package] %<fd|fdvar> Wasy-2 symbol font definitions] % % %<*driver> \documentclass{ltxdoc} +%\pdfmapfile{+wasy.map} \OnlyDescription \usepackage[integrals]{wasysym} \providecommand\dst{\expandafter{\normalfont\scshape docstrip}} @@ -171,16 +177,14 @@ % \begin{quote} % |\male|~\male \quad % |\female|~\female \quad +% |\cent|~\cent \quad +% |\wasyeuro|~\wasyeuro \quad +% |\euro|~\euro\ (Unless option |noeuro| is specified) \quad % |\currency|~\currency \quad % |\phone|~\phone \quad % |\recorder|~\recorder \quad % |\clock|~\clock \quad % |\lightning|~\lightning \quad -% |\pointer|~\pointer \quad -% |\RIGHTarrow|~\RIGHTarrow \quad -% |\LEFTarrow|~\LEFTarrow \quad -% |\UParrow|~\UParrow \quad -% |\DOWNarrow|~\DOWNarrow \quad % |\diameter|~\diameter \quad % |\invdiameter|~\invdiameter \quad % |\varangle|~\varangle \quad @@ -193,14 +197,19 @@ % |\checked|~\checked \quad % |\bell|~\bell \quad % |\ataribox|~\ataribox \quad -% |\cent|~\cent \quad % |\permil|~\permil \quad % |\brokenvert|~\brokenvert \quad % |\wasytherefore|~\wasytherefore \quad % |\Bowtie|~\Bowtie \quad -% |\agemO|~\agemO +% |\agemO|~\agemO \quad +% |\wasyparagraph|~\wasyparagraph \quad +% |\Paragraph|~\Paragraph \quad +% |\wasycmd|~\wasycmd \quad +% |\applecmd|~\applecmd % \end{quote} % +% Note the variation betweeen |\Paragraph| \Paragraph\ and \S\ |\S|. +% % \subsection{Electrical and physical symbols} % % \begin{quote} @@ -251,6 +260,16 @@ % |\rightturn|~\rightturn \quad % \end{quote} % +% \subsection{Arrows} +% +% \begin{quote} +% |\pointer|~\pointer \quad +% |\RIGHTarrow|~\RIGHTarrow \quad +% |\LEFTarrow|~\LEFTarrow \quad +% |\UParrow|~\UParrow \quad +% |\DOWNarrow|~\DOWNarrow \quad +% \end{quote} +% % \subsection{Phonetic symbols} % % \begin{quote} @@ -354,6 +373,44 @@ % the package will not clash with |amsmath|. % \end{itemize} % +% \section{Changes in version~2.3} +% Added support for the WASY fonts Version 2.3. +% +% This Version adds three new characters: +% +% |\wasyparagraph|~\wasyparagraph \quad |\wasyeuro|~\wasyeuro \quad +% |\wasycmd|~\wasycmd. +% +% These charachters are available with shorter names as well. +% If you want to keep the |\euro| command from a different package, +% use the |noeuro| option. +% +% |\Paragraph|~\Paragraph \quad |\euro|~\euro \quad +% |\applecmd|~\applecmd. +% +% WASY 2.0 included a bold font in 10~pt. This font is scaled for the other +% sizes. It was accessible with the usual \LaTeX-commands: +% |\textbf{\currency}| printed a bold \textbf{\currency} symbol. This was +% apperently never documented. +% +% WASY 2.3 includes a slanted font in 10~pt. Again this font is available +% through the usual \LaTeX-commands. |\textsl{\currency}| and +% |\textit{\currency}| will print the same character \textsl{\currency}. +% +% Here are all three verions: +% \currency\ \textbf{\currency} \textsl{\currency}. +% +% \section{Changes in version~2.4} +% Added support for the WASY fonts Version 2.4. +% +% This Version adds two new characters: +% +% |\longs|~\longs \quad |\roundz|~\roundz. +% +% While the \longs\ is quite common, even for non german texts, +% the \roundz\ is a rare hi\longs toric form. It was reintroduce to Germans +% whith the ``Vereinfachte Ausgans\longs chrift'', a cur\longs ive font u\longs ed to teach +% writing in elementary \longs chool. % % \StopEventually{} % @@ -387,12 +444,15 @@ %<*package> \newif\ifwasy@integrals \newif\ifwasy@compatibility +\newif\ifwasy@euro \wasy@eurotrue \DeclareOption{compat1}{% \wasy@compatibilitytrue\wasy@integralsfalse}% \DeclareOption{integrals}{% \wasy@compatibilityfalse\wasy@integralstrue}% \DeclareOption{nointegrals}{% \wasy@compatibilityfalse\wasy@integralsfalse}% +\DeclareOption{noeuro}{% + \wasy@eurofalse}% \ExecuteOptions{compat1} \ProcessOptions\relax % \end{macrocode} @@ -637,7 +697,7 @@ \def\thorn {{\wasyfamily\char105}} \def\Thorn {{\wasyfamily\char106}} \DeclareTextCommand{\dh}{OT1}{{\wasyfamily\char107}} -\DeclareTextCommand{\DH}{OT1}{\leavevmode{\rm\setbox0\hbox{D}% +\DeclareTextCommand{\DH}{OT1}{\leavevmode{\setbox0\hbox{D}% \hbox to\wd0{\kern 0.04em\char32\hss D}}} \def\openo {{\wasyfamily\char108}} \def\inve {{\wasyfamily\char85}} @@ -708,9 +768,24 @@ \@ifpackageloaded{amsmath}{\wasy@amssetup}{\wasy@setup} \fi } -%</package> % \end{macrocode} % +% \begin{macrocode} +\def \wasyparagraph {{\wasyfamily\char"4D}} +\def \wasyeuro {{\wasyfamily\char"4E}} +\def \wasycmd {{\wasyfamily\char"53}} +\ifwasy@euro + \let \euro\wasyeuro +\fi +\let \Paragraph\wasyparagraph +\let \applecmd\wasycmd +% \end{macrocode} +% +% \begin{macrocode} +\def \longs {{\wasyfamily\char"54}} +\def \roundz {{\wasyfamily\char"4F}} +%</package> +% \end{macrocode} % \subsection{The font definition files} % % The declarations, @@ -718,11 +793,15 @@ % \begin{macrocode} %<*fd> \DeclareFontFamily{U}{wasy}{} -\DeclareFontShape{U}{wasy}{m}{n}{ <5> <6> <7> <8> <9> gen * wasy - <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88>wasy10 }{} +\DeclareFontShape{U}{wasy}{m}{n}{% +<5> +<6> +<7> +<8> +<9> gen * wasy +<10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> wasy10 }{} \DeclareFontShape{U}{wasy}{b}{n}{ <-10> sub * wasy/m/n - <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88>wasyb10 }{} -\DeclareFontShape{U}{wasy}{bx}{n}{ <-> sub * wasy/b/n}{} + <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> wasyb10 }{} %</fd> %<*fdvar> \DeclareFontFamily{U}{wasy}{} @@ -735,8 +814,12 @@ <10-> wasy10}{} \DeclareFontShape{U}{wasy}{b}{n}{ <-10> sub * wasy/m/n <10-> wasyb10 }{} -\DeclareFontShape{U}{wasy}{bx}{n}{ <-> sub * wasy/b/n}{} %</fdvar> +%<*fdvar|fd> +\DeclareFontShape{U}{wasy}{bx}{n}{ <-> sub * wasy/b/n}{} +\DeclareFontShape{U}{wasy}{m}{sl}{ <-> wasysl10 }{} +\DeclareFontShape{U}{wasy}{m}{it}{ <-> sub * wasy/m/sl }{} +%</fdvar|fd> % \end{macrocode} % % The next line goes into all files and in addition prevents \dst{} diff --git a/macros/latex/contrib/wasysym/wasysym.ins b/macros/latex/contrib/wasysym/wasysym.ins index 0d2c5b5cd2..d6603a3219 100644 --- a/macros/latex/contrib/wasysym/wasysym.ins +++ b/macros/latex/contrib/wasysym/wasysym.ins @@ -4,7 +4,7 @@ %% LaTeX or TeX. %% %% -% Copyright 1994 - 2003 by Axel Kielhorn +% Copyright 1994 - 2020 by Axel Kielhorn % % This program can be redistributed and/or modified under the terms % of the LaTeX Project Public License Distributed from CTAN @@ -17,7 +17,7 @@ \input docstrip.tex \preamble -Copyright (C) 1994-2003 by Axel Kielhorn. All rights reserved. +Copyright (C) 1994-2020 by Axel Kielhorn. All rights reserved. For additional copyright information see further down in this file. This file is to be used with the LaTeX2e system. @@ -32,7 +32,7 @@ IMPORTANT NOTICE: Error reports in case of UNCHANGED versions to Axel Kielhorn -A.Kielhorn@web.de +tex@axelkielhorn.de \endpreamble \def\batchfile{wasysym.dst} % ignored in distribution diff --git a/macros/latex/contrib/wasysym/wasysym.pdf b/macros/latex/contrib/wasysym/wasysym.pdf Binary files differindex 5609acfc4b..a0ce610f7e 100644 --- a/macros/latex/contrib/wasysym/wasysym.pdf +++ b/macros/latex/contrib/wasysym/wasysym.pdf diff --git a/macros/latex/contrib/wasysym/wasysym.upl b/macros/latex/contrib/wasysym/wasysym.upl deleted file mode 100644 index ea2ad447a3..0000000000 --- a/macros/latex/contrib/wasysym/wasysym.upl +++ /dev/null @@ -1,35 +0,0 @@ -This is an interface to the wasy-2 fonts for LaTeX2e. - -It does work with the old wasy-fonts but some characters are -missing and others may come out wrong. Therefore I suggest -to upgrade to wasy-2. - -These definitions are not 100% compatible to wasy.tex or the -wasyfont.sty for NFSS1. - -Bug reports (and enhancements) to - -Axel Kielhorn -a.kielhorn@web.de - -Please note that the EC fonts (former DC fonts) come with -a textcompanion font that contains a lot of special characters. -Use the textcomp package to acces these symbols. - -Changes: -1.0b Corrected mathcode of integrals (now 1) (=mathop) -1.0c The command is textwasy as defined and not textlasy as - shown in the margin -1.0d Adapted to LaTeX2e[1994/06/01] -1.0e Changed some symbols from mathrel to mathbin as in latexsym - Changed the way the documentation is generated form - latex2e-beta to official LaTeX2e-way. -1.0f Corrected \dh and \Dh definition for T1 encoding - Renamed \Dh to \DH as in T1 encoding but keeping the old - name for compatibility -1.0g Reinserted the \hbox commands, wasysym now works in mathmode again -1.0f Changed most \hbox commands to \mbox (thanks to Donald Arseneau) - Donald added partial support for AMSmath -1.0i Changed license to LPPL, some documentation updates. -2.0 Changed the way integrals are handled - Corrected some definitions (missing \leavevmode) diff --git a/macros/latex/contrib/wasysym/wasysym.xml b/macros/latex/contrib/wasysym/wasysym.xml deleted file mode 100644 index 356b00ad76..0000000000 --- a/macros/latex/contrib/wasysym/wasysym.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE entry SYSTEM "../catalogue.dtd"> -<entry id="wasysym" - datestamp="2003/05/31" - modifier="A.Kielhorn@web.de"> - <about> - <name>wasysym</name> - <caption>LaTeX support file to use the WASY-2 fonts</caption> - <author> - <name>Axel Kielhorn</name> - <email>A.Kielhorn@web.de</email> - </author> - <license type="lppl"/> - <version> - <number>2.0</number> - </version> - </about> - <description> - <abstract> - The WASY (Waldi Symbol) font by Roland Waldi provides many - characters like male and female symbols and astronomical symbols. - The wasysym package implements and easy to use interface for these - symbols. - </abstract> - <documentation location="ctan" type="pdf">wasysym.pdf</documentation> - </description> - <distribution> - <ctan>macros/latex/contrib/supported/wasysym</ctan> - <texlive>???</texlive> - </distribution> -</entry> - - - - - - - |