From c8bf4d6e3b7f242e8fe1b35af105823861abf303 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 May 2015 21:25:56 +0000 Subject: polyglossia (14may15) git-svn-id: svn://tug.org/texlive/trunk@37397 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/polyglossia/README | 8 +- .../doc/latex/polyglossia/example-arabic.pdf | Bin 96616 -> 96480 bytes .../doc/latex/polyglossia/example-thai.pdf | Bin 23110 -> 23249 bytes .../texmf-dist/doc/latex/polyglossia/examples.pdf | Bin 166769 -> 165232 bytes .../doc/latex/polyglossia/polyglossia.pdf | Bin 132821 -> 135565 bytes .../doc/latex/polyglossia/polyglossia.tex | 67 ++-- .../source/latex/polyglossia/polyglossia.dtx | 364 +++++++++++++++++---- .../texmf-dist/tex/latex/polyglossia/farsical.sty | 3 +- .../tex/latex/polyglossia/gloss-arabic.ldf | 2 +- .../tex/latex/polyglossia/gloss-divehi.ldf | 2 +- .../tex/latex/polyglossia/gloss-farsi.ldf | 2 +- .../tex/latex/polyglossia/gloss-german.ldf | 58 +++- .../tex/latex/polyglossia/gloss-hebrew.ldf | 2 +- .../tex/latex/polyglossia/gloss-latin.ldf | 168 +++++++++- .../tex/latex/polyglossia/gloss-syriac.ldf | 2 +- .../tex/latex/polyglossia/gloss-tibetan.ldf | 22 +- .../tex/latex/polyglossia/gloss-turkish.ldf | 2 +- .../tex/latex/polyglossia/gloss-ukrainian.ldf | 2 + .../tex/latex/polyglossia/gloss-urdu.ldf | 2 +- .../texmf-dist/tex/latex/polyglossia/hebrewcal.sty | 16 +- .../tex/latex/polyglossia/polyglossia.sty | 17 +- 21 files changed, 600 insertions(+), 139 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/polyglossia/README b/Master/texmf-dist/doc/latex/polyglossia/README index 394aeaa0e10..f26094b606f 100644 --- a/Master/texmf-dist/doc/latex/polyglossia/README +++ b/Master/texmf-dist/doc/latex/polyglossia/README @@ -1,16 +1,16 @@ ¦----------------------------------------------¦ ¦ ¦ - ¦ THE POLYGLOSSIA PACKAGE v1.33.5 ¦ + ¦ THE POLYGLOSSIA PACKAGE v1.33.6 ¦ ¦ ¦ ¦ Modern multilingual typesetting ¦ ¦ with XeLaTeX and LuaLaTeX ¦ ¦ ¦ ¦----------------------------------------------¦ -This package provides a complete Babel replacement for users of XeLaTeX and -(at an early stage) LuaLaTeX. This version includes support for 74 different -languages. +This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX +(with a few languages incompletely supported for the latter). This version +includes support for 74 different languages. Polyglossia makes it possible to automate the following tasks: diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf index d7fe7eee56c..22fb29ea7cd 100644 Binary files a/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf and b/Master/texmf-dist/doc/latex/polyglossia/example-arabic.pdf differ diff --git a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf index d75ca80c4e9..77c100c59c1 100644 Binary files a/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf and b/Master/texmf-dist/doc/latex/polyglossia/example-thai.pdf differ diff --git a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf index ee14a4b63fe..aeb8a9cc087 100644 Binary files a/Master/texmf-dist/doc/latex/polyglossia/examples.pdf and b/Master/texmf-dist/doc/latex/polyglossia/examples.pdf differ diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf index eb2d391db3a..c130656e9c2 100644 Binary files a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf and b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.pdf differ diff --git a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex index bed5fcdaea5..6875a95185f 100644 --- a/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex +++ b/Master/texmf-dist/doc/latex/polyglossia/polyglossia.tex @@ -13,7 +13,7 @@ citecolor=myblue, hyperindex=false, hyperfootnotes=false, - pdftitle={Polyglossia: A Babel replacement for XeLaTeX and LuaLaTeX}, + pdftitle={Polyglossia: An alternative to Babel for XeLaTeX and LuaLaTeX}, pdfauthor={F Charette, A Reutenauer}, pdfkeywords={xetex, xelatex, luatex, lualatex, multilingual, babel, hyphenation} ]{hyperref} @@ -72,7 +72,7 @@ \title{\textcolor{lightblue}{\Huge\fontspec[LetterSpace=40]{GFS Ambrosia} Πολυγλωσσια} \\[16pt] -\color{myblue}Polyglossia: A Babel Replacement for \XeLaTeX\ and \LuaLaTeX} +\color{myblue}Polyglossia: An Alternative to Babel for \XeLaTeX\ and \LuaLaTeX} \author{\scshape\color{myblue}François Charette\\\color{myblue}Current maintainer: \scshape Arthur Reutenauer} \date{\filedate \qquad \fileversion\\ \footnotesize (\textsc{pdf} file generated on \today)} @@ -93,7 +93,7 @@ Polyglossia is a package for facilitating multilingual typesetting with \XeLaTeX\ and (at an early stage) \LuaLaTeX. Basically, it -can be used as a replacement of \pkg{babel} for performing the following +can be used as an alternative to \pkg{babel} for performing the following tasks automatically: \begin{enumerate} @@ -148,7 +148,7 @@ Language-specific options can be set or changed at any time by means of \displaycmd{\setkeys\{⟨lang⟩\}\{opt1=value1,opt2=value2,…\}.}{\setkeys} -\subsection{The “Babel way”} +\subsection{The “Babel way” – obsolete} \new{v1.2.0} {\color{red}\bfseries Warning}: \pkg{polyglossia} no longer supports loading language definition files as package options! @@ -242,21 +242,21 @@ that are explained in section \ref{specific} below. % painstakingly edited by hand because I failed to see the note above :-P -- Arthur \begin{tabular}{lllll} \hline -albanian & czech & \TX{hindi} & norsk & spanish \\ -amharic & danish & icelandic & nynorsk & swedish \\ -\TX{arabic} & divehi & interlingua & occitan & \TX{syriac} \\ -armenian & \TX{dutch} & irish & piedmontese & tamil \\ -asturian & \TX{english} & \TX{italian} & polish & telugu \\ -bahasai & \TX{esperanto} & kannada & portuges & tibetan \\ -bahasam & estonian & \TX{lao} & romanian & \TX{thai} \\ -basque & \TX{farsi} & latin & romansh & turkish \\ -\TX{bengali} & finnish & latvian & \TX{russian} & turkmen \\ -brazil[ian] & french & lithuanian & samin & ukrainian \\ -breton & friulan & \TX{lsorbian} & \TX{sanskrit}& urdu \\ -bulgarian & galician & \TX{magyar} & scottish & \TX{usorbian} \\ -\TX{catalan} & \TX{german} & malayalam & \TX{serbian} & vietnamese \\ -coptic & \TX{greek} & marathi & slovak & welsh \\ -croatian & \TX{hebrew} & nko & slovenian & \\ +albanian & czech & \TX{hindi} & norsk & spanish \\ +amharic & danish & icelandic & nynorsk & swedish \\ +\TX{arabic} & divehi & interlingua & occitan & \TX{syriac} \\ +armenian & \TX{dutch} & irish & piedmontese & tamil \\ +asturian & \TX{english} & \TX{italian} & polish & telugu \\ +bahasai & \TX{esperanto} & kannada & portuges & tibetan \\ +bahasam & estonian & \TX{lao} & romanian & \TX{thai} \\ +basque & \TX{farsi} & \TX{latin} & romansh & turkish \\ +\TX{bengali} & finnish & latvian & \TX{russian} & turkmen \\ +brazil[ian] & french & lithuanian & samin & \TX{ukrainian} \\ +breton & friulan & \TX{lsorbian} & \TX{sanskrit}& urdu \\ +bulgarian & galician & \TX{magyar} & scottish & \TX{usorbian} \\ +\TX{catalan} & \TX{german} & malayalam & \TX{serbian} & vietnamese \\ +coptic & \TX{greek} & marathi & slovak & welsh \\ +croatian & \TX{hebrew} & nko & slovenian & \\ \hline \end{tabular} \caption{Languages currently supported in \pkg{polyglossia}} @@ -487,8 +487,10 @@ The default value of each option is given in italic. \subsection{german}\label{german} \textbf{Options}: \begin{itemize} - \item\TB{variant} = \textit{german} or austrian.\new{v1.33.4} - Setting variant=austrian uses some austrian lexical variants. + \item\TB{variant} = \textit{german}, austrian or swiss.\new{v1.33.4} + Setting variant=austrian or variant=swiss uses some lexical variants. + With spelling=old, variant=swiss furthermore loads specific hyphenation + patterns. \item \TB{spelling} = \textit{new} (= 1996) or old (= 1901): indicates whether hyphenation patterns for traditional (1901) or reformed (1996) orthography should be used. The latter is the default. @@ -578,6 +580,12 @@ The default value of each option is given in italic. \item \TB{numerals} = lao or \textit{arabic} \end{itemize} +\subsection{latin}\label{latin} +\textbf{Options}: + \begin{itemize} + \item \TB{variant} = classical, medieval or \textit{modern} + \end{itemize} + \subsection{lsorbian and usorbian}\label{lsorbian}\label{usorbian} \textbf{Commands}: \begin{itemize} @@ -645,6 +653,14 @@ To insert the word breaks, you need to use an external processor. See the documentation to \pkg{thai-latex} and the file \file{testthai.tex} that comes with this package. +\subsection{ukrainian}\label{russian} +\textbf{Commands}: + \begin{itemize} + \item \Cmd\Asbuk: produces the uppercase Ukrainian alphabet, for + environments such as ¦enumerate¦ + \item \Cmd\asbuk: same in lowercase + \end{itemize} + \section{Modifying or extending captions and date formats} To redefine internal macros, you can use the command ¦\gappto¦ from the package @@ -790,5 +806,14 @@ document in dozens of different languages! Support for Lao was also added thanks to Brian Wilson. I also thank Alan Munn for kindly proof-reading the penultimate version of this documentation. And of course my gratitude also goes to Jonathan Kew, the formidable author of \XeTeX! + +\section{More acknowledgements (by Arthur Reutenauer)} +Many thanks to all the people who have contributed bugfixes and new features to +Polyglossia since I took over. Most of them can be identified from the version +control log on \href{https://github.com}{GitHub} and I won’t try to name them +all (maybe, one day ...); among the ones who sent contributions directly to me +I would like to especially thank Claudio Beccari, the indefatigable champion of +Romance languages, and beyond! + \end{document} diff --git a/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx b/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx index f7c32211489..f4cf2725bf8 100644 --- a/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx +++ b/Master/texmf-dist/source/latex/polyglossia/polyglossia.dtx @@ -11,16 +11,16 @@ ¦----------------------------------------------¦ ¦ ¦ - ¦ THE POLYGLOSSIA PACKAGE v1.33.5 ¦ + ¦ THE POLYGLOSSIA PACKAGE v1.33.6 ¦ ¦ ¦ ¦ Modern multilingual typesetting ¦ ¦ with XeLaTeX and LuaLaTeX ¦ ¦ ¦ ¦----------------------------------------------¦ -This package provides a complete Babel replacement for users of XeLaTeX and -(at an early stage) LuaLaTeX. This version includes support for 74 different -languages. +This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX +(with a few languages incompletely supported for the latter). This version +includes support for 74 different languages. Polyglossia makes it possible to automate the following tasks: @@ -63,7 +63,7 @@ http://github.com/reutenauer/polyglossia/issues The polyglossia package (C) 2008–2010 François Charette - (C) 2011-2014 Arthur Reutenauer + (C) 2011-2015 Arthur Reutenauer (C) 2013 Elie Roux License information appended @@ -71,7 +71,7 @@ http://github.com/reutenauer/polyglossia/issues \endpreamble \postamble - Copyright (C) 2014 by Arthur Reutenauer + Copyright (C) 2015 by Arthur Reutenauer This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -202,7 +202,7 @@ http://github.com/reutenauer/polyglossia/issues citecolor=myblue, hyperindex=false, hyperfootnotes=false, - pdftitle={Polyglossia: A Babel replacement for XeLaTeX and LuaLaTeX}, + pdftitle={Polyglossia: An alternative to Babel for XeLaTeX and LuaLaTeX}, pdfauthor={F Charette, A Reutenauer}, pdfkeywords={xetex, xelatex, luatex, lualatex, multilingual, babel, hyphenation} ]{hyperref} @@ -272,7 +272,7 @@ http://github.com/reutenauer/polyglossia/issues % % \title{\textcolor{lightblue}{\Huge\fontspec[LetterSpace=40]{GFS Ambrosia} Πολυγλωσσια} % \\[16pt] -% \color{myblue}Polyglossia: A Babel Replacement for \XeLaTeX\ and \LuaLaTeX} +% \color{myblue}Polyglossia: An Alternative to Babel for \XeLaTeX\ and \LuaLaTeX} % \author{\scshape\color{myblue}François Charette\\\color{myblue}Current maintainer: \scshape Arthur Reutenauer} % \date{\filedate \qquad \fileversion\\ % \footnotesize (\textsc{pdf} file generated on \today)} @@ -293,7 +293,7 @@ http://github.com/reutenauer/polyglossia/issues % % Polyglossia is a package for facilitating multilingual typesetting with % \XeLaTeX\ and (at an early stage) \LuaLaTeX. Basically, it -% can be used as a replacement of \pkg{babel} for performing the following +% can be used as an alternative to \pkg{babel} for performing the following % tasks automatically: % % \begin{enumerate} @@ -348,7 +348,7 @@ http://github.com/reutenauer/polyglossia/issues % \displaycmd{\setkeys\{⟨lang⟩\}\{opt1=value1,opt2=value2,…\}.}{\setkeys} % % -% \subsection{The “Babel way”} +% \subsection{The “Babel way” – obsolete} % \new{v1.2.0} % {\color{red}\bfseries Warning}: \pkg{polyglossia} no longer supports loading % language definition files as package options! @@ -442,21 +442,21 @@ http://github.com/reutenauer/polyglossia/issues % ^^A painstakingly edited by hand because I failed to see the note above :-P -- Arthur % \begin{tabular}{lllll} % \hline -% albanian & czech & \TX{hindi} & norsk & spanish \\ -% amharic & danish & icelandic & nynorsk & swedish \\ -% \TX{arabic} & divehi & interlingua & occitan & \TX{syriac} \\ -% armenian & \TX{dutch} & irish & piedmontese & tamil \\ -% asturian & \TX{english} & \TX{italian} & polish & telugu \\ -% bahasai & \TX{esperanto} & kannada & portuges & tibetan \\ -% bahasam & estonian & \TX{lao} & romanian & \TX{thai} \\ -% basque & \TX{farsi} & latin & romansh & turkish \\ -% \TX{bengali} & finnish & latvian & \TX{russian} & turkmen \\ -% brazil[ian] & french & lithuanian & samin & ukrainian \\ -% breton & friulan & \TX{lsorbian} & \TX{sanskrit}& urdu \\ -% bulgarian & galician & \TX{magyar} & scottish & \TX{usorbian} \\ -% \TX{catalan} & \TX{german} & malayalam & \TX{serbian} & vietnamese \\ -% coptic & \TX{greek} & marathi & slovak & welsh \\ -% croatian & \TX{hebrew} & nko & slovenian & \\ +% albanian & czech & \TX{hindi} & norsk & spanish \\ +% amharic & danish & icelandic & nynorsk & swedish \\ +% \TX{arabic} & divehi & interlingua & occitan & \TX{syriac} \\ +% armenian & \TX{dutch} & irish & piedmontese & tamil \\ +% asturian & \TX{english} & \TX{italian} & polish & telugu \\ +% bahasai & \TX{esperanto} & kannada & portuges & tibetan \\ +% bahasam & estonian & \TX{lao} & romanian & \TX{thai} \\ +% basque & \TX{farsi} & \TX{latin} & romansh & turkish \\ +% \TX{bengali} & finnish & latvian & \TX{russian} & turkmen \\ +% brazil[ian] & french & lithuanian & samin & \TX{ukrainian} \\ +% breton & friulan & \TX{lsorbian} & \TX{sanskrit}& urdu \\ +% bulgarian & galician & \TX{magyar} & scottish & \TX{usorbian} \\ +% \TX{catalan} & \TX{german} & malayalam & \TX{serbian} & vietnamese \\ +% coptic & \TX{greek} & marathi & slovak & welsh \\ +% croatian & \TX{hebrew} & nko & slovenian & \\ % \hline % \end{tabular} % \caption{Languages currently supported in \pkg{polyglossia}} @@ -687,8 +687,10 @@ http://github.com/reutenauer/polyglossia/issues % \subsection{german}\label{german} % \textbf{Options}: % \begin{itemize} -% \item\TB{variant} = \textit{german} or austrian.\new{v1.33.4} -% Setting variant=austrian uses some austrian lexical variants. +% \item\TB{variant} = \textit{german}, austrian or swiss.\new{v1.33.4} +% Setting variant=austrian or variant=swiss uses some lexical variants. +% With spelling=old, variant=swiss furthermore loads specific hyphenation +% patterns. % \item \TB{spelling} = \textit{new} (= 1996) or old (= 1901): % indicates whether hyphenation patterns for traditional (1901) or reformed % (1996) orthography should be used. The latter is the default. @@ -778,6 +780,12 @@ http://github.com/reutenauer/polyglossia/issues % \item \TB{numerals} = lao or \textit{arabic} % \end{itemize} % +% \subsection{latin}\label{latin} +% \textbf{Options}: +% \begin{itemize} +% \item \TB{variant} = classical, medieval or \textit{modern} +% \end{itemize} +% % \subsection{lsorbian and usorbian}\label{lsorbian}\label{usorbian} % \textbf{Commands}: % \begin{itemize} @@ -845,6 +853,14 @@ http://github.com/reutenauer/polyglossia/issues % See the documentation to \pkg{thai-latex} and the file \file{testthai.tex} % that comes with this package. % +% \subsection{ukrainian}\label{russian} +% \textbf{Commands}: +% \begin{itemize} +% \item \Cmd\Asbuk: produces the uppercase Ukrainian alphabet, for +% environments such as ¦enumerate¦ +% \item \Cmd\asbuk: same in lowercase +% \end{itemize} +% % \section{Modifying or extending captions and date formats} % % To redefine internal macros, you can use the command ¦\gappto¦ from the package @@ -991,6 +1007,15 @@ http://github.com/reutenauer/polyglossia/issues % I also thank Alan Munn for kindly proof-reading the penultimate version of this documentation. % And of course my gratitude also goes to Jonathan Kew, the formidable author of \XeTeX! % +% \section{More acknowledgements (by Arthur Reutenauer)} +% Many thanks to all the people who have contributed bugfixes and new features to +% Polyglossia since I took over. Most of them can be identified from the version +% control log on \href{https://github.com}{GitHub} and I won’t try to name them +% all (maybe, one day ...); among the ones who sent contributions directly to me +% I would like to especially thank Claudio Beccari, the indefatigable champion of +% Romance languages, and beyond! +% +% % % % \StopEventually{} @@ -1269,7 +1294,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \RequirePackage{hijrical} @@ -2444,7 +2469,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \PolyglossiaSetup{divehi}{ script=Thaana, scripttag=thaa, @@ -2830,7 +2855,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \RequirePackage{farsical} \RequirePackage{hijrical} @@ -3314,11 +3339,22 @@ and may look very wrong.} \newif\if@austrian@locale \@austrian@localefalse +\newif\if@swiss@locale +\@swiss@localefalse \def\tmp@austrian{austrian} +\def\tmp@swiss{swiss} \define@key{german}{variant}[german]{% \def\@tmpa{#1}% \ifx\@tmpa\tmp@austrian\@austrian@localetrue\else \@austrian@localefalse% + \fi + \ifx\@tmpa\tmp@swiss\@swiss@localetrue + \ifcsundef{l@swissgerman}% + {\xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak + I will use the standard patterns for German (old spelling) instead}% + \adddialect\l@swissgerman\l@german\relax}{}% + \else + \@swiss@localefalse% \fi} \newif\if@german@fraktur @@ -3333,7 +3369,7 @@ and may look very wrong.} \define@boolkey{german}[german@]{babelshorthands}[true]{} -\setkeys{german}{spelling,latesthyphen,script} +\setkeys{german}{spelling,latesthyphen,script,variant} \ifsystem@babelshorthands \setkeys{german}{babelshorthands=true} @@ -3424,6 +3460,10 @@ and may look very wrong.} \def\enclname{Beilage(n)}% } +\def\captions@german@swiss{% + \def\enclname{Beilage(n)}% +} + %%Strings for Fraktur contributed by Gerrit \def\captions@german@fraktur{% \captions@german% @@ -3445,6 +3485,7 @@ and may look very wrong.} \def\captionsgerman{% \if@german@fraktur\captions@german@fraktur\else\captions@german\fi \if@austrian@locale\captions@german@austrian\fi + \if@swiss@locale\captions@german@swiss\fi } \def\dategerman{% @@ -3452,13 +3493,43 @@ and may look very wrong.} } \def\german@language{\language=% - \csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname + \csname l@% + \if@swiss@locale + \if@german@oldspelling + swissgerman% + \else + ngerman% + \ifgerman@latesthyphen + -x-latest + \fi + \fi + \else% (german, austrian) + \if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi + \fi + \endcsname % LuaTeX - % \let\pattname{\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi} - % \xpg@set@language@luatex@ii{\pattname}} \ifgerman@latesthyphen - \if@german@oldspelling\xpg@set@language@luatex@ii{german-x-latest}\else\xpg@set@language@luatex@ii{ngerman-x-latest}\fi - \else\if@german@oldspelling\xpg@set@language@luatex@ii{german}\else\xpg@set@language@luatex@ii{ngerman}\fi\fi} + \if@german@oldspelling + \if@swiss@locale + \xpg@set@language@luatex@ii{swissgerman} + \else + \xpg@set@language@luatex@ii{german-x-latest} + \fi + \else + \xpg@set@language@luatex@ii{ngerman-x-latest} + \fi + \else% (latesthyphen=false) + \if@german@oldspelling + \if@swiss@locale + \xpg@set@language@luatex@ii{swissgerman} + \else + \xpg@set@language@luatex@ii{german} + \fi + \else + \xpg@set@language@luatex@ii{ngerman} + \fi + \fi +} \def\noextras@german{% \nogerman@shorthands% @@ -3841,7 +3912,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{hebrewcal} \providebool{@hebrew@marcheshvan} @@ -4602,15 +4673,112 @@ and may look very wrong.} % % \subsection{gloss-latin.ldf} % \begin{macrocode} +% !TEX encoding = UTF-8 Unicode \ProvidesFile{gloss-latin.ldf}[polyglossia: module for latin] \PolyglossiaSetup{latin}{ - hyphennames={latin}, - hyphenmins={2,2}, +% hyphennames={latin}, +% hyphenmins={2,2}, frenchspacing=true, fontsetup=true, } -\def\captionslatin{% + +\define@boolkey{latin}[latin@]{babelshorthands}[true]{} + + +\ifsystem@babelshorthands + \setkeys{latin}{babelshorthands=true} +\else + \setkeys{latin}{babelshorthands=false} +\fi + + +\ifcsundef{initiate@active@char}{% +\input{babelsh.def}% +}{}\initiate@active@char{"}% + + + +\def\latin@shorthands{% + \bbl@activate{"}% + \def\language@group{latin}% + \declare@shorthand{latin}{"}{% + \relax\ifmmode + \def\xpgla@next{''}% + \else + \def\xpgla@next{\futurelet\xpgla@temp\xpgla@cwm}% + \fi + \xpgla@next}% +} + + +\def\xpgla@allowhyphens{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens} +\newcommand*{\xpgla@cwm}{\let\xpgla@@next\relax + \ifcat\noexpand\xpgla@temp a% + \let\xpgla@@next\xpgla@allowhyphens + \else + \ifx\xpgla@temp\ae + \let\xpgla@@next\xpgla@allowhyphens + \else + \ifx\xpgla@temp\oe + \let\xpgla@@next\xpgla@allowhyphens + \else + \if\noexpand\xpgla@temp\string|% + \def\xpgla@@next{\xpgla@allowhyphens\@gobble}% + \fi + \fi + \fi + \fi + \xpgla@@next}% + +\def\nolatin@shorthands{% + \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}% +} + + +% set modern as default +\def\latin@variant{\l@latin}% +\def\captionslatin{\modernlatincaptions}% +\def\datelatin{\modernlatindate}% +\def\classicuclccodes{\lccode`\V=`\u \uccode`\u=`\V} + +\def\tmp@modern{modern} +\def\tmp@medieval{medieval} +\def\tmp@classic{classic} + +\define@key{latin}{variant}[modern]{% +\def\@tempa{#1}% +\ifx\@tempa\tmp@medieval + \def\latin@variant{\l@latin}% + \def\captionslatin{\medievallatincaptions}% + \def\datelatin{\classiclatindate}% + \classicuclccodes + \xpg@info{Option: Medieval Latin}% +\else + \ifx\@tempa\tmp@classic + \ifx\l@classiclatin\undefined + \xpg@nopatterns{Classic Latin}% + \adddialect\l@classiclatin\l@latin + \def\latin@variant{\l@latin}% + \else + \def\latin@variant{\l@classiclatin}% + \fi + \def\captionslatin{\modernlatincaptions}% + \def\datelatin{\classiclatindate}% + \classicuclccodes + \xpg@info{Option: Classic Latin}% + \else + \def\latin@variant{\l@latin}% + \def\captionslatin{\modernlatincaptions}% + \def\datelatin{\modernlatindate}% + \xpg@info{Option: Modern Latin}% + \fi +\fi +} + +\def\latin@language{\language=\latin@variant}% + +\def\modernlatincaptions{% \def\prefacename{Praefatio}% \def\refname{Conspectus librorum}% \def\abstractname{Summarium}% @@ -4627,13 +4795,38 @@ and may look very wrong.} \def\enclname{Additur}% \def\ccname{Exemplar}% \def\headtoname{\ignorespaces}% - \def\pagename{pagina}% + \def\pagename{charta}% + \def\seename{cfr.}% + \def\alsoname{cfr.}% + \def\proofname{Demonstratio}% + \def\glossaryname{Glossarium}% + } + +\def\medievallatincaptions{% + \def\prefacename{Præfatio}% + \def\refname{Conspectus librorum}% + \def\abstractname{Summarium}% + \def\bibname{Conspectus librorum}% + \def\chaptername{Caput}% + \def\appendixname{Additamentum}% + \def\contentsname{Index}% + \def\listfigurename{Conspectus descriptionum}% + \def\listtablename{Conspectus tabularum}% + \def\indexname{Index rerum notabilium}% + \def\figurename{Descriptio}% + \def\tablename{Tabula}% + \def\partname{Pars}% + \def\enclname{Additur}% + \def\ccname{Exemplar}% + \def\headtoname{\ignorespaces}% + \def\pagename{charta}% \def\seename{cfr.}% \def\alsoname{cfr.}% \def\proofname{Demonstratio}% \def\glossaryname{Glossarium}% } -\def\datelatin{% + +\def\modernlatindate{% \def\today{\uppercase\expandafter{\romannumeral\day}% \space \ifcase\month% \or Januarii\or Februarii\or Martii\or Aprilis\or Maji\or Junii\or% @@ -4641,6 +4834,42 @@ and may look very wrong.} Decembris\fi% \space \uppercase\expandafter{\romannumeral\year}}} +\def\classiclatindate{% + \def\today{\uppercase\expandafter{\romannumeral\day}% + \space \ifcase\month + \or Januarii\or Februarii\or Martii\or Aprilis\or Maii\or Junii\or + Julii\or Augusti\or Septembris\or Octobris\or Nouembris\or + Decembris\fi + \space \uppercase\expandafter{\romannumeral\year}}} + +\let\xpgla@savedvalues\empty +\AtEndPreamble{% the user or the class might define different values + \edef\xpgla@savedvalues{% + \clubpenalty=\the\clubpenalty\space + \@clubpenalty=\the\@clubpenalty\space + \widowpenalty=\the\widowpenalty\space + \finalhyphendemerits=\the\finalhyphendemerits} +} + + +\def\noextras@latin{% + \lccode\string"2019=\z@ + \nolatin@shorthands + \xpgla@savedvalues +} + +\def\blockextras@latin{% + \lccode\string"2019=\string"2019 + \clubpenalty=3000 \@clubpenalty=3000 \widowpenalty=3000 + \finalhyphendemerits=50000000 + \iflatin@babelshorthands\latin@shorthands\fi +} + +\def\inlineextras@latin{% + \lccode\string"2019=\string"2019 + \iflatin@babelshorthands\latin@shorthands\fi +} + % \end{macrocode} % \iffalse % @@ -6420,7 +6649,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \PolyglossiaSetup{syriac}{ @@ -7014,45 +7243,33 @@ and may look very wrong.} } \def\tibetan@globalnumbers{% - \let\orig@arabic\@arabic% + \let\xpg@orig@arabic\@arabic% \let\@arabic\tibetannumber% \renewcommand{\thefootnote}{\protect\tibetannumber{\c@footnote}}% } \def\notibetan@globalnumbers{% - \let\@arabic\orig@arabic% + \let\@arabic\xpg@orig@arabic% \renewcommand\thefootnote{\protect\number{\c@footnote}}% } \def\noextras@tibetan{% \notibetan@eol% - \let\baselinestrech\orig@baselinestretch% - } - -\def\blockextras@tibetan{% - % copied from Thai, not tested - \let\orig@baselinestrech\baselinestretch% - \renewcommand{\baselinestretch}{1.2}% - \tibetan@eol% + \ifcsname xpg@orig@baselinestretch\endcsname\renewcommand{\baselinestretch}{\xpg@orig@baselinestretch}\fi % } \def\inlineextras@tibetan{% - \let\orig@baselinestrech\baselinestretch% + \xdef\xpg@orig@baselinestretch{\ifcsname baselinestretch\endcsname \baselinestretch \else 1\fi}% \renewcommand{\baselinestretch}{1.2}% \tibetan@eol% } \def\blockextras@tibetan{% - \let\orig@baselinestrech\baselinestretch% + \xdef\xpg@orig@baselinestretch{\ifcsname baselinestretch\endcsname \baselinestretch \else 1\fi}% \renewcommand{\baselinestretch}{1.2}% \tibetan@eol% } -\def\noblockextras@tibetan{% - \notibetan@eol% - \let\baselinestrech\orig@baselinestretch% -} - % \end{macrocode} % \iffalse % @@ -7140,7 +7357,7 @@ and may look very wrong.} Ocak\or Şubat\or Mart\or Nisan\or Mayıs\or Haziran\or Temmuz\or Ağustos\or Eylül\or Ekim\or Kasım\or Aralık\fi - \space\number\year} + \space\number\year}% } \def\hijrimonthturkish#1{\ifcase#1% \or Muharrem\or Safer\or Rebiülevvel\or Rebiülahir\or Cemaziyelevvel\or Cemaziyelahir\or Recep\or Şaban\or Ramazan\or Şevval\or Zilkade\or Zilhicce\fi} @@ -7278,11 +7495,13 @@ and may look very wrong.} грудня\fi% \space\number\year~р.}} +\def\Asbuk#1{\expandafter\ukrainian@Alph\csname c@#1\endcsname} \def\ukrainian@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 Ч\or Ш\or Щ\or Ю\or Я\else\xpg@ill@value{#1}{ukrainian@Alph}\fi} +\def\asbuk#1{\expandafter\ukrainian@alph\csname c@#1\endcsname} \def\ukrainian@alph#1{\ifcase#1\or а\or б\or в\or г\or д\or е\or є\or ж\or з\or и\or і\or ї\or й\or к\or л\or м\or н\or о\or @@ -7318,7 +7537,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \RequirePackage{hijrical} @@ -8186,16 +8405,16 @@ polyglossia.enable_hyphenation = enable_hyphenation ¦----------------------------------------------¦ ¦ ¦ - ¦ THE POLYGLOSSIA PACKAGE v1.33.5 ¦ + ¦ THE POLYGLOSSIA PACKAGE v1.33.6 ¦ ¦ ¦ ¦ Modern multilingual typesetting ¦ ¦ with XeLaTeX and LuaLaTeX ¦ ¦ ¦ ¦----------------------------------------------¦ -This package provides a complete Babel replacement for users of XeLaTeX and -(at an early stage) LuaLaTeX. This version includes support for 74 different -languages. +This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX +(with a few languages incompletely supported for the latter). This version +includes support for 74 different languages. Polyglossia makes it possible to automate the following tasks: @@ -8223,7 +8442,18 @@ Hum, sorry, wishful thinking. Please report any bugs, problems or requests on: http://github.com/reutenauer/polyglossia/issues % %<*Changelog> -1.33.4 (21-05-2014) +10-05-2015 + * Added support for Swiss German (pull request #75) + * Added commands \Asbuk and \asbuk for Ukrainian (pull request #76), similar to Russian + * Documented changes to Latin from last year. + +09-05-2015 + * Be friendlier to right-to-left languages with LuaTeX + +04-06-2014 + * Enhanced Latin support by Claudio Beccari + +1.33.5 (21-05-2014) * Option to disable hyphenation entirely, by Élie Roux * Fix spurious spaces in gloss-russian.ldf, by Oleg Domanov * Support for the Austrian variant of German, by Jürgen Spitzmüller diff --git a/Master/texmf-dist/tex/latex/polyglossia/farsical.sty b/Master/texmf-dist/tex/latex/polyglossia/farsical.sty index b78d29809c3..7c715c82471 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/farsical.sty +++ b/Master/texmf-dist/tex/latex/polyglossia/farsical.sty @@ -1,7 +1,8 @@ \ProvidesPackage{farsical} [2008/07/02 v0.1 % Farsi (jalali) calendar] -\RequirePackage{bidi,calc,arabicnumbers} +\ifluatex\RequirePackage{luabidi}\else\RequirePackage{bidi}\fi +\RequirePackage{calc,arabicnumbers} %TODO - rewrite completely using calc %% - use Reingold & Dershowitz ME diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf index 2d5e2441502..441b2f2dd28 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-arabic.ldf @@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \RequirePackage{hijrical} diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf index 19f539f521b..8685b26c5df 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-divehi.ldf @@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \PolyglossiaSetup{divehi}{ script=Thaana, scripttag=thaa, diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf index d74ade2a03a..f9149badf6e 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-farsi.ldf @@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \RequirePackage{farsical} \RequirePackage{hijrical} diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf index e3e343c48eb..8e6674fdcef 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-german.ldf @@ -35,11 +35,22 @@ \newif\if@austrian@locale \@austrian@localefalse +\newif\if@swiss@locale +\@swiss@localefalse \def\tmp@austrian{austrian} +\def\tmp@swiss{swiss} \define@key{german}{variant}[german]{% \def\@tmpa{#1}% \ifx\@tmpa\tmp@austrian\@austrian@localetrue\else \@austrian@localefalse% + \fi + \ifx\@tmpa\tmp@swiss\@swiss@localetrue + \ifcsundef{l@swissgerman}% + {\xpg@warning{No hyphenation patterns were loaded for "Swiss German (Old Spelling)"\MessageBreak + I will use the standard patterns for German (old spelling) instead}% + \adddialect\l@swissgerman\l@german\relax}{}% + \else + \@swiss@localefalse% \fi} \newif\if@german@fraktur @@ -54,7 +65,7 @@ \define@boolkey{german}[german@]{babelshorthands}[true]{} -\setkeys{german}{spelling,latesthyphen,script} +\setkeys{german}{spelling,latesthyphen,script,variant} \ifsystem@babelshorthands \setkeys{german}{babelshorthands=true} @@ -145,6 +156,10 @@ \def\enclname{Beilage(n)}% } +\def\captions@german@swiss{% + \def\enclname{Beilage(n)}% +} + %%Strings for Fraktur contributed by Gerrit \def\captions@german@fraktur{% \captions@german% @@ -166,6 +181,7 @@ \def\captionsgerman{% \if@german@fraktur\captions@german@fraktur\else\captions@german\fi \if@austrian@locale\captions@german@austrian\fi + \if@swiss@locale\captions@german@swiss\fi } \def\dategerman{% @@ -173,13 +189,43 @@ } \def\german@language{\language=% - \csname l@\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi\endcsname + \csname l@% + \if@swiss@locale + \if@german@oldspelling + swissgerman% + \else + ngerman% + \ifgerman@latesthyphen + -x-latest + \fi + \fi + \else% (german, austrian) + \if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi + \fi + \endcsname % LuaTeX - % \let\pattname{\if@german@oldspelling\else n\fi german\ifgerman@latesthyphen -x-latest\fi} - % \xpg@set@language@luatex@ii{\pattname}} \ifgerman@latesthyphen - \if@german@oldspelling\xpg@set@language@luatex@ii{german-x-latest}\else\xpg@set@language@luatex@ii{ngerman-x-latest}\fi - \else\if@german@oldspelling\xpg@set@language@luatex@ii{german}\else\xpg@set@language@luatex@ii{ngerman}\fi\fi} + \if@german@oldspelling + \if@swiss@locale + \xpg@set@language@luatex@ii{swissgerman} + \else + \xpg@set@language@luatex@ii{german-x-latest} + \fi + \else + \xpg@set@language@luatex@ii{ngerman-x-latest} + \fi + \else% (latesthyphen=false) + \if@german@oldspelling + \if@swiss@locale + \xpg@set@language@luatex@ii{swissgerman} + \else + \xpg@set@language@luatex@ii{german} + \fi + \else + \xpg@set@language@luatex@ii{ngerman} + \fi + \fi +} \def\noextras@german{% \nogerman@shorthands% diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf index 73163d1b5a6..cb6ed7ef2b6 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-hebrew.ldf @@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{hebrewcal} \providebool{@hebrew@marcheshvan} diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf index 66be7360066..7170dd7553a 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-latin.ldf @@ -1,12 +1,109 @@ +% !TEX encoding = UTF-8 Unicode \ProvidesFile{gloss-latin.ldf}[polyglossia: module for latin] \PolyglossiaSetup{latin}{ - hyphennames={latin}, - hyphenmins={2,2}, +% hyphennames={latin}, +% hyphenmins={2,2}, frenchspacing=true, fontsetup=true, } -\def\captionslatin{% + +\define@boolkey{latin}[latin@]{babelshorthands}[true]{} + + +\ifsystem@babelshorthands + \setkeys{latin}{babelshorthands=true} +\else + \setkeys{latin}{babelshorthands=false} +\fi + + +\ifcsundef{initiate@active@char}{% +\input{babelsh.def}% +}{}\initiate@active@char{"}% + + + +\def\latin@shorthands{% + \bbl@activate{"}% + \def\language@group{latin}% + \declare@shorthand{latin}{"}{% + \relax\ifmmode + \def\xpgla@next{''}% + \else + \def\xpgla@next{\futurelet\xpgla@temp\xpgla@cwm}% + \fi + \xpgla@next}% +} + + +\def\xpgla@allowhyphens{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens} +\newcommand*{\xpgla@cwm}{\let\xpgla@@next\relax + \ifcat\noexpand\xpgla@temp a% + \let\xpgla@@next\xpgla@allowhyphens + \else + \ifx\xpgla@temp\ae + \let\xpgla@@next\xpgla@allowhyphens + \else + \ifx\xpgla@temp\oe + \let\xpgla@@next\xpgla@allowhyphens + \else + \if\noexpand\xpgla@temp\string|% + \def\xpgla@@next{\xpgla@allowhyphens\@gobble}% + \fi + \fi + \fi + \fi + \xpgla@@next}% + +\def\nolatin@shorthands{% + \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}% +} + + +% set modern as default +\def\latin@variant{\l@latin}% +\def\captionslatin{\modernlatincaptions}% +\def\datelatin{\modernlatindate}% +\def\classicuclccodes{\lccode`\V=`\u \uccode`\u=`\V} + +\def\tmp@modern{modern} +\def\tmp@medieval{medieval} +\def\tmp@classic{classic} + +\define@key{latin}{variant}[modern]{% +\def\@tempa{#1}% +\ifx\@tempa\tmp@medieval + \def\latin@variant{\l@latin}% + \def\captionslatin{\medievallatincaptions}% + \def\datelatin{\classiclatindate}% + \classicuclccodes + \xpg@info{Option: Medieval Latin}% +\else + \ifx\@tempa\tmp@classic + \ifx\l@classiclatin\undefined + \xpg@nopatterns{Classic Latin}% + \adddialect\l@classiclatin\l@latin + \def\latin@variant{\l@latin}% + \else + \def\latin@variant{\l@classiclatin}% + \fi + \def\captionslatin{\modernlatincaptions}% + \def\datelatin{\classiclatindate}% + \classicuclccodes + \xpg@info{Option: Classic Latin}% + \else + \def\latin@variant{\l@latin}% + \def\captionslatin{\modernlatincaptions}% + \def\datelatin{\modernlatindate}% + \xpg@info{Option: Modern Latin}% + \fi +\fi +} + +\def\latin@language{\language=\latin@variant}% + +\def\modernlatincaptions{% \def\prefacename{Praefatio}% \def\refname{Conspectus librorum}% \def\abstractname{Summarium}% @@ -23,13 +120,38 @@ \def\enclname{Additur}% \def\ccname{Exemplar}% \def\headtoname{\ignorespaces}% - \def\pagename{pagina}% + \def\pagename{charta}% + \def\seename{cfr.}% + \def\alsoname{cfr.}% + \def\proofname{Demonstratio}% + \def\glossaryname{Glossarium}% + } + +\def\medievallatincaptions{% + \def\prefacename{Præfatio}% + \def\refname{Conspectus librorum}% + \def\abstractname{Summarium}% + \def\bibname{Conspectus librorum}% + \def\chaptername{Caput}% + \def\appendixname{Additamentum}% + \def\contentsname{Index}% + \def\listfigurename{Conspectus descriptionum}% + \def\listtablename{Conspectus tabularum}% + \def\indexname{Index rerum notabilium}% + \def\figurename{Descriptio}% + \def\tablename{Tabula}% + \def\partname{Pars}% + \def\enclname{Additur}% + \def\ccname{Exemplar}% + \def\headtoname{\ignorespaces}% + \def\pagename{charta}% \def\seename{cfr.}% \def\alsoname{cfr.}% \def\proofname{Demonstratio}% \def\glossaryname{Glossarium}% } -\def\datelatin{% + +\def\modernlatindate{% \def\today{\uppercase\expandafter{\romannumeral\day}% \space \ifcase\month% \or Januarii\or Februarii\or Martii\or Aprilis\or Maji\or Junii\or% @@ -37,4 +159,40 @@ Decembris\fi% \space \uppercase\expandafter{\romannumeral\year}}} +\def\classiclatindate{% + \def\today{\uppercase\expandafter{\romannumeral\day}% + \space \ifcase\month + \or Januarii\or Februarii\or Martii\or Aprilis\or Maii\or Junii\or + Julii\or Augusti\or Septembris\or Octobris\or Nouembris\or + Decembris\fi + \space \uppercase\expandafter{\romannumeral\year}}} + +\let\xpgla@savedvalues\empty +\AtEndPreamble{% the user or the class might define different values + \edef\xpgla@savedvalues{% + \clubpenalty=\the\clubpenalty\space + \@clubpenalty=\the\@clubpenalty\space + \widowpenalty=\the\widowpenalty\space + \finalhyphendemerits=\the\finalhyphendemerits} +} + + +\def\noextras@latin{% + \lccode\string"2019=\z@ + \nolatin@shorthands + \xpgla@savedvalues +} + +\def\blockextras@latin{% + \lccode\string"2019=\string"2019 + \clubpenalty=3000 \@clubpenalty=3000 \widowpenalty=3000 + \finalhyphendemerits=50000000 + \iflatin@babelshorthands\latin@shorthands\fi +} + +\def\inlineextras@latin{% + \lccode\string"2019=\string"2019 + \iflatin@babelshorthands\latin@shorthands\fi +} + \endinput diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf index 0cda3fd0e0a..817a6f29bc9 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-syriac.ldf @@ -5,7 +5,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \PolyglossiaSetup{syriac}{ diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf index 3ca18cf0c96..e5702096b73 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-tibetan.ldf @@ -141,43 +141,31 @@ } \def\tibetan@globalnumbers{% - \let\orig@arabic\@arabic% + \let\xpg@orig@arabic\@arabic% \let\@arabic\tibetannumber% \renewcommand{\thefootnote}{\protect\tibetannumber{\c@footnote}}% } \def\notibetan@globalnumbers{% - \let\@arabic\orig@arabic% + \let\@arabic\xpg@orig@arabic% \renewcommand\thefootnote{\protect\number{\c@footnote}}% } \def\noextras@tibetan{% \notibetan@eol% - \let\baselinestrech\orig@baselinestretch% - } - -\def\blockextras@tibetan{% - % copied from Thai, not tested - \let\orig@baselinestrech\baselinestretch% - \renewcommand{\baselinestretch}{1.2}% - \tibetan@eol% + \ifcsname xpg@orig@baselinestretch\endcsname\renewcommand{\baselinestretch}{\xpg@orig@baselinestretch}\fi % } \def\inlineextras@tibetan{% - \let\orig@baselinestrech\baselinestretch% + \xdef\xpg@orig@baselinestretch{\ifcsname baselinestretch\endcsname \baselinestretch \else 1\fi}% \renewcommand{\baselinestretch}{1.2}% \tibetan@eol% } \def\blockextras@tibetan{% - \let\orig@baselinestrech\baselinestretch% + \xdef\xpg@orig@baselinestretch{\ifcsname baselinestretch\endcsname \baselinestretch \else 1\fi}% \renewcommand{\baselinestretch}{1.2}% \tibetan@eol% } -\def\noblockextras@tibetan{% - \notibetan@eol% - \let\baselinestrech\orig@baselinestretch% -} - \endinput diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf index 7df181f50cb..e937e7bf009 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-turkish.ldf @@ -76,7 +76,7 @@ Ocak\or Şubat\or Mart\or Nisan\or Mayıs\or Haziran\or Temmuz\or Ağustos\or Eylül\or Ekim\or Kasım\or Aralık\fi - \space\number\year} + \space\number\year}% } \def\hijrimonthturkish#1{\ifcase#1% \or Muharrem\or Safer\or Rebiülevvel\or Rebiülahir\or Cemaziyelevvel\or Cemaziyelahir\or Recep\or Şaban\or Ramazan\or Şevval\or Zilkade\or Zilhicce\fi} diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf index e7001edda42..b6656ea5274 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-ukrainian.ldf @@ -54,11 +54,13 @@ грудня\fi% \space\number\year~р.}} +\def\Asbuk#1{\expandafter\ukrainian@Alph\csname c@#1\endcsname} \def\ukrainian@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 Ч\or Ш\or Щ\or Ю\or Я\else\xpg@ill@value{#1}{ukrainian@Alph}\fi} +\def\asbuk#1{\expandafter\ukrainian@alph\csname c@#1\endcsname} \def\ukrainian@alph#1{\ifcase#1\or а\or б\or в\or г\or д\or е\or є\or ж\or з\or и\or і\or ї\or й\or к\or л\or м\or н\or о\or diff --git a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf index e092125e2ff..31e998dede3 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf +++ b/Master/texmf-dist/tex/latex/polyglossia/gloss-urdu.ldf @@ -6,7 +6,7 @@ I will proceed with the compilation, but\MessageBreak the output is not guaranteed to be correct\MessageBreak and may look very wrong.} \fi -\RequirePackage{bidi} +\RequireBidi \RequirePackage{arabicnumbers} \RequirePackage{hijrical} diff --git a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty index c75b2f5faa9..bf50422c19b 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty +++ b/Master/texmf-dist/tex/latex/polyglossia/hebrewcal.sty @@ -1,8 +1,8 @@ \ProvidesPackage{hebrewcal} - [2012/04/29 v2.5 % + [2015/04/17 v2.6 % Hebrew calendar for polyglossia (adapted from hebcal.sty in Babel)] \RequirePackage{xkeyval} -\RequirePackage{bidi} +\ifluatex\RequirePackage{luabidi}\else\RequirePackage{bidi}\fi \newif\if@xpg@hebrewcal@marcheshvan \DeclareOption{marcheshvan}{\@xpg@hebrewcal@marcheshvantrue} @@ -38,20 +38,20 @@ \def\HebrewYearName#1{{% \@tempcnta=#1\divide\@tempcnta by 1000\multiply\@tempcnta by 1000 \ifnum#1=\@tempcnta\relax % divisible by 1000: disambiguate - \hebrewnumeral{#1}\ (לפ"ג)% + \Hebrewnumeral{#1}\ (לפ"ג)% \else % not divisible by 1000 \ifnum#1<1000\relax % first millennium: disambiguate - \hebrewnumeral{#1}\ (לפ"ג)% + \Hebrewnumeral{#1}\ (לפ"ג)% \else \ifnum#1<5000 - \hebrewnumeral{#1}% + \Hebrewnumeral{#1}% \else \ifnum#1<6000 % current millenium, print without thousands \@tempcnta=#1\relax \if@hebrew@fullyear\else\advance\@tempcnta by -5000\fi - \hebrewnumeral{\@tempcnta}% + \Hebrewnumeral{\@tempcnta}% \else % #1>6000 - \hebrewnumeral{#1}% + \Hebrewnumeral{#1}% \fi \fi \fi @@ -81,7 +81,7 @@ \fi% \fi} \def\@FormatForHebrew#1#2#3{% - \hebrewnumeral{#1}~ב\HebrewMonthName{#2}{#3}~% + \Hebrewnumeral{#1}~ב\HebrewMonthName{#2}{#3}~% \HebrewYearName{#3}} \def\HebrewMonthNameInEnglish#1#2{% \ifnum #1 = 7% diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty index e56d5a9e70a..f9ff8a47ddd 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty +++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{polyglossia}[2014/05/21 v1.33.5 - Babel replacement for XeLaTeX and LuaTeX] +\ProvidesPackage{polyglossia}[2015/05/13 v1.33.6 + Alternative to Babel for XeLaTeX and LuaLaTeX] \RequirePackage{etoolbox} \RequirePackage{makecmds} \RequirePackage{xkeyval}[2008/08/13] @@ -64,6 +64,17 @@ \def\@@ensure@dir#1{\ifcsundef{@ensure@dir}{#1}{\@ensure@dir{#1}}} \def\@@ensure@maindir#1{\ifcsundef{@ensure@maindir}{#1}{\@ensure@maindir{#1}}} +%% Used by the language definitions files for right-to-left languages +\def\RequireBidi{% + \ifxetex + \RequirePackage{bidi} + \else\ifluatex + \RequirePackage{luabidi} + \else + \xpg@warning{You’re running a TeX engine that is not LuaTeX or XeTeX.\MessageBreak +That is almost guaranteed to cause problems.} + \fi\fi} + %% compatibility with babel \let\addto\gappto% gappto is defined in etoolbox @@ -791,7 +802,7 @@ \define@boolkey{polyglossia}[system@]{babelshorthands}[false]{} -\AtEndPreamble{\@ifpackageloaded{bidi}{\newcommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}}{}} +\AtEndPreamble{\@ifpackageloaded{bidi}{\providecommand*{\aemph}[1]{$\overline{\hboxR{#1}}$}}{}} %% Package Options %% \DeclareOption{nolocalmarks}{\setkeys{polyglossia}{localmarks=false}} -- cgit v1.2.3