From a63b337dd75bdef29d3e59f209931b46a96a4a4f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Mar 2014 20:46:25 +0000 Subject: babel (25mar14) git-svn-id: svn://tug.org/texlive/trunk@33283 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/babel/UKenglish.sty | 2 +- Master/texmf-dist/tex/generic/babel/USenglish.sty | 2 +- Master/texmf-dist/tex/generic/babel/afrikaans.sty | 2 +- Master/texmf-dist/tex/generic/babel/albanian.sty | 2 +- Master/texmf-dist/tex/generic/babel/american.sty | 2 +- Master/texmf-dist/tex/generic/babel/austrian.sty | 2 +- Master/texmf-dist/tex/generic/babel/babel.def | 561 +++++++++++---------- Master/texmf-dist/tex/generic/babel/babel.sty | 27 +- Master/texmf-dist/tex/generic/babel/bahasa.sty | 2 +- Master/texmf-dist/tex/generic/babel/bahasam.sty | 2 +- Master/texmf-dist/tex/generic/babel/basque.sty | 2 +- Master/texmf-dist/tex/generic/babel/blplain.tex | 4 +- Master/texmf-dist/tex/generic/babel/bplain.tex | 4 +- Master/texmf-dist/tex/generic/babel/breton.sty | 2 +- Master/texmf-dist/tex/generic/babel/british.sty | 2 +- Master/texmf-dist/tex/generic/babel/bulgarian.sty | 2 +- Master/texmf-dist/tex/generic/babel/catalan.sty | 2 +- Master/texmf-dist/tex/generic/babel/croatian.sty | 2 +- Master/texmf-dist/tex/generic/babel/czech.sty | 2 +- Master/texmf-dist/tex/generic/babel/danish.sty | 2 +- Master/texmf-dist/tex/generic/babel/dutch.sty | 2 +- Master/texmf-dist/tex/generic/babel/english.sty | 2 +- Master/texmf-dist/tex/generic/babel/esperanto.sty | 2 +- Master/texmf-dist/tex/generic/babel/estonian.sty | 2 +- Master/texmf-dist/tex/generic/babel/finnish.sty | 2 +- Master/texmf-dist/tex/generic/babel/francais.sty | 2 +- Master/texmf-dist/tex/generic/babel/galician.sty | 2 +- Master/texmf-dist/tex/generic/babel/germanb.sty | 2 +- Master/texmf-dist/tex/generic/babel/greek.sty | 2 +- Master/texmf-dist/tex/generic/babel/hebrew.sty | 2 +- Master/texmf-dist/tex/generic/babel/hyphen.cfg | 8 +- Master/texmf-dist/tex/generic/babel/icelandic.sty | 2 +- .../texmf-dist/tex/generic/babel/interlingua.sty | 2 +- Master/texmf-dist/tex/generic/babel/irish.sty | 2 +- Master/texmf-dist/tex/generic/babel/italian.sty | 2 +- Master/texmf-dist/tex/generic/babel/latin.sty | 2 +- Master/texmf-dist/tex/generic/babel/lsorbian.sty | 2 +- Master/texmf-dist/tex/generic/babel/luababel.def | 18 +- Master/texmf-dist/tex/generic/babel/magyar.sty | 2 +- Master/texmf-dist/tex/generic/babel/naustrian.sty | 2 +- Master/texmf-dist/tex/generic/babel/ngermanb.sty | 2 +- Master/texmf-dist/tex/generic/babel/nil.ldf | 6 +- Master/texmf-dist/tex/generic/babel/norsk.sty | 2 +- Master/texmf-dist/tex/generic/babel/plain.def | 40 +- Master/texmf-dist/tex/generic/babel/polish.sty | 2 +- Master/texmf-dist/tex/generic/babel/portuges.sty | 2 +- Master/texmf-dist/tex/generic/babel/romanian.sty | 2 +- Master/texmf-dist/tex/generic/babel/russianb.sty | 2 +- Master/texmf-dist/tex/generic/babel/samin.sty | 2 +- Master/texmf-dist/tex/generic/babel/scottish.sty | 2 +- Master/texmf-dist/tex/generic/babel/serbian.sty | 2 +- Master/texmf-dist/tex/generic/babel/slovak.sty | 2 +- Master/texmf-dist/tex/generic/babel/slovene.sty | 2 +- Master/texmf-dist/tex/generic/babel/spanish.sty | 2 +- Master/texmf-dist/tex/generic/babel/swedish.sty | 2 +- Master/texmf-dist/tex/generic/babel/switch.def | 10 +- Master/texmf-dist/tex/generic/babel/turkish.sty | 2 +- Master/texmf-dist/tex/generic/babel/ukraineb.sty | 2 +- Master/texmf-dist/tex/generic/babel/usorbian.sty | 2 +- Master/texmf-dist/tex/generic/babel/welsh.sty | 2 +- Master/texmf-dist/tex/generic/babel/xebabel.def | 2 +- 61 files changed, 397 insertions(+), 385 deletions(-) (limited to 'Master/texmf-dist/tex/generic/babel') diff --git a/Master/texmf-dist/tex/generic/babel/UKenglish.sty b/Master/texmf-dist/tex/generic/babel/UKenglish.sty index 1c53215f88f..29a10d02f78 100644 --- a/Master/texmf-dist/tex/generic/babel/UKenglish.sty +++ b/Master/texmf-dist/tex/generic/babel/UKenglish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `UKenglish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/USenglish.sty b/Master/texmf-dist/tex/generic/babel/USenglish.sty index f007c6038ba..1057f8a939e 100644 --- a/Master/texmf-dist/tex/generic/babel/USenglish.sty +++ b/Master/texmf-dist/tex/generic/babel/USenglish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `USenglish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/afrikaans.sty b/Master/texmf-dist/tex/generic/babel/afrikaans.sty index 2ceeab8f5b2..589e4350471 100644 --- a/Master/texmf-dist/tex/generic/babel/afrikaans.sty +++ b/Master/texmf-dist/tex/generic/babel/afrikaans.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `afrikaans') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/albanian.sty b/Master/texmf-dist/tex/generic/babel/albanian.sty index 79201f7f32a..c68f265fd69 100644 --- a/Master/texmf-dist/tex/generic/babel/albanian.sty +++ b/Master/texmf-dist/tex/generic/babel/albanian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `albanian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/american.sty b/Master/texmf-dist/tex/generic/babel/american.sty index 92025411802..44a38faa7c6 100644 --- a/Master/texmf-dist/tex/generic/babel/american.sty +++ b/Master/texmf-dist/tex/generic/babel/american.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `american') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/austrian.sty b/Master/texmf-dist/tex/generic/babel/austrian.sty index d8d58f7ce3d..0c0d6ca6b9d 100644 --- a/Master/texmf-dist/tex/generic/babel/austrian.sty +++ b/Master/texmf-dist/tex/generic/babel/austrian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `austrian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def index 159dfbfe35b..67ded378850 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.def +++ b/Master/texmf-dist/tex/generic/babel/babel.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `core') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -56,11 +56,11 @@ \wlog{File: #1 #4 #3 <#2>}% \let\ProvidesFile\@undefined} \fi -\ProvidesFile{babel.def}[2014/03/17 3.9j Babel common definitions] +\ProvidesFile{babel.def}[2014/03/24 3.9k Babel common definitions] \ifx\AtBeginDocument\@undefined \input plain.def\relax \fi -\def\bbl@tempa{3.9j}% +\def\bbl@tempa{3.9k}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi @@ -71,16 +71,18 @@ \message{I couldn't find the file language.def} \else \closein1 - \def\addlanguage#1#2#3#4#5{% - \expandafter\ifx\csname lang@#1\endcsname\relax\else - \global\expandafter\let\csname l@#1\expandafter\endcsname - \csname lang@#1\endcsname - \fi}% - \input language.def + \begingroup + \def\addlanguage#1#2#3#4#5{% + \expandafter\ifx\csname lang@#1\endcsname\relax\else + \global\expandafter\let\csname l@#1\expandafter\endcsname + \csname lang@#1\endcsname + \fi}% + \def\uselanguage#1{}% + \input language.def + \endgroup \fi - \chardef\l@english\lang@USenglish + \chardef\l@english\z@ \fi -\def\bbl@for#1#2#3{\bbl@loopx#1{#2}{\ifx#1\@empty\else#3\fi}} \def\bbl@add#1#2{% \@ifundefined{\expandafter\@gobble\string#1}% {\def#1{#2}}% @@ -94,15 +96,7 @@ \ifx\@nnil#3\relax\else \def#1{#3}#2\bbl@afterfi\bbl@@loop#1{#2}% \fi} -\ifx\bbl@opt@strings\@undefined - \def\bbl@opt@safe{BR} - \let\bbl@opt@strings\@nnil - \let\bbl@opt@shorthands\@nnil -\fi -\ifx\BabelModifiers\@undefined\let\BabelModifiers\relax\fi -\ifx\bbl@afterlang\@undefined\let\bbl@afterlang\relax\fi -\ifx\bbl@language@opts\@undefined\let\bbl@language@opts\@empty\fi -\providecommand\AfterBabelLanguage[2]{} +\def\bbl@for#1#2#3{\bbl@loopx#1{#2}{\ifx#1\@empty\else#3\fi}} \def\bbl@csarg#1#2{\expandafter#1\csname bbl@#2\endcsname}% \chardef\bbl@engine=% \ifx\directlua\@undefined @@ -116,6 +110,17 @@ \fi \long\def\bbl@afterelse#1\else#2\fi{\fi#1} \long\def\bbl@afterfi#1\fi{\fi#1} +\def\addto#1#2{% + \ifx#1\@undefined + \def#1{#2}% + \else + \ifx#1\relax + \def#1{#2}% + \else + {\toks@\expandafter{#1#2}% + \xdef#1{\the\toks@}}% + \fi + \fi} \def\bbl@withactive#1#2{% \begingroup \lccode`~=`#2\relax @@ -142,11 +147,32 @@ \fi \expandafter\def\csname\bbl@tempa\space\endcsname} \@onlypreamble\bbl@redefinerobust +\def\AddBabelHook#1#2{% + \@ifundefined{bbl@hk@#1}{\EnableBabelHook{#1}}{}% + \def\bbl@tempa##1,#2=##2,##3\@empty{\def\bbl@tempb{##2}}% + \expandafter\bbl@tempa\bbl@evargs,#2=,\@empty + \@ifundefined{bbl@ev@#1@#2}% + {\bbl@csarg\bbl@add{ev@#2}{\bbl@elt{#1}}% + \bbl@csarg\newcommand}% + {\bbl@csarg\let{ev@#1@#2}\relax + \bbl@csarg\newcommand}% + {ev@#1@#2}[\bbl@tempb]} +\def\EnableBabelHook#1{\bbl@csarg\let{hk@#1}\@firstofone} +\def\DisableBabelHook#1{\bbl@csarg\let{hk@#1}\@gobble} +\def\bbl@usehooks#1#2{% + \def\bbl@elt##1{% + \@nameuse{bbl@hk@##1}{\@nameuse{bbl@ev@##1@#1}#2}}% + \@nameuse{bbl@ev@#1}} +\def\bbl@evargs{,% don't delete the comma + everylanguage=1,loadkernel=1,loadpatterns=1,loadexceptions=1,% + adddialect=2,patterns=2,defaultcommands=0,encodedcommands=2,write=0,% + beforeextras=0,afterextras=0,stopcommands=0,stringprocess=0,% + hyphenation=2,initiateactive=3,afterreset=0} \newcommand\babelensure[2][]{% \AddBabelHook{babel-ensure}{afterextras}{% \ifcase\bbl@select@type \@nameuse{bbl@e@\languagename}% - \fi} + \fi}% \begingroup \let\bbl@ens@include\@empty \let\bbl@ens@exclude\@empty @@ -156,7 +182,7 @@ \edef\bbl@tempa{\bbl@tempb#1\@empty}% \def\bbl@tempb##1=##2\@@{\@namedef{bbl@ens@##1}{##2}}% \bbl@for\bbl@tempa\bbl@tempa{\expandafter\bbl@tempb\bbl@tempa\@@}% - \def\bbl@tempc{\bbl@ensure} + \def\bbl@tempc{\bbl@ensure}% \expandafter\bbl@add\expandafter\bbl@tempc\expandafter{% \expandafter{\bbl@ens@include}}% \expandafter\bbl@add\expandafter\bbl@tempc\expandafter{% @@ -164,27 +190,33 @@ \toks@\expandafter{\bbl@tempc}% \edef\x{% \endgroup - \noexpand\@namedef{bbl@e@#2}{\the\toks@{\bbl@ens@fontenc}}} + \noexpand\@namedef{bbl@e@#2}{\the\toks@{\bbl@ens@fontenc}}}% \x} \def\bbl@ensure#1#2#3{% - \def\bbl@tempb##1{% + \def\bbl@tempb##1{% elt for \bbl@ensured list \ifx##1\@empty\else \in@{##1}{#2}% \ifin@\else \toks@\expandafter{##1}% + \edef\bbl@tempa{% + \noexpand\DeclareRobustCommand + \bbl@csarg\noexpand{ensure@\languagename}[1]{% + \noexpand\foreignlanguage{\languagename}% + {\ifx\relax#3\else + \noexpand\fontencoding{#3}\noexpand\selectfont + \fi + ########1}}}% + \bbl@tempa \edef##1{% - \noexpand\foreignlanguage{\languagename}% - {\ifx\relax#3\else - \noexpand\fontencoding{#3}\noexpand\selectfont - \fi - \the\toks@}}% + \bbl@csarg\noexpand{ensure@\languagename}% + {\the\toks@}} \fi \expandafter\bbl@tempb \fi}% \expandafter\bbl@tempb\bbl@ensured\@empty - \def\bbl@tempa##1{% + \def\bbl@tempa##1{% elt for include list \ifx##1\@empty\else - \expandafter\in@\expandafter\foreignlanguage\expandafter{##1}% + \bbl@csarg\in@{ensure@\languagename\expandafter}\expandafter{##1}% \ifin@\else \bbl@tempb##1\@empty \fi @@ -550,6 +582,9 @@ \pr@@@s {\bbl@if@primes*^\pr@@@t\egroup}}} \endgroup +\initiate@active@char{~} +\declare@shorthand{system}{~}{\leavevmode\nobreak\ } +\bbl@activate{~} \expandafter\def\csname OT1dqpos\endcsname{127} \expandafter\def\csname T1dqpos\endcsname{4} \ifx\f@encoding\@undefined @@ -660,17 +695,6 @@ \let\bbl@nonfrenchspacing\nonfrenchspacing \fi} \let\bbl@nonfrenchspacing\nonfrenchspacing -\def\addto#1#2{% - \ifx#1\@undefined - \def#1{#2}% - \else - \ifx#1\relax - \def#1{#2}% - \else - {\toks@\expandafter{#1#2}% - \xdef#1{\the\toks@}}% - \fi - \fi} \def\babeltags#1{% \edef\bbl@tempa{\zap@space#1 \@empty}% \def\bbl@tempb##1=##2\@@{% @@ -749,173 +773,16 @@ \def\bbl@hy@empty{\hskip\z@skip} \def\bbl@hy@@empty{\discretionary{}{}{}} \def\bbl@disc#1#2{\nobreak\discretionary{#2-}{}{#1}\bbl@allowhyphens} -\def\set@low@box#1{\setbox\tw@\hbox{,}\setbox\z@\hbox{#1}% - \dimen\z@\ht\z@ \advance\dimen\z@ -\ht\tw@% - \setbox\z@\hbox{\lower\dimen\z@ \box\z@}\ht\z@\ht\tw@ \dp\z@\dp\tw@} -\def\save@sf@q#1{\leavevmode - \begingroup - \edef\@SF{\spacefactor\the\spacefactor}#1\@SF - \endgroup} -\ProvideTextCommand{\quotedblbase}{OT1}{% - \save@sf@q{\set@low@box{\textquotedblright\/}% - \box\z@\kern-.04em\bbl@allowhyphens}} -\ProvideTextCommandDefault{\quotedblbase}{% - \UseTextSymbol{OT1}{\quotedblbase}} -\ProvideTextCommand{\quotesinglbase}{OT1}{% - \save@sf@q{\set@low@box{\textquoteright\/}% - \box\z@\kern-.04em\bbl@allowhyphens}} -\ProvideTextCommandDefault{\quotesinglbase}{% - \UseTextSymbol{OT1}{\quotesinglbase}} -\ProvideTextCommand{\guillemotleft}{OT1}{% - \ifmmode - \ll - \else - \save@sf@q{\nobreak - \raise.2ex\hbox{$\scriptscriptstyle\ll$}\bbl@allowhyphens}% - \fi} -\ProvideTextCommand{\guillemotright}{OT1}{% - \ifmmode - \gg - \else - \save@sf@q{\nobreak - \raise.2ex\hbox{$\scriptscriptstyle\gg$}\bbl@allowhyphens}% - \fi} -\ProvideTextCommandDefault{\guillemotleft}{% - \UseTextSymbol{OT1}{\guillemotleft}} -\ProvideTextCommandDefault{\guillemotright}{% - \UseTextSymbol{OT1}{\guillemotright}} -\ProvideTextCommand{\guilsinglleft}{OT1}{% - \ifmmode - <% - \else - \save@sf@q{\nobreak - \raise.2ex\hbox{$\scriptscriptstyle<$}\bbl@allowhyphens}% - \fi} -\ProvideTextCommand{\guilsinglright}{OT1}{% - \ifmmode - >% - \else - \save@sf@q{\nobreak - \raise.2ex\hbox{$\scriptscriptstyle>$}\bbl@allowhyphens}% - \fi} -\ProvideTextCommandDefault{\guilsinglleft}{% - \UseTextSymbol{OT1}{\guilsinglleft}} -\ProvideTextCommandDefault{\guilsinglright}{% - \UseTextSymbol{OT1}{\guilsinglright}} -\DeclareTextCommand{\ij}{OT1}{% - i\kern-0.02em\bbl@allowhyphens j} -\DeclareTextCommand{\IJ}{OT1}{% - I\kern-0.02em\bbl@allowhyphens J} -\DeclareTextCommand{\ij}{T1}{\char188} -\DeclareTextCommand{\IJ}{T1}{\char156} -\ProvideTextCommandDefault{\ij}{% - \UseTextSymbol{OT1}{\ij}} -\ProvideTextCommandDefault{\IJ}{% - \UseTextSymbol{OT1}{\IJ}} -\def\crrtic@{\hrule height0.1ex width0.3em} -\def\crttic@{\hrule height0.1ex width0.33em} -\def\ddj@{% - \setbox0\hbox{d}\dimen@=\ht0 - \advance\dimen@1ex - \dimen@.45\dimen@ - \dimen@ii\expandafter\rem@pt\the\fontdimen\@ne\font\dimen@ - \advance\dimen@ii.5ex - \leavevmode\rlap{\raise\dimen@\hbox{\kern\dimen@ii\vbox{\crrtic@}}}} -\def\DDJ@{% - \setbox0\hbox{D}\dimen@=.55\ht0 - \dimen@ii\expandafter\rem@pt\the\fontdimen\@ne\font\dimen@ - \advance\dimen@ii.15ex % correction for the dash position - \advance\dimen@ii-.15\fontdimen7\font % correction for cmtt font - \dimen\thr@@\expandafter\rem@pt\the\fontdimen7\font\dimen@ - \leavevmode\rlap{\raise\dimen@\hbox{\kern\dimen@ii\vbox{\crttic@}}}} -\DeclareTextCommand{\dj}{OT1}{\ddj@ d} -\DeclareTextCommand{\DJ}{OT1}{\DDJ@ D} -\ProvideTextCommandDefault{\dj}{% - \UseTextSymbol{OT1}{\dj}} -\ProvideTextCommandDefault{\DJ}{% - \UseTextSymbol{OT1}{\DJ}} -\DeclareTextCommand{\SS}{OT1}{SS} -\ProvideTextCommandDefault{\SS}{\UseTextSymbol{OT1}{\SS}} -\ProvideTextCommand{\glq}{OT1}{% - \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}} -\ProvideTextCommand{\glq}{T1}{% - \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}} -\ProvideTextCommandDefault{\glq}{\UseTextSymbol{OT1}\glq} -\ProvideTextCommand{\grq}{T1}{% - \textormath{\textquoteleft}{\mbox{\textquoteleft}}} -\ProvideTextCommand{\grq}{OT1}{% - \save@sf@q{\kern-.0125em% - \textormath{\textquoteleft}{\mbox{\textquoteleft}}% - \kern.07em\relax}} -\ProvideTextCommandDefault{\grq}{\UseTextSymbol{OT1}\grq} -\ProvideTextCommand{\glqq}{OT1}{% - \textormath{\quotedblbase}{\mbox{\quotedblbase}}} -\ProvideTextCommand{\glqq}{T1}{% - \textormath{\quotedblbase}{\mbox{\quotedblbase}}} -\ProvideTextCommandDefault{\glqq}{\UseTextSymbol{OT1}\glqq} -\ProvideTextCommand{\grqq}{T1}{% - \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}} -\ProvideTextCommand{\grqq}{OT1}{% - \save@sf@q{\kern-.07em% - \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}% - \kern.07em\relax}} -\ProvideTextCommandDefault{\grqq}{\UseTextSymbol{OT1}\grqq} -\ProvideTextCommand{\flq}{OT1}{% - \textormath{\guilsinglleft}{\mbox{\guilsinglleft}}} -\ProvideTextCommand{\flq}{T1}{% - \textormath{\guilsinglleft}{\mbox{\guilsinglleft}}} -\ProvideTextCommandDefault{\flq}{\UseTextSymbol{OT1}\flq} -\ProvideTextCommand{\frq}{OT1}{% - \textormath{\guilsinglright}{\mbox{\guilsinglright}}} -\ProvideTextCommand{\frq}{T1}{% - \textormath{\guilsinglright}{\mbox{\guilsinglright}}} -\ProvideTextCommandDefault{\frq}{\UseTextSymbol{OT1}\frq} -\ProvideTextCommand{\flqq}{OT1}{% - \textormath{\guillemotleft}{\mbox{\guillemotleft}}} -\ProvideTextCommand{\flqq}{T1}{% - \textormath{\guillemotleft}{\mbox{\guillemotleft}}} -\ProvideTextCommandDefault{\flqq}{\UseTextSymbol{OT1}\flqq} -\ProvideTextCommand{\frqq}{OT1}{% - \textormath{\guillemotright}{\mbox{\guillemotright}}} -\ProvideTextCommand{\frqq}{T1}{% - \textormath{\guillemotright}{\mbox{\guillemotright}}} -\ProvideTextCommandDefault{\frqq}{\UseTextSymbol{OT1}\frqq} -\def\umlauthigh{% - \def\bbl@umlauta##1{\leavevmode\bgroup% - \expandafter\accent\csname\f@encoding dqpos\endcsname - ##1\bbl@allowhyphens\egroup}% - \let\bbl@umlaute\bbl@umlauta} -\def\umlautlow{% - \def\bbl@umlauta{\protect\lower@umlaut}} -\def\umlautelow{% - \def\bbl@umlaute{\protect\lower@umlaut}} -\umlauthigh -\expandafter\ifx\csname U@D\endcsname\relax - \csname newdimen\endcsname\U@D -\fi -\def\lower@umlaut#1{% - \leavevmode\bgroup - \U@D 1ex% - {\setbox\z@\hbox{% - \expandafter\char\csname\f@encoding dqpos\endcsname}% - \dimen@ -.45ex\advance\dimen@\ht\z@ - \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% - \expandafter\accent\csname\f@encoding dqpos\endcsname - \fontdimen5\font\U@D #1% - \egroup} -\AtBeginDocument{% - \DeclareTextCompositeCommand{\"}{OT1}{a}{\bbl@umlauta{a}}% - \DeclareTextCompositeCommand{\"}{OT1}{e}{\bbl@umlaute{e}}% - \DeclareTextCompositeCommand{\"}{OT1}{i}{\bbl@umlaute{\i}}% - \DeclareTextCompositeCommand{\"}{OT1}{\i}{\bbl@umlaute{\i}}% - \DeclareTextCompositeCommand{\"}{OT1}{o}{\bbl@umlauta{o}}% - \DeclareTextCompositeCommand{\"}{OT1}{u}{\bbl@umlauta{u}}% - \DeclareTextCompositeCommand{\"}{OT1}{A}{\bbl@umlauta{A}}% - \DeclareTextCompositeCommand{\"}{OT1}{E}{\bbl@umlaute{E}}% - \DeclareTextCompositeCommand{\"}{OT1}{I}{\bbl@umlaute{I}}% - \DeclareTextCompositeCommand{\"}{OT1}{O}{\bbl@umlauta{O}}% - \DeclareTextCompositeCommand{\"}{OT1}{U}{\bbl@umlauta{U}}% -} +\def\bbl@toglobal#1{\global\let#1#1} +\def\bbl@recatcode#1{% + \@tempcnta="7F + \def\bbl@tempa{% + \ifnum\@tempcnta>"FF\else + \catcode\@tempcnta=#1\relax + \advance\@tempcnta\@ne + \expandafter\bbl@tempa + \fi}% + \bbl@tempa} \def\bbl@patchuclc{% \let\bbl@patchuclc\relax \@ifundefined{bbl@tolower}{% @@ -928,33 +795,20 @@ {\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{% - \ifnum\@tempcnta>"FF\else - \catcode\@tempcnta=#1\relax - \advance\@tempcnta\@ne - \expandafter\bbl@tempa - \fi}% - \bbl@tempa} \@onlypreamble\StartBabelCommands \def\StartBabelCommands{% \begingroup \bbl@recatcode{11}% \def\SetStringLoop##1##2{% - \def\bbl@templ####1{\expandafter\noexpand\csname##1\endcsname}% - \count@\z@ - \bbl@loop\bbl@tempa{##2}{% - \advance\count@\@ne - \toks@\expandafter{\bbl@tempa}% - \edef\bbl@tempb{% - \bbl@templ{\romannumeral\count@}{\the\toks@}% - \count@=\the\count@\relax}% - \expandafter\SetString\bbl@tempb}}% + \def\bbl@templ####1{\expandafter\noexpand\csname##1\endcsname}% + \count@\z@ + \bbl@loop\bbl@tempa{##2}{% + \advance\count@\@ne + \toks@\expandafter{\bbl@tempa}% + \edef\bbl@tempb{% + \bbl@templ{\romannumeral\count@}{\the\toks@}% + \count@=\the\count@\relax}% + \expandafter\SetString\bbl@tempb}}% \newcommand\SetCase[3][]{% \bbl@patchuclc \bbl@forlang\bbl@tempa{% @@ -964,6 +818,10 @@ \csname\bbl@tempa @bbl@uc\endcsname{##2}% \expandafter\bbl@encstring \csname\bbl@tempa @bbl@lc\endcsname{##3}}}% + \newcommand\SetHyphenMap[1]{% + \bbl@forlang\bbl@tempa{% + \expandafter\bbl@stringdef + \csname\bbl@tempa @bbl@hyphenmap\endcsname{##1}}} \def\bbl@provstring##1##2{% \providecommand##1{##2}% \bbl@toglobal##1}% @@ -1092,30 +950,24 @@ \ifx\bbl@opt@strings\relax \def\bbl@scset#1#2{\def#1{\bbl@encoded#2}} \bbl@patchuclc + \let\bbl@encoded\relax + \def\bbl@encoded@uclc#1{% + \@inmathwarn#1% + \expandafter\ifx\csname\cf@encoding\string#1\endcsname\relax + \expandafter\ifx\csname ?\string#1\endcsname\relax + \TextSymbolUnavailable#1% + \else + \csname ?\string#1\endcsname + \fi + \else + \csname\cf@encoding\string#1\endcsname + \fi} \else \def\bbl@scset#1#2{\def#1{#2}} \fi -\let\bbl@encoded\relax -\def\bbl@encoded@uclc#1{% - \@inmathwarn#1% - \expandafter\ifx\csname\cf@encoding\string#1\endcsname\relax - \expandafter\ifx\csname ?\string#1\endcsname\relax - \TextSymbolUnavailable#1% - \else - \csname ?\string#1\endcsname - \fi - \else - \csname\cf@encoding\string#1\endcsname - \fi} -\def\SetHyphenMap#1{% - \bbl@forlang\bbl@tempa{% - \expandafter\bbl@stringdef - \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} +\def\bbl@aftercmds#1{% + \toks@\expandafter{\bbl@scafter#1}% + \xdef\bbl@scafter{\the\toks@}} \newcommand\BabelLower[2]{% one to one. \ifnum\lccode#1=#2\else \babel@savevariable{\lccode#1}% @@ -1141,26 +993,182 @@ \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}}% - \expandafter\bbl@tempa\bbl@evargs,#2=,\@empty - \@ifundefined{bbl@ev@#1@#2}% - {\bbl@csarg\bbl@add{ev@#2}{\bbl@elt{#1}}% - \bbl@csarg\newcommand}% - {\bbl@csarg\renewcommand}% - {ev@#1@#2}[\bbl@tempb]} -\def\EnableBabelHook#1{\bbl@csarg\let{hk@#1}\@firstofone} -\def\DisableBabelHook#1{\bbl@csarg\let{hk@#1}\@gobble} -\def\bbl@usehooks#1#2{% - \def\bbl@elt##1{% - \@nameuse{bbl@hk@##1}{\@nameuse{bbl@ev@##1@#1}#2}}% - \@nameuse{bbl@ev@#1}} -\def\bbl@evargs{,% don't delete the comma - everylanguage=1,loadkernel=1,loadpatterns=1,loadexceptions=1,% - adddialect=2,patterns=2,defaultcommands=0,encodedcommands=2,write=0,% - beforeextras=0,afterextras=0,stopcommands=0,stringprocess=0,% - hyphenation=2,initiateactive=3,afterreset=0} +\AtEndOfPackage{% + \ifx\bbl@hymapopt\@undefined + \@expandtwoargs\in@{,}{\bbl@language@opts}% + \chardef\bbl@hymapopt\ifin@4\else\@ne\fi + \fi} +\def\set@low@box#1{\setbox\tw@\hbox{,}\setbox\z@\hbox{#1}% + \dimen\z@\ht\z@ \advance\dimen\z@ -\ht\tw@% + \setbox\z@\hbox{\lower\dimen\z@ \box\z@}\ht\z@\ht\tw@ \dp\z@\dp\tw@} +\def\save@sf@q#1{\leavevmode + \begingroup + \edef\@SF{\spacefactor\the\spacefactor}#1\@SF + \endgroup} +\ProvideTextCommand{\quotedblbase}{OT1}{% + \save@sf@q{\set@low@box{\textquotedblright\/}% + \box\z@\kern-.04em\bbl@allowhyphens}} +\ProvideTextCommandDefault{\quotedblbase}{% + \UseTextSymbol{OT1}{\quotedblbase}} +\ProvideTextCommand{\quotesinglbase}{OT1}{% + \save@sf@q{\set@low@box{\textquoteright\/}% + \box\z@\kern-.04em\bbl@allowhyphens}} +\ProvideTextCommandDefault{\quotesinglbase}{% + \UseTextSymbol{OT1}{\quotesinglbase}} +\ProvideTextCommand{\guillemotleft}{OT1}{% + \ifmmode + \ll + \else + \save@sf@q{\nobreak + \raise.2ex\hbox{$\scriptscriptstyle\ll$}\bbl@allowhyphens}% + \fi} +\ProvideTextCommand{\guillemotright}{OT1}{% + \ifmmode + \gg + \else + \save@sf@q{\nobreak + \raise.2ex\hbox{$\scriptscriptstyle\gg$}\bbl@allowhyphens}% + \fi} +\ProvideTextCommandDefault{\guillemotleft}{% + \UseTextSymbol{OT1}{\guillemotleft}} +\ProvideTextCommandDefault{\guillemotright}{% + \UseTextSymbol{OT1}{\guillemotright}} +\ProvideTextCommand{\guilsinglleft}{OT1}{% + \ifmmode + <% + \else + \save@sf@q{\nobreak + \raise.2ex\hbox{$\scriptscriptstyle<$}\bbl@allowhyphens}% + \fi} +\ProvideTextCommand{\guilsinglright}{OT1}{% + \ifmmode + >% + \else + \save@sf@q{\nobreak + \raise.2ex\hbox{$\scriptscriptstyle>$}\bbl@allowhyphens}% + \fi} +\ProvideTextCommandDefault{\guilsinglleft}{% + \UseTextSymbol{OT1}{\guilsinglleft}} +\ProvideTextCommandDefault{\guilsinglright}{% + \UseTextSymbol{OT1}{\guilsinglright}} +\DeclareTextCommand{\ij}{OT1}{% + i\kern-0.02em\bbl@allowhyphens j} +\DeclareTextCommand{\IJ}{OT1}{% + I\kern-0.02em\bbl@allowhyphens J} +\DeclareTextCommand{\ij}{T1}{\char188} +\DeclareTextCommand{\IJ}{T1}{\char156} +\ProvideTextCommandDefault{\ij}{% + \UseTextSymbol{OT1}{\ij}} +\ProvideTextCommandDefault{\IJ}{% + \UseTextSymbol{OT1}{\IJ}} +\def\crrtic@{\hrule height0.1ex width0.3em} +\def\crttic@{\hrule height0.1ex width0.33em} +\def\ddj@{% + \setbox0\hbox{d}\dimen@=\ht0 + \advance\dimen@1ex + \dimen@.45\dimen@ + \dimen@ii\expandafter\rem@pt\the\fontdimen\@ne\font\dimen@ + \advance\dimen@ii.5ex + \leavevmode\rlap{\raise\dimen@\hbox{\kern\dimen@ii\vbox{\crrtic@}}}} +\def\DDJ@{% + \setbox0\hbox{D}\dimen@=.55\ht0 + \dimen@ii\expandafter\rem@pt\the\fontdimen\@ne\font\dimen@ + \advance\dimen@ii.15ex % correction for the dash position + \advance\dimen@ii-.15\fontdimen7\font % correction for cmtt font + \dimen\thr@@\expandafter\rem@pt\the\fontdimen7\font\dimen@ + \leavevmode\rlap{\raise\dimen@\hbox{\kern\dimen@ii\vbox{\crttic@}}}} +\DeclareTextCommand{\dj}{OT1}{\ddj@ d} +\DeclareTextCommand{\DJ}{OT1}{\DDJ@ D} +\ProvideTextCommandDefault{\dj}{% + \UseTextSymbol{OT1}{\dj}} +\ProvideTextCommandDefault{\DJ}{% + \UseTextSymbol{OT1}{\DJ}} +\DeclareTextCommand{\SS}{OT1}{SS} +\ProvideTextCommandDefault{\SS}{\UseTextSymbol{OT1}{\SS}} +\ProvideTextCommand{\glq}{OT1}{% + \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}} +\ProvideTextCommand{\glq}{T1}{% + \textormath{\quotesinglbase}{\mbox{\quotesinglbase}}} +\ProvideTextCommandDefault{\glq}{\UseTextSymbol{OT1}\glq} +\ProvideTextCommand{\grq}{T1}{% + \textormath{\textquoteleft}{\mbox{\textquoteleft}}} +\ProvideTextCommand{\grq}{OT1}{% + \save@sf@q{\kern-.0125em% + \textormath{\textquoteleft}{\mbox{\textquoteleft}}% + \kern.07em\relax}} +\ProvideTextCommandDefault{\grq}{\UseTextSymbol{OT1}\grq} +\ProvideTextCommand{\glqq}{OT1}{% + \textormath{\quotedblbase}{\mbox{\quotedblbase}}} +\ProvideTextCommand{\glqq}{T1}{% + \textormath{\quotedblbase}{\mbox{\quotedblbase}}} +\ProvideTextCommandDefault{\glqq}{\UseTextSymbol{OT1}\glqq} +\ProvideTextCommand{\grqq}{T1}{% + \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}} +\ProvideTextCommand{\grqq}{OT1}{% + \save@sf@q{\kern-.07em% + \textormath{\textquotedblleft}{\mbox{\textquotedblleft}}% + \kern.07em\relax}} +\ProvideTextCommandDefault{\grqq}{\UseTextSymbol{OT1}\grqq} +\ProvideTextCommand{\flq}{OT1}{% + \textormath{\guilsinglleft}{\mbox{\guilsinglleft}}} +\ProvideTextCommand{\flq}{T1}{% + \textormath{\guilsinglleft}{\mbox{\guilsinglleft}}} +\ProvideTextCommandDefault{\flq}{\UseTextSymbol{OT1}\flq} +\ProvideTextCommand{\frq}{OT1}{% + \textormath{\guilsinglright}{\mbox{\guilsinglright}}} +\ProvideTextCommand{\frq}{T1}{% + \textormath{\guilsinglright}{\mbox{\guilsinglright}}} +\ProvideTextCommandDefault{\frq}{\UseTextSymbol{OT1}\frq} +\ProvideTextCommand{\flqq}{OT1}{% + \textormath{\guillemotleft}{\mbox{\guillemotleft}}} +\ProvideTextCommand{\flqq}{T1}{% + \textormath{\guillemotleft}{\mbox{\guillemotleft}}} +\ProvideTextCommandDefault{\flqq}{\UseTextSymbol{OT1}\flqq} +\ProvideTextCommand{\frqq}{OT1}{% + \textormath{\guillemotright}{\mbox{\guillemotright}}} +\ProvideTextCommand{\frqq}{T1}{% + \textormath{\guillemotright}{\mbox{\guillemotright}}} +\ProvideTextCommandDefault{\frqq}{\UseTextSymbol{OT1}\frqq} +\def\umlauthigh{% + \def\bbl@umlauta##1{\leavevmode\bgroup% + \expandafter\accent\csname\f@encoding dqpos\endcsname + ##1\bbl@allowhyphens\egroup}% + \let\bbl@umlaute\bbl@umlauta} +\def\umlautlow{% + \def\bbl@umlauta{\protect\lower@umlaut}} +\def\umlautelow{% + \def\bbl@umlaute{\protect\lower@umlaut}} +\umlauthigh +\expandafter\ifx\csname U@D\endcsname\relax + \csname newdimen\endcsname\U@D +\fi +\def\lower@umlaut#1{% + \leavevmode\bgroup + \U@D 1ex% + {\setbox\z@\hbox{% + \expandafter\char\csname\f@encoding dqpos\endcsname}% + \dimen@ -.45ex\advance\dimen@\ht\z@ + \ifdim 1ex<\dimen@ \fontdimen5\font\dimen@ \fi}% + \expandafter\accent\csname\f@encoding dqpos\endcsname + \fontdimen5\font\U@D #1% + \egroup} +\AtBeginDocument{% + \DeclareTextCompositeCommand{\"}{OT1}{a}{\bbl@umlauta{a}}% + \DeclareTextCompositeCommand{\"}{OT1}{e}{\bbl@umlaute{e}}% + \DeclareTextCompositeCommand{\"}{OT1}{i}{\bbl@umlaute{\i}}% + \DeclareTextCompositeCommand{\"}{OT1}{\i}{\bbl@umlaute{\i}}% + \DeclareTextCompositeCommand{\"}{OT1}{o}{\bbl@umlauta{o}}% + \DeclareTextCompositeCommand{\"}{OT1}{u}{\bbl@umlauta{u}}% + \DeclareTextCompositeCommand{\"}{OT1}{A}{\bbl@umlauta{A}}% + \DeclareTextCompositeCommand{\"}{OT1}{E}{\bbl@umlaute{E}}% + \DeclareTextCompositeCommand{\"}{OT1}{I}{\bbl@umlaute{I}}% + \DeclareTextCompositeCommand{\"}{OT1}{O}{\bbl@umlauta{O}}% + \DeclareTextCompositeCommand{\"}{OT1}{U}{\bbl@umlauta{U}}% +} +\ifx\l@english\@undefined + \chardef\l@english\z@ +\fi +\main@language{english} \ifcase\bbl@engine\or \input luababel.def \or @@ -1441,13 +1449,6 @@ \endgroup \if@nobreak\ifvmode\nobreak\fi\fi} \fi -\initiate@active@char{~} -\declare@shorthand{system}{~}{\leavevmode\nobreak\ } -\bbl@activate{~} -\ifx\l@english\@undefined - \chardef\l@english\z@ -\fi -\main@language{english} %% %% \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 diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty index 7997f45cdb8..b3a70b1474d 100644 --- a/Master/texmf-dist/tex/generic/babel/babel.sty +++ b/Master/texmf-dist/tex/generic/babel/babel.sty @@ -7,7 +7,7 @@ %% babel.dtx (with options: `package') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -37,9 +37,8 @@ %% 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. -\NeedsTeXFormat{LaTeX2e}[2005/12/01] %% File 'babel.dtx' -%%\ProvidesFile{babel.dtx}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -48,14 +47,14 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\ProvidesPackage{babel}[2014/03/17 3.9j The Babel package] +\NeedsTeXFormat{LaTeX2e}[2005/12/01] +\ProvidesPackage{babel}[2014/03/24 3.9k The Babel package] \@ifpackagewith{babel}{debug} {\input switch.def\relax} - {\def\bbl@tempa{3.9j}% + {\def\bbl@tempa{3.9k}% \ifx\bbl@version\bbl@tempa\else \input switch.def\relax \fi} -\def\bbl@for#1#2#3{\bbl@loopx#1{#2}{\ifx#1\@empty\else#3\fi}} \def\bbl@add#1#2{% \@ifundefined{\expandafter\@gobble\string#1}% {\def#1{#2}}% @@ -69,6 +68,7 @@ \ifx\@nnil#3\relax\else \def#1{#3}#2\bbl@afterfi\bbl@@loop#1{#2}% \fi} +\def\bbl@for#1#2#3{\bbl@loopx#1{#2}{\ifx#1\@empty\else#3\fi}} \def\AfterBabelLanguage#1{% \global\expandafter\bbl@add\csname#1.ldf-h@@k\endcsname}% \@ifpackagewith{babel}{base}{% @@ -98,30 +98,30 @@ \bbl@for\bbl@tempa\bbl@tempa{% \expandafter\bbl@tempd\bbl@tempa.\@empty\@nnil} \expandafter\let\csname opt@babel.sty\endcsname\bbl@tempc +\DeclareOption{KeepShorthandsActive}{} \DeclareOption{activeacute}{} \DeclareOption{activegrave}{} -\DeclareOption{KeepShorthandsActive}{} \DeclareOption{debug}{} \DeclareOption{noconfigs}{} \DeclareOption{showlanguages}{} \DeclareOption{shorthands=off}{\bbl@tempa shorthands=\bbl@tempa} +\DeclareOption{math=active}{} +\DeclareOption{math=normal}{\def\bbl@mathnormal{\noexpand\textormath}} +\let\bbl@opt@strings\@nnil % accept strings=value \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}} \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} +\DeclareOption{safe=none}{\let\bbl@opt@safe\@empty} +\DeclareOption{safe=bib}{\def\bbl@opt@safe{B}} +\DeclareOption{safe=ref}{\def\bbl@opt@safe{R}} \let\bbl@opt@shorthands\@nnil \let\bbl@opt@config\@nnil \let\bbl@opt@main\@nnil -\let\bbl@opt@strings\@nnil \let\bbl@opt@headfoot\@nnil \def\bbl@tempa#1=#2\bbl@tempa{% \expandafter\ifx\csname bbl@opt@#1\endcsname\@nnil @@ -166,7 +166,6 @@ \fi} \edef\bbl@opt@shorthands{% \expandafter\bbl@sh@string\bbl@opt@shorthands\@empty}% - \bbl@ifshorthand{'}% {\PassOptionsToPackage{activeacute}{babel}}{} \bbl@ifshorthand{`}% diff --git a/Master/texmf-dist/tex/generic/babel/bahasa.sty b/Master/texmf-dist/tex/generic/babel/bahasa.sty index aff73c40346..12296c6a301 100644 --- a/Master/texmf-dist/tex/generic/babel/bahasa.sty +++ b/Master/texmf-dist/tex/generic/babel/bahasa.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `bahasa') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/bahasam.sty b/Master/texmf-dist/tex/generic/babel/bahasam.sty index 70ec92279e5..cc0952562f4 100644 --- a/Master/texmf-dist/tex/generic/babel/bahasam.sty +++ b/Master/texmf-dist/tex/generic/babel/bahasam.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `bahasam') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/basque.sty b/Master/texmf-dist/tex/generic/babel/basque.sty index 7d1e49e0bb2..fdf370d6d84 100644 --- a/Master/texmf-dist/tex/generic/babel/basque.sty +++ b/Master/texmf-dist/tex/generic/babel/basque.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `basque') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex index adedbc082c0..10638d754a4 100644 --- a/Master/texmf-dist/tex/generic/babel/blplain.tex +++ b/Master/texmf-dist/tex/generic/babel/blplain.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `blplain') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex index 384eb3bc781..b53e7d11f77 100644 --- a/Master/texmf-dist/tex/generic/babel/bplain.tex +++ b/Master/texmf-dist/tex/generic/babel/bplain.tex @@ -7,7 +7,7 @@ %% babel.dtx (with options: `bplain') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek diff --git a/Master/texmf-dist/tex/generic/babel/breton.sty b/Master/texmf-dist/tex/generic/babel/breton.sty index 186085f5834..1b7ab318653 100644 --- a/Master/texmf-dist/tex/generic/babel/breton.sty +++ b/Master/texmf-dist/tex/generic/babel/breton.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `breton') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/british.sty b/Master/texmf-dist/tex/generic/babel/british.sty index 8573836d1e6..d45d6fb7043 100644 --- a/Master/texmf-dist/tex/generic/babel/british.sty +++ b/Master/texmf-dist/tex/generic/babel/british.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `british') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/bulgarian.sty b/Master/texmf-dist/tex/generic/babel/bulgarian.sty index 45c1e62efb5..2f4b351fd2a 100644 --- a/Master/texmf-dist/tex/generic/babel/bulgarian.sty +++ b/Master/texmf-dist/tex/generic/babel/bulgarian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `bulgarian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/catalan.sty b/Master/texmf-dist/tex/generic/babel/catalan.sty index 56becc08273..933db3709bc 100644 --- a/Master/texmf-dist/tex/generic/babel/catalan.sty +++ b/Master/texmf-dist/tex/generic/babel/catalan.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `catalan') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/croatian.sty b/Master/texmf-dist/tex/generic/babel/croatian.sty index b0eabf5357f..73411c65df3 100644 --- a/Master/texmf-dist/tex/generic/babel/croatian.sty +++ b/Master/texmf-dist/tex/generic/babel/croatian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `croatian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/czech.sty b/Master/texmf-dist/tex/generic/babel/czech.sty index bf0de5730d9..661af92d86a 100644 --- a/Master/texmf-dist/tex/generic/babel/czech.sty +++ b/Master/texmf-dist/tex/generic/babel/czech.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `czech') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/danish.sty b/Master/texmf-dist/tex/generic/babel/danish.sty index af500ce9f77..b5c73cf3fb6 100644 --- a/Master/texmf-dist/tex/generic/babel/danish.sty +++ b/Master/texmf-dist/tex/generic/babel/danish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `danish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/dutch.sty b/Master/texmf-dist/tex/generic/babel/dutch.sty index f9127d3c0e9..9cfeaae5d4f 100644 --- a/Master/texmf-dist/tex/generic/babel/dutch.sty +++ b/Master/texmf-dist/tex/generic/babel/dutch.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `dutch') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/english.sty b/Master/texmf-dist/tex/generic/babel/english.sty index f25c94d414d..a5e23f3216d 100644 --- a/Master/texmf-dist/tex/generic/babel/english.sty +++ b/Master/texmf-dist/tex/generic/babel/english.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `english') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/esperanto.sty b/Master/texmf-dist/tex/generic/babel/esperanto.sty index ee3bd449df2..6bac992170c 100644 --- a/Master/texmf-dist/tex/generic/babel/esperanto.sty +++ b/Master/texmf-dist/tex/generic/babel/esperanto.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `esperanto') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/estonian.sty b/Master/texmf-dist/tex/generic/babel/estonian.sty index 6c354c5f841..6a8661ca74b 100644 --- a/Master/texmf-dist/tex/generic/babel/estonian.sty +++ b/Master/texmf-dist/tex/generic/babel/estonian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `estonian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/finnish.sty b/Master/texmf-dist/tex/generic/babel/finnish.sty index f0b0d92a503..497de73a1c0 100644 --- a/Master/texmf-dist/tex/generic/babel/finnish.sty +++ b/Master/texmf-dist/tex/generic/babel/finnish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `finnish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/francais.sty b/Master/texmf-dist/tex/generic/babel/francais.sty index 512aee4f296..ab46e2df926 100644 --- a/Master/texmf-dist/tex/generic/babel/francais.sty +++ b/Master/texmf-dist/tex/generic/babel/francais.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `francais') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/galician.sty b/Master/texmf-dist/tex/generic/babel/galician.sty index 05db3ae6a29..795699113eb 100644 --- a/Master/texmf-dist/tex/generic/babel/galician.sty +++ b/Master/texmf-dist/tex/generic/babel/galician.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `galician') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/germanb.sty b/Master/texmf-dist/tex/generic/babel/germanb.sty index ebe0495f471..de647f724d6 100644 --- a/Master/texmf-dist/tex/generic/babel/germanb.sty +++ b/Master/texmf-dist/tex/generic/babel/germanb.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `germanb') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/greek.sty b/Master/texmf-dist/tex/generic/babel/greek.sty index 911ef73c9bb..f46c940e32d 100644 --- a/Master/texmf-dist/tex/generic/babel/greek.sty +++ b/Master/texmf-dist/tex/generic/babel/greek.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `greek') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/hebrew.sty b/Master/texmf-dist/tex/generic/babel/hebrew.sty index d4023386a06..0fcd450fbb1 100644 --- a/Master/texmf-dist/tex/generic/babel/hebrew.sty +++ b/Master/texmf-dist/tex/generic/babel/hebrew.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `hebrew') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg index c4cba8ca9f4..c57cc93c239 100644 --- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg +++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg @@ -7,7 +7,7 @@ %% babel.dtx (with options: `patterns') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k 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{hyphen.cfg}[2014/03/17 3.9j Babel hyphens] +\ProvidesFile{hyphen.cfg}[2014/03/24 3.9k Babel hyphens] \xdef\bbl@format{\jobname} \ifx\AtBeginDocument\@undefined \def\@empty{} @@ -83,7 +83,7 @@ \countdef\last@language=19 \def\addlanguage{\alloc@9\language\chardef\@cclvi} \fi -\toks8{Babel <3.9j> and hyphenation patterns for }% +\toks8{Babel <3.9k> and hyphenation patterns for }% \def\process@line#1#2 #3 #4 {% \ifx=#1% \process@synonym{#2}% diff --git a/Master/texmf-dist/tex/generic/babel/icelandic.sty b/Master/texmf-dist/tex/generic/babel/icelandic.sty index 951cbb8a361..7ba707ef1d8 100644 --- a/Master/texmf-dist/tex/generic/babel/icelandic.sty +++ b/Master/texmf-dist/tex/generic/babel/icelandic.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `icelandic') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/interlingua.sty b/Master/texmf-dist/tex/generic/babel/interlingua.sty index dbc2edc975f..a91984044db 100644 --- a/Master/texmf-dist/tex/generic/babel/interlingua.sty +++ b/Master/texmf-dist/tex/generic/babel/interlingua.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `interlingua') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/irish.sty b/Master/texmf-dist/tex/generic/babel/irish.sty index fd9787b5580..9a35409d32c 100644 --- a/Master/texmf-dist/tex/generic/babel/irish.sty +++ b/Master/texmf-dist/tex/generic/babel/irish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `irish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/italian.sty b/Master/texmf-dist/tex/generic/babel/italian.sty index 89034e9a777..a576b1dab02 100644 --- a/Master/texmf-dist/tex/generic/babel/italian.sty +++ b/Master/texmf-dist/tex/generic/babel/italian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `italian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/latin.sty b/Master/texmf-dist/tex/generic/babel/latin.sty index cd9fd9358c1..bb95517b58e 100644 --- a/Master/texmf-dist/tex/generic/babel/latin.sty +++ b/Master/texmf-dist/tex/generic/babel/latin.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `latin') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/lsorbian.sty b/Master/texmf-dist/tex/generic/babel/lsorbian.sty index 56942465fa3..8f0484e11ac 100644 --- a/Master/texmf-dist/tex/generic/babel/lsorbian.sty +++ b/Master/texmf-dist/tex/generic/babel/lsorbian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `lsorbian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def index 4bc4e24fd47..0eeedc14690 100644 --- a/Master/texmf-dist/tex/generic/babel/luababel.def +++ b/Master/texmf-dist/tex/generic/babel/luababel.def @@ -7,7 +7,7 @@ %% bbunicode.dtx (with options: `luatex') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -92,22 +92,6 @@ '\luatexluaescapestring{\string#2}') }% \fi} -\AddBabelHook{luatex}{initiateactive}{% - \bbl@csarg\edef{doactive#2}{% - \futurelet\noexpand\let@token - \expandafter\noexpand\csname luabbl@doactive#2\endcsname}% - \def\bbl@tempa##1##2{% - \@namedef{luabbl@doactive#2}{% - \ifcat\noexpand\let@token a% - \expandafter##1% - \else\ifcat\noexpand\let@token.% - \expandafter\expandafter\expandafter##1% - \else - \expandafter\expandafter\expandafter##2% - \fi\fi}}% - \@expandtwoargs\bbl@tempa - {\expandafter\noexpand\csname user@active#2\endcsname}% - {\expandafter\noexpand\csname normal@char#2\endcsname}} \AddBabelHook{luatex}{everylanguage}{% \directlua{ processnow = (tex.language == 0) or diff --git a/Master/texmf-dist/tex/generic/babel/magyar.sty b/Master/texmf-dist/tex/generic/babel/magyar.sty index 5242bae779e..72ccfb83011 100644 --- a/Master/texmf-dist/tex/generic/babel/magyar.sty +++ b/Master/texmf-dist/tex/generic/babel/magyar.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `magyar') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/naustrian.sty b/Master/texmf-dist/tex/generic/babel/naustrian.sty index f96dce47c32..788eb5a79d4 100644 --- a/Master/texmf-dist/tex/generic/babel/naustrian.sty +++ b/Master/texmf-dist/tex/generic/babel/naustrian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `naustrian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/ngermanb.sty b/Master/texmf-dist/tex/generic/babel/ngermanb.sty index d7b56710723..4dd15781dc8 100644 --- a/Master/texmf-dist/tex/generic/babel/ngermanb.sty +++ b/Master/texmf-dist/tex/generic/babel/ngermanb.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `ngermanb') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf index e0f5e8830c7..b6516c07605 100644 --- a/Master/texmf-dist/tex/generic/babel/nil.ldf +++ b/Master/texmf-dist/tex/generic/babel/nil.ldf @@ -7,7 +7,7 @@ %% babel.dtx (with options: `nil') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -47,7 +47,7 @@ %% TeXniek %% by Javier Bezos %% all rights reserved. -\ProvidesLanguage{nil}[2014/03/17 3.9j Nil language] +\ProvidesLanguage{nil}[2014/03/24 3.9k 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 69d39fb243d..905232e9553 100644 --- a/Master/texmf-dist/tex/generic/babel/norsk.sty +++ b/Master/texmf-dist/tex/generic/babel/norsk.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `norsk') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def index cc4d926543d..b2441523935 100644 --- a/Master/texmf-dist/tex/generic/babel/plain.def +++ b/Master/texmf-dist/tex/generic/babel/plain.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `plain') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k The Babel package] %% Babel package for LaTeX2e. %% Copyright (C) 1989-2008 by Johannes Braams, %% TeXniek @@ -64,6 +64,8 @@ \long\def\@firstofone#1{#1} \long\def\@firstoftwo#1#2{#1} \long\def\@secondoftwo#1#2{#2} +\def\@nnil{\@nil} +\def\@gobbletwo#1#2{} \def\@ifstar#1{\@ifnextchar *{\@firstoftwo{#1}}} \def\@star@or@long#1{% \@ifstar @@ -73,6 +75,7 @@ \def\@car#1#2\@nil{#1} \def\@cdr#1#2\@nil{#2} \let\@typeset@protect\relax +\let\protected@edef\edef \long\def\@gobble#1{} \edef\@backslashchar{\expandafter\@gobble\string\\} \def\strip@prefix#1>{} @@ -103,10 +106,9 @@ \def\begindocument{% \@begindocumenthook \global\let\@begindocumenthook\@undefined - \def\do##1{\global\let ##1\@undefined}% + \def\do##1{\global\let##1\@undefined}% \@preamblecmds - \global\let\do\noexpand - } + \global\let\do\noexpand} \ifx\@begindocumenthook\@undefined \def\@begindocumenthook{} \fi @@ -148,7 +150,16 @@ \advance\@tempcntb \@ne}% \let\@hash@##% \l@ngrel@x\expandafter\def\expandafter#1\reserved@a} -\let\providecommand\newcommand +\def\providecommand{\@star@or@long\provide@command} +\def\provide@command#1{% + \begingroup + \escapechar\m@ne\xdef\@gtempa{{\string#1}}% + \endgroup + \expandafter\@ifundefined\@gtempa + {\def\reserved@a{\new@command#1}}% + {\let\reserved@a\relax + \def\reserved@a{\new@command\reserved@a}}% + \reserved@a}% \def\DeclareRobustCommand{\@star@or@long\declare@robustcommand} \def\declare@robustcommand#1{% \edef\reserved@a{\string#1}% @@ -359,6 +370,23 @@ \ifx\scriptsize\@undefined \let\scriptsize\sevenrm \fi +\let\bbl@opt@shorthands\@nnil +\def\bbl@ifshorthand#1#2#3{#2}% +\ifx\babeloptionstrings\@undefined + \let\bbl@opt@strings\@nnil +\else + \let\bbl@opt@strings\babeloptionstrings +\fi +\def\bbl@tempa{normal} +\ifx\babeloptionmath\bbl@tempa + \def\bbl@mathnormal{\noexpand\textormath} +\fi +\def\BabelStringsDefault{generic} +\ifx\BabelModifiers\@undefined\let\BabelModifiers\relax\fi +\let\bbl@afterlang\relax +\let\bbl@language@opts\@empty +\ifx\@uclclist\@undefined\let\@uclclist\@empty\fi +\def\AfterBabelLanguage#1#2{} %% %% \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 diff --git a/Master/texmf-dist/tex/generic/babel/polish.sty b/Master/texmf-dist/tex/generic/babel/polish.sty index e853c0bb062..d15bf3b58c6 100644 --- a/Master/texmf-dist/tex/generic/babel/polish.sty +++ b/Master/texmf-dist/tex/generic/babel/polish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `polish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/portuges.sty b/Master/texmf-dist/tex/generic/babel/portuges.sty index 2fce7e4122a..a8b88d9618d 100644 --- a/Master/texmf-dist/tex/generic/babel/portuges.sty +++ b/Master/texmf-dist/tex/generic/babel/portuges.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `portuges') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/romanian.sty b/Master/texmf-dist/tex/generic/babel/romanian.sty index f91b4b1116d..6edc185bca1 100644 --- a/Master/texmf-dist/tex/generic/babel/romanian.sty +++ b/Master/texmf-dist/tex/generic/babel/romanian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `romanian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/russianb.sty b/Master/texmf-dist/tex/generic/babel/russianb.sty index b01b0e76764..aaba8687e21 100644 --- a/Master/texmf-dist/tex/generic/babel/russianb.sty +++ b/Master/texmf-dist/tex/generic/babel/russianb.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `russianb') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/samin.sty b/Master/texmf-dist/tex/generic/babel/samin.sty index 6acc8c8abb7..10445d8badc 100644 --- a/Master/texmf-dist/tex/generic/babel/samin.sty +++ b/Master/texmf-dist/tex/generic/babel/samin.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `samin') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/scottish.sty b/Master/texmf-dist/tex/generic/babel/scottish.sty index 29a0715380e..61293c00c1e 100644 --- a/Master/texmf-dist/tex/generic/babel/scottish.sty +++ b/Master/texmf-dist/tex/generic/babel/scottish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `scottish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/serbian.sty b/Master/texmf-dist/tex/generic/babel/serbian.sty index 88b9d7a8207..37745f80136 100644 --- a/Master/texmf-dist/tex/generic/babel/serbian.sty +++ b/Master/texmf-dist/tex/generic/babel/serbian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `serbian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/slovak.sty b/Master/texmf-dist/tex/generic/babel/slovak.sty index c4458ab594e..dce48fc3d7c 100644 --- a/Master/texmf-dist/tex/generic/babel/slovak.sty +++ b/Master/texmf-dist/tex/generic/babel/slovak.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `slovak') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/slovene.sty b/Master/texmf-dist/tex/generic/babel/slovene.sty index c1017f6fa43..cd85202268f 100644 --- a/Master/texmf-dist/tex/generic/babel/slovene.sty +++ b/Master/texmf-dist/tex/generic/babel/slovene.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `slovene') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/spanish.sty b/Master/texmf-dist/tex/generic/babel/spanish.sty index a859993135d..513b99d685f 100644 --- a/Master/texmf-dist/tex/generic/babel/spanish.sty +++ b/Master/texmf-dist/tex/generic/babel/spanish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `spanish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/swedish.sty b/Master/texmf-dist/tex/generic/babel/swedish.sty index 0ec86e1305c..632af814044 100644 --- a/Master/texmf-dist/tex/generic/babel/swedish.sty +++ b/Master/texmf-dist/tex/generic/babel/swedish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `swedish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def index 5a491fdd18a..35a19975f96 100644 --- a/Master/texmf-dist/tex/generic/babel/switch.def +++ b/Master/texmf-dist/tex/generic/babel/switch.def @@ -7,7 +7,7 @@ %% babel.dtx (with options: `kernel') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% @@ -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}[2014/03/17 v3.9j The Babel package] +%%\ProvidesFile{babel.dtx}[2014/03/24 v3.9k 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}[2014/03/17 3.9j Babel switching mechanism] +\ProvidesFile{switch.def}[2014/03/24 3.9k 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.9j} -\def\bbl@date{2014/03/17} +\def\bbl@version{3.9k} +\def\bbl@date{2014/03/24} \def\adddialect#1#2{% \global\chardef#1#2\relax \bbl@usehooks{adddialect}{{#1}{#2}}% diff --git a/Master/texmf-dist/tex/generic/babel/turkish.sty b/Master/texmf-dist/tex/generic/babel/turkish.sty index 74450ed0d35..11f68b1099f 100644 --- a/Master/texmf-dist/tex/generic/babel/turkish.sty +++ b/Master/texmf-dist/tex/generic/babel/turkish.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `turkish') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/ukraineb.sty b/Master/texmf-dist/tex/generic/babel/ukraineb.sty index f5032a7e919..64918fe7918 100644 --- a/Master/texmf-dist/tex/generic/babel/ukraineb.sty +++ b/Master/texmf-dist/tex/generic/babel/ukraineb.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `ukraineb') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/usorbian.sty b/Master/texmf-dist/tex/generic/babel/usorbian.sty index e2e38241a2b..fdde3cd5ae5 100644 --- a/Master/texmf-dist/tex/generic/babel/usorbian.sty +++ b/Master/texmf-dist/tex/generic/babel/usorbian.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `usorbian') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/welsh.sty b/Master/texmf-dist/tex/generic/babel/welsh.sty index 86eca3e0872..48e3ac79906 100644 --- a/Master/texmf-dist/tex/generic/babel/welsh.sty +++ b/Master/texmf-dist/tex/generic/babel/welsh.sty @@ -7,7 +7,7 @@ %% bbcompat.dtx (with options: `welsh') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def index e16cc6b6440..1aef9bb3b4e 100644 --- a/Master/texmf-dist/tex/generic/babel/xebabel.def +++ b/Master/texmf-dist/tex/generic/babel/xebabel.def @@ -7,7 +7,7 @@ %% bbunicode.dtx (with options: `xetex') %% This is a generated file. %% -%% Copyright 2012-2013 Javier Bezos and Johannes L. Braams. +%% Copyright 2012-2014 Javier Bezos and Johannes L. Braams. %% Copyright 1989-2008 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% -- cgit v1.2.3