From 2b056e4bfac6a7a592b3d3e48a1f50f83f7c7b25 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 1 Jan 2010 23:41:30 +0100 Subject: Add Blender. --- EXAMPLES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/EXAMPLES b/EXAMPLES index 1bb38cbc..c08a2c12 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -9,6 +9,7 @@ included, please mail to `the Google group * Applied Mathematics at the Stellenbosch University: http://dip.sun.ac.za/ * APSW: http://apsw.googlecode.com/svn/publish/index.html * ASE: https://wiki.fysik.dtu.dk/ase/ +* Blender: http://www.blender.org/documentation/250PythonDoc/ * boostmpi: http://documen.tician.de/boostmpi/ * Calibre: http://calibre.kovidgoyal.net/user_manual/ * Chaco: http://code.enthought.com/projects/chaco/docs/html/ @@ -89,3 +90,5 @@ included, please mail to `the Google group * WTForms: http://wtforms.simplecodes.com/docs/ * Zope 3: e.g. http://docs.carduner.net/z3c-tutorial/ * zc.async: http://packages.python.org/zc.async/1.5.0/ + +.. XXX maybe regroup by interesting features used? -- cgit v1.2.1 From b380e340298756b2f70026340cd7f8f30439b419 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 1 Jan 2010 23:43:27 +0100 Subject: Add TOPS. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index c08a2c12..69b8aa2c 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -83,6 +83,7 @@ included, please mail to `the Google group * SymPy: http://docs.sympy.org/ * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/ * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/ +* Total Open Station: http://tops.berlios.de/ * TurboGears: http://turbogears.org/2.0/docs/ * VOR: http://www.vor-cycling.be/ * WebFaction: http://docs.webfaction.com/ -- cgit v1.2.1 From fa3e2fb9419e15458805c2c00bad741b7361ae02 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 1 Jan 2010 23:54:45 +0100 Subject: Correct info about jsmath_path if given relative. --- doc/ext/math.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ext/math.rst b/doc/ext/math.rst index a214b41e..c1602558 100644 --- a/doc/ext/math.rst +++ b/doc/ext/math.rst @@ -191,10 +191,10 @@ value: JSMath. There is no default. The path can be absolute or relative; if it is relative, it is relative to - the root of the built docs. + the ``_static`` directory of the built docs. For example, if you put JSMath into the static path of the Sphinx docs, this - value would be ``_static/jsMath/easy/load.js``. If you host more than one + value would be ``jsMath/easy/load.js``. If you host more than one Sphinx documentation set on one server, it is advisable to install jsMath in a shared location. -- cgit v1.2.1 From 07aae316cb05d3c8739a7b342389bb8853d7178e Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 2 Jan 2010 00:09:01 +0100 Subject: Direct posting to sphinx-dev is not possible anymore. --- doc/extensions.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/extensions.rst b/doc/extensions.rst index 5eb26c14..0716e485 100644 --- a/doc/extensions.rst +++ b/doc/extensions.rst @@ -60,8 +60,8 @@ There are several extensions that are not (yet) maintained in the Sphinx distribution. The `Wiki at BitBucket`_ maintains a list of those. If you write an extension that you think others will find useful, please write -to the project mailing list (sphinx-dev@googlegroups.com) and we'll find the -proper way of including or hosting it for the public. +to the project mailing list (`join here `_) +and we'll find the proper way of including or hosting it for the public. .. _Wiki at BitBucket: http://www.bitbucket.org/birkenfeld/sphinx/wiki/Home -- cgit v1.2.1 From 53f654442f0821830ca7e3014ed25921a604c48c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 2 Jan 2010 00:14:32 +0100 Subject: Add AGW. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index 69b8aa2c..ffae9069 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -6,6 +6,7 @@ experimenting with using it for their documentation. If you like to be included, please mail to `the Google group `_. +* Advanced Generic Widgets: http://xoomer.virgilio.it/infinity77/AGW_Docs/index.html * Applied Mathematics at the Stellenbosch University: http://dip.sun.ac.za/ * APSW: http://apsw.googlecode.com/svn/publish/index.html * ASE: https://wiki.fysik.dtu.dk/ase/ -- cgit v1.2.1 From e69271ac1c80fbd1394fec3edb8bb545b8c92efe Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 2 Jan 2010 00:30:42 +0100 Subject: IE apparently does not like href=""; change this to href="#" which appears to work. --- sphinx/builders/html.py | 3 ++- sphinx/environment.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index e2eda3fc..0f70932a 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -641,7 +641,8 @@ class StandaloneHTMLBuilder(Builder): baseuri=self.get_target_uri(pagename)): if not resource: otheruri = self.get_target_uri(otheruri) - return relative_uri(baseuri, otheruri) + uri = relative_uri(baseuri, otheruri) or '#' + return uri ctx['pathto'] = pathto ctx['hasdoc'] = lambda name: name in self.env.all_docs ctx['customsidebar'] = self.config.html_sidebars.get(pagename) diff --git a/sphinx/environment.py b/sphinx/environment.py index 95595dd5..83c97d5f 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -930,7 +930,7 @@ class BuildEnvironment: """Return a TOC nodetree -- for use on the same page only!""" toc = self.tocs[docname].deepcopy() for node in toc.traverse(nodes.reference): - node['refuri'] = node['anchorname'] + node['refuri'] = node['anchorname'] or '#' return toc def get_toctree_for(self, docname, builder, collapse): -- cgit v1.2.1 From c8a7702905889677b41326fb87c084f5fef33ac5 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 2 Jan 2010 00:39:55 +0100 Subject: #285: make the ``locale_dirs`` config value work again. --- CHANGES | 2 ++ sphinx/builders/__init__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index e01f480f..cace9d01 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ Release 0.6.4 (in development) ============================== +* #285: make the ``locale_dirs`` config value work again. + * #303: ``html_context`` values given on the command line via ``-A`` should not override other values given in conf.py. diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index dc4a64de..5d75a886 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -186,7 +186,7 @@ class Builder(object): if self.translator is None: self.translator = trans else: - self.translator._catalog.update(trans.catalog) + self.translator._catalog.update(trans._catalog) except Exception: # Language couldn't be found in the specified path pass -- cgit v1.2.1 From 33c21bf483282d39028b380822a61a76f3f62d4c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 2 Jan 2010 00:47:57 +0100 Subject: #293: line blocks are styled properly in HTML output. --- CHANGES | 2 ++ sphinx/themes/basic/static/basic.css | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/CHANGES b/CHANGES index cace9d01..9a6a5e45 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ Release 0.6.4 (in development) ============================== +* #293: line blocks are styled properly in HTML output. + * #285: make the ``locale_dirs`` config value work again. * #303: ``html_context`` values given on the command line via ``-A`` diff --git a/sphinx/themes/basic/static/basic.css b/sphinx/themes/basic/static/basic.css index 64964c98..a04d6545 100644 --- a/sphinx/themes/basic/static/basic.css +++ b/sphinx/themes/basic/static/basic.css @@ -332,6 +332,18 @@ dl.glossary dt { background-color: #ffa } +.line-block { + display: block; + margin-top: 1em; + margin-bottom: 1em; +} + +.line-block .line-block { + margin-top: 0; + margin-bottom: 0; + margin-left: 1.5em; +} + /* -- code displays --------------------------------------------------------- */ pre { -- cgit v1.2.1