summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-08-22 22:45:10 +0000
committerKarl Berry <karl@freefriends.org>2023-08-22 22:45:10 +0000
commit2ac7a85f8da9a2f72f7a7c4f7cd278d9b6e1cca3 (patch)
tree0a83dec8f898c64a26d4cf9a0bf2e633178ed8a3 /Master/texmf-dist/source
parente6a80606f494a33ec368a6221544cb27c5ebd08c (diff)
babel-hebrew (23aug23)
git-svn-id: svn://tug.org/texlive/trunk@68016 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/generic/babel-hebrew/hebrew.dtx47
-rw-r--r--Master/texmf-dist/source/generic/babel-hebrew/hebrew.ins2
2 files changed, 38 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/generic/babel-hebrew/hebrew.dtx b/Master/texmf-dist/source/generic/babel-hebrew/hebrew.dtx
index f97c57bcac5..a021f766b47 100644
--- a/Master/texmf-dist/source/generic/babel-hebrew/hebrew.dtx
+++ b/Master/texmf-dist/source/generic/babel-hebrew/hebrew.dtx
@@ -44,7 +44,7 @@
%</driver>
% \fi
% \ProvidesFile{hebrew.dtx}
- [2023/08/16 v2.4 %
+ [2023/08/22 v2.4a %
% \iffalse
%<hebrew> Hebrew language definition from the babel system
%<rightleft> Right-to-Left support from the babel system
@@ -373,14 +373,45 @@
% compatibility reasons}
% \begin{macrocode}
% \changes{hebrew~2.4}{2023/08/16}{Make NHE8 the default font encoding}
-\providecommand{\HeblatexEncoding}{NHE8}%
-\providecommand{\HeblatexEncodingFile}{nhe8enc}%
+% \changes{hebrew~2.4a}{2023/08/16}{Better handeling for font encoding}
+\@ifundefined{HeblatexEncoding}
+ {
+ \@ifl@aded{def}{nhe8enc}
+ {
+ \providecommand*\HeblatexEncoding{NHE8}
+ \providecommand*\HeblatexEncodingFile{nhe8enc}
+ }
+ {
+ \@ifl@aded{def}{he8enc}
+ {
+ \providecommand*\HeblatexEncoding{HE8}
+ \providecommand*\HeblatexEncodingFile{he8enc}
+ }
+ {
+ \@ifl@aded{def}{lheenc}
+ {
+ \providecommand*\HeblatexEncoding{LHE}
+ \providecommand*\HeblatexEncodingFile{lheenc}
+ }
+ {
+ \providecommand*\HeblatexEncoding{NHE8}
+ \providecommand*\HeblatexEncodingFile{nhe8enc}
+
+ }
+ }
+ }
+ }{}
+\@ifl@aded{def}{\HeblatexEncodingFile}{}
+ {\input{\HeblatexEncodingFile.def}}
+
\newcommand{\heblatex@set@encoding}[2]{
}
-\@ifl@aded{def}{\HeblatexEncodingFile}{}%
-{\input{\HeblatexEncodingFile.def}}
-\def\hebrewencoding{\HeblatexEncoding}
+
+\edef\hebrewencoding{\HeblatexEncoding}
\def\heb@NHEenc{NHE8}
+\ifx\heb@NHEenc\hebrewencoding
+ \def\@brackets#1#2#3{#1#2#3}
+\fi
% \end{macrocode}
% \end{macro}
% \changes{hebrew~2.4}{2023/08/16}{Assuming utf8 as default input encoding.}
@@ -1400,12 +1431,8 @@
% bracket. Brackets can be square brackets, braces, or
% parentheses.
% \begin{macrocode}
-\ifx\heb@NHEenc\HeblatexEncoding
-\def\@brackets#1#2#3{#1#2#3}
-\else
\def\@brackets#1#2#3{\protect\if@rl #3#2#1\protect\else
#1#2#3\protect\fi}
-\fi
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/generic/babel-hebrew/hebrew.ins b/Master/texmf-dist/source/generic/babel-hebrew/hebrew.ins
index b90547761ac..20251e37c9a 100644
--- a/Master/texmf-dist/source/generic/babel-hebrew/hebrew.ins
+++ b/Master/texmf-dist/source/generic/babel-hebrew/hebrew.ins
@@ -28,7 +28,7 @@
%% --------------- start of docstrip commands ------------------
%%
\def\batchfile{hebrew.ins}
-\def\filedate{2023/08/16}
+\def\filedate{2023/08/22}
\input docstrip.tex
{\ifx\generate\undefined