MRTsfacc: list mode, nested detection; MRTif: tllength, ifTwoToken

.gitignore

@@ -11,5 +11,6 @@
 *.run.xml
 *.snm
 *.toc
+Doc/img/*-alone.pdf
 Example_Documents/MRTbeam/example_MRTbeam.pdf
 Example_Documents/MRTthesis/example_MRTthesis.pdf

Doc/Makefile

@@ -6,6 +6,8 @@ FLAGS  = -halt-on-error
 TEXF   = ./tex
 # relative path to included TeX-files containing preamble stuff
 PREF   = ./preamble
+# relative path to images
+IMGF   = ./img
 ##########################################
 # }}}
 # Automatically defined variables {{{
@@ -24,7 +26,7 @@ FMT    = $(NAME).fmt
 ## the name 'quick' maybe misleading! 'all' might be faster if $(FILE) hasn't
 ## changed. 'quick' is for quickly running TeX assuming that you know what
 ## you're doing
-quick: $(FMT)
+quick: img $(FMT)
 	$(TEX) $(FLAGS) -fmt="$(NAME)" $(FILE)
 	#$(TEX) $(FLAGS) $(FILE);
 # }}}
@@ -37,11 +39,15 @@ $(OUT): $(FILE) $(SFILES) $(PREAMB)# {{{
 $(FMT): $(FILE) $(PREAMB)# {{{
 	$(TEX) -ini -enc -jobname="$(NAME)" "&$(TEX)" mylatexformat.ltx """$(FILE)"""
 # }}}
-.PHONY: clean cleantex cleansubfoldertex quick all
-clean: cleantex cleansubfoldertex
+img:
+	cd $(IMGF); make -j4
+.PHONY: clean cleantex cleansubfoldertex cleanimg quick all img
+clean: cleantex cleansubfoldertex cleanimg
 cleantex: # {{{
 	-rm $(shell find $(NAME)\.* | grep -Ev '\.tex$$' | grep -Ev '\.sty$$' | grep -Ev '\.bib$$')
 # }}}
 cleansubfoldertex: # {{{
 	-cd $(TEXF); rm $(shell cd $(TEXF); find * | grep -v tex);
 # }}}
+cleanimg:
+	cd $(IMGF)); make clean

Doc/img/Makefile

@@ -0,0 +1,28 @@
+# User defined variables {{{
+##########################################
+TEX   = pdflatex
+FLAG  = -halt-on-error
+AINP  = .alone.tex
+AOUT  = -alone.pdf
+##########################################
+# }}}
+# Automatically defined variables {{{
+##########################################
+ALONE = $(wildcard ./*$(AINP))
+AOUTP = $(ALONE:%$(AINP)=%$(AOUT))
+##########################################
+# }}}
+
+all: alone
+alone: $(AOUTP)
+%-alone.pdf: %.alone.tex
+	$(TEX) $(FLAGS) -jobname="$<" "\input{$<}"
+	-rm $<.aux
+	-rm $<.log
+	mv $<.pdf $@
+
+.PHONY: all alone clean clean_alone
+
+clean: clean_alone
+clean_alone:
+	-rm $(AOUTP)

Doc/img/sfacc_height_table.alone.tex

@@ -0,0 +1,38 @@
+\documentclass[british,sfacc=height]{MRTalone}
+\usepackage{collcell}
+
+\begin{document}
+\begin{MRTtable}
+  [
+    col=
+      {
+        *2{>{\collectcell\hatex}c<{\endcollectcell}}
+        *2{>{\collectcell\hatst}c<{\endcollectcell}}
+        >{\hskip4\tabcolsep}l
+        *2{>{\collectcell\hatex}c<{\endcollectcell}}
+        *2{>{\collectcell\hatst}c<{\endcollectcell}}
+      }
+    ,pre=
+      {%
+        \newcommand\hatex[1]{$\hat!{#1}$}%
+        \newcommand\hatst[1]{$\hat*{#1}$}%
+      }
+  ]
+  \multicolumn{2}{c}{original} & \multicolumn{2}{c}{shifted} &&
+  \multicolumn{2}{c}{original} & \multicolumn{2}{c}{shifted} \\
+
+    a & A & a & A   &&   n & N & n & N \\
+    b & B & b & B   &&   o & O & o & O \\
+    c & C & c & C   &&   p & P & p & P \\
+    d & D & d & D   &&   q & Q & q & Q \\
+    e & E & e & E   &&   r & R & r & R \\
+    f & F & f & F   &&   s & S & s & S \\
+    g & G & g & G   &&   t & T & t & T \\
+    h & H & h & H   &&   u & U & u & U \\
+    i & I & i & I   &&   v & V & v & V \\
+    j & J & j & J   &&   w & W & w & W \\
+    k & K & k & K   &&   x & X & x & X \\
+    l & L & l & L   &&   y & Y & y & Y \\
+    m & M & m & M   &&   z & Z & z & Z \\
+\end{MRTtable}
+\end{document}

Doc/img/sfacc_list_table.alone.tex

@@ -0,0 +1,39 @@
+\documentclass[british,sfacc=list]{MRTalone}
+\usepackage{collcell}
+
+\begin{document}
+\begin{MRTtable}
+  [
+    col=
+      {
+        *2{>{\collectcell\hatex}c<{\endcollectcell}}
+        *2{>{\collectcell\hatst}c<{\endcollectcell}}
+        >{\hskip4\tabcolsep}l
+        *2{>{\collectcell\hatex}c<{\endcollectcell}}
+        *2{>{\collectcell\hatst}c<{\endcollectcell}}
+      }
+    ,pre=
+      {%
+        \newcommand\hatex[1]{$\hat[0mu]{#1}$}%
+        \newcommand\hatst[1]{$\hat{#1}$}%
+      }
+  ]
+  \multicolumn{2}{c}{original} & \multicolumn{2}{c}{shifted} &&
+  \multicolumn{2}{c}{original} & \multicolumn{2}{c}{shifted} \\
+
+    a & A & a & A   &&   n & N & n & N \\
+    b & B & b & B   &&   o & O & o & O \\
+    c & C & c & C   &&   p & P & p & P \\
+    d & D & d & D   &&   q & Q & q & Q \\
+    e & E & e & E   &&   r & R & r & R \\
+    f & F & f & F   &&   s & S & s & S \\
+    g & G & g & G   &&   t & T & t & T \\
+    h & H & h & H   &&   u & U & u & U \\
+    i & I & i & I   &&   v & V & v & V \\
+    j & J & j & J   &&   w & W & w & W \\
+    k & K & k & K   &&   x & X & x & X \\
+    l & L & l & L   &&   y & Y & y & Y \\
+    m & M & m & M   &&   z & Z & z & Z \\
+\end{MRTtable}
+\end{document}
+

Doc/preamble/doc_macros.tex

@@ -1,5 +1,6 @@
 \makeatletter
 \newcommand*\pkg[1]{\textrm{#1}}
+\newcommand*\pkgWopt[2]{\opt{[#2]}\penalty500\pkg{#1}}
 \newcommand*\cls[1]{\textrm{#1}}
 \newcommand*\TikZ{\pkg{Ti\textit{k}Z}}
 \newcommand*\env[1]{\texttt{#1}}
@@ -12,7 +13,18 @@
     \texttt{\expandafter\eatspace\string\ \detokenize{#1}}%
   }%<<<
 \def\cs@PDFString#1{(macro #1)}
-\protected\def\meta#1{\texttt{$\langle$\textit{#1}$\rangle$}}
+\protected\def\meta#1{\texttt{$\langle$\textit{\meta@a{#1}}$\rangle$}}
+\ExplSyntaxOn
+\newcommand\meta@a[1]%>>>
+  {
+    \group_begin:
+    \tl_set:Nn \l_docMRTbundle_tmp_tl { #1 }
+    \regex_replace_once:nnN { \d+$ } { \c{textsubscript} \cB{ \0 \cE} }
+      \l_docMRTbundle_tmp_tl
+    \l_docMRTbundle_tmp_tl
+    \group_end:
+  }%<<<
+\ExplSyntaxOff
 \newcommand*\metaEnclosed[3]{\texttt{#1}\meta{#2}\texttt{#3}}
 \newcommand*\marg[1]{\metaEnclosed\{{#1}\}}
 \newcommand*\oarg[1]{\metaEnclosed[{#1}]}

Doc/tex/doc_MRTif.tex

@@ -44,6 +44,11 @@ the first and second argument, respectively, an expansion is made.
 \end{describemacroTF}
 \dscremaininglines{3}
 
+\begin{describemacroTF}[G,N,GN]{MRTifTwoToken}[\marg{arg}]
+  Tests if \meta{arg} is exactly two tokens.
+\end{describemacroTF}
+\dscremaininglines{3}
+
 \begin{describemacroTF}[G,N,GN]{MRTifLetter}[\marg{arg}]
   Tests if \meta{arg} is a letter, meaning of category code 11.
 \end{describemacroTF}
@@ -87,6 +92,12 @@ the first and second argument, respectively, an expansion is made.
 \end{describemacroTF}
 \dscremaininglines{4}
 
+\begin{describemacro}{MRTtllength,MRTtllengthN}[\marg{arg}]
+  Expands to the number of tokens or groups inside of \meta{arg}. Unprotected
+  spaces are ignored. The ordinary version needs two expansions while the |N|
+  version needs four.
+\end{describemacro}
+
 \section{Dependencies}
 \pkg{MRTif} loads the \pkg{pdftexcmds} package to make the \hologo{pdfTeX}
 primitive \cs{pdfstrcmp} available as \cs{pdf@strcmp} for \hologo{LuaTeX}.

Doc/tex/doc_MRTsfacc.tex

@@ -1,74 +1,162 @@
-\chapter{The \pkg{MRTsfacc} package}
+\chapter{The \pkg{MRTsfacc} package}\label{sec:sfacc}
 This package is provided to remedy an issue related with sans serif maths, to be
 more precise to fix the placement of \cs{mathaccentV}, which is internally used
-by macros such as \cs{hat} and \cs{dot}. It is therefore loaded by both,
-\cls{MRTthesis} and \cls{MRTbeam}. The \cls{beamer} class provides a fix for the
-same issue which is unfortunately only working for \cls{beamer}'s default font
-by fixing the font metrics.
-
-\cls{MRTsfacc} has a different approach by patching \cs{mathaccentV} to move the
-accent horizontally depending on the height of the accented character.
-Furthermore it is tested whether the character is an alphabetic one by checking
-the category code. If it is not an alphabetic character the shift isn't applied.
-
-The package forwards any option to \cs{MRTsfaccSet}. \cs{MRTsfaccSet} tests
-whether its argument is a valid float using \cs{MRTifFloatTF} and sets the share
-of the letters' height which is used as the horizontal displacement. So you can
-either use the option during load time to set the share or \cs{MRTsfaccSet} at
-any later point. The default share is
-\makeatletter\texttt{\MRTsfacc@shift}\makeatother.
-
-One can use \texttt{*} to enforce the shift and \texttt{!}\@ to enforce the
-omitting of that shift. Consider the following example:
-\verb$\hat!{m}$ produces $\hat!{m}$, \verb$\hat*{m}$ produces $\hat*{m}$, and
-\verb$\hat{m}$ produces $\hat{m}$, which is the same as \verb$\hat*{m}$ since
-\texttt{m} has by default the category code of an alphabetic character.
-
-The tokens \texttt{*} and \texttt{!}\@ must not be enclosed by braces if you
-want to specify the behaviour of \cs{mathaccentV}, so \verb$\hat{*}\hat{!}$
-results in $\hat{*}\hat{!}$.
-
-\begin{MRTtable}
+by macros such as \cs{hat} and \cs{dot} with \pkg{amsmath} loaded. It is
+therefore loaded by all three, \cls{MRTthesis}, \cls{MRTbeam} and
+\cls{MRTalone}. The \cls{beamer} class provides a fix for the same issue which
+is unfortunately only working for \cls{beamer}'s default font by fixing the font
+metrics (and as far as I know only works with \hologo{pdfLaTeX}).
+
+\cls{MRTsfacc} has two different approaches by patching \cs{mathaccentV} to move
+the accent horizontally -- either depending on the height of the accented
+character or a defined offset in a list of possible arguments.
+
+The package is designed with \pkg{mathastext} with the \opt{italics} option in
+mind. It might work for other sans serif maths solutions as well. It requires
+\pkg{amsmath} to be loaded.
+
+Independent on the used approach the accent macros check whether their argument
+is one meeting a special criterion (a character of category 11 or a known
+element). Furthermore both versions should detect whether the argument is just
+another accent macro nested so that in \bverb|\dot{\bar{a}}| the \cs{dot} would
+still find the |a| as a known argument. This nested usage works only if the
+nested macro uses \cs{mathaccentV} internally and each level of nesting is an
+exact match of the approach's criterion or does only contain two tokens or
+groups (so in above example the \cs{bar} and the |{a}|) with the first one being
+a \cs{mathaccentV} using macro.
+
+\section{Options}%>>>
+The package has the following options:
+\begin{describeopt}{height}
+  If this option is used the offset is dependent on the height of the accented
+  character. Read the description in \autoref{sec:sfacc:height}.
+\end{describeopt}
+\begin{describeopt}{list}
+  If this option is used the offset is defined by a list of known arguments.
+  Read the description in \autoref{sec:sfacc:list}.
+\end{describeopt}
+\begin{describeopt}{notest}
+  By default the package does test whether the definition of \cs{mathaccentV}
+  meets the known definition from the \pkg{amsmath} package. If something does
+  redefine \cs{mathaccentV} or the definition has changed but you're sure that
+  \pkg{MRTsfacc} still works with (it redefines it anyway) you can deactivate
+  that test with this option. If \pkg{amsmath}'s definition of \cs{mathaccentV}
+  has changed, please contact the me as described in \autoref{sec:bugs}.
+\end{describeopt}
+
+Every other option is passed on to \cs{MRTsfaccSet}, its description is included
+in \autoref{sec:sfacc:height:macros}. This will have no effect if the \opt{list}
+option is used.
+%<<<
+
+\section{\opt{height} Variant}\label{sec:sfacc:height}%>>>
+This variant checks whether the argument is a single character with category
+code 11. If this test does not return true, the shift isn't applied.
+
+\autoref{tab:sfacc:height} shows the results of this approach. While this
+approach is easier to adapt to other fonts -- one has to change only one
+parameter -- it is always a compromise trying to match every character as good
+as possible.
+
+\begin{table}% >>>
+  \centering
+  \includegraphics{img/sfacc_height_table-alone.pdf}
+  \caption
+    {%
+      Comparison of shifted accents against original placement with the use of
+      the \opt{height} variant.%
+      \label{tab:sfacc:height}%
+    }%
+\end{table}% <<<
+
+
+\subsection{Macros}\label{sec:sfacc:height:macros}%>>>
+\begin{describemacro}{<accent>}[\meta{*/!}\marg{arg}]%>>>
+  \cs{<accent>} can be any of the maths accent macros using \cs{mathaccentV}
+  internally (e.g. \cs{bar}, \cs{dot}, etc.).\\
+  The \meta{*/!} can either be \texttt{*} or \texttt{!}\@ or omitted entirely.
+  If the starred version is used, the shift is enforced regardless of the
+  argument, if the exclamation mark is given it is prohibited.
+\end{describemacro}%<<<
+
+\begin{describemacro}{MRTsfaccSet}[\marg{float}]%>>>
+  The shift width depends on a multiple of the box's height. The multiple can be
+  set with this macro and should be a valid float. This is tested using
+  \cs{MRTifFloatTF}. The package default for this share is
+  \makeatletter\texttt{\MRTsfacc@shift}\makeatother.
+\end{describemacro}%<<<
+%<<<
+%<<<
+
+\section{\opt{list} Variant}\label{sec:sfacc:list}%>>>
+This variant checks whether the argument is a known element from a list in which
+the offset is defined in the unit of \texttt{mu}.
+
+It has the advantage that you can define individual offsets for every argument.
+In addition not only characters can be added to the list but almost arbitrary
+stuff. The drawback is that everything has to be added that you want to be
+recognized.
+\autoref{tab:sfacc:list} shows the results of this approach.
+
+\begin{table}% >>>
+  \centering
+  \includegraphics{img/sfacc_list_table-alone.pdf}
+  \caption
+    {%
+      Comparison of shifted accents against original placement with the use of
+      the \opt{list} variant.%
+      \label{tab:sfacc:list}%
+    }%
+\end{table}% <<<
+
+\subsection{Macros}
+\begin{describemacro}{<accent>}[\oarg{opt}\marg{arg}]%>>>
+  \cs{<accent>} can be any of the maths accent macros using \cs{mathaccentV}
+  internally (e.g. \cs{bar}, \cs{dot}, etc.).\\
+  \meta{opt} can either be a defined element from the list or a length in the
+  unit of \texttt{mu}. So with \texttt{foo} a defined list element, both
+  \bverb|\hat[foo]{bar}| and \bverb|\hat[4mu]{bar}| would be valid. If
+  \meta{opt} is a known element the offset of that element is used regardless of
+  the given \meta{arg} else (if it is used) the given length is used as the
+  offset. If the optional argument isn't used at all, it'll be tested whether
+  \meta{arg} is a known element and if so the appropriate offset will be used.
+  Else no offset will be applied.
+\end{describemacro}%<<<
+
+\begin{describemacro}{MRTsfaccShift}[\marg{element}\marg{shift}]%>>>
+  Adds \meta{element} to the list of known arguments and saves \meta{shift} for
+  it. If \meta{element} is already known it'll get redefined. \meta{shift} has
+  to be given in \texttt{mu}.
+\end{describemacro}%<<<
+
+\begin{describemacro}{MRTsfaccShiftLet}%>>>
+  [\marg{element1}\marg{element2}]
+  Adds \meta{element1} to the list of known arguments and defines the
+  offset to be the one currently used by \meta{element2}.
+  \meta{element2} has to be known, if it isn't an error will be thrown.
+\end{describemacro}%<<<
+
+\begin{describemacro}{MRTsfaccLoadShiftList}[\marg{list}]
+  The package comes with definitions for some fonts (see
+  \autoref{tab:sfacc:listfiles}). With this macro you can load them. If you
+  define a list for a font (or font combination) not listed in the table you
+  might contact me as described in \autoref{sec:bugs} and I'll gladly add it
+  to the package.
+\end{describemacro}
+%<<<
+
+\begin{MRTtable}%>>>
   [
-    col=
-      {
-        *2{>{\collectcell\hatex}c<{\endcollectcell}}
-        *2{>{\collectcell\hatst}c<{\endcollectcell}}
-        >{\hskip4\tabcolsep}l
-        *2{>{\collectcell\hatex}c<{\endcollectcell}}
-        *2{>{\collectcell\hatst}c<{\endcollectcell}}
-      }
-    ,cap={Comparison of shifted accents against original placement}
-    ,label=tab:sfacc
-    ,pre=
-      {%
-        \newcommand\hatex[1]{$\hat!{#1}$}%
-        \newcommand\hatst[1]{$\hat*{#1}$}%
-      }
-    ,pos=!bp
+    ,col={>{\ttfamily}l >{\raggedright\arraybackslash}p{.55\linewidth}}
+    ,cap={Available shift definition lists}
+    ,label={tab:sfacc:listfiles}
   ]
-  \multicolumn{2}{c}{original} & \multicolumn{2}{c}{shifted} &&
-  \multicolumn{2}{c}{original} & \multicolumn{2}{c}{shifted} \\
-  
-    a & A & a & A   &&   n & N & n & N \\
-    b & B & b & B   &&   o & O & o & O \\
-    c & C & c & C   &&   p & P & p & P \\
-    d & D & d & D   &&   q & Q & q & Q \\
-    e & E & e & E   &&   r & R & r & R \\
-    f & F & f & F   &&   s & S & s & S \\
-    g & G & g & G   &&   t & T & t & T \\
-    h & H & h & H   &&   u & U & u & U \\
-    i & I & i & I   &&   v & V & v & V \\
-    j & J & j & J   &&   w & W & w & W \\
-    k & K & k & K   &&   x & X & x & X \\
-    l & L & l & L   &&   y & Y & y & Y \\
-    m & M & m & M   &&   z & Z & z & Z \\
-\end{MRTtable}
-
-The resulting \cs{mathaccentV} macro is not expandable and therefore created
-\cs{protected}. You can take a look at the results in \autoref{tab:sfacc}.
+    \normalfont List & To be used with\\
+    helvet & \pkg{helvet} and \pkgWopt{mathastext}{italic,defaultmathsizes}
+    \\
+\end{MRTtable}%<<<
 
 \section{Dependencies}
 \pkg{MRTsfacc} loads the \pkg{MRTif} package and uses its tests
-\cs{MRTifLetterGTF} and \cs{MRTifFloatTF}. It also depends on \pkg{amsmath}
-being loaded.
+\cs{MRTifLetterGTF}, \cs{MRTifFloatTF}, \cs{MRTifStringsMatchXXTF} and
+\cs{MRTifTwoTokenTF}. It also depends on \pkg{amsmath} being loaded.

MRTif/MRTif.sty

@@ -1,5 +1,5 @@
-\newcommand*\MRTif@version{0.0.2}
-\newcommand*\MRTif@date{2018-07-31}
+\newcommand*\MRTif@version{0.0.3}
+\newcommand*\MRTif@date{2018-11-06}
 
 \NeedsTeXFormat{LaTeX2e}
 
@@ -10,6 +10,16 @@
   ]
 \RequirePackage{pdftexcmds}
 
+\edef\endMRTifargument{\detokenize{{.$^_&}{}}{.$^_&}{}UnlikelyString}
+\newcommand\MRTif@endMRTifargument[1]% >>>
+  {%
+    \ifx\endMRTifargument#1%
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi
+  }% <<<
+
 \newcommand*\MRTif@groupify@TF[1]% >>>
   {%
     \expandafter\newcommand\csname MRTif#1GTF\endcsname{}%
@@ -244,6 +254,25 @@
 \MRTif@create@TandF@N@TandF{OneToken}
 \MRTif@create@TandF@N@TandF{OneTokenG}
 % <<<
+% MRTifTwoToken >>>
+\newcommand\MRTifTwoTokenTF[1]% >>>
+  {%
+    \MRTifEmptyTF{#1}{\@secondoftwo}
+      {%
+        \MRTifOneToken@a#1.\end@MRTifOneTokenTF
+          {\@secondoftwo}
+          {%
+            \MRTifTwoToken@a#1.\end@MRTifTwoTokenTF
+          }%
+      }%
+  }% <<<
+\newcommand\MRTifTwoToken@a{}% >>>
+\long\def\MRTifTwoToken@a#1#2#3#4\end@MRTifTwoTokenTF
+  {\MRTifEmptyTF{#4}}% <<<
+\MRTif@groupify@TF{TwoToken}
+\MRTif@create@TandF@N@TandF{TwoToken}
+\MRTif@create@TandF@N@TandF{TwoTokenG}
+% <<<
 % MRTifLetter >>>
 \newcommand\MRTifLetterTF[1]% >>>
   {%
@@ -517,6 +546,22 @@
     %\
   %}% <<<
 %
+% MRTtllength >>>
+\newcommand\MRTtllength@inner[1]% >>>
+  {%
+    \MRTif@endMRTifargument{#1}
+      {\relax}
+      {+1\MRTtllength@inner}%
+  }% <<<
+\newcommand\MRTtllength[1]% >>>
+  {%
+    \the\numexpr0\MRTtllength@inner#1\endMRTifargument
+  }% <<<
+\newcommand\MRTtllengthN[1]% >>>
+  {%
+    \expandafter\MRTtllength\expandafter{#1}%
+  }% <<<
+% <<<
 
 \endinput
 % vim: fdm=marker foldmarker=>>>,<<< ft=tex

MRTsfacc/MRTsfacc.list.helvet.tex

@@ -0,0 +1,56 @@
+\ProvidesFile{MRTsfacc.list.helvet.tex}
+  [2018-11-06 provides mathaccentV shifts for the helvet font]
+\MRTsfaccShift{a}{4mu}%
+\MRTsfaccShift{A}{5.4mu}%
+\MRTsfaccShift{b}{0mu}%
+\MRTsfaccShift{B}{3.5mu}%
+\MRTsfaccShift{c}{3mu}%
+\MRTsfaccShift{C}{4mu}%
+\MRTsfaccShift{d}{6.5mu}%
+\MRTsfaccShift{D}{3mu}%
+\MRTsfaccShift{e}{3.5mu}%
+\MRTsfaccShift{E}{4.4mu}%
+\MRTsfaccShift{f}{4.4mu}%
+\MRTsfaccShift{F}{4.7mu}%
+\MRTsfaccShift{g}{3mu}%
+\MRTsfaccShift{G}{4.7mu}%
+\MRTsfaccShift{h}{2mu}%
+\MRTsfaccShift{H}{4.5mu}%
+\MRTsfaccShift{i}{4mu}%
+\MRTsfaccShiftLet{\imath}{i}%
+\MRTsfaccShift{I}{5mu}%
+\MRTsfaccShift{j}{4mu}%
+\MRTsfaccShiftLet{\jmath}{j}%
+\MRTsfaccShift{J}{7mu}%
+\MRTsfaccShift{k}{1mu}%
+\MRTsfaccShift{K}{3mu}%
+\MRTsfaccShift{l}{5mu}%
+\MRTsfaccShift{L}{1.5mu}%
+\MRTsfaccShift{m}{4mu}%
+\MRTsfaccShift{M}{4.5mu}%
+\MRTsfaccShift{n}{3.8mu}%
+\MRTsfaccShift{N}{4.5mu}%
+\MRTsfaccShift{o}{3.5mu}%
+\MRTsfaccShift{O}{4.5mu}%
+\MRTsfaccShift{p}{3.5mu}%
+\MRTsfaccShift{P}{3.5mu}%
+\MRTsfaccShift{q}{3.5mu}%
+\MRTsfaccShift{Q}{4.5mu}%
+\MRTsfaccShift{r}{3.3mu}%
+\MRTsfaccShift{R}{3.5mu}%
+\MRTsfaccShift{s}{3mu}%
+\MRTsfaccShift{S}{4mu}%
+\MRTsfaccShift{t}{3.5mu}%
+\MRTsfaccShift{T}{3.5mu}%
+\MRTsfaccShift{u}{3.4mu}%
+\MRTsfaccShift{U}{4.5mu}%
+\MRTsfaccShift{v}{2.5mu}%
+\MRTsfaccShift{V}{3.3mu}%
+\MRTsfaccShift{w}{2.3mu}%
+\MRTsfaccShift{W}{3.3mu}%
+\MRTsfaccShift{x}{2.5mu}%
+\MRTsfaccShift{X}{3.7mu}%
+\MRTsfaccShift{y}{2.5mu}%
+\MRTsfaccShift{Y}{3.3mu}%
+\MRTsfaccShift{z}{3mu}%
+\MRTsfaccShift{Z}{4mu}%

MRTsfacc/MRTsfacc.sty

@@ -1,5 +1,5 @@
-\newcommand*\MRTsfacc@version{0.0.3}
-\newcommand*\MRTsfacc@date{2018-10-02}
+\newcommand*\MRTsfacc@version{0.0.4}
+\newcommand*\MRTsfacc@date{2018-11-07}
 
 \NeedsTeXFormat{LaTeX2e}
 
@@ -10,13 +10,14 @@
   ]
 
 \RequirePackage{MRTif}
+\RequirePackage{amsmath}
 
 \providecommand\@firstofthree[3]{#1}
 \providecommand\@secondofthree[3]{#2}
 \providecommand\@thirdofthree[3]{#3}
 
 \def\MRTsfacc@shift{0.25}
-\newcommand\MRTsfaccSet[1]
+\newcommand\MRTsfaccSet[1]%>>>
   {%
     \MRTifFloatTF{#1}
       {\def\MRTsfacc@shift{#1}}
@@ -30,140 +31,294 @@
             package maintainer.%
           }%
       }%
-  }
-\newif\if@MRTsfacc@patching@
-\DeclareOption{patching}{\@MRTsfacc@patching@true}
-\DeclareOption{mathastext}{\@MRTsfacc@patching@false}
+  }%<<<
+\newif\if@MRTsfacc@notest@
+\newif\if@MRTsfacc@height@
+\@MRTsfacc@height@true
+\DeclareOption{height}{\@MRTsfacc@height@true}
+\DeclareOption{list}{\@MRTsfacc@height@false}
+\DeclareOption{notest}{\@MRTsfacc@notest@true}
 \DeclareOption*{\expandafter\MRTsfaccSet\expandafter{\CurrentOption}}
 \ProcessOptions\relax
 
+% Test whether \mathaccentV has the correct meaning >>>
+\if@MRTsfacc@notest@
+\else
+  % this is amsmath's definition of \mathaccentV (2018-06-11)
+  \AtBeginDocument% >>>
+    {%
+      \begingroup
+      \newcommand*\MRTsfacc@mathaccentV@test[5]% >>>
+        {%
+          \ifmmode
+            \gdef\macc@tmp{\macc@depth\@ne}%
+            \setbox\z@\hbox
+              {%
+                \let\mathaccentV\macc@test
+                \let\use@mathgroup\@gobbletwo
+                \let\select@group\@gobblethree
+                \frozen@everymath{}%
+                $#5$%
+              }%
+            \macc@tmp
+            \ifnum\macc@depth=\@ne
+              \global\let\macc@nucleus\@empty
+              \mathaccent"\accentclass@
+            \else
+              \@xp\macc@nested
+            \fi
+            #2#3#4{#5}\macc@nucleus
+          \else
+            \@xp\nonmatherr@\csname #1\endcsname
+          \fi
+        }% <<<
+      \ifx\MRTsfacc@mathaccentV@test\mathaccentV
+      \else
+        \PackageError{MRTsfacc}{Compatibility with amsmath might be broken}
+          {%
+            This version of MRTsfacc might be incompatible with your version of
+            amsmath.%
+            \MessageBreak
+            This is tested by comparing the definition of
+            \string\mathaccentV\space with a known\MessageBreak definition.%
+            \MessageBreak
+            Read the manual of this `MRTsfacc`. Afterwards you might contact the
+            package\MessageBreak maintainer of this package.%
+          }%
+      \fi
+      \endgroup
+    }% <<<
+\fi
+% <<<
+
+\newcommand\MRTsfacc@mathaccentV[5]% >>>
+  {%
+    \global\let\macc@nucleus\@empty
+    \mathaccent"\accentclass@#2#3#4{#5}\macc@nucleus
+  }% <<<
+
+\newif\if@MRTsfacc@found@known@
+\edef\MRTsfacc@mathaccentV@detokenized{\detokenize{\mathaccentV}}
+\long\def\MRTsfacc@mathaccentV@using@inner#1 #2 #3\endMRTsfacc@arg% >>>
+  {%
+    \MRTifStringsMatchXXTF{\MRTsfacc@mathaccentV@detokenized}{#2 }
+  }% <<<
+\newcommand\MRTsfacc@mathaccentV@using[1]% >>>
+  {%
+    \expandafter\MRTsfacc@mathaccentV@using@inner\meaning#1 . .\endMRTsfacc@arg
+  }% <<<
+\newcommand\MRTsfacc@testnest[2]% >>>
+  {%
+    \MRTifTwoTokenTF{#2}
+      {%
+        \@MRTsfacc@found@known@false
+        \setbox\z@\hbox
+          {%
+            \let\MRTsfacc@testknown#1\relax
+            \let\mathaccentV\MRTsfacc@testnest@
+            \let\use@mathgroup\@gobbletwo
+            \let\select@group\@gobblethree
+            \frozen@everymath{}%
+            $#2$%
+          }%
+        \if@MRTsfacc@found@known@
+          \expandafter\@firstoftwo
+        \else
+          \expandafter\@secondoftwo
+        \fi
+      }
+      {\@secondoftwo}%
+  }% <<<
+\newcommand\MRTsfacc@testnest@[5]% >>>
+  {%
+    \MRTsfacc@testknown{#5}
+      {%
+        \gdef\MRTsfacc@known{#5}%
+        \global\@MRTsfacc@found@known@true
+      }
+      {%
+        \MRTifTwoTokenTF{#5}
+          {%
+            \expandafter\MRTsfacc@mathaccentV@using\expandafter{\@firstoftwo#5}%
+              {\@firstoftwo}
+              {\@secondoftwo}%
+          }
+          {\@secondoftwo}%
+          {%
+            #5%
+          }
+          {%
+            \global\@MRTsfacc@found@known@false
+          }%
+      }%
+  }% <<<
+
 % stupid package for math font is stupid. Have to cure the sickness >>>
-\if@MRTsfacc@patching@
+\if@MRTsfacc@height@
 % true >>>
-  \RequirePackage{amsmath}
-  \newcommand\MRTsfacc@kern%>>>
+  \newcommand*\MRTsfacc@patch@mathaccentV% >>>
+    {%
+      \protected\long\def\mathaccentV##1##2##3##4% >>>
+        {%
+          \ifmmode
+            \def\mathaccentV@args{{##1}{##2}{##3}{##4}}%
+            \expandafter\@firstofone
+          \else
+            \@xp\nonmatherr@\csname ##1\endcsname
+            \expandafter\@gobble
+          \fi
+          {\futurelet\next\mathaccentV@a}%
+        }% <<<
+    }% <<<
+  \newcommand*\MRTsfacc@kern% >>>
     {%
       \MRTsfacc@shift\ht\MRTsfacc@box
-    }%<<<
+    }% <<<
   \newbox\MRTsfacc@box
-  \newcommand*\MRTsfacc@patch@mathaccentV%>>>
+  \newcommand*\mathaccentV@a[1]% >>>
     {%
-      \let\mathaccentV@orig\mathaccentV
-      \protected\long\def\mathaccentV##1##2##3##4% >>>
+      \expandafter\ifx\next!%
+        \expandafter\@firstofthree
+      \else
+        \expandafter\ifx\next*%
+          \expandafter\expandafter\expandafter\@secondofthree
+        \else
+          \expandafter\expandafter\expandafter\@thirdofthree
+        \fi
+      \fi
+      {\expandafter\MRTsfacc@mathaccentV\mathaccentV@args}
+      {\expandafter\mathaccentV@shifted\mathaccentV@args}
+      {\expandafter\mathaccentV@b\mathaccentV@args{#1}}%
+    }% <<<
+  \newcommand*\mathaccentV@b[5]% >>>
+    {%
+      \MRTifLetterGTF{#5}
+        {\mathaccentV@shifted{#1}{#2}{#3}{#4}{#5}}
         {%
-          \def\mathaccentV@args{{##1}{##2}{##3}{##4}}%
-          \futurelet\next\mathaccentV@a
-        }% <<<
-      \newcommand*\mathaccentV@a[1]% >>>
+          \MRTsfacc@testnest\MRTifLetterGTF{#5}
+            {\mathaccentV@shifted{#1}{#2}{#3}{#4}{#5}}
+            {\MRTsfacc@mathaccentV{#1}{#2}{#3}{#4}{#5}}%
+        }%
+    }% <<<
+  \newcommand*\mathaccentV@shifted[5]% >>>
+    {%
+      \mathchoice
+        {\mathaccentV@shifted@a{display}{#1}{#2}{#3}{#4}{#5}}
+        {\mathaccentV@shifted@a{text}{#1}{#2}{#3}{#4}{#5}}
+        {\mathaccentV@shifted@a{script}{#1}{#2}{#3}{#4}{#5}}
+        {\mathaccentV@shifted@a{scriptscript}{#1}{#2}{#3}{#4}{#5}}%
+    }% <<<
+  \newcommand*\mathaccentV@shifted@a[6]% >>>
+    {%
+      \setbox\MRTsfacc@box\hbox{$\csname #1style\endcsname#6$}%
+      \MRTsfacc@mathaccentV{#2}{#3}{#4}{#5}%
+        {%
+          #6%
+          \kern\MRTsfacc@kern
+        }%
+      \kern-\MRTsfacc@kern
+    }% <<<
+\else% <<<
+% false >>>
+  \newcommand*\MRTsfacc@patch@mathaccentV% >>>
+    {%
+      \protected\def\mathaccentV##1##2##3##4% >>>
         {%
-          \expandafter\ifx\next!%
-            \expandafter\@firstofthree
+          \ifmmode
+            \expandafter\@firstofone
           \else
-            \expandafter\ifx\next*%
-              \expandafter\expandafter\expandafter\@secondofthree
-            \else
-              \expandafter\expandafter\expandafter\@thirdofthree
-            \fi
+            \@xp\nonmatherr@\csname ##1\endcsname
+            \expandafter\@gobble
           \fi
-          {\expandafter\mathaccentV@orig\mathaccentV@args}
-          {\expandafter\mathaccentV@shifted\mathaccentV@args}
-          {\expandafter\mathaccentV@b\mathaccentV@args{##1}}%
+          {%
+            \@ifnextchar[%]
+              {\mathaccentV@b{##1}{##2}{##3}{##4}}
+              {\mathaccentV@a{##1}{##2}{##3}{##4}}%
+          }%
         }% <<<
-      \newcommand*\mathaccentV@b[5]% >>>
+    }% <<<
+  \newcommand*\MRTsfacc@ifknown[1]% >>>
+    {%
+      \ifcsname\MRTsfacc@shift{#1}\endcsname
+        \expandafter\@firstoftwo
+      \else
+        \expandafter\@secondoftwo
+      \fi
+    }% <<<
+  \newcommand*\MRTsfacc@mathaccentV@shifted@expandhelper[6]% >>>
+    {%
+      \mathaccentV@shifted{#2}{#3}{#4}{#5}
+        {\csname\MRTsfacc@shift{#1}\endcsname}{#6}%
+    }% <<<
+  \newcommand\mathaccentV@a[5]% >>>
+    {%
+      \MRTsfacc@ifknown{#5}
         {%
-          \MRTifLetterGTF{##5}
-            {\mathaccentV@shifted{##1}{##2}{##3}{##4}{##5}}
-            {\mathaccentV@orig{##1}{##2}{##3}{##4}{##5}}%
-        }% <<<
-      \newcommand*\mathaccentV@shifted[5]% >>>
+          \mathaccentV@shifted{#1}{#2}{#3}{#4}
+            {\csname\MRTsfacc@shift{#5}\endcsname}{#5}%
+        }%
         {%
-          \mathchoice%
-            {\mathaccentV@shifted@a{display}{##1}{##2}{##3}{##4}{##5}}
-            {\mathaccentV@shifted@a{text}{##1}{##2}{##3}{##4}{##5}}
-            {\mathaccentV@shifted@a{script}{##1}{##2}{##3}{##4}{##5}}
-            {\mathaccentV@shifted@a{scriptscript}{##1}{##2}{##3}{##4}{##5}}%
-        }% <<<
-      \newcommand*\mathaccentV@shifted@a[6]% >>>
+          \MRTsfacc@testnest\MRTsfacc@ifknown{#5}
+            {%
+              \expandafter\MRTsfacc@mathaccentV@shifted@expandhelper\expandafter
+                {\MRTsfacc@known}{#1}{#2}{#3}{#4}{#5}%
+            }
+            {\MRTsfacc@mathaccentV{#1}{#2}{#3}{#4}{#5}}%
+        }%
+    }% <<<
+  \long\def\mathaccentV@b#1#2#3#4[#5]#6% >>>
+    {%
+      \MRTsfacc@ifknown{#5}
         {%
-          \setbox\MRTsfacc@box\hbox{$\csname ##1style\endcsname##6$}%
-          \kern\MRTsfacc@kern
-          \mathaccentV@orig{##2}{##3}{##4}{##5}%
+          \mathaccentV@shifted{#1}{#2}{#3}{#4}
+            {\csname\MRTsfacc@shift{#5}\endcsname}{#6}%
+        }
+        {\mathaccentV@shifted{#1}{#2}{#3}{#4}{#5}{#6}}%
+    }% <<<
+  \newcommand\mathaccentV@shifted[6]% >>>
+    {%
+      \MRTsfacc@mathaccentV{#1}{#2}{#3}{#4}
+        {%
+          #6%
+          \mkern#5\relax
+        }
+      \mkern-#5\relax
+    }% <<<
+  \renewcommand*\MRTsfacc@shift[1]% >>>
+    {%
+      MRTsfacc@shift@\detokenize{#1}%
+    }% <<<
+  \newcommand*\MRTsfaccShift[2]% >>>
+    {%
+      \expandafter\def\csname MRTsfacc@shift@\detokenize{#1}\endcsname{#2}%
+    }% <<<
+  \newcommand*\MRTsfaccShiftLet[2]% >>>
+    {%
+      \MRTsfacc@ifknown{#2}
+        {%
+          \expandafter\MRTsfaccShiftLet@a\csname\MRTsfacc@shift{#2}\endcsname
+            {#1}%
+        }
+        {%
+          \PackageError{MRTsfacc}{No shift defined for `\detokenize{#2}`.}
             {%
-              \kern-\MRTsfacc@kern
-              %\copy\MRTsfacc@box % or ##6 both have drawbacks
-              ##6%
+              You have to use an already defined shift as second argument for
+              \string\MRTsfaccShiftLet.
             }%
-        }% <<<
-    }%<<<
-  \AtBeginDocument{\MRTsfacc@patch@mathaccentV}
-\else% <<<
-% false >>>
-  \RequirePackage[italic,defaultmathsizes]{mathastext}
-  \RequirePackage{xparse}
-  \newlength\MRTsfacc@mu
-  \newcommand*\MRTsfacc@getmu%>>>
+        }%
+    }% <<<
+  \newcommand*\MRTsfaccShiftLet@a[2]% >>>
     {%
-      \begingroup
-        \setbox0\hbox{$\mkern1mu$}%
-        \expandafter
-      \endgroup
-      \expandafter\MRTsfacc@mu\the\wd0
-    }%<<<
-  \ExplSyntaxOn
-  \NewDocumentCommand \MRTsfaccAll {}
-    {
-      \clist_set_eq:NN \l_MRTsfacc_chars_clist \c_MRTsfacc_chars_clist
-    }
-  \NewDocumentCommand \MRTsfaccSingle { m m }
-    {
-      \clist_remove_all:Nn \l_MRTsfacc_chars_clist { #1 }
-      \AtBeginDocument { \MRTsfacc@apply@single [ #2 ] { #1 } }
-    }
-  \NewDocumentCommand \MRTsfaccHelvet {}
-    {
-      %\MRTsfaccSet{.2}
-      %\MRTsfaccAll
-      %\MRTsfaccSingle
-    }
-  \clist_const:Nn \c_MRTsfacc_chars_clist%>>>
-    {
-      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,
-      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
-    }%<<<
-  \clist_new:N \l_MRTsfacc_chars_clist
-  \MRTsfaccAll
-  \newcommand*\MRTsfacc@pttomu[1]%>>>
-    {
-      \fp_eval:n { #1 / \MRTsfacc@mu } mu
-    }%<<<
-  \newcommand*\MRTsfacc@apply%>>>
-    {
-      \clist_map_function:NN \c_MRTsfacc_chars_clist \MRTsfacc@apply@single
-    }%<<<
-  \ExplSyntaxOff
-  \newcommand*\MRTsfacc@apply@single@a[2]%>>>
-    {%
-      \typeout{Moving accents for #2 with #1}
-      \MTsetmathskips{#2}{-#1}{#1}%
-    }%<<<
-  \newcommand*\MRTsfacc@apply@single[2][\MRTsfacc@shift]%>>>
-    {%
-      \begingroup
-        \setbox0\hbox{$#2$}%
-        \ht0=#1\ht0
-        \edef\MRTsfacc@tmp{\MRTsfacc@pttomu{\ht0}}%
-        \expandafter
-      \endgroup
-      \expandafter\MRTsfacc@apply@single@a\expandafter{\MRTsfacc@tmp}{#2}%
-    }%<<<
-  \AtBeginDocument%>>>
+      \expandafter\let\csname\MRTsfacc@shift{#2}\endcsname#1%
+    }% <<<
+  \newcommand*\MRTsfaccLoadShiftList[1]% >>>
     {%
-      \MRTsfacc@getmu
-      \MRTsfacc@apply
-    }%<<<
+      \input{MRTsfacc.list.#1.tex}%
+    }% <<<
 % <<<
 \fi
 % <<<
+\AtBeginDocument{\MRTsfacc@patch@mathaccentV}
 
 
 \endinput