ffcode (23jan22)

git-svn-id: svn://tug.org/texlive/trunk@61714 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 13 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt b/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt
index d86449385ce..935840f8502 100644
--- a/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt
+++ b/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt
@@ -1,2 +1,3 @@
+hard xkeyval
 hard minted
 hard tcolorbox
diff --git a/Master/texmf-dist/doc/latex/ffcode/ffcode.pdf b/Master/texmf-dist/doc/latex/ffcode/ffcode.pdf
index 252a4fbb78b..c49dd4103c3 100644
--- a/Master/texmf-dist/doc/latex/ffcode/ffcode.pdf
+++ b/Master/texmf-dist/doc/latex/ffcode/ffcode.pdf
diff --git a/Master/texmf-dist/doc/latex/ffcode/ffcode.tex b/Master/texmf-dist/doc/latex/ffcode/ffcode.tex
index b90ab7a411b..607b71368b0 100644
--- a/Master/texmf-dist/doc/latex/ffcode/ffcode.tex
+++ b/Master/texmf-dist/doc/latex/ffcode/ffcode.tex
@@ -30,7 +30,7 @@
 \usepackage{microtype}
 \title{\ff{ffcode}: \LaTeX{} Package \\ for Fixed-Font Code Blocks}
 \author{Yegor Bugayenko}
-\date{0.4.0 2022/01/09}
+\date{0.4.1 2022/01/23}
 \begin{document}
 \pagenumbering{gobble}
 \raggedbottom
diff --git a/Master/texmf-dist/tex/latex/ffcode/ffcode.sty b/Master/texmf-dist/tex/latex/ffcode/ffcode.sty
index 5ebb6a0fc5d..65b846b8e51 100644
--- a/Master/texmf-dist/tex/latex/ffcode/ffcode.sty
+++ b/Master/texmf-dist/tex/latex/ffcode/ffcode.sty
@@ -21,7 +21,9 @@
 % SOFTWARE.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ffcode}[2022/01/09 0.4.0 Fixed Font Code]
+\ProvidesPackage{ffcode}[2022/01/23 0.4.1 Fixed Font Code]
+
+\RequirePackage{xkeyval}
 
 \makeatletter
 \DeclareOptionX{nopygments}{\PassOptionsToPackage{draft=true}{minted}}
@@ -39,17 +41,16 @@
 \RequirePackage{minted}
 
 \setminted{breaklines}
+\setminted{escapeinside=||,mathescape}
+\setminted{highlightcolor=gray!30}
 \usemintedstyle{bw}
 
 \makeatletter\ifff@nonumbers
   \ifff@nobars
-    \newminted[ffcode]{text}{
-      escapeinside=||,mathescape,highlightcolor=gray!30
-    }
+    \newminted[ffcode]{text}{}
   \else
     \newminted[ffcode]{text}{
-      framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,
-      escapeinside=||,mathescape,highlightcolor=gray!30
+      framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline
     }
   \fi
 \else
@@ -57,23 +58,23 @@
   \ifff@nocn
     \ifff@nobars
       \newminted[ffcode]{text}{
-        linenos,numbersep=2pt,highlightcolor=gray!30,escapeinside=||,mathescape
+        linenos,numbersep=2pt
       }
     \else
       \newminted[ffcode]{text}{
         framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,
-        linenos,numbersep=2pt,highlightcolor=gray!30,escapeinside=||,mathescape
+        linenos,numbersep=2pt
       }
     \fi
   \else
     \ifff@nobars
       \newminted[ffcode]{text}{
-        firstnumber=last,linenos,numbersep=2pt,highlightcolor=gray!30,escapeinside=||,mathescape
+        firstnumber=last,linenos,numbersep=2pt
       }
     \else
       \newminted[ffcode]{text}{
         framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,
-        firstnumber=last,linenos,numbersep=2pt,highlightcolor=gray!30,escapeinside=||,mathescape
+        firstnumber=last,linenos,numbersep=2pt
       }
     \fi
   \fi