summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel/babel.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-10-12 22:48:28 +0000
committerKarl Berry <karl@freefriends.org>2013-10-12 22:48:28 +0000
commit246b5665edc2af75b55662b748e9ad83f3dac101 (patch)
treeee34732675812d84422a6593f588e528e3d6fdf2 /Master/texmf-dist/tex/generic/babel/babel.sty
parent0ec188e4bda5bbce1ca6bb39f8e121f7c47d0adf (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/babel.sty')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty25
1 files changed, 14 insertions, 11 deletions
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}}