summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-04-12 12:47:35 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-04-12 12:47:35 +0000
commite1666d1d83abb4bf3869a2a51b860367ba6da1ea (patch)
tree0613fa7e5bc37f529d66e27284f5fec6a40d3afe /Master/texmf-dist
parentaebcc2b16b6b785a2b95ff1aebf9e2701593a21d (diff)
babel update from latex-tds (12apr2008)
git-svn-id: svn://tug.org/texlive/trunk@7390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/babel/00readme.txt6
-rw-r--r--Master/texmf-dist/doc/generic/babel/athnum.pdfbin96989 -> 96989 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/babel.pdfbin2343328 -> 2348645 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/bbcompat.pdfbin52891 -> 52891 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/bbidxglo.pdfbin58686 -> 58685 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/changes.txt85
-rw-r--r--Master/texmf-dist/doc/generic/babel/greek-fdd.pdfbin96765 -> 96766 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/greek-usage.pdfbin109184 -> 109187 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/grmath.pdfbin68059 -> 68059 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/grsymb.pdfbin66197 -> 66197 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/howtoget.txt2
-rw-r--r--Master/texmf-dist/doc/generic/babel/language.skeleton8
-rw-r--r--Master/texmf-dist/doc/generic/babel/tb1202.pdfbin174710 -> 174711 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/tb1401.pdfbin96189 -> 96189 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/tb1604.pdfbin123374 -> 123373 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel/todo.txt9
-rw-r--r--Master/texmf-dist/makeindex/babel/bbglo.ist2
-rw-r--r--Master/texmf-dist/makeindex/babel/bbind.ist2
-rw-r--r--Master/texmf-dist/source/generic/babel/babel.dtx89
-rw-r--r--Master/texmf-dist/source/generic/babel/babel.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/bahasa.dtx10
-rw-r--r--Master/texmf-dist/source/generic/babel/bahasa.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/bahasam.dtx33
-rw-r--r--Master/texmf-dist/source/generic/babel/base.ins17
-rw-r--r--Master/texmf-dist/source/generic/babel/bbcompat.dtx13
-rw-r--r--Master/texmf-dist/source/generic/babel/bbplain.dtx8
-rw-r--r--Master/texmf-dist/source/generic/babel/bulgarian.dtx14
-rw-r--r--Master/texmf-dist/source/generic/babel/bulgarian.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/catmik.tex33
-rw-r--r--Master/texmf-dist/source/generic/babel/danish.dtx46
-rw-r--r--Master/texmf-dist/source/generic/babel/danish.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/frenchb.dtx3489
-rw-r--r--Master/texmf-dist/source/generic/babel/frenchb.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/galician.dtx2697
-rw-r--r--Master/texmf-dist/source/generic/babel/galician.ins39
-rw-r--r--Master/texmf-dist/source/generic/babel/german.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/germanb.dtx25
-rw-r--r--Master/texmf-dist/source/generic/babel/italian.dtx27
-rw-r--r--Master/texmf-dist/source/generic/babel/italian.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/latin.dtx280
-rw-r--r--Master/texmf-dist/source/generic/babel/latin.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/lsorbian.dtx8
-rw-r--r--Master/texmf-dist/source/generic/babel/mik2t2.tex33
-rw-r--r--Master/texmf-dist/source/generic/babel/ngermanb.dtx10
-rw-r--r--Master/texmf-dist/source/generic/babel/portuges.dtx14
-rw-r--r--Master/texmf-dist/source/generic/babel/portuges.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/russianb.dtx15
-rw-r--r--Master/texmf-dist/source/generic/babel/russianb.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/sorbian.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/spanish.dtx3607
-rw-r--r--Master/texmf-dist/source/generic/babel/spanish.ins111
-rw-r--r--Master/texmf-dist/source/generic/babel/tb1202.tex2
-rw-r--r--Master/texmf-dist/source/generic/babel/tb1401.tex2
-rw-r--r--Master/texmf-dist/source/generic/babel/tb1604.tex2
-rw-r--r--Master/texmf-dist/source/generic/babel/ukraineb.dtx12
-rw-r--r--Master/texmf-dist/source/generic/babel/ukraineb.ins6
-rw-r--r--Master/texmf-dist/source/generic/babel/usorbian.dtx23
-rw-r--r--Master/texmf-dist/tex/generic/babel/UKenglish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/USenglish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/afrikaans.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/albanian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/american.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/austrian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def19
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty19
-rw-r--r--Master/texmf-dist/tex/generic/babel/bahasa.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/bahasai.ldf10
-rw-r--r--Master/texmf-dist/tex/generic/babel/bahasam.ldf27
-rw-r--r--Master/texmf-dist/tex/generic/babel/bahasam.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/basque.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/blplain.tex6
-rw-r--r--Master/texmf-dist/tex/generic/babel/bplain.tex6
-rw-r--r--Master/texmf-dist/tex/generic/babel/breton.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/british.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/bulgarian.ldf10
-rw-r--r--Master/texmf-dist/tex/generic/babel/bulgarian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/catalan.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/croatian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/czech.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/danish.ldf16
-rw-r--r--Master/texmf-dist/tex/generic/babel/danish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/dutch.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/english.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/esperanto.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/estonian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/finnish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/francais.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/frenchb.cfg200
-rw-r--r--Master/texmf-dist/tex/generic/babel/frenchb.ldf1288
-rw-r--r--Master/texmf-dist/tex/generic/babel/galician.ldf846
-rw-r--r--Master/texmf-dist/tex/generic/babel/galician.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/germanb.ldf21
-rw-r--r--Master/texmf-dist/tex/generic/babel/germanb.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/glbst.tex (renamed from Master/texmf-dist/tex/generic/babel/esbst.tex)64
-rw-r--r--Master/texmf-dist/tex/generic/babel/glromidx.tex216
-rw-r--r--Master/texmf-dist/tex/generic/babel/greek.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/hebrew.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg16
-rw-r--r--Master/texmf-dist/tex/generic/babel/icelandic.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/interlingua.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/irish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/italian.ldf15
-rw-r--r--Master/texmf-dist/tex/generic/babel/italian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/latin.ldf66
-rw-r--r--Master/texmf-dist/tex/generic/babel/latin.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/lsorbian.ldf8
-rw-r--r--Master/texmf-dist/tex/generic/babel/lsorbian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/magyar.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/naustrian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/ngermanb.ldf10
-rw-r--r--Master/texmf-dist/tex/generic/babel/ngermanb.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/norsk.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/plain.def6
-rw-r--r--Master/texmf-dist/tex/generic/babel/polish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/portuges.ldf10
-rw-r--r--Master/texmf-dist/tex/generic/babel/portuges.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/romanian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/romanidx.sty (renamed from Master/texmf-dist/tex/generic/babel/romanidx.tex)79
-rw-r--r--Master/texmf-dist/tex/generic/babel/russianb.ldf10
-rw-r--r--Master/texmf-dist/tex/generic/babel/russianb.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/samin.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/scottish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/serbian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/slovak.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/slovene.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/spanish.ldf1368
-rw-r--r--Master/texmf-dist/tex/generic/babel/spanish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/swedish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def16
-rw-r--r--Master/texmf-dist/tex/generic/babel/turkish.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/ukraineb.ldf12
-rw-r--r--Master/texmf-dist/tex/generic/babel/ukraineb.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/usorbian.ldf15
-rw-r--r--Master/texmf-dist/tex/generic/babel/usorbian.sty6
-rw-r--r--Master/texmf-dist/tex/generic/babel/welsh.sty6
135 files changed, 9131 insertions, 6399 deletions
diff --git a/Master/texmf-dist/doc/generic/babel/00readme.txt b/Master/texmf-dist/doc/generic/babel/00readme.txt
index da95f418547..9fd45ef96df 100644
--- a/Master/texmf-dist/doc/generic/babel/00readme.txt
+++ b/Master/texmf-dist/doc/generic/babel/00readme.txt
@@ -1,6 +1,6 @@
Babel Distribution Guide
- 29 March 2005
+ 17 March 2008
Welcome to the Babel system!
@@ -69,9 +69,9 @@ WARNINGS:
occurs in the argument of \uppercase
Send any suggestions, additions, complaints, to me:
-e-mail: babel at braams.cistron.nl
+e-mail: babel at braams.xs4all.nl
address: Kersengaarde 33
2723 BP Zoetermeer
The Netherlands
Note that I am more likely to respond to e-mail.
---- Copyright 1997,2005 Johannes Braams. All rights reserved ---
+--- Copyright 1997,2008 Johannes Braams. All rights reserved ---
diff --git a/Master/texmf-dist/doc/generic/babel/athnum.pdf b/Master/texmf-dist/doc/generic/babel/athnum.pdf
index 37550e06a81..531e2b5340a 100644
--- a/Master/texmf-dist/doc/generic/babel/athnum.pdf
+++ b/Master/texmf-dist/doc/generic/babel/athnum.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/babel.pdf b/Master/texmf-dist/doc/generic/babel/babel.pdf
index 2e4086a96eb..6c606d750b1 100644
--- a/Master/texmf-dist/doc/generic/babel/babel.pdf
+++ b/Master/texmf-dist/doc/generic/babel/babel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/bbcompat.pdf b/Master/texmf-dist/doc/generic/babel/bbcompat.pdf
index 9a564d80b44..1765a49cf8d 100644
--- a/Master/texmf-dist/doc/generic/babel/bbcompat.pdf
+++ b/Master/texmf-dist/doc/generic/babel/bbcompat.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf b/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf
index 66fe7c79d59..b198cb4e2d5 100644
--- a/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf
+++ b/Master/texmf-dist/doc/generic/babel/bbidxglo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/changes.txt b/Master/texmf-dist/doc/generic/babel/changes.txt
index 96491ddb346..7f818a19239 100644
--- a/Master/texmf-dist/doc/generic/babel/changes.txt
+++ b/Master/texmf-dist/doc/generic/babel/changes.txt
@@ -8,7 +8,84 @@ are not part of the distribution.
==========================================================================
-2005-11-23 Johannes Braams <babel at latex-project.org)
+2008-03-17 Johannes Braams <babel at latex-project.org)
+
+ * danish/danish.dtx : Set the \lefthyphenmin parameter to 2 by
+ default on request by the Danish users through Palle Jørgensen
+ Also added definitions for"/ and \- (copied from dutch.ldf) as per
+ the same request.
+
+ * german/germanb.dtx: When the option germanb needs to work like
+ german it is not sufficient to just change the value of
+ \CurrentOption. It also needs the setting of \l@germanb and the
+ four definiing macros. (PR 3992)
+
+ * sorbian/usorbian.dtx : When the lowercase code of the character
+ ^Y is to be changed we need to make sure that the caret has
+ category code 7. (PR 3992)
+
+2008-03-16 Johannes Braams <babel at latex-project.org)
+
+ * base/babel.dtx (subsubsection{\pkg{hyperref}}): Added some code
+ to let hyphenref swith the shorthands to system level (PR4006)
+ (subsection{Multiple languages}): Added the setting of the
+ hyphenmin parameters to the \hyphenrules command (PR3997)
+
+2008-03-15 Johannes Braams <babel at latex-project.org)
+
+ * bahasa/bahasam.dtx: New version from Bob Margolis with corrected
+ translations.
+
+2008-03-14 Johannes Braams (babel at latex-project.org)
+
+ * italian/italian.dtx : New version from Claudio, fixing a
+ cllubpenalty bug
+
+2008-03-13 Johannes Braams (babel at latex-project.org)
+
+ * latin/latin.dtx: New version from Claudio Beccari, merged with
+ master source.
+
+ * french/french.dtx New version from Daniel Flipo (2.0e)
+
+2007-10-20 Johannes Braams (babel at latex-project.org)
+
+ * latin/latin.dtx: The line with
+ \addtoextraslanguage{\LatinMarksOff} contained a typo; fixing that
+ brought to light that it needed to be removed as it generated an
+ error from \begin{document} PR 3960 by David Kastrup
+
+2007-10-19 Johannes Braams (babel at latex-project.org)
+
+ * sorbian/usorbian.dtx: The Babel option uppersorbian wasn't
+ supported, reported (PR 3982) by Uwe Stoehr
+
+ * sorbian/lsorbian.dtx: The Babel option lowersorbian wasn't
+ supported, reported (PR 3982) by Uwe Stoehr
+
+2006-06-05 Johannes Braams (babel at latex-project.org)
+
+ * esperanto/esperanto.dtx: The macros \esper and \Esper were
+ missing the letter 'r'; (PR3866), found by Paul Ebermann
+
+ * finnish/finnish.dtx: Small documentation fix (PR3871) from
+ Heik Oberdiek.
+
+ * frenchb/frenchb.dtx: Small documentation fix (PR3871) from
+ Heik Oberdiek.
+
+ * base/bbcompat.dtx: Small documentation fix (PR3871) from
+ Heiko Oberdiek.
+
+ * albanian/albanian.dtx: Small documentation fix (PR3871) from
+ Heiko Oberdiek.
+
+2005-12-10 Johannes Braams (babel at latex-project.org)
+
+ * cyrillic/ukraineb.dtx: removed the comment character before the
+ definition of "` on request from Andrij M. Shvaika
+
+2005-11-23 Johannes Braams (babel at latex-project.org)
* bahasa/bahasam.dtx: New language added to the distribution
@@ -18,7 +95,7 @@ are not part of the distribution.
* albanian/albanian.dtx: New language added to the distribution
-2005-11-17 Johannes Braams <babel at latex-project.org)
+2005-11-17 Johannes Braams (babel at latex-project.org)
* latin/latin.dtx (section{Latin shortcuts}\label{s:shrtcts}):
Claudio changed \allowhyphens to \bbl@allowhyphens to have the
@@ -32,13 +109,13 @@ are not part of the distribution.
hyphenation}): Claudio replaced a \it@next with \it@@next and
added a \nobreak in \it@@cwm
-2005-05-21 Johannes Braams <babel at latex-project.org)
+2005-05-21 Johannes Braams (babel at latex-project.org)
* base/babel.dtx (subsubsection{\pkg{varioref}}): The varioref
\Ref needs to be able to expand \ref; in order to make this work
we now redefine \Ref_ to call \org@ref (found by Frank Mitelbach).
-2005-05-18 Johannes Braams <babel at latex-project.org)
+2005-05-18 Johannes Braams (babel at latex-project.org)
* hebrew/hebrew.fdd: Typo's in the docstrip guards prevented the
command \ProvidesFile to appear in HE8nachlieli.fd (PR3774), the
diff --git a/Master/texmf-dist/doc/generic/babel/greek-fdd.pdf b/Master/texmf-dist/doc/generic/babel/greek-fdd.pdf
index 22d6382b77e..6a5ce1734fa 100644
--- a/Master/texmf-dist/doc/generic/babel/greek-fdd.pdf
+++ b/Master/texmf-dist/doc/generic/babel/greek-fdd.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/greek-usage.pdf b/Master/texmf-dist/doc/generic/babel/greek-usage.pdf
index fcda6888706..5c303445f73 100644
--- a/Master/texmf-dist/doc/generic/babel/greek-usage.pdf
+++ b/Master/texmf-dist/doc/generic/babel/greek-usage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/grmath.pdf b/Master/texmf-dist/doc/generic/babel/grmath.pdf
index 45f10f8ec57..a6be88d09ca 100644
--- a/Master/texmf-dist/doc/generic/babel/grmath.pdf
+++ b/Master/texmf-dist/doc/generic/babel/grmath.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/grsymb.pdf b/Master/texmf-dist/doc/generic/babel/grsymb.pdf
index 75beed532ee..fb05c3f0338 100644
--- a/Master/texmf-dist/doc/generic/babel/grsymb.pdf
+++ b/Master/texmf-dist/doc/generic/babel/grsymb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/howtoget.txt b/Master/texmf-dist/doc/generic/babel/howtoget.txt
index 3673c3ed454..deb4194359b 100644
--- a/Master/texmf-dist/doc/generic/babel/howtoget.txt
+++ b/Master/texmf-dist/doc/generic/babel/howtoget.txt
@@ -1,6 +1,6 @@
Babel Distribution Guide
- 29 March 2005
+ 17 March 2008
This file gives you some information as to where to get the latest
diff --git a/Master/texmf-dist/doc/generic/babel/language.skeleton b/Master/texmf-dist/doc/generic/babel/language.skeleton
index e893b3b660f..23834f76ed2 100644
--- a/Master/texmf-dist/doc/generic/babel/language.skeleton
+++ b/Master/texmf-dist/doc/generic/babel/language.skeleton
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -41,14 +41,14 @@
%<code>\ProvidesLanguage{<language>}
%\fi
%\ProvidesFile{<language>.dtx}
- [2005/02/20 v1.6 <Language> support from the babel system]
+ [2008/03/17 v1.6 <Language> support from the babel system]
%\iffalse
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 -- 2005
+%% Copyright (C) 1989 -- 2008
%% by Johannes Braams, TeXniek
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
% This file is part of the babel system, it provides the source code for
% the <Language> language definition file.
diff --git a/Master/texmf-dist/doc/generic/babel/tb1202.pdf b/Master/texmf-dist/doc/generic/babel/tb1202.pdf
index 9069bb1f478..4a008dd9d34 100644
--- a/Master/texmf-dist/doc/generic/babel/tb1202.pdf
+++ b/Master/texmf-dist/doc/generic/babel/tb1202.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/tb1401.pdf b/Master/texmf-dist/doc/generic/babel/tb1401.pdf
index 6b838f415ac..4994945076c 100644
--- a/Master/texmf-dist/doc/generic/babel/tb1401.pdf
+++ b/Master/texmf-dist/doc/generic/babel/tb1401.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/tb1604.pdf b/Master/texmf-dist/doc/generic/babel/tb1604.pdf
index 118c4578908..adf1f486082 100644
--- a/Master/texmf-dist/doc/generic/babel/tb1604.pdf
+++ b/Master/texmf-dist/doc/generic/babel/tb1604.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel/todo.txt b/Master/texmf-dist/doc/generic/babel/todo.txt
index 30f0ddc4fb8..687b7401c07 100644
--- a/Master/texmf-dist/doc/generic/babel/todo.txt
+++ b/Master/texmf-dist/doc/generic/babel/todo.txt
@@ -1,11 +1,6 @@
-Things that still need to be done (2001/02/22) :
+Things that still need to be done (2008/03/17) :
================================================
-- Vladimir Volovich suggested to have a babel option mechanism.
- This may be implemented using something like:
- \languageoption[<option>,<option>,...]{<language>}
- (See PR 2814)
-
- The language attribute mechanism is not completely mature yet. It is
currently not possible to switch attibutes on and off in the middle
of a document. This restriction might be lifted in a future release.
@@ -34,4 +29,4 @@ Things that still need to be done (2001/02/22) :
integrated.
- I have a contribution with support for the Thai language which also
- needs attntion to integrate it with babel \ No newline at end of file
+ needs attention to integrate it with babel \ No newline at end of file
diff --git a/Master/texmf-dist/makeindex/babel/bbglo.ist b/Master/texmf-dist/makeindex/babel/bbglo.ist
index 14c0507a4bc..09dff7636a4 100644
--- a/Master/texmf-dist/makeindex/babel/bbglo.ist
+++ b/Master/texmf-dist/makeindex/babel/bbglo.ist
@@ -8,7 +8,7 @@
%% This file was generated from file(s) of the Babel system.
%% ---------------------------------------------------------
%%
-%% Copyright (C) 2005 Johannes Braams. All rights reserved.
+%% Copyright (C) 2008 Johannes Braams. All rights reserved.
%%
%% This file is a style file for the MakeIndex program
%%
diff --git a/Master/texmf-dist/makeindex/babel/bbind.ist b/Master/texmf-dist/makeindex/babel/bbind.ist
index 28a2bb5c02d..31d43c8abb4 100644
--- a/Master/texmf-dist/makeindex/babel/bbind.ist
+++ b/Master/texmf-dist/makeindex/babel/bbind.ist
@@ -8,7 +8,7 @@
%% This file was generated from file(s) of the Babel system.
%% ---------------------------------------------------------
%%
-%% Copyright (C) 2005 Johannes Braams. All rights reserved.
+%% Copyright (C) 2008 Johannes Braams. All rights reserved.
%%
%% This file is a style file for the MakeIndex program
%%
diff --git a/Master/texmf-dist/source/generic/babel/babel.dtx b/Master/texmf-dist/source/generic/babel/babel.dtx
index 1c00fd2b3f4..29358b853c0 100644
--- a/Master/texmf-dist/source/generic/babel/babel.dtx
+++ b/Master/texmf-dist/source/generic/babel/babel.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{3821}
+% \CheckSum{3858}
%%
% \def\filename{babel.dtx}
% \let\thisfilename\filename
@@ -37,23 +37,23 @@
% \changes{babel~3.6k}{1999/03/18}{We need at least \LaTeX\ from
% June 1998}
% \begin{macrocode}
-%<+package>\NeedsTeXFormat{LaTeX2e}[1998/06/01]
+%<+package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
% \end{macrocode}
%
%% File 'babel.dtx'
%\fi
-%%\ProvidesFile{babel.dtx}[2005/11/23 v3.8h The Babel package]
+%%\ProvidesFile{babel.dtx}[2008/03/16 v3.8j The Babel package]
%\iffalse
%
% Babel DOCUMENT-STYLE option for LaTeX version 2.09 or plain TeX;
%% Babel package for LaTeX2e.
%
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%<*filedriver>
\documentclass{ltxdoc}
\usepackage{supertabular}
@@ -155,7 +155,7 @@
% Kersengaarde 33\\
% 2723 BP Zoetermeer\\
% The Netherlands\\
-% \texttt{babel@braams.cistron.nl}}
+% \texttt{babel\char64 braams.xs4all.nl}}
%
% \date{Printed \today}
%
@@ -293,7 +293,8 @@
% \tabletail{\hline}
% \begin{supertabular}{l p{8cm}}
% Afrikaans & afrikaans\\
-% Bahasa & bahasa\\
+% Bahasa & bahasa, indonesian, indon, bahasai,
+% bahasam, malay, meyalu\\
% Basque & basque\\
% Breton & breton\\
% Bulgarian & bulgarian\\
@@ -982,7 +983,7 @@
%<+kernel&!patterns>\ProvidesFile{switch.def}
%<+driver&!user>\ProvidesFile{babel.drv}
%<+driver&user>\ProvidesFile{user.drv}
- [2005/11/23 v3.8h %
+ [2008/03/16 v3.8j %
%<+package> The Babel package]
%<+core> Babel common definitions]
%<+kernel> Babel language switching mechanism]
@@ -2016,6 +2017,8 @@
% \emph{just} the hyphenation rules. This environment does
% \emph{not} change |\languagename| and when the hyphenation rules
% specified were not loaded it has no effect.
+% \changes{babel~3.8j}{2008/03/16}{Also set the hyphenmin paramters to
+% the correct value (PR3997)}
% \begin{macrocode}
\def\hyphenrules#1{%
\expandafter\ifx\csname l@#1\endcsname\@undefined
@@ -2023,6 +2026,12 @@
\else
\language=\csname l@#1\endcsname\relax
\languageshorthands{none}%
+ \expandafter\ifx\csname #1hyphenmins\endcsname\relax
+ \set@hyphenmins\tw@\thr@@\relax
+ \else
+ \expandafter\expandafter\expandafter\set@hyphenmins
+ \csname #1hyphenmins\endcsname\relax
+ \fi
\fi
}
\def\endhyphenrules{}
@@ -2850,7 +2859,7 @@
% to make its argument a shorthand character. The real work is
% performed once for each character.
% \changes{babel~3.7c}{1999/04/30}{Only execute
-% \cs{initiate@active@char} for each character}
+% \cs{initiate@active@char} once for each character}
% \begin{macrocode}
\def\initiate@active@char#1{%
\expandafter\ifx\csname active@char\string##1\endcsname\relax
@@ -2906,7 +2915,7 @@
% \changes{babel~3.5a}{1995/03/10}{Added a check for right quote and
% adapt \cs{pr@m@s} if necessary}
% \changes{babel~3.7f}{1999/12/18}{The redefinition needs to take
-% place on level higher, \cs{prim@s} needs to be redefined.}
+% place one level higher, \cs{prim@s} needs to be redefined.}
% \begin{macrocode}
\ifx##1'%
\let\prim@s\bbl@prim@s
@@ -3493,13 +3502,16 @@
% work out as expected. And to keep things local that need to
% remain local a group is opened, which is closed as soon as |\x|
% gets executed.
+% \changes{babel~3.8j}{2008/03/21}{Added a group in order to protect
+% the current lowercase code of the tilde (PR 3851)}
% \begin{macrocode}
\begingroup
\catcode`\~\active
\def\x{\endgroup
\def\bbl@switch@sh@on##1{%
+ \begingroup
\lccode`~=`##1%
- \lowercase{%
+ \lowercase{\endgroup
\catcode`~\active
}%
}%
@@ -5166,7 +5178,6 @@
% \subsection{marks}
%
% \begin{macro}{\markright}
-% \begin{macro}{\markboth}
% \changes{babel~3.6i}{1997/03/15}{Added redefinition of \cs{mark...}
% commands}
% Because the output routine is asynchronous, we must
@@ -5228,8 +5239,17 @@
\bbl@tempa
}
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\markboth}
+% \begin{macro}{\@mkboth}
% The definition of |\markboth| is equivalent to that of
-% |\markright|, except that we need two token registers.
+% |\markright|, except that we need two token registers. The
+% documentclasses \cls{report} and \cls{book} define and set the
+% headings for the page. While doing so they also store a copy of
+% |\markboth| in |\@mkboth|. Therefor we need to check whether
+% |\@mkboth| has already been set. If so we neeed to do that again
+% with the new definition of |\makrboth|.
% \changes{babel~3.7m}{2003/11/15}{added \cs{bbl@restore@actives} to
% the mark}
% \changes{babel~3.8c}{2004/05/26}{No need to add \emph{anything} to
@@ -5238,6 +5258,16 @@
% \changes{babel~3.8f}{2005/05/15}{Make the definition independent of
% the original definition; expand \cs{languagename} before passing
% it into the token registers}
+% \changes{babel~3.8j}{2008/03/21}{Added setting of \cs{@mkboth} (PR
+% 3826)}
+% \begin{macrocode}
+\ifx\@mkboth\markboth
+ \def\bbl@tempc{\let\@mkboth\markboth}
+\else
+ \def\bbl@tempc{}
+\fi
+% \end{macrocode}
+% Now we can start the new definition of |\markboth|
% \begin{macrocode}
\bbl@redefine\markboth#1#2{%
\edef\bbl@tempb{\noexpand\protect
@@ -5260,6 +5290,10 @@
\noexpand\org@markboth{\the\toks@}{\the\toks8}}%
\bbl@tempa
}
+% \end{macrocode}
+% and copy it to |\@mkboth| if necesary.
+% \begin{macrocode}
+\bbl@tempc
%</core|shorthands>
% \end{macrocode}
% \end{macro}
@@ -5436,7 +5470,32 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{General}
+% \subsubsection{\pkg{hyperref}}
+%
+% \begin{macro}{\pdfstringdefDisableCommands}
+% \changes{babel~3.8j}{2008/03/16}{Inform \pkg{hyperref} to use
+% shorthands at system level (PR4006)}
+% Although a number of interworking problems between \pkg{babel}
+% and \pkg{hyperref} are tackled by \pkg{hyperref} itself we need
+% to take care of correctly handling the shorthand characters.
+% When they get expanded inside a bookmark a warning will appear in
+% the log file which can be prevented. This is done by informing
+% \pkg{hyperref} that it should the shorthands as defined on the
+% system level rather than at the user level.
+%
+% \begin{macrocode}
+\AtBeginDocument{%
+ \@ifundefined{pdfstringdefDisableCommands}%
+ {}%
+ {\pdfstringdefDisableCommands{%
+ \languageshorthands{system}}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsubsection{General}
%
% \begin{macro}{\FOREIGNLANGUAGE}
% The package \pkg{fancyhdr} treats the running head and fout lines
diff --git a/Master/texmf-dist/source/generic/babel/babel.ins b/Master/texmf-dist/source/generic/babel/babel.ins
index ef03362d879..4344c414a1f 100644
--- a/Master/texmf-dist/source/generic/babel/babel.ins
+++ b/Master/texmf-dist/source/generic/babel/babel.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -75,7 +75,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -109,7 +109,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/bahasa.dtx b/Master/texmf-dist/source/generic/babel/bahasa.dtx
index 5c8bcb426cd..51e20f9571c 100644
--- a/Master/texmf-dist/source/generic/babel/bahasa.dtx
+++ b/Master/texmf-dist/source/generic/babel/bahasa.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -36,15 +36,15 @@
%<code>\ProvidesLanguage{bahasa}
%\fi
%\ProvidesFile{bahasa.dtx}
- [2005/11/23 v1.0k Bahasa Indonesia support from the babel system]
+ [2008/03/15 v1.0l Bahasa Indonesia support from the babel system]
%\iffalse
%% File `bahasa.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Bahasa Language Definition File
-%% Copyright (C) 1994 - 2005
+%% Copyright (C) 1994 - 2008
%% by J"org Knappen, (joerg.knappen at alpha.ntp.springer.de)
% Terry Mart (mart at vkpmzd.kph.uni-mainz.de)
% Institut f\"ur Kernphysik
@@ -55,7 +55,7 @@
%% Please report errors to: J"org Knappen
%% knappen at alpha.ntp.springer.de
%% J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
% This file is part of the babel system, it provides the source
% code for the bahasa indonesia / bahasa melayu language definition
diff --git a/Master/texmf-dist/source/generic/babel/bahasa.ins b/Master/texmf-dist/source/generic/babel/bahasa.ins
index 23c4cea4fa5..954122314c9 100644
--- a/Master/texmf-dist/source/generic/babel/bahasa.ins
+++ b/Master/texmf-dist/source/generic/babel/bahasa.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/bahasam.dtx b/Master/texmf-dist/source/generic/babel/bahasam.dtx
index cd456d2fdcb..6b55a397746 100644
--- a/Master/texmf-dist/source/generic/babel/bahasam.dtx
+++ b/Master/texmf-dist/source/generic/babel/bahasam.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -36,15 +36,15 @@
%<code>\ProvidesLanguage{bahasam}
%\fi
%\ProvidesFile{bahasam.dtx}
- [2005/11/23 v1.0j Bahasa Malaysia support from the babel system]
+ [2008/01/27 v1.0k Bahasa Malaysia support from the babel system]
%\iffalse
%% File `bahasam.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Bahasa Malaysia Language Definition File
-%% Copyright (C) 1994 - 2005
+%% Copyright (C) 1994 - 2008
%% by J"org Knappen, (joerg.knappen at alpha.ntp.springer.de)
% Terry Mart (mart at vkpmzd.kph.uni-mainz.de)
% Institut f\"ur Kernphysik
@@ -52,16 +52,18 @@
% D-55099 Mainz
% Germany
%
-%% Copyright (C) 2005
+%% Copyright (C) 2005, 2008
%% by Bob Margolis, (bob.margolis at ntlworld.com)
% derived from J"ork Knappen's work - see above.
+%% [With help from Awangku Merali Pengiran Mohamed (Sarawak)]
+% gratefully acknowledged.
% Yateley,
% UK
%
%% Please report errors to: Bob Margolis
%% bob.margolis at ntlworld.com
%% J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
% This file is part of the babel system, it provides the source
% code for the Bahasa Malaysia language definition
@@ -185,11 +187,12 @@
% (PR2214)}
% \changes{bahasa-1.0h}{2000/09/19}{Added \cs{glossaryname}}
% \changes{bahasa-1.0i}{2003/11/17}{Inserted translation for Glossary}
+% \changes{bahasam-1.0k}{2008/01/27}{Inserted changes from Awangku Merali }
% \begin{macrocode}
\@namedef{captions\CurrentOption}{%
- \def\prefacename{Pendahuluan}%
- \def\refname{Pustaka}%
- \def\abstractname{Ringkasan}% (sometime it's called 'intisari'
+ \def\prefacename{Prakata}%
+ \def\refname{Rujukan}%
+ \def\abstractname{Abstrak}% (sometime it's called 'intisari'
% or 'ikhtisar')
\def\bibname{Bibliografi}%
\def\chaptername{Bab}%
@@ -201,15 +204,15 @@
\def\figurename{Gambar}%
\def\tablename{Jadual}%
\def\partname{Bahagian}%
-% Subject: Subyek
+% Subject: Perkara
% From: Dari
\def\enclname{Lampiran}%
- \def\ccname{cc}%
+ \def\ccname{sk}% (short form for 'Salinan Kepada')
\def\headtoname{Kepada}%
\def\pagename{Halaman}%
% Notes (Endnotes): Catatan
- \def\seename{lihat}%
- \def\alsoname{lihat juga}%
+ \def\seename{sila rujuk}%
+ \def\alsoname{rujuk juga}%
\def\proofname{Bukti}%
\def\glossaryname{Istilah}%
}
@@ -224,10 +227,12 @@
% to save memory}
% \changes{bahasa-1.0g}{1999/03/12}{Februari should be spelled as
% Pebruari}
+% \changes{bahasam-1.0k}{2008/01/27}{Februari restored to BM spelling;
+% see Collins Kamus Dwibahasa 2005}
% \begin{macrocode}
\@namedef{date\CurrentOption}{%
\def\today{\number\day~\ifcase\month\or
- Januari\or Pebruari\or Mac\or April\or Mei\or Jun\or
+ Januari\or Februari\or Mac\or April\or Mei\or Jun\or
Julai\or Ogos\or September\or Oktober\or November\or Disember\fi
\space \number\year}}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/generic/babel/base.ins b/Master/texmf-dist/source/generic/babel/base.ins
index 636481b196e..ea88bd97fd1 100644
--- a/Master/texmf-dist/source/generic/babel/base.ins
+++ b/Master/texmf-dist/source/generic/babel/base.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -31,7 +31,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-%% Copyright 2005 Johannes L. Braams
+%% Copyright 2005-2008 Johannes L. Braams
%%
%% This file is part of the `babel' system.
%%
@@ -40,7 +40,7 @@
%%
%% You are not allowed to modify its contents.
%%
-\def\filedate{2004/02/20}
+\def\filedate{2008/03/21}
\def\batchfile{base.ins}
\input docstrip.tex
@@ -82,7 +82,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -116,7 +116,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -155,7 +155,7 @@ of this file under its original name.
This file was generated from file(s) of the Babel system.
---------------------------------------------------------
-Copyright (C) 2005 Johannes Braams. All rights reserved.
+Copyright (C) 2008 Johannes Braams. All rights reserved.
To produce the documentation in the way you like you are allowed
to change this driver file.
@@ -166,7 +166,7 @@ to change this driver file.
This file was generated from file(s) of the Babel system.
---------------------------------------------------------
-Copyright (C) 2005 Johannes Braams. All rights reserved.
+Copyright (C) 2008 Johannes Braams. All rights reserved.
This file is a style file for the MakeIndex program
@@ -263,6 +263,8 @@ This file is a style file for the MakeIndex program
\usepreamble\drvpreamble
+\usedir{source/generic/babel}
+
\generate{\file{babel.drv}{\from{babel.dtx}{driver}}
\file{user.drv}{\from{babel.dtx}{driver,user}}}
@@ -270,6 +272,7 @@ This file is a style file for the MakeIndex program
\usepreamble\istpreamble
\usepostamble\istpost
+\usedir{makeindex/babel}
\generate{\file{bbind.ist}{\from{bbidxglo.dtx}{idx}}
\file{bbglo.ist}{\from{bbidxglo.dtx}{glo}}}
diff --git a/Master/texmf-dist/source/generic/babel/bbcompat.dtx b/Master/texmf-dist/source/generic/babel/bbcompat.dtx
index 4986919cf03..d37db98c3c0 100644
--- a/Master/texmf-dist/source/generic/babel/bbcompat.dtx
+++ b/Master/texmf-dist/source/generic/babel/bbcompat.dtx
@@ -1,9 +1,6 @@
% \iffalse meta-comment
%
-% Patched by Heiko Oberdiek for project latex-tds:
-% * 2006/06/02: Documentation bug fix: \cd -> \cs (typo)
-%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -33,16 +30,16 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2005/11/23 v1.2i]
+\ProvidesFile{bbcompat.dtx}[2008/03/21 v1.2j]
%</dtx>
%
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
%<*filedriver>
\documentclass{ltxdoc}
\newcommand*\TeXhax{\TeX hax}
@@ -57,6 +54,8 @@
% \fi
%
% \GetFileInfo{bbcompat.dtx}
+% \changes{bbcompat-1.2j}{2006/06/05}{Small documentation fix}
+%
% \StopEventually{}
%
% \changes{bbcompat-1.2}{1996/11/02}{Added the check for \cs{LdfInit}}
diff --git a/Master/texmf-dist/source/generic/babel/bbplain.dtx b/Master/texmf-dist/source/generic/babel/bbplain.dtx
index ba2aad20de2..dc4516aa865 100644
--- a/Master/texmf-dist/source/generic/babel/bbplain.dtx
+++ b/Master/texmf-dist/source/generic/babel/bbplain.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -31,16 +31,16 @@
% \iffalse
%<*dtx>
\ProvidesFile{bbplain.dtx}
- [2004/02/19 v1.0r Babel support for plain-based formats]
+ [2008/03/21 v1.0r Babel support for plain-based formats]
%</dtx>
%
%% File `bbplain.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
% This file is part of the babel system, it provides the source
% code for the extra definitions needed to be able to use babel
diff --git a/Master/texmf-dist/source/generic/babel/bulgarian.dtx b/Master/texmf-dist/source/generic/babel/bulgarian.dtx
index b400609185f..313018acd81 100644
--- a/Master/texmf-dist/source/generic/babel/bulgarian.dtx
+++ b/Master/texmf-dist/source/generic/babel/bulgarian.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -35,15 +35,15 @@
\ProvidesFile{bulgarian.dtx}
%</dtx>
%<code>\ProvidesLanguage{bulgarian}
- [2006/03/31 v1.0e Bulgarian support from the babel system]
+ [2008/03/21 v1.0g Bulgarian support from the babel system]
%
%% File `bulgarian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989-2006
+%% Copyright (C) 1989-2008
%% by Johannes Braams,TeXniek
%
%% Bulgarian Language Definition File
-%% Copyright (C) 1995-2005
+%% Copyright (C) 1995-2008
%% by Georgi.Boshnakov <georgi.boshnakov at umist.ac.uk>
%% Johannes Braams,TeXniek
%
@@ -51,7 +51,7 @@
%% by Georgi.Boshnakov <georgi.boshnakov at umist.ac.uk>
%
%% Please report errors to:J.L.Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
%<*filedriver>
\documentclass{ltxdoc}
@@ -119,7 +119,7 @@
% in following surname. \\
% |"`| & for German left double quotes
% (looks like ,\kern-0.08em,). \\
-% |"'| & for German right double quotes (looks like ``). \\%''
+% |"'| & for German right double quotes (looks like ``). \\%^^A''
% |"<| & for French left double quotes (looks like $<\!\!<$).\\
% |">| & for French right double quotes (looks like $>\!\!>$).\\
% \end{tabular}
@@ -139,7 +139,7 @@
% |\cdash--*| & Cyrillic emdash for denoting direct speech. \\
% |\glqq| & for German left double quotes
% (looks like,\kern-0.08em,). \\
-% |\grqq| & for German right double quotes (looks like ``).\\%''
+% |\grqq| & for German right double quotes (looks like ``).\\^^A%''
% |\flqq| & for French left double quotes (looks like $<\!\!<$).\\
% |\frqq| & for French right double quotes (looks like $>\!\!>$).\\
% |\dq| & the original quotes character (|"|).
diff --git a/Master/texmf-dist/source/generic/babel/bulgarian.ins b/Master/texmf-dist/source/generic/babel/bulgarian.ins
index 85fa800211d..467e11c6ff9 100644
--- a/Master/texmf-dist/source/generic/babel/bulgarian.ins
+++ b/Master/texmf-dist/source/generic/babel/bulgarian.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/catmik.tex b/Master/texmf-dist/source/generic/babel/catmik.tex
deleted file mode 100644
index 39519aa9fe5..00000000000
--- a/Master/texmf-dist/source/generic/babel/catmik.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-% set catcodes for the lowercase Bulgarian letters in MIK (BDS) encoding
-\catcode 160=12 % \cyra
-\catcode 161=12 % \cyrb
-\catcode 162=12 % \cyrv
-\catcode 163=12 % \cyrg
-\catcode 164=12 % \cyrd
-\catcode 165=12 % \cyre
-\catcode 166=12 % \cyrzh
-\catcode 167=12 % \cyrz
-\catcode 168=12 % \cyri
-\catcode 169=12 % \cyrishrt
-\catcode 170=12 % \cyrk
-\catcode 171=12 % \cyrl
-\catcode 172=12 % \cyrm
-\catcode 173=12 % \cyrn
-\catcode 174=12 % \cyro
-\catcode 175=12 % \cyrp
-\catcode 176=12 % \cyrr
-\catcode 177=12 % \cyrs
-\catcode 178=12 % \cyrt
-\catcode 179=12 % \cyru
-\catcode 180=12 % \cyrf
-\catcode 181=12 % \cyrh
-\catcode 182=12 % \cyrc
-\catcode 183=12 % \cyrch
-\catcode 184=12 % \cyrsh
-\catcode 185=12 % \cyrshch
-\catcode 186=12 % \cyrhrdsn
-\catcode 187=12 % \cyrery
-\catcode 188=12 % \cyrsftsn
-\catcode 189=12 % \cyrerev
-\catcode 190=12 % \cyryu
-\catcode 191=12 % \cyrya
diff --git a/Master/texmf-dist/source/generic/babel/danish.dtx b/Master/texmf-dist/source/generic/babel/danish.dtx
index d0b6a0d7807..696561b3807 100644
--- a/Master/texmf-dist/source/generic/babel/danish.dtx
+++ b/Master/texmf-dist/source/generic/babel/danish.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{138}
+% \CheckSum{160}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -36,15 +36,15 @@
%<code>\ProvidesLanguage{danish}
%\fi
%\ProvidesFile{danish.dtx}
- [2005/03/30 v1.3p Danish support from the babel system]
+ [2008/03/17 v1.3q Danish support from the babel system]
%\iffalse
%% File `danish.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
% This file is part of the babel system, it provides the source
% code for the Danish language definition file.
@@ -101,6 +101,8 @@
% |"'| & normal double right quotes\\
% |"<| & for French left double quotes (similar to $<<$).\\
% |">| & for French right double quotes (similar to $>>$).\\
+% |\-| & like the old |\-|, but allowing hyphenation
+% in the rest of the word.
% \end{tabular}
% \caption{The extra definitions made by \file{danish.ldf}}
% \label{tab:danish-quote}
@@ -139,8 +141,9 @@
% hyphenmin parameters}
% This macro is used to store the correct values of the hyphenation
% parameters |\lefthyphenmin| and |\righthyphenmin|.
+% \changes{danish-1.3q}{2008/03/17}{Set lefthyphenmin to two}
% \begin{macrocode}
-\providehyphenmins{\CurrentOption}{\@ne\tw@}
+\providehyphenmins{\CurrentOption}{\tw@\tw@}
% \end{macrocode}
% \end{macro}
%
@@ -255,7 +258,7 @@
\declare@shorthand{danish}{">}{%
\textormath{\guillemotright}{\mbox{\guillemotright}}}
% \end{macrocode}
-% then we define to be able to specify hyphenation
+% then we define commands to be able to specify hyphenation
% breakpoints that behave a little different from |\-|.
% \changes{danish-1.3j}{1996/08/15}{Added definition of
% \texttt{"\char126} and \texttt{"\char61}}
@@ -270,6 +273,35 @@
\declare@shorthand{danish}{"|}{%
\textormath{\discretionary{-}{}{\kern.03em}}{}}
% \end{macrocode}
+%
+% To enable hyphenation in two words, written together but
+% separated by a slash, as in `uitdrukking/opmerking' we define the
+% command |"/|.
+% \changes{danish-1.3q}{2008/03/17}{Added definition of \texttt{"/}
+% from \texttt{dutch.ldf}}
+% \begin{macrocode}
+\declare@shorthand{dutch}{"/}{\textormath
+ {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
+% \end{macrocode}
+%
+% \begin{macro}{\-}
+% \changes{danish-1.3q}{2008/03/17}{Added redefinition of \cs{-} from
+% \texttt{dutch.ldf}}
+% All that is left now is the redefinition of |\-|. The new version
+% of |\-| should indicate an extra hyphenation position, while
+% allowing other hyphenation positions to be generated
+% automatically. The standard behaviour of \TeX\ in this respect is
+% very unfortunate for languages such as Dutch and German, where
+% long compound words are quite normal and all one needs is a means
+% to indicate an extra hyphenation position on top of the ones that
+% \TeX\ can generate from the hyphenation patterns.
+% \begin{macrocode}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \babel@save\-}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}}
+% \end{macrocode}
+% \end{macro}
% \end{macro}
%
% The macro |\ldf@finish| takes care of looking for a
diff --git a/Master/texmf-dist/source/generic/babel/danish.ins b/Master/texmf-dist/source/generic/babel/danish.ins
index 203cff95ab9..3eef6ab7379 100644
--- a/Master/texmf-dist/source/generic/babel/danish.ins
+++ b/Master/texmf-dist/source/generic/babel/danish.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/frenchb.dtx b/Master/texmf-dist/source/generic/babel/frenchb.dtx
index 2ec83b51865..803f3dcd3df 100644
--- a/Master/texmf-dist/source/generic/babel/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel/frenchb.dtx
@@ -1,9 +1,6 @@
% \iffalse meta-comment
%
-% Patched by Heiko Oberdiek for project latex-tds:
-% * 2006/06/02: Documentation bug: "!" cannot be used inside \changes.
-%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -29,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{1985}
+% \CheckSum{1809}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -40,7 +37,7 @@
%<code>\ProvidesLanguage{french}
%\ProvidesFile{frenchb.dtx}
%<*!cfg>
- [2005/02/06 v1.6g French support from the babel system]
+ [2007/10/05 v2.0e French support from the babel system]
%</!cfg>
%<*cfg>
%% frenchb.cfg: configuration file for frenchb.ldf
@@ -48,12 +45,12 @@
%</cfg>
%% File `frenchb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2007
%% by Johannes Braams, TeXniek
%
%<*!cfg>
%% Frenchb language Definition File
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2007
%% by Johannes Braams, TeXniek
%% Daniel Flipo, GUTenberg
%
@@ -63,12 +60,15 @@
%
% This file is part of the babel system, it provides the source
% code for the French language definition file.
-% For differences with francais.sty (author J. Braams) and with
-% french.sty (author B. Gaulle), see documentation printed by
-% |latex frenchb.dtx|.
%
%<*filedriver>
\documentclass[a4paper]{ltxdoc}
+\DeclareFontEncoding{T1}{}{}
+\DeclareFontSubstitution{T1}{lmr}{m}{n}
+\DeclareTextCommand{\guillemotleft}{OT1}{%
+ {\fontencoding{T1}\fontfamily{lmr}\selectfont\char19}}
+\DeclareTextCommand{\guillemotright}{OT1}{%
+ {\fontencoding{T1}\fontfamily{lmr}\selectfont\char20}}
\newcommand*\TeXhax{\TeX hax}
\newcommand*\babel{\textsf{babel}}
\newcommand*\langvar{$\langle \mathit lang \rangle$}
@@ -88,34 +88,34 @@
%\fi
% \GetFileInfo{frenchb.dtx}
%
-% \changes{frenchb-1.1}{1995/12/23}{Added a hook to insert space or
-% not before `double punctuation'.}
-%
-% \changes{frenchb-1.1b}{1996/08/07}{Replaced \cs{undefined} with
-% \cs{@undefined} and \cs{empty} with \cs{@empty} for consistency
-% with \LaTeX}
-%
-% \changes{frenchb-1.1b}{1996/10/10}{Moved the definition of
-% \cs{atcatcode} right to the beginning.}
-%
-% \changes{frenchb-1.3f}{1999/04/11}{Deleted sectioning command
-% \cs{section}\{About French Typography\}.}
-%
% \section{The French language}
%
% The file \file{\filename}\footnote{The file described in this
% section has version number \fileversion\ and was last revised on
-% \filedate.}, derived from \file{frenchy.sty}, defines all
-% the language definition macros for the French language.
+% \filedate.}, defines all the language definition macros for the
+% French language.
%
-% Customization for the French language is achieved following the
+% Customisation for the French language is achieved following the
% book ``Lexique des r\`egles typographiques en usage \`a
% l'Imprimerie nationale'' troisi\`eme \'edition (1994),
% ISBN-2-11-081075-0.
%
-% This file has been designed to be used with \LaTeXe, \LaTeX-2.09
-% and Plain\TeX{} formats. If you are still using \LaTeX-2.09, you
-% \emph{should} consider switching to \LaTeXe!
+% First version released: 1.1 (1996/05/31) as part of
+% \babel-3.6beta.
+%
+% |frenchb| has been improved using helpful suggestions from many
+% people, mainly from Jacques Andr\'e, Michel Bovani, Thierry Bouche,
+% and Vincent Jalby. Thanks to all of them!
+%
+% This new version (2.0) has been designed to be used with \LaTeXe{}
+% and Plain\TeX{} formats only. \LaTeX-2.09 is no longer supported.
+% Changes between version 1.6 and 2.0 are listed in
+% subsection~\ref{ssec-changes} p.~\pageref{ssec-changes}.
+%
+% An extensive documentation is available in French here:\\
+% |http://daniel.flipo.free.fr/frenchb|
+%
+% \subsection{Basic interface}
%
% The command |\selectlanguage{french}| switches to the French
% language%
@@ -125,29 +125,20 @@
% with the following effects:
% \begin{enumerate}
% \item French hyphenation patterns are made active;
-% \item `double punctuation' is made active for correct spacing
-% in French;
+% \item `double punctuation' (|:| |;| |!| |?|) is made active for
+% correct spacing in French;
% \item |\today| prints the date in French;
% \item the caption names are translated into French
% (\LaTeX{} only);
% \item the default items in itemize environment are set to `--'
-% instead of \textbullet, and all vertical spacing and glue
-% is deleted, a hook to reset standard \LaTeX{} spacing
-% is provided (|\FrenchItemizeSpacingfalse|);
+% instead of `\textbullet', and all vertical spacing and glue
+% is deleted, hooks to reset standard \LaTeX{} settings
+% are provided (see |\frenchbsetup{}|);
% it is possible to change `--' to something else (`---'
-% for instance) by redefining |\FrenchLabelItem|;
-% apart from the global hook |\FrenchLabelItem|, it is
-% also possible to change the `labelitems' at any level
-% (1 to 4) in French, using the standard \LaTeX{} syntax,
-% for instance: |\renewcommand{\labelitemii}{\textbullet}|;
-% in order to be effective in French, the redefinitions
-% have to be made when French is the current language
-% (i.e.\ \emph{after} the |\begin{document}|), the changes are
-% saved when switching to another language and will be
-% remembered of, when switching back to French;
+% for instance) using |\frenchbsetup{}|;
% \item vertical spacing in general \LaTeX{} lists is
% shortened, a hook to reset standard \LaTeX{} settings
-% is provided (|\FrenchListSpacingfalse|) ;
+% is provided (see |\frenchbsetup{}|);
% \item the first paragraph of each section is indented
% (\LaTeX{} only);
% \item the space after |\dots| is removed in French.
@@ -157,23 +148,25 @@
% easier:
% \begin{enumerate}
% \item French quotation marks can be entered using the commands
-% |\og| and |\fg| which work in \LaTeXe, \LaTeX-2.09 and
-% Plain\TeX{}, their appearance depending on what is
-% available to draw them; if you use \LaTeXe{} \emph{and}
-% |T1|-encoding you can also enter them as
-% |<<~French quotation marks~>>| but then
-% \emph{don't forget} the unbreakable spaces, (|\og| and
-% |\fg| provide for correct line breaks and better
-% horizontal spacing).
-% |\og| and |\fg| can be used outside French, they provide
+% |\og| and |\fg| which work in \LaTeXe and Plain\TeX,
+% their appearance depending on what is available to draw
+% them; even if you use \LaTeXe{} \emph{and} |T1|-encoding,
+% you should refrain from entering them as
+% |<<~French quotation marks~>>|: |\og| and |\fg| provide
+% better horizontal spacing.
+% |\og| and |\fg| can be used outside French, they typeset
% then English quotes `` and ''.
% \item A command |\up| is provided to typeset superscripts like
% |M\up{me}| (abbreviation for ``Madame''), |1\up{er}| (for
-% ``premier'').
+% ``premier''). Other commands are also provided for
+% ordinals: |\ier|, |\iere|, |\iers|, |\ieres|, |\ieme|,
+% |\iemes| (|3\iemes| prints 3\textsuperscript{es}).
% \item Family names should be typeset in small capitals and never
% be hyphenated, the macro |\bsc| (boxed small caps) does
% this, e.g., |Leslie~\bsc{Lamport}| will produce
-% Leslie~\mbox{\textsc{Lamport}}.
+% Leslie~\mbox{\textsc{Lamport}}. Note that composed names
+% (such as Dupont-Durant) may now be hyphenated on explicit
+% hyphens, this differs from |frenchb|~v.1.x.
% \item Commands |\primo|, |\secundo|, |\tertio| and |\quarto|
% may be used to enumerate in lists.
% \item Abbreviations for ``Num\'ero'' and ``num\'ero'' are
@@ -193,17 +186,11 @@
% explicit space has to be added in lists and intervals:
% |$[0,\ 1]$|, |$(x,\ y)$|. |\StandardMathComma| switches back
% to the standard behaviour of the comma.
-% \item A command |\nombre| is provided to easily typeset numbers:
-% it works both in text and in math mode: inputting
-% |\nombre{3141,592653}| will format this number properly
-% according to the current language (French or non-French):
-% each slice of three digits will be separated either with
-% a comma in English or with a space in French (if you prefer
-% a thin space instead of a normal space, just add the command
-% |\ThinSpaceInFrenchNumbers| to the preamble of your document,
-% or to |frenchb.cfg|).
-% The command |\nombre| is a contribution of Vincent Jalby
-% using ideas of David Carlisle in comma.sty.
+% \item A command |\nombre| was provided in 1.x versions to easily
+% format numbers in slices of three digits separated either
+% by a comma in English or with a space in French; |\nombre|
+% is now mapped to |\numprint| from \file{numprint.sty}, see
+% \file{numprint.pdf} for more information.
% \item |frenchb| has been designed to take advantage of the |xspace|
% package if present: adding |\usepackage{xspace}| in the
% preamble will force macros like |\fg|, |\ier|, |\ieme|,
@@ -211,110 +198,154 @@
% for instance typing `|1\ier juin|' will print
% `1\textsuperscript{er} juin' (no need for a forced space
% after |1\ier|).
-% \item Two commands, |\FrenchLayout| and |\StandardLayout| (to be
-% used \emph{only in the preamble}) are provided to unify the
-% layout of multilingual documents (it mainly concerns lists)
-% regardless the current language (see section~\ref{sec-global}
-% for details).
-% \item Two commands |\AddThinSpaceBeforeFootnotes| and
-% |\FrenchFootnotes| enable to customize the layout of
-% footnotes following the French IN's specifications;
-% the first one, which can only be used \emph{before} the
-% |\begin{document}|, adds a thinspace in the running text
-% before the number or symbol calling the footnote; the
-% second one modifies the footnote's layout: it typesets
-% leading numbers as `1.\hspace{.5em}' instead of
-% `$\hbox{}^1$'. |\FrenchFootnotes| has no effect on footnotes
-% numbered with symbols (as in the |\thanks| command).
-%
-% None of these commands are active by default, both can
-% be best added to |frenchb.cfg| or to the preamble of the
-% document. |\FrenchFootnotes| and |\StandardFootnotes|,
-% which cancels the effect of |\FrenchFootnotes| for the
-% text coming next, can be used anywhere in the document.
-% The command |\StandardFootnotes| may be useful when
-% some footnotes are numbered with letters (inside minipages
-% for instance).
-%
-% |\AddThinSpaceBeforeFootnotes| and |\FrenchFootnotes| act
-% on \emph{all} footnotes whatever the current language is.
% \end{enumerate}
%
-% \vspace{\baselineskip}
-% All commands previously available in |francais.ldf| have been
-% included in |frenchb.ldf| for compatibility, sometimes with
-% updated definitions.
-%
-% The |french| package, by Bernard~\textsc{Gaulle}, was not
-% designed to run with \babel\ (although the latest versions claim
-% to be \babel\ compatible), but rather as a stand-alone package
-% for the French language.
-% It provides many more functionalities (like |\lettrine|,
-% |\sommaire|\dots) not available in |frenchb|,
-% at the cost of a much greater complexity and possible
-% incompatibilities with other languages.
-%
-% As |french| is known to produce the best layout available for
-% French typography, I have borrowed many ideas from Bernard's file.
-% I did my best to help users of both packages (|french| and
-% |frenchb|) to exchange their sources files easily (see the example
-% configuration file below in section~\ref{sec-cfg}), with one
-% exception which affects the way French quotation marks are
-% entered: |frenchb| uses \emph{macros} (|\og| and |\fg|) while
-% |french| uses active characters (|<<| and |>>|).
-%
-% \vspace{\baselineskip}
-% French typographic rules specify that some white space should be
-% present before `double punctuation' characters. These characters
-% are |;| |!| |?| and |:|.
-% In order to get this white space automatically, the category code
-% of these characters is made |\active|. In French, the user
-% \emph{should} input these four characters preceded with a space,
-% but as many people forget about it (even among native French
-% writers!), the default behaviour of |frenchb| is to automatically
-% add a |\thinspace| before `|;|' `|!|' `|?|' and a normal
-% (unbreakable) space before~`|:|' (this is the rule in French
-% typography). It's up to the user to add or not a space
-% \emph{after} `double punctuation' characters: usually a space is
-% necessary, but not always (before a full point or a closing brace
-% for instance), so this cannot done automatically.
-%
-% In (rare) cases where no space should be added before a `double
-% punctuation', either use |\string;| |\string:| |\string!|
-% |\string?| instead of |;| |:| |!| |?|, or switch locally to
-% English. For instance you can type |C\string:TEX| or
-% |\begin{otherlanguage}{english}{C:TEX}\end{otherlanguage}| to
-% avoid the space before~|:| in a MS-DOS path.
-%
-% Some users dislike this automatic insertion of a space before
-% `double punctuation', and prefer to decide themselves whether a
-% space should be added or not; so a hook |\NoAutoSpaceBeforeFDP|
-% is provided: if this command is added (in file |frenchb.cfg|, or
-% anywhere in a document) |frenchb| will respect your typing, and
-% introduce a suitable space before `double punctuation' \emph{if
-% and only if} a space is typed in the source file before those
-% signs.
-%
-% The command |\AutoSpaceBeforeFDP| switches back to the
-% default behaviour of |frenchb|.
-%
-% \vspace{\baselineskip}
+% \subsection{Customisation}
+% \label{ssec-custom}
+%
+% Up to version 1.6, customisation of |frenchb| was achieved
+% by entering commands in \file{frenchb.cfg}. This possibility
+% remains for compatibility, but \emph{should not longer be used}.
+% Version 2.0 introduces a new command |\frenchbsetup{}| using
+% the \file{keyval} syntax which should make it easier to choose
+% among the many options available. The command |\frenchbsetup{}|
+% is to appear in the preamble only (after loading \babel).
+%
+% \vspace{.5\baselineskip}
+% |\frenchbsetup{ShowOptions}| prints all available options to
+% the \file{.log} file, it is just meant as a remainder of the
+% list of offered options. As usual with \file{keyval} syntax,
+% boolean options (as |ShowOptions|) can be entered as
+% |ShowOptions=true| or just |ShowOptions|, the `|=true|' part
+% can be omitted.
+%
+% \vspace{.5\baselineskip}
+% The other options are (their default value is shown between
+% brackets):
+% \begin{itemize}
+% \item |StandardLayout=true [false]| forces |frenchb| not to
+% interfere with the layout: no action on any kind of lists,
+% first paragraphs of sections are not indented (as in English),
+% no action on footnotes. This option replaces the former
+% command |\StandardLayout|. It can be used either for unifying
+% the layout of a document so that it is no longer language
+% dependent or to avoid conflicts with classes or packages which
+% customise lists or footnotes.
+% \item |GlobalLayoutFrench=true [false]| is also meant for unifying
+% the layout of a document: lists typeset in other languages than
+% French look the same as in French and first paragraphs of
+% sections are all indented. Note that the layout of footnotes is
+% language independent anyway (see below |FrenchFootnotes| and
+% |AutoSpaceFootnotes|). This option replaces the former
+% command |\FrenchLayout|.
+% \item |AutoSpacePunctuation=false [true]|; in French, the user
+% \emph{should} input a space before the four characters `|:;!?|'
+% but as many people forget about it (even among native French
+% writers!), the default behaviour of |frenchb| is to
+% automatically add a |\thinspace| before `|;|' `|!|' `|?|' and a
+% normal (unbreakable) space before~`|:|' (recommended by the
+% French Imprimerie nationale). This is convenient in most cases
+% but can lead to addition of spurious spaces in URLs or in MS-DOS
+% paths. Choosing |AutoSpacePunctuation=false| will ensure that
+% a proper space will be added before `|:;!?|' \emph{if and only
+% if} a (normal) space has been typed in. Those who are unsure
+% about their typing in this area should stick to the default
+% option and type |\string;| |\string:| |\string!| |\string?|
+% instead of |;| |:| |!| |?| whenever no space should be added
+% before them (mostly in URLs and MS-DOS paths).
+% \item |ThinColonSpace=true [false]| changes the normal
+% (unbreakable) space added before the colon `:' to a thin space,
+% so that the same amount of space is added before any of the
+% four double punctuation characters. The default setting is
+% supported by the French Imprimerie nationale.
+% \item |ReduceListSpacing=false [true]|; |frenchb| normally
+% reduces the values of the vertical spaces used in the
+% environment |list| in French; setting this option to |false|
+% reverts to the standard settings of |list|. This option
+% replaces the former command |\FrenchListSpacingfalse|.
+% \item |CompactItemize=false [true]|; |frenchb| normally
+% suppresses any vertical space between items of |itemize| lists
+% in French; setting this option to |false| reverts to the
+% standard settings of |itemize| lists. This option replaces
+% the former command |\FrenchItemizeSpacingfalse|.
+% \item |StandardItemLabels=true [false]| when set to |true| this
+% option stops |frenchb| from changing the labels in |itemize|
+% lists in French.
+% \item |ItemLabels=\textemdash|, |\textbullet|, |\ding{43}|,
+% \dots, |[\textendash]|; when |StandardItemLabels=false| (the
+% default), this option enables to choose the label used in
+% |itemize| lists for all levels. The next three options do
+% the same but each one for one level only. Note that the
+% example |\ding{43}| requires |\usepackage{pifont}|.
+% \item |ItemLabeli=\textemdash|, |\textbullet|, |\ding{43}|,
+% \dots,|[\textendash]|
+% \item |ItemLabelii=\textemdash|, |\textbullet|, |\ding{43}|,
+% \dots, |[\textendash]|
+% \item |ItemLabeliii=\textemdash|, |\textbullet|, |\ding{43}|,
+% \dots, |[\textendash]|
+% \item |ItemLabeliv=\textemdash|, |\textbullet|, |\ding{43}|,
+% \dots, |[\textendash]|
+% \item |StandardLists=true [false]| forbids |frenchb| to
+% customize any kind of list. Do activate the option
+% |StandardLists| when using classes or packages that customise
+% lists too (|enumitem|, |paralist|, \dots{}) to avoid conflicts.
+% This option is just a shorthand for |ReduceListSpacing=false|
+% and |CompactItemize=false| and |StandardItemLabels=true|.
+% \item |IndentFirst=false [true]|; |frenchb| normally forces
+% indentation of the first paragraph of sections (in French only).
+% When this option is set to |false|, the first paragraph of
+% will look the same in French and in English (not indented).
+% \item |FrenchFootnotes=false [true]| reverts to the standard
+% layout of footnotes. By default |frenchb| typesets leading
+% numbers as `1.\hspace{.5em}' instead of `$\hbox{}^1$', but
+% has no effect on footnotes numbered with symbols (as in the
+% |\thanks| command). The former commands |\StandardFootnotes|
+% and |\FrenchFootnotes| are still there, |\StandardFootnotes|
+% can be useful when some footnotes are numbered with letters
+% (inside minipages for instance).
+% \item |AutoSpaceFootnotes=false [true]| ; by default |frenchb|
+% adds a thin space in the running text before the number or
+% symbol calling the footnote. Making this option |false| reverts
+% to the standard setting (no space added).
+% \item |PartNameFull=false [true]|; when true, |frenchb| numbers
+% the title of |\part{}| commands as ``Premi\`ere partie'',
+% ``Deuxi\`eme partie'' and so on. With some classes which change
+% the|\part{}| command (AMS and SMF classes do so), you will get
+% ``Premi\`ere partie~I'', ``Deuxi\`eme partie~II'' instead;
+% when this occurs, this option should be set to |false|,
+% part titles will then be printed as ``Partie I'', ``Partie II''.
+% \item |og=|\texttt{\guillemotleft}, |fg=|\texttt{\guillemotright};
+% when guillemets characters are available on the keyboard
+% (through a compose key for instance), it is nice to use them
+% instead of typing |\og| and |\fg|. This option tells |frenchb|
+% which characters are opening and closing French guillemets
+% (they depend on the input encoding), then you can type either
+% \texttt{\guillemotleft{} guillemets \guillemotright}, or
+% \texttt{\guillemotleft{}guillemets\guillemotright} (with or
+% without spaces), to get properly typeset French quotes.
+% This option requires \file{inputenc} to be loaded with the
+% proper encoding, it works with 8-bits encodings (latin1,
+% latin9, ansinew, applemac,\dots) and multi-byte encodings
+% (utf8 and utf8x).
+% \end{itemize}
+%
+% \subsection{Hyphenation checks}
+% \label{ssec-hyphen}
+%
% Once you have built your format, a good precaution would be to
% perform some basic tests about hyphenation in French. For
% \LaTeXe{} I suggest this:
% \begin{itemize}
% \item run the following file, with the encoding suitable for
% your machine (\textit{my-encoding} will be |latin1| for
-% \textsc{unix} machines and PCs running~Windows, |applemac|
-% for Macintoshs, or |cp850| for PCs running~DOS). \\[3mm]^^A\]
+% \textsc{unix} machines, |ansinew| for PCs running~Windows,
+% |applemac| or |latin1| for Macintoshs, or |utf8|\dots\\[3mm]^^A\]
% |%%% Test file for French hyphenation.|\\
% |\documentclass{article}|\\
% |\usepackage[|\textit{my-encoding}|]{inputenc}|\\
-% |\usepackage[T1]{fontenc} % Use EC fonts for French|\\
-% |%\usepackage{aeguill} % Uncomment this line and|\\
-% | % comment out the preceeding one|\\
-% | % to use AE virtual fonts.|\\
-% |\usepackage[francais]{babel}|\\
+% |\usepackage[T1]{fontenc} % Use LM fonts|\\
+% |\usepackage{lmodern} % for French|\\
+% |\usepackage[frenchb]{babel}|\\
% |\begin{document}|\\
% |\showhyphens{signal container \'ev\'enement alg\`ebre}|\\
% |\showhyphens{|\texttt{signal container \'ev\'enement
@@ -339,335 +370,91 @@
% \item you get no hyphen at all in \texttt{\'ev\'e-ne-ment}, this
% probably means that you are using CM fonts and the macro
% |\accent| to produce accented characters.
-% Using EC fonts with built-in accented characters or Ml\TeX{}
-% with CM fonts avoids this type of mismatch.
+% Using 8-bits fonts with built-in accented characters avoids
+% this kind of mismatch.
% \end{itemize}
%
-% \vspace{\baselineskip}
-% |frenchb| has been improved using helpful suggestions from many
-% people, the main contributions came from Vincent~Jalby.
-% Thanks to all of them!
-%
-% \subsection*{Changes}
+% \textbf{Options' order} -- Please remember that options are read
+% in the order they appear inside the |\frenchbsetup| command.
+% Someone wishing that |frenchb| leaves the layout of lists
+% and footnotes untouched but caring for indentation of first
+% paragraph of sections could choose
+% |\frenchbsetup{StandardLayout,IndentFirst}| and get the expected
+% layout. Choosing |\frenchbsetup{IndentFirst,StandardLayout}|
+% would not lead to the expected result: option |IndentFirst| would
+% be overwritten by |StandardLayout|.
%
-% First version released: 1.1 as of 1996/05/31 part of
-% \babel-3.6beta.
-%
-% \textbf{Changes in version 1.1b}: update for \babel-3.6.
-%
-% \textbf{Changes in version 1.2}: new command |\nombre| to
-% format numbers; removed command |\fup| borrowed from the
-% |french| package (|\up| does a better job in \LaTeXe);
-% also removed aliases |\french| and |\english| (frenchb.cfg
-% is a better place for these).
-%
-% \textbf{Changes in version 1.3}:
-% \begin{itemize}
-% \item The `xspace' package, when present, now controls
-% spacing after all (sensible) macros, formerly `xspace'
-% worked on |\fg| (suggested by Vincent~Jalby);
-% \item spacing after opening and before closing guillemets
-% improved as suggested by Thierry~Bouche;
-% \item a replacement for poor looking guillemets in OT1 encoding
-% (\emph{math} fonts are used to emulate them) is provided
-% if the file |ot2wncyr.fd| is found: this file defines an
-% OT2 encoding using AMS Cyrillic fonts; these
-% have built-in guillemets, they are \emph{text} fonts,
-% are free, and are distributed as METAFONT and Type1 fonts
-% (good for pdftex!), the replacement was suggested by
-% G\'erard~Degrez; if the files |ot2wncyr.fd|, |wncy*.mf|,
-% |wncy*.tfm|, and |wncy*.pfb| aren't available on your
-% system, you \emph{should} get them from \mbox{CTAN};
-% if your system complains about missing |wncy*.tfm| fonts,
-% it means your \TeX{} system is \emph{incomplete}, as a
-% quick fix, you can either remove |ot2wncyr.fd| or add the
-% command |\LasyGuillemets| to the preamble of your document
-% or to |frenchb.cfg|, then |frenchb| will behave as it did
-% in the previous versions.\\
-% In case Cyrillic guillemets do not fit, it is possible
-% to pick French guillemets from any font using the
-% command |\FrenchGuillemetsFrom| which requires 4 arguments
-% |\FrenchGuillemetsFrom{|{\it coding}|}{|{\it font}\relax
-% |}{|{\it char-left}|}{|{\it char-right}|}|, for instance,
-% add |\FrenchGuillemetsFrom{T1}{ppl}{19}{20}| to the
-% preamble of your document or to |frenchb.cfg|, to pick
-% French guillemets from Palatino (fontname=ppl, char 19
-% and 20 are left and right guillemets in T1-encoding).
-% This was suggested by Michel~Bovani.
-% \item the environment `itemize' has been redesigned in French
-% according to specifications from Jacques~Andr\'e
-% and Thierry~Bouche; it is possible to switch back to the
-% settings of version~1.2: add |\FrenchItemizeSpacingfalse|
-% \emph{after} loading |frenchb| in the preamble (this can
-% be useful to process old documents);
-% \item two switches have been added to go back to standard
-% \LaTeX{} list spacing |\FrenchItemizeSpacingfalse|
-% and |\FrenchListSpacingfalse|;
-% \item |\nombre| now properly handles signs in \LaTeXe;
-% \item definition of |\dots| changed in French;
-% \item in French, with the standard \LaTeX{} classes, captions
-% in figures and tables are printed with an endash instead
-% of a colon.
-% \end{itemize}
-%
-% \textbf{Changes in version 1.4}:
-% \begin{itemize}
-% \item the redefinition of|\@makecaption| is changed not to
-% overwrite the changes made by some classes (koma-script,
-% amsart, ua-thesis\dots) as pointed out by Werner~Lemberg;
-% \item a hook, |\FrenchGuillemetsFrom|, is provided to pick
-% French guillemets from any font (suggested by
-% Michel~Bovani, works \emph{only} in OT1-encoding);
-% \item a hook, |\FrenchLabelItem|, is provided to enable marks
-% other than `--' (|\textendash|) in French lists
-% (also suggested by Michel~Bovani);
-% \item |\DecimalMathComma|, |\StandardMathComma|,
-% |\ThinSpaceInFrenchNumbers| added;
-% \item |\FrenchLayout| and |\StandardLayout| added;
-% \item an example of customization file |frenchb.cfg| is
-% included in |frenchb.dtx|.
-% \end{itemize}
+% \subsection{Changes}
+% \label{ssec-changes}
%
-% \textbf{Changes in version 1.5}:
-% \begin{itemize}
-% \item The settings for spacing in French lists are no longer
-% tuned at the |\@trivlist| level but within |\list|; this
-% enables the users to provide their own settings for the
-% lists they define with |\list| (suggested by P. Pichaureau).
-% Although the layout of the standard lists
-% \emph{has not changed}, some lists, based directly on
-% |\@trivlist| or |\trivlist|, could possibly be typeset
-% differently when upgrading from version 1.4 to 1.5.
-% The command |\FrenchOldTrivlisttrue| could then, be useful
-% to process older documents.
-% \item Apart from the global hook |\FrenchLabelItem|, it is
-% now also possible to change the `labelitems' at any level
-% (1 to 4) in French, using the standard \LaTeX{} syntax,
-% for instance: |\renewcommand{\labelitemii}{\textbullet}|.
-% \item The internal name for the French language has been
-% changed from |frenchb| to |french|, it means that
-% |\captionsfrench|, |\datefrench|, |\extrasfrench|,
-% |\noextrasfrench|, are to be used now instead of
-% |\captionsfrenchb|, |\datefrenchb|, |\extrasfrenchb|,
-% |\noextrasfrenchb|.
-% \item From version 1.5f on, it is possible to customize
-% the space inserted before a colon in French; its default
-% value is |\space| (as in previous versions of |frenchb|),
-% but it can now be changed to |\thinspace| by redefining
-% |\Fcolonspace|.
-% \end{itemize}
+% \subsubsection*{What's new in version 2.0?}
%
-% \textbf{Changes in version 1.6}:
+% Here is the list of all changes:
% \begin{itemize}
-% \item Two new commands are provided:
-% |\AddThinSpaceBeforeFootnotes| and |\FrenchFootnotes|;
-% they enable to typeset footnotes according to the
-% French IN's specifications (suggested by Jacques~Andr\'e).
-% \item |frenchb| will make use of |\textdegree| (TS1 encoding)
-% to typeset degrees whenever possible.
-% \item Default guillemets have been changed \emph{in OT1
-% encoding only} in version~1.6c: the former ones were picked
-% up in the wncyr fonts, which forced the cyrillic encoding to
-% OT2 when \babel{} was loaded with option |frenchb| before a
-% cyrillic language (|russian|, |ukrainian| or |bulgarian|).
-% Now, LM fonts for T1-encoding are available, we pick up the
-% guillemets from them, for OT1-encoding.
-% \item The config file |frenchb.cfg| is now loaded only when
-% \LaTeXe{} is used (from version~1.6g).
-% \item The command |\degres| now works also in math mode (from
-% version~1.6g), but not in bold versions (it is a text
-% character basically).
+% \item Support for \LaTeX-2.09 and for \LaTeXe{} in compatibility
+% mode has been dropped. This version is meant for \LaTeXe{} and
+% Plain based formats (like \file{bplain}). \LaTeXe{} formats
+% based on ml\TeX{} are no longer supported either (plenty of
+% good 8-bits fonts are available now, so T1 encoding should
+% be preferred for typesetting in French). A warning is issued
+% when OT1 encoding is in use at the |\begin{document}|.
+% \item Customisation should now be handled by command
+% |\frenchbsetup{}|, \file{frenchb.cfg} (kept for compatibility)
+% should no longer be used. See section~\ref{ssec-custom} for
+% the list of available options.
+% \item Captions in figures and table have changed in French: former
+% abbreviations ``Fig.'' and ``Tab.'' have been replaced by full
+% names ``Figure'' and ``Table''. If this leads to formatting
+% problems in captions, you can add the following two commands to
+% your preamble (after loading \babel) to get the former captions\\
+% |\addto\captionsfrench{\def\figurename{{\scshape Fig.}}}|\\
+% |\addto\captionsfrench{\def\tablename{{\scshape Tab.}}}|.
+% \item The |\nombre| command is now provided by the \file{numprint}
+% package which has to be loaded \emph{after} \babel{} with the
+% option |autolanguage| if number formatting should depend on the
+% current language.
+% \item The |\bsc| command no longer uses an |\hbox| to stop
+% hyphenation of names but a |\kern0pt| instead. This change
+% enables \file{microtype} to fine tune the length of the
+% argument of |\bsc|; as a side-effect, compound names like
+% Dupont-Durand can now be hyphenated on explicit hyphens.
+% You can get back to the former behaviour of |\bsc| by adding\\
+% |\renewcommand*{\bsc}[1]{\leavevmode\hbox{\scshape #1}}|\\
+% to the preamble of your document.
+% \item Footnotes are now displayed ``\`a la fran\c caise'' for the
+% whole document, except with an explicit\\
+% |\frenchbsetup{AutoSpaceFootnotes=false,FrenchFootnotes=false}|.\\
+% Add this command if you want standard footnotes. It is still
+% possible to revert locally to the standard layout of footnotes
+% by adding |\StandardFootnotes| (inside a |minipage| environment
+% for instance).
% \end{itemize}
%
% \StopEventually{}
%
-% \subsection*{Customizing frenchb: an example of configuration file}
+% \subsection{File frenchb.cfg}
% \label{sec-cfg}
%
-% \changes{frenchb-1.4d}{1999/12/19}{Do NOT set catcodes of French
-% quotes to 12 before launching \cs{initiate@active@char} in
-% frenchb.cfg, (problem on Mac reported by M.Bovani).}
+% \file{frenchb.cfg} is now a dummy file just kept for
+% compatibility with previous versions.
%
-% \begin{macrocode}
+% \iffalse
%<*cfg>
+% \fi
+% \begin{macrocode}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to customize frenchb, please DO NOT hack into the code,
-%% copy this file into a directory searched by TeX, preferably a
-%% personal one on multi-user systems, and customize it as you like.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% WARNING: If you exchange your documents with colleagues using
-%% a different TeX installation, it is best NOT TO HAVE a frenchb.cfg
-%% file, and add instead the customization commands to the preamble
-%% of your documents after babel and frenchb have been loaded.
+%%%%%%%%% WARNING: THIS FILE SHOULD NO LONGER BE USED %%%%%%%%%
+%% If you want to customise frenchb, please DO NOT hack into the code!
+%% Do no put any code in this file either, please use the new command
+%% \frenchbsetup{} with the proper options to customise frenchb.
+%%
+%% Add \frenchbsetup{ShowOptions} to your preamble to see the list of
+%% available options and/or read the documentation.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Uncomment the following line if you dislike frenchb automatically
-%% adding a space before French double punctuation (see frenchb.dtx
-%% for more information).
-%%
-%%\NoAutoSpaceBeforeFDP
-%%
-%% frenchb inserts a normal space before a colon in French (following
-%% I.N. specifications), but some people prefer a thinspace instead;
-%% uncomment the following line if you prefer a thinspace.
-%%
-%%\renewcommand{\Fcolonspace}{\thinspace}
-%%
-%% Uncomment the following line to force lasy font emulation for
-%% French guillemets in OT1 encoding; Polish guillemets are
-%% FAR BETTER LOOKING, you should normally leave this line commented out.
-%%
-%%\LasyGuillemets
-%%
-%% The following option is for backward compatibility ONLY
-%% (it might conflict with the russian option of babel).
-%% Uncomment the following line if you want to get back to
-%% the default guillemets used in versions $<$ 1.6b for OT1-encoding
-%% (no effect in T1-encoding).
-%%
-%%\CyrillicGuillemets
-%%
-%% If you dislike Polish guillemets in OT1-encoding, you can easily
-%% pick up yours from other fonts, examples below: Palatino or
-%% cyrillic CMR T2A encoded font.
-%% The four arguments are: encoding, font name, character codes of
-%% the opening and closing guillemets in the selected font.
-%%
-%%\FrenchGuillemetsFrom{T1}{ppl}{19}{20}
-%%\FrenchGuillemetsFrom{T2A}{cmr}{190}{191}
-%%
-%% Uncomment the following line if you don't want frenchb to change
-%% LaTeX standard settings for vertical spacing in 'itemize' lists.
-%% LaTeX standard settings were used by frenchb in versions < 1.3,
-%% so you may want to uncomment the following line to process older
-%% documents.
-%%
-%%\FrenchItemizeSpacingfalse
-%%
-%% frenchb tunes vertical spaces in all lists (at \list level),
-%% uncomment the following line if you prefer LaTeX standard settings
-%% (this flag is new in version 1.3). When \ifFrenchItemizeSpacing is
-%% `true' (default setting), this flag has no effect on itemize lists.
-%%
-%%\FrenchListSpacingfalse
-%%
-%% The command \FrenchLabelItem can be used to set the `labelitems'
-%% for all levels in French. For instance, to get long dashes, use:
-%%
-%%\renewcommand{\FrenchLabelItem}{\textemdash}
-%%
-%% You can also have different `labelitems' for each level in French:
-%%
-%%\renewcommand{\Frlabelitemi}{\textemdash}
-%%\renewcommand{\Frlabelitemii}{\bfseries\textendash}
-%%\renewcommand{\Frlabelitemiii}{\textbullet}
-%%\renewcommand{\Frlabelitemiv}{}
-%%
-%% Uncomment the following line if you want a thinspace to be added
-%% in the running text before the footnote number or symbol.
-%%
-%%\AddThinSpaceBeforeFootnotes
-%%
-%% Uncomment the following line if you want footnotes to be typeset
-%% according the specifications of the French `Imprimerie Nationale'.
-%%
-%%\FrenchFootnotes
-%%
-%% Uncomment the following line if you want the command \nombre to
-%% insert thin spaces (1/6em) instead of normal spaces (0.3em)
-%% between slices of 3 digits when typesetting numbers in French.
-%%
-%%\ThinSpaceInFrenchNumbers
-%%
-%% If you are bored to type {,} every time you want a decimal comma in
-%% math mode, uncomment the following line (and don't forget to add a
-%% forced space after the comma in lists and intervals: $(x,\ y)$ and
-%% $[0,\ 1]$). I suggest NOT TO UNCOMMENT the following line,
-%% and to switch between the decimal comma and the standard comma
-%% using \DecimalMathComma and \StandardMathComma inside the document.
-%%
-%%\DecimalMathComma
-%%
-%% If you do not want the appearance of lists to depend on the current
-%% language, add ONE of these two commands: \FrenchLayout (for a
-%% document mainly in French) or \StandardLayout (for a document
-%% mainly in English).
-%%
-%%\FrenchLayout
-%%\StandardLayout
-%%
-%% With the standard LaTeX classes (article.cls, report.cls, book.cls)
-%% you can change the separator used in figure and table captions in
-%% French with \CaptionSeparator, for instance (the default value of
-%% \CaptionSeparator in French is '\space\textendash\space'):
-%%
-%%\addto\captionsfrench{\def\CaptionSeparator{\space\textemdash\space}}
-%%
-%% You might want to change some of the translations of caption names,
-%% you can do it this way, for instance:
-%%
-%%\addto\captionsfrench{\def\figurename{{\scshape Figure}}}
-%%\addto\captionsfrench{\def\tablename{{\scshape Table}}}
-%%\addto\captionsfrench{\def\proofname{Preuve}}
-%%
-%% If French guillemets are available on your keyboard, you can use
-%% them instead of the commands \og and \fg: REPLACE << and >> in
-%% the following code by your ready-made guillemets (2 occurrences
-%% for each) AND uncomment the resulting code.
-%% WARNINGS:
-%% 1) This will reduce the portability of your source files!
-%% 2) This adds two active characters.
-%% 3) If you add this stuff to the preamble of a document, you'll
-%% need to wrap it in \makeatletter ... \makeatother.
-%%
-%% \ifx\mule@def\undefined
-%% \initiate@active@char{<<}
-%% \initiate@active@char{>>}
-%% \AtBeginDocument{%
-%% \def<<{\og\ignorespaces}%
-%% \def>>{{\fg}}%
-%% }%
-%% \else %%% For the CJK package, see MULEenc.sty.
-%% \mule@def{11}{\og\ignorespaces}
-%% \mule@def{27}{{\fg}}
-%% \fi
-%%
-%% The rest is for compatibility with Bernard Gaulle's french.sty:
-%% if you want to typeset with babel/frenchb files originally written
-%% for french.sty, you will probably want to uncomment these lines.
-%%
-%% Uncomment these lines if you want the aliases \numero and \Numero
-%% (as in french.sty) for \no and \No.
-%%
-%%\let\numero=\no
-%%\let\Numero=\No
-%%
-%% Uncomment the following lines if you want to substitute `\bsc' to
-%% either (or both) of french.sty macros `\fsc' and `\lsc'.
-%%
-%%\let\fsc=\bsc
-%%\let\lsc=\bsc
-%%
-%% Uncomment the following line if you want to substitute `\up' to
-%% french.sty macro `\fup'.
-%%
-%%\let\fup=\up
-%%
-%% Uncomment the following lines if you intend to use commands \french
-%% and \english to switch between languages, as in french.sty.
-%%
-%%\def\french{\leavevmode\selectlanguage{french}}
-%%\def\english{\leavevmode\selectlanguage{english}}
-%%
-%% Uncomment the following lines if you intend to use the command
-%% \AllTeX to refer to all flavours of TeX, (this command has been
-%% made popular by french.sty).
-%%
-%%\newcommand*{\AllTeX}{%
-%% (L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em)%
-%% T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}
-%</cfg>
% \end{macrocode}
+% \iffalse
+%</cfg>
+% \fi
%
% \section{\TeX{}nical details}
%
@@ -677,74 +464,38 @@
% loaded more than once, checking the category code of the
% \texttt{@} sign, etc.
%
-% \changes{frenchb-1.1b}{1996/11/02}{Now use \cs{LdfInit} to perform
-% initial checks}
-%
-% \changes{frenchb-1.5g}{2001/09/09}{Let \cs{LdfInit} check for
-% \cs{datefrench} instead of \cs{NoAutoSpaceBeforeFDP},
-% as the later is also defined by russianb.ldf}
+% \iffalse
+%<*code>
+% \fi
%
% \begin{macrocode}
-%<*code>
-%%
\LdfInit\CurrentOption\datefrench
% \end{macrocode}
%
-% \begin{macro}{\ifLaTeX}
% \begin{macro}{\ifLaTeXe}
-% \changes{frenchb-1.1}{1996/02/12}{Use \cs{fmtname} to check
-% the format instead of \cs{newcommand}; define \cs{PlainFmtName}
-% and \cs{LaTeXeFmtName}.}
-%
-% \changes{frenchb-1.3f}{1999/04/11}{Use \cs{magnification} to check
-% if the format is plain (i.e \emph{not} \LaTeX). Checking the
-% format's name was not reliable: plain-like formats may not be
-% called just `plain' but `babel-plain'.}
-%
-% To check the format in use (plain, \LaTeX{} or \LaTeXe),
-% we'll need two new `if'.
+% No support is provided for late \LaTeX-2.09: issue a warning
+% and exit if \LaTeX-2.09 is in use. Plain is still supported.
% \begin{macrocode}
-\newif\ifLaTeX
-\ifx\magnification\@undefined\LaTeXtrue\fi
\newif\ifLaTeXe
-\ifx\@compatibilitytrue\@undefined\else\LaTeXetrue\fi
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\if@Two@E}
-% \changes{frenchb-1.1}{1996/03/01}{New test \cs{if@Two@E}.}
-%
-% We will need another `if' : |\if@Two@E| is true if and only if
-% \LaTeXe{} is running \emph{not} in compatibility mode. It is
-% used in the definitions of the command |\nombre| and |\up|.
-% The definition is somewhat complicated, due to the fact that
-% |\if@compatibility| is not recognized as a |\if| in
-% \LaTeX-2.09 based formats.
-% \begin{macrocode}
-\newif\if@Two@E \@Two@Etrue
-\def\@FI@{\fi}
-\ifx\@compatibilitytrue\@undefined
- \@Two@Efalse \def\@FI@{\relax}
-\else
- \if@compatibility \@Two@Efalse \fi
-\@FI@
+\ifx\magnification\@undefined
+ \ifx\@compatibilitytrue\@undefined
+ \PackageError{frenchb.ldf}%
+ {LaTeX-2.09 format is no longer supported.\MessageBreak
+ Aborting here.}%
+ \endinput
+ \else
+ \LaTeXetrue
+ \fi
+\fi
% \end{macrocode}
% \end{macro}
%
-% \changes{frenchb-1.1b}{1996/11/07}{Removed test for \cs{l@english}}
-%
-% \changes{frenchb-1.2}{1997/01/05}{Check for hyphenation patterns}
-%
% Check if hyphenation patterns for the French language have been
% loaded in language.dat; we allow for the names `french',
% `francais', `canadien' or `acadian'. The latter two are both
% names used in Canada for variants of French that are in use in
% that country.
%
-% \changes{frenchb-1.5b}{2001/02/09}{Added support for canadien and
-% acadian}
-%
% \begin{macrocode}
\ifx\l@french\@undefined
\ifx\l@francais\@undefined
@@ -763,11 +514,8 @@
\fi
\fi
% \end{macrocode}
-% After the statement above |\l@french| is sure to always be
-% defined.
+% Now |\l@french| is always defined.
%
-% \changes{frenchb-1.2}{1997/01/05}{`french' `frenchb' and
-% `francais' are synonymous regardless of \cs{CurrentOption}.}
% The internal name for the French language will be `french';
% `francais' and `frenchb' will be synonymous for `french':
% first let both names use the same hyphenation patterns.
@@ -776,9 +524,6 @@
% As French uses the standard values of |\lefthyphenmin| (2)
% and |\righthyphenmin| (3), no special setting is required here.
%
-% \changes{frenchb-1.5d}{2001/02/16}{The internal name for the
-% French language is changed from `frenchb' to `french'.}
-%
% \begin{macrocode}
\def\CurrentOption{french}
\ifx\l@francais\@undefined
@@ -791,10 +536,6 @@
% When this language definition file was loaded for one of the
% Canadian versions of French we need to make sure that a suitable
% hyphenation pattern register will be found by \TeX.
-%
-% \changes{babel-1.5b}{2001/02/09}{Added support for canadien and
-% acadian}
-%
% \begin{macrocode}
\ifx\l@canadien\@undefined
\let\l@canadien\l@french
@@ -804,69 +545,17 @@
\fi
% \end{macrocode}
%
-% \changes{frenchb-1.5g}{2001/09/09}{Instead of issuing a warning when
-% \cs{captionsfrancais} or \cs{captionsfrenchb} are customized in
-% the preamble, we merge the changes into \cs{captionsfrench}.}
-%
% This language definition can be loaded for different variants of
% the French language. The `key' \babel\ macros are only defined
% once, using `french' as the language name, but |frenchb| and
-% |francais| are synonymous. As some users who choose |frenchb|
-% or |francais| as option of \babel, might customize
-% |\captionsfrenchb| or |\captionsfrancais| in the preamble,
-% we merge their changes at the |\begin{document}| when they do so
-% (only possible in \LaTeXe).
-% The other three commands for |\date|, |\extras|, and |\noextras|
-% are not likely to be modified by end-users.
-% The other variants of languages are defined by checking if the
-% relevant option was used and then adding one extra level of
-% expansion.
-%
-% \changes{frenchb-1.6c}{2003/06/30}{Bug correction: it is necessary
-% to re-execute \cs{captionsfrench} after merging
-% \cs{captionsfrenchb} and \cs{captionsfrancais}.}
-%
+% |francais| are synonymous.
% \begin{macrocode}
\def\datefrancais{\datefrench}
-\def\extrasfrancais{\extrasfrench}
-\def\noextrasfrancais{\noextrasfrench}
\def\datefrenchb{\datefrench}
+\def\extrasfrancais{\extrasfrench}
\def\extrasfrenchb{\extrasfrench}
+\def\noextrasfrancais{\noextrasfrench}
\def\noextrasfrenchb{\noextrasfrench}
-\ifLaTeXe
- \AtBeginDocument{\let\captions@French\captionsfrench
- \ifx\captionsfrenchb\@undefined
- \let\captions@Frenchb\relax
- \else
- \let\captions@Frenchb\captionsfrenchb
- \fi
- \ifx\captionsfrancais\@undefined
- \let\captions@Francais\relax
- \else
- \let\captions@Francais\captionsfrancais
- \fi
- \def\captionsfrench{\captions@French
- \captions@Francais\captions@Frenchb}%
- \def\captionsfrancais{\captionsfrench}%
- \def\captionsfrenchb{\captionsfrench}%
- \iflanguage{french}{\captionsfrench}{}%
- }
-\else
- \def\captionsfrancais{\captionsfrench}
- \def\captionsfrenchb{\captionsfrench}
-\fi
-\@ifpackagewith{babel}{canadien}{%
- \def\captionscanadien{\captionsfrench}%
- \def\datecanadien{\datefrench}%
- \def\extrascanadien{\extrasfrench}%
- \def\noextrascanadien{\noextrasfrench}%
- }{}
-\@ifpackagewith{babel}{acadian}{%
- \def\captionsacadian{\captionsfrench}%
- \def\dateacadian{\datefrench}%
- \def\extrasacadian{\extrasfrench}%
- \def\noextrasacadian{\noextrasfrench}%
- }{}
% \end{macrocode}
%
% \begin{macro}{\extrasfrench}
@@ -875,14 +564,12 @@
% definitions needed for the French language.
% The macro |\noextrasfrench| is used to cancel the actions of
% |\extrasfrench|.\\
-% In French ``apostrophe'' is used in hyphenation in expressions
-% like |l'ambulance| (French patterns provide entries for this kind
-% of words). This means that the |\lccode| of ``apostrophe'' has
-% to be non null in French for proper hyphenation of those
-% expressions, and to be reset to null when exiting French.
-%
-% \changes{frenchb-1.2}{1997/01/05}{`french' `frenchb' and
-% `francais' are synonymous regardless of \cs{CurrentOption}.}
+% In French, character``apostrophe'' is a letter in expressions like
+% |l'ambulance| (French hyphenation patterns provide entries for
+% this kind of words). This means that the |\lccode| of
+% ``apostrophe'' has to be non null in French for proper hyphenation
+% of those expressions, and has to be reset to null when exiting
+% French.
%
% \begin{macrocode}
\@namedef{extras\CurrentOption}{\lccode`\'=`\'}
@@ -891,529 +578,688 @@
% \end{macro}
% \end{macro}
%
-% \changes{frenchb-1.1}{1996/01/29}{Add some font changing
-% definitions.}
-%
-% It is best to use \LaTeXe{}'s font changing commands, and to
-% emulated those we need when they are not available, as in
-% Plain\TeX{} or \LaTeX-2.09. Be aware that old commands |\sc|,
-% |\it|, \textit{etc.} exist in \LaTeXe{}, but they behave like
-% they did in \LaTeX-2.09 (i.\,e., they switch back to
-% |\normalfont| instead of keeping the other font attributes
-% unchanged).
+% One more thing |\extrasfrench| needs to do is to make sure that
+% |\frenchspacing| is in effect. |\noextrasfrench| will switch
+% |\frenchspacing| off again.
% \begin{macrocode}
-\ifx\scshape\@undefined
- \ifx\sc\@undefined
- \let\scshape\relax
- \else
- \let\scshape\sc
- \fi
-\fi
-\ifx\emph\@undefined
- \ifx\em\@undefined
- \let\emph\relax
- \else
- \def\emph#1{\em #1}
- \fi
-\fi
+ \expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \bbl@frenchspacing}
+ \expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \bbl@nonfrenchspacing}
% \end{macrocode}
%
-% \subsection{Caption names}
-%
-% The next step consists of defining the French equivalents for
-% the \LaTeX{} caption names.
-%
-% \changes{frenchb-1.3c}{1997/10/08}{changed \cs{@makecaption}
-% definition to add a hook \cs{CaptionSeparator}.}
-%
-% In French, captions in figures and tables should be printed with
-% endash (`--') instead of the standard `:'. If another separator
-% is preferred, see in the example configuration file above
-% (section~\ref{sec-cfg}) how to change the default value of
-% |\CaptionSeparator|.
-%
-% \changes{frenchb-1.4a}{1999/10/23}{frenchb-1.3 silently redefined
-% \cs{@makecaption}, overwriting changes made by some classes
-% like koma-script, ua-thesis\dots (pointed out by Werner~Lemberg).
-% New implementation suggested by Vincent~Jalby.}
-%
-% \changes{frenchb-1.4e}{2000/03/12}{Captions print twice with AMS
-% classes (amsart, amsbook). Bug reported by Jean-Fran\c cois
-% Mertens. Revert to implementation of version 1.4, which is
-% safer as \@makecaption can be changed unpredictably.}
-%
-% We first store the standard definition of |\@makecaption|
-% (e.g., the one provided in article.cls, report.cls, book.cls
-% which is frozen for \LaTeXe{} according to Frank Mittelbach),
-% in |\STD@makecaption|. `ATBeginDocument' we compare it to its
-% current definition (some classes like koma-script classes,
-% AMS classes, ua-thesis.cls\dots change it).
-% If they are identical, frenchb just adds a hook called
-% |\CaptionSeparator| to |\@makecaption|, |\CaptionSeparator|
-% defaults to ': ' as in the standard |\@makecaption|, and will be
-% changed to ' -- ' in French.
-% If the definitions differ, frenchb doesn't overwrite the changes,
-% but prints a message in the .log file.
-%
-% \changes{frenchb-1.4f}{2000/04/07}{Only issue a warning if
-% \cs{@makecaption} exists}
+% \subsection{Punctuation}
+% \label{sec-punct}
%
-% \begin{macrocode}
-\ifLaTeXe
- \long\def\STD@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}
- \def\CaptionSeparator{\string:\space}
- \long\def\FB@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1\CaptionSeparator #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1\CaptionSeparator #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}
- \AtBeginDocument{%
- \ifx\@makecaption\STD@makecaption
- \let\@makecaption\FB@makecaption
+% As long as no better solution is available%
+% \footnote{Lua\TeX, or pdf\TeX{} might provide alternatives in
+% the future\dots},
+% the `double punctuation' characters (|;| |!| |?| and |:|) have to
+% be made |\active| for an automatic control of the amount of space
+% to insert before them. Before doing so, we have to save the
+% standard definition of |\@makecaption| (which includes two ':')
+% to compare it later to its definition at the |\begin{document}|.
+% \begin{macrocode}
+\long\def\STD@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1: #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ #1: #2\par
\else
- \ifx\@makecaption\@undefined\else
- \PackageWarning{frenchb.ldf}%
- {The definition of \protect\@makecaption\space
- has been changed,\MessageBreak
- frenchb will NOT customize it;\MessageBreak reported}%
- \fi
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
- \let\FB@makecaption\relax
- \let\STD@makecaption\relax}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \def\CaptionSeparator{\string:\space}}
-\fi
+ \vskip\belowcaptionskip}%
% \end{macrocode}
%
-% \begin{macro}{\captionsfrench}
-% The macro |\captionsfrench| defines all strings used in the four
-% standard document classes provided with \LaTeX. Some authors do
-% not like some of these names; it is easy to change them in the
-% preamble \emph{after} loading |frenchb| (or in your file
-% |frenchb.cfg|), e.g
-% |\addto\captionsfrench{\def\figurename{Figure}}| will print
-% `Figure' in Roman instead of `\textsc{Fig.}'.
-%
-% \changes{frenchb-1.1}{1996/01/30}{This code is useless in Plain\TeX,
-% check the format before loading it.}
-%
-% \changes{frenchb-1.2}{1997/01/05}{Added aliases \cs{captionsfrenchb}
-% and \cs{captionsfrancais}.}
-%
-% \changes{frenchb-1.3c}{1997/10/08}{Added \cs{CaptionSeparator}.}
-%
-% \changes{frenchb-1.4a}{1999/10/23}{Changed `--' to
-% \cs{textendash} in \cs{CaptionSeparator} in case the ligature
-% doesn't exist (tt-fonts).}
-%
-% \changes{frenchb-1.4f}{2000/04/06}{Added \cs{glossaryname}}
+% We define a new `if' |\FBpunct@active| which will be made false
+% whenever a better alternative will be available.
+% The following code makes the four characters |;| |!| |?| and |:|
+% `active' and provides their definitions.
+% \begin{macrocode}
+\newif\ifFBpunct@active \FBpunct@activetrue
+\ifFBpunct@active
+ \initiate@active@char{:}
+ \initiate@active@char{;}
+ \initiate@active@char{!}
+ \initiate@active@char{?}
+% \end{macrocode}
+% We first tune the amount of space before \texttt{;}
+% \texttt{!} \texttt{?} and \texttt{:}. This should only happen
+% in horizontal mode, hence the test |\ifhmode|.
%
+% In horizontal mode, if a space has been typed before `;' we
+% remove it and put an unbreakable |\thinspace| instead. If no
+% space has been typed, we add |\FDP@thinspace| which will be
+% defined, up to the user's wishes, as an automatic added
+% thin space, or as |\@empty|.
% \begin{macrocode}
-\ifLaTeX
-\@namedef{captions\CurrentOption}{%
- \def\refname{R\'ef\'erences}%
- \def\abstractname{R\'esum\'e}%
- \def\bibname{Bibliographie}%
- \def\prefacename{Pr\'eface}%
- \def\chaptername{Chapitre}%
- \def\appendixname{Annexe}%
- \def\contentsname{Table des mati\`eres}%
- \def\listfigurename{Table des figures}%
- \def\listtablename{Liste des tableaux}%
- \def\indexname{Index}%
- \def\figurename{{\scshape Fig.}}%
- \def\tablename{{\scshape Tab.}}%
- \def\CaptionSeparator{\space\textendash\space}%
+ \declare@shorthand{french}{;}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\thinspace
+ \else
+ \FDP@thinspace
+ \fi
+ \fi
% \end{macrocode}
-% ``Premi\`ere partie'' instead of ``Part I''
+% Now we can insert a |;| character.
% \begin{macrocode}
- \def\partname{\protect\@Fpt partie}%
- \def\@Fpt{{\ifcase\value{part}\or Premi\`ere\or Deuxi\`eme\or
- Troisi\`eme\or Quatri\`eme\or Cinqui\`eme\or Sixi\`eme\or
- Septi\`eme\or Huiti\`eme\or Neuvi\`eme\or Dixi\`eme\or Onzi\`eme\or
- Douzi\`eme\or Treizi\`eme\or Quatorzi\`eme\or Quinzi\`eme\or
- Seizi\`eme\or Dix-septi\`eme\or Dix-huiti\`eme\or Dix-neuvi\`eme\or
- Vingti\`eme\fi}\space\def\thepart{}}%
- \def\pagename{page}%
- \def\seename{{\emph{voir}}}%
- \def\alsoname{{\emph{voir aussi}}}%
- \def\enclname{P.~J. }%
- \def\ccname{Copie \`a }%
- \def\headtoname{}%
- \def\proofname{D\'emonstration}% for AMS-\LaTeX
- \def\glossaryname{Glossaire}%
- }
-\fi
+ \string;}
+% \end{macrocode}
+% The next three definitions are very similar.
+% \begin{macrocode}
+ \declare@shorthand{french}{!}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\thinspace
+ \else
+ \FDP@thinspace
+ \fi
+ \fi
+ \string!}
+ \declare@shorthand{french}{?}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\thinspace
+ \else
+ \FDP@thinspace
+ \fi
+ \fi
+ \string?}
+% \end{macrocode}
+% According to the I.N. specifications, the `:' requires a normal
+% space before it, but some people prefer a |\thinspace| (just
+% like the other three). We define |\Fcolonspace| to hold the
+% required amount of space (user customisable).
+% \begin{macrocode}
+ \newcommand*{\Fcolonspace}{\space}
+ \declare@shorthand{french}{:}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\Fcolonspace
+ \else
+ \FDP@colonspace
+ \fi
+ \fi
+ \string:}
% \end{macrocode}
-% \end{macro}
-%
-% \subsection{Punctuation}
%
-% The `double punctuation' characters (|;| |!| |?| and |:|) have to
-% be made |\active| for an automatic control of the amount of space
-% to insert before them.
+% \begin{macro}{\AutoSpaceBeforeFDP}
+% \begin{macro}{\NoAutoSpaceBeforeFDP}
+% |\FDP@thinspace| and |\FDP@space| are defined as unbreakable
+% spaces by\\ |\AutoSpaceBeforeFDP| or as |\@empty| by
+% |\NoAutoSpaceBeforeFDP|.\\
+% Default is |\AutoSpaceBeforeFDP|.
+% \begin{macrocode}
+ \def\AutoSpaceBeforeFDP{%
+ \def\FDP@thinspace{\penalty\@M\thinspace}%
+ \def\FDP@colonspace{\penalty\@M\Fcolonspace}}
+ \def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty
+ \let\FDP@colonspace\@empty}
+ \AutoSpaceBeforeFDP
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% When the active characters appear in an environment where their
+% French behaviour is not wanted they should give an `expected'
+% result. Therefore we define shorthands at system level as well.
% \begin{macrocode}
-\initiate@active@char{:}
-\initiate@active@char{;}
-\initiate@active@char{!}
-\initiate@active@char{?}
+ \declare@shorthand{system}{:}{\string:}
+ \declare@shorthand{system}{!}{\string!}
+ \declare@shorthand{system}{?}{\string?}
+ \declare@shorthand{system}{;}{\string;}
% \end{macrocode}
% We specify that the French group of shorthands should be used.
% \begin{macrocode}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \languageshorthands{french}}
+ \addto\extrasfrench{%
+ \languageshorthands{french}%
% \end{macrocode}
% These characters are `turned on' once, later their definition may
-% vary.
+% vary. Don't misunderstand the following code: they keep being
+% active all along the document, even when leaving French.
% \begin{macrocode}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@activate{:}\bbl@activate{;}%
- \bbl@activate{!}\bbl@activate{?}}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \bbl@activate{:}\bbl@activate{;}%
+ \bbl@activate{!}\bbl@activate{?}%
+ }
+ \addto\noextrasfrench{%
\bbl@deactivate{:}\bbl@deactivate{;}%
\bbl@deactivate{!}\bbl@deactivate{?}}
+\fi
% \end{macrocode}
%
-% One more thing |\extrasfrench| needs to do is to make sure that
-% |\frenchspacing| is in effect. If this is not the case the
-% execution of |\noextrasfrench| will switch it off again.
+% \subsection{French quotation marks}
+%
+% \begin{macro}{\og}
+% \begin{macro}{\fg}
+% The top macros for quotation marks will be called |\og|
+% (``\underline{o}uvrez \underline{g}uillemets'') and |\fg|
+% (``\underline{f}ermez \underline{g}uillemets'').
+% Another option for typesetting quotes in multilingual texts
+% is to use the package |csquotes.sty| and its command |\enquote|.
+%
% \begin{macrocode}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchspacing}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchspacing}
+\newcommand*{\og}{\@empty}
+\newcommand*{\fg}{\@empty}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\french@sh@;@}
-% We have to tune the amount of white space before \texttt{;}
-% \texttt{!} \texttt{?} and \texttt{:}. This should only happen
-% in horizontal mode, hence the test |\ifhmode|.
+% \begin{macro}{\guillemotleft}
+% \begin{macro}{\guillemotright}
+% \LaTeX{} users are supposed to use 8-bit output encodings (T1,
+% LY1,\dots) to typeset French, those who still stick to OT1 should
+% call |aeguill.sty| or a similar package. In both cases the
+% commands |\guillemotleft| and |\guillemotright| will print the
+% French opening and closing quote characters from the output font.
+% For XeLaTeX, |\guillemotleft| and |\guillemotright| are defined
+% by package \file{xunicode.sty}.
+% We will check `AtBeginDocument' that the proper output encodings
+% are in use (see end of section~\ref{sec-keyval}).
+%
+% We give the following definitions for Plain users only as a (poor)
+% fall-back, they are welcome to change them for anything better.
+% \begin{macrocode}
+\ifLaTeXe
+\else
+ \ifx\guillemotleft\@undefined
+ \def\guillemotleft{\leavevmode\raise0.25ex
+ \hbox{$\scriptscriptstyle\ll$}}
+ \fi
+ \ifx\guillemotright\@undefined
+ \def\guillemotright{\raise0.25ex
+ \hbox{$\scriptscriptstyle\gg$}}
+ \fi
+ \let\xspace\relax
+\fi
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% The next step is to provide correct spacing after |\guillemotleft|
+% and before |\guillemotright|: a space precedes and follows
+% quotation marks but no line break is allowed neither \emph{after}
+% the opening one, nor \emph{before} the closing one.
+% |\FBguill@spacing| which does the spacing, has been fine tuned by
+% Thierry Bouche. French quotes (including spacing) are printed by
+% |\FB@og| and |\FB@fg|, the expansion of the top level commands
+% |\og| and |\og| is different in and outside French.
+% We'll try to be smart to users of D.~Carlisle's |xspace| package:
+% if this package is loaded there will be no need for |{}|
+% or |\ | to get a space after |\fg|, otherwise |\xspace| will be
+% defined as |\relax| (done at the end of this file).
%
-% \changes{frenchb-1.1}{1995/12/23}{Added a hook to insert space
-% or not before `double punctuation'.}
+% \begin{macrocode}
+\newcommand*{\FBguill@spacing}{\penalty\@M\hskip.8\fontdimen2\font
+ plus.3\fontdimen3\font
+ minus.8\fontdimen4\font}
+\DeclareRobustCommand*{\FB@og}{\leavevmode
+ \guillemotleft\FBguill@spacing}
+\DeclareRobustCommand*{\FB@fg}{\ifdim\lastskip>\z@\unskip\fi
+ \FBguill@spacing\guillemotright\xspace}
+% \end{macrocode}
%
-% In horizontal mode, if a space has been typed before `;' we
-% remove it and put an unbreakable |\thinspace| instead. If no
-% space has been typed, we add |\FDP@thinspace| which will be
-% defined, up to the user's wishes, as an automatic added
-% thin space, or as |\@empty|.
+% The top level definitions for French quotation marks are switched
+% on and off through the |\extrasfrench| |\noextrasfrench|
+% mechanism. Outside French, |\og| and |\fg| will typeset standard
+% English opening and closing double quotes.
%
% \begin{macrocode}
-\declare@shorthand{french}{;}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\thinspace
- \else
- \FDP@thinspace
- \fi
- \fi
+\ifLaTeXe
+ \def\bbl@frenchguillemets{\renewcommand*{\og}{\FB@og}%
+ \renewcommand*{\fg}{\FB@fg}}
+ \def\bbl@nonfrenchguillemets{\renewcommand*{\og}{\textquotedblleft}%
+ \renewcommand*{\fg}{\ifdim\lastskip>\z@\unskip\fi
+ \textquotedblright}}
+\else
+ \def\bbl@frenchguillemets{\let\og\FB@og
+ \let\fg\FB@fg}
+ \def\bbl@nonfrenchguillemets{\def\og{``}%
+ \def\fg{\ifdim\lastskip>\z@\unskip\fi ''}}
+\fi
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \bbl@frenchguillemets}
+\expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \bbl@nonfrenchguillemets}
% \end{macrocode}
-% Now we can insert a |;| character.
+%
+% \subsection{Date in French}
+%
+% \begin{macro}{\datefrench}
+% The macro |\datefrench| redefines the command |\today| to
+% produce French dates.
+%
% \begin{macrocode}
- \string;}
+\@namedef{date\CurrentOption}{%
+ \def\today{\number\day \ifnum1=\day {\ier}\fi \relax \space
+ \ifcase\month
+ \or janvier\or f\'evrier\or mars\or avril\or mai\or juin\or
+ juillet\or ao\^ut\or septembre\or octobre\or novembre\or
+ d\'ecembre\fi \relax
+ \space \number\year}}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\french@sh@!@}
-% \begin{macro}{\french@sh@?@}
+% \subsection{Extra utilities}
+%
+% Let's provide the French user with some extra utilities.
%
-% Because these definitions are very similar only one is displayed
-% in a way that the definition can be easily checked.
+% \begin{macro}{\up}
+% \begin{macro}{\ieme}
+% |\up| eases the typesetting of superscripts like
+% `1\raise0.55ex\hbox{\small er}'. |\up| is just a shortcut for
+% |\textsuperscript| in \LaTeXe.
%
% \begin{macrocode}
-\declare@shorthand{french}{!}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\thinspace
- \else
- \FDP@thinspace
- \fi
- \fi
- \string!}
+\ifLaTeXe
+ \newcommand*{\up}[1]{\textsuperscript{#1}}
+\else
+ \newcommand*{\up}[1]{\leavevmode\raise1ex\hbox{\sevenrm #1}}
+\fi
% \end{macrocode}
%
% \begin{macrocode}
-\declare@shorthand{french}{?}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\thinspace
- \else
- \FDP@thinspace
- \fi
- \fi
- \string?}
+\def\ieme{\up{\lowercase{e}}\xspace}
+\def\iemes{\up{\lowercase{es}}\xspace}
+\def\ier{\up{\lowercase{er}}\xspace}
+\def\iers{\up{\lowercase{ers}}\xspace}
+\def\iere{\up{\lowercase{re}}\xspace}
+\def\ieres{\up{\lowercase{res}}\xspace}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\french@sh@:@}
-%
-% The `:' requires a normal space before it, instead of
-% a |\thinspace|.
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\No}
+% \begin{macro}{\no}
+% \begin{macro}{\primo}
+% \begin{macro}{\fprimo)}
+% And some more macros for numbering, first two support macros.
% \begin{macrocode}
-\declare@shorthand{french}{:}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\Fcolonspace
- \else
- \FDP@colonspace
- \fi
- \fi
- \string:}
+\newcommand*{\FrenchEnumerate}[1]{%
+ #1\up{\lowercase{o}}\kern+.3em}
+\newcommand*{\FrenchPopularEnumerate}[1]{%
+ #1\up{\lowercase{o}})\kern+.3em}
% \end{macrocode}
-% \end{macro}
-%
-% \changes{frenchb-1.1}{1995/12/23}{Added a hook to insert space
-% or not before `double punctuation'.}
%
-% \changes{frenchb-1.5f}{2001/06/02}{Added a hook to customize
-% the space before the colon in French (thin or normal).}
+% Typing |\primo| should result in `$1^{\rm o}$\kern+.3em',
+% \begin{macrocode}
+\def\primo{\FrenchEnumerate1}
+\def\secundo{\FrenchEnumerate2}
+\def\tertio{\FrenchEnumerate3}
+\def\quarto{\FrenchEnumerate4}
+% \end{macrocode}
+% while typing |\fprimo)| gives `1$^{\rm o}$)\kern+.3em.
+% \begin{macrocode}
+\def\fprimo){\FrenchPopularEnumerate1}
+\def\fsecundo){\FrenchPopularEnumerate2}
+\def\ftertio){\FrenchPopularEnumerate3}
+\def\fquarto){\FrenchPopularEnumerate4}
+% \end{macrocode}
%
-% \begin{macro}{\Fcolonspace}
-% \begin{macro}{\AutoSpaceBeforeFDP}
-% \begin{macro}{\NoAutoSpaceBeforeFDP}
-% |\FDP@thinspace| and |\FDP@space| are defined as unbreakable
-% spaces by\\ |\AutoSpaceBeforeFDP| or as |\@empty| by
-% |\NoAutoSpaceBeforeFDP|.\\
-% Default is |\AutoSpaceBeforeFDP|.
+% Let's provide two macros for the common abbreviations
+% of ``Num\'ero''.
% \begin{macrocode}
-\newcommand{\Fcolonspace}{\space}
-\def\AutoSpaceBeforeFDP{%
- \def\FDP@thinspace{\penalty\@M\thinspace}%
- \def\FDP@colonspace{\penalty\@M\Fcolonspace}}
-\def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty
- \let\FDP@colonspace\@empty}
-\AutoSpaceBeforeFDP
+\DeclareRobustCommand*{\No}{N\up{\lowercase{o}}\kern+.2em}
+\DeclareRobustCommand*{\no}{n\up{\lowercase{o}}\kern+.2em}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
-% \begin{macro}{\system@sh@:@}
-% \begin{macro}{\system@sh@!@}
-% \begin{macro}{\system@sh@?@}
-% \begin{macro}{\system@sh@;@}
+% \begin{macro}{\bsc}
+% As family names should be written in small capitals and never be
+% hyphenated, we provide a command (its name comes from Boxed Small
+% Caps) to input them easily. Note that this command has changed
+% with version~2 of frenchb: a |\kern0pt| is used instead of |\hbox|
+% because |\hbox| would break microtype's font expansion; as a
+% (positive?) side effect, composed names (such as Dupont-Durand)
+% can now be hyphenated on explicit hyphens.
+% Usage: |Jean~\bsc{Duchemin}|.
%
-% When the active characters appear in an environment where their
-% French behaviour is not wanted they should give an `expected'
-% result. Therefore we define shorthands at system level as well.
+% \changes{frenchb-2.0}{2006/11/06}{\cs{hbox} dropped, replaced by
+% \kern0pt.}
%
% \begin{macrocode}
-\declare@shorthand{system}{:}{\string:}
-\declare@shorthand{system}{!}{\string!}
-\declare@shorthand{system}{?}{\string?}
-\declare@shorthand{system}{;}{\string;}
+\DeclareRobustCommand*{\bsc}[1]{\leavevmode\begingroup\kern0pt
+ \scshape #1\endgroup}
+\ifLaTeXe\else\let\scshape\relax\fi
% \end{macrocode}
% \end{macro}
+%
+% Some definitions for special characters. We won't define |\tilde|
+% as a Text Symbol not to conflict with the macro |\tilde| for math
+% mode and use the name |\tild| instead. Note that |\boi| may
+% \emph{not} be used in math mode, its name in math mode is
+% |\backslash|. |\degre| can be accessed by the command |\r{}|
+% for ring accent.
+%
+% \begin{macrocode}
+\ifLaTeXe
+ \DeclareTextSymbol{\at}{T1}{64}
+ \DeclareTextSymbol{\circonflexe}{T1}{94}
+ \DeclareTextSymbol{\tild}{T1}{126}
+ \DeclareTextSymbolDefault{\at}{T1}
+ \DeclareTextSymbolDefault{\circonflexe}{T1}
+ \DeclareTextSymbolDefault{\tild}{T1}
+ \DeclareRobustCommand*{\boi}{\textbackslash}
+ \DeclareRobustCommand*{\degre}{\r{}}
+\else
+ \def\T@one{T1}
+ \ifx\f@encoding\T@one
+ \newcommand*{\degre}{\char6}
+ \else
+ \newcommand*{\degre}{\char23}
+ \fi
+ \newcommand*{\at}{\char64}
+ \newcommand*{\circonflexe}{\char94}
+ \newcommand*{\tild}{\char126}
+ \newcommand*{\boi}{$\backslash$}
+\fi
+% \end{macrocode}
+%
+% \begin{macro}{\degres}
+% We now define a macro |\degres| for typesetting the abbreviation
+% for `degrees' (as in `degrees Celsius'). As the bounding box of
+% the character `degree' has \emph{very} different widths in CM/EC
+% and PostScript fonts, we fix the width of the bounding box of
+% |\degres| to 0.3\,em, this lets the symbol `degree' stick to the
+% preceding (e.g., |45\degres|) or following character
+% (e.g., |20~\degres C|).
+%
+% If the \TeX{} Companion fonts are available (\file{textcomp.sty}),
+% we pick up |\textdegree| from them instead of using emulating
+% `degrees' from the |\r{}| accent. Otherwise we overwrite the
+% (poor) definition of |\textdegree| given in \file{latin1.def},
+% \file{applemac.def} etc. (called by \file{inputenc.sty}) by
+% our definition of |\degres|. We also advice the user (once only)
+% to use TS1-encoding.
+%
+% \begin{macrocode}
+\ifLaTeXe
+ \def\Warning@degree@TSone{%
+ \PackageWarning{frenchb.ldf}{%
+ Degrees would look better in TS1-encoding:
+ \MessageBreak add \protect
+ \usepackage{textcomp} to the preamble.
+ \MessageBreak Degrees used}}
+ \AtBeginDocument{\expandafter\ifx\csname M@TS1\endcsname\relax
+ \DeclareRobustCommand*{\degres}{%
+ \leavevmode\hbox to 0.3em{\hss\degre\hss}%
+ \Warning@degree@TSone
+ \global\let\Warning@degree@TSone\relax}%
+ \let\textdegree\degres
+ \else
+ \DeclareRobustCommand*{\degres}{%
+ \hbox{\UseTextSymbol{TS1}{\textdegree}}}%
+ \fi}
+\else
+ \newcommand*{\degres}{%
+ \leavevmode\hbox to 0.3em{\hss\degre\hss}}
+\fi
+% \end{macrocode}
% \end{macro}
+%
+% \subsection{Formatting numbers}
+% \label{sec-numbers}
+%
+% \begin{macro}{\DecimalMathComma}
+% \begin{macro}{\StandardMathComma}
+% As mentioned in the \TeX{}book p.~134, the comma is of type
+% |\mathpunct| in math mode: it is automatically followed by a
+% space. This is convenient in lists and intervals but
+% unpleasant when the comma is used as a decimal separator
+% in French: it has to be entered as |{,}|.
+% |\DecimalMathComma| makes the comma be an ordinary character
+% (of type |\mathord|) in French \emph{only} (no space added);
+% |\StandardMathComma| switches back to the standard behaviour
+% of the comma.
+% \begin{macrocode}
+\newcount\std@mcc
+\newcount\dec@mcc
+\std@mcc=\mathcode`\,
+\dec@mcc=\std@mcc
+\@tempcnta=\std@mcc
+\divide\@tempcnta by "1000
+\multiply\@tempcnta by "1000
+\advance\dec@mcc by -\@tempcnta
+\newcommand*{\DecimalMathComma}{\iflanguage{french}%
+ {\mathcode`\,=\dec@mcc}{}%
+ \addto\extrasfrench{\mathcode`\,=\dec@mcc}}
+\newcommand*{\StandardMathComma}{\mathcode`\,=\std@mcc
+ \addto\extrasfrench{\mathcode`\,=\std@mcc}}
+\expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \mathcode`\,=\std@mcc}
+% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \subsection{French quotation marks}
+% \changes{frenchb-2.0}{2006/11/06}{\cs{nombre} requires now
+% numprint.sty.}
%
-% \changes{frenchb-1.3}{1997/04/24}{New implementation of guillemets.}
+% \begin{macro}{\nombre}
+% The command |\nombre| is now borrowed from |numprint.sty| for
+% \LaTeXe. There is no point to maintain the former tricky code
+% when a package is dedicated to do the same job and more.
+% For Plain based formats, |\nombre| no longer formats numbers,
+% it prints them as is and issues a warning about the change.
%
-% \changes{frenchb-1.4}{1999/07/08}{Add a hook to pick French
-% guillemets from any font (suggested by Michel Bovani).}
+% Fake command |\nombre| for Plain based formats, warning users of
+% frenchb v.1.x. of the change.
+% \begin{macrocode}
+\newcommand*{\nombre}[1]{{#1}\message{%
+ *** \noexpand\nombre no longer formats numbers\string! ***}}%
+% \end{macrocode}
+% \end{macro}
%
-% \changes{frenchb-1.3e}{1999/01/02}{Try to use AMS Cyrillic fonts
-% to provide better looking guillemets in OT1 encoding.}
+% The next definitions only make sense for \LaTeXe. Let's cleanup
+% and exit if the format in Plain based.
%
-% \changes{frenchb-1.6b}{2003/04/05}{Default OT1 guillemets are
-% now borrowed from Polish fonts, rather than from wncyr.}
+% \begin{macrocode}
+\let\FBstop@here\relax
+\def\FBclean@on@exit{\let\ifLaTeXe\@undefined
+ \let\LaTeXetrue\@undefined
+ \let\LaTeXefalse\@undefined}
+\ifx\magnification\@undefined
+\else
+ \def\FBstop@here{\let\STD@makecaption\relax
+ \FBclean@on@exit
+ \ldf@quit\CurrentOption\endinput}
+\fi
+\FBstop@here
+% \end{macrocode}
%
-% \changes{frenchb-1.6c}{2003/06/30}{OT1 `Polish' guillemets are
-% now taken from the LM fonts which will be part of TL8.}
+% What follows now is for \LaTeXe{} \emph{only}.
+% We redefine |\nombre| for \LaTeXe. A warning is issued
+% at the first call of |\nombre| if |\numprint| is not
+% defined, suggesting what to do. The package |numprint|
+% is \emph{not} loaded automatically by frenchb because of
+% possible options conflict.
%
-% EC/LM fonts and standard PostScript fonts have built-in
-% guillemets, we of course use them. CM fonts have no French
-% guillemets built-in, so we have to emulate them:
-% \begin{itemize}
-% \item if a file `t1lmr.fd' is found, we expect the LM fonts
-% to be present on the system, so we pick up French guillemets
-% from them; before version 1.6b, French guillemets were
-% borrowed from the `wncyr' fonts, this has been changed because
-% it resulted in a conflict with the russian option of \babel.
-% Former Cyrillic guillemets are still available through the
-% command |\CyrillicGuillemets| (for backward compatibility).
-% \item otherwise we use math symbols, either \LaTeX's `lasy' font
-% if available, or \TeX{}~symbols |\ll| and |\gg| otherwise;
-% \end{itemize}
+% \begin{macrocode}
+\renewcommand*{\nombre}[1]{\Warning@nombre\numprint{#1}}
+\newcommand*{\Warning@nombre}{%
+ \@ifundefined{numprint}%
+ {\PackageWarning{frenchb.ldf}{%
+ \protect\nombre\space now relies on package numprint.sty,
+ \MessageBreak add \protect
+ \usepackage[autolanguage]{numprint}\MessageBreak
+ to your preamble *after* loading babel, \MessageBreak
+ see file numprint.pdf for other options.\MessageBreak
+ \protect\nombre\space called}%
+ \global\let\Warning@nombre\relax
+ \global\let\numprint\relax
+ }{}%
+}
+% \end{macrocode}
%
-% The standard names for French quotation marks are |\guillemotleft|
-% and |\guillemotright|, these commands are defined in |t1enc.def|
-% for T1-encoding.
-% In \LaTeXe{} formats, we first define these commands for
-% OT1-encoding (for CM fonts), using either the Polish `pl*' fonts
-% or \LaTeX{}'s `lasy' fonts.
-% Other local text encodings \emph{should} define them too,
-% but if they don't, the OT1 definitions will be used.
-% The standard PostScript fonts should \emph{always} be used together
-% with T1-encoding (\emph{not} OT1), for proper hyphenation and
-% built-in (better looking) French quotation marks.
-%
-% \changes{frenchb-1.2b}{1997/04/24}{Spacing after opening and before
-% closing guillemets slightly enlarged and some glue added,
-% as suggested by Th.~Bouche. Unlike \cs{kern}, \cs{hskip} doesn't
-% inhibit hyphenation, nothing like \cs{allowhyphens} is required.}
+% \changes{frenchb-2.0c}{2007/06/25}{No need to define here numprint's
+% command \cs{npstylefrench}, it will be redefined `AtBeginDocument'
+% by \cs{FBprocess@options}.}
%
-% The next step is to provide correct spacing after |\guillemotleft|
-% and before |\guillemotright| : a space precedes and follows
-% quotation marks but no line break is allowed neither \emph{after}
-% the opening one, nor \emph{before} the closing one.
-% |\guill@spacing| which does the spacing, has been fine tuned by
-% Thierry Bouche.
+% \changes{frenchb-2.0c}{2007/06/25}{\cs{ThinSpaceInFrenchNumbers}
+% added for compatibility with frenchb-1.x.}
%
-% \changes{frenchb-1.3d}{1998/04/20}{Spacing after opening and before
-% closing guillemets changed again: normal space with little glue
-% (suggested by Th. Bouche).}
+% \begin{macrocode}
+\newcommand*{\ThinSpaceInFrenchNumbers}{%
+ \PackageWarning{frenchb.ldf}{%
+ Type \protect\frenchbsetup{ThinSpaceInFrenchNumbers}
+ \MessageBreak Command \protect\ThinSpaceInFrenchNumbers\space
+ is no longer\MessageBreak defined in frenchb v.2,}}
+% \end{macrocode}
%
-% The top macros for quotation marks will be called |\og|
-% (``\underline{o}uvrez \underline{g}uillemets'') and |\fg|
-% (``\underline{f}ermez \underline{g}uillemets'').\\
-% The top level definitions for French quotation marks are switched
-% on and off through the |\extrasfrench| |\noextrasfrench|
-% mechanism. Outside French, |\og| and |\fg| will typeset standard
-% English opening and closing double quotes.\\
-% As |\DeclareTextCommand| cannot be used after the
-% |\begin{document}| we introduce internal definitions
-% |\begin@guill| and |\end@guill|.\\
-% We'll try to be smart to users of D.~\textsc{Carlisle}'s |xspace|
-% package: if this package is loaded there will be no need for |{}|
-% or |\ | to get a space after |\fg|.
+% \subsection{Caption names}
%
-% \begin{macro}{\guillemotleft}
-% \begin{macro}{\guillemotright}
-% \begin{macro}{\og}
-% \begin{macro}{\fg}
-% \changes{frenchb-1.1}{1996/01/20}{A warning is now issued if \cs{og}
-% or \cs{fg} have been defined elsewhere in a \LaTeXe{} document
-% (suggested by Vincent Jalby).}
-% In \LaTeXe{} we provide a dummy definition for |\og| and |\fg|,
-% just to display an error message in case |\og| or |\fg| have been
-% defined elsewhere.
+% The next step consists of defining the French equivalents for
+% the \LaTeX{} caption names.
%
-% \changes{frenchb-1.2b}{1997/04/24}{Define \cs{xspace} as \relax if
-% it is not defined by D. Carlisle `xspace.sty'. Will be used in
-% \cs{fg}, and \cs{ieme} ... \cs{ieres} (new for this release).}
+% \begin{macro}{\captionsfrench}
+% Let's first define |\captionsfrench| which sets all strings used
+% in the four standard document classes provided with \LaTeX.
+%
+% \changes{frenchb-2.0}{2006/11/06}{`Fig.' changed to `Figure' and
+% `Tab.' to `Table'.}
%
-% \changes{frenchb-1.5f}{2001/04/21}{\cs{og} and \cs{fg} should not
-% be expanded when written to a file; use \cs{renewcommand} (in
-% \cs{LaTeX}) to redefine them instead of \cs{let} or \cs{def}.}
+% \changes{frenchb-2.0}{2006/12/15}{Set \cs{CaptionSeparator} in
+% \cs{extrasfrench} now instead of \cs{captionsfrench} because
+% it has to be reset when leaving French.}
%
% \begin{macrocode}
-\newcommand{\og}{\@empty}
-\newcommand{\fg}{\@empty}
+\@namedef{captions\CurrentOption}{%
+ \def\refname{R\'ef\'erences}%
+ \def\abstractname{R\'esum\'e}%
+ \def\bibname{Bibliographie}%
+ \def\prefacename{Pr\'eface}%
+ \def\chaptername{Chapitre}%
+ \def\appendixname{Annexe}%
+ \def\contentsname{Table des mati\`eres}%
+ \def\listfigurename{Table des figures}%
+ \def\listtablename{Liste des tableaux}%
+ \def\indexname{Index}%
+ \def\figurename{{\scshape Figure}}%
+ \def\tablename{{\scshape Table}}%
% \end{macrocode}
-% \begin{macro}{\FrenchGuillemetsFrom}
+% ``Premi\`ere partie'' instead of ``Part I''.
% \begin{macrocode}
-\ifLaTeXe
- \def\FrenchGuillemetsFrom#1#2#3#4{%
- \DeclareFontEncoding{#1}{}{}%
- \DeclareFontSubstitution{#1}{#2}{m}{n}%
- \DeclareTextCommand{\guillemotleft}{OT1}{%
- {\fontencoding{#1}\fontfamily{#2}\selectfont\char#3}}%
- \DeclareTextCommand{\guillemotright}{OT1}{%
- {\fontencoding{#1}\fontfamily{#2}\selectfont\char#4}}}
-% \end{macrocode}
-% \begin{macro}{\CyrillicGuillemets}
-% \begin{macro}{\PolishGuillemets}
-% \begin{macro}{\LasyGuillemets}
-% \begin{macro}{\bbl@frenchguillemets}
-% \begin{macro}{\bbl@nonfrenchguillemets}
-% \begin{macrocode}
- \def\CyrillicGuillemets{\FrenchGuillemetsFrom{OT2}{wncyr}{60}{62}}
- \def\PolishGuillemets{\FrenchGuillemetsFrom{T1}{lmr}{19}{20}}
- \def\LasyGuillemets{%
- \DeclareTextCommand{\guillemotleft}{OT1}{\hbox{%
- \fontencoding{U}\fontfamily{lasy}\selectfont(\kern-0.20em(}}%
- \DeclareTextCommand{\guillemotright}{OT1}{\hbox{%
- \fontencoding{U}\fontfamily{lasy}\selectfont)\kern-0.20em)}}}
- \IfFileExists{t1lmr.fd}{\PolishGuillemets}{\LasyGuillemets}
- \DeclareTextSymbolDefault{\guillemotleft}{OT1}
- \DeclareTextSymbolDefault{\guillemotright}{OT1}
- \def\guill@spacing{\penalty\@M\hskip.8\fontdimen2\font
- plus.3\fontdimen3\font
- minus.8\fontdimen4\font}
- \DeclareRobustCommand*{\begin@guill}{\leavevmode
- \guillemotleft\penalty\@M\guill@spacing}
- \DeclareRobustCommand*{\end@guill}{\ifdim\lastskip>\z@\unskip\fi
- \penalty\@M\guill@spacing\guillemotright\xspace}
- \AtBeginDocument{\ifx\xspace\@undefined\let\xspace\relax\fi}
- \def\bbl@frenchguillemets{\renewcommand{\og}{\begin@guill}%
- \renewcommand{\fg}{\end@guill}}
- \def\bbl@nonfrenchguillemets{\renewcommand{\og}{``}%
- \renewcommand{\fg}{\ifdim\lastskip>\z@\unskip\fi ''}}
-% \end{macrocode}
-% For \emph{Plain}\TeX, and \LaTeX-2.09 we define |\begin@guill|
-% and |\end@guill| using math symbols |\ll| and |\gg|.
+ \def\partname{\protect\@Fpt partie}%
+ \def\@Fpt{{\ifcase\value{part}\or Premi\`ere\or Deuxi\`eme\or
+ Troisi\`eme\or Quatri\`eme\or Cinqui\`eme\or Sixi\`eme\or
+ Septi\`eme\or Huiti\`eme\or Neuvi\`eme\or Dixi\`eme\or Onzi\`eme\or
+ Douzi\`eme\or Treizi\`eme\or Quatorzi\`eme\or Quinzi\`eme\or
+ Seizi\`eme\or Dix-septi\`eme\or Dix-huiti\`eme\or Dix-neuvi\`eme\or
+ Vingti\`eme\fi}\space\def\thepart{}}%
+ \def\pagename{page}%
+ \def\seename{{\emph{voir}}}%
+ \def\alsoname{{\emph{voir aussi}}}%
+ \def\enclname{P.~J. }%
+ \def\ccname{Copie \`a }%
+ \def\headtoname{}%
+ \def\proofname{D\'emonstration}%
+ \def\glossaryname{Glossaire}%
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% As some users who choose |frenchb| or |francais| as option of
+% \babel, might customise |\captionsfrenchb| or |\captionsfrancais|
+% in the preamble, we merge their changes at the |\begin{document}|
+% when they do so.
+% The other variants of French (canadien, acadian) are defined by
+% checking if the relevant option was used and then adding one extra
+% level of expansion.
+%
+% \begin{macrocode}
+\AtBeginDocument{\let\captions@French\captionsfrench
+ \@ifundefined{captionsfrenchb}%
+ {\let\captions@Frenchb\relax}%
+ {\let\captions@Frenchb\captionsfrenchb}%
+ \@ifundefined{captionsfrancais}%
+ {\let\captions@Francais\relax}%
+ {\let\captions@Francais\captionsfrancais}%
+ \def\captionsfrench{\captions@French
+ \captions@Francais\captions@Frenchb}%
+ \def\captionsfrancais{\captionsfrench}%
+ \def\captionsfrenchb{\captionsfrench}%
+ \iflanguage{french}{\captionsfrench}{}%
+ }
+\@ifpackagewith{babel}{canadien}{%
+ \def\captionscanadien{\captionsfrench}%
+ \def\datecanadien{\datefrench}%
+ \def\extrascanadien{\extrasfrench}%
+ \def\noextrascanadien{\noextrasfrench}%
+ }{}
+\@ifpackagewith{babel}{acadian}{%
+ \def\captionsacadian{\captionsfrench}%
+ \def\dateacadian{\datefrench}%
+ \def\extrasacadian{\extrasfrench}%
+ \def\noextrasacadian{\noextrasfrench}%
+ }{}
+% \end{macrocode}
+%
+% \begin{macro}{\CaptionSeparator}
+% Let's consider now captions in figures and tables.
+% In French, captions in figures and tables should be printed with
+% endash (`--') instead of the standard `:'.
+%
+% The standard definition of |\@makecaption| (e.g., the one provided
+% in article.cls, report.cls, book.cls which is frozen for \LaTeXe{}
+% according to Frank Mittelbach), has been saved in
+% |\STD@makecaption| before making `:' active
+% (see section~\ref{sec-punct}). `AtBeginDocument' we compare it to
+% its current definition (some classes like koma-script classes,
+% AMS classes, ua-thesis.cls\dots change it).
+% If they are identical, frenchb just adds a hook called
+% |\CaptionSeparator| to |\@makecaption|, |\CaptionSeparator|
+% defaults to `: ' as in the standard |\@makecaption|, and will be
+% changed to ` -- ' in French.
+% If the definitions differ, frenchb doesn't overwrite the changes,
+% but prints a message in the .log file.
+%
% \begin{macrocode}
-\else
- \def\begin@guill{\leavevmode\raise0.25ex
- \hbox{$\scriptscriptstyle\ll$}%
- \penalty\@M\hskip.8\fontdimen2\font
- plus.3\fontdimen3\font
- minus.3\fontdimen4\font}
- \def\end@guill{\ifdim\lastskip>\z@\unskip\penalty\@M\fi
- \penalty\@M\hskip.8\fontdimen2\font
- plus.3\fontdimen3\font minus.3\fontdimen4\font
- \raise0.25ex\hbox{$\scriptscriptstyle\gg$}}
- \let\xspace\relax
- \def\bbl@frenchguillemets{\let\og\begin@guill
- \let\fg\end@guill}
- \def\bbl@nonfrenchguillemets{\def\og{``}%
- \def\fg{\ifdim\lastskip>\z@\unskip\fi ''}}
-\fi
+\def\CaptionSeparator{\string:\space}
+\long\def\FB@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1\CaptionSeparator #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ #1\CaptionSeparator #2\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi
+ \vskip\belowcaptionskip}
+\AtBeginDocument{%
+ \ifx\@makecaption\STD@makecaption
+ \global\let\@makecaption\FB@makecaption
+ \else
+ \@ifundefined{@makecaption}{}%
+ {\PackageWarning{frenchb.ldf}%
+ {The definition of \protect\@makecaption\space
+ has been changed,\MessageBreak
+ frenchb will NOT customise it;\MessageBreak reported}%
+ }%
+ \fi
+ \let\FB@makecaption\relax
+ \let\STD@makecaption\relax
+}
\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchguillemets}
+ \def\CaptionSeparator{\space\textendash\space}}
\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchguillemets}
+ \def\CaptionSeparator{\string:\space}}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
+% \end{macro}
%
% \subsection{French lists}
% \label{sec-lists}
%
-% \begin{macro}{\bbl@frenchlistspacing}
-% \begin{macro}{\bbl@nonfrenchlistspacing}
+% \begin{macro}{\listFB}
+% \begin{macro}{\listORI}
% Vertical spacing in general lists should be shorter in French
% texts than the defaults provided by \LaTeX.
% Note that the easy way, just changing values of vertical spacing
% parameters when entering French and restoring them to their
% defaults on exit would not work; as most lists are based on
-% |\list| we will redefine |\list| (up to version~1.4, the more
-% internal command |\@trivlist| was redefined, this ensured that
-% all lists would have common settings, but didn't allow the users
-% to provide their own settings, as pointed out by P.~Pichaureau).
-% If standard LaTeX{} settings are preferred, it is easy to issue
-% the command |\FrenchListSpacingfalse| in the preamble or in
-% |frenchb.cfg|. Please note that changing the flag
-% |\FrenchListSpacing| will \emph{not} take effect immediately,
-% but next time language French is switched on.
+% |\list| we will define a variant of |\list| (|\listFB|) to
+% be used in French.
%
% The amount of vertical space before and after a list is given by
% |\topsep| + |\parskip| (+ |\partopsep| if the list starts a new
@@ -1421,200 +1267,135 @@
% the list starts a new paragraph, so I subtract |\parskip| from
% |\topsep| and add it back to |\partopsep|; this will normally
% make no difference because |\parskip|'s default value is 0pt, but
-% will be noticeable when |\parskip| is \emph{not} null.\\
-% Of course, this code is only for \LaTeX.
-%
-% \changes{frenchb-1.3}{1997/05/30}{Add a switch to allow \cs{LaTeXe}
-% standard settings.}
+% will be noticeable when |\parskip| is \emph{not} null.
%
-% \changes{frenchb-1.5a}{2001/01/02}{Redefine \cs{list} instead of
-% \cs{@trivlist} to provide more freedom to the user, but still
-% allow the former way with \cs{ifFrenchOldTrivlist}.}
-%
-% \changes{frenchb-1.5g}{2001/09/09}{\cs{parskip} is of type `skip',
-% its mean value only (not the glue) should be moved from
-% \cs{topsep} to \cs{partopsep}: substracting glue can lead to
-% weird results. Bug pointed out by Michel Bovani.}
-%
-% \begin{macrocode}
-\newif\ifFrenchListSpacing \FrenchListSpacingtrue
-\newif\ifFrenchOldTrivlist
-\ifLaTeX
- \let\listORI\list
-% \end{macrocode}
% |\endlist| is not redefined, but |\endlistORI| is provided for
% the users who prefer to define their own lists from the original
% command, they can code: |\begin{listORI}{}{} \end{listORI}|.
% \begin{macrocode}
- \let\endlistORI\endlist
- \def\FR@listsettings{%
- \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}%
- \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}%
- \setlength{\topsep}{0.8ex plus 0.4ex minus 0.4ex}%
- \setlength{\partopsep}{0.4ex plus 0.2ex minus 0.2ex}%
+\let\listORI\list
+\let\endlistORI\endlist
+\def\FB@listsettings{%
+ \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}%
+ \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}%
+ \setlength{\topsep}{0.8ex plus 0.4ex minus 0.4ex}%
+ \setlength{\partopsep}{0.4ex plus 0.2ex minus 0.2ex}%
% \end{macrocode}
% |\parskip| is of type `skip', its mean value only (\emph{not
-% the glue}) should be substracted from |\topsep| and added to
+% the glue}) should be subtracted from |\topsep| and added to
% |\partopsep|, so convert |\parskip| to a `dimen' using
% |\@tempdima|.
% \begin{macrocode}
- \@tempdima=\parskip
- \addtolength{\topsep}{-\@tempdima}%
- \addtolength{\partopsep}{\@tempdima}}%
- \def\listFR#1#2{\listORI{#1}{\FR@listsettings #2}}%
-% \end{macrocode}
-% Keep the |\@trivlist| redefinition from version 1.4 (only
-% for compatibility reasons). The flag |\ifFrenchOldTrivlist|
-% could happen to be useful to process older documents.
-% \begin{macrocode}
- \let\@trivlistORI\@trivlist
- \def\@trivlistFR{\FR@listsettings\@trivlistORI}
- \def\bbl@frenchlistspacing{\ifFrenchListSpacing\let\list\listFR\fi
- \ifFrenchOldTrivlist\let\@trivlist\@trivlistFR
- \let\list\listORI\fi}
- \def\bbl@nonfrenchlistspacing{\let\list\listORI
- \let\@trivlist\@trivlistORI}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchlistspacing}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchlistspacing}
-\fi
+ \@tempdima=\parskip
+ \addtolength{\topsep}{-\@tempdima}%
+ \addtolength{\partopsep}{\@tempdima}}%
+\def\listFB#1#2{\listORI{#1}{\FB@listsettings #2}}%
+\let\endlistFB\endlist
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\bbl@frenchitemize}
-% \begin{macro}{\bbl@nonfrenchitemize}
-% The layout of French itemize-lists has changed between version~1.2
-% and~1.3. Jacques Andr\'e and Thierry Bouche pointed out to me
-% that vertical spacing between items, before and after the list,
-% should \emph{null} with \emph{no glue} added. Moreover
-% horizontal spacing was not correct either: the item labels of a
-% first level list should be vertically aligned on the paragraph's
-% first character (at |\parindent| from the left margin).
-% Checking the book ``Lexique des r\`egles typographiques en usage
-% \`a l'Imprimerie nationale'' confirmed their points, so the itemize
-% environment has been totally redefined for French in version~1.3.
-%
-% Several people pointed out to me that the layout of lists can
-% either be set by the current language or be tuned independently of
-% the language as part of the layout of the document. So hooks should
-% be provided to switch off the special settings made in |frenchb|.
-% Setting |\FrenchItemizeSpacingfalse| \emph{after} loading |frenchb|
-% in the preamble switches back to settings of version~1.2 (this can
-% be useful to process old documents). If you want all list spacings
-% to be exactly what they are in standard \LaTeXe{}, then add also
-% |\FrenchListSpacingfalse| in the preamble \emph{after} loading
-% |frenchb|. Both switches can also be set in |frenchb.cfg|.
-% Please note that changing the flags |\FrenchItemizeSpacing| and
-% |\FrenchListSpacing| will \emph{not} take effect immediately,
-% but next time language French is switched on.
-%
-% The \textbullet{} is never used in French itemize-lists,
-% a long dash `--' is preferred for all levels. The item label used
-% in French is stored in |\FrenchLabelItem}|, it defaults to '--' and
-% can be changed using |\renewcommand| (see the example
-% configuration file above).
-%
-% \changes{frenchb-1.1}{1996/01/25}{Save original definitions of label
-% items, instead of hard coding them in \cs{bbl@nonfrenchitems}
-% (suggested by Vincent Jalby).}
-%
-% \changes{frenchb-1.1}{1996/01/26}{Tune vertical spacing in
-% French lists.}
-%
-% \changes{frenchb-1.3}{1997/05/30}{Change -{}- to \cs{textendash},
-% completely redesign the itemize environment in French and add
-% a hook to switch back to \cs{LaTeXe} standard itemize lists.}
-%
-% \changes{frenchb-1.4}{1999/07/08}{\cs{newif} only in LaTeX.}
-%
-% \changes{frenchb-1.4}{1999/07/08}{Add a hook \cs{FrenchLabelItem}
-% which defaults to \cs{textendash}, this was suggested by
-% Michel Bovani to allow some customization of label items.}
-%
-% \changes{frenchb-1.5a}{2001/01/02}{Redesign \cs{itemize} to allow
-% users to change the markers of any level in itemize lists.}
-%
-% \changes{frenchb-1.5g}{2001/09/09}{\cs{parskip} is of type `skip',
-% its mean value only (not the glue) should be moved from
-% \cs{topsep} to \cs{partopsep}: substracting glue can lead to
-% weird results. Bug pointed out by Michel Bovani.}
-%
-% \begin{macrocode}
-\newif\ifFrenchItemizeSpacing \FrenchItemizeSpacingtrue
-\ifLaTeX
- \newcommand{\FrenchLabelItem}{\textendash}
- \newcommand{\Frlabelitemi}{\FrenchLabelItem}
- \newcommand{\Frlabelitemii}{\FrenchLabelItem}
- \newcommand{\Frlabelitemiii}{\FrenchLabelItem}
- \newcommand{\Frlabelitemiv}{\FrenchLabelItem}
- \def\bbl@frenchitemize{%
+% \begin{macro}{\itemizeFB}
+% \begin{macro}{\itemizeORI}
+% \begin{macro}{\bbl@frenchlabelitems}
+% \begin{macro}{\bbl@nonfrenchlabelitems}
+% Let's now consider French itemize lists. They differ from those
+% provided by the standard \LaTeXe{} classes:
+% \begin{itemize}
+% \item vertical spacing between items, before and after
+% the list, should be \emph{null} with \emph{no glue} added;
+% \item the item labels of a first level list should be vertically
+% aligned on the paragraph's first character (i.e. at
+% |\parindent| from the left margin);
+% \item the `\textbullet' is never used in French itemize-lists,
+% a long dash `--' is preferred for all levels. The item label
+% used in French is stored in |\FrenchLabelItem}|, it defaults
+% to `--' and can be changed using |\frenchbsetup{}| (see
+% section~\ref{sec-keyval}).
+% \end{itemize}
+%
+% \begin{macrocode}
+\newcommand*{\FrenchLabelItem}{\textendash}
+\newcommand*{\Frlabelitemi}{\FrenchLabelItem}
+\newcommand*{\Frlabelitemii}{\FrenchLabelItem}
+\newcommand*{\Frlabelitemiii}{\FrenchLabelItem}
+\newcommand*{\Frlabelitemiv}{\FrenchLabelItem}
+% \end{macrocode}
+% |\bbl@frenchlabelitems| saves current itemize labels and changes
+% them to their value in French. This code should never be executed
+% twice in a row, so we need a new flag that will be set and reset
+% by |\bbl@nonfrenchlabelitems| and |\bbl@frenchlabelitems|.
+% \begin{macrocode}
+\newif\ifFB@enterFrench \FB@enterFrenchtrue
+\def\bbl@frenchlabelitems{%
+ \ifFB@enterFrench
\let\@ltiORI\labelitemi
\let\@ltiiORI\labelitemii
\let\@ltiiiORI\labelitemiii
\let\@ltivORI\labelitemiv
- \let\itemizeORI\itemize
\let\labelitemi\Frlabelitemi
\let\labelitemii\Frlabelitemii
\let\labelitemiii\Frlabelitemiii
\let\labelitemiv\Frlabelitemiv
- \ifFrenchItemizeSpacing
-% \end{macrocode}
-% Make sure |\itemize| uses |\@trivlistORI| even with
-% |\FrenchOldTrivlisttrue|.
-% \begin{macrocode}
- \def\itemize{\let\@trivlist\@trivlistORI
- \ifnum \@itemdepth >\thr@@\@toodeep\else
- \advance\@itemdepth\@ne
- \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \listORI
- \csname\@itemitem\endcsname
- {\settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \ifnum\@listdepth=0
- \setlength{\itemindent}{\parindent}%
- \else
- \addtolength{\leftmargin}{\parindent}%
- \fi
- \setlength{\itemsep}{\z@}%
- \setlength{\parsep}{\z@}%
- \setlength{\topsep}{\z@}%
- \setlength{\partopsep}{\z@}%
+ \FB@enterFrenchfalse
+ \fi
+}
+\let\itemizeORI\itemize
+\let\enditemizeORI\enditemize
+\let\enditemizeFB\enditemize
+\def\itemizeFB{%
+ \ifnum \@itemdepth >\thr@@\@toodeep\else
+ \advance\@itemdepth\@ne
+ \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+ \expandafter
+ \listORI
+ \csname\@itemitem\endcsname
+ {\settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \ifnum\@listdepth=0
+ \setlength{\itemindent}{\parindent}%
+ \else
+ \addtolength{\leftmargin}{\parindent}%
+ \fi
+ \setlength{\itemsep}{\z@}%
+ \setlength{\parsep}{\z@}%
+ \setlength{\topsep}{\z@}%
+ \setlength{\partopsep}{\z@}%
% \end{macrocode}
% |\parskip| is of type `skip', its mean value only (\emph{not
-% the glue}) should be substracted from |\topsep| and added to
+% the glue}) should be subtracted from |\topsep| and added to
% |\partopsep|, so convert |\parskip| to a `dimen' using
% |\@tempdima|.
% \begin{macrocode}
- \@tempdima=\parskip
- \addtolength{\topsep}{-\@tempdima}%
- \addtolength{\partopsep}{\@tempdima}}%
- \fi}%
- \fi}
-% \end{macrocode}
-% The user's changes in labelitems are saved when leaving French
-% for further use when switching back to French.
-% \begin{macrocode}
- \def\bbl@nonfrenchitemize{\let\Frlabelitemi\labelitemi
- \let\Frlabelitemii\labelitemii
- \let\Frlabelitemiii\labelitemiii
- \let\Frlabelitemiv\labelitemiv
- \let\labelitemi\@ltiORI
- \let\labelitemii\@ltiiORI
- \let\labelitemiii\@ltiiiORI
- \let\labelitemiv\@ltivORI
- \let\itemize\itemizeORI}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchitemize}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchitemize}
-\fi
+ \@tempdima=\parskip
+ \addtolength{\topsep}{-\@tempdima}%
+ \addtolength{\partopsep}{\@tempdima}}%
+ \fi}
+% \end{macrocode}
+% The user's changes in labelitems are saved when leaving French for
+% further use when switching back to French. This code should never
+% be executed twice in a row (toggle with |\bbl@frenchlabelitems|).
+% \begin{macrocode}
+\def\bbl@nonfrenchlabelitems{%
+ \ifFB@enterFrench
+ \else
+ \let\Frlabelitemi\labelitemi
+ \let\Frlabelitemii\labelitemii
+ \let\Frlabelitemiii\labelitemiii
+ \let\Frlabelitemiv\labelitemiv
+ \let\labelitemi\@ltiORI
+ \let\labelitemii\@ltiiORI
+ \let\labelitemiii\@ltiiiORI
+ \let\labelitemiv\@ltivORI
+ \FB@enterFrenchtrue
+ \fi
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{French indentation of sections}
% \label{sec-indent}
@@ -1623,843 +1404,712 @@
% \begin{macro}{\bbl@nonfrenchindent}
% In French the first paragraph of each section should be indented,
% this is another difference with US-English.
-% Add this code only in \LaTeX.
-%
-% \changes{frenchb-1.2}{1996/12/27}{Corrected typo
-% \cs{bbl@nonfrenchident}.}
%
% \begin{macrocode}
-\ifLaTeX
- \let\@aifORI\@afterindentfalse
- \def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue
- \@afterindenttrue}
- \def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI
- \@afterindentfalse}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchindent}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchindent}
-\fi
+\let\@aifORI\@afterindentfalse
+\def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue}
+\def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI
+ \@afterindentfalse}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \subsection{Formatting footnotes}
+% \label{sec-footnotes}
%
-% \changes{frenchb-1.6a}{2003/02/02}{Add two hooks to customize
-% footnotes: \cs{AddThinSpaceBeforeFootnotes} and
-% \cs{FrenchFootnotes} (suggested by Jacques Andr\'e).}
+% \changes{frenchb-2.0}{2006/11/06}{Footnotes are now printed
+% by default `\`a la fran\c caise' for the whole document.}
%
-% \begin{macro}{\AddThinSpaceBeforeFootnotes}
-% \begin{macro}{\FrenchFootnotes}
-% \begin{macro}{\StandardFootnotes}
-% |\AddThinSpaceBeforeFootnotes| redefines |\@footnotemark| (whose
-% definition is saved at the |\begin{document}| in order to include
-% any customization that packages might have done) to add a thinspace
-% before the number or symbol calling a footnote (any space typed
-% in is removed first). |\AddThinSpaceBeforeFootnotes| has no effect
-% on the layout of the footnote itself. Note that |\thanks| in
-% |\maketitle| also relies on |\@footnotemark|, so the thinspace
-% is added there too.
+% \changes{frenchb-2.0b}{2007/04/18}{Just do nothing (except warning)
+% when the bigfoot package is loaded.}
%
-% \changes{frenchb-1.6f}{2003/04/02}{Move \cs{newif} and
-% \cs{newdimen} commands outside \cs{ifLaTeXe} ... \cs{fi}
-% for compatibility with the plain format.}
+% The |bigfoot| package deeply changes the way footnotes are
+% handled. When |bigfoot| is loaded, we just warn the user that
+% frenchb will drop the customisation of footnotes.
%
-% \begin{macrocode}
-\newif\ifthinspace@FN
-\newif\ifFR@fntlayout
-\newdimen\parindentFFN
-\ifLaTeXe
- \newcommand{\AddThinSpaceBeforeFootnotes}{\thinspace@FNtrue}
- \AtBeginDocument{\let\@footnotemarkORI\@footnotemark
- \def\@footnotemarkFR{\leavevmode\unskip\unkern
- \,\@footnotemarkORI}%
- \ifthinspace@FN
- \let\@footnotemark\@footnotemarkFR
- \fi}
-% \end{macrocode}
+% The layout of footnotes is controlled by two flags
+% |\ifFBAutoSpaceFootnotes| and |\ifFBFrenchFootnotes| which are
+% set by options of |\frenchbsetup{}| (see section~\ref{sec-keyval}).
+% Notice that the layout of footnotes \emph{does not depend} on the
+% current language (just think of two footnotes on the same page
+% looking different because one was called in a French part, the
+% other one in English!).
%
-% We then define |\@makefntextFR|, a variant of |\@makefntext|
+% When |\ifFBAutoSpaceFootnotes| is true, |\@footnotemark| (whose
+% definition is saved at the |\begin{document}| in order to include
+% any customisation that packages might have done) is redefined to
+% add a thin space before the number or symbol calling a footnote
+% (any space typed in is removed first). This has no effect on
+% the layout of the footnote itself.
+%
+% \begin{macrocode}
+\AtBeginDocument{\@ifpackageloaded{bigfoot}%
+ {\PackageWarning{frenchb.ldf}%
+ {bigfoot package in use.\MessageBreak
+ frenchb will NOT customise footnotes;\MessageBreak
+ reported}}%
+ {\let\@footnotemarkORI\@footnotemark
+ \def\@footnotemarkFB{\leavevmode\unskip\unkern
+ \,\@footnotemarkORI}%
+ \ifFBAutoSpaceFootnotes
+ \let\@footnotemark\@footnotemarkFB
+ \fi}%
+ }
+% \end{macrocode}
+%
+% We then define |\@makefntextFB|, a variant of |\@makefntext|
% which is responsible for the layout of footnotes, to match the
-% specifications of the French `Imprimerie Nationale': Footnotes
+% specifications of the French `Imprimerie Nationale': footnotes
% will be indented by |\parindentFFN|, numbers (if any) typeset on
% the baseline (instead of textsuperscripts) and followed by a dot
% and an half quad space. Whenever symbols are used to number
% footnotes (as in |\thanks| for instance), we switch back to the
% standard layout (the French layout of footnotes is meant for
% footnotes numbered by arabic or roman digits).
-% The value of |\parindentFFN| will be defined at the
-% |\begin{document}|, as the maximum of |\parindent| and 1.5em.
-%
-% \begin{macrocode}
- \def\ftnISsymbol{\@fnsymbol\c@footnote}
- \long\def\@makefntextFR#1{\ifx\thefootnote\ftnISsymbol
- \@makefntextORI{#1}%
- \else
- \parindent=\parindentFFN
- \rule\z@\footnotesep
- \setbox\@tempboxa\hbox{\@thefnmark}%
- \ifdim\wd\@tempboxa>\z@
- \llap{\@thefnmark}.\kern.5em
- \fi #1
- \fi}%
-% \end{macrocode}
-% We now define two commands |\FrenchFootnotes| and
-% |\StandardFootnotes| which select French or Standard layout
-% for footnotes; we have to save the standard definition of
-% |\@makefntext| at the |\begin{document}|, and then redefine
-% |\@makefntext| according to the value of an internal flag set
-% by |\FrenchFootnotes| and reset by |\StandardFootnotes|.
-% \begin{macrocode}
- \AtBeginDocument{\parindentFFN=\parindent
- \ifdim\parindentFFN<1.5em\parindentFFN=1.5em\fi
+%
+% \changes{frenchb-2.0}{2006/11/06}{\cs{parindentFFN} not changed if
+% already defined (for cah-gut.cls, JA wants \cs{parindentFFN}=0pt.}
+%
+% The value of |\parindentFFN| will be redefined at the
+% |\begin{document}|, as the maximum of |\parindent| and 1.5em
+% \emph{only if} unless it has been set in the preamble (the weird
+% value 10in is just for testing whether |\parindentFFN| has been
+% set or not).
+%
+% \begin{macrocode}
+\newdimen\parindentFFN
+\parindentFFN=10in
+\def\ftnISsymbol{\@fnsymbol\c@footnote}
+\long\def\@makefntextFB#1{\ifx\thefootnote\ftnISsymbol
+ \@makefntextORI{#1}%
+ \else
+ \parindent=\parindentFFN
+ \rule\z@\footnotesep
+ \setbox\@tempboxa\hbox{\@thefnmark}%
+ \ifdim\wd\@tempboxa>\z@
+ \llap{\@thefnmark}.\kern.5em
+ \fi #1
+ \fi}%
+% \end{macrocode}
+%
+% We save the standard definition of |\@makefntext| at the
+% |\begin{document}|, and then redefine |\@makefntext| according to
+% the value of flag |\ifFBFrenchFootnotes| (true or false).
+%
+% \begin{macrocode}
+\AtBeginDocument{\@ifpackageloaded{bigfoot}{}%
+ {\ifdim\parindentFFN<10in
+ \else
+ \parindentFFN=\parindent
+ \ifdim\parindentFFN<1.5em\parindentFFN=1.5em\fi
+ \fi
\let\@makefntextORI\@makefntext
\long\def\@makefntext#1{%
- \ifFR@fntlayout
- \@makefntextFR{#1}%
+ \ifFBFrenchFootnotes
+ \@makefntextFB{#1}%
\else
\@makefntextORI{#1}%
- \fi
- }%
- }
- \newcommand{\FrenchFootnotes}{\FR@fntlayouttrue}
- \newcommand{\StandardFootnotes}{\FR@fntlayoutfalse}
-\fi
+ \fi}%
+ }%
+ }
% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \subsection{Formatting numbers}
-% \label{sec-numbers}
-%
-% \changes{frenchb-1.4}{1999/10/02}{Add a hook to let the comma
-% be in math mode of type \cs{mathord} in French, as a decimal
-% separator should be.}
%
-% \changes{frenchb-1.6e}{2003/11/09}{The change from \cs{mathpunct}
-% to \cs{mathord} should be encoding independent (suggested by
-% Michel Bovani): just strip the highest hexadecimal digit to
-% switch from type \cs{mathpunct} to type \cs{mathord}.}
-%
-% \begin{macro}{\DecimalMathComma}
-% \begin{macro}{\StandardMathComma}
-% As mentioned in the \TeX{}book p.~134, the comma is of type
-% |\mathpunct| in math mode: it is automatically followed by a
-% space. This is convenient in lists and intervals but
-% unpleasant when the comma is used as a decimal separator
-% in French: it has to be entered as |{,}|.
-% |\DecimalMathComma| makes the comma be an ordinary character
-% (of type |\mathord|) in French \emph{only} (no space added);
-% |\StandardMathComma| switches back to the standard behaviour
-% of the comma.
+% For compatibility reasons, we provide definitions for the commands
+% dealing with the layout of footnotes in frenchb version~1.6.
+% |\frenchbsetup{}| (see in section \ref{sec-keyval}) should be
+% preferred for setting these options. |\StandardFootnotes| may
+% still be used locally (in minipages for instance), that's why the
+% test |\ifFBFrenchFootnotes| is done inside |\@makefntext|.
% \begin{macrocode}
-\newcount\std@mcc
-\newcount\dec@mcc
-\std@mcc=\mathcode`\,
-\dec@mcc=\std@mcc
-\@tempcnta=\std@mcc
-\divide\@tempcnta by "1000
-\multiply\@tempcnta by "1000
-\advance\dec@mcc by -\@tempcnta
-\newcommand{\DecimalMathComma}{\iflanguage{french}%
- {\mathcode`\,=\dec@mcc}{}%
- \addto\extrasfrench{\mathcode`\,=\dec@mcc}}
-\newcommand{\StandardMathComma}{\mathcode`\,=\std@mcc
- \addto\extrasfrench{\mathcode`\,=\std@mcc}}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \mathcode`\,=\std@mcc}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \changes{frenchb-1.2}{1996/12/27}{New macros \cs{nombre}
-% \cs{decimalsep} and \cs{thousandsep} added to format numbers.}
-%
-% In English the decimal part starts with a point and thousands
-% should be separated by a comma: an approximation of $1000\pi$
-% should be inputed as |$3{,}141.592{,}653$| in math mode and
-% as |3,141.592,653| in text.\\
-% In French the decimal part starts with a comma and thousands
-% should be separated by a space; the same approximation of
-% $1000\pi$ should be inputed as |$3\;141{,}592\;653$| in math mode
-% and as something like |3~141,592~653| in text: in math mode, the
-% comma is of type |\mathpunct| (thus normally followed by a space)
-% while the point is of type |\mathord| (no space added).
-%
-% Thierry Bouche suggested that a second type of comma, of type
-% |\mathord| would be useful in math mode, and proposed to
-% introduce a command (named |\decimalsep| in this package),
-% the expansion of which would depend on the current language.
-%
-% Vincent Jalby suggested a command |\nombre| to conveniently
-% typeset numbers: inputting |\nombre{3141,592653}| either in
-% text or in math mode will format this number properly according
-% to the current language (French or non-French).
-%
-% |\nombre| accepts an optional argument which happens to be
-% useful with the package `dcolumn', it specifies the decimal
-% separator used in the \emph{source code}:
-% |\newcolumntype{d}{D{,}{\decimalsep}{-1}}| \\
-% |\begin{tabular}{|d|}\hline | \\
-% | 3,14 \\ | \\
-% | \nombre[,]{123,4567} \\ | \\
-% | \nombre[,]{9876,543}\\\hline| \\
-% |\end{tabular} | \\
-% will print a column of numbers aligned on the decimal point
-% (comma or point depending on the current language), each slice
-% of 3 digits being separated by a space or a comma according to
-% the current language.
-%
-% \begin{macro}{\decimalsep}
-% \begin{macro}{\thousandsep}
-% We need a internal definition, valid in both text and math mode,
-% for the comma (|\@comma@|) and another one for the unbreakable
-% fixed length space (no glue) used in French (|\f@thousandsep|).
-%
-% The commands |\decimalsep| and |\thousandsep| get default
-% definitions (for the English language) when |frenchb| is loaded;
-% these definitions will be updated when the current language is
-% switched to or from French.
-%
-% \changes{frenchb-1.2b}{1997/04/24}{Extra care taken to handle
-% signs properly inside \cs{nombre} in \LaTeXe.}
-%
-% \changes{frenchb-1.2b}{1997/04/24}{Definition of \cs{nombre} changed
-% to correct a bug with moving arguments in \LaTeX-2.09.}
-%
-% \changes{frenchb-1.4g}{2000/10/07}{Added a new hook
-% \cs{ThinSpaceInFrenchNumbers} to have thin spaces instead of
-% normal spaces (the default) when formatting French numbers.}
-%
-% \begin{macrocode}
-\mathchardef\m@comma=\dec@mcc
-\def\@comma@{\ifmmode\m@comma\else,\fi}
-\def\f@thousandsep{\ifmmode\mskip5.5mu\else\penalty\@M\kern.3em\fi}
-\def\ThinSpaceInFrenchNumbers{\def\f@thousandsep{%
- \ifmmode\mskip3mu\else\penalty\@M\kern.16667em\fi}}
-\newcommand{\decimalsep}{.}
-\newcommand{\thousandsep}{\@comma@}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \def\decimalsep{\@comma@}%
- \def\thousandsep{\f@thousandsep}}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \def\decimalsep{.}%
- \def\thousandsep{\@comma@}}
+\newcommand*{\AddThinSpaceBeforeFootnotes}{\FBAutoSpaceFootnotestrue}
+\newcommand*{\FrenchFootnotes}{\FBFrenchFootnotestrue}
+\newcommand*{\StandardFootnotes}{\FBFrenchFootnotesfalse}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
%
-% \changes{frenchb-1.3}{1997/05/24}{Avoid mixing text and math mode
-% whenever possible: check if \cs{textminus} and co. are available.}
-% Signs can now be entered inside |\nombre|. When |\nombre| is
-% used in text-mode, signs should be text symbols to get the
-% series, shape... from the current text-font. When signs are not
-% available in text-mode, we provide some defaults.
-%
-% \begin{macrocode}
-\providecommand{\textminus}{\textendash}
-\providecommand{\textplusminus}{\ensuremath{\pm}}
-\providecommand{\textminusplus}{\ensuremath{\mp}}
-\def\fb@minus{\ifmmode-\else\textminus\fi}
-\def\fb@plusminus{\ifmmode\pm\else\textplusminus\fi}
-\def\fb@minusplus{\ifmmode\mp\else\textminusplus\fi}
-% \end{macrocode}
+% \subsection{Global layout}
+% \label{sec-global}
%
-% \begin{macro}{\nombre}
-% The decimal separator used when \emph{inputing} a number
-% with |\nombre| \emph{has to be a comma}.
-% |\nombre| splits the inputed number into two parts: what
-% comes before the first comma will be formatted by
-% \cs{@integerpart} while the rest (if not empty) will be
-% formatted by \cs{@decimalpart}. Both parts, once formatted
-% separately will be merged together with between them, either
-% the decimal separator \cs{decimalsep} or (in \LaTeXe{}
-% \emph{only}) the optional argument of |\nombre|.
-%
-% \changes{frenchb-1.3}{1997/05/24}{Added \cs{@empty} to the
-% definitions of \cs{nb@first} and \cs{nb@suite}, as suggested
-% by V. Jalby, to cope with possibly empty integer part as in
-% \cs{nombre{,123}}.}
-%
-% \begin{macrocode}
-\if@Two@E
- \newcommand{\nombre}[2][\decimalsep]{\def\@decimalsep{#1}%
- \@@nombre#2\@empty,\@empty,\@nil}
-\else
- \def\@decimalsep{\decimalsep}
- \newcommand{\nombre}[1]{\@nombre#1\@empty,\@empty,\@nil}
-\fi
-\def\@firstofmany#1#2,{#1}
-\def\@@nombre#1,#2,#3\@nil{%
- \def\nb@sign{}%
- \edef\nb@first{\@firstofmany #1\@empty,}%
- \edef\nb@suite{\@secondoftwo #1\@empty,}%
- \if+\nb@first \def\nb@sign{+}\fi
- \if-\nb@first \def\nb@sign{\fb@minus}\fi
- \expandafter\ifx\nb@first\pm \def\nb@sign{\fb@plusminus}\fi
- \expandafter\ifx\nb@first\mp \def\nb@sign{\fb@minusplus}\fi
- \ifx\@empty\nb@sign
- \let\@tmp\nb@suite\edef\nb@suite{\nb@first\@tmp}%
- \fi
- \nb@sign\expandafter\@nombre\nb@suite#2,#3\@nil}
-\def\@nombre#1,#2,#3\@nil{%
- \ifx\@empty#2%
- \@integerpart{#1}%
- \else
- \@integerpart{#1}\@decimalsep\@decimalpart{#2}%
- \fi}
-% \end{macrocode}
-% The easiest bit is the decimal part:
-% We attempt to read the first four digits of the decimal part, if
-% it has less than 4 digits, we just have to print them, otherwise
-% |\thousandsep| has to be appended after the third digit, and the
-% algorithm is applied recursively to the rest of the decimal part.
-% \begin{macrocode}
-\def\@decimalpart#1{\@@decimalpart#1\@empty\@empty\@empty}
-\def\@@decimalpart#1#2#3#4{#1#2#3%
- \ifx\@empty#4%
- \else
- \thousandsep\expandafter\@@decimalpart\expandafter#4%
- \fi}
-% \end{macrocode}
-% Formatting the integer part is more difficult because the slices
-% of 3 digits start from the \emph{bottom} while the number is
-% read from the top!
-% This (tricky) code is borrowed from David Carlisle's comma.sty.
-% \begin{macrocode}
-\def\@integerpart#1{\@@integerpart{}#1\@empty\@empty\@empty}
-\def\@@integerpart#1#2#3#4{%
- \ifx\@empty#2%
- \@addthousandsep#1\relax
- \else
- \ifx\@empty#3%
- \@addthousandsep\@empty\@empty#1#2\relax
- \else
- \ifx\@empty#4%
- \@addthousandsep\@empty#1#2#3\relax
- \else
- \@@integerpartafterfi{#1#2#3#4}%
- \fi
- \fi
- \fi}
-\def\@@integerpartafterfi#1\fi\fi\fi{\fi\fi\fi\@@integerpart{#1}}
-\def\@addthousandsep#1#2#3#4{#1#2#3%
- \if#4\relax
- \else
- \thousandsep\expandafter\@addthousandsep\expandafter#4%
- \fi}
+% In multilingual documents, some typographic rules must depend
+% on the current language (e.g., hyphenation, typesetting of
+% numbers, spacing before double punctuation\dots), others should,
+% IMHO, be kept global to the document: especially the layout of
+% lists (see~\ref{sec-lists}) and footnotes
+% (see~\ref{sec-footnotes}), and the indentation of the first
+% paragraph of sections (see~\ref{sec-indent}).
+%
+% From version 2.0 on, two flags control the global layout, their
+% values are chosen in |\frenchbsetup{}| (see
+% section~\ref{sec-keyval}). The default behaviour of frenchb is
+% to customise the layout (i.e. lists, indentation of the first
+% paragraphs of sections) only when the current language is French.
+% Unifying the layout can be done in two ways: frenchb will leave
+% the standard layout provided by the \LaTeX{} class untouched
+% in French when the option |StandardLayout| is made true in
+% |\frenchbsetup{}| or frenchb will (try to) force the layout
+% outside French to be the same as in French when the option
+% |GlobalLayoutFrench| is made true in |\frenchbsetup{}|.
+% Of course, the second option only works if the other languages
+% do not alter the layout.
+%
+% The former commands |\FrenchLayout| and |\StandardLayout| are kept
+% for compatibility reasons but should no longer be used.
+%
+% \begin{macrocode}
+\newcommand*{\FrenchLayout}{\FBGlobalLayoutFrenchtrue
+ \PackageWarning{frenchb.ldf}%
+ {\protect\FrenchLayout\space is obsolete. Please use\MessageBreak
+ \protect\frenchbsetup{GlobalLayoutFrench} instead.}%
+}
+\newcommand*{\StandardLayout}{\FBStandardLayouttrue
+ \PackageWarning{frenchb.ldf}%
+ {\protect\StandardLayout\space is obsolete. Please use\MessageBreak
+ \protect\frenchbsetup{StandardLayout} instead.}%
+}
+\@onlypreamble\FrenchLayout
+\@onlypreamble\StandardLayout
% \end{macrocode}
-% \end{macro}
%
% \subsection{Dots\dots}
% \label{sec-dots}
%
-% \changes{frenchb-1.3}{1997/06/03}{Added this section.}
+% \begin{macro}{\FBtextellipsis}
% \LaTeXe's standard definition of |\dots| in text-mode is
% |\textellipsis| which includes a |\kern| at the end;
% this space is not wanted in some cases (before a closing brace
% for instance) and |\kern| breaks hyphenation of the next word.
-% We define |\Frtextellipsis| for French (in \LaTeXe{} only).
+% We define |\FBtextellipsis| for French (in \LaTeXe{} only).
%
-% \changes{frenchb-1.4c}{1999/11/17}{Bug correction: \cs{xspace}
-% didn't work in \cs{dots} without amsmath.sty.}
% The |\if| construction in the \LaTeXe{} definition of |\dots|
% doesn't allow the use of |xspace| (|xspace| is always followed
% by a |\fi|), so we use the AMS-\LaTeX{} construction of |\dots|;
% this has to be done `AtBeginDocument' not to be overwritten
% when \file{amsmath.sty} is loaded after \babel.
%
-% \changes{frenchb-1.4d}{2000/02/01}{AMS-LaTeX 2.0 provides a much
-% better spacing for \cs{dots} than 1.2, so let's take advantage
-% of it when amsmath (up to 1.2 or newer) is loaded.}
+% \changes{frenchb-2.0}{2006/11/06}{Added special case for LY1
+% encoding, see bug report from Bruno Voisin (2004/05/18).}
+%
+% LY1 has a ready made character for |\textellipsis|, it should be
+% used in French too (pointed out by Bruno Voisin).
%
-% \begin{macro}{\Frtextellipsis}
% \begin{macrocode}
-\ifLaTeXe
- \DeclareTextCommandDefault{\Frtextellipsis}{%
+\DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
+\DeclareTextCommandDefault{\FBtextellipsis}{%
.\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace}
% \end{macrocode}
% |\Mdots@| and |\Tdots@ORI| hold the definitions of |\dots| in
% Math and Text mode. They default to those of amsmath-2.0, and
% will revert to standard \LaTeX{} definitions `AtBeginDocument',
% if amsmath has not been loaded. |\Mdots@| doesn't change when
-% switching from/to French, while |\Tdots@| is |\Frtextellipsis|
+% switching from/to French, while |\Tdots@| is |\FBtextellipsis|
% in French and |\Tdots@ORI| otherwise.
% \begin{macrocode}
- \newcommand{\Tdots@ORI}{\@xp\textellipsis}
- \newcommand{\Tdots@}{\Tdots@ORI}
- \newcommand{\Mdots@}{\@xp\mdots@}
- \AtBeginDocument{\DeclareRobustCommand{\dots}{\relax
- \csname\ifmmode M\else T\fi dots@\endcsname}%
- \ifx\@xp\@undefined\let\@xp\relax\fi
- \ifx\mdots@\@undefined\let\Tdots@ORI\textellipsis
- \let\Mdots@\mathellipsis\fi}
- \def\bbl@frenchdots{\let\Tdots@\Frtextellipsis}
- \def\bbl@nonfrenchdots{\let\Tdots@\Tdots@ORI}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
+\newcommand*{\Tdots@ORI}{\@xp\textellipsis}
+\newcommand*{\Tdots@}{\Tdots@ORI}
+\newcommand*{\Mdots@}{\@xp\mdots@}
+\AtBeginDocument{\DeclareRobustCommand{\dots}{\relax
+ \csname\ifmmode M\else T\fi dots@\endcsname}%
+ \@ifundefined{@xp}{\let\@xp\relax}{}%
+ \@ifundefined{mdots@}{\let\Tdots@ORI\textellipsis
+ \let\Mdots@\mathellipsis}{}}
+\def\bbl@frenchdots{\let\Tdots@\FBtextellipsis}
+\def\bbl@nonfrenchdots{\let\Tdots@\Tdots@ORI}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
\bbl@frenchdots}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
+\expandafter\addto\csname noextras\CurrentOption\endcsname{%
\bbl@nonfrenchdots}
-\fi
% \end{macrocode}
% \end{macro}
%
-% \subsection{Global layout}
-% \label{sec-global}
-%
-% \changes{frenchb-1.4}{1999/10/03}{Added this section.}
-%
-% In multilingual documents, some typographic rules must depend
-% on the current language (e.g., hyphenation, typesetting of
-% numbers, spacing before double punctuation\dots),
-% others should, IMHO, be kept global to the document:
-% especially the layout of lists (see~\ref{sec-lists})
-% and the indentation of the first paragraph of sections
-% (see~\ref{sec-indent}).
-%
-% \begin{macro}{\FrenchLayout}
-% \begin{macro}{\StandardLayout}
-% In a multilingual document, a unified look, either the French
-% one or the standard one, can be assigned to the whole document:
-% adding |\FrenchLayout| will give a global ``French look'' to
-% the document (e.g., lists, regardless the current language, will
-% be typeset as in French) and |\StandardLayout| forces a global
-% ``US-English'' look.
-% Both of these commands can only be used \emph{before} the
-% |\begin{document}|.
-% |\StandardLayout| can also be of interest for class designers
-% who do not want |frenchb| to interfere with their global layout
-% choices.
-%
-% As of version~1.4, |\FrenchLayout| and |\StandardLayout| only
-% affect:
-% \begin{itemize}
-% \item the layout of lists (see~\ref{sec-lists}),
-% \item the indentation of the first paragraph of sections
-% (see~\ref{sec-indent}).
-% \end{itemize}
-%
-% \changes{frenchb-1.6c}{2003/06/30}{Bug correction: the definitions
-% of \cs{labelitemi} ... \cs{itemize} need to be saved in
-% \cs{StandardLayout}.}
-%
-% \begin{macrocode}
-\ifLaTeXe
- \newcommand{\FrenchLayout}{%
- \renewcommand{\StandardLayout}{%
- \PackageWarning{frenchb.ldf}%
- {\protect\StandardLayout\space makes no change\MessageBreak
- (\protect\FrenchLayout\space has been selected before
- \MessageBreak for the whole document)}%
- }%
- \AtBeginDocument{\bbl@frenchitemize\bbl@frenchlistspacing
- \bbl@frenchindent}%
- \let\bbl@nonfrenchitemize\relax
- \let\bbl@nonfrenchlistspacing\relax
- \let\bbl@nonfrenchindent\relax}
- \newcommand{\StandardLayout}{%
- \renewcommand{\FrenchLayout}{%
- \PackageWarning{frenchb.ldf}%
- {\protect\FrenchLayout\space makes no change\MessageBreak
- (\protect\StandardLayout\space has been selected before
- \MessageBreak for the whole document)}%
- }%
- \let\@ltiORI\labelitemi
- \let\@ltiiORI\labelitemii
- \let\@ltiiiORI\labelitemiii
- \let\@ltivORI\labelitemiv
- \let\itemizeORI\itemize
- \let\bbl@frenchitemize\relax
- \let\bbl@frenchlistspacing\relax
- \let\bbl@frenchindent\relax}
- \@onlypreamble\FrenchLayout
- \@onlypreamble\StandardLayout
-\fi
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
+% \subsection{Setup options: keyval stuff}
+% \label{sec-keyval}
%
-% \subsection{Extra utilities}
+% \changes{frenchb-2.0}{2006/11/06}{New command \cs{frenchbsetup}
+% added for global customisation.}
%
-% All that is left to do now is to provide the French user
-% with some extra utilities.
+% \changes{frenchb-2.0c}{2007/06/25}{Option ThinSpaceInFrenchNumbers
+% added.}
%
-% \begin{macro}{\up}
-% \begin{macro}{\ieme}
-% |\up| eases the typesetting of superscripts like
-% `1\raise0.55ex\hbox{\small er}'. |\up| relies on
-% |\textsuperscript| when available (i.\,e., in \LaTeXe).
+% \changes{frenchb-2.0d}{2007/07/15}{Options og and fg changed: limit
+% the definition to French so that quote characters can be used
+% in German.}
%
-% \changes{frenchb-1.1}{1996/01/20}{Use \cs{textsuperscript} in \LaTeXe,
-% as suggested by Vincent Jalby.}
+% \changes{frenchb-2.0e}{2007/10/05}{New option: StandardLists.}
%
-% \changes{frenchb-1.1}{1996/01/26}{Internal macro \cs{up@size}
-% introduced by Johannes Braams to replace \cs{small},
-% too fragile in 2.09).}
+% \begin{macro}{\frenchbsetup}
+% From version 2.0 on, all setup options are handled by \emph{one}
+% command |\frenchbsetup| using the keyval syntax.
%
-% \changes{frenchb-1.1}{1996/05/03}{\cs{@ptsize} may not be undefined,
-% i.\,e. in slides.cls.}
+% We first define a collection of conditionals with their defaults
+% (true or false).
%
-% \begin{macro}{\up@size}
-% The internal macro |\up@size| holds the size at which the
-% superscript will be typeset. The reason for this is that we have
-% to specify it differently for different formats.
-% \begin{macrocode}
-\ifx\sevenrm\@undefined
- \ifx\@ptsize\@undefined
- \let\up@size\small
- \else
- \ifx\selectfont\@undefined
-% \end{macrocode}
-% In this case the format is the original \LaTeX-2.09:
-% \begin{macrocode}
- \ifcase\@ptsize
- \let\up@size\ixpt\or
- \let\up@size\xpt\or
- \let\up@size\xipt
- \fi
-% \end{macrocode}
-% When |\selectfont| is defined we probably have NFSS available:
-% \begin{macrocode}
- \else
- \ifcase\@ptsize
- \def\up@size{\fontsize\@ixpt{10pt}\selectfont}\or
- \def\up@size{\fontsize\@xpt{11pt}\selectfont}\or
- \def\up@size{\fontsize\@xipt{12pt}\selectfont}
- \fi
- \fi
- \fi
-\else
-% \end{macrocode}
-% If we end up here it must be a plain based \TeX{} format, so:
% \begin{macrocode}
- \let\up@size\sevenrm
-\fi
-% \end{macrocode}
-% \end{macro}
-% Now we can define |\up|. When \LaTeXe{} runs in
-% compatibility mode (\LaTeX-2.09 emulation), |\textsuperscript| is
-% also defined, but does no good job, so we give two different
-% definitions for |\up| using |\if@Two@E|.
-% \begin{macrocode}
-\if@Two@E
- \DeclareRobustCommand*{\up}[1]{\textsuperscript{#1}}
-\else
- \DeclareRobustCommand*{\up}[1]{\leavevmode\raise1ex\hbox{\up@size#1}}
-\fi
+\newif\ifFBStandardLayout \FBStandardLayoutfalse
+\newif\ifFBGlobalLayoutFrench \FBGlobalLayoutFrenchfalse
+\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue
+\newif\ifFBThinColonSpace \FBThinColonSpacefalse
+\newif\ifFBReduceListSpacing \FBReduceListSpacingtrue
+\newif\ifFBCompactItemize \FBCompactItemizetrue
+\newif\ifFBStandardItemLabels \FBStandardItemLabelsfalse
+\newif\ifFBStandardLists \FBStandardListsfalse
+\newif\ifFBIndentFirst \FBIndentFirsttrue
+\newif\ifFBFrenchFootnotes \FBFrenchFootnotestrue
+\newif\ifFBAutoSpaceFootnotes \FBAutoSpaceFootnotestrue
+\newif\ifFBThinSpaceInFrenchNumbers \FBThinSpaceInFrenchNumbersfalse
+\newif\ifFBPartNameFull \FBPartNameFulltrue
+\newif\ifFBShowOptions \FBShowOptionsfalse
% \end{macrocode}
%
-% \changes{frenchb-1.1}{1996/05/31}{Added 5 macros from french.sty and
-% missing \cs{lowercase}.}
-%
-% \changes{frenchb-1.2b}{1997/04/24}{Use \cs{xspace} to control spacing
-% after \cs{ieme} ... \cs{ieres}.}
-%
-% |\ieme| is provided for compatibility with |francais.sty|,
-% the other 5 for compatibility with |french.sty|:
+% Let's now define the main configuration command |\frenchbsetup|
+% which reads and sets the options which will be processed later
+% (at |\begin{document}|). It can only be called in the preamble.
% \begin{macrocode}
-\def\ieme{\up{\lowercase{e}}\xspace}
-\def\iemes{\up{\lowercase{es}}\xspace}
-\def\ier{\up{\lowercase{er}}\xspace}
-\def\iers{\up{\lowercase{ers}}\xspace}
-\def\iere{\up{\lowercase{re}}\xspace}
-\def\ieres{\up{\lowercase{res}}\xspace}
+\newcommand*{\frenchbsetup}[1]{%
+ \setkeys{FB}{#1}%
+}%
+\@onlypreamble\frenchbsetup
% \end{macrocode}
% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\No}
-% \begin{macro}{\no}
-% \begin{macro}{\primo}
-% \begin{macro}{\fprimo)}
-% And some more macros for numbering, first two support macros.
-%
-% \changes{frenchb-1.1}{1996/01/25}{Avoid using math superscripts
-% in text mode (suggested by V.~Jalby), use \cs{up} instead.
-% The symbol `degree' has nothing to do in
-% \cs{FrenchPopularEnumerate}, replace it by a small `o'.}
%
+% frenchb being an option of babel, it cannot load a package (keyval)
+% while frenchb.ldf is read, so we defer the loading of \file{keyval}
+% and the options setup at the end of \babel's loading.
+%
+% |StandardLayout| resets the layout in French to the standard layout
+% defined par the \LaTeX{} class and packages loaded. It deals with
+% lists, indentation of first paragraphs of sections and footnotes.
+% Other keys, entered \emph{after} |StandardLayout| in
+% |\frenchbsetup|, can overrule some of the |StandardLayout|
+% settings.
+%
+% \begin{macrocode}
+\AtEndOfPackage{%
+ \RequirePackage{keyval}%
+ \define@key{FB}{StandardLayout}[true]%
+ {\csname FBStandardLayout#1\endcsname
+ \ifFBStandardLayout
+ \FBStandardListstrue
+ \FBIndentFirstfalse
+ \FBFrenchFootnotesfalse
+ \FBAutoSpaceFootnotesfalse
+ \fi}%
+ \define@key{FB}{GlobalLayoutFrench}[true]%
+ {\csname FBGlobalLayoutFrench#1\endcsname}%
+ \define@key{FB}{AutoSpacePunctuation}[true]%
+ {\csname FBAutoSpacePunctuation#1\endcsname}%
+ \define@key{FB}{ThinColonSpace}[true]%
+ {\csname FBThinColonSpace#1\endcsname}%
+ \define@key{FB}{ReduceListSpacing}[true]%
+ {\csname FBReduceListSpacing#1\endcsname}%
+ \define@key{FB}{CompactItemize}[true]%
+ {\csname FBCompactItemize#1\endcsname}%
+ \define@key{FB}{StandardItemLabels}[true]%
+ {\csname FBStandardItemLabels#1\endcsname}%
+ \define@key{FB}{ItemLabels}{%
+ \renewcommand*{\FrenchLabelItem}{#1}}%
+ \define@key{FB}{ItemLabeli}{%
+ \renewcommand*{\Frlabelitemi}{#1}}%
+ \define@key{FB}{ItemLabelii}{%
+ \renewcommand*{\Frlabelitemii}{#1}}%
+ \define@key{FB}{ItemLabeliii}{%
+ \renewcommand*{\Frlabelitemiii}{#1}}%
+ \define@key{FB}{ItemLabeliv}{%
+ \renewcommand*{\Frlabelitemiv}{#1}}%
+ \define@key{FB}{StandardLists}[false]%
+ {\csname FBStandardLayout#1\endcsname
+ \ifFBStandardLists
+ \FBReduceListSpacingfalse
+ \FBCompactItemizefalse
+ \FBStandardItemLabelstrue
+ \fi}%
+ \define@key{FB}{IndentFirst}[true]%
+ {\csname FBIndentFirst#1\endcsname}%
+ \define@key{FB}{FrenchFootnotes}[true]%
+ {\csname FBFrenchFootnotes#1\endcsname}%
+ \define@key{FB}{AutoSpaceFootnotes}[true]%
+ {\csname FBAutoSpaceFootnotes#1\endcsname}%
+ \define@key{FB}{ThinSpaceInFrenchNumbers}[true]%
+ {\csname FBThinSpaceInFrenchNumbers#1\endcsname}%
+ \define@key{FB}{PartNameFull}[true]%
+ {\csname FBPartNameFull#1\endcsname}%
+ \define@key{FB}{ShowOptions}[true]%
+ {\csname FBShowOptions#1\endcsname}%
+% \end{macrocode}
+% Inputing French quotes as \emph{single characters} when they are
+% available on the keyboard (through a compose key for instance)
+% is more comfortable than typing |\og| and |\fg|.
+% The purpose of the following code is to map the French quote
+% characters to |\og\ignorespaces| and |{\fg}| respectively when
+% the current language is French, and to |\guillemotleft| and
+% |\guillemotright| otherwise (think of German quotes); thus correct
+% unbreakable spaces will be added automatically to French quotes.
+% The quote characters typed in depend on the input encoding,
+% it can be single-byte (latin1, latin9, applemac,\dots) or
+% multi-bytes (utf-8, utf8x). We first check whether XeTeX is used
+% or not, if not the package |inputenc| has to be loaded before the
+% |\begin{document}| with the proper coding option, so we check if
+% |\DeclareInputText| is defined.
+% \begin{macrocode}
+ \define@key{FB}{og}{%
+ \newcommand*{\FB@@og}{\iflanguage{french}%
+ {\FB@og\ignorespaces}{\guillemotleft}}%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \AtBeginDocument{%
+ \@ifundefined{DeclareInputText}%
+ {\PackageWarning{frenchb.ldf}%
+ {Option `og' requires package inputenc.\MessageBreak}%
+ }%
+ {\@ifundefined{uc@dclc}%
+% \end{macrocode}
+% if |\uc@dclc| is undefined, utf8x is not loaded\dots
+% \begin{macrocode}
+ {\@ifundefined{DeclareUnicodeCharacter}%
+% \end{macrocode}
+% if |\DeclareUnicodeCharacter| is undefined, utf8 is not loaded
+% either, we assume 8-bit character input encoding.
+% Package MULEenc.sty (from CJK) defines |\mule@def| to map
+% characters to control sequences.
+% \begin{macrocode}
+ {\@tempcnta`#1\relax
+ \@ifundefined{mule@def}%
+ {\DeclareInputText{\the\@tempcnta}{\FB@@og}}%
+ {\mule@def{11}{{\FB@@og}}}%
+ }%
+% \end{macrocode}
+% utf8 loaded, use |\DeclareUnicodeCharacter|,
+% \begin{macrocode}
+ {\DeclareUnicodeCharacter{00AB}{\FB@@og}}%
+ }%
+% \end{macrocode}
+% utf8x loaded, use |\uc@dclc|,
+% \begin{macrocode}
+ {\uc@dclc{171}{default}{\FB@@og}}%
+ }%
+ }%
+% \end{macrocode}
+% XeTeX in use, the following trick for defining the active quote
+% character is borrowed from \file{inputenc.dtx}.
% \begin{macrocode}
-\DeclareRobustCommand*{\FrenchEnumerate}[1]{%
- #1\up{\lowercase{o}}\kern+.3em}
-\DeclareRobustCommand*{\FrenchPopularEnumerate}[1]{%
- #1\up{\lowercase{o}})\kern+.3em}
+ \else
+ \catcode`#1=\active
+ \bgroup
+ \uccode`\~`#1%
+ \uppercase{%
+ \egroup
+ \def~%
+ }{\FB@@og}%
+ \fi
+ }%
% \end{macrocode}
-%
-% \changes{frenchb-1.3c}{1997/10/08}{Typos corrected: quatro, fquatro}
-%
-% Typing |\primo| should result in `$1^{\rm o}$\kern+.3em',
-% \begin{macrocode}
-\def\primo{\FrenchEnumerate1}
-\def\secundo{\FrenchEnumerate2}
-\def\tertio{\FrenchEnumerate3}
-\def\quarto{\FrenchEnumerate4}
+% Same code for the closing quote.
+% \begin{macrocode}
+ \define@key{FB}{fg}{%
+ \newcommand*{\FB@@fg}{\iflanguage{french}%
+ {\FB@fg}{\guillemotright}}%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \AtBeginDocument{%
+ \@ifundefined{DeclareInputText}%
+ {\PackageWarning{frenchb.ldf}%
+ {Option `fg' requires package inputenc.\MessageBreak}%
+ }%
+ {\@ifundefined{uc@dclc}%
+ {\@ifundefined{DeclareUnicodeCharacter}%
+ {\@tempcnta`#1\relax
+ \@ifundefined{mule@def}%
+ {\DeclareInputText{\the\@tempcnta}{{\FB@@fg}}}%
+ {\mule@def{27}{{\FB@@fg}}}%
+ }%
+ {\DeclareUnicodeCharacter{00BB}{{\FB@@fg}}}%
+ }%
+ {\uc@dclc{187}{default}{{\FB@@fg}}}%
+ }%
+ }%
+ \else
+ \catcode`#1=\active
+ \bgroup
+ \uccode`\~`#1%
+ \uppercase{%
+ \egroup
+ \def~%
+ }{{\FB@@fg}}%
+ \fi
+ }%
+}
% \end{macrocode}
-% while typing |\fprimo)| gives `1$^{\rm o}$)\kern+.3em.
+%
+% |\FBprocess@options| processes the options, it is called \emph{once}
+% at |\begin{document}|.
% \begin{macrocode}
-\def\fprimo){\FrenchPopularEnumerate1}
-\def\fsecundo){\FrenchPopularEnumerate2}
-\def\ftertio){\FrenchPopularEnumerate3}
-\def\fquarto){\FrenchPopularEnumerate4}
+\newcommand*{\FBprocess@options}{%
% \end{macrocode}
+% Nothing has to be done here for |StandardLayout| (the involved
+% flags have already been set in |\frenchbsetup{}|).
%
-% Let's provide two macros for the common abbreviations
-% of ``Num\'ero''.
+% |AutoSpacePunctuation| adds an unbreakable space (in French only)
+% before the four active characters (:;!?) even if none has been
+% typed before them.
% \begin{macrocode}
-\DeclareRobustCommand*{\No}{N\up{\lowercase{o}}\kern+.2em}
-\DeclareRobustCommand*{\no}{n\up{\lowercase{o}}\kern+.2em}
+ \ifFBAutoSpacePunctuation
+ \AutoSpaceBeforeFDP
+ \else
+ \NoAutoSpaceBeforeFDP
+ \fi
% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \changes{frenchb-1.1}{1996/01/29}{Added command \cs{bsc}.}
%
-% \changes{frenchb-1.1}{1996/05/31}{Added \cs{leavevmode} in \cs{bsc}}
-%
-% \begin{macro}{\bsc}
-% As family names should be written in small capitals and never be
-% hyphenated, we provide a command (its name comes from Boxed Small
-% Caps) to input them easily; this is a simpler implementation of
-% commands |\fsc| and |\lsc| from |french.sty| : no automatic
-% uppercase/lowercase conversion is performed.
-% Usage: |Jean~\bsc{Duchemin}|.
+% |ThinColonSpace| changes the normal unbreakable space typeset in
+% French before `:' to a thin space.
% \begin{macrocode}
-\DeclareRobustCommand*{\bsc}[1]{\leavevmode\hbox{\scshape #1}}
+ \ifFBThinColonSpace\renewcommand*{\Fcolonspace}{\thinspace}\fi
% \end{macrocode}
-% \end{macro}
-%
-% \changes{frenchb-1.1}{1996/05/31}{Added \cs{AllTeX}.}
-%
-% \changes{frenchb-1.2}{1997/01/08}{Removed \cs{AllTeX}.}
-%
-% \changes{frenchb-1.1}{1996/02/12}{Added T1-encodings for \oe, \OE,
-% \ae, \AE. \emph{Do not} re-define these symbols outside \LaTeXe.}
-%
-% \changes{frenchb-1.1}{1996/02/14}{Corrected definitions of
-% \cs{boi}.}
-%
-% \changes{frenchb-1.3}{1997/05/24}{Use \cs{textbackslash} to define
-% \cs{boi}.}
-%
-% Some definitions for special characters. The first eight are
-% mandatory for |\oe| etc. to work properly in moving arguments,
-% the others just for convenience. We won't define |\tilde| as a
-% Text Symbol not to conflict with the macro |\tilde| for math mode
-% and use the name |\tild| instead. Note that |\boi| may \emph{not}
-% be used in math mode, its name in math mode is |\backslash|.
-%
-% \changes{frenchb-1.3}{1997/05/24}{Use \cs{r{}} to access the
-% character `degree', as suggested by V. Jalby.}
-%
-% |\degre| needs a special treatment: it is |\char6|
-% in T1-encoding and |\char23| in OT1-encoding, both can be
-% accessed by the command |\r{}| for ring accent.
-%
-% \changes{frenchb-1.1}{1996/03/03}{Do not use commands related to
-% encodings outside \LaTeXe.}
-%
-% \changes{frenchb-1.4}{1999/10/03}{Add definitions for \cs{at},
-% \cs{circonflexe} and \cs{tild} in other encodings (mlTeX's LO1).}
+% The next three options deal with the layout of lists in French.
%
+% |ReduceListSpacing| reduces the vertical spaces between list
+% items in French (done by changing |\list| to |\listFB|).
+% When |GlobalLayoutFrench| is true the same is done outside French.
% \begin{macrocode}
-\ifLaTeXe
- \DeclareTextSymbol{\ae}{T1}{230}
- \DeclareTextSymbol{\ae}{OT1}{26}
- \DeclareTextSymbol{\oe}{T1}{247}
- \DeclareTextSymbol{\oe}{OT1}{27}
- \DeclareTextSymbol{\AE}{T1}{198}
- \DeclareTextSymbol{\AE}{OT1}{29}
- \DeclareTextSymbol{\OE}{T1}{215}
- \DeclareTextSymbol{\OE}{OT1}{30}
- \DeclareTextSymbol{\at}{T1}{64}
- \DeclareTextSymbol{\at}{OT1}{64}
- \DeclareTextSymbol{\circonflexe}{T1}{94}
- \DeclareTextSymbol{\circonflexe}{OT1}{94}
- \DeclareTextSymbol{\tild}{T1}{126}
- \DeclareTextSymbol{\tild}{OT1}{126}
- \DeclareTextSymbolDefault{\at}{OT1}
- \DeclareTextSymbolDefault{\circonflexe}{OT1}
- \DeclareTextSymbolDefault{\tild}{OT1}
- \DeclareRobustCommand*{\boi}{\textbackslash}
- \DeclareRobustCommand*{\degre}{\r{}}
-\else
- \def\T@one{T1}
- \ifx\f@encoding\T@one
- \newcommand{\degre}{\char6}
+ \ifFBReduceListSpacing
+ \addto\extrasfrench{\let\list\listFB
+ \let\endlist\endlistFB}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \let\list\listFB
+ \let\endlist\endlistFB
+ \else
+ \let\list\listORI
+ \let\endlist\endlistORI
+ \fi}%
\else
- \newcommand{\degre}{\char23}
+ \addto\extrasfrench{\let\list\listORI
+ \let\endlist\endlistORI}%
+ \addto\noextrasfrench{\let\list\listORI
+ \let\endlist\endlistORI}%
\fi
- \newcommand{\at}{\char64}
- \newcommand{\circonflexe}{\char94}
- \newcommand{\tild}{\char126}
- \newcommand{\boi}{{$\backslash$}}
-\fi
% \end{macrocode}
%
-% \begin{macro}{\degres}
-% We now define a macro |\degres| for typesetting the abbreviation
-% for `degrees' (as in `degrees Celsius'). As the bounding box of
-% the character `degree' has \emph{very} different widths in CM/EC
-% and PostScript fonts, we fix the width of the bounding box of
-% |\degres| to 0.3\,em, this lets the symbol `degree' stick to the
-% preceding (e.g., |45\degres|) or following character
-% (e.g., |20~\degres C|).
-%
-% If the \TeX{} Companion fonts are available (\file{textcomp.sty}),
-% we pick up |\textdegree| from them instead of using emulating
-% `degrees' from the |\r{}| accent. Otherwise we overwrite the
-% (poor) definition of |\textdegree| given in \file{latin1.def},
-% \file{applemac.def} etc. (called by \file{inputenc.sty}) by
-% our definition of |\degres|. We also advice the user (once only)
-% to use TS1-encoding.
-%
-% \changes{frenchb-1.1}{1996/01/25}{Fixed width bounding box for
-% correct spacing with both CM, EC and PostScript fonts}
-%
-% \changes{frenchb-1.1}{1996/05/31}{Added \cs{leavevmode} in the
-% \cs{degres}'s definition}
-%
-% \changes{frenchb-1.6a}{2003/02/02}{Replace \cs{degres} by
-% \cs{textdegree} from textcomp.sty when possible (suggested
-% by Michel Bovani).}
-%
-% \changes{frenchb-1.6g}{2005/02/06}{Add \cs{hbox} in the definition
-% of \cs{degres} when textcomp.sty is loaded, so that \cs{degres}
-% can be used in math mode.}
+% |CompactItemize| suppresses the vertical spacing between list
+% items in French (done by changing |\itemize| to |\itemizeFB|).
+% When |GlobalLayoutFrench| is true the same is done outside French.
+% \begin{macrocode}
+ \ifFBCompactItemize
+ \addto\extrasfrench{\let\itemize\itemizeFB
+ \let\enditemize\enditemizeFB}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \let\itemize\itemizeFB
+ \let\enditemize\enditemizeFB
+ \else
+ \let\itemize\itemizeORI
+ \let\enditemize\enditemizeORI
+ \fi}%
+ \else
+ \addto\extrasfrench{\let\itemize\itemizeORI
+ \let\enditemize\enditemizeORI}%
+ \addto\noextrasfrench{\let\itemize\itemizeORI
+ \let\enditemize\enditemizeORI}%
+ \fi
+% \end{macrocode}
%
+% |StandardItemLabels| resets labelitems in French to their
+% standard values set by the \LaTeX{} class and packages loaded.
+% When |GlobalLayoutFrench| is true labelitems are identical inside
+% and outside French.
% \begin{macrocode}
-\ifLaTeXe
- \def\Warning@degree@TSone{%
- \PackageWarning{frenchb.ldf}{%
- Degrees would look better in TS1-encoding:
- \MessageBreak add \protect
- \usepackage{textcomp} to the preamble.
- \MessageBreak Degrees used}}
- \AtBeginDocument{\expandafter\ifx\csname M@TS1\endcsname\relax
- \DeclareRobustCommand*{\degres}{%
- \leavevmode\hbox to 0.3em{\hss\degre\hss}%
- \Warning@degree@TSone
- \global\let\Warning@degree@TSone\relax}%
- \let\textdegree\degres
- \else
- \DeclareRobustCommand*{\degres}{%
- \hbox{\UseTextSymbol{TS1}{\textdegree}}}%
- \fi}
-\else
- \DeclareRobustCommand*{\degres}{%
- \leavevmode\hbox to 0.3em{\hss\degre\hss}}
-\fi
+ \ifFBStandardItemLabels
+ \addto\extrasfrench{\bbl@nonfrenchlabelitems}%
+ \addto\noextrasfrench{\bbl@nonfrenchlabelitems}%
+ \else
+ \addto\extrasfrench{\bbl@frenchlabelitems}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \bbl@frenchlabelitems
+ \else
+ \bbl@nonfrenchlabelitems
+ \fi}%
+ \fi
% \end{macrocode}
-% \end{macro}
-%
-% \changes{frenchb-1.1}{1996/01/16}{Special care has to be taken
-% with Ml\TeX.}
-%
-% The following macros are used in the redefinition of |\^| and
-% |\"| to handle the letter~i: they allow users to type simply
-% |\^i| and |\"i| instead of |\^{\i}| and |\"{\i}|.\\
-% Ml\TeX{}'s macros dealing with accents conflict with those of
-% \LaTeXe{}, so we check whether |\csubinverse| is defined or not.
-% If |\csubinverse| is \emph{defined}, we are in Ml\TeX.
-%
-% \changes{frenchb-1.1}{1996/03/02}{Do this only in \LaTeXe.}
-%
-% \changes{frenchb-1.1}{1996/03/12}{Do not redefine \cs{\char94} and
-% \cs{"} in Ml\TeX, because it would break hyphenation. The correct
-% place to redefine \cs{\char94i} and \cs{"i} is in the format
-% itself, see MLTeX.cfg.}
%
+% |IndentFirst| forces the first paragraphs of sections to be
+% indented just like the other ones in French.
+% When |GlobalLayoutFrench| is true the same is done outside French.
% \begin{macrocode}
-\ifLaTeXe
- \AtBeginDocument{%
- \ifx\csubinverse\@undefined
- \DeclareTextCompositeCommand{\^}{OT1}{i}{\^\i}%
- \DeclareTextCompositeCommand{\"}{OT1}{i}{\"\i}%
- \fi}
-\fi
+ \ifFBIndentFirst
+ \addto\extrasfrench{\bbl@frenchindent}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \bbl@frenchindent
+ \else
+ \bbl@nonfrenchindent
+ \fi}%
+ \else
+ \addto\extrasfrench{\bbl@nonfrenchindent}%
+ \addto\noextrasfrench{\bbl@nonfrenchindent}%
+ \fi
% \end{macrocode}
%
-% \subsection{Date and clean up}
-%
-% \begin{macro}{\datefrench}
-% The macro |\datefrench| redefines the command |\today| to
-% produce French dates.
-%
-% \changes{frenchb-1.2}{1997/01/05}{Added aliases \cs{datefrenchb}
-% and \cs{datefrancais}. Use \cs{ier} instead of \cs{up}.}
-%
-% \changes{frenchb-1.3b}{1997/10/01}{Use \cs{edef} to define
-% \cs{today} to save memory}
-%
-% \changes{frenchb-1.3d}{1998/07/04}{Move this code to the end
-% of file, until \cs{ier} is defined (due to use of \cs{edef});
-% expansion of \cs{ier} has to be stopped anyway.}
-%
-% \changes{frenchb-1.3g}{1999/08/18}{Replaced \cs{edef} with \cs{def}
-% to prevent problems with unexpandable accent commands}
+% The layout of footnotes is handled at the |\begin{document}|
+% depending on the values of flags |FrenchFootnotes|
+% and |AutoSpaceFootnotes| (see section~\ref{sec-footnotes}),
+% nothing has to be done here for footnotes.
+%
+% When |true|, |ThinSpaceInFrenchNumbers| redefines |numprint.sty|'s
+% |\npstylefrench| command to set |\npthousandsep| to |\,|
+% (thinspace) instead of |~| (default) . This option has no effect
+% if package |numprint.sty| is not loaded with `|autolanguage|'.
+% As old versions of |numprint.sty| did not define |\npstylefrench|,
+% we have to provide this command.
+% \begin{macrocode}
+ \@ifpackageloaded{numprint}%
+ {\ifnprt@autolanguage
+ \providecommand*{\npstylefrench}{}%
+ \ifFBThinSpaceInFrenchNumbers
+ \renewcommand*\npstylefrench{%
+ \npthousandsep{\,}%
+ \npdecimalsign{,}%
+ \npproductsign{\cdot}%
+ \npunitseparator{\,}%
+ \npdegreeseparator{}%
+ \nppercentseparator{\nprt@unitsep}%
+ }%
+ \else
+ \renewcommand*\npstylefrench{%
+ \npthousandsep{~}%
+ \npdecimalsign{,}%
+ \npproductsign{\cdot}%
+ \npunitseparator{\,}%
+ \npdegreeseparator{}%
+ \nppercentseparator{\nprt@unitsep}%
+ }%
+ \fi
+ \npaddtolanguage{french}{french}%
+ \fi}{}%
+% \end{macrocode}
+%
+% |PartNameFull|: if |false|, redefine |\partname|.
+% \begin{macrocode}
+ \ifFBPartNameFull
+ \else\addto\captionsfrench{\def\partname{Partie}}\fi
+% \end{macrocode}
+%
+% |ShowOptions|: if |true|, print the list of all options to the
+% \file{.log} file.
+% \begin{macrocode}
+ \ifFBShowOptions
+ \GenericWarning{* }{%
+ * **** List of possible options for frenchb ****\MessageBreak
+ [Default values between brackets]\MessageBreak
+ ShowOptions=true [false]\MessageBreak
+ StandardLayout=true [false]\MessageBreak
+ GlobalLayoutFrench=true [false]\MessageBreak
+ AutoSpacePunctuation=false [true]\MessageBreak
+ ThinColonSpace=true [false]\MessageBreak
+ StandardLists=true [false]\MessageBreak
+ ReduceListSpacing=false [true]\MessageBreak
+ CompactItemize=false [true]\MessageBreak
+ StandardItemLabels=true [false]\MessageBreak
+ ItemLabels=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabeli=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabelii=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabeliii=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabeliv=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ IndentFirst=false [true]\MessageBreak
+ FrenchFootnotes=false [true]\MessageBreak
+ AutoSpaceFootnotes=false [true]\MessageBreak
+ ThinSpaceInFrenchNumbers=true [false]\MessageBreak
+ PartNameFull=false [true]\MessageBreak
+ og= <left quote character>, fg= <right quote character>
+ \MessageBreak
+ *********************************************
+ \MessageBreak\protect\frenchbsetup{ShowOptions}}
+ \fi
+}
+% \end{macrocode}
+%
+% At |\begin{document}| we save again the definitions of the `list'
+% and `itemize' environments and the values of labelitems so that
+% all changes made in the preamble are taken into account in
+% languages other than French and in French with the StandardLayout
+% option. We also have to provide an |\xspace| command in case the
+% |xspace.sty| package is not loaded.
+%
+% \changes{frenchb-2.0}{2006/12/15}{AtBeginDocument, save again the
+% definitions of the `list' and `itemize' environments and the
+% values of labelitems. As of frenchb v.1.6, `ORI' values were
+% set when reading frenchb.ldf, later changes were ignored.}
+%
+% \changes{frenchb-2.0}{2006/12/06}{Added warning for OT1 encoding.}
+%
+% \begin{macrocode}
+\AtBeginDocument{%
+ \let\listORI\list
+ \let\endlistORI\endlist
+ \let\itemizeORI\itemize
+ \let\enditemizeORI\enditemize
+ \let\@ltiORI\labelitemi
+ \let\@ltiiORI\labelitemii
+ \let\@ltiiiORI\labelitemiii
+ \let\@ltivORI\labelitemiv
+ \providecommand*{\xspace}{\relax}%
+% \end{macrocode}
+% It is time to process the options set with |\frenchboptions{}|.
+% Then execute either |\extrasfrench| and |\captionsfrench| or
+% |\noextrasfrench| according to the current language at the
+% |\begin{document}| (these three commands are updated by
+% |\FBprocess@options|).
+% \begin{macrocode}
+ \FBprocess@options
+ \iflanguage{french}{\extrasfrench\captionsfrench}{\noextrasfrench}%
+% \end{macrocode}
+% Some warnings are issued when output font encodings are not
+% properly set. With XeLaTeX, \file{fontspec.sty} and
+% \file{xunicode.sty} should be loaded; with (pdf)\LaTeX, a warning
+% is issued when OT1 encoding is in use at the |\begin{document}|.
+% Mind that |\encodingdefault| is defined as `long', defining
+% |\FBOTone| with |\newcommand*| would fail!
+% \begin{macrocode}
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \begingroup \newcommand{\FBOTone}{OT1}%
+ \ifx\encodingdefault\FBOTone
+ \PackageWarning{frenchb.ldf}%
+ {OT1 encoding should not be used for French.
+ \MessageBreak
+ Add \protect\usepackage[T1]{fontenc} to the
+ preamble\MessageBreak of your document,}
+ \fi
+ \endgroup
+ \else
+ \@ifundefined{DeclareUTFcharacter}%
+ {\PackageWarning{frenchb.ldf}%
+ {Add \protect\usepackage{fontspec} *and*\MessageBreak
+ \protect\usepackage{xunicode} to the preamble\MessageBreak
+ of your document,}}%
+ {}%
+ \fi
+}
+% \end{macrocode}
%
-% \changes{frenchb-1.4d}{2000/02/01}{Changed \cs{noexpand}\cs{ier}
-% to \cs{ier}, as a result of the replacement of \cs{edef} by
-% \cs{def}, see previous change. Also add braces around \cs{ier}
-% for xspace.sty.}
+% \subsection{Clean up and exit}
%
+% Load |frenchb.cfg| (should do nothing, just for compatibility).
% \begin{macrocode}
-\@namedef{date\CurrentOption}{%
- \def\today{\number\day
- \ifnum1=\day {\ier}\fi
- \space \ifcase\month
- \or janvier\or f\'evrier\or mars\or avril\or mai\or juin\or
- juillet\or ao\^ut\or septembre\or octobre\or novembre\or
- d\'ecembre\fi
- \space \number\year}}
+\loadlocalcfg{frenchb}
% \end{macrocode}
-% \end{macro}
-%
+% Final cleaning.
% The macro |\ldf@quit| takes care for setting the main language
% to be switched on at |\begin{document}| and resetting the
% category code of \texttt{@} to its original value.
% The config file searched for has to be `frenchb.cfg', and
% |\CurrentOption| has been set to `french', so
% |\ldf@finish\CurrentOption| cannot be used: we first load
-% `frenchb.cfg' (in LaTeX2e only), then call
-% |\ldf@quit\CurrentOption|.
-% The macro-space used by some control sequences we do not
-% need any longer, is freed.
-%
-% \changes{frenchb-1.1b}{1996/11/02}{Now use \cs{ldf@finish} to wrap
-% up.}
-%
-% \changes{frenchb-1.2}{1997/01/05}{The config file searched for is
-% `frenchb.cfg' regardless \cs{CurrentOption}.}
-%
-% \changes{frenchb-1.5d}{2001/02/16}{Load frenchb.cfg first and
-% change \cs{ldf@finish} to \cs{ldf@quit}.}
-%
-% \changes{frenchb-1.6g}{2005/02/06}{frenchb.cfg is now loaded only
-% with LaTeX2e, as the customization makes sense only in LaTeX2e.
-% Suggested by J.F. Burnol.}
-%
+% `frenchb.cfg', then call |\ldf@quit\CurrentOption|.
% \begin{macrocode}
-\ifLaTeXe
- \loadlocalcfg{frenchb}
-\fi
-\let\T@one\relax
-\let\@FI@\relax
-\let\ifLaTeX\@undefined
-\let\LaTeXtrue\@undefined
-\let\LaTeXfalse\@undefined
-\let\ifLaTeXe\@undefined
-\let\LaTeXetrue\@undefined
-\let\LaTeXefalse\@undefined
+\FBclean@on@exit
\ldf@quit\CurrentOption
-%</code>
% \end{macrocode}
-%
-% \Finale
+% \iffalse
+%</code>
+%<*dtx>
+% \fi
%%
%% \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
@@ -2477,4 +2127,9 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
+% \iffalse
+%</dtx>
+% \fi
+%
+% \Finale
\endinput
diff --git a/Master/texmf-dist/source/generic/babel/frenchb.ins b/Master/texmf-dist/source/generic/babel/frenchb.ins
index 8e5f7507769..2e8b09885f6 100644
--- a/Master/texmf-dist/source/generic/babel/frenchb.ins
+++ b/Master/texmf-dist/source/generic/babel/frenchb.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/galician.dtx b/Master/texmf-dist/source/generic/babel/galician.dtx
index 89b8c59e296..f531828fc92 100644
--- a/Master/texmf-dist/source/generic/babel/galician.dtx
+++ b/Master/texmf-dist/source/generic/babel/galician.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,161 +26,1276 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{263}
-% \iffalse
-% Tell the \LaTeX\ system who we are and write an entry on the
-% transcript.
-%<*dtx>
-\ProvidesFile{galician.dtx}
-%</dtx>
-%<code>\ProvidesLanguage{galician}
-%\fi
-%\ProvidesFile{galician.dtx}
- [2005/03/30 v1.2l Galician support from the babel system]
+% \CheckSum{2264}
+% \ProvidesFile{galician.dtx}
+% [2007/10/11 v4.3b Galician support from the babel system]
%\iffalse
%% File `galician.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
-%% Galician Language Definition File
-%% Copyright (C) 1989 - 2005
+%% Galcian Language Definition File
+%% Copyright (C) 1989 - 2006
%% by Manuel Carriba mcarriba at eunetcom.net
-%% Johannes Braams, TeXniek
+%% Johannes Braams, TeXniek
+%% Copyright (C) 2007 - 2008
+%% by Javier A. M\'ugica
+%% Johannes Braams, TeXniek
%
-%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% Please report errors to: Javier A. Mugica (preferably)
+%% jmugica at digi21.net
+%% J.L. Braams
+%% babel at braams.xs4all.nl
%
% This file is part of the babel system, it provides the source
% code for the Galician language definition file.
+% The original version of the file spanish.dtx was written by Javier Bezos.
%
-% The 'galician' style was originally adopted from the 'spanish'
-% style.
-%
-% All the macrocodes have been translated from the spanish language
-% into the galician language, using the spanish-galician
-% dictionary:
-%
-% X.L. Franco Grande
-% Diccionario Galego-Castelan e Vocabulario Castelan-Galego
-% Editorial Galaixa, Vigo 1968
-%
-% The hyphenation patterns for the galician language should be the
-% same as the spanish language. I've inspected some galician essays
-% and nothing strange seems to point out that both languages might
-% use different hyphenation patterns. This still has to been
-% proved. I will check it anyway, and hope to report more as soon
-% as possible.
-%
-% A small note to the months in the galician language:
-%
-% 'outono' will be used sometimes instead of 'outubro', but this
-% word will be used more to assign the season.
-%
-% 'nadal' will be used sometimes instead of 'decembro', but this
-% word will be used more for the event on Christmas.
-%
-% Manuel Carriba (mcarriba at eunetcom.net)
-%
-% The file spanish.sty was written by Julio Sanchez,
-% (jsanchez at gmv.es)
%<*filedriver>
-\documentclass{ltxdoc}
+\documentclass[galician,a4paper]{ltxdoc}
+\usepackage[activeacute]{babel}
+%Small suport for the input encoding
+\catcode`\á=\active \defá{\'a}
+\catcode`\é=\active \defé{\'e}
+\catcode`\í=\active \defí{\'\i}
+\catcode`\ó=\active \defó{\'o}
+\catcode`\ú=\active \defú{\'u}
+\catcode`\ñ=\active \defñ{\~n}
+%end
+
+%\usepackage{ps}
+
\newcommand*\TeXhax{\TeX hax}
\newcommand*\babel{\textsf{babel}}
\newcommand*\langvar{$\langle \it lang \rangle$}
\newcommand*\note[1]{}
\newcommand*\Lopt[1]{\textsf{#1}}
\newcommand*\file[1]{\texttt{#1}}
+
+\setlength{\arrayrulewidth}{2\arrayrulewidth}
+\newcommand\toprule{\cline{1-2}\\[-2ex]}
+\newcommand\botrule{\\[.6ex]\cline{1-2}}
+\newcommand\hmk{$\string|$}
+
+\newcommand\New[1]{%
+ \leavevmode\marginpar{\raggedleft\sffamily Novo en #1}}
+
+\newcommand\nm[1]{\unskip\,$^{#1}$}
+\newcommand\nt[1]{\quad$^{#1}$\,\ignorespaces}
+
+\makeatletter
+ \renewcommand\@biblabel{}
+\makeatother
+
+\newcommand\DOT[1]{\msc{DOT},~#1}
+\newcommand\DTL[1]{\msc{DTL},~#1}
+\newcommand\MEA[1]{\msc{MEA},~#1}
+
+\raggedright
+\addtolength{\oddsidemargin}{-2pc}
+\addtolength{\textwidth}{2pc}
+\setlength{\parindent}{1em}
+
+\OnlyDescription
\begin{document}
- \DocInput{galician.dtx}
+ \DocInput{galician.dtx}
\end{document}
%</filedriver>
%\fi
+%
+% \begingroup
+%
+% \catcode`\{=11
+% \catcode`\[=1
+%
+% \gdef\ignoringuser[^^A
+% \bgroup
+% \let\end{userdtx\fi
+% \let\end{userdrv\fi
+% \aftergroup\endgroup
+% \catcode`\{=11
+% \catcode`f=14 ^^A kills \if... and \fi
+% \catcode`l=14 ^^A kills \else
+% \catcode`o=14 ^^A kills \or
+% \catcode`p=14 ^^A kills \repeat
+% \iffalse}
+%
+% \endgroup
+%
+% ^^A\def\langdeffile{}
+% \newenvironment{userdtx}
+% {\ifx\langdeffile\undefined
+% \else\expandafter\ignoringuser
+% \fi}{}
+%
+% \newenvironment{userdrv}
+% {\ifx\langdeffile\undefined
+% \expandafter\ignoringuser
+% \else\fi}{}
+%
+% \begin{userdtx}
+%^^A ======= Beginning of text as typeset by galician.dtx =========
+%
+% \title{Estilo \textsf{galician} para o sistema \babel\\[10pt]
+% \large Versión 4.3, de 29 de xaneiro do 2007}
+%
+% \author{Javier Múgica\footnote{O autor orixinal foi Javier Bezos.
+% Foi traduciro por min do castelán en xaneiro do 2007, e desde
+% entón e mantido e actualizado por min.}}
+%
+% \date{} ^^A@#
+%
+% \maketitle
+%
+% {\small\tableofcontents}
+%
+%% \section{\textsf{galician} coma lingua principal}
+%
+% En \babel{} considérase que a última lingua citada en |\usepackage| e |\documentclass|,
+% por esta orde, é a lingua principal. Se a lingua principal é |galician|, actívase o grupo
+% |\layoutgalician| que adapta varios elementos ós usos tipogr'aficos galegos do seguinte modo:
+%
+% \begin{itemize}
+%
+% \item[$\diamond$] |enumerate| e |itemize|\vadjust{\nobreak}\\[1ex]
+%
+% O primeiro usa a seguinte secuencia:\vadjust{\nobreak}\\
+% \quad 1.\\
+% \qquad \emph{a})\\
+% \quad\qquad 1)\\
+% \qquad\qquad \emph{a$'$})\\
+% O segundo a seguinte:\\
+% \quad\leavevmode\hbox to 1.2ex
+% {\hss\vrule height .95ex width .8ex depth -.15ex\hss}\\
+% \qquad\textbullet\\
+% \quad\qquad $\circ$\\
+% \qquad\qquad $\diamond$
+%
+% Dúas órdenes permiten outros estilos en |itemize|: con |\galiciandashitems| cámbiase a raias en tódo-los niveis
+% e con |\galiciansignitems|, a \textbullet{} $\circ$
+% $\diamond$ $\triangleright$.
+%
+% \item[$\diamond$] |\alph| e |\Alph|\\[1ex]
+%
+% Inclúen o e'ne, pero non k, j, w nin y.
+%
+% \item[$\diamond$] |\fnsymbol|\\[1ex]
+%
+% Empréganse un, dous, tres... asteriscos (*, **, ***, etc.),
+% en lugar da sucesi'on angloamericana de cruces, barras,
+% etc.\footnote{\DOT{162}.}
+%
+% \item[$\diamond$] |\guillemotleft| e |\guillemotright|\\[1ex]
+%
+% As comiñas latinas para |OT1| son menos angulosas e xenéranse cunhas puntas de frecha |lasy|.
+%
+% \item[$\diamond$] |\roman|\\[1ex]
+%
+% Os números romanos en minúscula son propios das obras inglesas e non se empregan no continente.
+% Por iso se redefine |\roman| para que produza versalitas.
+%
+% \begin{quote}\small
+% \textbf{Nota.} MakeIndex non pode entender a forma na que
+% |\roman| escribe o n'umero de p'axina, polo que
+% elimina as liñas afectadas. Por iso o aquivo |.idx|
+% ten que ser convertido antes de ser procesado con MakeIndex.
+% Con este paquete proporciónase a utilidade |glromidx.tex| que se
+% encarga diso. Simplemente componse ese arquivo con \LaTeX{}
+% e a continuaci'on respóndese ás preguntas que se formulan.
+% Este proceso non é necesario se non se introduciu ningunha
+% entrada de 'indice en p'axinas numeradas con |\roman| (o que ser'a
+% o máis normal). Se un s'imbolo propio de \emph{MakeIndex} xenerara
+% problemas, debe encerrarse entre chaves: \verb={"|}=.
+% \end{quote}
+%
+% \item[$\diamond$] |\section|, |\subsection|, etc.\\[1ex]
+%
+% Os n'umeros nos t'itulos est'an seguidos dun punto tanto no texto coma
+% no 'indice. Adem'ais, o primeiro parágrafo tra-lo título non elimina a sangr'ia
+% (de novo, un costume angloamericano).
+%
+% \end{itemize}
+%
+% Estes cambios funcionan coas clases est'andar ~---con otras
+% tal vez algún deles non teña efecto--- e persisten durante
+% todo o documento (non se poden desactivar). Ningún deles é
+% necesario para compoñer o documento, aínda que naturalmente
+% o resultado ser'a distinto.
+%
+% \begin{itemize}
+%
+% \item[$\diamond$] |\selectgalician*|\vadjust{\nobreak}\\[1ex]
+%
+% Se non se desexan estes cambios, chega con usar no
+% pre'ambulo |\selectgalician*| (con asterisco) ou <<borralos>> con:
+%\begin{verbatim}
+% \let\layoutgalician\relax
+%\end{verbatim}
+%
+% \end{itemize}
+%
+% \section{Descripci'on}
+%
+% \subsection{Traduccións}
+%
+% Certas ordes defínense para proporcionar traduccións
+% ó galego dalgúns términos, tal e como se describe no cadro 1.
+%
+% \begin{table}
+% \center\small
+% \caption{Traduccións}
+% \vspace{1.5ex}
+% \begin{tabular}{l@{\hspace{3em}}l}
+% \toprule
+% |\refname| & Referencias\\
+% |\abstractname| & Resumo\\
+% |\bibname| & Bibliograf'ia\\
+% |\chaptername| & Cap'itulo\\
+% |\appendixname| & Ap'endice\\
+% |\contentsname| & 'Indice xeral\nm{a}\\
+% |\listfigurename| & 'Indice de figuras\\
+% |\listtablename| & 'Indice de cadros\\
+% |\indexname| & 'Indice alfab'etico\\
+% |\figurename| & Figura\\
+% |\tablename| & Cadro\\
+% |\partname| & Parte\\
+% |\enclname| & Adxunto\\
+% |\ccname| & Copia a\\
+% |\headtoname| & A\\
+% |\pagename| & P'axina\\
+% |\seename| & v'exase\\
+% |\alsoname| & v'exase tam'en\\
+% |\proofname| & Demostraci'on
+% \botrule
+% \end{tabular}
+%
+% \vspace{1.5ex}
+%
+% \begin{minipage}{6cm}\footnotesize
+% \nt{a} Pero s'olo <<'Indice>> en \textsf{article}.
+% \end{minipage}
+% \end{table}
+%
+% Non existe para o índice unha terminolox'ia unificada. Tal vez
+% \emph{'Indice xeral} é o que m'ais se usa, as'i que a
+% iso me ateño salvo en |article|, onde se compón coma secci'on
+% e polo tanto resulta algo ostentoso.\footnote{\'O contrario que en
+% ingl'es, en galego o 'indice por antonomasia é o xeral.}
+%
+% Para o 'indice alfab'etico tense proposto \emph{'Indice de materias}
+% ou \emph{'Indice anal'itico}, aínda que estes 'indices non soamente
+% adoitan incluír materias, mais tamén nomes; \emph{'Indice alfab'etico}
+% é m'ais preciso.\footnote{\'E a usada en \DOT{300} as'i coma na meirande
+% parte dos libros que consultei ó azar nunha biblioteca. (J.B.)}
+%
+% En canto ós de cadros e figuras, tam'en é posible dicir
+% \emph{lista}, pero paréceme preferible \emph{'indice}, que
+% implica a correspondencia coas p'axinas.
+%
+% \emph{Table} debe traducirse por \emph{cadro}, xa que \emph{táboa}
+% é un \emph{falso amigo};\,\footnote{V'exanse as definicións
+% do \msc{DGII} e \DTL{67 ss.}} esa é a pr'actica tradicional.
+% (Por exemplo, <<cadro de estados medievais>> frente a <<táboa de logaritmos>>.)
+%
+% As traducción escríbense con min'usculas, salvo a inicial. Evítase
+% o anglicismo de comenzar con mai'usculas os substantivos.\footnote{\DOT{197}.}
+%
+% A orde |\today| dá a data actual. Con |\galiciandatedo| e |\galiciandatede|
+% óptase por \textit{do} (predeterminado) ou \textit{de}.
+%
+% \subsection{Abreviacións}
+%
+% (O que en \babel{} denomínase `shorthands'.) A lista completa
+% pódese atopar no cadro~2. Nos seguintes apartados daranse máis
+% detalles sobre algunhas delas.
+%
+% \begin{table}[!t]
+% \center\small
+% \caption{Abreviacións}
+% \vspace{1.5ex}
+% \begin{tabular}{l@{\hspace{3em}}l}
+% \toprule
+% |'a 'e 'i 'o 'u| & 'a 'e 'i 'o 'u\\
+% |'A 'E 'I 'O 'U| & 'A 'E 'I 'O 'U\\
+% |'n 'N| & 'n 'N\nm{a}\\
+% |"u "U| & "u "U\\
+% |"i "I| & "i "I\\
+% |"a "A "o "O| & Ordinais: 1"a, 1"A, 1"o, 1"O\\
+% |"rr "RR| & rr, pero -r cando se divide\\
+% |"-| & Coma |\-|, pero permite m'ais divisións\\
+% |"=| & Coma |-|, pero permite máis divisións\nm{b}\\
+% |"~| & Gui'on estil'istico\nm{c}\\
+% |~- ~-- ~---| & Coma |-|, |--| e |---|, pero sen divisi'on\\
+% |""| & Permite máis divisións antes e despois\nm{d}\\
+% |"/| & Unha barra algo m'ais baixa\\
+% \verb+"|+ & Divide un logotipo\nm{e}\\
+% |<< >>| & << >>\\
+% |"< ">| & |\begin{quoting}| |\end{quoting}|\nm{f}\\
+% |?` !`| & ?` !`\nm{g}\\
+% |"? "!| & "? "! aliñados coa liña base\nm{h}
+% \botrule
+% \end{tabular}
+%
+% \vspace{1.5ex}
+%
+% \begin{minipage}{11cm}
+% \footnotesize
+% \nt{a} A forma |~n| debe considerarse en extinci'on.
+% \nt{b} |"=| ven a ser o mesmo que |""-""|.
+% \nt{c} Esta abreviaci'on ten un uso distinto noutras
+% linguas. \nt{d} Coma en <<entrada/saída>>.
+% \nt{e} Carece de uso en galego. \nt{f} V'exase sec.~2.7.
+% \nt{g} Non proporcionadas por este paquete, mais por cada tipo;
+% figuran aqu'i coma simple recordatorio. \nt{h} 'Utiles en
+% r'otulos en mai'usculas.
+% \end{minipage}
+% \end{table}
+%
+% Para poder usar ap'ostrofos coma abreviacións de acentos
+% é necesaria a opci'on |activeacute| en |\usepackage|.
+% Pode cambiarse este comportamento coa orde |\gl@acuteactive|
+% no arquivo de configuraci'on |galician.cfg|; nese caso os
+% ap'ostrofos actívanse sempre.
+%
+% Os caracteres usados coma abreviacións compórtanse coma
+% outras ordes de \TeX{} e polo tanto faise caso omiso
+% dos espacios que poidan seguir: \verb*|' a| é o mesmo que |'a|.
+% Eso tam'en implica que tras eses caracteres non pode vir unha
+% chave de peche e que deber'a escribirse |{... '{}}| en lugar
+% de |{... '}|; en modo matem'atico non hai problema e |$x^{a'}$|
+% ($x^{a'}$) é v'alido.
+%
+% \begin{itemize}
+%
+% \item[$\diamond$]
+% |\deactivatetilden|\\[1ex]
+%
+% Esta orde desactiva as abreviacións |~n| e |~N| debido ós problemas
+% que presentan. Pode usarse no arquivo de configuraci'on (v'exase
+% m'ais abaixo).
+%
+% % \item[$\diamond$]
+% |\galiciandeactivate{<caracteres>}|\\[1ex]
+%
+% Permite desactivar as abreviacións correspondentes ós caracteres dados.
+% Para evitar entrar en conflicto con outras linguas, ó sair de |galician|
+% reactívanse,\footnote{O punto para os decimais non é estrictamente
+% unha abreviaci'on e non se reactiva.} polo que se se desexa que
+% persista cómpre engadi-la orde a |\shorthandsgalician| con |\addto|.
+% A orde |\renewcommand\shorthandsgalician{}| é unha variante optimizada de
+%\begin{verbatim}
+% \addto\shorthandsgalician{\galiciandeactivate{.'"~<>}}
+%\end{verbatim}
+% e é o recomendado se se desea prescindir do mecanismo de abreviacións.
+% \end{itemize}
+%
+% \subsection{Coma decimal}
+%
+% En \textsf{galician} tómase partido, coma en castelán, por separar
+% a parte enteira e a parte decimal mediante unha coma. O punto é
+% tradicional en inglés, non en galego, e ademáis chegouse a unha
+% normalización internacional pola que os milleiros sepáranse por
+% un espacio fino e os decimais con coma.
+%
+% Dado que \TeX\ usa a coma coma separador en intervalos ou expresións
+% similares, o que engade un espacio fino, \textsf{galician} converte
+% todo punto en modo matem'atico nunha coma sempre que estea seguido
+% dunha cifra, pero non notras circunstancias:
+% \begin{quote}\small\begin{tabbing}
+% |$1\,234.567\,890$| \quad \= $1\,234.567\,890$\\
+% |$f(1,2)=12.34.$| \> $f(1,2)=12.34.$\\
+% |$1{.}000$| \> $1{.}000$, mais\\
+% |1.000| \> 1.000, pois non é modo matem'atico.
+% \end{tabbing}\end{quote}
+%
+% As ordes |\decimalcomma| e |\decimalpoint| establecen se se usa
+% unha coma, que é o valor predeterminado, ou un punto, mentras que
+% |\galiciandecimal{<math>}| permite darlle unha definici'on
+% arbitraria.\footnote{Internamente o mecanismo é o dunha abreviaci'on,
+% e pódese desactivar coma as outras.}
+%
+% \subsection{Divisi'on de palabras}
+%
+% \textsf{Galician} comproba a codificaci'on no momento no que se
+% emprega un acento: se a codificaci'on é |OT1| tómanse medidas para
+% facilitar a divisi'on, que pese a todo nunca ser'a perfecta, mentres
+% que con |T1| accédese directamente ó car'acter correspondente.
+%
+% Para matizar a divisi'on de palabras hai catro posibilidades, dúas
+% delas co m'etodo de abreviacións:
+% \begin{itemize}
+% \item a orde |\-| é un gui'on opcional que non permite m'ais
+% divisións (coma en \TeX),
+%
+% \item |"-| é similar pero permite m'ais divisións,
+%
+% \item un |-| é un gui'on que non permite m'ais divisións nin
+% antes nin despois (coma en \TeX), e
+%
+% \item |"=| é o equivalente que s'i as permite,\footnote{Non
+% é unha boa idea usar esta orde, pero en medidas moi curtas
+% puede resultar necesario.}
+%
+% \end{itemize}
+% Por exemplo (coas posibles divisións marcadas con \hmk):
+% \begin{quote}\small\begin{tabbing}
+% |Zaragoza-Barcelona|\qquad \= Zaragoza-\hmk Barcelona\\
+% |Zaragoza"=Barcelona| \>
+% Za\hmk ra\hmk go\hmk za-\hmk Bar\hmk ce\hmk lo\hmk na\\
+% |semi\-aperto| \> semi\hmk aperto\\
+% |semi"-aperto| \> se\hmk mi\hmk aper\hmk to.\footnotemark
+% \end{tabbing}\footnotetext{Xusto antes e despóis de
+% {\ttfamily\string"\string-} e {\ttfamily\string"\string=}
+% aplícanse os correspondentes valores de
+% {\ttfamily\string\...hyphenmin}, o que implica que a
+% divis'on semia\hmk perto non é posible.
+% Este é un comportamento correcto.}
+% \end{quote}
+%
+% Adem'ais hai abreviacións que evitan divisións: |~-|, que resulta
+% 'util para expresar unha serie de n'umeros sen que o gui'on os
+% divida (12~-14, |12~-14|), e |~---|, que é a forma que debe usarse
+% para abrir incisos con raias, xa que do contrario pode haber unha
+% divisi'on entre a raia de abrir e a palabra que lle sigue:
+% \begin{quote}\small\begin{tabbing}
+% |Os concertos ~---ou academias--- que organiz'ou...|
+% \end{tabbing}\end{quote}
+% Mentras que este gui'on evita toda posible divisi'on nos elementos
+% que une, a raia (---) e a semirraia (--) permítenas nas palabras
+% que a precedan ou sigan.
+%
+% A abreviaci'on |"~| úsase cando se quere que o gui'on tam'en apareza
+% ó comienzo da seguinte liña. Por exemplo:
+% \begin{quote}\small\begin{tabbing}
+% |infra"~vermello| \quad \= in\hmk fra-ver\hmk mello, pero infra-\hmk-vermello.
+% \end{tabbing}\end{quote}
+%
+% Outra abreviaci'on é |"rr| que sirve para o 'unico cambio de escritura do
+% castelán en caso de haber divisi'on.\footnote{En galego non atopei un
+% pronunciamento ó respecto. A \msc{RAE} indica que ó a'nadir un prefixo
+% que reamta en vocal a unha palabra que comenza con \emph{r}, esta 'ultima debe
+% dobrarse a menos que se unan por un gui'on. Por exemplo:
+% |extra"{}rradio| divídese en ex\hmk trarra\hmk dio, mais extra-\hmk radio.}
+%
+% \subsection{Ordinais}
+%
+% As abreviaturas sempre levan punto, salvo algunhas nas que se
+% substitúe por unha barra (e salvo as siglas e s'imbolos, naturalmente),
+% que precede ás letras voladitas.\footnote{\DTL{196}. V'exase tam'en \DOT{222 e 227}.}
+% Por ello, \textsf{galician} proporciona a orde |\sptext| que facilita a
+% creaci'on destas abreviaturas. Por exemplo: |adm\sptext{'on}|, que dá
+% adm\sptext{'on}. Hai catro abreviacións asociadas a ordinais:
+% |"a|, |"A|, |"o| e |"O| que equivalen a |\sptext{a}|, etc.\footnote{Moitos
+% tipos engaden un pequeno subliñado que debe evitarse, e polo tanto non se debe
+% escribi-los ordinais con \textsf{inputenc}.}
+%
+% Para axustar o tamano o mellor posible, úsase o de 'indices en curso.
+% Esto funciona ben salvo para tama'nos moi grandes ou moi pequenos, onde
+% os resultados son meramente aceptables.
+%
+% En Plain \TeX{} execútase a orde |\sptextfont| para a letra voladita,
+% de xeito que |{\bf\let\sptextfont\bf 1"o}| dá o resultado correcto
+% (|\mit| se é para cursiva). Para usar un tipo novo con |\sptext| hai
+% que definir tam'en as variantes matem'aticas con |\newfam|.
+%
+% \subsection{Funcións matem'aticas}
+%
+% En castelán, tradicionalmente formáronse as abreviacións
+% do que en \TeX\ coñecense coma operadores a partir do nome castelán,
+% o que implica a presencia do acento en l'im, m'ax, m'in, 'inf e m'od.
+% Parece que isto e tamén o máis adecuado para o galego.
+%
+% Con |galician| pódense seguir varios criterios por medio das seguintes
+% ordes:
+% \begin{itemize}
+% \item[$\diamond$] |\accentedoperators| |\unaccentedoperators|\\[1ex]
+% Activa ou desactiva os acentos.
+% Por omisi'on acent'uanse, coma por exemplo: $\lim_{x\to 0}(1/x)$
+% (|$\lim_{x\to 0}(1/x)$|).
+%
+% \item[$\diamond$] |\spacedoperators| |\unspacedoperators|\\[1ex]
+% Activa ou desactiva o espacio entre "<arc"> e la funci'on. Por omisi'on
+% non se espacia.
+% \end{itemize}
+%
+% O i sen punto tam'en é accesible directamente en modo matem'atico
+% coa orde |\dotlessi|, de forma que se pode escribir |\acute{\dotlessi}|.
+% Por exemplo,
+% |$V_{\mathbf{cr\acute{\dotlessi}t}}$| dá $V_{\mathbf{cr\acute{\dotlessi}t}}$.
+%
+% Tam'en engádense |\sen|, |\cosec|, |\arcsen|, |\tx|, |\arctx|, e |senh|,
+% que dan as funcións respectivas. Ademáis |\sin|,\New{galician~4.3}
+% |sinh| e |arcsin| producen os mesmos resultados que |\sen|, |\senh|
+% e |\arcsen| respectivamente. Outras funcións trigonom'etricas
+% atópanse almacenadas no par'ametro |\galicianoperators|,
+% que inicialmente inclúe cotx e txh. Deste xeito pódense cambiar por
+% outras e engadir máis, coma por exemplo:
+%\begin{verbatim}
+% \renewcommand{\galicianoperators}{cotan arc\,ctx tanh}
+%\end{verbatim}
+% (separadas con espacio). Cando se selecciona |galician| créanse
+% ordes con eses nomes e que dan esas funcións (sempre con |\nolimits|).
+% Adem'ais das letras sen acentuar acéptanse as ordes |\,| e |\acute|, que
+% se pasan por alto para forma-lo nome. Por exemplo, |arc\,ctg| escribirase
+% no documento coma |\arcctg|, |M\acute{a}x| coma |\Max| e |cr\acute{i}t|
+% coma |\crit| (hai que usar |i| e non |\dotlessi|). A orde |\,| responde
+% a |\|(|un|)|spacedoperators|, e |\acute| a |\|(|un|)|accentedoperators|.
+%
+% |\renewcommand{\galicianoperators}| haberá de estar no pre'ambulo do documento,
+% despois de |\sepackage[galician]{babel}| e antes de |\selectgalician| ou de
+% |\begin{document}|.
+%
+% \subsection{Entrecomiñados}
+%
+% O entorno |quoting| entrecomiña un texto, engadindo comiñas de seguir ó
+% comienzo de cada parágrafo ou no seu interior.\footnote{Pódese atopar unha
+% detallada exposici'on das comiñas en \DTL{44 ss.} De alí tomouse alg'un exemplo.}
+% Tam'en pódense empregrar as abreviacións |"<| e |">| que se limitan a chamar
+% a |quoting|, que por ser entorno considera os seus cambios internos coma locais.
+% (É dicir, |"< ... ">| implica |{"< ... ">}|.) As abreviacións |<<| e |>>|
+% contin'uan dando sen m'ais os caracteres de comiñas de abrir e pechar.
+%
+% Por exemplo:
+%\begin{verbatim}
+% "<Chámanse "<comiñas de seguir"> as que son de peche, pero colócanse
+% ó comenzo de cada parágrafo cando se transcribe un texto
+% entrecomiñado con m'ais dun par'agrafo.
+%
+% No seu interior, coma de costume, úsanse as inglesas.">
+%\end{verbatim}
+% que ten por resultad:
+% \begin{quotation}\small
+% "<Chámanse "<comillas de seguir"> as que son de peche, pero colócanse
+% ó comenzo de cada par'agrafo cando se transcribe un texto
+% entrecomiñado con m'ais dun par'agrafo.
+%
+% No seu interior, coma de costume, úsanse as inglesas.">
+% \end{quotation}
+%
+% Este entorno pódese redefinir. Por exemplo:
+%\begin{verbatim}
+% \renewenvironment{quoting}{\itshape}{}
+%\end{verbatim}
+% pero non implica un novo par'agrafo, xa que est'a pensado
+% para ser usado tam'en no texto.
+%
+% En caso de incluír uns entornos |quoting| dentro doutros, modifícanse
+% as comiñas dos niveis interiores, que tam'en engadense ás de seguir:
+%\begin{verbatim}
+% "<O di'alogo desenvolveuse desta forma:
+%
+% "<---Eu no fun ---grit'ou Antonio.
+%
+% ---Mais colaboraches ---asegur'ou Rafael">.
+%
+% Mais al'i ningúen se aclarou.">
+%\end{verbatim}
+%
+% \begin{quotation}\small
+% "<O di'alogo desenvolveuse desta forma:
+%
+% "<---Eu no fun ---grit'ou Antonio.
+%
+% ---Mais colaboraches ---asegur'ou Rafael">.
+%
+% Mais al'i ningúen se aclarou.">
+% \end{quotation}
+%
+% \begin{itemize}
+% \item[$\diamond$]
+% |\lquoti| |\rquoti| |\lquotii| |\rquotii| |\lquotiii|
+% |\rquotiii|\\[1ex]
+%
+% Controlan as comiñas en |quoting|, segundo o nivel no que nos
+% atopemos. |\lquoti| son as comiñas de abrir m'ais exteriores,
+% |\lquotii| as de segundo nivel, etc., e o mesmo para as de pechar
+% con |\rquoti|... Para as de seguir sempre se usan as de pechar.
+% Os valores predefinidos est'an no cadro 3.
+% \begin{table}
+% \center\small
+% \caption{Entrecomiñados}
+% \vspace{1.5ex}
+% \begin{tabular}{l@{\hspace{5em}}l}
+% \toprule
+% |\lquoti| &|<<|\\
+% |\rquoti| &|>>|\\
+% |\lquotii| &|``|\\
+% |\rquotii| &|''|\\
+% |\lquotiii| &|`|\\
+% |\rquotiii| &|'|
+% \botrule
+% \end{tabular}
+% \end{table}
+%
+% \newenvironment{dialog}
+% {\def\lquoti{}\begin{quoting}---\ignorespaces}
+% {\def\rquoti{}\end{quoting}}
+%
+% As comiñas de seguir tam'en empréganse en di'alogos, incluso
+% se non as hai de abrir e pechar. Coa axuda do seguinte entorno,
+%\begin{verbatim}
+% \newenvironment{dialog}
+% {\def\lquoti{}\begin{quoting}---\ignorespaces}
+% {\def\rquoti{}\end{quoting}}
+%\end{verbatim}
+% podemos obter
+% \begin{quotation}\small
+% \begin{dialog}%
+% O di'alogo desenvolveuse deste xeito:
+%
+% "<---Eu non fun ---grit'ou Antonio.
+%
+% ---Mais colaboraches ---asegur'ou Rafael">.
+%
+% Mais al'i ninguén se aclarou.
+% \end{dialog}
+% \end{quotation}
+%
+% \item[$\diamond$]
+% |\activatequoting \deactivatequoting|\\[1ex]
+%
+% As incompatibilidades potenciais destas abreviacións son enormes.
+% Por exemplo, en \textsf{ifthen} cancélanse as comparacións entre
+% n'umeros;\,\footnote{E en |\string\ifnum|, etc. usado polos
+% desenroladores nos paquetes.} tam'en resultan inoperantes |@>>>|
+% e |@<<<| de \textsf{amstex}.\footnote{Aínda que neste caso cabe
+% empregar os sin'onimos |@)))| e |@(((|.} Por iso, dase a posibilidade
+% de cancelalas e reactivalas con estas ordes, aínda que se se
+% est'a a usar con \textsf{xmltex} xa se desactivan por completo de
+% modo autom'atico. O entorno |quoting| sempre permanece disponible.
+% \footnote{Algúns tipos posúen as ligaduras |<{}<| e |>{}>| de
+% forma interna para xenerar os caracteres de comiñas, polo que
+% neles tamb'en podemos usalos siempre.}
+%
+% \end{itemize}
+%
+% \subsection{Espaciado}
+%
+% O espaciado en galego afástase relativamente pouco do ingl'es;
+% Non obstante, o espacio tra-los signos de puntuaci'on debe
+% de ser o mesmo que o que hai entre palabras. Ou dito en
+% t'erminos de \TeX, |\frenchspacing| est'a activo.
+%
+% Tam'en noutros dous sitios hai diferencias. O primero son os
+% puntos suspensivos, para os que se redefine |\dots| e |\cdots|,\New{galician 4.3}
+% que os dan menos espaciados, e para |\dots| no texto engádese a
+% continuación un espacio igual que o que seguiría a un punto.
+% Por exemplo:
+% \begin{quote}\small\begin{tabbing}
+% |\dots non sei se canta\dots ou chora.|\quad \dots non sei se canta\dots ou chora.\\
+% |$f(x_1,\dots,x_n,y_1,\ldots,y_m)$|\quad $f(x_1,\dots,x_n,y_1,\ldots,y_m)$\\
+% |$1+2+\cdots+n$|\quad $1+2+\cdots+n$
+% \end{tabbing}\end{quote}
+% Tam'en poder'ianse escribir os tres puntos sen m'ais... , e na
+% pr'actica non hai diferencia. |galician| realiza as modificacións
+% a moi baixo nivel, para que sexan compatibles cos cambios que tamén
+% introduce |amsmath| nestes comandos.
+%
+% O segundo sitio é un espacio fino antes do signo |\%| (que m'ais
+% exactamente é |\,|, logo pódese <<recuperar>> co seu oposto |\!|,
+% se |\%| no segue a unha cifra).
+%
+% \subsection{Pequenas e medianas versais}
+%
+% |\lsc| pódese empregar para letras en versalitas. Tamén existe
+% |\msc|,\New{galician 4.3} que selecciona un tipo lixeiramente maior.
+% Por exemplo:
+% \begin{quote}\small\begin{tabbing}
+% |\lsc{DOG}, \lsc{RenFe}| \quad \= No \lsc{DOG} publicouse que \lsc{ReNFe} deber'a...\\
+% |\msc{DOG}, \msc{ReNFe}| \quad \= No \msc{DOG} publicouse que \msc{ReNFe} deber'a...
+% \end{tabbing}\end{quote}
+% Tam'en pode ser 'util para alguns usos dos n'umeros romanos:
+% \begin{quote}\small\begin{tabbing}
+% |s'eculo \msc{XVII}| \quad \= s'eculo \msc{XVII}\\
+% |cap'itulo \msc{II}| \quad \= cap'itulo \msc{II}.
+% \end{tabbing}\end{quote}
+%
+% Para evitar que con un tipo que carece de versalitas acabe
+% aparecendo (por substituci'on) un texto de min'usculas inténtase
+% usar nestes casos as versais \emph{reais} dun tama'no menor.
+% Queda simplemente aceptable, pero é mellor que nada. (\LaTeX{}
+% tende a substituír versalitas por versalitas, pero hai
+% excepcións, como coas negritas.)
+%
+% \subsection{Miscel'anea}
+%
+% \begin{itemize}
+% \item[$\bullet$] Pódese escribir |\'i| para |\'{\i}|.
+%
+% \item[$\bullet$] Hai unha abreviaci'on adicional como utilidade
+% tipogr'afica m'ais que especificamente galega. En certos
+% tipos, coma Times, o extremo inferior da barra est'a na liña
+% de base e expresións coma <<am/pm>> resultan pouco est'eticas.
+% |"/| produce unha barra que, de ser necesario, báixase lexeiramente.
+% Computer Modern ten unha barra ben dese'nada e non é posible
+% ilustrar aqu'i este punto, pero en todo caso escribir'iase |am"/pm|.^^A
+% \footnote{En \MEA{141} recórrese a unha soluci'on que é a 'unica
+% sinxela en programas de maquetaci'on: usar un corpo menor. Pero
+% con \TeX{} é moito m'ais doado automatiza-las tareas.}
+%
+% \end{itemize}
+%
+% \section{Selecci'on da lingua}
+%
+% Por omisi'on, \babel{} deixa <<dormidas>> as linguas ata que se
+% chega a |\begin{document}| co fin de evitar conflictos polas
+% abreviacións; a cambio, prívase da posibilidade de usar as linguas
+% no pre'ambulo en ordes coma |\savebox|, |\title|, |\newtheorem|, etc.
+%
+% A orde |\selectgalician| permite activar |galician| coas súas
+% extensións e abreviacións antes de |\begin{document}|.\footnote{^^A
+% Algúns detalles, que apenas afectan a \texttt{galician}, seguen sen
+% activarse ata o comenzo do documento.}
+% Deste xeito, poder'iamos dicir
+%\begin{verbatim}
+% \documentclass{book}
+% \usepackage[T1]{fontenc}
+% \usepackage[galician]{babel}
+% \usepackage[latin1]{inputenc}
+% \usepackage[centerlast]{caption2}
+% ... % M'ais paquetes
+%
+% \selectgalician
+%
+% \title{T'itulo}
+% \author{Autor}
+% \newcommand{\pste}{para"-psicoloxicamente}
+% \newsavebox{\mybox}
+% \savebox{\mybox}{m'ais cosas}
+% ... % M'ais definicións
+%
+% \begin{document}
+%\end{verbatim}
+%
+% \section{Adaptaci'on}
+% \subsection{Configuraci'on}
+%
+% Nas súas 'ultimas versions, \babel{} proporciona a posibilidade
+% de cargar autom'aticamente un arquivo co mesmo nome que o
+% principal, pero con extensi'on |.cfg|. \textsf{Galician}
+% proporciona unhas poucas ordes para seren usadas neste arquivo:
+% \begin{itemize}
+% \item[$\diamond$] |\gl@activeacute|\\[1ex]
+% Activa as abreviacións con ap'ostrofos, sen que sexa
+% necesario incluír |activeacute| coma opci'on en |\usepackage|.
+%
+% \item[$\diamond$] |\gl@enumerate{<leveli>}|%
+% |{<levelii>}{<leveliii>}{<leveliv>}|\\[1ex]
+% Cambia os valores preestablecidos por |galician| para
+% |enumerate|. \textit{leveln} consiste nunha letra, que
+% indica qu'e formato ter'a o n'umero, seguida de cualquera
+% texto. A letra ten que ser: |1| (ar'abigo), |a|
+% (min'uscula \emph{cursiva}\,\footnote{A letra é cursiva
+% mais non os signos que a poidan seguir. M'ais ben debera
+% dicirse destacada, xa que se usa |\string\emph|. V'exase
+% \DTL{11}.}), |A| (versal), |i| (romano \emph{versalita},
+% con |\msc|), |I| (romano versal) ou finalmente |o| (ordinal\,
+% \footnote{O normal é non engadir ning'un signo tras ordinal.}).
+%
+% Esta orde non est'a pensada para facer cambios elaborados, se
+% non solamente para meros reaxustes. Os valores preestablecidos
+% equivalen a
+%\begin{verbatim}
+% \gl@enumerate{1.}{a)}{1)}{a$'$)}
+%\end{verbatim}
+%
+% \item[$\diamond$] |\gl@itemize{<leveli>}|%
+% |{<levelii>}{<leveliii>}{<leveliv>}|\\[1ex]
+% O mesmo para |itemize|, s'olo que os argumentos úsanse
+% de forma literal. Os valores orixinais de \LaTeX{} son
+% similares a
+%\begin{verbatim}
+% \gl@itemize{\textbullet}{\normalfont\bfseries\textendash}
+% {\textasteriskcentered}{\textperiodcentered}
+%\end{verbatim}
+%
+% \item[$\diamond$] |\gl@operators|\\[1ex]
+% Todo o relativo a operadores cancélase con
+%\begin{verbatim}
+% \let\gl@operators\relax
+%\end{verbatim}
+% É boa idea incluílo se no se van usar, xa que aforra memoria.
+%
+% \end{itemize}
+%
+% Outros axustes 'utiles neste contexto son |\galicianoperators|,
+% |\selectgalician| e |\deactivatequoting|.
+%
+%
+% Recordemos que tódo-los cambios operados dende este arquivo
+% restan compatibilidade ó documento, polo que se se distribúe
+% conven adxuntarlo co entorno |filecontents|.
+%
+% \subsection{Outros cambios}
+%
+% \begin{itemize}
+%
+% \item A orde |\addto| permite
+% cambiar algunha das convencións internas. Esto resulta
+% interesante coas traduccións, xa que as formas proporcionadas
+% poden non ser as desexadas. Para iso é necesario que
+% |galician| non estea seleccionado. Por exemplo, para cambiar
+% \emph{'Indice de figuras} por \emph{Lista de figuras}:
+%\begin{verbatim}
+% \addto\captionsgalician{%
+% \def\listfigurename{Lista de figuras}}
+%\end{verbatim}
+%
+% \item Para voltar elimina-la sangr'ia tra-la secci'on:
+%\begin{verbatim}
+% \def\@afterindentfalse{\let\if@afterindent\iffalse}
+% \@afterindentfalse
+%\end{verbatim}
+%
+% \item Para que |\roman| proporcione n'umeros romanos en
+% min'uscula, segundo a forma inglesa:
+%\begin{verbatim}
+% \def\@roman#1{\romannumeral #1};
+%\end{verbatim}
+% e para que emprege |\lsc| en troques de |\msc|:
+%\begin{verbatim}
+% \def\gl@roman##1{\protect\gl@lsc{\romannumeral##1}}
+%\end{verbatim}
+%
+% \item
+% Os extras atópanse organizados en varios grupos:
+% |\textgalician|, |\mathgalician|, |\shorthandsgalician|
+% e |\layoutgalician|. Poden cancelarse con:
+%\begin{verbatim}
+% \renewcommand\textgalician{}
+%\end{verbatim}
+%
+% \end{itemize}
+%
+% \section{Formatos distintos a \LaTeXe}
+%
+% O estilo |galician| funciona con outros formatos, aínda que con un
+% subconxunto das funcións disponibles en \LaTeXe{}. Con Plain hai
+% que facer
+%\begin{verbatim}
+% \input galician.sty
+%\end{verbatim}
+% e con \LaTeX2.09, incluir |galician| entre as opcións de estilo.
+%
+% Inclúense: traduccións, case todas as abreviacións, coma decimal,
+% utilidades para a divisi'on de palabras, ordinais nunha versi'on
+% simplificada (e non moi elegante), funcións matem'aticas,
+% entrecomiñados en \LaTeX2.09, espaciado e |\'i|.
+% A selecci'on da lingua é inmediata ó cargar o arquivo.
+%
+% En cambio non est'an disponibles: entrecomiñados en Plain,
+% |\lsc|, |\msc| nin as adaptacións proporcionadas por |\layoutgalician|.
+%
+% A partir desta versi'on, o arquivo de configuraci'on lese sempre,
+% polo que aqueles que xa estean escritos espec'ificamante para \LaTeXe{}
+% poden presentar problemas se se usan con outros formatos. Se as
+% versións que se usan non son moi antigas, pódese comprobar o formato
+% coa variable |\fmtname|, que vale |LaTeX2e| ou |plain|. Por exemplo,
+%\begin{verbatim}
+% \def\temp{LaTeX2e}
+% \ifx\temp\fmtname
+% ...
+% \fi
+%\end{verbatim}
+%
+% \section{Bibliograf'ias}
+%
+% O arquivo |glbst.tex| que se xenera con \textsf{galician}
+% serve para que a utilidade \textsf{custom-bib} traballe en
+% conxunci'on con \babel. Define unha serie de ordes, que poden
+% consultarse no propio arquivo, que se utilizan para as
+% traduccións se se selecciona |babel| coma lingua ó xenerar un
+% estilo bibliogr'afico.
+%
+% \section{Incompatibilidades con versións anteriores}
+%
+% ^^A\begin{itemize}
+%
+% O t'ermino correspondente a |\tablename| estaba traducido
+% incorrectamente coma <<Táboa>>. Coma queira que <<táboa>> é a
+% palabra con que pode aparecer no propio texto, ou ben pode
+% haber un artigo feminino ante |\tablename|, pode reponerse o
+% valor antigo con:
+%\begin{verbatim}
+% \addto\captionsgalician{%
+% \def\tablename{Táboa}%
+% \def\listtablename{\'Indice de táboas}}
+%\end{verbatim}
+%
+% ^^A\end{itemize}
+%
+% \section*{Referencias}
+% \addcontentsline{toc}{section}{Referencias}
+%
+% \begingroup
+% \small
+% \leftskip1.5cm \parindent-1.5cm
+%
+% \makebox[1.5cm][l]{\msc{DGII}}\textit{Diccionario de galego},
+% Ir Indo. Vigo, 2004.
+%
+% \makebox[1.5cm][l]{\msc{DOT}}Jos'e Mart'inez de Sousa,
+% \textit{Diccionario de ortograf'ia t'ecnica},
+% Germ'an S'anchez Ruip'erez/Pir'amide. Madrid, 1987.
+% (Biblioteca del libro.)
+%
+% \makebox[1.5cm][l]{\msc{DTL}}Jos'e Mart'inez de Sousa,
+% \textit{Diccionario de tipograf'ia y del libro},
+% Paraninfo. Madrid, 3"a ed., 1992.
+%
+% \makebox[1.5cm][l]{\msc{MEA}}Jos'e Mart'inez de Sousa,
+% \textit{Manual de edici'on y autoedici'on},
+% Pir'amide. Madrid 1994.
+%
+% \makebox[1.5cm][l]{\msc{OELG}}Xos'e Feix'o Cid,
+% \textit{Ortografía e estilo da lingua galega},
+% Pir'amide. Vigo, 2002.
+%
+% \leftskip0pt \parindent0pt \vspace{6pt}
+%
+% {\itshape
+% Como normalmente o primeiro contacto con \TeX{} é por unha tesis,
+% cito libros que est'an relacionados co tema ós que tiven acceso.
+% Est'an por orde de preferencia; en particular, os dous 'ultimos
+% parécenme pouco recomendables. (J. B.)}
+%
+% \parindent-1.5pc \leftskip1.5pc \vspace{3pt}
+%
+% Umberto Eco,
+% \textit{C'omo se hace una tesis}, Gedisa.
+% Barcelona 1982.
+%
+% Antonia Rigo Arnavat e Gabriel Genesc\`a Due'nas,
+% \textit{C'omo presentar una tesis y trabajos de investigaci'on},
+% Eumo-Octaedro. Barcelona, 2002.
+%
+% Prudenci Comes,
+% \textit{Gu'ia para la redacci'on y presentaci'on de trabajos
+% cient'ificos, informes t'ecnicos y tesinas},
+% Oikos-Tau. Barcelona, 1971.
+%
+% Javier Lasso de la Vega,
+% \textit{C'omo se hace una tesis doctoral},
+% Fundacion Universitaria Espa~nola. Madrid, 1977.
+%
+% Jos'e Romera Castillo e outros,
+% \textit{Manual de estilo},
+% Universidad Nacional de Educaci'on a Distancia. Madrid, 1996.
+%
+% Restituto Sierra Bravo,
+% \textit{Tesis doctorales y trabajos de investigaci'on cient'ifica},
+% Paraninfo. Madrid, 1986.
+%
+% \parindent0pc \leftskip0pc \vspace{6pt}
+%
+% {\itshape
+% Para outras cuestións tipogr'aficas, as referencias
+% usadas son, entre outras:}
+%
+% \parindent-1.5pc \leftskip1.5pc \vspace{3pt}
+%
+% Javier Bezos,
+% \textit{Tipograf'ia espa'nola con \TeX}, documento electr'onico
+% disponible en
+% \textsf{http://perso.wanadoo.es/jbezos/tipografia.html}.
+%
+% Ra'ul Cabanes Mart'inez,
+% <<El sistema internacional de unidades: ese desconocido>>,
+% \textit{Mundo Electr'onico}, n"o 142, p'axs.~119~-125. 1984.
+%
+% \textit{The Chicago Manual of Style}, University of Chicago
+% Press, 14"a~ed., esp.~p'axs.~333~-335. Chicago, 1993.
+%
+% Jos'e Fern'andez Castillo,
+% \textit{Normas para correctores y compositores tip'ografos},
+% Espasa-Calpe. Madrid, 1959.
+%
+% IRANOR [AENOR], Normas \msc{UNE} n'umeros 5010 (<<Signos
+% matem'aticos>>), 5028 (<<S'imbolos
+% geom'etricos>>) e 5029 (<<Impresi'on de los
+% s'imbolos de magnitudes y unidades y de los n'umeros>>).
+% [Obsoletas.]
+%
+% Real Academia Espa'nola,
+% \textit{Esbozo de una nueva gram'atica de la
+% lengua espa'nola}, Espasa-Calpe. Madrid, 1973.
+%
+% V.\ Mart'inez Sicluna,
+% \textit{Teor'ia y pr'actica de la tipograf'ia},
+% Gustavo Gili. Barcelona, 1945.
+%
+% Jos'e Mart'inez de Sousa,
+% \textit{Diccionario de ortograf'ia de la lengua espa'nola},
+% Paraninfo. Madrid, 1996.
+%
+% Juan Mart'inez Val, \textit{Tipograf'ia pr'actica},
+% Laberinto. Madrid, 2002.
+%
+% Juan Jos'e Morato, \textit{Gu'ia pr'actica del compositor
+% tipogr'afico}, Hernando, 2"a ed. Madrid, 1908 (1"a ed., 1900,
+% 3"a ed., 1933).
+%
+% Marion Neubauer,
+% <<Feinheiten bei wissenschaftlichen Publikationen>>,
+% \textit{Die \TeX nisches Kom\"odie}, parte I, vol. 8, n"o 4,
+% p'axs. 23-40. 1996; parte II, vol. 9, n"o 1, p'axs.~25~-44. 1997.
+%
+% Jos'e Polo,
+% \textit{Ortograf'ia y ciencia del lenguaje}, Paraninfo. Madrid, 1974.
+%
+% Pedro Valle,
+% \textit{C'omo corregir sin ofender}, Lumen. Buenos Aires, 1998.
+%
+% Hugh C. Wolfe, <<S'imbolos, unidades y nomenclatura>>,
+% \textit{Enciclopedia de F'isica}, t.~2, p'axs.~1423~-1451.
+% dir. Rita G. Lerner e George L. Trigg, Alianza. Madrid, 1987,
+%
+% \endgroup
+%
+% \end{userdtx}
+%
+% \begin{userdrv}
+%^^A ======= Beginning of text as typeset by user.drv =========
+%
% \GetFileInfo{galician.dtx}
%
-% \changes{galician-1.1}{1994/02/27}{Update for \LaTeXe}
-% \changes{galician-1.1c}{1994/06/26}{Removed the use of \cs{filedate}
-% and moved identification after the loading of \file{babel.def}}
-% \changes{galician-1.2e}{1996/10/10}{Replaced \cs{undefined} with
-% \cs{@undefined} and \cs{empty} with \cs{@empty} for consistency
-% with \LaTeX, moved the definition of \cs{atcatcode} right to the
-% beginning.}
-%
-% \section{The Galician language}
-%
-% The file \file{\filename}\footnote{The file described in this
-% section has version number \fileversion\ and was last revised on
-% \filedate.} defines all the language definition macros for the
-% Galician language.
-%
-% For this language the characters |'| |~| and |"| are made
-% active. In table~\ref{tab:galician-quote} an overview is given of
-% their purpose.
-% \begin{table}[htb]
-% \centering
-% \begin{tabular}{lp{8cm}}
-% \verb="|= & disable ligature at this position.\\
-% |"-| & an explicit hyphen sign, allowing hyphenation
-% in the rest of the word.\\
-% |\-| & like the old |\-|, but allowing hyphenation
-% in the rest of the word. \\
-% |'a| & an accent that allows hyphenation. Valid for all
-% vowels uppercase and lowercase.\\
-% |'n| & a n with a tilde. This is included to
-% improve compatibility with FTC. Works for uppercase too.\\
-% |"u| & a u with dieresis allowing hyphenation.\\
-% |"a| & feminine ordinal as in
-% 1{\raise1ex\hbox{\underbar{\scriptsize a}}}.\\
-% |"o| & masculine ordinal as in
-% 1{\raise1ex\hbox{\underbar{\scriptsize o}}}.\\
-% |~n| & a n with tilde. Works for uppercase too.
-% \end{tabular}
-% \caption{The extra definitions made by \texttt{galician.ldf}}
-% \label{tab:galician-quote}
-% \end{table}
-% These active accents character behave according to their original
-% definitions if not followed by one of the characters indicated in
-% that table.
-%
-% \StopEventually{}
+% \section{This file}
%
-% The macro |\LdfInit| takes care of preventing that this file is
-% loaded more than once, checking the category code of the
-% \texttt{@} sign, etc.
-% \changes{galician-1.2e}{1996/11/02}{Now use \cs{LdfInit} to perform
-% initial checks}
+% This file defines all the language-specific macros for the
+% Galician language. The file galician.dtx was translated in
+% January 2007 by Javier A. M\'ugica from spanish.dtx. It was
+% given the version number 4.3, based on the version for spanish.dtx
+% at those times, that was 4.2b. The original author from
+% v4.0 to 4.2b was Javier Bezos. Previous versions were written
+% by Julio S\'anchez.
+
+% I decided to make \emph{tabula rasa} of all |\changes|
+% logs. Only changes from spanish 4.2b to galician 4.3 and thereafter
+% are documented. The change history for the original spanish.dtx
+% can be found in that file.
+%
+% \section{The Galcian language}
+%
+% Custumization is made following mainly the books on the subject
+% by Jos\'e Mart\'\i nez de Sousa and Xos\'e Feix\'o Cid.
+% By typesetting |galician.dtx| directly you will get the full
+% documentation (regrettably is in Galician only, but it is
+% pretty long). References in this part refers to that document.
+% There are several aditional features documented in the Galician
+% version only.
+%
+% This style provides:
+% \begin{itemize}
+% \item Translations following the International \LaTeX{}
+% conventions, as well as |\today|.
+%
+% \item Shorthands listed in Table~\ref{tab:galician-quote-def}.
+% Examples in subsection~3.4 are illustrative. Note that
+% |"~| has a special meaning in \textsf{galician}
+% different to other languages, and is used mainly in linguistic
+% contexts.
+%
+% \begin{table}[htb]
+% \centering
+% \begin{tabular}{lp{8cm}}
+% |'a| & acute accented a. Also for: e, i, o, u (both
+% lowercase and uppercase).\\
+% |'n| & \~n (also uppercase).\\
+% |~n| & \~n (also uppercase). Deprecated.\\
+% |"u| & \"u (also uppercase).\\
+% |"i| & \"i (also uppercase).\\
+% |"a| & Ordinal numbers (also |"A|, |"o|, |"O|).\\
+% |"rr| & rr, but -r when hyphenated\\
+% |"-| & Like |\-|, but allowing hyphenation in the rest
+% the word.\\
+% |"=| & Like |-|, but allowing hyphenation in the rest
+% the word.\\
+% |"~| & The hyphen is repeated at the very beginning of
+% the next line if the word is hyphenated at this
+% point.\\
+% |""| & Like |"-| but producing no hyphen sign.\\
+% |~-| & Like |-| but with no break after the hyphen. Also for:
+% en-dashes (|~--|) and em-dashes (|~---|). \\
+% |"/| & A slash slightly lowered, if necessary.\\
+% \verb+"|+ & disable ligatures at this point.\\
+% |<<| & Left guillemets.\\
+% |>>| & Right guillemets.\\
+% |"<| & |\begin{quoting}|. (See text.)\\
+% |">| & |\end{quoting}|. (See text.)
+% \end{tabular}
+% \caption{Extra definitions made by file \file{galician.ldf}}
+% \label{tab:galician-quote-def}
+% \end{table}
+%
+% \item |\deactivatetilden| deactivates the |~n| and |~N| shorthands.
+%
+% \item \emph{In math mode} a dot followed by a digit is replaced
+% by a decimal comma.
+%
+% \item Galicians ordinals and abbeviations with |\sptext|
+% as, for instance, |1\sptext{o}|. The
+% preceptive dot is included.
+%
+% \item Accented functions: l\'\i m, m\'ax, m\'\i n, m\'od. You may
+% globally omit the accents with |\unaccentedoperators|. Spaced
+% functions: arc\,cos, etc. You may globally kill that space with
+% |\unspacedoperators|. |\dotlessi| is provided for use in math mode.
+%
+% \item A |quoting| environment and a related pair of shorthands |<<|
+% and |>>|. The command
+% |\deactivatequoting| deactivates these shorthand in case
+% you want to use |<| and |>| in some AMS commands and numerical
+% comparisons.
+%
+% \item The command |\selectgalician| selects the |galician| language
+% \emph{and} its shorthands. (Intended for the preamble.)
+%
+% \item |\frenchspacing| is used.
+%
+% \item |\dots| is redefined. It is now equal to typing tree points
+% in a row (it preserves the space following).
+%
+% \item There is a small space before |\%|.
+%
+% \item |\msc| provides lowercase small caps. (See subsection~3.10.)
+% \end{itemize}
+%
+% Just in case |galician| is the main language, the group
+% |\layoutgalician| is activated, which modifies the standard
+% classes through the whole document (it cannot be deactivated)
+% in the following way:
+% \begin{itemize}
+% \item Both |enumerate| and |itemize| are adapted to Galician rules.
+%
+% \item Both |\alph| and |\Alph| include \textit{\~n} after \textit{n}.
+%
+% \item Symbol footmarks are one, two, three, etc., asteriscs.
+%
+% \item |OT1| guillemets are generated with two |lasy| symbols instead
+% of small |\ll| and |\gg|.
+%
+% \item |\roman| is redefined to write small caps roman numerals, since
+% lowercase roman numerals are not allowed. However, \textit{MakeIndex}
+% rejects entries containing pages in that format. The |.idx| file must
+% be preprocessed if the document has this kind of entries with
+% the provided |romanidx.tex| tool---just \TeX{} it and follow the
+% instructions.
+%
+% \item There is a dot after section numbers in titles and toc.
+% \end{itemize}
+% This group is ignored if you write |\selectgalician*| in the
+% preamble.
+%
+% Some additional commands are provided to be used in the
+% |galician.cfg| file:
+% \begin{itemize}
+% \item With |\gl@activeacute| acute accents are always active,
+% overriding the default \textsf{babel} behaviour.
+%
+% \item |\gl@enumerate| sets the labels to be used by |enumerate|. The
+% same applies to |\gl@itemize| and |itemize|.
+%
+% \item |\gl@operators| stores the operator commands.
+% All of them are canceled with
+%\begin{verbatim}
+% \let\gl@operators\relax
+%\end{verbatim}
+% \end{itemize}
+% The commands |\deactivatequoting|, |\deactivatetilden| and
+% |\selectgalician| may be used in this file, too.
+%
+% A subset of these commands is provided for
+% use in Plain \TeX{} (with |\input galician.sty|).
+%
+% \end{userdrv}
+%
+%\StopEventually{}
+%
+%^^A ========== End of manual ===============
+%
+% \begin{userdtx}
+% \section{The Code}
+% \end{userdtx}
+%
+% \begin{userdrv}
+% \subsection{The Code}
+% \end{userdrv}
+%
+% \changes{galician~4.3}{07/01/22}{Reversed "<, "> and <<, >>.}
+% \changes{galician~4.3}{07/01/22}{Removed the Spanish et sign.}
+% \changes{galician~4.3}{07/01/26}{Removed the shorthand for \c{c}. It
+% existed in medieval galician-portuguese, but that does not seem a
+% reason to be included here.}
+%
+% This file provides definition for both \LaTeXe{} and non
+% \LaTeXe{} formats.
+%
+% Identify the |ldf| file.
+%
% \begin{macrocode}
%<*code>
-\LdfInit{galician}\captionsgalician
+\ProvidesLanguage{galician.ldf}
+ [2007/01/29 v4.3 Galician support from the babel system]
% \end{macrocode}
%
+% The macro |\LdfInit| takes care of preventing that this file is
+% loaded more than once, checking the category code of the
+% \texttt{@} sign, etc.
% When this file is read as an option, i.e. by the |\usepackage|
-% command, \texttt{galician} could be an `unknown' language in which
+% command, \texttt{galician} will be an `unknown' language in which
% case we have to make it known. So we check for the existence of
% |\l@galician| to see whether we have to do something here.
%
-% \changes{galician-1.1c}{1994/06/26}{Now use \cs{@nopatterns} to
-% produce the warning}
% \begin{macrocode}
-\ifx\l@galician\@undefined
+\LdfInit{galician}\captionsgalician
+\ifx\undefined\l@galician
\@nopatterns{Galician}
- \adddialect\l@galician0\fi
+ \adddialect\l@galician0
+\fi
+% \end{macrocode}
+%
+% We define some tools which will be used in that style file:
+% (1) we make sure that |~| is active, (2) |\gl@delayed| delays
+% the expansion of the code in conditionals (in fact, quite similar
+% to |\bbl@afterfi|).
+%
+% \begin{macrocode}
+\edef\gl@savedcatcodes{%
+ \catcode`\noexpand\~=\the\catcode`\~
+ \catcode`\noexpand\"=\the\catcode`\"}
+\catcode`\~=\active
+\catcode`\"=12
+\long\def\gl@delayed#1\then#2\else#3\fi{%
+ #1%
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#2}{#3}}
+% \end{macrocode}
+%
+% Two tests are introduced. The first one tells us if the format is
+% \LaTeXe{}, and the second one if the format is Plain or any other.
+% If both are false, the format is \LaTeX2.09{}.
+%
+% \begin{macrocode}
+\gl@delayed
+\expandafter\ifx\csname documentclass\endcsname\relax\then
+ \let\ifes@LaTeXe\iffalse
+\else
+ \let\ifes@LaTeXe\iftrue
+\fi
+\gl@delayed
+\expandafter\ifx\csname newenvironment\endcsname\relax\then
+ \let\ifes@plain\iftrue
+\else
+ \let\ifes@plain\iffalse
+\fi
% \end{macrocode}
%
-% The next step consists of defining commands to switch to (and
-% from) the Galician language.
+% Translations for captions.
%
-% \begin{macro}{\captionsgalician}
-% The macro |\captionsgalician| defines all strings used
-% in the four standard documentclasses provided with \LaTeX.
-% \changes{galician-1.1d}{1994/11/09}{Added a few missing
-% translations}
-% \changes{galician-1.2b}{1995/07/02}{Added \cs{proofname} for
-% AMS-\LaTeX}
-% \changes{galician-1.2j}{2000/09/20}{Added \cs{glossaryname}}
-% \changes{galician-1.2k}{2001/02/20}{Translated Proof}
-% \changes{galician-1.2l}{2003/05/23}{Translated Gloassary}
% \begin{macrocode}
\addto\captionsgalician{%
\def\prefacename{Prefacio}%
@@ -189,12 +1304,11 @@
\def\bibname{Bibliograf\'{\i}a}%
\def\chaptername{Cap\'{\i}tulo}%
\def\appendixname{Ap\'endice}%
- \def\contentsname{\'Indice Xeral}%
- \def\listfigurename{\'Indice de Figuras}%
- \def\listtablename{\'Indice de T\'aboas}%
- \def\indexname{\'Indice de Materias}%
+ \def\listfigurename{\'Indice de figuras}%
+ \def\listtablename{\'Indice de cadros}%
+ \def\indexname{\'Indice alfab\'etico}%
\def\figurename{Figura}%
- \def\tablename{T\'aboa}%
+ \def\tablename{Cadro}%
\def\partname{Parte}%
\def\enclname{Adxunto}%
\def\ccname{Copia a}%
@@ -203,260 +1317,1107 @@
\def\seename{v\'exase}%
\def\alsoname{v\'exase tam\'en}%
\def\proofname{Demostraci\'on}%
- \def\glossaryname{Glosario}%
-}
+ \def\glossaryname{Glosario}}
+
+\expandafter\ifx\csname chapter\endcsname\relax
+ \addto\captionsgalician{\def\contentsname{\'Indice}}
+\else
+ \addto\captionsgalician{\def\contentsname{\'Indice xeral}}
+\fi
% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\dategalician}
-% The macro |\dategalician| redefines the command |\today| to
-% produce Galician dates.
-% \changes{galician-1.1d}{1994/11/09}{Corrected the name of the month
-% marzo from marzal}
-% \changes{galician-1.2h}{1997/10/01}{Use \cs{edef} to define
-% \cs{today} to save memory}
-% \changes{galician-1.2h}{1998/03/28}{use \cs{def} instead of \cs{edef}}
+% And the date.
+% \changes{galician~4.3}{07/01/21}{Set the default to \textit{do}}
% \begin{macrocode}
\def\dategalician{%
- \def\today{\number\day~de\space\ifcase\month\or
- xaneiro\or febreiro\or marzo\or abril\or maio\or xu\~no\or
- xullo\or agosto\or setembro\or outubro\or novembro\or decembro\fi
- \space de~\number\year}}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\extrasgalician}
-% \changes{galician-1.2a}{1995/03/14}{Handling of active characters
-% completely rewritten}
-% \begin{macro}{\noextrasgalician}
-%
-% The macro |\extrasgalician| will perform all the extra
-% definitions needed for the Galician language. The macro
-% |\noextrasgalician| is used to cancel the actions of
-% |\extrasgalician|.
-%
-% For Galician, some characters are made active or are
-% redefined. In particular, the \texttt{"} character and the |~|
-% character receive new meanings this can also happen for the
-% \texttt{'} character when the option \Lopt{activeacute} is
-% specified.
-%
-% \changes{galician-1.2c}{1995/07/08}{Make active accent optional}
-% \changes{galician-1.2d}{1995/08/17}{Need to split up the
-% \cs{@ifpackagewith} statement}
-% \begin{macrocode}
-\addto\extrasgalician{\languageshorthands{galician}}
-\initiate@active@char{"}
-\initiate@active@char{~}
-\addto\extrasgalician{%
- \bbl@activate{"}\bbl@activate{~}}
-\@ifpackagewith{babel}{activeacute}{%
- \initiate@active@char{'}}{}
-\@ifpackagewith{babel}{activeacute}{%
- \addto\extrasgalician{\bbl@activate{'}}}{}
-% \end{macrocode}
-% Now make sure that the characters that have been turned into
-% shorthanfd characters expand to `normal' characters outside the
-% catalan environment.
-% \changes{galician-1.2i}{1999/12/16}{Don't forget do deactivate the
-% shorthands}
-% \begin{macrocode}
-\addto\noextrasgalician{%
- \bbl@deactivate{"}\bbl@deactivate{~}}
-\@ifpackagewith{babel}{activeacute}{%
- \addto\noextrascatalan{\bbl@deactivate{'}}}{}
-% \end{macrocode}
-%
-% \changes{galician-1.2a}{1995/03/14}{All the code for handling active
-% characters is now moved to \file{babel.def}}
-%
-% Apart from the active characters some other macros get a new
-% definition. Therefore we store the current one to be able to
-% restore them later.
-%
-% \changes{galician-1.2f}{1997/01/08}{Added some comment signs to
-% prevent unwanted spaces in the output}
-% \begin{macrocode}
-\addto\extrasgalician{%
- \babel@save\"\babel@save\~%
- \def\"{\protect\@umlaut}%
- \def\~{\protect\@tilde}}
-\@ifpackagewith{babel}{activeacute}{%
- \babel@save\'%
- \addto\extrasgalician{\def\'{\protect\@acute}}
- }{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% All the code above is necessary because we need a few extra
-% active characters. These characters are then used as indicated in
-% table~\ref{tab:galician-quote}.
-%
-% This option includes some support for working with extended,
-% 8-bit fonts, if available. This assumes that the user has some
-% macros predefined. For instance, if the user has a |\@ac@a| macro
-% defined, the sequence |\'a| or |'a| will both expand to whatever
-% |\@ac@a| is defined to expand, presumably \texttt{\'a}. The
-% names of these macros are the same as those in Ferguson's
-% ML-\TeX{} compatibility package on purpose. Using this method,
-% and provided that adequate hyphenation patterns exist, it is
-% possible to get better hyphenation for Galician than before. If
-% the user has a terminal able to produce these codes directly, it
-% is possible to do so. If the need arises to send the document to
-% someone who does not have such support, it is possible to
-% mechanically translate the document so that the receiver can make
-% use of it.
-%
-% To be able to define the function of the new accents, we first
-% define a couple of `support' macros.
-%
-% \begin{macro}{\dieresis}
-% \begin{macro}{\textacute}
-% \changes{galician-1.1c}{1994/06/26}{Renamed from \cs{acute} as that
-% is a \cs{mathaccent}}
-% \begin{macro}{\texttilde}
-% \changes{galician-1.1c}{1994/06/26}{Renamed from \cs{tilde} as that
-% is a \cs{mathaccent}}
-%
-% The original definition of |\"| is stored as |\dieresis|, because
-% the definition of |\"| might not be the default plain \TeX\
-% one. If the user uses \textsc{PostScript} fonts with the Adobe
-% font encoding the \texttt{"} character is not in the same
-% position as in Knuth's font encoding. In this case |\"| will not
-% be defined as |\accent"7F #1|, but as |\accent'310 #1|. Something
-% similar happens when using fonts that follow the Cork
-% encoding. For this reason we save the definition of |\"| and use
-% that in the definition of other macros. We do likewise for |\'|
-% and |\~|.
-% \begin{macrocode}
-\let\dieresis\"
-\let\texttilde\~
-\@ifpackagewith{babel}{activeacute}{\let\textacute\'}{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\@umlaut}
-% \begin{macro}{\@acute}
-% \begin{macro}{\@tilde}
-% If the user setup has extended fonts, the Ferguson macros are
-% required to be defined. We check for their existance and, if
-% defined, expand to whatever they are defined to. For instance,
-% |\'a| would check for the existance of a |\@ac@a| macro. It is
-% assumed to expand to the code of the accented letter. If it is
-% not defined, we assume that no extended codes are available and
-% expand to the original definition but enabling hyphenation beyond
-% the accent. This is as best as we can do. It is better if you
-% have extended fonts or ML-\TeX{} because the hyphenation
-% algorithm can work on the whole word. The following macros are
-% directly derived from ML-\TeX{}.\footnote{A problem is perceived
-% here with these macros when used in a multilingual environment
-% where extended hyphenation patterns are available for some but
-% not all languages. Assume that no extended patterns exist at some
-% site for French and that \file{french.sty} would adopt this
-% scheme too. In that case, \texttt{'e} in French would
-% produce the combined accented letter, but hyphenation around it
-% would be suppressed. Both language options would need an
-% independent method to know whether they have extended patterns
-% available. The precise impact of this problem and the possible
-% solutions are under study.}
-%
-% \begin{macrocode}
-\def\@umlaut#1{\allowhyphens\dieresis{#1}\allowhyphens}
-\def\@tilde#1{\allowhyphens\texttilde{#1}\allowhyphens}
-\@ifpackagewith{babel}{activeacute}{%
- \def\@acute#1{\allowhyphens\textacute{#1}\allowhyphens}}{}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% Now we can define our shorthands: the umlauts,
-% \begin{macrocode}
-\declare@shorthand{galician}{"-}{\nobreak-\bbl@allowhyphens}
-\declare@shorthand{galician}{"|}{\discretionary{-}{}{\kern.03em}}
-\declare@shorthand{galician}{"u}{\@umlaut{u}}
-\declare@shorthand{galician}{"U}{\@umlaut{U}}
-% \end{macrocode}
-% ordinals\footnote{The code for the ordinals was taken from the
-% answer provided by Raymond Chen
-% {\texttt(raymond@math.berkeley.edu}) to a question by Joseph Gil
-% (\texttt{yogi@cs.ubc.ca}) in \texttt{comp.text.tex}.},
-% \changes{galician-1.2f}{1997/01/08}{Added \cs{leavevmode} to
-% definitions of \texttt{"a} and \texttt{"o}}
-% \begin{macrocode}
-\declare@shorthand{galician}{"o}{%
- \leavevmode\raise1ex\hbox{\underbar{\scriptsize o}}}
-\declare@shorthand{galician}{"a}{%
- \leavevmode\raise1ex\hbox{\underbar{\scriptsize a}}}
-% \end{macrocode}
-% acute accents,
-% \changes{galician-1.2b}{1995/07/03}{Changed mathmode definition of
-% acute shorthands to expand to a single prime followed by the next
-% character in the input}
-% \begin{macrocode}
-\@ifpackagewith{babel}{activeacute}{%
- \declare@shorthand{galician}{'a}{\textormath{\@acute a}{^{\prime} a}}
- \declare@shorthand{galician}{'e}{\textormath{\@acute e}{^{\prime} e}}
- \declare@shorthand{galician}{'i}{\textormath{\@acute\i{}}{^{\prime}i}}
- \declare@shorthand{galician}{'o}{\textormath{\@acute o}{^{\prime} o}}
- \declare@shorthand{galician}{'u}{\textormath{\@acute u}{^{\prime} u}}
- \declare@shorthand{galician}{'A}{\textormath{\@acute A}{^{\prime} A}}
- \declare@shorthand{galician}{'E}{\textormath{\@acute E}{^{\prime} E}}
- \declare@shorthand{galician}{'I}{\textormath{\@acute I}{^{\prime} I}}
- \declare@shorthand{galician}{'O}{\textormath{\@acute O}{^{\prime} O}}
- \declare@shorthand{galician}{'U}{\textormath{\@acute U}{^{\prime} U}}
-% \end{macrocode}
-% tildes,
-% \begin{macrocode}
- \declare@shorthand{galician}{'n}{\textormath{\~n}{^{\prime} n}}
- \declare@shorthand{galician}{'N}{\textormath{\~N}{^{\prime} N}}
-% \end{macrocode}
-% the acute accent,
-% \changes{galician-1.2d}{1995/11/11}{Added '{}' as an axtra shorthand}
-% \begin{macrocode}
- \declare@shorthand{galician}{''}{%
- \textormath{\textquotedblright}{\sp\bgroup\prim@s'}}
- }{}
-\declare@shorthand{galician}{~n}{\textormath{\~n}{\@tilde n}}
-\declare@shorthand{galician}{~N}{\textormath{\~N}{\@tilde N}}
-% \end{macrocode}
-%
-% \begin{macro}{\-}
-%
-% All that is left now is the redefinition of |\-|. The new version
-% of |\-| should indicate an extra hyphenation position, while
-% allowing other hyphenation positions to be generated
-% automatically. The standard behaviour of \TeX\ in this respect is
-% unfortunate for Galician but not as much as for Dutch or German,
-% where long compound words are quite normal and all one needs is a
-% means to indicate an extra hyphenation position on top of the
-% ones that \TeX\ can generate from the hyphenation
-% patterns. However, the average length of words in Galician makes
-% this desirable and so it is kept here.
-%
-% \begin{macrocode}
-\addto\extrasgalician{%
- \babel@save{\-}%
- \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}}
-% \end{macrocode}
-% \end{macro}
-%
-% The macro |\ldf@finish| takes care of looking for a
-% configuration file, setting the main language to be switched on
-% at |\begin{document}| and resetting the category code of
-% \texttt{@} to its original value.
-% \changes{galician-1.2e}{1996/11/02}{Now use \cs{ldf@finish} to wrap
-% up}
-% \begin{macrocode}
-\ldf@finish{galician}
+ \def\today{\the\day~de \ifcase\month\or xaneiro\or febreiro\or
+ marzo\or abril\or maio\or xu\~no\or xullo\or agosto\or
+ setembro\or outubro\or novembro\or decembro\fi
+ \ \ifnum\year>1999\gl@yearl\else de\fi~\the\year}}
+\def\galiciandatedo{\def\gl@yearl{do}}
+\def\galiciandatede{\def\gl@yearl{de}}
+\galiciandatedo
+% \end{macrocode}
+%
+% The basic macros to select the language, in the preamble or the
+% config file. Use of |\selectlanguage| should be avoided at this
+% early stage because the active chars are not yet
+% active. |\selectgalician| makes them active.
+%
+% \begin{macrocode}
+\def\selectgalician{%
+ \def\selectgalician{%
+ \def\selectgalician{%
+ \PackageWarning{galician}{Extra \string\selectgalician ignored}}%
+ \gl@select}}
+
+\@onlypreamble\selectgalician
+
+\def\gl@select{%
+ \let\gl@select\@undefined
+ \selectlanguage{galician}%
+ \catcode`\"\active\catcode`\~=\active}
+% \end{macrocode}
+%
+% Instead of joining all the extras directly in |\extrasgalician|,
+% we subdivide them in three further groups.
+% \begin{macrocode}
+\def\extrasgalician{%
+ \textgalician
+ \mathgalician
+ \ifx\shorthandsgalician\@empty
+ \galiciandeactivate{."'~<>}%
+ \languageshorthands{none}%
+ \else
+ \shorthandsgalician
+ \fi}
+\def\noextrasgalician{%
+ \ifx\textgalician\@empty\else
+ \notextgalician
+ \fi
+ \ifx\mathgalician\@empty\else
+ \nomathgalician
+ \fi
+ \ifx\shorthandsgalician\@empty\else
+ \noshorthandsgalician
+ \fi
+ \gl@reviveshorthands}
+% \end{macrocode}
+%
+% And the first of these sub-groups is defined.
+%
+% \begin{macrocode}
+\addto\textgalician{%
+ \babel@save\sptext
+ \def\sptext{\protect\gl@sptext}}
+% \end{macrocode}
+%
+% The definition of |\sptext| is more elaborated than that of
+% |\textsuperscript|. With uppercase superscript text
+% the scriptscriptsize is used. The mandatory dot is already
+% included. There are two versions, depending on the
+% format.
+%
+% \begin{macrocode}
+\ifes@LaTeXe %<<<<<<
+ \newcommand\gl@sptext[1]{%
+ {.\setbox\z@\hbox{8}\dimen@\ht\z@
+ \csname S@\f@size\endcsname
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \fontsize\sf@size\z@
+ \selectfont
+ \advance\dimen@-1.15ex
+ \else
+ \fontsize\ssf@size\z@
+ \selectfont
+ \advance\dimen@-1.5ex
+ \fi
+ \math@fontsfalse\raise\dimen@\hbox{#1}}}
+\else %<<<<<<
+ \let\sptextfont\rm
+ \newcommand\gl@sptext[1]{%
+ {.\setbox\z@\hbox{8}\dimen@\ht\z@
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \advance\dimen@-0.75ex
+ \raise\dimen@\hbox{$\scriptstyle\sptextfont#1$}%
+ \else
+ \advance\dimen@-0.8ex
+ \raise\dimen@\hbox{$\scriptscriptstyle\sptextfont#1$}%
+ \fi}}
+\fi %<<<<<<
+% \end{macrocode}
+%
+% Now, lowercase small caps. First, we test if there are actual
+% small caps for the current font. If not, faked small caps are
+% used. \cs{msc} tries a slightly larger font.
+% Javier B. wrote: ``The \cs{selectfont} in \cs{gl@lsc} could
+% seem redundant, but it's not''. I cannot see how it can't be
+% redundant (it is the last thing executed by |\scshape|), but
+% I keep it.
+%
+% \changes{galician~4.3}{07/00/26}{Added \cs{msc}}
+% \begin{macrocode}
+\ifes@LaTeXe %<<<<<<
+ \addto\textgalician{%
+ \babel@save\lsc
+ \def\lsc{\protect\gl@lsc}
+ \babel@save\msc
+ \def\msc{\protect\gl@msc}}
+
+ \def\gl@@msc{\expandafter\@tempdima\f@size pt \divide\@tempdima by 200 \multiply\@tempdima by 219
+ \edef\f@size{\strip@pt\@tempdima}\selectfont}
+ \def\gl@msc{\let\gl@do@msc\gl@@msc\lsc}
+ \let\gl@do@msc\relax
+
+ \def\gl@lsc#1{%
+ \leavevmode
+ \hbox{\gl@do@msc\scshape\selectfont
+ \expandafter\ifx\csname\f@encoding/\f@family/\f@series
+ /n/\f@size\expandafter\endcsname
+ \csname\curr@fontshape/\f@size\endcsname
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size\z@\selectfont
+ \PackageInfo{galician}{Replacing undefined sc font\MessageBreak
+ shape by faked small caps}%
+ \MakeUppercase{#1}%
+ \else
+ \MakeLowercase{#1}%
+ \fi}\let\gl@do@msc\relax}
+\fi %<<<<<<
+% \end{macrocode}
+%
+% The |quoting| environment. This part is not available
+% in Plain, hence the test. Overriding the default |\everypar| is
+% a bit tricky.
+%
+% \begin{macrocode}
+\newif\ifgl@listquot
+
+\ifes@plain\else %<<<<<<
+ \csname newtoks\endcsname\gl@quottoks
+ \csname newcount\endcsname\gl@quotdepth
+
+ \ifx\quoting\c@undefined\def\next{\let\next\relax\newenvironment}
+ \else\def\next{\PackageInfo{galician}{Redefining quoting}\let\next\relax\renewenvironment}
+ \fi
+ \next{quoting}
+ {\leavevmode
+ \advance\gl@quotdepth1
+ \csname lquot\romannumeral\gl@quotdepth\endcsname%
+ \ifnum\gl@quotdepth=\@ne
+ \gl@listquotfalse
+ \let\gl@quotpar\everypar
+ \let\everypar\gl@quottoks
+ \everypar\expandafter{\the\gl@quotpar}%
+ \gl@quotpar{\the\everypar
+ \ifgl@listquot\global\gl@listquotfalse\else\gl@quotcont\fi}%
+ \fi
+ \toks@\expandafter{\gl@quotcont}%
+ \edef\gl@quotcont{\the\toks@
+ \expandafter\noexpand
+ \csname rquot\romannumeral\gl@quotdepth\endcsname}}
+ {\csname rquot\romannumeral\gl@quotdepth\endcsname}
+
+ \def\lquoti{\guillemotleft{}}
+ \def\rquoti{\guillemotright{}}
+ \def\lquotii{``}
+ \def\rquotii{''}
+ \def\lquotiii{`}
+ \def\rquotiii{'}
+
+ \let\gl@quotcont\@empty
+% \end{macrocode}
+%
+% If there is a margin par inside quoting, we don't add the
+% quotes. |\gl@listqout| stores the quotes to be used before
+% item labels; otherwise they could appear after the labels.
+%
+% \begin{macrocode}
+ \addto\@marginparreset{\let\gl@quotcont\@empty}
+
+ \def\gl@listquot{%
+ \csname rquot\romannumeral\gl@quotdepth\endcsname
+ \global\gl@listquottrue}
+\fi %<<<<<<
+% \end{macrocode}
+%
+% Now, the |\frenchspacing|, followed by |\...dots| and |\%|
+% Instead of redefining |\ldots| and |\cdots|, we redefine |\ldotp|
+% and |\cdotp|, so that this is compatible with amsmath.
+% In LaTeX we also redefine |\textellipsis|, and for plain or
+% other we redefine |\dots|.
+%
+% \changes{galician~4.3}{07/01/27}{\cs{...} is removed and instead
+% \cs{dots} and \cs{dots} are changed, by redefining \cs{ldotc},
+% \cs{dotc} and \cs{textellipsis} or \cs{dots}}
+% \begin{macrocode}
+\addto\textgalician{\bbl@frenchspacing}
+\addto\notextgalician{\bbl@nonfrenchspacing}
+
+\mathchardef\gl@cdot="0201
+\ifes@LaTeXe %<<<<<<
+\addto\textgalician{%
+ \babel@save\textellipsis
+ \babel@save\ldotp
+ \babel@save\cdotp%
+ \def\textellipsis{\hbox{...}\spacefactor\sfcode`.{} }%
+ \mathchardef\ldotp="013A%
+ \mathchardef\cdotp="0201%
+}
+\else %<<<<<<
+\addto\textgalician{%
+ \babel@save\dots
+ \babel@save\ldotp
+ \babel@save\cdotp
+ \mathchardef\ldotp="013A%
+ \mathchardef\cdotp="0201%
+ \def\dots{\ifmmode\ldots\else...\spacefactor\sfcode`.{} \fi}%
+}
+\fi %<<<<<<
+
+\ifes@LaTeXe %<<<<<<
+ \addto\textgalician{%
+ \let\percentsign\%%
+ \babel@save\%%
+ \def\%{\unskip\,\percentsign{}}}
+\else
+ \addto\textgalician{%
+ \let\percentsign\%%
+ \babel@save\%%
+ \def\%{\unskip\ifmmode\,\else$\m@th\,$\fi\percentsign{}}}
+\fi
+% \end{macrocode}
+%
+% We follow with the math group. It's not easy to add an accent
+% in an operator. The difficulty is that we must avoid using
+% text (that is, |\mbox|) because we have no control on font
+% and size, and at time we should access |\i|, which is a text
+% command forbidden in math mode. |\dotlessi| must be
+% converted to uppercase if necessary in \LaTeXe. There are
+% two versions, depending on the format.
+%
+% \begin{macrocode}
+\addto\mathgalician{%
+ \babel@save\dotlessi
+ \def\dotlessi{\protect\gl@dotlessi}}
+
+\let\nomathgalician\relax %% Unused, but called
+
+\ifes@LaTeXe %<<<<<<
+ \def\gl@texti{\i}
+ \addto\@uclclist{\dotlessi\gl@texti}
+\fi %<<<<<<
+
+\ifes@LaTeXe %<<<<<<
+ \def\gl@dotlessi{%
+ \ifmmode
+ {\ifnum\mathgroup=\m@ne
+ \imath
+ \else
+ \count@\escapechar \escapechar=\m@ne
+ \expandafter\expandafter\expandafter
+ \split@name\expandafter\string\the\textfont\mathgroup\@nil
+ \escapechar=\count@
+ \@ifundefined{\f@encoding\string\i}%
+ {\edef\f@encoding{\string?}}{}%
+ \expandafter\count@\the\csname\f@encoding\string\i\endcsname
+ \advance\count@"7000
+ \mathchar\count@
+ \fi}%
+ \else
+ \i
+ \fi}
+\else %<<<<<<
+ \def\gl@dotlessi{%
+ \ifmmode
+ \mathchar"7010
+ \else
+ \i
+ \fi}
+\fi %<<<<<<
+% \end{macrocode}
+%
+% The switches for accents and spaces in math.
+%
+% \changes{galician~4.3}{07/01/21}{Set the default to \cs{unspacedoperators}}
+% \begin{macrocode}
+\def\accentedoperators{%
+ \def\gl@op@ac##1{\acute{##1}}%
+ \def\gl@op@i{\acute{\dotlessi}}}
+\def\unaccentedoperators{%
+ \def\gl@op@ac##1{##1}%
+ \def\gl@op@i{i}}
+\accentedoperators
+
+\def\spacedoperators{\let\gl@op@sp\,}
+\def\unspacedoperators{\let\gl@op@sp\@empty}
+\unspacedoperators
+% \end{macrocode}
+%
+% The operators are stored in |\gl@operators|, which in turn is
+% included in the math group. Since |\operator@font| is
+% defined in \LaTeXe{} only, we need to define them in the plain variant.
+%
+% \changes{galician~4.3}{07/01/21}{\cs{sin}, \cs{arcsin} and \cs{sinh}
+% are set to produce the same as \cs{sen}, \cs{arcsen} and \cs{senh}}
+% \changes{galician~4.3}{07/01/27}{cosec and senh moved from
+% \cs{galicianoperators} to the main group}
+%
+% \begin{macrocode}
+\addto\mathgalician{%
+ \gl@operators}
+
+\ifes@LaTeXe\else %<<<<<<
+ \let\operator@font\rm
+ \def\@empty{}
+\fi %<<<<<<
+
+\def\gl@operators{%
+ \babel@save\lim \def\lim{\mathop{\operator@font l\protect\gl@op@i m}}%
+ \babel@save\limsup \def\limsup{\mathop{\operator@font l\gl@op@i m\,sup}}%
+ \babel@save\liminf \def\liminf{\mathop{\operator@font l\gl@op@i m\,inf}}%
+ \babel@save\max \def\max{\mathop{\operator@font m\gl@op@ac ax}}%
+ \babel@save\inf \def\inf{\mathop{\operator@font \protect\gl@op@i nf}}%
+ \babel@save\min \def\min{\mathop{\operator@font m\protect\gl@op@i n}}%
+ \babel@save\bmod
+ \def\bmod{%
+ \nonscript\mskip-\medmuskip\mkern5mu%
+ \mathbin{\operator@font m\gl@op@ac od}\penalty900\mkern5mu%
+ \nonscript\mskip-\medmuskip}%
+ \babel@save\pmod
+ \def\pmod##1{%
+ \allowbreak\mkern18mu({\operator@font m\gl@op@ac od}\,\,##1)}%
+ \def\gl@a##1 {%
+ \gl@delayed
+ \if^##1^\then % is it empty? do nothing and continue
+ \gl@a
+ \else
+ \gl@delayed
+ \if&##1\then % is it &? do nothing and finish
+ \else
+ \begingroup
+ \let\,\@empty % \, is ignored when def'ing the macro name
+ \let\acute\@firstofone % same
+ \edef\gl@b{\expandafter\noexpand\csname##1\endcsname}%
+ \def\,{\noexpand\gl@op@sp}%
+ \def\acute####1{%
+ \if i####1%
+ \noexpand\gl@op@i
+ \else
+ \noexpand\gl@op@ac####1%
+ \fi}%
+ \edef\gl@a{\endgroup
+ \noexpand\babel@save\expandafter\noexpand\gl@b
+ \def\expandafter\noexpand\gl@b{%
+ \mathop{\noexpand\operator@font##1}\nolimits}}%
+ \gl@a % It restores itself
+ \gl@a
+ \fi
+ \fi}%
+ \let\gl@b\galicianoperators
+ \addto\gl@b{ }%
+ \expandafter\gl@a\gl@b sen tx cosec arc\,sen arc\,cos arc\,tx senh & %\, will be set to \gl@op@sp
+ %
+ \babel@save\sin \let\sin\sen
+ \babel@save\arcsin \let\arcsin\arcsen
+ \babel@save\sinh \let\sinh\senh
+}
+
+\def\galicianoperators{cotx txh}
+% \end{macrocode}
+%
+% Now comes the text shorthands. They are grouped in
+% |\shorthandsgalician| and this style performs some
+% operations before the babel shortands are called.
+% The goals are to allow espression like |$a^{x'}$|
+% and to deactivate the shorthands making them of
+% category `other'. After providing a |\'i| shorthand,
+% the new macros are defined.
+%
+% \begin{macrocode}
+\DeclareTextCompositeCommand{\'}{OT1}{i}{\@tabacckludge'{\i}}
+
+\def\gl@set@shorthand#1{%
+ \expandafter\edef\csname gl@savecat\string#1\endcsname
+ {\the\catcode`#1}%
+ \initiate@active@char{#1}%
+ \catcode`#1=\csname gl@savecat\string#1\endcsname\relax
+ \expandafter\let\csname gl@math\string#1\expandafter\endcsname
+ \csname normal@char\string#1\endcsname}
+
+\def\gl@use@shorthand{%
+ \gl@delayed
+ \ifx\thepage\relax\then
+ \string
+ \else{%
+ \gl@delayed
+ \ifx\protect\@unexpandable@protect\then
+ \noexpand
+ \else
+ \gl@use@sh
+ \fi}%
+ \fi}
+
+\def\gl@text@sh#1{\csname active@char\string#1\endcsname}
+\def\gl@math@sh#1{\csname gl@math\string#1\endcsname}
+
+\def\gl@use@sh{%
+ \gl@delayed
+ \if@safe@actives\then
+ \string
+ \else{%
+ \gl@delayed
+ \ifmmode\then
+ \gl@math@sh
+ \else
+ \gl@text@sh
+ \fi}%
+ \fi}
+
+\gdef\gl@activate#1{%
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \def~{\gl@use@shorthand~}}}
+
+\def\galiciandeactivate#1{%
+ \@tfor\@tempa:=#1\do{\expandafter\gl@spdeactivate\@tempa}}
+
+\def\gl@spdeactivate#1{%
+ \if.#1%
+ \mathcode`\.=\gl@period@code
+ \else
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \expandafter\let\expandafter~%
+ \csname normal@char\string#1\endcsname}%
+ \catcode`#1\csname gl@savecat\string#1\endcsname\relax
+ \fi}
+
+\def\gl@reviveshorthands{%
+ \gl@restore{"}\gl@restore{~}%
+ \gl@restore{<}\gl@restore{>}%
+ \gl@quoting}
+
+\def\gl@restore#1{%
+ \catcode`#1=\active
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \bbl@deactivate{~}}}
+% \end{macrocode}
+%
+% But \textsf{galician} allows two category codes for |'|,
+% so both should be taken into account in \cs{bbl@pr@m@s}.
+%
+% \begin{macrocode}
+\begingroup
+\catcode`\'=12
+\lccode`~=`' \lccode`'=`'
+\lowercase{%
+\gdef\bbl@pr@m@s{%
+ \gl@delayed
+ \ifx~\@let@token\then
+ \pr@@@s
+ \else
+ {\gl@delayed
+ \ifx'\@let@token\then
+ \pr@@@s
+ \else
+ {\gl@delayed
+ \ifx^\@let@token\then
+ \pr@@@t
+ \else
+ \egroup
+ \fi}%
+ \fi}%
+ \fi}}
+\endgroup
+% \end{macrocode}
+%
+% \begin{macrocode}
+\expandafter\ifx\csname @tabacckludge\endcsname\relax
+ \let\gl@tak\a
+\else
+ \let\gl@tak\@tabacckludge
+\fi
+
+\ifes@LaTeXe %<<<<<<
+ \def\@tabacckludge#1{\expandafter\gl@tak\string#1}
+ \let\a\@tabacckludge
+\else\ifes@plain %<<<<<<
+ \def\@tabacckludge#1{\csname\string#1\endcsname}
+\else %<<<<<<
+ \def\@tabacckludge#1{\csname a\string#1\endcsname}
+\fi\fi %<<<<<<
+
+\expandafter\ifx\csname add@accent\endcsname\relax
+ \def\add@accent#1#2{\accent#1 #2}
+\fi
+% \end{macrocode}
+%
+% Instead of redefining |\'|, we redefine the internal macro for the OT1 encoding.
+% \begin{macrocode}
+\ifes@LaTeXe %<<<<<<
+ \def\gl@accent#1#2#3{%
+ \expandafter\@text@composite
+ \csname OT1\string#1\endcsname#3\@empty\@text@composite
+ {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \setbox\@tempboxa\hbox{#3%
+ \global\mathchardef\accent@spacefactor\spacefactor}%
+ \spacefactor\accent@spacefactor}}
+\else %<<<<<<
+ \def\gl@accent#1#2#3{%
+ \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \spacefactor\sfcode`#3 }
+\fi %<<<<<<
+% \end{macrocode}
+%
+% The shorthands are activated in the aux file. Now, we begin
+% the shorthands group.
+%
+% \begin{macrocode}
+\addto\shorthandsgalician{\languageshorthands{galician}}
+\let\noshorthandsgalician\relax
+% \end{macrocode}
+%
+% First, decimal comma.
+%
+% \begin{macrocode}
+\def\galiciandecimal#1{\def\gl@decimal{{#1}}}
+\def\decimalcomma{\galiciandecimal{,}}
+\def\decimalpoint{\galiciandecimal{.}}
+\decimalcomma
+
+\gl@set@shorthand{.}
+
+\@namedef{gl@math\string.}{%
+ \@ifnextchar\egroup
+ {\mathchar\gl@period@code\relax}%
+ {\gl@text@sh.}}
+
+\declare@shorthand{system}{.}{\mathchar\gl@period@code\relax}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\addto\shorthandsgalician{%
+ \mathchardef\gl@period@code\the\mathcode`\.%
+ \babel@savevariable{\mathcode`\.}%
+ \mathcode`\.="8000 %
+ \gl@activate{.}}
+
+\AtBeginDocument{%
+ \catcode`\.=12
+ \if@filesw
+ \immediate\write\@mainaux{%
+ \string\catcode`\string\.=12}%
+ \fi}
+
+\declare@shorthand{galician}{.1}{\gl@decimal1}
+\declare@shorthand{galician}{.2}{\gl@decimal2}
+\declare@shorthand{galician}{.3}{\gl@decimal3}
+\declare@shorthand{galician}{.4}{\gl@decimal4}
+\declare@shorthand{galician}{.5}{\gl@decimal5}
+\declare@shorthand{galician}{.6}{\gl@decimal6}
+\declare@shorthand{galician}{.7}{\gl@decimal7}
+\declare@shorthand{galician}{.8}{\gl@decimal8}
+\declare@shorthand{galician}{.9}{\gl@decimal9}
+\declare@shorthand{galician}{.0}{\gl@decimal0}
+% \end{macrocode}
+%
+% Now accents and tools
+%
+% \begin{macrocode}
+\gl@set@shorthand{"}
+\def\gl@umlaut#1{%
+ \bbl@allowhyphens\add@accent{127}#1\bbl@allowhyphens
+ \spacefactor\sfcode`#1 }
+% \end{macrocode}
+%
+% We override the default |"| of babel, intended for german.
+%
+% \begin{macrocode}
+\ifes@LaTeXe %<<<<<<
+ \addto\shorthandsgalician{%
+ \gl@activate{"}%
+ \gl@activate{~}%
+ \babel@save\bbl@umlauta
+ \let\bbl@umlauta\gl@umlaut
+ \expandafter\babel@save\csname OT1\string\~\endcsname
+ \expandafter\def\csname OT1\string\~\endcsname{\gl@accent\~{126}}%
+ \expandafter\babel@save\csname OT1\string\'\endcsname
+ \expandafter\def\csname OT1\string\'\endcsname{\gl@accent\'{19}}}
+\else %<<<<<<
+ \addto\shorthandsgalician{%
+ \gl@activate{"}%
+ \gl@activate{~}%
+ \babel@save\bbl@umlauta
+ \let\bbl@umlauta\gl@umlaut
+ \babel@save\~%
+ \def\~{\gl@accent\~{126}}%
+ \babel@save\'%
+ \def\'#1{\if#1i\gl@accent\'{19}\i\else\gl@accent\'{19}{#1}\fi}}
+\fi %<<<<<<
+% \end{macrocode}
+% \changes{galician~4.3}{07/01/22}{Removed the shorthands "er and "ER,
+% they don't exist in galician.}
+% \begin{macrocode}
+\declare@shorthand{galician}{"a}{\protect\gl@sptext{a}}
+\declare@shorthand{galician}{"A}{\protect\gl@sptext{A}}
+\declare@shorthand{galician}{"o}{\protect\gl@sptext{o}}
+\declare@shorthand{galician}{"O}{\protect\gl@sptext{O}}
+
+\declare@shorthand{galician}{"u}{\"u}
+\declare@shorthand{galician}{"U}{\"U}
+\declare@shorthand{galician}{"i}{\"i}
+\declare@shorthand{galician}{"I}{\"I}
+
+\declare@shorthand{galician}{"<}{\begin{quoting}}
+\declare@shorthand{galician}{">}{\end{quoting}}
+\declare@shorthand{galician}{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
+\declare@shorthand{galician}{"=}%
+ {\bbl@allowhyphens\char\hyphenchar\font\hskip\z@skip}
+\declare@shorthand{galician}{"~}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {\char\hyphenchar\font}{\char\hyphenchar\font}\bbl@allowhyphens}
+\declare@shorthand{galician}{"r}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {}{r}\bbl@allowhyphens}
+\declare@shorthand{galician}{"R}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {}{R}\bbl@allowhyphens}
+\declare@shorthand{galician}{""}{\hskip\z@skip}
+\declare@shorthand{galician}{"/}
+ {\setbox\z@\hbox{/}%
+ \dimen@\ht\z@
+ \advance\dimen@-1ex
+ \advance\dimen@\dp\z@
+ \dimen@.31\dimen@
+ \advance\dimen@-\dp\z@
+ \ifdim\dimen@>0pt
+ \kern.01em\lower\dimen@\box\z@\kern.03em
+ \else
+ \box\z@
+ \fi}
+\declare@shorthand{galician}{"?}
+ {\setbox\z@\hbox{?`}%
+ \leavevmode\raise\dp\z@\box\z@}
+\declare@shorthand{galician}{"!}
+ {\setbox\z@\hbox{!`}%
+ \leavevmode\raise\dp\z@\box\z@}
+
+\gl@set@shorthand{~}
+\declare@shorthand{galician}{~n}{\~n}
+\declare@shorthand{galician}{~N}{\~N}
+\declare@shorthand{galician}{~-}{%
+ \leavevmode
+ \bgroup
+ \let\@sptoken\gl@dashes % This assignation changes the
+ \@ifnextchar-% \@ifnextchar behaviour
+ {\gl@dashes}%
+ {\hbox{\char\hyphenchar\font}\egroup}}
+\def\gl@dashes-{%
+ \@ifnextchar-%
+ {\bbl@allowhyphens\hbox{---}\bbl@allowhyphens\egroup\@gobble}%
+ {\bbl@allowhyphens\hbox{--}\bbl@allowhyphens\egroup}}
+
+\def\deactivatetilden{%
+ \expandafter\let\csname galician@sh@\string~@n@\endcsname\relax
+ \expandafter\let\csname galician@sh@\string~@N@\endcsname\relax}
+% \end{macrocode}
+%
+% The shorthands for |quoting|.
+%
+% \begin{macrocode}
+\expandafter\ifx\csname XML@catcodes\endcsname\relax
+ \addto\gl@select{%
+ \catcode`\<\active\catcode`\>=\active
+ \gl@quoting}
+
+ \gl@set@shorthand{<}
+ \gl@set@shorthand{>}
+
+ \declare@shorthand{system}{<}{\csname normal@char\string<\endcsname}
+ \declare@shorthand{system}{>}{\csname normal@char\string>\endcsname}
+
+ \addto\shorthandsgalician{%
+ \gl@activate{<}%
+ \gl@activate{>}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \ifes@LaTeXe %<<<<<<
+ \AtBeginDocument{%
+ \gl@quoting
+ \if@filesw
+ \immediate\write\@mainaux{\string\gl@quoting}%
+ \fi}%
+ \fi %<<<<<<
+
+ \def\activatequoting{%
+ \catcode`>=\active \catcode`<=\active
+ \let\gl@quoting\activatequoting}
+ \def\deactivatequoting{%
+ \catcode`>=12 \catcode`<=12
+ \let\gl@quoting\deactivatequoting}
+
+ \declare@shorthand{galician}{<<}{\guillemotleft{}}
+ \declare@shorthand{galician}{>>}{\guillemotright{}}
+\fi
+
+\let\gl@quoting\relax
+\let\deactivatequoting\relax
+\let\activatequoting\relax
+% \end{macrocode}
+%
+% The acute accents are stored in a macro. If |activeacute| was set
+% as an option it's executed. If not is not deleted for a possible
+% later use in the |cfg| file. In non \LaTeXe{} formats is always
+% executed.
+%
+% \begin{macrocode}
+\def\gl@activeacute{%
+ \gl@set@shorthand{'}%
+ \addto\shorthandsgalician{\gl@activate{'}}%
+ \addto\gl@reviveshorthands{\gl@restore{'}}%
+ \addto\gl@select{\catcode`'=\active}%
+ \declare@shorthand{galician}{'a}{\@tabacckludge'a}%
+ \declare@shorthand{galician}{'A}{\@tabacckludge'A}%
+ \declare@shorthand{galician}{'e}{\@tabacckludge'e}%
+ \declare@shorthand{galician}{'E}{\@tabacckludge'E}%
+ \declare@shorthand{galician}{'i}{\@tabacckludge'i}%
+ \declare@shorthand{galician}{'I}{\@tabacckludge'I}%
+ \declare@shorthand{galician}{'o}{\@tabacckludge'o}%
+ \declare@shorthand{galician}{'O}{\@tabacckludge'O}%
+ \declare@shorthand{galician}{'u}{\@tabacckludge'u}%
+ \declare@shorthand{galician}{'U}{\@tabacckludge'U}%
+ \declare@shorthand{galician}{'n}{\~n}%
+ \declare@shorthand{galician}{'N}{\~N}%
+ \declare@shorthand{galician}{''}{\textquotedblright}%
+ \let\gl@activeacute\relax}
+
+\ifes@LaTeXe %<<<<<<
+ \@ifpackagewith{babel}{activeacute}{\gl@activeacute}{}
+\else %<<<<<<
+ \gl@activeacute
+\fi %<<<<<<%
+% \end{macrocode}
+%
+% And the customization. By default these macros only
+% store the values and do nothing.
+%
+% \begin{macrocode}
+\def\gl@enumerate#1#2#3#4{%
+ \def\gl@enum{{#1}{#2}{#3}{#4}}}
+
+\def\gl@itemize#1#2#3#4{%
+ \def\gl@item{{#1}{#2}{#3}{#4}}}
+% \end{macrocode}
+%
+% The part formerly in the |.lld| file comes here. It performs
+% layout adaptation of \LaTeX{} to ``orthodox'' Galician rules.
+% \begin{macrocode}
+\ifes@LaTeXe %<<<<<<
+
+\gl@enumerate{1.}{a)}{1)}{a$'$}
+\def\galiciandashitems{\gl@itemize{---}{---}{---}{---}}
+\def\galiciansymbitems{%
+ \gl@itemize
+ {\leavevmode\hbox to 1.2ex
+ {\hss\vrule height .9ex width .7ex depth -.2ex\hss}}%
+ {\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}}
+\def\galiciansignitems{%
+ \gl@itemize
+ {\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}%
+ {$\m@th\triangleright$}}
+\galiciansymbitems
+
+\def\gl@enumdef#1#2#3\@@{%
+ \if#21%
+ \@namedef{theenum#1}{\arabic{enum#1}}%
+ \else\if#2a%
+ \@namedef{theenum#1}{\emph{\alph{enum#1}}}%
+ \else\if#2A%
+ \@namedef{theenum#1}{\Alph{enum#1}}%
+ \else\if#2i%
+ \@namedef{theenum#1}{\roman{enum#1}}%
+ \else\if#2I%
+ \@namedef{theenum#1}{\Roman{enum#1}}%
+ \else\if#2o%
+ \@namedef{theenum#1}{\arabic{enum#1}\protect\gl@sptext{o}}%
+ \fi\fi\fi\fi\fi\fi
+ \toks@\expandafter{\csname theenum#1\endcsname}
+ \expandafter\edef\csname labelenum#1\endcsname
+ {\noexpand\gl@listquot\the\toks@#3}}
+
+\addto\layoutgalician{%
+ \def\gl@enumerate##1##2##3##4{%
+ \gl@enumdef{i}##1\@empty\@empty\@@
+ \gl@enumdef{ii}##2\@empty\@empty\@@
+ \gl@enumdef{iii}##3\@empty\@empty\@@
+ \gl@enumdef{iv}##4\@empty\@empty\@@}%
+ \def\gl@itemize##1##2##3##4{%
+ \def\labelitemi{\gl@listquot##1}%
+ \def\labelitemii{\gl@listquot##2}%
+ \def\labelitemiii{\gl@listquot##3}%
+ \def\labelitemiv{\gl@listquot##4}}%
+ \def\p@enumii{\theenumi}%
+ \def\p@enumiii{\theenumi\theenumii}%
+ \def\p@enumiv{\p@enumiii\theenumiii}%
+ \expandafter\gl@enumerate\gl@enum
+ \expandafter\gl@itemize\gl@item
+ \DeclareTextCommand{\guillemotleft}{OT1}{%
+ \ifmmode\ll
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char40 \kern-0.19em\char40 }}%
+ \fi}%
+ \DeclareTextCommand{\guillemotright}{OT1}{%
+ \ifmmode\gg
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char41 \kern-0.19em\char41 }}%
+ \fi}%
+ \def\@fnsymbol##1%
+ {\ifcase##1\or*\or**\or***\or****\or
+ *****\or******\else\@ctrerr\fi}%
+ \def\@alph##1%
+ {\ifcase##1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or
+ l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
+ x\or z\else\@ctrerr\fi}%
+ \def\@Alph##1%
+ {\ifcase##1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or
+ L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
+ X\or Z\else\@ctrerr\fi}%
+ \let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue
+ \def\@seccntformat##1{\csname the##1\endcsname.\quad}%
+ \def\numberline##1{\hb@xt@\@tempdima{##1\if&##1&\else.\fi\hfil}}%
+ \def\@roman##1{\protect\gl@roman{\number##1}}%
+ \def\gl@roman##1{\protect\gl@msc{\romannumeral##1}}%
+ \def\glromanindex##1##2{##1{\protect\gl@msc{##2}}}}
+% \end{macrocode}
+%
+% We need to execute the following code when babel has been
+% run, in order to see if |galician| is the main language.
+%
+% \begin{macrocode}
+\AtEndOfPackage{%
+ \let\gl@activeacute\@undefined
+ \def\bbl@tempa{galician}%
+ \ifx\bbl@main@language\bbl@tempa
+ \AtBeginDocument{\layoutgalician}%
+ \addto\gl@select{%
+ \@ifstar{\let\layoutgalician\relax}%
+ {\layoutgalician\let\layoutgalician\relax}}%
+ \fi
+ \selectgalician}
+
+\fi %<<<<<<
+% \end{macrocode}
+%
+% After restoring the catcode of |~| and setting the minimal
+% values for hyphenation, the |.ldf| is finished.
+%
+% \begin{macrocode}
+\gl@savedcatcodes
+
+\providehyphenmins{\CurrentOption}{\tw@\tw@}
+
+\ifes@LaTeXe %<<<<<<
+ \ldf@finish{galician}
+\else %<<<<<<
+ \gl@select
+ \ldf@finish{galician}
+ \csname activatequoting\endcsname
+\fi %<<<<<<
+
%</code>
% \end{macrocode}
+% That's all in the main file. Now the file with
+% \textsf{custom-bib} macros.
+%
+% \begin{macrocode}
+%<*bblbst>
+\def\bbland{e}
+\def\bbleditors{directores} \def\bbleds{dirs.\@}
+\def\bbleditor{director} \def\bbled{dir.\@}
+\def\bbledby{dirixido por}
+\def\bbledition{edici\'on} \def\bbledn{ed.\@}
+\def\bbletal{e outros}
+\def\bblvolume{volumen} \def\bblvol{vol.\@}
+\def\bblof{de}
+\def\bblnumber{n\'umero} \def\bblno{n\sptext{o}}
+\def\bblin{en}
+\def\bblpages{p\'axinas} \def\bblpp{p\'axs.\@}
+\def\bblpage{p\'axina} \def\bblp{p\'ax.\@}
+\def\bblchapter{cap\'itulo} \def\bblchap{cap.\@}
+\def\bbltechreport{informe t\'ecnico}
+\def\bbltechrep{inf.\@ t\'ec.\@}
+\def\bblmthesis{proxecto de fin de carreira}
+\def\bblphdthesis{tesis doutoral}
+\def\bblfirst {primeira} \def\bblfirsto {1\sptext{a}}
+\def\bblsecond{segunda} \def\bblsecondo{2\sptext{a}}
+\def\bblthird {terceira} \def\bblthirdo {3\sptext{a}}
+\def\bblfourth{cuarta} \def\bblfourtho{4\sptext{a}}
+\def\bblfifth {quinta} \def\bblfiftho {5\sptext{a}}
+\def\bblth{\sptext{a}}
+\let\bblst\bblth \let\bblnd\bblth \let\bblrd\bblth
+\def\bbljan{xaneiro} \def\bblfeb{febreiro} \def\bblmar{marzo}
+\def\bblapr{abril} \def\bblmay{maio} \def\bbljun{xu\~no}
+\def\bbljul{xullo} \def\bblaug{agosto} \def\bblsep{setembro}
+\def\bbloct{outubro}\def\bblnov{novembro}\def\bbldec{decembro}
+%</bblbst>
+% \end{macrocode}
+%
+% The |galician| option writes a macro in the page field of
+% \textit{MakeIndex} in entries with medium caps number, and they
+% are rejected. This program is a preprocessor which moves this
+% macro to the entry field.
+%
+% \begin{macrocode}
+%<*indexgl>
+\makeatletter
+
+\newcount\gl@converted
+\newcount\gl@processed
+
+\def\gl@encap{`\|}
+\def\gl@openrange{`\(}
+\def\gl@closerange{`\)}
+
+\def\gl@split@file#1.#2\@@{#1}
+\def\gl@split@ext#1.#2\@@{#2}
+
+\typein[\answer]{^^JArchivo que convertir^^J%
+ (extension por omision .idx):}
+
+\@expandtwoargs\in@{.}{\answer}
+\ifin@
+ \edef\gl@input@file{\expandafter\gl@split@file\answer\@@}
+ \edef\gl@input@ext{\expandafter\gl@split@ext\answer\@@}
+\else
+ \edef\gl@input@file{\answer}
+ \def\gl@input@ext{idx}
+\fi
+
+\typein[\answer]{^^JArquivo de destino^^J%
+ (arquivo por omision: \gl@input@file.eix,^^J%
+ extension por omision .eix):}
+\ifx\answer\@empty
+ \edef\gl@output{\gl@input@file.eix}
+\else
+ \@expandtwoargs\in@{.}{\answer}
+ \ifin@
+ \edef\gl@output{\answer}
+ \else
+ \edef\gl@output{\answer.eix}
+ \fi
+\fi
+
+\typein[\answer]{%
+ ^^J?Usouse algun esquema especial de controles^^J%
+ de MakeIndex para encap, open_range ou close_range?^^J%
+ [s/n] (n por omision)}
+
+\if s\answer
+ \typein[\answer]{^^JCaracter para 'encap'^^J%
+ (\string| por omision)}
+ \ifx\answer\@empty\else
+ \edef\gl@encap{%
+ `\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
+ \fi
+ \typein[\answer]{^^JCaracter para 'open_range'^^J%
+ (\string( por omision)}
+ \ifx\answer\@empty\else
+ \edef\gl@openrange{%
+ `\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
+ \fi
+ \typein[\answer]{^^JCaracter para 'close_range'^^J%
+ (\string) por omision)}
+ \ifx\answer\@empty\else
+ \edef\gl@closerange{%
+ `\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
+ \fi
+\fi
+
+\newwrite\gl@indexfile
+\immediate\openout\gl@indexfile=\gl@output
+
+\newif\ifgl@encapsulated
+
+\def\gl@roman#1{\romannumeral#1 }
+\edef\gl@slash{\expandafter\@gobble\string\\}
+
+\def\indexentry{%
+ \begingroup
+ \@sanitize
+ \gl@indexentry}
+
+\begingroup
+
+\catcode`\|=12 \lccode`\|=\gl@encap\relax
+\catcode`\(=12 \lccode`\(=\gl@openrange\relax
+\catcode`\)=12 \lccode`\)=\gl@closerange\relax
+
+\lowercase{
+\gdef\gl@indexentry#1{%
+ \endgroup
+ \advance\gl@processed\@ne
+ \gl@encapsulatedfalse
+ \gl@bar@idx#1|\@@
+ \gl@idxentry}%
+}
+
+\lowercase{
+\gdef\gl@idxentry#1{%
+ \in@{\gl@roman}{#1}%
+ \ifin@
+ \advance\gl@converted\@ne
+ \immediate\write\gl@indexfile{%
+ \string\indexentry{\gl@b|\ifgl@encapsulated\gl@p\fi glromanindex%
+ {\ifx\gl@a\@empty\else\gl@slash\gl@a\fi}}{#1}}%
+ \else
+ \immediate\write\gl@indexfile{%
+ \string\indexentry{\gl@b\ifgl@encapsulated|\gl@p\gl@a\fi}{#1}}%
+ \fi}
+}
+
+\lowercase{
+\gdef\gl@bar@idx#1|#2\@@{%
+ \def\gl@b{#1}\def\gl@a{#2}%
+ \ifx\gl@a\@empty\else\gl@encapsulatedtrue\gl@bar@eat#2\fi}
+}
+
+\lowercase{
+\gdef\gl@bar@eat#1#2|{\def\gl@p{#1}\def\gl@a{#2}%
+ \edef\gl@t{(}\ifx\gl@t\gl@p
+ \else\edef\gl@t{)}\ifx\gl@t\gl@p
+ \else
+ \edef\gl@a{\gl@p\gl@a}\let\gl@p\@empty%
+ \fi\fi}
+}
+
+\endgroup
+
+\input \gl@input@file.\gl@input@ext
+
+\immediate\closeout\gl@indexfile
+
+\typeout{*****************}
+\typeout{procesouse: \gl@input@file.\gl@input@ext }
+\typeout{Li'nas lidas: \the\gl@processed}
+\typeout{Li'nas convertidas: \the\gl@converted}
+\typeout{Resultado en: \gl@output}
+\ifnum\gl@converted>\z@
+ \typeout{Xenere o 'indice a partir deste arquivo}
+\else
+ \typeout{Non se realizou ning'un tipo de conversi'on}
+ \typeout{P'odese xenerar o arquivo directamente^^J%
+ de \gl@input@file.\gl@input@ext}
+\fi
+\typeout{*****************}
+\@@end
+%</indexgl>
+% \end{macrocode}
%
% \Finale
%
+%%
%% \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
%% Lower-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/source/generic/babel/galician.ins b/Master/texmf-dist/source/generic/babel/galician.ins
index a50810d8f2c..215b447ea06 100644
--- a/Master/texmf-dist/source/generic/babel/galician.ins
+++ b/Master/texmf-dist/source/generic/babel/galician.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -31,29 +31,29 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{1999/04/11}
\def\batchfile{galician.ins}
+\def\filedate{2007/01/29}
\input docstrip.tex
{\ifx\generate\undefined
-\Msg{**********************************************}
-\Msg{*}
-\Msg{* This installation requires docstrip}
-\Msg{* version 2.3c or later.}
-\Msg{*}
-\Msg{* An older version of docstrip has been input}
-\Msg{*}
-\Msg{**********************************************}
-\errhelp{Move or rename old docstrip.tex.}
-\errmessage{Old docstrip in input path}
-\batchmode
-\csname @@end\endcsname
+ \Msg{**********************************************}
+ \Msg{*}
+ \Msg{* This installation requires docstrip}
+ \Msg{* version 2.3c or later.}
+ \Msg{*}
+ \Msg{* An older version of docstrip has been input}
+ \Msg{*}
+ \Msg{**********************************************}
+ \errhelp{Move or rename old docstrip.tex.}
+ \errmessage{Old docstrip in input path}
+ \batchmode
+ \csname @@end\endcsname
\fi}
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -125,9 +125,12 @@ of this file under its original name.
\usedir{tex/generic/babel}
+\keepsilent
+
\usepreamble\mainpreamble
-\generate{\file{galician.ldf}{\from{galician.dtx}{code}}
- }
+\generate{\file{galician.ldf}{\from{galician.dtx}{code}}%
+ \file{glbst.tex}{\from{galician.dtx}{bblbst}}%
+ \file{glromidx.tex}{\from{galician.dtx}{indexgl}}}
\usepreamble\fdpreamble
\ifToplevel{
diff --git a/Master/texmf-dist/source/generic/babel/german.ins b/Master/texmf-dist/source/generic/babel/german.ins
index 987f600bf78..b7b7db1c49e 100644
--- a/Master/texmf-dist/source/generic/babel/german.ins
+++ b/Master/texmf-dist/source/generic/babel/german.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/germanb.dtx b/Master/texmf-dist/source/generic/babel/germanb.dtx
index 4e2491b2ecd..dfd72c63938 100644
--- a/Master/texmf-dist/source/generic/babel/germanb.dtx
+++ b/Master/texmf-dist/source/generic/babel/germanb.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{343}
+% \CheckSum{366}
%
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -37,22 +37,22 @@
%<code>\ProvidesLanguage{germanb}
%\fi
%\ProvidesFile{germanb.dtx}
- [2004/02/19 v2.6k German support from the babel system]
+ [2008/03/17 v2.6l German support from the babel system]
%\iffalse
%% File `germanb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Germanb Language Definition File
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Bernd Raichle raichle at azu.Informatik.Uni-Stuttgart.de
%% Johannes Braams, TeXniek
% This file is based on german.tex version 2.5d,
% by Bernd Raichle, Hubert Partl et.al.
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
%<*filedriver>
\documentclass{ltxdoc}
@@ -175,10 +175,23 @@
%
% When this file was read through the option \Lopt{germanb} we make
% it behave as if \Lopt{german} was specified.
+% \changes{german-2.6l}{2008/03/17}{Making germanb behave like german
+% needs som more work besides defining \cs{CurrentOption}}
% \begin{macrocode}
\def\bbl@tempa{germanb}
\ifx\CurrentOption\bbl@tempa
\def\CurrentOption{german}
+ \ifx\l@german\@undefined
+ \@nopatterns{German}
+ \adddialect\l@german0
+ \fi
+ \let\l@germanb\l@german
+ \AtBeginDocument{%
+ \let\captionsgermanb\coptionsgerman
+ \let\dategermanb\dategerman
+ \let\extrasgermanb\extrasgerman
+ \let\noextrasgermanb\noextrasgerman
+ }
\fi
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/generic/babel/italian.dtx b/Master/texmf-dist/source/generic/babel/italian.dtx
index 71ec315d740..d054726438b 100644
--- a/Master/texmf-dist/source/generic/babel/italian.dtx
+++ b/Master/texmf-dist/source/generic/babel/italian.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{420}
+% \CheckSum{424}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -36,15 +36,17 @@
%<code>\ProvidesLanguage{italian}
%\fi
%\ProvidesFile{italian.dtx}
- [2005/11/17 v1.2r Italian support from the babel system]
+ [2008/03/14 v1.2t Italian support from the babel system]
%\iffalse
%% File `italian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%% Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%% babel at braams.xs4all.nl
+%% Claudio Beccari
+%% claudio.beccari at gmail.it
%
% This file is part of the babel system, it provides the source
% code for the Italian language definition file.
@@ -97,6 +99,7 @@
% with package units.sty; adjusted caporali functionality, since
% the previous one did not work with the standard (although obsolete)
% slides class file}
+% \changes{italian-1.2s}{2007/01/12}{Corrected email of CB}
% \section{The Italian language}
%
% The file \file{\filename}\footnote{The file described in this
@@ -125,7 +128,11 @@
% and the |\widowpenalty| are set to rather high values and
% |\finalhyphendemerits| is set to such a high value that
% hyphenation is prohibited between the last two lines of a
-% paragraph.
+% paragraph. In orer to make it consistent, also |\@clubpenalty|
+% is set to the same value; actualy the latter value is the
+% reset value after every sectioning command, so that after the
+% first section, |\clubpenalty| is reset to the low default value.
+% Thanks to Enrico Gregorio for spotting this serious bug.
% \item Some language specific shortcuts have been defined so as to
% allow etymological hyphenation, specifically |"| inserts a
% break point in any word boundary that the typesetter chooses,
@@ -302,11 +309,15 @@
% \changes{italian-1.2b}{1994/05/19}{Added setting of club- and
% widowpenalty}
% Lower the chance that clubs or widows occur.
+% \changes{italian-1.2t}{2007/12/10}{Added \cs{@clubpenalty} to the
+% italian specific settings, otherwise any sectioning command restores
+% it to the default value valid for english and most other languages}
% \begin{macrocode}
\addto\extrasitalian{%
\babel@savevariable\clubpenalty
\babel@savevariable\widowpenalty
- \clubpenalty3000\widowpenalty3000}%
+ \babel@savevariable\@clubpenalty
+ \clubpenalty3000\widowpenalty3000\@clubpenalty\clubpenalty}%
% \end{macrocode}
%
% \changes{italian-1.2b}{1994/05/19}{Added setting of
diff --git a/Master/texmf-dist/source/generic/babel/italian.ins b/Master/texmf-dist/source/generic/babel/italian.ins
index e7e51cbbd19..4ea2ac191dd 100644
--- a/Master/texmf-dist/source/generic/babel/italian.ins
+++ b/Master/texmf-dist/source/generic/babel/italian.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -60,7 +60,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -94,7 +94,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/latin.dtx b/Master/texmf-dist/source/generic/babel/latin.dtx
index 1a47aab565f..32d6462c607 100644
--- a/Master/texmf-dist/source/generic/babel/latin.dtx
+++ b/Master/texmf-dist/source/generic/babel/latin.dtx
@@ -1,9 +1,6 @@
% \iffalse meta-comment
%
-% Patched by Heiko Oberdiek for project latex-tds:
-% * 2007/10/24: \CheckSum number fixed.
-%
-% Copyright 1989-2007 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -29,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{450}
+% \CheckSum{454}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -39,15 +36,17 @@
%<code>\ProvidesFile{latin.ldf}
%\fi
%\ProvidesFile{latin.dtx}%
- [2007/10/19 v2.0h Latin support from the babel system]
+ [2008/03/21 v2.0k Latin support from the babel system]
%\iffalse
%% File `latin.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%% Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%% babel at braams.xs4all.nl
+%% Claudio Beccari
+%% claudio.beccari at gmail.it
%
% This file is part of the babel system, it provides the source
% code for the Latin language definition file.
@@ -75,38 +74,49 @@
% and etymological hyphenation (CB)}
% \changes{latin-1.2}{2000/01/31}{Added suggestions from Krzysztof
% Konrad \.Zelechowski (CB)}
-% \changes{latin-2.0}{2000/02/10}{Completely new etymological
+% \changes{latin-2.0}{2000/02/10}{Completely new etymological
% hyphenation (CB)}
% \changes{latin-2.0a}{2000/10/15}{Revised by JB}
-% \changes{latin-2.0b}{2000/12/13}{Simplified shortcuts for
+% \changes{latin-2.0b}{2000/12/13}{Simplified shortcuts for
% etymological hyphenation; modified breve and macro shortcuts;
% language attribute medieval declared}
+% \changes{latin-2.0c}{2001/06/04}{Restored caret and equals sign
+% category codes before exiting}
% \changes{latin-2.0d}{2001/06/04}{Restored caret and equals sign
% category codes before exiting}
% \changes{latin-2.0e}{2003/04/11}{Introduced the language attribute
% `withprosodicmarks'; modified use of breve and macron shortcuts
% in order to avoid possible conflicts with other packages}
+% \changes{latin-2.0i}{2008/02/17}{Corrected the \cs{@clubpenalty}
+% problem}
+% \changes{latin-2.0j}{2008/03/17}{Added a missing comment char and a
+% missing closing brace}
%
% \section{The Latin language}
%
% The file \file{\filename}\footnote{The file described in this
% section has version number \fileversion\ and was last revised on
-% \filedate. The original author is Claudio Beccari with
+% \filedate. The original author is Claudio Beccari with
% contributions by Krzysztof Konrad \.Zelechowski,
% (\texttt{kkz@alfa.mimuw.edu.pl})} defines all the
% language-specific macros for the Latin language both in modern
% and medieval spelling.
%
-% For this language two ``styles'' of typesetting are implemented:
-% ``regular'' or modern-spelling Latin, and medieval Latin.
-% The medieval Latin specific commands can be activated by means of
-% the language attribute |medieval|; the medieval spelling differs
-% from the modern one by the systematic use of the lower case `u'
-% also where in modern spelling the letter `v' is used; when
-% typesetting with capital letters, on the opposite, the letter 'V'
-% is used also in place of 'U'.
+% For this language the |\clubpenalty|, |\widowpenalty| are set to
+% rather high values and |\finalhyphendemerits| is set to such a
+% high value that hyphenation is prohibited between the last two
+% lines of a paragraph.
+%
+% For this language two ``styles'' of typesetting are implemented:
+% ``regular'' or modern-spelling Latin, and medieval Latin.
+% The medieval Latin specific commands can be activated by means of
+% the language attribute |medieval|; the medieval spelling differs
+% from the modern one by the systematic use of the lower case `u'
+% also where in modern spelling the letter `v' is used; when
+% typesetting with capital letters, on the opposite, the letter 'V'
+% is used also in place of 'U'.
% Medieval spelling also includes the ligatures |\ae| (\ae), |\oe|
-% (\oe), |\AE| (\AE), and |\OE| (\OE) that are not used in modern
+% (\oe), |\AE| (\AE), and |\OE| (\OE) that are not used in modern
% spelling, nor were used in the classical times.
%
% Furthermore a third typesetting style |withprosodicmarks| is
@@ -126,20 +136,20 @@
% in the strings used to name for example the ``Preface'' that
% becomes ``Praefatio'' or ``Pr\ae fatio'' respectively.
% Hyphenation rules are also different, but the hyphenation pattern
-% file \file{lahyph.tex} takes care of both versions of the
+% file \file{lahyph.tex} takes care of both versions of the
% language. Needless to say that such patterns must be loaded in
-% the \LaTeX\ format by by running |initex| (or whatever the name
-% of the initializer) on |latex.ltx|.
+% the \LaTeX\ format by running |initex| (or whatever the name
+% if the initializer) on |latex.ltx|.
%
-% The name strings for chapters, figures, tables, etcetera, are
-% suggested by prof. Raffaella Tabacco, a classicist of the
-% University of Turin, Italy, to whom we address our warmest
+% The name strings for chapters, figures, tables, etcetera, are
+% suggested by prof. Raffaella Tabacco, a classicist of the
+% University of Turin, Italy, to whom we address our warmest
% thanks. The names suggested by Krzysztof Konrad \.Zelechowski,
-% when different, are used as the names for the medieval variety,
-% since he made a word and spelling choice more suited for this
+% when different, are used as the names for the medieval variety,
+% since he made a word and spelling choice more suited for this
% variety.
%
-% For this language some shortcuts are defined according to
+% For this language some shortcuts are defined according to
% table~\ref{t:lashrtct}; all of them are supposed to work with
% both spelling styles, except where the opposite is explicitly
% stated.
@@ -150,21 +160,21 @@
% medieval ligatures \ae\ and \oe.\\
% |=a| & inserts the macron accent as \=a; valid also for the
% other lowercase vowels, but it does not operate on the
-% medieval ligatures \ae\ and \oe.\\
+% medieval ligatures \ae\ and \oe.\\
% |"| & inserts a compound word mark where hyphenation is legal;
% the next character must not be a medieval ligature \ae\
-% or \oe, nor an accented letter (foreign names).\\
+% or \oe, nor an accented letter (foreign names).\\
% \texttt{\string"\string|}
% & same as above, but operates also when the next character
% is a medieval ligature or an accented letter.
% \end{tabular}
-% \caption[]{Shortcuts defined for the Latin language. The
+% \caption[]{Shortcuts defined for the Latin language. The
% characters \texttt{\string^} and \texttt{\string=} are
% active only when the language attribute
% \texttt{withprosodicmarks} has been declared,
-% otherwise they are disabled; see
+% otherwise they are disabled; see
% section~\ref{s:shrtcts} for more details.}%
-% \label{t:lashrtct}
+% \label{t:lashrtct}
% \end{table}
% \StopEventually{}
%
@@ -241,28 +251,28 @@
}
% \end{macrocode}
% \end{macro}
-% In the above definitions there are some points that might change
+% In the above definitions there are some points that might change
% in the future or that require a minimum of attention from the
% typesetter.
% \begin{enumerate}
-% \item the \cs{enclname} is translated by a passive verb, that
-% literally means ``(they) are being added''; if just one
-% enclosure is joined to the document, the plural passive is not
-% suited any more; nevertheless a generic plural passive might be
-% incorrect but suited for most circumstances. On the opposite
-% ``Additur'', the corresponding singular passive, might be more
-% correct with one enclosure and less suited in general: what
+% \item the \cs{enclname} is translated by a passive verb, that
+% literally means ``(they) are being added''; if just one
+% enclosure is joined to the document, the plural passive is not
+% suited any more; nevertheless a generic plural passive might be
+% incorrect but suited for most circumstances. On the opposite
+% ``Additur'', the corresponding singular passive, might be more
+% correct with one enclosure and less suited in general: what
% about the abbreviation ``Add.'' that works in both cases, but
% certainly is less elegant?
-% \item The \cs{headtoname} is empty and gobbles the possible
-% following space; in practice the typesetter should use the
-% dative of the recipient's name; since nowadays not all such
-% names can be translated into Latin, they might result
-% indeclinable. The clever use of an appellative by the
-% typesetter such as ``Domino'' or ``Dominae'' might solve the
-% problem, but the header might get too impressive. The typesetter
-% must make a decision on his own.
-% \item The same holds true for the copy recipient's name in the
+% \item The \cs{headtoname} is empty and gobbles the possible
+% following space; in practice the typesetter should use the
+% dative of the recipient's name; since nowadays not all such
+% names can be translated into Latin, they might result
+% indeclinable. The clever use of an appellative by the
+% typesetter such as ``Domino'' or ``Dominae'' might solve the
+% problem, but the header might get too impressive. The typesetter
+% must make a decision on his own.
+% \item The same holds true for the copy recipient's name in the
% ``Cc'' field of \cs{ccname}.
% \end{enumerate}
%
@@ -280,8 +290,7 @@
\def\november{Novembris}%
\def\today{%
{\check@mathfonts\fontsize\sf@size\z@\math@fontsfalse\selectfont
- \uppercase\expandafter{\romannumeral\day}}\nobreakspace
- \ifcase\month\or
+ \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
Iulii\or Augusti\or Septembris\or Octobris\or \november\or
Decembris\fi
@@ -290,13 +299,13 @@
% \end{macro}
%
% \begin{macro}{\romandate}
-% Thomas Martin Widmann (\texttt{viralbus@daimi.au.dk}) developed a
-% macro originally named |\latindate| (but to be renamed
-% |\romandate| so as not to conflict with the standard \babel\
-% conventions) that should compute and translate the current date
-% into a date \textit{ab urbe condita} with days numbered according
-% to the kalendae and idus; for the moment this is a placeholder
-% for Thomas' macro, waiting for a self standing one that keeps
+% Thomas Martin Widmann (\texttt{viralbus@daimi.au.dk}) developed a
+% macro originally named |\latindate| (but to be renamed
+% |\romandate| so as not to conflict with the standard \babel\
+% conventions) that should compute and translate the current date
+% into a date \textit{ab urbe condita} with days numbered according
+% to the kalendae and idus; for the moment this is a placeholder
+% for Thomas' macro, waiting for a self standing one that keeps
% local all the intermediate data, counters, etc. If he succeeds,
% here is the place to add his macro.
% \end{macro}
@@ -313,15 +322,13 @@
%
% \begin{macro}{\extraslatin}
% \begin{macro}{\noextraslatin}
-% For this language the |\clubpenalty|, |\widowpenalty| are set to
-% rather high values and |\finalhyphendemerits| is set to such a
-% high value that hyphenation is prohibited between the last two
-% lines of a paragraph.
+% Lower the chance that clubs or widows occur.
% \begin{macrocode}
\addto\extraslatin{%
\babel@savevariable\clubpenalty
+ \babel@savevariable\@clubpenalty
\babel@savevariable\widowpenalty
- \clubpenalty3000\widowpenalty3000}
+ \clubpenalty3000\@clubpenalty3000\widowpenalty3000}
% \end{macrocode}
% Never ever break a word between the last two lines of a paragraph
% in latin texts.
@@ -339,9 +346,9 @@
% capital V. Everything else is identical with Latin.
% \begin{macrocode}
\addto\extrasmedievallatin{%
-\babel@savevariable{\lccode`\V}%
-\babel@savevariable{\uccode`\u}%
-\lccode`\V=`\u \uccode`\u=`\V}
+ \babel@savevariable{\lccode`\V}%
+ \babel@savevariable{\uccode`\u}%
+ \lccode`\V=`\u \uccode`\u=`\V}
% \end{macrocode}
%
% \begin{macro}{\SetLatinLigatures}
@@ -359,13 +366,13 @@
% All this fuss is made in order to allow the use of the medieval
% ligatures \ae\ and \oe\ while typesetting with the medieval
% spelling; I have my doubts that the medieval spelling should be
-% used at all in modern books, reports, and the like, as the uncial
-% `u' shape of the lower case `v' and the above ligatures were
+% used at all in modern books, reports, and the like; the uncial
+% `u' shape of the lower case `v' and the above ligatures were
% fancy styles of the copyists who were able to write faster with
% those rounded glyphs; with typesetting there is no question of
% handling a quill penn\dots Since my (CB) opinion may be wrong, I
% managed to set up the instruments and it is up to the typesetter
-% to use them or not.
+% to use them or not.
%
% \begin{macrocode}
\addto\extrasmedievallatin{%
@@ -397,23 +404,25 @@
\let\@tempA\@undefined
}
% \end{macrocode}
-% With the above definitions we are sure that |\MakeUppercase|
+% With the above definitions we are sure that |\MakeUppercase|
% works properly and |\MakeUppercase{C{\ae}sar}| correctly `yields
% `C{\AE}SAR''; correspondingly |\MakeUppercase{Heluetia}|
-% correctly yields ``HELVETIA''.
+% correctly yields ``HELVETIA''.
% \end{macro}
%
% \section{Latin shortcuts}\label{s:shrtcts}
-% For writing dictionaries or didactic texts we defined a third
-% language attribute, or a third typesetting style, where a couple
-% of other active characters are defined: |^| for marking a vowel
-% with the breve sign, and |=| for marking a vowel with the macro
-% sign. Please take notice that neither the OT1 font encoding, nor
-% the T1 one for most vowels, contain directly the marked vowels,
-% therefore hyphenation of words containing these ``accents'' may
-% become problematic; for this reason the above active characters
-% not only introduce the required accent, but also the necessary
-% code for allowing hyphenation in the rest of the word.
+% For writing dictionaries or didactic texts (in modern spelling
+% only) we defined a third language attribute, or a third
+% typesetting style, a couple of other active characters are
+% defined: |^| for marking a vowel with the breve sign, and |=| for
+% marking a vowel with the macro sign. Please take notice that
+% neither the OT1 font encoding, nor the T1 one for most vowels,
+% contain directly the marked vowels, therefore hyphenation of
+% words containing these ``accents'' may become problematic; for
+% this reason the above active characters not only introduce the
+% required accent, but also an unbreakable zero skip that in
+% practice does not introduce a discretionary break, but allows
+% breaks in the rest of the word.
%
% It must be remarked that the active characters |^| and |=| may
% have other meanings in other contexts. For example the equals
@@ -423,9 +432,9 @@
% paragraph, diacritical marking in Latin is used only for
% typesetting certain kind of documents, such as grammars and
% dictionaries. It is reasonable that the breve and macron active
-% characters may be switched on and off at will, and in particular
+% characters are switched on and off at will, and in particular
% that they are off by default if the attribute |withprosodicmarks|
-% has not been set.
+% has not been set.
%
% \begin{macro}{\ProsodicMarksOn}
% \begin{macro}{\ProsodicMarksOff}
@@ -435,7 +444,7 @@
% third style is not declared:
% \begin{macrocode}
\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
+ \GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
{Latin language error: \string\ProsodicMarksOn\space
is defined by setting the\MessageBreak
language attribute to `withprosodicmarks'\MessageBreak
@@ -445,14 +454,21 @@
documentation for explanation}{\@ehd}}}
\addto\extraslatin{\let\ProsodicMarksOff\relax}
% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
% Then we temporarily set the caret and the equals sign to active
-% characters so that they can receive their definitions:
+% characters so that they can receive their definitions. But first
+% we store their current category codes to restore them later on.
+% \changes{latin-2.0k}{2008/03/21}{Save current category codes of
+% equals sign and caret in order to restore them later}
% \begin{macrocode}
+\@tempcnta=\catcode`\=
+\@tempcntb=\catcode`\^
\catcode`\= \active
\catcode`\^ \active
% \end{macrocode}
-% and we add the necessary declarations to the macros that are
+% Now we can add the necessary declarations to the macros that are
% being activated when the Latin language and its typesetting
% styles are declared:
% \begin{macrocode}
@@ -466,10 +482,11 @@
%
% \begin{macro}{\ProsodicMarks}
% Next we define the defining macro for the active characters
+% \changes{latin-2.0k}{2008/03/21}{Use \cs{active} instead of 13}
% \begin{macrocode}
\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
+ \def\ProsodicMarksOn{\catcode`\^ \active\catcode`\= \active}%
+ \def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
% \end{macrocode}
% Notice that with the above redefinitions of the commands
% |\ProsodicMarksOn| and |\ProsodicMarksOff|, the operation of the
@@ -485,27 +502,28 @@
% \changes{latin-2.0g}{2005/11/17}{changed \cs{allowhyphens} to
% \cs{bbl@allowhyphens}}
% \begin{macrocode}
-\initiate@active@char{^}%
-\initiate@active@char{=}%
-\declare@shorthand{latin}{^a}{%
+ \initiate@active@char{^}%
+ \initiate@active@char{=}%
+ \declare@shorthand{latin}{^a}{%
\textormath{\u{a}\bbl@allowhyphens}{\hat{a}}}%
-\declare@shorthand{latin}{^e}{%
+ \declare@shorthand{latin}{^e}{%
\textormath{\u{e}\bbl@allowhyphens}{\hat{e}}}%
-\declare@shorthand{latin}{^i}{%
+ \declare@shorthand{latin}{^i}{%
\textormath{\u{\i}\bbl@allowhyphens}{\hat{\imath}}}%
-\declare@shorthand{latin}{^o}{%
+ \declare@shorthand{latin}{^o}{%
\textormath{\u{o}\bbl@allowhyphens}{\hat{o}}}%
-\declare@shorthand{latin}{^u}{%
+ \declare@shorthand{latin}{^u}{%
\textormath{\u{u}\bbl@allowhyphens}{\hat{u}}}%
-\declare@shorthand{latin}{=a}{%
+%
+ \declare@shorthand{latin}{=a}{%
\textormath{\={a}\bbl@allowhyphens}{\bar{a}}}%
-\declare@shorthand{latin}{=e}{%
+ \declare@shorthand{latin}{=e}{%
\textormath{\={e}\bbl@allowhyphens}{\bar{e}}}%
-\declare@shorthand{latin}{=i}{%
+ \declare@shorthand{latin}{=i}{%
\textormath{\={\i}\bbl@allowhyphens}{\bar{\imath}}}%
-\declare@shorthand{latin}{=o}{%
+ \declare@shorthand{latin}{=o}{%
\textormath{\={o}\bbl@allowhyphens}{\bar{o}}}%
-\declare@shorthand{latin}{=u}{%
+ \declare@shorthand{latin}{=u}{%
\textormath{\={u}\bbl@allowhyphens}{\bar{u}}}%
}
% \end{macrocode}
@@ -521,54 +539,58 @@
%
% Finally we restore the caret and equals sign initial default
% category codes.
+% \changes{latin-2.0k}{2008/03/21}{Restore category codes rather then
+% return them to their \TeX\ default values. \emph{And} do that
+% outside of the command definition}
% \begin{macrocode}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
+\catcode`\= \@tempcnta
+\catcode`\^ \@tempcntb
% \end{macrocode}
+% so as to avoid conflicts with other packages or other \babel\
+% options.
% \end{macro}
%
-% \begin{macro}{\LatinMarksOn}
-% \begin{macro}{\LatinMarksOff}
+% \begin{macro}{\LatinMarksOn}
+% \begin{macro}{\LatinMarksOff}
% \changes{latin-2.0g}{2005/11/17}{Added two commands}
% \changes{latin-2.0h}{2007/10/19}{Added missing backslash}
-% We define two new commands so as to switch on and off the breve
+% We define two new commands so as to switch on and off the breve
% and macron shortcuts.
% \changes{latin-2.0h}{2007/10/20}{Removed the setting of
% \cs{LatinMarksOff} from \cs{extraslatin}}
+% \changes{latin-2.0k}{2008/03/21}{Set the \cs{LatinMarks...} commands
+% equal to the \cs{ProsodicMarks..} commands for compatibility}
% \begin{macrocode}
-\addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
-\addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
-%\addto\extraslatin{\LatinMarksOff}
+\addto\extraswithprosodicmarks{\let\LatinMarksOn\ProsodicMarksOn}
+\addto\extraswithprosodicmarks{\let\LatinMarksOff\ProsodicMarksOff}
% \end{macrocode}
-% \end{macro}
-% \end{macro}
+% \end{macro}
+% \end{macro}
%
% It must be understood that by using the above prosodic marks,
% line breaking is somewhat impeached; since such prosodic marks
% are used almost exclusively in dictionaries, grammars, and poems
% (only in school textbooks), this shouldn't be of any importance
% for what concerns the quality of typesetting.
-% \end{macro}
-% \end{macro}
%
% \section{Etymological hyphenation}
% In order to deal in a clean way with prefixes and compound words
-% to be divided etymologically, the active character |"| is given
+% to be divided etymologically, the active character |"| is given
% a special definition so as to behave as a discretionary break
% with hyphenation allowed after it.
% Most of the code for dealing with the active |"| is already
% contained in the core of \babel, but we are going to use it as a
-% single character shorthand for Latin.
+% single character shorthand for Latin.
% \begin{macrocode}
\initiate@active@char{"}%
\addto\extraslatin{\bbl@activate{"}%
}
% \end{macrocode}
%
-% A temporary macro is defined so as to take different actions in
-% math mode and text mode: specifically in the former case the
-% macro inserts a double quote as it should in math mode, otherwise
-% another delayed macro comes into action.
+% A temporary macro is defined so as to take different actions in math
+% mode and text mode: specifically in the former case the macro inserts a
+% double quote as it should in math mode, otherwise another delayed macro
+% comes into action.
% \begin{macrocode}
\declare@shorthand{latin}{"}{%
\ifmmode
@@ -589,7 +611,7 @@
% hyphen and an unbreakable space; in case the token is not a
% letter, the token is tested again to find if it is the character
% \texttt{\string|}, in which case it is gobbled and a
-% discretionary break is introduced.
+% discretionary break is introduced.
% \changes{latin-2.0g}{2005/11/17}{Added a \cs{nobreak}}
% \begin{macrocode}
\def\lt@allowhyphens{\nobreak\discretionary{-}{}{}\nobreak\hskip\z@skip}
@@ -598,24 +620,24 @@
\let\lt@n@xt\lt@allowhyphens
\else
\if\noexpand\lt@temp\string|%
- \def\lt@n@xt{\lt@allowhyphens\@gobble}%
+ \def\lt@n@xt{\lt@allowhyphens\@gobble}%
\fi
\fi
\lt@n@xt}%
% \end{macrocode}
%
% Attention: the category code comparison does not work if the
-% temporary control sequence \cs{lt@temp} has been let equal to an
+% temporary control sequence \cs{lt@temp} has been let equal to an
% implicit character, such as |\ae|; therefore this etymological
% hyphenation facility does not work with medieval Latin spelling
-% when |"| immediately precedes a ligature. in order to overcome
-% this drawback the shorthand \verb!"|! may be used in such cases;
+% when |"| immediately precedes a ligature. In order to overcome
+% this drawback the shorthand \verb!"|! may be used in such cases;
% it behaves exactly as |"|, but it does not test the implicit
% character control sequence. An input such as
% \verb!super"|{\ae}quitas!\footnote{This word does not exist in
-% ``regular'' Latin, and it is used just as an example.}
-% gets hyphenated as \texttt{su-per-{\ae}qui-tas} instead of
-% \texttt{su-pe-r\ae-qui-tas}.
+% ``regular'' Latin, and it is used just as an example.} gets
+% hyphenated as \texttt{su-per-{\ae}qui-tas} instead of
+% \texttt{su-pe-r\ae-qui-tas}.
%
% The macro |\ldf@finish| takes care of looking for a
% configuration file, setting the main language to be switched on
diff --git a/Master/texmf-dist/source/generic/babel/latin.ins b/Master/texmf-dist/source/generic/babel/latin.ins
index e6678888792..763ed018ff2 100644
--- a/Master/texmf-dist/source/generic/babel/latin.ins
+++ b/Master/texmf-dist/source/generic/babel/latin.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2007 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -89,7 +89,7 @@ Copyright 1999-2007 Claudio Beccari All rights reserved.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/lsorbian.dtx b/Master/texmf-dist/source/generic/babel/lsorbian.dtx
index 5ed352dadcf..f5adbe47631 100644
--- a/Master/texmf-dist/source/generic/babel/lsorbian.dtx
+++ b/Master/texmf-dist/source/generic/babel/lsorbian.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2007 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -37,15 +37,15 @@
%<code>\ProvidesLanguage{lsorbian}
%\fi
%\ProvidesFile{lsorbian.dtx}
- [2007/10/19 v1.0g Lower Sorbian support from the babel system]
+ [2008/03/17 v1.0g Lower Sorbian support from the babel system]
%\iffalse
%% File `lsorbian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Lower Sorbian Language Definition File
-%% Copyright (C) 1994 - 2007
+%% Copyright (C) 1994 - 2008
%% by Eduard Werner
% Werner, Eduard",
% Serbski institut z. t.,
diff --git a/Master/texmf-dist/source/generic/babel/mik2t2.tex b/Master/texmf-dist/source/generic/babel/mik2t2.tex
deleted file mode 100644
index 2d025835f0e..00000000000
--- a/Master/texmf-dist/source/generic/babel/mik2t2.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-% MIK to T2 translation for Bulgarian hyphenation patterns
-\lccode 160=224 % \cyra
-\lccode 161=225 % \cyrb
-\lccode 162=226 % \cyrv
-\lccode 163=227 % \cyrg
-\lccode 164=228 % \cyrd
-\lccode 165=229 % \cyre
-\lccode 166=230 % \cyrzh
-\lccode 167=231 % \cyrz
-\lccode 168=232 % \cyri
-\lccode 169=233 % \cyrishrt
-\lccode 170=234 % \cyrk
-\lccode 171=235 % \cyrl
-\lccode 172=236 % \cyrm
-\lccode 173=237 % \cyrn
-\lccode 174=238 % \cyro
-\lccode 175=239 % \cyrp
-\lccode 176=240 % \cyrr
-\lccode 177=241 % \cyrs
-\lccode 178=242 % \cyrt
-\lccode 179=243 % \cyru
-\lccode 180=244 % \cyrf
-\lccode 181=245 % \cyrh
-\lccode 182=246 % \cyrc
-\lccode 183=247 % \cyrch
-\lccode 184=248 % \cyrsh
-\lccode 185=249 % \cyrshch
-\lccode 186=250 % \cyrhrdsn
-\lccode 187=251 % \cyrery
-\lccode 188=252 % \cyrsftsn
-\lccode 189=253 % \cyrerev
-\lccode 190=254 % \cyryu
-\lccode 191=255 % \cyrya
diff --git a/Master/texmf-dist/source/generic/babel/ngermanb.dtx b/Master/texmf-dist/source/generic/babel/ngermanb.dtx
index 12b940fdceb..a2d4ba129d0 100644
--- a/Master/texmf-dist/source/generic/babel/ngermanb.dtx
+++ b/Master/texmf-dist/source/generic/babel/ngermanb.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -37,15 +37,15 @@
%<code>\ProvidesLanguage{ngermanb}
%\fi
%\ProvidesFile{ngermanb.dtx}
- [2004/02/20 v2.6m new German support from the babel system]
+ [2008/03/17 v2.6m new German support from the babel system]
%\iffalse
%% File `ngermanb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% new Germanb Language Definition File
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Bernd Raichle raichle at azu.Informatik.Uni-Stuttgart.de
%% Johannes Braams, TeXniek,
%% Walter Schmidt.
@@ -53,7 +53,7 @@
% by Bernd Raichle, Hubert Partl et.al.
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
%<*filedriver>
\documentclass{ltxdoc}
diff --git a/Master/texmf-dist/source/generic/babel/portuges.dtx b/Master/texmf-dist/source/generic/babel/portuges.dtx
index 8c4fbf1d6f3..7797f125413 100644
--- a/Master/texmf-dist/source/generic/babel/portuges.dtx
+++ b/Master/texmf-dist/source/generic/babel/portuges.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{319}
+% \CheckSum{320}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -36,15 +36,15 @@
%<code>\ProvidesLanguage{portuges}
%\fi
%\ProvidesFile{portuges.dtx}
- [2005/03/31 v1.2p Portuguese support from the babel system]
+ [2008/03/18 v1.2q Portuguese support from the babel system]
%\iffalse
%% File `portuges.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Portuguese Language Definition File
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Please report errors to: J.L. Braams
@@ -292,6 +292,8 @@
% \changes{portuges-1.2i}{1995/11/25}{Added \cs{proofname} for
% AMS-\LaTeX}
% \changes{portuges-1.2m}{2000/09/20}{Added \cs{glossaryname}}
+% \changes{portuges-1.2q}{2008/03/18}{Substituted `Gloss\'ario' for
+% `Glossary'}
% \begin{macrocode}
\@namedef{captions\CurrentOption}{%
\def\prefacename{Pref\'acio}%
@@ -314,7 +316,7 @@
\def\seename{veja}%
\def\alsoname{veja tamb\'em}%
\def\proofname{Demonstra\c{c}\~ao}%
- \def\glossaryname{Glossary}% <-- Needs translation
+ \def\glossaryname{Gloss\'ario}%
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/generic/babel/portuges.ins b/Master/texmf-dist/source/generic/babel/portuges.ins
index 3889bc8f8b2..e4e3c2e0296 100644
--- a/Master/texmf-dist/source/generic/babel/portuges.ins
+++ b/Master/texmf-dist/source/generic/babel/portuges.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/russianb.dtx b/Master/texmf-dist/source/generic/babel/russianb.dtx
index 7a7baeb62b1..381cb2b26a3 100644
--- a/Master/texmf-dist/source/generic/babel/russianb.dtx
+++ b/Master/texmf-dist/source/generic/babel/russianb.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2007 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -35,15 +35,15 @@
\ProvidesFile{russianb.dtx}
%</dtx>
%<code>\ProvidesLanguage{russianb}
- [2005/03/29 v1.1r Russian support from the babel system]
+ [2008/03/21 v1.1r Russian support from the babel system]
%
%% File `russianb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Russianb Language Definition File
-%% Copyright (C) 1995 - 2005
+%% Copyright (C) 1995 - 2008
%% by Olga Lapko cyrtug at mir.msk.su
%% Johannes Braams, TeXniek
%
@@ -52,7 +52,7 @@
%% Werner Lemberg wl at gnu.org
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
%
%<*filedriver>
\documentclass{ltxdoc}
@@ -116,7 +116,7 @@
% in following surname. \\
% |"`| & for German left double quotes
% (looks like ,\kern-0.08em,). \\
-% |"'| & for German right double quotes (looks like ``). \\%''
+% |"'| & for German right double quotes (looks like ``). \\%^^A''
% |"<| & for French left double quotes (looks like $<\!\!<$). \\
% |">| & for French right double quotes (looks like $>\!\!>$). \\
% \end{tabular}
@@ -136,7 +136,7 @@
% |\cdash--*| & Cyrillic emdash for denoting direct speech. \\
% |\glqq| & for German left double quotes
% (looks like ,\kern-0.08em,). \\
-% |\grqq| & for German right double quotes (looks like ``). \\%''
+% |\grqq| & for German right double quotes (looks like ``). \\%^^A''
% |\flqq| & for French left double quotes (looks like $<\!\!<$). \\
% |\frqq| & for French right double quotes (looks like $>\!\!>$). \\
% |\dq| & the original quotes character (|"|). \\
@@ -1236,4 +1236,3 @@
%% Right brace \} Tilde \~}
%%
\endinput
-dinput
diff --git a/Master/texmf-dist/source/generic/babel/russianb.ins b/Master/texmf-dist/source/generic/babel/russianb.ins
index 77df88a0d16..3c721f17114 100644
--- a/Master/texmf-dist/source/generic/babel/russianb.ins
+++ b/Master/texmf-dist/source/generic/babel/russianb.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2007 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -88,7 +88,7 @@ extension .ins) which are part of the distribution.
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/sorbian.ins b/Master/texmf-dist/source/generic/babel/sorbian.ins
index f65404805da..5fb2d701233 100644
--- a/Master/texmf-dist/source/generic/babel/sorbian.ins
+++ b/Master/texmf-dist/source/generic/babel/sorbian.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2007 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -87,7 +87,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/spanish.dtx b/Master/texmf-dist/source/generic/babel/spanish.dtx
index 232c2436479..3563516bf80 100644
--- a/Master/texmf-dist/source/generic/babel/spanish.dtx
+++ b/Master/texmf-dist/source/generic/babel/spanish.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,51 +26,83 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{2195}
+% \CheckSum{2143}
% \ProvidesFile{spanish.dtx}
-% [2004/02/20 v4.2b Spanish support from the babel system]
+% [2007/02/21 v5.0a Spanish support from the babel system]
%\iffalse
%% File `spanish.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Spanish Language Definition File
-%% Copyright (C) 1997 - 2005
-%% by Javier Bezos (jbezos at wanadoo.es)
-%% Apartado 116.035
-%% E-28080 Madrid
-%% Espa\~na / Espagne
-%% and
-%% by CervanTeX (www.cervantex.org)
+%% Copyright (C) 1997 - 2008
+%% Javier Bezos (www.texytipografia.com)
+%% and
+%% CervanTeX (www.cervantex.org)
%
%% Please report errors to: Javier Bezos (preferably)
-%% jbezos at wanadoo.es
+%% www.texytipografia.com/contact.html
%% J.L. Braams
-%% babel at braams.cistron.nl
+%% www.latex-project.org
%
% This file is part of the babel system, it provides the source
% code for the Spanish language definition file.
% The original version of this file was written by Javier Bezos.
%
%<*filedriver>
+\let\ooverb\verb
\documentclass[spanish,a4paper]{ltxdoc}
+\let\verb\ooverb
\usepackage[activeacute]{babel}
+\usepackage{hyperref}
+
+\let\meta\emph
+
+\usepackage{pslatex}
+\usepackage{mathptmx}
+\usepackage{color}
+\usepackage[cp1252]{inputenc}
+\usepackage[T1]{fontenc}
+\newcommand\act[1]{%
+ \\%
+ \makebox[1.5pc][l]{\textcolor{green}{$\surd$}}%
+ \textsf{#1}\ignorespaces}
+\newcommand\deact[1]{%
+ \\%
+ \makebox[1.5pc][l]{\textcolor{red}{$\times$}}%
+ \texttt{#1}\ignorespaces}
+\newcommand\txt{\makebox[1.5pc][l]{\textcolor{blue}{$\Rightarrow$}}\ignorespaces}
+\newcommand\con{\makebox[1.5pc][l]{\textcolor{magenta}{$\star$}}\ignorespaces}
+\newcommand\alw{%
+ \\%
+ \makebox[1.5pc][l]{\textcolor{green}{$\surd$}}%
+ Se define siempre, sin depender de un grupo.}
+\newcommand\opp{\qquad Opción de paquete}
+
+%\makeindex
-%\usepackage{ps}
-
-\newcommand*\TeXhax{\TeX hax}
\newcommand*\babel{\textsf{babel}}
-\newcommand*\langvar{$\langle \it lang \rangle$}
-\newcommand*\note[1]{}
-\newcommand*\Lopt[1]{\textsf{#1}}
\newcommand*\file[1]{\texttt{#1}}
\setlength{\arrayrulewidth}{2\arrayrulewidth}
-\newcommand\toprule{\cline{1-2}\\[-2ex]}
-\newcommand\botrule{\\[.6ex]\cline{1-2}}
+\newcommand\toprule[1]{\cline{1-#1}\\[-2ex]}
+\newcommand\botrule[1]{\\[.6ex]\cline{1-#1}}
\newcommand\hmk{$\string|$}
+\newenvironment{decl}[1][]%
+ {\par\small\addvspace{4.5ex plus 1ex}%
+ \vskip -\parskip
+ \ifx\relax#1\relax
+ \def\@decl@date{}%
+ \else
+ \def\@decl@date{\NEWfeature{#1}}%
+ \fi
+ \noindent%\hspace{-\leftmargini}%
+ \begin{tabular}{|l|}\hline\ignorespaces}%
+ {\\\hline\end{tabular}\nobreak\@decl@date\par\nobreak
+ \vspace{2.3ex}\vskip-\parskip}
+
\newcommand\New[1]{%
\leavevmode\marginpar{\raggedleft\sffamily Nuevo en #1}}
@@ -86,10 +118,11 @@
\newcommand\MEA[1]{\lsc{MEA},~#1}
\raggedright
-\setlength{\parindent}{1em}
+\setlength{\parindent}{0em}
+\setlength{\parskip}{3pt}
-\addtolength{\oddsidemargin}{-2pc}
-\addtolength{\textwidth}{4pc}
+\addtolength{\oddsidemargin}{-4pc}
+\addtolength{\textwidth}{7pc}
\OnlyDescription
\begin{document}
@@ -99,244 +132,358 @@
%\fi
%
% \begingroup
-%
-% \catcode`\{=11
-% \catcode`\[=1
-%
-% \gdef\ignoringuser[^^A
-% \bgroup
-% \let\end{userdtx\fi
-% \let\end{userdrv\fi
-% \aftergroup\endgroup
-% \catcode`\{=11
-% \catcode`f=14 ^^A kills \if... and \fi
-% \catcode`l=14 ^^A kills \else
-% \catcode`o=14 ^^A kills \or
-% \catcode`p=14 ^^A kills \repeat
-% \iffalse}
-%
-% \endgroup
-%
-% \newenvironment{userdtx}
-% {\ifx\langdeffile\undefined
-% \else\expandafter\ignoringuser
-% \fi}{}
-%
-% \newenvironment{userdrv}
-% {\ifx\langdeffile\undefined
-% \expandafter\ignoringuser
-% \else\fi}{}
+% \ifx\langdeffile\undefined
%
-% \begin{userdtx}
%^^A ======= Beginning of text as typeset by spanish.dtx =========
%
+%
% \title{Estilo \textsf{spanish}\\
-% para el sistema \babel.\footnote{Este
-% archivo est\'a actualmente en la versi\'on
-% 4.2b con fecha 12 de septiembre del 2003. ^^A@#
-% Esta copia del manual se compuso el~\today.}}
-%
-% \author{Javier Bezos\footnote{Por favor, env\'{\i}en
-% comentarios y sugerencias a \texttt{jbezos@wanadoo.es}
-% o a mi direcci\'on postal: Apartado 116.035, E-28080 Madrid,
-% Espa'na / Espagne. Han colaborado de una u otra forma muchas
-% personas, a las cuales agradezco sus comentarios y sugerencias.
-% Para m'as informaci'on sobre los criterios seguidos, v'ease la
-% referencia: Javier Bezos, \textit{Tipograf'ia espa'nola con
-% \TeX.} Para informaci'on sobre actualizaciones:
-% http://www.cervantex.org/}}
-%
-% \date{12 de septiembre del 2003} ^^A@#
+% para el sistema \babel.\footnote{Este
+% archivo est\'a actualmente en la versi\'on
+% 5.0a con fecha 21 de febrero del 2007. ^^A@#
+% Esta copia del manual se compuso el~\today.}}
+%
+% \author{Javier Bezos\footnote{Por favor, env\'{\i}en comentarios y
+% sugerencias en http://www.texytipografia.com/contact.html. Han
+% colaborado de una u otra forma muchas personas, a las cuales
+% agradezco sus comentarios y sugerencias; en particular, han sido muy
+% activos Juan Luis Varona y José Luis Rivera. Para m'as informaci'on
+% sobre los criterios seguidos, v'ease la referencia: Javier Bezos,
+% \textit{Tipograf'ia espa'nola con \TeX.} Para informaci'on sobre
+% actualizaciones: http://www.cervantex.org/}}
+%
+% \date{21 de febrero del 2007} ^^A@#
%
% \maketitle
%
% {\small\tableofcontents}
%
-%% \section{\textsf{spanish} como lengua principal}
-%
-% En \babel{} se considera que la 'ultima lengua citada en |\usepackage| y
-% |\documentclass|, por este orden, es la lengua principal. Si la
-% lengua principal es |spanish|, \New{4.1} se activa el grupo
-% |\layoutspanish| que adapta varios elementos
-% a los usos tipogr'aficos espa'noles del siguiente modo:
+% \section*{Símbolos empleados}
%
% \begin{itemize}
+% \item[\textcolor{blue}{$\Rightarrow$}] Macros para
+% ser usadas en el texto.
+% \item[\textcolor{magenta}{$\star$}] Macros de
+% configuración y preferencias.
+% \item[\textcolor{green}{$\surd$}] Grupo que
+% activa la orden.
+% \item[\textcolor{red}{$\times$}] Opciones de
+% paquete que anulan la orden. En redonda van las destinadas
+% específicamente a anular ese punto, y en cursiva las que además
+% anulan otros aspectos del estilo.
+% \end{itemize}
%
-% \item[$\diamond$]
-% |enumerate| e |itemize|\\[1ex]
+% \section{Uso de \textsf{spanish} para babel}
%
-% El primero usa la siguiente secuencia:\,\footnote{No hay raz'on
-% concreta para ella. Es tan s'olo una f'ormula de compromiso.}\\
+% El estilo de \textsf{spanish} para babel tiene con finalidad adaptar una
+% serie de elementos de los documentos de \LaTeX\ a la lengua
+% española, tanto en las traducciones como en la tipografía. Para
+% usarlo, basta con emplear la opción \textsf{spanish} al cargar babel:
+%\begin{verbatim}
+%\usepackage[spanish]{babel}
+%\end{verbatim}
+%
+% Esto es todo lo que hace falta para conseguir que el documento tenga
+% un aspecto español. En caso de estar en México, véase, además, el
+% apartado \ref{paises} (<<Opciones por países>>):\footnote{En próximas versiones se
+% añadirán más países.}
+%\begin{verbatim}
+%\usepackage[spanish,mexico]{babel}
+%\end{verbatim}
+%
+% El estilo \textsf{spanish} se puede cargar junto con otras lenguas (véase el
+% manual de babel). Si \textsf{spanish} es la última de las lenguas cargadas,
+% entonces se considera la lengua principal y se hacen una serie de
+% ajustes tipográficos adicionales. En particular, se modifican
+% 'ordenes y entornos como:
+%\begin{center}
+%\begin{tabular}{lll}
+% |enumerate| & |\roman| & |\section| \\
+% |itemize| & |\fnsymbol| & |\subsection|\\
+% |\%| & |\alph| & |\subsubsection|\\
+% & |\Alph| & \\
+%\end{tabular}
+%\end{center}
+%
+% El estilo está pensado para que sea muy configurable. Para ello, se
+% proporcionan una serie de opciones de paquete, que en caso de
+% emplearse deben ir \textit{después} de \textsf{spanish}. Por
+% ejemplo:
+% \begin{verbatim}
+% \usepackage[french,spanish,es-noindentfirst]{babel} \end{verbatim}
+% carga los estilos para el francés y el español, esta última como
+% lengua principal; además, evita que \textsf{spanish} sangre el
+% primer párrafo tras un título. Otras opciones se pueden ajustar por
+% medio de macros, en particular aquellas que se puede desear cambiar
+% en medio del documento (por ejemplo, el formato de la fecha).
+%
+% Los cambios están organizados en una serie de grupos:
+% \textsf{captions, date, text, math} y \textsf{shorthands}.
+% Los tres ultimos corresponden a lo que en babel sería normalmente
+% \textsf{extras}.
+%
+% \section{\textsf{spanish} como lengua principal}
+%
+% Si la lengua principal es \textsf{spanish}, se introducen una serie de
+% cambios en el momento de cargar la lengua para adaptar varios
+% elementos a los usos tipogr'aficos espa'noles. Estos cambios
+% funcionan con las clases est'andar "+--con otras tal vez alguno de
+% ellos no tenga efecto--- y persisten durante todo el documento.
+% Ninguno de ellos es necesario para componer el documento, aunque
+% naturalmente el resultado ser'a distinto.
+%
+% \subsection{Listas}
+%
+% \begin{decl} \txt |\begin{enumerate} ... \end{enumerate}|%
+% \deact{es-nolists, \textit{es-nolayout, es-minimal,
+% es-sloppy}} \end{decl}
+%
+% Usa la siguiente secuencia:\\
% \quad 1.\\
% \qquad \emph{a})\\
% \quad\qquad 1)\\
-% \qquad\qquad \emph{a$'$})\\
-% El segundo la siguiente:\\
+% \qquad\qquad \emph{a$'$})
+%
+% \begin{decl} \txt |\begin{itemize} ... \end{itemize}|%
+% \deact{es-nolists, \textit{es-nolayout, es-minimal,
+% es-sloppy}} \end{decl}
+%
+% Usa la siguiente secuencia:\\
% \quad\leavevmode\hbox to 1.2ex
% {\hss\vrule height .95ex width .8ex depth -.15ex\hss}\\
% \qquad\textbullet\\
% \quad\qquad $\circ$\\
% \qquad\qquad $\diamond$
%
-% \New{4.2}Dos 'ordenes permiten otros estilos en
-% |itemize|: con |\spanishdashitems| se cambia a rayas en todos los
-% niveles, y con |\spanishsignitems|, a \textbullet{} $\circ$
-% $\diamond$ $\triangleright$.
+% \begin{decl}
+% \con |\spanishdashitems \spanishsignitems|
+% \end{decl}
%
-% \item[$\diamond$]
-% |\alph| y |\Alph|\\[1ex]
+% Dos 'ordenes para cambiar a otros estilos en
+% |itemize|: rayas en todos los niveles y \textbullet{} $\circ$
+% $\diamond$ $\triangleright$, respectivamente.
+%
+% \begin{decl}
+% \con |es-nolists|\opp
+% \end{decl}
+%
+% Desactiva los cambios en las listas (aunque |\es@enumerate| y
+% |\es@itemize| siguen disponibles).
+%
+% \subsection{Contadores}
+%
+% \begin{decl}
+% \txt |\alph \Alph|\deact{\textit{es-nolayout, es-sloppy}}
+% \end{decl}
%
% Incluyen la e'ne.
%
-% \item[$\diamond$]
-% |\fnsymbol|\\[1ex]
+% \begin{decl}
+% \txt |\fnsymbol|\deact{\textit{es-nolayout, es-sloppy}}
+% \end{decl}
%
% Se emplean uno, dos, tres... asteriscos (*, **, ***, etc.),
% en lugar de la sucesi'on angloamericana de cruces, barras,
% etc.\footnote{\DOT{162}.}
%
-% \item[$\diamond$]
-% |\guillemotleft| y |\guillemotright|\\[1ex]
+% \begin{decl}
+% \txt |\roman|\deact{es-ucroman, es-lcroman, \textit{es-nolayout, es-minimal, es-sloppy}}
+% \end{decl}
+%
+% Como en castellano no se usan n'umeros romanos en min'uscula,
+% |\roman| se redefine para que los d'e en
+% versalitas.\footnote{\DTL{197}.} La opción de paquete
+% |es-minimal| los desactiva con |es-ucroman|, y |es-sloppy|
+% con |es-lcroman|.
+
+% \begin{decl}
+% \con |es-ucroman|\opp
+% \end{decl}
+%
+% Opción de paquete adicional, que pasa todos los romanos a versales,
+% en caso de que no se quiera la versalita o por incompatibilidad con
+% algún paquete que use de forma indebida |\roman|.\footnote{En
+% el momento de escribir esto, como mínimo son: \textsf{dramatist,
+% epiolmec, flashcards, lipsum, ntheorem, ntheorem-hyper,
+% texmate.} Otros paquetes como \textsf{hyperref, easy} y \textsf{exam}
+% ya han sido corregidos.}
+%
+% \begin{decl}
+% \con |es-lcroman|\opp
+% \end{decl}
+%
+% Como último recurso, de haber problemas con el valor predeterminado
+% o con |es-ucroman|, con esta opción de paquete puede dejarse la
+% definición de \LaTeX, aunque en español los romanos en minúscula
+% sean una falta ortográfica.
+%
+% \begin{decl}
+% \con |es-preindex|\opp
+% \end{decl}
+%
+% \textit{MakeIndex} no puede entender la forma en que |\roman|
+% escribe el n'umero de p'agina, por lo que elimina las l'ineas
+% afectadas. Por ello el archivo |.idx| ha de ser convertido antes de
+% procesarlo con \textit{MakeIndex}. Con este paquete se proporciona
+% la utilidad |romanidx.sty| que se encarga de ello. Simplemente se
+% compone ese archivo con \LaTeX{} y a continuaci'on se responde a las
+% preguntas que se formulan; el archivo resultante, es decir, el que
+% hay que procesar con \textit{MakeIndex,} tiene la extensión
+% \texttt{eix}. Este proceso no es necesario si no se introdujo
+% ninguna entrada de 'indice en p'aginas numeradas con |\roman| (lo
+% cual ser'a lo m'as normal). Si un s'imbolo propio de
+% \emph{MakeIndex} generara problemas, debe encerrarse entre llaves:
+% \verb={"|}=.
+%
+% Con la opción de paquete |es-preindex| se llama desde el
+% documento |romanidx.sty|, de forma que no es necesaria su ejecución
+% aparte. Tampoco pide ningún dato, sino que ha de darse en el
+% documento principal con la siguiente orden.
+%
+% \begin{decl}
+% \con |\spanishindexchars|\marg{encap}\marg{open\_range}\marg{close\_range}
+% \end{decl}
+%
+% De usarse |es-preindex| con un estilo de índice que no tiene los
+% valores predeterminados de estos tres caracteres especiales, hay que
+% darlos con esta orden (es decir, por omisión es
+% \verb+\spanishindexchars{|}{(}{)}+).
+%
+% \begin{decl}
+% \con |\spanishscroman \spanishlcroman \spanishucroman|
+% \end{decl}
+%
+% Finalmente, tres macros permiten cambios temporales en el
+% documento de |\roman| a versalitas, minúsculas y mayúsculas,
+% respectivamente.
+%
+% \subsection{Otros}
+%
+% \begin{decl}
+% \txt |\guillemotleft \guillemotright|\deact{\textit{es-nolayout, es-sloppy}}
+% \end{decl}
%
% Las comillas latinas para |OT1| son menos angulosas y se generan
-% con unas puntas de flecha de |lasy|.
-%
-% \item[$\diamond$]
-% |\roman|\\[1ex]
-%
-% Como en castellano no se usan n'umeros romanos
-% en min'uscula, |\roman| se redefine para que los d'e en
-% versalitas.\footnote{\DTL{197}. Los n'umeros romanos con
-% versalitas son desconocidos en ingl'es, donde se prefiere
-% la min'uscula. En la Europa continental, la situaci'on es
-% justamente la opuesta.}
-%
-% \begin{quote}\small
-% \textbf{Nota.} MakeIndex no puede entender la forma en que
-% |\roman| escribe el n'umero de p'agina, por lo
-% que elimina las l'ineas afectadas. Por ello el archivo |.idx|
-% ha de ser convertido antes de procesarlo con MakeIndex.
-% Con este paquete se proporciona la utilidad |romanidx.tex| que se
-% encarga de ello. Simplemente se compone ese archivo con \LaTeX{}
-% y a continuaci'on se responde a las preguntas que se formulan.
-% Este proceso no es necesario si no se introdujo ninguna
-% entrada de 'indice en p'aginas numeradas con |\roman| (lo cual ser'a
-% lo m'as normal). Si un s'imbolo propio de \emph{MakeIndex} generara
-% problemas, debe encerrarse entre llaves: \verb={"|}=.
-% \end{quote}
+% con unas puntas de flecha de |lasy|. En T1 no hay cambios.
%
-% \item[$\diamond$]
-% |\section|, |\subsection|, etc.\\[1ex]
+% \begin{decl}
+% \txt |\section|, |\subsection|, etc.,
+% |\tableofcontents|\deact{es-nosectiondot, es-noindentfirst, \textit{es-nolayout,
+% es-mininal, es-sloppy}}
+% \end{decl}
%
% Los n'umeros en los t'itulos est'an seguidos de un punto
% tanto en el texto como en el 'indice. Adem'as,
-% el primer p'arrafo tras el t'itulo no elimina la sangr'ia
-% (de nuevo, una costumbre angloamericana).
-%
-% \end{itemize}
-%
-% Estos cambios funcionan con las clases est'andar ~---con otras
-% tal vez alguno de ellos no tenga efecto--- y persisten durante
-% todo el documento (no se pueden desactivar). Ninguno de ellos
-% es necesario para componer el documento, aunque naturalmente el
-% resultado ser'a distinto.
-%
-% \begin{itemize}
-%
-% \item[$\diamond$]
-% |\selectspanish*|\\[1ex]
+% el primer p'arrafo tras el t'itulo no elimina la sangr'ia.
%
-% \New{4.1}Si no se desean estos cambios, basta con usar en el
-% pre'ambulo |\selectspanish*| (con asterisco) o <<borrarlos>> con:
-%\begin{verbatim}
-% \let\layoutspanish\relax
-%\end{verbatim}
+% \begin{decl}
+% \con |es-nolayout|\opp
+% \end{decl}
%
-% \end{itemize}
+% Si no se desea ninguno de estos cambios, basta con usar esta opción
+% de paquete.
%
-% \section{Descripci'on}
+% \section{Traducciones}
%
-% \subsection{Traducciones}
+% \subsection{Nombres}
%
-% Ciertas 'ordenes se definen para
-% proporcionar traducciones al castellano de algunos t'erminos, tal
-% y como se describe en el cuadro 1.
+% \begin{decl}
+% \txt |\refname|, |\tablename|, |\contentsname|, etc.\\
+% \con |\spanishrefname|, |\spanishtablename|, |\spanishcontentsname|, etc.
+% \act{captions}
+% \end{decl}
+%
+% Establecen las traducciones al castellano de algunos t'erminos,
+% tal y como se describe en el cuadro 1. Para cambiar el texto
+% de ellas, conviene redefinir la forma que empieza con
+% |\spanish...|, ya que, al contrario que las órdenes
+% |\refname|, |\abstractname|, etc., se pueden redefinir cuando
+% se desee y entran en acción al momento y de forma permanente, sin
+% necesidad de |\addto|.
%
% \begin{table}
% \center\small
+% \newcommand\name[2]{%
+% \texttt{\textbackslash#1name}&%
+% \texttt{\textbackslash spanish#1name}&}
% \caption{Traducciones}
% \vspace{1.5ex}
-% \begin{tabular}{l@{\hspace{3em}}l}
-% \toprule
-% |\refname| & Referencias\\
-% |\abstractname| & Resumen\\
-% |\bibname| & Bibliograf'ia\\
-% |\chaptername| & Cap'itulo\\
-% |\appendixname| & Ap'endice\\
-% |\contentsname| & 'Indice general\nm{a}\\
-% |\listfigurename| & 'Indice de figuras\\
-% |\listtablename| & 'Indice de cuadros\\
-% |\indexname| & 'Indice alfab'etico\\
-% |\figurename| & Figura\\
-% |\tablename| & Cuadro\\
-% |\partname| & Parte\\
-% |\enclname| & Adjunto\\
-% |\ccname| & Copia a\\
-% |\headtoname| & A\\
-% |\pagename| & P'agina\\
-% |\seename| & v'ease\\
-% |\alsoname| & v'ease tambi'en\\
-% |\proofname| & Demostraci'on
-% \botrule
+% \begin{tabular}{l@{\hspace{3em}}l@{\hspace{3em}}l}
+% \toprule3
+% \name{ref} & Referencias\\
+% \name{abstract} & Resumen\\
+% \name{bib} & Bibliograf'ia\\
+% \name{chapter} & Cap'itulo\\
+% \name{appendix} & Ap'endice\\
+% \name{contents} & 'Indice general\nm{a}\\
+% \name{listfigure} & 'Indice de figuras\\
+% \name{listtable} & 'Indice de cuadros\\
+% \name{index} & 'Indice alfab'etico\\
+% \name{figure} & Figura\\
+% \name{table} & Cuadro\\
+% \name{part} & Parte\\
+% \name{encl} & Adjunto\\
+% \name{cc} & Copia a\\
+% \name{headto} & A\\
+% \name{page} & p'agina\\
+% \name{see} & v'ease\\
+% \name{also} & v'ease tambi'en\\
+% \name{proof} & Demostraci'on
+% \botrule3
% \end{tabular}
%
% \vspace{1.5ex}
%
-% \begin{minipage}{6cm}\footnotesize
+% \begin{minipage}{10cm}\footnotesize
% \nt{a} Pero s'olo <<'Indice>> en \textsf{article}.
% \end{minipage}
% \end{table}
%
-% No existe una terminolog'ia unificada.
-% Tal vez \emph{'Indice general} es lo
-% que m'as se usa para el 'indice de los cap'itulos, as'i que a
-% ello me atengo salvo en |article|, donde se compone como secci'on
-% y por tanto resulta algo ostentoso.\footnote{Al contrario que en
-% ingl'es, en castellano el 'indice por antonomasia es el general.}
-%
-% Para el 'indice alfab'etico se ha propuesto \emph{'Indice de
-% materias} o \emph{'Indice anal'itico}, aunque
-% estos 'indices no solamente suelen incluir
-% materias, sino tambi'en nombres; \emph{'Indice alfab'etico} es
-% m'as preciso.\footnote{Es la usada en \DOT{300} as'i
-% como en la mayor'ia de los libros que consult'e al azar en una
-% biblioteca.}
-%
-% En cuanto a los de cuadros y figuras, tambi'en es posible decir
-% \emph{lista}, pero me parece preferible \emph{'indice}, que
-% implica la correspondencia con las p'aginas.
-%
-% Para traducir \emph{table} es mejor \emph{cuadro}, ya que
-% \emph{tabla} es un \emph{falso amigo};\,\footnote{V'eanse las
-% definiciones del \lsc{DRAE} y \DTL{67 ss.}} esa es la pr'actica
-% tradicional. (Por ejemplo, <<cuadro de estados medievales>>
-% frente a <<tabla de logaritmos>>.)
-%
-% Las traducciones se escriben de min'usculas, salvo la inicial.
-% Se evita el anglicismo de comenzar en
-% may'usculas los sustantivos.\footnote{\DOT{197}.}
-%
-% La orden |\today| da la fecha actual. \New{4.2}Aunque al citar
-% a'nos posteriores a 1999 la Academia s'olo admite la supresi'on del
-% art'iculo en cartas y documentos, en la pr'actica se ha extendido
-% esta construcci'on agramatical y as'i se hace aqu'i. Con
-% |\spanishdatedel| y |\spanishdatede| se opta por \textit{del}
-% (recomendado) o \textit{de} (predeterminado).
-%
-% \subsection{Abreviaciones}
-%
-% (Lo que en \babel{} se denomina `shorthands'.) La
-% lista completa se puede encontrar en el cuadro 2. En los
+% \begin{decl}
+% \con |es-uppernames|\opp
+% \end{decl}
+%
+% Aunque sea un anglicismo,\footnote{\DOT{197}.} con esta opción de
+% paquete los sustantivos tienen mayúscula inicial.
+%
+% \begin{decl}
+% \con |es-tabla|\opp
+% \end{decl}
+%
+% En caso de que todos los cuadros sean tablas, esta opción permite
+% cambiar \textit{cuadro} por \textit{tabla} (en cierto modo,
+% \textit{cuadro} es a \textit{tabla} lo que \texttt{table} es a
+% \texttt{tabular}).
+%
+% \subsection{Fechas}
+%
+% \begin{decl}
+% \txt |\today \Today|
+% \act{date}
+% \end{decl}
+%
+% Fecha actual, en la forma \textit{1 de enero de
+% 2004.} Con |\Today| el mes va en mayúscula.
+%
+% \begin{decl}
+% \con |\spanishdatedel \spanishdatede|
+% \end{decl}
+%
+% Con la primera se cambia el formato para que a partir del 2000 se
+% emplee \textit{del} y no \textit{de} (recomendado). La segunda
+% hace justo lo contrario (predeterminado).
+%
+% \begin{decl}
+% \con |\spanishreverseddate|
+% \end{decl}
+%
+% Cambia el formato de |\today| a la forma
+% \textit{enero 1 del 2004.} Con |\Today| el mes va en
+% mayúscula.
+%
+% \section{Abreviaciones (\textit{shorthands})}
+%
+% La lista completa se puede encontrar en el cuadro 2. En los
% siguientes apartados se dar'an m'as detalles sobre algunas de
% ellas.
%
@@ -344,119 +491,117 @@
% \center\small
% \caption{Abreviaciones}
% \vspace{1.5ex}
-% \begin{tabular}{l@{\hspace{3em}}l}
-% \toprule
+% \begin{tabular}{l@{\hspace{3em}}l@{\hspace{3em}}l}
+% \toprule2
% |'a 'e 'i 'o 'u| & 'a 'e 'i 'o 'u\\
% |'A 'E 'I 'O 'U| & 'A 'E 'I 'O 'U\\
% |'n 'N| & 'n 'N\nm{a}\\
% |"u "U| & "u "U\\
+% |"i "I| & "i "I\\
% |"a "A "o "O| & Ordinales: 1"a, 1"A, 1"o, 1"O\\
-%\llap{\textsf{Nuevo en 4.2 }}\relax
% |"er "ER| & Ordinales: 1"er, 1"ER\\
-% |"c "C| & "c "C\nm{b}\\
-% |"rr "RR| & rr, pero -r cuando se divide\\
+% |"c "C| & "c "C\\
+% |"rr "RR| & rr, pero -r cuando se divide\\
% |"y| & El antiguo signo para <<y>>\\
% |"-| & Como |\-|, pero permite m'as divisiones\\
-% |"=| & Como |-|, pero permite mas divisiones\nm{c}\\
-% |"~| & Gui'on estil'istico\nm{d}\\
-% |~- ~-- ~---| & Como |-|, |--| y |---|, pero sin divisi'on\\
-% |""| & Permite mas divisiones antes y despu'es\nm{e}\\
+% |"=| & Como |-|, pero permite mas divisiones\nm{b}\\
+% |"~| & Gui'on estil'istico\nm{c}\\
+% |"+ "+- "+--| & Como |-|, |--| y |---|, pero sin divisi'on\\
+% |~- ~-- ~---| & Lo mismo que el anterior.\\
+% |""| & Permite mas divisiones antes y despu'es\nm{d}\\
% |"/| & Una barra algo m'as baja\\
-% \verb+"|+ & Divide un logotipo\nm{f}\\
+% \verb+"|+ & Divide un logotipo\nm{e}\\
% |"< ">| & "< ">\\
-% |<< >>| & |\begin{quoting}| |\end{quoting}|\nm{g}\\
-% |?` !`| & ?` !`\nm{h}\\
-%\llap{\textsf{Nuevo en 4.2 }}\relax
-%|"? "!| & "? "! alineados con la linea base\nm{i}
-% \botrule
+% |"` "'| & |\begin{quoting}| |\end{quoting}|\nm{f}\\
+% |<< >>| & Lo mismo que el anterior.\\
+% |?` !`| & ?` !`\nm{g}\\
+%|"? "!| & "? "! alineados con la linea base\nm{h}
+% \botrule2
% \end{tabular}
%
% \vspace{1.5ex}
%
% \begin{minipage}{11cm}
% \footnotesize
-% \nt{a} La forma |~n| debe considerarse en extinci'on.
-% \nt{b} La cedilla ya no se usa, pero se us'o anta'no.
-% \nt{c} |"=| viene a ser lo mismo que |""-""|.
-% \nt{d} Esta abreviaci'on tiene un uso distinto
-% en otras lenguas. \nt{e} Como en <<entrada/salida>>.
-% \nt{f} Carece de uso en castellano. \nt{g} V'ease sec.~2.7.
-% \nt{h} No proporcionadas por este paquete, sino por cada tipo;
-% figuran aqu'i como simple recordatorio. \nt{i} 'Utiles en
-% r'otulos en may'usculas.
+% \nt{a} La forma |~n| no está activada por omisión a partir de
+% la versión 5.
+% \nt{b} |"=| viene a ser lo mismo que |""-""|.
+% \nt{c} Esta abreviaci'on tiene un uso distinto
+% en otras lenguas de babel.
+% \nt{d} Como en <<entrada/salida>>.
+% \nt{e} Carece de uso en castellano.
+% \nt{f} V'ease sec.~2.7.
+% \nt{g} No proporcionadas por este paquete, sino por cada tipo;
+% figuran aqu'i como simple recordatorio.
+% \nt{h} 'Utiles en r'otulos en may'usculas.
% \end{minipage}
% \end{table}
-%
-% Para poder usar ap'ostrofos como abreviaciones de acentos
-% es necesaria la opci'on |activeacute| en |\usepackage|.
-% Puede cambiarse este comportamiento con
-% la orden |\es@acuteactive| en el archivo de configuraci'on
-% |spanish.cfg|; en ese caso los ap'ostrofos se activan siempre.
-%
-% \New{4.1} La conjunci'on \textit{y} es de por s'i bastante breve,
-% por lo que en espa'nol no se han usado signos sustitutorios
-% desde hace varios siglos. Sin
-% embargo, existe un signo parecido a un dos dado la vuelta, que
-% desapareci'o tras el Renacimento y que se emplea hoy en ediciones
-% paleogr'aficas. Se puede <<imitar>> con |"y|, siempre que se
-% haya cargado el paquete |graphics|; de no ser as'i, se usa la letra
-% $\tau$, aunque la variante normal de \TeX{} no es demasiado
-% apropiada.
-%
+%
% Los caracteres usados como abreviaciones se comportan
% como otras 'ordenes de \TeX{} y por tanto se hace caso
% omiso de los espacios que le puedan seguir: \verb*|' a| es lo mismo
% que |'a|. Eso tambi'en implica que tras esos caracteres no
% puede ir una llave de cierre y que deber'a escribirse
% |{... '{}}| en lugar de |{... '}|; en modo matem'atico no hay
-% problema y |$x^{a'}$| ($x^{a'}$) es v'alido. \New{4.1}
-%
-% \begin{itemize}
+% ningún problema y |$x^{a'}$| ($x^{a'}$) es v'alido.
%
-% \item[$\diamond$]
-% |\deactivatetilden|\\[1ex]
+% \begin{decl}
+% \con |activeacute|\opp
+% \end{decl}
+%
+% Para poder usar ap'ostrofos como abreviaciones de acentos es
+% necesaria esta opci'on en |\usepackage|. Puede cambiarse este
+% comportamiento con la orden |\es@acuteactive| en el archivo de
+% configuraci'on |spanish.cfg|; en ese caso los ap'ostrofos se activan
+% siempre.
+%
+% \begin{decl}
+% \con |es-tilden|\opp
+% \end{decl}
%
-% Esta orden desactiva las abreviaciones |~n| y |~N| debido a
-% los problemas que presentan. Puede usarse en el archivo
-% de configuraci'on (v'ease m'as abajo).
+% Esta orden activa las abreviaciones |~n| y |~N| por compatibilidad
+% con versiones anteriores de \textsf{spanish} (y siempre que no se
+% empleado también |es-notilde|). En la versión 5 no están
+% activadas de forma predeterminada.
%
-% % \item[$\diamond$]
-% |\spanishdeactivate{<caracteres>}|\\[1ex]
+% \begin{decl}
+% \con |\spanishdeactivate|\marg{caracteres}
+% \end{decl}
%
-% \New{4.1}Permite desactivar las abreviaciones correspondientes a los
+% Permite desactivar las abreviaciones correspondientes a los
% caracteres dados. Para evitar entrar en conflicto con otras lenguas,
-% al salir de |spanish| se reactivan,\footnote{El punto para
+% al salir de \textsf{spanish} se reactivan,\footnote{El punto para
% los decimales no es estrictamente una abreviaci'on y no se
% reactiva.} por lo que si se desea que
-% persista hay que a'nadir la orden a |\shorthandsspanish| con
+% persistan hay que a'nadir la orden a |\shorthandsspanish| con
%|\addto|. La orden |\renewcommand\shorthandsspanish{}| es una
% variante optimizada de
%\begin{verbatim}
% \addto\shorthandsspanish{\spanishdeactivate{.'"~<>}}
%\end{verbatim}
-% y es lo recomendado si se desea
-% prescindir del mecanismo de abreviaciones.
-% \end{itemize}
%
+% \begin{decl}
+% \con |es-noshorthands|\opp
+% \end{decl}
+%
+% No activa ninguna abreviación.
+%
% \subsection{Coma decimal}
%
-% Tanto el ingl'es como el castellano y otras lenguas tienen sus
-% formas tradicionales de representar la coma decimal. En ingl'es
-% es algo como $12{\cdot}34$, mientras que en castellano
-% es $12$'$34$. Adem'as, los millares se pueden separar por coma en
-% ingl'es y punto en castellano.\footnote{Excepto en a'nos, donde
-% siempre se escriben las cifras juntas: \emph{1978, 1998}.}
-% Tales formas deben ser descartadas, pues se ha llegado a
-% una normalizaci'on internacional donde los millares se
-% separan por un espacio fino y los decimales con coma.\footnote{%
-% La ISO admite el punto en pa'ises donde haya sido esa
-% la tradici'on, aunque recomienda que se adapten a la coma.}
+% \begin{decl}
+% \txt |.|\textit{número}\act{shorthands}\deact{es-nodecimaldot,
+% \textit{es-noshorthands, es-minimal, es-sloppy}}
+% \end{decl}
%
+% En \textsf{spanish}, el punto en matemáticas sirve como marca decimal
+% genérica que puede representarse como coma o punto; funciona
+% por tanto como marcado lógico del signo para decimales. Por
+% omisión, se siguen las normas internacionales ISO y la legislación
+% de diversos países (como de España y México) de emplear la coma.
% Ya que \TeX\ usa la coma como separador en intervalos o expresiones
% similares, lo que a'nade un espacio fino, \textsf{spanish}
-% convierte todo punto en modo matem'atico en
-% una coma siempre que est'e seguido de una cifra, pero no en otras
-% circunstancias:
+% interpreta todo punto en modo matem'atico de esta forma siempre
+% que est'e seguido de una cifra, pero no en otras circunstancias:
% \begin{quote}\small\begin{tabbing}
% |$1\,234.567\,890$| \quad \= $1\,234.567\,890$\\
% |$f(1,2)=12.34.$| \> $f(1,2)=12.34.$\\
@@ -464,12 +609,20 @@
% |1.000| \> 1.000, pues no es modo matem'atico.
% \end{tabbing}\end{quote}
%
-% Las 'ordenes |\decimalcomma| y |\decimalpoint|
-% establecen si se usa una coma, que es el valor predeterminado,
-% o un punto, mientras que |\spanishdecimal{<math>}| permite darle
-% una definici'on arbitraria.\footnote{Internamente el mecanismo es
-% de una abreviaci'on, y se puede desactivar como las otras.
-% \textsf{Nuevo 4.2}}
+%
+% \begin{decl}
+% \con |\decimalcomma \decimalpoint \spanishdecimal|\marg{math}
+% \end{decl}
+%
+% Las dos primeras establecen si se usa una coma (predeterminado)
+% o un punto, mientras que |\spanishdecimal|\marg{math}
+% permite darle una definici'on arbitraria.
+%
+% \begin{decl}
+% \con |es-nodecimaldot|\opp
+% \end{decl}
+%
+% Cancela por completo el mecanismo del punto decimal.
%
% \subsection{Divisi'on de palabras}
%
@@ -479,6 +632,11 @@
% la divisi'on, que pese a todo nunca ser'a perfecta, mientras que con
% |T1| se accede directamente al car'acter correspondiente.
%
+% \begin{decl}
+% \txt |"- "= "~|\act{shorthands}
+% \deact{\textit{es-noshorthands, es-sloppy}}
+% \end{decl}
+%
% Para matizar la divisi'on de palabras hay cuatro posibilidades, dos
% de ellas con el m'etodo de abreviaciones:
% \begin{itemize}
@@ -510,25 +668,36 @@
% 'Este es un comportamiento correcto.}
% \end{quote}
%
-% Adem'as. hay abreviaciones que evitan
-% divisiones: |~-|, que resulta 'util para expresar una serie de
-% n'umeros sin que el gui'on los divida (12~-14, |12~-14|), y |~---|,
-% que es la forma que debe usarse para abrir incisos con rayas, ya que
-% de lo contrario puede haber una divisi'on entre la raya de abrir y
-% la palabra que le sigue:
-% \begin{quote}\small\begin{tabbing}
-% |Los conciertos ~---o academias--- que organiz'o...|
-% \end{tabbing}\end{quote}
-% Mientras que este gui'on evita toda posible divisi'on en los
-% elementos que une, la raya (---) y la semirraya (--) las permiten
-% en las palabras que le precedan o le sigan.
-%
% La abreviaci'on |"~| se usa cuando se quiere que el gui'on
% tambi'en aparezca al comienzo de la siguiente l'inea. Por ejemplo:
% \begin{quote}\small\begin{tabbing}
% |infra"~rojo| \quad \= in\hmk fra-ro\hmk jo, pero infra-\hmk-rojo.
% \end{tabbing}\end{quote}
%
+% \begin{decl}
+%\txt |"+ "+- "+--|\act{shorthands}\deact{\emph{no-shorthands,
+% es-sloppy}}
+% \end{decl}
+%\vskip-1.5pc\vskip0pt
+% \begin{decl}
+% \txt |~- ~-- ~---|\act{shorthands}\deact{es-notilde, \emph{no-shorthands,
+% es-minimal, es-sloppy}}
+% \end{decl}
+
+% Evitan divisiones: |~-|, que resulta 'util para expresar una serie
+% de n'umeros sin que el gui'on los divida (12~-14, |12~-14|), y
+% |~---|, que es la forma que debe usarse para abrir incisos con
+% rayas, ya que de lo contrario puede haber una divisi'on entre la
+% raya de abrir y la palabra que le sigue:
+% \begin{quote}\small\begin{tabbing}
+%|Los conciertos ~---o % academias--- que organiz'o...|
+% \end{tabbing}\end{quote}
+%
+% También pueden emplearse para esta misma función las abreviaciones
+% |"+|, |"+-| y |"+---|. Mientras que este gui'on evita toda posible
+% divisi'on en los elementos que une, la raya (---) y la semirraya
+% (--) las permiten en las palabras que le precedan o le sigan.
+%
% Otra abreviaci'on es |"rr| que sirve para el
% 'unico cambio de escritura del castellano en caso de haber divisi'on.
% La \lsc{RAE} indica que al a'nadir un prefijo que termina en vocal a
@@ -542,99 +711,148 @@
% aplicarse o no, aunque la opini'on mayoritaria actual est'a en
% contra.
%
-% \subsection{Ordinales}
-%
-% Las abreviaturas siempre llevan punto, salvo algunas en que
-% se sustituye por una barra (y salvo las siglas y s'imbolos,
-% naturalmente), que precede a las letras voladitas.\footnote{Puede
-% comprobarse en \DTL{196}. V'ease tambi'en \DOT{222 y 227}.}
-% Por ello, \textsf{spanish} proporciona la orden
-% |\sptext| que facilita la creaci'on de estas abreviaturas. Por
-% ejemplo: |adm\sptext{'on}| que da adm\sptext{'on}. Hay seis abreviaciones
-% asociadas a ordinales: |"a|, |"A|, |"o|, |"O|, |"er| y |"ER| que equivalen a
-% |\sptext{a}|, etc.\footnote{Muchos tipos a'naden
-% un peque'no subrayado que debe evitarse, y por tanto no se debe
-% escribir los ordinales con \textsf{inputenc}.}
+% \subsection{Otros}
+%
+% \begin{decl}
+% \txt |"/|\act{shorthands}\deact{\textit{es-noshorthands, es-sloppy}}
+% \end{decl}
+%
+% Es una utilidad tipogr'afica m'as que espec'ificamente espa'nola.
+% En ciertos tipos, como Times, el extremo inferior de la barra est'a
+% en la l'inea de base y expresiones como <<am/pm>> resultan poco
+% est'eticas. |"/| produce una barra que, de ser necesario, se baja
+% ligeramente. Computer Modern tiene una barra bien dise'nada y no es
+% posible ilustrar aqu'i este punto pero en todo caso se escribir'ia
+% |am"/pm|.\footnote{En \MEA{141} se recurre a una soluci'on que es la
+% 'unica sencilla en programas de maquetaci'on: usar un cuerpo menor.
+% Pero con \TeX{} es mucho m'as f'acil automatizar las tareas.}
+%
+% \begin{decl}
+% \txt |"y|\act{shorthand}\deact{\textit{es-noshorthands, es-sloppy}}
+% \end{decl}
+%
+% El signo \textit{et tironiano}, que en español se empleó muy a
+% menudo, se puede <<imitar>> con |"y|, siempre que se haya cargado el
+% paquete |graphics|; de no ser as'i, se usa la letra $\tau$, aunque
+% la variante normal de \TeX{} no es demasiado apropiada.
+%
+% \section{Funciones de texto y matemáticas}
+%
+% \subsection{Abreviaturas}
+%
+% \begin{decl}
+% \txt |\sptext|\marg{texto}\act{text}\deact{\textit{es-sloppy}}
+% \end{decl}
+%
+% Pone un punto y le sigue el argumento en voladitas. Para
+% abreviaturas como |adm\sptext{'on}| que da adm\sptext{'on}. Hay seis
+% abreviaciones asociadas a ordinales: |"a|, |"A|, |"o|, |"O|, |"er| y
+% |"ER| que equivalen a |\sptext{a}|, etc. Muchos tipos
+% a'naden un peque'no subrayado que debe evitarse, y por tanto no se
+% deben escribir los ordinales con \textsf{inputenc}.
%
% Para ajustar el tama'no lo mejor posible, se usa el de
% 'indices en curso. Esto funciona bien salvo para tama'nos muy
% grandes o muy peque'nos, donde los resultados son meramente
% aceptables.
%
-% \New{4.1}En Plain \TeX{} se ejecuta la orden |\sptextfont| para la
+% En Plain \TeX{} se ejecuta la orden |\sptextfont| para la
% letra voladita, de forma que |{\bf\let\sptextfont\bf 1"o}| da el
% resultado correcto (|\mit| si es para cursiva). Para usar un tipo
% nuevo con |\sptext| hay que definir tambi'en las variantes
% matem'aticas con |\newfam|.
+%
+% \subsection{Espaciado}
%
-% \subsection{Funciones matem'aticas}
+% Salvo excepciones, el espaciado espa'nol difiere relativamente poco
+% del ingl'es; una de ellas es que en \textsf{spanish} |\frenchspacing|
+% est'a activo.
+%
+% \begin{decl}
+% \txt |\...|\act{text}\deact{\textit{es-sloppy}}
+% \end{decl}
%
-% Tradicionalmente, se han formado las abreviaciones
-% de lo que en \TeX\ se conocen como operadores a partir
-% del nombre castellano, lo que implica la presencia del
-% acento en l'im (en sus tres formas |\lim|, |\limsup| y |\liminf|),
-% m'ax, m'in, 'inf y m'od (en sus dos
-% formas |\bmod| y |\pmod|).
+% Puntos suspensivos menos espaciados que |\dots|. El espacio
+% que sigue se conserva:
+% \begin{quote}\small\begin{tabbing}
+% |\... y solo estaba\... ella.|\quad\=\... y solo estaba\... ella.
+% \end{tabbing}\end{quote}
+% Tambi'en podr'ian escribirse los tres puntos sin m'as |...|, y en
+% la pr'actica no hay diferencia, a menos que se cambie el
+% valor del espacio tras punto; en ese caso, la forma con barra
+% da los valores apropiados \emph{dentro} de una sentencia, y
+% los tres puntos \emph{al final} de ella. Esta orden no
+% interfiere con el valor original de |\.| (un punto suprascrito).
%
-% Con |spanish| pueden seguirse varias convenciones con ayuda
-% de las siguientes 'ordenes:
-% \begin{itemize}
-% \item[$\diamond$] |\accentedoperators| |\unaccentedoperators|\\[1ex]
-% Activa o desactiva los acentos.
-% Por omisi'on se acent'uan, como por ejemplo: $\lim_{x\to 0}(1/x)$
-% (|$\lim_{x\to 0}(1/x)$|).
+% \begin{decl}
+% \txt |\%|\act{text}\deact{\textit{es-minimal, es-sloppy}}
+% \end{decl}
+%
+% Se añade un espacio fino antes del signo (que
+% m'as exactamente es |\,|, con lo cual se puede "<recuperar"> con
+% su opuesto |\!| si |\%| no sigue a una cifra; también se puede
+% emplear |\percentsign|).
+%
+% \begin{decl}
+% \con |\spanishplainpercent|
+% \end{decl}
+%
+% Orden para que |\%| no añada el espacio fino. Puede ser útil
+% en cuadros, si |\%| aparece siempre entre paréntesis.
+%
+% \subsection{Fuentes}
+%
+% \begin{decl}
+% \txt |\lsc|\marg{texto}\act{text}\deact{\textit{es-sloppy}}
+% \end{decl}
+%
+% Pasa \textit{texto} a versalitas:
+% \begin{quote}\small\begin{tabbing}
+% |\lsc{RAE}| \quad \= \lsc{RAE}\\
+% |\lsc{ReNFe}| \quad \= \lsc{ReNFe}.\\
+% |siglo \lsc{XVII}| \quad \= siglo \lsc{XVII}\\
+% |cap'itulo \lsc{II}| \quad \= cap'itulo \lsc{II}.
+% \end{tabbing}\end{quote}
%
-% \item[$\diamond$] |\spacedoperators| |\unspacedoperators|\\[1ex]
-% Activa o desactiva el espacio entre "<arc"> y la funci'on.
-% Lo habitual ha sido con espacio; as'i pues, por omisi'on
-% se espacia.
-% \end{itemize}
+% Para evitar que con un tipo que carece de versalitas acabe
+% apareciendo (por substituci'on) un texto de min'usculas se intenta
+% usar en estos casos las versales \emph{reales} de un tama'no menor
+% (\LaTeX\ tiende a sustituir versalitas por versalitas, pero hay
+% excepciones, como con las negritas).
%
-% La i sin punto tambi'en es accesible directamente en modo
-% matem'atico con la orden |\dotlessi|, de forma que se puede escribir
-% |\acute{\dotlessi}|. Por ejemplo,
-% |$V_{\mathbf{cr\acute{\dotlessi}t}}$| da
-% $V_{\mathbf{cr\acute{\dotlessi}t}}$.
+% \begin{decl}
+% \txt |\'i|\alw
+% \end{decl}
%
-% Tambi'en se a'naden |\sen|, |\arcsen|, |\tg| y |\arctg|,
-% que dan las funciones respectivas. Otras funciones trigonom'etricas
-% se encuentran almacenadas en el par'ametro |\spanishoperators|, que
-% inicialmente incluye cotg, cosec, senh y tgh. La raz'on por la que
-% estas funciones se han separado es porque ~---al contrario que sen
-% y tg~--- su forma est'a lejos de estar normalizada en el 'ambito
-% hispanohablante. De esta
-% forma se puede cambiar por otras con, por ejemplo:
-%\begin{verbatim}
-% \renewcommand{\spanishoperators}{ctg arc\,ctg sh ch th}
-%\end{verbatim}
-% (separadas con espacio). Cuando se selecciona |spanish| se crean
-% 'ordenes con esos nombres
-% y que dan esas funciones (siempre con |\nolimits|). Adem'as de
-% las letras sin acentuar se aceptan las 'ordenes |\,| y |\acute|, que
-% se pasan por alto para formar el nombre. \New{4.2}Por ejemplo, |arc\,ctg|
-% se escribe en el documento con
-% |\arcctg|, |M\acute{a}x| como |\Max| y |cr\acute{i}t| como |\crit|
-% (hay que usar |i| y no |\dotlessi|).
-% La orden |\,| responde a |\|(|un|)|spacedoperators|, y |\acute|
-% a |\|(|un|)|accentedoperators|.
-%
-% Conviene que |\spanishoperators| est'e en el pre'ambulo del
-% documento en s'i, antes de |\selectspanish| o de
-% |\begin{document}|.
+% Lo mismo que |\'{\i}|.
%
% \subsection{Entrecomillados}
%
+% \begin{decl}
+% \txt |\begin{quoting} ... \end{quoting}|\alw
+% \end{decl}
+%
% El entorno |quoting| entrecomilla un
% texto, a'nadiendo comillas de seguir al comienzo de
% cada p'arrafo en su interior.\footnote{Se puede encontrar
% una detallada exposici'on de las comillas en \DTL{44 ss.} De ah'i
% se ha tomado alg'un ejemplo.}
-% Tambi'en se pueden emplear las
-% abreviaciones |<<| y |>>| que se limitan a llamar a |quoting|, que
-% por ser entorno considera sus cambios internos como locales. (Es
-% decir, |<< ... >>| implica |{<< ... >>}|.)
-% Las abreviaciones |"<| y |">| contin'uan dando sin m'as los
-% caracteres de comillas de abrir y cerrar, respectivamente.
+%
+% \begin{decl}
+% \txt |<< >>|\act{shorthands}\deact{es-noquoting, \textit{es-noshorthands, es-minimal,
+% es-sloppy}}
+% \end{decl}
+%\vskip-1.5pc\vskip0pt
+% \begin{decl}
+% \txt |"` "'|\act{shorthands}\deact{\textit{es-noshorthands, es-sloppy}}
+% \end{decl}
+%
+% Tambi'en se pueden emplear las abreviaciones |<<| y |>>| (o
+% alternativamente |"`| y |"'|) que se limitan a llamar a |quoting|,
+% que por ser entorno considera sus cambios internos como locales.
+% (Es decir, |<< ... >>| implica |{<< ... >>}|.) Las abreviaciones
+% |"<| y |">| contin'uan dando sin m'as los caracteres de comillas de
+% abrir y cerrar, respectivamente.
%
% Por ejemplo:
%\begin{verbatim}
@@ -652,6 +870,9 @@
%
% En su interior, como de costumbre, se usan inglesas.>>
% \end{quotation}
+%
+% También se añaden comillas de seguir en listas, excepto con la
+% opción \texttt{es-nolists} o cualquier otra que las desactive.
%
% Este entorno se puede redefinir, como por ejemplo:
%\begin{verbatim}
@@ -660,32 +881,10 @@
% pero en principio no implica un nuevo p'arrafo, ya que
% est'a pensado para ser usado tambi'en en el texto.
%
-% En caso de anidar entornos |quoting|, se modifican las comillas
-% de los niveles interiores, que tambi'en se a'naden a las de seguir:
-%\begin{verbatim}
-% <<El di'alogo se desarroll'o de esta forma:
-%
-% <<---Yo no he sido ---grit'o Antonio.
-%
-% ---Pero has colaborado ---asegur'o Rafael>>.
-%
-% Pero all'i no se aclar'o nadie.>>
-%\end{verbatim}
-%
-% \begin{quotation}\small
-% <<El di'alogo se desarroll'o de esta forma:
-%
-% <<---Yo no he sido ---grit'o Antonio.
-%
-% ---Pero has colaborado ---asegur'o Rafael>>.
-%
-% Pero all'i no se aclar'o nadie.>>
-% \end{quotation}
-%
-% \begin{itemize}
-% \item[$\diamond$]
-% |\lquoti| |\rquoti| |\lquotii| |\rquotii| |\lquotiii|
-% |\rquotiii|\\[1ex]
+% \begin{decl}
+% \con |\lquoti| |\rquoti| |\lquotii| |\rquotii| |\lquotiii|
+% |\rquotiii|
+% \end{decl}
%
% Controlan las comillas en |quoting|, seg'un el
% nivel en que nos encontremos. |\lquoti| son las comillas de abrir
@@ -697,54 +896,32 @@
% \caption{Entrecomillados}
% \vspace{1.5ex}
% \begin{tabular}{l@{\hspace{5em}}l}
-% \toprule
+% \toprule2
% |\lquoti| &|"<|\\
% |\rquoti| &|">|\\
% |\lquotii| &|``|\\
% |\rquotii| &|''|\\
% |\lquotiii| &|`|\\
% |\rquotiii| &|'|
-% \botrule
+% \botrule2
% \end{tabular}
% \end{table}
%
-% \newenvironment{dialog}
-% {\def\lquoti{}\begin{quoting}---\ignorespaces}
-% {\def\rquoti{}\end{quoting}}
-%
-% Las comillas de seguir tambi'en se emplean en di'alogos, incluso
-% si no las hay de abrir y cerrar. Con la ayuda del siguiente
-% entorno,
-%\begin{verbatim}
-% \newenvironment{dialog}
-% {\def\lquoti{}\begin{quoting}---\ignorespaces}
-% {\def\rquoti{}\end{quoting}}
-%\end{verbatim}
-% podemos obtener
-% \begin{quotation}\small
-% \begin{dialog}%
-% El di'alogo se desarroll'o de esta forma:
-%
-% <<---Yo no he sido ---grit'o Antonio.
-%
-% ---Pero has colaborado ---asegur'o Rafael>>.
-%
-% Pero all'i no se aclar'o nadie.
-% \end{dialog}
-% \end{quotation}
-%
-% \item[$\diamond$]
-% |\activatequoting \deactivatequoting|\\[1ex]
+% \begin{decl}
+% \con |\activatequoting \deactivatequoting|
+% \end{decl}
%
% Las incompatibilidades potenciales de estas abreviaciones son
% enormes. Por ejemplo, en \textsf{ifthen} se cancelan las
-% comparaciones entre n'umeros;\,\footnote{Y en |\string\ifnum|,
-% etc. usado por los desarrolladores en los paquetes.} tambi'en
+% comparaciones entre n'umeros;\,\footnote{Y en \texttt{\textbackslash
+% ifnum},
+% \texttt{\textbackslash ifdim}, etc., usado por los desarrolladores en
+% los paquetes.} tambi'en
% resultan inoperantes |@>>>| y |@<<<| de
% \textsf{amstex}.\footnote{Aunque en
% este caso cabe usar los sin'onimos |@)))| y |@(((|.}
-% Por ello, se da posibilidad de cancelarlas y reactivarlas con
-% estas 'ordenes, \New{4.2}aunque si se est'a usando con
+% Por ello, se da la posibilidad de cancelarlas y reactivarlas con
+% estas 'ordenes, aunque si se est'a usando
% \textsf{xmltex} ya se
% desactivan por completo de forma autom'atica. El entorno
% |quoting| siempre permanece disponible.\footnote{Algunos tipos
@@ -753,10 +930,102 @@
% podemos usarlos siempre, aunque los ajustes proporcionados por
% \textsf{spanish} se pueden perder; por otra parte, tampoco se
% usan demasiado a menudo.}
+%
+% \subsection{Funciones matem'aticas}
%
-% \end{itemize}
+% \begin{decl}
+% \txt |\lim \limsup \liminf \bmod \pmod \sen \tg|
+% etc.\act{math}\deact{\textit{es-minimal, es-sloppy}}
+% \end{decl}
+%
+% Tradicionalmente, las abreviaciones de lo que en \TeX\ se conocen
+% como operadores se han formado a partir del nombre castellano, lo
+% que implica la presencia del acento en l'im (en sus tres formas
+% |\lim|, |\limsup| y |\liminf|), m'ax, m'in, 'inf y m'od (en sus dos
+% formas |\bmod| y |\pmod|).
+%
+% Con \textsf{spanish} pueden seguirse varias convenciones con ayuda
+% de las siguientes 'ordenes:
+% \begin{decl} \con |\accentedoperators| |\unaccentedoperators|
+% \end{decl}
+% Activa o desactiva los acentos.
+% Por omisi'on se acent'uan, como por ejemplo: $\lim_{x\to 0}(1/x)$
+% (|$\lim_{x\to 0}(1/x)$|).
%
-% \subsection{Selecci'on}
+% \begin{decl}
+% \con |\spacedoperators| |\unspacedoperators|
+% \end{decl}
+% Activa o desactiva el espacio entre "<arc"> y la funci'on.
+% Lo habitual ha sido con espacio; as'i pues, por omisi'on
+% se espacia.
+%
+% Tambi'en se a'naden |\sen|, |\arcsen|, |\tg| y |\arctg|,
+% que dan las funciones respectivas.
+% \begin{decl}
+% \con |\spanishoperators|
+% \end{decl}
+%
+% Otras funciones trigonom'etricas se encuentran almacenadas en el
+% par'ametro |\spanishoperators|, que inicialmente incluye cotg,
+% cosec, senh y tgh. La raz'on por la que estas funciones se han
+% separado es porque su forma no está normalizada en el 'ambito
+% hispanohablante. De esta forma se puede cambiar por otras con, por
+% ejemplo:
+%\begin{verbatim}
+% \renewcommand{\spanishoperators}{ctg arc\,ctg sh ch th}
+%\end{verbatim}
+% (separadas con espacio). Cuando se selecciona \textsf{spanish} se crean
+% 'ordenes con esos nombres
+% y que dan esas funciones (siempre con |\nolimits|). Adem'as de
+% las letras sin acentuar se aceptan las 'ordenes |\,| y |\acute|, que
+% se pasan por alto para formar el nombre. Por ejemplo, |arc\,ctg|
+% se escribe en el documento con
+% |\arcctg|, |M\acute{a}x| como |\Max| y |cr\acute{i}t| como |\crit|
+% (hay que usar |i| y no |\dotlessi|).
+% La orden |\,| responde a |\|(|un|)|spacedoperators|, y |\acute|
+% a |\|(|un|)|accentedoperators|.
+%
+% Conviene que |\spanishoperators| est'e en el pre'ambulo del
+% documento en s'i, antes de |\selectspanish| o de
+% |\begin{document}|.
+%
+% \begin{decl}
+% \txt |\dotlessi|\act{math}\deact{\textit{es-sloppy}}
+% \end{decl}
+%
+% La \textit{i} sin punto tambi'en es accesible directamente en modo
+% matem'atico con la orden |\dotlessi|, de forma que se puede escribir
+% |\acute{\dotlessi}|. Por ejemplo,
+% |$V_{\mathbf{cr\acute{\dotlessi}t}}$| da
+% $V_{\mathbf{cr\acute{\dotlessi}t}}$.
+%
+%
+% \section{Opciones generales}
+%
+% Están pensadas principalmente para documentos basados en una clase
+% o un estilo editorial muy preciso que no debe tocarse. Para conocer
+% los cambios exactos, véanse las diferentes entradas que describen
+% las funciones de \textsf{spanish}.
+%
+% \begin{decl}
+% \con |es-minimal|\opp
+% \end{decl}
+%
+% Anula la mayoría de los cambios pero deja unas cuantas utilidades
+% que pueden resultar utiles en el momento de escribir el texto.
+%
+% \begin{decl}
+% \con |es-sloppy|\opp
+% \end{decl}
+%
+% Anula, además, todas las ligaduras sin excepción, la eñe en listas y los
+% grupos \textsf{text} y \textsf{math}.
+%
+% \section{Selecci'on}
+%
+% \begin{decl}
+% |\selectspanish|
+% \end{decl}
%
% Por omisi'on, \babel{} deja <<dormidas>> las lenguas hasta que se
% llega a |\begin{document}| con el fin de evitar conflictos por
@@ -764,18 +1033,17 @@
% se priva de la posibilidad de usar las lenguas en el pre'ambulo
% en 'ordenes como |\savebox|, |\title|, |\newtheorem|, etc.
%
-% La orden |\selectspanish| permite activar |spanish| con sus
+% La orden |\selectspanish| permite activar \textsf{spanish} con sus
% extensiones y abreviaciones antes de
% |\begin{document}|.\footnote{Algunos detalles, que
-% apenas afectan a \texttt{spanish}, siguen sin activarse hasta el
+% apenas afectan a \textsf{spanish}, siguen sin activarse hasta el
% comienzo del documento.}
% De esta forma, podr'iamos decir
%\begin{verbatim}
% \documentclass{book}
% \usepackage[T1]{fontenc}
-% \usepackage[spanish]{babel}
-% \usepackage[latin1]{inputenc}
-% \usepackage[centerlast]{caption2}
+% \usepackage[cp1252]{inputenc}
+% \usepackage[spanish,activeacute,es-notilde]{babel}
% ... % Mas paquetes
%
% \selectspanish
@@ -783,94 +1051,51 @@
% \title{T'itulo}
% \author{Autor}
% \newcommand{\pste}{para"-psicol'ogicamente}
-% \newsavebox{\mybox}
-% \savebox{\mybox}{m'as cosas}
% ... % Mas definiciones
%
% \begin{document}
%\end{verbatim}
-%
-% \subsection{Espaciado}
-%
-% El espaciado espa'nol difiere relativamente poco del ingl'es;
-% sin embargo, el espacio tras los signos de
-% puntuaci'on debe ser mismo que el que hay entre palabras. O dicho en
-% t'erminos de \TeX, |\frenchspacing| est'a activo.
-%
-% Tambi'en en otros dos sitios hay diferencias. El primero son los
-% puntos suspensivos, para los que se define una nueva orden |\...|
-% que los da menos espaciados; con ella \TeX{} preserva
-% el espacio siguiente. Por ejemplo:
-% \begin{quote}\small\begin{tabbing}
-% |\... y solo estaba\... ella.|\quad\=\... y solo estaba\... ella.
-% \end{tabbing}\end{quote}
-% Tambi'en podr'ian escribirse los tres puntos sin m'as |...|, y en
-% la pr'actica no hay diferencia, a menos que se cambie el
-% valor del espacio tras punto; en ese caso, la forma con barra
-% da los valores apropiados \emph{dentro} de una sentencia, y
-% los tres puntos \emph{al final} de ella. Esta orden no
-% interfiere con el valor original de |\.| (un punto suprascrito).
%
-% El segundo sitio es un espacio fino antes del signo |\%| (que
-% m'as exactamente es |\,|, con lo cual se puede "<recuperar"> con
-% su opuesto |\!|, si |\%| no sigue a una cifra).
+% \section{Adaptaci'on}
%
-% \subsection{Miscel'anea}
-%
-% \begin{itemize}
+% \subsection{Opciones por países}
+% \label{paises}
%
-% \item[$\bullet$] La orden |\lsc| se puede usar para siglas
-% en versalitas.
-% Por ejemplo:
-% \begin{quote}\small\begin{tabbing}
-% |\lsc{RAE}| \quad \= \lsc{RAE}\\
-% |\lsc{ReNFe}| \quad \= \lsc{ReNFe}.
-% \end{tabbing}\end{quote}
-% Tambi'en puede ser 'util para algunos usos de los n'umeros
-% romanos:
-% \begin{quote}\small\begin{tabbing}
-% |siglo \lsc{XVII}| \quad \= siglo \lsc{XVII}\\
-% |cap'itulo \lsc{II}| \quad \= cap'itulo \lsc{II}.
-% \end{tabbing}\end{quote}
-%
-% Para evitar que con un tipo que carece de versalitas acabe
-% apareciendo (por substituci'on) un texto de min'usculas se
-% intenta usar en estos casos las versales \emph{reales}
-% de un tama'no menor. Queda simplemente aceptable, pero es mejor que
-% nada. (\LaTeX\ tiende a sustituir versalitas por versalitas,
-% pero hay excepciones, como con las negritas.)
-%
-% \item[$\bullet$] Se puede escribir |\'i| para |\'{\i}|.
-%
-% \item[$\bullet$] Hay una abreviaci'on adicional como utilidad
-% tipogr'afica m'as que espec'ificamente espa'nola. En ciertos
-% tipos, como Times, el extremo inferior de la barra est'a en la
-% l'inea de base y expresiones como <<am/pm>> resultan poco
-% est'eticas. |"/| produce una barra que, de ser necesario,
-% se baja ligeramente. Computer Modern tiene una barra bien
-% dise'nada y no es posible ilustrar aqu'i este punto
-% pero en todo caso se escribir'ia |am"/pm|.\footnote{En \MEA{141}
-% se recurre a una soluci'on que es la 'unica sencilla en
-% programas de maquetaci'on: usar un cuerpo menor. Pero con \TeX{}
-% es mucho m'as f'acil automatizar las tareas.}
+% % \begin{decl} \con |mexico| \quad |mexico-com|
+% \end{decl}
%
-% \end{itemize}
+% La primera cambia \textit{cuadro} a \textit{tabla} y desactiva tanto
+% |<||<>||>| como el punto decimal. También cambia
+% |"`| y |"'| a ``\,`\,"<\,">\,'\,''. Es decir, aparte de
+% redefinir las comillas, equivale a:
+% a:
+%\begin{verbatim}
+%\usepackage[spanish,es-nodecimaldot,es-tabla,es-noquoting]{spanish}
+%\end{verbatim}
+% La segunda es similar
+% pero sí activa el punto decimal. (Obsérvese que no van precedidas
+% de |es-|.)
+%
+% Probablemente, esta opción también sea apropiada en algunos
+% países de América Central y del Sur.
%
-% \section{Adaptaci'on}
% \subsection{Configuraci'on}
%
-% En sus 'ultimas versiones, \babel{} proporciona la posibilidad
+% En sus 'ultimas versiones, \babel{} ofrece la posibilidad
% de cargar autom'aticamente un archivo con el mismo nombre que
% el principal, pero con extensi'on |.cfg|. \textsf{Spanish}
% proporciona unas pocas 'ordenes para ser usadas en este archivo:
-% \begin{itemize}
-% \item[$\diamond$] |\es@activeacute|\\[1ex]
+%
+% \begin{decl}
+% \con |\es@activeacute|
+% \end{decl}
% Activa las abreviaciones con ap'ostrofos, sin que sea
% necesario incluir |activeacute| como opci'on en |\usepackage|.
%
-% \item[$\diamond$] |\es@enumerate{<leveli>}|%
-% |{<levelii>}{<leveliii>}{<leveliv>}|\\[1ex]
-% Cambia los valores preestablecidos por |spanish| para
+% \begin{decl} \con |\es@enumerate{<leveli>}|%
+% |{<levelii>}{<leveliii>}{<leveliv>}|\alw
+% \end{decl}
+% Cambia los valores preestablecidos por \textsf{spanish} para
% |enumerate|. \textit{leveln} consiste en una letra, que
% indica qu'e formato tendr'a el n'umero, seguida
% de cualquier texto. La letra tiene que ser: |1| (ar'abigo),
@@ -883,14 +1108,15 @@
% signo tras ordinal.}).
%
% Esta orden no est'a pensada para hacer cambios elaborados, sino
-% s—lo meros reajustes. Los valores preestablecidos
+% sólo meros reajustes. Los valores preestablecidos
% equivalen a
%\begin{verbatim}
% \es@enumerate{1.}{a)}{1)}{a$'$)}
%\end{verbatim}
%
-% \item[$\diamond$] |\es@itemize{<leveli>}|%
-% |{<levelii>}{<leveliii>}{<leveliv>}|\\[1ex]
+% \begin{decl} \con |\es@itemize{<leveli>}|%
+% |{<levelii>}{<leveliii>}{<leveliv>}|\alw
+% \end{decl}
% Lo mismo para |itemize|, s'olo que los argumentos se
% usan de forma literal. Los valores originales de \LaTeX{} son
% similares a
@@ -899,15 +1125,14 @@
% {\textasteriskcentered}{\textperiodcentered}
%\end{verbatim}
%
-% \item[$\diamond$] |\es@operators|\\[1ex]
+% \begin{decl}\con |\es@operators|\act{math}
+% \end{decl}
% Todo lo relativo a operadores se cancela con
%\begin{verbatim}
% \let\es@operators\relax
%\end{verbatim}
% Es buena idea incluirlo si no se van a usar, ya que ahorra memoria.
%
-% \end{itemize}
-%
% Otros ajustes 'utiles en este contexto son |\spanishoperators|,
% |\selectspanish| y |\deactivatequoting|.
%
@@ -917,106 +1142,61 @@
% documento, por lo que si se distribuye conviene adjuntarlo
% con el entorno |filecontents|.
%
-% \subsection{Otros cambios}
-%
-% \begin{itemize}
-%
-% \item La orden |\addto| permite
-% cambiar alguna de las convenciones internas. Esto resulta
-% interesante con las traducciones, ya que las
-% formas proporcionadas pueden no ser las deseadas.
-% Para ello es necesario que |spanish| no est'e seleccionado.
-% Por ejemplo, para cambiar \emph{'Indice de figuras} por
-% \emph{Lista de figuras}:
-%\begin{verbatim}
-% \addto\captionsspanish{%
-% \def\listfigurename{Lista de figuras}}
-%\end{verbatim}
+% \subsection{Pasar opciones desde un paquete o clase}
%
-% \item Para volver a eliminar la sangr'ia tras secci'on:
-%\begin{verbatim}
-% \def\@afterindentfalse{\let\if@afterindent\iffalse}
-% \@afterindentfalse
-%\end{verbatim}
+% \begin{decl} \con |\spanishoptions|
+% \end{decl}
%
-% \item Para que |\roman| proporcione n'umeros romanos en
-% min'uscula, seg'un la forma inglesa:
-%\begin{verbatim}
-% \def\@roman#1{\romannumeral #1}
-%\end{verbatim}
+% Como |\PassOptionsToPackage| añade opciones al comienzo y
+% las opciones específicas de \textsf{spanish} han de ir al final, definiendo
+% esta macro se puede controlar el comportamiento de \textsf{spanish} antes
+% de su carga.
+%
+% \subsection{Otros cambios}
%
-% \item
-% Los extras se encuentran organizados en varios grupos:
+% Las adaptaciones se encuentran organizadas en varios grupos, a los
+% que corresponden sendas macros:
% |\textspanish|, |\mathspanish|,
-% |\shorthandsspanish| y |\layoutspanish|. Pueden
+% |\shorthandsspanish|, |\datespanish| y |\captionsspanish|. Pueden
% cancelarse con:
%\begin{verbatim}
% \renewcommand\textspanish{}
%\end{verbatim}
-%
-% \end{itemize}
%
-% \section{Formatos distintos a \LaTeXe}
+% \section{Plain \TeX}
%
-% El estilo |spanish| funciona con
-% otros formatos, aunque con un subconjunto de las funciones
-% disponibles en \LaTeXe{}. Con Plain hay que hacer
+% Con Plain hay que hacer:
%\begin{verbatim}
% \input spanish.sty
%\end{verbatim}
-% y con \LaTeX2.09, incluir |spanish| entre las opciones de estilo.
%
-% Se incluyen: traducciones, casi todas las abreviaciones, coma
+% Se incluyen: traducciones, casi todas las abreviaciones, coma
% decimal, utilidades para divisi'on de palabras, ordinales en una
% versi'on simplificada (y no muy elegante), funciones matem'aticas,
-% entrecomillados en \LaTeX2.09, |\'i| y espaciado.
-% La selecci'on de la lengua es inmediata al cargar el archivo.
-%
-% En cambio no est'an disponibles: entrecomillados en Plain,
-% |\lsc| ni las adaptaciones proporcionadas por |\layoutspanish|.
-%
-% A partir de esta versi'on, el archivo de configuraci'on
-% se lee siempre, por lo que aquellos que ya est'an escritos
-% espec'ificamante para \LaTeXe{} pueden presentar problemas si se usan
-% con otros formatos. Si las versiones que se usan no son muy antiguas,
-% se puede comprobar el formato con la variable |\fmtname| que vale
-% |LaTeX2e| o |plain|. Por ejemplo
-%\begin{verbatim}
-% \def\temp{LaTeX2e}
-% \ifx\temp\fmtname
-% ...
-% \fi
-%\end{verbatim}
-%
-% \section{Bibliograf'ias}
-%
-% El archivo |esbst.tex| que se genera con \textsf{spanish}
-% sirve para que la utilidad \textsf{custom-bib} trabaje en
-% conjunci'on con \babel. Define una serie de 'ordenes, que pueden
-% consultarse en el propio archivo, que se utilizan para las
-% traducciones si se selecciona |babel| como lengua al generar un
-% estilo bibliogr'afico.
-%
-% \section{Incompatibilidades con versiones anteriores}
-%
-% \begin{itemize}
+% |\'i| y espaciado. La selecci'on de la lengua es inmediata al
+% cargar el archivo.
%
-% \item En versiones de cierta antig"uedad, el actual |activeacute|
-% estaba siempre impl'icito, por lo que ahora la abreviaci'on no se
-% reconoce y en su lugar aparecen ap'ostrofos.
-%
-% \item El t'ermino correspondiente a |\tablename| estaba traducido
-% incorrectamente como <<Tabla>>. Como quiera que <<tabla>> es la
-% palabra con que puede aparecer en el propio texto, o bien puede
-% haber un art'iculo femenino ante |\tablename|, puede reponerse el
-% valor antiguo con:
-%\begin{verbatim}
-% \addto\captionsspanish{%
-% \def\tablename{Tabla}%
-% \def\listtablename{\'Indice de tablas}}
-%\end{verbatim}
+% En cambio no est'an disponibles: entrecomillados,
+% |\lsc| ni las adaptaciones de lengua principal.
%
-% \end{itemize}
+% \section{Compatibilidad con versiones anteriores}
+%
+% En versiones de \textsf{babel} bastante antiguas, las abreviaciones
+% con |'| se activaban por omisión, mientras que ahora es necesario
+% |activeacute|.
+%
+% En la versión 4, la abreviación |~n| se consideró para extinguir.
+% En la versión 5 sigue estando, pero \textit{no} se activa por
+% omisión, sino que hay que emplear |es-tilden|.
+%
+% En la versión 5 el grupo \textsf{layout} no se retrasa a
+% |\begin{document}|, como en la 4, sino que se ejecuta
+% inmediatamente. Esto permite cambios en el preámbulo con otros
+% paquetes. Con ello, además, |\selectspanish*| carece de utilidad.
+% La opción de paquete |es-delayed| restaura el comportamiento
+% anterior, por si hubiera alguna incompatibilidad.
+%
+% La compatibilidad con la versión 2.09 de \LaTeX{} se ha suprimido.
%
% \section*{Referencias}
% \addcontentsline{toc}{section}{Referencias}
@@ -1044,109 +1224,90 @@
% \leftskip0pt \parindent0pt \vspace{6pt}
%
% {\itshape
-% Como normalmente el primer contacto con \TeX{} es por una tesis,
-% cito libros que
-% est'an relacionados con el tema a los que he tenido acceso.
-% Est'an por orden de preferencia; en particular, los dos 'ultimos me
-% parecen poco recomendables.}
-%
-% \parindent-1.5pc \leftskip1.5pc \vspace{3pt}
+% Para otras cuestiones tipogr'aficas, las referencias
+% usadas son, entre otras:}
%
-% Umberto Eco,
-% \textit{C'omo se hace una tesis},
-% Barcelona, Gedisa, 1982.
+% \parindent-1.5pc \leftskip1.5pc \vspace{3pt}
%
-% Antonia Rigo Arnavat y Gabriel Genesc\`a Due'nas,
-% \textit{C'omo presentar una tesis y trabajos de investigaci'on},
-% Barcelona, Eumo-Octaedro, 2002.
+% Asociación de Academias de la Lengua Española,
+% \textit{Diccionario panhispánico de dudas}, Madrid, Santillana, 2005.
%
-% Prudenci Comes,
-% \textit{Gu'ia para la redacci'on y presentaci'on de trabajos
-% cient'ificos, informes t'ecnicos y tesinas},
-% Barcelona, Oikos-Tau, 1971.
+% Javier Bezos,
+% \textit{Tipograf'ia espa'nola con \TeX}, documento electr'onico
+% disponible en
+% \textsf{http://perso.wanadoo.es/jbezos/tipografia.html}.
%
-% Javier Lasso de la Vega,
-% \textit{C'omo se hace una tesis doctoral},
-% Madrid, Fundacion Universitaria Espa~nola, 1977.
+% Bureau International des Poids et mesures,
+% \textit{Le Sist\`{e}me international d'unités},
+% 8"a ed., París, {\footnotesize BIPM}, 2006,
+% \textsf{http://www.bipm.org/""fr/""si/""si\_brochure/}, 2006-11-10.
%
-% Jos'e Romera Castillo y otros,
-% \textit{Manual de estilo},
-% Madrid, Universidad Nacional de Educaci'on a Distancia, 1996.
+% Jorge de Buen,
+% \textit{Manual de diseño editorial,} México, Santillana, 2000.
%
-% Restituto Sierra Bravo,
-% \textit{Tesis doctorales y trabajos de investigaci'on cient'ifica},
-% Madrid, Paraninfo, 1986.
%
-% \parindent0pc \leftskip0pc \vspace{6pt}
+% \textit{The Chicago Manual of Style}, Chicago, University of
+% Chicago Press, 14"a~ed., 1993, esp.~p'ags.~333~-335.
%
-% {\itshape
-% Para otras cuestiones tipogr'aficas, las referencias
-% usadas son, entre otras:}
+% Jos'e Fern'andez Castillo,
+% \textit{Normas para correctores y compositores tip'ografos},
+% Madrid, Espasa-Calpe, 1959.
%
-% \parindent-1.5pc \leftskip1.5pc \vspace{3pt}
-%
-% Javier Bezos,
-% \textit{Tipograf'ia espa'nola con \TeX}, documento electr'onico
-% disponible en
-% \textsf{http://perso.wanadoo.es/jbezos/tipografia.html}.
+% IRANOR [AENOR], Normas \lsc{UNE} n'umeros 5010 (<<Signos
+% matem'aticos>>), 5028 (<<S'imbolos
+% geom'etricos>>) y 5029 (<<Impresi'on de los
+% s'imbolos de magnitudes y unidades y de los n'umeros>>).
+% [Obsoletas.]
%
-% Ra'ul Cabanes Mart'inez,
-% <<El sistema internacional de unidades: ese desconocido>>,
-% \textit{Mundo Electr'onico}, n"o 142, 1984, p'ags.~119~-125.
+% Llerena, Mario,
+% \textit{Un manual de estilo,} Miami, Unilit, 1999.
%
-% \textit{The Chicago Manual of Style}, Chicago, University of
-% Chicago Press, 14"a~ed., 1993, esp.~p'ags.~333~-335.
+% Real Academia Espa'nola,
+% \textit{Esbozo de una nueva gram'atica de la
+% lengua espa'nola}, Madrid, Espasa-Calpe, 1973.
+%
+% V.\ Mart'inez Sicluna,
+% \textit{Teor'ia y pr'actica de la tipograf'ia},
+% Barcelona, Gustavo Gili, 1945.
%
-% Jos'e Fern'andez Castillo,
-% \textit{Normas para correctores y compositores tip'ografos},
-% Madrid, Espasa-Calpe, 1959.
+% Jos'e Mart'inez de Sousa,
+% \textit{Diccionario de ortograf'ia de la lengua espa'nola},
+% Madrid, Paraninfo, 1996.
%
-% IRANOR [AENOR], Normas \lsc{UNE} n'umeros 5010 (<<Signos
-% matem'aticos>>), 5028 (<<S'imbolos
-% geom'etricos>>) y 5029 (<<Impresi'on de los
-% s'imbolos de magnitudes y unidades y de los n'umeros>>).
-% [Obsoletas.]
+% Juan Mart'inez Val, \textit{Tipograf'ia pr'actica}, Madrid,
+% Laberinto, 2002.
%
-% Real Academia Espa'nola,
-% \textit{Esbozo de una nueva gram'atica de la
-% lengua espa'nola}, Madrid, Espasa-Calpe, 1973.
-%
-% V.\ Mart'inez Sicluna,
-% \textit{Teor'ia y pr'actica de la tipograf'ia},
-% Barcelona, Gustavo Gili, 1945.
+% Juan Jos'e Morato, \textit{Gu'ia pr'actica del compositor
+% tipogr'afico}, Madrid, Hernando, 2"a ed., 1908 (1"a ed., 1900,
+% 3"a ed., 1933).
%
-% Jos'e Mart'inez de Sousa,
-% \textit{Diccionario de ortograf'ia de la lengua espa'nola},
-% Madrid, Paraninfo, 1996.
+% Marion Neubauer,
+% <<Feinheiten bei wissenschaftlichen Publikationen>>,
+% \textit{Die \TeX nisches Kom\"odie}, parte I, vol. 8, n"o 4, 1996,
+% p'ags. 23-40; parte II, vol. 9, n"o 1, 1997, p'ags.~25~-44.
%
-% Juan Mart'inez Val, \textit{Tipograf'ia pr'actica}, Madrid,
-% Laberinto, 2002.
+% Notimex, \textit{Manual de operación y estilo editorial}, México,
+% Notimex, 1999.
%
-% Juan Jos'e Morato, \textit{Gu'ia pr'actica del compositor
-% tipogr'afico}, Madrid, Hernando, 2"a ed., 1908 (1"a ed., 1900,
-% 3"a ed., 1933).
+% Jos'e Polo,
+% \textit{Ortograf'ia y ciencia del lenguaje}, Madrid, Paraninfo,
+% 1974.
%
-% Marion Neubauer,
-% <<Feinheiten bei wissenschaftlichen Publikationen>>,
-% \textit{Die \TeX nisches Kom\"odie}, parte I, vol. 8, n"o 4, 1996,
-% p'ags. 23-40; parte II, vol. 9, n"o 1, 1997, p'ags.~25~-44.
+% Siglo 21, \textit{Libro de estilo}, México, Alda,
+% $\mathrm{^s}\!$/$\mathrm{_f}$
+% (impr. 1995).
%
-% Jos'e Polo,
-% \textit{Ortograf'ia y ciencia del lenguaje}, Madrid, Paraninfo,
-% 1974.
+% Pedro Valle,
+% \textit{C'omo corregir sin ofender}, Buenos Aires, Lumen, 1998.
%
-% Pedro Valle,
-% \textit{C'omo corregir sin ofender}, Buenos Aires, Lumen, 1998.
+% Hugh C. Wolfe, <<S'imbolos, unidades y nomenclatura>>,
+% \textit{Enciclopedia de F'isica}, dir. Rita G. Lerner y George L.
+% Trigg, Madrid, Alianza, 1987, t.~2, p'ags.~1423~-1451.
%
-% Hugh C. Wolfe, <<S'imbolos, unidades y nomenclatura>>,
-% \textit{Enciclopedia de F'isica}, dir. Rita G. Lerner y George L.
-% Trigg, Madrid, Alianza, 1987, t.~2, p'ags.~1423~-1451.
+%\endgroup
%
-% \endgroup
+% \else
%
-% \end{userdtx}
-%
-% \begin{userdrv}
%^^A ======= Beginning of text as typeset by user.drv =========
%
% \GetFileInfo{spanish.dtx}
@@ -1155,40 +1316,44 @@
%
% The file \file{\filename}\footnote{The file described in this
% section has version number \fileversion\ and was last revised on
-% \filedate. The original author from v4.0 on is Javier
-% Bezos. Previous versions were by Julio S\'anchez.} defines all the
-% language-specific macros for the Spanish language.
-%
-% Custumization is made following mainly the
-% books on the subject by Jos\'e Mart\'\i nez de Sousa.
-% By typesetting |spanish.dtx| directly you will get the full
-% documentation (regrettably is in Spanish only, but it is
-% pretty long). References in this part refers to that document.
-% There are several aditional features documented in the Spanish
-% version only.
-%
-% This style provides:
+% \filedate. The maintainer from v4.0 on is Javier Bezos
+% (http://www.texytipografia.com). Previous
+% versions were made by Julio S\'anchez. The English documentation
+% has been improved by José Luis Rivera; thanks to him it is now a lot
+% clearer.} defines all the language-specific macros for the Spanish
+% language.
+%
+% Spanish support is implemented following mainly the guidelines given
+% by Jos\'e Mart\'\i nez de Sousa. You may get the the full
+% documentation (more comprehensive, but regrettably only in Spanish)
+% by typesetting |spanish.dtx| directly. There are examples and some
+% additional features documented in the Spanish version only.
+% Cross-references in this section point to that document.
+%
+% \paragraph{Features} This style provides:
+%
% \begin{itemize}
% \item Translations following the International \LaTeX{}
% conventions, as well as |\today|.
%
% \item Shorthands listed in Table~\ref{tab:spanish-quote-def}.
-% Examples in subsection~3.4 are illustrative. Note that
-% |"~| has a special meaning in \textsf{spanish}
-% different to other languages, and is used mainly in linguistic
-% contexts.
+% Examples in subsection~3.4 are illustrative. Notice that |"~| has a
+% special meaning in \textsf{spanish} different to other languages,
+% and is used mainly in linguistic contexts.
%
% \begin{table}[htb]
% \centering
% \begin{tabular}{lp{8cm}}
-% |'a| & acute accented a. Also for: e, i, o, u (both
+% |'a| & Acute accented a. Works for e, i, o, u, too (both
% lowercase and uppercase).\\
-% |'n| & \~n (also uppercase).\\
-% |~n| & \~n (also uppercase). Deprecated.\\
-% |"u| & \"u (also uppercase).\\
-% |"a| & Ordinal numbers (also |"A|, |"o|, |"O|).\\
-% |"c| & \c{c} (also uppercase).\\
-% |"rr| & rr, but -r when hyphenated\\
+% |'n| & \~n (uppercase too).\\
+% |"i| & \"i (uppercase too).\\
+% |"u| & \"u (uppercase too).\\
+% |"a| |"o| & Ordinal numbers (uppercase |"A|, |"O| too).\\
+% |"er "ER| & Ordinal 1.\textsuperscript{er} 1.\textsuperscript{\textsc{er}}\\
+% |"c| & \c{c} (uppercase too).\\
+% |"rr| & rr, but -r when hyphenated.\\
+% |"y| & An old ligature for ``et'' (like the English \&).\\
% |"-| & Like |\-|, but allowing hyphenation in the rest
% the word.\\
% |"=| & Like |-|, but allowing hyphenation in the rest
@@ -1197,322 +1362,482 @@
% the next line if the word is hyphenated at this
% point.\\
% |""| & Like |"-| but producing no hyphen sign.\\
-% |~-| & Like |-| but with no break after the hyphen. Also for:
-% en-dashes (|~--|) and em-dashes (|~---|). \\
+% |~-| & Like |"-| but with no break after the hyphen. Works for
+% en-dashes (|~--|) and em-dashes (|~---|). |"+|, |"+-|
+% and |"+--| are synonymous.\\
% |"/| & A slash slightly lowered, if necessary.\\
-% \verb+"|+ & disable ligatures at this point.\\
+% \verb+"|+ & Disable ligatures at this point.\\
% |"<| & Left guillemets.\\
% |">| & Right guillemets.\\
-% |<<| & |\begin{quoting}|. (See text.)\\
-% |>>| & |\end{quoting}|. (See text.)
+% |<<| |>>| & |\begin{quoting}| and |\end{quoting}|. (See below.)
+% |"`| and |"'| are synonymous.\\
+% |"? "!| & Opening question and exlamation marks (?`!`)
+% aligned on the baseline, useful for all-caps headings, etc.
% \end{tabular}
% \caption{Extra definitions made by file \file{spanish.ldf}}
% \label{tab:spanish-quote-def}
% \end{table}
%
-% \item |\deactivatetilden| deactivates the |~n| and |~N| shorthands.
-%
-% \item \emph{In math mode} a dot followed by a digit is replaced
+% \item |\frenchspacing|.
+%
+% \item \emph{In math mode}, a dot followed by a digit is replaced
% by a decimal comma.
%
-% \item Spanish ordinals and abbeviations with |\sptext|
-% as, for instance, |1\sptext{er}|. The
-% preceptive dot is included.
-%
-% \item Accented functions: l\'\i m, m\'ax, m\'\i n, m\'od. You may
-% globally omit the accents with |\unaccentedoperators|. Spaced
-% functions: arc\,cos, etc. You may globally kill that space with
-% |\unspacedoperators|. |\dotlessi| is provided for use in math mode.
+% \item Spanish ordinals and abbreviations with the |\sptext|\marg{text}
+% command as, for instance, |1\sptext{er}|. The preceptive dot is included.
%
+% \item Accented (l\'\i m, m\'ax, m\'\i n, m\'od) and spaced
+% (arc\,cos, etc.) functions.
+%
+% \item |\dotlessi| is provided for use in math mode.
+%
% \item A |quoting| environment and a related pair of shorthands |<<|
-% and |>>|. The command
-% |\deactivatequoting| deactivates these shorthand in case
-% you want to use |<| and |>| in some AMS commands and numerical
-% comparisons.
-%
-% \item The command |\selectspanish| selects the |spanish| language
-% \emph{and} its shorthands. (Intended for the preamble.)
-%
-% \item |\frenchspacing| is used.
-%
-% \item Ellipsis are best typed |...| or, within a sentence, |\...|
-%
-% \item There is a small space before |\%|.
+% and |>>|. Useful for traditional spanish multi-paragraph quoting.
+%
+% \item There is a small space before the percent |\%| sign.
%
% \item |\lsc| provides lowercase small caps. (See subsection~3.10.)
+%
+% \item Ellipsis is best typed as |...| or, within a sentence, as |\...|
+%
% \end{itemize}
%
-% Just in case |spanish| is the main language, the group
-% |\layoutspanish| is activated, which modifies the standard
-% classes through the whole document (it cannot be deactivated)
-% in the following way:
+% If \textsf{spanish} is the main language, the command
+% |\layoutspanish| is added to the main group, modifying the standard
+% classes throughout the whole document in the following way:
+%
% \begin{itemize}
+%
+% \item Paragraphs are set with |\indentfirst|.
+%
% \item Both |enumerate| and |itemize| are adapted to Spanish rules.
%
% \item Both |\alph| and |\Alph| include \textit{\~n} after \textit{n}.
%
-% \item Symbol footmarks are one, two, three, etc., asteriscs.
+% \item Symbol footmarks are one, two, three, etc., asterisks.
%
% \item |OT1| guillemets are generated with two |lasy| symbols instead
% of small |\ll| and |\gg|.
%
-% \item |\roman| is redefined to write small caps roman numerals, since
-% lowercase roman numerals are not allowed. However, \textit{MakeIndex}
-% rejects entries containing pages in that format. The |.idx| file must
-% be preprocessed if the document has this kind of entries with
-% the provided |romanidx.tex| tool---just \TeX{} it and follow the
-% instructions.
+% \item |\roman| is redefined to write small caps Roman numerals, since
+% lowercase Roman numerals are discouraged (see below).
%
-% \item There is a dot after section numbers in titles and toc.
+% \item There is a dot after section numbers in titles, headings, and toc.
+%
% \end{itemize}
-% This group is ignored if you write |\selectspanish*| in the
-% preamble.
-%
-% Some additional commands are provided to be used in the
-% |spanish.cfg| file:
-% \begin{itemize}
-% \item With |\es@activeacute| acute accents are always active,
-% overriding the default \textsf{babel} behaviour.
+%
+% A subset of these features is implemented for Plain \TeX{}
+% (accesible with the command |\input spanish.sty|). Most
+% significantly, |\lsc|, the |quoting| environment, and features
+% provided by |\layoutspanish| are missing.
+%
+% \paragraph{Customization}
+%
+% Beginning with version 5.0, customization is made following two paths:
+% via |options| or via |commands|; these options and commands override
+% the layout for Spanish documents at different levels: options are meant for
+% use at the preamble only, while commands may be used in the configuration
+% file or at document level.
+%
+% Global options control the overall appearance of the document, and may
+% be set on the |{babel}| call, right after calling |spanish|, or
+% shortly before the call to |{babel}|, to ensure their proper loading
+% at runtime. Thus, the following calls are roughly equivalent:
%
-% \item |\es@enumerate| sets the labels to be used by |enumerate|. The
-% same applies to |\es@itemize| and |itemize|.
+% \begin{verbatim}
+% \usepackage[...,spanish,es-nosectiondot,es-nodecimaldot,...]{babel}
%
-% \item |\es@operators| stores the operator commands.
-% All of them are canceled with
-%\begin{verbatim}
-% \let\es@operators\relax
-%\end{verbatim}
+% \def\spanishoptions{es-nosectiondot,es-nodecimaldot}
+% \usepackage[...,spanish,...]{babel}
+% \end{verbatim}
+%
+% \begin{table}
+% \centering
+% \begin{tabular}{cccc}\hline
+% Basic Options & |es-minimal| & |es-sloppy| & |es-noshorthands| \\\hline
+% |es-noindentfirst| & X & X & \\
+% |es-nosectiondot| & X & X & \\
+% |es-nolists| & X & X & \\
+% |es-noquoting| & X & X & X \\
+% |es-notilde| & X & X & X \\
+% |es-nodecimaldot| & X & X & X \\
+% |es-nolayout| & & X & \\
+% |es-ucroman| & X & & \\
+% |es-lcroman| & X & X & \\\hline
+% \end{tabular}
+% \caption{Spanish Customization Options}
+% \label{tab:SpanishCustomizationOptions}
+% \end{table}
+%
+% Some global options are built upon lower level options, and may be
+% used as shorthand for more global customizations.
+% Table~\ref{tab:SpanishCustomizationOptions} gives an overview of the
+% global options constructed this way. Most of these options are
+% self-explanatory: they disable the changes made to the basic \LaTeX\
+% layout by |spanish|. |es-lcroman| however, and a few others, need a
+% bit of explanation, and they may be described as follows:
+%
+% \begin{itemize}
+%
+% \item Traditional Spanish typography discourages the use of
+% lowercase Roman numerals; instead, a smallcaps variant is
+% implemented. However, since |Makeindex| seems to choke on the code
+% implementing lowercase Roman numerals (via the |\lsc| macro), two
+% workarounds are implemented: the |es-ucroman| option converts all
+% Roman numerals to uppercase, and the |es-lcroman| option turns all
+% Roman numerals to lowercase; the former should be preferred over the
+% latter. Three macros control local changes to Roman numbers:
+% |\spanishscroman|, |\spanishucroman|, and |\spanishlcroman|.
+%
+% \item The |es-preindex| option calls the |romanidx.sty| package
+% automatically to fix index entries in smallcaps roman form. An
+% additional macro,
+% |\spanishindexchars|\marg{encap}\marg{openrange}\marg{closerange}
+% determines the characters delimiting index entries. Defaults are
+% \verb=\spanishindexchars{|}{(}{)}=.
+%
+% \item The |es-tilden| option restores the old tilde |~| shorthand
+% for \~n. This shorthand is however \emph{strongly} deprecated.
+%
+% \item The |es-nolayout| option disables layout changes in the
+% document when |spanish| is the main language. These changes affect
+% enumerated and itemized lists, enumerations (alphabetic order
+% excludes \~n), and symbolic footnotes.
+%
+% \item The |es-noshorthands| disables the shorthand mechanism
+% completely: neither |"| nor |'| nor |<| nor |>| nor |~| nor |.| work
+% at all.
+%
+% \item The |es-noquoting| option disables the macros |<<| and |>>|
+% calling the |quoting| environment; the alternative macros |"`| and
+% |"'| are still available.
+%
+% \item The |es-uppernames| option makes uppercase versions of
+% captions for chapter, tablename, etc.
+%
+% \item The |es-tabla| option changes ``cuadro'' for ``tabla'' in
+% captions.
+%
% \end{itemize}
-% The commands |\deactivatequoting|, |\deactivatetilden| and
-% |\selectspanish| may be used in this file, too.
+%
+% Finally, the Spanish 5 series begins the implementation of national
+% variations of Spanish typography, beginning with Mexico. Thus the
+% global options |mexico| and |mexico-com| are adapted to practices
+% spread in Mexico, and perhaps Central America, the Caribbean, and
+% some countries in South America.\footnote{The main difference is
+% that |mexico| disables the |decimaldot| mechanism, while
+% |mexico-com| keeps it enabled; both change the |quoting|
+% environment, disabling the use of guillemets.}
+%
+% Many of the global options are implemented via macros, which may be
+% included in the configuration file |spanish.cfg|, in the preamble,
+% after the call to |babel|, and in the body of the document. These
+% macros are the following.
+%
+% \begin{itemize}
+%
+% \item The macros |\spanishdashitems| and |\spanishsignitems| change
+% the values of itemized lists to a series of dashes or an alternative
+% series of symbols, respectively.
+%
+% \item The command |\deactivatequoting| deactivates the |<<| and |>>|
+% shorthands if you want to use |<| and |>| in numerical comparisons
+% and some AMS\TeX\ commands.
+%
+% \item You may kill the space in spaced operators with
+% |\unspacedoperators|.
+%
+% \item You may kill the accents on accented operators with
+% |\unaccentedoperators|.
+%
+% \item The command |\decimalpoint| resets the decimal separator to
+% its default (dot) value, while |\spanishdecimal|\marg{symbol} allows
+% for an arbitrary definition.
+%
+% \item |\spanishplainpercent| prevents the addition of a thinspace before
+% the percent sign in texts. This might be useful for parenthesized percent
+% signs in tables, etc.
+%
+% \item The macros |\spanishdatedel| and |\spanishdatede| control the
+% if the article is given in years (|del| or |de|).
+%
+% \item The macro |\spanishreverseddate| sets the date of the format
+% ``Month Day del Year''.
+%
+% \item The macro |\Today| gives months in uppercase.
+%
+% \item The macros |\spanish|\textit{caption} change the value of the \emph{caption}
+% automatically (no need to add an |\addto|).
+%
+% \item The command |\spanishdeactivate|\marg{characters} disables the
+% shorthand characters listed in the argument. Elegible characters
+% are the set |.'"~<>|. These shorthand characters may be globally
+% deactivated for Spanish adding this command to |\shorthandsspanish|.
+%
+% \item Extras are divided in groups controlled by the commands
+% |\textspanish|, |\mathspanish|, |\shorthandsspanish| y
+% |\layoutspanish|; their values may be cancelled typing
+% |\renewcommand|\marg{command}|{}|, or changed at will (check the
+% Spanish documentation or the code for details).
+%
+% \item The command |\spanishoperators|\marg{operators} defines
+% command names for operators in Spanish. There is no standard name
+% for some of them, so they may be created or changed at will. For
+% instance, the command
+% |\renewcommand{\spanishoperators}{arc\,ctg m\acute{i}n}|
+% creates commands for these functions. The command
+% |\,| adds thinspaces at the appropriate places for spaced operators
+% (like |\arcctg| in this case), and the command |\acute|\marg{letter}
+% adds an accent to the letter included in the definition (thus,
+% |m\acute{i}n| defines the accented function |\min| (m\'\i{}n);
+% please notice that |\dotlessi| is not necessary).
+%
+% \item The commands
+% |\lquoti|\marg{string} |\rquoti|\marg{string}
+% |\lquotii|\marg{string} |\rquotii|\marg{string}
+% |\lquotiii|\marg{string} |\rquotiii|\marg{string}
+% set the quoting signs in the |quoting| environment,
+% nested from outside in. They may be |\renew|ed at will.
+% Default values are shown in table~\ref{tab:spanish-quote-ref}.
+% \begin{table}
+% \center\small
+% \vspace{1.5ex}
+% \begin{tabular}{l@{\hspace{5em}}l}
+% |\lquoti| &|"<|\\
+% |\rquoti| &|">|\\
+% |\lquotii| &|``|\\
+% |\rquotii| &|''|\\
+% |\lquotiii| &|`|\\
+% |\rquotiii| &|'|
+% \end{tabular}
+% \caption{Default quoting signs set for the \texttt{quoting} environment.}
+% \label{tab:spanish-quote-ref}
+% \end{table}
+%
+% \item The command |\selectspanish*| is obsolete: if |spanish| is the
+% main language, all its features are available right after loading
+% |babel|. The |es-delayed| option is provided to restore the
+% previous behavior and macros for backwards compatibility.
%
-% A subset of these commands is provided for
-% use in Plain \TeX{} (with |\input spanish.sty|).
+% \end{itemize}
%
-% \end{userdrv}
+% \fi
+% \endgroup
%
%\StopEventually{}
%
%^^A ========== End of manual ===============
%
-% \begin{userdtx}
+% \ifx\langdeffile\undefined
%
% \section{The Code}
%
-% \end{userdtx}
-%
-% \begin{userdrv}
-%
+% \else
+%
% \subsection{The Code}
%
-% \end{userdrv}
-%
-% \changes{spanish~4.0f}{99/04/12}{Beginning of changes to follow the
-% doc conventions}
-% \changes{spanish~4.0d}{99/03/26}{Changed some parts for babel.ins
-% to generate the files}
-% \changes{spanish~4.0e}{99/04/10}{Adapted to 3.6k with some minor
-% changes, since most of features intended for 3.7 are included
-% now}
-% \changes{spanish~4.0d}{99/03/26}{Restored the test for \cs{LdfInit}.
-% It is redundant for LaTeX209 but not for plain}
-% \changes{spanish~4.0d}{99/03/29}{With a shoddy piece of work, the
-% plain variant works (at last). Instead of inputting
-% \file{babel.def} we input \file{switch.def}. To be changed, I
-% think, since now \file{plain.def} is read twice}
-% \changes{spanish~4.0e}{99/04/10}{Replaced all instances of
-% allowhyphens by \cs{bbl@allowhyphens}}
-% \changes{spanish~4.0g}{99/05/05}{The code introduced the 99/03/29
-% (see above) has been removed}
-% \changes{spanish~4.1a}{99/12/26}{Added \cs{spanishdecimal}.}
-% \changes{spanish~4.1b}{00/06/16}{Added the Spanish et sign.}
-% \changes{spanish~4.1a}{99/12/29}{Modified \cs{@marginparreset}
-% in order to kill the continuing guillemets.}
-% \changes{spanish~4.1a}{00/01/09}{\cs{sptext} protected.}
+% \fi
+%
+% \changes{spanish~5.0a}{2007-02-21}{Reimplemented in full, which some
+% parts rewritten from scratch. Added the es- mechanism and the mexico
+% option. Many bug fixes.}
%
% This file provides definition for both \LaTeXe{} and non
% \LaTeXe{} formats.
%
-% Identify the |ldf| file.
-%
-% \changes{spanish~4.0g}{99/05/05}{Replaced \cs{ProvidesFile}
-% by \cs{ProvidesLanguage}}
-% \changes{spanish~4.0j}{99/09/18}{Renamed spanish.tex as spanish.lpf}
-%
% \begin{macrocode}
%<*code>
\ProvidesLanguage{spanish.ldf}
- [2005/03/31 v4.2b Spanish support from the babel system]
-% \end{macrocode}
-%
-% The macro |\LdfInit| takes care of preventing that this file is
-% loaded more than once, checking the category code of the
-% \texttt{@} sign, etc.
-% When this file is read as an option, i.e. by the |\usepackage|
-% command, \texttt{spanish} will be an `unknown' language in which
-% case we have to make it known. So we check for the existence of
-% |\l@spanish| to see whether we have to do something here.
-%
-% \changes{spanish~4.0a}{98/09/23}{All files renamed from spanishb
-% to spanish as requested by the Spanish TeX list, since this
-% style should replace the current Spanish option. Julio
-% Sanchez gave up supporting his files and he has withdrawn
-% from his TeX activities. The last distributed version as
-% spanishb was 1.1.}
-% \changes{spanish~4.0a}{98/09/12}{Introduced \cs{LdfInit} setup}
-% \begin{macrocode}
+ [2007/02/21 v5.0a Spanish support from the babel system]
\LdfInit{spanish}\captionsspanish
-\ifx\undefined\l@spanish
- \@nopatterns{Spanish}
- \adddialect\l@spanish0
-\fi
-% \end{macrocode}
-%
-% We define some tools which will be used in that style file:
-% (1) we make sure that |~| is active, (2) |\es@delayed| delays
-% the expansion of the code in conditionals (in fact, quite similar
-% to |\bbl@afterfi|).
-%
-% \changes{spanish~4.0a}{98/09/12}{Test for 209 moved from sty}
-% \changes{spanish~4.1a}{99/12/01}{Introduced the \cs{es@delayed}
-% mechanism for ``conflictive'' conditionals.}
-% \begin{macrocode}
+
\edef\es@savedcatcodes{%
- \catcode`\noexpand\~=\the\catcode`\~
- \catcode`\noexpand\"=\the\catcode`\"}
+ \catcode`\noexpand\~=\the\catcode`\~
+ \catcode`\noexpand\"=\the\catcode`\"}
\catcode`\~=\active
\catcode`\"=12
-\long\def\es@delayed#1\then#2\else#3\fi{%
- #1%
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- {#2}{#3}}
+
+\ifx\undefined\l@spanish
+ \@nopatterns{Spanish}
+ \adddialect\l@spanish0
+\fi
+
+\def\es@sdef#1{\babel@save#1\def#1}
+
+\@ifundefined{documentclass}
+ {\let\ifes@latex\iffalse}
+ {\let\ifes@latex\iftrue}
% \end{macrocode}
%
-% Two tests are introduced. The first one tells us if the format is
-% \LaTeXe{}, and the second one if the format is plain or any other.
-% If both are false, the format is \LaTeX2.09{}.
+% Package options for spanish. To avoid error messages dummy
+% options are created on the fly when neccessary.
%
% \begin{macrocode}
-\es@delayed
-\expandafter\ifx\csname documentclass\endcsname\relax\then
- \let\ifes@LaTeXe\iffalse
-\else
- \let\ifes@LaTeXe\iftrue
-\fi
-\es@delayed
-\expandafter\ifx\csname newenvironment\endcsname\relax\then
- \let\ifes@plain\iftrue
+\ifes@latex
+
+\@ifundefined{spanishoptions}{}
+{\PassOptionsToPackage{\spanishoptions}{babel}}
+
+\def\es@genoption#1#2#3{%
+ \DeclareOption{#1}{}%
+ \@ifpackagewith{babel}{#1}%
+ {\def\es@a{#1}%
+ \expandafter\let\expandafter\es@b\csname opt@babel.sty\endcsname
+ \addto\es@b{,#2}%
+ \expandafter\let\csname opt@babel.sty\endcsname\es@b
+ \AtEndOfPackage{#3}}%
+ {}}
+
+\es@genoption{es-minimal}
+ {es-ucroman,es-noindentfirst,es-nosectiondot,es-nolists,%
+ es-noquoting,es-notilde,es-nodecimaldot}
+ {\spanishplainpercent
+ \let\es@operators\relax}
+\es@genoption{es-sloppy}
+ {es-nolayout,es-noshorthands}{}
+\es@genoption{es-noshorthands}
+ {es-noquoting,es-nodecimaldot,es-notilde}{}
+\es@genoption{mexico}
+ {mexico-com,es-nodecimaldot}{}
+\es@genoption{mexico-com}
+ {es-tabla,es-noquoting}
+ {\def\lquoti{``}\def\rquoti{''}%
+ \def\lquotii{`}\def\rquotii{'}%
+ \def\lquotiii{\guillemotleft{}}%
+ \def\rquotiii{\guillemotright{}}}
+
+\def\es@ifoption#1#2#3{%
+ \DeclareOption{es-#1}{}%
+ \@ifpackagewith{babel}{es-#1}{#2}{#3}}%
+
+\def\es@optlayout#1#2{\es@ifoption{#1}{}{\addto\layoutspanish{#2}}}
+
\else
- \let\ifes@plain\iffalse
+
+\def\es@ifoption#1#2#3{\@namedef{spanish#1}{#2}}
+
\fi
+
+\let\es@uclc\@secondoftwo
+\es@ifoption{uppernames}{\let\es@uclc\@firstoftwo}{}
+
+\def\es@tablename{Ccuadro}
+\es@ifoption{tabla}{\def\es@tablename{Ttabla}}{}
+\es@ifoption{cuadro}{\def\es@tablename{Ccuadro}}{}
% \end{macrocode}
%
-% Translations for captions.
+% Captions follow a two step schema, so that, say, |\refname| is
+% defined as |\spanishrefname| which in turn contains the string
+% to be printed. The final definition of |\captionsspanish|
+% is built below.
%
-% \changes{spanishb~1.1}{98/03/17}{Corrected \cs{indexname} to the
-% promised text}
-% \changes{spanish~4.1c}{00/10/04}{Added \cs{glossaryname}}
% \begin{macrocode}
-\addto\captionsspanish{%
- \def\prefacename{Prefacio}%
- \def\refname{Referencias}%
- \def\abstractname{Resumen}%
- \def\bibname{Bibliograf\'{\i}a}%
- \def\chaptername{Cap\'{\i}tulo}%
- \def\appendixname{Ap\'endice}%
- \def\listfigurename{\'Indice de figuras}%
- \def\listtablename{\'Indice de cuadros}%
- \def\indexname{\'Indice alfab\'etico}%
- \def\figurename{Figura}%
- \def\tablename{Cuadro}%
- \def\partname{Parte}%
- \def\enclname{Adjunto}%
- \def\ccname{Copia a}%
- \def\headtoname{A}%
- \def\pagename{P\'agina}%
- \def\seename{v\'ease}%
- \def\alsoname{v\'ease tambi\'en}%
- \def\proofname{Demostraci\'on}%
- \def\glossaryname{Glosario}}
-
-\expandafter\ifx\csname chapter\endcsname\relax
- \addto\captionsspanish{\def\contentsname{\'Indice}}
-\else
- \addto\captionsspanish{\def\contentsname{\'Indice general}}
-\fi
+\def\captionsspanish{%
+ \es@a{preface}{Prefacio}%
+ \es@a{ref}{Referencias}%
+ \es@a{abstract}{Resumen}%
+ \es@a{bib}{Bibliograf\'{\i}a}%
+ \es@a{chapter}{Cap\'{\i}tulo}%
+ \es@a{appendix}{Ap\'{e}ndice}%
+ \es@a{listfigure}{\'{I}ndice de \es@uclc Ffiguras}%
+ \es@a{listtable}{\'{I}ndice de \expandafter\es@uclc\es@tablename s}%
+ \es@a{index}{\'{I}ndice \es@uclc Aalfab\'{e}tico}%
+ \es@a{figure}{Figura}%
+ \es@a{table}{\expandafter\@firstoftwo\es@tablename}%
+ \es@a{part}{Parte}%
+ \es@a{encl}{Adjunto}%
+ \es@a{cc}{Copia a}%
+ \es@a{headto}{A}%
+ \es@a{page}{p\'{a}gina}%
+ \es@a{see}{v\'{e}ase}%
+ \es@a{also}{v\'{e}ase tambi\'{e}n}%
+ \es@a{proof}{Demostraci\'{o}n}%
+ \es@a{glossary}{Glosario}%
+ \@ifundefined{chapter}
+ {\es@a{contents}{\'Indice}}%
+ {\es@a{contents}{\'Indice \es@uclc Ggeneral}}}
+
+\def\es@a#1{\@namedef{spanish#1name}}
+\captionsspanish
+\def\es@a#1#2{%
+ \def\expandafter\noexpand\csname#1name\endcsname
+ {\expandafter\noexpand\csname spanish#1name\endcsname}}
+\edef\captionsspanish{\captionsspanish}
% \end{macrocode}
%
-% And the date.
-% \changes{spanish~4.2a}{03/08/08}{Added the mechanism to
-% select \textit{del} or \textit{de}}
+% Now two macros for dates (upper and lowercase).
+%
% \begin{macrocode}
+\def\es@month#1{%
+ \expandafter#1\ifcase\month\or Eenero\or Ffebrero\or
+ Mmarzo\or Aabril\or Mmayo\or Jjunio\or Jjulio\or Aagosto\or
+ Sseptiembre\or Ooctubre\or Nnoviembre\or Ddiciembre\fi}
+
+\def\es@today#1{%
+ \ifcase\es@datefmt
+ \the\day~de \es@month#1%
+ \else
+ \es@month#1~\the\day
+ \fi
+ \ de\ifnum\year>1999\es@yearl\fi~\the\year}
+
\def\datespanish{%
- \def\today{\the\day~de \ifcase\month\or enero\or febrero\or
- marzo\or abril\or mayo\or junio\or julio\or agosto\or
- septiembre\or octubre\or noviembre\or diciembre\fi
- \ de\ifnum\year>1999\es@yearl\fi~\the\year}}
+ \def\today{\es@today\@secondoftwo}%
+ \def\Today{\es@today\@firstoftwo}}
+\newcount\es@datefmt
+\def\spanishreverseddate{\es@datefmt\@ne}
\def\spanishdatedel{\def\es@yearl{l}}
\def\spanishdatede{\let\es@yearl\@empty}
\spanishdatede
% \end{macrocode}
%
-% The basic macros to select the language, in the preamble or the
+% The basic macros to select the language in the preamble or the
% config file. Use of |\selectlanguage| should be avoided at this
% early stage because the active chars are not yet
% active. |\selectspanish| makes them active.
%
% \begin{macrocode}
\def\selectspanish{%
+ \def\selectspanish{%
\def\selectspanish{%
- \def\selectspanish{%
- \PackageWarning{spanish}{Extra \string\selectspanish ignored}}%
- \es@select}}
-
+ \PackageWarning{spanish}{Extra \string\selectspanish ignored}}%
+ \es@select}}
\@onlypreamble\selectspanish
-
\def\es@select{%
- \let\es@select\@undefined
- \selectlanguage{spanish}%
- \catcode`\"\active\catcode`\~=\active}
+ \let\es@select\@undefined
+ \selectlanguage{spanish}}
+
+\let\es@shlist\@empty
% \end{macrocode}
%
% Instead of joining all the extras directly in |\extrasspanish|,
% we subdivide them in three further groups.
-% \changes{spanish~4.0a}{99/11/30}{The extras subdivided into three
-% further groups.}
-% \changes{spanish~4.2a}{03/08/08}{The dot is deactitated, too}
+%
% \begin{macrocode}
\def\extrasspanish{%
- \textspanish
- \mathspanish
- \ifx\shorthandsspanish\@empty
- \spanishdeactivate{."'~<>}%
- \languageshorthands{none}%
- \else
- \shorthandsspanish
- \fi}
+ \textspanish
+ \mathspanish
+ \ifx\shorthandsspanish\@empty
+ \expandafter\spanishdeactivate\expandafter{\es@shlist}%
+ \languageshorthands{none}%
+ \else
+ \shorthandsspanish
+ \fi}
\def\noextrasspanish{%
- \ifx\textspanish\@empty\else
- \notextspanish
- \fi
- \ifx\mathspanish\@empty\else
- \nomathspanish
- \fi
- \ifx\shorthandsspanish\@empty\else
- \noshorthandsspanish
- \fi
- \es@reviveshorthands}
-% \end{macrocode}
-%
-% And the first of these sub-groups is defined.
-%
-% \begin{macrocode}
-\addto\textspanish{%
- \babel@save\sptext
- \def\sptext{\protect\es@sptext}}
+ \ifx\textspanish\@empty\else
+ \notextspanish
+ \fi
+ \ifx\mathspanish\@empty\else
+ \nomathspanish
+ \fi
+ \ifx\shorthandsspanish\@empty\else
+ \noshorthandsspanish
+ \fi
+ \csname es@restorelist\endcsname}
+
+\addto\textspanish{\es@sdef\sptext{\protect\es@sptext}}
+
+\def\es@orddot{.}
% \end{macrocode}
%
% The definition of |\sptext| is more elaborated than that of
@@ -1522,107 +1847,102 @@
% format.
%
% \begin{macrocode}
-\ifes@LaTeXe %<<<<<<
- \newcommand\es@sptext[1]{%
- {.\setbox\z@\hbox{8}\dimen@\ht\z@
- \csname S@\f@size\endcsname
- \edef\@tempa{\def\noexpand\@tempc{#1}%
- \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
- \ifx\@tempb\@tempc
- \fontsize\sf@size\z@
- \selectfont
- \advance\dimen@-1.15ex
- \else
- \fontsize\ssf@size\z@
- \selectfont
- \advance\dimen@-1.5ex
- \fi
- \math@fontsfalse\raise\dimen@\hbox{#1}}}
-\else %<<<<<<
- \let\sptextfont\rm
- \newcommand\es@sptext[1]{%
- {.\setbox\z@\hbox{8}\dimen@\ht\z@
- \edef\@tempa{\def\noexpand\@tempc{#1}%
- \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
- \ifx\@tempb\@tempc
- \advance\dimen@-0.75ex
- \raise\dimen@\hbox{$\scriptstyle\sptextfont#1$}%
- \else
- \advance\dimen@-0.8ex
- \raise\dimen@\hbox{$\scriptscriptstyle\sptextfont#1$}%
- \fi}}
-\fi %<<<<<<
+\ifes@latex
+ \def\es@sptext#1{%
+ {\es@orddot
+ \setbox\z@\hbox{8}\dimen@\ht\z@
+ \csname S@\f@size\endcsname
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \fontsize\sf@size\z@
+ \selectfont
+ \advance\dimen@-1.15ex
+ \else
+ \fontsize\ssf@size\z@
+ \selectfont
+ \advance\dimen@-1.5ex
+ \fi
+ \math@fontsfalse\raise\dimen@\hbox{#1}}}
+\else
+ \let\sptextfont\rm
+ \def\es@sptext#1{%
+ {\es@orddot
+ \setbox\z@\hbox{8}\dimen@\ht\z@
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \advance\dimen@-0.75ex
+ \raise\dimen@\hbox{$\scriptstyle\sptextfont#1$}%
+ \else
+ \advance\dimen@-0.8ex
+ \raise\dimen@\hbox{$\scriptscriptstyle\sptextfont#1$}%
+ \fi}}
+\fi
% \end{macrocode}
%
% Now, lowercase small caps. First, we test if there are actual
% small caps for the current font. If not, faked small caps are
% used. The \cs{selectfont} in \cs{es@lsc} could seem redundant,
-% but it's not.
+% but it's not. An intermediate macro allows using an optimized
+% variant for Roman numerals.
%
-% \changes{spanishb~1.1}{98/05/11}{\cs{es@lsc} rewritten to
-% incorporate the procedure so far available in
-% \cs{roman} only}
-% \changes{spanish~4.0e}{99/04/10}{Added \cs{leavevmode}}
% \begin{macrocode}
-\ifes@LaTeXe %<<<<<<
- \addto\textspanish{%
- \babel@save\lsc
- \def\lsc{\protect\es@lsc}}
-
- \def\es@lsc#1{%
- \leavevmode
- \hbox{\scshape\selectfont
- \expandafter\ifx\csname\f@encoding/\f@family/\f@series
- /n/\f@size\expandafter\endcsname
- \csname\curr@fontshape/\f@size\endcsname
- \csname S@\f@size\endcsname
- \fontsize\sf@size\z@\selectfont
- \PackageInfo{spanish}{Replacing undefined sc font\MessageBreak
- shape by faked small caps}%
- \MakeUppercase{#1}%
- \else
- \MakeLowercase{#1}%
- \fi}}
-\fi %<<<<<<
+\ifes@latex
+ \addto\textspanish{\es@sdef\lsc{\protect\es@lsc}}
+ \def\es@lsc{\es@xlsc\MakeUppercase\MakeLowercase}
+ \def\es@xlsc#1#2#3{%
+ \leavevmode
+ \hbox{%
+ \scshape\selectfont
+ \expandafter\ifx\csname\f@encoding/\f@family/\f@series
+ /n/\f@size\expandafter\endcsname
+ \csname\curr@fontshape/\f@size\endcsname
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size\z@\selectfont
+ \PackageWarning{spanish}{Replacing `\curr@fontshape' by
+ \MessageBreak faked small caps}%
+ #1{#3}%
+ \else
+ #2{#3}%
+ \fi}}
+\fi
% \end{macrocode}
%
% The |quoting| environment. This part is not available
-% in Plain, hence the test. Overriding the default |\everypar| is
+% in Plain. Overriding the default |\everypar| is
% a bit tricky.
%
% \begin{macrocode}
\newif\ifes@listquot
-\ifes@plain\else %<<<<<<
- \csname newtoks\endcsname\es@quottoks
- \csname newcount\endcsname\es@quotdepth
-
- \newenvironment{quoting}
- {\leavevmode
- \advance\es@quotdepth1
- \csname lquot\romannumeral\es@quotdepth\endcsname%
- \ifnum\es@quotdepth=\@ne
- \es@listquotfalse
- \let\es@quotpar\everypar
- \let\everypar\es@quottoks
- \everypar\expandafter{\the\es@quotpar}%
- \es@quotpar{\the\everypar
- \ifes@listquot\global\es@listquotfalse\else\es@quotcont\fi}%
- \fi
- \toks@\expandafter{\es@quotcont}%
- \edef\es@quotcont{\the\toks@
- \expandafter\noexpand
- \csname rquot\romannumeral\es@quotdepth\endcsname}}
- {\csname rquot\romannumeral\es@quotdepth\endcsname}
-
- \def\lquoti{\guillemotleft{}}
- \def\rquoti{\guillemotright{}}
- \def\lquotii{``}
- \def\rquotii{''}
- \def\lquotiii{`}
- \def\rquotiii{'}
-
- \let\es@quotcont\@empty
+\ifes@latex
+ \csname newtoks\endcsname\es@quottoks
+ \csname newcount\endcsname\es@quotdepth
+ \newenvironment{quoting}
+ {\leavevmode
+ \advance\es@quotdepth\@ne
+ \csname lquot\romannumeral\es@quotdepth\endcsname%
+ \ifnum\es@quotdepth=\@ne
+ \es@listquotfalse
+ \let\es@quotpar\everypar
+ \let\everypar\es@quottoks
+ \everypar\expandafter{\the\es@quotpar}%
+ \es@quotpar{\the\everypar
+ \ifes@listquot\global\es@listquotfalse\else\es@quotcont\fi}%
+ \fi
+ \toks@\expandafter{\es@quotcont}%
+ \edef\es@quotcont{\the\toks@
+ \expandafter\noexpand
+ \csname rquot\romannumeral\es@quotdepth\endcsname}}
+ {\csname rquot\romannumeral\es@quotdepth\endcsname}
+ \def\lquoti{\guillemotleft{}}
+ \def\rquoti{\guillemotright{}}
+ \def\lquotii{``}
+ \def\rquotii{''}
+ \def\lquotiii{`}
+ \def\rquotiii{'}
+ \let\es@quotcont\@empty
% \end{macrocode}
%
% If there is a margin par inside quoting, we don't add the
@@ -1630,752 +1950,549 @@
% item labels; otherwise they could appear after the labels.
%
% \begin{macrocode}
- \addto\@marginparreset{\let\es@quotcont\@empty}
-
- \def\es@listquot{%
- \csname rquot\romannumeral\es@quotdepth\endcsname
- \global\es@listquottrue}
-\fi %<<<<<<
+ \addto\@marginparreset{\let\es@quotcont\@empty}
+ \DeclareRobustCommand\es@listquot{%
+ \csname rquot\romannumeral\es@quotdepth\endcsname
+ \global\es@listquottrue}
+\fi
% \end{macrocode}
%
-% Now, the |\frenchspacing|, followed by |\...| and |\%|
+% Now, the |\frenchspacing|, followed by |\...| and |\%|.
%
-% \changes{spanish~4.0e}{99/04/10}{Added ignorespaces to \cs{es@dots}}
-% \changes{spanish~4.1d}{01/09/12}{Now there are two versions of
-% percent sign}
% \begin{macrocode}
\addto\textspanish{\bbl@frenchspacing}
\addto\notextspanish{\bbl@nonfrenchspacing}
-
\addto\textspanish{%
- \let\es@save@dot\.%
- \babel@save\.%
- \def\.{\@ifnextchar.{\es@dots}{\es@save@dot}}}
-
+ \let\es@save@dot\.%
+ \es@sdef\.{\@ifnextchar.{\es@dots}{\es@save@dot}}}
\def\es@dots..{\leavevmode\hbox{...}\spacefactor\@M}
-
-\ifes@LaTeXe %<<<<<<
- \addto\textspanish{%
- \let\percentsign\%%
- \babel@save\%%
- \def\%{\unskip\,\percentsign{}}}
-\else
- \addto\textspanish{%
- \let\percentsign\%%
- \babel@save\%%
- \def\%{\unskip\ifmmode\,\else$\m@th\,$\fi\percentsign{}}}
-\fi
+\def\es@sppercent{\unskip\textormath{$\m@th\,$}{\,}}
+\def\spanishplainpercent{\let\es@sppercent\@empty}
+\addto\textspanish{%
+ \let\percentsign\%%
+ \es@sdef\%{\es@sppercent\percentsign{}}}
% \end{macrocode}
%
-% We follow with the math group.
-% It's not easy to add an accent in an operator.
-% The difficulty is that we must avoid using text (that is,
-% |\mbox|) because we have no control on font and size, and
-% at time we should access |\i|, which is a text
-% command forbidden in math mode. |\dotlessi| must be
-% converted to uppercase if necessary in \LaTeXe. There are
-% two versions, depending on the format.
-%
-% \changes{spanishb~1.1}{98/04/01}{dotless math i handling
-% rewritten}
-% \changes{spanishb~1.1}{98/05/13}{Again rewriten in full. Now
-% that character is accesible as \cs{dotlessi}}
-% \changes{spanish~4.0c}{98/12/07}{Moved from its original place below.
-% Decimal values replaced by hex ones.}
-% \changes{spanish~4.0k}{99/10/12}{Minor improvementes in
-% \cs{es@dotlessi}. Now it behaves like the dotlessi.sty package}
-% \changes{spanish~4.1f}{02/05/17}{\cs{i} not used directly in
-% the upper/lowercase list}
-% \begin{macrocode}
-\addto\mathspanish{%
- \babel@save\dotlessi
- \def\dotlessi{\protect\es@dotlessi}}
-
-\let\nomathspanish\relax %% Unused, but called
-
-\ifes@LaTeXe %<<<<<<
- \def\es@texti{\i}
- \addto\@uclclist{\dotlessi\es@texti}
-\fi %<<<<<<
-
-\ifes@LaTeXe %<<<<<<
- \def\es@dotlessi{%
- \ifmmode
- {\ifnum\mathgroup=\m@ne
- \imath
- \else
- \count@\escapechar \escapechar=\m@ne
- \expandafter\expandafter\expandafter
- \split@name\expandafter\string\the\textfont\mathgroup\@nil
- \escapechar=\count@
- \@ifundefined{\f@encoding\string\i}%
- {\edef\f@encoding{\string?}}{}%
- \expandafter\count@\the\csname\f@encoding\string\i\endcsname
- \advance\count@"7000
- \mathchar\count@
- \fi}%
- \else
- \i
- \fi}
-\else %<<<<<<
- \def\es@dotlessi{%
- \ifmmode
- \mathchar"7010
- \else
- \i
- \fi}
-\fi %<<<<<<
-% \end{macrocode}
+% We follow with the math group. It's not easy to add an accent to
+% an operator. The difficulty is that we must avoid using text
+% (that is, |\mbox|) because we have no control on font and size,
+% and at time we should access |\i|, which is a text command
+% forbidden in math mode. |\dotlessi| must be converted to
+% uppercase if necessary in \LaTeXe. There are two versions,
+% depending on the format.
%
-% The switches for accents and spaces in math.
-%
-%\changes{spanish~4.0b}{98/11/10}{Added missing \cs{nolimits}}
-%\changes{spanish~4.0c}{98/11/30}{Merged \cs{es@op@i} and
-% \cs{es@op@a} into a single command. The (re)defided commands
-% have been changed as suggested by JoseRa Portillo and Juan Luis
-% Varona. Now it conforms the UNE 5010 norm. Code is no
-% longer duplicated--\cs{operator@font} is defined for lplain
-% instead}
-%\changes{spanish~4.0c}{98/12/10}{Removed the explicit
-% trigonometric declaration. While some functions are
-% preceptive (sen, tg) some other are optional and
-% defined in \cs{spanishoperators}. This is because there
-% is no norm in Spanish and there is quite a chaos in their
-% form. Restored the forms of v 1.1}
-%\changes{spanish~4.0k}{99/10/13}{Restored the \cs{es@op@i}
-% command, because we have to discriminate \cs{dotlessi} and i}
-%
% \begin{macrocode}
+\addto\mathspanish{\es@sdef\dotlessi{\protect\es@dotlessi}}
+\let\nomathspanish\relax
+
+\ifes@latex
+ \def\es@texti{\i}
+ \addto\@uclclist{\dotlessi\es@texti}
+\fi
+
+\ifes@latex
+ \def\es@dotlessi{%
+ \ifmmode
+ {\ifnum\mathgroup=\m@ne
+ \imath
+ \else
+ \count@\escapechar \escapechar=\m@ne
+ \expandafter\expandafter\expandafter
+ \split@name\expandafter\string\the\textfont\mathgroup\@nil
+ \escapechar=\count@
+ \@ifundefined{\f@encoding\string\i}%
+ {\edef\f@encoding{\string?}}{}%
+ \expandafter\count@\the\csname\f@encoding\string\i\endcsname
+ \advance\count@"7000
+ \mathchar\count@
+ \fi}%
+ \else
+ \i
+ \fi}
+\else
+ \def\es@dotlessi{\textormath{\i}{\mathchar"7010}}
+\fi
+
\def\accentedoperators{%
- \def\es@op@ac##1{\acute{##1}}%
- \def\es@op@i{\acute{\dotlessi}}}
+ \def\es@op@ac##1{\acute{\if i##1\dotlessi\else##1\fi}}}
\def\unaccentedoperators{%
- \def\es@op@ac##1{##1}%
- \def\es@op@i{i}}
+ \def\es@op@ac##1{##1}}
\accentedoperators
-
\def\spacedoperators{\let\es@op@sp\,}
\def\unspacedoperators{\let\es@op@sp\@empty}
\spacedoperators
+\addto\mathspanish{\es@operators}
+
+\ifes@latex\else
+ \let\operator@font\rm
+\fi
% \end{macrocode}
%
% The operators are stored in |\es@operators|, which in turn is
% included in the math group. Since |\operator@font| is
% defined in \LaTeXe{} only, we defined in the plain variant.
-%
-% \changes{spanish~4.0g}{99/05/05}{Restored the assignment of
-% \cs{operator@font} which was misteriously missing}
-% \changes{spanish~4.0i}{99/06/21}{Replaced wrong \cs{spanishoperators}
-% by \cs{es@b}}
-% \changes{spanish~4.0j}{99/09/17}{Removed an extra line in the lplain
-% option}
-% \changes{spanish~4.2a}{03/08/08}{Names including \cs{acute} can be
-% formed}
%
% \begin{macrocode}
-\addto\mathspanish{\es@operators}
-
-\ifes@LaTeXe\else %<<<<<<
- \let\operator@font\rm
- \def\@empty{}
-\fi %<<<<<<
-
\def\es@operators{%
- \babel@save\lim
- \def\lim{\mathop{\operator@font l\protect\es@op@i m}}%
- \babel@save\limsup
- \def\limsup{\mathop{\operator@font l\es@op@i m\,sup}}%
- \babel@save\liminf
- \def\liminf{\mathop{\operator@font l\es@op@i m\,inf}}%
- \babel@save\max
- \def\max{\mathop{\operator@font m\es@op@ac ax}}%
- \babel@save\inf
- \def\inf{\mathop{\operator@font \protect\es@op@i nf}}%
- \babel@save\min
- \def\min{\mathop{\operator@font m\protect\es@op@i n}}%
- \babel@save\bmod
- \def\bmod{%
- \nonscript\mskip-\medmuskip\mkern5mu%
- \mathbin{\operator@font m\es@op@ac od}\penalty900\mkern5mu%
- \nonscript\mskip-\medmuskip}%
- \babel@save\pmod
- \def\pmod##1{%
- \allowbreak\mkern18mu({\operator@font m\es@op@ac od}\,\,##1)}%
- \def\es@a##1 {%
- \es@delayed
- \if^##1^\then % is it empty? do nothing and continue
- \es@a
- \else
- \es@delayed
- \if&##1\then % is it &? do nothing and finish
- \else
- \begingroup
- \let\,\@empty % \, is ignored when def'ing the macro name
- \let\acute\@firstofone % same
- \edef\es@b{\expandafter\noexpand\csname##1\endcsname}%
- \def\,{\noexpand\es@op@sp}%
- \def\acute####1{%
- \if i####1%
- \noexpand\es@op@i
- \else
- \noexpand\es@op@ac####1%
- \fi}%
- \edef\es@a{\endgroup
- \noexpand\babel@save\expandafter\noexpand\es@b
- \def\expandafter\noexpand\es@b{%
- \mathop{\noexpand\operator@font##1}\nolimits}}%
- \es@a % It restores itself
- \es@a
- \fi
- \fi}%
- \let\es@b\spanishoperators
- \addto\es@b{ }%
- \expandafter\es@a\es@b sen tg arc\,sen arc\,cos arc\,tg & }
-
-\def\spanishoperators{cotg cosec senh tgh}
+ \es@sdef\bmod{\nonscript\mskip-\medmuskip\mkern5mu
+ \mathbin{\operator@font m\es@op@ac od}\penalty900\mkern5mu
+ \nonscript\mskip-\medmuskip}%
+ \@ifundefined{@amsmath@err}%
+ {\es@sdef\pmod##11{\allowbreak\mkern18mu
+ ({\operator@font m\es@op@ac od}\,\,##11)}}%
+ {\es@sdef\mod##1{\allowbreak\if@display\mkern18mu
+ \else\mkern12mu\fi{\operator@font m\es@op@ac od}\,\,##1}%
+ \es@sdef\pmod##1{\pod{{\operator@font m\es@op@ac od}%
+ \mkern6mu##1}}}%
+ \def\es@a##1 {%
+ \if^##1^% empty? continue
+ \bbl@afterelse
+ \es@a
+ \else
+ \bbl@afterfi
+ {\if&##1% &? finish
+ \else
+ \bbl@afterfi
+ \begingroup
+ \let\,\@empty % ignore when def'ing name
+ \let\acute\@firstofone % id
+ \edef\es@b{\expandafter\noexpand\csname##1\endcsname}%
+ \def\,{\noexpand\es@op@sp}%
+ \def\acute{\noexpand\es@op@ac}%
+ \edef\es@a{\endgroup
+ \noexpand\es@sdef\expandafter\noexpand\es@b{%
+ \mathop{\noexpand\operator@font##1}\nolimits}}%
+ \es@a % restores itself
+ \es@a
+ \fi}%
+ \fi}%
+ \let\es@b\spanishoperators
+ \addto\es@b{ }%
+ \expandafter\es@a\es@b l\acute{i}m l\acute{i}m\,sup
+ l\acute{i}m\,inf m\acute{a}x \acute{i}nf m\acute{i}n
+ sen tg arc\,sen arc\,cos arc\,tg & }
+\def\spanishoperators{cotg cosec senh tgh }
% \end{macrocode}
%
% Now comes the text shorthands. They are grouped in
% |\shorthandsspanish| and this style performs some
% operations before the babel shortands are called.
-% The goals are to allow espression like |$a^{x'}$|
-% and to deactivate the shorthands making them of
+% The aims are to allow espression like |$a^{x'}$|
+% and to deactivate shorthands by making them of
% category `other.' After providing a |\'i| shorthand,
-% the new macros are defined.
+% the new macros are defined.
%
-% \changes{spanish~4.1a}{99/11/30}{Added basic code for
-% spanish shorthands.}
-% \changes{spanish~4.1a}{99/12/01}{Debugged and added support
-% for the babel groups.}
-% \changes{spanish~4.1c}{00/10/04}{Revised so that it
-% now uses the babel shorthands}
-% \changes{spanish~4.2a}{03/08/08}{Deactivation of dot as
-% a special case}
% \begin{macrocode}
\DeclareTextCompositeCommand{\'}{OT1}{i}{\@tabacckludge'{\i}}
\def\es@set@shorthand#1{%
- \expandafter\edef\csname es@savecat\string#1\endcsname
- {\the\catcode`#1}%
- \initiate@active@char{#1}%
- \catcode`#1=\csname es@savecat\string#1\endcsname\relax
- \expandafter\let\csname es@math\string#1\expandafter\endcsname
- \csname normal@char\string#1\endcsname}
+ \expandafter\edef\csname es@savecat\string#1\endcsname
+ {\the\catcode`#1}%
+ \initiate@active@char{#1}%
+ \catcode`#1=\csname es@savecat\string#1\endcsname\relax
+ \if.#1\else
+ \addto\es@restorelist{\es@restore{#1}}%
+ \addto\es@select{\shorthandon{#1}}%
+ \addto\shorthandsspanish{\es@activate{#1}}%
+ \addto\es@shlist{#1}%
+ \fi}
\def\es@use@shorthand{%
- \es@delayed
- \ifx\thepage\relax\then
- \string
- \else{%
- \es@delayed
- \ifx\protect\@unexpandable@protect\then
- \noexpand
- \else
- \es@use@sh
- \fi}%
- \fi}
-
-\def\es@text@sh#1{\csname active@char\string#1\endcsname}
-\def\es@math@sh#1{\csname es@math\string#1\endcsname}
-
-\def\es@use@sh{%
- \es@delayed
- \if@safe@actives\then
- \string
- \else{%
- \es@delayed
- \ifmmode\then
- \es@math@sh
- \else
- \es@text@sh
- \fi}%
- \fi}
+ \ifx\thepage\relax
+ \bbl@afterelse
+ \string
+ \else
+ \bbl@afterfi
+ {\ifx\protect\@unexpandable@protect
+ \bbl@afterelse
+ \noexpand
+ \else
+ \bbl@afterfi
+ \es@use@sh
+ \fi}%
+ \fi}
+
+\def\es@use@sh#1{%
+ \if@safe@actives
+ \bbl@afterelse
+ \string#1%
+ \else%
+ \bbl@afterfi
+ \textormath
+ {\csname active@char\string#1\endcsname}%
+ {\csname normal@char\string#1\endcsname}%
+ \fi}
\gdef\es@activate#1{%
- \begingroup
- \lccode`\~=`#1
- \lowercase{%
- \endgroup
- \def~{\es@use@shorthand~}}}
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \def~{\es@use@shorthand~}}}
\def\spanishdeactivate#1{%
- \@tfor\@tempa:=#1\do{\expandafter\es@spdeactivate\@tempa}}
+ \@tfor\@tempa:=#1\do{\expandafter\es@spdeactivate\@tempa}}
\def\es@spdeactivate#1{%
- \if.#1%
- \mathcode`\.=\es@period@code
- \else
- \begingroup
- \lccode`\~=`#1
- \lowercase{%
- \endgroup
- \expandafter\let\expandafter~%
- \csname normal@char\string#1\endcsname}%
- \catcode`#1\csname es@savecat\string#1\endcsname\relax
- \fi}
-
-\def\es@reviveshorthands{%
- \es@restore{"}\es@restore{~}%
- \es@restore{<}\es@restore{>}%
- \es@quoting}
-
-\def\es@restore#1{%
- \catcode`#1=\active
+ \if.#1%
+ \mathcode`\.=\es@period@code
+ \else
\begingroup
- \lccode`\~=`#1
- \lowercase{%
+ \lccode`\~=`#1
+ \lowercase{%
\endgroup
- \bbl@deactivate{~}}}
+ \expandafter\let\expandafter~%
+ \csname normal@char\string#1\endcsname}%
+ \catcode`#1=\csname es@savecat\string#1\endcsname\relax
+ \fi}
% \end{macrocode}
%
-% But \textsf{spanish} allows two category codes for |'|,
-% so both should be taken into account in \cs{bbl@pr@m@s}.
-%
-% \changes{spanish~4.1c}{00/10/03}{Added support for primes
-% which are either `active' or `other'}
+% |\es@restore| is used in the list |\es@restorelist|, which in
+% turn restores all shorthands as defined by \babel. The latter
+% macros also has |\es@quoting|.
+%
% \begin{macrocode}
-\begingroup
-\catcode`\'=12
-\lccode`~=`' \lccode`'=`'
-\lowercase{%
-\gdef\bbl@pr@m@s{%
- \es@delayed
- \ifx~\@let@token\then
- \pr@@@s
- \else
- {\es@delayed
- \ifx'\@let@token\then
- \pr@@@s
- \else
- {\es@delayed
- \ifx^\@let@token\then
- \pr@@@t
- \else
- \egroup
- \fi}%
- \fi}%
- \fi}}
-\endgroup
+\def\es@restore#1{%
+ \shorthandon{#1}%
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \bbl@deactivate{~}}}
% \end{macrocode}
%
-% \changes{spanishb~1.1}{98/05/15}{Rewritten part}
-% \changes{spanish~4.0c}{98/12/07}{Optimized a bit}
+% To selectively define the shorthands we have a couple of
+% macros, which defines a certain combination if the first
+% character has been activated as a shorthand. The second
+% one is intended for a few shorthands with an alternative
+% form.
%
% \begin{macrocode}
-\expandafter\ifx\csname @tabacckludge\endcsname\relax
- \let\es@tak\a
-\else
- \let\es@tak\@tabacckludge
+\def\es@declare#1{%
+ \@ifundefined{es@savecat\expandafter\string\@firstoftwo#1}%
+ {\@gobble}%
+ {\declare@shorthand{spanish}{#1}}}
+\def\es@declarealt#1#2#3{%
+ \es@declare{#1}{#3}%
+ \es@declare{#2}{#3}}
+
+\ifes@latex\else
+ \def\@tabacckludge#1{\csname\string#1\endcsname}
\fi
-\ifes@LaTeXe %<<<<<<
- \def\@tabacckludge#1{\expandafter\es@tak\string#1}
- \let\a\@tabacckludge
-\else\ifes@plain %<<<<<<
- \def\@tabacckludge#1{\csname\string#1\endcsname}
-\else %<<<<<<
- \def\@tabacckludge#1{\csname a\string#1\endcsname}
-\fi\fi %<<<<<<
-
-\expandafter\ifx\csname add@accent\endcsname\relax
- \def\add@accent#1#2{\accent#1 #2}
-\fi
+\@ifundefined{add@accent}{\def\add@accent#1#2{\accent#1 #2}}{}
% \end{macrocode}
%
% Instead of redefining |\'|, we redefine the internal
% macro for the OT1 encoding.
-% \changes{spanish~4.1f}{02/05/17}{The spacefactor is restored
-% with the method used in LaTeX2e}
+%
% \begin{macrocode}
-\ifes@LaTeXe %<<<<<<
- \def\es@accent#1#2#3{%
- \expandafter\@text@composite
- \csname OT1\string#1\endcsname#3\@empty\@text@composite
- {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
- \setbox\@tempboxa\hbox{#3%
- \global\mathchardef\accent@spacefactor\spacefactor}%
- \spacefactor\accent@spacefactor}}
-\else %<<<<<<
- \def\es@accent#1#2#3{%
- \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
- \spacefactor\sfcode`#3 }
-\fi %<<<<<<
+\ifes@latex
+ \def\es@accent#1#2#3{%
+ \expandafter\@text@composite
+ \csname OT1\string#1\endcsname#3\@empty\@text@composite
+ {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \setbox\@tempboxa\hbox{#3%
+ \global\mathchardef\accent@spacefactor\spacefactor}%
+ \spacefactor\accent@spacefactor}}
+\else
+ \def\es@accent#1#2#3{%
+ \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \spacefactor\sfcode`#3 }
+\fi
+
+\addto\shorthandsspanish{\languageshorthands{spanish}}%
+\es@ifoption{noshorthands}{}{\es@set@shorthand{"}}
% \end{macrocode}
%
-% The shorthands are activated in the aux file. Now, we begin
-% the shorthands group.
+% We override the default |"| of babel, intended for german.
%
-% \changes{spanish~4.0j}{99/09/15}{Added shorthands for \cs{protect}
-% following active chars. This way, they work in headers}
-% \changes{spanish~4.0l}{99/11/13}{Added the \cs{es@activate}
-% command, which makes the shorthands more robust in math mode.
-% In particular, any of them may be followed by a closing brace}
% \begin{macrocode}
-\addto\shorthandsspanish{\languageshorthands{spanish}}
+\def\es@umlaut#1{%
+ \bbl@allowhyphens\add@accent{127}#1\bbl@allowhyphens
+ \spacefactor\sfcode`#1 }
+
+\addto\shorthandsspanish{%
+ \babel@save\bbl@umlauta
+ \let\bbl@umlauta\es@umlaut}
\let\noshorthandsspanish\relax
-% \end{macrocode}
-%
-% First, decimal comma.
-%
-% \changes{spanish~4.1c}{00/10/03}{Removed an unnecessary macro.}
-% \begin{macrocode}
+
+\ifes@latex
+\addto\shorthandsspanish{%
+ \expandafter\es@sdef\csname OT1\string\~\endcsname{\es@accent\~{126}}%
+ \expandafter\es@sdef\csname OT1\string\'\endcsname{\es@accent\'{19}}}
+\else
+\addto\shorthandsspanish{%
+ \es@sdef\~{\es@accent\~{126}}%
+ \es@sdef\'#1{\if#1i\es@accent\'{19}\i\else\es@accent\'{19}{#1}\fi}}
+\fi
+
+\def\es@sptext@r#1#2{\es@sptext{#1#2}}
+\es@declare{"a}{\sptext{a}}
+\es@declare{"A}{\sptext{A}}
+\es@declare{"o}{\sptext{o}}
+\es@declare{"O}{\sptext{O}}
+\es@declare{"e}{\protect\es@sptext@r{e}}
+\es@declare{"E}{\protect\es@sptext@r{E}}
+\es@declare{"u}{\"u}
+\es@declare{"U}{\"U}
+\es@declare{"i}{\"{\i}}
+\es@declare{"I}{\"I}
+\es@declare{"c}{\c{c}}
+\es@declare{"C}{\c{C}}
+\es@declare{"<}{\guillemotleft{}}
+\es@declare{">}{\guillemotright{}}
+\def\es@chf{\char\hyphenchar\font}
+\es@declare{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
+\es@declare{"=}{\bbl@allowhyphens\es@chf\hskip\z@skip}
+\es@declare{"~}
+ {\bbl@allowhyphens
+ \discretionary{\es@chf}{\es@chf}{\es@chf}%
+ \bbl@allowhyphens}
+\es@declare{"r}
+ {\bbl@allowhyphens
+ \discretionary{\es@chf}{}{r}%
+ \bbl@allowhyphens}
+\es@declare{"R}
+ {\bbl@allowhyphens
+ \discretionary{\es@chf}{}{R}%
+ \bbl@allowhyphens}
+\es@declare{"y}
+ {\@ifundefined{scalebox}%
+ {\ensuremath{\tau}}%
+ {\raisebox{1ex}{\scalebox{-1}{\resizebox{.45em}{1ex}{2}}}}}
+\es@declare{""}{\hskip\z@skip}
+\es@declare{"/}
+ {\setbox\z@\hbox{/}%
+ \dimen@\ht\z@
+ \advance\dimen@-1ex
+ \advance\dimen@\dp\z@
+ \dimen@.31\dimen@
+ \advance\dimen@-\dp\z@
+ \ifdim\dimen@>0pt
+ \kern.01em\lower\dimen@\box\z@\kern.03em
+ \else
+ \box\z@
+ \fi}
+\es@declare{"?}
+ {\setbox\z@\hbox{?`}%
+ \leavevmode\raise\dp\z@\box\z@}
+\es@declare{"!}
+ {\setbox\z@\hbox{!`}%
+ \leavevmode\raise\dp\z@\box\z@}
+
\def\spanishdecimal#1{\def\es@decimal{{#1}}}
\def\decimalcomma{\spanishdecimal{,}}
\def\decimalpoint{\spanishdecimal{.}}
\decimalcomma
-
-\es@set@shorthand{.}
-
-\@namedef{es@math\string.}{%
- \@ifnextchar\egroup
+\es@ifoption{nodecimaldot}{}
+ {\AtBeginDocument{\bgroup\@fileswfalse}%
+ \es@set@shorthand{.}%
+ \AtBeginDocument{\egroup}%
+ \@namedef{normal@char\string.}{%
+ \@ifnextchar\egroup
{\mathchar\es@period@code\relax}%
- {\es@text@sh.}}
-
-\declare@shorthand{system}{.}{\mathchar\es@period@code\relax}
-% \end{macrocode}
-%
-% \changes{spanish~4.0a}{98/09/10}{After the . is activated, it is
-% redefined to avoid errors if followed by a closing brace.
-% Changed \cs{edef} by \cs{mathchardef}. Use
-% \cs{babel@savevariable}instead of \cs{noextrasspanish}.}
-% \changes{spanish~4.0e}{99/04/10}{The catcode is restored in
-% the aux file, too}
-% \begin{macrocode}
-\addto\shorthandsspanish{%
- \mathchardef\es@period@code\the\mathcode`\.%
- \babel@savevariable{\mathcode`\.}%
- \mathcode`\.="8000 %
- \es@activate{.}}
-
-\AtBeginDocument{%
- \catcode`\.=12
- \if@filesw
- \immediate\write\@mainaux{%
- \string\catcode`\string\.=12}%
- \fi}
-
-\declare@shorthand{spanish}{.1}{\es@decimal1}
-\declare@shorthand{spanish}{.2}{\es@decimal2}
-\declare@shorthand{spanish}{.3}{\es@decimal3}
-\declare@shorthand{spanish}{.4}{\es@decimal4}
-\declare@shorthand{spanish}{.5}{\es@decimal5}
-\declare@shorthand{spanish}{.6}{\es@decimal6}
-\declare@shorthand{spanish}{.7}{\es@decimal7}
-\declare@shorthand{spanish}{.8}{\es@decimal8}
-\declare@shorthand{spanish}{.9}{\es@decimal9}
-\declare@shorthand{spanish}{.0}{\es@decimal0}
-% \end{macrocode}
-%
-% Now accents and tools
-%
-% \changes{spanish~4.0d}{99/03/26}{Removed the tilde settings
-% because they are included in babel.def}
-% \changes{spanish~4.0b}{98/10/02}{Introduced \cs{es@umlaut} to allow
-% further division in words containing g\"u}
-% \changes{spanish~4.0c}{98/12/02}{Added missing space at the end
-% of \cs{es@umlaut}}
-% \begin{macrocode}
-\es@set@shorthand{"}
-\def\es@umlaut#1{%
- \bbl@allowhyphens\add@accent{127}#1\bbl@allowhyphens
- \spacefactor\sfcode`#1 }
-% \end{macrocode}
-%
-% We override the default |"| of babel, intended for german.
-%
-% \begin{macrocode}
-\ifes@LaTeXe %<<<<<<
- \addto\shorthandsspanish{%
- \es@activate{"}%
- \es@activate{~}%
- \babel@save\bbl@umlauta
- \let\bbl@umlauta\es@umlaut
- \expandafter\babel@save\csname OT1\string\~\endcsname
- \expandafter\def\csname OT1\string\~\endcsname{\es@accent\~{126}}%
- \expandafter\babel@save\csname OT1\string\'\endcsname
- \expandafter\def\csname OT1\string\'\endcsname{\es@accent\'{19}}}
-\else %<<<<<<
+ {\csname active@char\string.\endcsname}}%
+ \declare@shorthand{system}{.}{\mathchar\es@period@code\relax}%
\addto\shorthandsspanish{%
- \es@activate{"}%
- \es@activate{~}%
- \babel@save\bbl@umlauta
- \let\bbl@umlauta\es@umlaut
- \babel@save\~%
- \def\~{\es@accent\~{126}}%
- \babel@save\'%
- \def\'#1{\if#1i\es@accent\'{19}\i\else\es@accent\'{19}{#1}\fi}}
-\fi %<<<<<<
-% \end{macrocode}
-% \changes{spanish~4.0c}{98/11/19}{Subtituted
-% \cs{char}\cs{hyphenchar}\cs{font} for some instances of -}
-% \changes{spanish~4.0h}{98/06/06}{Added \cs{deactivatetilden}}
-% \changes{spanish~4.2a}{03/08/08}{Added raised ?` and !`}
-% \changes{spanish~4.2b}{03/09/12}{Added er and ER}
-% \begin{macrocode}
-\declare@shorthand{spanish}{"a}{\protect\es@sptext{a}}
-\declare@shorthand{spanish}{"A}{\protect\es@sptext{A}}
-\declare@shorthand{spanish}{"o}{\protect\es@sptext{o}}
-\declare@shorthand{spanish}{"O}{\protect\es@sptext{O}}
-\declare@shorthand{spanish}{"e}{\protect\es@sptext@r{e}}
-\declare@shorthand{spanish}{"E}{\protect\es@sptext@r{E}}
-
-\def\es@sptext@r#1#2{\es@sptext{#1#2}}
-
-\declare@shorthand{spanish}{"u}{\"u}
-\declare@shorthand{spanish}{"U}{\"U}
-
-\declare@shorthand{spanish}{"c}{\c{c}}
-\declare@shorthand{spanish}{"C}{\c{C}}
-
-\declare@shorthand{spanish}{"<}{\guillemotleft{}}
-\declare@shorthand{spanish}{">}{\guillemotright{}}
-\declare@shorthand{spanish}{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
-\declare@shorthand{spanish}{"=}%
- {\bbl@allowhyphens\char\hyphenchar\font\hskip\z@skip}
-\declare@shorthand{spanish}{"~}
- {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
- {\char\hyphenchar\font}{\char\hyphenchar\font}\bbl@allowhyphens}
-\declare@shorthand{spanish}{"r}
- {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
- {}{r}\bbl@allowhyphens}
-\declare@shorthand{spanish}{"R}
- {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
- {}{R}\bbl@allowhyphens}
-\declare@shorthand{spanish}{"y}
- {\@ifundefined{scalebox}%
- {\ensuremath{\tau}}%
- {\raisebox{1ex}{\scalebox{-1}{\resizebox{.45em}{1ex}{2}}}}}
-\declare@shorthand{spanish}{""}{\hskip\z@skip}
-\declare@shorthand{spanish}{"/}
- {\setbox\z@\hbox{/}%
- \dimen@\ht\z@
- \advance\dimen@-1ex
- \advance\dimen@\dp\z@
- \dimen@.31\dimen@
- \advance\dimen@-\dp\z@
- \ifdim\dimen@>0pt
- \kern.01em\lower\dimen@\box\z@\kern.03em
- \else
- \box\z@
- \fi}
-\declare@shorthand{spanish}{"?}
- {\setbox\z@\hbox{?`}%
- \leavevmode\raise\dp\z@\box\z@}
-\declare@shorthand{spanish}{"!}
- {\setbox\z@\hbox{!`}%
- \leavevmode\raise\dp\z@\box\z@}
-
-\es@set@shorthand{~}
-\declare@shorthand{spanish}{~n}{\~n}
-\declare@shorthand{spanish}{~N}{\~N}
-\declare@shorthand{spanish}{~-}{%
- \leavevmode
- \bgroup
- \let\@sptoken\es@dashes % This assignation changes the
- \@ifnextchar-% \@ifnextchar behaviour
- {\es@dashes}%
- {\hbox{\char\hyphenchar\font}\egroup}}
+ \mathchardef\es@period@code\the\mathcode`\.%
+ \babel@savevariable{\mathcode`\.}%
+ \mathcode`\.="8000 %
+ \es@activate{.}}%
+ \def\es@a#1{\es@declare{.#1}{\es@decimal#1}}%
+ \es@a1\es@a2\es@a3\es@a4\es@a5\es@a6\es@a7\es@a8\es@a9\es@a0}
+
+\es@ifoption{notilde}{}{\es@set@shorthand{~}}
+\def\deactivatetilden{%
+ \expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
+ \expandafter\let\csname spanish@sh@\string~@N@\endcsname\relax}
+\es@ifoption{tilden}
+ {\es@declare{~n}{\~n}%
+ \es@declare{~N}{\~N}}
+ {\let\deactivatetilden\relax}
+\es@declarealt{~-}{"+}{%
+ \leavevmode
+ \bgroup
+ \let\@sptoken\es@dashes % Changes \@ifnextchar behaviour
+ \@ifnextchar-%
+ {\es@dashes}%
+ {\hbox{\es@chf}\egroup}}
\def\es@dashes-{%
- \@ifnextchar-%
- {\bbl@allowhyphens\hbox{---}\bbl@allowhyphens\egroup\@gobble}%
- {\bbl@allowhyphens\hbox{--}\bbl@allowhyphens\egroup}}
+ \@ifnextchar-%
+ {\bbl@allowhyphens\hbox{---}\bbl@allowhyphens\egroup\@gobble}%
+ {\bbl@allowhyphens\hbox{--}\bbl@allowhyphens\egroup}}
+
+\es@ifoption{noquoting}%
+ {\let\es@quoting\relax
+ \let\activatequoting\relax
+ \let\deactivatequoting\relax}
+ {\@ifundefined{XML@catcodes}%
+ {\es@set@shorthand{<}%
+ \es@set@shorthand{>}%
+ \declare@shorthand{system}{<}{\csname normal@char\string<\endcsname}%
+ \declare@shorthand{system}{>}{\csname normal@char\string>\endcsname}%
+ \addto\es@restorelist{\es@quoting}%
+ \addto\es@select{\es@quoting}%
+ \ifes@latex
+ \AtBeginDocument{%
+ \es@quoting
+ \if@filesw
+ \immediate\write\@mainaux{\string\@nameuse{es@quoting}}%
+ \fi}%
+ \fi
+ \def\activatequoting{%
+ \shorthandon{<>}%
+ \let\es@quoting\activatequoting}%
+ \def\deactivatequoting{%
+ \shorthandoff{<>}%
+ \let\es@quoting\deactivatequoting}}{}}
-\def\deactivatetilden{%
- \expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
- \expandafter\let\csname spanish@sh@\string~@N@\endcsname\relax}
+\es@declarealt{<<}{"`}{\begin{quoting}}
+\es@declarealt{>>}{"'}{\end{quoting}}
% \end{macrocode}
%
-% The shorthands for |quoting|.
+% Acute accent shorthands are stored in a macro. If |activeacute|
+% was set as an option it's executed. If not is not deleted for a
+% possible later use in the |cfg| file. In non \LaTeXe{} formats
+% is always executed.
%
-% \changes{spanish~4.1d}{01/09/10}{Disabled if in xmltex}
% \begin{macrocode}
-\expandafter\ifx\csname XML@catcodes\endcsname\relax
- \addto\es@select{%
- \catcode`\<\active\catcode`\>=\active
- \es@quoting}
-
- \es@set@shorthand{<}
- \es@set@shorthand{>}
-
- \declare@shorthand{system}{<}{\csname normal@char\string<\endcsname}
- \declare@shorthand{system}{>}{\csname normal@char\string>\endcsname}
-
- \addto\shorthandsspanish{%
- \es@activate{<}%
- \es@activate{>}}
+\begingroup
+\catcode`\'=12
+\gdef\es@activeacute{%
+ \es@set@shorthand{'}%
+ \def\es@a##1{\es@declare{'##1}{\@tabacckludge'##1}}%
+ \es@a a\es@a e\es@a i\es@a o\es@a u%
+ \es@a A\es@a E\es@a I\es@a O\es@a U%
+ \es@declare{'n}{\~n}%
+ \es@declare{'N}{\~N}%
% \end{macrocode}
%
-% \changes{spanish~4.0e}{99/04/10}{\cs{es@quoting} is written to the
-% aux file, too}
+% But \textsf{spanish} allows two category codes for |'|,
+% so both should be taken into account in \cs{bbl@pr@m@s}.
+%
% \begin{macrocode}
- \ifes@LaTeXe %<<<<<<
- \AtBeginDocument{%
- \es@quoting
- \if@filesw
- \immediate\write\@mainaux{\string\es@quoting}%
- \fi}%
- \fi %<<<<<<
-
- \def\activatequoting{%
- \catcode`>=\active \catcode`<=\active
- \let\es@quoting\activatequoting}
- \def\deactivatequoting{%
- \catcode`>=12 \catcode`<=12
- \let\es@quoting\deactivatequoting}
+ \let\es@pr@m@s\bbl@pr@m@s
+ \def\bbl@pr@m@s{%
+ \ifx'\@let@token
+ \bbl@afterelse
+ \pr@@@s
+ \else
+ \bbl@afterfi
+ \es@pr@m@s
+ \fi}%
+ \let\es@activeacute\relax}
+\endgroup
- \declare@shorthand{spanish}{<<}{\begin{quoting}}
- \declare@shorthand{spanish}{>>}{\end{quoting}}
+\ifes@latex
+ \@ifpackagewith{babel}{activeacute}{\es@activeacute}{}
+\else
+ \es@activeacute
\fi
-
-\let\es@quoting\relax
-\let\deactivatequoting\relax
-\let\activatequoting\relax
-% \end{macrocode}
-%
-% The acute accents are stored in a macro. If |activeacute| was set
-% as an option it's executed. If not is not deleted for a possible
-% later use in the |cfg| file. In non \LaTeXe{} formats is always
-% executed.
-%
-% \changes{spanish~4.0l}{99/11/12}{We make a preevaluation of acute;
-% in math mode, the shorthand mechanism is bypassed. That's done
-% *after* the test of the protection status.}
-% \begin{macrocode}
-\def\es@activeacute{%
- \es@set@shorthand{'}%
- \addto\shorthandsspanish{\es@activate{'}}%
- \addto\es@reviveshorthands{\es@restore{'}}%
- \addto\es@select{\catcode`'=\active}%
- \declare@shorthand{spanish}{'a}{\@tabacckludge'a}%
- \declare@shorthand{spanish}{'A}{\@tabacckludge'A}%
- \declare@shorthand{spanish}{'e}{\@tabacckludge'e}%
- \declare@shorthand{spanish}{'E}{\@tabacckludge'E}%
- \declare@shorthand{spanish}{'i}{\@tabacckludge'i}%
- \declare@shorthand{spanish}{'I}{\@tabacckludge'I}%
- \declare@shorthand{spanish}{'o}{\@tabacckludge'o}%
- \declare@shorthand{spanish}{'O}{\@tabacckludge'O}%
- \declare@shorthand{spanish}{'u}{\@tabacckludge'u}%
- \declare@shorthand{spanish}{'U}{\@tabacckludge'U}%
- \declare@shorthand{spanish}{'n}{\~n}%
- \declare@shorthand{spanish}{'N}{\~N}%
- \declare@shorthand{spanish}{''}{\textquotedblright}%
- \let\es@activeacute\relax}
-
-\ifes@LaTeXe %<<<<<<
- \@ifpackagewith{babel}{activeacute}{\es@activeacute}{}
-\else %<<<<<<
- \es@activeacute
-\fi %<<<<<<%
% \end{macrocode}
%
% And the customization. By default these macros only
% store the values and do nothing.
%
% \begin{macrocode}
-\def\es@enumerate#1#2#3#4{%
- \def\es@enum{{#1}{#2}{#3}{#4}}}
-
-\def\es@itemize#1#2#3#4{%
- \def\es@item{{#1}{#2}{#3}{#4}}}
-% \end{macrocode}
-%
-% The part formerly in the |.lld| file comes here. It performs
-% layout adaptation of \LaTeX{} to ``orthodox'' Spanish rules.
-% \changes{spanish~4.1c}{00/09/30}{The box used in itemize made
-% slightly smaller (.1ex).}
-% \changes{spanish~4.1d}{02/01/25}{Removed extra \cs{enspace}
-% which formatted differently \cs{item} with brackets.}
-% \changes{spanish~4.2a}{03/08/08}{Added \cs{spanishsignitems}}
-% \changes{spanish~4.2a}{03/08/08}{Mispaced \cs{es@enumerate}
-% and \cs{es@itemize} moved into \cs{layoutspanish}}
-% \changes{spanish~4.2b}{03/09/12}{If an entry toc has an
-% empty \cs{numberline} the dot is not printed}
-% \begin{macrocode}
-\ifes@LaTeXe %<<<<<<
+\def\es@enumerate#1#2#3#4{\def\es@enum{{#1}{#2}{#3}{#4}}}
+\def\es@itemize#1#2#3#4{\def\es@item{{#1}{#2}{#3}{#4}}}
+\ifes@latex
\es@enumerate{1.}{a)}{1)}{a$'$}
\def\spanishdashitems{\es@itemize{---}{---}{---}{---}}
\def\spanishsymbitems{%
- \es@itemize
- {\leavevmode\hbox to 1.2ex
- {\hss\vrule height .9ex width .7ex depth -.2ex\hss}}%
- {\textbullet}%
- {$\m@th\circ$}%
- {$\m@th\diamond$}}
+ \es@itemize
+ {\leavevmode\hbox to 1.2ex
+ {\hss\vrule height .9ex width .7ex depth -.2ex\hss}}%
+ {\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}}
\def\spanishsignitems{%
- \es@itemize
- {\textbullet}%
- {$\m@th\circ$}%
- {$\m@th\diamond$}%
- {$\m@th\triangleright$}}
+ \es@itemize{\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}%
+ {$\m@th\triangleright$}}
\spanishsymbitems
-
\def\es@enumdef#1#2#3\@@{%
- \if#21%
- \@namedef{theenum#1}{\arabic{enum#1}}%
- \else\if#2a%
- \@namedef{theenum#1}{\emph{\alph{enum#1}}}%
- \else\if#2A%
- \@namedef{theenum#1}{\Alph{enum#1}}%
- \else\if#2i%
- \@namedef{theenum#1}{\roman{enum#1}}%
- \else\if#2I%
- \@namedef{theenum#1}{\Roman{enum#1}}%
- \else\if#2o%
- \@namedef{theenum#1}{\arabic{enum#1}\protect\es@sptext{o}}%
- \fi\fi\fi\fi\fi\fi
- \toks@\expandafter{\csname theenum#1\endcsname}
- \expandafter\edef\csname labelenum#1\endcsname
- {\noexpand\es@listquot\the\toks@#3}}
-
-\addto\layoutspanish{%
- \def\es@enumerate##1##2##3##4{%
- \es@enumdef{i}##1\@empty\@empty\@@
- \es@enumdef{ii}##2\@empty\@empty\@@
- \es@enumdef{iii}##3\@empty\@empty\@@
- \es@enumdef{iv}##4\@empty\@empty\@@}%
- \def\es@itemize##1##2##3##4{%
- \def\labelitemi{\es@listquot##1}%
- \def\labelitemii{\es@listquot##2}%
- \def\labelitemiii{\es@listquot##3}%
- \def\labelitemiv{\es@listquot##4}}%
- \def\p@enumii{\theenumi}%
- \def\p@enumiii{\theenumi\theenumii}%
- \def\p@enumiv{\p@enumiii\theenumiii}%
- \expandafter\es@enumerate\es@enum
- \expandafter\es@itemize\es@item
- \DeclareTextCommand{\guillemotleft}{OT1}{%
- \ifmmode\ll
- \else
- \save@sf@q{\penalty\@M
- \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
- \char40 \kern-0.19em\char40 }}%
- \fi}%
- \DeclareTextCommand{\guillemotright}{OT1}{%
- \ifmmode\gg
- \else
- \save@sf@q{\penalty\@M
- \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
- \char41 \kern-0.19em\char41 }}%
- \fi}%
- \def\@fnsymbol##1%
- {\ifcase##1\or*\or**\or***\or****\or
- *****\or******\else\@ctrerr\fi}%
- \def\@alph##1%
- {\ifcase##1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or
- k\or l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
- w\or x\or y\or z\else\@ctrerr\fi}%
- \def\@Alph##1%
- {\ifcase##1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or
- K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
- W\or X\or Y\or Z\else\@ctrerr\fi}%
- \let\@afterindentfalse\@afterindenttrue
- \@afterindenttrue
- \def\@seccntformat##1{\csname the##1\endcsname.\quad}%
- \def\numberline##1{\hb@xt@\@tempdima{##1\if&##1&\else.\fi\hfil}}%
- \def\@roman##1{\protect\es@roman{\number##1}}%
- \def\es@roman##1{\protect\es@lsc{\romannumeral##1}}%
- \def\esromanindex##1##2{##1{\protect\es@lsc{##2}}}}
+ \if#21%
+ \@namedef{theenum#1}{\arabic{enum#1}}%
+ \else\if#2a%
+ \@namedef{theenum#1}{\emph{\alph{enum#1}}}%
+ \else\if#2A%
+ \@namedef{theenum#1}{\Alph{enum#1}}%
+ \else\if#2i%
+ \@namedef{theenum#1}{\roman{enum#1}}%
+ \else\if#2I%
+ \@namedef{theenum#1}{\Roman{enum#1}}%
+ \else\if#2o%
+ \@namedef{theenum#1}{\arabic{enum#1}\sptext{o}}%
+ \fi\fi\fi\fi\fi\fi
+ \toks@\expandafter{\csname theenum#1\endcsname}%
+ \expandafter\edef\csname labelenum#1\endcsname
+ {\noexpand\es@listquot\the\toks@#3}}
+\def\es@guillemot#1#2{%
+ \ifmmode#1%
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char#2 \kern-0.19em\char#2 }}%
+ \fi}
+\def\layoutspanish{%
+ \let\layoutspanish\@empty
+ \DeclareTextCommand{\guillemotleft}{OT1}{\es@guillemot\ll{40}}%
+ \DeclareTextCommand{\guillemotright}{OT1}{\es@guillemot\gg{41}}%
+ \def\@fnsymbol##1%
+ {\ifcase##1\or*\or**\or***\or****\or
+ *****\or******\else\@ctrerr\fi}%
+ \def\@alph##1%
+ {\ifcase##1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or
+ k\or l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
+ w\or x\or y\or z\else\@ctrerr\fi}%
+ \def\@Alph##1%
+ {\ifcase##1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or
+ K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
+ W\or X\or Y\or Z\else\@ctrerr\fi}}
+
+\es@optlayout{nolists}{%
+ \def\es@enumerate#1#2#3#4{%
+ \es@enumdef{i}#1\@empty\@empty\@@
+ \es@enumdef{ii}#2\@empty\@empty\@@
+ \es@enumdef{iii}#3\@empty\@empty\@@
+ \es@enumdef{iv}#4\@empty\@empty\@@}%
+ \def\es@itemize#1#2#3#4{%
+ \def\labelitemi{\es@listquot#1}%
+ \def\labelitemii{\es@listquot#2}%
+ \def\labelitemiii{\es@listquot#3}%
+ \def\labelitemiv{\es@listquot#4}}%
+ \def\p@enumii{\theenumi}%
+ \def\p@enumiii{\p@enumii\theenumii}%
+ \def\p@enumiv{\p@enumiii\theenumiii}%
+ \expandafter\es@enumerate\es@enum
+ \expandafter\es@itemize\es@item}
+\let\esromanindex\@secondoftwo
+\es@ifoption{ucroman}
+ {\def\es@romandef{%
+ \def\esromanindex##1##2{##1{\uppercase{##2}}}%
+ \def\@roman{\@Roman}}}
+ {\def\es@romandef{%
+ \def\esromanindex##1##2{##1{\protect\es@roman{##2}}}%
+ \def\@roman##1{\protect\es@roman{\romannumeral##1}}%
+ \def\es@roman{\es@xlsc\uppercase\@firstofone}}}
+\es@optlayout{lcroman}{\es@romandef}
+\newcommand\spanishlcroman{\def\@roman##1{\romannumeral##1}}
+\newcommand\spanishucroman{\def\@roman{\@Roman}}
+\newcommand\spanishscroman{\def\@roman##1{\es@roman{\romannumeral##1}}}
+\es@optlayout{noindentfirst}{%
+ \let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue}
+\es@optlayout{nosectiondot}{%
+ \def\@seccntformat#1{\csname the#1\endcsname.\quad}%
+ \def\numberline#1{\hb@xt@\@tempdima{#1\if&#1&\else.\fi\hfil}}}
+\es@ifoption{nolayout}{\let\layoutspanish\relax}{}
+\es@ifoption{sloppy}{\let\textspanish\relax\let\mathspanish\relax}{}
+\es@ifoption{delayed}{}{\def\es@layoutspanish{\layoutspanish}}
+\es@ifoption{preindex}{\AtEndOfPackage{\RequirePackage{romanidx}}}{}
% \end{macrocode}
%
% We need to execute the following code when babel has been
@@ -2383,105 +2500,73 @@
%
% \begin{macrocode}
\AtEndOfPackage{%
- \let\es@activeacute\@undefined
- \def\bbl@tempa{spanish}%
- \ifx\bbl@main@language\bbl@tempa
- \AtBeginDocument{\layoutspanish}%
- \addto\es@select{%
- \@ifstar{\let\layoutspanish\relax}%
- {\layoutspanish\let\layoutspanish\relax}}%
- \fi
- \selectspanish}
-
-\fi %<<<<<<
+\let\es@activeacute\@undefined
+\def\bbl@tempa{spanish}%
+\ifx\bbl@main@language\bbl@tempa
+ \@nameuse{es@layoutspanish}%
+ \addto\es@select{%
+ \@ifstar{\PackageError{spanish}%
+ {Old syntax--use es-nolayout}%
+ {If you don't want changes in layout\MessageBreak
+ use the es-nolayout package option}}%
+ {}}%
+ \AtBeginDocument{\layoutspanish}%
+\fi
+\selectspanish}
+\fi
% \end{macrocode}
%
% After restoring the catcode of |~| and setting the minimal
% values for hyphenation, the |.ldf| is finished.
-%
-% \changes{spanish~4.0e}{99/04/11}{Removed duplicated \cs{loadlocalcfg}}
-% \changes{spanish~4.0a}{98/09/14}{Moved
-% \cs{let}\cs{es@activeacute}\cs{@undefined}
-% to \cs{AtEndOfPackage}}
-% \changes{spanish~4.0a}{98/09/12}{Introduced \cs{ldf@finish}}
-% \changes{spanish~4.1d}{01/06/06}{Removed extra \cs{endinput}}
+%
% \begin{macrocode}
\es@savedcatcodes
-
\providehyphenmins{\CurrentOption}{\tw@\tw@}
-
-\ifes@LaTeXe %<<<<<<
- \ldf@finish{spanish}
-\else %<<<<<<
- \es@select
- \ldf@finish{spanish}
- \csname activatequoting\endcsname
-\fi %<<<<<<
-
+\ifes@latex\else
+ \es@select
+\fi
+\ldf@finish{spanish}
+\csname activatequoting\endcsname
%</code>
% \end{macrocode}
-% That's all in the main file. Now the file with
-% \textsf{custom-bib} macros.
-%
-% \changes{spanish~4.0b}{98/11/09}{Added support for custom-bib}
-% \changes{spanish~4.0i}{99/06/21}{the mthesis and phdthesis text
-% were reverted. Fixed}
-% \changes{spanish~4.0i}{99/06/21}{Added \cs{bbletal}}
-% \begin{macrocode}
-%<*bblbst>
-\def\bbland{y}
-\def\bbleditors{directores} \def\bbleds{dirs.\@}
-\def\bbleditor{director} \def\bbled{dir.\@}
-\def\bbledby{dirigido por}
-\def\bbledition{edici\'on} \def\bbledn{ed.\@}
-\def\bbletal{y otros}
-\def\bblvolume{vol\'umen} \def\bblvol{vol.\@}
-\def\bblof{de}
-\def\bblnumber{n\'umero} \def\bblno{n\sptext{o}}
-\def\bblin{en}
-\def\bblpages{p\'aginas} \def\bblpp{p\'ags.\@}
-\def\bblpage{p\'gina} \def\bblp{p\'ag.\@}
-\def\bblchapter{cap\'itulo} \def\bblchap{cap.\@}
-\def\bbltechreport{informe t\'ecnico}
-\def\bbltechrep{inf.\@ t\'ec.\@}
-\def\bblmthesis{proyecto de fin de carrera}
-\def\bblphdthesis{tesis doctoral}
-\def\bblfirst {primera} \def\bblfirsto {1\sptext{a}}
-\def\bblsecond{segunda} \def\bblsecondo{2\sptext{a}}
-\def\bblthird {tercera} \def\bblthirdo {3\sptext{a}}
-\def\bblfourth{cuarta} \def\bblfourtho{4\sptext{a}}
-\def\bblfifth {quinta} \def\bblfiftho {5\sptext{a}}
-\def\bblth{\sptext{a}}
-\let\bblst\bblth \let\bblnd\bblth \let\bblrd\bblth
-\def\bbljan{enero} \def\bblfeb{febrero} \def\bblmar{marzo}
-\def\bblapr{abril} \def\bblmay{mayo} \def\bbljun{junio}
-\def\bbljul{julio} \def\bblaug{agosto} \def\bblsep{septiembre}
-\def\bbloct{octubre}\def\bblnov{noviembre}\def\bbldec{diciembre}
-%</bblbst>
-% \end{macrocode}
+% That's all in the main file.
%
% The |spanish| option writes a macro in the page field of
% \textit{MakeIndex} in entries with small caps number, and they
% are rejected. This program is a preprocessor which moves this
-% macro to the entry field.
+% macro to the entry field. It can be called from the main
+% document as a package or with the package option |es-preindex|.
%
% \begin{macrocode}
%<*indexes>
\makeatletter
+\@ifundefined{es@idxfile}
+ {\def\spanishindexchars#1#2#3{%
+ \edef\es@encap{`\expandafter\noexpand\csname\string#1\endcsname}%
+ \edef\es@openrange{`\expandafter\noexpand\csname\string#2\endcsname}%
+ \edef\es@closerange{`\expandafter\noexpand\csname\string#3\endcsname}}%
+ \spanishindexchars{|}{(}{)}%
+ \ifx\documentclass\@twoclasseserror
+ \edef\es@idxfile{\jobname}%
+ \AtEndDocument{%
+ \addto\@defaultsubs{%
+ \immediate\closeout\@indexfile
+ \input{romanidx.sty}}}%
+ \expandafter\endinput
+ \fi}{}
+
\newcount\es@converted
\newcount\es@processed
-\def\es@encap{`\|}
-\def\es@openrange{`\(}
-\def\es@closerange{`\)}
-
\def\es@split@file#1.#2\@@{#1}
\def\es@split@ext#1.#2\@@{#2}
-\typein[\answer]{^^JArchivo que convertir^^J%
- (extension por omision .idx):}
-
+\@ifundefined{es@idxfile}
+ {\typein[\answer]{^^JArchivo que convertir^^J%
+ (extension por omision .idx):}}
+ {\let\answer\es@idxfile}
+
\@expandtwoargs\in@{.}{\answer}
\ifin@
\edef\es@input@file{\expandafter\es@split@file\answer\@@}
@@ -2491,9 +2576,11 @@
\def\es@input@ext{idx}
\fi
-\typein[\answer]{^^JArchivo de destino^^J%
- (archivo por omision: \es@input@file.eix,^^J%
- extension por omision .eix):}
+\@ifundefined{es@idxfile}
+ {\typein[\answer]{^^JArchivo de destino^^J%
+ (archivo por omision: \es@input@file.eix,^^J%
+ extension por omision .eix):}}
+ {\let\answer\es@idxfile}
\ifx\answer\@empty
\edef\es@output{\es@input@file.eix}
\else
@@ -2505,11 +2592,13 @@
\fi
\fi
-\typein[\answer]{%
- ^^J?Se ha usado algun esquema especial de controles^^J%
- de MakeIndex para encap, open_range o close_range?^^J%
- [s/n] (n por omision)}
-
+\@ifundefined{es@idxfile}
+ {\typein[\answer]{%
+ ^^J?Se ha usado algun esquema especial de controles^^J%
+ de MakeIndex para encap, open_range o close_range?^^J%
+ [s/n] (n por omision)}}
+ {\def\answer{n}}
+
\if s\answer
\typein[\answer]{^^JCaracter para 'encap'^^J%
(\string| por omision)}
@@ -2530,20 +2619,20 @@
`\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
\fi
\fi
-
+
\newwrite\es@indexfile
\immediate\openout\es@indexfile=\es@output
\newif\ifes@encapsulated
-\def\es@roman#1{\romannumeral#1 }
+\def\es@roman#1{#1}
\edef\es@slash{\expandafter\@gobble\string\\}
\def\indexentry{%
\begingroup
\@sanitize
\es@indexentry}
-
+
\begingroup
\catcode`\|=12 \lccode`\|=\es@encap\relax
@@ -2602,12 +2691,32 @@
\ifnum\es@converted>\z@
\typeout{Genere el indice a partir de ese archivo}
\else
- \typeout{No se ha realizado ningun tipo de conversion}
- \typeout{Se puede generar el archivo directamente^^J%
- de \es@input@file.\es@input@ext}
+ \typeout{No se ha convertido nada. Se puede generar}
+ \typeout{el .ind directamente de \es@input@file.\es@input@ext}
\fi
\typeout{*****************}
-\@@end
+
+\@ifundefined{es@sdef}{\@@end}{}
+%%
+%% \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
+%% Lower-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
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%
+\endinput
+%%
+%% End of file `romanidx.tex'.
%</indexes>
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/generic/babel/spanish.ins b/Master/texmf-dist/source/generic/babel/spanish.ins
index 025a0f1c792..3347f7b15ff 100644
--- a/Master/texmf-dist/source/generic/babel/spanish.ins
+++ b/Master/texmf-dist/source/generic/babel/spanish.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -31,29 +31,29 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\batchfile{spanish.ins}
-\def\filedate{2000/10/13}
-\input docstrip.tex
-
-{\ifx\generate\undefined
- \Msg{**********************************************}
- \Msg{*}
- \Msg{* This installation requires docstrip}
- \Msg{* version 2.3c or later.}
- \Msg{*}
- \Msg{* An older version of docstrip has been input}
- \Msg{*}
- \Msg{**********************************************}
- \errhelp{Move or rename old docstrip.tex.}
- \errmessage{Old docstrip in input path}
- \batchmode
- \csname @@end\endcsname
-\fi}
-
-\declarepreamble\mainpreamble
+\def\batchfile{spanish.ins}
+\def\filedate{2007/02/21}
+\input docstrip.tex
+
+{\ifx\generate\undefined
+ \Msg{**********************************************}
+ \Msg{*}
+ \Msg{* This installation requires docstrip}
+ \Msg{* version 2.3c or later.}
+ \Msg{*}
+ \Msg{* An older version of docstrip has been input}
+ \Msg{*}
+ \Msg{**********************************************}
+ \errhelp{Move or rename old docstrip.tex.}
+ \errmessage{Old docstrip in input path}
+ \batchmode
+ \csname @@end\endcsname
+\fi}
+
+\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -82,12 +82,12 @@ information.
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.
-\endpreamble
-
-\declarepreamble\fdpreamble
+\endpreamble
+
+\declarepreamble\fdpreamble
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -119,33 +119,32 @@ this file to serve the needs of your installation.
However, NO PERMISSION is granted to distribute a modified version
of this file under its original name.
-\endpreamble
-
-\keepsilent
-
-\usedir{tex/generic/babel}
-
-\keepsilent
-
-\usepreamble\mainpreamble
-\generate{\file{spanish.ldf}{\from{spanish.dtx}{code}}%
- \file{esbst.tex}{\from{spanish.dtx}{bblbst}}%
- \file{romanidx.tex}{\from{spanish.dtx}{indexes}}}
-\usepreamble\fdpreamble
-
-\ifToplevel{
-\Msg{***********************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* files into a directory searched by TeX:}
-\Msg{*}
-\Msg{* \space\space All *.def, *.fd, *.ldf, *.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the files ending with}
-\Msg{* '.dtx' and `.fdd' through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing}
-\Msg{***********************************************************}
-}
-
-\endinput
+\endpreamble
+
+\keepsilent
+
+\usedir{tex/generic/babel}
+
+\keepsilent
+
+\usepreamble\mainpreamble
+\generate{\file{spanish.ldf}{\from{spanish.dtx}{code}}%
+ \file{romanidx.sty}{\from{spanish.dtx}{indexes}}}
+\usepreamble\fdpreamble
+
+\ifToplevel{
+\Msg{***********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* files into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space All *.def, *.fd, *.ldf, *.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the files ending with}
+\Msg{* '.dtx' and `.fdd' through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing}
+\Msg{***********************************************************}
+}
+
+\endinput
diff --git a/Master/texmf-dist/source/generic/babel/tb1202.tex b/Master/texmf-dist/source/generic/babel/tb1202.tex
index 0cedd222ba2..fbec780704e 100644
--- a/Master/texmf-dist/source/generic/babel/tb1202.tex
+++ b/Master/texmf-dist/source/generic/babel/tb1202.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/tb1401.tex b/Master/texmf-dist/source/generic/babel/tb1401.tex
index 7d8b0903592..00373e522fa 100644
--- a/Master/texmf-dist/source/generic/babel/tb1401.tex
+++ b/Master/texmf-dist/source/generic/babel/tb1401.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/tb1604.tex b/Master/texmf-dist/source/generic/babel/tb1604.tex
index 0538716f82a..579bf65f504 100644
--- a/Master/texmf-dist/source/generic/babel/tb1604.tex
+++ b/Master/texmf-dist/source/generic/babel/tb1604.tex
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/ukraineb.dtx b/Master/texmf-dist/source/generic/babel/ukraineb.dtx
index 8e3d382bc6f..0bd4b5537af 100644
--- a/Master/texmf-dist/source/generic/babel/ukraineb.dtx
+++ b/Master/texmf-dist/source/generic/babel/ukraineb.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2007 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -35,19 +35,19 @@
\ProvidesFile{ukraineb.dtx}
%</dtx>
%<code>\ProvidesLanguage{ukraineb}
- [2007/10/20 v1.1l Ukrainian support from the babel system]
+ [2008/03/21 v1.1l Ukrainian support from the babel system]
%
%% File `ukraineb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% ukraineb Language Definition File
-%% Copyright (C) 1997 - 2007
+%% Copyright (C) 1997 - 2008
%% by Andrij Shvaika ashv at icmp.lviv.ua
%
%% derived from the Russianb Language Definition File
-%% Copyright (C) 1995 - 2007
+%% Copyright (C) 1995 - 2008
%% by Olga Lapko cyrtug at mir.msk.su
%% Johannes Braams, TeXniek
% adapted to the new T2 and X2 Cyrillic encodings
@@ -55,7 +55,7 @@
% Werner Lemberg wl at gnu.org
%
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
%
%<*filedriver>
\documentclass{ltxdoc}
diff --git a/Master/texmf-dist/source/generic/babel/ukraineb.ins b/Master/texmf-dist/source/generic/babel/ukraineb.ins
index 388f7ba499b..fd1c219c3e1 100644
--- a/Master/texmf-dist/source/generic/babel/ukraineb.ins
+++ b/Master/texmf-dist/source/generic/babel/ukraineb.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file is part of the Babel system.
@@ -53,7 +53,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 1989-2007 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
@@ -88,7 +88,7 @@ extension .ins) which are part of the distribution.
This is a generated file.
-Copyright 1989-2005 Johannes L. Braams and any individual authors
+Copyright 1989-2008 Johannes L. Braams and any individual authors
listed elsewhere in this file. All rights reserved.
This file was generated from file(s) of the Babel system.
diff --git a/Master/texmf-dist/source/generic/babel/usorbian.dtx b/Master/texmf-dist/source/generic/babel/usorbian.dtx
index c6248a3a6f2..7c02a293cd8 100644
--- a/Master/texmf-dist/source/generic/babel/usorbian.dtx
+++ b/Master/texmf-dist/source/generic/babel/usorbian.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2007 Johannes L. Braams and any individual authors
+% Copyright 1989-2008 Johannes L. Braams and any individual authors
% listed elsewhere in this file. All rights reserved.
%
% This file is part of the Babel system.
@@ -26,7 +26,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{337}
+% \CheckSum{344}
% \iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
% transcript.
@@ -36,11 +36,11 @@
%<code>\ProvidesLanguage{usorbian}
%\fi
%\ProvidesFile{usorbian.dtx}
- [2007/10/19 v1.0j Upper Sorbian support from the babel system]
+ [2008/03/17 v1.0k Upper Sorbian support from the babel system]
%\iffalse
%% File `usorbian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%
%% Upper Sorbian Language Definition File
@@ -243,11 +243,18 @@
%
% In order for \TeX\ to be able to hyphenate German Upper Sorbian
% words which contain `\ss' we have to give the character a nonzero
-% |\lccode| (see Appendix H, the \TeX book).
+% |\lccode| (see Appendix H, the \TeX book). As some of the other
+% language definitions turn the character |^| into a shorthand we
+% need to make sure that it has it's orginial definition here.
+% \changes{usorbian-1.0k}{2008/03/17}{Make sure the caret has the
+% right \cs{catcdoe}}
% \begin{macrocode}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \babel@savevariable{\lccode`\^^Y}%
- \lccode`\^^Y`\^^Y}
+\begingroup \catcode`\^7
+\def\x{\endgroup
+ \expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \babel@savevariable{\lccode`\^^Y}%
+ \lccode`\^^Y`\^^Y}}
+\x
% \end{macrocode}
% The umlaut accent macro |\"| is changed to lower the umlaut dots.
% The redefinition is done with the help of |\umlautlow|.
diff --git a/Master/texmf-dist/tex/generic/babel/UKenglish.sty b/Master/texmf-dist/tex/generic/babel/UKenglish.sty
index fd0cc78d8b8..f03265330da 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/USenglish.sty b/Master/texmf-dist/tex/generic/babel/USenglish.sty
index 6cda05cbf8a..76ba93b37b6 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/afrikaans.sty b/Master/texmf-dist/tex/generic/babel/afrikaans.sty
index f0a632d790c..e0807fc5516 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/albanian.sty b/Master/texmf-dist/tex/generic/babel/albanian.sty
index b53cffbb74a..5f0c385ea80 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/american.sty b/Master/texmf-dist/tex/generic/babel/american.sty
index 1d39e6b686b..8f6d370e595 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/austrian.sty b/Master/texmf-dist/tex/generic/babel/austrian.sty
index 4c8b3da04a7..189be4f1d52 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 27b14184b0a..e4c237cb05c 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,13 +38,13 @@
%% extension .ins) which are part of the distribution.
%%
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2005/11/23 v3.8h The Babel package]
+%%\ProvidesFile{babel.dtx}[2008/03/16 v3.8j The Babel package]
%% Babel package for LaTeX2e.
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\ifx\bbl@afterfi\@undefined
\else
\bbl@afterfi\endinput
@@ -56,7 +56,7 @@
}
\fi
\ProvidesFile{babel.def}
- [2005/11/23 v3.8h %
+ [2008/03/16 v3.8j %
Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
@@ -387,8 +387,9 @@
\catcode`\~\active
\def\x{\endgroup
\def\bbl@switch@sh@on##1{%
+ \begingroup
\lccode`~=`##1%
- \lowercase{%
+ \lowercase{\endgroup
\catcode`~\active
}%
}%
@@ -829,6 +830,11 @@
\noexpand\org@markright{\the\toks@}}%
\bbl@tempa
}
+\ifx\@mkboth\markboth
+ \def\bbl@tempc{\let\@mkboth\markboth}
+\else
+ \def\bbl@tempc{}
+\fi
\bbl@redefine\markboth#1#2{%
\edef\bbl@tempb{\noexpand\protect
\noexpand\foreignlanguage{\languagename}}%
@@ -850,6 +856,7 @@
\noexpand\org@markboth{\the\toks@}{\the\toks8}}%
\bbl@tempa
}
+\bbl@tempc
\bbl@redefine\TeX{\textlatin{\org@TeX}}
\bbl@redefine\LaTeX{\textlatin{\org@LaTeX}}
\ifx\nfss@catcodes\@undefined
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index f409c8f5b79..203d60c69dc 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,17 +37,17 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\NeedsTeXFormat{LaTeX2e}[1998/06/01]
+\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2005/11/23 v3.8h The Babel package]
+%%\ProvidesFile{babel.dtx}[2008/03/16 v3.8j The Babel package]
%% Babel package for LaTeX2e.
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\ProvidesPackage{babel}
- [2005/11/23 v3.8h %
+ [2008/03/16 v3.8j %
The Babel package]
\ifx\LdfInit\@undefined\input babel.def\relax\fi
\DeclareOption{acadian}{\input{frenchb.ldf}}
@@ -206,6 +206,13 @@
\def\@currname{hhline}\input{hhline.sty}\makeatother
\fi}%
{}}
+\AtBeginDocument{%
+ \@ifundefined{pdfstringdefDisableCommands}%
+ {}%
+ {\pdfstringdefDisableCommands{%
+ \languageshorthands{system}}%
+ }%
+}
\DeclareRobustCommand{\FOREIGNLANGUAGE}[1]{%
\lowercase{\foreignlanguage{#1}}}
%%
diff --git a/Master/texmf-dist/tex/generic/babel/bahasa.sty b/Master/texmf-dist/tex/generic/babel/bahasa.sty
index 63b9588e304..d7a49e98aa6 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/bahasai.ldf b/Master/texmf-dist/tex/generic/babel/bahasai.ldf
index ca8bf315139..5cfe93aa9b6 100644
--- a/Master/texmf-dist/tex/generic/babel/bahasai.ldf
+++ b/Master/texmf-dist/tex/generic/babel/bahasai.ldf
@@ -7,7 +7,7 @@
%% bahasa.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,18 +37,18 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{bahasa}
- [2005/11/23 v1.0k Bahasa Indonesia support from the babel system]
+ [2008/03/15 v1.0l Bahasa Indonesia support from the babel system]
%% File `bahasa.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Bahasa Language Definition File
-%% Copyright (C) 1994 - 2005
+%% Copyright (C) 1994 - 2008
%% by J"org Knappen, (joerg.knappen at alpha.ntp.springer.de)
%% Please report errors to: J"org Knappen
%% knappen at alpha.ntp.springer.de
%% J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\LdfInit\CurrentOption{date\CurrentOption}
\ifx\l@bahasa\@undefined
\ifx\l@bahasai\@undefined
diff --git a/Master/texmf-dist/tex/generic/babel/bahasam.ldf b/Master/texmf-dist/tex/generic/babel/bahasam.ldf
index 57c074a240c..eb737cb2109 100644
--- a/Master/texmf-dist/tex/generic/babel/bahasam.ldf
+++ b/Master/texmf-dist/tex/generic/babel/bahasam.ldf
@@ -7,7 +7,7 @@
%% bahasam.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,20 +37,21 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{bahasam}
- [2005/11/23 v1.0j Bahasa Malaysia support from the babel system]
+ [2008/01/27 v1.0k Bahasa Malaysia support from the babel system]
%% File `bahasam.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Bahasa Malaysia Language Definition File
-%% Copyright (C) 1994 - 2005
+%% Copyright (C) 1994 - 2008
%% by J"org Knappen, (joerg.knappen at alpha.ntp.springer.de)
-%% Copyright (C) 2005
+%% Copyright (C) 2005, 2008
%% by Bob Margolis, (bob.margolis at ntlworld.com)
+%% [With help from Awangku Merali Pengiran Mohamed (Sarawak)]
%% Please report errors to: Bob Margolis
%% bob.margolis at ntlworld.com
%% J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\LdfInit\CurrentOption{date\CurrentOption}
\ifx\l@malay\@undefined
\ifx\l@meyalu\@undefined
@@ -85,9 +86,9 @@
\expandafter l\expandafter @\CurrentOption\endcsname
\l@malay
\@namedef{captions\CurrentOption}{%
- \def\prefacename{Pendahuluan}%
- \def\refname{Pustaka}%
- \def\abstractname{Ringkasan}% (sometime it's called 'intisari'
+ \def\prefacename{Prakata}%
+ \def\refname{Rujukan}%
+ \def\abstractname{Abstrak}% (sometime it's called 'intisari'
% or 'ikhtisar')
\def\bibname{Bibliografi}%
\def\chaptername{Bab}%
@@ -100,17 +101,17 @@
\def\tablename{Jadual}%
\def\partname{Bahagian}%
\def\enclname{Lampiran}%
- \def\ccname{cc}%
+ \def\ccname{sk}% (short form for 'Salinan Kepada')
\def\headtoname{Kepada}%
\def\pagename{Halaman}%
- \def\seename{lihat}%
- \def\alsoname{lihat juga}%
+ \def\seename{sila rujuk}%
+ \def\alsoname{rujuk juga}%
\def\proofname{Bukti}%
\def\glossaryname{Istilah}%
}
\@namedef{date\CurrentOption}{%
\def\today{\number\day~\ifcase\month\or
- Januari\or Pebruari\or Mac\or April\or Mei\or Jun\or
+ Januari\or Februari\or Mac\or April\or Mei\or Jun\or
Julai\or Ogos\or September\or Oktober\or November\or Disember\fi
\space \number\year}}
\@namedef{extras\CurrentOption}{}
diff --git a/Master/texmf-dist/tex/generic/babel/bahasam.sty b/Master/texmf-dist/tex/generic/babel/bahasam.sty
index f6d989bb92d..5f16558cad3 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/basque.sty b/Master/texmf-dist/tex/generic/babel/basque.sty
index 9fb0a2ccb23..21d65f169c5 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index d77b39d873e..e80adaa89fa 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -7,7 +7,7 @@
%% bbplain.dtx (with options: `blplain')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,10 +38,10 @@
%% extension .ins) which are part of the distribution.
%% File `bbplain.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\catcode`\{=1 % left brace is begin-group character
\catcode`\}=2 % right brace is end-group character
\catcode`\#=6 % hash mark is macro parameter character
diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex
index ad379c2b165..ca43c2c328d 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -7,7 +7,7 @@
%% bbplain.dtx (with options: `bplain')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,10 +38,10 @@
%% extension .ins) which are part of the distribution.
%% File `bbplain.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\catcode`\{=1 % left brace is begin-group character
\catcode`\}=2 % right brace is end-group character
\catcode`\#=6 % hash mark is macro parameter character
diff --git a/Master/texmf-dist/tex/generic/babel/breton.sty b/Master/texmf-dist/tex/generic/babel/breton.sty
index 1e3450ddb4d..3efbc192e83 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/british.sty b/Master/texmf-dist/tex/generic/babel/british.sty
index 329f06c4843..d65787f0662 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/bulgarian.ldf b/Master/texmf-dist/tex/generic/babel/bulgarian.ldf
index 72f1a8b2cb9..389e8588be0 100644
--- a/Master/texmf-dist/tex/generic/babel/bulgarian.ldf
+++ b/Master/texmf-dist/tex/generic/babel/bulgarian.ldf
@@ -7,7 +7,7 @@
%% bulgarian.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,19 +37,19 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{bulgarian}
- [2006/03/31 v1.0e Bulgarian support from the babel system]
+ [2008/03/21 v1.0g Bulgarian support from the babel system]
%% File `bulgarian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989-2006
+%% Copyright (C) 1989-2008
%% by Johannes Braams,TeXniek
%% Bulgarian Language Definition File
-%% Copyright (C) 1995-2005
+%% Copyright (C) 1995-2008
%% by Georgi.Boshnakov <georgi.boshnakov at umist.ac.uk>
%% Johannes Braams,TeXniek
%% Adapted from russianb.dtx
%% by Georgi.Boshnakov <georgi.boshnakov at umist.ac.uk>
%% Please report errors to:J.L.Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\LdfInit{bulgarian}{captionsbulgarian}
\ifx\l@bulgarian\@undefined
\@nopatterns{Bulgarian}
diff --git a/Master/texmf-dist/tex/generic/babel/bulgarian.sty b/Master/texmf-dist/tex/generic/babel/bulgarian.sty
index ff4ac1029d3..1e79966e6e6 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/catalan.sty b/Master/texmf-dist/tex/generic/babel/catalan.sty
index cc2306ceeaf..94433d4ffcb 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/croatian.sty b/Master/texmf-dist/tex/generic/babel/croatian.sty
index 39d9d4d90ec..a42823dbe5d 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/czech.sty b/Master/texmf-dist/tex/generic/babel/czech.sty
index ebb010e3d98..a6291603982 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/danish.ldf b/Master/texmf-dist/tex/generic/babel/danish.ldf
index 8b8fdec15b6..388dc25ec65 100644
--- a/Master/texmf-dist/tex/generic/babel/danish.ldf
+++ b/Master/texmf-dist/tex/generic/babel/danish.ldf
@@ -7,7 +7,7 @@
%% danish.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,18 +37,18 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{danish}
- [2005/03/30 v1.3p Danish support from the babel system]
+ [2008/03/17 v1.3q Danish support from the babel system]
%% File `danish.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\LdfInit{danish}\captionsdanish
\ifx\l@danish\@undefined
\@nopatterns{Danish}
\adddialect\l@danish0\fi
-\providehyphenmins{\CurrentOption}{\@ne\tw@}
+\providehyphenmins{\CurrentOption}{\tw@\tw@}
\addto\captionsdanish{%
\def\prefacename{Forord}%
\def\refname{Litteratur}%
@@ -97,6 +97,12 @@
\declare@shorthand{danish}{"=}{\nobreak-\hskip\z@skip}
\declare@shorthand{danish}{"|}{%
\textormath{\discretionary{-}{}{\kern.03em}}{}}
+\declare@shorthand{dutch}{"/}{\textormath
+ {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \babel@save\-}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}}
\ldf@finish{danish}
%%
%% \CharacterTable
diff --git a/Master/texmf-dist/tex/generic/babel/danish.sty b/Master/texmf-dist/tex/generic/babel/danish.sty
index 9e237b0f040..48cc01b3475 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/dutch.sty b/Master/texmf-dist/tex/generic/babel/dutch.sty
index 0f35493a344..ebfde1f3685 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/english.sty b/Master/texmf-dist/tex/generic/babel/english.sty
index d96db812dc2..73f7cacd1cf 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/esperanto.sty b/Master/texmf-dist/tex/generic/babel/esperanto.sty
index e159b1b50c0..63802eb61e4 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/estonian.sty b/Master/texmf-dist/tex/generic/babel/estonian.sty
index 8faeb510e03..24c298f4774 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/finnish.sty b/Master/texmf-dist/tex/generic/babel/finnish.sty
index 2d55873aa16..8fd60acee53 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/francais.sty b/Master/texmf-dist/tex/generic/babel/francais.sty
index 7743bc808ee..73f6c505cf0 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/frenchb.cfg b/Master/texmf-dist/tex/generic/babel/frenchb.cfg
index 2518a6ec74e..d2177f5f798 100644
--- a/Master/texmf-dist/tex/generic/babel/frenchb.cfg
+++ b/Master/texmf-dist/tex/generic/babel/frenchb.cfg
@@ -2,198 +2,14 @@
%% Daniel Flipo Daniel.Flipo at univ-lille1.fr
%% File `frenchb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2007
%% by Johannes Braams, TeXniek
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If you want to customize frenchb, please DO NOT hack into the code,
-%% copy this file into a directory searched by TeX, preferably a
-%% personal one on multi-user systems, and customize it as you like.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% WARNING: If you exchange your documents with colleagues using
-%% a different TeX installation, it is best NOT TO HAVE a frenchb.cfg
-%% file, and add instead the customization commands to the preamble
-%% of your documents after babel and frenchb have been loaded.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Uncomment the following line if you dislike frenchb automatically
-%% adding a space before French double punctuation (see frenchb.dtx
-%% for more information).
-%%
-%%\NoAutoSpaceBeforeFDP
-%%
-%% frenchb inserts a normal space before a colon in French (following
-%% I.N. specifications), but some people prefer a thinspace instead;
-%% uncomment the following line if you prefer a thinspace.
-%%
-%%\renewcommand{\Fcolonspace}{\thinspace}
-%%
-%% Uncomment the following line to force lasy font emulation for
-%% French guillemets in OT1 encoding; Polish guillemets are
-%% FAR BETTER LOOKING, you should normally leave this line commented out.
-%%
-%%\LasyGuillemets
-%%
-%% The following option is for backward compatibility ONLY
-%% (it might conflict with the russian option of babel).
-%% Uncomment the following line if you want to get back to
-%% the default guillemets used in versions $<$ 1.6b for OT1-encoding
-%% (no effect in T1-encoding).
-%%
-%%\CyrillicGuillemets
-%%
-%% If you dislike Polish guillemets in OT1-encoding, you can easily
-%% pick up yours from other fonts, examples below: Palatino or
-%% cyrillic CMR T2A encoded font.
-%% The four arguments are: encoding, font name, character codes of
-%% the opening and closing guillemets in the selected font.
-%%
-%%\FrenchGuillemetsFrom{T1}{ppl}{19}{20}
-%%\FrenchGuillemetsFrom{T2A}{cmr}{190}{191}
-%%
-%% Uncomment the following line if you don't want frenchb to change
-%% LaTeX standard settings for vertical spacing in 'itemize' lists.
-%% LaTeX standard settings were used by frenchb in versions < 1.3,
-%% so you may want to uncomment the following line to process older
-%% documents.
-%%
-%%\FrenchItemizeSpacingfalse
-%%
-%% frenchb tunes vertical spaces in all lists (at \list level),
-%% uncomment the following line if you prefer LaTeX standard settings
-%% (this flag is new in version 1.3). When \ifFrenchItemizeSpacing is
-%% `true' (default setting), this flag has no effect on itemize lists.
-%%
-%%\FrenchListSpacingfalse
-%%
-%% The command \FrenchLabelItem can be used to set the `labelitems'
-%% for all levels in French. For instance, to get long dashes, use:
-%%
-%%\renewcommand{\FrenchLabelItem}{\textemdash}
-%%
-%% You can also have different `labelitems' for each level in French:
-%%
-%%\renewcommand{\Frlabelitemi}{\textemdash}
-%%\renewcommand{\Frlabelitemii}{\bfseries\textendash}
-%%\renewcommand{\Frlabelitemiii}{\textbullet}
-%%\renewcommand{\Frlabelitemiv}{}
-%%
-%% Uncomment the following line if you want a thinspace to be added
-%% in the running text before the footnote number or symbol.
-%%
-%%\AddThinSpaceBeforeFootnotes
-%%
-%% Uncomment the following line if you want footnotes to be typeset
-%% according the specifications of the French `Imprimerie Nationale'.
-%%
-%%\FrenchFootnotes
-%%
-%% Uncomment the following line if you want the command \nombre to
-%% insert thin spaces (1/6em) instead of normal spaces (0.3em)
-%% between slices of 3 digits when typesetting numbers in French.
-%%
-%%\ThinSpaceInFrenchNumbers
-%%
-%% If you are bored to type {,} every time you want a decimal comma in
-%% math mode, uncomment the following line (and don't forget to add a
-%% forced space after the comma in lists and intervals: $(x,\ y)$ and
-%% $[0,\ 1]$). I suggest NOT TO UNCOMMENT the following line,
-%% and to switch between the decimal comma and the standard comma
-%% using \DecimalMathComma and \StandardMathComma inside the document.
-%%
-%%\DecimalMathComma
-%%
-%% If you do not want the appearance of lists to depend on the current
-%% language, add ONE of these two commands: \FrenchLayout (for a
-%% document mainly in French) or \StandardLayout (for a document
-%% mainly in English).
-%%
-%%\FrenchLayout
-%%\StandardLayout
-%%
-%% With the standard LaTeX classes (article.cls, report.cls, book.cls)
-%% you can change the separator used in figure and table captions in
-%% French with \CaptionSeparator, for instance (the default value of
-%% \CaptionSeparator in French is '\space\textendash\space'):
-%%
-%%\addto\captionsfrench{\def\CaptionSeparator{\space\textemdash\space}}
-%%
-%% You might want to change some of the translations of caption names,
-%% you can do it this way, for instance:
-%%
-%%\addto\captionsfrench{\def\figurename{{\scshape Figure}}}
-%%\addto\captionsfrench{\def\tablename{{\scshape Table}}}
-%%\addto\captionsfrench{\def\proofname{Preuve}}
-%%
-%% If French guillemets are available on your keyboard, you can use
-%% them instead of the commands \og and \fg: REPLACE << and >> in
-%% the following code by your ready-made guillemets (2 occurrences
-%% for each) AND uncomment the resulting code.
-%% WARNINGS:
-%% 1) This will reduce the portability of your source files!
-%% 2) This adds two active characters.
-%% 3) If you add this stuff to the preamble of a document, you'll
-%% need to wrap it in \makeatletter ... \makeatother.
-%%
-%% \ifx\mule@def\undefined
-%% \initiate@active@char{<<}
-%% \initiate@active@char{>>}
-%% \AtBeginDocument{%
-%% \def<<{\og\ignorespaces}%
-%% \def>>{{\fg}}%
-%% }%
-%% \else %%% For the CJK package, see MULEenc.sty.
-%% \mule@def{11}{\og\ignorespaces}
-%% \mule@def{27}{{\fg}}
-%% \fi
-%%
-%% The rest is for compatibility with Bernard Gaulle's french.sty:
-%% if you want to typeset with babel/frenchb files originally written
-%% for french.sty, you will probably want to uncomment these lines.
-%%
-%% Uncomment these lines if you want the aliases \numero and \Numero
-%% (as in french.sty) for \no and \No.
-%%
-%%\let\numero=\no
-%%\let\Numero=\No
-%%
-%% Uncomment the following lines if you want to substitute `\bsc' to
-%% either (or both) of french.sty macros `\fsc' and `\lsc'.
-%%
-%%\let\fsc=\bsc
-%%\let\lsc=\bsc
-%%
-%% Uncomment the following line if you want to substitute `\up' to
-%% french.sty macro `\fup'.
-%%
-%%\let\fup=\up
-%%
-%% Uncomment the following lines if you intend to use commands \french
-%% and \english to switch between languages, as in french.sty.
-%%
-%%\def\french{\leavevmode\selectlanguage{french}}
-%%\def\english{\leavevmode\selectlanguage{english}}
-%%
-%% Uncomment the following lines if you intend to use the command
-%% \AllTeX to refer to all flavours of TeX, (this command has been
-%% made popular by french.sty).
-%%
-%%\newcommand*{\AllTeX}{%
-%% (L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em)%
-%% T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}
-%%
-%% \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
-%% Lower-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
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
+%%%%%%%%% WARNING: THIS FILE SHOULD NO LONGER BE USED %%%%%%%%%
+%% If you want to customise frenchb, please DO NOT hack into the code!
+%% Do no put any code in this file either, please use the new command
+%% \frenchbsetup{} with the proper options to customise frenchb.
%%
+%% Add \frenchbsetup{ShowOptions} to your preamble to see the list of
+%% available options and/or read the documentation.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/babel/frenchb.ldf b/Master/texmf-dist/tex/generic/babel/frenchb.ldf
index 73334212a7a..e545dbe7f6e 100644
--- a/Master/texmf-dist/tex/generic/babel/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel/frenchb.ldf
@@ -7,7 +7,7 @@
%% frenchb.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,30 +37,29 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{french}
- [2005/02/06 v1.6g French support from the babel system]
+ [2007/10/05 v2.0e French support from the babel system]
%% File `frenchb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2007
%% by Johannes Braams, TeXniek
%% Frenchb language Definition File
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2007
%% by Johannes Braams, TeXniek
%% Daniel Flipo, GUTenberg
%% Please report errors to: Daniel Flipo, GUTenberg
%% Daniel.Flipo at univ-lille1.fr
-%%
\LdfInit\CurrentOption\datefrench
-\newif\ifLaTeX
-\ifx\magnification\@undefined\LaTeXtrue\fi
\newif\ifLaTeXe
-\ifx\@compatibilitytrue\@undefined\else\LaTeXetrue\fi
-\newif\if@Two@E \@Two@Etrue
-\def\@FI@{\fi}
-\ifx\@compatibilitytrue\@undefined
- \@Two@Efalse \def\@FI@{\relax}
-\else
- \if@compatibility \@Two@Efalse \fi
-\@FI@
+\ifx\magnification\@undefined
+ \ifx\@compatibilitytrue\@undefined
+ \PackageError{frenchb.ldf}%
+ {LaTeX-2.09 format is no longer supported.\MessageBreak
+ Aborting here.}%
+ \endinput
+ \else
+ \LaTeXetrue
+ \fi
+\fi
\ifx\l@french\@undefined
\ifx\l@francais\@undefined
\ifx\l@canadien\@undefined
@@ -91,239 +90,119 @@
\let\l@acadian\l@french
\fi
\def\datefrancais{\datefrench}
-\def\extrasfrancais{\extrasfrench}
-\def\noextrasfrancais{\noextrasfrench}
\def\datefrenchb{\datefrench}
+\def\extrasfrancais{\extrasfrench}
\def\extrasfrenchb{\extrasfrench}
+\def\noextrasfrancais{\noextrasfrench}
\def\noextrasfrenchb{\noextrasfrench}
-\ifLaTeXe
- \AtBeginDocument{\let\captions@French\captionsfrench
- \ifx\captionsfrenchb\@undefined
- \let\captions@Frenchb\relax
- \else
- \let\captions@Frenchb\captionsfrenchb
- \fi
- \ifx\captionsfrancais\@undefined
- \let\captions@Francais\relax
- \else
- \let\captions@Francais\captionsfrancais
- \fi
- \def\captionsfrench{\captions@French
- \captions@Francais\captions@Frenchb}%
- \def\captionsfrancais{\captionsfrench}%
- \def\captionsfrenchb{\captionsfrench}%
- \iflanguage{french}{\captionsfrench}{}%
- }
-\else
- \def\captionsfrancais{\captionsfrench}
- \def\captionsfrenchb{\captionsfrench}
-\fi
-\@ifpackagewith{babel}{canadien}{%
- \def\captionscanadien{\captionsfrench}%
- \def\datecanadien{\datefrench}%
- \def\extrascanadien{\extrasfrench}%
- \def\noextrascanadien{\noextrasfrench}%
- }{}
-\@ifpackagewith{babel}{acadian}{%
- \def\captionsacadian{\captionsfrench}%
- \def\dateacadian{\datefrench}%
- \def\extrasacadian{\extrasfrench}%
- \def\noextrasacadian{\noextrasfrench}%
- }{}
\@namedef{extras\CurrentOption}{\lccode`\'=`\'}
\@namedef{noextras\CurrentOption}{\lccode`\'=0}
-\ifx\scshape\@undefined
- \ifx\sc\@undefined
- \let\scshape\relax
- \else
- \let\scshape\sc
- \fi
-\fi
-\ifx\emph\@undefined
- \ifx\em\@undefined
- \let\emph\relax
- \else
- \def\emph#1{\em #1}
- \fi
-\fi
-\ifLaTeXe
- \long\def\STD@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1: #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1: #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}
- \def\CaptionSeparator{\string:\space}
- \long\def\FB@makecaption#1#2{%
- \vskip\abovecaptionskip
- \sbox\@tempboxa{#1\CaptionSeparator #2}%
- \ifdim \wd\@tempboxa >\hsize
- #1\CaptionSeparator #2\par
- \else
- \global \@minipagefalse
- \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
- \fi
- \vskip\belowcaptionskip}
- \AtBeginDocument{%
- \ifx\@makecaption\STD@makecaption
- \let\@makecaption\FB@makecaption
+ \expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \bbl@frenchspacing}
+ \expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \bbl@nonfrenchspacing}
+\long\def\STD@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1: #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ #1: #2\par
\else
- \ifx\@makecaption\@undefined\else
- \PackageWarning{frenchb.ldf}%
- {The definition of \protect\@makecaption\space
- has been changed,\MessageBreak
- frenchb will NOT customize it;\MessageBreak reported}%
- \fi
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
- \let\FB@makecaption\relax
- \let\STD@makecaption\relax}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \def\CaptionSeparator{\string:\space}}
-\fi
-\ifLaTeX
-\@namedef{captions\CurrentOption}{%
- \def\refname{R\'ef\'erences}%
- \def\abstractname{R\'esum\'e}%
- \def\bibname{Bibliographie}%
- \def\prefacename{Pr\'eface}%
- \def\chaptername{Chapitre}%
- \def\appendixname{Annexe}%
- \def\contentsname{Table des mati\`eres}%
- \def\listfigurename{Table des figures}%
- \def\listtablename{Liste des tableaux}%
- \def\indexname{Index}%
- \def\figurename{{\scshape Fig.}}%
- \def\tablename{{\scshape Tab.}}%
- \def\CaptionSeparator{\space\textendash\space}%
- \def\partname{\protect\@Fpt partie}%
- \def\@Fpt{{\ifcase\value{part}\or Premi\`ere\or Deuxi\`eme\or
- Troisi\`eme\or Quatri\`eme\or Cinqui\`eme\or Sixi\`eme\or
- Septi\`eme\or Huiti\`eme\or Neuvi\`eme\or Dixi\`eme\or Onzi\`eme\or
- Douzi\`eme\or Treizi\`eme\or Quatorzi\`eme\or Quinzi\`eme\or
- Seizi\`eme\or Dix-septi\`eme\or Dix-huiti\`eme\or Dix-neuvi\`eme\or
- Vingti\`eme\fi}\space\def\thepart{}}%
- \def\pagename{page}%
- \def\seename{{\emph{voir}}}%
- \def\alsoname{{\emph{voir aussi}}}%
- \def\enclname{P.~J. }%
- \def\ccname{Copie \`a }%
- \def\headtoname{}%
- \def\proofname{D\'emonstration}% for AMS-\LaTeX
- \def\glossaryname{Glossaire}%
- }
-\fi
-\initiate@active@char{:}
-\initiate@active@char{;}
-\initiate@active@char{!}
-\initiate@active@char{?}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \languageshorthands{french}}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@activate{:}\bbl@activate{;}%
- \bbl@activate{!}\bbl@activate{?}}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@deactivate{:}\bbl@deactivate{;}%
- \bbl@deactivate{!}\bbl@deactivate{?}}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchspacing}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchspacing}
-\declare@shorthand{french}{;}{%
- \ifhmode
+ \vskip\belowcaptionskip}%
+\newif\ifFBpunct@active \FBpunct@activetrue
+\ifFBpunct@active
+ \initiate@active@char{:}
+ \initiate@active@char{;}
+ \initiate@active@char{!}
+ \initiate@active@char{?}
+ \declare@shorthand{french}{;}{%
+ \ifhmode
\ifdim\lastskip>\z@
- \unskip\penalty\@M\thinspace
- \else
- \FDP@thinspace
+ \unskip\penalty\@M\thinspace
+ \else
+ \FDP@thinspace
+ \fi
\fi
- \fi
- \string;}
-\declare@shorthand{french}{!}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\thinspace
- \else
- \FDP@thinspace
+ \string;}
+ \declare@shorthand{french}{!}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\thinspace
+ \else
+ \FDP@thinspace
+ \fi
\fi
- \fi
- \string!}
-\declare@shorthand{french}{?}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\thinspace
- \else
- \FDP@thinspace
+ \string!}
+ \declare@shorthand{french}{?}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\thinspace
+ \else
+ \FDP@thinspace
+ \fi
\fi
- \fi
- \string?}
-\declare@shorthand{french}{:}{%
- \ifhmode
- \ifdim\lastskip>\z@
- \unskip\penalty\@M\Fcolonspace
- \else
- \FDP@colonspace
+ \string?}
+ \newcommand*{\Fcolonspace}{\space}
+ \declare@shorthand{french}{:}{%
+ \ifhmode
+ \ifdim\lastskip>\z@
+ \unskip\penalty\@M\Fcolonspace
+ \else
+ \FDP@colonspace
+ \fi
\fi
- \fi
- \string:}
-\newcommand{\Fcolonspace}{\space}
-\def\AutoSpaceBeforeFDP{%
- \def\FDP@thinspace{\penalty\@M\thinspace}%
- \def\FDP@colonspace{\penalty\@M\Fcolonspace}}
-\def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty
- \let\FDP@colonspace\@empty}
-\AutoSpaceBeforeFDP
-\declare@shorthand{system}{:}{\string:}
-\declare@shorthand{system}{!}{\string!}
-\declare@shorthand{system}{?}{\string?}
-\declare@shorthand{system}{;}{\string;}
-\newcommand{\og}{\@empty}
-\newcommand{\fg}{\@empty}
+ \string:}
+ \def\AutoSpaceBeforeFDP{%
+ \def\FDP@thinspace{\penalty\@M\thinspace}%
+ \def\FDP@colonspace{\penalty\@M\Fcolonspace}}
+ \def\NoAutoSpaceBeforeFDP{\let\FDP@thinspace\@empty
+ \let\FDP@colonspace\@empty}
+ \AutoSpaceBeforeFDP
+ \declare@shorthand{system}{:}{\string:}
+ \declare@shorthand{system}{!}{\string!}
+ \declare@shorthand{system}{?}{\string?}
+ \declare@shorthand{system}{;}{\string;}
+ \addto\extrasfrench{%
+ \languageshorthands{french}%
+ \bbl@activate{:}\bbl@activate{;}%
+ \bbl@activate{!}\bbl@activate{?}%
+ }
+ \addto\noextrasfrench{%
+ \bbl@deactivate{:}\bbl@deactivate{;}%
+ \bbl@deactivate{!}\bbl@deactivate{?}}
+\fi
+\newcommand*{\og}{\@empty}
+\newcommand*{\fg}{\@empty}
+\ifLaTeXe
+\else
+ \ifx\guillemotleft\@undefined
+ \def\guillemotleft{\leavevmode\raise0.25ex
+ \hbox{$\scriptscriptstyle\ll$}}
+ \fi
+ \ifx\guillemotright\@undefined
+ \def\guillemotright{\raise0.25ex
+ \hbox{$\scriptscriptstyle\gg$}}
+ \fi
+ \let\xspace\relax
+\fi
+\newcommand*{\FBguill@spacing}{\penalty\@M\hskip.8\fontdimen2\font
+ plus.3\fontdimen3\font
+ minus.8\fontdimen4\font}
+\DeclareRobustCommand*{\FB@og}{\leavevmode
+ \guillemotleft\FBguill@spacing}
+\DeclareRobustCommand*{\FB@fg}{\ifdim\lastskip>\z@\unskip\fi
+ \FBguill@spacing\guillemotright\xspace}
\ifLaTeXe
- \def\FrenchGuillemetsFrom#1#2#3#4{%
- \DeclareFontEncoding{#1}{}{}%
- \DeclareFontSubstitution{#1}{#2}{m}{n}%
- \DeclareTextCommand{\guillemotleft}{OT1}{%
- {\fontencoding{#1}\fontfamily{#2}\selectfont\char#3}}%
- \DeclareTextCommand{\guillemotright}{OT1}{%
- {\fontencoding{#1}\fontfamily{#2}\selectfont\char#4}}}
- \def\CyrillicGuillemets{\FrenchGuillemetsFrom{OT2}{wncyr}{60}{62}}
- \def\PolishGuillemets{\FrenchGuillemetsFrom{T1}{lmr}{19}{20}}
- \def\LasyGuillemets{%
- \DeclareTextCommand{\guillemotleft}{OT1}{\hbox{%
- \fontencoding{U}\fontfamily{lasy}\selectfont(\kern-0.20em(}}%
- \DeclareTextCommand{\guillemotright}{OT1}{\hbox{%
- \fontencoding{U}\fontfamily{lasy}\selectfont)\kern-0.20em)}}}
- \IfFileExists{t1lmr.fd}{\PolishGuillemets}{\LasyGuillemets}
- \DeclareTextSymbolDefault{\guillemotleft}{OT1}
- \DeclareTextSymbolDefault{\guillemotright}{OT1}
- \def\guill@spacing{\penalty\@M\hskip.8\fontdimen2\font
- plus.3\fontdimen3\font
- minus.8\fontdimen4\font}
- \DeclareRobustCommand*{\begin@guill}{\leavevmode
- \guillemotleft\penalty\@M\guill@spacing}
- \DeclareRobustCommand*{\end@guill}{\ifdim\lastskip>\z@\unskip\fi
- \penalty\@M\guill@spacing\guillemotright\xspace}
- \AtBeginDocument{\ifx\xspace\@undefined\let\xspace\relax\fi}
- \def\bbl@frenchguillemets{\renewcommand{\og}{\begin@guill}%
- \renewcommand{\fg}{\end@guill}}
- \def\bbl@nonfrenchguillemets{\renewcommand{\og}{``}%
- \renewcommand{\fg}{\ifdim\lastskip>\z@\unskip\fi ''}}
+ \def\bbl@frenchguillemets{\renewcommand*{\og}{\FB@og}%
+ \renewcommand*{\fg}{\FB@fg}}
+ \def\bbl@nonfrenchguillemets{\renewcommand*{\og}{\textquotedblleft}%
+ \renewcommand*{\fg}{\ifdim\lastskip>\z@\unskip\fi
+ \textquotedblright}}
\else
- \def\begin@guill{\leavevmode\raise0.25ex
- \hbox{$\scriptscriptstyle\ll$}%
- \penalty\@M\hskip.8\fontdimen2\font
- plus.3\fontdimen3\font
- minus.3\fontdimen4\font}
- \def\end@guill{\ifdim\lastskip>\z@\unskip\penalty\@M\fi
- \penalty\@M\hskip.8\fontdimen2\font
- plus.3\fontdimen3\font minus.3\fontdimen4\font
- \raise0.25ex\hbox{$\scriptscriptstyle\gg$}}
- \let\xspace\relax
- \def\bbl@frenchguillemets{\let\og\begin@guill
- \let\fg\end@guill}
+ \def\bbl@frenchguillemets{\let\og\FB@og
+ \let\fg\FB@fg}
\def\bbl@nonfrenchguillemets{\def\og{``}%
\def\fg{\ifdim\lastskip>\z@\unskip\fi ''}}
\fi
@@ -331,296 +210,17 @@
\bbl@frenchguillemets}
\expandafter\addto\csname noextras\CurrentOption\endcsname{%
\bbl@nonfrenchguillemets}
-\newif\ifFrenchListSpacing \FrenchListSpacingtrue
-\newif\ifFrenchOldTrivlist
-\ifLaTeX
- \let\listORI\list
- \let\endlistORI\endlist
- \def\FR@listsettings{%
- \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}%
- \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}%
- \setlength{\topsep}{0.8ex plus 0.4ex minus 0.4ex}%
- \setlength{\partopsep}{0.4ex plus 0.2ex minus 0.2ex}%
- \@tempdima=\parskip
- \addtolength{\topsep}{-\@tempdima}%
- \addtolength{\partopsep}{\@tempdima}}%
- \def\listFR#1#2{\listORI{#1}{\FR@listsettings #2}}%
- \let\@trivlistORI\@trivlist
- \def\@trivlistFR{\FR@listsettings\@trivlistORI}
- \def\bbl@frenchlistspacing{\ifFrenchListSpacing\let\list\listFR\fi
- \ifFrenchOldTrivlist\let\@trivlist\@trivlistFR
- \let\list\listORI\fi}
- \def\bbl@nonfrenchlistspacing{\let\list\listORI
- \let\@trivlist\@trivlistORI}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchlistspacing}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchlistspacing}
-\fi
-\newif\ifFrenchItemizeSpacing \FrenchItemizeSpacingtrue
-\ifLaTeX
- \newcommand{\FrenchLabelItem}{\textendash}
- \newcommand{\Frlabelitemi}{\FrenchLabelItem}
- \newcommand{\Frlabelitemii}{\FrenchLabelItem}
- \newcommand{\Frlabelitemiii}{\FrenchLabelItem}
- \newcommand{\Frlabelitemiv}{\FrenchLabelItem}
- \def\bbl@frenchitemize{%
- \let\@ltiORI\labelitemi
- \let\@ltiiORI\labelitemii
- \let\@ltiiiORI\labelitemiii
- \let\@ltivORI\labelitemiv
- \let\itemizeORI\itemize
- \let\labelitemi\Frlabelitemi
- \let\labelitemii\Frlabelitemii
- \let\labelitemiii\Frlabelitemiii
- \let\labelitemiv\Frlabelitemiv
- \ifFrenchItemizeSpacing
- \def\itemize{\let\@trivlist\@trivlistORI
- \ifnum \@itemdepth >\thr@@\@toodeep\else
- \advance\@itemdepth\@ne
- \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \listORI
- \csname\@itemitem\endcsname
- {\settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
- \setlength{\leftmargin}{\labelwidth}%
- \addtolength{\leftmargin}{\labelsep}%
- \ifnum\@listdepth=0
- \setlength{\itemindent}{\parindent}%
- \else
- \addtolength{\leftmargin}{\parindent}%
- \fi
- \setlength{\itemsep}{\z@}%
- \setlength{\parsep}{\z@}%
- \setlength{\topsep}{\z@}%
- \setlength{\partopsep}{\z@}%
- \@tempdima=\parskip
- \addtolength{\topsep}{-\@tempdima}%
- \addtolength{\partopsep}{\@tempdima}}%
- \fi}%
- \fi}
- \def\bbl@nonfrenchitemize{\let\Frlabelitemi\labelitemi
- \let\Frlabelitemii\labelitemii
- \let\Frlabelitemiii\labelitemiii
- \let\Frlabelitemiv\labelitemiv
- \let\labelitemi\@ltiORI
- \let\labelitemii\@ltiiORI
- \let\labelitemiii\@ltiiiORI
- \let\labelitemiv\@ltivORI
- \let\itemize\itemizeORI}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchitemize}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchitemize}
-\fi
-\ifLaTeX
- \let\@aifORI\@afterindentfalse
- \def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue
- \@afterindenttrue}
- \def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI
- \@afterindentfalse}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchindent}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchindent}
-\fi
-\newif\ifthinspace@FN
-\newif\ifFR@fntlayout
-\newdimen\parindentFFN
-\ifLaTeXe
- \newcommand{\AddThinSpaceBeforeFootnotes}{\thinspace@FNtrue}
- \AtBeginDocument{\let\@footnotemarkORI\@footnotemark
- \def\@footnotemarkFR{\leavevmode\unskip\unkern
- \,\@footnotemarkORI}%
- \ifthinspace@FN
- \let\@footnotemark\@footnotemarkFR
- \fi}
- \def\ftnISsymbol{\@fnsymbol\c@footnote}
- \long\def\@makefntextFR#1{\ifx\thefootnote\ftnISsymbol
- \@makefntextORI{#1}%
- \else
- \parindent=\parindentFFN
- \rule\z@\footnotesep
- \setbox\@tempboxa\hbox{\@thefnmark}%
- \ifdim\wd\@tempboxa>\z@
- \llap{\@thefnmark}.\kern.5em
- \fi #1
- \fi}%
- \AtBeginDocument{\parindentFFN=\parindent
- \ifdim\parindentFFN<1.5em\parindentFFN=1.5em\fi
- \let\@makefntextORI\@makefntext
- \long\def\@makefntext#1{%
- \ifFR@fntlayout
- \@makefntextFR{#1}%
- \else
- \@makefntextORI{#1}%
- \fi
- }%
- }
- \newcommand{\FrenchFootnotes}{\FR@fntlayouttrue}
- \newcommand{\StandardFootnotes}{\FR@fntlayoutfalse}
-\fi
-\newcount\std@mcc
-\newcount\dec@mcc
-\std@mcc=\mathcode`\,
-\dec@mcc=\std@mcc
-\@tempcnta=\std@mcc
-\divide\@tempcnta by "1000
-\multiply\@tempcnta by "1000
-\advance\dec@mcc by -\@tempcnta
-\newcommand{\DecimalMathComma}{\iflanguage{french}%
- {\mathcode`\,=\dec@mcc}{}%
- \addto\extrasfrench{\mathcode`\,=\dec@mcc}}
-\newcommand{\StandardMathComma}{\mathcode`\,=\std@mcc
- \addto\extrasfrench{\mathcode`\,=\std@mcc}}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \mathcode`\,=\std@mcc}
-\mathchardef\m@comma=\dec@mcc
-\def\@comma@{\ifmmode\m@comma\else,\fi}
-\def\f@thousandsep{\ifmmode\mskip5.5mu\else\penalty\@M\kern.3em\fi}
-\def\ThinSpaceInFrenchNumbers{\def\f@thousandsep{%
- \ifmmode\mskip3mu\else\penalty\@M\kern.16667em\fi}}
-\newcommand{\decimalsep}{.}
-\newcommand{\thousandsep}{\@comma@}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \def\decimalsep{\@comma@}%
- \def\thousandsep{\f@thousandsep}}
-\expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \def\decimalsep{.}%
- \def\thousandsep{\@comma@}}
-\providecommand{\textminus}{\textendash}
-\providecommand{\textplusminus}{\ensuremath{\pm}}
-\providecommand{\textminusplus}{\ensuremath{\mp}}
-\def\fb@minus{\ifmmode-\else\textminus\fi}
-\def\fb@plusminus{\ifmmode\pm\else\textplusminus\fi}
-\def\fb@minusplus{\ifmmode\mp\else\textminusplus\fi}
-\if@Two@E
- \newcommand{\nombre}[2][\decimalsep]{\def\@decimalsep{#1}%
- \@@nombre#2\@empty,\@empty,\@nil}
-\else
- \def\@decimalsep{\decimalsep}
- \newcommand{\nombre}[1]{\@nombre#1\@empty,\@empty,\@nil}
-\fi
-\def\@firstofmany#1#2,{#1}
-\def\@@nombre#1,#2,#3\@nil{%
- \def\nb@sign{}%
- \edef\nb@first{\@firstofmany #1\@empty,}%
- \edef\nb@suite{\@secondoftwo #1\@empty,}%
- \if+\nb@first \def\nb@sign{+}\fi
- \if-\nb@first \def\nb@sign{\fb@minus}\fi
- \expandafter\ifx\nb@first\pm \def\nb@sign{\fb@plusminus}\fi
- \expandafter\ifx\nb@first\mp \def\nb@sign{\fb@minusplus}\fi
- \ifx\@empty\nb@sign
- \let\@tmp\nb@suite\edef\nb@suite{\nb@first\@tmp}%
- \fi
- \nb@sign\expandafter\@nombre\nb@suite#2,#3\@nil}
-\def\@nombre#1,#2,#3\@nil{%
- \ifx\@empty#2%
- \@integerpart{#1}%
- \else
- \@integerpart{#1}\@decimalsep\@decimalpart{#2}%
- \fi}
-\def\@decimalpart#1{\@@decimalpart#1\@empty\@empty\@empty}
-\def\@@decimalpart#1#2#3#4{#1#2#3%
- \ifx\@empty#4%
- \else
- \thousandsep\expandafter\@@decimalpart\expandafter#4%
- \fi}
-\def\@integerpart#1{\@@integerpart{}#1\@empty\@empty\@empty}
-\def\@@integerpart#1#2#3#4{%
- \ifx\@empty#2%
- \@addthousandsep#1\relax
- \else
- \ifx\@empty#3%
- \@addthousandsep\@empty\@empty#1#2\relax
- \else
- \ifx\@empty#4%
- \@addthousandsep\@empty#1#2#3\relax
- \else
- \@@integerpartafterfi{#1#2#3#4}%
- \fi
- \fi
- \fi}
-\def\@@integerpartafterfi#1\fi\fi\fi{\fi\fi\fi\@@integerpart{#1}}
-\def\@addthousandsep#1#2#3#4{#1#2#3%
- \if#4\relax
- \else
- \thousandsep\expandafter\@addthousandsep\expandafter#4%
- \fi}
-\ifLaTeXe
- \DeclareTextCommandDefault{\Frtextellipsis}{%
- .\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace}
- \newcommand{\Tdots@ORI}{\@xp\textellipsis}
- \newcommand{\Tdots@}{\Tdots@ORI}
- \newcommand{\Mdots@}{\@xp\mdots@}
- \AtBeginDocument{\DeclareRobustCommand{\dots}{\relax
- \csname\ifmmode M\else T\fi dots@\endcsname}%
- \ifx\@xp\@undefined\let\@xp\relax\fi
- \ifx\mdots@\@undefined\let\Tdots@ORI\textellipsis
- \let\Mdots@\mathellipsis\fi}
- \def\bbl@frenchdots{\let\Tdots@\Frtextellipsis}
- \def\bbl@nonfrenchdots{\let\Tdots@\Tdots@ORI}
- \expandafter\addto\csname extras\CurrentOption\endcsname{%
- \bbl@frenchdots}
- \expandafter\addto\csname noextras\CurrentOption\endcsname{%
- \bbl@nonfrenchdots}
-\fi
+\@namedef{date\CurrentOption}{%
+ \def\today{\number\day \ifnum1=\day {\ier}\fi \relax \space
+ \ifcase\month
+ \or janvier\or f\'evrier\or mars\or avril\or mai\or juin\or
+ juillet\or ao\^ut\or septembre\or octobre\or novembre\or
+ d\'ecembre\fi \relax
+ \space \number\year}}
\ifLaTeXe
- \newcommand{\FrenchLayout}{%
- \renewcommand{\StandardLayout}{%
- \PackageWarning{frenchb.ldf}%
- {\protect\StandardLayout\space makes no change\MessageBreak
- (\protect\FrenchLayout\space has been selected before
- \MessageBreak for the whole document)}%
- }%
- \AtBeginDocument{\bbl@frenchitemize\bbl@frenchlistspacing
- \bbl@frenchindent}%
- \let\bbl@nonfrenchitemize\relax
- \let\bbl@nonfrenchlistspacing\relax
- \let\bbl@nonfrenchindent\relax}
- \newcommand{\StandardLayout}{%
- \renewcommand{\FrenchLayout}{%
- \PackageWarning{frenchb.ldf}%
- {\protect\FrenchLayout\space makes no change\MessageBreak
- (\protect\StandardLayout\space has been selected before
- \MessageBreak for the whole document)}%
- }%
- \let\@ltiORI\labelitemi
- \let\@ltiiORI\labelitemii
- \let\@ltiiiORI\labelitemiii
- \let\@ltivORI\labelitemiv
- \let\itemizeORI\itemize
- \let\bbl@frenchitemize\relax
- \let\bbl@frenchlistspacing\relax
- \let\bbl@frenchindent\relax}
- \@onlypreamble\FrenchLayout
- \@onlypreamble\StandardLayout
-\fi
-\ifx\sevenrm\@undefined
- \ifx\@ptsize\@undefined
- \let\up@size\small
- \else
- \ifx\selectfont\@undefined
- \ifcase\@ptsize
- \let\up@size\ixpt\or
- \let\up@size\xpt\or
- \let\up@size\xipt
- \fi
- \else
- \ifcase\@ptsize
- \def\up@size{\fontsize\@ixpt{10pt}\selectfont}\or
- \def\up@size{\fontsize\@xpt{11pt}\selectfont}\or
- \def\up@size{\fontsize\@xipt{12pt}\selectfont}
- \fi
- \fi
- \fi
+ \newcommand*{\up}[1]{\textsuperscript{#1}}
\else
- \let\up@size\sevenrm
-\fi
-\if@Two@E
- \DeclareRobustCommand*{\up}[1]{\textsuperscript{#1}}
-\else
- \DeclareRobustCommand*{\up}[1]{\leavevmode\raise1ex\hbox{\up@size#1}}
+ \newcommand*{\up}[1]{\leavevmode\raise1ex\hbox{\sevenrm #1}}
\fi
\def\ieme{\up{\lowercase{e}}\xspace}
\def\iemes{\up{\lowercase{es}}\xspace}
@@ -628,9 +228,9 @@
\def\iers{\up{\lowercase{ers}}\xspace}
\def\iere{\up{\lowercase{re}}\xspace}
\def\ieres{\up{\lowercase{res}}\xspace}
-\DeclareRobustCommand*{\FrenchEnumerate}[1]{%
+\newcommand*{\FrenchEnumerate}[1]{%
#1\up{\lowercase{o}}\kern+.3em}
-\DeclareRobustCommand*{\FrenchPopularEnumerate}[1]{%
+\newcommand*{\FrenchPopularEnumerate}[1]{%
#1\up{\lowercase{o}})\kern+.3em}
\def\primo{\FrenchEnumerate1}
\def\secundo{\FrenchEnumerate2}
@@ -642,38 +242,29 @@
\def\fquarto){\FrenchPopularEnumerate4}
\DeclareRobustCommand*{\No}{N\up{\lowercase{o}}\kern+.2em}
\DeclareRobustCommand*{\no}{n\up{\lowercase{o}}\kern+.2em}
-\DeclareRobustCommand*{\bsc}[1]{\leavevmode\hbox{\scshape #1}}
+\DeclareRobustCommand*{\bsc}[1]{\leavevmode\begingroup\kern0pt
+ \scshape #1\endgroup}
+\ifLaTeXe\else\let\scshape\relax\fi
\ifLaTeXe
- \DeclareTextSymbol{\ae}{T1}{230}
- \DeclareTextSymbol{\ae}{OT1}{26}
- \DeclareTextSymbol{\oe}{T1}{247}
- \DeclareTextSymbol{\oe}{OT1}{27}
- \DeclareTextSymbol{\AE}{T1}{198}
- \DeclareTextSymbol{\AE}{OT1}{29}
- \DeclareTextSymbol{\OE}{T1}{215}
- \DeclareTextSymbol{\OE}{OT1}{30}
\DeclareTextSymbol{\at}{T1}{64}
- \DeclareTextSymbol{\at}{OT1}{64}
\DeclareTextSymbol{\circonflexe}{T1}{94}
- \DeclareTextSymbol{\circonflexe}{OT1}{94}
\DeclareTextSymbol{\tild}{T1}{126}
- \DeclareTextSymbol{\tild}{OT1}{126}
- \DeclareTextSymbolDefault{\at}{OT1}
- \DeclareTextSymbolDefault{\circonflexe}{OT1}
- \DeclareTextSymbolDefault{\tild}{OT1}
+ \DeclareTextSymbolDefault{\at}{T1}
+ \DeclareTextSymbolDefault{\circonflexe}{T1}
+ \DeclareTextSymbolDefault{\tild}{T1}
\DeclareRobustCommand*{\boi}{\textbackslash}
\DeclareRobustCommand*{\degre}{\r{}}
\else
\def\T@one{T1}
\ifx\f@encoding\T@one
- \newcommand{\degre}{\char6}
+ \newcommand*{\degre}{\char6}
\else
- \newcommand{\degre}{\char23}
+ \newcommand*{\degre}{\char23}
\fi
- \newcommand{\at}{\char64}
- \newcommand{\circonflexe}{\char94}
- \newcommand{\tild}{\char126}
- \newcommand{\boi}{{$\backslash$}}
+ \newcommand*{\at}{\char64}
+ \newcommand*{\circonflexe}{\char94}
+ \newcommand*{\tild}{\char126}
+ \newcommand*{\boi}{$\backslash$}
\fi
\ifLaTeXe
\def\Warning@degree@TSone{%
@@ -693,53 +284,574 @@
\hbox{\UseTextSymbol{TS1}{\textdegree}}}%
\fi}
\else
- \DeclareRobustCommand*{\degres}{%
+ \newcommand*{\degres}{%
\leavevmode\hbox to 0.3em{\hss\degre\hss}}
\fi
-\ifLaTeXe
- \AtBeginDocument{%
- \ifx\csubinverse\@undefined
- \DeclareTextCompositeCommand{\^}{OT1}{i}{\^\i}%
- \DeclareTextCompositeCommand{\"}{OT1}{i}{\"\i}%
- \fi}
-\fi
-\@namedef{date\CurrentOption}{%
- \def\today{\number\day
- \ifnum1=\day {\ier}\fi
- \space \ifcase\month
- \or janvier\or f\'evrier\or mars\or avril\or mai\or juin\or
- juillet\or ao\^ut\or septembre\or octobre\or novembre\or
- d\'ecembre\fi
- \space \number\year}}
-\ifLaTeXe
- \loadlocalcfg{frenchb}
+\newcount\std@mcc
+\newcount\dec@mcc
+\std@mcc=\mathcode`\,
+\dec@mcc=\std@mcc
+\@tempcnta=\std@mcc
+\divide\@tempcnta by "1000
+\multiply\@tempcnta by "1000
+\advance\dec@mcc by -\@tempcnta
+\newcommand*{\DecimalMathComma}{\iflanguage{french}%
+ {\mathcode`\,=\dec@mcc}{}%
+ \addto\extrasfrench{\mathcode`\,=\dec@mcc}}
+\newcommand*{\StandardMathComma}{\mathcode`\,=\std@mcc
+ \addto\extrasfrench{\mathcode`\,=\std@mcc}}
+\expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \mathcode`\,=\std@mcc}
+\newcommand*{\nombre}[1]{{#1}\message{%
+ *** \noexpand\nombre no longer formats numbers\string! ***}}%
+\let\FBstop@here\relax
+\def\FBclean@on@exit{\let\ifLaTeXe\@undefined
+ \let\LaTeXetrue\@undefined
+ \let\LaTeXefalse\@undefined}
+\ifx\magnification\@undefined
+\else
+ \def\FBstop@here{\let\STD@makecaption\relax
+ \FBclean@on@exit
+ \ldf@quit\CurrentOption\endinput}
\fi
-\let\T@one\relax
-\let\@FI@\relax
-\let\ifLaTeX\@undefined
-\let\LaTeXtrue\@undefined
-\let\LaTeXfalse\@undefined
-\let\ifLaTeXe\@undefined
-\let\LaTeXetrue\@undefined
-\let\LaTeXefalse\@undefined
+\FBstop@here
+\renewcommand*{\nombre}[1]{\Warning@nombre\numprint{#1}}
+\newcommand*{\Warning@nombre}{%
+ \@ifundefined{numprint}%
+ {\PackageWarning{frenchb.ldf}{%
+ \protect\nombre\space now relies on package numprint.sty,
+ \MessageBreak add \protect
+ \usepackage[autolanguage]{numprint}\MessageBreak
+ to your preamble *after* loading babel, \MessageBreak
+ see file numprint.pdf for other options.\MessageBreak
+ \protect\nombre\space called}%
+ \global\let\Warning@nombre\relax
+ \global\let\numprint\relax
+ }{}%
+}
+\newcommand*{\ThinSpaceInFrenchNumbers}{%
+ \PackageWarning{frenchb.ldf}{%
+ Type \protect\frenchbsetup{ThinSpaceInFrenchNumbers}
+ \MessageBreak Command \protect\ThinSpaceInFrenchNumbers\space
+ is no longer\MessageBreak defined in frenchb v.2,}}
+\@namedef{captions\CurrentOption}{%
+ \def\refname{R\'ef\'erences}%
+ \def\abstractname{R\'esum\'e}%
+ \def\bibname{Bibliographie}%
+ \def\prefacename{Pr\'eface}%
+ \def\chaptername{Chapitre}%
+ \def\appendixname{Annexe}%
+ \def\contentsname{Table des mati\`eres}%
+ \def\listfigurename{Table des figures}%
+ \def\listtablename{Liste des tableaux}%
+ \def\indexname{Index}%
+ \def\figurename{{\scshape Figure}}%
+ \def\tablename{{\scshape Table}}%
+ \def\partname{\protect\@Fpt partie}%
+ \def\@Fpt{{\ifcase\value{part}\or Premi\`ere\or Deuxi\`eme\or
+ Troisi\`eme\or Quatri\`eme\or Cinqui\`eme\or Sixi\`eme\or
+ Septi\`eme\or Huiti\`eme\or Neuvi\`eme\or Dixi\`eme\or Onzi\`eme\or
+ Douzi\`eme\or Treizi\`eme\or Quatorzi\`eme\or Quinzi\`eme\or
+ Seizi\`eme\or Dix-septi\`eme\or Dix-huiti\`eme\or Dix-neuvi\`eme\or
+ Vingti\`eme\fi}\space\def\thepart{}}%
+ \def\pagename{page}%
+ \def\seename{{\emph{voir}}}%
+ \def\alsoname{{\emph{voir aussi}}}%
+ \def\enclname{P.~J. }%
+ \def\ccname{Copie \`a }%
+ \def\headtoname{}%
+ \def\proofname{D\'emonstration}%
+ \def\glossaryname{Glossaire}%
+ }
+\AtBeginDocument{\let\captions@French\captionsfrench
+ \@ifundefined{captionsfrenchb}%
+ {\let\captions@Frenchb\relax}%
+ {\let\captions@Frenchb\captionsfrenchb}%
+ \@ifundefined{captionsfrancais}%
+ {\let\captions@Francais\relax}%
+ {\let\captions@Francais\captionsfrancais}%
+ \def\captionsfrench{\captions@French
+ \captions@Francais\captions@Frenchb}%
+ \def\captionsfrancais{\captionsfrench}%
+ \def\captionsfrenchb{\captionsfrench}%
+ \iflanguage{french}{\captionsfrench}{}%
+ }
+\@ifpackagewith{babel}{canadien}{%
+ \def\captionscanadien{\captionsfrench}%
+ \def\datecanadien{\datefrench}%
+ \def\extrascanadien{\extrasfrench}%
+ \def\noextrascanadien{\noextrasfrench}%
+ }{}
+\@ifpackagewith{babel}{acadian}{%
+ \def\captionsacadian{\captionsfrench}%
+ \def\dateacadian{\datefrench}%
+ \def\extrasacadian{\extrasfrench}%
+ \def\noextrasacadian{\noextrasfrench}%
+ }{}
+\def\CaptionSeparator{\string:\space}
+\long\def\FB@makecaption#1#2{%
+ \vskip\abovecaptionskip
+ \sbox\@tempboxa{#1\CaptionSeparator #2}%
+ \ifdim \wd\@tempboxa >\hsize
+ #1\CaptionSeparator #2\par
+ \else
+ \global \@minipagefalse
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+ \fi
+ \vskip\belowcaptionskip}
+\AtBeginDocument{%
+ \ifx\@makecaption\STD@makecaption
+ \global\let\@makecaption\FB@makecaption
+ \else
+ \@ifundefined{@makecaption}{}%
+ {\PackageWarning{frenchb.ldf}%
+ {The definition of \protect\@makecaption\space
+ has been changed,\MessageBreak
+ frenchb will NOT customise it;\MessageBreak reported}%
+ }%
+ \fi
+ \let\FB@makecaption\relax
+ \let\STD@makecaption\relax
+}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \def\CaptionSeparator{\space\textendash\space}}
+\expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \def\CaptionSeparator{\string:\space}}
+\let\listORI\list
+\let\endlistORI\endlist
+\def\FB@listsettings{%
+ \setlength{\itemsep}{0.4ex plus 0.2ex minus 0.2ex}%
+ \setlength{\parsep}{0.4ex plus 0.2ex minus 0.2ex}%
+ \setlength{\topsep}{0.8ex plus 0.4ex minus 0.4ex}%
+ \setlength{\partopsep}{0.4ex plus 0.2ex minus 0.2ex}%
+ \@tempdima=\parskip
+ \addtolength{\topsep}{-\@tempdima}%
+ \addtolength{\partopsep}{\@tempdima}}%
+\def\listFB#1#2{\listORI{#1}{\FB@listsettings #2}}%
+\let\endlistFB\endlist
+\newcommand*{\FrenchLabelItem}{\textendash}
+\newcommand*{\Frlabelitemi}{\FrenchLabelItem}
+\newcommand*{\Frlabelitemii}{\FrenchLabelItem}
+\newcommand*{\Frlabelitemiii}{\FrenchLabelItem}
+\newcommand*{\Frlabelitemiv}{\FrenchLabelItem}
+\newif\ifFB@enterFrench \FB@enterFrenchtrue
+\def\bbl@frenchlabelitems{%
+ \ifFB@enterFrench
+ \let\@ltiORI\labelitemi
+ \let\@ltiiORI\labelitemii
+ \let\@ltiiiORI\labelitemiii
+ \let\@ltivORI\labelitemiv
+ \let\labelitemi\Frlabelitemi
+ \let\labelitemii\Frlabelitemii
+ \let\labelitemiii\Frlabelitemiii
+ \let\labelitemiv\Frlabelitemiv
+ \FB@enterFrenchfalse
+ \fi
+}
+\let\itemizeORI\itemize
+\let\enditemizeORI\enditemize
+\let\enditemizeFB\enditemize
+\def\itemizeFB{%
+ \ifnum \@itemdepth >\thr@@\@toodeep\else
+ \advance\@itemdepth\@ne
+ \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+ \expandafter
+ \listORI
+ \csname\@itemitem\endcsname
+ {\settowidth{\labelwidth}{\csname\@itemitem\endcsname}%
+ \setlength{\leftmargin}{\labelwidth}%
+ \addtolength{\leftmargin}{\labelsep}%
+ \ifnum\@listdepth=0
+ \setlength{\itemindent}{\parindent}%
+ \else
+ \addtolength{\leftmargin}{\parindent}%
+ \fi
+ \setlength{\itemsep}{\z@}%
+ \setlength{\parsep}{\z@}%
+ \setlength{\topsep}{\z@}%
+ \setlength{\partopsep}{\z@}%
+ \@tempdima=\parskip
+ \addtolength{\topsep}{-\@tempdima}%
+ \addtolength{\partopsep}{\@tempdima}}%
+ \fi}
+\def\bbl@nonfrenchlabelitems{%
+ \ifFB@enterFrench
+ \else
+ \let\Frlabelitemi\labelitemi
+ \let\Frlabelitemii\labelitemii
+ \let\Frlabelitemiii\labelitemiii
+ \let\Frlabelitemiv\labelitemiv
+ \let\labelitemi\@ltiORI
+ \let\labelitemii\@ltiiORI
+ \let\labelitemiii\@ltiiiORI
+ \let\labelitemiv\@ltivORI
+ \FB@enterFrenchtrue
+ \fi
+}
+\let\@aifORI\@afterindentfalse
+\def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue}
+\def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI
+ \@afterindentfalse}
+\AtBeginDocument{\@ifpackageloaded{bigfoot}%
+ {\PackageWarning{frenchb.ldf}%
+ {bigfoot package in use.\MessageBreak
+ frenchb will NOT customise footnotes;\MessageBreak
+ reported}}%
+ {\let\@footnotemarkORI\@footnotemark
+ \def\@footnotemarkFB{\leavevmode\unskip\unkern
+ \,\@footnotemarkORI}%
+ \ifFBAutoSpaceFootnotes
+ \let\@footnotemark\@footnotemarkFB
+ \fi}%
+ }
+\newdimen\parindentFFN
+\parindentFFN=10in
+\def\ftnISsymbol{\@fnsymbol\c@footnote}
+\long\def\@makefntextFB#1{\ifx\thefootnote\ftnISsymbol
+ \@makefntextORI{#1}%
+ \else
+ \parindent=\parindentFFN
+ \rule\z@\footnotesep
+ \setbox\@tempboxa\hbox{\@thefnmark}%
+ \ifdim\wd\@tempboxa>\z@
+ \llap{\@thefnmark}.\kern.5em
+ \fi #1
+ \fi}%
+\AtBeginDocument{\@ifpackageloaded{bigfoot}{}%
+ {\ifdim\parindentFFN<10in
+ \else
+ \parindentFFN=\parindent
+ \ifdim\parindentFFN<1.5em\parindentFFN=1.5em\fi
+ \fi
+ \let\@makefntextORI\@makefntext
+ \long\def\@makefntext#1{%
+ \ifFBFrenchFootnotes
+ \@makefntextFB{#1}%
+ \else
+ \@makefntextORI{#1}%
+ \fi}%
+ }%
+ }
+\newcommand*{\AddThinSpaceBeforeFootnotes}{\FBAutoSpaceFootnotestrue}
+\newcommand*{\FrenchFootnotes}{\FBFrenchFootnotestrue}
+\newcommand*{\StandardFootnotes}{\FBFrenchFootnotesfalse}
+\newcommand*{\FrenchLayout}{\FBGlobalLayoutFrenchtrue
+ \PackageWarning{frenchb.ldf}%
+ {\protect\FrenchLayout\space is obsolete. Please use\MessageBreak
+ \protect\frenchbsetup{GlobalLayoutFrench} instead.}%
+}
+\newcommand*{\StandardLayout}{\FBStandardLayouttrue
+ \PackageWarning{frenchb.ldf}%
+ {\protect\StandardLayout\space is obsolete. Please use\MessageBreak
+ \protect\frenchbsetup{StandardLayout} instead.}%
+}
+\@onlypreamble\FrenchLayout
+\@onlypreamble\StandardLayout
+\DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
+\DeclareTextCommandDefault{\FBtextellipsis}{%
+ .\kern\fontdimen3\font.\kern\fontdimen3\font.\xspace}
+\newcommand*{\Tdots@ORI}{\@xp\textellipsis}
+\newcommand*{\Tdots@}{\Tdots@ORI}
+\newcommand*{\Mdots@}{\@xp\mdots@}
+\AtBeginDocument{\DeclareRobustCommand{\dots}{\relax
+ \csname\ifmmode M\else T\fi dots@\endcsname}%
+ \@ifundefined{@xp}{\let\@xp\relax}{}%
+ \@ifundefined{mdots@}{\let\Tdots@ORI\textellipsis
+ \let\Mdots@\mathellipsis}{}}
+\def\bbl@frenchdots{\let\Tdots@\FBtextellipsis}
+\def\bbl@nonfrenchdots{\let\Tdots@\Tdots@ORI}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \bbl@frenchdots}
+\expandafter\addto\csname noextras\CurrentOption\endcsname{%
+ \bbl@nonfrenchdots}
+\newif\ifFBStandardLayout \FBStandardLayoutfalse
+\newif\ifFBGlobalLayoutFrench \FBGlobalLayoutFrenchfalse
+\newif\ifFBAutoSpacePunctuation \FBAutoSpacePunctuationtrue
+\newif\ifFBThinColonSpace \FBThinColonSpacefalse
+\newif\ifFBReduceListSpacing \FBReduceListSpacingtrue
+\newif\ifFBCompactItemize \FBCompactItemizetrue
+\newif\ifFBStandardItemLabels \FBStandardItemLabelsfalse
+\newif\ifFBStandardLists \FBStandardListsfalse
+\newif\ifFBIndentFirst \FBIndentFirsttrue
+\newif\ifFBFrenchFootnotes \FBFrenchFootnotestrue
+\newif\ifFBAutoSpaceFootnotes \FBAutoSpaceFootnotestrue
+\newif\ifFBThinSpaceInFrenchNumbers \FBThinSpaceInFrenchNumbersfalse
+\newif\ifFBPartNameFull \FBPartNameFulltrue
+\newif\ifFBShowOptions \FBShowOptionsfalse
+\newcommand*{\frenchbsetup}[1]{%
+ \setkeys{FB}{#1}%
+}%
+\@onlypreamble\frenchbsetup
+\AtEndOfPackage{%
+ \RequirePackage{keyval}%
+ \define@key{FB}{StandardLayout}[true]%
+ {\csname FBStandardLayout#1\endcsname
+ \ifFBStandardLayout
+ \FBStandardListstrue
+ \FBIndentFirstfalse
+ \FBFrenchFootnotesfalse
+ \FBAutoSpaceFootnotesfalse
+ \fi}%
+ \define@key{FB}{GlobalLayoutFrench}[true]%
+ {\csname FBGlobalLayoutFrench#1\endcsname}%
+ \define@key{FB}{AutoSpacePunctuation}[true]%
+ {\csname FBAutoSpacePunctuation#1\endcsname}%
+ \define@key{FB}{ThinColonSpace}[true]%
+ {\csname FBThinColonSpace#1\endcsname}%
+ \define@key{FB}{ReduceListSpacing}[true]%
+ {\csname FBReduceListSpacing#1\endcsname}%
+ \define@key{FB}{CompactItemize}[true]%
+ {\csname FBCompactItemize#1\endcsname}%
+ \define@key{FB}{StandardItemLabels}[true]%
+ {\csname FBStandardItemLabels#1\endcsname}%
+ \define@key{FB}{ItemLabels}{%
+ \renewcommand*{\FrenchLabelItem}{#1}}%
+ \define@key{FB}{ItemLabeli}{%
+ \renewcommand*{\Frlabelitemi}{#1}}%
+ \define@key{FB}{ItemLabelii}{%
+ \renewcommand*{\Frlabelitemii}{#1}}%
+ \define@key{FB}{ItemLabeliii}{%
+ \renewcommand*{\Frlabelitemiii}{#1}}%
+ \define@key{FB}{ItemLabeliv}{%
+ \renewcommand*{\Frlabelitemiv}{#1}}%
+ \define@key{FB}{StandardLists}[false]%
+ {\csname FBStandardLayout#1\endcsname
+ \ifFBStandardLists
+ \FBReduceListSpacingfalse
+ \FBCompactItemizefalse
+ \FBStandardItemLabelstrue
+ \fi}%
+ \define@key{FB}{IndentFirst}[true]%
+ {\csname FBIndentFirst#1\endcsname}%
+ \define@key{FB}{FrenchFootnotes}[true]%
+ {\csname FBFrenchFootnotes#1\endcsname}%
+ \define@key{FB}{AutoSpaceFootnotes}[true]%
+ {\csname FBAutoSpaceFootnotes#1\endcsname}%
+ \define@key{FB}{ThinSpaceInFrenchNumbers}[true]%
+ {\csname FBThinSpaceInFrenchNumbers#1\endcsname}%
+ \define@key{FB}{PartNameFull}[true]%
+ {\csname FBPartNameFull#1\endcsname}%
+ \define@key{FB}{ShowOptions}[true]%
+ {\csname FBShowOptions#1\endcsname}%
+ \define@key{FB}{og}{%
+ \newcommand*{\FB@@og}{\iflanguage{french}%
+ {\FB@og\ignorespaces}{\guillemotleft}}%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \AtBeginDocument{%
+ \@ifundefined{DeclareInputText}%
+ {\PackageWarning{frenchb.ldf}%
+ {Option `og' requires package inputenc.\MessageBreak}%
+ }%
+ {\@ifundefined{uc@dclc}%
+ {\@ifundefined{DeclareUnicodeCharacter}%
+ {\@tempcnta`#1\relax
+ \@ifundefined{mule@def}%
+ {\DeclareInputText{\the\@tempcnta}{\FB@@og}}%
+ {\mule@def{11}{{\FB@@og}}}%
+ }%
+ {\DeclareUnicodeCharacter{00AB}{\FB@@og}}%
+ }%
+ {\uc@dclc{171}{default}{\FB@@og}}%
+ }%
+ }%
+ \else
+ \catcode`#1=\active
+ \bgroup
+ \uccode`\~`#1%
+ \uppercase{%
+ \egroup
+ \def~%
+ }{\FB@@og}%
+ \fi
+ }%
+ \define@key{FB}{fg}{%
+ \newcommand*{\FB@@fg}{\iflanguage{french}%
+ {\FB@fg}{\guillemotright}}%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \AtBeginDocument{%
+ \@ifundefined{DeclareInputText}%
+ {\PackageWarning{frenchb.ldf}%
+ {Option `fg' requires package inputenc.\MessageBreak}%
+ }%
+ {\@ifundefined{uc@dclc}%
+ {\@ifundefined{DeclareUnicodeCharacter}%
+ {\@tempcnta`#1\relax
+ \@ifundefined{mule@def}%
+ {\DeclareInputText{\the\@tempcnta}{{\FB@@fg}}}%
+ {\mule@def{27}{{\FB@@fg}}}%
+ }%
+ {\DeclareUnicodeCharacter{00BB}{{\FB@@fg}}}%
+ }%
+ {\uc@dclc{187}{default}{{\FB@@fg}}}%
+ }%
+ }%
+ \else
+ \catcode`#1=\active
+ \bgroup
+ \uccode`\~`#1%
+ \uppercase{%
+ \egroup
+ \def~%
+ }{{\FB@@fg}}%
+ \fi
+ }%
+}
+\newcommand*{\FBprocess@options}{%
+ \ifFBAutoSpacePunctuation
+ \AutoSpaceBeforeFDP
+ \else
+ \NoAutoSpaceBeforeFDP
+ \fi
+ \ifFBThinColonSpace\renewcommand*{\Fcolonspace}{\thinspace}\fi
+ \ifFBReduceListSpacing
+ \addto\extrasfrench{\let\list\listFB
+ \let\endlist\endlistFB}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \let\list\listFB
+ \let\endlist\endlistFB
+ \else
+ \let\list\listORI
+ \let\endlist\endlistORI
+ \fi}%
+ \else
+ \addto\extrasfrench{\let\list\listORI
+ \let\endlist\endlistORI}%
+ \addto\noextrasfrench{\let\list\listORI
+ \let\endlist\endlistORI}%
+ \fi
+ \ifFBCompactItemize
+ \addto\extrasfrench{\let\itemize\itemizeFB
+ \let\enditemize\enditemizeFB}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \let\itemize\itemizeFB
+ \let\enditemize\enditemizeFB
+ \else
+ \let\itemize\itemizeORI
+ \let\enditemize\enditemizeORI
+ \fi}%
+ \else
+ \addto\extrasfrench{\let\itemize\itemizeORI
+ \let\enditemize\enditemizeORI}%
+ \addto\noextrasfrench{\let\itemize\itemizeORI
+ \let\enditemize\enditemizeORI}%
+ \fi
+ \ifFBStandardItemLabels
+ \addto\extrasfrench{\bbl@nonfrenchlabelitems}%
+ \addto\noextrasfrench{\bbl@nonfrenchlabelitems}%
+ \else
+ \addto\extrasfrench{\bbl@frenchlabelitems}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \bbl@frenchlabelitems
+ \else
+ \bbl@nonfrenchlabelitems
+ \fi}%
+ \fi
+ \ifFBIndentFirst
+ \addto\extrasfrench{\bbl@frenchindent}%
+ \addto\noextrasfrench{\ifFBGlobalLayoutFrench
+ \bbl@frenchindent
+ \else
+ \bbl@nonfrenchindent
+ \fi}%
+ \else
+ \addto\extrasfrench{\bbl@nonfrenchindent}%
+ \addto\noextrasfrench{\bbl@nonfrenchindent}%
+ \fi
+ \@ifpackageloaded{numprint}%
+ {\ifnprt@autolanguage
+ \providecommand*{\npstylefrench}{}%
+ \ifFBThinSpaceInFrenchNumbers
+ \renewcommand*\npstylefrench{%
+ \npthousandsep{\,}%
+ \npdecimalsign{,}%
+ \npproductsign{\cdot}%
+ \npunitseparator{\,}%
+ \npdegreeseparator{}%
+ \nppercentseparator{\nprt@unitsep}%
+ }%
+ \else
+ \renewcommand*\npstylefrench{%
+ \npthousandsep{~}%
+ \npdecimalsign{,}%
+ \npproductsign{\cdot}%
+ \npunitseparator{\,}%
+ \npdegreeseparator{}%
+ \nppercentseparator{\nprt@unitsep}%
+ }%
+ \fi
+ \npaddtolanguage{french}{french}%
+ \fi}{}%
+ \ifFBPartNameFull
+ \else\addto\captionsfrench{\def\partname{Partie}}\fi
+ \ifFBShowOptions
+ \GenericWarning{* }{%
+ * **** List of possible options for frenchb ****\MessageBreak
+ [Default values between brackets]\MessageBreak
+ ShowOptions=true [false]\MessageBreak
+ StandardLayout=true [false]\MessageBreak
+ GlobalLayoutFrench=true [false]\MessageBreak
+ AutoSpacePunctuation=false [true]\MessageBreak
+ ThinColonSpace=true [false]\MessageBreak
+ StandardLists=true [false]\MessageBreak
+ ReduceListSpacing=false [true]\MessageBreak
+ CompactItemize=false [true]\MessageBreak
+ StandardItemLabels=true [false]\MessageBreak
+ ItemLabels=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabeli=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabelii=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabeliii=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ ItemLabeliv=\textemdash, \textbullet,
+ \protect\ding{43},... [\textendash]\MessageBreak
+ IndentFirst=false [true]\MessageBreak
+ FrenchFootnotes=false [true]\MessageBreak
+ AutoSpaceFootnotes=false [true]\MessageBreak
+ ThinSpaceInFrenchNumbers=true [false]\MessageBreak
+ PartNameFull=false [true]\MessageBreak
+ og= <left quote character>, fg= <right quote character>
+ \MessageBreak
+ *********************************************
+ \MessageBreak\protect\frenchbsetup{ShowOptions}}
+ \fi
+}
+\AtBeginDocument{%
+ \let\listORI\list
+ \let\endlistORI\endlist
+ \let\itemizeORI\itemize
+ \let\enditemizeORI\enditemize
+ \let\@ltiORI\labelitemi
+ \let\@ltiiORI\labelitemii
+ \let\@ltiiiORI\labelitemiii
+ \let\@ltivORI\labelitemiv
+ \providecommand*{\xspace}{\relax}%
+ \FBprocess@options
+ \iflanguage{french}{\extrasfrench\captionsfrench}{\noextrasfrench}%
+ \expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \begingroup \newcommand{\FBOTone}{OT1}%
+ \ifx\encodingdefault\FBOTone
+ \PackageWarning{frenchb.ldf}%
+ {OT1 encoding should not be used for French.
+ \MessageBreak
+ Add \protect\usepackage[T1]{fontenc} to the
+ preamble\MessageBreak of your document,}
+ \fi
+ \endgroup
+ \else
+ \@ifundefined{DeclareUTFcharacter}%
+ {\PackageWarning{frenchb.ldf}%
+ {Add \protect\usepackage{fontspec} *and*\MessageBreak
+ \protect\usepackage{xunicode} to the preamble\MessageBreak
+ of your document,}}%
+ {}%
+ \fi
+}
+\loadlocalcfg{frenchb}
+\FBclean@on@exit
\ldf@quit\CurrentOption
-%%
-%% \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
-%% Lower-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
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\endinput
%%
%% End of file `frenchb.ldf'.
diff --git a/Master/texmf-dist/tex/generic/babel/galician.ldf b/Master/texmf-dist/tex/generic/babel/galician.ldf
index de266b0347c..4cdc56c7815 100644
--- a/Master/texmf-dist/tex/generic/babel/galician.ldf
+++ b/Master/texmf-dist/tex/generic/babel/galician.ldf
@@ -7,7 +7,7 @@
%% galician.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -36,22 +36,54 @@
%% 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.
-\ProvidesLanguage{galician}
- [2005/03/30 v1.2l Galician support from the babel system]
%% File `galician.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
-%% Galician Language Definition File
-%% Copyright (C) 1989 - 2005
+%% Galcian Language Definition File
+%% Copyright (C) 1989 - 2006
%% by Manuel Carriba mcarriba at eunetcom.net
-%% Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% Johannes Braams, TeXniek
+%% Copyright (C) 2007 - 2008
+%% by Javier A. M\'ugica
+%% Johannes Braams, TeXniek
+%% Please report errors to: Javier A. Mugica (preferably)
+%% jmugica at digi21.net
+%% J.L. Braams
+%% babel at braams.xs4all.nl
+%% \section{\textsf{galician} coma lingua principal}
+
+\ProvidesLanguage{galician.ldf}
+ [2007/01/29 v4.3 Galician support from the babel system]
\LdfInit{galician}\captionsgalician
-\ifx\l@galician\@undefined
+\ifx\undefined\l@galician
\@nopatterns{Galician}
- \adddialect\l@galician0\fi
+ \adddialect\l@galician0
+\fi
+\edef\gl@savedcatcodes{%
+ \catcode`\noexpand\~=\the\catcode`\~
+ \catcode`\noexpand\"=\the\catcode`\"}
+\catcode`\~=\active
+\catcode`\"=12
+\long\def\gl@delayed#1\then#2\else#3\fi{%
+ #1%
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+ {#2}{#3}}
+\gl@delayed
+\expandafter\ifx\csname documentclass\endcsname\relax\then
+ \let\ifes@LaTeXe\iffalse
+\else
+ \let\ifes@LaTeXe\iftrue
+\fi
+\gl@delayed
+\expandafter\ifx\csname newenvironment\endcsname\relax\then
+ \let\ifes@plain\iftrue
+\else
+ \let\ifes@plain\iffalse
+\fi
\addto\captionsgalician{%
\def\prefacename{Prefacio}%
\def\refname{Referencias}%
@@ -59,12 +91,11 @@
\def\bibname{Bibliograf\'{\i}a}%
\def\chaptername{Cap\'{\i}tulo}%
\def\appendixname{Ap\'endice}%
- \def\contentsname{\'Indice Xeral}%
- \def\listfigurename{\'Indice de Figuras}%
- \def\listtablename{\'Indice de T\'aboas}%
- \def\indexname{\'Indice de Materias}%
+ \def\listfigurename{\'Indice de figuras}%
+ \def\listtablename{\'Indice de cadros}%
+ \def\indexname{\'Indice alfab\'etico}%
\def\figurename{Figura}%
- \def\tablename{T\'aboa}%
+ \def\tablename{Cadro}%
\def\partname{Parte}%
\def\enclname{Adxunto}%
\def\ccname{Copia a}%
@@ -73,71 +104,726 @@
\def\seename{v\'exase}%
\def\alsoname{v\'exase tam\'en}%
\def\proofname{Demostraci\'on}%
- \def\glossaryname{Glosario}%
-}
+ \def\glossaryname{Glosario}}
+
+\expandafter\ifx\csname chapter\endcsname\relax
+ \addto\captionsgalician{\def\contentsname{\'Indice}}
+\else
+ \addto\captionsgalician{\def\contentsname{\'Indice xeral}}
+\fi
\def\dategalician{%
- \def\today{\number\day~de\space\ifcase\month\or
- xaneiro\or febreiro\or marzo\or abril\or maio\or xu\~no\or
- xullo\or agosto\or setembro\or outubro\or novembro\or decembro\fi
- \space de~\number\year}}
-\addto\extrasgalician{\languageshorthands{galician}}
-\initiate@active@char{"}
-\initiate@active@char{~}
-\addto\extrasgalician{%
- \bbl@activate{"}\bbl@activate{~}}
-\@ifpackagewith{babel}{activeacute}{%
- \initiate@active@char{'}}{}
-\@ifpackagewith{babel}{activeacute}{%
- \addto\extrasgalician{\bbl@activate{'}}}{}
-\addto\noextrasgalician{%
- \bbl@deactivate{"}\bbl@deactivate{~}}
-\@ifpackagewith{babel}{activeacute}{%
- \addto\noextrascatalan{\bbl@deactivate{'}}}{}
-\addto\extrasgalician{%
- \babel@save\"\babel@save\~%
- \def\"{\protect\@umlaut}%
- \def\~{\protect\@tilde}}
-\@ifpackagewith{babel}{activeacute}{%
- \babel@save\'%
- \addto\extrasgalician{\def\'{\protect\@acute}}
- }{}
-\let\dieresis\"
-\let\texttilde\~
-\@ifpackagewith{babel}{activeacute}{\let\textacute\'}{}
-\def\@umlaut#1{\allowhyphens\dieresis{#1}\allowhyphens}
-\def\@tilde#1{\allowhyphens\texttilde{#1}\allowhyphens}
-\@ifpackagewith{babel}{activeacute}{%
- \def\@acute#1{\allowhyphens\textacute{#1}\allowhyphens}}{}
-\declare@shorthand{galician}{"-}{\nobreak-\bbl@allowhyphens}
-\declare@shorthand{galician}{"|}{\discretionary{-}{}{\kern.03em}}
-\declare@shorthand{galician}{"u}{\@umlaut{u}}
-\declare@shorthand{galician}{"U}{\@umlaut{U}}
-\declare@shorthand{galician}{"o}{%
- \leavevmode\raise1ex\hbox{\underbar{\scriptsize o}}}
-\declare@shorthand{galician}{"a}{%
- \leavevmode\raise1ex\hbox{\underbar{\scriptsize a}}}
-\@ifpackagewith{babel}{activeacute}{%
- \declare@shorthand{galician}{'a}{\textormath{\@acute a}{^{\prime} a}}
- \declare@shorthand{galician}{'e}{\textormath{\@acute e}{^{\prime} e}}
- \declare@shorthand{galician}{'i}{\textormath{\@acute\i{}}{^{\prime}i}}
- \declare@shorthand{galician}{'o}{\textormath{\@acute o}{^{\prime} o}}
- \declare@shorthand{galician}{'u}{\textormath{\@acute u}{^{\prime} u}}
- \declare@shorthand{galician}{'A}{\textormath{\@acute A}{^{\prime} A}}
- \declare@shorthand{galician}{'E}{\textormath{\@acute E}{^{\prime} E}}
- \declare@shorthand{galician}{'I}{\textormath{\@acute I}{^{\prime} I}}
- \declare@shorthand{galician}{'O}{\textormath{\@acute O}{^{\prime} O}}
- \declare@shorthand{galician}{'U}{\textormath{\@acute U}{^{\prime} U}}
- \declare@shorthand{galician}{'n}{\textormath{\~n}{^{\prime} n}}
- \declare@shorthand{galician}{'N}{\textormath{\~N}{^{\prime} N}}
- \declare@shorthand{galician}{''}{%
- \textormath{\textquotedblright}{\sp\bgroup\prim@s'}}
- }{}
-\declare@shorthand{galician}{~n}{\textormath{\~n}{\@tilde n}}
-\declare@shorthand{galician}{~N}{\textormath{\~N}{\@tilde N}}
-\addto\extrasgalician{%
- \babel@save{\-}%
- \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}}
-\ldf@finish{galician}
+ \def\today{\the\day~de \ifcase\month\or xaneiro\or febreiro\or
+ marzo\or abril\or maio\or xu\~no\or xullo\or agosto\or
+ setembro\or outubro\or novembro\or decembro\fi
+ \ \ifnum\year>1999\gl@yearl\else de\fi~\the\year}}
+\def\galiciandatedo{\def\gl@yearl{do}}
+\def\galiciandatede{\def\gl@yearl{de}}
+\galiciandatedo
+\def\selectgalician{%
+ \def\selectgalician{%
+ \def\selectgalician{%
+ \PackageWarning{galician}{Extra \string\selectgalician ignored}}%
+ \gl@select}}
+
+\@onlypreamble\selectgalician
+
+\def\gl@select{%
+ \let\gl@select\@undefined
+ \selectlanguage{galician}%
+ \catcode`\"\active\catcode`\~=\active}
+\def\extrasgalician{%
+ \textgalician
+ \mathgalician
+ \ifx\shorthandsgalician\@empty
+ \galiciandeactivate{."'~<>}%
+ \languageshorthands{none}%
+ \else
+ \shorthandsgalician
+ \fi}
+\def\noextrasgalician{%
+ \ifx\textgalician\@empty\else
+ \notextgalician
+ \fi
+ \ifx\mathgalician\@empty\else
+ \nomathgalician
+ \fi
+ \ifx\shorthandsgalician\@empty\else
+ \noshorthandsgalician
+ \fi
+ \gl@reviveshorthands}
+\addto\textgalician{%
+ \babel@save\sptext
+ \def\sptext{\protect\gl@sptext}}
+\ifes@LaTeXe %<<<<<<
+ \newcommand\gl@sptext[1]{%
+ {.\setbox\z@\hbox{8}\dimen@\ht\z@
+ \csname S@\f@size\endcsname
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \fontsize\sf@size\z@
+ \selectfont
+ \advance\dimen@-1.15ex
+ \else
+ \fontsize\ssf@size\z@
+ \selectfont
+ \advance\dimen@-1.5ex
+ \fi
+ \math@fontsfalse\raise\dimen@\hbox{#1}}}
+\else %<<<<<<
+ \let\sptextfont\rm
+ \newcommand\gl@sptext[1]{%
+ {.\setbox\z@\hbox{8}\dimen@\ht\z@
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \advance\dimen@-0.75ex
+ \raise\dimen@\hbox{$\scriptstyle\sptextfont#1$}%
+ \else
+ \advance\dimen@-0.8ex
+ \raise\dimen@\hbox{$\scriptscriptstyle\sptextfont#1$}%
+ \fi}}
+\fi %<<<<<<
+\ifes@LaTeXe %<<<<<<
+ \addto\textgalician{%
+ \babel@save\lsc
+ \def\lsc{\protect\gl@lsc}
+ \babel@save\msc
+ \def\msc{\protect\gl@msc}}
+
+ \def\gl@@msc{\expandafter\@tempdima\f@size pt \divide\@tempdima by 200 \multiply\@tempdima by 219
+ \edef\f@size{\strip@pt\@tempdima}\selectfont}
+ \def\gl@msc{\let\gl@do@msc\gl@@msc\lsc}
+ \let\gl@do@msc\relax
+
+ \def\gl@lsc#1{%
+ \leavevmode
+ \hbox{\gl@do@msc\scshape\selectfont
+ \expandafter\ifx\csname\f@encoding/\f@family/\f@series
+ /n/\f@size\expandafter\endcsname
+ \csname\curr@fontshape/\f@size\endcsname
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size\z@\selectfont
+ \PackageInfo{galician}{Replacing undefined sc font\MessageBreak
+ shape by faked small caps}%
+ \MakeUppercase{#1}%
+ \else
+ \MakeLowercase{#1}%
+ \fi}\let\gl@do@msc\relax}
+\fi %<<<<<<
+\newif\ifgl@listquot
+
+\ifes@plain\else %<<<<<<
+ \csname newtoks\endcsname\gl@quottoks
+ \csname newcount\endcsname\gl@quotdepth
+
+ \ifx\quoting\c@undefined\def\next{\let\next\relax\newenvironment}
+ \else\def\next{\PackageInfo{galician}{Redefining quoting}\let\next\relax\renewenvironment}
+ \fi
+ \next{quoting}
+ {\leavevmode
+ \advance\gl@quotdepth1
+ \csname lquot\romannumeral\gl@quotdepth\endcsname%
+ \ifnum\gl@quotdepth=\@ne
+ \gl@listquotfalse
+ \let\gl@quotpar\everypar
+ \let\everypar\gl@quottoks
+ \everypar\expandafter{\the\gl@quotpar}%
+ \gl@quotpar{\the\everypar
+ \ifgl@listquot\global\gl@listquotfalse\else\gl@quotcont\fi}%
+ \fi
+ \toks@\expandafter{\gl@quotcont}%
+ \edef\gl@quotcont{\the\toks@
+ \expandafter\noexpand
+ \csname rquot\romannumeral\gl@quotdepth\endcsname}}
+ {\csname rquot\romannumeral\gl@quotdepth\endcsname}
+
+ \def\lquoti{\guillemotleft{}}
+ \def\rquoti{\guillemotright{}}
+ \def\lquotii{``}
+ \def\rquotii{''}
+ \def\lquotiii{`}
+ \def\rquotiii{'}
+
+ \let\gl@quotcont\@empty
+ \addto\@marginparreset{\let\gl@quotcont\@empty}
+
+ \def\gl@listquot{%
+ \csname rquot\romannumeral\gl@quotdepth\endcsname
+ \global\gl@listquottrue}
+\fi %<<<<<<
+\addto\textgalician{\bbl@frenchspacing}
+\addto\notextgalician{\bbl@nonfrenchspacing}
+
+\mathchardef\gl@cdot="0201
+\ifes@LaTeXe %<<<<<<
+\addto\textgalician{%
+ \babel@save\textellipsis
+ \babel@save\ldotp
+ \babel@save\cdotp%
+ \def\textellipsis{\hbox{...}\spacefactor\sfcode`.{} }%
+ \mathchardef\ldotp="013A%
+ \mathchardef\cdotp="0201%
+}
+\else %<<<<<<
+\addto\textgalician{%
+ \babel@save\dots
+ \babel@save\ldotp
+ \babel@save\cdotp
+ \mathchardef\ldotp="013A%
+ \mathchardef\cdotp="0201%
+ \def\dots{\ifmmode\ldots\else...\spacefactor\sfcode`.{} \fi}%
+}
+\fi %<<<<<<
+
+\ifes@LaTeXe %<<<<<<
+ \addto\textgalician{%
+ \let\percentsign\%%
+ \babel@save\%%
+ \def\%{\unskip\,\percentsign{}}}
+\else
+ \addto\textgalician{%
+ \let\percentsign\%%
+ \babel@save\%%
+ \def\%{\unskip\ifmmode\,\else$\m@th\,$\fi\percentsign{}}}
+\fi
+\addto\mathgalician{%
+ \babel@save\dotlessi
+ \def\dotlessi{\protect\gl@dotlessi}}
+
+\let\nomathgalician\relax %% Unused, but called
+
+\ifes@LaTeXe %<<<<<<
+ \def\gl@texti{\i}
+ \addto\@uclclist{\dotlessi\gl@texti}
+\fi %<<<<<<
+
+\ifes@LaTeXe %<<<<<<
+ \def\gl@dotlessi{%
+ \ifmmode
+ {\ifnum\mathgroup=\m@ne
+ \imath
+ \else
+ \count@\escapechar \escapechar=\m@ne
+ \expandafter\expandafter\expandafter
+ \split@name\expandafter\string\the\textfont\mathgroup\@nil
+ \escapechar=\count@
+ \@ifundefined{\f@encoding\string\i}%
+ {\edef\f@encoding{\string?}}{}%
+ \expandafter\count@\the\csname\f@encoding\string\i\endcsname
+ \advance\count@"7000
+ \mathchar\count@
+ \fi}%
+ \else
+ \i
+ \fi}
+\else %<<<<<<
+ \def\gl@dotlessi{%
+ \ifmmode
+ \mathchar"7010
+ \else
+ \i
+ \fi}
+\fi %<<<<<<
+\def\accentedoperators{%
+ \def\gl@op@ac##1{\acute{##1}}%
+ \def\gl@op@i{\acute{\dotlessi}}}
+\def\unaccentedoperators{%
+ \def\gl@op@ac##1{##1}%
+ \def\gl@op@i{i}}
+\accentedoperators
+
+\def\spacedoperators{\let\gl@op@sp\,}
+\def\unspacedoperators{\let\gl@op@sp\@empty}
+\unspacedoperators
+\addto\mathgalician{%
+ \gl@operators}
+
+\ifes@LaTeXe\else %<<<<<<
+ \let\operator@font\rm
+ \def\@empty{}
+\fi %<<<<<<
+
+\def\gl@operators{%
+ \babel@save\lim \def\lim{\mathop{\operator@font l\protect\gl@op@i m}}%
+ \babel@save\limsup \def\limsup{\mathop{\operator@font l\gl@op@i m\,sup}}%
+ \babel@save\liminf \def\liminf{\mathop{\operator@font l\gl@op@i m\,inf}}%
+ \babel@save\max \def\max{\mathop{\operator@font m\gl@op@ac ax}}%
+ \babel@save\inf \def\inf{\mathop{\operator@font \protect\gl@op@i nf}}%
+ \babel@save\min \def\min{\mathop{\operator@font m\protect\gl@op@i n}}%
+ \babel@save\bmod
+ \def\bmod{%
+ \nonscript\mskip-\medmuskip\mkern5mu%
+ \mathbin{\operator@font m\gl@op@ac od}\penalty900\mkern5mu%
+ \nonscript\mskip-\medmuskip}%
+ \babel@save\pmod
+ \def\pmod##1{%
+ \allowbreak\mkern18mu({\operator@font m\gl@op@ac od}\,\,##1)}%
+ \def\gl@a##1 {%
+ \gl@delayed
+ \if^##1^\then % is it empty? do nothing and continue
+ \gl@a
+ \else
+ \gl@delayed
+ \if&##1\then % is it &? do nothing and finish
+ \else
+ \begingroup
+ \let\,\@empty % \, is ignored when def'ing the macro name
+ \let\acute\@firstofone % same
+ \edef\gl@b{\expandafter\noexpand\csname##1\endcsname}%
+ \def\,{\noexpand\gl@op@sp}%
+ \def\acute####1{%
+ \if i####1%
+ \noexpand\gl@op@i
+ \else
+ \noexpand\gl@op@ac####1%
+ \fi}%
+ \edef\gl@a{\endgroup
+ \noexpand\babel@save\expandafter\noexpand\gl@b
+ \def\expandafter\noexpand\gl@b{%
+ \mathop{\noexpand\operator@font##1}\nolimits}}%
+ \gl@a % It restores itself
+ \gl@a
+ \fi
+ \fi}%
+ \let\gl@b\galicianoperators
+ \addto\gl@b{ }%
+ \expandafter\gl@a\gl@b sen tx cosec arc\,sen arc\,cos arc\,tx senh & %\, will be set to \gl@op@sp
+ %
+ \babel@save\sin \let\sin\sen
+ \babel@save\arcsin \let\arcsin\arcsen
+ \babel@save\sinh \let\sinh\senh
+}
+
+\def\galicianoperators{cotx txh}
+\DeclareTextCompositeCommand{\'}{OT1}{i}{\@tabacckludge'{\i}}
+
+\def\gl@set@shorthand#1{%
+ \expandafter\edef\csname gl@savecat\string#1\endcsname
+ {\the\catcode`#1}%
+ \initiate@active@char{#1}%
+ \catcode`#1=\csname gl@savecat\string#1\endcsname\relax
+ \expandafter\let\csname gl@math\string#1\expandafter\endcsname
+ \csname normal@char\string#1\endcsname}
+
+\def\gl@use@shorthand{%
+ \gl@delayed
+ \ifx\thepage\relax\then
+ \string
+ \else{%
+ \gl@delayed
+ \ifx\protect\@unexpandable@protect\then
+ \noexpand
+ \else
+ \gl@use@sh
+ \fi}%
+ \fi}
+
+\def\gl@text@sh#1{\csname active@char\string#1\endcsname}
+\def\gl@math@sh#1{\csname gl@math\string#1\endcsname}
+
+\def\gl@use@sh{%
+ \gl@delayed
+ \if@safe@actives\then
+ \string
+ \else{%
+ \gl@delayed
+ \ifmmode\then
+ \gl@math@sh
+ \else
+ \gl@text@sh
+ \fi}%
+ \fi}
+
+\gdef\gl@activate#1{%
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \def~{\gl@use@shorthand~}}}
+
+\def\galiciandeactivate#1{%
+ \@tfor\@tempa:=#1\do{\expandafter\gl@spdeactivate\@tempa}}
+
+\def\gl@spdeactivate#1{%
+ \if.#1%
+ \mathcode`\.=\gl@period@code
+ \else
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \expandafter\let\expandafter~%
+ \csname normal@char\string#1\endcsname}%
+ \catcode`#1\csname gl@savecat\string#1\endcsname\relax
+ \fi}
+
+\def\gl@reviveshorthands{%
+ \gl@restore{"}\gl@restore{~}%
+ \gl@restore{<}\gl@restore{>}%
+ \gl@quoting}
+
+\def\gl@restore#1{%
+ \catcode`#1=\active
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \bbl@deactivate{~}}}
+\begingroup
+\catcode`\'=12
+\lccode`~=`' \lccode`'=`'
+\lowercase{%
+\gdef\bbl@pr@m@s{%
+ \gl@delayed
+ \ifx~\@let@token\then
+ \pr@@@s
+ \else
+ {\gl@delayed
+ \ifx'\@let@token\then
+ \pr@@@s
+ \else
+ {\gl@delayed
+ \ifx^\@let@token\then
+ \pr@@@t
+ \else
+ \egroup
+ \fi}%
+ \fi}%
+ \fi}}
+\endgroup
+\expandafter\ifx\csname @tabacckludge\endcsname\relax
+ \let\gl@tak\a
+\else
+ \let\gl@tak\@tabacckludge
+\fi
+
+\ifes@LaTeXe %<<<<<<
+ \def\@tabacckludge#1{\expandafter\gl@tak\string#1}
+ \let\a\@tabacckludge
+\else\ifes@plain %<<<<<<
+ \def\@tabacckludge#1{\csname\string#1\endcsname}
+\else %<<<<<<
+ \def\@tabacckludge#1{\csname a\string#1\endcsname}
+\fi\fi %<<<<<<
+
+\expandafter\ifx\csname add@accent\endcsname\relax
+ \def\add@accent#1#2{\accent#1 #2}
+\fi
+\ifes@LaTeXe %<<<<<<
+ \def\gl@accent#1#2#3{%
+ \expandafter\@text@composite
+ \csname OT1\string#1\endcsname#3\@empty\@text@composite
+ {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \setbox\@tempboxa\hbox{#3%
+ \global\mathchardef\accent@spacefactor\spacefactor}%
+ \spacefactor\accent@spacefactor}}
+\else %<<<<<<
+ \def\gl@accent#1#2#3{%
+ \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \spacefactor\sfcode`#3 }
+\fi %<<<<<<
+\addto\shorthandsgalician{\languageshorthands{galician}}
+\let\noshorthandsgalician\relax
+\def\galiciandecimal#1{\def\gl@decimal{{#1}}}
+\def\decimalcomma{\galiciandecimal{,}}
+\def\decimalpoint{\galiciandecimal{.}}
+\decimalcomma
+
+\gl@set@shorthand{.}
+
+\@namedef{gl@math\string.}{%
+ \@ifnextchar\egroup
+ {\mathchar\gl@period@code\relax}%
+ {\gl@text@sh.}}
+
+\declare@shorthand{system}{.}{\mathchar\gl@period@code\relax}
+\addto\shorthandsgalician{%
+ \mathchardef\gl@period@code\the\mathcode`\.%
+ \babel@savevariable{\mathcode`\.}%
+ \mathcode`\.="8000 %
+ \gl@activate{.}}
+
+\AtBeginDocument{%
+ \catcode`\.=12
+ \if@filesw
+ \immediate\write\@mainaux{%
+ \string\catcode`\string\.=12}%
+ \fi}
+
+\declare@shorthand{galician}{.1}{\gl@decimal1}
+\declare@shorthand{galician}{.2}{\gl@decimal2}
+\declare@shorthand{galician}{.3}{\gl@decimal3}
+\declare@shorthand{galician}{.4}{\gl@decimal4}
+\declare@shorthand{galician}{.5}{\gl@decimal5}
+\declare@shorthand{galician}{.6}{\gl@decimal6}
+\declare@shorthand{galician}{.7}{\gl@decimal7}
+\declare@shorthand{galician}{.8}{\gl@decimal8}
+\declare@shorthand{galician}{.9}{\gl@decimal9}
+\declare@shorthand{galician}{.0}{\gl@decimal0}
+\gl@set@shorthand{"}
+\def\gl@umlaut#1{%
+ \bbl@allowhyphens\add@accent{127}#1\bbl@allowhyphens
+ \spacefactor\sfcode`#1 }
+\ifes@LaTeXe %<<<<<<
+ \addto\shorthandsgalician{%
+ \gl@activate{"}%
+ \gl@activate{~}%
+ \babel@save\bbl@umlauta
+ \let\bbl@umlauta\gl@umlaut
+ \expandafter\babel@save\csname OT1\string\~\endcsname
+ \expandafter\def\csname OT1\string\~\endcsname{\gl@accent\~{126}}%
+ \expandafter\babel@save\csname OT1\string\'\endcsname
+ \expandafter\def\csname OT1\string\'\endcsname{\gl@accent\'{19}}}
+\else %<<<<<<
+ \addto\shorthandsgalician{%
+ \gl@activate{"}%
+ \gl@activate{~}%
+ \babel@save\bbl@umlauta
+ \let\bbl@umlauta\gl@umlaut
+ \babel@save\~%
+ \def\~{\gl@accent\~{126}}%
+ \babel@save\'%
+ \def\'#1{\if#1i\gl@accent\'{19}\i\else\gl@accent\'{19}{#1}\fi}}
+\fi %<<<<<<
+\declare@shorthand{galician}{"a}{\protect\gl@sptext{a}}
+\declare@shorthand{galician}{"A}{\protect\gl@sptext{A}}
+\declare@shorthand{galician}{"o}{\protect\gl@sptext{o}}
+\declare@shorthand{galician}{"O}{\protect\gl@sptext{O}}
+
+\declare@shorthand{galician}{"u}{\"u}
+\declare@shorthand{galician}{"U}{\"U}
+\declare@shorthand{galician}{"i}{\"i}
+\declare@shorthand{galician}{"I}{\"I}
+
+\declare@shorthand{galician}{"<}{\begin{quoting}}
+\declare@shorthand{galician}{">}{\end{quoting}}
+\declare@shorthand{galician}{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
+\declare@shorthand{galician}{"=}%
+ {\bbl@allowhyphens\char\hyphenchar\font\hskip\z@skip}
+\declare@shorthand{galician}{"~}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {\char\hyphenchar\font}{\char\hyphenchar\font}\bbl@allowhyphens}
+\declare@shorthand{galician}{"r}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {}{r}\bbl@allowhyphens}
+\declare@shorthand{galician}{"R}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {}{R}\bbl@allowhyphens}
+\declare@shorthand{galician}{""}{\hskip\z@skip}
+\declare@shorthand{galician}{"/}
+ {\setbox\z@\hbox{/}%
+ \dimen@\ht\z@
+ \advance\dimen@-1ex
+ \advance\dimen@\dp\z@
+ \dimen@.31\dimen@
+ \advance\dimen@-\dp\z@
+ \ifdim\dimen@>0pt
+ \kern.01em\lower\dimen@\box\z@\kern.03em
+ \else
+ \box\z@
+ \fi}
+\declare@shorthand{galician}{"?}
+ {\setbox\z@\hbox{?`}%
+ \leavevmode\raise\dp\z@\box\z@}
+\declare@shorthand{galician}{"!}
+ {\setbox\z@\hbox{!`}%
+ \leavevmode\raise\dp\z@\box\z@}
+
+\gl@set@shorthand{~}
+\declare@shorthand{galician}{~n}{\~n}
+\declare@shorthand{galician}{~N}{\~N}
+\declare@shorthand{galician}{~-}{%
+ \leavevmode
+ \bgroup
+ \let\@sptoken\gl@dashes % This assignation changes the
+ \@ifnextchar-% \@ifnextchar behaviour
+ {\gl@dashes}%
+ {\hbox{\char\hyphenchar\font}\egroup}}
+\def\gl@dashes-{%
+ \@ifnextchar-%
+ {\bbl@allowhyphens\hbox{---}\bbl@allowhyphens\egroup\@gobble}%
+ {\bbl@allowhyphens\hbox{--}\bbl@allowhyphens\egroup}}
+
+\def\deactivatetilden{%
+ \expandafter\let\csname galician@sh@\string~@n@\endcsname\relax
+ \expandafter\let\csname galician@sh@\string~@N@\endcsname\relax}
+\expandafter\ifx\csname XML@catcodes\endcsname\relax
+ \addto\gl@select{%
+ \catcode`\<\active\catcode`\>=\active
+ \gl@quoting}
+
+ \gl@set@shorthand{<}
+ \gl@set@shorthand{>}
+
+ \declare@shorthand{system}{<}{\csname normal@char\string<\endcsname}
+ \declare@shorthand{system}{>}{\csname normal@char\string>\endcsname}
+
+ \addto\shorthandsgalician{%
+ \gl@activate{<}%
+ \gl@activate{>}}
+ \ifes@LaTeXe %<<<<<<
+ \AtBeginDocument{%
+ \gl@quoting
+ \if@filesw
+ \immediate\write\@mainaux{\string\gl@quoting}%
+ \fi}%
+ \fi %<<<<<<
+
+ \def\activatequoting{%
+ \catcode`>=\active \catcode`<=\active
+ \let\gl@quoting\activatequoting}
+ \def\deactivatequoting{%
+ \catcode`>=12 \catcode`<=12
+ \let\gl@quoting\deactivatequoting}
+
+ \declare@shorthand{galician}{<<}{\guillemotleft{}}
+ \declare@shorthand{galician}{>>}{\guillemotright{}}
+\fi
+
+\let\gl@quoting\relax
+\let\deactivatequoting\relax
+\let\activatequoting\relax
+\def\gl@activeacute{%
+ \gl@set@shorthand{'}%
+ \addto\shorthandsgalician{\gl@activate{'}}%
+ \addto\gl@reviveshorthands{\gl@restore{'}}%
+ \addto\gl@select{\catcode`'=\active}%
+ \declare@shorthand{galician}{'a}{\@tabacckludge'a}%
+ \declare@shorthand{galician}{'A}{\@tabacckludge'A}%
+ \declare@shorthand{galician}{'e}{\@tabacckludge'e}%
+ \declare@shorthand{galician}{'E}{\@tabacckludge'E}%
+ \declare@shorthand{galician}{'i}{\@tabacckludge'i}%
+ \declare@shorthand{galician}{'I}{\@tabacckludge'I}%
+ \declare@shorthand{galician}{'o}{\@tabacckludge'o}%
+ \declare@shorthand{galician}{'O}{\@tabacckludge'O}%
+ \declare@shorthand{galician}{'u}{\@tabacckludge'u}%
+ \declare@shorthand{galician}{'U}{\@tabacckludge'U}%
+ \declare@shorthand{galician}{'n}{\~n}%
+ \declare@shorthand{galician}{'N}{\~N}%
+ \declare@shorthand{galician}{''}{\textquotedblright}%
+ \let\gl@activeacute\relax}
+
+\ifes@LaTeXe %<<<<<<
+ \@ifpackagewith{babel}{activeacute}{\gl@activeacute}{}
+\else %<<<<<<
+ \gl@activeacute
+\fi %<<<<<<%
+\def\gl@enumerate#1#2#3#4{%
+ \def\gl@enum{{#1}{#2}{#3}{#4}}}
+
+\def\gl@itemize#1#2#3#4{%
+ \def\gl@item{{#1}{#2}{#3}{#4}}}
+\ifes@LaTeXe %<<<<<<
+
+\gl@enumerate{1.}{a)}{1)}{a$'$}
+\def\galiciandashitems{\gl@itemize{---}{---}{---}{---}}
+\def\galiciansymbitems{%
+ \gl@itemize
+ {\leavevmode\hbox to 1.2ex
+ {\hss\vrule height .9ex width .7ex depth -.2ex\hss}}%
+ {\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}}
+\def\galiciansignitems{%
+ \gl@itemize
+ {\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}%
+ {$\m@th\triangleright$}}
+\galiciansymbitems
+
+\def\gl@enumdef#1#2#3\@@{%
+ \if#21%
+ \@namedef{theenum#1}{\arabic{enum#1}}%
+ \else\if#2a%
+ \@namedef{theenum#1}{\emph{\alph{enum#1}}}%
+ \else\if#2A%
+ \@namedef{theenum#1}{\Alph{enum#1}}%
+ \else\if#2i%
+ \@namedef{theenum#1}{\roman{enum#1}}%
+ \else\if#2I%
+ \@namedef{theenum#1}{\Roman{enum#1}}%
+ \else\if#2o%
+ \@namedef{theenum#1}{\arabic{enum#1}\protect\gl@sptext{o}}%
+ \fi\fi\fi\fi\fi\fi
+ \toks@\expandafter{\csname theenum#1\endcsname}
+ \expandafter\edef\csname labelenum#1\endcsname
+ {\noexpand\gl@listquot\the\toks@#3}}
+
+\addto\layoutgalician{%
+ \def\gl@enumerate##1##2##3##4{%
+ \gl@enumdef{i}##1\@empty\@empty\@@
+ \gl@enumdef{ii}##2\@empty\@empty\@@
+ \gl@enumdef{iii}##3\@empty\@empty\@@
+ \gl@enumdef{iv}##4\@empty\@empty\@@}%
+ \def\gl@itemize##1##2##3##4{%
+ \def\labelitemi{\gl@listquot##1}%
+ \def\labelitemii{\gl@listquot##2}%
+ \def\labelitemiii{\gl@listquot##3}%
+ \def\labelitemiv{\gl@listquot##4}}%
+ \def\p@enumii{\theenumi}%
+ \def\p@enumiii{\theenumi\theenumii}%
+ \def\p@enumiv{\p@enumiii\theenumiii}%
+ \expandafter\gl@enumerate\gl@enum
+ \expandafter\gl@itemize\gl@item
+ \DeclareTextCommand{\guillemotleft}{OT1}{%
+ \ifmmode\ll
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char40 \kern-0.19em\char40 }}%
+ \fi}%
+ \DeclareTextCommand{\guillemotright}{OT1}{%
+ \ifmmode\gg
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char41 \kern-0.19em\char41 }}%
+ \fi}%
+ \def\@fnsymbol##1%
+ {\ifcase##1\or*\or**\or***\or****\or
+ *****\or******\else\@ctrerr\fi}%
+ \def\@alph##1%
+ {\ifcase##1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or
+ l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
+ x\or z\else\@ctrerr\fi}%
+ \def\@Alph##1%
+ {\ifcase##1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or
+ L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
+ X\or Z\else\@ctrerr\fi}%
+ \let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue
+ \def\@seccntformat##1{\csname the##1\endcsname.\quad}%
+ \def\numberline##1{\hb@xt@\@tempdima{##1\if&##1&\else.\fi\hfil}}%
+ \def\@roman##1{\protect\gl@roman{\number##1}}%
+ \def\gl@roman##1{\protect\gl@msc{\romannumeral##1}}%
+ \def\glromanindex##1##2{##1{\protect\gl@msc{##2}}}}
+\AtEndOfPackage{%
+ \let\gl@activeacute\@undefined
+ \def\bbl@tempa{galician}%
+ \ifx\bbl@main@language\bbl@tempa
+ \AtBeginDocument{\layoutgalician}%
+ \addto\gl@select{%
+ \@ifstar{\let\layoutgalician\relax}%
+ {\layoutgalician\let\layoutgalician\relax}}%
+ \fi
+ \selectgalician}
+
+\fi %<<<<<<
+\gl@savedcatcodes
+
+\providehyphenmins{\CurrentOption}{\tw@\tw@}
+
+\ifes@LaTeXe %<<<<<<
+ \ldf@finish{galician}
+\else %<<<<<<
+ \gl@select
+ \ldf@finish{galician}
+ \csname activatequoting\endcsname
+\fi %<<<<<<
+
+%%
%% \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
%% Lower-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/galician.sty b/Master/texmf-dist/tex/generic/babel/galician.sty
index 2ecb23a3613..ebd06b05761 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/germanb.ldf b/Master/texmf-dist/tex/generic/babel/germanb.ldf
index 5a114eea30e..236d8b2caf2 100644
--- a/Master/texmf-dist/tex/generic/babel/germanb.ldf
+++ b/Master/texmf-dist/tex/generic/babel/germanb.ldf
@@ -7,7 +7,7 @@
%% germanb.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,20 +37,31 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{germanb}
- [2004/02/19 v2.6k German support from the babel system]
+ [2008/03/17 v2.6l German support from the babel system]
%% File `germanb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Germanb Language Definition File
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Bernd Raichle raichle at azu.Informatik.Uni-Stuttgart.de
%% Johannes Braams, TeXniek
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\def\bbl@tempa{germanb}
\ifx\CurrentOption\bbl@tempa
\def\CurrentOption{german}
+ \ifx\l@german\@undefined
+ \@nopatterns{German}
+ \adddialect\l@german0
+ \fi
+ \let\l@germanb\l@german
+ \AtBeginDocument{%
+ \let\captionsgermanb\coptionsgerman
+ \let\dategermanb\dategerman
+ \let\extrasgermanb\extrasgerman
+ \let\noextrasgermanb\noextrasgerman
+ }
\fi
\LdfInit\CurrentOption{captions\CurrentOption}
\ifx\l@german\@undefined
diff --git a/Master/texmf-dist/tex/generic/babel/germanb.sty b/Master/texmf-dist/tex/generic/babel/germanb.sty
index b5b1caedb44..329cbc0473e 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/esbst.tex b/Master/texmf-dist/tex/generic/babel/glbst.tex
index 7be9dbc31d4..1ede741a457 100644
--- a/Master/texmf-dist/tex/generic/babel/esbst.tex
+++ b/Master/texmf-dist/tex/generic/babel/glbst.tex
@@ -1,13 +1,13 @@
%%
-%% This is file `esbst.tex',
+%% This is file `glbst.tex',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% spanish.dtx (with options: `bblbst')
+%% galician.dtx (with options: `bblbst')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -36,51 +36,51 @@
%% 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.
-%% File `spanish.dtx'
+%% File `galician.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
-%% Spanish Language Definition File
-%% Copyright (C) 1997 - 2005
-%% by Javier Bezos (jbezos at wanadoo.es)
-%% Apartado 116.035
-%% E-28080 Madrid
-%% Espa\~na / Espagne
-%% and
-%% by CervanTeX (www.cervantex.org)
-%% Please report errors to: Javier Bezos (preferably)
-%% jbezos at wanadoo.es
+%% Galcian Language Definition File
+%% Copyright (C) 1989 - 2006
+%% by Manuel Carriba mcarriba at eunetcom.net
+%% Johannes Braams, TeXniek
+%% Copyright (C) 2007 - 2008
+%% by Javier A. M\'ugica
+%% Johannes Braams, TeXniek
+%% Please report errors to: Javier A. Mugica (preferably)
+%% jmugica at digi21.net
%% J.L. Braams
-%% babel at braams.cistron.nl
-%% \section{\textsf{spanish} como lengua principal}
-\def\bbland{y}
+%% babel at braams.xs4all.nl
+%% \section{\textsf{galician} coma lingua principal}
+
+\def\bbland{e}
\def\bbleditors{directores} \def\bbleds{dirs.\@}
\def\bbleditor{director} \def\bbled{dir.\@}
-\def\bbledby{dirigido por}
+\def\bbledby{dirixido por}
\def\bbledition{edici\'on} \def\bbledn{ed.\@}
-\def\bbletal{y otros}
-\def\bblvolume{vol\'umen} \def\bblvol{vol.\@}
+\def\bbletal{e outros}
+\def\bblvolume{volumen} \def\bblvol{vol.\@}
\def\bblof{de}
\def\bblnumber{n\'umero} \def\bblno{n\sptext{o}}
\def\bblin{en}
-\def\bblpages{p\'aginas} \def\bblpp{p\'ags.\@}
-\def\bblpage{p\'gina} \def\bblp{p\'ag.\@}
+\def\bblpages{p\'axinas} \def\bblpp{p\'axs.\@}
+\def\bblpage{p\'axina} \def\bblp{p\'ax.\@}
\def\bblchapter{cap\'itulo} \def\bblchap{cap.\@}
\def\bbltechreport{informe t\'ecnico}
\def\bbltechrep{inf.\@ t\'ec.\@}
-\def\bblmthesis{proyecto de fin de carrera}
-\def\bblphdthesis{tesis doctoral}
-\def\bblfirst {primera} \def\bblfirsto {1\sptext{a}}
+\def\bblmthesis{proxecto de fin de carreira}
+\def\bblphdthesis{tesis doutoral}
+\def\bblfirst {primeira} \def\bblfirsto {1\sptext{a}}
\def\bblsecond{segunda} \def\bblsecondo{2\sptext{a}}
-\def\bblthird {tercera} \def\bblthirdo {3\sptext{a}}
+\def\bblthird {terceira} \def\bblthirdo {3\sptext{a}}
\def\bblfourth{cuarta} \def\bblfourtho{4\sptext{a}}
\def\bblfifth {quinta} \def\bblfiftho {5\sptext{a}}
\def\bblth{\sptext{a}}
\let\bblst\bblth \let\bblnd\bblth \let\bblrd\bblth
-\def\bbljan{enero} \def\bblfeb{febrero} \def\bblmar{marzo}
-\def\bblapr{abril} \def\bblmay{mayo} \def\bbljun{junio}
-\def\bbljul{julio} \def\bblaug{agosto} \def\bblsep{septiembre}
-\def\bbloct{octubre}\def\bblnov{noviembre}\def\bbldec{diciembre}
+\def\bbljan{xaneiro} \def\bblfeb{febreiro} \def\bblmar{marzo}
+\def\bblapr{abril} \def\bblmay{maio} \def\bbljun{xu\~no}
+\def\bbljul{xullo} \def\bblaug{agosto} \def\bblsep{setembro}
+\def\bbloct{outubro}\def\bblnov{novembro}\def\bbldec{decembro}
%%
%% \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
@@ -100,4 +100,4 @@
%%
\endinput
%%
-%% End of file `esbst.tex'.
+%% End of file `glbst.tex'.
diff --git a/Master/texmf-dist/tex/generic/babel/glromidx.tex b/Master/texmf-dist/tex/generic/babel/glromidx.tex
new file mode 100644
index 00000000000..3133cc020f0
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel/glromidx.tex
@@ -0,0 +1,216 @@
+%%
+%% This is file `glromidx.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% galician.dtx (with options: `indexgl')
+%% This is a generated file.
+%%
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
+%% listed elsewhere in this file. All rights reserved.
+%%
+%% This file was generated from file(s) of the Babel system.
+%% ---------------------------------------------------------
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is Johannes Braams.
+%%
+%% This file may only be distributed together with a copy of the Babel
+%% system. You may however distribute the Babel system without
+%% such generated files.
+%%
+%% The list of all files belonging to the Babel distribution is
+%% given in the file `manifest.bbl'. See also `legal.bbl for additional
+%% information.
+%%
+%% 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.
+%% File `galician.dtx'
+%% Babel package for LaTeX version 2e
+%% Copyright (C) 1989 - 2008
+%% by Johannes Braams, TeXniek
+%% Galcian Language Definition File
+%% Copyright (C) 1989 - 2006
+%% by Manuel Carriba mcarriba at eunetcom.net
+%% Johannes Braams, TeXniek
+%% Copyright (C) 2007 - 2008
+%% by Javier A. M\'ugica
+%% Johannes Braams, TeXniek
+%% Please report errors to: Javier A. Mugica (preferably)
+%% jmugica at digi21.net
+%% J.L. Braams
+%% babel at braams.xs4all.nl
+%% \section{\textsf{galician} coma lingua principal}
+
+\makeatletter
+
+\newcount\gl@converted
+\newcount\gl@processed
+
+\def\gl@encap{`\|}
+\def\gl@openrange{`\(}
+\def\gl@closerange{`\)}
+
+\def\gl@split@file#1.#2\@@{#1}
+\def\gl@split@ext#1.#2\@@{#2}
+
+\typein[\answer]{^^JArchivo que convertir^^J%
+ (extension por omision .idx):}
+
+\@expandtwoargs\in@{.}{\answer}
+\ifin@
+ \edef\gl@input@file{\expandafter\gl@split@file\answer\@@}
+ \edef\gl@input@ext{\expandafter\gl@split@ext\answer\@@}
+\else
+ \edef\gl@input@file{\answer}
+ \def\gl@input@ext{idx}
+\fi
+
+\typein[\answer]{^^JArquivo de destino^^J%
+ (arquivo por omision: \gl@input@file.eix,^^J%
+ extension por omision .eix):}
+\ifx\answer\@empty
+ \edef\gl@output{\gl@input@file.eix}
+\else
+ \@expandtwoargs\in@{.}{\answer}
+ \ifin@
+ \edef\gl@output{\answer}
+ \else
+ \edef\gl@output{\answer.eix}
+ \fi
+\fi
+
+\typein[\answer]{%
+ ^^J?Usouse algun esquema especial de controles^^J%
+ de MakeIndex para encap, open_range ou close_range?^^J%
+ [s/n] (n por omision)}
+
+\if s\answer
+ \typein[\answer]{^^JCaracter para 'encap'^^J%
+ (\string| por omision)}
+ \ifx\answer\@empty\else
+ \edef\gl@encap{%
+ `\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
+ \fi
+ \typein[\answer]{^^JCaracter para 'open_range'^^J%
+ (\string( por omision)}
+ \ifx\answer\@empty\else
+ \edef\gl@openrange{%
+ `\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
+ \fi
+ \typein[\answer]{^^JCaracter para 'close_range'^^J%
+ (\string) por omision)}
+ \ifx\answer\@empty\else
+ \edef\gl@closerange{%
+ `\expandafter\noexpand\csname\expandafter\string\answer\endcsname}
+ \fi
+\fi
+
+\newwrite\gl@indexfile
+\immediate\openout\gl@indexfile=\gl@output
+
+\newif\ifgl@encapsulated
+
+\def\gl@roman#1{\romannumeral#1 }
+\edef\gl@slash{\expandafter\@gobble\string\\}
+
+\def\indexentry{%
+ \begingroup
+ \@sanitize
+ \gl@indexentry}
+
+\begingroup
+
+\catcode`\|=12 \lccode`\|=\gl@encap\relax
+\catcode`\(=12 \lccode`\(=\gl@openrange\relax
+\catcode`\)=12 \lccode`\)=\gl@closerange\relax
+
+\lowercase{
+\gdef\gl@indexentry#1{%
+ \endgroup
+ \advance\gl@processed\@ne
+ \gl@encapsulatedfalse
+ \gl@bar@idx#1|\@@
+ \gl@idxentry}%
+}
+
+\lowercase{
+\gdef\gl@idxentry#1{%
+ \in@{\gl@roman}{#1}%
+ \ifin@
+ \advance\gl@converted\@ne
+ \immediate\write\gl@indexfile{%
+ \string\indexentry{\gl@b|\ifgl@encapsulated\gl@p\fi glromanindex%
+ {\ifx\gl@a\@empty\else\gl@slash\gl@a\fi}}{#1}}%
+ \else
+ \immediate\write\gl@indexfile{%
+ \string\indexentry{\gl@b\ifgl@encapsulated|\gl@p\gl@a\fi}{#1}}%
+ \fi}
+}
+
+\lowercase{
+\gdef\gl@bar@idx#1|#2\@@{%
+ \def\gl@b{#1}\def\gl@a{#2}%
+ \ifx\gl@a\@empty\else\gl@encapsulatedtrue\gl@bar@eat#2\fi}
+}
+
+\lowercase{
+\gdef\gl@bar@eat#1#2|{\def\gl@p{#1}\def\gl@a{#2}%
+ \edef\gl@t{(}\ifx\gl@t\gl@p
+ \else\edef\gl@t{)}\ifx\gl@t\gl@p
+ \else
+ \edef\gl@a{\gl@p\gl@a}\let\gl@p\@empty%
+ \fi\fi}
+}
+
+\endgroup
+
+\input \gl@input@file.\gl@input@ext
+
+\immediate\closeout\gl@indexfile
+
+\typeout{*****************}
+\typeout{procesouse: \gl@input@file.\gl@input@ext }
+\typeout{Li'nas lidas: \the\gl@processed}
+\typeout{Li'nas convertidas: \the\gl@converted}
+\typeout{Resultado en: \gl@output}
+\ifnum\gl@converted>\z@
+ \typeout{Xenere o 'indice a partir deste arquivo}
+\else
+ \typeout{Non se realizou ning'un tipo de conversi'on}
+ \typeout{P'odese xenerar o arquivo directamente^^J%
+ de \gl@input@file.\gl@input@ext}
+\fi
+\typeout{*****************}
+\@@end
+%%
+%% \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
+%% Lower-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
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%
+\endinput
+%%
+%% End of file `glromidx.tex'.
diff --git a/Master/texmf-dist/tex/generic/babel/greek.sty b/Master/texmf-dist/tex/generic/babel/greek.sty
index 0ef6fce6477..fe5bdab7ad0 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/hebrew.sty b/Master/texmf-dist/tex/generic/babel/hebrew.sty
index c5517d107ca..d21249581ed 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index 5022a917d46..9e29ee8598a 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: `kernel,patterns')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,13 +38,13 @@
%% extension .ins) which are part of the distribution.
%%
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2005/11/23 v3.8h The Babel package]
+%%\ProvidesFile{babel.dtx}[2008/03/16 v3.8j The Babel package]
%% Babel package for LaTeX2e.
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\ifx\ProvidesFile\@undefined
\def\ProvidesFile#1[#2 #3 #4]{%
\wlog{File: #1 #4 #3 <#2>}%
@@ -72,7 +72,7 @@
\endgroup}
\fi
\ProvidesFile{hyphen.cfg}
- [2005/11/23 v3.8h %
+ [2008/03/16 v3.8j %
Babel language switching mechanism]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
@@ -218,6 +218,12 @@
\else
\language=\csname l@#1\endcsname\relax
\languageshorthands{none}%
+ \expandafter\ifx\csname #1hyphenmins\endcsname\relax
+ \set@hyphenmins\tw@\thr@@\relax
+ \else
+ \expandafter\expandafter\expandafter\set@hyphenmins
+ \csname #1hyphenmins\endcsname\relax
+ \fi
\fi
}
\def\endhyphenrules{}
diff --git a/Master/texmf-dist/tex/generic/babel/icelandic.sty b/Master/texmf-dist/tex/generic/babel/icelandic.sty
index 093cfdb9186..eaac6a6627a 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/interlingua.sty b/Master/texmf-dist/tex/generic/babel/interlingua.sty
index 48170690cb0..60357554a1d 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/irish.sty b/Master/texmf-dist/tex/generic/babel/irish.sty
index da5814366ef..95d5ec26475 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/italian.ldf b/Master/texmf-dist/tex/generic/babel/italian.ldf
index b83b13b0c35..28faf1b8485 100644
--- a/Master/texmf-dist/tex/generic/babel/italian.ldf
+++ b/Master/texmf-dist/tex/generic/babel/italian.ldf
@@ -7,7 +7,7 @@
%% italian.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,13 +37,15 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{italian}
- [2005/11/17 v1.2r Italian support from the babel system]
+ [2008/03/14 v1.2t Italian support from the babel system]
%% File `italian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%% Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%% babel at braams.xs4all.nl
+%% Claudio Beccari
+%% claudio.beccari at gmail.it
\LdfInit{italian}{captionsitalian}%
\ifx\l@italian\@undefined
\@nopatterns{Italian}%
@@ -80,7 +82,8 @@
\addto\extrasitalian{%
\babel@savevariable\clubpenalty
\babel@savevariable\widowpenalty
- \clubpenalty3000\widowpenalty3000}%
+ \babel@savevariable\@clubpenalty
+ \clubpenalty3000\widowpenalty3000\@clubpenalty\clubpenalty}%
\addto\extrasitalian{%
\babel@savevariable\finalhyphendemerits
\finalhyphendemerits50000000}%
diff --git a/Master/texmf-dist/tex/generic/babel/italian.sty b/Master/texmf-dist/tex/generic/babel/italian.sty
index 5af72a205d0..f268e3e5f72 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/latin.ldf b/Master/texmf-dist/tex/generic/babel/latin.ldf
index 16a45aaf9dd..8e058749290 100644
--- a/Master/texmf-dist/tex/generic/babel/latin.ldf
+++ b/Master/texmf-dist/tex/generic/babel/latin.ldf
@@ -7,7 +7,7 @@
%% latin.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -39,13 +39,15 @@
%%
%% Copyright 1999-2007 Claudio Beccari All rights reserved.
\ProvidesFile{latin.ldf}
- [2007/10/19 v2.0h Latin support from the babel system]
+ [2008/03/21 v2.0k Latin support from the babel system]
%% File `latin.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%% Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%% babel at braams.xs4all.nl
+%% Claudio Beccari
+%% claudio.beccari at gmail.it
\LdfInit{latin}{captionslatin}
\ifx\l@latin\@undefined
\@nopatterns{Latin}
@@ -87,8 +89,7 @@
\def\november{Novembris}%
\def\today{%
{\check@mathfonts\fontsize\sf@size\z@\math@fontsfalse\selectfont
- \uppercase\expandafter{\romannumeral\day}}\nobreakspace
- \ifcase\month\or
+ \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
Iulii\or Augusti\or Septembris\or Octobris\or \november\or
Decembris\fi
@@ -96,15 +97,16 @@
\providehyphenmins{\CurrentOption}{\tw@\tw@}
\addto\extraslatin{%
\babel@savevariable\clubpenalty
+ \babel@savevariable\@clubpenalty
\babel@savevariable\widowpenalty
- \clubpenalty3000\widowpenalty3000}
+ \clubpenalty3000\@clubpenalty3000\widowpenalty3000}
\addto\extraslatin{%
\babel@savevariable\finalhyphendemerits
\finalhyphendemerits50000000}
\addto\extrasmedievallatin{%
-\babel@savevariable{\lccode`\V}%
-\babel@savevariable{\uccode`\u}%
-\lccode`\V=`\u \uccode`\u=`\V}
+ \babel@savevariable{\lccode`\V}%
+ \babel@savevariable{\uccode`\u}%
+ \lccode`\V=`\u \uccode`\u=`\V}
\addto\extrasmedievallatin{%
\babel@savevariable{\lccode`\^^e6}% T1 \ae
\babel@savevariable{\uccode`\^^e6}% T1 \ae
@@ -134,7 +136,7 @@
\let\@tempA\@undefined
}
\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
+ \GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
{Latin language error: \string\ProsodicMarksOn\space
is defined by setting the\MessageBreak
language attribute to `withprosodicmarks'\MessageBreak
@@ -143,6 +145,8 @@
{See the Latin language description in the babel
documentation for explanation}{\@ehd}}}
\addto\extraslatin{\let\ProsodicMarksOff\relax}
+\@tempcnta=\catcode`\=
+\@tempcntb=\catcode`\^
\catcode`\= \active
\catcode`\^ \active
\addto\extraslatin{\languageshorthands{latin}}%
@@ -152,35 +156,35 @@
\addto\noextraswithprosodicmarks{\bbl@deactivate{=}}%
\addto\extraswithprosodicmarks{\ProsodicMarks}
\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
-\initiate@active@char{^}%
-\initiate@active@char{=}%
-\declare@shorthand{latin}{^a}{%
+ \def\ProsodicMarksOn{\catcode`\^ \active\catcode`\= \active}%
+ \def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
+ \initiate@active@char{^}%
+ \initiate@active@char{=}%
+ \declare@shorthand{latin}{^a}{%
\textormath{\u{a}\bbl@allowhyphens}{\hat{a}}}%
-\declare@shorthand{latin}{^e}{%
+ \declare@shorthand{latin}{^e}{%
\textormath{\u{e}\bbl@allowhyphens}{\hat{e}}}%
-\declare@shorthand{latin}{^i}{%
+ \declare@shorthand{latin}{^i}{%
\textormath{\u{\i}\bbl@allowhyphens}{\hat{\imath}}}%
-\declare@shorthand{latin}{^o}{%
+ \declare@shorthand{latin}{^o}{%
\textormath{\u{o}\bbl@allowhyphens}{\hat{o}}}%
-\declare@shorthand{latin}{^u}{%
+ \declare@shorthand{latin}{^u}{%
\textormath{\u{u}\bbl@allowhyphens}{\hat{u}}}%
-\declare@shorthand{latin}{=a}{%
+ \declare@shorthand{latin}{=a}{%
\textormath{\={a}\bbl@allowhyphens}{\bar{a}}}%
-\declare@shorthand{latin}{=e}{%
+ \declare@shorthand{latin}{=e}{%
\textormath{\={e}\bbl@allowhyphens}{\bar{e}}}%
-\declare@shorthand{latin}{=i}{%
+ \declare@shorthand{latin}{=i}{%
\textormath{\={\i}\bbl@allowhyphens}{\bar{\imath}}}%
-\declare@shorthand{latin}{=o}{%
+ \declare@shorthand{latin}{=o}{%
\textormath{\={o}\bbl@allowhyphens}{\bar{o}}}%
-\declare@shorthand{latin}{=u}{%
+ \declare@shorthand{latin}{=u}{%
\textormath{\={u}\bbl@allowhyphens}{\bar{u}}}%
}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
-\addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
-\addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
+\catcode`\= \@tempcnta
+\catcode`\^ \@tempcntb
+\addto\extraswithprosodicmarks{\let\LatinMarksOn\ProsodicMarksOn}
+\addto\extraswithprosodicmarks{\let\LatinMarksOff\ProsodicMarksOff}
\initiate@active@char{"}%
\addto\extraslatin{\bbl@activate{"}%
}
@@ -198,7 +202,7 @@
\let\lt@n@xt\lt@allowhyphens
\else
\if\noexpand\lt@temp\string|%
- \def\lt@n@xt{\lt@allowhyphens\@gobble}%
+ \def\lt@n@xt{\lt@allowhyphens\@gobble}%
\fi
\fi
\lt@n@xt}%
diff --git a/Master/texmf-dist/tex/generic/babel/latin.sty b/Master/texmf-dist/tex/generic/babel/latin.sty
index d1a2248ccda..0bb3f76e320 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/lsorbian.ldf b/Master/texmf-dist/tex/generic/babel/lsorbian.ldf
index 6649ef27ed8..ee5c589c14c 100644
--- a/Master/texmf-dist/tex/generic/babel/lsorbian.ldf
+++ b/Master/texmf-dist/tex/generic/babel/lsorbian.ldf
@@ -7,7 +7,7 @@
%% lsorbian.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,13 +37,13 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{lsorbian}
- [2007/10/19 v1.0g Lower Sorbian support from the babel system]
+ [2008/03/17 v1.0g Lower Sorbian support from the babel system]
%% File `lsorbian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Lower Sorbian Language Definition File
-%% Copyright (C) 1994 - 2007
+%% Copyright (C) 1994 - 2008
%% by Eduard Werner
%% Please report errors to: Eduard Werner edi at kaihh.hanse.de
%%
diff --git a/Master/texmf-dist/tex/generic/babel/lsorbian.sty b/Master/texmf-dist/tex/generic/babel/lsorbian.sty
index d3bcc2d2bcd..48f75de8165 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/magyar.sty b/Master/texmf-dist/tex/generic/babel/magyar.sty
index b89956762ff..39c641f3d0c 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/naustrian.sty b/Master/texmf-dist/tex/generic/babel/naustrian.sty
index f335d7f0286..610c736d84a 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/ngermanb.ldf b/Master/texmf-dist/tex/generic/babel/ngermanb.ldf
index af193365162..1b0da8920d0 100644
--- a/Master/texmf-dist/tex/generic/babel/ngermanb.ldf
+++ b/Master/texmf-dist/tex/generic/babel/ngermanb.ldf
@@ -7,7 +7,7 @@
%% ngermanb.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,18 +37,18 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{ngermanb}
- [2004/02/20 v2.6m new German support from the babel system]
+ [2008/03/17 v2.6m new German support from the babel system]
%% File `ngermanb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% new Germanb Language Definition File
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Bernd Raichle raichle at azu.Informatik.Uni-Stuttgart.de
%% Johannes Braams, TeXniek,
%% Walter Schmidt.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\def\bbl@tempa{ngermanb}
\ifx\CurrentOption\bbl@tempa
\def\CurrentOption{ngerman}
diff --git a/Master/texmf-dist/tex/generic/babel/ngermanb.sty b/Master/texmf-dist/tex/generic/babel/ngermanb.sty
index d4d3651eb6f..90262dba4a0 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/norsk.sty b/Master/texmf-dist/tex/generic/babel/norsk.sty
index 2681866084d..76a81f60762 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index 5204e438c75..9469b7473a3 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.def
@@ -7,7 +7,7 @@
%% bbplain.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,10 +38,10 @@
%% extension .ins) which are part of the distribution.
%% File `bbplain.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\ifx\adddialect\@undefined
\def\@empty{}
\def\loadlocalcfg#1{%
diff --git a/Master/texmf-dist/tex/generic/babel/polish.sty b/Master/texmf-dist/tex/generic/babel/polish.sty
index ac049d3d9a8..434612354fd 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/portuges.ldf b/Master/texmf-dist/tex/generic/babel/portuges.ldf
index 6a7f33b8e6e..181d7a8923a 100644
--- a/Master/texmf-dist/tex/generic/babel/portuges.ldf
+++ b/Master/texmf-dist/tex/generic/babel/portuges.ldf
@@ -7,7 +7,7 @@
%% portuges.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,13 +37,13 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{portuges}
- [2005/03/31 v1.2p Portuguese support from the babel system]
+ [2008/03/18 v1.2q Portuguese support from the babel system]
%% File `portuges.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Portuguese Language Definition File
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Please report errors to: J.L. Braams
%% babel at braams.cistron.nl
@@ -132,7 +132,7 @@
\def\seename{veja}%
\def\alsoname{veja tamb\'em}%
\def\proofname{Demonstra\c{c}\~ao}%
- \def\glossaryname{Glossary}% <-- Needs translation
+ \def\glossaryname{Gloss\'ario}%
}
\@namedef{date\CurrentOption}{%
\def\today{\number\day\space de\space\ifcase\month\or
diff --git a/Master/texmf-dist/tex/generic/babel/portuges.sty b/Master/texmf-dist/tex/generic/babel/portuges.sty
index 0e2f392941d..aab3ddcd3e9 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/romanian.sty b/Master/texmf-dist/tex/generic/babel/romanian.sty
index 527a1729b35..eb6609622c7 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/romanidx.tex b/Master/texmf-dist/tex/generic/babel/romanidx.sty
index bc50735db31..961a4e911ee 100644
--- a/Master/texmf-dist/tex/generic/babel/romanidx.tex
+++ b/Master/texmf-dist/tex/generic/babel/romanidx.sty
@@ -1,5 +1,5 @@
%%
-%% This is file `romanidx.tex',
+%% This is file `romanidx.sty',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -7,7 +7,7 @@
%% spanish.dtx (with options: `indexes')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,35 +38,46 @@
%% extension .ins) which are part of the distribution.
%% File `spanish.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Spanish Language Definition File
-%% Copyright (C) 1997 - 2005
-%% by Javier Bezos (jbezos at wanadoo.es)
-%% Apartado 116.035
-%% E-28080 Madrid
-%% Espa\~na / Espagne
-%% and
-%% by CervanTeX (www.cervantex.org)
+%% Copyright (C) 1997 - 2008
+%% Javier Bezos (www.texytipografia.com)
+%% and
+%% CervanTeX (www.cervantex.org)
%% Please report errors to: Javier Bezos (preferably)
-%% jbezos at wanadoo.es
+%% www.texytipografia.com/contact.html
%% J.L. Braams
-%% babel at braams.cistron.nl
-%% \section{\textsf{spanish} como lengua principal}
+%% www.latex-project.org
+
+
\makeatletter
+\@ifundefined{es@idxfile}
+ {\def\spanishindexchars#1#2#3{%
+ \edef\es@encap{`\expandafter\noexpand\csname\string#1\endcsname}%
+ \edef\es@openrange{`\expandafter\noexpand\csname\string#2\endcsname}%
+ \edef\es@closerange{`\expandafter\noexpand\csname\string#3\endcsname}}%
+ \spanishindexchars{|}{(}{)}%
+ \ifx\documentclass\@twoclasseserror
+ \edef\es@idxfile{\jobname}%
+ \AtEndDocument{%
+ \addto\@defaultsubs{%
+ \immediate\closeout\@indexfile
+ \input{romanidx.sty}}}%
+ \expandafter\endinput
+ \fi}{}
+
\newcount\es@converted
\newcount\es@processed
-\def\es@encap{`\|}
-\def\es@openrange{`\(}
-\def\es@closerange{`\)}
-
\def\es@split@file#1.#2\@@{#1}
\def\es@split@ext#1.#2\@@{#2}
-\typein[\answer]{^^JArchivo que convertir^^J%
- (extension por omision .idx):}
+\@ifundefined{es@idxfile}
+ {\typein[\answer]{^^JArchivo que convertir^^J%
+ (extension por omision .idx):}}
+ {\let\answer\es@idxfile}
\@expandtwoargs\in@{.}{\answer}
\ifin@
@@ -77,9 +88,11 @@
\def\es@input@ext{idx}
\fi
-\typein[\answer]{^^JArchivo de destino^^J%
- (archivo por omision: \es@input@file.eix,^^J%
- extension por omision .eix):}
+\@ifundefined{es@idxfile}
+ {\typein[\answer]{^^JArchivo de destino^^J%
+ (archivo por omision: \es@input@file.eix,^^J%
+ extension por omision .eix):}}
+ {\let\answer\es@idxfile}
\ifx\answer\@empty
\edef\es@output{\es@input@file.eix}
\else
@@ -91,10 +104,12 @@
\fi
\fi
-\typein[\answer]{%
- ^^J?Se ha usado algun esquema especial de controles^^J%
- de MakeIndex para encap, open_range o close_range?^^J%
- [s/n] (n por omision)}
+\@ifundefined{es@idxfile}
+ {\typein[\answer]{%
+ ^^J?Se ha usado algun esquema especial de controles^^J%
+ de MakeIndex para encap, open_range o close_range?^^J%
+ [s/n] (n por omision)}}
+ {\def\answer{n}}
\if s\answer
\typein[\answer]{^^JCaracter para 'encap'^^J%
@@ -122,7 +137,7 @@
\newif\ifes@encapsulated
-\def\es@roman#1{\romannumeral#1 }
+\def\es@roman#1{#1}
\edef\es@slash{\expandafter\@gobble\string\\}
\def\indexentry{%
@@ -188,12 +203,12 @@
\ifnum\es@converted>\z@
\typeout{Genere el indice a partir de ese archivo}
\else
- \typeout{No se ha realizado ningun tipo de conversion}
- \typeout{Se puede generar el archivo directamente^^J%
- de \es@input@file.\es@input@ext}
+ \typeout{No se ha convertido nada. Se puede generar}
+ \typeout{el .ind directamente de \es@input@file.\es@input@ext}
\fi
\typeout{*****************}
-\@@end
+
+\@ifundefined{es@sdef}{\@@end}{}
%%
%% \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
@@ -213,4 +228,4 @@
%%
\endinput
%%
-%% End of file `romanidx.tex'.
+%% End of file `romanidx.sty'.
diff --git a/Master/texmf-dist/tex/generic/babel/russianb.ldf b/Master/texmf-dist/tex/generic/babel/russianb.ldf
index 7bfda8efeed..b18b530f751 100644
--- a/Master/texmf-dist/tex/generic/babel/russianb.ldf
+++ b/Master/texmf-dist/tex/generic/babel/russianb.ldf
@@ -7,7 +7,7 @@
%% russianb.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,20 +37,20 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{russianb}
- [2005/03/29 v1.1r Russian support from the babel system]
+ [2008/03/21 v1.1r Russian support from the babel system]
%% File `russianb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2005
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Russianb Language Definition File
-%% Copyright (C) 1995 - 2005
+%% Copyright (C) 1995 - 2008
%% by Olga Lapko cyrtug at mir.msk.su
%% Johannes Braams, TeXniek
%% Adapted to the new T2 and X2 Cyrillic encodings
%% by Vladimir Volovich TeX at vvv.vsu.ru
%% Werner Lemberg wl at gnu.org
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\LdfInit{russian}{captionsrussian}
\ifx\l@russian\@undefined
\@nopatterns{Russian}
diff --git a/Master/texmf-dist/tex/generic/babel/russianb.sty b/Master/texmf-dist/tex/generic/babel/russianb.sty
index 92b16cbc583..2f00cda724d 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/samin.sty b/Master/texmf-dist/tex/generic/babel/samin.sty
index 2135dfebce4..3e7648a3b5f 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/scottish.sty b/Master/texmf-dist/tex/generic/babel/scottish.sty
index 477aa056187..8fe2fff5e00 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/serbian.sty b/Master/texmf-dist/tex/generic/babel/serbian.sty
index 15aec9ab838..eaca180563f 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/slovak.sty b/Master/texmf-dist/tex/generic/babel/slovak.sty
index 3d57da65ee2..dadf76e0e85 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/slovene.sty b/Master/texmf-dist/tex/generic/babel/slovene.sty
index 9ef178d65d0..1f4948ae483 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/spanish.ldf b/Master/texmf-dist/tex/generic/babel/spanish.ldf
index 8d2aaba2d16..080255a3f46 100644
--- a/Master/texmf-dist/tex/generic/babel/spanish.ldf
+++ b/Master/texmf-dist/tex/generic/babel/spanish.ldf
@@ -7,7 +7,7 @@
%% spanish.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,793 +38,741 @@
%% extension .ins) which are part of the distribution.
%% File `spanish.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2004
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Spanish Language Definition File
-%% Copyright (C) 1997 - 2005
-%% by Javier Bezos (jbezos at wanadoo.es)
-%% Apartado 116.035
-%% E-28080 Madrid
-%% Espa\~na / Espagne
-%% and
-%% by CervanTeX (www.cervantex.org)
+%% Copyright (C) 1997 - 2008
+%% Javier Bezos (www.texytipografia.com)
+%% and
+%% CervanTeX (www.cervantex.org)
%% Please report errors to: Javier Bezos (preferably)
-%% jbezos at wanadoo.es
+%% www.texytipografia.com/contact.html
%% J.L. Braams
-%% babel at braams.cistron.nl
-%% \section{\textsf{spanish} como lengua principal}
+%% www.latex-project.org
+
+
\ProvidesLanguage{spanish.ldf}
- [2005/03/31 v4.2b Spanish support from the babel system]
+ [2007/02/21 v5.0a Spanish support from the babel system]
\LdfInit{spanish}\captionsspanish
-\ifx\undefined\l@spanish
- \@nopatterns{Spanish}
- \adddialect\l@spanish0
-\fi
+
\edef\es@savedcatcodes{%
- \catcode`\noexpand\~=\the\catcode`\~
- \catcode`\noexpand\"=\the\catcode`\"}
+ \catcode`\noexpand\~=\the\catcode`\~
+ \catcode`\noexpand\"=\the\catcode`\"}
\catcode`\~=\active
\catcode`\"=12
-\long\def\es@delayed#1\then#2\else#3\fi{%
- #1%
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- {#2}{#3}}
-\es@delayed
-\expandafter\ifx\csname documentclass\endcsname\relax\then
- \let\ifes@LaTeXe\iffalse
-\else
- \let\ifes@LaTeXe\iftrue
-\fi
-\es@delayed
-\expandafter\ifx\csname newenvironment\endcsname\relax\then
- \let\ifes@plain\iftrue
-\else
- \let\ifes@plain\iffalse
+
+\ifx\undefined\l@spanish
+ \@nopatterns{Spanish}
+ \adddialect\l@spanish0
\fi
-\addto\captionsspanish{%
- \def\prefacename{Prefacio}%
- \def\refname{Referencias}%
- \def\abstractname{Resumen}%
- \def\bibname{Bibliograf\'{\i}a}%
- \def\chaptername{Cap\'{\i}tulo}%
- \def\appendixname{Ap\'endice}%
- \def\listfigurename{\'Indice de figuras}%
- \def\listtablename{\'Indice de cuadros}%
- \def\indexname{\'Indice alfab\'etico}%
- \def\figurename{Figura}%
- \def\tablename{Cuadro}%
- \def\partname{Parte}%
- \def\enclname{Adjunto}%
- \def\ccname{Copia a}%
- \def\headtoname{A}%
- \def\pagename{P\'agina}%
- \def\seename{v\'ease}%
- \def\alsoname{v\'ease tambi\'en}%
- \def\proofname{Demostraci\'on}%
- \def\glossaryname{Glosario}}
-
-\expandafter\ifx\csname chapter\endcsname\relax
- \addto\captionsspanish{\def\contentsname{\'Indice}}
+
+\def\es@sdef#1{\babel@save#1\def#1}
+
+\@ifundefined{documentclass}
+ {\let\ifes@latex\iffalse}
+ {\let\ifes@latex\iftrue}
+\ifes@latex
+
+\@ifundefined{spanishoptions}{}
+{\PassOptionsToPackage{\spanishoptions}{babel}}
+
+\def\es@genoption#1#2#3{%
+ \DeclareOption{#1}{}%
+ \@ifpackagewith{babel}{#1}%
+ {\def\es@a{#1}%
+ \expandafter\let\expandafter\es@b\csname opt@babel.sty\endcsname
+ \addto\es@b{,#2}%
+ \expandafter\let\csname opt@babel.sty\endcsname\es@b
+ \AtEndOfPackage{#3}}%
+ {}}
+
+\es@genoption{es-minimal}
+ {es-ucroman,es-noindentfirst,es-nosectiondot,es-nolists,%
+ es-noquoting,es-notilde,es-nodecimaldot}
+ {\spanishplainpercent
+ \let\es@operators\relax}
+\es@genoption{es-sloppy}
+ {es-nolayout,es-noshorthands}{}
+\es@genoption{es-noshorthands}
+ {es-noquoting,es-nodecimaldot,es-notilde}{}
+\es@genoption{mexico}
+ {mexico-com,es-nodecimaldot}{}
+\es@genoption{mexico-com}
+ {es-tabla,es-noquoting}
+ {\def\lquoti{``}\def\rquoti{''}%
+ \def\lquotii{`}\def\rquotii{'}%
+ \def\lquotiii{\guillemotleft{}}%
+ \def\rquotiii{\guillemotright{}}}
+
+\def\es@ifoption#1#2#3{%
+ \DeclareOption{es-#1}{}%
+ \@ifpackagewith{babel}{es-#1}{#2}{#3}}%
+
+\def\es@optlayout#1#2{\es@ifoption{#1}{}{\addto\layoutspanish{#2}}}
+
\else
- \addto\captionsspanish{\def\contentsname{\'Indice general}}
+
+\def\es@ifoption#1#2#3{\@namedef{spanish#1}{#2}}
+
\fi
+
+\let\es@uclc\@secondoftwo
+\es@ifoption{uppernames}{\let\es@uclc\@firstoftwo}{}
+
+\def\es@tablename{Ccuadro}
+\es@ifoption{tabla}{\def\es@tablename{Ttabla}}{}
+\es@ifoption{cuadro}{\def\es@tablename{Ccuadro}}{}
+\def\captionsspanish{%
+ \es@a{preface}{Prefacio}%
+ \es@a{ref}{Referencias}%
+ \es@a{abstract}{Resumen}%
+ \es@a{bib}{Bibliograf\'{\i}a}%
+ \es@a{chapter}{Cap\'{\i}tulo}%
+ \es@a{appendix}{Ap\'{e}ndice}%
+ \es@a{listfigure}{\'{I}ndice de \es@uclc Ffiguras}%
+ \es@a{listtable}{\'{I}ndice de \expandafter\es@uclc\es@tablename s}%
+ \es@a{index}{\'{I}ndice \es@uclc Aalfab\'{e}tico}%
+ \es@a{figure}{Figura}%
+ \es@a{table}{\expandafter\@firstoftwo\es@tablename}%
+ \es@a{part}{Parte}%
+ \es@a{encl}{Adjunto}%
+ \es@a{cc}{Copia a}%
+ \es@a{headto}{A}%
+ \es@a{page}{p\'{a}gina}%
+ \es@a{see}{v\'{e}ase}%
+ \es@a{also}{v\'{e}ase tambi\'{e}n}%
+ \es@a{proof}{Demostraci\'{o}n}%
+ \es@a{glossary}{Glosario}%
+ \@ifundefined{chapter}
+ {\es@a{contents}{\'Indice}}%
+ {\es@a{contents}{\'Indice \es@uclc Ggeneral}}}
+
+\def\es@a#1{\@namedef{spanish#1name}}
+\captionsspanish
+\def\es@a#1#2{%
+ \def\expandafter\noexpand\csname#1name\endcsname
+ {\expandafter\noexpand\csname spanish#1name\endcsname}}
+\edef\captionsspanish{\captionsspanish}
+\def\es@month#1{%
+ \expandafter#1\ifcase\month\or Eenero\or Ffebrero\or
+ Mmarzo\or Aabril\or Mmayo\or Jjunio\or Jjulio\or Aagosto\or
+ Sseptiembre\or Ooctubre\or Nnoviembre\or Ddiciembre\fi}
+
+\def\es@today#1{%
+ \ifcase\es@datefmt
+ \the\day~de \es@month#1%
+ \else
+ \es@month#1~\the\day
+ \fi
+ \ de\ifnum\year>1999\es@yearl\fi~\the\year}
+
\def\datespanish{%
- \def\today{\the\day~de \ifcase\month\or enero\or febrero\or
- marzo\or abril\or mayo\or junio\or julio\or agosto\or
- septiembre\or octubre\or noviembre\or diciembre\fi
- \ de\ifnum\year>1999\es@yearl\fi~\the\year}}
+ \def\today{\es@today\@secondoftwo}%
+ \def\Today{\es@today\@firstoftwo}}
+\newcount\es@datefmt
+\def\spanishreverseddate{\es@datefmt\@ne}
\def\spanishdatedel{\def\es@yearl{l}}
\def\spanishdatede{\let\es@yearl\@empty}
\spanishdatede
\def\selectspanish{%
+ \def\selectspanish{%
\def\selectspanish{%
- \def\selectspanish{%
- \PackageWarning{spanish}{Extra \string\selectspanish ignored}}%
- \es@select}}
-
+ \PackageWarning{spanish}{Extra \string\selectspanish ignored}}%
+ \es@select}}
\@onlypreamble\selectspanish
-
\def\es@select{%
- \let\es@select\@undefined
- \selectlanguage{spanish}%
- \catcode`\"\active\catcode`\~=\active}
+ \let\es@select\@undefined
+ \selectlanguage{spanish}}
+
+\let\es@shlist\@empty
\def\extrasspanish{%
- \textspanish
- \mathspanish
- \ifx\shorthandsspanish\@empty
- \spanishdeactivate{."'~<>}%
- \languageshorthands{none}%
- \else
- \shorthandsspanish
- \fi}
+ \textspanish
+ \mathspanish
+ \ifx\shorthandsspanish\@empty
+ \expandafter\spanishdeactivate\expandafter{\es@shlist}%
+ \languageshorthands{none}%
+ \else
+ \shorthandsspanish
+ \fi}
\def\noextrasspanish{%
- \ifx\textspanish\@empty\else
- \notextspanish
- \fi
- \ifx\mathspanish\@empty\else
- \nomathspanish
- \fi
- \ifx\shorthandsspanish\@empty\else
- \noshorthandsspanish
- \fi
- \es@reviveshorthands}
-\addto\textspanish{%
- \babel@save\sptext
- \def\sptext{\protect\es@sptext}}
-\ifes@LaTeXe %<<<<<<
- \newcommand\es@sptext[1]{%
- {.\setbox\z@\hbox{8}\dimen@\ht\z@
- \csname S@\f@size\endcsname
- \edef\@tempa{\def\noexpand\@tempc{#1}%
- \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
- \ifx\@tempb\@tempc
- \fontsize\sf@size\z@
- \selectfont
- \advance\dimen@-1.15ex
- \else
- \fontsize\ssf@size\z@
- \selectfont
- \advance\dimen@-1.5ex
- \fi
- \math@fontsfalse\raise\dimen@\hbox{#1}}}
-\else %<<<<<<
- \let\sptextfont\rm
- \newcommand\es@sptext[1]{%
- {.\setbox\z@\hbox{8}\dimen@\ht\z@
- \edef\@tempa{\def\noexpand\@tempc{#1}%
- \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
- \ifx\@tempb\@tempc
- \advance\dimen@-0.75ex
- \raise\dimen@\hbox{$\scriptstyle\sptextfont#1$}%
- \else
- \advance\dimen@-0.8ex
- \raise\dimen@\hbox{$\scriptscriptstyle\sptextfont#1$}%
- \fi}}
-\fi %<<<<<<
-\ifes@LaTeXe %<<<<<<
- \addto\textspanish{%
- \babel@save\lsc
- \def\lsc{\protect\es@lsc}}
-
- \def\es@lsc#1{%
- \leavevmode
- \hbox{\scshape\selectfont
- \expandafter\ifx\csname\f@encoding/\f@family/\f@series
- /n/\f@size\expandafter\endcsname
- \csname\curr@fontshape/\f@size\endcsname
- \csname S@\f@size\endcsname
- \fontsize\sf@size\z@\selectfont
- \PackageInfo{spanish}{Replacing undefined sc font\MessageBreak
- shape by faked small caps}%
- \MakeUppercase{#1}%
- \else
- \MakeLowercase{#1}%
- \fi}}
-\fi %<<<<<<
+ \ifx\textspanish\@empty\else
+ \notextspanish
+ \fi
+ \ifx\mathspanish\@empty\else
+ \nomathspanish
+ \fi
+ \ifx\shorthandsspanish\@empty\else
+ \noshorthandsspanish
+ \fi
+ \csname es@restorelist\endcsname}
+
+\addto\textspanish{\es@sdef\sptext{\protect\es@sptext}}
+
+\def\es@orddot{.}
+\ifes@latex
+ \def\es@sptext#1{%
+ {\es@orddot
+ \setbox\z@\hbox{8}\dimen@\ht\z@
+ \csname S@\f@size\endcsname
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \fontsize\sf@size\z@
+ \selectfont
+ \advance\dimen@-1.15ex
+ \else
+ \fontsize\ssf@size\z@
+ \selectfont
+ \advance\dimen@-1.5ex
+ \fi
+ \math@fontsfalse\raise\dimen@\hbox{#1}}}
+\else
+ \let\sptextfont\rm
+ \def\es@sptext#1{%
+ {\es@orddot
+ \setbox\z@\hbox{8}\dimen@\ht\z@
+ \edef\@tempa{\def\noexpand\@tempc{#1}%
+ \lowercase{\def\noexpand\@tempb{#1}}}\@tempa
+ \ifx\@tempb\@tempc
+ \advance\dimen@-0.75ex
+ \raise\dimen@\hbox{$\scriptstyle\sptextfont#1$}%
+ \else
+ \advance\dimen@-0.8ex
+ \raise\dimen@\hbox{$\scriptscriptstyle\sptextfont#1$}%
+ \fi}}
+\fi
+\ifes@latex
+ \addto\textspanish{\es@sdef\lsc{\protect\es@lsc}}
+ \def\es@lsc{\es@xlsc\MakeUppercase\MakeLowercase}
+ \def\es@xlsc#1#2#3{%
+ \leavevmode
+ \hbox{%
+ \scshape\selectfont
+ \expandafter\ifx\csname\f@encoding/\f@family/\f@series
+ /n/\f@size\expandafter\endcsname
+ \csname\curr@fontshape/\f@size\endcsname
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size\z@\selectfont
+ \PackageWarning{spanish}{Replacing `\curr@fontshape' by
+ \MessageBreak faked small caps}%
+ #1{#3}%
+ \else
+ #2{#3}%
+ \fi}}
+\fi
\newif\ifes@listquot
-\ifes@plain\else %<<<<<<
- \csname newtoks\endcsname\es@quottoks
- \csname newcount\endcsname\es@quotdepth
-
- \newenvironment{quoting}
- {\leavevmode
- \advance\es@quotdepth1
- \csname lquot\romannumeral\es@quotdepth\endcsname%
- \ifnum\es@quotdepth=\@ne
- \es@listquotfalse
- \let\es@quotpar\everypar
- \let\everypar\es@quottoks
- \everypar\expandafter{\the\es@quotpar}%
- \es@quotpar{\the\everypar
- \ifes@listquot\global\es@listquotfalse\else\es@quotcont\fi}%
- \fi
- \toks@\expandafter{\es@quotcont}%
- \edef\es@quotcont{\the\toks@
- \expandafter\noexpand
- \csname rquot\romannumeral\es@quotdepth\endcsname}}
- {\csname rquot\romannumeral\es@quotdepth\endcsname}
-
- \def\lquoti{\guillemotleft{}}
- \def\rquoti{\guillemotright{}}
- \def\lquotii{``}
- \def\rquotii{''}
- \def\lquotiii{`}
- \def\rquotiii{'}
-
- \let\es@quotcont\@empty
- \addto\@marginparreset{\let\es@quotcont\@empty}
-
- \def\es@listquot{%
- \csname rquot\romannumeral\es@quotdepth\endcsname
- \global\es@listquottrue}
-\fi %<<<<<<
+\ifes@latex
+ \csname newtoks\endcsname\es@quottoks
+ \csname newcount\endcsname\es@quotdepth
+ \newenvironment{quoting}
+ {\leavevmode
+ \advance\es@quotdepth\@ne
+ \csname lquot\romannumeral\es@quotdepth\endcsname%
+ \ifnum\es@quotdepth=\@ne
+ \es@listquotfalse
+ \let\es@quotpar\everypar
+ \let\everypar\es@quottoks
+ \everypar\expandafter{\the\es@quotpar}%
+ \es@quotpar{\the\everypar
+ \ifes@listquot\global\es@listquotfalse\else\es@quotcont\fi}%
+ \fi
+ \toks@\expandafter{\es@quotcont}%
+ \edef\es@quotcont{\the\toks@
+ \expandafter\noexpand
+ \csname rquot\romannumeral\es@quotdepth\endcsname}}
+ {\csname rquot\romannumeral\es@quotdepth\endcsname}
+ \def\lquoti{\guillemotleft{}}
+ \def\rquoti{\guillemotright{}}
+ \def\lquotii{``}
+ \def\rquotii{''}
+ \def\lquotiii{`}
+ \def\rquotiii{'}
+ \let\es@quotcont\@empty
+ \addto\@marginparreset{\let\es@quotcont\@empty}
+ \DeclareRobustCommand\es@listquot{%
+ \csname rquot\romannumeral\es@quotdepth\endcsname
+ \global\es@listquottrue}
+\fi
\addto\textspanish{\bbl@frenchspacing}
\addto\notextspanish{\bbl@nonfrenchspacing}
-
\addto\textspanish{%
- \let\es@save@dot\.%
- \babel@save\.%
- \def\.{\@ifnextchar.{\es@dots}{\es@save@dot}}}
-
+ \let\es@save@dot\.%
+ \es@sdef\.{\@ifnextchar.{\es@dots}{\es@save@dot}}}
\def\es@dots..{\leavevmode\hbox{...}\spacefactor\@M}
+\def\es@sppercent{\unskip\textormath{$\m@th\,$}{\,}}
+\def\spanishplainpercent{\let\es@sppercent\@empty}
+\addto\textspanish{%
+ \let\percentsign\%%
+ \es@sdef\%{\es@sppercent\percentsign{}}}
+\addto\mathspanish{\es@sdef\dotlessi{\protect\es@dotlessi}}
+\let\nomathspanish\relax
+
+\ifes@latex
+ \def\es@texti{\i}
+ \addto\@uclclist{\dotlessi\es@texti}
+\fi
-\ifes@LaTeXe %<<<<<<
- \addto\textspanish{%
- \let\percentsign\%%
- \babel@save\%%
- \def\%{\unskip\,\percentsign{}}}
+\ifes@latex
+ \def\es@dotlessi{%
+ \ifmmode
+ {\ifnum\mathgroup=\m@ne
+ \imath
+ \else
+ \count@\escapechar \escapechar=\m@ne
+ \expandafter\expandafter\expandafter
+ \split@name\expandafter\string\the\textfont\mathgroup\@nil
+ \escapechar=\count@
+ \@ifundefined{\f@encoding\string\i}%
+ {\edef\f@encoding{\string?}}{}%
+ \expandafter\count@\the\csname\f@encoding\string\i\endcsname
+ \advance\count@"7000
+ \mathchar\count@
+ \fi}%
+ \else
+ \i
+ \fi}
\else
- \addto\textspanish{%
- \let\percentsign\%%
- \babel@save\%%
- \def\%{\unskip\ifmmode\,\else$\m@th\,$\fi\percentsign{}}}
+ \def\es@dotlessi{\textormath{\i}{\mathchar"7010}}
\fi
-\addto\mathspanish{%
- \babel@save\dotlessi
- \def\dotlessi{\protect\es@dotlessi}}
-
-\let\nomathspanish\relax %% Unused, but called
-
-\ifes@LaTeXe %<<<<<<
- \def\es@texti{\i}
- \addto\@uclclist{\dotlessi\es@texti}
-\fi %<<<<<<
-
-\ifes@LaTeXe %<<<<<<
- \def\es@dotlessi{%
- \ifmmode
- {\ifnum\mathgroup=\m@ne
- \imath
- \else
- \count@\escapechar \escapechar=\m@ne
- \expandafter\expandafter\expandafter
- \split@name\expandafter\string\the\textfont\mathgroup\@nil
- \escapechar=\count@
- \@ifundefined{\f@encoding\string\i}%
- {\edef\f@encoding{\string?}}{}%
- \expandafter\count@\the\csname\f@encoding\string\i\endcsname
- \advance\count@"7000
- \mathchar\count@
- \fi}%
- \else
- \i
- \fi}
-\else %<<<<<<
- \def\es@dotlessi{%
- \ifmmode
- \mathchar"7010
- \else
- \i
- \fi}
-\fi %<<<<<<
+
\def\accentedoperators{%
- \def\es@op@ac##1{\acute{##1}}%
- \def\es@op@i{\acute{\dotlessi}}}
+ \def\es@op@ac##1{\acute{\if i##1\dotlessi\else##1\fi}}}
\def\unaccentedoperators{%
- \def\es@op@ac##1{##1}%
- \def\es@op@i{i}}
+ \def\es@op@ac##1{##1}}
\accentedoperators
-
\def\spacedoperators{\let\es@op@sp\,}
\def\unspacedoperators{\let\es@op@sp\@empty}
\spacedoperators
\addto\mathspanish{\es@operators}
-\ifes@LaTeXe\else %<<<<<<
- \let\operator@font\rm
- \def\@empty{}
-\fi %<<<<<<
-
+\ifes@latex\else
+ \let\operator@font\rm
+\fi
\def\es@operators{%
- \babel@save\lim
- \def\lim{\mathop{\operator@font l\protect\es@op@i m}}%
- \babel@save\limsup
- \def\limsup{\mathop{\operator@font l\es@op@i m\,sup}}%
- \babel@save\liminf
- \def\liminf{\mathop{\operator@font l\es@op@i m\,inf}}%
- \babel@save\max
- \def\max{\mathop{\operator@font m\es@op@ac ax}}%
- \babel@save\inf
- \def\inf{\mathop{\operator@font \protect\es@op@i nf}}%
- \babel@save\min
- \def\min{\mathop{\operator@font m\protect\es@op@i n}}%
- \babel@save\bmod
- \def\bmod{%
- \nonscript\mskip-\medmuskip\mkern5mu%
- \mathbin{\operator@font m\es@op@ac od}\penalty900\mkern5mu%
- \nonscript\mskip-\medmuskip}%
- \babel@save\pmod
- \def\pmod##1{%
- \allowbreak\mkern18mu({\operator@font m\es@op@ac od}\,\,##1)}%
- \def\es@a##1 {%
- \es@delayed
- \if^##1^\then % is it empty? do nothing and continue
- \es@a
- \else
- \es@delayed
- \if&##1\then % is it &? do nothing and finish
- \else
- \begingroup
- \let\,\@empty % \, is ignored when def'ing the macro name
- \let\acute\@firstofone % same
- \edef\es@b{\expandafter\noexpand\csname##1\endcsname}%
- \def\,{\noexpand\es@op@sp}%
- \def\acute####1{%
- \if i####1%
- \noexpand\es@op@i
- \else
- \noexpand\es@op@ac####1%
- \fi}%
- \edef\es@a{\endgroup
- \noexpand\babel@save\expandafter\noexpand\es@b
- \def\expandafter\noexpand\es@b{%
- \mathop{\noexpand\operator@font##1}\nolimits}}%
- \es@a % It restores itself
- \es@a
- \fi
- \fi}%
- \let\es@b\spanishoperators
- \addto\es@b{ }%
- \expandafter\es@a\es@b sen tg arc\,sen arc\,cos arc\,tg & }
-
-\def\spanishoperators{cotg cosec senh tgh}
+ \es@sdef\bmod{\nonscript\mskip-\medmuskip\mkern5mu
+ \mathbin{\operator@font m\es@op@ac od}\penalty900\mkern5mu
+ \nonscript\mskip-\medmuskip}%
+ \@ifundefined{@amsmath@err}%
+ {\es@sdef\pmod##11{\allowbreak\mkern18mu
+ ({\operator@font m\es@op@ac od}\,\,##11)}}%
+ {\es@sdef\mod##1{\allowbreak\if@display\mkern18mu
+ \else\mkern12mu\fi{\operator@font m\es@op@ac od}\,\,##1}%
+ \es@sdef\pmod##1{\pod{{\operator@font m\es@op@ac od}%
+ \mkern6mu##1}}}%
+ \def\es@a##1 {%
+ \if^##1^% empty? continue
+ \bbl@afterelse
+ \es@a
+ \else
+ \bbl@afterfi
+ {\if&##1% &? finish
+ \else
+ \bbl@afterfi
+ \begingroup
+ \let\,\@empty % ignore when def'ing name
+ \let\acute\@firstofone % id
+ \edef\es@b{\expandafter\noexpand\csname##1\endcsname}%
+ \def\,{\noexpand\es@op@sp}%
+ \def\acute{\noexpand\es@op@ac}%
+ \edef\es@a{\endgroup
+ \noexpand\es@sdef\expandafter\noexpand\es@b{%
+ \mathop{\noexpand\operator@font##1}\nolimits}}%
+ \es@a % restores itself
+ \es@a
+ \fi}%
+ \fi}%
+ \let\es@b\spanishoperators
+ \addto\es@b{ }%
+ \expandafter\es@a\es@b l\acute{i}m l\acute{i}m\,sup
+ l\acute{i}m\,inf m\acute{a}x \acute{i}nf m\acute{i}n
+ sen tg arc\,sen arc\,cos arc\,tg & }
+\def\spanishoperators{cotg cosec senh tgh }
\DeclareTextCompositeCommand{\'}{OT1}{i}{\@tabacckludge'{\i}}
\def\es@set@shorthand#1{%
- \expandafter\edef\csname es@savecat\string#1\endcsname
- {\the\catcode`#1}%
- \initiate@active@char{#1}%
- \catcode`#1=\csname es@savecat\string#1\endcsname\relax
- \expandafter\let\csname es@math\string#1\expandafter\endcsname
- \csname normal@char\string#1\endcsname}
+ \expandafter\edef\csname es@savecat\string#1\endcsname
+ {\the\catcode`#1}%
+ \initiate@active@char{#1}%
+ \catcode`#1=\csname es@savecat\string#1\endcsname\relax
+ \if.#1\else
+ \addto\es@restorelist{\es@restore{#1}}%
+ \addto\es@select{\shorthandon{#1}}%
+ \addto\shorthandsspanish{\es@activate{#1}}%
+ \addto\es@shlist{#1}%
+ \fi}
\def\es@use@shorthand{%
- \es@delayed
- \ifx\thepage\relax\then
- \string
- \else{%
- \es@delayed
- \ifx\protect\@unexpandable@protect\then
- \noexpand
- \else
- \es@use@sh
- \fi}%
- \fi}
-
-\def\es@text@sh#1{\csname active@char\string#1\endcsname}
-\def\es@math@sh#1{\csname es@math\string#1\endcsname}
-
-\def\es@use@sh{%
- \es@delayed
- \if@safe@actives\then
- \string
- \else{%
- \es@delayed
- \ifmmode\then
- \es@math@sh
- \else
- \es@text@sh
- \fi}%
- \fi}
+ \ifx\thepage\relax
+ \bbl@afterelse
+ \string
+ \else
+ \bbl@afterfi
+ {\ifx\protect\@unexpandable@protect
+ \bbl@afterelse
+ \noexpand
+ \else
+ \bbl@afterfi
+ \es@use@sh
+ \fi}%
+ \fi}
+
+\def\es@use@sh#1{%
+ \if@safe@actives
+ \bbl@afterelse
+ \string#1%
+ \else%
+ \bbl@afterfi
+ \textormath
+ {\csname active@char\string#1\endcsname}%
+ {\csname normal@char\string#1\endcsname}%
+ \fi}
\gdef\es@activate#1{%
- \begingroup
- \lccode`\~=`#1
- \lowercase{%
- \endgroup
- \def~{\es@use@shorthand~}}}
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \def~{\es@use@shorthand~}}}
\def\spanishdeactivate#1{%
- \@tfor\@tempa:=#1\do{\expandafter\es@spdeactivate\@tempa}}
+ \@tfor\@tempa:=#1\do{\expandafter\es@spdeactivate\@tempa}}
\def\es@spdeactivate#1{%
- \if.#1%
- \mathcode`\.=\es@period@code
- \else
- \begingroup
- \lccode`\~=`#1
- \lowercase{%
- \endgroup
- \expandafter\let\expandafter~%
- \csname normal@char\string#1\endcsname}%
- \catcode`#1\csname es@savecat\string#1\endcsname\relax
- \fi}
-
-\def\es@reviveshorthands{%
- \es@restore{"}\es@restore{~}%
- \es@restore{<}\es@restore{>}%
- \es@quoting}
-
-\def\es@restore#1{%
- \catcode`#1=\active
+ \if.#1%
+ \mathcode`\.=\es@period@code
+ \else
\begingroup
- \lccode`\~=`#1
- \lowercase{%
+ \lccode`\~=`#1
+ \lowercase{%
\endgroup
- \bbl@deactivate{~}}}
-\begingroup
-\catcode`\'=12
-\lccode`~=`' \lccode`'=`'
-\lowercase{%
-\gdef\bbl@pr@m@s{%
- \es@delayed
- \ifx~\@let@token\then
- \pr@@@s
- \else
- {\es@delayed
- \ifx'\@let@token\then
- \pr@@@s
- \else
- {\es@delayed
- \ifx^\@let@token\then
- \pr@@@t
- \else
- \egroup
- \fi}%
- \fi}%
- \fi}}
-\endgroup
-\expandafter\ifx\csname @tabacckludge\endcsname\relax
- \let\es@tak\a
-\else
- \let\es@tak\@tabacckludge
+ \expandafter\let\expandafter~%
+ \csname normal@char\string#1\endcsname}%
+ \catcode`#1=\csname es@savecat\string#1\endcsname\relax
+ \fi}
+\def\es@restore#1{%
+ \shorthandon{#1}%
+ \begingroup
+ \lccode`\~=`#1
+ \lowercase{%
+ \endgroup
+ \bbl@deactivate{~}}}
+\def\es@declare#1{%
+ \@ifundefined{es@savecat\expandafter\string\@firstoftwo#1}%
+ {\@gobble}%
+ {\declare@shorthand{spanish}{#1}}}
+\def\es@declarealt#1#2#3{%
+ \es@declare{#1}{#3}%
+ \es@declare{#2}{#3}}
+
+\ifes@latex\else
+ \def\@tabacckludge#1{\csname\string#1\endcsname}
\fi
-\ifes@LaTeXe %<<<<<<
- \def\@tabacckludge#1{\expandafter\es@tak\string#1}
- \let\a\@tabacckludge
-\else\ifes@plain %<<<<<<
- \def\@tabacckludge#1{\csname\string#1\endcsname}
-\else %<<<<<<
- \def\@tabacckludge#1{\csname a\string#1\endcsname}
-\fi\fi %<<<<<<
-
-\expandafter\ifx\csname add@accent\endcsname\relax
- \def\add@accent#1#2{\accent#1 #2}
+\@ifundefined{add@accent}{\def\add@accent#1#2{\accent#1 #2}}{}
+\ifes@latex
+ \def\es@accent#1#2#3{%
+ \expandafter\@text@composite
+ \csname OT1\string#1\endcsname#3\@empty\@text@composite
+ {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \setbox\@tempboxa\hbox{#3%
+ \global\mathchardef\accent@spacefactor\spacefactor}%
+ \spacefactor\accent@spacefactor}}
+\else
+ \def\es@accent#1#2#3{%
+ \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
+ \spacefactor\sfcode`#3 }
\fi
-\ifes@LaTeXe %<<<<<<
- \def\es@accent#1#2#3{%
- \expandafter\@text@composite
- \csname OT1\string#1\endcsname#3\@empty\@text@composite
- {\bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
- \setbox\@tempboxa\hbox{#3%
- \global\mathchardef\accent@spacefactor\spacefactor}%
- \spacefactor\accent@spacefactor}}
-\else %<<<<<<
- \def\es@accent#1#2#3{%
- \bbl@allowhyphens\add@accent{#2}{#3}\bbl@allowhyphens
- \spacefactor\sfcode`#3 }
-\fi %<<<<<<
-\addto\shorthandsspanish{\languageshorthands{spanish}}
-\let\noshorthandsspanish\relax
-\def\spanishdecimal#1{\def\es@decimal{{#1}}}
-\def\decimalcomma{\spanishdecimal{,}}
-\def\decimalpoint{\spanishdecimal{.}}
-\decimalcomma
-\es@set@shorthand{.}
-
-\@namedef{es@math\string.}{%
- \@ifnextchar\egroup
- {\mathchar\es@period@code\relax}%
- {\es@text@sh.}}
+\addto\shorthandsspanish{\languageshorthands{spanish}}%
+\es@ifoption{noshorthands}{}{\es@set@shorthand{"}}
+\def\es@umlaut#1{%
+ \bbl@allowhyphens\add@accent{127}#1\bbl@allowhyphens
+ \spacefactor\sfcode`#1 }
-\declare@shorthand{system}{.}{\mathchar\es@period@code\relax}
\addto\shorthandsspanish{%
- \mathchardef\es@period@code\the\mathcode`\.%
- \babel@savevariable{\mathcode`\.}%
- \mathcode`\.="8000 %
- \es@activate{.}}
-
-\AtBeginDocument{%
- \catcode`\.=12
- \if@filesw
- \immediate\write\@mainaux{%
- \string\catcode`\string\.=12}%
- \fi}
+ \babel@save\bbl@umlauta
+ \let\bbl@umlauta\es@umlaut}
+\let\noshorthandsspanish\relax
-\declare@shorthand{spanish}{.1}{\es@decimal1}
-\declare@shorthand{spanish}{.2}{\es@decimal2}
-\declare@shorthand{spanish}{.3}{\es@decimal3}
-\declare@shorthand{spanish}{.4}{\es@decimal4}
-\declare@shorthand{spanish}{.5}{\es@decimal5}
-\declare@shorthand{spanish}{.6}{\es@decimal6}
-\declare@shorthand{spanish}{.7}{\es@decimal7}
-\declare@shorthand{spanish}{.8}{\es@decimal8}
-\declare@shorthand{spanish}{.9}{\es@decimal9}
-\declare@shorthand{spanish}{.0}{\es@decimal0}
-\es@set@shorthand{"}
-\def\es@umlaut#1{%
- \bbl@allowhyphens\add@accent{127}#1\bbl@allowhyphens
- \spacefactor\sfcode`#1 }
-\ifes@LaTeXe %<<<<<<
- \addto\shorthandsspanish{%
- \es@activate{"}%
- \es@activate{~}%
- \babel@save\bbl@umlauta
- \let\bbl@umlauta\es@umlaut
- \expandafter\babel@save\csname OT1\string\~\endcsname
- \expandafter\def\csname OT1\string\~\endcsname{\es@accent\~{126}}%
- \expandafter\babel@save\csname OT1\string\'\endcsname
- \expandafter\def\csname OT1\string\'\endcsname{\es@accent\'{19}}}
-\else %<<<<<<
- \addto\shorthandsspanish{%
- \es@activate{"}%
- \es@activate{~}%
- \babel@save\bbl@umlauta
- \let\bbl@umlauta\es@umlaut
- \babel@save\~%
- \def\~{\es@accent\~{126}}%
- \babel@save\'%
- \def\'#1{\if#1i\es@accent\'{19}\i\else\es@accent\'{19}{#1}\fi}}
-\fi %<<<<<<
-\declare@shorthand{spanish}{"a}{\protect\es@sptext{a}}
-\declare@shorthand{spanish}{"A}{\protect\es@sptext{A}}
-\declare@shorthand{spanish}{"o}{\protect\es@sptext{o}}
-\declare@shorthand{spanish}{"O}{\protect\es@sptext{O}}
-\declare@shorthand{spanish}{"e}{\protect\es@sptext@r{e}}
-\declare@shorthand{spanish}{"E}{\protect\es@sptext@r{E}}
+\ifes@latex
+\addto\shorthandsspanish{%
+ \expandafter\es@sdef\csname OT1\string\~\endcsname{\es@accent\~{126}}%
+ \expandafter\es@sdef\csname OT1\string\'\endcsname{\es@accent\'{19}}}
+\else
+\addto\shorthandsspanish{%
+ \es@sdef\~{\es@accent\~{126}}%
+ \es@sdef\'#1{\if#1i\es@accent\'{19}\i\else\es@accent\'{19}{#1}\fi}}
+\fi
\def\es@sptext@r#1#2{\es@sptext{#1#2}}
+\es@declare{"a}{\sptext{a}}
+\es@declare{"A}{\sptext{A}}
+\es@declare{"o}{\sptext{o}}
+\es@declare{"O}{\sptext{O}}
+\es@declare{"e}{\protect\es@sptext@r{e}}
+\es@declare{"E}{\protect\es@sptext@r{E}}
+\es@declare{"u}{\"u}
+\es@declare{"U}{\"U}
+\es@declare{"i}{\"{\i}}
+\es@declare{"I}{\"I}
+\es@declare{"c}{\c{c}}
+\es@declare{"C}{\c{C}}
+\es@declare{"<}{\guillemotleft{}}
+\es@declare{">}{\guillemotright{}}
+\def\es@chf{\char\hyphenchar\font}
+\es@declare{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
+\es@declare{"=}{\bbl@allowhyphens\es@chf\hskip\z@skip}
+\es@declare{"~}
+ {\bbl@allowhyphens
+ \discretionary{\es@chf}{\es@chf}{\es@chf}%
+ \bbl@allowhyphens}
+\es@declare{"r}
+ {\bbl@allowhyphens
+ \discretionary{\es@chf}{}{r}%
+ \bbl@allowhyphens}
+\es@declare{"R}
+ {\bbl@allowhyphens
+ \discretionary{\es@chf}{}{R}%
+ \bbl@allowhyphens}
+\es@declare{"y}
+ {\@ifundefined{scalebox}%
+ {\ensuremath{\tau}}%
+ {\raisebox{1ex}{\scalebox{-1}{\resizebox{.45em}{1ex}{2}}}}}
+\es@declare{""}{\hskip\z@skip}
+\es@declare{"/}
+ {\setbox\z@\hbox{/}%
+ \dimen@\ht\z@
+ \advance\dimen@-1ex
+ \advance\dimen@\dp\z@
+ \dimen@.31\dimen@
+ \advance\dimen@-\dp\z@
+ \ifdim\dimen@>0pt
+ \kern.01em\lower\dimen@\box\z@\kern.03em
+ \else
+ \box\z@
+ \fi}
+\es@declare{"?}
+ {\setbox\z@\hbox{?`}%
+ \leavevmode\raise\dp\z@\box\z@}
+\es@declare{"!}
+ {\setbox\z@\hbox{!`}%
+ \leavevmode\raise\dp\z@\box\z@}
-\declare@shorthand{spanish}{"u}{\"u}
-\declare@shorthand{spanish}{"U}{\"U}
-
-\declare@shorthand{spanish}{"c}{\c{c}}
-\declare@shorthand{spanish}{"C}{\c{C}}
-
-\declare@shorthand{spanish}{"<}{\guillemotleft{}}
-\declare@shorthand{spanish}{">}{\guillemotright{}}
-\declare@shorthand{spanish}{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
-\declare@shorthand{spanish}{"=}%
- {\bbl@allowhyphens\char\hyphenchar\font\hskip\z@skip}
-\declare@shorthand{spanish}{"~}
- {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
- {\char\hyphenchar\font}{\char\hyphenchar\font}\bbl@allowhyphens}
-\declare@shorthand{spanish}{"r}
- {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
- {}{r}\bbl@allowhyphens}
-\declare@shorthand{spanish}{"R}
- {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
- {}{R}\bbl@allowhyphens}
-\declare@shorthand{spanish}{"y}
- {\@ifundefined{scalebox}%
- {\ensuremath{\tau}}%
- {\raisebox{1ex}{\scalebox{-1}{\resizebox{.45em}{1ex}{2}}}}}
-\declare@shorthand{spanish}{""}{\hskip\z@skip}
-\declare@shorthand{spanish}{"/}
- {\setbox\z@\hbox{/}%
- \dimen@\ht\z@
- \advance\dimen@-1ex
- \advance\dimen@\dp\z@
- \dimen@.31\dimen@
- \advance\dimen@-\dp\z@
- \ifdim\dimen@>0pt
- \kern.01em\lower\dimen@\box\z@\kern.03em
- \else
- \box\z@
- \fi}
-\declare@shorthand{spanish}{"?}
- {\setbox\z@\hbox{?`}%
- \leavevmode\raise\dp\z@\box\z@}
-\declare@shorthand{spanish}{"!}
- {\setbox\z@\hbox{!`}%
- \leavevmode\raise\dp\z@\box\z@}
-
-\es@set@shorthand{~}
-\declare@shorthand{spanish}{~n}{\~n}
-\declare@shorthand{spanish}{~N}{\~N}
-\declare@shorthand{spanish}{~-}{%
- \leavevmode
- \bgroup
- \let\@sptoken\es@dashes % This assignation changes the
- \@ifnextchar-% \@ifnextchar behaviour
- {\es@dashes}%
- {\hbox{\char\hyphenchar\font}\egroup}}
-\def\es@dashes-{%
- \@ifnextchar-%
- {\bbl@allowhyphens\hbox{---}\bbl@allowhyphens\egroup\@gobble}%
- {\bbl@allowhyphens\hbox{--}\bbl@allowhyphens\egroup}}
-
-\def\deactivatetilden{%
- \expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
- \expandafter\let\csname spanish@sh@\string~@N@\endcsname\relax}
-\expandafter\ifx\csname XML@catcodes\endcsname\relax
- \addto\es@select{%
- \catcode`\<\active\catcode`\>=\active
- \es@quoting}
-
- \es@set@shorthand{<}
- \es@set@shorthand{>}
-
- \declare@shorthand{system}{<}{\csname normal@char\string<\endcsname}
- \declare@shorthand{system}{>}{\csname normal@char\string>\endcsname}
-
+\def\spanishdecimal#1{\def\es@decimal{{#1}}}
+\def\decimalcomma{\spanishdecimal{,}}
+\def\decimalpoint{\spanishdecimal{.}}
+\decimalcomma
+\es@ifoption{nodecimaldot}{}
+ {\AtBeginDocument{\bgroup\@fileswfalse}%
+ \es@set@shorthand{.}%
+ \AtBeginDocument{\egroup}%
+ \@namedef{normal@char\string.}{%
+ \@ifnextchar\egroup
+ {\mathchar\es@period@code\relax}%
+ {\csname active@char\string.\endcsname}}%
+ \declare@shorthand{system}{.}{\mathchar\es@period@code\relax}%
\addto\shorthandsspanish{%
- \es@activate{<}%
- \es@activate{>}}
- \ifes@LaTeXe %<<<<<<
- \AtBeginDocument{%
- \es@quoting
- \if@filesw
- \immediate\write\@mainaux{\string\es@quoting}%
- \fi}%
- \fi %<<<<<<
-
+ \mathchardef\es@period@code\the\mathcode`\.%
+ \babel@savevariable{\mathcode`\.}%
+ \mathcode`\.="8000 %
+ \es@activate{.}}%
+ \def\es@a#1{\es@declare{.#1}{\es@decimal#1}}%
+ \es@a1\es@a2\es@a3\es@a4\es@a5\es@a6\es@a7\es@a8\es@a9\es@a0}
+
+\es@ifoption{notilde}{}{\es@set@shorthand{~}}
+\def\deactivatetilden{%
+ \expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
+ \expandafter\let\csname spanish@sh@\string~@N@\endcsname\relax}
+\es@ifoption{tilden}
+ {\es@declare{~n}{\~n}%
+ \es@declare{~N}{\~N}}
+ {\let\deactivatetilden\relax}
+\es@declarealt{~-}{"+}{%
+ \leavevmode
+ \bgroup
+ \let\@sptoken\es@dashes % Changes \@ifnextchar behaviour
+ \@ifnextchar-%
+ {\es@dashes}%
+ {\hbox{\es@chf}\egroup}}
+\def\es@dashes-{%
+ \@ifnextchar-%
+ {\bbl@allowhyphens\hbox{---}\bbl@allowhyphens\egroup\@gobble}%
+ {\bbl@allowhyphens\hbox{--}\bbl@allowhyphens\egroup}}
+
+\es@ifoption{noquoting}%
+ {\let\es@quoting\relax
+ \let\activatequoting\relax
+ \let\deactivatequoting\relax}
+ {\@ifundefined{XML@catcodes}%
+ {\es@set@shorthand{<}%
+ \es@set@shorthand{>}%
+ \declare@shorthand{system}{<}{\csname normal@char\string<\endcsname}%
+ \declare@shorthand{system}{>}{\csname normal@char\string>\endcsname}%
+ \addto\es@restorelist{\es@quoting}%
+ \addto\es@select{\es@quoting}%
+ \ifes@latex
+ \AtBeginDocument{%
+ \es@quoting
+ \if@filesw
+ \immediate\write\@mainaux{\string\@nameuse{es@quoting}}%
+ \fi}%
+ \fi
\def\activatequoting{%
- \catcode`>=\active \catcode`<=\active
- \let\es@quoting\activatequoting}
+ \shorthandon{<>}%
+ \let\es@quoting\activatequoting}%
\def\deactivatequoting{%
- \catcode`>=12 \catcode`<=12
- \let\es@quoting\deactivatequoting}
+ \shorthandoff{<>}%
+ \let\es@quoting\deactivatequoting}}{}}
- \declare@shorthand{spanish}{<<}{\begin{quoting}}
- \declare@shorthand{spanish}{>>}{\end{quoting}}
-\fi
+\es@declarealt{<<}{"`}{\begin{quoting}}
+\es@declarealt{>>}{"'}{\end{quoting}}
+\begingroup
+\catcode`\'=12
+\gdef\es@activeacute{%
+ \es@set@shorthand{'}%
+ \def\es@a##1{\es@declare{'##1}{\@tabacckludge'##1}}%
+ \es@a a\es@a e\es@a i\es@a o\es@a u%
+ \es@a A\es@a E\es@a I\es@a O\es@a U%
+ \es@declare{'n}{\~n}%
+ \es@declare{'N}{\~N}%
+ \let\es@pr@m@s\bbl@pr@m@s
+ \def\bbl@pr@m@s{%
+ \ifx'\@let@token
+ \bbl@afterelse
+ \pr@@@s
+ \else
+ \bbl@afterfi
+ \es@pr@m@s
+ \fi}%
+ \let\es@activeacute\relax}
+\endgroup
-\let\es@quoting\relax
-\let\deactivatequoting\relax
-\let\activatequoting\relax
-\def\es@activeacute{%
- \es@set@shorthand{'}%
- \addto\shorthandsspanish{\es@activate{'}}%
- \addto\es@reviveshorthands{\es@restore{'}}%
- \addto\es@select{\catcode`'=\active}%
- \declare@shorthand{spanish}{'a}{\@tabacckludge'a}%
- \declare@shorthand{spanish}{'A}{\@tabacckludge'A}%
- \declare@shorthand{spanish}{'e}{\@tabacckludge'e}%
- \declare@shorthand{spanish}{'E}{\@tabacckludge'E}%
- \declare@shorthand{spanish}{'i}{\@tabacckludge'i}%
- \declare@shorthand{spanish}{'I}{\@tabacckludge'I}%
- \declare@shorthand{spanish}{'o}{\@tabacckludge'o}%
- \declare@shorthand{spanish}{'O}{\@tabacckludge'O}%
- \declare@shorthand{spanish}{'u}{\@tabacckludge'u}%
- \declare@shorthand{spanish}{'U}{\@tabacckludge'U}%
- \declare@shorthand{spanish}{'n}{\~n}%
- \declare@shorthand{spanish}{'N}{\~N}%
- \declare@shorthand{spanish}{''}{\textquotedblright}%
- \let\es@activeacute\relax}
-
-\ifes@LaTeXe %<<<<<<
- \@ifpackagewith{babel}{activeacute}{\es@activeacute}{}
-\else %<<<<<<
- \es@activeacute
-\fi %<<<<<<%
-\def\es@enumerate#1#2#3#4{%
- \def\es@enum{{#1}{#2}{#3}{#4}}}
-
-\def\es@itemize#1#2#3#4{%
- \def\es@item{{#1}{#2}{#3}{#4}}}
-\ifes@LaTeXe %<<<<<<
+\ifes@latex
+ \@ifpackagewith{babel}{activeacute}{\es@activeacute}{}
+\else
+ \es@activeacute
+\fi
+\def\es@enumerate#1#2#3#4{\def\es@enum{{#1}{#2}{#3}{#4}}}
+\def\es@itemize#1#2#3#4{\def\es@item{{#1}{#2}{#3}{#4}}}
+\ifes@latex
\es@enumerate{1.}{a)}{1)}{a$'$}
\def\spanishdashitems{\es@itemize{---}{---}{---}{---}}
\def\spanishsymbitems{%
- \es@itemize
- {\leavevmode\hbox to 1.2ex
- {\hss\vrule height .9ex width .7ex depth -.2ex\hss}}%
- {\textbullet}%
- {$\m@th\circ$}%
- {$\m@th\diamond$}}
+ \es@itemize
+ {\leavevmode\hbox to 1.2ex
+ {\hss\vrule height .9ex width .7ex depth -.2ex\hss}}%
+ {\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}}
\def\spanishsignitems{%
- \es@itemize
- {\textbullet}%
- {$\m@th\circ$}%
- {$\m@th\diamond$}%
- {$\m@th\triangleright$}}
+ \es@itemize{\textbullet}%
+ {$\m@th\circ$}%
+ {$\m@th\diamond$}%
+ {$\m@th\triangleright$}}
\spanishsymbitems
-
\def\es@enumdef#1#2#3\@@{%
- \if#21%
- \@namedef{theenum#1}{\arabic{enum#1}}%
- \else\if#2a%
- \@namedef{theenum#1}{\emph{\alph{enum#1}}}%
- \else\if#2A%
- \@namedef{theenum#1}{\Alph{enum#1}}%
- \else\if#2i%
- \@namedef{theenum#1}{\roman{enum#1}}%
- \else\if#2I%
- \@namedef{theenum#1}{\Roman{enum#1}}%
- \else\if#2o%
- \@namedef{theenum#1}{\arabic{enum#1}\protect\es@sptext{o}}%
- \fi\fi\fi\fi\fi\fi
- \toks@\expandafter{\csname theenum#1\endcsname}
- \expandafter\edef\csname labelenum#1\endcsname
- {\noexpand\es@listquot\the\toks@#3}}
-
-\addto\layoutspanish{%
- \def\es@enumerate##1##2##3##4{%
- \es@enumdef{i}##1\@empty\@empty\@@
- \es@enumdef{ii}##2\@empty\@empty\@@
- \es@enumdef{iii}##3\@empty\@empty\@@
- \es@enumdef{iv}##4\@empty\@empty\@@}%
- \def\es@itemize##1##2##3##4{%
- \def\labelitemi{\es@listquot##1}%
- \def\labelitemii{\es@listquot##2}%
- \def\labelitemiii{\es@listquot##3}%
- \def\labelitemiv{\es@listquot##4}}%
- \def\p@enumii{\theenumi}%
- \def\p@enumiii{\theenumi\theenumii}%
- \def\p@enumiv{\p@enumiii\theenumiii}%
- \expandafter\es@enumerate\es@enum
- \expandafter\es@itemize\es@item
- \DeclareTextCommand{\guillemotleft}{OT1}{%
- \ifmmode\ll
- \else
- \save@sf@q{\penalty\@M
- \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
- \char40 \kern-0.19em\char40 }}%
- \fi}%
- \DeclareTextCommand{\guillemotright}{OT1}{%
- \ifmmode\gg
- \else
- \save@sf@q{\penalty\@M
- \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
- \char41 \kern-0.19em\char41 }}%
- \fi}%
- \def\@fnsymbol##1%
- {\ifcase##1\or*\or**\or***\or****\or
- *****\or******\else\@ctrerr\fi}%
- \def\@alph##1%
- {\ifcase##1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or
- k\or l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
- w\or x\or y\or z\else\@ctrerr\fi}%
- \def\@Alph##1%
- {\ifcase##1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or
- K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
- W\or X\or Y\or Z\else\@ctrerr\fi}%
- \let\@afterindentfalse\@afterindenttrue
- \@afterindenttrue
- \def\@seccntformat##1{\csname the##1\endcsname.\quad}%
- \def\numberline##1{\hb@xt@\@tempdima{##1\if&##1&\else.\fi\hfil}}%
- \def\@roman##1{\protect\es@roman{\number##1}}%
- \def\es@roman##1{\protect\es@lsc{\romannumeral##1}}%
- \def\esromanindex##1##2{##1{\protect\es@lsc{##2}}}}
+ \if#21%
+ \@namedef{theenum#1}{\arabic{enum#1}}%
+ \else\if#2a%
+ \@namedef{theenum#1}{\emph{\alph{enum#1}}}%
+ \else\if#2A%
+ \@namedef{theenum#1}{\Alph{enum#1}}%
+ \else\if#2i%
+ \@namedef{theenum#1}{\roman{enum#1}}%
+ \else\if#2I%
+ \@namedef{theenum#1}{\Roman{enum#1}}%
+ \else\if#2o%
+ \@namedef{theenum#1}{\arabic{enum#1}\sptext{o}}%
+ \fi\fi\fi\fi\fi\fi
+ \toks@\expandafter{\csname theenum#1\endcsname}%
+ \expandafter\edef\csname labelenum#1\endcsname
+ {\noexpand\es@listquot\the\toks@#3}}
+\def\es@guillemot#1#2{%
+ \ifmmode#1%
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char#2 \kern-0.19em\char#2 }}%
+ \fi}
+\def\layoutspanish{%
+ \let\layoutspanish\@empty
+ \DeclareTextCommand{\guillemotleft}{OT1}{\es@guillemot\ll{40}}%
+ \DeclareTextCommand{\guillemotright}{OT1}{\es@guillemot\gg{41}}%
+ \def\@fnsymbol##1%
+ {\ifcase##1\or*\or**\or***\or****\or
+ *****\or******\else\@ctrerr\fi}%
+ \def\@alph##1%
+ {\ifcase##1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or
+ k\or l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
+ w\or x\or y\or z\else\@ctrerr\fi}%
+ \def\@Alph##1%
+ {\ifcase##1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or
+ K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
+ W\or X\or Y\or Z\else\@ctrerr\fi}}
+
+\es@optlayout{nolists}{%
+ \def\es@enumerate#1#2#3#4{%
+ \es@enumdef{i}#1\@empty\@empty\@@
+ \es@enumdef{ii}#2\@empty\@empty\@@
+ \es@enumdef{iii}#3\@empty\@empty\@@
+ \es@enumdef{iv}#4\@empty\@empty\@@}%
+ \def\es@itemize#1#2#3#4{%
+ \def\labelitemi{\es@listquot#1}%
+ \def\labelitemii{\es@listquot#2}%
+ \def\labelitemiii{\es@listquot#3}%
+ \def\labelitemiv{\es@listquot#4}}%
+ \def\p@enumii{\theenumi}%
+ \def\p@enumiii{\p@enumii\theenumii}%
+ \def\p@enumiv{\p@enumiii\theenumiii}%
+ \expandafter\es@enumerate\es@enum
+ \expandafter\es@itemize\es@item}
+\let\esromanindex\@secondoftwo
+\es@ifoption{ucroman}
+ {\def\es@romandef{%
+ \def\esromanindex##1##2{##1{\uppercase{##2}}}%
+ \def\@roman{\@Roman}}}
+ {\def\es@romandef{%
+ \def\esromanindex##1##2{##1{\protect\es@roman{##2}}}%
+ \def\@roman##1{\protect\es@roman{\romannumeral##1}}%
+ \def\es@roman{\es@xlsc\uppercase\@firstofone}}}
+\es@optlayout{lcroman}{\es@romandef}
+\newcommand\spanishlcroman{\def\@roman##1{\romannumeral##1}}
+\newcommand\spanishucroman{\def\@roman{\@Roman}}
+\newcommand\spanishscroman{\def\@roman##1{\es@roman{\romannumeral##1}}}
+\es@optlayout{noindentfirst}{%
+ \let\@afterindentfalse\@afterindenttrue
+ \@afterindenttrue}
+\es@optlayout{nosectiondot}{%
+ \def\@seccntformat#1{\csname the#1\endcsname.\quad}%
+ \def\numberline#1{\hb@xt@\@tempdima{#1\if&#1&\else.\fi\hfil}}}
+\es@ifoption{nolayout}{\let\layoutspanish\relax}{}
+\es@ifoption{sloppy}{\let\textspanish\relax\let\mathspanish\relax}{}
+\es@ifoption{delayed}{}{\def\es@layoutspanish{\layoutspanish}}
+\es@ifoption{preindex}{\AtEndOfPackage{\RequirePackage{romanidx}}}{}
\AtEndOfPackage{%
- \let\es@activeacute\@undefined
- \def\bbl@tempa{spanish}%
- \ifx\bbl@main@language\bbl@tempa
- \AtBeginDocument{\layoutspanish}%
- \addto\es@select{%
- \@ifstar{\let\layoutspanish\relax}%
- {\layoutspanish\let\layoutspanish\relax}}%
- \fi
- \selectspanish}
-
-\fi %<<<<<<
+\let\es@activeacute\@undefined
+\def\bbl@tempa{spanish}%
+\ifx\bbl@main@language\bbl@tempa
+ \@nameuse{es@layoutspanish}%
+ \addto\es@select{%
+ \@ifstar{\PackageError{spanish}%
+ {Old syntax--use es-nolayout}%
+ {If you don't want changes in layout\MessageBreak
+ use the es-nolayout package option}}%
+ {}}%
+ \AtBeginDocument{\layoutspanish}%
+\fi
+\selectspanish}
+\fi
\es@savedcatcodes
-
\providehyphenmins{\CurrentOption}{\tw@\tw@}
-
-\ifes@LaTeXe %<<<<<<
- \ldf@finish{spanish}
-\else %<<<<<<
- \es@select
- \ldf@finish{spanish}
- \csname activatequoting\endcsname
-\fi %<<<<<<
-
-%%
-%% \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
-%% Lower-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
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
+\ifes@latex\else
+ \es@select
+\fi
+\ldf@finish{spanish}
+\csname activatequoting\endcsname
\endinput
%%
%% End of file `spanish.ldf'.
diff --git a/Master/texmf-dist/tex/generic/babel/spanish.sty b/Master/texmf-dist/tex/generic/babel/spanish.sty
index 106458d6be7..c1b609b54aa 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/swedish.sty b/Master/texmf-dist/tex/generic/babel/swedish.sty
index 79f16a652cb..6b20c534e1b 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 5f62760c8d6..99eb2966d0d 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -38,13 +38,13 @@
%% extension .ins) which are part of the distribution.
%%
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2005/11/23 v3.8h The Babel package]
+%%\ProvidesFile{babel.dtx}[2008/03/16 v3.8j The Babel package]
%% Babel package for LaTeX2e.
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\ifx\ProvidesFile\@undefined
\def\ProvidesFile#1[#2 #3 #4]{%
\wlog{File: #1 #4 #3 <#2>}%
@@ -66,7 +66,7 @@
\endgroup}
\fi
\ProvidesFile{switch.def}
- [2005/11/23 v3.8h %
+ [2008/03/16 v3.8j %
Babel language switching mechanism]
\ifx\AtBeginDocument\@undefined
\def\adddialect{}
@@ -216,6 +216,12 @@
\else
\language=\csname l@#1\endcsname\relax
\languageshorthands{none}%
+ \expandafter\ifx\csname #1hyphenmins\endcsname\relax
+ \set@hyphenmins\tw@\thr@@\relax
+ \else
+ \expandafter\expandafter\expandafter\set@hyphenmins
+ \csname #1hyphenmins\endcsname\relax
+ \fi
\fi
}
\def\endhyphenrules{}
diff --git a/Master/texmf-dist/tex/generic/babel/turkish.sty b/Master/texmf-dist/tex/generic/babel/turkish.sty
index eb37133889a..51de47caea4 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/ukraineb.ldf b/Master/texmf-dist/tex/generic/babel/ukraineb.ldf
index e855abe78af..cbd1d6d5fff 100644
--- a/Master/texmf-dist/tex/generic/babel/ukraineb.ldf
+++ b/Master/texmf-dist/tex/generic/babel/ukraineb.ldf
@@ -7,7 +7,7 @@
%% ukraineb.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,20 +37,20 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{ukraineb}
- [2007/10/20 v1.1l Ukrainian support from the babel system]
+ [2008/03/21 v1.1l Ukrainian support from the babel system]
%% File `ukraineb.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% ukraineb Language Definition File
-%% Copyright (C) 1997 - 2007
+%% Copyright (C) 1997 - 2008
%% by Andrij Shvaika ashv at icmp.lviv.ua
%% derived from the Russianb Language Definition File
-%% Copyright (C) 1995 - 2007
+%% Copyright (C) 1995 - 2008
%% by Olga Lapko cyrtug at mir.msk.su
%% Johannes Braams, TeXniek
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams.xs4all.nl
\LdfInit{ukrainian}{captionsukrainian}
\ifx\l@ukrainian\@undefined
\@nopatterns{Ukrainian}
diff --git a/Master/texmf-dist/tex/generic/babel/ukraineb.sty b/Master/texmf-dist/tex/generic/babel/ukraineb.sty
index e5d1bc64c8b..1a4ff994e93 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/usorbian.ldf b/Master/texmf-dist/tex/generic/babel/usorbian.ldf
index f9e6638ffa2..d1a5de345a6 100644
--- a/Master/texmf-dist/tex/generic/babel/usorbian.ldf
+++ b/Master/texmf-dist/tex/generic/babel/usorbian.ldf
@@ -7,7 +7,7 @@
%% usorbian.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,10 +37,10 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{usorbian}
- [2007/10/19 v1.0j Upper Sorbian support from the babel system]
+ [2008/03/17 v1.0k Upper Sorbian support from the babel system]
%% File `usorbian.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2008
%% by Johannes Braams, TeXniek
%% Upper Sorbian Language Definition File
%% Copyright (C) 1994 - 2004
@@ -102,9 +102,12 @@
\bbl@activate{"}}
\expandafter\addto\csname extras\CurrentOption\endcsname{%
\bbl@deactivate{"}}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
- \babel@savevariable{\lccode`\^^Y}%
- \lccode`\^^Y`\^^Y}
+\begingroup \catcode`\^7
+\def\x{\endgroup
+ \expandafter\addto\csname extras\CurrentOption\endcsname{%
+ \babel@savevariable{\lccode`\^^Y}%
+ \lccode`\^^Y`\^^Y}}
+\x
\expandafter\addto\csname extras\CurrentOption\endcsname{%
\babel@save\"\umlautlow}
\expandafter\addto\csname noextras\CurrentOption\endcsname{%
diff --git a/Master/texmf-dist/tex/generic/babel/usorbian.sty b/Master/texmf-dist/tex/generic/babel/usorbian.sty
index bd08da6346d..0e4927573e7 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@
diff --git a/Master/texmf-dist/tex/generic/babel/welsh.sty b/Master/texmf-dist/tex/generic/babel/welsh.sty
index 2f244b0896e..21e55d35949 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 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
%% This file was generated from file(s) of the Babel system.
@@ -37,11 +37,11 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'bbcompat.dtx'
-%% Copyright (C) 1989 -- 2005 by Johannes Braams,
+%% Copyright (C) 1989 -- 2008 by Johannes Braams,
%% TeXniek
%% all rights reserved.
%% Please report errors to: J.L. Braams
-%% babel at braams.cistron.nl
+%% babel at braams dot xs4all dot nl
\ifx\LdfInit\undefined
\def\LdfInit{%
\chardef\atcatcode=\catcode`\@