From 69a9e2bb8b63735fde506fd73e535e8f59b4003e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Sep 2016 21:35:58 +0000 Subject: fvextra (3sep16) git-svn-id: svn://tug.org/texlive/trunk@41984 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fvextra/fvextra.pdf | Bin 702054 -> 703074 bytes Master/texmf-dist/source/latex/fvextra/fvextra.dtx | 31 ++++++++++++++++----- Master/texmf-dist/tex/latex/fvextra/fvextra.sty | 15 ++++++---- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf b/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf index 3c6da8659b2..37fd18e3507 100644 Binary files a/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf and b/Master/texmf-dist/doc/latex/fvextra/fvextra.pdf differ diff --git a/Master/texmf-dist/source/latex/fvextra/fvextra.dtx b/Master/texmf-dist/source/latex/fvextra/fvextra.dtx index dffaa62c9ea..27b455ab714 100644 --- a/Master/texmf-dist/source/latex/fvextra/fvextra.dtx +++ b/Master/texmf-dist/source/latex/fvextra/fvextra.dtx @@ -26,7 +26,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{fvextra} %<*package> - [2016/07/20 v1.2 fvextra - extensions and patches for fancyvrb] + [2016/09/02 v1.2.1 fvextra - extensions and patches for fancyvrb] % % %<*driver> @@ -213,7 +213,7 @@ % % \fi % -% \CheckSum{2843} +% \CheckSum{2857} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -232,6 +232,12 @@ % Right brace \} Tilde \~} % % +% \begin{changelog}{v1.2.1}{2016/09/02} +% \item The package is now compatible with classes and packages that redefine \texttt{\string\raggedright}. +% \item Fixed a bug that introduced extra space in inline contexts such as \texttt{\string\mintinline} when \texttt{breaklines=true} (\#3). +% \end{changelog} +% +% % \begin{changelog}{v1.2}{2016/07/20} % \item Added support for line breaking when working with Pygments for syntax highlighting. % \item The default \texttt{highlightcolor} is now defined with \texttt{rgb} for compatibility with the \texttt{color} package. Fixed a bug in the conditional color definition when \texttt{color} and \texttt{xcolor} are not loaded before \texttt{fvextra}. @@ -3082,6 +3088,17 @@ % \end{macrocode} % \end{macro} % +% +% \begin{macro}{\FV@RaggedRight} +% We need a copy of the default |\raggedright| to ensure that everything works with classes or packages that use a special definition. +% \begin{macrocode} +\def\FV@RaggedRight{% + \let\\\@centercr + \@rightskip\@flushglue\rightskip\@rightskip\leftskip\z@skip\parindent\z@} +% \end{macrocode} +% \end{macro} +% +% % \begin{macro}{\FV@SaveLineBox} % This is the macro that does most of the work. It was inspired by Marco Daniel's code at \url{http://tex.stackexchange.com/a/112573/10742}. % @@ -3105,7 +3122,7 @@ \ifdefempty{\FancyVerbBreakSymbolRight}{}% {\advance\linewidth by -\FV@BreakSymbolIndentRight}% \parbox[t]{\linewidth}{% - \raggedright + \FV@RaggedRight \leftlinenumbers* \begin{internallinenumbers*}% \let\makeLineNumber\FV@makeLineNumber @@ -3376,13 +3393,13 @@ \def\FV@VerbatimPygments#1#2{% \edef\FV@PYG@Literal{\expandafter\FV@DetokMacro@StripSpace\detokenize{#1}}% \def\FV@BreakBeforePrep@PygmentsHook{% - \expandafter\FV@BreakBeforePrep@Pygments\expandafter{\FV@PYG@Literal}} + \expandafter\FV@BreakBeforePrep@Pygments\expandafter{\FV@PYG@Literal}}% \def\FV@BreakAfterPrep@PygmentsHook{% - \expandafter\FV@BreakAfterPrep@Pygments\expandafter{\FV@PYG@Literal}} + \expandafter\FV@BreakAfterPrep@Pygments\expandafter{\FV@PYG@Literal}}% \ifx#2\relax - \let\FV@PYG#1 + \let\FV@PYG#1% \else - \let\FV@PYG#2 + \let\FV@PYG#2% \fi \ifbool{FV@breakbytoken}% {\ifbool{FV@breakbytokenanywhere}% diff --git a/Master/texmf-dist/tex/latex/fvextra/fvextra.sty b/Master/texmf-dist/tex/latex/fvextra/fvextra.sty index c00f5abd51a..45d418d39ee 100644 --- a/Master/texmf-dist/tex/latex/fvextra/fvextra.sty +++ b/Master/texmf-dist/tex/latex/fvextra/fvextra.sty @@ -20,7 +20,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{fvextra} - [2016/07/20 v1.2 fvextra - extensions and patches for fancyvrb] + [2016/09/02 v1.2.1 fvextra - extensions and patches for fancyvrb] \RequirePackage{ifthen} \RequirePackage{etoolbox} \RequirePackage{fancyvrb} @@ -1152,6 +1152,9 @@ \FV@SetLineBreakLast }% } +\def\FV@RaggedRight{% + \let\\\@centercr + \@rightskip\@flushglue\rightskip\@rightskip\leftskip\z@skip\parindent\z@} \def\FV@SaveLineBox#1{% \savebox{\FV@LineBox}{% \advance\linewidth by -\FV@BreakIndent @@ -1170,7 +1173,7 @@ \ifdefempty{\FancyVerbBreakSymbolRight}{}% {\advance\linewidth by -\FV@BreakSymbolIndentRight}% \parbox[t]{\linewidth}{% - \raggedright + \FV@RaggedRight \leftlinenumbers* \begin{internallinenumbers*}% \let\makeLineNumber\FV@makeLineNumber @@ -1370,13 +1373,13 @@ \def\FV@VerbatimPygments#1#2{% \edef\FV@PYG@Literal{\expandafter\FV@DetokMacro@StripSpace\detokenize{#1}}% \def\FV@BreakBeforePrep@PygmentsHook{% - \expandafter\FV@BreakBeforePrep@Pygments\expandafter{\FV@PYG@Literal}} + \expandafter\FV@BreakBeforePrep@Pygments\expandafter{\FV@PYG@Literal}}% \def\FV@BreakAfterPrep@PygmentsHook{% - \expandafter\FV@BreakAfterPrep@Pygments\expandafter{\FV@PYG@Literal}} + \expandafter\FV@BreakAfterPrep@Pygments\expandafter{\FV@PYG@Literal}}% \ifx#2\relax - \let\FV@PYG#1 + \let\FV@PYG#1% \else - \let\FV@PYG#2 + \let\FV@PYG#2% \fi \ifbool{FV@breakbytoken}% {\ifbool{FV@breakbytokenanywhere}% -- cgit v1.2.3