summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/babel.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel/babel.sty')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty27
1 files changed, 13 insertions, 14 deletions
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{`}%