From 4a18f607fa288537a2a1415e54606e8ae5aa28b5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Sep 2021 20:08:48 +0000 Subject: ffcode (13sep21) git-svn-id: svn://tug.org/texlive/trunk@60500 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt | 1 - Master/texmf-dist/doc/latex/ffcode/ffcode.pdf | Bin 118496 -> 186641 bytes Master/texmf-dist/doc/latex/ffcode/ffcode.tex | 16 ++++++++- Master/texmf-dist/tex/latex/ffcode/ffcode.sty | 48 +++++++++++++------------ 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt b/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt index b7535d747d6..935840f8502 100644 --- a/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt +++ b/Master/texmf-dist/doc/latex/ffcode/DEPENDS.txt @@ -1,4 +1,3 @@ -hard microtype 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 d10d38424d4..3d6ec820a1f 100644 Binary files a/Master/texmf-dist/doc/latex/ffcode/ffcode.pdf and b/Master/texmf-dist/doc/latex/ffcode/ffcode.pdf differ diff --git a/Master/texmf-dist/doc/latex/ffcode/ffcode.tex b/Master/texmf-dist/doc/latex/ffcode/ffcode.tex index c1fbc404836..df15670be00 100644 --- a/Master/texmf-dist/doc/latex/ffcode/ffcode.tex +++ b/Master/texmf-dist/doc/latex/ffcode/ffcode.tex @@ -21,14 +21,16 @@ % SOFTWARE. \documentclass[12pt]{article} +\usepackage[T1]{fontenc} \usepackage[tt=false,type1=true]{libertine} \usepackage{amsmath} \usepackage{multicol} \usepackage{ffcode} \usepackage{xcolor} +\usepackage{microtype} \title{\ff{ffcode}: \LaTeX{} Package \\ for Fixed-Font Code Blocks} \author{Yegor Bugayenko} -\date{0.3.0 2021/09/07} +\date{0.3.2 2021/09/13} \begin{document} \pagenumbering{gobble} \raggedbottom @@ -48,6 +50,7 @@ and the \ff{ffcode} environment): \raggedcolumns \begin{verbatim} \documentclass{article} +\usepackage[T1]{fontenc} \usepackage{ffcode} \begin{document} The function \ff{fibo()} is recursive: @@ -84,6 +87,10 @@ in order to let \ff{minted} (the package we use) to run Pygments and format the code. If you don't want this to happen, just use the \ff{nopygments} option. +A pair of vertical lines decorate a TeX command inside the snippet. +If you want to print a single vertical line, use this: +\ff{|\char`\\vert|}. + If you want to omit the light gray frames around \ff{\char`\\ff} texts, use the package option \ff{noframes}. @@ -126,6 +133,13 @@ while (true) { \end{ffcode*} \end{multicols} +Using this second argument of the \ff{ffcode*} (with the trailing asterisk), +you can provide any other options from the \ff{minted} package to the +snippet. + +By the way, the package correctly formats low-height texts, for example, just +a dot: \ff{.} + More details about this package you can find in the \ff{yegor256/ffcode} GitHub repository. diff --git a/Master/texmf-dist/tex/latex/ffcode/ffcode.sty b/Master/texmf-dist/tex/latex/ffcode/ffcode.sty index f4c23b51bbb..1c51720636c 100644 --- a/Master/texmf-dist/tex/latex/ffcode/ffcode.sty +++ b/Master/texmf-dist/tex/latex/ffcode/ffcode.sty @@ -21,53 +21,55 @@ % SOFTWARE. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ffcode}[2021/09/07 0.3.0 Fixed Font Code] +\ProvidesPackage{ffcode}[2021/09/13 0.3.2 Fixed Font Code] -\RequirePackage{microtype} \RequirePackage{xkeyval} -\newif\ifnopygments -\DeclareOptionX{nopygments}{\nopygmentstrue} -\newif\ifnoframes -\DeclareOptionX{noframes}{\noframestrue} -\newif\ifnonumbers -\DeclareOptionX{nonumbers}{\nonumberstrue} -\newif\ifnocn -\DeclareOptionX{nocn}{\nocntrue} + +\makeatletter +\newif\ifffcode@nopygments +\DeclareOptionX{nopygments}{\ffcode@nopygmentstrue} +\newif\ifffcode@noframes +\DeclareOptionX{noframes}{\ffcode@noframestrue} +\newif\ifffcode@nonumbers +\DeclareOptionX{nonumbers}{\ffcode@nonumberstrue} +\newif\ifffcode@nocn +\DeclareOptionX{nocn}{\ffcode@nocntrue} \ProcessOptionsX\relax +\makeatother -\ifnopygments +\makeatletter\ifffcode@nopygments \RequirePackage[draft=true]{minted} \else \RequirePackage{minted} -\fi +\fi\makeatother \setminted{breaklines} \usemintedstyle{bw} -\ifnonumbers +\makeatletter\ifffcode@nonumbers \newminted[ffcode]{text}{framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,escapeinside=||,mathescape,highlightcolor=gray!30} \else \renewcommand{\theFancyVerbLine}{\textcolor{gray}{\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}} - \ifnocn + \ifffcode@nocn \newminted[ffcode]{text}{linenos,numbersep=2pt,framesep=6pt,framerule=1pt,highlightcolor=gray!30,rulecolor=gray,frame=leftline,escapeinside=||,mathescape} \else \newminted[ffcode]{text}{firstnumber=last,linenos,numbersep=2pt,framesep=6pt,framerule=1pt,highlightcolor=gray!30,rulecolor=gray,frame=leftline,escapeinside=||,mathescape} \fi -\fi +\fi\makeatother \makeatletter -\newcommand\ffprint{\begingroup\obeyspaces\@ffprint} -\newcommand{\@ffprint}[1]{\texttt{#1}\endgroup} +\newcommand\ffcode@print{\begingroup\obeyspaces\ffcode@printx} +\newcommand\ffcode@printx[1]{\texttt{#1}\endgroup} \makeatother -\newcommand\ffcoderule{\vrule height 6pt depth 1pt width 0pt} -\ifnoframes - \newcommand{\ff}[1]{\ffcoderule\ffprint{#1}} +\makeatletter\newcommand\ffcode@rule{\vrule height 6pt depth 1pt width 0pt} +\makeatletter\ifffcode@noframes + \newcommand\ff[1]{\ffcode@rule\ffcode@print{#1}} \else \RequirePackage{tcolorbox} - \newtcbox{\ffcodebox}{nobeforeafter,colframe=gray!80!white, + \newtcbox\ffcode@box{nobeforeafter,colframe=gray!80!white, colback=gray!5!white,boxrule=0.1pt,arc=1pt, boxsep=1.2pt,left=0.5pt,right=0.5pt,top=0.2pt,bottom=0.2pt, tcbox raise base} - \newcommand{\ff}[1]{\ffcodebox{\ffcoderule\ffprint{#1}}} -\fi + \newcommand\ff[1]{\ffcode@box{\ffcode@rule\ffcode@print{#1}}} +\fi\makeatother \endinput -- cgit v1.2.3