From df2f0de4bc78d7ff734e976c89b55cc7a31a160e Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Mon, 16 Nov 2020 20:01:16 +0100 Subject: fixed captions in longtables --- arabluatex.dtx | 93 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 51 deletions(-) diff --git a/arabluatex.dtx b/arabluatex.dtx index 08f9be2..92e04df 100644 --- a/arabluatex.dtx +++ b/arabluatex.dtx @@ -188,7 +188,7 @@ \labelformat{subsection}{sect.~#1} \labelformat{subsubsection}{sect.~#1} \labelformat{figure}{fig.~#1} -\labelformat{table}{tab.~#1} +\labelformat{table}{table~#1} \metaset{titletext}{% \metapick[#1]{title}% \metacompose[#1]{subtitle}{\metaget[sep]{subtitle}}{}{}} @@ -852,12 +852,11 @@ % where \meta{mode} may be any of |voc|, |fullvoc|, |novoc| or % |trans|. % -%\section{Standard Arab\TeX\ input} -%\subsection{Consonants} +% \section{Standard Arab\TeX\ input} +% \subsection{Consonants} % \Vref{tab:arabtex-consonants} gives the Arab\TeX\ equivalents for % all of the Arabic consonants. % -% \addlines[2] % \newcommand{\dmg}[1]{% % \SetTranslitConvention{dmg}% % \arb[trans]{#1}} @@ -869,11 +868,10 @@ % \arb[trans]{#1}\SetTranslitConvention{dmg}} % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:arabtex-consonants}: Standard Arab\TeX\ -% (consonants)} +% \caption[]{Standard Arab\TeX\ (consonants)} % \endfoot -% \captionlistentry{Arab\TeX\ consonants}\\[-1em] % \toprule +% \captionlistentry{Standard Arab\TeX\ (consonants)} % Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule @@ -888,7 +886,7 @@ % \arb[trans]{'alif} as a consonant, see \textcite[i. 16 % D]{Wright}. The \arb[trans]{hamzaT} itself is encoded \texttt{<'>} % and may be followed by either \meta{u, a} or \meta{i}. See below -% \vref{ref:hamza}.} & \dmg{'u 'a 'i} & +% \vref{ref:hamza}.} & \dmg{'u, 'a, 'i} & % \loc{|'u, |'a, |'i} & \brill{|'u, |'a, |'i} & |'u| or |'a| or |'i| \\ % \arb[novoc]{b} & \dmg{b} & \loc{b} & \brill{b} & |b| \\ % \arb[novoc]{t} & \dmg{t} & \loc{t} & \brill{t} & |t| \\ @@ -901,6 +899,7 @@ % \arb[novoc]{r} & \dmg{r} & \loc{r} & \brill{r} & |r| \\ % \arb[novoc]{z} & \dmg{z} & \loc{z} & \brill{z} & |z| \\ % \arb[novoc]{s} & \dmg{s} & \loc{s} & \brill{s} & |s| \\ +% \pagebreak[1] % \arb[novoc]{^s} & \dmg{^s} & \loc{^s} & \brill{^s} & |^s| \\ % \arb[novoc]{.s} & \dmg{.s} & \loc{.s} & \brill{.s} & |.s| \\ % \arb[novoc]{.d} & \dmg{.d} & \loc{.d} & \brill{.d} & |.d| \\ @@ -962,11 +961,10 @@ % % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:arabtex-additional-characters}: Standard -% Arab\TeX\ (additional characters)} +% \caption[]{Standard Arab\TeX\ (additional characters)} % \endfoot -% \captionlistentry{Arab\TeX\ additional characters}\\[-1em] % \toprule +% \captionlistentry{Standard Arab\TeX\ (additional characters)} % Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica}\footnotemark @@ -986,6 +984,7 @@ % \label{tab:arabtex-additional-characters} % \hskip-1em\arb[novoc]{p} & \dmg{p} & \loc{p} & \brill{p} & \verb|p| \\ % \arb[novoc]{^c} & \dmg{^c} & \loc{^c} & \brill{^c} & \verb|^c| \\ +% \pagebreak[1] % \arb[novoc]{^z} & \dmg{^z} & \loc{^z} & \brill{^z} & \verb|^z| \\ % \arb[novoc]{v}\footnote{\label{fn:not-in-dmg}This character is not found in % \textcite[2]{dmg}. It is taken from the \textcite{din31635} standard.} & @@ -1004,14 +1003,13 @@ % \subsubsection{Long vowels} % \Vref{tab:arabtex-long-vowels} gives the Arab\TeX\ equivalents for % the Arabic long vowels. -% \enlargethispage{1\baselineskip} +% % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:arabtex-long-vowels}: Standard Arab\TeX\ (long -% vowels)} +% \caption[]{Standard Arab\TeX\ (long vowels)} % \endfoot -% \captionlistentry{Arab\TeX\ long vowels}\\[-1em] % \toprule +% \captionlistentry{Standard Arab\TeX\ (long vowels)} % Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule @@ -1069,11 +1067,10 @@ % % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:arabtex-short-vowels}: Standard Arab\TeX\ -% (short vowels)} +% \caption[]{Standard Arab\TeX\ (short vowels)} % \endfoot -% \captionlistentry{Arab\TeX\ short vowels}\\[-1em] % \toprule +% \captionlistentry{Standard Arab\TeX\ (short vowels)} % Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule @@ -1909,11 +1906,11 @@ % % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:quoted-hamza}: \enquote{Quoted} -% \arb[trans]{hamzaT}} +% \caption[]{\enquote{Quoted} \arb[trans]{hamzaT}} % \endfoot -% \captionlistentry{\enquote{Quoted} \arb[trans]{hamzaT}}\\[-1em] -% \toprule Letter & \multicolumn{3}{l}{Transliteration\footnotemark} +% \toprule +% \captionlistentry{\enquote{Quoted} \arb[trans]{hamzaT}} +% Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule % \endfirsthead @@ -1924,7 +1921,6 @@ % \footnotetext{See below \vref{sec:transliteration}.} % \label{tab:quoted-hamza} % \arb[novoc]{|"'} & \dmg{|"'} & \loc{|"'} & \brill{|"'} & \verb+|"'+ \\ -% \pagebreak[1] % \arb[novoc]{A"'} & \dmg{A"'} & \loc{A"'} & \brill{A"'} & \verb|A"'| \\ % \arb[novoc]{a"'} & \dmg{a"'} & \loc{a"'} & \brill{a"'} & \verb|a"'| \\ % \arb[novoc]{u"'} & \dmg{u"'} & \loc{u"'} & \brill{u"'} & \verb|u"'| \\ @@ -2152,11 +2148,10 @@ % For the time being, the following is included:--- % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:additional-arabic-codings}: Additional Arabic -% codings} +% \caption[]{Additional Arabic codings} % \endfoot -% \captionlistentry{Additional Arabic codings}\\[-1em] % \toprule +% \captionlistentry{Additional Arabic codings} % Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule @@ -2172,7 +2167,6 @@ % \arb[novoc]{.f} & \dmg{.f} & \loc{.f} & \brill{.f} & |.f| \\ % \arb[novoc]{.q} & \dmg{.q} & \loc{.q} & \brill{.q} & |.q| \\ % \arb[novoc]{.k} & \dmg{.k} & \loc{.k} & \brill{.k} & |.k| \\ -% \pagebreak[1] % \arb[novoc]{.n} & \dmg{.n} & \loc{.n} & \brill{.n} & |.n| \\ % \arb[novoc]{((} & \dmg{((} & \loc{((} & \brill{((} & |((| \\ % \arb[novoc]{))} & \dmg{))} & \loc{))} & \brill{))} & |))| \\ @@ -2667,14 +2661,14 @@ % can be used to insert such characters either in Unicode or in % romanized Arabic environments. It takes as argument a shorthand % defined beforehand in a default list which consists of the following -% at the time of writing:---\\ +% at the time of writing:--- +% % \begin{longtable}{llp{.3\linewidth}p{.3\linewidth}} % \bottomrule -% \caption*{\Vref{tab:arabtex-additional-marks}: Additional Arabic -% marks} +% \caption[]{Additional Arabic marks} % \endfoot -% \captionlistentry{Additional Arabic marks}\\[-1em] % \toprule +% \captionlistentry{Additional Arabic marks} % Codepoint & Shorthand & Glyph & Transliteration \\ \midrule % \endfirsthead % \toprule @@ -2909,6 +2903,7 @@ % shape of the letters while coloring them:--- % \begin{quote}\textbf{\enquote*{voc} mode}:\\ % |i^stara\arbcolor[brown]{y}tu-hu| |bi-_tama\arbcolor[red]{niN}| +% \\ % |'a`\arbcolor[blue]{^ga}ba-ka| % \arb{i^stara\arbcolor[brown]{y}tu-hu bi-_tama\arbcolor[red]{niN} % 'a`\arbcolor[blue]{^ga}ba-ka} @@ -2917,6 +2912,7 @@ % \end{quote} % \begin{quote}\textbf{\enquote*{fullvoc} mode}:\\ % |i^stara\arbcolor[brown]{y}tu-hu| |bi-_tama\arbcolor[red]{niN}| +% \\ % |'a`\arbcolor[blue]{^ga}ba-ka| % \arb[fullvoc]{i^stara\arbcolor[brown]{y}tu-hu % bi-_tama\arbcolor[red]{niN} 'a`\arbcolor[blue]{^ga}ba-ka} @@ -2942,14 +2938,12 @@ % \Vref{tab:arbcolor-diacritics} gives the Arab\TeX\ equivalents for % the diacritics to be printed inside or just after \cs{arbcolor}. % -% \needspace{7\baselineskip} % \begin{longtable}{lllll} % \bottomrule -% \caption*{\Vref{tab:arbcolor-diacritics}: Arab\TeX\ diacritics -% for \cs{arbcolor}} +% \caption[]{Arab\TeX\ diacritics for \cs{arbcolor}} % \endfoot -% \captionlistentry{Arab\TeX\ diacritics for \cs{arbcolor}}\\[-1em] % \toprule +% \captionlistentry{Arab\TeX\ diacritics for \cs{arbcolor}} % Diacritic & \multicolumn{3}{l}{Transliteration\footnotemark} % & Arab\TeX\ notation \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & \\ \midrule @@ -2961,9 +2955,7 @@ % \endhead \footnotetext{See below \vref{sec:transliteration}.} % \label{tab:arbcolor-diacritics} % \arb{B.a} & \dmg{.a} & \loc{.a} & \brill{.a} & \verb|.a| \\ -% \pagebreak[1] % \arb{B.u} & \dmg{.u} & \loc{.u} & \brill{.u} & \verb|.u| \\ -% \pagebreak[1] % \arb{B.i} & \dmg{.i} & \loc{.i} & \brill{.i} & \verb|.i| \\ \midrule % \arb{Bo} & \dmg{o} & \loc{o} & \brill{o} & \verb|o| \\ % \end{longtable} @@ -2987,7 +2979,7 @@ % 'a`\arbcolor[red]{^g}.aba-ka}. % % |i^staraytu-hu| |bi-_tama\arbcolor[red]{n}\arbcolor[blue]{iN}| -% \allowbreak +% \\ % |'a`\arbcolor[red]|\allowbreak|{^g}\arbcolor[blue]{.a}ba-ka| % \arb{i^staraytu-hu bi-_tama\arbcolor[red]{n}\arbcolor[blue]{iN} % 'a`\arbcolor[red]{^g}\arbcolor[blue]{.a}ba-ka} \linebreak @@ -2998,14 +2990,15 @@ % % \begin{quote}\textbf{\enquote*{fullvoc} mode}:\\ % |i^staray"\arbcolor[red]{o}tu-hu| |bi-_taman"\arbcolor[red]{iN}| +% \\ % |'a`^g"\arbcolor[red]{.a}ba-ka| % \arb[fullvoc]{i^staray"\arbcolor[red]{o}tu-hu % bi-_taman"\arbcolor[red]{iN} 'a`^g"\arbcolor[red]{.a}ba-ka} % \arb[trans]{i^staray"\arbcolor[red]{o}tu-hu -% bi-_taman"\arbcolor[red]{iN} -% \linebreak 'a`^g"\arbcolor[red]{.a}ba-ka}. +% bi-_taman"\arbcolor[red]{iN} 'a`^g"\arbcolor[red]{.a}ba-ka}. % % |i^stara\arbcolor[red]{y"}otu-hu| |bi-_tama\arbcolor[red]{n"}iN| +% \\ % |'a`\arbcolor[red]|\allowbreak|{^g"}.aba-ka| % \arb[fullvoc]{i^stara\arbcolor[red]{y"}otu-hu % bi-_tama\arbcolor[red]{n"}iN 'a`\arbcolor[red]{^g"}.aba-ka} @@ -3013,8 +3006,9 @@ % bi-_tama\arbcolor[red]{n"}iN 'a`\arbcolor[red]{^g"}.aba-ka}. % % |i^stara\arbcolor[red]{y"}\arbcolor[blue]{o}tu-hu| +% \\ % |bi-_tama\arb|\allowbreak|color[red]{n"}\arbcolor[blue]{iN}| -% |'a`\arbcolor[red]|\allowbreak|{^g"}\arb|\allowbreak% +% |'a`\arbcolor[red]|\\|{^g"}\arb| % |color[blue]{.a}ba-ka| % \arb[fullvoc]{i^stara\arbcolor[red]{y"}\arbcolor[blue]{o}tu-hu % bi-_tama\arbcolor[red]{n"}\arbcolor[blue]{iN} @@ -3086,9 +3080,8 @@ % the knowledge of the writer, the \arb[trans]{wa.slaT} alone is not % part of the Arabic Unicode block.}. % -% |fI| |"al".i-\arbcolor[red]{\arbnull{'l-}i}btidA'i| +% |fI| |"al".i-\arbcolor[red]{\arbnull{'l-}i}btidA'i|\\ % \arb[fullvoc]{fI "al".i-\arbcolor[red]{\arbnull{'l-}i}btidA'i} -% \linebreak % \arb[trans]{fI "al".i-\arbcolor[red]{\arbnull{'l-}i}btidA'i}. % % |\arbcolor[red]{'a'\arbnull{k}}kulu| @@ -3171,18 +3164,19 @@ % \paragraph{\texorpdfstring{\arb[trans]{hamzaT}}{hamzah}} % The \enquote*{quoting} technique provides an easy way to determine % the carrier of the \arb[trans]{hamzaT}, as shown in -% \vref{tab:quoted-hamza}---: +% \vref{tab:quoted-hamza}:--- % \begin{quote} % \verb+yatasA\arbnull{'a}\arbcolor[red]{|"'}.alUna+ % \arb{yatasA\arbnull{'a}\arbcolor[red]{|"'}.alUna} % \arb[trans]{yatasA\arbnull{'a}\-\arbcolor[red]{|"'}.a\-lUna}, +% \\ % \verb+^say\arbcolor[red]{|"'}\arbnull{'}aN+ % \arb{^say\arbcolor[red]{|"'}\arbnull{'}aN} % \arb[trans]{^say\arbcolor[red]{|"'}\arbnull{'}aN}, -% \verb+^say\ar+\allowbreak\verb+bcolor[red]{|"'}iN+ +% \verb+^say\arbcolor[red]+\\\verb+{|"'}iN+ % \arb{^say\arbcolor[red]{|"'}iN} % \arb[trans]{^say\arbcolor[red]{|"'}iN}, -% |\arbcolor[red]{a"'}.as\arbcolor|\allowbreak|[red]{y"'}.ilaTuN| +% |\arbcolor[red]{a"'}.as\arbcolor[red]{y"'}.ilaTuN| % \arb{\arbcolor[red]{a"'}.as\arbcolor[red]{y"'}.ilaTuN} % \arb[trans]{\arbcolor[red]{a"'}.as\arbcolor[red]{y"'}.ilaTuN}. % \end{quote} @@ -3614,13 +3608,12 @@ % characters that are defined in \vref{tab:additional-arabic-codings} % are also available. % -% \enlargethispage{\baselineskip} % \begin{longtable}{llllll} % \bottomrule -% \caption*{\Vref{tab:buckwalter-scheme}: Buckwalter scheme} +% \caption[]{Buckwalter input scheme} % \endfoot -% \captionlistentry{Buckwalter scheme}\\[-1em] % \toprule +% \captionlistentry{Buckwalter input scheme} % Letter & \multicolumn{3}{l}{Transliteration\footnotemark} % & \multicolumn{2}{l}{Buckwalter notation} \\ % & \texttt{dmg} & \texttt{loc} & \texttt{arabica} & |base/xml| & @@ -3651,7 +3644,6 @@ % \arb[novoc]{.t} & \dmg{.t} & \loc{.t} & \brill{.t} & |T| & |T| \\ % \arb[novoc]{.z} & \dmg{.z} & \loc{.z} & \brill{.z} & |Z| & |Z| \\ % \arb[novoc]{`} & \dmg{`} & \loc{`} & \brill{`} & |E| & |E| \\ -% \pagebreak[2] % \arb[novoc]{.g} & \dmg{.g} & \loc{.g} & \brill{.g} & |g| & |g| \\ % \arb[novoc]{f} & \dmg{f} & \loc{f} & \brill{f} & |f| & |f| \\ % \arb[novoc]{q} & \dmg{q} & \loc{q} & \brill{q} & |q| & |q| \\ @@ -3754,7 +3746,6 @@ % \fi % \end{enumerate} % -% \needspace{4\baselineskip} % \section{\LaTeX\ Commands in Arabic environments} % \label{sec:commands-in-arb} % \paragraph{General principle} \label{ref:cmd-inside-arabic}\LaTeX\ -- cgit v1.2.3