[latex3-commits] [git/LaTeX3-latex3-babel] master: Bump to 3.28 (24da180)
Joseph Wright
joseph.wright at morningstar2.co.uk
Mon Apr 1 19:40:37 CEST 2019
Repository : https://github.com/latex3/babel
On branch : master
Link : https://github.com/latex3/babel/commit/24da180622d625fe671b23f0b5d13f4b593acf43
>---------------------------------------------------------------
commit 24da180622d625fe671b23f0b5d13f4b593acf43
Author: Javier <jbezos at localhost>
Date: Mon Apr 1 15:44:56 2019 +0200
Bump to 3.28
>---------------------------------------------------------------
24da180622d625fe671b23f0b5d13f4b593acf43
README.md | 13 +--
babel.dtx | 94 ++++++++++++++-------
babel.ins | 2 +-
babel.pdf | Bin 671700 -> 674025 bytes
bbcompat.dtx | 2 +-
locale/ar/babel-ar-DZ.ini | 30 ++++++-
locale/ar/babel-ar-MA.ini | 30 ++++++-
locale/ar/babel-ar-SY.ini | 30 ++++++-
locale/ar/babel-ar.ini | 30 ++++++-
locale/fa/babel-fa.ini | 30 ++++++-
locale/he/babel-he.ini | 32 ++++++-
locale/hi/babel-hi.ini | 33 +++++++-
samples/bidi-misc.lualatex.pdf | Bin 89882 -> 90258 bytes
samples/bidi-misc.pdflatex.pdf | Bin 170481 -> 166532 bytes
samples/bidi-misc.tex | 15 +++-
samples/bidi-misc.xelatex.pdf | Bin 74247 -> 81573 bytes
samples/fixarabkerns.sty | 57 -------------
samples/lua-arabic.pdf | Bin 85142 -> 85036 bytes
samples/lua-arabic.tex | 2 +-
samples/lua-beamer.pdf | Bin 22271 -> 22332 bytes
samples/lua-beamer.tex | 23 -----
samples/lua-bidibasic.pdf | Bin 49308 -> 49301 bytes
samples/lua-hebrew.pdf | Bin 0 -> 83924 bytes
samples/lua-hebrew.tex | 182 ++++++++++++++++++++++++++++++++++++++++
samples/lua-sanskrit.pdf | Bin 80657 -> 81899 bytes
samples/lua-sanskrit.tex | 2 +-
samples/lua-se-he.pdf | Bin 4007 -> 4009 bytes
samples/lua-secenum.pdf | Bin 57618 -> 57644 bytes
samples/lua-thai.pdf | Bin 36098 -> 36145 bytes
samples/xe-bidi.pdf | Bin 20487 -> 14027 bytes
30 files changed, 466 insertions(+), 141 deletions(-)
diff --git a/README.md b/README.md
index 805317c..97ff35a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Babel 3.27.1585
+## Babel 3.28
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -51,11 +51,12 @@ respective authors.
### Latest changes
```
-3.28 - Fix - wrong dir after math with basic-r
- - Fix - wrong dir in weak L inside R inside L
+3.28 - Fixes - wrong dir after math, in math inside tabular, in weak L
+ inside R inside L, and in boxes inside math.
- \babelfont now takes into account \defaultfontfeatures. This
- is potentially a source of backwards incompatibilities, but
- very likely the risks are very low.
+ is a potential source of backwards incompatibilities, but
+ very likely the risks are very low, and it is, I think, the
+ expected behavior.
3.27 - Preliminary support for bidi (by Vafa Khalighi) with xetex.
- Fix for 3.23 - \ensureascii was redefined even when not
necessary.
@@ -124,5 +125,5 @@ respective authors.
```
Javier Bezos
-2019/03/19
+2019/04/01
diff --git a/babel.dtx b/babel.dtx
index 48d7b72..ca43f71 100644
--- a/babel.dtx
+++ b/babel.dtx
@@ -31,7 +31,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2019/03/26 v3.27.1592 The Babel package]
+\ProvidesFile{babel.dtx}[2019/04/01 v3.28 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -3917,8 +3917,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.27.1592>>
-%<<date=2019/03/26>>
+%<<version=3.28>>
+%<<date=2019/04/01>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -7821,9 +7821,8 @@ help from Bernd Raichle, for which I am grateful.
{\bbl at ifblank{#1}%
{\bbl at error
{If you want to modify `#2' you must tell how in\\%
- the optional argument. Currently there are three\\%
- options: captions=lang-tag, hyphenrules=lang-list\\%
- import=lang-tag}%
+ the optional argument. See the manual for the\\%
+ available options.}%
{Use this macro as documented}}%
{\bbl at provide@renew{#2}}}%
% Post tasks
@@ -8231,6 +8230,7 @@ help from Bernd Raichle, for which I am grateful.
% TODO. Remove copypaste pattern.
%
% \changes{3.16}{2018/01/02}{Fix - dates were severely broken.}
+% \changes{3.28}{2019/04/01}{Start work on calendars.}
%
% \begin{macrocode}
\bbl at csarg\def{inikv at date.gregorian}#1=#2\@@{% for defaults
@@ -9228,6 +9228,8 @@ help from Bernd Raichle, for which I am grateful.
% \changes{3.15}{2017/10/30}{Use an attribute instead of tex language
% (reserved for hyphenation).}
% \changes{3.15}{2017/10/30}{Store direction in @wdir@<lang>.}
+% \changes{3.28}{2019/04/01}{Dir in boxes within math and other
+% contexts (passim).}
%
% \begin{macrocode}
\bbl at trace{Basic (internal) bidi support}
@@ -9299,6 +9301,7 @@ help from Bernd Raichle, for which I am grateful.
\else
\everyhbox{\bgroup\aftergroup\egroup\textdir TRT\relax}%
\fi}
+ % TODO - the same trick as bbl at severypar
\everymath{\bbl at mathboxdir}
\everydisplay{\bbl at mathboxdir}
\else % pdftex=0, xetex=2
@@ -9690,16 +9693,17 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macro}{\bbl at set@language}
%
-% The macro |\bbl at set@language| takes care of switching the
-% language environment \emph{and} of writing entries on the
-% auxiliary files. For historial reasons, language names can be
-% either |language| of |\language|. To catch either form a trick is
-% used, but unfortunately as a side effect the catcodes of letters
-% in |\languagename| are not well defined. The list of auxiliary
-% files can be extended by redefining |\BabelContentsFiles|, but
-% make sure they are loaded inside a group (as |aux|, |toc|,
-% |lof|, and |lot| do) or the last language of the document will
-% remain active afterwards.
+% The macro |\bbl at set@language| takes care of switching the language
+% environment \emph{and} of writing entries on the auxiliary files.
+% For historial reasons, language names can be either |language| of
+% |\language|. To catch either form a trick is used, but
+% unfortunately as a side effect the catcodes of letters in
+% |\languagename| are messed up. This is a bug, but preserved for
+% backwards compatibility. The list of auxiliary files can be
+% extended by redefining |\BabelContentsFiles|, but make sure they
+% are loaded inside a group (as |aux|, |toc|, |lof|, and |lot| do)
+% or the last language of the document will remain active
+% afterwards.
%
% We also write a command to change the current language in the
% auxiliary files.
@@ -9717,19 +9721,22 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\def\BabelContentsFiles{toc,lof,lot}
-\def\bbl at set@language#1{%
+\def\bbl at set@language#1{% from selectlanguage, pop@
\edef\languagename{%
\ifnum\escapechar=\expandafter`\string#1\@empty
\else\string#1\@empty\fi}%
\select at language{\languagename}%
+ % write to auxs
\expandafter\ifx\csname date\languagename\endcsname\relax\else
\if at filesw
\protected at write\@auxout{}{\string\babel at aux{\languagename}{}}%
\bbl at usehooks{write}{}%
\fi
\fi}
-\def\select at language#1{%
+\def\select at language#1{% from set@, babel at aux
+ % set hymap
\ifnum\bbl at hymapsel=\@cclv\chardef\bbl at hymapsel4\relax\fi
+ % set name
\edef\languagename{#1}%
\bbl at fixname\languagename
\bbl at iflanguage\languagename{%
@@ -9742,6 +9749,7 @@ help from Bernd Raichle, for which I am grateful.
some cases, you may need to remove the aux file}%
{You may proceed, but expect wrong results}%
\else
+ % set type
\let\bbl at select@type\z@
\expandafter\bbl at switch\expandafter{\languagename}%
\fi}}
@@ -9821,7 +9829,8 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\newif\ifbbl at usedategroup
-\def\bbl at switch#1{%
+\def\bbl at switch#1{% from select@, foreign@
+ % restore
\originalTeX
\expandafter\def\expandafter\originalTeX\expandafter{%
\csname noextras#1\endcsname
@@ -9829,6 +9838,7 @@ help from Bernd Raichle, for which I am grateful.
\babel at beginsave}%
\bbl at usehooks{afterreset}{}%
\languageshorthands{none}%
+ % switch captions, date
\ifcase\bbl at select@type
\ifhmode
\hskip\z at skip % trick to ignore spaces
@@ -9839,19 +9849,27 @@ help from Bernd Raichle, for which I am grateful.
\csname captions#1\endcsname\relax
\csname date#1\endcsname\relax
\fi
- \else\ifbbl at usedategroup
- \bbl at usedategroupfalse
- \ifhmode
- \hskip\z at skip % trick to ignore spaces
- \csname date#1\endcsname\relax
- \loop\ifdim\lastskip>\z@\unskip\repeat\unskip
- \else
- \csname date#1\endcsname\relax
+ \else
+ \ifbbl at usedategroup % if \foreign... within \<lang>date
+ \bbl at usedategroupfalse
+ \ifhmode
+ \hskip\z at skip % trick to ignore spaces
+ \csname date#1\endcsname\relax
+ \loop\ifdim\lastskip>\z@\unskip\repeat\unskip
+ \else
+ \csname date#1\endcsname\relax
+ \fi
\fi
- \fi\fi
+ \fi
+ % switch extras
\bbl at usehooks{beforeextras}{}%
\csname extras#1\endcsname\relax
\bbl at usehooks{afterextras}{}%
+ % > babel-ensure
+ % > babel-sh-<short>
+ % > babel-bidi
+ % > babel-fontspec
+ % hyphenation - case mapping
\ifcase\bbl at opt@hyphenmap\or
\def\BabelLower##1##2{\lccode##1=##2\relax}%
\ifnum\bbl at hymapsel>4\else
@@ -9864,7 +9882,9 @@ help from Bernd Raichle, for which I am grateful.
\fi
\fi
\global\let\bbl at hymapsel\@cclv
+ % hyphenation - patterns
\bbl at patterns{#1}%
+ % hyphenation - mins
\babel at savevariable\lefthyphenmin
\babel at savevariable\righthyphenmin
\expandafter\ifx\csname #1hyphenmins\endcsname\relax
@@ -10016,18 +10036,21 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\def\foreign at language#1{%
+ % set name
\edef\languagename{#1}%
\bbl at fixname\languagename
\bbl at iflanguage\languagename{%
\expandafter\ifx\csname date\languagename\endcsname\relax
- \bbl at warning
+ \bbl at warning % TODO - why a warning, not an error?
{Unknown language `#1'. Either you have\\%
misspelled its name, it has not been installed,\\%
or you requested it in a previous run. Fix its name,\\%
- install it or just rerun the file, respectively.\\%
+ install it or just rerun the file, respectively. In\\%
+ some cases, you may need to remove the aux file.\\%
I'll proceed, but expect wrong results.\\%
Reported}%
\fi
+ % set type
\let\bbl at select@type\@ne
\expandafter\bbl at switch\expandafter{\languagename}}}
% \end{macrocode}
@@ -10071,6 +10094,7 @@ help from Bernd Raichle, for which I am grateful.
\edef\bbl at tempa{#1:\f at encoding}%
\fi
\@expandtwoargs\bbl at usehooks{patterns}{{#1}{\bbl at tempa}}%
+ % > luatex
\@ifundefined{bbl at hyphenation@}{}{% Can be \relax!
\begingroup
\bbl at xin@{,\number\language,}{,\bbl at hyphlist}%
@@ -10544,10 +10568,12 @@ help from Bernd Raichle, for which I am grateful.
\expandafter\language\csname l@#1\endcsname
\edef\languagename{#1}%
\bbl at hook@everylanguage{#1}%
+ % > luatex
\bbl at get@enc#1::\@@@
\begingroup
\lefthyphenmin\m at ne
\bbl at hook@loadpatterns{#2}%
+ % > luatex
\ifnum\lefthyphenmin=\m at ne
\else
\expandafter\xdef\csname #1hyphenmins\endcsname{%
@@ -10557,6 +10583,7 @@ help from Bernd Raichle, for which I am grateful.
\def\bbl at tempa{#3}%
\ifx\bbl at tempa\@empty\else
\bbl at hook@loadexceptions{#3}%
+ % > luatex
\fi
\let\bbl at elt\relax
\edef\bbl at languages{%
@@ -10908,6 +10935,9 @@ help from Bernd Raichle, for which I am grateful.
% |\bbl at mapselect| because |\selectfont| is called internally when a
% font is defined.
%
+% \changes{3.28}{2019/04/01}{\cs{babelfont} now based on
+% \cs{newfontfamily}.}
+%
% \begin{macrocode}
\def\bbl at font@set#1#2#3{% eg \bbl at rmdflt@lang \rmdefault \rmfamily
\bbl at xin@{<>}{#1}%
@@ -18225,7 +18255,7 @@ function Babel.bidi(head, ispar)
elseif item.id == node.id'math' then
inmath = (item.subtype == 0)
else
- dir = nil
+ dir = nil -- Not a char
end
% \end{macrocode}
%
@@ -18418,7 +18448,7 @@ end
-- TODO - \hbox with an explicit dir can lead to wrong results
-- <R \hbox dir TLT{<R>}> and <L \hbox dir TRT{<L>}>. A small attempt
--- is made to improve the situation, but the problem is the 3-dir
+-- was s made to improve the situation, but the problem is the 3-dir
-- model in babel/Unicode and the 2-dir model in LuaTeX don't fit
-- well.
diff --git a/babel.ins b/babel.ins
index 397ddc8..21bbb5d 100644
--- a/babel.ins
+++ b/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{2019/03/19}
+\def\filedate{2019/04/01}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/babel.pdf b/babel.pdf
index b9fa2fd..c8a3099 100644
Binary files a/babel.pdf and b/babel.pdf differ
diff --git a/bbcompat.dtx b/bbcompat.dtx
index 1b413a6..0ee1213 100644
--- a/bbcompat.dtx
+++ b/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2019/03/19 v3.27.1585]
+\ProvidesFile{bbcompat.dtx}[2019/04/01 v3.28]
%</dtx>
%
%% File 'bbcompat.dtx'
diff --git a/locale/ar/babel-ar-DZ.ini b/locale/ar/babel-ar-DZ.ini
index 93a70ff..60bad20 100644
--- a/locale/ar/babel-ar-DZ.ini
+++ b/locale/ar/babel-ar-DZ.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.1
-date = 2018-02-05
+version = 1.2
+date = 2019-01-31
name.local = العربية
name.english = Arabic
name.babel = arabic-dz
@@ -107,6 +107,32 @@ dayPeriods.narrow.pm = م
dayPeriods.wide.am = ص
dayPeriods.wide.pm = م
+[date.islamic]
+months.wide.1 = محرم
+months.wide.2 = صفر
+months.wide.3 = ربيع الأول
+months.wide.4 = ربيع الآخر
+months.wide.5 = جمادى الأولى
+months.wide.6 = جمادى الآخرة
+months.wide.7 = رجب
+months.wide.8 = شعبان
+months.wide.9 = رمضان
+months.wide.10 = شوال
+months.wide.11 = ذو القعدة
+months.wide.12 = ذو الحجة
+months.narrow.1 = ١
+months.narrow.2 = ٢
+months.narrow.3 = ٣
+months.narrow.4 = ٤
+months.narrow.5 = ٥
+months.narrow.6 = ٦
+months.narrow.7 = ٧
+months.narrow.8 = ٨
+months.narrow.9 = ٩
+months.narrow.10 = ١٠
+months.narrow.11 = ١١
+months.narrow.12 = ١٢
+
[time.gregorian]
time.medium = [h]:[mm]:[ss] [a]
time.short = [h]:[mm] [a]
diff --git a/locale/ar/babel-ar-MA.ini b/locale/ar/babel-ar-MA.ini
index 86ca9ce..0225a04 100644
--- a/locale/ar/babel-ar-MA.ini
+++ b/locale/ar/babel-ar-MA.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.1
-date = 2018-02-05
+version = 1.2
+date = 2019-01-31
name.local = العربية
name.english = Arabic
name.babel = arabic-ma
@@ -107,6 +107,32 @@ dayPeriods.narrow.pm = م
dayPeriods.wide.am = ص
dayPeriods.wide.pm = م
+[date.islamic]
+months.wide.1 = محرم
+months.wide.2 = صفر
+months.wide.3 = ربيع الأول
+months.wide.4 = ربيع الآخر
+months.wide.5 = جمادى الأولى
+months.wide.6 = جمادى الآخرة
+months.wide.7 = رجب
+months.wide.8 = شعبان
+months.wide.9 = رمضان
+months.wide.10 = شوال
+months.wide.11 = ذو القعدة
+months.wide.12 = ذو الحجة
+months.narrow.1 = ١
+months.narrow.2 = ٢
+months.narrow.3 = ٣
+months.narrow.4 = ٤
+months.narrow.5 = ٥
+months.narrow.6 = ٦
+months.narrow.7 = ٧
+months.narrow.8 = ٨
+months.narrow.9 = ٩
+months.narrow.10 = ١٠
+months.narrow.11 = ١١
+months.narrow.12 = ١٢
+
[time.gregorian]
time.medium = [HH]:[mm]:[ss]
time.short = [HH]:[mm]
diff --git a/locale/ar/babel-ar-SY.ini b/locale/ar/babel-ar-SY.ini
index 8414353..42cc757 100644
--- a/locale/ar/babel-ar-SY.ini
+++ b/locale/ar/babel-ar-SY.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.1
-date = 2018-02-05
+version = 1.2
+date = 2019-01-31
name.local = العربية
name.english = Arabic
name.babel = arabic-sy
@@ -105,6 +105,32 @@ dayPeriods.narrow.pm = م
dayPeriods.wide.am = ص
dayPeriods.wide.pm = م
+[date.islamic]
+months.wide.1 = محرم
+months.wide.2 = صفر
+months.wide.3 = ربيع الأول
+months.wide.4 = ربيع الآخر
+months.wide.5 = جمادى الأولى
+months.wide.6 = جمادى الآخرة
+months.wide.7 = رجب
+months.wide.8 = شعبان
+months.wide.9 = رمضان
+months.wide.10 = شوال
+months.wide.11 = ذو القعدة
+months.wide.12 = ذو الحجة
+months.narrow.1 = ١
+months.narrow.2 = ٢
+months.narrow.3 = ٣
+months.narrow.4 = ٤
+months.narrow.5 = ٥
+months.narrow.6 = ٦
+months.narrow.7 = ٧
+months.narrow.8 = ٨
+months.narrow.9 = ٩
+months.narrow.10 = ١٠
+months.narrow.11 = ١١
+months.narrow.12 = ١٢
+
[time.gregorian]
time.medium = [h]:[mm]:[ss] [a]
time.short = [h]:[mm] [a]
diff --git a/locale/ar/babel-ar.ini b/locale/ar/babel-ar.ini
index d22aed4..9e9d187 100644
--- a/locale/ar/babel-ar.ini
+++ b/locale/ar/babel-ar.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.1
-date = 2018-02-05
+version = 1.2
+date = 2019-01-31
name.local = العربية
name.english = Arabic
name.babel = arabic
@@ -103,6 +103,32 @@ dayPeriods.narrow.pm = م
dayPeriods.wide.am = ص
dayPeriods.wide.pm = م
+[date.islamic]
+months.wide.1 = محرم
+months.wide.2 = صفر
+months.wide.3 = ربيع الأول
+months.wide.4 = ربيع الآخر
+months.wide.5 = جمادى الأولى
+months.wide.6 = جمادى الآخرة
+months.wide.7 = رجب
+months.wide.8 = شعبان
+months.wide.9 = رمضان
+months.wide.10 = شوال
+months.wide.11 = ذو القعدة
+months.wide.12 = ذو الحجة
+months.narrow.1 = ١
+months.narrow.2 = ٢
+months.narrow.3 = ٣
+months.narrow.4 = ٤
+months.narrow.5 = ٥
+months.narrow.6 = ٦
+months.narrow.7 = ٧
+months.narrow.8 = ٨
+months.narrow.9 = ٩
+months.narrow.10 = ١٠
+months.narrow.11 = ١١
+months.narrow.12 = ١٢
+
[time.gregorian]
time.medium = [h]:[mm]:[ss] [a]
time.short = [h]:[mm] [a]
diff --git a/locale/fa/babel-fa.ini b/locale/fa/babel-fa.ini
index 2a185b0..f200945 100644
--- a/locale/fa/babel-fa.ini
+++ b/locale/fa/babel-fa.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.1
-date = 2018-04-11
+version = 1.2
+date = 2019-01-31
name.local = فارسی
name.english = Persian
name.babel = persian
@@ -103,6 +103,32 @@ dayPeriods.narrow.pm = ب
dayPeriods.wide.am = قبلازظهر
dayPeriods.wide.pm = بعدازظهر
+[date.persian]
+months.wide.1 = فروردین
+months.wide.2 = اردیبهشت
+months.wide.3 = خرداد
+months.wide.4 = تیر
+months.wide.5 = مرداد
+months.wide.6 = شهریور
+months.wide.7 = مهر
+months.wide.8 = آبان
+months.wide.9 = آذر
+months.wide.10 = دی
+months.wide.11 = بهمن
+months.wide.12 = اسفند
+months.narrow.1 = ف
+months.narrow.2 = ا
+months.narrow.3 = خ
+months.narrow.4 = ت
+months.narrow.5 = م
+months.narrow.6 = ش
+months.narrow.7 = م
+months.narrow.8 = آ
+months.narrow.9 = آ
+months.narrow.10 = د
+months.narrow.11 = ب
+months.narrow.12 = ا
+
[time.gregorian]
time.medium = [H]:[mm]:[ss]
time.short = [H]:[mm]
diff --git a/locale/he/babel-he.ini b/locale/he/babel-he.ini
index 0367a8f..2adc080 100644
--- a/locale/he/babel-he.ini
+++ b/locale/he/babel-he.ini
@@ -11,8 +11,8 @@
[identification]
charset = utf8
-version = 1.0
-date = 2017-09-01
+version = 1.1
+date = 2019-01-31
name.local = עברית
name.english = Hebrew
name.babel = hebrew
@@ -140,6 +140,34 @@ months.wide.10 = \hebalef\hebvav\hebqof\hebtet\hebvav\hebbet\hebresh
months.wide.11 = \hebnun\hebvav\hebbet\hebmem\hebbet\hebresh
months.wide.12 = \hebdalet\hebtsadi\hebmem\hebbet\hebresh
+[date.hebrew]
+months.wide.1 = תשרי
+months.wide.2 = חשוון
+months.wide.3 = כסלו
+months.wide.4 = טבת
+months.wide.5 = שבט
+months.wide.6 = אדר א׳
+months.wide.7 = אדר
+months.wide.8 = ניסן
+months.wide.9 = אייר
+months.wide.10 = סיוון
+months.wide.11 = תמוז
+months.wide.12 = אב
+months.wide.13 = אלול
+months.narrow.1 = תש׳
+months.narrow.2 = חש׳
+months.narrow.3 = כס׳
+months.narrow.4 = טב׳
+months.narrow.5 = שב׳
+months.narrow.6 = א״א
+months.narrow.7 = אד׳
+months.narrow.8 = ני׳
+months.narrow.9 = אי׳
+months.narrow.10 = סי׳
+months.narrow.11 = תמ׳
+months.narrow.12 = אב
+months.narrow.13 = אל׳
+
[time.gregorian]
time.medium = [H]:[mm]:[ss]
time.short = [H]:[mm]
diff --git a/locale/hi/babel-hi.ini b/locale/hi/babel-hi.ini
index 5d31399..735e539 100644
--- a/locale/hi/babel-hi.ini
+++ b/locale/hi/babel-hi.ini
@@ -12,8 +12,8 @@
[identification]
charset = utf8
-version = 0.91
-date = 2017-04-10
+version = 1.0
+date = 2019-01-31
name.local = हिन्दी
name.english = Hindi
name.babel = hindi
@@ -127,6 +127,32 @@ dayPeriods.narrow.pm = अ
dayPeriods.wide.am = पूर्वाह्न
dayPeriods.wide.pm = अपराह्न
+[date.indian]
+months.wide.1 = चैत्र
+months.wide.2 = वैशाख
+months.wide.3 = ज्येष्ठ
+months.wide.4 = आषाढ़
+months.wide.5 = श्रावण
+months.wide.6 = भाद्रपद
+months.wide.7 = अश्विन
+months.wide.8 = कार्तिक
+months.wide.9 = अग्रहायण
+months.wide.10 = पौष
+months.wide.11 = माघ
+months.wide.12 = फाल्गुन
+months.narrow.1 = 1
+months.narrow.2 = 2
+months.narrow.3 = 3
+months.narrow.4 = 4
+months.narrow.5 = 5
+months.narrow.6 = 6
+months.narrow.7 = 7
+months.narrow.8 = 8
+months.narrow.9 = 9
+months.narrow.10 = 10
+months.narrow.11 = 11
+months.narrow.12 = 12
+
[time.gregorian]
time.medium = [h]:[mm]:[ss] [a]
time.short = [h]:[mm] [a]
@@ -149,7 +175,7 @@ delimiters.quotes = “”‘’
auxiliary = [\u200C\u200D]
exemplarCharacters = [\u093C ॐ \u0902 \u0901 ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल ळ व श ष स ह ऽ ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 \u0948 ॉ ो ौ \u094D]
index = [अ आ इ ई उ ऊ ऋ ए ऐ ओ औ क ख ग घ ङ च छ ज झ ञ ट ठ ड ढ ण त थ द ध न प फ ब भ म य र ल व श ष स ह]
-punctuation = [। ॥ \\- , ; \\: ! ? . ‘ ’ “ ” ( ) \\[ \\] \\{ \\} ॰]
+punctuation = [\\- , ; \\: ! ? . ‘ ’ “ ” ( ) \\[ \\] \\{ \\} ॰]
[numbers]
defaultNumberingSystem = latn
@@ -171,4 +197,3 @@ superscriptingExponent = ×
alph =
Alph =
ordinals =
-
diff --git a/samples/bidi-misc.lualatex.pdf b/samples/bidi-misc.lualatex.pdf
index 7906e01..4237a1b 100644
Binary files a/samples/bidi-misc.lualatex.pdf and b/samples/bidi-misc.lualatex.pdf differ
diff --git a/samples/bidi-misc.pdflatex.pdf b/samples/bidi-misc.pdflatex.pdf
index 49e5115..6cd148e 100644
Binary files a/samples/bidi-misc.pdflatex.pdf and b/samples/bidi-misc.pdflatex.pdf differ
diff --git a/samples/bidi-misc.tex b/samples/bidi-misc.tex
index eadbfc0..283d3bd 100644
--- a/samples/bidi-misc.tex
+++ b/samples/bidi-misc.tex
@@ -2,7 +2,11 @@
\documentclass[a4paper]{book}
\usepackage[english,
- bidi=\ifx\directlua\undefined default\else basic-r\fi,
+ bidi=\ifx\XeTeXinputencoding\undefined
+ \ifx\directlua\undefined
+ default\else
+ basic\fi
+ \else default\fi,
layout=sectioning.lists.columns.contents.counters]
{babel}
@@ -63,7 +67,6 @@ if you have installed some 8-bit Hebrew font.
The sample PDFs in GitHub has been typeset with version 3.16.1150
(available here).
-
\chapter{English \engine}
\setcounter{section}{25}
@@ -284,7 +287,14 @@ twelfth thirteenthfourteenth fifteenth.\par}
\bigskip
+\ifx\XeTeXinputencoding\undefined
+ \ifx\directlua\undefined
+ \else
אבגדה HIJ \ref{bla} KLM \thetable{} (OPQ) \TeX{} RST וזחטי.
+ \fi
+\else
+אבגדה HIJ \ref{bla} KLM \thetable{} (OPQ) \TeX{} RST וזחטי.
+\fi
ABC \babelsublr{26}.\babelsublr{1} DEF
@@ -363,4 +373,3 @@ ble bli blo blu bla ble bli blo blu bla ble bli blo blu bla ble bli
blo blu bla ble bli blo blu
\end{document}
-
diff --git a/samples/bidi-misc.xelatex.pdf b/samples/bidi-misc.xelatex.pdf
index 43d3f27..9fae669 100644
Binary files a/samples/bidi-misc.xelatex.pdf and b/samples/bidi-misc.xelatex.pdf differ
diff --git a/samples/fixarabkerns.sty b/samples/fixarabkerns.sty
deleted file mode 100644
index 9731683..0000000
--- a/samples/fixarabkerns.sty
+++ /dev/null
@@ -1,57 +0,0 @@
-
-% ----
-% 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/samples/lua-arabic.pdf b/samples/lua-arabic.pdf
index ad77365..729bd32 100644
Binary files a/samples/lua-arabic.pdf and b/samples/lua-arabic.pdf differ
diff --git a/samples/lua-arabic.tex b/samples/lua-arabic.tex
index e9dd838..facb067 100644
--- a/samples/lua-arabic.tex
+++ b/samples/lua-arabic.tex
@@ -1,7 +1,7 @@
%$LuaLaTeX -*- coding: utf-8 ; mode: latex; TeX-engine: luatex; -*-
\documentclass[a4paper]{book}
-\usepackage[english, bidi=basic-r,
+\usepackage[english, bidi=basic,
headfoot=arabic, % an alternative is layout=sectioning
layout=counters.tabular]{babel}
diff --git a/samples/lua-beamer.pdf b/samples/lua-beamer.pdf
index bbfb56f..e1ebb87 100644
Binary files a/samples/lua-beamer.pdf and b/samples/lua-beamer.pdf differ
diff --git a/samples/lua-beamer.tex b/samples/lua-beamer.tex
index 6811681..352e3a6 100644
--- a/samples/lua-beamer.tex
+++ b/samples/lua-beamer.tex
@@ -7,29 +7,6 @@
\babelfont{rm}{FreeSerif}
\babelfont{sf}{FreeSerif}
-% See lua-arabic for an explanation of the following code, which is a
-% workaround for a bug in the default font loader.
-
-\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)
-}
-
\mode<presentation>{\usetheme{Luebeck}}
\title{ميكانيكا}
diff --git a/samples/lua-bidibasic.pdf b/samples/lua-bidibasic.pdf
index 94dda04..f388f5f 100644
Binary files a/samples/lua-bidibasic.pdf and b/samples/lua-bidibasic.pdf differ
diff --git a/samples/lua-hebrew.pdf b/samples/lua-hebrew.pdf
new file mode 100644
index 0000000..af9afe2
Binary files /dev/null and b/samples/lua-hebrew.pdf differ
diff --git a/samples/lua-hebrew.tex b/samples/lua-hebrew.tex
new file mode 100644
index 0000000..9af5121
--- /dev/null
+++ b/samples/lua-hebrew.tex
@@ -0,0 +1,182 @@
+\documentclass{article}
+
+\usepackage[unicode]{hyperref}
+
+\ifx\directlua\undefined
+% With XeTeX, which often works with isolated words, but note
+% "multi-word" L text is messed up:
+ \usepackage[bidi=bidi]{babel}
+ \rightfootnoterule
+\else
+ \usepackage[bidi=basic,layout=tabular]{babel}
+\fi
+
+\babelprovide[main,import]{hebrew}
+\babelprovide{rl}
+
+\babelfont{rm}{FreeSerif}
+% \babelfont{rm}{FrankRuehl}
+
+\title{מיון עולם הטבע\\\large From Wikipedia}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\section{המיון של קארולוס ליניאוס}
+
+חלוקת עולם הטבע לשלוש ממלכות, בספרו של ארנסט הקל משנת
+תורת המיון המדעית הראשונה הוצעה בשנת 1735 על ידי המדען השוודי קארולוס
+ליניאוס (קארל פון לינה) בספרו ”Systema Naturae“ (בלטינית: "מערכת
+הטבע"), והיא הביאה להתפתחותה של הטקסונומיה, ענף בתורת הביולוגיה שתפקידו
+למיין ולארגן את כל היצורים במערך היררכי אחיד. ליניאוס מיין את עולם הטבע
+לפי ההיררכיה הבאה:
+
+\begin{center}
+ \begin{tabular}{lll}
+ \hline
+ עברית & לטינית & אנגלית \\
+ \hline
+ ממלכה & Regnum & Kingdom \\
+ מערכה & Phylum & \\
+ מחלקה & Classis & Class \\
+ סדרה & Ordo & Order \\
+ משפחה & Familia & Family \\
+ סוג & Genus & \\
+ מין & Species & \\
+ \hline
+ \end{tabular}
+\end{center}
+
+כל ממלכה מתחלקת למספר מערכות, בכל מערכה מספר מחלקות, וכן הלאה.
+
+ניתן לזכור את ההיררכיה בעזרת המנמוניקה הבאה: ”Kings Play Chess On Fancy
+Glass Stools“.
+
+כאשר נזקקו הטקסונומים לטקסונים נוספים, הם השתמשו בטקסונים אלה בצרוף
+הקידומות "על-" ו"תת-". כך למשל נוצרו "על-מחלקה" ו"תת-סדרה".
+
+ליניאוס התייחס רק לשתי ממלכות: צמחים ובעלי חיים. ממלכת הצמחים כללה גם
+אצות וחיידקים ואילו ממלכת בעלי החיים כללה גם חד תאיים כפרוטוזואה. עם
+הזמן התגלו יצורים שלא ניתן היה לשייך אותם לאף אחת משתי הממלכות הללו,
+ונוצר הצורך להוסיף ממלכות נוספות.
+
+בתחילת שנות ה-80 של המאה ה-20 היה מקובל למיין את היצורים בעולם הטבע
+לחמש הממלכות הבאות:
+
+\begin{itemize}
+ \item מונרה (Monera) שכללה חיידקים וכחוליות.
+ \item פרוטוקטיסטה (Protoctista) שכללה חד תאיים כפרוטוזואה ואצות.
+ \item פטריות (Fungi).
+ \item צמחים (Plantae) שכללה גם כמה קבוצות של אצות.
+ \item בעלי חיים (Animalia).
+\end{itemize}
+
+\section{מיון מודרני}
+
+שיטת המיון של ליניאוס מבוססת על דמיון בתכונות היצורים ובמראם. כיום, עם
+התפתחות הביולוגיה, הפכה שיטה זו למיושנת. שיטות מיון חדשות שהוצעו,
+מבוססות בעיקר על דמיון גנטי. כתוצאה מכך, קבוצות רבות של יצורים שנחשבו
+כיחידות סיסטמטיות, אינן עוד כאלה.
+
+שיטות המיון המודרניות נוטות לחלק את היצורים לשלוש על-ממלכות:
+
+\begin{itemize}
+ \item חיידקים אמיתיים (Bacteria)
+ \item חיידקים קדומים (Archaea)
+ \item אוקריוטיים (Eucaryota)
+\end{itemize}
+
+חיידקים אמיתיים וחיידקים קדומים הם יצורים חסרי גרעין (פרוקריוטיים)
+ואילו אוקריוטיים הם יצורים בעלי גרעין. האוקריוטיים עצמם ממוינים לקבוצות
+של חד-תאיים כפרוטוזואה ואצות ולשלוש ממלכות: בעלי חיים (Metazoa), פטריות
+וצומח (Viridiplantae). עם זאת, עד עתה לא הצליחה אף שיטה לתפוס את מקומו
+של מיון ליניאוס הנפוץ והביולוגים עדיין משתמשים בה רבות.
+
+המורכבות של מיון עולם הטבע מומחשת בשיטת מיון המערכה בעלי פרחים, הקבוצה
+הגדולה ואחת החשובות ביותר של הצמחים, שעברה שינויים רבים במשך הזמן, ככל
+שהתרחב הידע האנושי, והתגלו יחסים חדשים בין המשפחות השונות. המיון
+המסורתי, שמתבסס על מכלול התכונות החיצוניות והמבנה של כל פרט, מיוצג על
+ידי שיטת קרונקויסט שהוצעה ב־1981 על ידי ארתור קרונקויסט. עם זאת כיום
+ברור שהשיטה הזאת איננה מייצגת נאמנה את מהלך ההתפתחות האבולוציונית.
+ההסכמה הכללית לגבי מיון מערכת בעלי הפרחים החלה להתגבש רק עתה והיא
+מתבססת על תכונות משותפות המתבטאות ברמה הגנטית. עבודה מרכזית בתחום זה
+נעשתה על ידי קבוצת APG, שפרסמה ב־1998 מיון חדש ומקיף. עם המשך המחקר
+הגנטי וגילוי ידע חדש, פורסם עדכון למיון זה בשנת 2003.
+
+\section{קישורים חיצוניים}
+
+\begin{itemize}
+ \item ITIS – אתר של ממשלות ארצות הברית, קנדה ומקסיקו למיון עולם
+ הטבע.\footnote{המיונים בוויקיפדיה נעשים על פי אתר זה.}
+ \item Tree of Life Web Project – אתר פרויקט עץ החיים
+\end{itemize}
+
+% -----------
+
+\part{פונקציה}
+
+\section{הגדרה פורמלית}
+
+מסמנים $f(x)=y$ אם ורק אם $(x,y) \in f$. במקרה כזה האיבר y קרוי
+ה\textbf{תמונה} של $x$, ו-$x$ קרוי \textbf{מקור} של $y$. התנאי הראשון
+מבטיח שלכל x ב-$X$ יש תמונה. התנאי השני מבטיח שתמונה זו היא יחידה. יחס
+שהוא גם חד ערכי וגם מלא נקרא פונקציה.
+
+אם מוותרים על התנאי הראשון (לא לכל איבר יש בהכרח תמונה) אז מתקבלת
+פונקציה חלקית, ואם מוותרים על התנאי השני (ייתכנו איברים עם יותר
+מתמונה אחת) מתקבלת פונקציה מרובה. אם מוותרים על שני התנאים יחדיו
+מתקבל יחס במובנו הכללי.
+
+שתי פונקציות $f,g$, עם אותו תחום וטווח, מוגדרות כשוות רק כאשר
+$f(x)=g(x)$ לכל $x\in X$.
+
+לכל $Z \subseteq X$ (תת-קבוצה כלשהי של $X$) הקבוצה $f(Z)$ היא תת-קבוצה
+של Y המוגדרת: $f(Z) = \{f(z) \mid z\in Z \}$. כלומר זוהי התת-קבוצה של Y
+הכוללת את כל האיברים שהם תמונות של איברי $Z$. אומרים על $f(Z)$ שהיא
+התמונה של Z. בפרט, הקבוצה $f(X)$ הכוללת את כל האיברים ב-$Y$ שהם תמונה
+של איבר כלשהו ב-$X$, נקראת ה\textbf{תמונה} של הפונקציה $f$.
+
+לכל $Z \subseteq Y$ הקבוצה $f^{-1}(Z)$ היא תת-קבוצה של $X$ המוגדרת: $\{x
+\in X \mid f(x)\in Z\}$. כלומר זוהי התת-קבוצה של $X$ הכוללת את כל האיברים
+שהתמונה שלהם היא איבר ב-$Z$. אומרים על $f^{-1}(Z)$ שהיא המקור של $Z$.
+
+אם $f: X \to Y$ היא פונקציה, ו-$Z \subseteq X$, אז הפונקציה $f|_Z : Z
+\to Y$ המוגדרת $f|_Z(z) = f(z)$, נקראת \textbf{הצמצום של $f$ ל-$Z$}. זוהי
+הפונקציה שזהה לפונקציה $f$, רק שתחומה הוא $Z$.
+
+\section{Psalms}
+
+\selectlanguage{rl}
+
+Compare with \texttt{http://tanach.us/Tanach.xml?Ps1:1-1:6}.
+Cantillation marks (the second paragraph) are wrong with both
+\textsf{xetex} and \textsf{luatex}. The font is FreeSerif. Depending on
+the font and the engine, the rendering may be better or worse.
+
+\bigskip
+
+\selectlanguage{hebrew}
+
+אַשְׁרֵי־הָאִישׁ אֲשֶׁר לֹא הָלַךְ בַּעֲצַת רְשָׁעִים וּבְדֶרֶךְ
+חַטָּאִים לֹא עָמָד וּבְמוֹשַׁב לֵצִים לֹא יָשָׁב׃ כִּי אִם בְּתוֹרַת
+יְהוָה חֶפְצוֹ וּבְתוֹרָתוֹ יֶהְגֶּה יוֹמָם וָלָיְלָה׃ וְהָיָה כְּעֵץ
+שָׁתוּל עַל־פַּלְגֵי מָיִם אֲשֶׁר פִּרְיוֹ יִתֵּן בְּעִתּוֹ וְעָלֵהוּ
+לֹא־יִבּוֹל וְכֹל אֲשֶׁר־יַעֲשֶׂה יַצְלִיחַ׃ לֹא־כֵן הָרְשָׁעִים כִּי
+אִם־כַּמֹּץ אֲשֶׁר־תִּדְּפֶנּוּ רוּחַ׃ עַל־כֵּן לֹא־יָקֻמוּ רְשָׁעִים
+בַּמִּשְׁפָּט וְחַטָּאִים בַּעֲדַת צַדִּיקִים׃ כִּי־יוֹדֵעַ יְהוָה
+דֶּרֶךְ צַדִּיקִים וְדֶרֶךְ רְשָׁעִים תֹּאבֵד׃
+
+אַ֥שְֽׁרֵי־הָאִ֗ישׁ אֲשֶׁ֤ר ׀ לֹ֥א הָלַךְ֮ בַּעֲצַ֪ת רְשָׁ֫עִ֥ים
+וּבְדֶ֣רֶךְ חַ֭טָּאִים לֹ֥א עָמָ֑ד וּבְמוֹשַׁ֥ב לֵ֝צִ֗ים לֹ֣א יָשָֽׁב׃
+כִּ֤י אִ֥ם בְּתוֹרַ֥ת יְהוָ֗ה חֶ֫פְצ֥וֹ וּֽבְתוֹרָת֥וֹ יֶהְגֶּ֗ה
+יוֹמָ֥ם וָלָֽיְלָה׃ וְֽהָיָ֗ה כְּעֵץ֮ שָׁת֪וּל עַֽל־פַּלְגֵ֫י מָ֥יִם
+אֲשֶׁ֤ר פִּרְי֨וֹ ׀ יִתֵּ֬ן בְּעִתּ֗וֹ וְעָלֵ֥הוּ לֹֽא־יִבּ֑וֹל וְכֹ֖ל
+אֲשֶׁר־יַעֲשֶׂ֣ה יַצְלִֽיחַ׃ לֹא־כֵ֥ן הָרְשָׁעִ֑ים כִּ֥י אִם־כַּ֝מֹּ֗ץ
+אֲֽשֶׁר־תִּדְּפֶ֥נּוּ רֽוּחַ׃ עַל־כֵּ֤ן ׀ לֹא־יָקֻ֣מוּ רְ֭שָׁעִים
+בַּמִּשְׁפָּ֑ט וְ֝חַטָּאִ֗ים בַּעֲדַ֥ת צַדִּיקִֽים׃ כִּֽי־יוֹדֵ֣עַ
+יְ֭הוָה דֶּ֣רֶךְ צַדִּיקִ֑ים וְדֶ֖רֶךְ רְשָׁעִ֣ים תֹּאבֵֽד׃
+
+\end{document}
diff --git a/samples/lua-sanskrit.pdf b/samples/lua-sanskrit.pdf
index cf9edc0..3d39de0 100644
Binary files a/samples/lua-sanskrit.pdf and b/samples/lua-sanskrit.pdf differ
diff --git a/samples/lua-sanskrit.tex b/samples/lua-sanskrit.tex
index 80a7d51..8ef7f74 100644
--- a/samples/lua-sanskrit.tex
+++ b/samples/lua-sanskrit.tex
@@ -30,7 +30,7 @@
\raggedright
-Some Devanagari fonts with luatex.
+Some Devanagari fonts with luatex. Note the ‘ra’.
\section{FreeSerif}\fsfamily\text
diff --git a/samples/lua-se-he.pdf b/samples/lua-se-he.pdf
index a105cac..261b489 100644
Binary files a/samples/lua-se-he.pdf and b/samples/lua-se-he.pdf differ
diff --git a/samples/lua-secenum.pdf b/samples/lua-secenum.pdf
index 42eec82..0faf38a 100644
Binary files a/samples/lua-secenum.pdf and b/samples/lua-secenum.pdf differ
diff --git a/samples/lua-thai.pdf b/samples/lua-thai.pdf
index 9bc973d..949b3ed 100644
Binary files a/samples/lua-thai.pdf and b/samples/lua-thai.pdf differ
diff --git a/samples/xe-bidi.pdf b/samples/xe-bidi.pdf
index 2880841..2b77ba6 100644
Binary files a/samples/xe-bidi.pdf and b/samples/xe-bidi.pdf differ
More information about the latex3-commits
mailing list