bidi update (5apr10)

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

1 files changed, 22 insertions, 63 deletions

diff --git a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
index 7a8dd0b3768..dcb383f932e 100644
--- a/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
+++ b/Master/texmf-dist/tex/xelatex/bidi/bidicode.sty
@@ -26,79 +26,38 @@
 \lstset{%
     language=[LaTeX]TEX,%
     float=hbp,%
-    basicstyle=\ttfamily, %
+    basicstyle=\ttfamily\small, %
     identifierstyle=\color{black}, %
     keywordstyle=\color{mygreen}, %
     stringstyle=\color{blue}, %
     commentstyle=\color{blue}, %
     columns=flexible, %
+    tabsize=4, %
+    frame=single, %
     extendedchars=true, %
     showspaces=false, %
     showstringspaces=false, %
+    numbers=left,
+    numbersep=12pt,
+    numberstyle=\tiny, %
     breaklines=true, %
     breakautoindent=true,
-    captionpos=t,
-    explpreset={columns=flexible,language=[LaTeX]TEX},
+    captionpos=b,
+    xleftmargin=1em,
+    breaklines=true,
+    backgroundcolor=\color{mybackground},
+    breakautoindent=true,
+    rframe={},
+    explpreset={numbers=left,numberstyle=\tiny,numbersep=12pt,
+    xleftmargin=1em,columns=flexible,language=[LaTeX]TEX},
    morekeywords={setLTR,setLR,setRTL,setRL,LRE,LR,RLE,RL,lr}
 }
-\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20}}
-\lstdefinestyle{code}{backgroundcolor=\color{red!20}}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstdefinestyle{code}{backgroundcolor=\color{red!20},numbers=left,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
 \lst@UserCommand\lstlistlistingname{List of Examples} % \lstlistoflistings
 \lst@UserCommand\lstlistingname{Example}
-
-\def\lst@Init#1{%
-    \begingroup\if@RTL\@RTLfalse\fi
-    \ifx\lst@float\relax\else
-        \edef\@tempa{\noexpand\lst@beginfloat{lstlisting}[\lst@float]}%
-        \expandafter\@tempa
-    \fi
-    \ifx\lst@multicols\@empty\else
-        \edef\lst@next{\noexpand\multicols{\lst@multicols}}
-        \expandafter\lst@next
-    \fi
-    \ifhmode\ifinner \lst@boxtrue \fi\fi
-    \lst@ifbox
-        \lsthk@BoxUnsafe
-        \hbox to\z@\bgroup
-             $\if t\lst@boxpos \vtop
-        \else \if b\lst@boxpos \vbox
-        \else \vcenter \fi\fi
-        \bgroup \par\noindent
-    \else
-        \lst@ifdisplaystyle
-            \lst@EveryDisplay
-            \par\penalty-50\relax
-            \vspace\lst@aboveskip
-        \fi
-    \fi
-    \normalbaselines
-    \abovecaptionskip\lst@abovecaption\relax
-    \belowcaptionskip\lst@belowcaption\relax
-    \lst@MakeCaption t%
-    \lsthk@PreInit \lsthk@Init
-    \lst@ifdisplaystyle
-        \global\let\lst@ltxlabel\@empty
-        \if@inlabel
-            \lst@ifresetmargins
-                \leavevmode
-            \else
-                \xdef\lst@ltxlabel{\the\everypar}%
-                \lst@AddTo\lst@ltxlabel{%
-                    \global\let\lst@ltxlabel\@empty
-                    \everypar{\lsthk@EveryLine\lsthk@EveryPar}}%
-            \fi
-        \fi
-        \everypar\expandafter{\lst@ltxlabel
-                              \lsthk@EveryLine\lsthk@EveryPar}%
-    \else
-        \everypar{}\let\lst@NewLine\@empty
-    \fi
-    \lsthk@InitVars \lsthk@InitVarsBOL
-    \lst@Let{13}\lst@MProcessListing
-    \let\lst@Backslash#1%
-    \lst@EnterMode{\lst@Pmode}{\lst@SelectCharTable}%
-    \lst@InitFinalize}
-
 \newcommand\Larg [1]{{\normalfont\itshape#1\/}}
 \newcommand\Larga[1]{$\langle$\Larg{#1}$\rangle$}
 \newcommand\Largb[1]{\lcb\Larg{#1}\rcb}
@@ -139,7 +98,7 @@
 \newsavebox{\boxdef}
 \newenvironment{BDef}
   {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}\if@RTL\@RTLfalse\fi
+      \def\arraystretch{1.0}
       \begin{tabular}{@{}l@{}l@{}l@{}}
   }
   {\end{tabular}\end{lrbox}
@@ -150,7 +109,7 @@
 
 \newenvironment{BDef*}
   {\begin{lrbox}\boxdef
-      \def\arraystretch{1.0}\if@RTL\@RTLfalse\fi
+      \def\arraystretch{1.0}
       \begin{tabular}{@{}l@{}l@{}l@{}}
   }
   {\end{tabular}\end{lrbox}
@@ -161,7 +120,7 @@
   \@beginparpenalty-\@lowpenalty
   \topsep\BDefaboveskip
   \fboxsep3pt
-  \flushleft\if@RTL\@RTLfalse\fi}
+  \flushleft}
  {\@endparpenalty\@M
   \@topsepadd\BDefbelowskip
   \endflushleft}
@@ -170,7 +129,7 @@
   \@beginparpenalty\@M
   \topsep\BDefinlineskip
   \fboxsep3pt
-  \flushleft\if@RTL\@RTLfalse\fi}
+  \flushleft}
  {\@endparpenalty5000
   \endflushleft}