[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Bump babel version (3.18) (ebe4c69)
Javier
javier at dante.de
Wed Feb 14 19:00:53 CET 2018
Repository : https://github.com/latex3/latex2e
On branch : master
Link : https://github.com/latex3/latex2e/commit/ebe4c69ceafdd16be199bba1b9f719b94e168c79
>---------------------------------------------------------------
commit ebe4c69ceafdd16be199bba1b9f719b94e168c79
Author: Javier <javier at localhost>
Date: Wed Feb 14 19:00:53 2018 +0100
Bump babel version (3.18)
>---------------------------------------------------------------
ebe4c69ceafdd16be199bba1b9f719b94e168c79
required/babel/README.md | 12 ++++-
required/babel/babel.dtx | 87 ++++++++++++++++++-------------
required/babel/babel.ins | 4 +-
required/babel/babel.pdf | Bin 638752 -> 639170 bytes
required/babel/bbcompat.dtx | 2 +-
required/babel/samples/fixarabkerns.sty | 57 ++++++++++++++++++++
required/babel/samples/lua-arabic.pdf | Bin 85578 -> 85558 bytes
required/babel/samples/lua-arabic.tex | 35 ++-----------
8 files changed, 125 insertions(+), 72 deletions(-)
diff --git a/required/babel/README.md b/required/babel/README.md
index 744d9b9..68f077f 100644
--- a/required/babel/README.md
+++ b/required/babel/README.md
@@ -1,4 +1,4 @@
-## Babel 3.17.1180
+## Babel 3.18
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -64,6 +64,14 @@ respective authors.
### New
```
+3.18 - More bidi in luatex: captions (required only in multilingual
+ docs) and tabular (required for R tables). Also an experimental
+ support for captions in xetex and pdftex (tabular is not yet
+ supported).
+ - New ini files: ar-DZ, ar-MA, ar-SY
+ - Fix - \begin{hyphenrules} didn't work with polyglossia.
+ - Fix - switch.def was loaded twice.
+
3.17 - A tool for bidi footnotes.
- Fix - \ragged... didn't work for bidi.
@@ -110,5 +118,5 @@ respective authors.
```
Javier Bezos
-2018/02/07
+2018/02/14
diff --git a/required/babel/babel.dtx b/required/babel/babel.dtx
index 4348ad6..b11d3d5 100644
--- a/required/babel/babel.dtx
+++ b/required/babel/babel.dtx
@@ -1,7 +1,7 @@
% \iffalse
% This document requires lualatex
%%
-%% Copyright (C) 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2018 Javier Bezos and Johannes L. Braams.
%% Copyright (C) 1989-2012 Johannes L. Braams and
%% any individual authors listed elsewhere in this file.
%% All rights reserved.
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2018/02/07 v3.17.1180 The Babel package]
+\ProvidesFile{babel.dtx}[2018/02/14 v3.18 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -374,7 +374,7 @@ _\foreignlanguage{french}{français}_.
\subsection{Modifiers}
-\New{3.9c} The basic behaviour of some languages can be modified when
+\New{3.9c} The basic behavior of some languages can be modified when
loading \babel{} by means of \textit{modifiers}. They are set after
the language name, and are prefixed with a dot (only when the language
is set as package option -- neither global options nor the |main| key
@@ -594,7 +594,7 @@ environment are \textit{not} ignored.
This environment was originally intended for intermixing left-to-right
typesetting with right-to-left typesetting in engines not supporting a
change in the writing direction inside a line. However, by default it never
-complied with the documented behaviour and it is just a version as
+complied with the documented behavior and it is just a version as
environment of |\foreignlanguage|.
\Describe{\begin\menv{hyphenrules}}{\marg{language}\Eenv{hyphenrules}}
@@ -817,7 +817,7 @@ system shorthands. Language-dependent user shorthands (new in
\defineshorthand{"*}{\babelhyphen{soft}}
\defineshorthand{"-}{\babelhyphen{hard}}
\end{verbatim}
- However, behaviour of hyphens is language dependent. For example, in
+ However, behavior of hyphens is language dependent. For example, in
languages like Polish and Portuguese, a hard hyphen inside compound
words are repeated at the beginning of the next line. You could then
set:
@@ -1031,7 +1031,7 @@ it only as a last resort).
$\string|$ \texttt{select} $\string|$ \texttt{other} $\string|$
\texttt{other*}}
-\New{3.9g} Sets the behaviour of case mapping for hyphenation,
+\New{3.9g} Sets the behavior of case mapping for hyphenation,
provided the language defines it.\footnote{Turned off in plain.} It
can take the following values:
\begin{description}
@@ -1054,7 +1054,7 @@ can take the following values:
optimized version of \texttt{other*} for monolingual
documents.\footnote{Providing |foreign| is pointless, because the
case mapping applied is that at the end of paragraph, but if either
- \xetex{} or \luatex{} change this behaviour it might be added. On
+ \xetex{} or \luatex{} change this behavior it might be added. On
the other hand, |other| is provided even if I [JBL] think it isn't
really useful, but who knows.}
\end{description}
@@ -1843,7 +1843,7 @@ to select fonts in addition to the three basic ones.
\textit{language} (and therefore the writing direction). In other
words, the |ini| file or |\babelprovide| provides default values for
|\babelfont| if omitted, but the opposite is not true. See the note
- above for the reasons of this behaviour.
+ above for the reasons of this behavior.
\end{note}
\begin{warning}
@@ -1862,7 +1862,7 @@ to select fonts in addition to the three basic ones.
\subsection{Modifying a language}
-Modifying the behaviour of a language (say, the chapter “caption”), is
+Modifying the behavior of a language (say, the chapter “caption”), is
sometimes necessary, but not always trivial.
\begin{itemize}
\item The old way, still valid for many languages, to redefine a
@@ -1969,7 +1969,7 @@ language the first valid hyphenation rules in the list. For example:
\begin{verbatim}
\babelprovide[hyphenrules=chavacano spanish italian]{chavacano}
\end{verbatim}
-If none of the listed hyphenrules exist, the default behaviour
+If none of the listed hyphenrules exist, the default behavior
applies. Note in this example we set |chavacano| as first option --
without it, it would select |spanish| even if |chavacano| exists.
@@ -2051,7 +2051,7 @@ with a breaking oportunity after it. A further type is a
oportunity.
In \TeX, \verb|-| and \verb|\-| forbid further breaking oportunities
-in the word. This is the desired behaviour very often, but not always,
+in the word. This is the desired behavior very often, but not always,
and therefore many languages provide shorthands for these
cases. Unfortunately, this has not been done consistently: for
example, \verb|"-| in Dutch, Portugese, Catalan or Danish is a hard
@@ -2221,7 +2221,8 @@ text, which handles numbers and unmarked L text within an R context.
this writing some Arabic fonts are not rendered correctly by the
default \luatex{} font loader, with misplaced kerns inside some
words, so double check the resulting text. It seems a fix is on the
- way.}
+ way, but in the meanwhile you could have a look at the workaround
+ available on GitHub, under \texttt{/required/babel/samples}}
\begingroup
% If you are looking at the code to see how it has been written, you
% will be disappointed :-). The following example is built ad hoc to
@@ -2292,7 +2293,11 @@ etc.). Note not all options are required by all engines.
\item[captions] is similar to |sectioning|, but for |\caption|; not
required in monolingual documents with \luatex{}, but may be
required in \xetex{} and \pdftex{} in some styles (support for the
- latter two engines is still experimental);
+ latter two engines is still experimental); \New{3.18}
+\item[tabular] required in \luatex{} for R |tabular| (it has been
+ tested only with simple tables, so expect some readjustments in the
+ future); ignored in \pdftex{} or \xetex{} (which will not support a
+ similar option in the short term). \New{3.18}
\end{description}
\Describe{\babelsublr}{\marg{lr-text}}
@@ -2936,7 +2941,7 @@ set of hyphenation patterns.
The macro |\adddialect| can be used when two languages can (or
must) use the same hyphenation patterns. This can also be useful
for languages for which no patterns are preloaded in the
-format. In such cases the default behaviour of the \babel{}
+format. In such cases the default behavior of the \babel{}
system is to define this language as a `dialect' of the language
for which the patterns were loaded as |\language0|. Here
``language'' is used in the \TeX{} sense of set of hyphenation
@@ -3100,7 +3105,7 @@ that way until the end of the document. Its definition may vary.
\DescribeMacro{\bbl at activate}
\DescribeMacro{\bbl at deactivate}
The command |\bbl at activate| is used to change the way an active
-character expands. |\bbl at activate| `switches on' the active behaviour
+character expands. |\bbl at activate| `switches on' the active behavior
of the character. |\bbl at deactivate| lets the active character expand
to its former (mostly) non-active self.
@@ -3159,7 +3164,7 @@ instance, be used in adding instructions to a macro like
Be careful when using this macro, because depending on the case the
assignment could be either global (usually) or local (sometimes). That
-does not seem very consistent, but this behaviour is preserved for
+does not seem very consistent, but this behavior is preserved for
backward compatibility. If you are using \pkg{etoolbox}, by Philipp
Lehman, consider using the tools provided by this package instead of
|\addto|.
@@ -3181,7 +3186,7 @@ this encoding but constructed with |\accent| in |OT1|.
Note the previous command (|\bbl at allowhyphens|) has different
applications (hyphens and discretionaries) than this one (composite
chars). Note also prior to version 3.7, |\allowhyphens| had the
-behaviour of |\bbl at allowhyphens|.
+behavior of |\bbl at allowhyphens|.
\DescribeMacro{\set at low@box}
For some languages, quotes need to be lowered to the baseline. For
@@ -3452,7 +3457,7 @@ assignment is wrong, fix it directly.
Most of changes in version 3.9 are related to bugs, either to fix them
(there were lots), or to provide some alternatives. Even new features
like |\babelhyphen| are intended to solve a certain problem (in this
-case, the lacking of a uniform syntax and behaviour for shorthands
+case, the lacking of a uniform syntax and behavior for shorthands
across languages). These changes are described in this manual in the
corresponding place. A selective list follows:
\begin{itemize}
@@ -3630,8 +3635,8 @@ help from Bernd Raichle, for which I am grateful.
% little bit of literate programming.
%
% \begin{macrocode}
-%<<version=3.17.1180>>
-%<<date=2018/02/07>>
+%<<version=3.18>>
+%<<date=2018/02/14>>
% \end{macrocode}
%
% \section{Tools}
@@ -3647,7 +3652,7 @@ help from Bernd Raichle, for which I am grateful.
%
% We define some basic macros which just make the code cleaner.
% |\bbl at add| is now used internally instead of |\addto| because of
-% the unpredictable behaviour of the latter. Used in
+% the unpredictable behavior of the latter. Used in
% \file{babel.def} and in \file{babel.sty}, which means in \LaTeX{}
% is executed twice, but we need them when defining options and
% \file{babel.def} cannot be load until options have been defined.
@@ -4028,7 +4033,7 @@ help from Bernd Raichle, for which I am grateful.
%
%
% Apart from all the language options below we also have a few options
-% that influence the behaviour of language definition files.
+% that influence the behavior of language definition files.
%
% Many of the following options don't do anything themselves, they
% are just defined in order to make it possible for babel and
@@ -4049,6 +4054,8 @@ help from Bernd Raichle, for which I am grateful.
% base}
% \changes{babel~3.9q}{2016/02/11}{Load patterns with option base.
% To be improved. Moved showlanguages before base}
+% \changes{babel~3.18}{2018/02/14}{Fix - prevent doble input of
+% switch.def}
%
% \begin{macrocode}
%<*package>
@@ -5449,7 +5456,7 @@ help from Bernd Raichle, for which I am grateful.
\bbl at usehooks{initiateactive}{{#1}{#2}{#3}}}
% \end{macrocode}
%
-% The following package options control the behaviour of shorthands
+% The following package options control the behavior of shorthands
% in math mode.
%
% \begin{macrocode}
@@ -6425,7 +6432,7 @@ help from Bernd Raichle, for which I am grateful.
% \end{macrocode}
%
% The following two commands are used to wrap the ``hyphen'' and
-% set the behaviour of the rest of the word -- the version with a
+% set the behavior of the rest of the word -- the version with a
% single |@| is used when further hyphenation is allowed, while
% that with |@@| if no more hyphen are allowed. In both cases, if
% the hyphen is preceded by a positive space, breaking after the
@@ -6561,7 +6568,7 @@ help from Bernd Raichle, for which I am grateful.
%<</More package options>>
% \end{macrocode}
%
-% The following package options control the behaviour of |\SetString|.
+% The following package options control the behavior of |\SetString|.
%
% \begin{macrocode}
%<<*More package options>>
@@ -6619,7 +6626,7 @@ help from Bernd Raichle, for which I am grateful.
%
% Parse the encoding info to get the label, input, and font parts.
%
-% Select the behaviour of |\SetString|. Thre are two main cases,
+% Select the behavior of |\SetString|. Thre are two main cases,
% depending of if there is an optional argument: without it and
% |strings=encoded|, strings are defined
% always; otherwise, they are set only if they are still undefined
@@ -6837,7 +6844,7 @@ help from Bernd Raichle, for which I am grateful.
%
% \paragraph{Case mapping}
%
-% The command |\SetCase| provides a way to change the behaviour of
+% The command |\SetCase| provides a way to change the behavior of
% |\MakeUppercase| and |\MakeLowercase|. |\bbl at tempa| is set by the
% patched |\@uclclist| to the parsing command.
%
@@ -6902,7 +6909,7 @@ help from Bernd Raichle, for which I am grateful.
\bbl at tempa}
% \end{macrocode}
%
-% The following package options control the behaviour of
+% The following package options control the behavior of
% hyphenation mapping.
%
% \changes{babel~3.9t}{2017/04/28}{Renamed \cs{bbl at hymapopt} to
@@ -6918,7 +6925,7 @@ help from Bernd Raichle, for which I am grateful.
%<</More package options>>
% \end{macrocode}
%
-% Initial setup to provide a default behaviour if |hypenmap|
+% Initial setup to provide a default behavior if |hypenmap|
% is not set.
%
% \begin{macrocode}
@@ -7455,6 +7462,9 @@ help from Bernd Raichle, for which I am grateful.
\fi
% \end{macrocode}
%
+% \changes{babel~3.18}{2018/02/14}{Moved \cs{babelprovide}, also for
+% plain}
+%
% \subsection{Creating languages}
%
% |\babelprovide| is a general purpose tool for creating
@@ -8704,7 +8714,7 @@ help from Bernd Raichle, for which I am grateful.
% It is loosely based on |rlbabel.def|, but most of it has been
% developed from scratch. This \babel{} module (by Johannes Braams and
% Boris Lavva) has served the purpose of typesetting R documents for
-% two decades, and despite its flaws I think is still a good starting
+% two decades, and despite its flaws I think it is still a good starting
% point (some parts have been copied here almost verbatim), partly
% thanks to its simplicity. I've also looked at \textsc{arabi} (by
% Youssef Jabri), which is compatible with \babel{}.
@@ -9262,7 +9272,6 @@ help from Bernd Raichle, for which I am grateful.
% temporarily |\set at hyphenmins| and hyphenation. It can be done in
% hooks if necessary.}
%
-%
% The switching of the values of |\lefthyphenmin| and
% |\righthyphenmin| is somewhat different. First we save their
% current values, then we check if |\|\langvar|hyphenmins| is
@@ -9421,7 +9430,7 @@ help from Bernd Raichle, for which I am grateful.
% (3.11) Also experimental are the hook |foreign| and
% |foreign*|. With them you can redefine |\BabelText| which by
% default does nothing. Its
-% behaviour is not well defined yet. So, use it in
+% behavior is not well defined yet. So, use it in
% horizontal mode only if you do not want surprises.
%
% In other words, at the beginning of a paragraph |\foreignlanguage|
@@ -9563,6 +9572,7 @@ help from Bernd Raichle, for which I am grateful.
% the correct value (PR3997)}
% \changes{babel~3.8l}{2008/07/06}{Use \cs{bbl at patterns}}
% \changes{3.15}{2017/10/30}{Don't set language name. Use temp macro.}
+% \changes{3.15}{2018/02/14}{Fix - didn't work with polyglossia}
%
% \begin{macrocode}
\def\hyphenrules#1{%
@@ -9961,7 +9971,7 @@ help from Bernd Raichle, for which I am grateful.
% the name of the language. The macro |\bbl at get@enc| extracts the
% font encoding from the language name and stores it in
% |\bbl at hyph@enc|. The latter can be used in hyphenation files if
-% you need to set a behaviour depending on the given encoding (it
+% you need to set a behavior depending on the given encoding (it
% is set to empty if no encoding is given).
%
% Pattern files may contain assignments to |\lefthyphenmin| and
@@ -11158,6 +11168,9 @@ help from Bernd Raichle, for which I am grateful.
% |\parbox| and |\hangindent| are involved. Fortunately, latest
% releases of \luatex{} simplify a lot the solution with |\shapemode|.
%
+% \changes{3.18}{2018/02/14}{\cs{bbl at nextfake}, similar to the old
+% \cs{nextfakemath} in Omega}
+%
% \begin{macrocode}
\bbl at trace{Redefinitions for bidi layout}
\ifx\bbl at opt@layout\@nnil\endinput\fi % if no layout
@@ -11165,7 +11178,7 @@ help from Bernd Raichle, for which I am grateful.
\def\bbl at nextfake#1{%
\mathdir\bodydir % non-local, use always inside a group!
\bbl at exp{%
- #1%
+ #1% Once entered in math, set boxes to restore values
\everyvbox{%
\the\everyvbox
\bodydir\the\bodydir
@@ -11186,8 +11199,8 @@ help from Bernd Raichle, for which I am grateful.
\fi
\noindent\box\@tempboxa}
\fi
-\IfBabelLayout{tabular}% Experimental - don't use un production
- {\def\@tabular{% eg, tabular inside tabular might not work
+\IfBabelLayout{tabular}
+ {\def\@tabular{%
\leavevmode\hbox\bgroup\bbl at nextfake$%
\let\@acol\@tabacol \let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}}
@@ -17520,7 +17533,7 @@ function Babel.pre_otfload(head)
% nil, ie, a non-char), the textdir is set. This means you cannot
% insert, say, a whatsit, but this is what I would expect (with
% \textsf{luacolor} you may colorize some digits). Anyway, this
-% behaviour could be changed with a switch in the future. Note in the
+% behavior could be changed with a switch in the future. Note in the
% first branch only <an> is relevant if <al>.
%
% \begin{macrocode}
diff --git a/required/babel/babel.ins b/required/babel/babel.ins
index 6e29f9b..f33ccf2 100644
--- a/required/babel/babel.ins
+++ b/required/babel/babel.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 2012-2017 Javier Bezos and Johannes L. Braams.
+%% Copyright 2012-2018 Javier Bezos and Johannes L. Braams.
%% Copyright 1989-2008 Johannes L. Braams and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
@@ -26,7 +26,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\def\filedate{2018/02/07}
+\def\filedate{2018/02/14}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/required/babel/babel.pdf b/required/babel/babel.pdf
index 98d7c68..d72692a 100644
Binary files a/required/babel/babel.pdf and b/required/babel/babel.pdf differ
diff --git a/required/babel/bbcompat.dtx b/required/babel/bbcompat.dtx
index fc9d90d..d99a4de 100644
--- a/required/babel/bbcompat.dtx
+++ b/required/babel/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2018/02/07 v3.17.1180]
+\ProvidesFile{bbcompat.dtx}[2018/02/14 v3.18]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/required/babel/samples/fixarabkerns.sty b/required/babel/samples/fixarabkerns.sty
new file mode 100644
index 0000000..9731683
--- /dev/null
+++ b/required/babel/samples/fixarabkerns.sty
@@ -0,0 +1,57 @@
+
+% ----
+% Fix some bad kerns inserted by the font loader. I don't know
+% where the bug is and why the following workaroud fixes it. It just
+% forces a dir node as the second node in the par. Note it doesn't
+% take hboxes into account, yet (no local_par = 9 node at the
+% beginning), but there is another workaround. But in tabular the
+% issue remains. It seems the font loader will be fixed soon.
+
+\directlua{
+
+function fixkerns (head)
+ if head and head.id == 9 then
+ snd = head.next
+ if snd and not (snd.id == node.id'dir') then
+ local d = node.new(node.id'dir')
+ d.dir = head.dir
+ head = node.insert_after(head, head, d)
+ end
+ end
+ return head
+end
+
+where = luatexbase.priority_in_callback('pre_linebreak_filter',
+ 'luaotfload.node_processor')
+
+luatexbase.add_to_callback("pre_linebreak_filter", fixkerns, "fixkerns", where)
+}
+
+% Fixes for hboxes and tabular
+
+\everyhbox{\bgroup\aftergroup\egroup\textdir\bodydir}
+
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \textdir\bodydir
+ \ifcase\@chnum
+ \hfil\ignorespaces\@sharp\unskip\hfil
+ \or
+ \hskip1sp\ignorespaces\@sharp\unskip\hfil
+ \or
+ \hfil\hskip1sp\ignorespaces\@sharp\unskip
+ \fi}}}
diff --git a/required/babel/samples/lua-arabic.pdf b/required/babel/samples/lua-arabic.pdf
index 21d108b..b2c74c2 100644
Binary files a/required/babel/samples/lua-arabic.pdf and b/required/babel/samples/lua-arabic.pdf differ
diff --git a/required/babel/samples/lua-arabic.tex b/required/babel/samples/lua-arabic.tex
index 7d7d1e7..c066af8 100644
--- a/required/babel/samples/lua-arabic.tex
+++ b/required/babel/samples/lua-arabic.tex
@@ -19,41 +19,16 @@
\usepackage{multicol}
\usepackage{booktabs}
+% The following package provides a few workarounds for a bug in the
+% lua font loader, which sometimes inserts kerns at the wrong place.
+% It's just a workaround, so it's only available on GitHub.
+\usepackage{fixarabkerns}
+
\title{كهرباء}
\author{From Wikipedia\\%
Typeset with \textsf{babel}
\addfontfeatures{Numbers=ArabicOff} \csname bbl at version\endcsname}
-% ----
-% Fix some bad kerns inserted by the font loader. I don't know
-% where the bug is and why the following workaroud fixes it. It just
-% forces a dir node as the second node in the par. Note it doesn't
-% take hboxes into account, yet (no local_par = 9 node at the
-% beginning), but there is another workaround. But in tabular the
-% issue remains. It seems the font loader will be fixed soon.
-
-\directlua{
-
-function fixkerns (head)
- if head and head.id == 9 then
- snd = head.next
- if snd and not (snd.id == node.id'dir') then
- local d = node.new(node.id'dir')
- d.dir = head.dir
- head = node.insert_after(head, head, d)
- end
- end
- return head
-end
-
-where = luatexbase.priority_in_callback('pre_linebreak_filter',
- 'luaotfload.node_processor')
-
-luatexbase.add_to_callback("pre_linebreak_filter", fixkerns, "fixkerns", where)
-}
-\everyhbox{\bgroup\aftergroup\egroup\textdir\bodydir}
-% ----
-
\begin{document}
\frontmatter
More information about the latex3-commits
mailing list