texlive[42174] Master/texmf-dist: arabluatex (28sep16)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 29 00:19:35 CEST 2016
Revision: 42174
http://tug.org/svn/texlive?view=revision&revision=42174
Author: karl
Date: 2016-09-29 00:19:34 +0200 (Thu, 29 Sep 2016)
Log Message:
-----------
arabluatex (28sep16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
Modified: trunk/Master/texmf-dist/doc/lualatex/arabluatex/arabluatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx 2016-09-28 12:54:52 UTC (rev 42173)
+++ trunk/Master/texmf-dist/source/lualatex/arabluatex/arabluatex.dtx 2016-09-28 22:19:34 UTC (rev 42174)
@@ -27,7 +27,7 @@
%<package-info>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package-info>\ProvidesPackage{arabluatex}
%<*package-info>
- [2016/09/14 v1.4.3 This is ArabTeX for LuaLaTeX]
+ [2016/09/28 v1.4.4 This is ArabTeX for LuaLaTeX]
%</package-info>
%
%<*driver>
@@ -145,7 +145,7 @@
\defaultfontfeatures{RawFeature={+liga}}
\setmainfont{Old Standard}[SmallCapsFont={Latin Modern Roman Caps},
RawFeature={+mark;+ccmp;+ss05;+ss06}]
-\usepackage{arabluatex}[2016/09/14]
+\usepackage{arabluatex}[2016/09/28]
\usepackage{varioref}
\usepackage{hypdoc}
\hypersetup{unicode=true, colorlinks, allcolors=blue,
@@ -198,7 +198,7 @@
%</driver>
% \fi
%
-% \CheckSum{376}
+% \CheckSum{379}
%
% \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
@@ -510,12 +510,16 @@
% \item In |fullvoc| mode, the \arb[trans]{sukUn} is expressed.
% \end{compactitem}
%
-% \DescribeMacro{\SetArbEasy} \DescribeMacro{\SetArbDflt} Such
+% \DescribeMacro{\SetArbEasy} \NEWfeature{v1.4.4}
+% \DescribeMacro{\SetArbEasy*} \DescribeMacro{\SetArbDflt} Such
% refinements may be discarded by the command \cs{SetArbEasy}, either
% globally in the preamble or locally at any point of the
-% document. Default \enquote*{classic} rules may be set back at any
-% point of the document with the command \cs{SetArbDflt}. Examples
-% follow:---
+% document. The difference between \cs{SetArbEasy} and its
+% \enquote*{starred} version \cs{SetArbEasy*} is that the former keeps
+% the \arb[trans]{sukUn} that is generated by the |fullvoc| mode,
+% while the latter further takes it away. Default \enquote*{classic}
+% rules may be set back at any point of the document with the command
+% \cs{SetArbDflt}. Examples follow:---
% \begin{compactenum}[(a)]
% \item \cs{SetArbDflt}:
% \begin{compactenum}[i.]
@@ -535,6 +539,15 @@
% \item |trans| \arb[trans]{wa-mAta istisqA'aN qabla 'an yutimma
% kitAba-hu fI nujUm-i 'l-samA'-i}\SetArbDflt
% \end{compactenum}
+% \item \cs{SetArbEasy*}:
+% \begin{compactenum}[i.]\SetArbEasy*
+% \item |voc| \arb[voc]{wa-mAta istisqA'aN qabla 'an yutimma
+% kitAba-hu fI nujUm-i 'l-samA'-i}
+% \item |fullvoc| \arb[fullvoc]{wa-mAta istisqA'aN qabla 'an yutimma
+% kitAba-hu fI nujUm-i 'l-samA'-i}
+% \item |trans| \arb[trans]{wa-mAta istisqA'aN qabla 'an yutimma
+% kitAba-hu fI nujUm-i 'l-samA'-i}\SetArbDflt
+% \end{compactenum}
% \end{compactenum}
%
% \iffalse
@@ -2383,7 +2396,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2016/09/14 v1.4.3 ArabTeX-like interface for LuaLaTeX]
+[2016/09/28 v1.4.4 ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
% \end{macrocode}
% \package{arabluatex} requires \LuaLaTeX\ of course. Issue a warning
@@ -2494,6 +2507,10 @@
% \begin{macro}{\SetArbEasy}
% \changes{v1.2}{2016/05/09}{New \cs{SetArbEasy}/\cs{SetArbDflt} for
% \enquote*{modern} or \enquote*{classic} Arabic styles.}
+% \begin{macro}{\SetArbEasy*}
+% \changes{v1.4.4}{2016/09/28}{this starred version discards the
+% \arb[trans]{sukUn} in addition to what is already discarded by
+% \cs{SetArbEasy}.}
% \begin{macro}{\SetArbDflt}
% By default, \package{arabluatex} applies complex rules to generate
% euphonic \arb[trans]{ta^sdId}, \arb[trans]{'alif mamdUdaT} and
@@ -2500,14 +2517,21 @@
% \arb[trans]{sukUn} depending on the modes which are selected,
% either |voc|, |fullvoc| or |trans|. Such refinements can be
% discarded with \cs{SetArbEasy}, either globally in the preamble or
-% at any point of the document. Default complex rules can be set
+% at any point of the document. Note that \cs{SetArbEasy} keeps the
+% \arb[trans]{sukUn} that is generated, while the starred version
+% \cs{SetArbEasy*} takes it away. Default complex rules can be set
% back at any point of the document with \cs{SetArbDflt}.
% \begin{macrocode}
\def\al at arb@rules{dflt}
-\NewDocumentCommand{\SetArbEasy}{}{\def\al at arb@rules{easy}}
+\NewDocumentCommand{\SetArbEasy}{s}{%
+ \IfBooleanTF{#1}
+ {\def\al at arb@rules{easynosukun}}
+ {\def\al at arb@rules{easy}}}
\NewDocumentCommand{\SetArbDflt}{}{\def\al at arb@rules{dflt}}
% \end{macrocode}
% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\SetTranslitFont}
% \changes{v1.4}{2016/07/05}{For selecting a specific font for
% transliterated texts} By default, the font that is used for
@@ -2519,7 +2543,6 @@
\NewDocumentCommand{\SetTranslitFont}{m}{\def\al at trans@font{#1}}
% \end{macrocode}
% \end{macro}
-% \end{macro}
% \begin{macro}{\SetTranslitStyle} By default any transliterated
% Arabic text is printed in italics. This can be changed either
% globally in the preamble or at any point of the document:
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua 2016-09-28 12:54:52 UTC (rev 42173)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.lua 2016-09-28 22:19:34 UTC (rev 42174)
@@ -241,7 +241,7 @@
return str
end
-local function fullvoceasy(str)
+local function fullvoceasy(str, opt)
str = string.gsub(str, "\\arb(%b{})", function(inside)
inside = string.sub(inside, 2, -2)
for i = 1,#hamzafveasy do
@@ -253,8 +253,14 @@
for i = 1,#trigraphsfveasy do
inside = string.gsub(inside, trigraphsfveasy[i].a, trigraphsfveasy[i].b)
end
- for i = 1,#digraphsfveasy do
- inside = string.gsub(inside, digraphsfveasy[i].a, digraphsfveasy[i].b)
+ if opt == "nosukun" then
+ for i = 1,#digraphsfveasy do
+ inside = string.gsub(inside, digraphsfveasy[i].a, digraphsfveasy[i].b)
+ end
+ else
+ for i = 1,#digraphsfv do
+ inside = string.gsub(inside, digraphsfv[i].a, digraphsfv[i].b)
+ end
end
for i = 1,#singlefveasy do
inside = string.gsub(inside, singlefveasy[i].a, singlefveasy[i].b)
@@ -477,7 +483,7 @@
if scheme == "buckwalter" then
str = processbuckw(str)
else end
- if rules == "easy" then
+ if rules == "easy" or rules == "easynosukun" then
str = voceasy(str)
elseif rules == "dflt" then
str = voc(str)
@@ -496,7 +502,9 @@
str = processbuckw(str)
else end
if rules == "easy" then
- str = fullvoceasy(str)
+ str = fullvoceasy(str, "sukun")
+ elseif rules == "easynosukun" then
+ str = fullvoceasy(str, "nosukun")
elseif rules == "dflt" then
str = fullvoc(str)
else end
@@ -513,7 +521,7 @@
if scheme == "buckwalter" then
str = processbuckw(str)
else end
- if rules == "easy" then
+ if rules == "easy" or rules == "easynosukun" then
str = novoceasy(str)
elseif rules == "dflt" then
str = novoc(str)
@@ -532,7 +540,7 @@
str = processbuckw(str)
else end
if mode == "dmg" then
- if rules == "easy" then
+ if rules == "easy" or rules == "easynosukun" then
str = transdmgeasy(str)
elseif rules == "dflt" then
str = transdmg(str)
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty 2016-09-28 12:54:52 UTC (rev 42173)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex.sty 2016-09-28 22:19:34 UTC (rev 42174)
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{arabluatex}%
-[2016/09/14 v1.4.3 ArabTeX-like interface for LuaLaTeX]
+[2016/09/28 v1.4.4 ArabTeX-like interface for LuaLaTeX]
\RequirePackage{ifluatex}
\ifluatex\else
\PackageError{arabluatex}{lualatex needed}{%
@@ -86,7 +86,10 @@
\def\al at input@scheme{arabtex}
\NewDocumentCommand{\SetInputScheme}{m}{\def\al at input@scheme{#1}}
\def\al at arb@rules{dflt}
-\NewDocumentCommand{\SetArbEasy}{}{\def\al at arb@rules{easy}}
+\NewDocumentCommand{\SetArbEasy}{s}{%
+ \IfBooleanTF{#1}
+ {\def\al at arb@rules{easynosukun}}
+ {\def\al at arb@rules{easy}}}
\NewDocumentCommand{\SetArbDflt}{}{\def\al at arb@rules{dflt}}
\def\al at trans@font{\rmfamily}%
\NewDocumentCommand{\SetTranslitFont}{m}{\def\al at trans@font{#1}}
Modified: trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2016-09-28 12:54:52 UTC (rev 42173)
+++ trunk/Master/texmf-dist/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2016-09-28 22:19:34 UTC (rev 42174)
@@ -503,7 +503,7 @@
{a="%^d", b="ڊ"}
}
-digraphsfveasy = { -- see the diffenrences under 'easy' marker below
+digraphsfveasy = { -- see the differences under 'easy' marker below
-- iʿrāb: straight double quote must be discarded
{a="(%-)(\"?[UI]na)(%p?%s)", b="%2%3"},
{a="(%-)(\"?[UI]na)(%p?)$", b="%2%3"},
More information about the tex-live-commits
mailing list