Commits

Georg Brandl committed 97c609e Merge

merge with stable

  • Participants
  • Parent commits 7fc532c, 92577b1

Comments (0)

Files changed (3)

   directive or currentclass directive.
 * #1419: Generated i18n sphinx.js files are missing message catalog entries
   from '.js_t' and '.html'. The issue was introduced in Sphinx 1.1.
+* #636: Keep straight single quotes in literal blocks in the LaTeX build.
 
 Documentation
 -------------

sphinx/highlighting.py

 \newcommand\PYGZcb{\char`\}}
 '''
 
+# used if Pygments is available
+# use textcomp quote to get a true single quote
+_LATEX_ADD_STYLES = r'''
+\renewcommand\PYGZsq{\textquotesingle}
+'''
+
 
 class PygmentsBridge(object):
     # Set these attributes if you want to have different Pygments formatters
         if self.dest == 'html':
             return formatter.get_style_defs('.highlight')
         else:
-            return formatter.get_style_defs()
+            return formatter.get_style_defs() + _LATEX_ADD_STYLES

sphinx/texinputs/sphinx.sty

 \RequirePackage{parskip}
 % For parsed-literal blocks.
 \RequirePackage{alltt}
+% Display "real" single quotes in literal blocks.
+\RequirePackage{upquote}
 
 % Redefine these colors to your liking in the preamble.
 \definecolor{TitleColor}{rgb}{0.126,0.263,0.361}