summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/babel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-04 00:01:59 +0000
committerKarl Berry <karl@freefriends.org>2013-12-04 00:01:59 +0000
commitf077be0a1cb84cd0031d4d47104a836f7cf255be (patch)
tree0096f7c448cdbba23e9e70d171ccb5e41389dddc /Master/texmf-dist/tex/generic/babel
parent20f40b1b909d575836f8af15228fbbbc9566a0b5 (diff)
babel (3dec13)
git-svn-id: svn://tug.org/texlive/trunk@32311 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel')
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def87
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/blplain.tex2
-rw-r--r--Master/texmf-dist/tex/generic/babel/bplain.tex2
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg6
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel/plain.def7
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def19
8 files changed, 68 insertions, 65 deletions
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index a58501aec4a..23c13db2653 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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h 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}[2013/10/10 3.9g Babel common definitions]
+\ProvidesFile{babel.def}[2013/12/03 3.9h Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
-\def\bbl@tempa{3.9g}%
+\def\bbl@tempa{3.9h}%
\ifx\bbl@version\bbl@tempa\else
\input switch.def\relax
\fi
@@ -420,7 +420,8 @@
The character `\string #1' should be made a shorthand character;\\%
add the command \string\useshorthands\string{#1\string} to
the preamble.\\%
- I will ignore your instruction}{}}
+ I will ignore your instruction}%
+ {You may proceed, but expect unexpected results}}
\newcommand*\shorthandon[1]{\bbl@switch@sh\@ne#1\@nnil}
\DeclareRobustCommand*\shorthandoff{%
\@ifstar{\bbl@shorthandoff\tw@}{\bbl@shorthandoff\z@}}
@@ -869,26 +870,24 @@
\def\StartBabelCommands{%
\begingroup
\bbl@recatcode{11}%
- \def\SetStringLoop{\afterassignment\bbl@sclp\def\bbl@templ####1}%
- \def\bbl@sclp##1{%
- \def\bbl@tempk{\@ne}%
- \@for\bbl@tempm:=##1\do{%
- \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@}}%
- \advance\count@\@ne
- \edef\bbl@tempk{\the\count@}%
- \expandafter\SetString\bbl@tempn}}%
+ \def\SetStringLoop##1##2{%
+ \def\bbl@templ####1{\expandafter\noexpand\csname##1\endcsname}%
+ \count@\z@
+ \@for\bbl@tempa:=\@empty##2\do{% \@empty "undoes" \expandafter
+ \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{%
- \expandafter\bbl@stringdef
+ \expandafter\bbl@encstring
\csname\bbl@tempa @bbl@uclc\endcsname{\reserved@a##1}%
- \expandafter\bbl@stringdef
+ \expandafter\bbl@encstring
\csname\bbl@tempa @bbl@uc\endcsname{##2}%
- \expandafter\bbl@stringdef
+ \expandafter\bbl@encstring
\csname\bbl@tempa @bbl@lc\endcsname{##3}}}%
\def\bbl@provstring##1##2{%
\providecommand##1{##2}%
@@ -952,20 +951,25 @@
\@expandtwoargs
\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\bbl@opt@strings\@nnil % ie, no strings -> defaults
+ \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
+ \bbl@scswitch
+ \ifx\bbl@G\@empty
+ \def\SetString##1##2{%
+ \bbl@error{Missing group for string \string##1}%
+ {You must assign strings to some category, typically\\%
+ captions or extras, but you set none}}%
+ \fi
\ifx\@empty#1%
\@expandtwoargs
\bbl@usehooks{defaultcommands}{}%
@@ -976,10 +980,8 @@
\def\bbl@forlang#1#2{%
\bbl@for#1\bbl@L{%
\@expandtwoargs\in@{,#1,}{,\BabelLanguages,}%
- \ifin@#2\fi}}
-\def\bbl@scswitch#1{%
- #1\relax
- \bbl@scswitch@i
+ \ifin@#2\relax\fi}}
+\def\bbl@scswitch{%
\bbl@forlang\bbl@tempa{%
\ifx\bbl@G\@empty\else
\ifx\SetString\@gobbletwo\else
@@ -991,16 +993,9 @@
\fi
\fi
\fi}}
-\def\bbl@scswitch@i{%
- \ifx\bbl@G\@empty
- \def\SetString##1##2{%
- \bbl@error{Missing group for string \string##1}%
- {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}%
- \def\bbl@forlang#1#2{\bbl@for#1\bbl@L{\@ifundefined{date#1}{}{#2}}}}
+ \def\bbl@forlang#1#2{\bbl@for#1\bbl@L{\@ifundefined{date#1}{}{#2}}}%
+ \let\bbl@scswitch\relax}
\@onlypreamble\EndBabelCommands
\def\EndBabelCommands{%
\bbl@usehooks{stopcommands}{}%
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 26a28eaeac6..b66ffcd0001 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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -48,10 +48,10 @@
%% TeXniek
%% by Javier Bezos
%% all rights reserved.
-\ProvidesPackage{babel}[2013/10/10 3.9g The Babel package]
+\ProvidesPackage{babel}[2013/12/03 3.9h The Babel package]
\@ifpackagewith{babel}{debug}
{\input switch.def\relax}
- {\def\bbl@tempa{3.9g}%
+ {\def\bbl@tempa{3.9h}%
\ifx\bbl@version\bbl@tempa\else
\input switch.def\relax
\fi}
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index 29f4bca9338..abb4b6f2c05 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h 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 2e53f89e0f1..81d5a5cc5bc 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 6d462814d0a..9c5591cd7bc 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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h 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}[2013/10/10 3.9g Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2013/12/03 3.9h 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.9g> and hyphenation patterns for }%
+\toks8{Babel <3.9h> 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/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 55908c7ab78..76cb69c6632 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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h 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}[2013/10/10 3.9g Nil language]
+\ProvidesLanguage{nil}[2013/12/03 3.9h Nil language]
\LdfInit{nil}{datenil}
\ifx\l@nohyphenation\@undefined
\@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index 4c97dc9b692..2ca0a36cbcd 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -89,6 +89,10 @@
\fi}
\def\@expandtwoargs#1#2#3{%
\edef\reserved@a{\noexpand#1{#2}{#3}}\reserved@a}
+\def\zap@space#1 #2{%
+ #1%
+ \ifx#2\@empty\else\expandafter\zap@space\fi
+ #2}
\ifx\@preamblecmds\@undefined
\def\@preamblecmds{}
\fi
@@ -113,6 +117,7 @@
\def\@endofldf{}
\@onlypreamble\@endofldf
\let\bbl@afterlang\@empty
+\chardef\bbl@hymapopt\z@
\ifx\if@filesw\@undefined
\expandafter\let\csname if@filesw\expandafter\endcsname
\csname iffalse\endcsname
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 4c29ac1367d..592bd52dde0 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/10/10 v3.9g The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/12/03 v3.9h 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}[2013/10/10 3.9g Babel switching mechanism]
+\ProvidesFile{switch.def}[2013/12/03 3.9h 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.9g}
-\def\bbl@date{2013/10/10}
+\def\bbl@version{3.9h}
+\def\bbl@date{2013/12/03}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%
@@ -126,7 +126,7 @@
\bbl@push@language
\aftergroup\bbl@pop@language
\bbl@set@language{#1}}
-\def\BabelContentsFiles{toc,lof,lot}%
+\def\BabelContentsFiles{toc,lof,lot}
\def\bbl@set@language#1{%
\edef\languagename{%
\ifnum\escapechar=\expandafter`\string#1\@empty
@@ -147,7 +147,10 @@
\bbl@iflanguage\languagename{%
\expandafter\ifx\csname date\languagename\endcsname\relax
\bbl@error
- {You haven't loaded the language #1\space yet}%
+ {Unknown language `#1'. Either you have\\%
+ misspelled its name, it has not been installed,\\%
+ or you requested it in a previous run. Fix its name,\\%
+ install it or just rerun the file, respectively}%
{You may proceed, but expect unexpected results}%
\else
\let\bbl@select@type\z@
@@ -174,7 +177,7 @@
\csname extras#1\endcsname\relax
\bbl@usehooks{afterextras}{}%
\ifcase\bbl@hymapopt\or
- \renewcommand\BabelLower[2]{\lccode##1=##2\relax}%
+ \def\BabelLower##1##2{\lccode##1=##2\relax}%
\ifnum\bbl@hymapsel>4\else
\csname\languagename @bbl@hyphenmap\endcsname
\fi
@@ -228,7 +231,7 @@
\bbl@iflanguage\languagename{%
\expandafter\ifx\csname date\languagename\endcsname\relax
\bbl@warning
- {You haven't loaded the language #1\space yet\\%
+ {You haven't loaded the language \languagename\space yet\\%
I'll proceed, but expect unexpected results.\\%
Reported}%
\fi