license: upgrade from GPLv2 to GPLv3 --> arabluatex v1.1

10 files changed, 158 insertions, 147 deletions

diff --git a/README.md b/README.md
index b9c08d7..78cddf4 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,12 @@ analyzed and correlated in various ways.
 License and disclamer 
 =====================
 
-Copyright ⓒ 2016 Robert Alessi Please send error reports and suggestions
-for improvements to Robert Alessi:
+ArabLuaTeX – Processing ArabTeX notation under LuaLaTeX
+
+Copyright ⓒ 2016 Robert Alessi
+
+Please send error reports and suggestions for improvements to Robert
+Alessi:
 
 -   email: [alessi@robertalessi.net](alessi@robertalessi.net)
 
@@ -34,9 +38,9 @@ for improvements to Robert Alessi:
 -   comments, feature requests, bug reports:
     <https://notabug.org/ralessi/arabluatex>
 
-This program is free software; you can redistribute it and/or modify it
+This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
+Free Software Foundation, either version 3 of the License, or (at your
 option) any later version.
 
 This program is distributed in the hope that it will be useful, but
@@ -45,8 +49,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
 
 This release of arabluatex consists of the following source files:
 
diff --git a/README.tex b/README.tex
index d1e5d76..08b4c75 100644
--- a/README.tex
+++ b/README.tex
@@ -32,7 +32,10 @@ interact with some other packages yet to come to produce from
 searched, analyzed and correlated in various ways.
 
 \section*{License and disclamer}
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
+
 Copyright ⓒ 2016  Robert Alessi
+
 Please send error reports and suggestions for improvements to Robert
 Alessi:
 \begin{itemize}
@@ -42,20 +45,19 @@ Alessi:
   \url{https://notabug.org/ralessi/arabluatex}
 \end{itemize}
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 
 This release of arabluatex consists of the following
 source files:
diff --git a/about.html b/about.html
index b451f60..a093cac 100644
--- a/about.html
+++ b/about.html
@@ -16,15 +16,17 @@
 <h1 id="sec:overview" class="unnumbered">Overview</h1>
 <p>This package provides for <a href="http://luatex.org">LuaLaTeX</a> an <a href="http://ctan.org/pkg/arabtex">ArabTeX</a>-like interface to generate Arabic writing from an <span style="font-variant: small-caps;">ascii</span> transliteration. It is particularly well-suited for complex documents such as technical documents or critical editions where a lot of left-to-right commands intertwine with Arabic writing. arabluatex is able to process any ArabTeX input notation. Its output can be set in the same modes of vocalization as ArabTeX, or in different roman transliterations. It further allows many typographical refinements. It will eventually interact with some other packages yet to come to produce from <code>.tex</code> source files, in addition to printed books, <code>TEI xml</code> compliant critical editions and/or lexicons that can be searched, analyzed and correlated in various ways.</p>
 <h1 id="license-and-disclamer" class="unnumbered">License and disclamer</h1>
-<p>Copyright ⓒ 2016 Robert Alessi Please send error reports and suggestions for improvements to Robert Alessi:</p>
+<p>ArabLuaTeX – Processing ArabTeX notation under LuaLaTeX</p>
+<p>Copyright ⓒ 2016 Robert Alessi</p>
+<p>Please send error reports and suggestions for improvements to Robert Alessi:</p>
 <ul>
 <li><p>email: <a href="alessi@robertalessi.net" class="uri">alessi@robertalessi.net</a></p></li>
 <li><p>website: <a href="http://www.robertalessi.net/arabluatex" class="uri">http://www.robertalessi.net/arabluatex</a></p></li>
 <li><p>comments, feature requests, bug reports: <a href="https://notabug.org/ralessi/arabluatex" class="uri">https://notabug.org/ralessi/arabluatex</a></p></li>
 </ul>
-<p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</p>
+<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p>
 <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</p>
-<p>You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</p>
+<p>You should have received a copy of the GNU General Public License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</p>
 <p>This release of arabluatex consists of the following source files:</p>
 <ul>
 <li><p><code>arabluatex.ins</code></p></li>
diff --git a/arabluatex.dtx b/arabluatex.dtx
index 27e970e..3fd4ccb 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -1,23 +1,23 @@
 % \iffalse meta-comment
+% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 % Copyright (C) 2016  Robert Alessi
 %
-% Please send error reports and suggestions for improvements to
-% Robert Alessi <alessi@robertalessi.net>
+% Please send error reports and suggestions for improvements to Robert
+% Alessi <alessi@robertalessi.net>
 %
-% This program is free software; you can redistribute it and/or
-% modify it under the terms of the GNU General Public License
-% as published by the Free Software Foundation; either version 2
-% of the License, or (at your option) any later version.
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 %
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
+% This program is distributed in the hope that it will be useful, but
+% WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+% General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-% 02111-1307, USA.
+% along with this program.  If not, see
+% <http://www.gnu.org/licenses/>.
 % \fi
 %
 % \iffalse
@@ -36,25 +36,25 @@
 \begin{filecontents}{\jobname.bib}
 % This file is part of the `arabluatex' package
 %
-% copyright (C) 2016  Robert Alessi
+% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
+% Copyright (C) 2016  Robert Alessi
 %
-% Please send error reports and suggestions for improvements to
-% Robert Alessi <alessi@robertalessi.net>
+% Please send error reports and suggestions for improvements to Robert
+% Alessi <alessi@robertalessi.net>
 %
-% This program is free software; you can redistribute it and/or
-% modify it under the terms of the GNU General Public License
-% as published by the Free Software Foundation; either version 2
-% of the License, or (at your option) any later version.
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 %
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
+% This program is distributed in the hope that it will be useful, but
+% WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+% General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-% 02111-1307, USA.
+% along with this program.  If not, see
+% <http://www.gnu.org/licenses/>.
 
 @software{pkg:arabtex,
   author =       {Lagally, Klaus},
@@ -274,20 +274,19 @@
 % \url{https://notabug.org/ralessi/arabluatex}
 % \end{compactitem}
 %
-% This program is free software; you can redistribute it and/or
-% modify it under the terms of the GNU General Public License
-% as published by the Free Software Foundation; either version 2
-% of the License, or (at your option) any later version.
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
 %
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
+% This program is distributed in the hope that it will be useful, but
+% WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+% General Public License for more details.
 %
 % You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-% 02111-1307, USA.
+% along with this program.  If not, see
+% <http://www.gnu.org/licenses/>.
 %
 % This release of \package{arabluatex} consists of the following
 % source files:
diff --git a/arabluatex.ins b/arabluatex.ins
index 62606c6..4901ac9 100644
--- a/arabluatex.ins
+++ b/arabluatex.ins
@@ -1,11 +1,14 @@
+%% This file is part of the `arabluatex' package
+%%
+%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 %% Copyright (C) 2016  Robert Alessi
 %%
 %% Please send error reports and suggestions for improvements to
 %% Robert Alessi <alessi@robertalessi.net>
 %%
-%% This program is free software; you can redistribute it and/or
+%% This program is free software: you can redistribute it and/or
 %% modify it under the terms of the GNU General Public License
-%% as published by the Free Software Foundation; either version 2
+%% as published by the Free Software Foundation, either version 3
 %% of the License, or (at your option) any later version.
 %%
 %% This program is distributed in the hope that it will be useful,
@@ -14,8 +17,8 @@
 %% GNU General Public License for more details.
 %%
 %% You should have received a copy of the GNU General Public License
-%% along with this program; if not, write to the Free Software
-%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+%% along with this program.  If not, see
+%% <http://www.gnu.org/licenses/>.
 %%
 %% This release of 'arabluatex' consists of the following source files:
 %% - arabluatex.ins
@@ -38,25 +41,27 @@
 
 This is a generated file.
 
+This file is part of the `arabluatex' package
+
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 Copyright (C) 2016  Robert Alessi
 
-Please send error reports and suggestions for improvements to
-Robert Alessi <alessi@robertalessi.net>
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 
 This release of 'arabluatex' consists of the following source files:
 - arabluatex.ins
diff --git a/arabluatex.lua b/arabluatex.lua
index 0f3984b..719e1e0 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -1,25 +1,25 @@
 --[[
 This file is part of the `arabluatex' package
 
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 Copyright (C) 2016  Robert Alessi
 
-Please send error reports and suggestions for improvements to
-Robert Alessi <alessi@robertalessi.net>
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 --]]
 
 require("arabluatex_voc")
@@ -381,13 +381,6 @@ function cap(str)
 return str
 end
 
-local abjad = {
-{"a\"'", "b", "j", "d", "h", "w", "z", ".h", ".t"},
-{"y", "k", "l", "m", "n", "s", "`", "f", ".s", },
-{"q", "r", "^s", "t", "_t", "x", "_d", ".d", ".z", },
-{".g"}
-}
-
 -- this function is adapted from an 'obsolete project' of Khaled
 -- Hosny's that dates back to 2010. Thanks to him.
 -- See https://github.com/khaledhosny/lualatex-arabic
diff --git a/arabluatex_fullvoc.lua b/arabluatex_fullvoc.lua
index 8b94c1e..8263734 100644
--- a/arabluatex_fullvoc.lua
+++ b/arabluatex_fullvoc.lua
@@ -1,25 +1,25 @@
 --[[
 This file is part of the `arabluatex' package
 
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 Copyright (C) 2016  Robert Alessi
 
-Please send error reports and suggestions for improvements to
-Robert Alessi <alessi@robertalessi.net>
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 --]]
 
 -- this is new
diff --git a/arabluatex_novoc.lua b/arabluatex_novoc.lua
index deb5d3e..16f3b51 100644
--- a/arabluatex_novoc.lua
+++ b/arabluatex_novoc.lua
@@ -1,25 +1,25 @@
 --[[
 This file is part of the `arabluatex' package
 
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 Copyright (C) 2016  Robert Alessi
 
-Please send error reports and suggestions for improvements to
-Robert Alessi <alessi@robertalessi.net>
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 --]]
 
 tanwinnv = {
diff --git a/arabluatex_trans.lua b/arabluatex_trans.lua
index 11d1ac1..6b3f1bc 100644
--- a/arabluatex_trans.lua
+++ b/arabluatex_trans.lua
@@ -1,25 +1,25 @@
 --[[
 This file is part of the `arabluatex' package
 
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 Copyright (C) 2016  Robert Alessi
 
-Please send error reports and suggestions for improvements to
-Robert Alessi <alessi@robertalessi.net>
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 --]]
 
 -- common
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index 0544a63..5eafca5 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -1,27 +1,34 @@
 --[[
 This file is part of the `arabluatex' package
 
+ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
 Copyright (C) 2016  Robert Alessi
 
-Please send error reports and suggestions for improvements to
-Robert Alessi <alessi@robertalessi.net>
+Please send error reports and suggestions for improvements to Robert
+Alessi <alessi@robertalessi.net>
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
 --]]
 
+abjad = {
+{"a\"'", "b", "j", "d", "h", "w", "z", ".h", ".t"},
+{"y", "k", "l", "m", "n", "s", "`", "f", ".s", },
+{"q", "r", "^s", "t", "_t", "x", "_d", ".d", ".z", },
+{".g"}
+}
+
 numbers = {
    {a="0", b="٠"},
    {a="1", b="١"},