texlive[51357] Master/texmf-dist: leipzig (10jun19)
commits+karl at tug.org
commits+karl at tug.org
Mon Jun 10 23:17:45 CEST 2019
Revision: 51357
http://tug.org/svn/texlive?view=revision&revision=51357
Author: karl
Date: 2019-06-10 23:17:44 +0200 (Mon, 10 Jun 2019)
Log Message:
-----------
leipzig (10jun19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/leipzig/leipzig.pdf
trunk/Master/texmf-dist/makeindex/leipzig/leipzig.ist
trunk/Master/texmf-dist/source/latex/leipzig/leipzig.dtx
trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.sty
trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.tex
Modified: trunk/Master/texmf-dist/doc/latex/leipzig/leipzig.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/makeindex/leipzig/leipzig.ist
===================================================================
--- trunk/Master/texmf-dist/makeindex/leipzig/leipzig.ist 2019-06-10 21:17:21 UTC (rev 51356)
+++ trunk/Master/texmf-dist/makeindex/leipzig/leipzig.ist 2019-06-10 21:17:44 UTC (rev 51357)
@@ -1,5 +1,5 @@
% makeindex style file created by the glossaries package
-% for document 'leipzig' on 2017-6-18
+% for document 'leipzig' on 2019-6-10
actual '?'
encap '|'
level '!'
Modified: trunk/Master/texmf-dist/source/latex/leipzig/leipzig.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/leipzig/leipzig.dtx 2019-06-10 21:17:21 UTC (rev 51356)
+++ trunk/Master/texmf-dist/source/latex/leipzig/leipzig.dtx 2019-06-10 21:17:44 UTC (rev 51357)
@@ -106,7 +106,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1996/10/24]%
%<package>\ProvidesPackage{leipzig}%
%<*package>
- [2017/06/16 v2.0 Leipzig package for linguistic abbreviations]%
+ [2019/06/09 v2.2 Leipzig package for linguistic abbreviations]%
%\AtBeginDocument{%
% \MakeShortVerb{\|}
% \DeleteShortVerb{"}}
@@ -161,7 +161,7 @@
%</driver>
% \fi
%
-%\CheckSum{844}
+%\CheckSum{855}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -465,7 +465,7 @@
%\ex|\renewcommand{\leipzigfont}[1]{\textit{\MakeUppercase{#1}}}|\xe
%
%\renewcommand{\leipzigfont}[1]{{\textit{\MakeUppercase{#1}}}}%
-%This can occur anywhere in your document and it affects the short forms of of any following abbreviations, e.g.\ further instances of |{\Verbz}| from~\refp{ex:verbz} will expand to \Verbz{}.
+%This can occur anywhere in your document and it affects the short forms of any following abbreviations, e.g.\ further instances of |{\Verbz}| from~\refp{ex:verbz} will expand to \Verbz{}.
%\renewcommand{\leipzigfont}[1]{\textsc{#1}}%
%
%Note that the name of each glossary entry in the glossary will also be printed using the final redefinition of \cs{leipzigfont}. You can redefine \cs{glsnamefont} to control how glossary names are displayed. See \autoref{printglossary} for more information on glossary display.
@@ -538,7 +538,7 @@
% To disable or enable all hyperlinks to glossaries, use \cs{glsdisablehyper} or \cs{glsenablehyper}. The effect can be localised by placing the commands within a group.
%
%\DescribeMacro{[nohypertypes]}
-%To disable hyperlinks only for certain glossaries, use the package option (from \glossaries{}) \hbox{[nohypertypes]}. This is a key that take a list of comma-separated glossary names as a value. Make sure you enclose the value in braces if it contains any commas. The values must be fully expanded, so something like \hbox{|[nohypertypes=\leipzigtype]|} \emph{won't} work. Instead use \hbox{|[nohypertypes=main]|} if the \hbox{[glosses]} option has not been used, or \hbox{|[nohypertypes=leipzig]|} if the \hbox{[glosses]} option has been used. Instead of or in addition to the package option \hbox{[nohypertypes]}, you can also use |\GlsDeclareNoHyperList{|\meta{list}|}|.
+%To disable hyperlinks only for certain glossaries, use the package option (from \glossaries{}) \hbox{[nohypertypes]}. This is a key that takes a list of comma-separated glossary names as a value. Make sure you enclose the value in braces if it contains any commas. The values must be fully expanded, so something like \hbox{|[nohypertypes=\leipzigtype]|} \emph{won't} work. Instead use \hbox{|[nohypertypes=main]|} if the \hbox{[glosses]} option has not been used, or \hbox{|[nohypertypes=leipzig]|} if the \hbox{[glosses]} option has been used. Instead of or in addition to the package option \hbox{[nohypertypes]}, you can also use |\GlsDeclareNoHyperList{|\meta{list}|}|.
%
%\DescribeMacro{[nohyperfirst]}
%To disable hyperlinks only on the first use, use the package options (from \glossaries{}) \hbox{[nohyperfirst]}. This is a key that take a list of comma-separated glossary names as a value. Make sure you enclose the value in braces if it contains any commas.
@@ -682,7 +682,7 @@
%\DescribeMacro{\glsinlinedescformat}
%\DescribeMacro{\glsinlinesubdescformat}
%\DescribeMacro{\glsinlineemptydescformat}
-%Short and long forms of abbreviations are separated by \cs{glsinlinedescformat}. The default is to print an equals sign with small spaces on either side, and to encourage linebreaks \emph{after} the equals sign so that new lines do not begin with an equals sign. The short and long forms of child entries are separated by \cs{glsinlinesubdescformat}, which is defined the same as \cs{glsinlinedescformat}. Finally,\cs{glsinlineemptydescformat} controls what happens if there is no description at all. Defaults:
+%Short and long forms of abbreviations are separated by \cs{glsinlinedescformat}. The default is to print an equals sign with small spaces on either side, and to encourage linebreaks \emph{after} the equals sign so that new lines do not begin with an equals sign. The short and long forms of child entries are separated by \cs{glsinlinesubdescformat}, which is defined the same as \cs{glsinlinedescformat}. Finally, \cs{glsinlineemptydescformat} controls what happens if there is no description at all. Defaults:
%
%\begin{verbatim}\renewcommand*{\glsinlinedescformat}[3]{\,=\,\linebreak[1]##1}
%\renewcommand*{\glsinlinesubdescformat}[3]{\,=\,\linebreak[1]##1}
@@ -788,7 +788,7 @@
%\begin{description}
%\item[Q:] Why don't the abbreviations display in smallcaps?
%\item[A:] Did you define abbreviations using ALL CAPS for the short form? The short form is displayed in \cs{leipzigfont}, which uses |\textsc|, but |\textsc| cannot make smallcaps out of capital letters: |\textsc{abc}| produces \textsc{abc}, but |\textsc{ABC}| produces \textsc{ABC}. Solution: change the \cs{newleipzig} definitions to use lowercase letters in the second argument.
-%\item[A:] Not all font families contain a smallcaps font. For instance, only some version of Times New Roman contain a smallcaps font; the versionson Windows XP and Mac OS X do not. Solution: try changing the smallcaps font, or at least using |\usepackage[T1]{fontenc}| in your preamble.
+%\item[A:] Not all font families contain a smallcaps font. For instance, only some version of Times New Roman contain a smallcaps font; the versions on Windows XP and Mac OS X do not. Solution: try changing the smallcaps font, or at least using |\usepackage[T1]{fontenc}| in your preamble.
%\end{description}
%
% \begin{thebibliography}{9}
@@ -1663,7 +1663,7 @@
%
% \begin{macrocode}
\ifleipzigdonotindex
- \uppercase{\expandafter\gdef\csname #2}#2\endcsname{%
+ \uppercase{\expandafter\gdef\csname #1}#2\endcsname{%
\leipzigfont{\glsentryshort{#1#2}}%
}%
% \end{macrocode}
@@ -1724,12 +1724,12 @@
\fi
{\newleipzig{#2}}{\newleipzig[#1]{#2}}%
}%
+}%
% \end{macrocode}
% \end{macro}
%If \glossaries{} not loaded, then the code for \cs{newleipzig} and \cs{renewleipzig} is much shorter.
-%
% \begin{macrocode}
-}{%
+{%
\newcommand{\newleipzig}[4][]{\@newleipzig(#3)#2\@nil}%
\newcommand{\renewleipzig}[4][]{%
\if at leipzig@defined{#2}
@@ -1743,6 +1743,16 @@
\@gobbletwo
}%
}
+% \end{macrocode}
+%\changes{2.2}{2019/06/09}{Added definition of \cs{if at leipzig@defined} here. This fixes an error that occurred if \cs{renewcommand} was used with package option [noglossaries].}
+% \begin{macrocode}
+ \def\if at leipzig@defined#1{%
+ \uppercase\expandafter{\expandafter\ifcsname\@car#1\@nil}\@cdr#1\@nil\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }
\def\@newleipzig(#1)#2#3\@nil{%
\uppercase{\expandafter\gdef\csname #2}#3\endcsname{\leipzigfont{#1}}
}%
@@ -1753,7 +1763,22 @@
%
% \begin{macrocode}
\@ifpackageloaded{glossaries}{%
+% \end{macrocode}
+% If the \hbox{[nostandards]} option was used, then do not index the abbreviations in leipzig.tex.
+%
+% \begin{macrocode}
+ \ifleipzig at nostandards\leipzigdonotindextrue\fi
\loadglsentries{leipzig.tex}%
+% \end{macrocode}
+% Calculate the widest name based on this set of pre-defined abbreviations. It is probably vaguely accurate; if the author needs to, they can always redefine this in the preamble.
+%
+% \begin{macrocode}
+ \glsfindwidesttoplevelname[\leipzigtype]%
+% \end{macrocode}
+% Turn indexing back on if it was off.
+%
+% \begin{macrocode}
+ \leipzigdonotindexfalse
}%
{\input{leipzig.tex}}%
% \end{macrocode}
@@ -1786,10 +1811,6 @@
%
% In a few cases, the label does not match the abbreviation, because the
% macro that would have been created is already defined in LaTeX.
-% \end{macrocode}
-% If the \hbox{[nostandards]} option was used, then do not index the following.
-% \begin{macrocode}
-\makeatletter\ifleipzig at nostandards\leipzigdonotindextrue\fi\makeatother
\newleipzig{abl}{abl}{ab\-la\-tive} %ablative
\newleipzig{abs}{abs}{ab\-so\-lu\-tive} %absolutive
@@ -1889,22 +1910,7 @@
\newcommand{\Tdu}{{\Third}{\Du}}%
\newcommand{\Tpl}{{\Third}{\Pl}}%
-\makeatletter
% \end{macrocode}
-%If \glossaries{} is loaded, calculate the widest name based on this set of pre-defined abbreviations. It is probably vaguely accurate; if the author needs to, they can always redefine this in the preamble.
-%
-% \begin{macrocode}
-\@ifpackageloaded{glossaries}{% if glossary-tree loaded
- \glsfindwidesttoplevelname[\leipzigtype]%
-}{\relax}%
-% \end{macrocode}
-% Turn indexing back on if it was off.
-%
-% \begin{macrocode}
-\leipzigdonotindexfalse
-\makeatother
-
-% \end{macrocode}
% \iffalse
%</abbrvs>
% \fi
@@ -1977,4 +1983,4 @@
\setglossarypreamble[\leipzigtype]{}%
}%
}{}% if glossaries not loaded, do nothing
-% \end{macrocode}
\ No newline at end of file
+% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.sty 2019-06-10 21:17:21 UTC (rev 51356)
+++ trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.sty 2019-06-10 21:17:44 UTC (rev 51357)
@@ -38,7 +38,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1996/10/24]%
\ProvidesPackage{leipzig}%
- [2017/06/16 v2.0 Leipzig package for linguistic abbreviations]%
+ [2019/06/09 v2.2 Leipzig package for linguistic abbreviations]%
@@ -422,7 +422,7 @@
}%
\def\@newleipzig#1#2\@nil{%
\ifleipzigdonotindex
- \uppercase{\expandafter\gdef\csname #2}#2\endcsname{%
+ \uppercase{\expandafter\gdef\csname #1}#2\endcsname{%
\leipzigfont{\glsentryshort{#1#2}}%
}%
\else
@@ -468,7 +468,8 @@
\fi
{\newleipzig{#2}}{\newleipzig[#1]{#2}}%
}%
-}{%
+}%
+{%
\newcommand{\newleipzig}[4][]{\@newleipzig(#3)#2\@nil}%
\newcommand{\renewleipzig}[4][]{%
\if at leipzig@defined{#2}
@@ -482,12 +483,22 @@
\@gobbletwo
}%
}
+ \def\if at leipzig@defined#1{%
+ \uppercase\expandafter{\expandafter\ifcsname\@car#1\@nil}\@cdr#1\@nil\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }
\def\@newleipzig(#1)#2#3\@nil{%
\uppercase{\expandafter\gdef\csname #2}#3\endcsname{\leipzigfont{#1}}
}%
}
\@ifpackageloaded{glossaries}{%
+ \ifleipzig at nostandards\leipzigdonotindextrue\fi
\loadglsentries{leipzig.tex}%
+ \glsfindwidesttoplevelname[\leipzigtype]%
+ \leipzigdonotindexfalse
}%
{\input{leipzig.tex}}%
%%
Modified: trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.tex 2019-06-10 21:17:21 UTC (rev 51356)
+++ trunk/Master/texmf-dist/tex/latex/leipzig/leipzig.tex 2019-06-10 21:17:44 UTC (rev 51357)
@@ -47,7 +47,6 @@
%% http://www.eva.mpg.de/lingua/resources/glossing-rules.php %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\makeatletter\ifleipzig at nostandards\leipzigdonotindextrue\fi\makeatother
\newleipzig{abl}{abl}{ab\-la\-tive} %ablative
\newleipzig{abs}{abs}{ab\-so\-lu\-tive} %absolutive
@@ -146,13 +145,6 @@
\newcommand{\Tdu}{{\Third}{\Du}}%
\newcommand{\Tpl}{{\Third}{\Pl}}%
-\makeatletter
-\@ifpackageloaded{glossaries}{% if glossary-tree loaded
- \glsfindwidesttoplevelname[\leipzigtype]%
-}{\relax}%
-\leipzigdonotindexfalse
-\makeatother
-
%%
%% Copyright (C) 2017 by Natalie Weber <natalie.a.weber at gmail.com>
%%
More information about the tex-live-commits
mailing list