summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/babel/CONTRIB9
-rw-r--r--Master/texmf-dist/doc/latex/babel/README7
-rw-r--r--Master/texmf-dist/doc/latex/babel/babel.pdfbin581339 -> 581648 bytes
-rw-r--r--Master/texmf-dist/source/latex/babel/babel.dtx26
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def6
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg12
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def8
9 files changed, 47 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/babel/CONTRIB b/Master/texmf-dist/doc/latex/babel/CONTRIB
index 0cbafdd1ffb..161d658e3f7 100644
--- a/Master/texmf-dist/doc/latex/babel/CONTRIB
+++ b/Master/texmf-dist/doc/latex/babel/CONTRIB
@@ -3,8 +3,11 @@ Guidelines for contributed languages
Now language files are "outsourced" and are located in a separate
directory, so that they are contributed directly to CTAN (please, do
-not send to me language styles just to upload them to CTAN). Of
-course, placing your style files in this directory is not mandatory,
+not send to me language styles just to upload them to CTAN):
+
+/macros/latex/contrib/babel-contrib
+
+Of course, placing your style files in this directory is not mandatory,
but if you want to do it, here are a few guidelines.
- Do not hesitate stating on the file heads you are the author and the
@@ -28,4 +31,4 @@ course, you can make any suggestion you like.
------------
Javier Bezos
-2013/03/25
+2013/05/16
diff --git a/Master/texmf-dist/doc/latex/babel/README b/Master/texmf-dist/doc/latex/babel/README
index 4a7aca9979e..5b730e8cc92 100644
--- a/Master/texmf-dist/doc/latex/babel/README
+++ b/Master/texmf-dist/doc/latex/babel/README
@@ -1,7 +1,7 @@
-Babel 3.9e
+Babel 3.9f
----------
-This is Babel 3.9e.
+This is Babel 3.9f.
Version 3.9a fixed lots of bugs and added some new features, intended
mainly to make it compatible somehow with Unicode engines. Some bugs
@@ -44,10 +44,11 @@ New
- Code reorganized (just an "internal" change)
3.9e - Fixed a bug introduced in 3.9c which mangled key=value
options.
+3.9f - Default hyphenmins were not set to 2 3. Now they are again.
* bbunicode.dtx
1.0b - Improvements by Elie Roux for LuaTeX.
------------
Javier Bezos
-2013-04-22
+2013-05-16
diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf
index db6652a0e48..681da726e5e 100644
--- a/Master/texmf-dist/doc/latex/babel/babel.pdf
+++ b/Master/texmf-dist/doc/latex/babel/babel.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx
index ccb3254716c..15a5b97bfb4 100644
--- a/Master/texmf-dist/source/latex/babel/babel.dtx
+++ b/Master/texmf-dist/source/latex/babel/babel.dtx
@@ -44,7 +44,7 @@
%
%% File 'babel.dtx'
%\fi
-%%\ProvidesFile{babel.dtx}[2013/04/15 v3.9e The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%\iffalse
%
% Babel DOCUMENT-STYLE option for LaTeX version 2.09 or plain TeX;
@@ -85,8 +85,6 @@
\newcommand*\cls[1]{\texttt{#1}}
\newcommand*\pkg[1]{\texttt{#1}}
\addtolength{\oddsidemargin}{1em}
-\lefthyphenmin=2
-\righthyphenmin=3
% Stolen and adapted from microtype:
\usepackage{color}
\definecolor{thered} {rgb}{0.65,0.04,0.07}
@@ -1231,7 +1229,7 @@ dialect and an attribute.
\begin{verbatim}
\ProvidesLanguage{<language>}
- [2013/04/22 v0.0 <Language> support from the babel system]
+ [2013/05/16 v0.0 <Language> support from the babel system]
\LdfInit{<language>}{captions<language>}
\ifx\undefined\l@<language>
@@ -1934,8 +1932,8 @@ help from Bernd Raichle, for which I am grateful.
% necessary}
% \begin{macrocode}
%<*kernel>
-\def\bbl@version{3.9e}
-\def\bbl@date{2013/04/15}
+\def\bbl@version{3.9f}
+\def\bbl@date{2013/05/16}
%</kernel>
%<*patterns>
\xdef\bbl@format{\jobname}
@@ -1990,7 +1988,7 @@ help from Bernd Raichle, for which I am grateful.
%<nil>\ProvidesLanguage{nil}
%<driver&!user>\ProvidesFile{babel.drv}
%<driver&user>\ProvidesFile{user.drv}
- [2013/04/15 v3.9e %
+ [2013/05/16 v3.9f %
%<package> The Babel package]
%<core> Babel common definitions]
%<kernel|patterns> Babel language switching mechanism]
@@ -2042,10 +2040,10 @@ help from Bernd Raichle, for which I am grateful.
%<*package>
\@ifpackagewith{babel}{debug}
{\let\bbl@tempa\relax}
- {\def\bbl@tempa{3.9e}}%
+ {\def\bbl@tempa{3.9f}}%
%</package>
%<*core>
-\def\bbl@tempa{3.9e}
+\def\bbl@tempa{3.9f}
%</core>
%<*core|package>
\ifx\bbl@version\bbl@tempa\else
@@ -6874,7 +6872,7 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
%<*patterns>
-\toks8{Babel <3.9e> and hyphenation patterns for }%
+\toks8{Babel <3.9f> and hyphenation patterns for }%
% \end{macrocode}
%
% \changes{babel~3.5g}{1996/07/09}{Removed the use of
@@ -7013,6 +7011,8 @@ help from Bernd Raichle, for which I am grateful.
% \cs{@empty} as the latter is unknown in plain}
%
% \changes{babel~3.9a}{2012/06/25}{Added \cs{bbl@languages}}
+% \changes{babel~3.9f}{2013/05/16}{Restored code to set default
+% hyphenmins, which was deleted mistakenly}
% \cs{bbl@languages} saves a snapshot of the loaded languagues in the
% form \cs{bbl@elt}\marg{language-name}\marg{number}%
% \marg{patterns-file}\marg{exceptions-file}. Note the last 2
@@ -7047,6 +7047,12 @@ help from Bernd Raichle, for which I am grateful.
\edef\bbl@languages{%
\bbl@languages\bbl@elt{#1}{\the\language}{#2}{\bbl@tempa}}%
\ifnum\the\language=\z@
+ \expandafter\ifx\csname #1hyphenmins\endcsname\relax
+ \set@hyphenmins\tw@\thr@@\relax
+ \else
+ \expandafter\expandafter\expandafter\set@hyphenmins
+ \csname #1hyphenmins\endcsname
+ \fi
\the\toks@
\toks@{}%
\fi}
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 840bebbc8a9..be6f32123e6 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/04/15 v3.9e The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -58,12 +58,12 @@
}
\fi
\ProvidesFile{babel.def}
- [2013/04/15 v3.9e %
+ [2013/05/16 v3.9f %
Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
-\def\bbl@tempa{3.9e}
+\def\bbl@tempa{3.9f}
\ifx\bbl@version\bbl@tempa\else
\input switch.def\relax
\fi
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 1fd791be7f7..f479ee0eef4 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/04/15 v3.9e The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -49,11 +49,11 @@
%% by Javier Bezos
%% all rights reserved.
\ProvidesPackage{babel}
- [2013/04/15 v3.9e %
+ [2013/05/16 v3.9f %
The Babel package]
\@ifpackagewith{babel}{debug}
{\let\bbl@tempa\relax}
- {\def\bbl@tempa{3.9e}}%
+ {\def\bbl@tempa{3.9f}}%
\ifx\bbl@version\bbl@tempa\else
\input switch.def\relax
\fi
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index b2aa4446012..d8cb2b5a720 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/04/15 v3.9e The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -55,7 +55,7 @@
}
\fi
\ProvidesFile{hyphen.cfg}
- [2013/04/15 v3.9e %
+ [2013/05/16 v3.9f %
Babel language switching mechanism]
\ifx\AtBeginDocument\@undefined
\let\orig@dump\dump
@@ -78,7 +78,7 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\toks8{Babel <3.9e> and hyphenation patterns for }%
+\toks8{Babel <3.9f> and hyphenation patterns for }%
\def\process@line#1#2 #3 #4 {%
\ifx=#1%
\process@synonym{#2}%
@@ -122,6 +122,12 @@
\edef\bbl@languages{%
\bbl@languages\bbl@elt{#1}{\the\language}{#2}{\bbl@tempa}}%
\ifnum\the\language=\z@
+ \expandafter\ifx\csname #1hyphenmins\endcsname\relax
+ \set@hyphenmins\tw@\thr@@\relax
+ \else
+ \expandafter\expandafter\expandafter\set@hyphenmins
+ \csname #1hyphenmins\endcsname
+ \fi
\the\toks@
\toks@{}%
\fi}
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index cbcaea124fd..2796adeedb7 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/04/15 v3.9e The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -48,7 +48,7 @@
%% by Javier Bezos
%% all rights reserved.
\ProvidesLanguage{nil}
- [2013/04/15 v3.9e %
+ [2013/05/16 v3.9f %
Nil language]
\LdfInit{nil}{datenil}
\ifx\l@nohyphenation\@undefined
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index d8fb0240f4f..b56bd93ef6e 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/04/15 v3.9e The Babel package]
+%%\ProvidesFile{babel.dtx}[2013/05/16 v3.9f The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
@@ -47,8 +47,8 @@
%% TeXniek
%% by Javier Bezos
%% all rights reserved.
-\def\bbl@version{3.9e}
-\def\bbl@date{2013/04/15}
+\def\bbl@version{3.9f}
+\def\bbl@date{2013/05/16}
\ifx\ProvidesFile\@undefined
\def\ProvidesFile#1[#2 #3 #4]{%
\wlog{File: #1 #4 #3 <#2>}%
@@ -70,7 +70,7 @@
\endgroup}
\fi
\ProvidesFile{switch.def}
- [2013/04/15 v3.9e %
+ [2013/05/16 v3.9f %
Babel language switching mechanism]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 06:56:27 +0000