summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-25 22:06:03 +0000
committerKarl Berry <karl@freefriends.org>2016-03-25 22:06:03 +0000
commitf9e5222a931d1b2671fa84b5c93a4605c00c2373 (patch)
tree20ac69a38c367d4792d6e3aea532c5ba669fe10a /Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
parent0cf37a0dcbc1de449eda38e14e357dd7b19dc5dd (diff)
polyglossia (25mar16)
git-svn-id: svn://tug.org/texlive/trunk@40138 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf')
-rw-r--r--Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf46
1 files changed, 23 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
index a72983d5fd7..edc3cb21cf6 100644
--- a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
+++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf
@@ -13,23 +13,23 @@
\def\@tmpa{#1}%
\ifx\@tmpa\tmp@oldyr\def\@tmpa{old}\fi
\ifx\@tmpa\tmp@old
- \ifx\l@german\@undefined
+ \xpg@ifdefined{german}{}{%
\xpg@nopatterns{german}%
\adddialect\l@german\l@nohyphenation
- \fi
+ }
\@german@oldspellingtrue
- \else %try ngerman
- \ifx\l@ngerman\@undefined
- \ifx\l@german\@undefined
- \xpg@nopatterns{ngerman}%
- \adddialect\l@ngerman\l@nohyphenation
- \else
+ \else % try ngerman
+ \xpg@ifdefined{ngerman}{%
+ \@german@oldspellingfalse
+ }{% fall back to german
+ \xpg@ifdefined{german}{%
\xpg@warning{You asked for `ngerman' but only `german' hyphenation is available!}%
\@german@oldspellingtrue
- \fi
- \else %we use ngerman
- \@german@oldspellingfalse
- \fi
+ }{%
+ \xpg@nopatterns{ngerman}%
+ \adddialect\l@ngerman\l@nohyphenation
+ }%
+ }%
\fi
}
@@ -45,10 +45,10 @@
\@austrian@localefalse%
\fi
\ifx\@tmpa\tmp@swiss\@swiss@localetrue
- \ifcsundef{l@swissgerman}%
+ \xpg@ifdefined{swissgerman}{}%
{\xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak
I will use the standard patterns for German (old spelling) instead}%
- \adddialect\l@swissgerman\l@german\relax}{}%
+ \adddialect\l@swissgerman\l@german\relax}%
\else
\@swiss@localefalse%
\fi}
@@ -188,7 +188,7 @@
\if@german@fraktur\date@german@fraktur\else\date@german\fi
}
-\def\german@language{\language=%
+\def\german@language{\ifxetex\language=%
\csname l@%
\if@swiss@locale
\if@german@oldspelling
@@ -202,29 +202,29 @@
\else% (german, austrian)
\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi
\fi
- \endcsname
+ \endcsname\else\ifluatex
% LuaTeX
\ifgerman@latesthyphen
\if@german@oldspelling
\if@swiss@locale
- \xpg@set@language@luatex@ii{swissgerman}%
+ \xpg@set@language@luatex@iv{swissgerman}%
\else
- \xpg@set@language@luatex@ii{german-x-latest}%
+ \xpg@set@language@luatex@iv{german-x-latest}%
\fi
\else
- \xpg@set@language@luatex@ii{ngerman-x-latest}%
+ \xpg@set@language@luatex@iv{ngerman-x-latest}%
\fi
\else% (latesthyphen=false)
\if@german@oldspelling
\if@swiss@locale
- \xpg@set@language@luatex@ii{swissgerman}%
+ \xpg@set@language@luatex@iv{swissgerman}%
\else
- \xpg@set@language@luatex@ii{german}%
+ \xpg@set@language@luatex@iv{german}%
\fi
\else
- \xpg@set@language@luatex@ii{ngerman}%
+ \xpg@set@language@luatex@iv{ngerman}%
\fi
- \fi
+ \fi\fi\fi
}
\def\noextras@german{%