diff options
author | Karl Berry <karl@freefriends.org> | 2017-06-26 21:24:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-06-26 21:24:22 +0000 |
commit | 439864b38b6777a8f40523a964c0fb7e3c352bff (patch) | |
tree | 173cbf91e3ef1fedbcd130504bb73b46edffa16e /Master/texmf-dist/tex/generic/babel/switch.def | |
parent | b41810159701157d4c4082233224c298a27f4574 (diff) |
babel (26jun17)
git-svn-id: svn://tug.org/texlive/trunk@44705 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/switch.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/babel/switch.def | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index a06711562f7..6da4af4d0b1 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -38,7 +38,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2017/05/19 v3.10 The Babel package] +%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -52,7 +52,7 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{switch.def}[2017/05/19 3.10 Babel switching mechanism] +\ProvidesFile{switch.def}[2017/06/26 3.11 Babel switching mechanism] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -73,8 +73,8 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\def\bbl@version{3.10} -\def\bbl@date{2017/05/19} +\def\bbl@version{3.11} +\def\bbl@date{2017/06/26} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -203,13 +203,29 @@ \ifnum\bbl@hymapsel=\@cclv\chardef\bbl@hymapsel4\relax\fi \foreign@language{#1}} \expandafter\let\csname endotherlanguage*\endcsname\relax +\let\bbl@beforeforeign\@empty \edef\foreignlanguage{% \noexpand\protect \expandafter\noexpand\csname foreignlanguage \endcsname} -\expandafter\def\csname foreignlanguage \endcsname#1#2{% +\expandafter\def\csname foreignlanguage \endcsname{% + \@ifstar\bbl@foreign@s\bbl@foreign@x} +\def\bbl@foreign@x#1#2{% \begingroup + \let\BabelText\@firstofone + \bbl@beforeforeign \foreign@language{#1}% - #2% + \bbl@usehooks{foreign}{}% + \BabelText{#2}% Now in horizontal mode! + \endgroup} +\def\bbl@foreign@s#1#2{% TODO - \shapemode, \@setpar, ?\@@par + \begingroup + {\par}% + \let\BabelText\@firstofone + \foreign@language{#1}% + \bbl@usehooks{foreign*}{}% + \bbl@dirparastext + \BabelText{#2}% Still in vertical mode! + {\par}% \endgroup} \def\foreign@language#1{% \edef\languagename{#1}% @@ -295,7 +311,7 @@ \LdfInit} \ifx\originalTeX\@undefined\let\originalTeX\@empty\fi \ifx\babel@beginsave\@undefined\let\babel@beginsave\relax\fi -\newcommand\setlocale{% +\providecommand\setlocale{% \bbl@error {Not yet available}% {Find an armchair, sit down and wait}} @@ -366,22 +382,6 @@ rebuild the format. Now I will use the patterns\\% preloaded for \bbl@nulllanguage\space instead}} \let\bbl@usehooks\@gobbletwo -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} \endinput %% %% End of file `switch.def'. |