1 files changed, 21 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def b/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def
index ec597e1b45e..a6c8422d55a 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def
+++ b/Master/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def
@@ -20,7 +20,7 @@
 %%   by Vafa Khalighi.
 %% 
 %% 
-%% \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
@@ -37,7 +37,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %%
-\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}[{%
@@ -429,7 +429,7 @@
             {\parfillskip\@flushglue\par}\nobreak\hskip-\bidi@leftskip
           }{}%
         }%
-        \@nameuse{scr@tso@#1@entryformat}{%
+        {\@nameuse{scr@tso@#1@entryformat}{%
           #2%
           \nobreak
           {%
@@ -441,8 +441,7 @@
               \@nameuse{scr@tso@#1@pagenumberformat}{#3}%
             }%
           }%
-          \@par
-        }%
+        }}\@par
       }%
     }%
     \tocbasic@SetPenaltyByTOCLevel{#1}%
@@ -725,20 +724,20 @@
   \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}%
     }%
   }%
@@ -763,20 +762,20 @@
   }{}%
   \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}}%
     }%
@@ -798,6 +797,15 @@
 }]{%
   \scr@dte@tocline{#1}{##1}{##2}%
 }
+
+\renewcommand*{\scr@tso@figure@pagenumberformat}[1]{%
+   {\normalfont\normalcolor #1}%
+ }
+
+\renewcommand*{\scr@tso@table@pagenumberformat}[1]{%
+   {\normalfont\normalcolor #1}%
+ }
+
 \endinput
 %%
 %% End of file `tocbasic-xetex-bidi.def'.