diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-13 16:15:28 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-13 16:15:28 +0000 |
commit | 408c10d89836d10d0ecffb0422b33ce40f26215c (patch) | |
tree | c78a6bd337a8f7e0899b4050e9a6335b497be467 /Master/texmf-dist/tex/xelatex | |
parent | 90bc556dd49baf83dc41781e00119ca70f0007fb (diff) |
polyglossia 1.2.0 (29jul10)
git-svn-id: svn://tug.org/texlive/trunk@19698 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex')
6 files changed, 68 insertions, 61 deletions
diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf index 3aee5b7f359..07770f3d0ca 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-english.ldf @@ -31,23 +31,26 @@ {\ifstrequal{#1}{us}% these patterns are the default so we don't need to reset them {\@british@hyphenfalse\english@ordinalmonthdayfalse \xpg@info{Option: english variant=american}}% - {\ifstrequal{#1}{usmax}% - {\@british@hyphenfalse\english@ordinalmonthdayfalse - \setkeys[xpg@setup]{english}{hyphennames={usenglishmax}}% - \xpg@info{Option: english variant=american (with additional patterns)}}% - \ifcsundef{l@usenglishmax}% - {\xpg@warning{No hyphenation patterns were loaded for "US English Max"\MessageBreak - I will use the standard patterns for US English instead}% - \adddialect\l@usenglishmax\l@english\relax}{}% - \gdef\english@language{\language=\l@usenglishmax}}% - {\ifstrequal{#1}{australian}% - {\@british@hyphentrue\english@ordinalmonthdayfalse - \xpg@info{Option: english variant=australian}}% - {\ifstrequal{#1}{newzealand}% - {\@british@hyphentrue\english@ordinalmonthdayfalse - \xpg@info{Option: english variant=newzealand}}% - {\xpg@warning{Unknown English variant `#1'}}% - }}}}% + {\ifstrequal{#1}{american}% + {\@british@hyphenfalse\english@ordinalmonthdayfalse + \xpg@info{Option: english variant=american}}% + {\ifstrequal{#1}{usmax}% + {\@british@hyphenfalse\english@ordinalmonthdayfalse + \setkeys[xpg@setup]{english}{hyphennames={usenglishmax}}% + \xpg@info{Option: english variant=american (with additional patterns)}% + \ifcsundef{l@usenglishmax}% + {\xpg@warning{No hyphenation patterns were loaded for "US English Max"\MessageBreak + I will use the standard patterns for US English instead}% + \adddialect\l@usenglishmax\l@english\relax}{}% + \gdef\english@language{\language=\l@usenglishmax}}% + {\ifstrequal{#1}{australian}% + {\@british@hyphentrue\english@ordinalmonthdayfalse + \xpg@info{Option: english variant=australian}}% + {\ifstrequal{#1}{newzealand}% + {\@british@hyphentrue\english@ordinalmonthdayfalse + \xpg@info{Option: english variant=newzealand}}% + {\xpg@warning{Unknown English variant `#1'}}% + }}}}}}% \if@british@locale\@british@hyphentrue\english@ordinalmonthdaytrue\fi \if@british@hyphen \setkeys[xpg@setup]{english}{hyphennames={ukenglish,british,UKenglish}}% @@ -103,7 +106,7 @@ \english@day\space\english@month\space\number\year \else \english@month\space\english@day, \number\year - \fi} + \fi}% } \endinput diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf index 96c4803530e..3d3328393cc 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-greek.ldf @@ -74,20 +74,14 @@ \def\greek@language{\language=\greek@variant} -\def\tmp@arabic{arabic} \newif\if@greek@numerals \define@key{greek}{numerals}[greek]{% -\def\@tmpa{#1}\ifx\@tmpa\tmp@arabic\@greek@numeralsfalse\else\@greek@numeralstrue\fi} +\ifstrequal{#1}{arabic}{\@greek@numeralsfalse}{\@greek@numeralstrue}} -\def\tmp@false{false} -\newif\if@attic@numerals -\define@key{greek}{attic}[true]{% -\def\@tmpa{#1} -\ifx\@tmpa\tmp@false\@attic@numeralsfalse -\else\@attic@numeralstrue\fi} +\define@boolkey{greek}{attic}[true]{\xpg@warning{Greek option `attic' is no longer required.}} % This sets the defaults -\setkeys{greek}{numerals,attic=false} +\setkeys{greek}{numerals} \def\monogreekcaptions{% \def\refname{Αναφορές}% @@ -291,8 +285,7 @@ ͵\ifcase#1\or ρ\or σ\or τ\or υ\or φ\or χ\or ψ\or ω\or ϡ\fi \gr@num@v} -%%%% Attic numerals (optional) -\if@attic@numerals% +%%%% Attic numerals (no longer optional) \newcount\@attic@num \DeclareRobustCommand*{\@@atticnum}[1]{% \@attic@num#1\relax @@ -332,8 +325,6 @@ \@attic@num#1\relax \@atticnum{\@attic@num}} \let\atticnum=\atticnumeral -\fi -%%%% \def\greek@numbers{% \let\latin@alph\@alph% diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-occitan.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-occitan.ldf index 40669d18275..c647aa9000f 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-occitan.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-occitan.ldf @@ -22,7 +22,7 @@ \def\indexname{Indèx}% \def\figurename{Figura}% \def\tablename{Tablèu}% - %\def\thepart{\textoccitan{}}% + %\def\thepart{}% \def\partname{Partida}% \def\pagename{Pagina}% \def\seename{vejatz}% diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf index df704094e42..edb18ccdeae 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-serbian.ldf @@ -16,7 +16,7 @@ \newif\if@serbian@cyr -\define@key{serbian}{Script}[Cyrillic]{% TODO FIXDOC: keyname is CHANGED: script -> Script !!! +\define@key{serbian}{Script}[Cyrillic]{% TODO FIXDOC: keyname is CHANGED: script -> Script !!! \ifstrequal{#1}{Cyrillic}% {\@serbian@cyrtrue \setkeys[xpg@setup]{serbian}{script=Cyrillic}% @@ -26,38 +26,44 @@ {\ifstrequal{#1}{Latin}% {\@serbian@cyrfalse \xpg@fontsetup@latin{serbian}% - %TODO \def\serbian@language{\language=\l@serbianlat}% + %TODO \def\serbian@language{\language=\l@serbianlat}% % or should we use Croatian patterns as a fallback for the time being??? }% {\xpg@error{Unknown script `#1' for Serbian language\MessageBreak Valid values are "Cyrillic" and "Latin"}}% } } +\define@key{serbian}{script}[Cyrillic]{\setkeys{serbian}{Script=#1}} \setkeys{serbian}{Script} \def\captionsserbian{% - \if@serbian@cyr\captionsserbian@cyr\else\captionsserbian@lat\fi% + \if@serbian@cyr\captionsserbian@cyr\else\captionsserbian@lat\fi } \def\dateserbian{% - \if@serbian@cyr\dateserbian@cyr\else\dateserbian@lat\fi% + \if@serbian@cyr\dateserbian@cyr\else\dateserbian@lat\fi } \def\captionsserbian@lat{% - \def\refname{Literatura}% + \def\refname{Bibliografija}% \def\abstractname{Sažetak}% - \def\bibname{Bibliografija}% + \def\bibname{Literatura}% \def\prefacename{Predgovor}% \def\chaptername{Glava}% \def\appendixname{Dodatak}% \def\contentsname{Sadržaj}% - \def\listfigurename{Slike}% - \def\listtablename{Tabele}% - \def\indexname{Indeks}% + \def\listfigurename{Spisak slika}% + \def\listtablename{Spisak tabela}% + \def\indexname{Registar}% \def\figurename{Slika}% \def\tablename{Tabela}% \def\partname{Deo}% + \renewcommand\thepart{\ifcase\value{part}\or Prvi\or Drugi\or + Treći\or Čevrti\or Peti\or Šesti\or Sedmi\or Osmi\or + Deveti\or Deseti\or Jedanaesti\or Dvanaesti\or Trinaesti\or + Četrnaesti\or Petnaesti\or Šesnaesti\or Sedamnaesti\or + Osamnaesti\or Devetnaesti\or Dvadeseti\fi}% \def\pagename{Strana}% \def\seename{Vidi}% \def\alsoname{Vidi takođe}% @@ -65,45 +71,47 @@ \def\ccname{Kopije}% \def\headtoname{Prima}% \def\proofname{Dokaz}% - \def\glossaryname{Glosar}% <-- CHECK + \def\glossaryname{Rečnik nepoznatih reči}% } \def\dateserbian@lat{% \def\today{\number\day .~\ifcase\month\or januar\or februar\or mart\or april\or maj\or - juni\or juli\or avgust\or septembar\or oktobar\or novembar\or - decembar\fi \space \number\year}% + jun\or jul\or avgust\or septembar\or oktobar\or novembar\or + decembar\fi \space \number\year.}% } -%%%TODO ASK SOMEONE TO CHECK THESE! \def\captionsserbian@cyr{% - \def\refname{Литература}% + \def\refname{Библиографија}% \def\abstractname{Сажетак}% - \def\bibname{Библиографија}% + \def\bibname{Литература}% \def\prefacename{Предговор}% \def\chaptername{Глава}% \def\appendixname{Додатак}% \def\contentsname{Садржај}% - \def\listfigurename{Слике}% - \def\listtablename{Табеле}% - \def\indexname{Индекс}% + \def\listfigurename{Списак слика}% + \def\listtablename{Списак табела}% + \def\indexname{Регистар}% \def\figurename{Слика}% \def\tablename{Табела}% - %\def\thepart{}% \def\partname{Део}% + \renewcommand\thepart{\ifcase\value{part}\or Први\or Други\or Трећи\or + Четврти\or Пети\or Шести\or Седми\or Осми\or Девети\or Десети\or + Једанаести\or Дванаести\or Тринаести\or Четрнаести\or Петнаести\or + Шеснаести\or Седамнаести\or Осамнаести\or Деветнаести\or Двадесети\fi}% \def\pagename{Страна}% \def\seename{Види}% \def\alsoname{Види такође}% - \def\enclname{Прилоzи}% + \def\enclname{Прилози}% \def\ccname{Копије}% \def\headtoname{Прима}% - \def\proofname{Докаz}% - \def\glossaryname{Глосар}% <-- CHECK + \def\proofname{Доказ}% + \def\glossaryname{Речник непознатих речи}% } \def\dateserbian@cyr{% \def\today{\number\day .~\ifcase\month\or јануар\or фебруар\or март\or април\or мај\or - јуни\or јули\or август\or септембар\or октобар\or нобембар\or - децембар\fi \space \number\year}% + јун\or јул\or август\or септембар\or октобар\or нобембар\or + децембар\fi \space \number\year.}% } \endinput diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-urdu.ldf b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-urdu.ldf index b205431bf54..43e5598f7fd 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/gloss-urdu.ldf +++ b/Master/texmf-dist/tex/xelatex/polyglossia/gloss-urdu.ldf @@ -71,7 +71,7 @@ \def\indexname{\@ensure@RTL{اشاریہ}}% \def\figurename{\@ensure@RTL{شكل}}% \def\tablename{\@ensure@RTL{جدول}}% - %\def\thepart{\text<lang>{}}% + %\def\thepart{}% \def\partname{\@ensure@RTL{حصّہ}}% \def\pagename{\@ensure@RTL{صفحہ}}% \def\seename{\@ensure@RTL{ملاحظہ ہو}}% diff --git a/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty index f990db9fd3b..f14583eae70 100644 --- a/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty +++ b/Master/texmf-dist/tex/xelatex/polyglossia/polyglossia.sty @@ -1,11 +1,10 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{polyglossia}[2010/07/15 v1.2.0 +\ProvidesPackage{polyglossia}[2010/07/27 v1.2.0a Babel replacement for XeLaTeX] \RequirePackage{etoolbox} \RequirePackage{makecmds} \RequirePackage{fontspec}[2010/06/08]% v2.0 % fontspec now uses LaTeX3 packages such as expl3, so we need this: -% TODO is is possible to localize this further? \ExplSyntaxOn \ifcsundef{newXeTeXintercharclass}{% @@ -457,7 +456,7 @@ \IfFileExists{gloss-#2.ldf}% {\ifcsundef{#2@loaded}% {\input{gloss-#2.ldf}% - \xpg@info{Default~ language~ is~ #2.} + \xpg@info{Default~ language~ is~ #2}% \def\languagename{#2}% % This is needed because \arabic is a built-in LaTeX command: % so now we have \begin{Arabic}... instead of \begin{arabic}... @@ -505,7 +504,13 @@ \selectlanguage[#1]{#2}% \selectbackgroundlanguage{#2}}} -\def\familytype{rm} +\expandafter\ifx\familydefault\sfdefault + \def\familytype{sf} +\else\expandafter\ifx\familydefault\ttdefault + \def\familytype{tt} +\else + \def\familytype{rm} +\fi\fi % This robustifies the redefinitions of \<xx>family (suggestion by Enrico Gregorio) % e.g. to prevent expansion of the \familytype redefinition in auxiliary files \csgappto{rmfamily }{\def\familytype{rm}} |