Skip to content

Commit e830be3

Browse files
Update sphinx to the version used by RTD, and fix LaTeX output
LaTeX don't like mixing sphinxcode and href, which we did thanks to the extensions gh_tree and gh_blob. The easy workaround is to remove the code styling from the output of those.
1 parent 26dd602 commit e830be3

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ mock==1.0.1
55
mechanize==0.2.5
66

77
# Only for building documentation
8-
Sphinx==1.3.1
8+
Sphinx==1.5.3

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
# General information about the project.
4343
project = u'CMS'
44-
copyright = u'2013, The CMS development team'
44+
copyright = u'2017, The CMS development team'
4545

4646
# The version info for the project you're documenting, acts as replacement for
4747
# |version| and |release|, also used in various other places throughout the

docs/gh_links.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ def gh_tree(typ, rawtext, text, lineno, inliner, options={}, content=[]):
5050
full_url = 'https://github.com/cms-dev/cms/tree/v%s/%s' % (app.config.release, part)
5151

5252
refnode = nodes.reference(title, title, internal=False, refuri=full_url, **options)
53-
retnode = nodes.literal(role=typ.lower(), classes=[typ])
54-
retnode += refnode
55-
return [retnode], []
53+
return [refnode], []
5654
return gh_tree
5755

5856
def make_gh_blob(app):
@@ -64,9 +62,7 @@ def gh_blob(typ, rawtext, text, lineno, inliner, options={}, content=[]):
6462
full_url = 'https://github.com/cms-dev/cms/blob/v%s/%s' % (app.config.release, part)
6563

6664
refnode = nodes.reference(title, title, internal=False, refuri=full_url, **options)
67-
retnode = nodes.literal(role=typ.lower(), classes=[typ])
68-
retnode += refnode
69-
return [retnode], []
65+
return [refnode], []
7066
return gh_blob
7167

7268
def setup_roles(app):

0 commit comments

Comments
 (0)