diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty | 65 |
1 files changed, 38 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty index 118017d1f4f..1e872abb2f6 100644 --- a/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty +++ b/Master/texmf-dist/tex/latex/polyglossia/polyglossia.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{polyglossia}[2020/01/29 v1.47 +\ProvidesPackage{polyglossia}[2020/03/25 v1.48 Modern multilingual typesetting with XeLaTeX and LuaLaTeX] \RequirePackage{etoolbox} \RequirePackage{makecmds} @@ -301,7 +301,7 @@ \csdef{#1@language}{% \polyglossia@setup@language@patterns{#1}% }% - % setup hypenmins + % setup hyphenmins \exp_args:NNe \clist_set:Nn \l_tmpa_clist { \prop_item:Nn \polyglossia@langsetup {#1 / hyphenmins} } \cs_if_eq:cNF {l@#1} \l@nohyphenation @@ -959,34 +959,45 @@ %% ensure localization of \markright and \markboth commands %%% THIS IS NOW DISABLED BY DEFAULT -\newcommand{\local@marks}[1]{} -\def\enable@local@marks{ +\cs_new_nopar:Nn {\polyglossia@local@marks:n} {} +\cs_new_nopar:Nn {\polyglossia@enable@local@marks:} +{ \xpg@info{Option:~ localmarks}% - \def\local@marks##1{% - \def\markboth####1####2{% + \cs_gset_nopar:Nn \polyglossia@local@marks:n + {% + \def\xpg@tmp@lang{##1}% + \DeclareRobustCommand\markboth[2]{% \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}}}}% + {% + {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}% + {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####2}}}% + }% \@temptokena \expandafter{\@themark}% \mark{\the\@temptokena}% \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi}% - \def\markright####1{% - \begingroup - \let\label\relax \let\index\relax \let\glossary\relax - \expandafter\@markright\@themark - {\foreignlanguage{##1}{\protect\@@ensure@maindir{####1}}}% - \@temptokena \expandafter{\@themark}% - \mark{\the\@temptokena}% - \endgroup - \if@nobreak\ifvmode\nobreak\fi\fi}% - \def\@markright####1####2####3{\@temptokena{\protect\@@ensure@maindir{####1}}% - \unrestored@protected@xdef\@themark{{\the\@temptokena}% - {\protect\@@ensure@maindir{####3}}}}}% + \if@nobreak\ifvmode\nobreak\fi\fi% + }% + \DeclareRobustCommand\markright[1]{% + \begingroup + \let\label\relax \let\index\relax \let\glossary\relax + \expandafter\@markright\@themark + {\lowercase{\foreignlanguage{\xpg@tmp@lang}}{\protect\@@ensure@maindir{####1}}}% + \@temptokena \expandafter{\@themark}% + \mark{\the\@temptokena}% + \endgroup + \if@nobreak\ifvmode\nobreak\fi\fi% + }% +% This part seems wrong (see #396 for explanation). Remove after a while. +% \def\@markright####1####2####3{% +% \@temptokena{\protect\@@ensure@maindir{####1}}% +% \unrestored@protected@xdef\@themark{% +% {\the\@temptokena}% +% {\protect\@@ensure@maindir{####3}}% +% }% +% }% + }% } @@ -2021,7 +2032,7 @@ % via babelname (such as biblatex) \cs_if_exist_use:c{captions@bbl@\babelname}% \cs_if_exist_use:c{date@bbl@\babelname}% - \local@marks{#2}% + \polyglossia@local@marks:n{#2}% \csuse{init@extras@#2}% \polyglossia@lang@indentfirst:n{#2} \csuse{blockextras@#2}% @@ -2141,7 +2152,7 @@ localmarks .bool_set:N = \l_polyglossia_localmarks_bool, localmarks - .default:n = false, + .default:n = true, % compatibility nolocalmarks .meta:n = { localmarks = false }, @@ -2171,8 +2182,8 @@ \gdef\xpg@info#1{\relax}% no polyglossia info } -\bool_if:nTF \l_polyglossia_localmarks_bool {} { - \enable@local@marks{} +\bool_if:nTF \l_polyglossia_localmarks_bool { + \polyglossia@enable@local@marks: }{} % compatibility |