dad (19mar18)

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

6 files changed, 45 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/fonts/dad/README b/Master/texmf-dist/doc/fonts/dad/README
index ebb9f2adbdc..968b9ea1dc0 100644
--- a/Master/texmf-dist/doc/fonts/dad/README
+++ b/Master/texmf-dist/doc/fonts/dad/README
@@ -1,8 +1,9 @@
-README for ض (dad) package, 2014/10/11, v1.1
+README for ض (dad) package, 2017/05/20, v1.2
 
 TABLE OF CONTENTS
 =================
 
+0 Changes in v1.2
 1 Introduction
 2 Download
 3 Installation
@@ -13,6 +14,12 @@ TABLE OF CONTENTS
 8 Known Problems
 
 
+0 CHANGES IN V1.2
+=================
+
+I added support for LuaTeX 0.95 by including package luatex85 and by changing \luatextextdir into \textdir in file dad.sty.
+
+
 1 INTRODUCTION
 ==============
 
diff --git a/Master/texmf-dist/doc/fonts/dad/dad-to-utf8.pl b/Master/texmf-dist/doc/fonts/dad/dad-to-utf8.pl
index a19feb720e0..85d971af481 100755
--- a/Master/texmf-dist/doc/fonts/dad/dad-to-utf8.pl
+++ b/Master/texmf-dist/doc/fonts/dad/dad-to-utf8.pl
@@ -1,4 +1,4 @@
-#!/opt/local/bin/perl
+#!/usr/bin/perl
 use utf8;
 binmode stdin,":utf8";
 binmode stdout,":utf8";
@@ -48,7 +48,7 @@ s/d-h/ده/g;
 s/A/ا/g;
 s/b/ب/g;
 s/t\*/ة/g;
-s/th/ث/g;
+s/c/ث/g;
 s/t/ت/g;
 s/j/ج/g;
 s/H/ح/g;
diff --git a/Master/texmf-dist/doc/fonts/dad/dad-user-guide.pdf b/Master/texmf-dist/doc/fonts/dad/dad-user-guide.pdf
index 5c0d2406006..7fef54224cd 100644
--- a/Master/texmf-dist/doc/fonts/dad/dad-user-guide.pdf
+++ b/Master/texmf-dist/doc/fonts/dad/dad-user-guide.pdf
diff --git a/Master/texmf-dist/doc/fonts/dad/dad-user-guide.tex b/Master/texmf-dist/doc/fonts/dad/dad-user-guide.tex
index 3d3fad6af01..988557686cc 100644
--- a/Master/texmf-dist/doc/fonts/dad/dad-user-guide.tex
+++ b/Master/texmf-dist/doc/fonts/dad/dad-user-guide.tex
@@ -1,8 +1,8 @@
 %%% ====================================================================
 %%%  @LaTeX-file{
 %%%     filename        = "dad-user-guide.tex",
-%%%     version         = "1.1",
-%%%     date            = "2014/10/11",
+%%%     version         = "1.2",
+%%%     date            = "2017/05/20",
 %%%     author          = "Yannis Haralambous",
 %%%     copyright       = "This file is part of the dad package, released
 %%%                        under the LPPL."
@@ -14,6 +14,7 @@
 %%% ====================================================================
 % needs lualatex to be processed
 \documentclass[11pt,a4paper]{article}
+\usepackage{luatex85}
 \pdfmapfile{/hom/yannis/projets/smf/0/smfpdftex.map}
 \usepackage{graphicx,color,framed,a4wide}
 \usepackage{ifpdf}
@@ -29,32 +30,42 @@
 \usepackage{dad}
 \def\hamza{'}%\textsuperscript{\ejective}}
 \def\ayn{`}%\textsuperscript{\reveject}}
+\usepackage{fontspec}
 
 %%% Start of metadata %%%
 
-\title{User's Guide of \arab{D} (\emph{\d{d}\=ad}),\\ a Simple Arabic Typesetting System\\ for Mixed Latin/Arabic Alphabet Documents\\[12pt]Version 1.1/2014-10-11}
+\title{User's Guide of \arab{D} (\emph{\d{d}\=ad}),\\ a Simple Arabic Typesetting System\\ for Mixed Latin/Arabic Alphabet Documents\\[12pt]Version 1.2/2017-05-20}
 
 % repeat info for each author.
-\author{Yannis Haralambous\thanks{Institut Mines T\'el\'ecom, T\'el\'ecom Bretagne,
+\author{Yannis Haralambous\thanks{IMT Atlantique,
 UMR~CNRS~6285 Lab-STICC,
 Technop\^ole Brest Iroise
-CS 83818, 29238~Brest~Cedex~3, France, \url{yannis.haralambous@telecom-bretagne.eu}}}
+CS 83818, 29238~Brest~Cedex~3, France, \url{yannis.haralambous@imt-atlantique.fr}}}
 %\netaddress{yannis.haralambous (at) telecom-bretagne dot eu}
 %\personalURL{http://example.org/~user/}
 \date{}
 %%% End of metadata %%%
 
+
+%\newfontfamily\arabicfont[Script=Arabic,Scale=1.2]{Scheherazade-Regular.ttf}
+%\newcommand{\textarabic}[1]{\bgroup\textdir TRT\arabicfont #1\egroup}
 \begin{document}
 
 \maketitle
 
+\section*{New features of version 1.2}
+
+I added support for Lua\TeX\ 0.95 by including package \verb=luatex85= and by changing \verb=\luatextextdir= into \verb=\textdir=.
+
+\section{Introduction}
+
 \noindent\mbox{\arab{D}} is a package for typesetting Arabic in the simplest possible way. It is particularly well suited for mixed Arabic/Latin documents. ``Simplest possible'' means:
 \begin{itemize}
 \item it is compatible with all \LaTeX\ style files, since the code is minimal and all the complexity is in the font;
 \item input can be done in Unicode or in transliteration, the latter being often the best choice when mixing left-to-right and right-to-left scripts;
 \item the only \TeX nical requirement is Lua\TeX, not because of the Lua language (which is not used, for the moment), but because of features that have survived from Lua\TeX's $\Omega$ origins: bidirectionality and use of large fonts (OVF, OFM).
 \end{itemize}
-Choose Lua\TeX\ as your \TeX\ engine, load the package into your document, and \arab{AhlAaN wshlAaN!}, just start writing in Arabic using command \verb=\arab=.
+Choose Lua\TeX\ as your \TeX\ engine, load the package into your document, and \arab{AhlAaN Us-hlAaN!}, just start writing in Arabic using command \verb=\arab=.
 
 More information about \arab{D} (history, evolution, rationale of technical choices, \TeX nicalities) can be found in \cite{tugboat}.
 
@@ -152,7 +163,7 @@ stroke: compare \arabttexample{lYl} and \arabttexample{l--Y--l}. There is also a
 
 \item some digraphs start with an apostrophe: it is the case of \emph{hamza}-carriers \arabttexample{'a}, \arabttexample{'i}, \arabttexample{'u}, \arabttexample{'I}, \arabttexample{'A} but also of undotted letters \emph{b\=a\hamza} \arabttexample{'b}, \emph{n\=un} \arabttexample{'n}, \emph{f\=a\hamza} \arabttexample{'f} and \emph{q\=af} \arabttexample{'q};
 
-\item other digraphs end with one or more asterisks: the most frequent one is the \emph{t\=a\hamza\ marbu\d{t}a} \arabttexample{t*} (which can be used also in initial and medial, and then becomes a regular \emph{t\=a\hamza}). The asterisk is also used for the \emph{wa\d{s}la} (which is only placed on the \emph{\hamza$\!$alif}) \arabttexample{A*} as well as for the vertical \emph{fat\d{h}a} (as in \arabttexample{ha*dhA}) and the \emph{madda}. The latter is normally used only on the \emph{\hamza$\!$alif} (\arabttexample{'A}) but can be found also in the notorious \emph{muqa\d t\d ta\ayn\=at} in the Koran, as in \arab{`a**sa**qa**} (\emph{Koran} 42:2) or \arab{ka**ha*Ya*`a**Sa**} (\emph{Koran} 19:1)---sometimes it is even combined with a \emph{\v{s}adda} (as in \arab{Ala**m+a**Sa**}, \emph{Koran} 7:1 and \cite[p.~111]{syed} for the \emph{\v{s}adda});
+\item other digraphs end with one or more asterisks: the most frequent one is the \emph{t\=a\hamza\ marbu\d{t}a} \arabttexample{t*} (which can be used also in initial and medial, and then becomes a regular \emph{t\=a\hamza}). The asterisk is also used for the \emph{Ua\d{s}la} (which is only placed on the \emph{\hamza$\!$alif}) \arabttexample{A*} as well as for the vertical \emph{fat\d{h}a} (as in \arabttexample{ha*dhA}) and the \emph{madda}. The latter is normally used only on the \emph{\hamza$\!$alif} (\arabttexample{'A}) but can be found also in the notorious \emph{muqa\d t\d ta\ayn\=at} in the Koran, as in \arab{`a**sa**qa**} (\emph{Koran} 42:2) or \arab{ka**ha*Ya*`a**Sa**} (\emph{Koran} 19:1)---sometimes it is even combined with a \emph{\v{s}adda} (as in \arab{Ala**m+a**Sa**}, \emph{Koran} 7:1 and \cite[p.~111]{syed} for the \emph{\v{s}adda});
 
 \item there is a special transcription for the ligature \arabttexample{LLh} used for the \arab{اسم الجلالة} ``noun of majesty,'' which is the name of God \arab{ALLh}: in this case---and in this case only---an uppercase \texttt{L} is used. The reason is that we wish to avoid ambiguity with other uses of the trigram \emph{l\=am}-\emph{l\=am}-\emph{h\=a\hamza}, for example \arab{YuDolilohu} (\emph{Koran} 6:39) where we encounter letters \arab{llh} but not with the meaning ``God.'' Contrarily to other systems, the \arab{LLh} ligature is available also in final form (for \arab{faLiLhi} which occurs six times in the Koran, for example  \emph{Koran} 6:149), and it is possible to add diacritics to its first glyph (as in \arab{UaLiLhi}, \emph{Koran} 2:115 or \arab{L+iLhi}, \emph{Koran} 2:165).
 \end{enumerate}
@@ -369,7 +380,7 @@ Input can be transliterated or provided directly in Unicode Arabic: \texttt{\tex
 
 All cells of Table~\ref{trans} can be obtained by the corresponding Unicode characters (mostly via a single character, except for \emph{\v{s}adda} + vowel combinations which require two characters). There is a special case, though: the \arab{LLh} ligature (see next section).
 
-For the convenience of the user who wants to write kashida (so that Arabic input is not disrupted) we have defined a command (in Arabic characters) \arabtt{tT}\textbackslash{} (\arab{tT} are the first two letters of \arab{tTUYl} = \emph{ta\d{t}wyl}, the Arabic name of kashida) which is exactly equivalent to \verb=\kesh= and has to be placed between Unicode \textsc{U+0640 arabic tatwell} characters.
+For the convenience of the user who wants to write kashida (so that Arabic input is not disrupted) we have defined a command (in Arabic characters) \arabtt{tT}\textbackslash{} (\arab{tT} are the first two letters of \arab{tTUYl} = \emph{ta\d{t}Uyl}, the Arabic name of kashida) which is exactly equivalent to \verb=\kesh= and has to be placed between Unicode \textsc{U+0640 arabic tatwell} characters.
 
 \subsubsection{The \arab{LLh} ligature and Unicode}\label{allah}
 
diff --git a/Master/texmf-dist/doc/fonts/dad/utf8-to-dad.pl b/Master/texmf-dist/doc/fonts/dad/utf8-to-dad.pl
index b9be01ac8c4..e834ea58435 100755
--- a/Master/texmf-dist/doc/fonts/dad/utf8-to-dad.pl
+++ b/Master/texmf-dist/doc/fonts/dad/utf8-to-dad.pl
@@ -1,4 +1,4 @@
-#!/opt/local/bin/perl
+#!/usr/bin/perl
 use utf8;
 binmode stdin,":utf8";
 binmode stdout,":utf8";
@@ -7,6 +7,12 @@ while (<>) {
 s/لله/LLh/g;
 s/لِله/LiLh/g;
 s/لِّله/L+iLh/g;
+s/أ/'a/g;
+s/إ/'i/g;
+s/ؤ/'u/g;
+s/ىٔ/'I/g;
+s/هٔ/e/g;
+s/آ/'A/g;
 s/ء/|/g;
 s/ٱ/A*/g;
 s/آ/'A/g;
@@ -64,6 +70,10 @@ s/ّ/+/g;
 s/ْ/o/g;
 s/ٰ/a*/g;
 s/ٓ/a**/g;
+s/،/,/g;
+s/؟/?/g;
+s/؛/;/g;
+tr/٠١٢٣٤٥٦٧٨٩٪/0123456789%/;
 s/‍/-/g;
 s/ـ/--/g;
 s/([tds])h/\1-h/g;
diff --git a/Master/texmf-dist/tex/lualatex/dad/dad.sty b/Master/texmf-dist/tex/lualatex/dad/dad.sty
index c8f74c67019..336dc01bbe1 100644
--- a/Master/texmf-dist/tex/lualatex/dad/dad.sty
+++ b/Master/texmf-dist/tex/lualatex/dad/dad.sty
@@ -1,8 +1,8 @@
 %%% ====================================================================
 %%%  @LaTeX-style-file{
 %%%     filename        = "dad.sty",
-%%%     version         = "1.1",
-%%%     date            = "2014/10/11",
+%%%     version         = "1.2",
+%%%     date            = "2017/05/20",
 %%%     author          = "Yannis Haralambous",
 %%%     copyright       = "This file is part of the dad package, released
 %%%                        under the LPPL."
@@ -12,9 +12,10 @@
 %%%       system for typesetting in the Arabic language.",
 %%%  }
 %%% ====================================================================
-\long\def\arab#1{\bgroup\language-1\fontencoding{OT1}\fontfamily{dad}\selectfont\luatextextdir TRT#1\egroup}
+\RequirePackage{luatex85}
+\long\def\arab#1{\bgroup\language-1\fontencoding{OT1}\fontfamily{dad}\selectfont\textdir TRT#1\egroup}
 \def\arabttexample#1{\arab{#1} $=$ \texttt{#1}}
-\long\def\arabtt#1{\bgroup\language-1\fontencoding{OT1}\fontfamily{dad}\fontshape{mono}\selectfont\luatextextdir TRT#1\egroup}
+\long\def\arabtt#1{\bgroup\language-1\fontencoding{OT1}\fontfamily{dad}\fontshape{mono}\selectfont\textdir TRT#1\egroup}
 \def\kesh{\leavevmode\leaders\hrule height \fontdimen8\font\hfill\kern0pt}
 \def\arabttsep#1#2{\arab{#1} $=$ \texttt{#2}}
 \def\arabdottedcircle{^^^^00fb}