From fc029dfa40169989b3bd548b60a7bbea2111de5a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 29 Aug 2018 23:36:46 +0000 Subject: arabluatex (29aug18) git-svn-id: svn://tug.org/texlive/trunk@48507 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/lualatex/arabluatex/arabluatex.el | 25 ++- .../doc/lualatex/arabluatex/arabluatex.pdf | Bin 654353 -> 654744 bytes .../doc/lualatex/arabluatex/samples/al-Jahiz.pdf | Bin 111577 -> 111577 bytes .../doc/lualatex/arabluatex/samples/exporting.pdf | Bin 0 -> 56438 bytes .../doc/lualatex/arabluatex/samples/exporting.tex | 206 +++++++++++++++++++++ .../lualatex/arabluatex/samples/template-01.pdf | Bin 64813 -> 64862 bytes .../source/lualatex/arabluatex/README.tex | 2 +- .../source/lualatex/arabluatex/arabluatex.dtx | 12 +- .../source/lualatex/arabluatex/arabluatex.ins | 2 +- .../tex/lualatex/arabluatex/arabluatex.sty | 5 +- 10 files changed, 235 insertions(+), 17 deletions(-) create mode 100644 Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf create mode 100644 Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el index 4fc17b8b197..d8e8dff1467 100644 --- a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el +++ b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.el @@ -21,19 +21,28 @@ ;; along with this program. If not, see ;; . -(defvar LaTeX-arabluatex-package-options - '("voc" "fullvoc" "novoc" "trans") +(defvar LaTeX-arabluatex-preamble-options + '(;; + ("voc") + ("fullvoc") + ("novoc") + ("trans") + ("export" ("true" "false"))) "Package options for the arabluatex package.") +(defun LaTeX-arabluatex-package-options () + "Prompt for package options for arabluatex package." + (TeX-read-key-val t + (append LaTeX-arabluatex-preamble-options))) + (defvar LaTeX-arabluatex-mode-options '(;; ("voc") ("fullvoc") ("novoc") ("trans") - ("export") ) - "Global or local options.") + "Local options.") (defvar LaTeX-arabluatex-key-val-options '(;; @@ -44,7 +53,7 @@ ("color") ("delim" ("true" "false")) ("utf" ("true" "false")) - ("export")) + ("export" ("true" "false"))) "Key=value options for arabverse environment.") (defvar LaTeX-arabluatex-color-options @@ -52,13 +61,13 @@ (defvar LaTeX-arabluatex-outfile-options '(;; - (newline)) + ("newline")) "Option for outfile command.") (defvar LaTeX-arabluatex-arbmark-options '(;; - (rl) - (lr)) + ("rl") + ("lr")) "Option for arbmark command.") (TeX-add-style-hook diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf index d09022ae7d3..91c45db77ab 100644 Binary files a/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf and b/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf index f6e94986708..05240d86730 100644 Binary files a/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf and b/Master/texmf-dist/doc/lualatex/arabluatex/samples/al-Jahiz.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf new file mode 100644 index 00000000000..adb5a0439da Binary files /dev/null and b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex new file mode 100644 index 00000000000..ad2b3e5ba32 --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/arabluatex/samples/exporting.tex @@ -0,0 +1,206 @@ +\RequirePackage{filecontents} +% +% This file is public domain +% +\begin{filecontents*}{exporting-preamble.tex} +\documentclass[12pt]{article} + +\usepackage[fullvoc,export=false]{arabluatex} +\SetArbEasy + +\usepackage{csquotes} +\DeclareQuoteStyle{arabic} +{\textquotedblright}{\textquotedblleft} +{\textquoteright}{\textquoteleft} + +% \renewcommand{\txarb}[1]{#1} +% \renewcommand{\txtrans}[1]{\emph{#1}} +% \renewcommand{\aemph}[1]{#1} +% \renewcommand{\arbup}[1]{\textsuperscript{#1}} +\end{filecontents*} +\begin{filecontents*}{exporting-dajaja.tex} +\begin{arabexport} +\section*{Unicode Arabic} +\setquotestyle{arabic} +\begin{arab} + kAna \uc{'a}bU 'l-\uc{h}u_dayli 'ahd_A 'il_A + \uc{m}uwaysiN dajAjaTaN. wa-kAnat dajAjatu-hu 'llatI + 'ahdA-hA dUna mA kAna yuttaxa_du + li-\uc{m}uwaysiN. wa-l_akinna-hu bi-karami-hi + wa-bi-.husni _hu\-luqi-hi 'a.zhara 'l-ta`ajjuba min + simani-hA wa-.tIbi la.hmi-hA. wa-kAna <\uc{'a}bU + 'l-\uc{h}u_dayli> yu`rafu bi-'l-'imsAki + 'l-^sadIdi. fa-qAla: \enquote{wa-kayfa ra'ayta yA + \uc{'a}bA \uc{`i}mrAna tilka 'l-dajA\-jaTa?} qAla: + \enquote{kAnat `ajabaN mina 'l-`ajabi!} fa-yaqUlu: + \enquote{wa-tadrI mA jinsu-hA? wa-tadrI mA sinnu-hA? + fa-'inna 'l-dajAjaTa 'inna-mA ta.tIbu bi-'l-jinsi + wa-'l-sinni. wa-tadrI bi-'ayyi ^say'iN kunnA + nusamminu-hA? wa-fI 'ayyi makAniN kunnA na`lifu-hA?} + fa-lA yazAlu fI h_a_dA wa-'l-'A_haru ya.d.haku .da.hkaN + na`rifu-hu na.hnu wa-lA ya`rifu-hu \uc{'a}bU + 'l-\uc{h}u_dayli. +\end{arab} + +\begin{arab} + wa-kAna \uc{'a}bU 'l-\uc{h}u_dayli 'aslama 'l-nAsi + .sadraN wa-'awsa`a-hum _huluqaN wa-'ashala-hum + suhUlaTaN. fa-'in _dakarUA dajAjaTaN, qAla: + \enquote{'ayna kAnat yA \uc{'a}bA \uc{`i}mrAna min + tilka 'l-dajA\-jaTi?} fa-'in _dakarUA ba.t.taTaN 'aw + `anAqaN 'aw jazUraN 'aw baqaraTaN, qAla: + \enquote{fa-'ayna kAnat h_a_dihi 'l-jazUru fI 'l-juzuri + min tilka 'l-dajAjaTi fI 'l-dajAji!} wa-'ini + istasmana \uc{'a}bU 'l-\uc{h}u_dayli ^say'aN mina + 'l-.tayri wa-'l-bahA'imi, qAla: \enquote{lA wa-'l-l_ahi + wa-lA tilka 'l-dajAjaTu!} wa-'in _dakarUA `u_dUbaTa + 'l-^sa.hmi, qAla: \enquote{`u_dUbaTu 'l-^sa.hmi fI + 'l-baqari wa-'l-ba.t.ti wa-bu.tUni 'l-samaki + wa-'l-dajAji, wa-lA siyyamA _d_alika 'l-jinsu mina + 'l-dajAji.} wa-'in _dakarUA mIlAda ^say'iN 'aw + qudUma 'insAniN, qAla: \enquote{kAna _d_alika ba`da 'an + 'ahdaytu-hA la-ka bi-sanaTiN, wa-mA kAna bayna qudUmi + fulAniN wa-bayna 'l-ba`_taTi bi-tilka 'l-dajAjaTi + 'illA yawmuN.} wa-kAnat ma_ta\-laN fI kulli ^say'iN + wa-tArI_haN fI kulli ^say'iN. +\end{arab} + +\bigskip + +\begin{arab} + \uc{al-jA.hi.zu}, \aemph{\uc{k}itAbu 'l-\uc{b}u_halA'i} +\end{arab} + +\section*{Romanized Arabic} +\setquotestyle{english} +\begin{arab}[trans] + kAna \uc{'a}bU 'l-\uc{h}u_dayli 'ahd_A 'il_A + \uc{m}uwaysiN dajAjaTaN. wa-kAnat dajAjatu-hu 'llatI + 'ahdA-hA dUna mA kAna yuttaxa_du + li-\uc{m}uwaysiN. wa-l_akinna-hu bi-karami-hi + wa-bi-.husni _hu\-luqi-hi 'a.zhara 'l-ta`ajjuba min + simani-hA wa-.tIbi la.hmi-hA. wa-kAna <\uc{'a}bU + 'l-\uc{h}u_dayli> yu`rafu bi-'l-'imsAki + 'l-^sadIdi. fa-qAla: \enquote{wa-kayfa ra'ayta yA + \uc{'a}bA \uc{`i}mrAna tilka 'l-dajA\-jaTa?} qAla: + \enquote{kAnat `ajabaN mina 'l-`ajabi!} fa-yaqUlu: + \enquote{wa-tadrI mA jinsu-hA? wa-tadrI mA sinnu-hA? + fa-'inna 'l-dajAjaTa 'inna-mA ta.tIbu bi-'l-jinsi + wa-'l-sinni. wa-tadrI bi-'ayyi ^say'iN kunnA + nusamminu-hA? wa-fI 'ayyi makAniN kunnA na`lifu-hA?} + fa-lA yazAlu fI h_a_dA wa-'l-'A_haru ya.d.haku .da.hkaN + na`rifu-hu na.hnu wa-lA ya`rifu-hu \uc{'a}bU + 'l-\uc{h}u_dayli. +\end{arab} + +\begin{arab}[trans] + wa-kAna \uc{'a}bU 'l-\uc{h}u_dayli 'aslama 'l-nAsi + .sadraN wa-'awsa`a-hum _huluqaN wa-'ashala-hum + suhUlaTaN. fa-'in _dakarUA dajAjaTaN, qAla: + \enquote{'ayna kAnat yA \uc{'a}bA \uc{`i}mrAna min + tilka 'l-dajA\-jaTi?} fa-'in _dakarUA ba.t.taTaN 'aw + `anAqaN 'aw jazUraN 'aw baqaraTaN, qAla: + \enquote{fa-'ayna kAnat h_a_dihi 'l-jazUru fI 'l-juzuri + min tilka 'l-dajAjaTi fI 'l-dajAji!} wa-'ini + istasmana \uc{'a}bU 'l-\uc{h}u_dayli ^say'aN mina + 'l-.tayri wa-'l-bahA'imi, qAla: \enquote{lA wa-'l-l_ahi + wa-lA tilka 'l-dajAjaTu!} wa-'in _dakarUA `u_dUbaTa + 'l-^sa.hmi, qAla: \enquote{`u_dUbaTu 'l-^sa.hmi fI + 'l-baqari wa-'l-ba.t.ti wa-bu.tUni 'l-samaki + wa-'l-dajAji, wa-lA siyyamA _d_alika 'l-jinsu mina + 'l-dajAji.} wa-'in _dakarUA mIlAda ^say'iN 'aw qudUma + 'insAniN, qAla: \enquote{kAna _d_alika ba`da 'an + 'ahdaytu-hA la-ka bi-sanaTiN, wa-mA kAna bayna qudUmi + fulAniN wa-bayna 'l-ba`_taTi bi-tilka 'l-dajAjaTi + 'illA yawmuN.} wa-kAnat ma_ta\-laN fI kulli ^say'iN + wa-tArI_haN fI kulli ^say'iN. +\end{arab} + +\bigskip + +\begin{arab}[trans] + \uc{al-jA.hi.zu}, \aemph{\uc{k}itAbu 'l-\uc{b}u_halA'i} +\end{arab} +\end{arabexport} +\end{filecontents*} +\documentclass[12pt]{article} + +\usepackage[fullvoc,export=false]{arabluatex} +\SetArbEasy + +\usepackage{csquotes} +\DeclareQuoteStyle{arabic} +{\textquotedblright}{\textquotedblleft} +{\textquoteright}{\textquoteleft} + +\PassOptionsToPackage{pdfa}{hyperref} +\usepackage{hyperxmp} +\usepackage{hyperref} +\hypersetup{colorlinks, linkcolor=blue, pdfauthor={Robert + Alessi}} + +\title{\large Exporting Unicode Arabic to an external + .tex source file} +\author{} +\date{} + +\usepackage{xcolor} +\usepackage[outputdir=TMP]{minted} +\definecolor{bg}{rgb}{0.95,0.95,0.95} + +\usepackage{ccicons} +\usepackage{paralist} + +% \renewcommand{\txarb}[1]{#1} +% \renewcommand{\txtrans}[1]{\emph{#1}} +% \renewcommand{\aemph}[1]{#1} +% \renewcommand{\arbup}[1]{\textsuperscript{#1}} + +\begin{document} +\vspace*{-.5in} +\noindent +\textbf{\textsf{arabluatex sample file}} --- \cczero\ This +file is public domain + +\begin{compactenum} +\item Copy the source code below, paste it into your + favorite tex editor and save it as + \verb|exporting.tex|. +\item In the preamble, set \verb|export=true| in + \textsf{arabluatex} global options (line 3). +\item Compile this file with Lua\LaTeX. +\item Open \verb|exporting_out.tex| and compile it again + with Lua\LaTeX. +\item Open \verb|exporting_out_out.tex|, then: + \begin{compactenum} + \item In the preamble, set \verb|export=false| in + \textsf{arabluatex} global options (line 3). + \item Compile this file and see the resulting + \verb|exporting_out_out.pdf|. + \end{compactenum} +\item Finally, uncomment in the preamble the four lines + that are just above \verb|\begin{document}|. +\item Open a terminal, then do: +\begin{verbatim} +pandoc exporting_out_out.tex -s -o exporting.odt +\end{verbatim} + and open the resulting \verb|exporting.odt| file with LibreOffice. +\end{compactenum} + +\phantomsection +\section*{Source code} +\label{ref:source-begin} +\inputminted[firstnumber=last, bgcolor=bg]{latex}% + {TMP/exporting-preamble.tex} + +\begin{minted}[bgcolor=bg]{latex} +\begin{document} +\end{minted} +\inputminted[firstnumber=last, bgcolor=bg]{latex}% + {TMP/exporting-dajaja.tex} +\begin{minted}[bgcolor=bg]{latex} +\end{document} +\end{minted} +\label{ref:source-end} + +\end{document} diff --git a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf index 79e3f8dab42..c5f7220c1b9 100644 Binary files a/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf and b/Master/texmf-dist/doc/lualatex/arabluatex/samples/template-01.pdf differ diff --git a/Master/texmf-dist/source/lualatex/arabluatex/README.tex b/Master/texmf-dist/source/lualatex/arabluatex/README.tex index 51a5f3460e7..24da0c71b8f 100644 --- a/Master/texmf-dist/source/lualatex/arabluatex/README.tex +++ b/Master/texmf-dist/source/lualatex/arabluatex/README.tex @@ -89,7 +89,7 @@ to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. \item To finish the installation you have to move the following files into a directory where LaTeX can find them. See the FAQ on \verb|tex.ac.uk| at - \url{http://www.tex.ac.uk/faq/FAQ-inst-wlcf.html} for more on this: + \url{https://texfaq.org/FAQ-inst-wlcf} for more on this: \begin{itemize} \item \verb|arabluatex.sty| \item \verb|arabluatex-patch.sty| diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx index 44d443c1f4f..8fadee2d105 100644 --- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx +++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx @@ -27,7 +27,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{arabluatex} %<*package-info> - [2018/08/27 v1.13 An ArabTeX-like interface for LuaLaTeX] + [2018/08/29 v1.14 An ArabTeX-like interface for LuaLaTeX] % % %<*driver> @@ -158,7 +158,7 @@ \usepackage{newunicodechar} \newunicodechar{ǧ}{ǧ} % Old Standard does not include ǧ/Ǧ \newunicodechar{Ǧ}{Ǧ} % -\usepackage{arabluatex}[2018/08/27] +\usepackage{arabluatex}[2018/08/29] \usepackage[nopar]{quran} \usepackage[noindex]{nameauth} \usepackage{varioref} @@ -260,7 +260,7 @@ % % \fi % -% \CheckSum{896} +% \CheckSum{899} % % \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 @@ -4192,6 +4192,7 @@ wa-ya.sIru ta.hta 'l-jild-i \usepackage{arabluatex} % note that 'export' has been removed \renewcommand{\txarb}[1]{#1} \renewcommand{\txtrans}[1]{\emph{#1}} + \renewcommand{\arbup}[1]{\textsuperscript{#1}} % now that \prname{} has been replaced with \prname*{} it should % be safe to say: \renewcommand{\prname}[2]{#2} @@ -4239,7 +4240,7 @@ wa-ya.sIru ta.hta 'l-jild-i % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{arabluatex}% -[2018/08/27 v1.13 An ArabTeX-like interface for LuaLaTeX] +[2018/08/29 v1.14 An ArabTeX-like interface for LuaLaTeX] \RequirePackage{ifluatex} % \end{macrocode} % \package{arabluatex} requires \hologo{LuaLaTeX} of course. Issue a @@ -4261,10 +4262,11 @@ wa-ya.sIru ta.hta 'l-jild-i \DeclareOptionX{novoc}{\def\al@mode{novoc}} \DeclareOptionX{trans}{\def\al@mode{trans}} \define@boolkey{arabluatex.sty}[@pkg@]{export}[true]{% + \if@pkg@export% \AtBeginDocument{\luadirect{al_openstream()}% \MkArbBreak{@al@ob,@al@cb,@al@cb@sp}} \AtEndDocument{\luadirect{al_closestream()}} -} + \else\fi} \ExecuteOptionsX{voc} \ProcessOptionsX\relax \def\al@mode@voc{voc} diff --git a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins index 0ab399b31ac..7a3582b0a8f 100644 --- a/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins +++ b/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.ins @@ -82,7 +82,7 @@ This release of 'arabluatex' consists of the following source files: \Msg{*} \Msg{* To finish the installation you have to move the following} \Msg{* files into a directory where LaTeX canfind them. See the} -\Msg{* FAQ at http://www.tex.ac.uk/faq/FAQ-inst-wlcf.html for} +\Msg{* FAQ at https://texfaq.org/FAQ-inst-wlcf for} \Msg{* more on this} \Msg{*} \Msg{* \space\space arabluatex.sty} diff --git a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty index 1e90fdfcddb..4a46cfe5665 100644 --- a/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty +++ b/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{arabluatex}% -[2018/08/27 v1.13 An ArabTeX-like interface for LuaLaTeX] +[2018/08/29 v1.14 An ArabTeX-like interface for LuaLaTeX] \RequirePackage{ifluatex} \ifluatex\else \PackageError{arabluatex}{lualatex needed}{% @@ -56,10 +56,11 @@ \DeclareOptionX{novoc}{\def\al@mode{novoc}} \DeclareOptionX{trans}{\def\al@mode{trans}} \define@boolkey{arabluatex.sty}[@pkg@]{export}[true]{% + \if@pkg@export% \AtBeginDocument{\luadirect{al_openstream()}% \MkArbBreak{@al@ob,@al@cb,@al@cb@sp}} \AtEndDocument{\luadirect{al_closestream()}} -} + \else\fi} \ExecuteOptionsX{voc} \ProcessOptionsX\relax \def\al@mode@voc{voc} -- cgit v1.2.3