add refformat option

Author: rzach

fitch.sty

@@ -50,7 +50,7 @@
 % \]
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fitch}[2023-10-15 v1.0-beta Macros for Fitch-style natural deduction]
+\ProvidesPackage{fitch}[2023-10-15 v1.0-beta2 Macros for Fitch-style natural deduction]
 
 % Define keyval options
 
@@ -64,6 +64,7 @@ prefix = nd@ % prefix with nd@ for compatibility with old code
 \DeclareStringOption[ndrules]{rules}
 \DeclareStringOption[array]{arrayenv}
 \DeclareStringOption[ndjustformat]{justformat}
+\DeclareStringOption[ndrefformat]{refformat}
 
 \DeclareStringOption[4.5ex]{height}[4.5ex]
 \DeclareStringOption[3.5ex]{topheight}[3.5ex]
@@ -94,6 +95,7 @@ prefix = nd@ % prefix with nd@ for compatibility with old code
   rules,
   arrayenv,
   justformat,
+  refformat,
   height,
   topheight,
   depth,
@@ -122,7 +124,7 @@ prefix = nd@ % prefix with nd@ for compatibility with old code
 \def\nd@numopt#1#2{\nd@numo{$#1$}{#2}}
 \def\nd@numo#1#2{\edef\x{#1}\mbox{$\x$}\expandafter\global\expandafter\let\csname nd@-#2\endcsname\x}
 \def\nd@ref#1{\expandafter\let\expandafter\x\csname nd@-#1\endcsname\ifx\x\relax%
-  \PackageWarning{fitch}{Undefined line reference: #1}\mbox{\textbf{??}}\else\mbox{$\x$}\fi}
+  \PackageWarning{fitch}{Undefined line reference: #1}\mbox{\textbf{??}}\else\csname\nd@refformat\endcsname{\mbox{$\x$}}\fi}
 \def\nd@noop{}
 \def\nd@set#1#2{\ifx\relax#1\nd@noop\else\global\def\nd@base{#1}\fi\ifx\relax#2\relax\else\global\nd@ctr=#2\fi}
 \def\nd@reset{\nd@set{}{1}}
@@ -286,6 +288,10 @@ prefix = nd@ % prefix with nd@ for compatibility with old code
 
 \newcommand{\ndjustformat}[2]{#1, #2}
 
+% default line number format
+
+\newcommand{\ndrefformat}[1]{#1}
+
 % User-level commands for proofs
 
 \newenvironment{nd}[1][]

fitchdoc.tex

@@ -55,7 +55,7 @@
 \href{https://github.com/OpenLogicProject/fitch/issues}{issues} with
 it.}}
 
-\date{Version 1.0-beta\\ October 15, 2023}
+\date{Version 1.0-beta2\\ October 15, 2023}
 
 \begin{document}
 \maketitle
@@ -256,14 +256,14 @@ \subsection{Generic justifications}
 
 \subsection{Scope}
 
-The commands |\hypo|, |\have|, |\open|, |\close|,
-|\r|, |\ii|, and so forth are only available inside an
-|nd| environment. These commands may have a different meaning
-elsewhere in the same document. The only commands provided by the
-|fitch.sty|  package which are visible outside an |nd|
-environment are the command |\ndref| described in
-Section~\ref{subsec-ndref}, and the command |\nddim| and the
-dimension |\ndindent| described in Section~\ref{sec-customization}.
+The commands |\hypo|, |\have|, |\open|, |\close|, |\r|, |\ii|, and so
+forth are only available inside an |nd| environment. These commands
+may have a different meaning elsewhere in the same document. The only
+commands provided by the |fitch.sty|  package which are visible
+outside an |nd| environment are the command |\ndref| described in
+Section~\ref{subsec-ndref}, the commands |\ndrules|, |\ndjustformat|,
+|\ndrefformat|, and |\nddim|, and the dimension |\ndindent| described
+in Section~\ref{sec-customization}.
 
 \subsection{Breaking it across pages}\label{subsec-break}
 
@@ -433,15 +433,17 @@ \section{Customization}\label{sec-customization}
   \begin{fitchproof}[linethickness=1pt]
   \fitchset{hsep=1em,indent=1em}\end{verbatim}
 
-In addition, the macros used 
-to generate the table containing the proof, 
-to format justifications, and to initialize macros to produce
-justifications in the proof can be customized:
+In addition, the macros used to generate the table containing the
+proof, to format justifications, format line number references, and to
+initialize macros to produce justifications in the proof can be
+customized:
 \begin{center}
   \begin{tabular}{ll}
-  \meta{rules} & |ndrules|\\
-  \meta{justformat} & |ndjustformat|\\
-  \meta{arrayenv} & |array|
+  option & default\\\hline
+  |rules=|\meta{macroname} & |ndrules|\\
+  |justformat=|\meta{macroname} & |ndjustformat|\\
+  |refformat=|\meta{macroname} & |ndrefformat|\\
+  |arrayenv=|\meta{envname} & |array|
   \end{tabular}
 \end{center}
 For compatibility with earlier versions of |fitch.sty|, the default
@@ -483,23 +485,34 @@ \section{Customization}\label{sec-customization}
   \newcommand{\ndjustformat}[2]{#1, #2}
 \end{verbatim}
 The first argument takes the rule name, the second the reference list.
+It is used to typeset the justification.
 
-\cmd{\ndrules} and \cmd{\ndjustformat} can be redefined using
-\cmd{\renewcommand}, or you can define your own commands to set the
-rule names or the justification format, and pass the names (without
-initial |\|) as an option to the \cmd{\usepackage} or individual
-\cmd{\nd} or \cmd{\fitchproof} commands.
+\DescribeMacro{\ndrefformat}
+The macro \cmd{\ndrefformat} is defined as
+\begin{verbatim}
+  \newcommand{\ndrefformat}[1]{#1}
+\end{verbatim}
+It is used to typeset the line numbers in justifications.
+
+\cmd{\ndrules}, \cmd{\ndjustformat}, and \cmd{\ndrefformat} can
+be redefined using \cmd{\renewcommand}, or you can define your own
+commands to provide the rule names, the justification format, and line
+number format, and pass the names (without initial |\|) as an option
+to the \cmd{\usepackage} or individual \cmd{\nd} or \cmd{\fitchproof}
+commands.
 \begin{LTXexample}
 \newcommand{\myjust}[2]
-  {#2 (by \textsf{#1})}
+  {#2 by \textsf{#1}}
 \newcommand{\myrules}{
   \ndrules % include standard rules
   \def\ds{\by{DS}}}
+\renewcommand{\ndrefformat}[1]{(#1)}
 $
 \begin{nd}[rules=myrules,
   justformat=myjust,
-  indent=2cm,
-  linethickness=1.5pt]
+  indent=1.5cm,
+  linethickness=1.5pt,
+  justsep=1cm]
   \hypo {1} {A\vee B}
   \hypo {2} {\neg B}
   \open