IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2026-09-03 20:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.6

Browse Source
This commit is contained in:
Georg Brandl
2009-09-03 18:24:04 +02:00
parent 4b450726d6 65a8a4a6b2
commit 9fce647b14
8 changed files with 74 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+9
View File
@@ -38,6 +38,15 @@ Release 1.0 (in development)
Release 0.6.3 (in development) Release 0.6.3 (in development)
============================== ==============================
* #253: Ignore graphviz directives without content instead of
raising an unhandled exception.
* #241: Fix a crash building LaTeX output for documents that contain
a todolist directive.
* #252: Make it easier to change the build dir in the Makefiles
generated by quickstart.
* #220: Fix CSS so that displaymath really is centered. * #220: Fix CSS so that displaymath really is centered.
* #222: Allow the "Footnotes" header to be translated. * #222: Allow the "Footnotes" header to be translated.
EXAMPLES
+1
View File
@@ -78,6 +78,7 @@ included, please mail to `the Google group
* The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/ * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/
* TurboGears: http://turbogears.org/2.0/docs/ * TurboGears: http://turbogears.org/2.0/docs/
* VOR: http://www.vor-cycling.be/ * VOR: http://www.vor-cycling.be/
* WebFaction: http://docs.webfaction.com/
* Werkzeug: http://werkzeug.pocoo.org/documentation/dev/ * Werkzeug: http://werkzeug.pocoo.org/documentation/dev/
* WFront: http://discorporate.us/projects/WFront/ * WFront: http://discorporate.us/projects/WFront/
* WTForms: http://wtforms.simplecodes.com/docs/ * WTForms: http://wtforms.simplecodes.com/docs/
doc/markup/para.rst
+1 -1
View File
@@ -1,4 +1,4 @@
x.. highlight:: rest .. highlight:: rest
Paragraph-level markup Paragraph-level markup
---------------------- ----------------------
sphinx/builders/htmlhelp.py
+1
View File
@@ -138,6 +138,7 @@ chm_locales = {
'ru': (0x419, 'cp1251'), 'ru': (0x419, 'cp1251'),
'sl': (0x424, 'iso8859_2'), 'sl': (0x424, 'iso8859_2'),
'uk_UA': (0x422, 'cp1251'), 'uk_UA': (0x422, 'cp1251'),
'zh_CN': (0x804, 'cp936'),
'zh_TW': (0x404, 'cp950'), 'zh_TW': (0x404, 'cp950'),
} }
sphinx/ext/graphviz.py
+6 -1
View File
@@ -50,8 +50,13 @@ class Graphviz(Directive):
option_spec = {} option_spec = {}
def run(self): def run(self):
dotcode = '\n'.join(self.content)
if not dotcode.strip():
return [self.state_machine.reporter.warning(
'Ignoring "graphviz" directive without content.',
line=self.lineno)]
node = graphviz() node = graphviz()
node['code'] = '\n'.join(self.content) node['code'] = dotcode
node['options'] = [] node['options'] = []
return [node] return [node]
sphinx/ext/todo.py
+8 -3
View File
@@ -14,6 +14,7 @@
from docutils import nodes from docutils import nodes
from sphinx.environment import NoUri
from sphinx.util.compat import Directive, make_admonition from sphinx.util.compat import Directive, make_admonition
class todo_node(nodes.Admonition, nodes.Element): pass class todo_node(nodes.Admonition, nodes.Element): pass
@@ -104,9 +105,13 @@ def process_todo_nodes(app, doctree, fromdocname):
newnode = nodes.reference('', '') newnode = nodes.reference('', '')
innernode = nodes.emphasis(_('here'), _('here')) innernode = nodes.emphasis(_('here'), _('here'))
newnode['refdocname'] = todo_info['docname'] newnode['refdocname'] = todo_info['docname']
newnode['refuri'] = app.builder.get_relative_uri( try:
fromdocname, todo_info['docname']) newnode['refuri'] = app.builder.get_relative_uri(
newnode['refuri'] += '#' + todo_info['target']['refid'] fromdocname, todo_info['docname'])
newnode['refuri'] += '#' + todo_info['target']['refid']
except NoUri:
# ignore if no URI can be determined, e.g. for LaTeX output
pass
newnode.append(innernode) newnode.append(innernode)
para += newnode para += newnode
para += nodes.Text('.)', '.)') para += nodes.Text('.)', '.)')
sphinx/locale/it/LC_MESSAGES/sphinx.po
+1 -1
View File
@@ -460,7 +460,7 @@ msgstr "© Copyright %(copyright)s."
#: sphinx/themes/basic/layout.html:193 #: sphinx/themes/basic/layout.html:193
#, python-format #, python-format
msgid "Last updated on %(last_updated)s." msgid "Last updated on %(last_updated)s."
msgstr "Ultimo Aggiornamento on %(last_updated)s." msgstr "Ultimo aggiornamento %(last_updated)s."
#: sphinx/themes/basic/layout.html:196 #: sphinx/themes/basic/layout.html:196
#, python-format #, python-format
sphinx/quickstart.py
+47 -45
View File
@@ -262,11 +262,12 @@ MAKEFILE = '''\
SPHINXOPTS = SPHINXOPTS =
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
PAPER = PAPER =
BUILDDIR = %(rbuilddir)s
# Internal variables. # Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d %(rbuilddir)s/doctrees $(PAPEROPT_$(PAPER)) \ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) \
$(SPHINXOPTS) %(rsrcdir)s $(SPHINXOPTS) %(rsrcdir)s
.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes \ .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes \
@@ -289,42 +290,42 @@ help:
(if enabled)" (if enabled)"
clean: clean:
\t-rm -rf %(rbuilddir)s/* \t-rm -rf $(BUILDDIR)/*
html: html:
\t$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) %(rbuilddir)s/html \t$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
\t@echo \t@echo
\t@echo "Build finished. The HTML pages are in %(rbuilddir)s/html." \t@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml: dirhtml:
\t$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) %(rbuilddir)s/dirhtml \t$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
\t@echo \t@echo
\t@echo "Build finished. The HTML pages are in %(rbuilddir)s/dirhtml." \t@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
pickle: pickle:
\t$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) %(rbuilddir)s/pickle \t$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
\t@echo \t@echo
\t@echo "Build finished; now you can process the pickle files." \t@echo "Build finished; now you can process the pickle files."
json: json:
\t$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) %(rbuilddir)s/json \t$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
\t@echo \t@echo
\t@echo "Build finished; now you can process the JSON files." \t@echo "Build finished; now you can process the JSON files."
htmlhelp: htmlhelp:
\t$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) %(rbuilddir)s/htmlhelp \t$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
\t@echo \t@echo
\t@echo "Build finished; now you can run HTML Help Workshop with the" \\ \t@echo "Build finished; now you can run HTML Help Workshop with the" \\
\t ".hhp project file in %(rbuilddir)s/htmlhelp." \t ".hhp project file in $(BUILDDIR)/htmlhelp."
qthelp: qthelp:
\t$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) %(rbuilddir)s/qthelp \t$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
\t@echo \t@echo
\t@echo "Build finished; now you can run "qcollectiongenerator" with the" \\ \t@echo "Build finished; now you can run "qcollectiongenerator" with the" \\
\t ".qhcp project file in %(rbuilddir)s/qthelp, like this:" \t ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
\t@echo "# qcollectiongenerator %(rbuilddir)s/qthelp/%(project_fn)s.qhcp" \t@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/%(project_fn)s.qhcp"
\t@echo "To view the help file:" \t@echo "To view the help file:"
\t@echo "# assistant -collectionFile %(rbuilddir)s/qthelp/%(project_fn)s.qhc" \t@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/%(project_fn)s.qhc"
devhelp: devhelp:
\t$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) %(rbuilddir)s/devhelp \t$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) %(rbuilddir)s/devhelp
@@ -336,9 +337,9 @@ devhelp:
\t@echo "# devhelp" \t@echo "# devhelp"
latex: latex:
\t$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) %(rbuilddir)s/latex \t$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
\t@echo \t@echo
\t@echo "Build finished; the LaTeX files are in %(rbuilddir)s/latex." \t@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
\t@echo "Run \\`make all-pdf' or \\`make all-ps' in that directory to" \\ \t@echo "Run \\`make all-pdf' or \\`make all-ps' in that directory to" \\
\t "run these through (pdf)latex." \t "run these through (pdf)latex."
@@ -349,20 +350,20 @@ latexpdf: latex
\t@echo "pdflatex finished; the PDF files are in %(rbuilddir)s/latex." \t@echo "pdflatex finished; the PDF files are in %(rbuilddir)s/latex."
changes: changes:
\t$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) %(rbuilddir)s/changes \t$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
\t@echo \t@echo
\t@echo "The overview file is in %(rbuilddir)s/changes." \t@echo "The overview file is in $(BUILDDIR)/changes."
linkcheck: linkcheck:
\t$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) %(rbuilddir)s/linkcheck \t$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
\t@echo \t@echo
\t@echo "Link check complete; look for any errors in the above output " \\ \t@echo "Link check complete; look for any errors in the above output " \\
\t "or in %(rbuilddir)s/linkcheck/output.txt." \t "or in $(BUILDDIR)/linkcheck/output.txt."
doctest: doctest:
\t$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) %(rbuilddir)s/doctest \t$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
\t@echo "Testing of doctests in the sources finished, look at the " \\ \t@echo "Testing of doctests in the sources finished, look at the " \\
\t "results in %(rbuilddir)s/doctest/output.txt." \t "results in $(BUILDDIR)/doctest/output.txt."
''' '''
BATCHFILE = '''\ BATCHFILE = '''\
@@ -371,7 +372,8 @@ BATCHFILE = '''\
REM Command file for Sphinx documentation REM Command file for Sphinx documentation
set SPHINXBUILD=sphinx-build set SPHINXBUILD=sphinx-build
set ALLSPHINXOPTS=-d %(rbuilddir)s/doctrees %%SPHINXOPTS%% %(rsrcdir)s set BUILDDIR=%(rbuilddir)s
set ALLSPHINXOPTS=-d %%BUILDDIR%%/doctrees %%SPHINXOPTS%% %(rsrcdir)s
if NOT "%%PAPER%%" == "" ( if NOT "%%PAPER%%" == "" (
\tset ALLSPHINXOPTS=-D latex_paper_size=%%PAPER%% %%ALLSPHINXOPTS%% \tset ALLSPHINXOPTS=-D latex_paper_size=%%PAPER%% %%ALLSPHINXOPTS%%
) )
@@ -396,55 +398,55 @@ if "%%1" == "help" (
) )
if "%%1" == "clean" ( if "%%1" == "clean" (
\tfor /d %%%%i in (%(rbuilddir)s\*) do rmdir /q /s %%%%i \tfor /d %%%%i in (%%BUILDDIR%%\*) do rmdir /q /s %%%%i
\tdel /q /s %(rbuilddir)s\* \tdel /q /s %%BUILDDIR%%\*
\tgoto end \tgoto end
) )
if "%%1" == "html" ( if "%%1" == "html" (
\t%%SPHINXBUILD%% -b html %%ALLSPHINXOPTS%% %(rbuilddir)s/html \t%%SPHINXBUILD%% -b html %%ALLSPHINXOPTS%% %%BUILDDIR%%/html
\techo. \techo.
\techo.Build finished. The HTML pages are in %(rbuilddir)s/html. \techo.Build finished. The HTML pages are in %%BUILDDIR%%/html.
\tgoto end \tgoto end
) )
if "%%1" == "dirhtml" ( if "%%1" == "dirhtml" (
\t%%SPHINXBUILD%% -b dirhtml %%ALLSPHINXOPTS%% %(rbuilddir)s/dirhtml \t%%SPHINXBUILD%% -b dirhtml %%ALLSPHINXOPTS%% %%BUILDDIR%%/dirhtml
\techo. \techo.
\techo.Build finished. The HTML pages are in %(rbuilddir)s/dirhtml. \techo.Build finished. The HTML pages are in %%BUILDDIR%%/dirhtml.
\tgoto end \tgoto end
) )
if "%%1" == "pickle" ( if "%%1" == "pickle" (
\t%%SPHINXBUILD%% -b pickle %%ALLSPHINXOPTS%% %(rbuilddir)s/pickle \t%%SPHINXBUILD%% -b pickle %%ALLSPHINXOPTS%% %%BUILDDIR%%/pickle
\techo. \techo.
\techo.Build finished; now you can process the pickle files. \techo.Build finished; now you can process the pickle files.
\tgoto end \tgoto end
) )
if "%%1" == "json" ( if "%%1" == "json" (
\t%%SPHINXBUILD%% -b json %%ALLSPHINXOPTS%% %(rbuilddir)s/json \t%%SPHINXBUILD%% -b json %%ALLSPHINXOPTS%% %%BUILDDIR%%/json
\techo. \techo.
\techo.Build finished; now you can process the JSON files. \techo.Build finished; now you can process the JSON files.
\tgoto end \tgoto end
) )
if "%%1" == "htmlhelp" ( if "%%1" == "htmlhelp" (
\t%%SPHINXBUILD%% -b htmlhelp %%ALLSPHINXOPTS%% %(rbuilddir)s/htmlhelp \t%%SPHINXBUILD%% -b htmlhelp %%ALLSPHINXOPTS%% %%BUILDDIR%%/htmlhelp
\techo. \techo.
\techo.Build finished; now you can run HTML Help Workshop with the ^ \techo.Build finished; now you can run HTML Help Workshop with the ^
.hhp project file in %(rbuilddir)s/htmlhelp. .hhp project file in %%BUILDDIR%%/htmlhelp.
\tgoto end \tgoto end
) )
if "%%1" == "qthelp" ( if "%%1" == "qthelp" (
\t%%SPHINXBUILD%% -b qthelp %%ALLSPHINXOPTS%% %(rbuilddir)s/qthelp \t%%SPHINXBUILD%% -b qthelp %%ALLSPHINXOPTS%% %%BUILDDIR%%/qthelp
\techo. \techo.
\techo.Build finished; now you can run "qcollectiongenerator" with the ^ \techo.Build finished; now you can run "qcollectiongenerator" with the ^
.qhcp project file in %(rbuilddir)s/qthelp, like this: .qhcp project file in %%BUILDDIR%%/qthelp, like this:
\techo.^> qcollectiongenerator %(rbuilddir)s\\qthelp\\%(project_fn)s.qhcp \techo.^> qcollectiongenerator %%BUILDDIR%%\\qthelp\\%(project_fn)s.qhcp
\techo.To view the help file: \techo.To view the help file:
\techo.^> assistant -collectionFile %(rbuilddir)s\\qthelp\\%(project_fn)s.ghc \techo.^> assistant -collectionFile %%BUILDDIR%%\\qthelp\\%(project_fn)s.ghc
\tgoto end \tgoto end
) )
@@ -456,32 +458,32 @@ if "%%1" == "devhelp" (
) )
if "%%1" == "latex" ( if "%%1" == "latex" (
\t%%SPHINXBUILD%% -b latex %%ALLSPHINXOPTS%% %(rbuilddir)s/latex \t%%SPHINXBUILD%% -b latex %%ALLSPHINXOPTS%% %%BUILDDIR%%/latex
\techo. \techo.
\techo.Build finished; the LaTeX files are in %(rbuilddir)s/latex. \techo.Build finished; the LaTeX files are in %%BUILDDIR%%/latex.
\tgoto end \tgoto end
) )
if "%%1" == "changes" ( if "%%1" == "changes" (
\t%%SPHINXBUILD%% -b changes %%ALLSPHINXOPTS%% %(rbuilddir)s/changes \t%%SPHINXBUILD%% -b changes %%ALLSPHINXOPTS%% %%BUILDDIR%%/changes
\techo. \techo.
\techo.The overview file is in %(rbuilddir)s/changes. \techo.The overview file is in %%BUILDDIR%%/changes.
\tgoto end \tgoto end
) )
if "%%1" == "linkcheck" ( if "%%1" == "linkcheck" (
\t%%SPHINXBUILD%% -b linkcheck %%ALLSPHINXOPTS%% %(rbuilddir)s/linkcheck \t%%SPHINXBUILD%% -b linkcheck %%ALLSPHINXOPTS%% %%BUILDDIR%%/linkcheck
\techo. \techo.
\techo.Link check complete; look for any errors in the above output ^ \techo.Link check complete; look for any errors in the above output ^
or in %(rbuilddir)s/linkcheck/output.txt. or in %%BUILDDIR%%/linkcheck/output.txt.
\tgoto end \tgoto end
) )
if "%%1" == "doctest" ( if "%%1" == "doctest" (
\t%%SPHINXBUILD%% -b doctest %%ALLSPHINXOPTS%% %(rbuilddir)s/doctest \t%%SPHINXBUILD%% -b doctest %%ALLSPHINXOPTS%% %%BUILDDIR%%/doctest
\techo. \techo.
\techo.Testing of doctests in the sources finished, look at the ^ \techo.Testing of doctests in the sources finished, look at the ^
results in %(rbuilddir)s/doctest/output.txt. results in %%BUILDDIR%%/doctest/output.txt.
\tgoto end \tgoto end
) )