babel-hebrew (23aug23)

git-svn-id: svn://tug.org/texlive/trunk@68016 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 80 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-hebrew/README.md b/Master/texmf-dist/doc/generic/babel-hebrew/README.md
index c81d658b83b..4ccdd62aaea 100644
--- a/Master/texmf-dist/doc/generic/babel-hebrew/README.md
+++ b/Master/texmf-dist/doc/generic/babel-hebrew/README.md
@@ -3,18 +3,10 @@ babel-hebrew
 
 This is the babel style for the hebrew language. 
 
-**Version**: 2.4
+**Version**: 2.4a
 
 **Copyright**: © 1997 -- 2005 Boris Lavva and Johannes Braams.  © 2023 Udi Fogiel.
 
-Changes
--------
-
-Fixes:
-* New default font and input encodings.
-* Fixing \underline.
-* Fixing clashes of \everypar with other packages.
-
 This work may be distributed and/or modified under the conditions of the
 [LaTeX Project Public License](http://www.latex-project.org/lppl.txt),
 either version 1.3 of this license or any later version.
diff --git a/Master/texmf-dist/doc/generic/babel-hebrew/hebrew.pdf b/Master/texmf-dist/doc/generic/babel-hebrew/hebrew.pdf
index 23907586c6d..ee9065dee12 100644
--- a/Master/texmf-dist/doc/generic/babel-hebrew/hebrew.pdf
+++ b/Master/texmf-dist/doc/generic/babel-hebrew/hebrew.pdf
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
diff --git a/Master/texmf-dist/tex/generic/babel-hebrew/hebcal.sty b/Master/texmf-dist/tex/generic/babel-hebrew/hebcal.sty
index 644c717de5f..b7343e8aa06 100644
--- a/Master/texmf-dist/tex/generic/babel-hebrew/hebcal.sty
+++ b/Master/texmf-dist/tex/generic/babel-hebrew/hebcal.sty
@@ -34,7 +34,7 @@
 %% Copyright (C) 1991 by Michail Rozman, misha@iop.tartu.ew.su
 %%
 \ProvidesPackage{hebcal}
-        [2023/08/16 v2.4 %
+        [2023/08/22 v2.4a %
          Hebrew calendar
     Hebrew language support from the babel system]
 \newif\if@full@hebrew@year
diff --git a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew.ldf b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew.ldf
index 1d347991f00..17c7d0eda5a 100644
--- a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew.ldf
+++ b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew.ldf
@@ -31,7 +31,7 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesFile{hebrew.ldf}
-        [2023/08/16 v2.4 %
+        [2023/08/22 v2.4a %
          Hebrew language definition from the babel system
     Hebrew language support from the babel system]
 \LdfInit{hebrew}{captionshebrew}
@@ -39,14 +39,44 @@
   \@nopatterns{Hebrew}%
   \adddialect\l@hebrew0
 \fi
-\providecommand{\HeblatexEncoding}{NHE8}%
-\providecommand{\HeblatexEncodingFile}{nhe8enc}%
-\newcommand{\heblatex@set@encoding}[2]{
+\@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}{}%
+  }{}
+\@ifl@aded{def}{\HeblatexEncodingFile}{}
 {\input{\HeblatexEncodingFile.def}}
-\def\hebrewencoding{\HeblatexEncoding}
+
+\newcommand{\heblatex@set@encoding}[2]{
+}
+
+\edef\hebrewencoding{\HeblatexEncoding}
 \def\heb@NHEenc{NHE8}
+\ifx\heb@NHEenc\hebrewencoding
+\def\@brackets#1#2#3{#1#2#3}
+\fi
 \providehyphenmins{\CurrentOption}{\tw@\tw@}
 \addto\captionshebrew{%
   \def\prefacename{\@ensure@R{\hebmem\hebbet\hebvav\hebalef}}%
diff --git a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_newcode.sty b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_newcode.sty
index 1ef28cc8ecb..9db52a147ff 100644
--- a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_newcode.sty
+++ b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_newcode.sty
@@ -31,7 +31,7 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesPackage{hebrew_newcode} 
-        [2023/08/16 v2.4 %
+        [2023/08/22 v2.4a %
   Package for backwards compatibility 
     Hebrew language support from the babel system]
 \NeedsTeXFormat{LaTeX2e}
diff --git a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_oldcode.sty b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_oldcode.sty
index 4e8e9170494..744db426e91 100644
--- a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_oldcode.sty
+++ b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_oldcode.sty
@@ -31,7 +31,7 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesPackage{hebrew_oldcode}
-        [2023/08/16 v2.4 %
+        [2023/08/22 v2.4a %
  Package for backwards compatibility
     Hebrew language support from the babel system]
 \NeedsTeXFormat{LaTeX2e}
diff --git a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_p.sty b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_p.sty
index 750799021cd..3886f3cb0cf 100644
--- a/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_p.sty
+++ b/Master/texmf-dist/tex/generic/babel-hebrew/hebrew_p.sty
@@ -31,7 +31,7 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesPackage{hebrew_p}
-        [2023/08/16 v2.4 %
+        [2023/08/22 v2.4a %
  Package for backwards compatibility
     Hebrew language support from the babel system]
 \NeedsTeXFormat{LaTeX2e}
diff --git a/Master/texmf-dist/tex/generic/babel-hebrew/rlbabel.def b/Master/texmf-dist/tex/generic/babel-hebrew/rlbabel.def
index 35015213985..c2d6c6cb92d 100644
--- a/Master/texmf-dist/tex/generic/babel-hebrew/rlbabel.def
+++ b/Master/texmf-dist/tex/generic/babel-hebrew/rlbabel.def
@@ -31,7 +31,7 @@
 %% extension .ins) which are part of the distribution.
 %% 
 \ProvidesFile{rlbabel.def}
-        [2023/08/16 v2.4 %
+        [2023/08/22 v2.4a %
          Right-to-Left support from the babel system
     Hebrew language support from the babel system]
 \ifx\TeXXeTstate\undefined\else%
@@ -125,12 +125,8 @@
 \let\everypar=\heb@n@everypar
 \newcommand{\hmbox}[1]{\mbox{\R{#1}}}
 \newcommand{\embox}[1]{\mbox{\L{#1}}}
-\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
 \def\@@number#1{\ifmmode\else\beginL\fi#1\ifmmode\else\endL\fi}
 \def\@@latin#1{\@@number{{\@fromrl#1}}}
 \def\@number{\protect\@@number}