From b8ef34526b49483f65102f6cf35338395db613f1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 25 Dec 2018 21:49:26 +0000 Subject: lstfiracode (25dec18) git-svn-id: svn://tug.org/texlive/trunk@49503 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/lstfiracode/README.md | 2 +- .../doc/latex/lstfiracode/lstfiracode.pdf | Bin 53414 -> 54036 bytes .../doc/latex/lstfiracode/lstfiracode.tex | 13 ++++++++++--- .../tex/latex/lstfiracode/lstfiracode.sty | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/lstfiracode/README.md b/Master/texmf-dist/doc/latex/lstfiracode/README.md index 19a6a8a161b..f83f6f31ee9 100644 --- a/Master/texmf-dist/doc/latex/lstfiracode/README.md +++ b/Master/texmf-dist/doc/latex/lstfiracode/README.md @@ -16,7 +16,7 @@ Here is a sample preamble of a document: \documentclass{article} \usepackage{fontspec} - \setmonofont{FiraCode-Regular.otf}[Ligatures=Common,Contextuals=Alternate] + \setmonofont{FiraCode-Regular.otf}[Contextuals=Alternate] \usepackage{listings} \usepackage[verbatim]{lstfiracode} \lstset{style=FiraCodeStyle,basicstyle=\ttfamily} diff --git a/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.pdf b/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.pdf index dc1e9d741df..3e6cc3ab256 100644 Binary files a/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.pdf and b/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.pdf differ diff --git a/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.tex b/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.tex index df5f81d7e9b..e40f1583c7d 100644 --- a/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.tex +++ b/Master/texmf-dist/doc/latex/lstfiracode/lstfiracode.tex @@ -12,7 +12,6 @@ ] \setmonofont{Fira Code}[ Scale=MatchLowercase, - Ligatures=Common, Contextuals=Alternate ] \newfontfamily\LMMono{Latin Modern Mono}[ @@ -67,7 +66,7 @@ } \title{The \texttt{lstfiracode} package} \author{Ruixi~Zhang\thanks{\href{mailto:\myemail}{\nolinkurl{\myemail}}.}} -\date{2018/12/20\enskip v0.1b} +\date{2018/12/24\enskip v0.1c} \begin{document} @@ -116,7 +115,6 @@ To access \verb|FiraCodeStyle|, simply load \verb|lstfiracode| \emph{after} \usepackage{fontspec} \setmonofont{FiraCode-Regular.otf}[ BoldFont=FiraCode-Bold.otf, - Ligatures=Common, % Activate the liga feature Contextuals=Alternate % Activate the calt feature ] \usepackage{xcolor} @@ -191,6 +189,7 @@ automatically with the package option \verb|verbatim=true|. \item[\texttt{\textbackslash DeactivateVerbatimLigatures}] Suppress \emph{almost all} Fira Code ligatures in \verb|verbatim|. Currently, it cannot break the {\LMMono\#\{} and the {\LMMono|\}} ligatures. +You should use Fira Mono if you wish to avoid ligatures altogether. \item[\texttt{\textbackslash RestoreVerbatimBehavior}] Restore how \verb|verbatim| is originally handled by \LaTeX. \end{description} @@ -310,6 +309,14 @@ Pull requests are welcome. \section*{Version history} \begin{description} +\versionhistory{v0.1c}{2018/12/24}{% + Removed \texttt{Ligatures=Common} + from \texttt{README.md} and \texttt{lstfiracode.tex} + (see \href{https://github.com/RuixiZhang42/lstfiracode/issues/1}{% + \#1}). + Re-implemented + \texttt{\textbackslash DeactivateVerbatimLigatures}.% +} \versionhistory{v0.1b}{2018/12/20}{% Updated \texttt{FiraCodeStyle} literate list. Added \texttt{\textbackslash RestoreVerbatimBehavior}. diff --git a/Master/texmf-dist/tex/latex/lstfiracode/lstfiracode.sty b/Master/texmf-dist/tex/latex/lstfiracode/lstfiracode.sty index b8b2c132ebc..69017968619 100644 --- a/Master/texmf-dist/tex/latex/lstfiracode/lstfiracode.sty +++ b/Master/texmf-dist/tex/latex/lstfiracode/lstfiracode.sty @@ -20,7 +20,7 @@ % \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{lstfiracode}[% - 2018/12/20 v0.1b Use Fira Code font for listings] + 2018/12/24 v0.1c Use Fira Code font for listings] \RequirePackage{kvoptions} \RequirePackage{listings} @@ -42,11 +42,11 @@ \def\verbatim@nolig@list{\do\`\do\,\do\'}% } \newcommand*\DeactivateVerbatimLigatures{% - \expandafter\def\expandafter\verbatim@nolig@list\expandafter{% - \lstfiracode@verbatim@nolig@list + \def\verbatim@nolig@list{% + \do\`\do\<\do\>\do\,\do\'\do\-% \do\w\do\*\do\/\do\:\do\=\do\!\do\~\do\[% \do\#\do\(\do\?\do\_\do\.\do\;\do\&\do\|% - \do\+\do\$\do\@\do\%\do\]% Do "7B and "7D, how? + \do\+\do\$\do\@\do\%\do\]% Do "7B and "7D, impossible? }% } \newcommand*\RestoreVerbatimBehavior{% -- cgit v1.2.3