diff options
| author | Karl Berry <karl@freefriends.org> | 2013-10-12 22:48:28 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-10-12 22:48:28 +0000 |
| commit | 246b5665edc2af75b55662b748e9ad83f3dac101 (patch) | |
| tree | ee34732675812d84422a6593f588e528e3d6fdf2 /Master/texmf-dist/tex/generic/babel | |
| parent | 0ec188e4bda5bbce1ca6bb39f8e121f7c47d0adf (diff) | |
babel (12oct13)
git-svn-id: svn://tug.org/texlive/trunk@31886 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel')
61 files changed, 522 insertions, 280 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/UKenglish.sty b/Master/texmf-dist/tex/generic/babel/UKenglish.sty index 7da72f23079..1c53215f88f 100644 --- a/Master/texmf-dist/tex/generic/babel/UKenglish.sty +++ b/Master/texmf-dist/tex/generic/babel/UKenglish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/USenglish.sty b/Master/texmf-dist/tex/generic/babel/USenglish.sty index 1a7cef61597..f007c6038ba 100644 --- a/Master/texmf-dist/tex/generic/babel/USenglish.sty +++ b/Master/texmf-dist/tex/generic/babel/USenglish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/afrikaans.sty b/Master/texmf-dist/tex/generic/babel/afrikaans.sty index 677aefaf5b0..2ceeab8f5b2 100644 --- a/Master/texmf-dist/tex/generic/babel/afrikaans.sty +++ b/Master/texmf-dist/tex/generic/babel/afrikaans.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/albanian.sty b/Master/texmf-dist/tex/generic/babel/albanian.sty index fa5e1a44c3e..79201f7f32a 100644 --- a/Master/texmf-dist/tex/generic/babel/albanian.sty +++ b/Master/texmf-dist/tex/generic/babel/albanian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/american.sty b/Master/texmf-dist/tex/generic/babel/american.sty index 21e6a01f55c..92025411802 100644 --- a/Master/texmf-dist/tex/generic/babel/american.sty +++ b/Master/texmf-dist/tex/generic/babel/american.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/austrian.sty b/Master/texmf-dist/tex/generic/babel/austrian.sty index 2c1d97af0a8..d8d58f7ce3d 100644 --- a/Master/texmf-dist/tex/generic/babel/austrian.sty +++ b/Master/texmf-dist/tex/generic/babel/austrian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index be6f32123e6..a58501aec4a 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.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}[2013/05/16 v3.9f The Babel package] +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -54,16 +54,13 @@ \ifx\ProvidesFile\@undefined \def\ProvidesFile#1[#2 #3 #4]{% \wlog{File: #1 #4 #3 <#2>}% - \let\ProvidesFile\@undefined - } + \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def} - [2013/05/16 v3.9f % - Babel common definitions] +\ProvidesFile{babel.def}[2013/10/10 3.9g Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi -\def\bbl@tempa{3.9f} +\def\bbl@tempa{3.9g}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi @@ -84,6 +81,16 @@ \ifx\bbl@afterlang\@undefined\let\bbl@afterlang\relax\fi \providecommand\AfterBabelLanguage[2]{} \def\bbl@csarg#1#2{\expandafter#1\csname bbl@#2\endcsname}% +\chardef\bbl@engine=% + \ifx\directlua\@undefined + \ifx\XeTeXinputencoding\@undefined + \z@ + \else + \tw@ + \fi + \else + \@ne + \fi \long\def\bbl@afterelse#1\else#2\fi{\fi#1} \long\def\bbl@afterfi#1\fi{\fi#1} \def\bbl@withactive#1#2{% @@ -145,6 +152,9 @@ \fi \fi \let\bbl@screset\@empty + \let\BabelStrings\bbl@opt@strings + \let\BabelOptions\@empty + \let\BabelLanguages\relax \ifx\originalTeX\@undefined \let\originalTeX\@empty \else @@ -434,9 +444,9 @@ \fi} \def\babelshorthand{\active@prefix\babelshorthand\bbl@putsh} \def\bbl@putsh#1{% - \@ifundefined{bbl@active@\string#1}% - {\bbl@putsh@i#1\@empty\@nnil}% - {\csname bbl@active@\string#1\endcsname}} + \@ifundefined{bbl@active@\string#1}% + {\bbl@putsh@i#1\@empty\@nnil}% + {\csname bbl@active@\string#1\endcsname}} \def\bbl@putsh@i#1#2\@nnil{% \csname\languagename @sh@\string#1@% \ifx\@empty#2\else\string#2@\fi\endcsname} @@ -831,6 +841,21 @@ \DeclareTextCompositeCommand{\"}{OT1}{O}{\bbl@umlauta{O}}% \DeclareTextCompositeCommand{\"}{OT1}{U}{\bbl@umlauta{U}}% } +\def\bbl@patchuclc{% + \let\bbl@patchuclc\relax + \@ifundefined{bbl@tolower}{% + \g@addto@macro\@uclclist{% + \reserved@b{\reserved@b\@gobble}% stops processing the list + \@ifundefined{\languagename @bbl@uclc}% and resumes it + {\reserved@a}% + {\csname\languagename @bbl@uclc\endcsname}% + {\bbl@tolower\@empty}{\bbl@toupper\@empty}}% + \gdef\bbl@tolower{\csname\languagename @bbl@lc\endcsname}% + \gdef\bbl@toupper{\csname\languagename @bbl@uc\endcsname}}{}}% +\def\bbl@aftercmds#1{% + \toks@\expandafter{\bbl@scafter#1}% + \xdef\bbl@scafter{\the\toks@}} +\def\bbl@toglobal#1{\global\let#1#1} \def\bbl@recatcode#1{% \@tempcnta="7F \def\bbl@tempa{% @@ -844,118 +869,128 @@ \def\StartBabelCommands{% \begingroup \bbl@recatcode{11}% - \def\bbl@scuse{% - \ifx\bbl@opt@strings\@nnil\def\bbl@opt@strings{generic}\fi}% - \def\UseStrings{\bbl@scuse\aftergroup\bbl@scuse}% \def\SetStringLoop{\afterassignment\bbl@sclp\def\bbl@templ####1}% \def\bbl@sclp##1{% - \count@\z@ % dangerous if a hook is used + \def\bbl@tempk{\@ne}% \@for\bbl@tempm:=##1\do{% - \advance\count@\@ne + \count@\bbl@tempk\relax % Because of stringprocess event \toks@\expandafter{\bbl@tempm}% \edef\bbl@tempn{% \expandafter\noexpand - \csname\bbl@templ{\romannumeral\count@}\endcsname% - {\the\toks@}}% + \csname\bbl@templ{\romannumeral\count@}\endcsname{\the\toks@}}% + \advance\count@\@ne + \edef\bbl@tempk{\the\count@}% \expandafter\SetString\bbl@tempn}}% - \def\SetCase{% - \@ifundefined{bbl@tolower}{% - \g@addto@macro\@uclclist{% - \reserved@b{\reserved@b\@gobble}% stops processing the list - \@ifundefined{\languagename @bbl@uclc}% and resumes it - {\reserved@a}% - {\csname\languagename @bbl@uclc\endcsname}% - {\bbl@tolower\@empty}{\bbl@toupper\@empty}}% - \gdef\bbl@tolower{\csname\languagename @bbl@lc\endcsname}% - \gdef\bbl@toupper{\csname\languagename @bbl@uc\endcsname}}{}% - \let\SetCase\bbl@setcase - \SetCase}% - \def\bbl@provstring##1{% - \@ifundefined{\expandafter\@gobble\string##1}{\gdef##1}\@gobble}% - \def\bbl@dftstring##1##2{% - \@dec@text@cmd\gdef##1?{##2}% - \global\let##1##1}% - \def\bbl@encstring##1##2{% - \bbl@for\bbl@tempc\bbl@sc@fontenc{% - \@ifundefined{T@\bbl@tempc}% - \@empty - {\@dec@text@cmd\gdef##1\bbl@tempc{##2}% - \global\let##1##1}}}% + \newcommand\SetCase[3][]{% + \bbl@patchuclc + \bbl@forlang\bbl@tempa{% + \expandafter\bbl@stringdef + \csname\bbl@tempa @bbl@uclc\endcsname{\reserved@a##1}% + \expandafter\bbl@stringdef + \csname\bbl@tempa @bbl@uc\endcsname{##2}% + \expandafter\bbl@stringdef + \csname\bbl@tempa @bbl@lc\endcsname{##3}}}% + \def\bbl@provstring##1##2{% + \providecommand##1{##2}% + \bbl@toglobal##1}% + \global\let\bbl@scafter\@empty \let\StartBabelCommands\bbl@startcmds + \ifx\BabelLanguages\relax + \let\BabelLanguages\CurrentOption + \fi \begingroup \let\bbl@screset\@nnil % local flag - disable 1st stopcommands \StartBabelCommands} -\def\bbl@startcmds#1#2{% +\def\bbl@startcmds{% \ifx\bbl@screset\@nnil\else \bbl@usehooks{stopcommands}{}% \fi \endgroup \begingroup + \@ifstar + {\ifx\bbl@opt@strings\@nnil + \let\bbl@opt@strings\BabelStringsDefault + \fi + \bbl@startcmds@i}% + \bbl@startcmds@i} +\def\bbl@startcmds@i#1#2{% \edef\bbl@L{\zap@space#1 \@empty}% \edef\bbl@G{\zap@space#2 \@empty}% - \let\bbl@sc@charset\space - \let\bbl@sc@fontenc\space + \bbl@startcmds@ii} +\newcommand\bbl@startcmds@ii[1][\@empty]{% \let\SetString\@gobbletwo \let\bbl@stringdef\@gobbletwo - \bbl@startcmds@i} -\newcommand\bbl@startcmds@i[1][\@empty]{% + \let\AfterBabelCommands\@gobble \ifx\@empty#1% \def\bbl@sc@label{generic}% - \bbl@scswitch{% - \ifx\bbl@opt@strings\@nnil - \let\bbl@stringdef\bbl@dftstring - \else\ifx\bbl@opt@strings\relax - \let\SetString\bbl@setstring - \let\bbl@stringdef\bbl@dftstring - \else - \let\SetString\bbl@setstring - \let\bbl@stringdef\bbl@provstring - \fi\fi}% - \@expandtwoargs - \bbl@usehooks{defaultcommands}{}% + \def\bbl@encstring##1##2{% + \ProvideTextCommandDefault##1{##2}% + \bbl@toglobal##1% + \expandafter\bbl@toglobal\csname\string?\string##1\endcsname}% + \let\bbl@sctest\in@true \else + \let\bbl@sc@charset\space % <- zapped below + \let\bbl@sc@fontenc\space % <- " " \def\bbl@tempa##1=##2\@nil{% \bbl@csarg\edef{sc@\zap@space##1 \@empty}{##2 }}% \bbl@for\bbl@tempb{label=#1}{\expandafter\bbl@tempa\bbl@tempb\@nil}% - \def\bbl@tempa##1 ##2{% + \def\bbl@tempa##1 ##2{% space -> comma ##1% \ifx\@empty##2\else\ifx,##1,\else,\fi\bbl@afterfi\bbl@tempa##2\fi}% \edef\bbl@sc@fontenc{\expandafter\bbl@tempa\bbl@sc@fontenc\@empty}% \edef\bbl@sc@label{\expandafter\zap@space\bbl@sc@label\@empty}% \edef\bbl@sc@charset{\expandafter\zap@space\bbl@sc@charset\@empty}% - \bbl@scswitch{% - \ifx\bbl@opt@strings\@nnil - \let\bbl@stringdef\bbl@encstring - \else\ifx\bbl@opt@strings\relax - \let\SetString\bbl@setstring - \let\bbl@stringdef\bbl@encstring - \else + \def\bbl@encstring##1##2{% + \bbl@for\bbl@tempc\bbl@sc@fontenc{% + \@ifundefined{T@\bbl@tempc}% + {}% + {\ProvideTextCommand##1\bbl@tempc{##2}% + \bbl@toglobal##1% + \expandafter + \bbl@toglobal\csname\bbl@tempc\string##1\endcsname}}}% + \def\bbl@sctest{% \@expandtwoargs - \in@{,\bbl@opt@strings,}{,\bbl@sc@label,\bbl@sc@fontenc,}% - \ifin@ - \let\SetString\bbl@setstring - \let\bbl@stringdef\bbl@provstring - \fi\fi\fi}% + \in@{,\bbl@opt@strings,}{,\bbl@sc@label,\bbl@sc@fontenc,}}% + \fi + \bbl@scswitch{% + \ifx\bbl@opt@strings\@nnil % ie, no strings + \let\bbl@stringdef\bbl@encstring % for \SetCase + \else\ifx\bbl@opt@strings\relax % ie, strings with no value + \let\AfterBabelCommands\bbl@aftercmds + \let\SetString\bbl@setstring + \let\bbl@stringdef\bbl@encstring + \else % ie, strings=value + \bbl@sctest + \ifin@ + \let\AfterBabelCommands\bbl@aftercmds + \let\SetString\bbl@setstring + \let\bbl@stringdef\bbl@provstring + \fi\fi\fi}% + \ifx\@empty#1% + \@expandtwoargs + \bbl@usehooks{defaultcommands}{}% + \else \@expandtwoargs \bbl@usehooks{encodedcommands}{{\bbl@sc@charset}{\bbl@sc@fontenc}}% \fi} +\def\bbl@forlang#1#2{% + \bbl@for#1\bbl@L{% + \@expandtwoargs\in@{,#1,}{,\BabelLanguages,}% + \ifin@#2\fi}} \def\bbl@scswitch#1{% - \@expandtwoargs\in@{,\CurrentOption,}{,\bbl@L,}% - \ifin@ - \let\bbl@L\CurrentOption - #1\relax - \bbl@scswitch@i + #1\relax + \bbl@scswitch@i + \bbl@forlang\bbl@tempa{% \ifx\bbl@G\@empty\else \ifx\SetString\@gobbletwo\else - \edef\bbl@GL{\bbl@G\bbl@L}% + \edef\bbl@GL{\bbl@G\bbl@tempa}% \@expandtwoargs\in@{,\bbl@GL,}{,\bbl@screset,}% \ifin@\else \global\expandafter\let\csname\bbl@GL\endcsname\@undefined \xdef\bbl@screset{\bbl@screset,\bbl@GL}% \fi \fi - \fi - \fi} + \fi}} \def\bbl@scswitch@i{% \ifx\bbl@G\@empty \def\SetString##1##2{% @@ -963,15 +998,18 @@ {You must assign strings to some category, typically\\% captions or extras, but you set none}}% \fi} -\AtEndOfPackage{\def\bbl@scswitch#1{#1\relax\bbl@scswitch@i}} +\AtEndOfPackage{% + \def\bbl@scswitch#1{#1\relax\bbl@scswitch@i}% + \def\bbl@forlang#1#2{\bbl@for#1\bbl@L{\@ifundefined{date#1}{}{#2}}}} \@onlypreamble\EndBabelCommands \def\EndBabelCommands{% \bbl@usehooks{stopcommands}{}% \endgroup - \endgroup} + \endgroup + \bbl@scafter} \def\bbl@scset#1#2{\def#1{#2}} \def\bbl@setstring#1#2{% - \bbl@for\bbl@tempa\bbl@L{% + \bbl@forlang\bbl@tempa{% \edef\bbl@LC{\bbl@tempa\expandafter\@gobble\string#1}% \@ifundefined{\bbl@LC}% eg, \germanchaptername {\global\expandafter @@ -982,14 +1020,40 @@ \bbl@usehooks{stringprocess}{}% \expandafter\bbl@stringdef \csname\bbl@LC\expandafter\endcsname\expandafter{\BabelString}}} -\newcommand\bbl@setcase[3][]{% - \bbl@for\bbl@tempa\bbl@L{% +\def\SetHyphenMap#1{% + \bbl@forlang\bbl@tempa{% \expandafter\bbl@stringdef - \csname\bbl@tempa @bbl@uclc\endcsname{\reserved@a#1}% - \expandafter\bbl@stringdef - \csname\bbl@tempa @bbl@uc\endcsname{#2}% - \expandafter\bbl@stringdef - \csname\bbl@tempa @bbl@lc\endcsname{#3}}} + \csname\bbl@tempa @bbl@hyphenmap\endcsname{#1}}} +\AtEndOfPackage{% + \ifx\bbl@hymapopt\@undefined + \@expandtwoargs\in@{,}{\bbl@language@opts}% + \chardef\bbl@hymapopt\ifin@4\else\@ne\fi + \fi} +\newcommand\BabelLower[2]{% one to one. + \ifnum\lccode#1=#2\else + \babel@savevariable{\lccode#1}% + \lccode#1=#2\relax + \fi} +\newcommand\BabelLowerMM[4]{% many-to-many + \@tempcnta=#1\relax + \@tempcntb=#4\relax + \def\bbl@tempa{% + \ifnum\@tempcnta>#2\else + \@expandtwoargs\BabelLower{\the\@tempcnta}{\the\@tempcntb}% + \advance\@tempcnta#3\relax + \advance\@tempcntb#3\relax + \expandafter\bbl@tempa + \fi}% + \bbl@tempa} +\newcommand\BabelLowerMO[4]{% many-to-one + \@tempcnta=#1\relax + \def\bbl@tempa{% + \ifnum\@tempcnta>#2\else + \@expandtwoargs\BabelLower{\the\@tempcnta}{#4}% + \advance\@tempcnta#3 + \expandafter\bbl@tempa + \fi}% + \bbl@tempa} \def\AddBabelHook#1#2{% \@ifundefined{bbl@hk@#1}{\EnableBabelHook{#1}}{}% \def\bbl@tempa##1,#2=##2,##3\@empty{\def\bbl@tempb{##2}}% @@ -1010,12 +1074,10 @@ adddialect=2,patterns=2,defaultcommands=0,encodedcommands=2,write=0,% beforeextras=0,afterextras=0,stopcommands=0,stringprocess=0,% hyphenation=2} -\ifx\directlua\@undefined - \ifx\XeTeXinputencoding\@undefined\else - \input xebabel.def - \fi -\else +\ifcase\bbl@engine\or \input luababel.def +\or + \input xebabel.def \fi {\def\format{lplain} \ifx\fmtname\format @@ -1084,7 +1146,7 @@ }{}} \bbl@redefine\nocite#1{% \@safe@activestrue\org@nocite{#1}\@safe@activesfalse} - \bbl@redefine\bibcite{% + \bbl@redefine\bibcite{% \bbl@cite@choice \bibcite} \def\bbl@bibcite#1#2{% diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index f479ee0eef4..26a28eaeac6 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -39,7 +39,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[2005/12/01] %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package] +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -48,15 +48,13 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\ProvidesPackage{babel} - [2013/05/16 v3.9f % - The Babel package] +\ProvidesPackage{babel}[2013/10/10 3.9g The Babel package] \@ifpackagewith{babel}{debug} - {\let\bbl@tempa\relax} - {\def\bbl@tempa{3.9f}}% + {\input switch.def\relax} + {\def\bbl@tempa{3.9g}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax -\fi +\fi} \def\bbl@for#1#2#3{\@for#1:=#2\do{\ifx#1\@empty\else#3\fi}} \def\bbl@add#1#2{% \@ifundefined{\expandafter\@gobble\string#1}% @@ -103,12 +101,17 @@ \DeclareOption{shorthands=off}{\bbl@tempa shorthands=\bbl@tempa} \DeclareOption{strings}{\def\bbl@opt@strings{\BabelStringsDefault}} \DeclareOption{strings=encoded}{\let\bbl@opt@strings\relax} +\def\BabelStringsDefault{generic} \DeclareOption{safe=none}{\let\bbl@opt@safe\@empty} \DeclareOption{safe=bib}{\def\bbl@opt@safe{B}} \DeclareOption{safe=ref}{\def\bbl@opt@safe{R}} \DeclareOption{math=active}{} \DeclareOption{math=normal}{\def\bbl@mathnormal{\noexpand\textormath}} -\def\BabelStringsDefault{generic} +\DeclareOption{hyphenmap=off}{\chardef\bbl@hymapopt\z@} +\DeclareOption{hyphenmap=first}{\chardef\bbl@hymapopt\@ne} +\DeclareOption{hyphenmap=select}{\chardef\bbl@hymapopt\tw@} +\DeclareOption{hyphenmap=other}{\chardef\bbl@hymapopt\thr@@} +\DeclareOption{hyphenmap=other*}{\chardef\bbl@hymapopt4\relax} \let\bbl@opt@shorthands\@nnil \let\bbl@opt@config\@nnil \let\bbl@opt@main\@nnil @@ -205,11 +208,11 @@ \expandafter\let\expandafter\BabelModifiers \csname bbl@mod@\CurrentOption\endcsname}% {\bbl@error{% - Unknow option `\CurrentOption'. Either you misspelled it\\% + Unknown option `\CurrentOption'. Either you misspelled it\\% or the language definition file \CurrentOption.ldf was not found}{% - Valid options are: shorthands=..., KeepShorthandsActive,\\% + Valid options are: shorthands=, KeepShorthandsActive,\\% activeacute, activegrave, noconfigs, safe=, main=, math=\\% - headfoot=, strings=, config=, or a language name.}}} + headfoot=, strings=, config=, hyphenmap=, or a language name.}}} \DeclareOption{acadian}{\bbl@load@language{frenchb}} \DeclareOption{afrikaans}{\bbl@load@language{dutch}} \DeclareOption{american}{\bbl@load@language{english}} diff --git a/Master/texmf-dist/tex/generic/babel/bahasa.sty b/Master/texmf-dist/tex/generic/babel/bahasa.sty index 556237aacd0..aff73c40346 100644 --- a/Master/texmf-dist/tex/generic/babel/bahasa.sty +++ b/Master/texmf-dist/tex/generic/babel/bahasa.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/bahasam.sty b/Master/texmf-dist/tex/generic/babel/bahasam.sty index 4fde909d21a..70ec92279e5 100644 --- a/Master/texmf-dist/tex/generic/babel/bahasam.sty +++ b/Master/texmf-dist/tex/generic/babel/bahasam.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/basque.sty b/Master/texmf-dist/tex/generic/babel/basque.sty index 58cf1784e79..7d1e49e0bb2 100644 --- a/Master/texmf-dist/tex/generic/babel/basque.sty +++ b/Master/texmf-dist/tex/generic/babel/basque.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex index 4c03de82a1a..29f4bca9338 100644 --- a/Master/texmf-dist/tex/generic/babel/blplain.tex +++ b/Master/texmf-dist/tex/generic/babel/blplain.tex @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bbplain.dtx (with options: `blplain') +%% babel.dtx (with options: `blplain') %% This is a generated file. %% %% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. @@ -37,10 +37,12 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% File `bbplain.dtx' -%% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 -%% by Johannes Braams +%% File 'babel.dtx' +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] +%% Babel package for LaTeX2e. +%% Copyright (C) 1989 -- 2008 by Johannes Braams, +%% TeXniek +%% all rights reserved. %% Copyright (C) 2013 by Johannes Braams %% TeXniek %% by Javier Bezos @@ -60,6 +62,22 @@ \fi \a lplain.tex \def\fmtname{babel-lplain} +%% +%% \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 `blplain.tex'. diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex index 982620aa760..2e53f89e0f1 100644 --- a/Master/texmf-dist/tex/generic/babel/bplain.tex +++ b/Master/texmf-dist/tex/generic/babel/bplain.tex @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bbplain.dtx (with options: `bplain') +%% babel.dtx (with options: `bplain') %% This is a generated file. %% %% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. @@ -37,10 +37,12 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% File `bbplain.dtx' -%% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 -%% by Johannes Braams +%% File 'babel.dtx' +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] +%% Babel package for LaTeX2e. +%% Copyright (C) 1989 -- 2008 by Johannes Braams, +%% TeXniek +%% all rights reserved. %% Copyright (C) 2013 by Johannes Braams %% TeXniek %% by Javier Bezos @@ -60,6 +62,22 @@ \fi \a plain.tex \def\fmtname{babel-plain} +%% +%% \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 `bplain.tex'. diff --git a/Master/texmf-dist/tex/generic/babel/breton.sty b/Master/texmf-dist/tex/generic/babel/breton.sty index 8c9cf8cf920..186085f5834 100644 --- a/Master/texmf-dist/tex/generic/babel/breton.sty +++ b/Master/texmf-dist/tex/generic/babel/breton.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/british.sty b/Master/texmf-dist/tex/generic/babel/british.sty index 6e89fd173cf..8573836d1e6 100644 --- a/Master/texmf-dist/tex/generic/babel/british.sty +++ b/Master/texmf-dist/tex/generic/babel/british.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/bulgarian.sty b/Master/texmf-dist/tex/generic/babel/bulgarian.sty index 01a88fccdbb..45c1e62efb5 100644 --- a/Master/texmf-dist/tex/generic/babel/bulgarian.sty +++ b/Master/texmf-dist/tex/generic/babel/bulgarian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/catalan.sty b/Master/texmf-dist/tex/generic/babel/catalan.sty index a4f15610c4c..56becc08273 100644 --- a/Master/texmf-dist/tex/generic/babel/catalan.sty +++ b/Master/texmf-dist/tex/generic/babel/catalan.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/croatian.sty b/Master/texmf-dist/tex/generic/babel/croatian.sty index 7cdf2051db8..b0eabf5357f 100644 --- a/Master/texmf-dist/tex/generic/babel/croatian.sty +++ b/Master/texmf-dist/tex/generic/babel/croatian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/czech.sty b/Master/texmf-dist/tex/generic/babel/czech.sty index d9ce4b85624..bf0de5730d9 100644 --- a/Master/texmf-dist/tex/generic/babel/czech.sty +++ b/Master/texmf-dist/tex/generic/babel/czech.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/danish.sty b/Master/texmf-dist/tex/generic/babel/danish.sty index e8ccb844ebc..af500ce9f77 100644 --- a/Master/texmf-dist/tex/generic/babel/danish.sty +++ b/Master/texmf-dist/tex/generic/babel/danish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/dutch.sty b/Master/texmf-dist/tex/generic/babel/dutch.sty index 2e4c72ddcb8..f9127d3c0e9 100644 --- a/Master/texmf-dist/tex/generic/babel/dutch.sty +++ b/Master/texmf-dist/tex/generic/babel/dutch.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/english.sty b/Master/texmf-dist/tex/generic/babel/english.sty index 3109bdd2d4a..f25c94d414d 100644 --- a/Master/texmf-dist/tex/generic/babel/english.sty +++ b/Master/texmf-dist/tex/generic/babel/english.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/esperanto.sty b/Master/texmf-dist/tex/generic/babel/esperanto.sty index 31743fb5be7..ee3bd449df2 100644 --- a/Master/texmf-dist/tex/generic/babel/esperanto.sty +++ b/Master/texmf-dist/tex/generic/babel/esperanto.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/estonian.sty b/Master/texmf-dist/tex/generic/babel/estonian.sty index 3b7eea14d45..6c354c5f841 100644 --- a/Master/texmf-dist/tex/generic/babel/estonian.sty +++ b/Master/texmf-dist/tex/generic/babel/estonian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/finnish.sty b/Master/texmf-dist/tex/generic/babel/finnish.sty index d00dbe9eddc..f0b0d92a503 100644 --- a/Master/texmf-dist/tex/generic/babel/finnish.sty +++ b/Master/texmf-dist/tex/generic/babel/finnish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/francais.sty b/Master/texmf-dist/tex/generic/babel/francais.sty index 4f848e4d963..512aee4f296 100644 --- a/Master/texmf-dist/tex/generic/babel/francais.sty +++ b/Master/texmf-dist/tex/generic/babel/francais.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/galician.sty b/Master/texmf-dist/tex/generic/babel/galician.sty index 73c95d310ed..05db3ae6a29 100644 --- a/Master/texmf-dist/tex/generic/babel/galician.sty +++ b/Master/texmf-dist/tex/generic/babel/galician.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/germanb.sty b/Master/texmf-dist/tex/generic/babel/germanb.sty index 9880a670669..ebe0495f471 100644 --- a/Master/texmf-dist/tex/generic/babel/germanb.sty +++ b/Master/texmf-dist/tex/generic/babel/germanb.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/greek.sty b/Master/texmf-dist/tex/generic/babel/greek.sty index 0cdf1ac7ae7..911ef73c9bb 100644 --- a/Master/texmf-dist/tex/generic/babel/greek.sty +++ b/Master/texmf-dist/tex/generic/babel/greek.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/hebrew.sty b/Master/texmf-dist/tex/generic/babel/hebrew.sty index 45bb222d6eb..d4023386a06 100644 --- a/Master/texmf-dist/tex/generic/babel/hebrew.sty +++ b/Master/texmf-dist/tex/generic/babel/hebrew.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index d8cb2b5a720..6d462814d0a 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -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}[2013/05/16 v3.9f The Babel package] +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -47,19 +47,24 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\xdef\bbl@format{\jobname} \ifx\ProvidesFile\@undefined \def\ProvidesFile#1[#2 #3 #4]{% \wlog{File: #1 #4 #3 <#2>}% - \let\ProvidesFile\@undefined - } + \let\ProvidesFile\@undefined} \fi -\ProvidesFile{hyphen.cfg} - [2013/05/16 v3.9f % - Babel language switching mechanism] +\ProvidesFile{hyphen.cfg}[2013/10/10 3.9g Babel hyphens] +\xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined + \def\@empty{} \let\orig@dump\dump - \input plain.def\relax + \def\dump{% + \ifx\@ztryfc\@undefined + \else + \toks0=\expandafter{\@preamblecmds}% + \edef\@preamblecmds{\noexpand\@begindocumenthook\the\toks0}% + \def\@begindocumenthook{}% + \fi + \let\dump\orig@dump\let\orig@dump\@undefined\dump} \fi \ifx\language\@undefined \csname newcount\endcsname\language @@ -78,7 +83,7 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\toks8{Babel <3.9f> and hyphenation patterns for }% +\toks8{Babel <3.9g> and hyphenation patterns for }% \def\process@line#1#2 #3 #4 {% \ifx=#1% \process@synonym{#2}% @@ -191,13 +196,16 @@ \errhelp{language.dat loads no language, only synonyms} \errmessage{Orphan language synonym} \fi -\ifx\addto@hook\@undefined -\else - \edef\bbl@tempa{% - \noexpand\typeout{\the\toks8 \the\last@language\space languages - loaded.}}% - \expandafter\addto@hook\expandafter\everyjob\expandafter{\bbl@tempa} -\fi +\edef\bbl@tempa{% + \everyjob{% + \the\everyjob + \ifx\typeout\@undefined + \immediate\write16% + \else + \noexpand\typeout + \fi + {\the\toks8 \the\last@language\space languages loaded.}}} +\bbl@tempa \let\bbl@line\@undefined \let\process@line\@undefined \let\process@synonym\@undefined diff --git a/Master/texmf-dist/tex/generic/babel/icelandic.sty b/Master/texmf-dist/tex/generic/babel/icelandic.sty index a333115ac6c..951cbb8a361 100644 --- a/Master/texmf-dist/tex/generic/babel/icelandic.sty +++ b/Master/texmf-dist/tex/generic/babel/icelandic.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/interlingua.sty b/Master/texmf-dist/tex/generic/babel/interlingua.sty index 4be3bc71758..dbc2edc975f 100644 --- a/Master/texmf-dist/tex/generic/babel/interlingua.sty +++ b/Master/texmf-dist/tex/generic/babel/interlingua.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/irish.sty b/Master/texmf-dist/tex/generic/babel/irish.sty index 22a350213e7..fd9787b5580 100644 --- a/Master/texmf-dist/tex/generic/babel/irish.sty +++ b/Master/texmf-dist/tex/generic/babel/irish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/italian.sty b/Master/texmf-dist/tex/generic/babel/italian.sty index b33f346d483..89034e9a777 100644 --- a/Master/texmf-dist/tex/generic/babel/italian.sty +++ b/Master/texmf-dist/tex/generic/babel/italian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/latin.sty b/Master/texmf-dist/tex/generic/babel/latin.sty index fcdf667135d..cd9fd9358c1 100644 --- a/Master/texmf-dist/tex/generic/babel/latin.sty +++ b/Master/texmf-dist/tex/generic/babel/latin.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/lsorbian.sty b/Master/texmf-dist/tex/generic/babel/lsorbian.sty index b0707008b43..56942465fa3 100644 --- a/Master/texmf-dist/tex/generic/babel/lsorbian.sty +++ b/Master/texmf-dist/tex/generic/babel/lsorbian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index ba35d0551bf..c5857c196fc 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -108,6 +108,38 @@ \input #1\relax \fi \directlua{processnow = nil}} +\def\babelFSstore#1{% + \bbl@for\bbl@tempa{#1}{% + \edef\bbl@tempb{\noexpand\bbl@FSstore{\bbl@tempa}} + \bbl@tempb{rm}\rmdefault\bbl@save@rmdefault + \bbl@tempb{sf}\sfdefault\bbl@save@sfdefault + \bbl@tempb{tt}\ttdefault\bbl@save@ttdefault}} +\def\bbl@FSstore#1#2#3#4{% + \bbl@csarg\edef{#2default#1}{#3}% + \expandafter\addto\csname extras#1\endcsname{% + \let#4#3% + \ifx#3\f@family + \edef#3{\csname bbl@#2default#1\endcsname}% + \fontfamily{#3}\selectfont + \else + \edef#3{\csname bbl@#2default#1\endcsname}% + \fi}% + \expandafter\addto\csname noextras#1\endcsname{% + \ifx#3\f@family + \fontfamily{#4}\selectfont + \fi + \let#3#4}} +\let\bbl@langfeatures\@empty +\def\babelFSfeatures{% + \let\bbl@ori@fontspec\fontspec + \renewcommand\fontspec[1][]{% + \bbl@ori@fontspec[\bbl@langfeatures##1]} + \let\babelFSfeatures\bbl@FSfeatures + \babelFSfeatures} +\def\bbl@FSfeatures#1#2{% + \expandafter\addto\csname extras#1\endcsname{% + \babel@save\bbl@langfeatures + \edef\bbl@langfeatures{#2,}}} \endinput %% %% End of file `luababel.def'. diff --git a/Master/texmf-dist/tex/generic/babel/magyar.sty b/Master/texmf-dist/tex/generic/babel/magyar.sty index 73fd232d227..5242bae779e 100644 --- a/Master/texmf-dist/tex/generic/babel/magyar.sty +++ b/Master/texmf-dist/tex/generic/babel/magyar.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/naustrian.sty b/Master/texmf-dist/tex/generic/babel/naustrian.sty index d1c94a3c242..f96dce47c32 100644 --- a/Master/texmf-dist/tex/generic/babel/naustrian.sty +++ b/Master/texmf-dist/tex/generic/babel/naustrian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/ngermanb.sty b/Master/texmf-dist/tex/generic/babel/ngermanb.sty index ed372645c58..d7b56710723 100644 --- a/Master/texmf-dist/tex/generic/babel/ngermanb.sty +++ b/Master/texmf-dist/tex/generic/babel/ngermanb.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index 2796adeedb7..55908c7ab78 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -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}[2013/05/16 v3.9f The Babel package] +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -47,9 +47,7 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\ProvidesLanguage{nil} - [2013/05/16 v3.9f % - Nil language] +\ProvidesLanguage{nil}[2013/10/10 3.9g Nil language] \LdfInit{nil}{datenil} \ifx\l@nohyphenation\@undefined \@nopatterns{nil} diff --git a/Master/texmf-dist/tex/generic/babel/norsk.sty b/Master/texmf-dist/tex/generic/babel/norsk.sty index d201d8a07bb..69d39fb243d 100644 --- a/Master/texmf-dist/tex/generic/babel/norsk.sty +++ b/Master/texmf-dist/tex/generic/babel/norsk.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def index e593ec7448e..4c97dc9b692 100644 --- a/Master/texmf-dist/tex/generic/babel/plain.def +++ b/Master/texmf-dist/tex/generic/babel/plain.def @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bbplain.dtx (with options: `code') +%% babel.dtx (with options: `plain') %% This is a generated file. %% %% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. @@ -37,28 +37,17 @@ %% The list of derived (unpacked) files belonging to the distribution %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. -%% File `bbplain.dtx' -%% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2008 -%% by Johannes Braams +%% File 'babel.dtx' +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] +%% Babel package for LaTeX2e. +%% Copyright (C) 1989 -- 2008 by Johannes Braams, +%% TeXniek +%% all rights reserved. %% Copyright (C) 2013 by Johannes Braams %% TeXniek %% by Javier Bezos %% all rights reserved. \def\@empty{} -\ifx\orig@dump\@undefined\else - \def\dump{% - \ifx\@ztryfc\@undefined - \else - \toks0=\expandafter{\@preamblecmds} - \edef\@preamblecmds{\noexpand\@begindocumenthook\the\toks0} - \def\@begindocumenthook{} - \fi - \everyjob\expandafter{\the\everyjob% - \immediate\write16{\the\toks8 loaded.}}% - \let\dump\orig@dump\let\orig@dump\@undefined\dump} - \expandafter\endinput -\fi \def\loadlocalcfg#1{% \openin0#1.cfg \ifeof0 @@ -190,8 +179,7 @@ \let\bbl@tempa\@empty \fi \bbl@tempa -\def\@ifpackagewith#1#2#3#4{% - #3} +\def\@ifpackagewith#1#2#3#4{#3} \def\@ifl@aded#1#2#3#4{} \ifx\@tempcnta\@undefined \csname newcount\endcsname\@tempcnta\relax @@ -200,7 +188,7 @@ \csname newcount\endcsname\@tempcntb\relax \fi \ifx\bye\@undefined - \advance\count10 by -2\relax + \advance\count10 by -2\relax \fi \ifx\@ifnextchar\@undefined \def\@ifnextchar#1#2#3{% @@ -366,6 +354,22 @@ \ifx\scriptsize\@undefined \let\scriptsize\sevenrm \fi +%% +%% \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 `plain.def'. diff --git a/Master/texmf-dist/tex/generic/babel/polish.sty b/Master/texmf-dist/tex/generic/babel/polish.sty index 3d63fe60099..e853c0bb062 100644 --- a/Master/texmf-dist/tex/generic/babel/polish.sty +++ b/Master/texmf-dist/tex/generic/babel/polish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/portuges.sty b/Master/texmf-dist/tex/generic/babel/portuges.sty index 2aa67457fe8..2fce7e4122a 100644 --- a/Master/texmf-dist/tex/generic/babel/portuges.sty +++ b/Master/texmf-dist/tex/generic/babel/portuges.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/romanian.sty b/Master/texmf-dist/tex/generic/babel/romanian.sty index d2b1e670cc1..f91b4b1116d 100644 --- a/Master/texmf-dist/tex/generic/babel/romanian.sty +++ b/Master/texmf-dist/tex/generic/babel/romanian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/russianb.sty b/Master/texmf-dist/tex/generic/babel/russianb.sty index 22f61e609c7..b01b0e76764 100644 --- a/Master/texmf-dist/tex/generic/babel/russianb.sty +++ b/Master/texmf-dist/tex/generic/babel/russianb.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/samin.sty b/Master/texmf-dist/tex/generic/babel/samin.sty index 339c1fc89df..6acc8c8abb7 100644 --- a/Master/texmf-dist/tex/generic/babel/samin.sty +++ b/Master/texmf-dist/tex/generic/babel/samin.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/scottish.sty b/Master/texmf-dist/tex/generic/babel/scottish.sty index 08f8ca2939a..29a0715380e 100644 --- a/Master/texmf-dist/tex/generic/babel/scottish.sty +++ b/Master/texmf-dist/tex/generic/babel/scottish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/serbian.sty b/Master/texmf-dist/tex/generic/babel/serbian.sty index db6e4afd98d..88b9d7a8207 100644 --- a/Master/texmf-dist/tex/generic/babel/serbian.sty +++ b/Master/texmf-dist/tex/generic/babel/serbian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/slovak.sty b/Master/texmf-dist/tex/generic/babel/slovak.sty index 48928613bcc..c4458ab594e 100644 --- a/Master/texmf-dist/tex/generic/babel/slovak.sty +++ b/Master/texmf-dist/tex/generic/babel/slovak.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/slovene.sty b/Master/texmf-dist/tex/generic/babel/slovene.sty index 9cf43eca4b4..c1017f6fa43 100644 --- a/Master/texmf-dist/tex/generic/babel/slovene.sty +++ b/Master/texmf-dist/tex/generic/babel/slovene.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/spanish.sty b/Master/texmf-dist/tex/generic/babel/spanish.sty index 84dbb260f44..a859993135d 100644 --- a/Master/texmf-dist/tex/generic/babel/spanish.sty +++ b/Master/texmf-dist/tex/generic/babel/spanish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/swedish.sty b/Master/texmf-dist/tex/generic/babel/swedish.sty index b3e1577dfd6..0ec86e1305c 100644 --- a/Master/texmf-dist/tex/generic/babel/swedish.sty +++ b/Master/texmf-dist/tex/generic/babel/swedish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index b56bd93ef6e..4c29ac1367d 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}[2013/05/16 v3.9f The Babel package] +%%\ProvidesFile{babel.dtx}[2013/10/10 v3.9g The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989 -- 2008 by Johannes Braams, %% TeXniek @@ -47,31 +47,12 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\def\bbl@version{3.9f} -\def\bbl@date{2013/05/16} \ifx\ProvidesFile\@undefined \def\ProvidesFile#1[#2 #3 #4]{% \wlog{File: #1 #4 #3 <#2>}% - \let\ProvidesFile\@undefined - } - \def\ProvidesLanguage#1[#2 #3 #4]{% - \wlog{Language: #1 #4 #3 <#2>}% - } -\else - \def\ProvidesLanguage#1{% - \begingroup - \catcode`\ 10 % - \@makeother\/% - \@ifnextchar[%] - {\@provideslanguage{#1}}{\@provideslanguage{#1}[]}} - \def\@provideslanguage#1[#2]{% - \wlog{Language: #1 #2}% - \expandafter\xdef\csname ver@#1.ldf\endcsname{#2}% - \endgroup} + \let\ProvidesFile\@undefined} \fi -\ProvidesFile{switch.def} - [2013/05/16 v3.9f % - Babel language switching mechanism] +\ProvidesFile{switch.def}[2013/10/10 3.9g Babel switching mechanism] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi @@ -92,6 +73,8 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi +\def\bbl@version{3.9g} +\def\bbl@date{2013/10/10} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% @@ -139,6 +122,7 @@ \expandafter\bbl@pop@lang\bbl@language@stack-\bbl@language@stack \expandafter\bbl@set@language\expandafter{\languagename}} \expandafter\def\csname selectlanguage \endcsname#1{% + \ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\tw@\fi \bbl@push@language \aftergroup\bbl@pop@language \bbl@set@language{#1}} @@ -157,6 +141,7 @@ \fi \fi} \def\select@language#1{% + \ifnum\bbl@hymapsel=\@cclv\chardef\bbl@hymapsel4\relax\fi \edef\languagename{#1}% \bbl@fixname\languagename \bbl@iflanguage\languagename{% @@ -188,6 +173,18 @@ \bbl@usehooks{beforeextras}{}% \csname extras#1\endcsname\relax \bbl@usehooks{afterextras}{}% + \ifcase\bbl@hymapopt\or + \renewcommand\BabelLower[2]{\lccode##1=##2\relax}% + \ifnum\bbl@hymapsel>4\else + \csname\languagename @bbl@hyphenmap\endcsname + \fi + \chardef\bbl@hymapopt\z@ + \else + \ifnum\bbl@hymapsel>\bbl@hymapopt\else + \csname\languagename @bbl@hyphenmap\endcsname + \fi + \fi + \global\let\bbl@hymapsel\@cclv \bbl@patterns{#1}% \babel@savevariable\lefthyphenmin \babel@savevariable\righthyphenmin @@ -208,11 +205,13 @@ \expandafter\@secondoftwo \fi} \long\def\otherlanguage#1{% + \ifnum\bbl@hymapsel=\@cclv\let\bbl@hymapsel\thr@@\fi \csname selectlanguage \endcsname{#1}% \ignorespaces} \long\def\endotherlanguage{% \global\@ignoretrue\ignorespaces} \expandafter\def\csname otherlanguage*\endcsname#1{% + \ifnum\bbl@hymapsel=\@cclv\chardef\bbl@hymapsel4\relax\fi \foreign@language{#1}} \expandafter\let\csname endotherlanguage*\endcsname\relax \edef\foreignlanguage{% @@ -237,6 +236,7 @@ \expandafter\bbl@switch\expandafter{\languagename}}} \let\bbl@hyphlist\@empty \let\bbl@hyphenation@\relax +\let\bbl@hymapsel=\@cclv \def\bbl@patterns#1{% \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax \csname l@#1\endcsname @@ -277,6 +277,22 @@ \@namedef{#1hyphenmins}{#2}% \fi} \def\set@hyphenmins#1#2{\lefthyphenmin#1\relax\righthyphenmin#2\relax} +\ifx\ProvidesFile\@undefined + \def\ProvidesLanguage#1[#2 #3 #4]{% + \wlog{Language: #1 #4 #3 <#2>}% + } +\else + \def\ProvidesLanguage#1{% + \begingroup + \catcode`\ 10 % + \@makeother\/% + \@ifnextchar[%] + {\@provideslanguage{#1}}{\@provideslanguage{#1}[]}} + \def\@provideslanguage#1[#2]{% + \wlog{Language: #1 #2}% + \expandafter\xdef\csname ver@#1.ldf\endcsname{#2}% + \endgroup} +\fi \def\LdfInit{% \chardef\atcatcode=\catcode`\@ \catcode`\@=11\relax diff --git a/Master/texmf-dist/tex/generic/babel/turkish.sty b/Master/texmf-dist/tex/generic/babel/turkish.sty index 04d59fd4b33..74450ed0d35 100644 --- a/Master/texmf-dist/tex/generic/babel/turkish.sty +++ b/Master/texmf-dist/tex/generic/babel/turkish.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/ukraineb.sty b/Master/texmf-dist/tex/generic/babel/ukraineb.sty index 83f6289463a..f5032a7e919 100644 --- a/Master/texmf-dist/tex/generic/babel/ukraineb.sty +++ b/Master/texmf-dist/tex/generic/babel/ukraineb.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/usorbian.sty b/Master/texmf-dist/tex/generic/babel/usorbian.sty index 769381874e3..e2e38241a2b 100644 --- a/Master/texmf-dist/tex/generic/babel/usorbian.sty +++ b/Master/texmf-dist/tex/generic/babel/usorbian.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/welsh.sty b/Master/texmf-dist/tex/generic/babel/welsh.sty index cd8ace831b6..86eca3e0872 100644 --- a/Master/texmf-dist/tex/generic/babel/welsh.sty +++ b/Master/texmf-dist/tex/generic/babel/welsh.sty @@ -57,8 +57,9 @@ \else \def\bblstyerror{% \PackageError{babel}% - {You have used an old interface to call babel\MessageBreak - You may expect compatibility problems wit other packages}% + {You are loading directly a language style.\MessageBreak + This syntax is deprecated and you must use\MessageBreak + \string\usepackage[language]\string{babel\string}}% {You could proceed but don't complain if you run into errors}% \let\bblstyerror\@undefined } diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index 289874aa2e2..77dbf96bea1 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -54,6 +54,38 @@ \AddBabelHook{xetex}{stopcommands}{% \xebbl@stop \let\xebbl@stop\relax} +\def\babelFSstore#1{% + \bbl@for\bbl@tempa{#1}{% + \edef\bbl@tempb{\noexpand\bbl@FSstore{\bbl@tempa}} + \bbl@tempb{rm}\rmdefault\bbl@save@rmdefault + \bbl@tempb{sf}\sfdefault\bbl@save@sfdefault + \bbl@tempb{tt}\ttdefault\bbl@save@ttdefault}} +\def\bbl@FSstore#1#2#3#4{% + \bbl@csarg\edef{#2default#1}{#3}% + \expandafter\addto\csname extras#1\endcsname{% + \let#4#3% + \ifx#3\f@family + \edef#3{\csname bbl@#2default#1\endcsname}% + \fontfamily{#3}\selectfont + \else + \edef#3{\csname bbl@#2default#1\endcsname}% + \fi}% + \expandafter\addto\csname noextras#1\endcsname{% + \ifx#3\f@family + \fontfamily{#4}\selectfont + \fi + \let#3#4}} +\let\bbl@langfeatures\@empty +\def\babelFSfeatures{% + \let\bbl@ori@fontspec\fontspec + \renewcommand\fontspec[1][]{% + \bbl@ori@fontspec[\bbl@langfeatures##1]} + \let\babelFSfeatures\bbl@FSfeatures + \babelFSfeatures} +\def\bbl@FSfeatures#1#2{% + \expandafter\addto\csname extras#1\endcsname{% + \babel@save\bbl@langfeatures + \edef\bbl@langfeatures{#2,}}} \endinput %% %% End of file `xebabel.def'. |