[latex3-commits] [git/LaTeX3-latex3-latex2e] master: switch.def was loaded twice. Minimal experimental tabular in R. (748dc3f)
Javier
javier at dante.de
Mon Jan 29 17:30:17 CET 2018
Repository : https://github.com/latex3/latex2e
On branch : master
Link : https://github.com/latex3/latex2e/commit/748dc3f873bdafbd9d0627d0ba9164794fed2538
>---------------------------------------------------------------
commit 748dc3f873bdafbd9d0627d0ba9164794fed2538
Author: Javier <javier at localhost>
Date: Mon Jan 29 17:29:27 2018 +0100
switch.def was loaded twice. Minimal experimental tabular in R.
>---------------------------------------------------------------
748dc3f873bdafbd9d0627d0ba9164794fed2538
required/babel/README.md | 4 +--
required/babel/babel.dtx | 67 +++++++++++++++++++++++++++----------------
required/babel/babel.ins | 2 +-
required/babel/babel.pdf | Bin 637146 -> 637952 bytes
required/babel/bbcompat.dtx | 2 +-
5 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/required/babel/README.md b/required/babel/README.md
index e8a58b0..32dbe50 100644
--- a/required/babel/README.md
+++ b/required/babel/README.md
@@ -1,4 +1,4 @@
-## Babel 3.17.1169
+## Babel 3.17.1171
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -110,5 +110,5 @@ respective authors.
```
Javier Bezos
-2018/01/27
+2018/01/29
diff --git a/required/babel/babel.dtx b/required/babel/babel.dtx
index 1cf764e..bebb78c 100644
--- a/required/babel/babel.dtx
+++ b/required/babel/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2018/01/27 v3.17.1169 The Babel package]
+\ProvidesFile{babel.dtx}[2018/01/29 v3.17.1171 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -3615,8 +3615,8 @@ help from Bernd Raichle, for which I am grateful.
% little bit of literate programming.
%
% \begin{macrocode}
-%<<version=3.17.1169>>
-%<<date=2018/01/27>>
+%<<version=3.17.1171>>
+%<<date=2018/01/29>>
% \end{macrocode}
%
% \section{Tools}
@@ -4044,7 +4044,10 @@ help from Bernd Raichle, for which I am grateful.
\let\bbl at debug\@firstofone}
{\providecommand\bbl at trace[1]{}%
\let\bbl at debug\@gobble}
-\input switch.def\relax
+\ifx\bbl at switchflag\@undefined % Prevent double input
+ \let\bbl at switchflag\relax
+ \input switch.def\relax
+\fi
<@Load patterns in luatex@>
<@Basic macros@>
\def\AfterBabelLanguage#1{%
@@ -4629,34 +4632,33 @@ help from Bernd Raichle, for which I am grateful.
\ifx\bbl at ifshorthand\@undefined
\let\bbl at opt@shorthands\@nnil
\def\bbl at ifshorthand#1#2#3{#2}%
+ \let\bbl at language@opts\@empty
\ifx\babeloptionstrings\@undefined
\let\bbl at opt@strings\@nnil
\else
\let\bbl at opt@strings\babeloptionstrings
\fi
+ \def\BabelStringsDefault{generic}
\def\bbl at tempa{normal}
\ifx\babeloptionmath\bbl at tempa
\def\bbl at mathnormal{\noexpand\textormath}
\fi
- \def\BabelStringsDefault{generic}
+ \def\AfterBabelLanguage#1#2{}
\ifx\BabelModifiers\@undefined\let\BabelModifiers\relax\fi
\let\bbl at afterlang\relax
- \let\bbl at language@opts\@empty
+ \def\bbl at opt@safe{BR}
\ifx\@uclclist\@undefined\let\@uclclist\@empty\fi
- \def\AfterBabelLanguage#1#2{}
\ifx\bbl at trace\@undefined\def\bbl at trace#1{}\fi
- \def\bbl at ifshorthand#1#2#3{#2}%
- \def\bbl at opt@safe{BR}
- \def\AfterBabelLanguage#1#2{}
- \let\bbl at afterlang\relax
- \let\bbl at language@opts\@empty
\fi
% \end{macrocode}
%
% And continue.
%
% \begin{macrocode}
-\input switch.def\relax
+\ifx\bbl at switchflag\@undefined % Prevent double input
+ \let\bbl at switchflag\relax
+ \input switch.def\relax
+\fi
\bbl at trace{Compatibility with language.def}
\ifx\bbl at languages\@undefined
\ifx\directlua\@undefined
@@ -8685,7 +8687,8 @@ help from Bernd Raichle, for which I am grateful.
% Boris Lavva) has served the purpose of typesetting R documents for
% two decades, and despite its flaws I think is still a good starting
% point (some parts have been copied here almost verbatim), partly
-% thanks to its simplicity.
+% thanks to its simplicity. I've also looked at \textsc{arabi} (by
+% Youssef Jabri), which is compatible with \babel{}.
%
% There are two ways of modifying macros to make them “bidi”, namely,
% by patching the internal low level macros (which is what I have done
@@ -10557,17 +10560,18 @@ help from Bernd Raichle, for which I am grateful.
% \changes{babel~3.16}{2018/01/02}{Option layout - first available options:
% sectioning, counters, lists, columns, contents}
%
-% In progress.
+% \textit{In progress.}
%
-% Unfortunately, for proper support for \xetex{} lots of macros and
-% packages must be patched somehow. At least at this stage, \babel{}
-% will not do it and therefore a package similar to \textsf{bidi} will
-% be required. Any help in making \babel{} and \textsf{bidi}
-% collaborate will be welcome, although the underlying concepts in
-% both packages seem very different. Note as well, elements like
-% headlines and margins can be modified easily with packages like
-% \textsf{fancyhdr}, \textsf{typearea} or \textsf{titleps}, and
-% \textsf{geometry}.
+% Unfortunately, proper support for \xetex{} requires patching somehow
+% lots of macros and packages (and some issues related to |\special|s
+% remain, like color and hyperlinks). At least at this stage, \babel{}
+% will not do it and therefore a package like \textsf{bidi} (by Vafa
+% Khalighi) would be necessary to overcome the limitations of
+% \xetex. Any help in making \babel{} and \textsf{bidi} collaborate
+% will be welcome, although the underlying concepts in both packages
+% seem very different. Note also elements like headlines and margins
+% can be modified easily with packages like \textsf{fancyhdr},
+% \textsf{typearea} or \textsf{titleps}, and \textsf{geometry}.
%
% |\bbl at startskip| and |\bbl at endskip| are available to package
% authors. Thanks to the \TeX{} expansion mechanism the following
@@ -10575,7 +10579,7 @@ help from Bernd Raichle, for which I am grateful.
% |\advance\bbl at startskip\adim|, |\bbl at startskip\adim|.
%
% Consider |txtbabel| as a shorthand for \textit{tex--xet babel},
-% which the bidi model in both \pdftex{} and \xetex{}.
+% which is the bidi model in both \pdftex{} and \xetex{}.
%
% \begin{macrocode}
%<*texxet>
@@ -11138,6 +11142,11 @@ help from Bernd Raichle, for which I am grateful.
\bbl at trace{Redefinitions for bidi layout}
\ifx\bbl at opt@layout\@nnil\endinput\fi % if no layout
\ifx\bbl at beforeforeign\leavevmode % A poor test for bidi=
+ \def\bbl at nextfake#1{%
+ \bbl at exp{%
+ \mathdir\bodydir#1%
+ \everyvbox{\bodydir\the\bodydir\everyvbox{}}%
+ \everyhbox{\bodydir\the\bodydir\everyhbox{}}}}%
\def\@hangfrom#1{%
\setbox\@tempboxa\hbox{{#1}}%
\hangindent\wd\@tempboxa
@@ -11146,6 +11155,12 @@ 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
+ \leavevmode\hbox\bgroup\bbl at nextfake$%
+ \let\@acol\@tabacol \let\@classz\@tabclassz
+ \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}}
+ {}
\IfBabelLayout{lists}
{\def\list#1#2{%
\ifnum \@listdepth >5\relax
@@ -17339,6 +17354,8 @@ Babel.characters={
% excels, because everything related to bidi writing is under our
% control.
%
+% TODO: math mode (as weak L?)
+%
% \begin{macrocode}
%<*basic-r>
Babel = Babel or {}
diff --git a/required/babel/babel.ins b/required/babel/babel.ins
index d12ffde..38d1520 100644
--- a/required/babel/babel.ins
+++ b/required/babel/babel.ins
@@ -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/01/27}
+\def\filedate{2018/01/29}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/required/babel/babel.pdf b/required/babel/babel.pdf
index cc65d7e..e161ef1 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 1a104a7..73bf9dc 100644
--- a/required/babel/bbcompat.dtx
+++ b/required/babel/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2018/01/27 v3.17.1169]
+\ProvidesFile{bbcompat.dtx}[2018/01/29 v3.17.1171]
%</dtx>
%
%% File 'bbcompat.dtx'
More information about the latex3-commits
mailing list