summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-29 21:28:45 +0000
committerKarl Berry <karl@freefriends.org>2017-06-29 21:28:45 +0000
commit8028a8bcca0edecaaae03156b082bf56e070c7db (patch)
treeb5fd90cb88e2208b33729ff712d9bdbce058d1ee /Master/texmf-dist
parent687aad96931a20c6c6f1cf9596b71a8a3e8d5e5d (diff)
babel (29jun17)
git-svn-id: svn://tug.org/texlive/trunk@44722 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/babel/README7
-rw-r--r--Master/texmf-dist/doc/latex/babel/babel.pdfbin419255 -> 403537 bytes
-rw-r--r--Master/texmf-dist/source/latex/babel/babel.dtx11
-rw-r--r--Master/texmf-dist/source/latex/babel/bbcompat.dtx2
-rw-r--r--Master/texmf-dist/source/latex/babel/bbunicode.dtx566
-rw-r--r--Master/texmf-dist/source/latex/babel/locale.zipbin683240 -> 682747 bytes
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.def4
-rw-r--r--Master/texmf-dist/tex/generic/babel/babel.sty4
-rw-r--r--Master/texmf-dist/tex/generic/babel/blplain.tex2
-rw-r--r--Master/texmf-dist/tex/generic/babel/bplain.tex2
-rw-r--r--Master/texmf-dist/tex/generic/babel/hyphen.cfg6
-rw-r--r--Master/texmf-dist/tex/generic/babel/locale/gsw/babel-swissgerman.tex12
-rw-r--r--Master/texmf-dist/tex/generic/babel/luababel.def2
-rw-r--r--Master/texmf-dist/tex/generic/babel/nil.ldf4
-rw-r--r--Master/texmf-dist/tex/generic/babel/plain.def2
-rw-r--r--Master/texmf-dist/tex/generic/babel/switch.def8
-rw-r--r--Master/texmf-dist/tex/generic/babel/xebabel.def2
17 files changed, 29 insertions, 605 deletions
diff --git a/Master/texmf-dist/doc/latex/babel/README b/Master/texmf-dist/doc/latex/babel/README
index 267c44624fc..9cc12753dac 100644
--- a/Master/texmf-dist/doc/latex/babel/README
+++ b/Master/texmf-dist/doc/latex/babel/README
@@ -1,4 +1,4 @@
-Babel 3.11
+Babel 3.12
----------
This package manages culturally-determined typographical (and other)
@@ -53,6 +53,9 @@ respective authors.
Recent changes
--------------
+[3.12 - No real changes in the babel core. Just a few technical changes
+ related to the files.]
+
3.11 - Fix - error when version in format and of package
didn't match.
- Now switch.def is loaded always.
@@ -82,5 +85,5 @@ Recent changes
------------
Javier Bezos
-2017-06-26
+2017/06/29
diff --git a/Master/texmf-dist/doc/latex/babel/babel.pdf b/Master/texmf-dist/doc/latex/babel/babel.pdf
index b89b9227245..3cd1f86f163 100644
--- a/Master/texmf-dist/doc/latex/babel/babel.pdf
+++ b/Master/texmf-dist/doc/latex/babel/babel.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/babel/babel.dtx b/Master/texmf-dist/source/latex/babel/babel.dtx
index d76895d5856..10f0d5fa509 100644
--- a/Master/texmf-dist/source/latex/babel/babel.dtx
+++ b/Master/texmf-dist/source/latex/babel/babel.dtx
@@ -36,7 +36,7 @@
%\iffalse
%% File 'babel.dtx'
%\fi
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%\iffalse
%
% Babel DOCUMENT-STYLE option for LaTeX version 2.09 or plain TeX;
@@ -208,8 +208,8 @@
\vspace{2cm}\hspace{1.5cm}
\begin{minipage}{5cm}
\Large
-Version 3.11\newline
-2017/06/26
+Version 3.12\newline
+2017/06/29
\vspace{1cm}
\textit{Original author}\newline
@@ -2440,7 +2440,6 @@ can contain any valid \LaTeX\ code.
\end{itemize}
\DocInput{babel.dtx}
-\DocInput{bbunicode.dtx}
\section{Conclusion}
@@ -2574,8 +2573,8 @@ help from Bernd Raichle, for which I am grateful.
% little bit of literate programming.
%
% \begin{macrocode}
-%<<version=3.11>>
-%<<date=2017/06/26>>
+%<<version=3.12>>
+%<<date=2017/06/29>>
% \end{macrocode}
%
% \section{Tools}
diff --git a/Master/texmf-dist/source/latex/babel/bbcompat.dtx b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
index 529391794f9..1237f3fcc4d 100644
--- a/Master/texmf-dist/source/latex/babel/bbcompat.dtx
+++ b/Master/texmf-dist/source/latex/babel/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2017/06/26 v3.11]
+\ProvidesFile{bbcompat.dtx}[2017/06/29 v3.12]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/Master/texmf-dist/source/latex/babel/bbunicode.dtx b/Master/texmf-dist/source/latex/babel/bbunicode.dtx
deleted file mode 100644
index 44d3d205227..00000000000
--- a/Master/texmf-dist/source/latex/babel/bbunicode.dtx
+++ /dev/null
@@ -1,566 +0,0 @@
-% \iffalse meta-comment
-%
-% Copyright 2013-2017 Javier Bezos and any individual authors
-% listed elsewhere in this file. All rights reserved.
-%
-% This file is part 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 Javier Bezos.
-%
-% The list of all files belonging to the Babel system 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.
-% \fi
-% \CheckSum{795}
-%
-% \iffalse
-%<*dtx>
-\ProvidesFile{bbunicode.dtx}
- [2017/06/26 v3.11 Babel hooks for Unicode engines]
-%</dtx>
-%
-%% File `bbunicode.dtx'
-%% Babel package for LaTeX version 2e
-%% Copyright (C) 2103-2017
-%% by Javier Bezos
-%
-%<*filedriver>
-\documentclass{ltxdoc}
-\font\manual=logo10 % font used for the METAFONT logo, etc.
-\newcommand*\MF{{\manual META}\-{\manual FONT}}
-\newcommand*{\babel}{\textsf{babel}}
-\newcommand*{\langvar}{$\langle \it lang \rangle$}
-\newcommand*{\note}[1]{}
-\newcommand*{\pkg}[1]{\textsf{#1}}
-\newcommand*{\Lopt}[1]{\textsf{#1}}
-\newcommand*{\file}[1]{\texttt{#1}}
-\begin{document}
- \DocInput{bbunicode.dtx}
-\end{document}
-%</filedriver>
-% \fi
-%
-% \GetFileInfo{bbunicode.dtx}
-% \StopEventually{}
-%
-% \section{Tentative font handling}
-%
-% A general solution is far from trivial:
-% \begin{itemize}
-% \item |\addfontfeature| only sets it for the current family and it's
-% not very efficient, and
-% \item |\defaultfontfeatures| requires to redefine the font (and the
-% opti\texttt{}ons aren't ``orthogonal'').
-% \end{itemize}
-%
-% \begin{macrocode}
-%<<*Font selection>>
-\def\babelFSstore#1{%
- \bbl@for\bbl@tempa{#1}{%
- \edef\bbl@tempb{\noexpand\bbl@FSstore{\bbl@tempa}}
- \bbl@tempb{rm}\rmdefault\bbl@save@rmdefault
- \bbl@tempb{sf}\sfdefault\bbl@save@sfdefault
- \bbl@tempb{tt}\ttdefault\bbl@save@ttdefault}}
-\def\bbl@FSstore#1#2#3#4{%
- \bbl@csarg\edef{#2default#1}{#3}%
- \expandafter\addto\csname extras#1\endcsname{%
- \let#4#3%
- \ifx#3\f@family
- \edef#3{\csname bbl@#2default#1\endcsname}%
- \fontfamily{#3}\selectfont
- \else
- \edef#3{\csname bbl@#2default#1\endcsname}%
- \fi}%
- \expandafter\addto\csname noextras#1\endcsname{%
- \ifx#3\f@family
- \fontfamily{#4}\selectfont
- \fi
- \let#3#4}}
-\let\bbl@langfeatures\@empty
-\def\babelFSfeatures{%
- \let\bbl@ori@fontspec\fontspec
- \renewcommand\fontspec[1][]{%
- \bbl@ori@fontspec[\bbl@langfeatures##1]}
- \let\babelFSfeatures\bbl@FSfeatures
- \babelFSfeatures}
-\def\bbl@FSfeatures#1#2{%
- \expandafter\addto\csname extras#1\endcsname{%
- \babel@save\bbl@langfeatures
- \edef\bbl@langfeatures{#2,}}}
-%<</Font selection>>
-% \end{macrocode}
-% \section{Hooks for XeTeX and LuaTeX}
-%
-% \subsection{XeTeX}
-%
-% Unfortunately, the current encoding cannot be retrieved and
-% therefore it is reset always to |utf8|, which seems a sensible
-% default.
-%
-% \LaTeX{} sets many ``codes'' just before loading
-% \verb|hyphen.cfg|. That is not a problem in luatex, but in xetex
-% they must be reset to the proper value. Most of the work is done in
-% \textsf{xe(la)tex.ini}, so here we just ``undo'' some of the
-% changes done by \LaTeX. Anyway, for consistency Lua\TeX{} also
-% resets the catcodes.
-% \changes{bbunicode~1.0c}{2014/03/10}{Reset ``codes'' set by \cs{LaTeX}
-% to what xetex expects. Used also in luatex.}
-% \changes{bbunicode~1.0f}{2015/12/06}{This block was assigned to
-% xetex, even in luatex. Fixed here and below.}
-% \begin{macrocode}
-%<<*Restore Unicode catcodes before loading patterns>>
- \begingroup
- % Reset chars "80-"C0 to category "other", no case mapping:
- \catcode`\@=11 \count@=128
- \loop\ifnum\count@<192
- \global\uccode\count@=0 \global\lccode\count@=0
- \global\catcode\count@=12 \global\sfcode\count@=1000
- \advance\count@ by 1 \repeat
- % Other:
- \def\O ##1 {%
- \global\uccode"##1=0 \global\lccode"##1=0
- \global\catcode"##1=12 \global\sfcode"##1=1000 }%
- % Letter:
- \def\L ##1 ##2 ##3 {\global\catcode"##1=11
- \global\uccode"##1="##2
- \global\lccode"##1="##3
- % Uppercase letters have sfcode=999:
- \ifnum"##1="##3 \else \global\sfcode"##1=999 \fi }%
- % Letter without case mappings:
- \def\l ##1 {\L ##1 ##1 ##1 }%
- \l 00AA
- \L 00B5 039C 00B5
- \l 00BA
- \O 00D7
- \l 00DF
- \O 00F7
- \L 00FF 0178 00FF
- \endgroup
- \input #1\relax
-%<</Restore Unicode catcodes before loading patterns>>
-% \end{macrocode}
-%
-% Now, the code.
-%
-% \begin{macrocode}
-%<*xetex>
-\def\BabelStringsDefault{unicode}
-\let\xebbl@stop\relax
-\AddBabelHook{xetex}{encodedcommands}{%
- \def\bbl@tempa{#1}%
- \ifx\bbl@tempa\@empty
- \XeTeXinputencoding"bytes"%
- \else
- \XeTeXinputencoding"#1"%
- \fi
- \def\xebbl@stop{\XeTeXinputencoding"utf8"}}
-\AddBabelHook{xetex}{stopcommands}{%
- \xebbl@stop
- \let\xebbl@stop\relax}
-\AddBabelHook{xetex}{loadkernel}{%
-<@Restore Unicode catcodes before loading patterns@>}
-<@Font selection@>
-%</xetex>
-% \end{macrocode}
-%
-% \subsection{LuaTeX}
-%
-% The new loader for luatex is based solely on |language.dat|, which
-% is read on the fly. The code shouldn't be executed when the format
-% is build, so we check if |\AddBabelHook| is defined. Then comes a
-% modified version of the loader in |hyphen.cfg| (without the
-% hyphenmins stuff, which is under the direct control of \babel).
-%
-% The names |\l@<language>| are defined and take some value from the
-% beginning because all \texttt{ldf} files assume this for the
-% corresponding language to be considered valid, but patterns are not
-% loaded (except the first one). This is done later, when the language
-% is first selected (which usually means when the \texttt{ldf}
-% finishes). If a language has been loaded, |\bbl@hyphendata@<num>|
-% exists (with the names of the files read).
-%
-% The default setup preloads the first language into the format. This
-% is intended mainly for `english', so that it's available without
-% further intervention from the user. To avoid duplicating it, the
-% following rule applies: if the ``0th'' language and the first
-% language in |language.dat| have the same name then just ignore the
-% latter. If there are new synonymous, the are added, but note if the
-% language patterns have not been preloaded they won't at run time.
-%
-% Other preloaded languages could be read twice, if they has been
-% preloaded into the format. This is not optimal, but it shouldn't
-% happen very often -- with \luatex{} patterns are best loaded when
-% the document is typeset, and the ``0th'' language is preloaded just
-% for backwards compatibility.
-%
-% As of 1.1b, lua(e)tex is taken into account. Formerly, loading of
-% patterns on the fly didn't work in this format, but with the new
-% loader it does. Unfortunately, the format is not based on \babel,
-% and data could be duplicated, because languages are reassigned above
-% those in the format (nothing serious, anyway). Note even with this
-% format |language.dat| is used (under the principle of a single
-% source), instead of |language.def|.
-%
-% Of course, there is room for improvements, like tools to read and
-% reassign languages, which would require modifying the language list,
-% and better error handling.
-%
-% We need catcode tables, but no format (targeted by \babel) provide a
-% command to allocate them (although there are packages like
-% \textsf{ctablestack}). For the moment, a dangerous approach is used
-% -- just allocate a high random number and cross the fingers. To
-% complicate things, \textsf{etex.sty} changes the way languages are
-% allocated.
-%
-% \changes{bbunicode~1.0b}{2013/04/22}{luatex-hyphen is loaded with
-% require. Changes supplied by \'{E}lie Roux.}
-% \changes{bbunicode~1.0c}{2014/03/10}{Defined hook for
-% `initiateactive', to fetch the next token and continue only if
-% letter or other.}
-% \changes{bbunicode~1.0d}{2014/03/21}{Removed the `misfeature' for
-% `initiateactive'.}
-% \changes{bbunicode~1.0e}{2015/05/10}{Use brackets instead of
-% \cs{luaescapestring}.}
-% \changes{bbunicode~1.0e}{2015/07/26}{Added function addpattern
-% and modified the patterns hook.}
-% \changes{bbunicode~1.1a}{2016/01/26}{New hyphenation loader for
-% luatex.}
-% \changes{bbunicode~1.1b}{2016/02/05}{Also lua(e)tex.}
-% \changes{bbunicode~1.1c}{2016/02/08}{Base reading of patterns on
-% number, not in name.}
-% \changes{bbunicode~1.1c}{2016/02/08}{Some hacks for polyglossia. To
-% be improved.}
-% \changes{bbunicode~1.1c}{2016/02/23}{Thoroughly revised.}
-% \changes{bbunicode~1.1d}{2016/4/22}{Lua: Fixed a line break at
-% \cs{foreignlanguage} with unloaded patterns. Added
-% \cs{babelcatcodetablenum}, just in case.}
-%
-% \begin{macrocode}
-%<*luatex>
-\ifx\AddBabelHook\@undefined
-\begingroup
- \toks@{}
- \count@\z@ % 0=start, 1=0th, 2=normal
- \def\bbl@process@line#1#2 #3 #4 {%
- \ifx=#1%
- \bbl@process@synonym{#2}%
- \else
- \bbl@process@language{#1#2}{#3}{#4}%
- \fi
- \ignorespaces}
- \def\bbl@manylang{%
- \ifnum\bbl@last>\@ne
- \bbl@info{Non-standard hyphenation setup}%
- \fi
- \let\bbl@manylang\relax}
- \def\bbl@process@language#1#2#3{%
- \ifcase\count@
- \@ifundefined{zth@#1}{\count@\tw@}{\count@\@ne}%
- \or
- \count@\tw@
- \fi
- \ifnum\count@=\tw@
- \expandafter\addlanguage\csname l@#1\endcsname
- \language\allocationnumber
- \chardef\bbl@last\allocationnumber
- \bbl@manylang
- \let\bbl@elt\relax
- \xdef\bbl@languages{%
- \bbl@languages\bbl@elt{#1}{\the\language}{#2}{#3}}%
- \fi
- \the\toks@
- \toks@{}}
- \def\bbl@process@synonym@aux#1#2{%
- \global\expandafter\chardef\csname l@#1\endcsname#2\relax
- \let\bbl@elt\relax
- \xdef\bbl@languages{%
- \bbl@languages\bbl@elt{#1}{#2}{}{}}}%
- \def\bbl@process@synonym#1{%
- \ifcase\count@
- \toks@\expandafter{\the\toks@\relax\bbl@process@synonym{#1}}%
- \or
- \@ifundefined{zth@#1}{\bbl@process@synonym@aux{#1}{0}}{}%
- \else
- \bbl@process@synonym@aux{#1}{\the\bbl@last}%
- \fi}
- \ifx\bbl@languages\@undefined % Just a (sensible?) guess
- \chardef\l@english\z@
- \chardef\l@USenglish\z@
- \chardef\bbl@last\z@
- \global\@namedef{bbl@hyphendata@0}{{hyphen.tex}{}}
- \gdef\bbl@languages{%
- \bbl@elt{english}{0}{hyphen.tex}{}%
- \bbl@elt{USenglish}{0}{}{}}
- \else
- \global\let\bbl@languages@format\bbl@languages
- \def\bbl@elt#1#2#3#4{% Remove all except language 0
- \ifnum#2>\z@\else
- \noexpand\bbl@elt{#1}{#2}{#3}{#4}%
- \fi}%
- \xdef\bbl@languages{\bbl@languages}%
- \fi
- \def\bbl@elt#1#2#3#4{\@namedef{zth@#1}{}} % Define flags
- \bbl@languages
- \openin1=language.dat
- \ifeof1
- \bbl@warning{I couldn't find language.dat. No additional\\%
- patterns loaded. Reported}%
- \else
- \loop
- \endlinechar\m@ne
- \read1 to \bbl@line
- \endlinechar`\^^M
- \if T\ifeof1F\fi T\relax
- \ifx\bbl@line\@empty\else
- \edef\bbl@line{\bbl@line\space\space\space}%
- \expandafter\bbl@process@line\bbl@line\relax
- \fi
- \repeat
- \fi
-\endgroup
-\def\bbl@get@enc#1:#2:#3\@@@{\def\bbl@hyph@enc{#2}}
-\ifx\babelcatcodetablenum\@undefined
- \def\babelcatcodetablenum{5211}
-\fi
-\def\bbl@luapatterns#1#2{%
- \bbl@get@enc#1::\@@@
- \setbox\z@\hbox\bgroup
- \begingroup
- \ifx\catcodetable\@undefined
- \let\savecatcodetable\luatexsavecatcodetable
- \let\initcatcodetable\luatexinitcatcodetable
- \let\catcodetable\luatexcatcodetable
- \fi
- \savecatcodetable\babelcatcodetablenum\relax
- \initcatcodetable\numexpr\babelcatcodetablenum+1\relax
- \catcodetable\numexpr\babelcatcodetablenum+1\relax
- \catcode`\#=6 \catcode`\$=3 \catcode`\&=4 \catcode`\^=7
- \catcode`\_=8 \catcode`\{=1 \catcode`\}=2 \catcode`\~=13
- \catcode`\@=11 \catcode`\^^I=10 \catcode`\^^J=12
- \catcode`\<=12 \catcode`\>=12 \catcode`\*=12 \catcode`\.=12
- \catcode`\-=12 \catcode`\/=12 \catcode`\[=12 \catcode`\]=12
- \catcode`\`=12 \catcode`\'=12 \catcode`\"=12
- \input #1\relax
- \catcodetable\babelcatcodetablenum\relax
- \endgroup
- \def\bbl@tempa{#2}%
- \ifx\bbl@tempa\@empty\else
- \input #2\relax
- \fi
- \egroup}%
-\def\bbl@patterns@lua#1{%
- \language=\expandafter\ifx\csname l@#1:\f@encoding\endcsname\relax
- \csname l@#1\endcsname
- \edef\bbl@tempa{#1}%
- \else
- \csname l@#1:\f@encoding\endcsname
- \edef\bbl@tempa{#1:\f@encoding}%
- \fi\relax
- \@namedef{lu@texhyphen@loaded@\the\language}{}% Temp
- \@ifundefined{bbl@hyphendata@\the\language}%
- {\def\bbl@elt##1##2##3##4{%
- \ifnum##2=\csname l@\bbl@tempa\endcsname % #2=spanish, dutch:OT1...
- \def\bbl@tempb{##3}%
- \ifx\bbl@tempb\@empty\else % if not a synonymous
- \def\bbl@tempc{{##3}{##4}}%
- \fi
- \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
- \fi}%
- \bbl@languages
- \@ifundefined{bbl@hyphendata@\the\language}%
- {\bbl@info{No hyphenation patterns were set for\\%
- language ‘\bbl@tempa’. Reported}}%
- {\expandafter\expandafter\expandafter\bbl@luapatterns
- \csname bbl@hyphendata@\the\language\endcsname}}{}}
-\endinput\fi
-\begingroup
-\catcode`\%=12
-\catcode`\'=12
-\catcode`\"=12
-\catcode`\:=12
-\directlua{
- Babel = {}
- function Babel.bytes(line)
- return line:gsub("(.)",
- function (chr) return unicode.utf8.char(string.byte(chr)) end)
- end
- function Babel.begin_process_input()
- if luatexbase and luatexbase.add_to_callback then
- luatexbase.add_to_callback('process_input_buffer',
- Babel.bytes,'Babel.bytes')
- else
- Babel.callback = callback.find('process_input_buffer')
- callback.register('process_input_buffer',Babel.bytes)
- end
- end
- function Babel.end_process_input ()
- if luatexbase and luatexbase.remove_from_callback then
- luatexbase.remove_from_callback('process_input_buffer','Babel.bytes')
- else
- callback.register('process_input_buffer',Babel.callback)
- end
- end
- function Babel.addpatterns(pp, lg)
- local lg = lang.new(lg)
- local pats = lang.patterns(lg) or ''
- lang.clear_patterns(lg)
- for p in pp:gmatch('[^%s]+') do
- ss = ''
- for i in string.utfcharacters(p:gsub('%d', '')) do
- ss = ss .. '%d?' .. i
- end
- ss = ss:gsub('^%%d%?%.', '%%.') .. '%d?'
- ss = ss:gsub('%.%%d%?$', '%%.')
- pats, n = pats:gsub('%s' .. ss .. '%s', ' ' .. p .. ' ')
- if n == 0 then
- tex.sprint(
- [[\string\csname\space bbl@info\endcsname{New pattern: ]]
- .. p .. [[}]])
- pats = pats .. ' ' .. p
- else
- tex.sprint(
- [[\string\csname\space bbl@info\endcsname{Renew pattern: ]]
- .. p .. [[}]])
- end
- end
- lang.patterns(lg, pats)
- end
-}
-\endgroup
-\def\BabelStringsDefault{unicode}
-\let\luabbl@stop\relax
-\AddBabelHook{luatex}{encodedcommands}{%
- \def\bbl@tempa{utf8}\def\bbl@tempb{#1}%
- \ifx\bbl@tempa\bbl@tempb\else
- \directlua{Babel.begin_process_input()}%
- \def\luabbl@stop{%
- \directlua{Babel.end_process_input()}}%
- \fi}%
-\AddBabelHook{luatex}{stopcommands}{%
- \luabbl@stop
- \let\luabbl@stop\relax}
-\AddBabelHook{luatex}{patterns}{%
- \@ifundefined{bbl@hyphendata@\the\language}%
- {\def\bbl@elt##1##2##3##4{%
- \ifnum##2=\csname l@#2\endcsname % #2=spanish, dutch:OT1...
- \def\bbl@tempb{##3}%
- \ifx\bbl@tempb\@empty\else % if not a synonymous
- \def\bbl@tempc{{##3}{##4}}%
- \fi
- \bbl@csarg\xdef{hyphendata@##2}{\bbl@tempc}%
- \fi}%
- \bbl@languages
- \@ifundefined{bbl@hyphendata@\the\language}%
- {\bbl@info{No hyphenation patterns were set for\\%
- language ‘#2’. Reported}}%
- {\expandafter\expandafter\expandafter\bbl@luapatterns
- \csname bbl@hyphendata@\the\language\endcsname}}{}%
- \@ifundefined{bbl@patterns@}{}{%
- \begingroup
- \@expandtwoargs\in@{,\number\language,}{,\bbl@pttnlist}%
- \ifin@\else
- \ifx\bbl@patterns@\@empty\else
- \directlua{ Babel.addpatterns(
- [[\bbl@patterns@]], \number\language) }%
- \fi
- \@ifundefined{bbl@patterns@#1}%
- \@empty
- {\directlua{ Babel.addpatterns(
- [[\space\csname bbl@patterns@#1\endcsname]],
- \number\language) }}%
- \xdef\bbl@pttnlist{\bbl@pttnlist\number\language,}%
- \fi
- \endgroup}}
-\AddBabelHook{luatex}{everylanguage}{%
- \def\process@language##1##2##3{%
- \def\process@line####1####2 ####3 ####4 {}}}
-\AddBabelHook{luatex}{loadpatterns}{%
- \input #1\relax
- \expandafter\gdef\csname bbl@hyphendata@\the\language\endcsname
- {{#1}{}}}
-\AddBabelHook{luatex}{loadexceptions}{%
- \input #1\relax
- \def\bbl@tempb##1##2{{##1}{#1}}%
- \expandafter\xdef\csname bbl@hyphendata@\the\language\endcsname
- {\expandafter\expandafter\expandafter\bbl@tempb
- \csname bbl@hyphendata@\the\language\endcsname}}
-% \end{macrocode}
-%
-% \begin{macro}{\babelpatterns}
-%
-% This macro adds patterns. Two macros are used to store them:
-% |\bbl@patterns@| for the global ones and |\bbl@patterns@<lang>|
-% for language ones. We make sure there is a space between words
-% when multiple commands are used.
-% \changes{bbunicode~1.0e}{2015/07/26}{Macro \cs{babelpatterns} added}
-%
-% \begin{macrocode}
-\@onlypreamble\babelpatterns
-\AtEndOfPackage{%
- \newcommand\babelpatterns[2][\@empty]{%
- \ifx\bbl@patterns@\relax
- \let\bbl@patterns@\@empty
- \fi
- \ifx\bbl@pttnlist\@empty\else
- \bbl@warning{%
- You must not intermingle \string\selectlanguage\space and\\%
- \string\babelpatterns\space or some patterns will not\\%
- be taken into account. Reported}%
- \fi
- \ifx\@empty#1%
- \protected@edef\bbl@patterns@{\bbl@patterns@\space#2}%
- \else
- \edef\bbl@tempb{\zap@space#1 \@empty}%
- \bbl@for\bbl@tempa\bbl@tempb{%
- \bbl@fixname\bbl@tempa
- \bbl@iflanguage\bbl@tempa{%
- \bbl@csarg\protected@edef{patterns@\bbl@tempa}{%
- \@ifundefined{bbl@patterns@\bbl@tempa}%
- \@empty
- {\csname bbl@patterns@\bbl@tempa\endcsname\space}%
- #2}}}%
- \fi}}
-% \end{macrocode}
-% \end{macro}
-%
-% Common stuff.
-%
-% \begin{macrocode}
-\AddBabelHook{luatex}{loadkernel}{%
-<@Restore Unicode catcodes before loading patterns@>}
-<@Font selection@>
-%</luatex>
-% \end{macrocode}
-%
-\endinput
-%%
-%% \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 \~}
diff --git a/Master/texmf-dist/source/latex/babel/locale.zip b/Master/texmf-dist/source/latex/babel/locale.zip
index 2ab502028d1..e271aa75dbb 100644
--- a/Master/texmf-dist/source/latex/babel/locale.zip
+++ b/Master/texmf-dist/source/latex/babel/locale.zip
Binary files differ
diff --git a/Master/texmf-dist/tex/generic/babel/babel.def b/Master/texmf-dist/tex/generic/babel/babel.def
index 3a3c0248835..e8b54aa88ba 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.def
+++ b/Master/texmf-dist/tex/generic/babel/babel.def
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
@@ -56,7 +56,7 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{babel.def}[2017/06/26 3.11 Babel common definitions]
+\ProvidesFile{babel.def}[2017/06/29 3.12 Babel common definitions]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
diff --git a/Master/texmf-dist/tex/generic/babel/babel.sty b/Master/texmf-dist/tex/generic/babel/babel.sty
index 9d85c47d183..e4fa0d0b1d2 100644
--- a/Master/texmf-dist/tex/generic/babel/babel.sty
+++ b/Master/texmf-dist/tex/generic/babel/babel.sty
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
@@ -48,7 +48,7 @@
%% by Javier Bezos
%% all rights reserved.
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{babel}[2017/06/26 3.11 The Babel package]
+\ProvidesPackage{babel}[2017/06/29 3.12 The Babel package]
\@ifpackagewith{babel}{debug}
{\let\bbl@debug\@firstofone}
{\let\bbl@debug\@gobble}
diff --git a/Master/texmf-dist/tex/generic/babel/blplain.tex b/Master/texmf-dist/tex/generic/babel/blplain.tex
index cbb1a963c89..c8a7cc42a5e 100644
--- a/Master/texmf-dist/tex/generic/babel/blplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/blplain.tex
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/bplain.tex b/Master/texmf-dist/tex/generic/babel/bplain.tex
index 400800a9622..2672f18ca88 100644
--- a/Master/texmf-dist/tex/generic/babel/bplain.tex
+++ b/Master/texmf-dist/tex/generic/babel/bplain.tex
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/hyphen.cfg b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
index a6310ca9392..2afe48c3532 100644
--- a/Master/texmf-dist/tex/generic/babel/hyphen.cfg
+++ b/Master/texmf-dist/tex/generic/babel/hyphen.cfg
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
@@ -52,7 +52,7 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{hyphen.cfg}[2017/06/26 3.11 Babel hyphens]
+\ProvidesFile{hyphen.cfg}[2017/06/29 3.12 Babel hyphens]
\xdef\bbl@format{\jobname}
\ifx\AtBeginDocument\@undefined
\def\@empty{}
@@ -83,7 +83,7 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\toks8{Babel <3.11> and hyphenation patterns for }%
+\toks8{Babel <3.12> and hyphenation patterns for }%
\def\process@line#1#2 #3 #4 {%
\ifx=#1%
\process@synonym{#2}%
diff --git a/Master/texmf-dist/tex/generic/babel/locale/gsw/babel-swissgerman.tex b/Master/texmf-dist/tex/generic/babel/locale/gsw/babel-swissgerman.tex
deleted file mode 100644
index e3670de5e88..00000000000
--- a/Master/texmf-dist/tex/generic/babel/locale/gsw/babel-swissgerman.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-% This file is part of babel. For further details see:
-% https://www.ctan.org/pkg/babel
-\ifx\BabelBeforeIni\undefined
- \PackageError{babel}%
- {This file is a component of babel and cannot\MessageBreak
- be loaded directly. I'll stop immediately}%
- {Just use babel as documented.}%
- \stop
-\fi
-\BabelBeforeIni{gsw}{%
-}
-\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/babel/luababel.def b/Master/texmf-dist/tex/generic/babel/luababel.def
index cba3990897d..88ec296e225 100644
--- a/Master/texmf-dist/tex/generic/babel/luababel.def
+++ b/Master/texmf-dist/tex/generic/babel/luababel.def
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/nil.ldf b/Master/texmf-dist/tex/generic/babel/nil.ldf
index 63f75eb300e..486ca76999d 100644
--- a/Master/texmf-dist/tex/generic/babel/nil.ldf
+++ b/Master/texmf-dist/tex/generic/babel/nil.ldf
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
@@ -47,7 +47,7 @@
%% TeXniek
%% by Javier Bezos
%% all rights reserved.
-\ProvidesLanguage{nil}[2017/06/26 3.11 Nil language]
+\ProvidesLanguage{nil}[2017/06/29 3.12 Nil language]
\LdfInit{nil}{datenil}
\ifx\l@nohyphenation\@undefined
\@nopatterns{nil}
diff --git a/Master/texmf-dist/tex/generic/babel/plain.def b/Master/texmf-dist/tex/generic/babel/plain.def
index d3dd1fa8f20..16ae3a50965 100644
--- a/Master/texmf-dist/tex/generic/babel/plain.def
+++ b/Master/texmf-dist/tex/generic/babel/plain.def
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
diff --git a/Master/texmf-dist/tex/generic/babel/switch.def b/Master/texmf-dist/tex/generic/babel/switch.def
index 6da4af4d0b1..24d972bcc49 100644
--- a/Master/texmf-dist/tex/generic/babel/switch.def
+++ b/Master/texmf-dist/tex/generic/babel/switch.def
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek
@@ -52,7 +52,7 @@
\wlog{File: #1 #4 #3 <#2>}%
\let\ProvidesFile\@undefined}
\fi
-\ProvidesFile{switch.def}[2017/06/26 3.11 Babel switching mechanism]
+\ProvidesFile{switch.def}[2017/06/29 3.12 Babel switching mechanism]
\ifx\AtBeginDocument\@undefined
\input plain.def\relax
\fi
@@ -73,8 +73,8 @@
\countdef\last@language=19
\def\addlanguage{\alloc@9\language\chardef\@cclvi}
\fi
-\def\bbl@version{3.11}
-\def\bbl@date{2017/06/26}
+\def\bbl@version{3.12}
+\def\bbl@date{2017/06/29}
\def\adddialect#1#2{%
\global\chardef#1#2\relax
\bbl@usehooks{adddialect}{{#1}{#2}}%
diff --git a/Master/texmf-dist/tex/generic/babel/xebabel.def b/Master/texmf-dist/tex/generic/babel/xebabel.def
index 26b8e5a5e06..e7d7bce3b7a 100644
--- a/Master/texmf-dist/tex/generic/babel/xebabel.def
+++ b/Master/texmf-dist/tex/generic/babel/xebabel.def
@@ -38,7 +38,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2017/06/26 v3.11 The Babel package]
+%%\ProvidesFile{babel.dtx}[2017/06/29 v3.12 The Babel package]
%% Babel package for LaTeX2e.
%% Copyright (C) 1989-2008 by Johannes Braams,
%% TeXniek