From 2bbb699b01257615855f05ad2d7864354ce3da09 Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Mon, 11 Dec 2017 21:15:58 +0100
Subject: [PATCH] Move some LaTeX macros for easier customizability if needed

---
 sphinx/texinputs/sphinx.sty | 67 ++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 4c9a6385f..cbd2b82e4 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -840,6 +840,32 @@
 
 % needed to create wrapper environments of fancyvrb's Verbatim
 \newcommand*{\sphinxVerbatimEnvironment}{\gdef\FV@EnvironName{sphinxVerbatim}}
+% serves to implement line highlighting and line wrapping
+\newcommand\sphinxFancyVerbFormatLine[1]{%
+  \expandafter\sphinx@verbatim@checkifhl
+    \expandafter{\the\numexpr\value{FancyVerbLine}-\spx@verbatim@linedelta}%
+  \ifin@
+     \edef\sphinx@restorefboxsep{\fboxsep\the\fboxsep\relax}%
+     \fboxsep\z@
+     \colorbox{VerbatimHighlightColor}%
+              {\sphinx@restorefboxsep\sphinx@FancyVerbFormatLine{#1}}%
+  \else
+     \sphinx@FancyVerbFormatLine{#1}%
+  \fi
+}%
+\def\sphinx@FancyVerbFormatLine@wrap #1%
+{\hsize\linewidth
+    \vtop{\raggedright\hyphenpenalty\z@\exhyphenpenalty\z@
+          \doublehyphendemerits\z@\finalhyphendemerits\z@
+          \strut #1\strut}%
+}%
+\def\sphinx@FancyVerbFormatLine@nowrap #1{\hb@xt@\linewidth{\strut #1\hss}}%
+\def\sphinx@FancyVerbCodesHook
+   {\FV@SetLineNo\edef\spx@verbatim@linedelta{\the\value{FancyVerbLine}}}%
+\g@addto@macro\FV@SetupFont{%
+    \sbox\sphinxcontinuationbox {\spx@opt@verbatimcontinued}%
+    \sbox\sphinxvisiblespacebox {\spx@opt@verbatimvisiblespace}%
+}%
 % Sphinx <1.5 optional argument was in fact mandatory. It is now really
 % optional and handled by original Verbatim.
 \newenvironment{sphinxVerbatim}{%
@@ -886,41 +912,20 @@
   %       to achieve this without extensive rewrite of fancyvrb.
   %     - The (not used in sphinx) obeytabs option to Verbatim is
   %       broken by this change (showtabs and tabspace work).
-  \expandafter\def\expandafter\FV@SetupFont\expandafter
-    {\FV@SetupFont\sbox\sphinxcontinuationbox {\spx@opt@verbatimcontinued}%
-                  \sbox\sphinxvisiblespacebox {\spx@opt@verbatimvisiblespace}}%
-  \def\sphinx@FancyVerbFormatLine ##1{\hsize\linewidth
-          \vtop{\raggedright\hyphenpenalty\z@\exhyphenpenalty\z@
-                \doublehyphendemerits\z@\finalhyphendemerits\z@
-                \strut ##1\strut}%
-          }%
-  \let\FV@Space\spx@verbatim@space
+    \let\sphinx@FancyVerbFormatLine\sphinx@FancyVerbFormatLine@wrap
+    \let\FV@Space\spx@verbatim@space
   % Allow breaks at special characters using \PYG... macros.
-  \sphinxbreaksatspecials
+    \sphinxbreaksatspecials
   % Breaks at punctuation characters . , ; ? ! and / (needs catcode activation)
-  % Hacker note: mark-up should not use codes=... option of Verbatim, but
-  % codes*=..., and \fvset{codes=...} if added by raw latex will be overwritten
-  \def\FancyVerbCodes{\sphinxbreaksviaactive}%
+    \expandafter\def\expandafter\sphinx@FancyVerbCodesHook\expandafter
+                   {\sphinx@FancyVerbCodesHook\sphinxbreaksviaactive}%
   \else % end of conditional code for wrapping long code lines
-    \def\sphinx@FancyVerbFormatLine ##1{\hb@xt@\linewidth{\strut ##1\hss}}%
-    \let\FancyVerbCodes\@empty % only for clarity
+    \let\sphinx@FancyVerbFormatLine\sphinx@FancyVerbFormatLine@nowrap
   \fi
-  \renewcommand\FancyVerbFormatLine[1]{%
-      \expandafter\sphinx@verbatim@checkifhl
-      \expandafter{\the\numexpr\value{FancyVerbLine}-\spx@verbatim@linedelta}%
-      \ifin@
-         \edef\sphinx@restorefboxsep{\fboxsep\the\fboxsep\relax}%
-         \fboxsep\z@
-         \colorbox{VerbatimHighlightColor}%
-                  {\sphinx@restorefboxsep\sphinx@FancyVerbFormatLine{##1}}%
-      \else
-         \sphinx@FancyVerbFormatLine{##1}%
-      \fi
-      }%
-  % hook into this macro to recover the line numbering offset (default zero)
-  \expandafter\def\expandafter\FancyVerbCodes\expandafter{\FancyVerbCodes
-      \FV@SetLineNo
-      \edef\spx@verbatim@linedelta{\the\value{FancyVerbLine}}}%
+  \let\FancyVerbFormatLine\sphinxFancyVerbFormatLine
+  % hook into \FancyVerbCodes to recover at first code line the numbering offset
+  \expandafter\def\expandafter\FancyVerbCodes\expandafter
+      {\FancyVerbCodes\sphinx@FancyVerbCodesHook}%
   % go around fancyvrb's check of \@currenvir
   \let\VerbatimEnvironment\sphinxVerbatimEnvironment
   % go around fancyvrb's check of current list depth