From 7ceab6fad1b5f8b7302a3b189f44fdaac9bbc4f2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Oct 2011 23:05:31 +0000 Subject: xepersian git-svn-id: svn://tug.org/texlive/trunk@24172 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/xelatex/xepersian/environments-ltx.def | 3 - .../tex/xelatex/xepersian/localise-xepersian.def | 2 +- .../xelatex/xepersian/misc-localise-xepersian.def | 11 +++ .../xepersian/packages-localise-xepersian.def | 104 +++++++++++++++++++++ .../texmf-dist/tex/xelatex/xepersian/xepersian.sty | 4 +- 5 files changed, 118 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex/xepersian') diff --git a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def index 596aaf53aab..97bceb1c303 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/environments-ltx.def @@ -35,7 +35,6 @@ \eqenvironment{ریاضی}{math} \eqenvironment{ماتریس}{matrix} \eqenvironment{صفحه‌کوچک}{minipage} -\eqenvironment{چندستونی‌ها}{multicols} \eqenvironment{چندخطی}{multline} \eqenvironment{یادداشت}{note} \eqenvironment{انباشتن}{overlay} @@ -55,8 +54,6 @@ \eqenvironment{محتوای‌نمایه}{theindex} \eqenvironment{صفحه‌عنوان}{titlepage} \eqenvironment{لیست‌بدوی}{trivlist} -\eqenvironment{همانطورکه‌هست}{verbatim} -\eqenvironment{همانطورکه‌هست*}{verbatim*} \eqenvironment{شعر}{verse} %% %% Copyright © 2008–2011 VAFA KHALIGHI diff --git a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def index c39c380e784..526f26ccf89 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def @@ -17,7 +17,7 @@ \makezwnjletter \newcommand*{\eqcommand}[2]{% \expandafter\@ifdefinable \csname#1\endcsname{% -\expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}} +\expandafter\def\csname#1\expandafter\endcsname{\csname#2\endcsname}}} \newcommand*{\eqenvironment}[2]{\newenvironment{#1}{\csname#2\endcsname}{\csname end#2\endcsname}} \input{commands-ltx.def} \input{commands-xepersian.def} diff --git a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def index 91d50d93f94..571d8757216 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/misc-localise-xepersian.def @@ -334,6 +334,17 @@ \@floatboxreset \@setnobreak \ignorespaces} }{} +\begingroup \catcode `|=0 \catcode `[= 1 +\catcode`]=2 \catcode `\{=12 \catcode `\}=12 +\catcode`\\=12 |gdef|@x@xepersian@localize@verbatim#1\پایان{همانطورکه‌هست}[#1|پایان[همانطورکه‌هست]] +|gdef|@sx@xepersian@localize@verbatim#1\پایان{همانطورکه‌هست*}[#1|پایان[همانطورکه‌هست*]] +|endgroup +\def\همانطورکه‌هست{\@verbatim \frenchspacing\@vobeyspaces \@x@xepersian@localize@verbatim} +\def\endهمانطورکه‌هست{\if@newlist \leavevmode\fi\endtrivlist} +\ExplSyntaxOn +\AtBeginDocument{\@namedef{همانطورکه‌هست*}{\@verbatim \fontspec_print_visible_spaces: \@sx@xepersian@localize@verbatim}} +\ExplSyntaxOff +\expandafter\let\csname endهمانطورکه‌هست*\endcsname =\endهمانطورکه‌هست %% %% Copyright © 2008–2011 VAFA KHALIGHI %% diff --git a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def index e112d044e26..8e8c2596b1d 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def +++ b/Master/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def @@ -14,6 +14,110 @@ %% \آماده‌سازی‌پرونده{packages-localise-xepersian.def}[2011/03/01 v0.1 localising LaTeX2e Packages] \@گرسبک‌فراخوانی‌شده{color}{\ورودی{color-localise.def}}{} +\@ifpackageloaded{multicol}{% +\newenvironment{چندستونی‌ها}{\begin{multicols}}{\end{multicols}}% +\newenvironment{چندستونی‌ها*}{\begin{multicols*}}{\end{multicols*}}% +}{} +\@ifpackageloaded{verbatim}{% +\begingroup + \vrb@catcodes + \lccode`\!=`\\ \lccode`\[=`\{ \lccode`\]=`\} + \catcode`\~=\active \lccode`\~=`\^^M + \lccode`\C=`\C + \lowercase{\endgroup + \def\xepersian@localize@verbatim@start#1{% + \verbatim@startline + \if\noexpand#1\noexpand~% + \let\next\xepersian@localize@verbatim@ + \else \def\next{\xepersian@localize@verbatim@#1}\fi + \next}% + \def\xepersian@localize@verbatim@#1~{\xepersian@localize@verbatim@@#1!پایان\@nil}% + \def\xepersian@localize@verbatim@@#1!پایان{% + \verbatim@addtoline{#1}% + \futurelet\next\xepersian@localize@verbatim@@@}% + \def\xepersian@localize@verbatim@@@#1\@nil{% + \ifx\next\@nil + \verbatim@processline + \verbatim@startline + \let\next\xepersian@localize@verbatim@ + \else + \def\@tempa##1!پایان\@nil{##1}% + \@temptokena{!پایان}% + \def\next{\expandafter\verbatim@test\@tempa#1\@nil~}% + \fi \next}% + \def\verbatim@test#1{% + \let\next\verbatim@test + \if\noexpand#1\noexpand~% + \expandafter\verbatim@addtoline + \expandafter{\the\@temptokena}% + \verbatim@processline + \verbatim@startline + \let\next\xepersian@localize@verbatim@ + \else \if\noexpand#1 + \@temptokena\expandafter{\the\@temptokena#1}% + \else \if\noexpand#1\noexpand[% + \let\@tempc\@empty + \let\next\verbatim@testend + \else + \expandafter\verbatim@addtoline + \expandafter{\the\@temptokena}% + \def\next{\xepersian@localize@verbatim@#1}% + \fi\fi\fi + \next}% + \def\verbatim@testend#1{% + \if\noexpand#1\noexpand~% + \expandafter\verbatim@addtoline + \expandafter{\the\@temptokena[}% + \expandafter\verbatim@addtoline + \expandafter{\@tempc}% + \verbatim@processline + \verbatim@startline + \let\next\xepersian@localize@verbatim@ + \else\if\noexpand#1\noexpand]% + \let\next\verbatim@@testend + \else\if\noexpand#1\noexpand!% + \expandafter\verbatim@addtoline + \expandafter{\the\@temptokena[}% + \expandafter\verbatim@addtoline + \expandafter{\@tempc}% + \def\next{\xepersian@localize@verbatim@!}% + \else \expandafter\def\expandafter\@tempc\expandafter + {\@tempc#1}\fi\fi\fi + \next}% + \def\verbatim@@testend{% + \ifx\@tempc\@currenvir + \verbatim@finish + \edef\next{\noexpand\end{\@currenvir}% + \noexpand\verbatim@rescan{\@currenvir}}% + \else + \expandafter\verbatim@addtoline + \expandafter{\the\@temptokena[}% + \expandafter\verbatim@addtoline + \expandafter{\@tempc]}% + \let\next\xepersian@localize@verbatim@ + \fi + \next}% + \def\verbatim@rescan#1#2~{\if\noexpand~\noexpand#2~\else + \@warning{Characters dropped after `\string\end{#1}'}\fi}}% +\def\همانطورکه‌هست{\begingroup\@verbatim \frenchspacing\@vobeyspaces + \xepersian@localize@verbatim@start} +\@namedef{همانطورکه‌هست*}{\begingroup\@verbatim\xepersian@localize@verbatim@start} +\def\endهمانطورکه‌هست{\endtrivlist\endgroup\@doendpe} +\expandafter\let\csname endهمانطورکه‌هست*\endcsname =\endهمانطورکه‌هست +}{} +\ExplSyntaxOn +\AtBeginDocument{ + \xepersian_localize_patch_verbatim: +} +\cs_set:Npn \xepersian_localize_patch_verbatim: { + \@ifpackageloaded{verbatim}{ + \cs_set:cpn {همانطورکه‌هست*} { + \group_begin: \@verbatim \fontspec_print_visible_spaces: \xepersian@localize@verbatim@start + } + }{ + } +} +\ExplSyntaxOff %% %% Copyright © 2008–2011 VAFA KHALIGHI %% diff --git a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty index 390bc239faf..9adc2bff6dd 100644 --- a/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty +++ b/Master/texmf-dist/tex/xelatex/xepersian/xepersian.sty @@ -13,8 +13,8 @@ %% %% \NeedsTeXFormat{LaTeX2e} -\def\xepersianversion{v1.2.3} -\def\xepersiandate{2011/10/01} +\def\xepersianversion{v1.2.4} +\def\xepersiandate{2011/12/01} \ProvidesPackage{xepersian}[\xepersiandate\space \xepersianversion\space Persian typesetting in XeLaTeX] \RequirePackage{fontspec} -- cgit v1.2.3