summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-10 21:17:44 +0000
committerKarl Berry <karl@freefriends.org>2019-06-10 21:17:44 +0000
commit7a7a5e7046af2a9e0116d7a558d31df96caf45f8 (patch)
tree7c521ab0199b4aa722c0b9df8f4e6a47c52bb25a /Master/texmf-dist/tex
parentc9236b6b0c878565529841d0f72447f6a041ec85 (diff)
leipzig (10jun19)
git-svn-id: svn://tug.org/texlive/trunk@51357 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/leipzig/leipzig.sty17
-rw-r--r--Master/texmf-dist/tex/latex/leipzig/leipzig.tex8
2 files changed, 14 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/leipzig/leipzig.sty b/Master/texmf-dist/tex/latex/leipzig/leipzig.sty
index c6b0b8387b1..e564de6cefb 100644
--- a/Master/texmf-dist/tex/latex/leipzig/leipzig.sty
+++ b/Master/texmf-dist/tex/latex/leipzig/leipzig.sty
@@ -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@leipzig@defined{#2}
@@ -482,12 +483,22 @@
\@gobbletwo
}%
}
+ \def\if@leipzig@defined#1{%
+ \uppercase\expandafter{\expandafter\ifcsname\@car#1\@nil}\@cdr#1\@nil\endcsname
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ }
\def\@newleipzig(#1)#2#3\@nil{%
\uppercase{\expandafter\gdef\csname #2}#3\endcsname{\leipzigfont{#1}}
}%
}
\@ifpackageloaded{glossaries}{%
+ \ifleipzig@nostandards\leipzigdonotindextrue\fi
\loadglsentries{leipzig.tex}%
+ \glsfindwidesttoplevelname[\leipzigtype]%
+ \leipzigdonotindexfalse
}%
{\input{leipzig.tex}}%
%%
diff --git a/Master/texmf-dist/tex/latex/leipzig/leipzig.tex b/Master/texmf-dist/tex/latex/leipzig/leipzig.tex
index ba6a4e8091a..c8929ab4bf2 100644
--- a/Master/texmf-dist/tex/latex/leipzig/leipzig.tex
+++ b/Master/texmf-dist/tex/latex/leipzig/leipzig.tex
@@ -47,7 +47,6 @@
%% http://www.eva.mpg.de/lingua/resources/glossing-rules.php %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\makeatletter\ifleipzig@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@gmail.com>
%%