#19 normal \ff, not verbatim

yegor256 · Dec 2, 2022 · 831e724 · 831e724
1 parent 34ce24d
commit 831e724
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/ffcode.dtx b/ffcode.dtx
@@ -152,7 +152,7 @@
 
 % \DescribeMacro{sf}
 % You can change the font family of |\ff| pieces to |\sffamily|:
-% \docshotOptions{firstline=4,lastline=9}
+% \docshotOptions{firstline=4,lastline=10}
 % \begin{docshot}
 % \documentclass{article}
 % \usepackage[paperwidth=3in]{geometry}
@@ -161,7 +161,8 @@
 % \begin{document}
 % Sometimes you may want them to look
 % not strictly fixed-width, but more
-% elegant, like the |fibo()| here.
+% elegant, like the \emph{|fibo()|}
+% here.
 % \end{document}
 % \end{docshot}
 
@@ -347,7 +348,16 @@
 % Then, we define |\ff@x| internal command for printing a piece of fixed-width-font text:
 %    \begin{macrocode}
 \makeatletter
-\NewDocumentCommand\ff@x{v}{%
+\NewDocumentCommand\ff@x{v}{\ff{#1}}
+\makeatother
+%    \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\ff}
+% Then, we define |\ff| macro:
+%    \begin{macrocode}
+\makeatletter
+\newcommand\ff[1]{%
   \ifdefined\ff@noframes%
     \ff@rule\ff@print{#1}%
   \else%
@@ -362,15 +372,6 @@
 %    \end{macrocode}
 % \end{macro}
 
-% \begin{macro}{\ff}
-% Then, we define |\ff| macro:
-%    \begin{macrocode}
-\makeatletter
-\def\ff{\ff@x}
-\makeatother
-%    \end{macrocode}
-% \end{macro}
-
 % \begin{macro}{novert}
 % Finally, we let vertical bars work similar to |\ff|, as suggested
 % \href{https://tex.stackexchange.com/a/665105/1449}{here}

diff --git a/testfiles/simple.luatex.tlg b/testfiles/simple.luatex.tlg
@@ -14,3 +14,8 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 )
 LaTeX Warning: Reference `ln:ret' on page 1 undefined on input line ....
+! Missing $ inserted.
+<inserted text> 
+$
+l. ...This code is fixed-width font: \ff{_hello\abc}
+                                                 .
diff --git a/testfiles/simple.tlg b/testfiles/simple.tlg
@@ -10,3 +10,8 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 )
 LaTeX Warning: Reference `ln:ret' on page 1 undefined on input line ....
+! Missing $ inserted.
+<inserted text> 
+                $
+l. ...... code is fixed-width font: \ff{_hello\abc}
+                                                  . 
diff --git a/testfiles/simple.xetex.tlg b/testfiles/simple.xetex.tlg
@@ -11,3 +11,8 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 (Font)              <5> on input line ....
 )
 LaTeX Warning: Reference `ln:ret' on page 1 undefined on input line ....
+! Missing $ inserted.
+<inserted text> 
+                $
+l. ...... code is fixed-width font: \ff{_hello\abc}
+                                                  .