corrected clean-up function for hyphen

2 files changed, 24 insertions, 19 deletions

diff --git a/arabluatex.dtx b/arabluatex.dtx
index 6c89aa4..cad42c7 100644
--- a/arabluatex.dtx
+++ b/arabluatex.dtx
@@ -50,7 +50,7 @@
 \usepackage{longtable}
 \usepackage{booktabs}
 \usepackage{tikz}
-\usepackage[skins]{tcolorbox}
+\usepackage[skins,listings]{tcolorbox}
 \usepackage{csquotes}
 \usepackage[style=authoryear, natbib]{biblatex}
 \addbibresource{arabluatex.bib}
@@ -124,7 +124,7 @@
 %   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. \package{arabluatex} is able to process any Arab\TeX\
+%   writing. \pkg*{arabluatex} is able to process any Arab\TeX\
 %   input notation. Its output can be set in the same modes of
 %   vocalization as Arab\TeX\ ones, or in different roman
 %   transliterations. It further allows some typographical
@@ -159,9 +159,9 @@
 % say so---it will eventually provide all of its valuable qualities to
 % the \LuaLaTeX\ users.
 %
-% \package{arabtex} dates back to 1992. As far as I know, it was then
+% \pkg{arabtex} dates back to 1992. As far as I know, it was then
 % the first and only way to typeset Arabic texts with \TeX\ and
-% \LaTeX. To achieve this, \package{arabtex} provided---and still
+% \LaTeX. To achieve this, \pkg{arabtex} provided---and still
 % does---an Arabic font in \emph{Nasḫī} style and a macro package that
 % defined its own input notation which was, as the author stated,
 % \enquote{both machine, and human, readable, and suited for
@@ -210,26 +210,26 @@
 % that can stand to close grammatical scrutiny and to complex textual
 % searches as well.
 %
-% Having that in mind, I started \package{arabluatex}. With the help
+% Having that in mind, I started \pkg*{arabluatex}. With the help
 % of Lua, it will eventually interact with some other packages yet to
 % come to produce from \verb|.tex| source files, in addition to
 % printed books, \texttt{TEI xml} compliant critical editions and/or
 % lexicons that can be searched, analyzed and correlated in various
 % ways.
 %
-%\subsection{\package{arabluatex} is for \LuaLaTeX}
-% It goes without saying that \package{arabluatex} requires
-% \LuaLaTeX. \TeX\ and \LaTeX\ have \package{arabtex}, and \XeLaTeX\
-% has \package{arabxetex}. Both of them are much more advanced than
-% \package{arabluatex}, as they can process a number of different
+%\subsection{\pkg*{arabluatex} is for \LuaLaTeX}
+% It goes without saying that \pkg*{arabluatex} requires
+% \LuaLaTeX. \TeX\ and \LaTeX\ have \pkg*{arabtex}, and \XeLaTeX\
+% has \pkg*{arabxetex}. Both of them are much more advanced than
+% \pkg*{arabluatex}, as they can process a number of different
 % languages,\footnote{To date, both packages support Arabic, Maghribi,
 % Urdu, Pashto, Sindhi, Kashmiri, Uighuric and Old Malay; in addition
-% to these, \package{arabtex} also has a Hebrew mode, including
-% Judeo-Arabic and Yiddish.} whereas \package{arabluatex} can process
+% to these, \pkg*{arabtex} also has a Hebrew mode, including
+% Judeo-Arabic and Yiddish.} whereas \pkg*{arabluatex} can process
 % only Arabic for the time being. More languages will be included in
-% future releases of \package{arabluatex}.
+% future releases of \pkg*{arabluatex}.
 %
-% In comparison to \package{arabxetex}, \package{arabluatex} works in
+% In comparison to \pkg*{arabxetex}, \pkg*{arabluatex} works in
 % a very different way. The former relies on the
 % \href{http://scripts.sil.org/TECkitIntro}{\texttt{TECkit}} engine
 % which converts Arab\TeX\ input on the fly into Unicode Arabic
@@ -246,7 +246,12 @@
 % processing.
 %
 % \section{Usage}
-% \sinceversion{1.0}
+% \subsection{Getting started}
+% As usual put in your preamble:
+% \begin{commands}
+%   \command{usepackage}[\Marg{arabluatex}]
+% \end{commands}
+%
 % \begin{options}
 %   \opt{voc}\Default{voc} Vocalized Arabic
 %   \opt{novoc} Full vocalized Arabic
@@ -296,7 +301,7 @@
 [2016/01/26 v1.0 ArabTeX-like interface for LuaLaTeX]
 \RequirePackage{ifluatex}
 %    \end{macrocode}
-% \package{arabluatex} requires \LuaLaTeX\ of course.
+% \pkg*{arabluatex} requires \LuaLaTeX\ of course.
 %    \begin{macrocode}
 \ifluatex\else
  \PackageError{arabluatex}{lualatex needed}{%
@@ -325,8 +330,8 @@
 \RequirePackage{environ}
 \luadirect{dofile(kpse.find_file("arabluatex.lua"))}
 %    \end{macrocode}
-% This is needed by the current versions of \package{polyglossia} and
-% \package{luabidi}.  \package{luabidi} provides a \cs{Footnote}
+% This is needed by the current versions of \pkg*{polyglossia} and
+% \pkg*{luabidi}.  \pkg*{luabidi} provides a \cs{Footnote}
 % command. Use it as well if it is loaded.
 %    \begin{macrocode}
 \luadirect{tex.enableprimitives("luatex",tex.extraprimitives("omega"))}
diff --git a/arabluatex_voc.lua b/arabluatex_voc.lua
index f9f251c..ea81844 100644
--- a/arabluatex_voc.lua
+++ b/arabluatex_voc.lua
@@ -302,7 +302,7 @@ punctuation = {
 
 null = {
    {a="%|", b=""},
-   {a="([^0-9])(%-)([^0-9])", b="%1%3"}
+   {a="([^0-9])(%-)", b="%1"}
 }
 
 -- return {