IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Georg Brandl 2014-03-25 10:27:36 +01:00
commit 41580fc373
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -137,6 +137,7 @@ Bugs fixed
directive or currentclass directive. directive or currentclass directive.
* #1419: Generated i18n sphinx.js files are missing message catalog entries * #1419: Generated i18n sphinx.js files are missing message catalog entries
from '.js_t' and '.html'. The issue was introduced in Sphinx 1.1. 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 Documentation
------------- -------------

8
sphinx/highlighting.py
View File

@ -63,6 +63,12 @@ _LATEX_STYLES = r'''
\newcommand\PYGZcb{\char`\}} \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): class PygmentsBridge(object):
# Set these attributes if you want to have different Pygments formatters # Set these attributes if you want to have different Pygments formatters
@ -215,4 +221,4 @@ class PygmentsBridge(object):
if self.dest == 'html': if self.dest == 'html':
return formatter.get_style_defs('.highlight') return formatter.get_style_defs('.highlight')
else: else:
return formatter.get_style_defs() return formatter.get_style_defs() + _LATEX_ADD_STYLES

2
sphinx/texinputs/sphinx.sty
View File

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