summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-22 00:02:31 +0000
committerKarl Berry <karl@freefriends.org>2009-11-22 00:02:31 +0000
commit37c4a5be1d1d1c895526e9c5ae9e5918fb133d80 (patch)
tree6fde677a6e13e2677babd7003dfaa3d210feb973 /Master/texmf-dist/tex
parentc8f25e8c064910cbdae63d68ad0b753dcd925264 (diff)
polyglossia update (20nov09)
git-svn-id: svn://tug.org/texlive/trunk@16115 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/babelsh.def303
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/farsical.sty4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-albanian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-amharic.ldf6
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-arabic.ldf120
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasai.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasam.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-basque.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-brazil.ldf16
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-breton.ldf22
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-bulgarian.ldf24
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-catalan.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-coptic.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-croatian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-czech.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-danish.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-divehi.ldf6
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-dutch.ldf10
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf2
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-esperanto.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-estonian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-farsi.ldf52
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-finnish.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf83
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-galician.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-german.ldf153
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-hebrew.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-hindi.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-icelandic.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-interlingua.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-irish.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-italian.ldf20
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-latin.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-latvian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-lsorbian.ldf2
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-magyar.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-norsk.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-nynorsk.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-polish.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-portuges.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-romanian.ldf8
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-samin.ldf20
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-sanskrit.ldf21
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-scottish.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovak.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovenian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-spanish.ldf6
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-swedish.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-syriac.ldf48
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-thai.ldf2
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-turkish.ldf30
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-ukrainian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-usorbian.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-vietnamese.ldf63
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/gloss-welsh.ldf4
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/hebrewcal.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/hijrical.sty6
-rw-r--r--Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty107
61 files changed, 814 insertions, 462 deletions
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/babelsh.def b/Master/texmf-dist/tex/xelatex/polyglossia/babelsh.def
new file mode 100644
index 00000000000..9bf1d1e46b7
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/babelsh.def
@@ -0,0 +1,303 @@
+\ifx\initiate@active@char\@undefined
+\else
+ \bbl@afterfi\endinput
+\fi
+\ProvidesFile{babelsh.def}
+ [2009/05/07 %
+ Babel common definitions for shorthands^^J
+ Taken verbatim from babel.def (2008/07/06 v3.8l)]
+\def\bbl@add@special#1{\begingroup
+ \def\do{\noexpand\do\noexpand}%
+ \def\@makeother{\noexpand\@makeother\noexpand}%
+ \edef\x{\endgroup
+ \def\noexpand\dospecials{\dospecials\do#1}%
+ \expandafter\ifx\csname @sanitize\endcsname\relax \else
+ \def\noexpand\@sanitize{\@sanitize\@makeother#1}%
+ \fi}%
+ \x}
+\def\bbl@remove@special#1{\begingroup
+ \def\x##1##2{\ifnum`#1=`##2\noexpand\@empty
+ \else\noexpand##1\noexpand##2\fi}%
+ \def\do{\x\do}%
+ \def\@makeother{\x\@makeother}%
+ \edef\x{\endgroup
+ \def\noexpand\dospecials{\dospecials}%
+ \expandafter\ifx\csname @sanitize\endcsname\relax \else
+ \def\noexpand\@sanitize{\@sanitize}%
+ \fi}%
+ \x}
+\long\def\bbl@afterelse#1\else#2\fi{\fi#1}
+\long\def\bbl@afterfi#1\fi{\fi#1}
+\def\initiate@active@char#1{%
+ \expandafter\ifx\csname active@char\string##1\endcsname\relax
+ \bbl@afterfi{\@initiate@active@char{#1}}%
+ \fi}
+\begingroup
+ \catcode`\~\active
+ \def\x{\endgroup
+ \def\@initiate@active@char##1{%
+ \ifcat\noexpand##1\noexpand~\relax
+ \@ifundefined{normal@char\string##1}{%
+ \expandafter\let\csname normal@char\string##1\endcsname##1%
+ \expandafter\gdef
+ \expandafter##1%
+ \expandafter{%
+ \expandafter\active@prefix\expandafter##1%
+ \csname normal@char\string##1\endcsname}}{}%
+ \else
+ \@activated{##1}%
+ \@namedef{normal@char\string##1}{##1}%
+ \ifx##1'%
+ \let\prim@s\bbl@prim@s
+ \@namedef{normal@char\string##1}{%
+ \textormath{##1}{^\bgroup\prim@s}}%
+ \fi
+ \ifx##1^%
+ \gdef\bbl@act@caret{%
+ \ifmmode
+ \csname normal@char\string^\endcsname
+ \else
+ \bbl@afterfi
+ {\if@safe@actives
+ \bbl@afterelse\csname normal@char\string##1\endcsname
+ \else
+ \bbl@afterfi\csname user@active\string##1\endcsname
+ \fi}%
+ \fi}
+ \fi
+ \@ifpackagewith{babel}{KeepShorthandsActive}{}{%
+ \edef\bbl@tempa{\catcode`\noexpand##1\the\catcode`##1}%
+ \expandafter\AtEndOfPackage\expandafter{\bbl@tempa}}%
+ \@tempcnta=\lccode`\~
+ \lccode`~=`##1%
+ \lowercase{%
+ \catcode`~\active
+ \expandafter\bbl@add@special
+ \csname \string##1\endcsname
+ \AtBeginDocument{%
+ \catcode`##1\active
+ \if@filesw
+ \immediate\write\@mainaux{%
+ \string\catcode`##1\string\active}%
+ \fi}%
+ \expandafter\gdef
+ \expandafter~%
+ \expandafter{%
+ \expandafter\active@prefix\expandafter##1%
+ \csname normal@char\string##1\endcsname}}%
+ \lccode`\~\@tempcnta
+ \fi
+ \ifx##1^%
+ \@namedef{active@char\string##1}{\bbl@act@caret}%
+ \else
+ \@namedef{active@char\string##1}{%
+ \if@safe@actives
+ \bbl@afterelse\csname normal@char\string##1\endcsname
+ \else
+ \bbl@afterfi\csname user@active\string##1\endcsname
+ \fi}%
+ \fi
+ \@namedef{user@active\string##1}{%
+ \expandafter\ifx
+ \csname \user@group @sh@\string##1@\endcsname
+ \relax
+ \bbl@afterelse\bbl@sh@select\user@group##1%
+ {user@active@arg\string##1}{language@active\string##1}%
+ \else
+ \bbl@afterfi\csname \user@group @sh@\string##1@\endcsname
+ \fi}%
+ \long\@namedef{user@active@arg\string##1}####1{%
+ \expandafter\ifx
+ \csname \user@group @sh@\string##1@\string####1@\endcsname
+ \relax
+ \bbl@afterelse
+ \csname language@active\string##1\endcsname####1%
+ \else
+ \bbl@afterfi
+ \csname \user@group @sh@\string##1@\string####1@%
+ \endcsname
+ \fi}%
+ \@namedef{\user@group @sh@\string##1@@}{%
+ \csname normal@char\string##1\endcsname}
+ \@namedef{language@active\string##1}{%
+ \expandafter\ifx
+ \csname \language@group @sh@\string##1@\endcsname
+ \relax
+ \bbl@afterelse\bbl@sh@select\language@group##1%
+ {language@active@arg\string##1}{system@active\string##1}%
+ \else
+ \bbl@afterfi
+ \csname \language@group @sh@\string##1@\endcsname
+ \fi}%
+ \long\@namedef{language@active@arg\string##1}####1{%
+ \expandafter\ifx
+ \csname \language@group @sh@\string##1@\string####1@\endcsname
+ \relax
+ \bbl@afterelse
+ \csname system@active\string##1\endcsname####1%
+ \else
+ \bbl@afterfi
+ \csname \language@group @sh@\string##1@\string####1@%
+ \endcsname
+ \fi}%
+ \@namedef{system@active\string##1}{%
+ \expandafter\ifx
+ \csname \system@group @sh@\string##1@\endcsname
+ \relax
+ \bbl@afterelse\bbl@sh@select\system@group##1%
+ {system@active@arg\string##1}{normal@char\string##1}%
+ \else
+ \bbl@afterfi\csname \system@group @sh@\string##1@\endcsname
+ \fi}%
+ \long\@namedef{system@active@arg\string##1}####1{%
+ \expandafter\ifx
+ \csname \system@group @sh@\string##1@\string####1@\endcsname
+ \relax
+ \bbl@afterelse\csname normal@char\string##1\endcsname####1%
+ \else
+ \bbl@afterfi
+ \csname \system@group @sh@\string##1@\string####1@\endcsname
+ \fi}%
+ \@namedef{user@sh@\string##1@\string\protect@}{%
+ \csname user@active\string##1\endcsname}%
+ }%
+ }\x
+\def\bbl@sh@select#1#2{%
+ \expandafter\ifx\csname#1@sh@\string#2@sel\endcsname\relax
+ \bbl@afterelse\bbl@scndcs
+ \else
+ \bbl@afterfi\csname#1@sh@\string#2@sel\endcsname
+ \fi
+}
+\def\active@prefix#1{%
+ \ifx\protect\@typeset@protect
+ \else
+ \ifx\protect\@unexpandable@protect
+ \bbl@afterelse\bbl@afterfi\noexpand#1\@gobble
+ \else
+ \bbl@afterfi\bbl@afterfi\protect#1\@gobble
+ \fi
+ \fi}
+\newif\if@safe@actives
+\@safe@activesfalse
+\def\bbl@restore@actives{\if@safe@actives\@safe@activesfalse\fi}
+\def\bbl@activate#1{%
+ \expandafter\def
+ \expandafter#1\expandafter{%
+ \expandafter\active@prefix
+ \expandafter#1\csname active@char\string#1\endcsname}%
+}
+\def\bbl@deactivate#1{%
+ \expandafter\def
+ \expandafter#1\expandafter{%
+ \expandafter\active@prefix
+ \expandafter#1\csname normal@char\string#1\endcsname}%
+}
+\def\bbl@firstcs#1#2{\csname#1\endcsname}
+\def\bbl@scndcs#1#2{\csname#2\endcsname}
+\def\declare@shorthand#1#2{\@decl@short{#1}#2\@nil}
+\def\@decl@short#1#2#3\@nil#4{%
+ \def\bbl@tempa{#3}%
+ \ifx\bbl@tempa\@empty
+ \expandafter\let\csname #1@sh@\string#2@sel\endcsname\bbl@scndcs
+ \@namedef{#1@sh@\string#2@}{#4}%
+ \else
+ \expandafter\let\csname #1@sh@\string#2@sel\endcsname\bbl@firstcs
+ \@namedef{#1@sh@\string#2@\string#3@}{#4}%
+ \fi}
+\def\textormath#1#2{%
+ \ifmmode
+ \bbl@afterelse#2%
+ \else
+ \bbl@afterfi#1%
+ \fi}
+\def\user@group{user}
+\def\language@group{english}
+\def\system@group{system}
+\def\useshorthands#1{%
+ \def\user@group{user}%
+ \initiate@active@char{#1}%
+ \@tempcnta\lccode`\~
+ \lccode`~=`#1%
+ \lowercase{\catcode`~\active\bbl@activate{~}}%
+ \lccode`\~\@tempcnta}
+\def\defineshorthand{\declare@shorthand{user}}
+\def\languageshorthands#1{\def\language@group{#1}}
+\def\aliasshorthand#1#2{%
+ \expandafter\ifx\csname active@char\string#2\endcsname\relax
+ \ifx\document\@notprerr
+ \@notshorthand{#2}
+ \else
+ \initiate@active@char{#2}%
+ \@tempcnta\lccode`\~
+ \lccode`~=`#2%
+ \lowercase{\let~#1}%
+ \lccode`\~\@tempcnta
+ \fi
+ \fi
+}
+\def\@notshorthand#1{%
+ \PackageError{babel}{%
+ The character `\string #1' should be made
+ a shorthand character;\MessageBreak
+ add the command \string\useshorthands\string{#1\string} to
+ the preamble.\MessageBreak
+ I will ignore your instruction}{}%
+ }
+\newcommand*\shorthandon[1]{\bbl@switch@sh{on}#1\@nil}
+\newcommand*\shorthandoff[1]{\bbl@switch@sh{off}#1\@nil}
+\def\bbl@switch@sh#1#2#3\@nil{%
+ \@ifundefined{active@char\string#2}{%
+ \PackageError{babel}{%
+ The character '\string #2' is not a shorthand character
+ in \languagename}{%
+ Maybe you made a typing mistake?\MessageBreak
+ I will ignore your instruction}}{%
+ \csname bbl@switch@sh@#1\endcsname#2}%
+ \ifx#3\@empty\else
+ \bbl@afterfi\bbl@switch@sh{#1}#3\@nil
+ \fi}
+\def\bbl@switch@sh@off#1{\catcode`#112\relax}
+\begingroup
+ \catcode`\~\active
+ \def\x{\endgroup
+ \def\bbl@switch@sh@on##1{%
+ \begingroup
+ \lccode`~=`##1%
+ \lowercase{\endgroup
+ \catcode`~\active
+ }%
+ }%
+ }
+\x
+\declare@shorthand{system}{"}{\csname normal@char\string"\endcsname}
+\declare@shorthand{system}{'}{%
+ \textormath{\csname normal@char\string'\endcsname}%
+ {\sp\bgroup\prim@s}}
+\declare@shorthand{system}{`}{\csname normal@char\string`\endcsname}
+\def\bbl@prim@s{%
+ \prime\futurelet\@let@token\bbl@pr@m@s}
+\begingroup
+ \catcode`\'\active\let'\relax
+ \def\x{\endgroup
+ \def\bbl@pr@m@s{%
+ \ifx'\@let@token
+ \expandafter\pr@@@s
+ \else
+ \ifx^\@let@token
+ \expandafter\expandafter\expandafter\pr@@@t
+ \else
+ \egroup
+ \fi
+ \fi}%
+ }
+\x
+\initiate@active@char{~}
+\declare@shorthand{system}{~}{\leavevmode\nobreak\ }
+\bbl@activate{~}
+\def\bbl@disc#1#2{%
+ \nobreak\discretionary{#2-}{}{#1}\allowhyphens}
+%HERE ENDS THE CODE COPIED FROM babel.def --------------------
+\def\bbl@disc@german#1#2{%
+ \nobreak\discretionary{#2-}{}{#1}}
+\endinput
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/farsical.sty b/Master/texmf-dist/tex/xelatex/polyglossia/farsical.sty
index 8768825308f..5e43ab75233 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/farsical.sty
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/farsical.sty
@@ -3,7 +3,7 @@
Farsi (jalali) calendar]
\RequirePackage{bidi,calc}
-%TODO - rewrite completely using use calc
+%TODO - rewrite completely using calc
%% - use Reingold & Dershowitz ME
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -184,7 +184,7 @@
\JALALI@d = \JALALI@dn \advance \JALALI@d by -\JALALI@sn
\fi
%% DATE FORMATTING
-\if@rl{\farsinumber\JALALI@d\space%
+\if@RTL{\farsinumber\JALALI@d\space%
\Jalalimonth{\JALALI@m}\space\farsinumber\JALALI@y}%
\else%
\number\JALALI@d\space\JalalimonthEnglish{\JALALI@m}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-albanian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-albanian.ldf
index add9ddc43a0..4ce8ee077c6 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-albanian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-albanian.ldf
@@ -4,7 +4,7 @@
\ifx\l@albanian\@undefined
\xpg@nopatterns{Albanian}
- \adddialect\l@albanian0\fi
+ \adddialect\l@albanian\l@nohyphenation\fi
\def\captionsalbanian{%
\def\refname{Referencat}%
@@ -36,7 +36,7 @@
Qershor\or Korrik\or Gusht\or Shtator\or Tetor\or Nëntor\or
Dhjetor\fi \space \number\year}}}
-\def\albanian@language{\protect\language=\l@albanian}
+\def\albanian@language{\language=\l@albanian}
\setlocalhyphenmins{albanian}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-amharic.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-amharic.ldf
index 10db1eab906..48dcd85eeb0 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-amharic.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-amharic.ldf
@@ -3,8 +3,8 @@
\makeatletter
\ifx\l@amharic\@undefined%
- \xpg@nopatterns{Amharic}%
- \adddialect\l@amharic0%
+ %\xpg@nopatterns{Amharic}%
+ \adddialect\l@amharic\l@nohyphenation%
\fi
\def\captionsamharic{%
@@ -225,6 +225,6 @@
\let\normalfont=\amharic@font%
\def\reset@font{\normalfont}}
-\def\amharic@language{\protect\language=\l@amharic}
+\def\amharic@language{\language=\l@amharic}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-arabic.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-arabic.ldf
index 6997b45bf15..7f4f4e35c80 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-arabic.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-arabic.ldf
@@ -4,53 +4,66 @@
\makeatletter
\ifx\l@arabic\@undefined
- \xpg@nopatterns{arabic}%
- \adddialect\l@arabic0
+ %\xpg@nopatterns{arabic}%
+ \adddialect\l@arabic\l@nohyphenation
\fi
\def\arabic@RL{\relax}
-\newif\if@eastern@numerals
+\newif\ifeastern@numerals
\def\tmp@mashriq{mashriq}
\def\tmp@maghrib{maghrib}
\define@key{arabic}{numerals}[mashriq]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@mashriq\@eastern@numeralstrue\else%
- \ifx\@tmpa\tmp@maghrib\@eastern@numeralsfalse\fi%
- \fi}
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@mashriq%
+ \eastern@numeralstrue%
+ \else
+ \ifx\@tmpa\tmp@maghrib\eastern@numeralsfalse\fi%
+ \fi}
+
+\newif\ifabjad@jim@notail
+\def\tmp@true{true}
+\define@key{arabic}{abjadjimnotail}[true]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@true\abjad@jim@notailtrue%
+ \else
+ \abjad@jim@notailfalse
+ \fi}
\def\tmp@morocco{morocco}
\def\tmp@algeria{algeria}
\define@key{arabic}{locale}[default]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@morocco%
- \@eastern@numeralsfalse%
- \else\ifx\@tmpa\tmp@algeria%
- \@eastern@numeralsfalse%
- \fi%
- \fi%
- \gdef\@@arabic@month{\@arabic@month{#1}}}
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@morocco%
+ \eastern@numeralsfalse%
+ \else
+ \ifx\@tmpa\tmp@algeria%
+ \eastern@numeralsfalse%
+ \fi%
+ \fi%
+ \gdef\@@arabic@month{\@arabic@month{#1}}}
\newif\if@hijrical
\def\tmp@hijri{hijri}
\def\tmp@islamic{islamic}
-\define@key{arabic}{calendar}[islamic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@hijri\@hijricaltrue%
- \else%
- \ifx\@tmpa\tmp@islamic\@hijricaltrue%
- \else\@hijricalfalse%
- \fi\fi}
+\define@key{arabic}{calendar}[gregorian]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@hijri\@hijricaltrue%
+ \else
+ \ifx\@tmpa\tmp@islamic\@hijricaltrue%
+ \else\@hijricalfalse%
+ \fi
+ \fi}
\define@key{arabic}{hijricorrection}[0]{%
- \gdef\@hijri@correction{#1}}%
+ \gdef\@hijri@correction{#1}}%
% This should set the defaults
-\setkeys{arabic}{locale,calendar,numerals,hijricorrection}
+\setkeys{arabic}{locale,calendar,numerals,hijricorrection,abjadjimnotail=false}
\def\arabicgregmonth@default#1{\ifcase#1%
% Egypt, Sudan, Yemen and Golf states
- \or يناير\or فبراير\or مارس\or ابريل\or مايو\or يونيو\or يوليو\or اغستس\or سبتمبر\or أكتوبر\or نوفمبر\or ديسمبر\fi}
+ \or يناير\or فبراير\or مارس\or أبريل\or مايو\or يونيو\or يوليو\or أغسطس\or سبتمبر\or أكتوبر\or نوفمبر\or ديسمبر\fi}
\def\arabicgregmonth@mashriq#1{\ifcase#1%
% Iraq Syria Jordan Lebanon Palestine
\or كانون الثاني\or شباط\or آذار\or نيسان\or أيار\or حزيران\or تموز\or آب\or أيلول\or تشرين الأول\or تشرين الثاني\or كانون الأول\fi}
@@ -71,35 +84,35 @@
\arabicgregmonth@default}}
\def\captionsarabic{%
-\def\prefacename{\@ensure@RL{مدخل}}%
-\def\refname{\@ensure@RL{المراجع}}
-\def\abstractname{\@ensure@RL{ملخص}}%
-\def\bibname{\@ensure@RL{المصادر}}%
-\def\chaptername{\@ensure@RL{الباب}}%
-\def\appendixname{\@ensure@RL{الملاحق}}%
-\def\contentsname{\@ensure@RL{المحتويات}}
-%\def\contentsname{\@ensure@RL{الفهرس}}%
-\def\listfigurename{\@ensure@RL{قائمة الأشكال}}%
-\def\listtablename{\@ensure@RL{قائمة الجداول}}%
-\def\indexname{\@ensure@RL{الفهرس}}%
-\def\figurename{\@ensure@RL{شكل}}%
-\def\tablename{\@ensure@RL{جدول}}%
-\def\partname{\@ensure@RL{القسم}}%
-\def\enclname{\@ensure@RL{المرفقات}}%<-- Needs translation
-\def\ccname{\@ensure@RL{نسخة ل‬}}% <<
-\def\headtoname{\@ensure@RL{إلى}}%<-- Needs translation
-\def\pagename{\@ensure@RL{صفحة}}%
-\def\seename{\@ensure@RL{راجع}}%\alefhamza\nun\za\ra
-\def\alsoname{\@ensure@RL{راجع أيضاً}}%<<\alefhamza\nun\za\ra
-\def\proofname{\@ensure@RL{برهان}}%
-\def\glossaryname{\@ensure@RL{قاموس}}%<<
+\def\prefacename{\@ensure@RTL{مدخل}}%
+\def\refname{\@ensure@RTL{المراجع}}
+\def\abstractname{\@ensure@RTL{ملخص}}%
+\def\bibname{\@ensure@RTL{المصادر}}%
+\def\chaptername{\@ensure@RTL{باب}}%
+\def\appendixname{\@ensure@RTL{الملاحق}}%
+\def\contentsname{\@ensure@RTL{المحتويات}}
+%\def\contentsname{\@ensure@RTL{الفهرس}}%
+\def\listfigurename{\@ensure@RTL{قائمة الأشكال}}%
+\def\listtablename{\@ensure@RTL{قائمة الجداول}}%
+\def\indexname{\@ensure@RTL{الفهرس}}%
+\def\figurename{\@ensure@RTL{شكل}}%
+\def\tablename{\@ensure@RTL{جدول}}%
+\def\partname{\@ensure@RTL{القسم}}%
+\def\enclname{\@ensure@RTL{المرفقات}}%<-- Needs translation
+\def\ccname{\@ensure@RTL{نسخة ل‬}}% <<
+\def\headtoname{\@ensure@RTL{إلى}}%<-- Needs translation
+\def\pagename{\@ensure@RTL{صفحة}}%
+\def\seename{\@ensure@RTL{راجع}}%\alefhamza\nun\za\ra
+\def\alsoname{\@ensure@RTL{راجع أيضًا}}%<<\alefhamza\nun\za\ra
+\def\proofname{\@ensure@RTL{برهان}}%
+\def\glossaryname{\@ensure@RTL{قاموس}}%<<
}
\def\datearabic{%
\def\today{%
\if@hijrical%
\Hijritoday[\@hijri@correction]%
\else%
- \if@rl%
+ \if@RTL%
\arabicnumber\day\space\@@arabic@month{\month}%
\space\arabicnumber\year%
\else% in LR environment we format the gregorian date within \textenglish
@@ -111,7 +124,7 @@
\fi}}
-\def\arabicnumber#1{\if@eastern@numerals{\protect\addfontfeature{Mapping=arabicdigits}\number#1}\else\RL{\reset@font\number#1}\fi}
+\def\arabicnumber#1{\ifeastern@numerals{\addfontfeature{Mapping=arabicdigits}\number#1}\else\RL{\reset@font\number#1}\fi}
\def\@ornatebracearabic#1{\RL{\char"FD3F\@arabic#1\char"FD3E}}
\def\@ornatebracealph#1{\RL{\char"FD3F\@alph#1\char"FD3E}}
@@ -122,7 +135,7 @@
\else%
\ifnum#1<\z@\space\xpg@ill@value{#1}{abjad numeral}%
\else%
- \ifnum#1<10\expandafter\abj@num@i\number#1%
+ \ifnum#1<10\expandafter\abj@num@i@iso\number#1%
\else%
\ifnum#1<100\expandafter\abj@num@ii\number#1%
\else%
@@ -137,8 +150,13 @@
\fi
}
\def\abjad@zero{}
+\def\abjad@three{ج\ifabjad@jim@notail\char"200D\fi}
+\def\abj@num@i@iso#1{%
+ \ifcase#1\or ا\or ب\or\abjad@three\or د%
+ \or ه\char"200D\or و\or ز\or ح\or ط\fi%
+ \ifnum#1=\z@\abjad@zero\fi}
\def\abj@num@i#1{%
- \ifcase#1\or ا\or ب\or ج\char"200D\or د%
+ \ifcase#1\or ا\or ب\or\abjad@three\or د%
\or ه\or و\or ز\or ح\or ط\fi%
\ifnum#1=\z@\abjad@zero\fi}
\def\abj@num@ii#1{%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasai.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasai.ldf
index 7b6a7b384d9..4c1bdd0ab0d 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasai.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasai.ldf
@@ -10,7 +10,7 @@
\ifx\l@malay\@undefined
\ifx\l@meyalu\@undefined
\xpg@nopatterns{Bahasa Indonesia}
- \adddialect\l@bahasa0\relax
+ \adddialect\l@bahasa\l@nohyphenation\relax
\else
\let\l@bahasa\l@meyalu
\fi
@@ -61,7 +61,7 @@
Juli\or Agustus\or September\or Oktober\or Nopember\or Desember\fi
\space \number\year}}
-\def\bahasai@language{\protect\language=\l@bahasai}
+\def\bahasai@language{\language=\l@bahasai}
\setlocalhyphenmins{bahasai}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasam.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasam.ldf
index 93770223c28..9cfb07f3422 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasam.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bahasam.ldf
@@ -10,7 +10,7 @@
\ifx\l@indon\@undefined
\ifx\l@indonesian\@undefined
\xpg@nopatterns{Bahasa Malaysia}
- \adddialect\l@malay0\relax
+ \adddialect\l@malay\l@nohyphenation\relax
\else
\let\l@malay\l@indonesian
\fi
@@ -61,7 +61,7 @@
Julai\or Ogos\or September\or Oktober\or November\or Disember\fi
\space \number\year}}
-\def\bahasam@language{\protect\language=\l@bahasam}
+\def\bahasam@language{\language=\l@bahasam}
\setlocalhyphenmins{bahasam}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-basque.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-basque.ldf
index d1c211ab4cb..990d9a0df70 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-basque.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-basque.ldf
@@ -4,7 +4,7 @@
\ifx\l@basque\@undefined%
\xpg@nopatterns{Basque}%
- \adddialect\l@basque0%
+ \adddialect\l@basque\l@nohyphenation%
\fi
\def\captionsbasque{%
@@ -38,7 +38,7 @@
irailaren\or urriaren\or azaroaren\or
abenduaren\fi~\number\day}}
-\def\basque@language{\protect\language=\l@basque}
+\def\basque@language{\language=\l@basque}
\setlocalhyphenmins{basque}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-brazil.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-brazil.ldf
index bbfa6347742..e1e3d25349a 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-brazil.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-brazil.ldf
@@ -1,14 +1,14 @@
-\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for portuguese]
+\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for portuguese]
\makeatletter
-\def\portuges@font{\normalfontlatin}
+\def\brazil@font{\normalfontlatin}
%FIXME check this:
-\ifx\l@portuges\@undefined
+\ifx\l@brazil\@undefined
\ifx\l@portuguese\@undefined
- \xpg@nopatterns{Portuguese}
- \adddialect\l@portuges0
+ \xpg@nopatterns{Brazilian Portuguese}
+ \adddialect\l@brazil\l@nohyphenation
\else
- \let\l@portuges\l@portuguese
+ \let\l@brazil\l@portuguese
\fi
\fi
@@ -34,7 +34,7 @@
\def\ccname{Cópia para}%
\def\headtoname{Para}%
\def\proofname{Demonstração}%
- \def\glossaryname{Glossary}%
+ \def\glossaryname{Glossário}%
}
\def\datebrazil{%
\def\today{\number\day\space de\space\ifcase\month\or
@@ -43,7 +43,7 @@
\fi\space de\space\number\year}%
}
-\def\brazil@language{\protect\language=\l@portuges}
+\def\brazil@language{\language=\l@brazil}
\setlocalhyphenmins{brazil}{2}{3}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-breton.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-breton.ldf
index e1c51cb23d5..a689f961d6d 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-breton.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-breton.ldf
@@ -4,18 +4,24 @@
\ifx\l@breton\@undefined%
\xpg@nopatterns{Breton}%
- \adddialect\l@breton0%
+ \adddialect\l@breton\l@nohyphenation%
\fi
+\newXeTeXintercharclass\breton@punctthin % ! ? ;
+\newXeTeXintercharclass\breton@punctthick % :
+
+\def\breton@punctthinspace{\unskip\thinspace}
+\def\breton@punctthickspace{\unskip\nobreakspace}
+
\def\breton@punctuation{%
\frenchspacing%
\XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\; 7%
- \XeTeXcharclass `\: 7%
- \XeTeXcharclass `\? 8%
- \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
- \XeTeXinterchartoks 0 8 = {\unskip\kern\fontdimen2\font\kern-1.4\fontdimen3\font}%
+ \XeTeXcharclass `\! \breton@punctthin
+ \XeTeXcharclass `\? \breton@punctthin
+ \XeTeXcharclass `\; \breton@punctthin
+ \XeTeXcharclass `\: \breton@punctthick
+ \XeTeXinterchartoks \z@ \breton@punctthin = \breton@punctthinspace
+ \XeTeXinterchartoks \z@ \breton@punctthick = \breton@punctthickspace
}
\def\nobreton@punctuation{%
@@ -55,7 +61,7 @@
Gouere\or Eost\or Gwengolo\or Here\or Du\or Kerzu\fi
\space\number\year}}
-\def\breton@language{\protect\language=\l@breton}
+\def\breton@language{\language=\l@breton}
\setlocalhyphenmins{breton}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bulgarian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bulgarian.ldf
index 9166f9b47ea..5ce648ca0f6 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bulgarian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-bulgarian.ldf
@@ -3,23 +3,25 @@
\ifx\l@bulgarian\@undefined%
\xpg@nopatterns{Bulgarian}%
- \adddialect\l@bulgarian0%
+ \adddialect\l@bulgarian\l@nohyphenation%
\fi
\def\bulgarian@Alph#1{%
\ifcase#1\or
А\or Б\or В\or Г\or Д\or Е\or Ж\or
- З\or И\or К\or Л\or М\or Н\or О\or
- П\or Р\or С\or Т\or У\or Ф\or Х\or
- Ц\or Ч\or Ш\or Ш\or Ю\or Я\else
+ З\or И\or Й\or К\or Л\or М\or Н\or
+ О\or П\or Р\or С\or Т\or У\or Ф\or
+ Х\or Ц\or Ч\or Ш\or Щ\or Ъ\or
+ Ю\or Я\else
\xpg@ill@value{#1}{bulgarian@Alph}\fi}%
\def\bulgarian@alph#1{%
\ifcase#1\or
а\or б\or в\or г\or д\or е\or ж\or
- з\or и\or к\or л\or м\or н\or о\or
- п\or р\or с\or т\or у\or ф\or х\or
- ц\or ч\or ш\or щ\or ю\or я\else
+ з\or и\or й\or к\or л\or м\or н\or
+ о\or п\or р\or с\or т\or у\or ф\or
+ х\or ц\or ч\or ш\or щ\or ъ\or ь\or
+ ю\or я\else
\xpg@ill@value{#1}{bulgarian@alph}\fi}%
\def\bulgarian@numbers{%
@@ -42,9 +44,9 @@
\def\chaptername{Глава}%
\def\appendixname{Приложение}%
\def\contentsname{Съдържание}%
- \def\listfigurename{Списхrdsnк на фигурите}%
- \def\listtablename{Списхrdsnк на таблиците}%
- \def\indexname{Азбуцhен указател}%
+ \def\listfigurename{Списък на фигурите}%
+ \def\listtablename{Списък на таблиците}%
+ \def\indexname{Азбучен указател}%
\def\figurename{Фигура}%
\def\tablename{Таблица}%
%\def\thepart{}%
@@ -77,7 +79,7 @@
\def\todayRoman{\number\day.\,\month@Roman.\,\number\year~г.}%
}
-\def\bulgarian@language{\protect\language=\l@bulgarian}
+\def\bulgarian@language{\language=\l@bulgarian}
\def\bulgarian@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-catalan.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-catalan.ldf
index 5832a0dd2ff..e89999a2846 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-catalan.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-catalan.ldf
@@ -4,7 +4,7 @@
\ifx\l@catalan\@undefined%
\xpg@nopatterns{Catalan}%
- \adddialect\l@catalan0%
+ \adddialect\l@catalan\l@nohyphenation%
\fi
\def\captionscatalan{%
@@ -38,7 +38,7 @@
de novembre\or de desembre\fi
\space de~\number\year}}
-\def\catalan@language{\protect\language=\l@catalan}
+\def\catalan@language{\language=\l@catalan}
\setlocalhyphenmins{catalan}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-coptic.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-coptic.ldf
index 4ec672d82ba..62d68cdd799 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-coptic.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-coptic.ldf
@@ -3,7 +3,7 @@
\ifx\l@coptic\@undefined%
\xpg@nopatterns{Coptic}%
- \adddialect\l@coptic0%
+ \adddialect\l@coptic\l@nohyphenation%
\fi
%\def\captionscoptic{%
@@ -34,7 +34,7 @@
% \def\today{<++>}%
% }
-\def\coptic@language{\protect\language=\l@coptic}
+\def\coptic@language{\language=\l@coptic}
\def\coptic@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-croatian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-croatian.ldf
index 67cc391723f..d578a225863 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-croatian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-croatian.ldf
@@ -4,7 +4,7 @@
\ifx\l@croatian\@undefined%
\xpg@nopatterns{Croatian}%
- \adddialect\l@croatian0%
+ \adddialect\l@croatian\l@nohyphenation%
\fi
\def\captionscroatian{%
@@ -36,7 +36,7 @@
lipnja\or srpnja\or kolovoza\or rujna\or listopada\or studenog\or
prosinca\fi \space \number\year.}}
-\def\croatian@language{\protect\language=\l@croatian}
+\def\croatian@language{\language=\l@croatian}
\setlocalhyphenmins{croatian}{2}{2}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-czech.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-czech.ldf
index 555943ed0f4..b7d19d1564c 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-czech.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-czech.ldf
@@ -4,7 +4,7 @@
\ifx\l@czech\@undefined%
\xpg@nopatterns{Czech}%
- \adddialect\l@czech0%
+ \adddialect\l@czech\l@nohyphenation%
\fi
\def\captionsczech{%
@@ -38,7 +38,7 @@
října\or listopadu\or prosince\fi
\space \number\year}}
-\def\czech@language{\protect\language=\l@czech}
+\def\czech@language{\language=\l@czech}
\setlocalhyphenmins{czech}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-danish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-danish.ldf
index 249539ff433..251a3ea8ceb 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-danish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-danish.ldf
@@ -4,7 +4,7 @@
\ifx\l@danish\@undefined
\xpg@nopatterns{Danish}
- \adddialect\l@danish0
+ \adddialect\l@danish\l@nohyphenation
\fi
\def\captionsdanish{%
@@ -35,7 +35,7 @@
\space\number\year}
\def\danish@language{%
- \protect\language=\l@danish}
+ \language=\l@danish}
\setlocalhyphenmins{danish}{2}{3}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-divehi.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-divehi.ldf
index 9455c35bfaf..17feea24196 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-divehi.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-divehi.ldf
@@ -3,8 +3,8 @@
\makeatletter
\ifx\l@divehi\@undefined%
- \xpg@nopatterns{Divehi}%
- \adddialect\l@divehi0%
+ %\xpg@nopatterns{Divehi}%
+ \adddialect\l@divehi\l@nohyphenation%
\fi
\def\divehi@RL{\relax}
@@ -35,7 +35,7 @@
% }
%\def\datedivehi{\def\today{<++>}}
-\def\divehi@language{\protect\language=\l@divehi}
+\def\divehi@language{\language=\l@divehi}
\def\divehi@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-dutch.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-dutch.ldf
index d92caf20ad4..dc0255b19da 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-dutch.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-dutch.ldf
@@ -4,7 +4,7 @@
\ifx\l@dutch\@undefined
\xpg@nopatterns{Dutch}
- \adddialect\l@dutch0
+ \adddialect\l@dutch\l@nohyphenation
\fi
\def\dutch@punctuation{%
@@ -38,12 +38,12 @@
\def\proofname{Bewijs}%
\def\glossaryname{Verklarende Woordenlijst}%
\def\today{\number\day~\ifcase\month%
- Januarie\or Februarie\or Maart\or April\or Mei\or Junie\or
- Julie\or Augustus\or September\or Oktober\or November\or
- Desember\fi
+ \or januari\or februari\or maart\or april\or mei\or juni\or
+ juli\or augustus\or september\or oktober\or november\or
+ december\fi
\space \number\year}}
-\def\dutch@language{\protect\language=\l@dutch}
+\def\dutch@language{\language=\l@dutch}
\setlocalhyphenmins{dutch}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf
index a50b1fb5928..9556c270190 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf
@@ -6,7 +6,7 @@
\ifx\l@USenglish\@undefined%
\ifx\l@american\@undefined%
\xpg@nopatterns{English}%
- \adddialect\l@english0%
+ \adddialect\l@english\l@nohyphenation%
\else%
\let\l@english\l@american%
\fi%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-esperanto.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-esperanto.ldf
index 46cb02f7c69..eefa595232f 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-esperanto.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-esperanto.ldf
@@ -4,7 +4,7 @@
\ifx\l@esperanto\@undefined%
\xpg@nopatterns{Esperanto}%
- \adddialect\l@esperanto0%
+ \adddialect\l@esperanto\l@nohyphenation%
\fi
\def\captionsesperanto{%
@@ -63,7 +63,7 @@
\let\@alph\latin@alph%
}
-\def\esperanto@language{\protect\language=\l@esperanto}
+\def\esperanto@language{\language=\l@esperanto}
\setlocalhyphenmins{esperanto}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-estonian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-estonian.ldf
index ce71da797d4..b88d49b66ea 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-estonian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-estonian.ldf
@@ -4,7 +4,7 @@
\ifx\l@estonian\@undefined%
\xpg@nopatterns{Estonian}%
- \adddialect\l@estonian0%
+ \adddialect\l@estonian\l@nohyphenation%
\fi
\def\captionsestonian{%
@@ -37,7 +37,7 @@
juuli\or august\or september\or oktoober\or november\or
detsember\fi\space\number\year.\space a.}}
-\def\estonian@language{\protect\language=\l@estonian}
+\def\estonian@language{\language=\l@estonian}
\setlocalhyphenmins{estonian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-farsi.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-farsi.ldf
index a01b187e0b3..75556ea167b 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-farsi.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-farsi.ldf
@@ -3,10 +3,10 @@
\RequirePackage{farsical}
\makeatletter
-%\ifx\l@farsi\@undefined
-% \xpg@nopatterns{Farsi}%
-\adddialect\l@farsi0
-%\fi
+\ifx\l@farsi\@undefined
+ %\xpg@nopatterns{Farsi}%
+ \adddialect\l@farsi\l@nohyphenation
+\fi
\def\farsi@RL{\relax}
@@ -33,30 +33,30 @@
\or نیسان\or ایار\or حزیران\or تموز\or آب\or ایلول\or تشرین اول\or تشرین ثانی\or کانون اول\fi}
\def\captionsfarsi{%
-\def\prefacename{\@ensure@RL{پیشگفتار}}%
-\def\refname{\@ensure@RL{مراجع}}%
-\def\abstractname{\@ensure@RL{چکیده}}%
-\def\bibname{\@ensure@RL{کتاب‌نامه}}%
-\def\chaptername{\@ensure@RL{فصل}}%
-\def\appendixname{\@ensure@RL{پیوست}}%
-\def\contentsname{\@ensure@RL{فهرست مطالب}}%
-\def\listfigurename{\@ensure@RL{لیست تصاویر}}%
-\def\listtablename{\@ensure@RL{لیست جداول}}%
-\def\indexname{\@ensure@RL{نمایه}}%
-\def\figurename{\@ensure@RL{شكل}}%
-\def\tablename{\@ensure@RL{جدول}}%
-\def\partname{\@ensure@RL{بخش}}%
-%\def\enclname{\@ensure@RL{}}%<-- Needs translation
-%\def\ccname{\@ensure@RL{}}%<-- Needs translation
-%\def\headtoname{\@ensure@RL{}}%<-- Needs translation
-\def\pagename{\@ensure@RL{صفحة}}%
-%\def\seename{\@ensure@RL{}}%<-- Needs translation
-%\def\alsoname{\@ensure@RL{}}%<-- Needs translation
-\def\proofname{\@ensure@RL{برهان}}%
-\def\glossaryname{\@ensure@RL{لغت‌نامه}}%<-- Needs to be checked
+\def\prefacename{\@ensure@RTL{پیشگفتار}}%
+\def\refname{\@ensure@RTL{مراجع}}%
+\def\abstractname{\@ensure@RTL{چکیده}}%
+\def\bibname{\@ensure@RTL{کتاب‌نامه}}%
+\def\chaptername{\@ensure@RTL{فصل}}%
+\def\appendixname{\@ensure@RTL{پیوست}}%
+\def\contentsname{\@ensure@RTL{فهرست مطالب}}%
+\def\listfigurename{\@ensure@RTL{لیست تصاویر}}%
+\def\listtablename{\@ensure@RTL{لیست جداول}}%
+\def\indexname{\@ensure@RTL{نمایه}}%
+\def\figurename{\@ensure@RTL{شكل}}%
+\def\tablename{\@ensure@RTL{جدول}}%
+\def\partname{\@ensure@RTL{بخش}}%
+%\def\enclname{\@ensure@RTL{}}%<-- Needs translation
+%\def\ccname{\@ensure@RTL{}}%<-- Needs translation
+%\def\headtoname{\@ensure@RTL{}}%<-- Needs translation
+\def\pagename{\@ensure@RTL{صفحة}}%
+%\def\seename{\@ensure@RTL{}}%<-- Needs translation
+%\def\alsoname{\@ensure@RTL{}}%<-- Needs translation
+\def\proofname{\@ensure@RTL{برهان}}%
+\def\glossaryname{\@ensure@RTL{لغت‌نامه}}%<-- Needs to be checked
}
\def\datefarsi{%
- \def\today{\@ensure@RL{\farsinumber\day\space\farsigregmonth{\month}\space\farsinumber\year}}%
+ \def\today{\@ensure@RTL{\farsinumber\day\space\farsigregmonth{\month}\space\farsinumber\year}}%
}
\def\farsinumber#1{\if@western@numerals\RL{\number#1}\else%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-finnish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-finnish.ldf
index bd5ee15e513..60f4a5b971b 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-finnish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-finnish.ldf
@@ -4,7 +4,7 @@
\ifx\l@finnish\@undefined%
\xpg@nopatterns{Finnish}%
- \adddialect\l@finnish0%
+ \adddialect\l@finnish\l@nohyphenation%
\fi
\def\captionsfinnish{%
@@ -38,7 +38,7 @@
syyskuuta\or lokakuuta\or marraskuuta\or joulukuuta\fi
\space\number\year}}
-\def\finnish@language{\protect\language=\l@finnish}
+\def\finnish@language{\language=\l@finnish}
\setlocalhyphenmins{finnish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf
index 85bc82ddd79..9a03f06af7d 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-french.ldf
@@ -1,70 +1,51 @@
\ProvidesFile{gloss-french.ldf}[polyglossia: module for french]
\makeatletter
\def\french@font{\normalfontlatin}
-\lccode"2019="2019
\ifx\l@french\@undefined%
\xpg@nopatterns{French}%
- \adddialect\l@french0%
+ \adddialect\l@french\l@nohyphenation%
\fi
+\newXeTeXintercharclass\french@punctthin % ! ? ;
+\newXeTeXintercharclass\french@punctthick % :
+\newXeTeXintercharclass\french@punctguill % « »
+
+\def\french@punctthinspace{\unskip\thinspace}
+\def\french@punctthickspace{\unskip\nobreakspace}
+
\def\french@punctuation{%
- \frenchspacing%
- \XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\? 7%
- \XeTeXcharclass `\; 7%
- \XeTeXcharclass `\: 7%
- \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
+ \frenchspacing
+ \lccode"2019="2019
+ \XeTeXinterchartokenstate=1
+ \XeTeXcharclass `\! \french@punctthin
+ \XeTeXcharclass `\? \french@punctthin
+ \XeTeXcharclass `\; \french@punctthin
+ \XeTeXcharclass `\: \french@punctthick
+ \XeTeXinterchartoks \z@ \french@punctthin = \french@punctthinspace
+ \XeTeXinterchartoks \z@ \french@punctthick = \french@punctthickspace
}
\def\nofrench@punctuation{%
- \nonfrenchspacing%
- \XeTeXinterchartokenstate=0%
+ \nonfrenchspacing
+ \lccode"2019=\z@
+ \XeTeXinterchartokenstate=0
}
\def\french@guillemets{%
- \XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\« 8%
- \XeTeXcharclass `\» 8%
- \XeTeXinterchartoks 8 0 = {\kern.1667em}%
- \XeTeXinterchartoks 0 8 = {\unskip\kern.1667em}%
- \XeTeXinterchartoks 8 7 = {\unskip\kern.1667em}% "»;" -> "» ;"
- \XeTeXinterchartoks 7 8 = {\unskip\kern.1667em}% "?»" -> "? »"
+ \XeTeXinterchartokenstate=1
+ \XeTeXcharclass `\« \french@punctguill
+ \XeTeXcharclass `\» \french@punctguill
+ \XeTeXinterchartoks \french@punctguill \z@ = \french@punctthickspace
+ \XeTeXinterchartoks \z@ \french@punctguill = \french@punctthickspace
+ \XeTeXinterchartoks \french@punctguill \french@punctthin = \french@punctthinspace
+ % "»;" -> "» ;"
+ \XeTeXinterchartoks \french@punctguill \french@punctthick = \french@punctthickspace
+ % "»:" -> "» :"
+ \XeTeXinterchartoks \french@punctthin \french@punctguill = \french@punctthickspace
+ % "?»" -> "? »"
}
-%\newcounter{niveauguillemets}[paragraph]
-%
-%\def\tmp@normal{normal}
-%\def\tmp@paragraphe{paragraphe}
-%\def\tmp@ligne{ligne}
-
-%TODO
-%\define@key{french}{guillemets}[normal]{
-% \def\@tmpa{#1}
-% \ifx\@tmpa\tmp@ligne%
-% \def\french@guill@mets{% FIXME
-% \def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em\setcounter{niveauguillemets}{1}%
-% \ifthenelse{\value{niveauguillemets} = 1}{\localleftbox{«\kern.1667em}}%
-% {\everypar={{«}\kern.1667em}\setcounter{niveauguillemets}{1}}}%
-% \def\RightPointingDoubleAngleQuotationMark{\unskip\kern.1667em»%
-% \everypar={}\localleftbox{}}}%
-% \else\ifx\@tmpa\tmp@paragraphe%
-% \def\french@guill@mets{\def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em%
-% \everypar={«\kern.1667em}}\def\RightPointingDoubleAngleQuotationMark%
-% {\unskip\kern.1667em»\everypar={}}}%
-% \else\ifx\@tmpa\tmp@normal%
-% \def\french@guill@mets{\def\LeftPointingDoubleAngleQuotationMark{«\kern.1667em}%
-% \def\RightPointingDoubleAngleQuotationMark{\unskip\kern.1667em»}}%
-%\fi\fi\fi}
-%
-%\def\tmp@sans{sansaccents}
-%\define@key{french}{majuscules}{%
-% \def\@tmpa{#1}%
-% \ifx\@tmpa\tmp@sans%
-% \addfontfeature{Mapping=sansaccents}% <<< TODO!
-% \fi}
-
\def\captionsfrench{%
\def\refname{Références}%
\def\abstractname{Résumé}%
@@ -104,7 +85,7 @@
décembre\fi%
\space \number\year}}
-\def\french@language{\protect\language=\l@french}
+\def\french@language{\language=\l@french}
\setlocalhyphenmins{french}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-galician.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-galician.ldf
index 6e68208e943..9a97d8c3aec 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-galician.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-galician.ldf
@@ -4,7 +4,7 @@
\ifx\l@galician\@undefined%
\xpg@nopatterns{Galician}%
- \adddialect\l@galician0%
+ \adddialect\l@galician\l@nohyphenation%
\fi
\def\captionsgalician{%
@@ -37,7 +37,7 @@
xullo\or agosto\or setembro\or outubro\or novembro\or decembro\fi
\space de~\number\year}}
-\def\galician@language{\protect\language=\l@galician}
+\def\galician@language{\language=\l@galician}
\setlocalhyphenmins{galician}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-german.ldf
index ec78057d0a5..94041f8a677 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-german.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-german.ldf
@@ -11,21 +11,21 @@
\ifx\@tmpa\tmp@old%
\ifx\l@german\@undefined%
\xpg@nopatterns{german}%
- \adddialect\l@german0%
+ \adddialect\l@german\l@nohyphenation%
\fi%
\@german@oldspellingtrue%
\else%
\ifx\@tmpa\tmp@oldyr%
\ifx\l@german\@undefined%
\xpg@nopatterns{german}%
- \adddialect\l@german0%
+ \adddialect\l@german\l@nohyphenation%
\fi%
\@german@oldspellingtrue%
\else%
\ifx\l@ngerman\@undefined%
\ifx\l@german\@undefined%
\xpg@nopatterns{ngerman}%
- \adddialect\l@ngerman0%
+ \adddialect\l@ngerman\l@nohyphenation%
\else%
\xpg@warning{You asked for `ngerman' but only `german' hyphenation is available!}%
\@german@oldspellingtrue%
@@ -37,91 +37,68 @@
\fi%
}
+\newif\if@german@fraktur
+\def\tmp@fraktur{fraktur}
+\define@key{german}{script}[latin]{%
+ \def\@tmpa{#1}%
+ \ifx\@tmpa\tmp@fraktur\@german@frakturtrue\else%
+ \@german@frakturfalse%
+ \fi}
+
\define@boolkey{german}[german@]{latesthyphen}[false]{}
\define@boolkey{german}[german@]{babelshorthands}[false]{}
-\setkeys{german}{spelling,latesthyphen,babelshorthands}
+\setkeys{german}{spelling,latesthyphen,babelshorthands,script}
-%% definitions from babel.def and germanb.ldf
-\long\def\bbl@afterelse#1\else#2\fi{\fi#1}
-\long\def\bbl@afterfi#1\fi{\fi#1}
-\def\textormath#1#2{%
- \ifmmode
- \bbl@afterelse#2%
- \else
- \bbl@afterfi#1%
- \fi}
+\ifcsundef{initiate@active@char}{%
+\input{babelsh.def}%
+\initiate@active@char{"}%
+}{}
-\def\bbl@disc#1#2{%
- \nobreak\discretionary{#2-}{}{#1}}
+\def\german@shorthands{%
+\bbl@activate{"}%
+\def\language@group{german}%
+\declare@shorthand{german}{"`}{„}%
+\declare@shorthand{german}{"'}{“}%
+\declare@shorthand{german}{"<}{«}%
+\declare@shorthand{german}{">}{»}%
+\declare@shorthand{german}{"c}{\textormath{\bbl@disc@german ck}{c}}%
+\declare@shorthand{german}{"C}{\textormath{\bbl@disc@german CK}{C}}%
+\declare@shorthand{german}{"F}{\textormath{\bbl@disc@german F{FF}}{F}}%
+\declare@shorthand{german}{"l}{\textormath{\bbl@disc@german l{ll}}{l}}%
+\declare@shorthand{german}{"L}{\textormath{\bbl@disc@german L{LL}}{L}}%
+\declare@shorthand{german}{"m}{\textormath{\bbl@disc@german m{mm}}{m}}%
+\declare@shorthand{german}{"M}{\textormath{\bbl@disc@german M{MM}}{M}}%
+\declare@shorthand{german}{"n}{\textormath{\bbl@disc@german n{nn}}{n}}%
+\declare@shorthand{german}{"N}{\textormath{\bbl@disc@german N{NN}}{N}}%
+\declare@shorthand{german}{"p}{\textormath{\bbl@disc@german p{pp}}{p}}%
+\declare@shorthand{german}{"P}{\textormath{\bbl@disc@german P{PP}}{P}}%
+\declare@shorthand{german}{"r}{\textormath{\bbl@disc@german r{rr}}{r}}%
+\declare@shorthand{german}{"R}{\textormath{\bbl@disc@german R{RR}}{R}}%
+\declare@shorthand{german}{"t}{\textormath{\bbl@disc@german t{tt}}{t}}%
+\declare@shorthand{german}{"T}{\textormath{\bbl@disc@german T{TT}}{T}}%
+\declare@shorthand{german}{"f}{\textormath{\bbl@discff}{f}}%
\def\bbl@discff{\penalty\@M
- \afterassignment\bbl@insertff \let\bbl@nextff= }
+ \afterassignment\bbl@insertff \let\bbl@nextff= }%
\def\bbl@insertff{%
\if f\bbl@nextff
\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
- {\relax\discretionary{ff-}{f}{ff}}{f\bbl@nextff}}
-\let\bbl@nextff=f
-
-\def\german@shorthands{%
- \XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\" 7%
- \XeTeXcharclass `\c 8%
- \XeTeXcharclass `\C 9%
- \XeTeXcharclass `\F 10%
- \XeTeXcharclass `\l 11%
- \XeTeXcharclass `\L 12%
- \XeTeXcharclass `\m 13%
- \XeTeXcharclass `\M 14%
- \XeTeXcharclass `\n 15%
- \XeTeXcharclass `\N 16%
- \XeTeXcharclass `\p 17%
- \XeTeXcharclass `\P 18%
- \XeTeXcharclass `\r 19%
- \XeTeXcharclass `\R 20%
- \XeTeXcharclass `\t 21%
- \XeTeXcharclass `\T 22%
- \XeTeXcharclass `\f 23%
- \XeTeXcharclass `\- 24%
- \XeTeXcharclass `\| 25%
- \XeTeXcharclass `\~ 26%
- \XeTeXcharclass `\= 27%
- \XeTeXcharclass `\` 28%
- \XeTeXcharclass `\' 29%
- \XeTeXcharclass `\< 30%
- \XeTeXcharclass `\> 31%
- \XeTeXinterchartoks 7 8 = {\textormath{\bbl@disc ck}{c}}%
- \XeTeXinterchartoks 7 9 = {\textormath{\bbl@disc CK}{C}}%
- \XeTeXinterchartoks 7 10 = {\textormath{\bbl@disc F{FF}}{F}}%
- \XeTeXinterchartoks 7 11 = {\textormath{\bbl@disc l{ll}}{l}}%
- \XeTeXinterchartoks 7 12 = {\textormath{\bbl@disc L{LL}}{L}}%
- \XeTeXinterchartoks 7 13 = {\textormath{\bbl@disc m{mm}}{m}}%
- \XeTeXinterchartoks 7 14 = {\textormath{\bbl@disc M{MM}}{M}}%
- \XeTeXinterchartoks 7 15 = {\textormath{\bbl@disc n{nn}}{n}}%
- \XeTeXinterchartoks 7 16 = {\textormath{\bbl@disc N{NN}}{N}}%
- \XeTeXinterchartoks 7 17 = {\textormath{\bbl@disc p{pp}}{p}}%
- \XeTeXinterchartoks 7 18 = {\textormath{\bbl@disc P{PP}}{P}}%
- \XeTeXinterchartoks 7 19 = {\textormath{\bbl@disc r{rr}}{r}}%
- \XeTeXinterchartoks 7 20 = {\textormath{\bbl@disc R{RR}}{R}}%
- \XeTeXinterchartoks 7 21 = {\textormath{\bbl@disc t{tt}}{t}}%
- \XeTeXinterchartoks 7 22 = {\textormath{\bbl@disc T{TT}}{T}}%
- \XeTeXinterchartoks 7 23 = {\textormath{\bbl@discff}{f}}%
- \XeTeXinterchartoks 7 24 = {\nobreak\-\nobreak\hskip\z@skip}%
- \XeTeXinterchartoks 7 25 = {\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}}{}}%
- \XeTeXinterchartoks 7 7 = {\hskip\z@skip}%
- \XeTeXinterchartoks 7 26 = {\textormath{\leavevmode\hbox{-}}{-}}%
- \XeTeXinterchartoks 7 27 = {\penalty\@M-\hskip\z@skip}%
- \XeTeXinterchartoks 7 28 = „%
- \XeTeXinterchartoks 7 29 = “%
- \XeTeXinterchartoks 7 30 = «%
- \XeTeXinterchartoks 7 31 = »%
+ {\relax\discretionary{ff-}{f}{ff}\allowhyphens}{f\bbl@nextff}}%
+\let\bbl@nextff=f%
+\declare@shorthand{german}{"-}{\nobreak\-\nobreak\hskip\z@skip}%
+\declare@shorthand{german}{"|}{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}}{}}%
+\declare@shorthand{german}{""}{\hskip\z@skip}%
+\declare@shorthand{german}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
+\declare@shorthand{german}{"=}{\penalty\@M-\hskip\z@skip}%
+\def\ck{\allowhyphens\discretionary{k-}{k}{ck}\allowhyphens}%
}
\def\nogerman@shorthands{%
- \XeTeXinterchartokenstate=0%
+ \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
}
-\def\captionsgerman{%
+\def\captions@german{%
\def\prefacename{Vorwort}%
\def\refname{Literatur}%
\def\abstractname{Zusammenfassung}%
@@ -144,7 +121,7 @@
\def\proofname{Beweis}%
\def\glossaryname{Glossar}%
}
-\def\dategerman{%
+\def\date@german{%
\def\today{\number\day.%
\space \ifcase\month%TODO add option for Austrian forms (Jänner etc)
\or Januar\or Februar\or März\or April\or Mai\or Juni\or%
@@ -153,7 +130,33 @@
\space \number\year}%
}
-\def\german@language{\protect\language=%
+%%Strings for Fraktur contributed by Gerrit <z0idberg . gmx . de>
+\def\captions@german@fraktur{%
+ \captions@german%
+ \def\abstractname{Zuſammenfaſſung}%
+ \def\seename{ſiehe}%
+ \def\alsoname{ſiehe auch}%
+ \def\glossaryname{Gloſſar}%
+ }
+
+\def\date@german@fraktur{%
+ \def\today{\number\day.%
+ \space \ifcase\month%TODO add option for Austrian forms (Jänner etc)
+ \or Januar\or Februar\or März\or April\or Mai\or Juni\or%
+ Juli\or Auguſt\or September\or Oktober\or November\or%
+ Dezember\fi%
+ \space \number\year}%
+}
+
+\def\captionsgerman{%
+ \if@german@fraktur\captions@german@fraktur\else\captions@german\fi%
+ }
+
+\def\dategerman{%
+ \if@german@fraktur\date@german@fraktur\else\date@german\fi%
+ }
+
+\def\german@language{\language=%
\csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname}
\setlocalhyphenmins{german}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf
index 8cbc00a8d31..f712221be42 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf
@@ -316,7 +316,7 @@
\ifx\l@greek\@undefined
\ifx\l@polygreek\@undefined
\xpg@nopatterns{Greek}
- \adddialect\l@greek0
+ \adddialect\l@greek\l@nohyphenation
\else
\let\l@greek\l@polygreek
\fi
@@ -653,7 +653,7 @@
\let\greek@Alph\@undefined%
}
-\def\greek@language{\protect\language=\greek@variant}
+\def\greek@language{\language=\greek@variant}
\def\greek@font{%
\@ifundefined{greekfont}{%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hebrew.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hebrew.ldf
index c995adcc011..b3013b3fd65 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hebrew.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hebrew.ldf
@@ -4,8 +4,8 @@
\makeatletter
\ifx\l@hebrew\@undefined
- \xpg@nopatterns{Hebrew}%
- \adddialect\l@hebrew0
+ %\xpg@nopatterns{Hebrew}%
+ \adddialect\l@hebrew\l@nohyphenation
\fi
\def\hebrew@RL{\relax}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hindi.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hindi.ldf
index 5b5d843b88e..bc55764c099 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hindi.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-hindi.ldf
@@ -7,7 +7,7 @@
\ifx\l@hindi\@undefined%
\ifx\l@sanskrit\@undefined%
\xpg@nopatterns{Hindi}%
- \adddialect\l@hindi0%
+ \adddialect\l@hindi\l@nohyphenation%
\else
\let\l@hindi\l@sanskrit%
\fi
@@ -56,7 +56,7 @@
\space\number\year}%
}
-\def\hindi@language{\protect\language=\l@hindi}
+\def\hindi@language{\language=\l@hindi}
\def\hindi@font{%
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-icelandic.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-icelandic.ldf
index b48f61a64ea..c735dcb37ce 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-icelandic.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-icelandic.ldf
@@ -4,7 +4,7 @@
\ifx\l@icelandic\@undefined%
\xpg@nopatterns{Icelandic}%
- \adddialect\l@icelandic0%
+ \adddialect\l@icelandic\l@nohyphenation%
\fi
\def\captionsicelandic{%
@@ -39,7 +39,7 @@
\space\number\year}%
}
-\def\icelandic@language{\protect\language=\l@icelandic}
+\def\icelandic@language{\language=\l@icelandic}
\setlocalhyphenmins{icelandic}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-interlingua.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-interlingua.ldf
index e20cba8f794..4a209593adc 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-interlingua.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-interlingua.ldf
@@ -3,7 +3,7 @@
\ifx\l@interlingua\@undefined%
\xpg@nopatterns{Interlingua}%
- \adddialect\l@interlingua0%
+ \adddialect\l@interlingua\l@nohyphenation%
\fi
\def\captionsinterlingua{%
@@ -37,7 +37,7 @@
decembre\fi
\space \number\year}}
-\def\interlingua@language{\protect\language=\l@interlingua}
+\def\interlingua@language{\language=\l@interlingua}
\setlocalhyphenmins{interlingua}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-irish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-irish.ldf
index e8086966335..5c29d736720 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-irish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-irish.ldf
@@ -4,7 +4,7 @@
\ifx\l@irish\@undefined%
\xpg@nopatterns{Irish}%
- \adddialect\l@irish0%
+ \adddialect\l@irish\l@nohyphenation%
\fi
\def\captionsirish{%
@@ -41,7 +41,7 @@
Mí na Samhna\or Mí na Nollag\fi
\space \number\year}}
-\def\irish@language{\protect\language=\l@irish}
+\def\irish@language{\language=\l@irish}
\setlocalhyphenmins{irish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-italian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-italian.ldf
index c7f256c65f1..0b5a9842788 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-italian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-italian.ldf
@@ -4,7 +4,7 @@
\ifx\l@italian\@undefined
\xpg@nopatterns{Italian}
- \adddialect\l@italian0
+ \adddialect\l@italian\l@nohyphenation
\fi
\def\captionsitalian{%
@@ -37,12 +37,22 @@
dicembre\fi\space \number\year}
}
-\def\italian@language{\protect\language=\l@italian}
+\def\italian@language{\language=\l@italian}
\setlocalhyphenmins{italian}{2}{2}%
-%\def\blockextras@italian{%
-% %TODO ? \clubpenalty3000\widowpenalty3000\finalhyphendemerits50000000
-% }
+\def\noextras@italian{%
+ \lccode"2019=0%
+ \nofrench@indent}
+
+\def\blockextras@italian{%
+ \lccode"2019="2019
+ %TODO ? \clubpenalty3000\widowpenalty3000\finalhyphendemerits50000000 << in Babel
+ \french@indent%
+ }
+
+\def\inlineextras@italian{%
+ \lccode"2019="2019
+ }
\endinput
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latin.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latin.ldf
index e6c1cd7e127..0a411130486 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latin.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latin.ldf
@@ -4,7 +4,7 @@
\ifx\l@latin\@undefined
\xpg@nopatterns{latin}
- \adddialect\l@latin0
+ \adddialect\l@latin\l@nohyphenation
\fi
\def\captionslatin{%
@@ -38,7 +38,7 @@
Decembris\fi%
\space \uppercase\expandafter{\romannumeral\year}}}
-\def\latin@language{\protect\language=\l@latin}
+\def\latin@language{\language=\l@latin}
\setlocalhyphenmins{latin}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latvian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latvian.ldf
index 16351c105ad..5f118434fbd 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latvian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-latvian.ldf
@@ -4,7 +4,7 @@
\ifx\l@latvian\@undefined
\xpg@nopatterns{Latvian}
- \adddialect\l@latvian0
+ \adddialect\l@latvian\l@nohyphenation
\fi
\def\captionslatvian{%
@@ -39,7 +39,7 @@
jūlijā\or augustā\or septembrī\or%
oktobrī\or novembrī\or decembrī\fi}}
-\def\latvian@language{\protect\language=\l@latvian}
+\def\latvian@language{\language=\l@latvian}
\setlocalhyphenmins{latvian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-lsorbian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-lsorbian.ldf
index 198edfa0dea..87660aa1818 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-lsorbian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-lsorbian.ldf
@@ -51,7 +51,7 @@
godownika\fi\space \number\year}}%
}
-\def\lsorbian@language{\protect\language=\l@lsorbian}
+\def\lsorbian@language{\language=\l@lsorbian}
\setlocalhyphenmins{lsorbian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-magyar.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-magyar.ldf
index 91bc5ab935b..7f42b214006 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-magyar.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-magyar.ldf
@@ -5,7 +5,7 @@
\ifx\l@magyar\@undefined
\ifx\l@hungarian\@undefined
\xpg@nopatterns{Magyar}
- \adddialect\l@magyar0
+ \adddialect\l@magyar\l@nohyphenation
\else
\let\l@magyar\l@hungarian
\fi
@@ -62,7 +62,7 @@
31-én\fi}}%
\let\ontoday\ondatemagyar}
-\def\magyar@language{\protect\language=\l@magyar}
+\def\magyar@language{\language=\l@magyar}
\def\noextras@magyar{%
\let\ontoday\@undefined
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-norsk.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-norsk.ldf
index 43b9d9f0319..436cb855794 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-norsk.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-norsk.ldf
@@ -4,7 +4,7 @@
\ifx\l@norsk\@undefined%
\xpg@nopatterns{Norsk}%
- \adddialect\l@norsk0%
+ \adddialect\l@norsk\l@nohyphenation%
\fi
\def\captionsnorsk{%
@@ -38,7 +38,7 @@
\fi\space\number\year}%
}
-\def\norsk@language{\protect\language=\l@norsk}
+\def\norsk@language{\language=\l@norsk}
\setlocalhyphenmins{norsk}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-nynorsk.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-nynorsk.ldf
index 488fb155aa8..6d944e9b9e7 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-nynorsk.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-nynorsk.ldf
@@ -4,7 +4,7 @@
\ifx\l@nynorsk\@undefined%
\xpg@nopatterns{Nynorsk}%
- \adddialect\l@nynorsk0%
+ \adddialect\l@nynorsk\l@nohyphenation%
\fi
\def\captionsnynorsk{%
@@ -38,7 +38,7 @@
\fi\space\number\year}%
}
-\def\norsk@language{\protect\language=\l@nynorsk}
+\def\norsk@language{\language=\l@nynorsk}
\setlocalhyphenmins{nynorsk}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-polish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-polish.ldf
index 759a2424b00..50d1436c0ed 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-polish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-polish.ldf
@@ -4,7 +4,7 @@
\ifx\l@polish\@undefined
\xpg@nopatterns{polish}
- \adddialect\l@polish0
+ \adddialect\l@polish\l@nohyphenation
\fi
\def\captionspolish{%
@@ -37,7 +37,7 @@
listopada\or grudnia\fi%
\space\number\day, \number\year}}
-\def\polish@language{\protect\language=\l@polish}
+\def\polish@language{\language=\l@polish}
\setlocalhyphenmins{polish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-portuges.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-portuges.ldf
index 3354fdd46dc..5c3283600a1 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-portuges.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-portuges.ldf
@@ -5,7 +5,7 @@
\ifx\l@portuges\@undefined
\ifx\l@portuguese\@undefined
\xpg@nopatterns{Portuguese}
- \adddialect\l@portuges0
+ \adddialect\l@portuges\l@nohyphenation
\else
\let\l@portuges\l@portuguese
\fi
@@ -42,7 +42,7 @@
\fi\space de\space\number\year}%
}
-\def\portuges@language{\protect\language=\l@portuges}
+\def\portuges@language{\language=\l@portuges}
%\setlocalhyphenmins{portuges}{2}{3}% this is the default
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-romanian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-romanian.ldf
index 0f820455854..e69f75ec3f9 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-romanian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-romanian.ldf
@@ -4,14 +4,14 @@
\ifx\l@romanian\@undefined%
\xpg@nopatterns{Romanian}%
- \adddialect\l@romanian0%
+ \adddialect\l@romanian\l@nohyphenation%
\fi
\def\captionsromanian{%
\def\refname{Bibliografie}%
\def\abstractname{Rezumat}%
\def\bibname{Bibliografie}%
- \def\prefacename{Prefaţă}%
+ \def\prefacename{Prefață}%
\def\chaptername{Capitolul}%
\def\appendixname{Anexa}%
\def\contentsname{Cuprins}%
@@ -28,7 +28,7 @@
\def\enclname{Anexă}%
\def\ccname{Copie}%
\def\headtoname{Pentru}%
- \def\proofname{Demonstraţie}%
+ \def\proofname{Demonstrație}%
\def\glossaryname{Glosar}%
}
\def\dateromanian{%
@@ -39,7 +39,7 @@
\space \number\year}%
}
-\def\romanian@language{\protect\language=\l@romanian}
+\def\romanian@language{\language=\l@romanian}
\setlocalhyphenmins{romanian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf
index 94e88ea21b0..0ad8bc9a461 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-russian.ldf
@@ -3,7 +3,7 @@
\ifx\l@russian\@undefined
\xpg@nopatterns{Russian}
- \adddialect\l@russian0
+ \adddialect\l@russian\l@nohyphenation
\fi
\def\russian@font{%
@@ -167,7 +167,7 @@
\let\@alph\latin@alph%
}
-\def\russian@language{\protect\language=\l@russian}
+\def\russian@language{\language=\l@russian}
\setlocalhyphenmins{russian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-samin.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-samin.ldf
index 7d913f2cb8a..d44e4bc6538 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-samin.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-samin.ldf
@@ -4,25 +4,9 @@
\ifx\l@samin\@undefined%
\xpg@nopatterns{Samin}%
- \adddialect\l@samin0%
+ \adddialect\l@samin\l@nohyphenation%
\fi
-%\def\samin@punctuation{%
-% \frenchspacing%
-% \XeTeXinterchartokenstate=1%
-% \XeTeXcharclass `\! 7%
-% \XeTeXcharclass `\? 7%
-% \XeTeXcharclass `\; 7%
-% \XeTeXcharclass `\: 7%
-% \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
-% }
-%
-%\def\nosamin@punctuation{%
-% \nonfrenchspacing%
-% \XeTeXinterchartokenstate=0%
-%}
-
-
\def\captionssamin{%
\def\refname{Čujuhusat}%
\def\abstractname{Čoahkkáigeassu}%
@@ -64,7 +48,7 @@
\space\number\day.~b.\space\number\year}%
}
-\def\samin@language{\protect\language=\l@samin}
+\def\samin@language{\language=\l@samin}
\setlocalhyphenmins{samin}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-sanskrit.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-sanskrit.ldf
index 8efd81c2339..0478bad9475 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-sanskrit.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-sanskrit.ldf
@@ -4,7 +4,7 @@
\ifx\l@sanskrit\@undefined%
\ifx\l@prakrit\@undefined%
\xpg@nopatterns{Sanskrit}%
- \adddialect\l@sanskrit0%
+ \adddialect\l@sanskrit\l@nohyphenation%
\else%
\let\l@sanskrit=\l@prakrit%
\fi%
@@ -16,16 +16,19 @@
\setkeys{sanskrit}{Script}
+\newXeTeXintercharclass\sanskrit@punctthin % ! ? ; : danda double_danda
+\def\sanskrit@punctthinspace{\unskip\thinspace}
+
\def\sanskrit@punctuation{%
\frenchspacing%
\XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\? 7%
- \XeTeXcharclass `\; 7%
- \XeTeXcharclass `\: 7%
- \XeTeXcharclass `\। 7% danda \ as requested by
- \XeTeXcharclass `\॥ 7% double danda / Yves Codet
- \XeTeXinterchartoks 0 7 = {\unskip\kern.1667em}%
+ \XeTeXcharclass `\! \sankskrit@punctthin
+ \XeTeXcharclass `\? \sankskrit@punctthin
+ \XeTeXcharclass `\; \sankskrit@punctthin
+ \XeTeXcharclass `\: \sankskrit@punctthin
+ \XeTeXcharclass `\। \sankskrit@punctthin
+ \XeTeXcharclass `\॥ \sankskrit@punctthin
+ \XeTeXinterchartoks \z@ \sanskrit@punctthin = \sanskrit@punctthinspace
}
\def\nosanskrit@punctuation{%
@@ -93,7 +96,7 @@
\let\ttfamily=\sanskrit@font%
\def\reset@font{\normalfont}}
-\def\sanskrit@language{\protect\language=\l@sanskrit}
+\def\sanskrit@language{\language=\l@sanskrit}
\setlocalhyphenmins{sanskrit}{1}{5}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-scottish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-scottish.ldf
index 0fafeb21eed..5e6dafd26de 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-scottish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-scottish.ldf
@@ -4,7 +4,7 @@
\ifx\l@scottish\@undefined%
\xpg@nopatterns{Scottish}%
- \adddialect\l@scottish0%
+ \adddialect\l@scottish\l@nohyphenation%
\fi
\def\captionsscottish{%
@@ -41,7 +41,7 @@
\space \number\year}%
}
-\def\scottish@language{\protect\language=\l@scottish}
+\def\scottish@language{\language=\l@scottish}
\setlocalhyphenmins{scottish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf
index d4c049b7157..5ed4034f87a 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf
@@ -4,7 +4,7 @@
%TODO eventually there will be patterns for Serbian-Latin as well as Serbian-Cyrillic
\ifx\l@serbian\@undefined%
\xpg@nopatterns{Serbian}%
- \adddialect\l@serbian0%
+ \adddialect\l@serbian\l@nohyphenation%
\fi
\newif\if@serbian@cyr
@@ -122,7 +122,7 @@
\if@serbian@cyr\serbian@font@cyr\else\serbian@font@lat\fi}
%TODO when available load latin hyphenation patterns as well!
-\def\serbian@language{\protect\language=\l@serbian}
+\def\serbian@language{\language=\l@serbian}
\setlocalhyphenmins{serbian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovak.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovak.ldf
index 26b774e8b8e..cd28569577b 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovak.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovak.ldf
@@ -4,7 +4,7 @@
\ifx\l@slovak\@undefined%
\xpg@nopatterns{Slovak}%
- \adddialect\l@slovak0%
+ \adddialect\l@slovak\l@nohyphenation%
\fi
\def\captionsslovak{%
@@ -39,7 +39,7 @@
\space \number\year}%
}
-\def\slovak@language{\protect\language=\l@slovak}
+\def\slovak@language{\language=\l@slovak}
\setlocalhyphenmins{slovak}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovenian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovenian.ldf
index 0d52daf1d50..febdcac0293 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovenian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-slovenian.ldf
@@ -5,7 +5,7 @@
\ifx\l@slovenian\@undefined%
\ifx\l@slovene\@undefined%
\xpg@nopatterns{Slovenian}%
- \adddialect\l@slovenian0%
+ \adddialect\l@slovenian\l@nohyphenation%
\fi\fi
\def\captionsslovenian{%
@@ -39,7 +39,7 @@
\space \number\year}%
}
-\def\slovenian@language{\protect\language=\l@slovenian}
+\def\slovenian@language{\language=\l@slovenian}
\setlocalhyphenmins{slovenian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-spanish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-spanish.ldf
index ab7b2487f03..d1be8fb06da 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-spanish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-spanish.ldf
@@ -4,7 +4,7 @@
\ifx\l@spanish\@undefined
\xpg@nopatterns{spanish}
- \adddialect\l@spanish0
+ \adddialect\l@spanish\l@nohyphenation
\fi
\def\captionsspanish{%
@@ -34,10 +34,10 @@
\def\today{\number\day~de~\ifcase\month\or
enero\or febrero\or marzo\or abril\or mayo\or junio\or
julio\or agosto\or septiembre\or octubre\or noviembre\or
- diciembre\fi\space \number\year}
+ diciembre\fi\space \number\year}%
}
-\def\spanish@language{\protect\language=\l@spanish}
+\def\spanish@language{\language=\l@spanish}
\setlocalhyphenmins{spanish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-swedish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-swedish.ldf
index d73b39bd27b..3c07c5b6884 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-swedish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-swedish.ldf
@@ -4,7 +4,7 @@
\ifx\l@swedish\@undefined%
\xpg@nopatterns{Swedish}%
- \adddialect\l@swedish0%
+ \adddialect\l@swedish\l@nohyphenation%
\fi
\def\captionsswedish{%
@@ -44,7 +44,7 @@
\def\today{\number\day/\number\month\space\number\year}}%
}
-\def\swedish@language{\protect\language=\l@swedish}
+\def\swedish@language{\language=\l@swedish}
\setlocalhyphenmins{swedish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-syriac.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-syriac.ldf
index 2b2ac6717f1..ec808b5b8f2 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-syriac.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-syriac.ldf
@@ -3,8 +3,8 @@
\makeatletter
\ifx\l@syriac\@undefined
- \xpg@nopatterns{Syriac}%
- \adddialect\l@syriac0
+ %\xpg@nopatterns{Syriac}%
+ \adddialect\l@syriac\l@nohyphenation
\fi
\def\syriac@RL{\relax}
@@ -55,27 +55,27 @@
% \def\@syriac@locale{#1}}
%
%\def\captionssyriac{%
-%\def\prefacename{\@ensure@RL{}}%
-%\def\refname{\@ensure@RL{}}
-%\def\abstractname{\@ensure@RL{}}%
-%\def\bibname{\@ensure@RL{}}%
-%\def\chaptername{\@ensure@RL{}}%
-%\def\appendixname{\@ensure@RL{}}%
-%\def\contentsname{\@ensure@RL{}}
-%\def\listfigurename{\@ensure@RL{}}%
-%\def\listtablename{\@ensure@RL{}}%
-%\def\indexname{\@ensure@RL{}}%
-%\def\figurename{\@ensure@RL{}}%
-%\def\tablename{\@ensure@RL{}}%
-%\def\partname{\@ensure@RL{}}%
-%\def\enclname{\@ensure@RL{}}%
-%\def\ccname{\@ensure@RL{}}%
-%\def\headtoname{\@ensure@RL{}}%
-%\def\pagename{\@ensure@RL{}}%
-%\def\seename{\@ensure@RL{}}%
-%\def\alsoname{\@ensure@RL{}}%
-%\def\proofname{\@ensure@RL{}}%
-%\def\glossaryname{\@ensure@RL{}}%
+%\def\prefacename{\@ensure@RTL{}}%
+%\def\refname{\@ensure@RTL{}}
+%\def\abstractname{\@ensure@RTL{}}%
+%\def\bibname{\@ensure@RTL{}}%
+%\def\chaptername{\@ensure@RTL{}}%
+%\def\appendixname{\@ensure@RTL{}}%
+%\def\contentsname{\@ensure@RTL{}}
+%\def\listfigurename{\@ensure@RTL{}}%
+%\def\listtablename{\@ensure@RTL{}}%
+%\def\indexname{\@ensure@RTL{}}%
+%\def\figurename{\@ensure@RTL{}}%
+%\def\tablename{\@ensure@RTL{}}%
+%\def\partname{\@ensure@RTL{}}%
+%\def\enclname{\@ensure@RTL{}}%
+%\def\ccname{\@ensure@RTL{}}%
+%\def\headtoname{\@ensure@RTL{}}%
+%\def\pagename{\@ensure@RTL{}}%
+%\def\seename{\@ensure@RTL{}}%
+%\def\alsoname{\@ensure@RTL{}}%
+%\def\proofname{\@ensure@RTL{}}%
+%\def\glossaryname{\@ensure@RTL{}}%
%}
\def\datesyriac{%
@@ -84,7 +84,7 @@
\or ܬܫܪܝܢ ܩܕܡ% ܬܫܪܝܢ ܩܕܝܡ
\or ܬܫܪܝܢ ܐܚܪܝ\or ܟܢܘܢ ܩܕܡ% ܟܢܘܢ ܩܕܝܡ
\fi}%
- \def\today{\@ensure@RL{\syriacnumber\day{\space}%
+ \def\today{\@ensure@RTL{\syriacnumber\day{\space}%
\syriac@month{\month}{\space}\syriacnumber\year}}%
}
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-thai.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-thai.ldf
index 809e2be608b..0dda46f13c3 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-thai.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-thai.ldf
@@ -120,7 +120,7 @@
\let\ttfamily=\thai@font%
\def\reset@font{\normalfont}}
-\def\thai@language{\protect\language=\l@nohyphenation}
+\def\thai@language{\language=\l@nohyphenation}
\def\blockextras@thai{%
\renewcommand{\baselinestretch}{1.2}% FIXME restore default value in noextras?
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-turkish.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-turkish.ldf
index e44ab1a8570..7ba1fb37f1f 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-turkish.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-turkish.ldf
@@ -5,23 +5,35 @@
\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
\@ifundefined{turkishfont}{%
\zf@check@ot@lang{TUR}%
- \if@tempswa\addfontfeature{Language=Turkish}\fi}
+ \if@tempswa
+ \addfontfeature{Language=Turkish}%
+ \else
+ \zf@check@ot@lang{TRK}%
+ \if@tempswa
+ \addfontfeature{Language=Turkish}\fi%
+ \fi}
{\turkishfont}%
}%
\ifx\l@turkish\@undefined
\xpg@nopatterns{turkish}
- \adddialect\l@turkish0
+ \adddialect\l@turkish\l@nohyphenation
\fi
+\newXeTeXintercharclass\turkish@punctthin % ! :
+\newXeTeXintercharclass\turkish@punctthick % =
+
+\def\turkish@punctthinspace{\ifdim\lastskip>\z@\unskip\penalty\@M\thinspace\fi}
+\def\turkish@punctthickspace{\unskip\nobreakspace}
+
\def\turkish@punctuation{%
\frenchspacing%
\XeTeXinterchartokenstate=1%
- \XeTeXcharclass `\! 7%
- \XeTeXcharclass `\= 8%
- \XeTeXcharclass `\: 7%
- \XeTeXinterchartoks 0 7 = {\unskip\penalty\@M\thinspace}%
- \XeTeXinterchartoks 0 8 = {\unskip\kern\fontdimen2\font\kern-1.4\fontdimen3\font}%
+ \XeTeXcharclass `\! \turkish@punctthin
+ \XeTeXcharclass `\: \turkish@punctthin
+ \XeTeXcharclass `\= \turkish@punctthick
+ \XeTeXinterchartoks \z@ \turkish@punctthin = \turkish@punctthinspace
+ \XeTeXinterchartoks \z@ \turkish@punctthick = \turkish@punctthickspace
}
\def\noturkish@punctuation{%
@@ -51,7 +63,7 @@
\def\seename{bkz.}%
\def\alsoname{ayrıca bkz.}%
\def\proofname{Kanıt}%
- \def\glossaryname{Glossary}% <-- Needs translation
+ \def\glossaryname{Lügatçe}%
}
\def\dateturkish{%
\def\today{\number\day~\ifcase\month\or
@@ -61,7 +73,7 @@
\space\number\year}
}
-\def\turkish@language{\protect\language=\l@turkish}
+\def\turkish@language{\language=\l@turkish}
\setlocalhyphenmins{turkish}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-ukrainian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-ukrainian.ldf
index 6099f2738c0..d7750e3a0f6 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-ukrainian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-ukrainian.ldf
@@ -6,7 +6,7 @@
\ifx\l@ukrainian\@undefined%
\xpg@nopatterns{Ukrainian}%
- \adddialect\l@ukrainian0%
+ \adddialect\l@ukrainian\l@nohyphenation%
\fi
\def\ukrainian@font{%
@@ -96,7 +96,7 @@
\let\@alph\latin@alph%
}
-\def\ukrainian@language{\protect\language=\l@ukrainian}
+\def\ukrainian@language{\language=\l@ukrainian}
\setlocalhyphenmins{ukrainian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-usorbian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-usorbian.ldf
index 491e3cda2a9..d2a4693cfd1 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-usorbian.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-usorbian.ldf
@@ -5,7 +5,7 @@
\ifx\l@uppersorbian\@undefined
\ifx\l@usorbian\@undefined
\xpg@nopatterns{Upper Sorbian}
- \adddialect\l@usorbian0
+ \adddialect\l@usorbian\l@nohyphenation
\let\l@uppersorbian\l@usorbian
\else
\let\l@uppersorbian\l@usorbian
@@ -52,7 +52,7 @@
hodownika\fi \space \number\year}%
}
-\def\usorbian@language{\protect\language=\l@usorbian}
+\def\usorbian@language{\language=\l@usorbian}
\setlocalhyphenmins{usorbian}{2}{2}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-vietnamese.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-vietnamese.ldf
new file mode 100644
index 00000000000..26c7728a9d0
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-vietnamese.ldf
@@ -0,0 +1,63 @@
+\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for vietnamese]
+%% Strings contributed by Daniel Owens < dhowens . pmbx . net >
+\makeatletter
+
+\def\vietnamese@font{%
+\font\zf@basefont="\csname zf@family@fontdef\f@family\endcsname" at \f@size pt
+\@ifundefined{vietnamesefont}{%
+ \zf@check@ot@lang{VIT}%
+ \if@tempswa\addfontfeature{Language=Vietnamese}\fi}
+ {\vietnamesefont}%
+}%
+
+\ifx\l@vietnamese\@undefined%
+ \xpg@nopatterns{Vietnamese}%
+ \adddialect\l@vietnamese\l@nohyphenation%
+\fi
+
+\def\captionsvietnamese{%
+ \def\refname{Tài liệu}%
+ \def\abstractname{Tóm tắt nội dung}%
+ \def\bibname{Tài liệu tham khảo}%
+ \def\prefacename{Lời nói đầu}%
+ \def\chaptername{Chương}%
+ \def\appendixname{Phụ lục}%
+ \def\contentsname{Mục lục}%
+ \def\listfigurename{Danh sách hình vẽ}%
+ \def\listtablename{Danh sách bẳng}%
+ \def\indexname{Chỉ mục}%
+ \def\figurename{Hình}%
+ \def\tablename{Bẳng}%
+ \def\partname{Phần}%
+ \def\pagename{Trang}%
+ \def\seename{Xem}%
+ \def\alsoname{Xem thêm}%
+ \def\enclname{Kèm theo}%
+ \def\ccname{Cùng gửi}%
+ \def\headtoname{Gửi}%
+ \def\proofname{Chứng minh}%
+ \def\glossaryname{Từ điển chú giải}%
+ }
+\def\datevietnamese{%
+ \def\today{%
+ Ngày \number\day\space
+ tháng \number\month\space
+ năm \number\year}%
+ }
+
+\def\vietnamese@language{\language=\l@vietnamese}
+
+\setlocalhyphenmins{vietnamese}{2}{2}%
+
+\def\noextras@vietnamese{%
+ \nonfrenchspacing%
+}
+
+\def\blockextras@vietnamese{%
+ \frenchspacing%
+}
+
+\def\inlineextras@vietnamese{%
+ \frenchspacing%
+}
+\endinput
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-welsh.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-welsh.ldf
index 6803101bdc4..a1209676285 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-welsh.ldf
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-welsh.ldf
@@ -4,7 +4,7 @@
\ifx\l@welsh\@undefined%
\xpg@nopatterns{Welsh}%
- \adddialect\l@welsh0%
+ \adddialect\l@welsh\l@nohyphenation%
\fi
\def\captionswelsh{%
@@ -40,7 +40,7 @@
\space\number\year}%
}
-\def\welsh@language{\protect\language=\l@welsh}
+\def\welsh@language{\language=\l@welsh}
\setlocalhyphenmins{welsh}{2}{3}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/hebrewcal.sty b/Master/texmf-dist/tex/xelatex/polyglossia/hebrewcal.sty
index d4f53fccd48..5e433a3e308 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/hebrewcal.sty
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/hebrewcal.sty
@@ -15,7 +15,7 @@
\def\hebrewdate#1#2#3{%
\HebrewFromGregorian{#1}{#2}{#3}%
{\hebrewday}{\hebrewmonth}{\hebrewyear}%
- \if@rl%
+ \if@RTL%
\@FormatForHebrew{\hebrewday}{\hebrewmonth}{\hebrewyear}%
\else%
\@FormatForEnglish{\hebrewday}{\hebrewmonth}{\hebrewyear}%
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/hijrical.sty b/Master/texmf-dist/tex/xelatex/polyglossia/hijrical.sty
index 02fd693ad2d..a0320f4cb23 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/hijrical.sty
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/hijrical.sty
@@ -40,7 +40,7 @@
\def\Hijridate#1#2#3{%
\HijriFromGregorian{#1}{#2}{#3}%
- \if@rl%
+ \if@RTL%
\FormatHijriDate%
\else%
\FormatHijriDateEnglish%
@@ -72,7 +72,7 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
\def\@rabicnumb@r#1{\@ifundefined{arabicnumber}{{\addfontfeature{Mapping=arabicdigits} #1}}%
{\arabicnumber{#1}}}
-\def\FormatHijriDate{\@ensure@RL{%
+\def\FormatHijriDate{\@ensure@RTL{%
\@rabicnumb@r{\value{Hijriday}}\space\HijriMonthArabic{\value{Hijrimonth}}\space\@rabicnumb@r{\value{Hijriyear}}}}
\endinput
@@ -80,5 +80,3 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
%TODO
\def\CYearsFromHijri#1{%yields the corr julian or gregorian years
} % e.g. \CYearsFromHijri{425} -> 1033/34
-
-
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty
index 0f8a2dae8e5..521ddd4a1f2 100644
--- a/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty
+++ b/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2009/01/25 v1.0.2
- Babel replacement for XeLaTeX]
+\ProvidesPackage{polyglossia}[2009/11/20 v1.1.0
+ Babel replacement for XeLaTeX]
\RequirePackage{etoolbox}
\RequirePackage{fontspec} %which itself depends on xkeyval
@@ -52,10 +52,10 @@
\begingroup%
\let\label\relax \let\index\relax \let\glossary\relax%
\unrestored@protected@xdef\@themark%
- {{\foreignlanguage{##1}{%
- \protect\@@ensure@maindir{####1}}}%
- {\foreignlanguage{##1}{%
- \protect\@@ensure@maindir{####2}}}}%
+ {{\foreignlanguage{##1}{%
+ \protect\@@ensure@maindir{####1}}}%
+ {\foreignlanguage{##1}{%
+ \protect\@@ensure@maindir{####2}}}}%
\@temptokena \expandafter{\@themark}%
\mark{\the\@temptokena}%
\endgroup%
@@ -64,7 +64,7 @@
\begingroup%
\let\label\relax \let\index\relax \let\glossary\relax%
\expandafter\@markright\@themark%
- {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}%
+ {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}%
\@temptokena \expandafter{\@themark}%
\mark{\the\@temptokena}%
\endgroup%
@@ -75,11 +75,15 @@
\else%\ifx\@tmpa\opt@disabled
\def\local@marks##1{}
\xpg@info{Option: localmarks=off}
- %\fi%
- \fi%
+ %\fi
+ \fi
}
\setkeys{polyglossia}{localmarks=on}
+%% when no patterns are available, we use \l@nohyphenation, assigned to 255
+%% (suggestion by Enrico Gregorio)
+\@ifundefined{l@nohyphenation}{\chardef\l@nohyphenation=255 }{}
+
\newcommand{\setdefaultlanguage}[2][]{%
\IfFileExists{gloss-#2.ldf}%
{\ifcsundef{#2@loaded}%
@@ -96,12 +100,12 @@
\else%
\newenvironment{#2}[1][]{\begin{otherlanguage}[####1]{#2}}%
{\end{otherlanguage}}%
- \fi%
+ \fi
\expandafter\newcommand\csname text#2\endcsname[2][]{%
\ifcsdef{RL}%
{\ifcsundef{#2@RL}%
{\@ensure@LR{\foreignlanguage[####1]{#2}{####2}}}%
- {\@ensure@RL{\foreignlanguage[####1]{#2}{####2}}}}%
+ {\@ensure@RTL{\foreignlanguage[####1]{#2}{####2}}}}%
{\foreignlanguage[####1]{#2}{####2}}%
}%
\csletcs{local#2}{text#2}%
@@ -176,12 +180,12 @@
\else%
\newenvironment{#2}[1][]{\begin{otherlanguage}[####1]{#2}}%
{\end{otherlanguage}}%
- \fi%
+ \fi
\expandafter\newcommand\csname text#2\endcsname[2][]{%
\ifcsdef{RL}{%
- \ifcsundef{#2@RL}%
- {\@ensure@LR{\foreignlanguage[####1]{#2}{####2}}}%
- {\@ensure@RL{\foreignlanguage[####1]{#2}{####2}}}%
+ \ifcsundef{#2@RL}%
+ {\@ensure@LR{\foreignlanguage[####1]{#2}{####2}}}%
+ {\@ensure@RTL{\foreignlanguage[####1]{#2}{####2}}}%
}{% else
\foreignlanguage[####1]{#2}{####2}%
}}%
@@ -194,7 +198,7 @@
{\xpg@nolang{#2}\hyphenrules{#2}}%
%TODO ? \expandafter\ifx\csname l@#2\endcsname\@undefined
%\xpg@nopatterns{#2}\expandafter\adddialect\csname l@#2\endcsname 0%
- %\else\expandafter\expandafter\protect\language=\csname l@#2\endcsname\fi%
+ %\else\expandafter\expandafter\protect\language=\csname l@#2\endcsname\fi
}
\newcommand\setotherlanguages[1]{%
@@ -249,7 +253,7 @@
\addtocontents{toc}{\protect\select@language{#1}}%
\addtocontents{lof}{\protect\select@language{#1}}%
\addtocontents{lot}{\protect\select@language{#1}}%
- \fi%
+ \fi
}
\ifcsundef{select@language}{}%
@@ -287,9 +291,9 @@
\else
\expandafter\ifx\csname l@#1\endcsname\l@nohyphenation%
\xpg@warning{\string\setlocalhyphenmin useless for unhyphenated language #1}%
- \else%
+ \else
\providehyphenmins{#1}{#2#3}%
- \fi%
+ \fi
\fi}
\def\use@localhyphenmins#1{%
@@ -297,6 +301,8 @@
{\expandafter\expandafter\expandafter\set@hyphenmins\csname #1hyphenmins\endcsname\relax}}
%% package options
+
+%%\DeclareOption{shorthands}{\setkeys{polyglossia}{shorthands=true}}
\DeclareOption{nolocalmarks}{\setkeys{polyglossia}{localmarks=off}}
\DeclareOption{quiet}{%
\gdef\@latex@info#1{\relax}% no latex info
@@ -304,56 +310,19 @@
\gdef\@font@warning#1{\relax}% no latex font warnings
\gdef\zf@PackageInfo#1{\relax}% no fontspec info
\gdef\xpg@info#1{\relax}}% no polyglossia info
-\DeclareOption{USenglish}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=american]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=american]{english}}}%
- \@temp}
-\DeclareOption{american}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=american]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=american]{english}}}%
- \@temp}
-\DeclareOption{UKenglish}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=british]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=british]{english}}}%
- \@temp}
-\DeclareOption{british}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=british]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=british]{english}}}%
- \@temp}
-\DeclareOption{australian}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=australian]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=australian]{english}}}%
- \@temp}
-\DeclareOption{newzealand}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=newzealand]{english}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=newzealand]{english}}}%
- \@temp}
-\DeclareOption{ngerman}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[spelling=new]{german}}}%
- {\edef\@temp{\noexpand\setotherlanguage[spelling=new]{german}}}%
- \@temp}
-\DeclareOption{polygreek}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=poly]{greek}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=poly]{greek}}}%
- \@temp}
-\DeclareOption{monogreek}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=mono]{greek}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=mono]{greek}}}%
- \@temp}
-\DeclareOption{ancientgreek}{%
-\ifcsundef{xpg@main@language}%
- {\edef\@temp{\noexpand\setdefaultlanguage[variant=ancient]{greek}}}%
- {\edef\@temp{\noexpand\setotherlanguage[variant=ancient]{greek}}}%
- \@temp}
+\def\xpg@option#1#2{%
+ \ifcsundef{xpg@main@language}{\setdefaultlanguage}{\setotherlanguage}%
+ [#1]{#2}}
+\DeclareOption{USenglish}{\xpg@option{variant=american}{english}}
+\DeclareOption{american}{\xpg@option{variant=american}{english}}
+\DeclareOption{UKenglish}{\xpg@option{variant=british}{english}}
+\DeclareOption{british}{\xpg@option{variant=british}{english}}
+\DeclareOption{australian}{\xpg@option{variant=australian}{english}}
+\DeclareOption{newzealand}{\xpg@option{variant=newzealand}{english}}
+\DeclareOption{ngerman}{\xpg@option{spelling=new}{german}}
+\DeclareOption{polygreek}{\xpg@option{variant=poly}{greek}}
+\DeclareOption{monogreek}{\xpg@option{variant=mono}{greek}}
+\DeclareOption{ancientgreek}{\xpg@option{variant=ancient}{greek}}
%%% FIXME: this does not work when gloss-<option>.ldf contains a \RequirePackage command !!!
%%% let's try with \AtEndOfPackage (not tested)
\DeclareOption*{%