improve printtoken; some better definitions for rule names

Author: rzach

open-logic-config.sty

@@ -195,22 +195,22 @@
 % - `\Weakening`: produces name or abbreviation for weakening rule,
 % e.g., ``W''.
 
-\DeclareDocumentMacro \Weakening {\text{W}}
+\DeclareDocumentMacro \Weakening {\ensuremath{\mathrm{W}}}
 
 % - `\Contraction`: produces name or abbreviation for contraction rule,
 % e.g., ``C''.
 
-\DeclareDocumentMacro \Contraction {\text{C}}
+\DeclareDocumentMacro \Contraction {\ensuremath{\mathrm{C}}}
 
 % - `\Exchange`: produces name or abbreviation for exchange rule,
 % e.g., ``X''.
 
-\DeclareDocumentMacro \Exchange {\text{X}}
+\DeclareDocumentMacro \Exchange {\ensuremath{\mathrm{X}}}
 
 % - `\Cut`: produces name or abbreviation for cut rule,
 % e.g., ``Cut''.
 
-\DeclareDocumentMacro \Cut {\text{Cut}}
+\DeclareDocumentMacro \Cut {\ensuremath{\mathrm{Cut}}}
 
 % - Rule names: `\Intro{Op}` typesets the name of an intro rule for
 % operator `Op`, e.g., `\Intro{\land}` produces `$\land$Intro`.

sty/open-logic-referencing.sty

@@ -81,7 +81,7 @@
 % defined
 % Tim Button adds: so: 
 %
-% \ollabel{L}{YText}{NText}
+% \oliflabeldef{L}{YText}{NText}
 %
 % Should simply do something along these lines:
 % If L is defined, then output: YText

sty/open-logic-tokenize.sty

@@ -56,28 +56,28 @@
 \@ifpackagelater{xparse}{2018/04/17}{
 \DeclareDocumentCommand \@printtoken { t^ ta m !ts } {%
   \IfBooleanTF {#1} 
-               {\IfBooleanTF {#2}{\printtoken{A}{#3}~% 
+               {\IfBooleanTF {#2}{\Article{#3}~%
                 \IfBooleanTF {#4}
                  {\printtoken{p}{#3}}
                  {\printtoken{s}{#3}}}{%
                 \IfBooleanTF {#4}
                  {\printtoken{P}{#3}}
                  {\printtoken{S}{#3}}}}{%
-               {\IfBooleanTF {#2}{\printtoken{a}{#3}~}{}%
+               {\IfBooleanTF {#2}{\article{#3}~}{}%
                 \IfBooleanTF {#4}
                  {\printtoken{p}{#3}}
                  {\printtoken{s}{#3}}}}}
 }{
 \DeclareDocumentCommand \@printtoken { t^ ta m ts } {%
   \IfBooleanTF {#1} 
-               {\IfBooleanTF {#2}{\printtoken{A}{#3}~% 
+               {\IfBooleanTF {#2}{\Article{#3}~%
                 \IfBooleanTF {#4}
                  {\printtoken{p}{#3}}
                  {\printtoken{s}{#3}}}{%
                 \IfBooleanTF {#4}
                  {\printtoken{P}{#3}}
                  {\printtoken{S}{#3}}}}{%
-               {\IfBooleanTF {#2}{\printtoken{a}{#3}~}{}%
+               {\IfBooleanTF {#2}{\article{#3}~}{}%
                 \IfBooleanTF {#4}
                  {\printtoken{p}{#3}}
                  {\printtoken{s}{#3}}}}}
@@ -101,8 +101,13 @@
 % `\article{token}`, `\Article{token}` - just print the article for a
 % token
 
-\def\article#1{\printtoken{a}{#1}}
-\def\Article#1{\printtoken{A}{#1}}
+\def\article#1{\ifcsname TOK@a@#1\endcsname
+    \tokenformat{\usetoken{a}{#1}}\else
+    \PackageWarning{open-logic-tokenize}{Token #1 undefined}{\color{red}a}\fi}
+\def\Article#1{\ifcsname TOK@a@#1\endcsname
+    \tokenformat{\usetoken{A}{#1}}\else
+    \PackageWarning{open-logic-tokenize}{Token #1 undefined}{\color{red}A}\fi}
+%\def\Article#1{\printtoken{A}{#1}}
 
 % use shorthand mechanism from `babel.sty` to define `!!` as shorthand
 % for `\printtoken`