bidi (27may22)

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

4 files changed, 317 insertions, 44 deletions

diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx
index 086bc4557a7..fb1f37974a6 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx
@@ -20,7 +20,7 @@ If you use \textsf{bidi} package to write any input \TeX\ document, and then run
 * Copyright (c) 2007--2022 Vafa Khalighi
 * Copyright (c) 2018--2020 bidi-tex GitHub Organization
 * 
-* v37.0, 2022/05/24
+* v37.1, 2022/05/27
 * 
 * License: LaTeX Project Public License, version
 * 1.3c or higher (your choice)
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx
index e1b7a505fdf..254c51d806e 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx
@@ -3,7 +3,7 @@
 \begin{document}
 \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
 \LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-\large User documentation for \textcolor{blue!65!black}{version 37.0}}
+\large User documentation for \textcolor{blue!65!black}{version 37.1}}
 \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the  {\LaTeX} team to maintain the package in the period 2018--2020.}}
 \setcounter{page}{0}
 \thispagestyle{empty}
@@ -13,7 +13,7 @@
 \textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
 
 \Large
-User documentation for \textcolor{blue!65!black}{version 37.0}}
+User documentation for \textcolor{blue!65!black}{version 37.1}}
 
 \vskip 0pt plus 3fill
 \textit{\large to my Master, \textbf{Ferdowsi The Great}}
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx b/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx
index 2e468609a00..2fa06275487 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi-doc.ltx
@@ -1,7 +1,7 @@
 \documentclass{ltxdoc}
 \input{bidi-doc-preamble.ltx}
 \hypersetup{%
-  pdftitle={User documentation for version 37.0 of the bidi
+  pdftitle={User documentation for version 37.1 of the bidi
                 package}%
 }
 \begin{document}
diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
index 793628e4faf..7cb0111153f 100644
--- a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
+++ b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
@@ -5,7 +5,7 @@
 %<*readme>
 ___________________
 The bidi package
-v37.0
+v37.1
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -30,7 +30,7 @@ The announcements for the new releases of the package will
 also appear in the Discussions space under the Announcements
 category.
   
-Current version release date: 2022/05/24
+Current version release date: 2022/05/27
 
 ___________________________________________
 Vafa Khalighi
@@ -239,7 +239,7 @@ by Vafa Khalighi.
 \documentclass{ltxdoc}
 \input{bidi-doc-preamble.ltx}
 \hypersetup{%
-  pdftitle={Source documentation for version 37.0 of the bidi
+  pdftitle={Source documentation for version 37.1 of the bidi
                 package}%
 }
 \EnableCrossrefs
@@ -258,7 +258,7 @@ by Vafa Khalighi.
 % \GetFileInfo{\jobname.dtx}
 % \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
 %\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Source documentation for \textcolor{blue!65!black}{version 37.0}}
+%\large Source documentation for \textcolor{blue!65!black}{version 37.1}}
 % \author{Vafa Khalighi\thanks{Thanks to the bidi-tex GitHub organization consisted of David Carlisle and other members of the  {\LaTeX} team to maintain the package in the period 2018--2020.}}
 %\setcounter{page}{0}
 %\thispagestyle{empty}
@@ -268,7 +268,7 @@ by Vafa Khalighi.
 %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
 %
 %\Large
-%Source documentation for \textcolor{blue!65!black}{version 37.0}}
+%Source documentation for \textcolor{blue!65!black}{version 37.1}}
 %
 %\vskip 0pt plus 3fill
 %\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -317,7 +317,7 @@ by Vafa Khalighi.
 %\iffalse
 %<*table>
 %\fi
-%% \CheckSum{51690}
+%% \CheckSum{52030}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -2388,9 +2388,9 @@ by Vafa Khalighi.
   \fi
 }
 
-\expandafter\let\csname beamer@@tmpop@subsection in toc@default\endcsname\relax
+\bidi@csundef{beamer@@tmpop@subsection in toc@default}
 
-\expandafter\let\csname beamer@@tmpop@subsubsection in toc@default\endcsname\relax
+\bidi@csundef{beamer@@tmpop@subsubsection in toc@default}
 
 \defbeamertemplate*{subsection in toc}{default}
 {\leavevmode\bidi@beamer@leftskip=1.5em\inserttocsubsection\par}
@@ -2407,11 +2407,11 @@ by Vafa Khalighi.
   \fi
 } 
 
-\expandafter\let\csname beamer@@tmpop@itemize item@default\endcsname\relax
+\bidi@csundef{beamer@@tmpop@itemize item@default}
 
-\expandafter\let\csname beamer@@tmpop@itemize subitem@default\endcsname\relax
+\bidi@csundef{beamer@@tmpop@itemize subitem@default}
 
-\expandafter\let\csname beamer@@tmpop@itemize subsubitem@default\endcsname\relax
+\bidi@csundef{beamer@@tmpop@itemize subsubitem@default}
 
 \defbeamertemplate*{itemize item}{default}{\usebeamerfont*{itemize item}\raise1.25pt\hbox{\donotcoloroutermaths\bidi@beamer@blacktriangle}}
 \defbeamertemplate*{itemize subitem}{default}{\usebeamerfont*{itemize subitem}\raise1.5pt\hbox{\donotcoloroutermaths\bidi@beamer@blacktriangle}}
@@ -2464,8 +2464,8 @@ by Vafa Khalighi.
 % \section{File \texttt{bidi.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2022/05/24}
-\def\bidi@version{37.0}
+\def\bididate{2022/05/27}
+\def\bidi@version{37.1}
 \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\@bidi@info{****************************************************^^J%
@@ -2553,7 +2553,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 }
 \newcommand*{\@bidi@pdfcustomproperties}{%
   This is the bidi package, Version \bidi@version,
-  Released May 24, 2022. 
+  Released May 27, 2022. 
 }
 \newcommand*{\bidi@beamer@ragged}{}
 \@RTLmainfalse
@@ -2797,9 +2797,9 @@ Bidirectional typesetting in plain TeX and LaTeX]
 %\fi
 % \section{File \texttt{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2022/05/24}
+\def\bididate{2022/05/27}
 \catcode`@=11
-\def\bidi@version{37.0}
+\def\bidi@version{37.1}
 \let \protect \relax
 \newlinechar`\^^J
 \edef\@bidi@info{****************************************************^^J%
@@ -2901,7 +2901,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 }
 \def\@bidi@pdfcustomproperties{%
   This is the bidi package, Version \bidi@version,
-  Released May 24, 2022. 
+  Released May 27, 2022. 
 }
 \def\bidi@pdfm@mark{%
   \special{pdf:%
@@ -4438,6 +4438,9 @@ ill-advised in the old versions of bidi package.%
 
 
 \bidi@newrobustcmd{\bidi@undef}[1]{\let#1\bidi@undefined}
+\bidi@newrobustcmd{\bidi@csundef}[1]{%
+  \expandafter\let\csname #1\endcsname\bidi@undefined
+}
 
 \let\bidi@dbg@trce\@gobble
 \let\bidi@dbg@init\@gobble
@@ -18818,7 +18821,7 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{scrartcl-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{scrartcl-xetex-bidi.def}[2022/05/22 v1.2 bidi adaptations for scrartcl class for XeTeX engine]
+\ProvidesFile{scrartcl-xetex-bidi.def}[2022/05/27 v1.3 bidi adaptations for scrartcl class for XeTeX engine]
 \newcommand{\scr@saved@LTRfootnotetext}{}
 \newcommand{\scr@saved@RTLfootnotetext}{}
 \let\scr@saved@footnotetext\@footnotetext
@@ -19327,6 +19330,89 @@ to\rtside{\box\bslice\hfil}}
   \fi
 }
 
+\renewcommand{\scr@@makesinglelinecaption}[3]{%
+    {\usekomafont{caption}{\strut\ignorespaces
+      #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+      \ignorespaces #3\unskip}}%
+}
+
+\renewcommand{\scr@makemultilinecaption}[3]{%
+  {%
+    \usefontofkomafont{caption}{%
+      \hb@xt@\hsize{%
+        \cap@left
+        \vbox{\hsize\cap@width\linewidth\hsize
+          \scr@ifundefinedorrelax{@captype}{%
+            \ClassWarning{\KOMAClassName}{%
+              `\string\caption' outside float.\MessageBreak
+              Seems you are using `\string\caption' outside a
+              float.\MessageBreak
+              Maybe you are using a package that uses
+              `\string\@makecaption'\MessageBreak
+              without setting `\string\@captype' before.\MessageBreak
+              Because I cannot detect the caption type, I'm using\MessageBreak
+              the empty one.%
+            }%
+            \let\@captype\@empty
+          }{}%
+          \scr@ifundefinedorrelax{ragged\@captype caption}{\raggedcaption}{%
+            \@nameuse{ragged\@captype caption}%
+          }%
+          \ifdofullc@p
+            \@hangfrom{%
+              \strut
+              \scr@smashdp{%
+                #1{%
+                  \usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }%
+                }%
+              }%
+            }%
+            {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+          \else
+            \ifdim\cap@indent<\z@
+              \strut
+              #1{%
+                {\usekomafont{caption}{%
+                  \usekomafont{captionlabel}{#2\captionformat}%
+                }%
+              }\par}%
+              \noindent{{\usekomafont{caption}{%
+                  \hspace*{-\cap@indent}#3\scr@endstrut
+              }}\par}%
+            \else
+              \if@capbreak
+                \strut
+                #1{%
+                  {\usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }%
+                }\par}%
+                \noindent\@hangfrom{\hspace*{\cap@indent}}%
+                {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+              \else
+                \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+                {%
+                  \hspace{-\cap@indent}%
+                  \scr@smashdp{%
+                    #1{\usekomafont{caption}{%
+                        \usekomafont{captionlabel}{#2\captionformat}%
+                      }%
+                    }%
+                  }%
+                  {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+                }%
+              \fi
+            \fi
+          \fi
+        }%
+        \cap@right
+      }\par\kern\dp\strutbox
+    }%
+  }\kern-\dp\strutbox
+}
+
 \bidi@AfterFile{longtable-xetex-bidi.def}{%
   \if@komalongtable
     \renewcommand{\LT@makecaption}[3]{%
@@ -19381,7 +19467,7 @@ to\rtside{\box\bslice\hfil}}
   \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}%
   \expandafter\renewcommand%
   \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
-    \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}%
+    {\usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}}%
   \expandafter\renewcommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
 }
@@ -19399,7 +19485,7 @@ to\rtside{\box\bslice\hfil}}
   \expandafter\renewcommand%
   \csname scr@tso@#1@entryformat\endcsname{\usekomafont{sectionentry}}%
   \expandafter\renewcommand%
-  \csname scr@tso@#1@pagenumberformat\endcsname[1]{\usekomafont{sectionentry}{\usekomafont{sectionentrypagenumber}{##1}}}%
+  \csname scr@tso@#1@pagenumberformat\endcsname[1]{{\usekomafont{sectionentry}{\usekomafont{sectionentrypagenumber}{##1}}}}%
   \expandafter\renewcommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
 }
@@ -19408,6 +19494,9 @@ to\rtside{\box\bslice\hfil}}
 \TOCEntryStyleStartInitCode{subsection}{%
   \expandafter\renewcommand%
   \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+      \expandafter\renewcommand%
+      \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+        {\normalfont\normalcolor ##1}}%
 }
 
 \CloneTOCEntryStyle{subsection}{default}
@@ -19478,7 +19567,7 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{scrbook-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{scrbook-xetex-bidi.def}[2022/05/22 v1.2 bidi adaptations for scrbook class for XeTeX engine]
+\ProvidesFile{scrbook-xetex-bidi.def}[2022/05/27 v1.3 bidi adaptations for scrbook class for XeTeX engine]
 \newcommand{\scr@saved@LTRfootnotetext}{}
 \newcommand{\scr@saved@RTLfootnotetext}{}
 \let\scr@saved@footnotetext\@footnotetext
@@ -20008,6 +20097,91 @@ to\rtside{\box\bslice\hfil}}
     \vskip\belowcaptionskip
   \fi
 }
+
+\renewcommand{\scr@@makesinglelinecaption}[3]{%
+    {\usekomafont{caption}{\strut\ignorespaces
+      #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+      \ignorespaces #3\unskip}}%
+}
+
+\renewcommand{\scr@makemultilinecaption}[3]{%
+  {%
+    \usefontofkomafont{caption}{%
+      \hb@xt@\hsize{%
+        \cap@left
+        \vbox{\hsize\cap@width\linewidth\hsize
+          \scr@ifundefinedorrelax{@captype}{%
+            \ClassWarning{\KOMAClassName}{%
+              `\string\caption' outside float.\MessageBreak
+              Seems you are using `\string\caption' outside a
+              float.\MessageBreak
+              Maybe you are using a package that uses
+              `\string\@makecaption'\MessageBreak
+              without setting `\string\@captype' before.\MessageBreak
+              Because I cannot detect the caption type, I'm using\MessageBreak
+              the empty one.%
+            }%
+            \let\@captype\@empty
+          }{}%
+          \scr@ifundefinedorrelax{ragged\@captype caption}{\raggedcaption}{%
+            \@nameuse{ragged\@captype caption}%
+          }%
+          \ifdofullc@p
+            \@hangfrom{%
+              \strut
+              \scr@smashdp{%
+                #1{%
+                  \usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }%
+                }%
+              }%
+            }%
+            {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+          \else
+            \ifdim\cap@indent<\z@
+              \strut
+              #1{%
+                {\usekomafont{caption}{%
+                  \usekomafont{captionlabel}{#2\captionformat}%
+                }%
+              }\par}%
+              \noindent{{\usekomafont{caption}{%
+                  \hspace*{-\cap@indent}#3\scr@endstrut
+              }}\par}%
+            \else
+              \if@capbreak
+                \strut
+                #1{%
+                  {\usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }
+                }\par}%
+                \noindent\@hangfrom{\hspace*{\cap@indent}}%
+                {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+              \else
+                \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+                {%
+                  \hspace{-\cap@indent}%
+                  \scr@smashdp{%
+                    #1{\usekomafont{caption}{%
+                        \usekomafont{captionlabel}{#2\captionformat}%
+                      }%
+                    }%
+                  }%
+                  {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+                }%
+              \fi
+            \fi
+          \fi
+        }%
+        \cap@right
+      }\par\kern\dp\strutbox
+    }%
+  }\kern-\dp\strutbox
+}
+
+
 \bidi@AfterFile{longtable-xetex-bidi.def}{%
   \if@komalongtable
     \renewcommand{\LT@makecaption}[3]{%
@@ -20062,7 +20236,7 @@ to\rtside{\box\bslice\hfil}}
   \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}%
   \expandafter\renewcommand%
   \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
-    \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}%
+    {\usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}}%
   \expandafter\renewcommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
 }
@@ -20081,7 +20255,7 @@ to\rtside{\box\bslice\hfil}}
   \csname scr@tso@#1@entryformat\endcsname{\usekomafont{chapterentry}}%
   \expandafter\renewcommand%
   \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
-    \usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}%
+    {\usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}}%
   \expandafter\renewcommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
 }
@@ -20090,6 +20264,9 @@ to\rtside{\box\bslice\hfil}}
 \TOCEntryStyleStartInitCode{section}{%
   \expandafter\renewcommand%
   \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+      \expandafter\renewcommand%
+      \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+        {\normalfont\normalcolor ##1}}%
 }
 
 \CloneTOCEntryStyle{section}{default}
@@ -20170,7 +20347,7 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{scrreprt-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{scrreprt-xetex-bidi.def}[2022/05/22 v1.2 bidi adaptations for scrreprt class for XeTeX engine]
+\ProvidesFile{scrreprt-xetex-bidi.def}[2022/05/27 v1.3 bidi adaptations for scrreprt class for XeTeX engine]
 \newcommand{\scr@saved@LTRfootnotetext}{}
 \newcommand{\scr@saved@RTLfootnotetext}{}
 \let\scr@saved@footnotetext\@footnotetext
@@ -20692,6 +20869,91 @@ to\rtside{\box\bslice\hfil}}
     \vskip\belowcaptionskip
   \fi
 }
+
+\renewcommand{\scr@@makesinglelinecaption}[3]{%
+    {\usekomafont{caption}{\strut\ignorespaces
+      #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+      \ignorespaces #3\unskip}}%
+}
+
+\renewcommand{\scr@makemultilinecaption}[3]{%
+  {%
+    \usefontofkomafont{caption}{%
+      \hb@xt@\hsize{%
+        \cap@left
+        \vbox{\hsize\cap@width\linewidth\hsize
+          \scr@ifundefinedorrelax{@captype}{%
+            \ClassWarning{\KOMAClassName}{%
+              `\string\caption' outside float.\MessageBreak
+              Seems you are using `\string\caption' outside a
+              float.\MessageBreak
+              Maybe you are using a package that uses
+              `\string\@makecaption'\MessageBreak
+              without setting `\string\@captype' before.\MessageBreak
+              Because I cannot detect the caption type, I'm using\MessageBreak
+              the empty one.%
+            }%
+            \let\@captype\@empty
+          }{}%
+          \scr@ifundefinedorrelax{ragged\@captype caption}{\raggedcaption}{%
+            \@nameuse{ragged\@captype caption}%
+          }%
+          \ifdofullc@p
+            \@hangfrom{%
+              \strut
+              \scr@smashdp{%
+                #1{%
+                  \usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }%
+                }%
+              }%
+            }%
+            {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+          \else
+            \ifdim\cap@indent<\z@
+              \strut
+              #1{%
+                {\usekomafont{caption}{%
+                  \usekomafont{captionlabel}{#2\captionformat}%
+                }%
+              }\par}%
+              \noindent{{\usekomafont{caption}{%
+                  \hspace*{-\cap@indent}#3\scr@endstrut
+              }}\par}%
+            \else
+              \if@capbreak
+                \strut
+                #1{%
+                  {\usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }%
+                }\par}%
+                \noindent\@hangfrom{\hspace*{\cap@indent}}%
+                {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+              \else
+                \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+                {%
+                  \hspace{-\cap@indent}%
+                  \scr@smashdp{%
+                    #1{\usekomafont{caption}{%
+                        \usekomafont{captionlabel}{#2\captionformat}%
+                      }%
+                    }%
+                  }%
+                  {{\usekomafont{caption}{#3\scr@endstrut}}\par}%
+                }%
+              \fi
+            \fi
+          \fi
+        }%
+        \cap@right
+      }\par\kern\dp\strutbox
+    }%
+  }\kern-\dp\strutbox
+}
+
+
 \bidi@AfterFile{longtable-xetex-bidi.def}{%
   \if@komalongtable
     \renewcommand{\LT@makecaption}[3]{%
@@ -20746,7 +21008,7 @@ to\rtside{\box\bslice\hfil}}
   \csname scr@tso@#1@entryformat\endcsname[1]{\usekomafont{partentry}{##1}}%
   \expandafter\renewcommand%
   \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
-    \usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}%
+    {\usekomafont{partentry}{\usekomafont{partentrypagenumber}{##1}}}}%
   \expandafter\renewcommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
 }
@@ -20765,7 +21027,7 @@ to\rtside{\box\bslice\hfil}}
   \csname scr@tso@#1@entryformat\endcsname{\usekomafont{chapterentry}}%
   \expandafter\renewcommand%
   \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
-    \usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}%
+    {\usekomafont{chapterentry}{\usekomafont{chapterentrypagenumber}{##1}}}}%
   \expandafter\renewcommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
 }
@@ -20774,6 +21036,9 @@ to\rtside{\box\bslice\hfil}}
 \TOCEntryStyleStartInitCode{section}{%
   \expandafter\renewcommand%
   \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
+      \expandafter\renewcommand%
+      \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
+        {\normalfont\normalcolor ##1}}%
 }
 
 \CloneTOCEntryStyle{section}{default}
@@ -21688,7 +21953,7 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{tocbasic-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{tocbasic-xetex-bidi.def}[2022/05/22 v0.3 bidi adaptations for tocbasic package for XeTeX engine]
+\ProvidesFile{tocbasic-xetex-bidi.def}[2022/05/27 v0.4 bidi adaptations for tocbasic package for XeTeX engine]
 \bidi@undef\scr@dte@def@l@undottedtocline
 \bidi@undef\scr@dte@undottedtocline@init
 \DeclareTOCEntryStyle{undottedtocline}[{%
@@ -22080,7 +22345,7 @@ to\rtside{\box\bslice\hfil}}
             {\parfillskip\@flushglue\par}\nobreak\hskip-\bidi@leftskip
           }{}%
         }%
-        \@nameuse{scr@tso@#1@entryformat}{%
+        {\@nameuse{scr@tso@#1@entryformat}{%
           #2%
           \nobreak
           {%
@@ -22092,8 +22357,7 @@ to\rtside{\box\bslice\hfil}}
               \@nameuse{scr@tso@#1@pagenumberformat}{#3}%
             }%
           }%
-          \@par
-        }%
+        }}\@par
       }%
     }%
     \tocbasic@SetPenaltyByTOCLevel{#1}%
@@ -22377,20 +22641,20 @@ to\rtside{\box\bslice\hfil}}
   \expandafter\renewcommand%
   \csname scr@tso@#1@numberformat\endcsname[1]{##1}%
   \Ifstr{#1}{part}{%
-    \expandafter\renewcommand%
+    \expandafter\providecommand%
     \csname scr@tso@#1@entryformat\endcsname[1]{\large\bfseries ##1}%
   }{%
     \Ifstr{#1}{chapter}{%
-      \expandafter\renewcommand%
+      \expandafter\providecommand%
       \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}%
     }{%
       \scr@ifundefinedorrelax{l@chapter}{%
         \Ifstr{#1}{section}{%
-          \expandafter\renewcommand%
+          \expandafter\providecommand%
           \csname scr@tso@#1@entryformat\endcsname[1]{\bfseries ##1}%
         }{}%
       }{}%
-      \expandafter\renewcommand%
+      \expandafter\providecommand%
       \csname scr@tso@#1@entryformat\endcsname[1]{##1}%
     }%
   }%
@@ -22415,20 +22679,20 @@ to\rtside{\box\bslice\hfil}}
   }{}%
   \expandafter\renewcommand\csname Ifscr@tso@#1@raggedpage\endcsname[2]{##2}%
   \Ifstr{#1}{part}{%
-    \expandafter\renewcommand%
+    \expandafter\providecommand%
     \csname scr@tso@#1@pagenumberformat\endcsname[1]{\large\bfseries ##1}%
   }{%
     \Ifstr{#1}{chapter}{%
-      \expandafter\renewcommand%
+      \expandafter\providecommand%
       \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}%
     }{%
       \scr@ifundefinedorrelax{l@chapter}{%
         \Ifstr{#1}{section}{%
-          \expandafter\renewcommand%
+          \expandafter\providecommand%
           \csname scr@tso@#1@pagenumberformat\endcsname[1]{\bfseries ##1}%
         }{}%
       }{}%
-      \expandafter\renewcommand%
+      \expandafter\providecommand%
       \csname scr@tso@#1@pagenumberformat\endcsname[1]{%
         {\normalfont\normalcolor ##1}}%
     }%
@@ -22450,6 +22714,15 @@ to\rtside{\box\bslice\hfil}}
 }]{%
   \scr@dte@tocline{#1}{##1}{##2}%
 }
+
+\renewcommand*{\scr@tso@figure@pagenumberformat}[1]{%
+   {\normalfont\normalcolor #1}%
+ }
+ 
+\renewcommand*{\scr@tso@table@pagenumberformat}[1]{%
+   {\normalfont\normalcolor #1}%
+ }
+ 
 %    \end{macrocode}
 % \iffalse
 %</tocbasic-xetex-bidi.def>
@@ -23040,7 +23313,7 @@ to\rtside{\box\bslice\hfil}}
 %\fi
 % \section{File \texttt{latex-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{latex-xetex-bidi.def}[2022/02/18 v1.4.0 bidi adaptations  for `latex.ltx' for XeTeX engine]
+\ProvidesFile{latex-xetex-bidi.def}[2022/05/27 v1.4.1 bidi adaptations  for `latex.ltx' for XeTeX engine]
 \newcommand{\TeXXeTOn}{\TeXXeTstate\@ne}
 \newcommand{\TeXXeTOff}{\TeXXeTstate\z@}
 \TeXXeTOn
@@ -23848,6 +24121,7 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \if@bidi@csundef{@idxitem}{}{%
 \renewcommand\@idxitem{\par\hangindent \if@RTL-\fi40\p@}%
 }
+\@ifpackageloaded{tocbasic}{\input{tocbasic-xetex-bidi.def}}{}
 \@ifclassloaded{article}{\@ifclassloaded{svmult}{}{\input{article-xetex-bidi.def}}}{}
 \@ifclassloaded{extarticle}{\input{extarticle-xetex-bidi.def}}{}
 \@ifclassloaded{artikel1}{\input{artikel1-xetex-bidi.def}}{}
@@ -23986,7 +24260,6 @@ $\@@underline{\hbox{#1}}\m@th$\relax\fi\fi}
 \@ifpackageloaded{tabls}{\input{tabls-xetex-bidi.def}}{}
 \@ifpackageloaded{tabulary}{\input{tabulary-xetex-bidi.def}}{}
 \@ifpackageloaded{tcolorbox}{\input{tcolorbox-xetex-bidi.def}}{}
-\@ifpackageloaded{tocbasic}{\input{tocbasic-xetex-bidi.def}}{}
 \@ifpackageloaded{tocstyle}{\input{tocstyle-xetex-bidi.def}}{}
 \@ifpackageloaded{tocbibind}{\@ifclassloaded{memoir}{}{\input{tocbibind-xetex-bidi.def}}}{}
 \@ifpackageloaded{tocloft}{\@ifclassloaded{memoir}{}{\input{tocloft-xetex-bidi.def}}}{}