[latex3-commits] [git/LaTeX3-latex3-babel] master: Minor improvements to latest changes: (be80028)
Javier
email at dante.de
Mon Jan 18 19:01:38 CET 2021
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/be800282b6c154a226bb785b34cb535e2161bcb3
>---------------------------------------------------------------
commit be800282b6c154a226bb785b34cb535e2161bcb3
Author: Javier <email at localhost>
Date: Mon Jan 18 19:01:38 2021 +0100
Minor improvements to latest changes:
* Consider 'on' with mirrored parenthesis
* Don't ensure with \babelprovide{..}
* \babel at texpdf in incubator.
>---------------------------------------------------------------
be800282b6c154a226bb785b34cb535e2161bcb3
README.md | 4 ++-
babel.dtx | 66 +++++++++++++++++++++++++++++++++----------------
babel.ins | 4 +--
babel.pdf | Bin 819218 -> 819589 bytes
bbcompat.dtx | 2 +-
locale/si/babel-si.ini | 1 +
tools/incubator.html | 39 ++++++++++++++---------------
7 files changed, 70 insertions(+), 46 deletions(-)
diff --git a/README.md b/README.md
index 7c21f66..5c047ad 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.52.2247
+## Babel 3.52.2256
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -48,6 +48,8 @@ respective authors.
#111).
* Allow access to some features in `ini` files even with `ldf`
ones.
+ * Tool to create ldf files with a (more or less) GUI.
+ * Captions for Sinhala (thanks to Nisal D Bandara).
* Fixes:
- Not really a fix, but I started working on `picture` with
bidi in lua.
diff --git a/babel.dtx b/babel.dtx
index ba8b8a3..cca133f 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -1,7 +1,7 @@
% \iffalse
% This document requires lualatex
%%
-%% Copyright (C) 2012-2020 Javier Bezos and Johannes L. Braams.
+%% Copyright (C) 2012-2021 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}[2021/01/09 v3.52.2247 The Babel package]
+\ProvidesFile{babel.dtx}[2021/01/18 v3.52.2256 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -4854,8 +4854,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.52.2247>>
-%<<date=2021/01/09>>
+%<<version=3.52.2256>>
+%<<date=2021/01/18>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -7402,12 +7402,28 @@ help from Bernd Raichle, for which I am grateful.
\expandafter\ifx\csname date\languagename\endcsname\relax\else
\if at filesw
\ifx\babel at aux\@gobbletwo\else % Set if single in the first, redundant
+ % \bbl at savelastskip
\protected at write\@auxout{}{\string\babel at aux{\bbl at auxname}{}}%
+ % \bbl at restorelastskip
\fi
\bbl at usehooks{write}{}%
\fi
\fi}
-%
+% The following is used above to deal with skips before the write
+% whatsit. Adapted from hyperref, but it might fail, so for the moment
+% it's not activated. TODO.
+\def\bbl at savelastskip{%
+ \let\bbl at restorelastskip\relax
+ \ifvmode
+ \ifdim\lastskip=\z@
+ \let\bbl at restorelastskip\nobreak
+ \else
+ \bbl at exp{%
+ \def\\\bbl at restorelastskip{%
+ \skip@=\the\lastskip
+ \\\nobreak \vskip-\skip@ \vskip\skip@}}%
+ \fi
+ \fi}
\newif\ifbbl at bcpallowed
\bbl at bcpallowedfalse
\def\select at language#1{% from set@, babel at aux
@@ -10686,20 +10702,25 @@ help from Bernd Raichle, for which I am grateful.
{}%
{\bbl at provide@renew{#2}}}%
% Post tasks
- \bbl at ifunset{bbl at extracaps@#2}%
- {\bbl at exp{\\\babelensure[exclude=\\\today]{#2}}}%
- {\toks@\expandafter\expandafter\expandafter
- {\csname bbl at extracaps@#2\endcsname}%
- \bbl at exp{\\\babelensure[exclude=\\\today,include=\the\toks@}]{#2}}%
- \bbl at ifunset{bbl at ensure@\languagename}%
- {\bbl at exp{%
- \\\DeclareRobustCommand\<bbl at ensure@\languagename>[1]{%
- \\\foreignlanguage{\languagename}%
- {####1}}}}%
- {}%
- \bbl at exp{%
- \\\bbl at toglobal\<bbl at ensure@\languagename>%
- \\\bbl at toglobal\<bbl at ensure@\languagename\space>}%
+ % ----------
+ % == ensure captions ==
+ \ifx\bbl at KVP@captions\@nil\else
+ \bbl at ifunset{bbl at extracaps@#2}%
+ {\bbl at exp{\\\babelensure[exclude=\\\today]{#2}}}%
+ {\toks@\expandafter\expandafter\expandafter
+ {\csname bbl at extracaps@#2\endcsname}%
+ \bbl at exp{\\\babelensure[exclude=\\\today,include=\the\toks@}]{#2}}%
+ \bbl at ifunset{bbl at ensure@\languagename}%
+ {\bbl at exp{%
+ \\\DeclareRobustCommand\<bbl at ensure@\languagename>[1]{%
+ \\\foreignlanguage{\languagename}%
+ {####1}}}}%
+ {}%
+ \bbl at exp{%
+ \\\bbl at toglobal\<bbl at ensure@\languagename>%
+ \\\bbl at toglobal\<bbl at ensure@\languagename\space>}%
+ \fi
+ % ==
% At this point all parameters are defined if 'import'. Now we
% execute some code depending on them. But what about if nothing was
% imported? We just load the very basic parameters.
@@ -20964,8 +20985,11 @@ function Babel.bidi(head, ispar, hdir)
has_en = false
end
- -- Force mathdir in math (currently works as expected with 'l')
- if inmath then d = ('TRT' == tex.mathdir) and 'r' or 'l' end
+ -- Force mathdir in math if ON (currently works as expected only
+ -- with 'l')
+ if inmath and d == 'on' then
+ d = ('TRT' == tex.mathdir) and 'r' or 'l'
+ end
if d then
if d == 'al' then
diff --git a/babel.ins b/babel.ins
index 79ddf92..820bc64 100644
--- a/babel.ins
+++ b/babel.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 2012-2020 Javier Bezos and Johannes L. Braams.
+%% Copyright 2012-2021 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{2021/01/09}
+\def\filedate{2021/01/18}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index 401950d..2587357 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 5925b18..005c524 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2021/01/09 v3.52.2247]
+\ProvidesFile{bbcompat.dtx}[2021/01/18 v3.52.2256]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/locale/si/babel-si.ini b/locale/si/babel-si.ini
index d07346c..83d410c 100644
--- a/locale/si/babel-si.ini
+++ b/locale/si/babel-si.ini
@@ -8,6 +8,7 @@
; * Common Locale Data Repository (license Unicode):
; http://cldr.unicode.org/
; http://unicode.org/copyright.html
+; * With contributions by Nisal D Bandara.
[identification]
charset = utf8
diff --git a/tools/incubator.html b/tools/incubator.html
index 0f40dd0..7949524 100644
--- a/tools/incubator.html
+++ b/tools/incubator.html
@@ -7,8 +7,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
-
-<link href="texytipo.css" rel="stylesheet" type="text/css" />
+<link href="http://www.texnia.com/texytipo.css" rel="stylesheet" type="text/css" />
<style>
form.ldf label { display:inline-block; width: 15em; }
form.ldf input { display:inline-block; width: 20em; }
@@ -59,10 +58,10 @@ function doCreate() {
softhy + '}{\\bbl at hy@soft}'; }
if ( hardhy != '' ) {
decl += '\n\\declare at shorthand{' + lang + '}{' +
- hardhy + '}{\\bbl at hy@hard}'; }
+ hardhy + '}{\\babel at texpdf{\\bbl at hy@hard}{-}{-}{\\textminus}}'; }
if ( breakligs != '' ) {
decl += '\n\\declare at shorthand{' + lang + '}{' +
- breakligs + '}{\\discretionary{-}{}{\kern.03em}}'; }
+ breakligs + '}{\\babel at texpdf{\\discretionary{-}{}{\\kern.03em}}{}{}{}}'; }
doc = doc.replace(/\[=initiate=]/, decl);
var shorts = '\n \\languageshorthands{' + lang + '}%\n'
shorts += ' \\bbl at activate{"}'
@@ -155,30 +154,28 @@ function getToday() {
<h1>Language incubator for babel</h1>
+<small><i>Version 0.2. 2021-01-12.</i></small>
-<small><i>Version 0.1. 2015-01-31.</i></small>
-
-<p>Creating an <code>ldf</code> file for <a href="babel_news.html">babel</a> can be
-intimidating. This page provides a simple way to create a simple
-language definition file for the babel system. This is still very
-rudimentary, but even so you may find it a very convenient way to, at
-least, start the work.</p>
+<p>Creating an <code>ldf</code> file for babel can be intimidating.
+This page provides a simple way to create a simple language definition
+file for the babel system. This is still very rudimentary, but even so
+you may find it a very convenient way to, at least, start the work.</p>
<p>Currently only the skeleton, the minimal structure, is generated.
-Anyway, it can be used directly, even if it is not fully adapted to
-the typographical conventions. Future work will provide more tools
-and very likely integration with <a href="http://cldr.unicode.org/">CLDR</a> in
-order the ease localizing TeX. Output for polyglossia is also
-intended.</p>
+Anyway, it can be used directly, even if it is not fully adapted to the
+typographical conventions. Future work will provide more tools and very
+likely integration with <a href="http://cldr.unicode.org/">CLDR</a> in
+order the ease localizing TeX.</p>
-<p>String are currently not converted to the <span class="caps">LICR</span> for traditional engines
-(you must still do it by hand — to be fixed).</p>
+<p>String are currently not converted to the <span
+class="caps">LICR</span> for traditional engines (you must still do it
+by hand — to be fixed).</p>
-<p>Another nice improvement would be beautifying this page, of course.</p>
+<p>Another nice improvement would be beautifying this page, of
+course.</p>
<p>Note also I haven’t said it’s bug free.</p>
-
<form class="ldf">
<h2>Identification</h2>
@@ -564,7 +561,7 @@ of this file under its original name.
</div>
<div class="toc">
<p class="credits">
-© 2000-2015<br />Javier Bezos<br />All Rights Reserved</p>
+© 2015-2021<br />Javier Bezos<br />License: MIT</p>
</div>
</div>
More information about the latex3-commits
mailing list.