diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/babel')
78 files changed, 2766 insertions, 1919 deletions
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&\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`\@ |