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 0.6

Browse Source
This commit is contained in:
Georg Brandl 2010-01-17 14:19:44 +01:00
commit b5b4e372bc
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -76,6 +76,12 @@ Release 1.0 (in development)
* Added ``htmltitle`` block in layout template. * Added ``htmltitle`` block in layout template.
Release 0.6.5 (in development)
==============================
* #321: Fix link generation in the LaTeX builder.
Release 0.6.4 (Jan 12, 2010) Release 0.6.4 (Jan 12, 2010)
============================ ============================

12
sphinx/themes/default/static/default.css_t
View File

@ -210,6 +210,18 @@ div.admonition p.admonition-title + p {
display: inline; display: inline;
} }
div.admonition p {
margin-bottom: 5px;
}
div.admonition pre {
margin-bottom: 5px;
}
div.admonition ul, div.admonition ol {
margin-bottom: 5px;
}
div.note { div.note {
background-color: #eee; background-color: #eee;
border: 1px solid #ccc; border: 1px solid #ccc;

6
sphinx/writers/latex.py
View File

@ -1045,13 +1045,15 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append('\\href{%s}{' % self.encode_uri(uri)) self.body.append('\\href{%s}{' % self.encode_uri(uri))
self.context.append('}') self.context.append('}')
elif uri.startswith('#'): elif uri.startswith('#'):
self.body.append('\\hyperlink{%s}{' % uri[1:]) # references to labels
self.body.append('\\hyperlink{%s}{' % self.idescape(uri[1:]))
self.context.append('}') self.context.append('}')
elif uri.startswith('%'): elif uri.startswith('%'):
# references to documents or labels inside documents
hashindex = uri.find('#') hashindex = uri.find('#')
targetname = (hashindex == -1) and '--doc-' + uri[1:] \ targetname = (hashindex == -1) and '--doc-' + uri[1:] \
or uri[hashindex+1:] or uri[hashindex+1:]
self.body.append('\\hyperlink{%s}{' % targetname) self.body.append('\\hyperlink{%s}{' % self.idescape(targetname))
self.context.append('}') self.context.append('}')
elif uri.startswith('@token'): elif uri.startswith('@token'):
if self.in_production_list: if self.in_production_list: