bidi (17feb15)

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

1 files changed, 30 insertions, 14 deletions

diff --git a/Master/texmf-dist/source/xelatex/bidi/bidi.dtx b/Master/texmf-dist/source/xelatex/bidi/bidi.dtx
index 4cc47cff72a..d9a9a0dc120 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
-v16.7
+v16.9
 
 This package provides a convenient interface for typesetting
 bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
@@ -25,7 +25,7 @@ a minimal working example showing the issue, and always choose the appropriate
 label for your query (i.e. if you are reporting any bugs, choose `Bug' label). 
 
 
-Current version release date: 2015/02/16
+Current version release date: 2015/02/17
 
 ___________________
 Vafa Khalighi
@@ -318,7 +318,7 @@ by Vafa Khalighi.
 %\changes{v13.9}{2013/09/23}{Added implementaion of the package.}
 % \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\
 %\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt]
-%\large Documentation for \textcolor{blue!65!black}{version 16.7}}
+%\large Documentation for \textcolor{blue!65!black}{version 16.9}}
 % \author{Vafa Khalighi\\
 %  \url{persian-tex@tug.org}}
 %\setcounter{page}{0}
@@ -329,7 +329,7 @@ by Vafa Khalighi.
 %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}
 %
 %\Large
-%Documentation for \textcolor{blue!65!black}{version 16.7}}
+%Documentation for \textcolor{blue!65!black}{version 16.9}}
 %
 %\vskip 0pt plus 3fill
 %\textit{\large to my Master, \textbf{Ferdowsi The Great}}
@@ -380,7 +380,7 @@ by Vafa Khalighi.
 %* 
 %* Copyright (c) 2009--2015 Vafa Khalighi
 %* 
-%* 2015/02/16, v16.7
+%* 2015/02/17, v16.9
 %* 
 %* License: LaTeX Project Public License, version
 %* 1.3c or higher (your choice)
@@ -1137,7 +1137,7 @@ by Vafa Khalighi.
 %\iffalse
 %<*table>
 %\fi
-%% \CheckSum{44128}
+%% \CheckSum{44160}
 %% \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
@@ -2717,8 +2717,8 @@ by Vafa Khalighi.
 % \subsection{\textsf{bidi.sty}}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\def\bididate{2015/02/16}
-\def\bidiversion{v16.7}
+\def\bididate{2015/02/17}
+\def\bidiversion{v16.9}
 \ProvidesPackage{bidi}[\bididate\space \bidiversion\space
 Bidirectional typesetting in plain TeX and LaTeX]
 \edef\@bidi@info{****************************************************^^J%
@@ -2840,7 +2840,7 @@ Bidirectional typesetting in plain TeX and LaTeX]
 %\fi
 % \subsection{\textsf{bidi.tex}}
 %    \begin{macrocode}
-\def\bididate{2015/02/16}
+\def\bididate{2015/02/17}
 \def\bidiversion{v0.2}
 \catcode`@=11
 \let \protect \relax
@@ -6146,7 +6146,7 @@ bidi implementation of tufte hyperref]
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bidituftetitle}[2011/06/18 v0.1
 bidi implementation of tufte title]
-\RequirePackage{etoolbox}
+\RequirePackage{biditools}
 %%
 % `titlepage' option -- creates a full title page with \maketitle
 \newboolean{@bidituftetitle@titlepage}
@@ -6251,7 +6251,7 @@ bidi implementation of tufte title]
 }
 %%
 % Title block
-\AfterEndPreamble{%
+\bidi@AfterEndPreamble{%
 \renewcommand{\maketitle}{%
   \newpage%
   \global\@topnum\z@% prevent floats from being placed at the top of the page
@@ -6274,7 +6274,7 @@ bidi implementation of tufte title]
 %%
 % Title page (if the `titlepage' option was passed to the bidituftetitle-handout
 % class.)
-\AfterEndPreamble{%
+\bidi@AfterEndPreamble{%
 \ifthenelse{\boolean{@bidituftetitle@titlepage}}
   {\renewcommand{\maketitle}{\maketitlepage}}
   {}
@@ -13007,7 +13007,7 @@ bidi implementation of tufte title]
 %\fi
 % \subsection{\textsf{lettrine-xetex-bidi.def}}
 %    \begin{macrocode}
-\ProvidesFile{lettrine-xetex-bidi.def}[2014/09/19 v0.4 bidi adaptations for lettrine package for XeTeX engine]
+\ProvidesFile{lettrine-xetex-bidi.def}[2015/02/17 v0.5 bidi adaptations for lettrine package for XeTeX engine]
 \def\@lettrine[#1]#2#3{%
   \setcounter{L@lines}{\theDefaultLines}%
   \setcounter{L@depth}{\theDefaultDepth}%
@@ -13018,7 +13018,9 @@ bidi implementation of tufte title]
   \setlength{\L@Findent}{\DefaultFindent}%
   \setlength{\L@Nindent}{\DefaultNindent}%
   \setlength{\L@slope}{\DefaultSlope}%
+  \setlength{\L@novskip}{\DiscardVskip}%
   \ifLettrineImage\L@imagetrue\else\L@imagefalse\fi
+  \ifLettrineOnGrid\L@gridtrue\else\L@gridfalse\fi
   \if\DefaultOptionsFile\relax
   \else
     \begingroup
@@ -13070,7 +13072,21 @@ bidi implementation of tufte title]
      \addtolength{\L@lraise}{\@tempdima}%
    \fi
    \par
-   \ifdim\L@first>0.2\p@\vskip\L@first\fi
+   \ifdim\L@first>\L@novskip
+     \ifL@grid
+       \@tempdima=\baselineskip
+       \@tempdimb=\@tempdima
+       \advance\@tempdimb by \L@novskip
+       \@tempcnta=1
+       \loop\ifdim\L@first>\@tempdimb
+         \advance\@tempcnta by 1
+         \advance\L@first by -\@tempdima
+       \repeat
+       \vskip\@tempcnta\baselineskip
+     \else
+       \vskip\L@first
+     \fi
+   \fi
   \setlength{\L@Pindent}{\wd\L@lbox}%
   \addtolength{\L@Pindent}{-\L@hang\wd\L@lbox}%
   \settowidth{\L@first}{\L@ante}%