From 015a6338637cd0ee19c1d05ffdd762b49c0ba8f3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 26 Oct 2009 18:54:16 +0100 Subject: [PATCH 01/20] Do link to self. --- sphinx/environment.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/sphinx/environment.py b/sphinx/environment.py index d04fcbf9b..d4f16819b 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -1288,9 +1288,6 @@ class BuildEnvironment: 'missing-reference', self, node, contnode) if not newnode: newnode = contnode - elif docname == fromdocname: - # don't link to self - newnode = contnode else: newnode = nodes.reference('', '') newnode['refuri'] = builder.get_relative_uri( From 39a9330fc08048823b28ce226631015410bed55e Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 27 Oct 2009 20:03:48 +0100 Subject: [PATCH 02/20] Fix autosummary_generate docs; a boolean value is supported only as of trunk. --- doc/ext/autosummary.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/ext/autosummary.rst b/doc/ext/autosummary.rst index f270a67b6..1c4ae3da9 100644 --- a/doc/ext/autosummary.rst +++ b/doc/ext/autosummary.rst @@ -130,10 +130,7 @@ also use this new config value: .. confval:: autosummary_generate - Boolean indicating whether to scan all found documents for autosummary - directives, and to generate stub pages for each. - - Can also be a list of documents for which stub pages should be generated. + A list of documents for which stub pages should be generated. The new files will be placed in the directories specified in the ``:toctree:`` options of the directives. From 4652c53a82772b1bd70b7061d69f1df611e16c82 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 10:18:35 +0100 Subject: [PATCH 03/20] Add examples for graph options. --- doc/ext/inheritance.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/ext/inheritance.rst b/doc/ext/inheritance.rst index fe6d636d3..72849e05a 100644 --- a/doc/ext/inheritance.rst +++ b/doc/ext/inheritance.rst @@ -37,10 +37,20 @@ New config values are: A dictionary of graphviz graph attributes for inheritance diagrams. + For example:: + + inheritance_graph_attrs = dict(rankdir="LR", size='"6.0, 8.0"', + fontsize=14, ratio='compress') + .. confval:: inheritance_node_attrs A dictionary of graphviz node attributes for inheritance diagrams. + For example:: + + inheritance_node_attrs = dict(shape='ellipse', fontsize=14, height=0.75, + color='dodgerblue1', style='filled') + .. confval:: inheritance_edge_attrs A dictionary of graphviz edge attributes for inheritance diagrams. From bb1a50158cbcf9838458ac38503ac537fc777c23 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 15:10:33 +0100 Subject: [PATCH 04/20] Add Kaa. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index 07f1cd250..9d41f6952 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -24,6 +24,7 @@ included, please mail to `the Google group * Hedge: http://documen.tician.de/hedge/ * IFM: http://fluffybunny.memebot.com/ifm-docs/index.html * Jinja: http://jinja.pocoo.org/2/documentation/ +* Kaa: http://doc.freevo.org/api/kaa/ * LEPL: http://www.acooke.org/lepl/ * MapServer: http://mapserver.org/ * Matplotlib: http://matplotlib.sourceforge.net/ From abbf78915e8151ee80e0791950e50d6f96928413 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 16:07:56 +0100 Subject: [PATCH 05/20] #275: Update Dutch translations. --- sphinx/locale/nl/LC_MESSAGES/sphinx.js | 2 +- sphinx/locale/nl/LC_MESSAGES/sphinx.mo | Bin 7074 -> 8159 bytes sphinx/locale/nl/LC_MESSAGES/sphinx.po | 191 +++++++++++++------------ 3 files changed, 97 insertions(+), 96 deletions(-) diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.js b/sphinx/locale/nl/LC_MESSAGES/sphinx.js index 2dafd39f1..7a7a821a0 100644 --- a/sphinx/locale/nl/LC_MESSAGES/sphinx.js +++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.js @@ -1 +1 @@ -Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"module, in ": "module", "Preparing search...": "Het zoeken wordt voorbereid", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woordencorrect gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": "", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "Hide Search Matches": "Zoekresultaten verbergen", "Search Results": "Zoekresultaten"}}); \ No newline at end of file +Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woorden correct gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": ", in ", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module, in", "Hide Search Matches": "Zoekresultaten verbergen"}}); \ No newline at end of file diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.mo b/sphinx/locale/nl/LC_MESSAGES/sphinx.mo index 50cef9c1f0f95f06216b2c5917813e9b2167576c..b9be8617d9f7aee9eb943e340f9fc9b5c9dc7f25 100644 GIT binary patch delta 3367 zcmY+^4QyRy9mnyf>*~60W25Y?-NqhD>LhfRPM7Y5*(!T=jJ451KqTAQy-(Y--h0mV zoO5rx5x8bTU~JBq!-ykGL=v;G85Aptn88etKom1$@MRJ;#4JVwMtq4eBKZBCdp6_J z^>fa1&htF~|Nr@)KE2_0Lyg~d&OT}QcZB~d`QJBNcmMmhrQMkM+e zZ>S93!#UVNRGQa`>+vI~K<+~&GL2gA%Q%du@I&}VWC`;ZT*3b4-&}0KWzP zQ*~=GW*=(7{p_v)rue1IAI4dDD!)ICI=yeB=0A^G?*b~&S90G(&3_jgH*nE*P4leQ zp!VF5-*3zBM^O=bs3R%o_Ya~rJc_JkPM|7x8Wq4dQ1iZp>aFjiD)dX#K7YN2`jfo* zfPvd^9v!2|_98>(0N#k7M@=}1D&fAjx@j5E7 z2XPgq4KDaG&+$tey^Jc=MN~JxjoPrSv$@ei)R`_uE!d6v9D7ie*^XLgPyYOFRDkVQL;1xKBv^9{RhrYN7r%%4j4q%8xrAS#DSwYzutqux=m;v1M^W#cLv8Rp zl7o2(`7uA`myY5xGQVN|&V`z%g%(xh3sHfrKs8Grs#H5s3%T4W)cZ&C`;(}^&!9GX z8L!7*q2~V+)muyWl$6j-IH2!;D;KL7IE;JnNmNFEKrQqRs?@XitD}rMa2sBi-`|Z| z&_lgu zTta2`CNHa`|3U@aPTBN#VHNUWzzGrQ!u8 zTlNEI!)oG(!L7D8p1Ec2ms%DFi67Kl$%cUq+;n2A-ndI&=y9_1SC#4UN@;qL#FQS8)ZiJ&MA}>wx?qyG2^OAJIg5?c6<(JFWt0iH@OZ=i&E+4wG`A<_rqFDwbQc;{kA@>mCj#udBLW&{TtWz57>`>Y;*tm^!-JvM%Jxk z$gUgM+&^%0|GNJEjy+zStR0QKATE1J7;Uz9c#(fFuytx%BGS(~XSYxZZ9d_;$ z;}y>@7ifj_&TG%lTHld=bI!)}_Rh3zGV7GrIxo{HVYL)_#fc5r#7k|(b zR>!@%Gk3YD9+t;xz^c`S<7G9WA9(4`C66?AIyYtyhi+0msN>>s;CYoSUB`k~8Zyg+ z{vOLal3v^q))I49=(1J}%r3UhVybD8E1ky@r7(=Ng$oMSW*fR-QduTZ!;MYxl*qHT zAjt{pPN!SsOaqt682b zQ|8l&RA5cK*Oq)|D=M*iu=&yfSND=659u%+M-G8cTuCjCm5<{X)RZ1C5o{C}C+HB; zOMkXxTZ=cdZ0Sf#df&2xgP-Kntvi<9?bW@{#Kp+3a>|we4>=6HGUx3lS;sreYM#my zr0vUBwH6A6ncn5CEiGYsQ&;cx`LS+uhp!x?8TG4XR0U_oMAyC+o4(rh*2=2~ufDCT bv#w4E(`UMGY*nLN?A|t8A4fWW#S{MpuPA63 delta 2228 zcmYM!Z%oxy9LMo<<%0a_V)Fn0y=K4zz+D8nfFxiS5r;y0oy)0kH!qBaUcF$;KY49q z(VEEIPdBPLOCQuodP20uoVMk%ja6)AD_vyigWSZeC)wtc-XAzycbEG*=lsr}@A>}D z;rHe%f%rm(`=a4en$7f5HO%3-d66Xw+VWb?8Sg z_G2@SqBd|Fv++AjF>!W4fjP_~Zo+?TeM9PU#G8;!nNHNe5Z2;rr~ob_L(D98;Vn$U zETX4q3b7E&PyuX4ZFnnsSl{$eP~?Yj1-@nLBj~0+fm+}aYJ!hZflOJyMvea!*We;5 z^{dFcQt#zQ^-5cBLIu`=aiuzB8~RWS9!0&Y*HM`nvCqd)XJi7k^BLr8=J{bw^BZo) zN2q`*nIs)sa4mMB`VXNpbjCyemD*7nG{HEk{(heS?~R9`y?Epys(3r=aWf0F{y?!q)>2YCtwBWd*3`<){GHSp&$| zwD6-$yn^a?2=j3m6~H+>>EhL)=F7@h4kW&Yf&wTiF_ZU2u{D9?7!FK&7}8wbKA)eY<^+D8*2T=WnP}lhkR$y8I`PYL0c~@jX z)XrW-vTEK$9l{H?{t0TKo2UimP=|0Hwb0L4iuX|)NFr?t+=Dul*{D}jf_m<6unz*Z zp#_!VcGRKTW804*Uvr8dEi_T+G$w!R5}uW8&+?{s7qH~MR;*4O&{_0%i;d{R5ZL&H^}SorYJV0bth zYxHf|-P!5e(Yn3O*VMMXwWG78H5lC4wriL3MdtMtHK|Tha=mjc%W?K*|KL1Hx#TS7 z{F^u&?u!gMEAvL(TcXE?oxAx#S9IE2(Cu=L7xp@7t6p~UiwdU$MF}ofm$R|Bv|wp~ v2}VvteBI&xfx}@F8aQG?(SuRvba9WfQ2YlS@0F}gh{Pg}%NumMz2pA@L?Z77 diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.po b/sphinx/locale/nl/LC_MESSAGES/sphinx.po index 1b21566fa..a522d75d9 100644 --- a/sphinx/locale/nl/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.po @@ -6,42 +6,49 @@ msgid "" msgstr "" "Project-Id-Version: Sphinx 0.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2008-09-11 23:58+0200\n" -"PO-Revision-Date: 2009-08-06 22:48+0200\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2009-08-06 23:04+0200\n" +"PO-Revision-Date: 2009-11-03 15:55+0100\n" +"Last-Translator: Marijn van der Zee \n" "Language-Team: nl \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Generated-By: Babel 0.9.4\n" -#: sphinx/environment.py:103 sphinx/writers/latex.py:182 +#: sphinx/environment.py:103 +#: sphinx/writers/latex.py:184 #, python-format msgid "%B %d, %Y" msgstr "%d. %B %Y" -#: sphinx/environment.py:324 sphinx/themes/basic/genindex-single.html:2 +#: sphinx/environment.py:324 +#: sphinx/themes/basic/genindex-single.html:2 #: sphinx/themes/basic/genindex-split.html:2 #: sphinx/themes/basic/genindex-split.html:5 -#: sphinx/themes/basic/genindex.html:2 sphinx/themes/basic/genindex.html:5 -#: sphinx/themes/basic/genindex.html:48 sphinx/themes/basic/layout.html:131 -#: sphinx/writers/latex.py:188 +#: sphinx/themes/basic/genindex.html:2 +#: sphinx/themes/basic/genindex.html:5 +#: sphinx/themes/basic/genindex.html:48 +#: sphinx/themes/basic/layout.html:134 +#: sphinx/writers/latex.py:190 msgid "Index" msgstr "Index" -#: sphinx/environment.py:325 sphinx/writers/latex.py:187 +#: sphinx/environment.py:325 +#: sphinx/writers/latex.py:189 msgid "Module Index" msgstr "Module-index" -#: sphinx/environment.py:326 sphinx/themes/basic/defindex.html:16 +#: sphinx/environment.py:326 +#: sphinx/themes/basic/defindex.html:16 msgid "Search Page" msgstr "Zoekpagina" -#: sphinx/roles.py:55 sphinx/directives/desc.py:747 +#: sphinx/roles.py:55 +#: sphinx/directives/desc.py:747 #, python-format msgid "environment variable; %s" -msgstr "Omgevingsvariabele; %s" +msgstr "omgevingsvariabele; %s" #: sphinx/roles.py:62 #, python-format @@ -56,34 +63,38 @@ msgstr "Builtins" msgid "Module level" msgstr "Moduleniveau" -#: sphinx/builders/html.py:205 +#: sphinx/builders/html.py:222 #, python-format msgid "%b %d, %Y" msgstr "%d.%b.%Y" -#: sphinx/builders/html.py:224 sphinx/themes/basic/defindex.html:21 +#: sphinx/builders/html.py:241 +#: sphinx/themes/basic/defindex.html:21 msgid "General Index" msgstr "Algemene index" -#: sphinx/builders/html.py:224 +#: sphinx/builders/html.py:241 msgid "index" msgstr "Index" -#: sphinx/builders/html.py:226 sphinx/builders/htmlhelp.py:219 -#: sphinx/builders/qthelp.py:133 sphinx/themes/basic/defindex.html:19 -#: sphinx/themes/basic/modindex.html:2 sphinx/themes/basic/modindex.html:13 +#: sphinx/builders/html.py:243 +#: sphinx/builders/htmlhelp.py:219 +#: sphinx/builders/qthelp.py:133 +#: sphinx/themes/basic/defindex.html:19 +#: sphinx/themes/basic/modindex.html:2 +#: sphinx/themes/basic/modindex.html:13 msgid "Global Module Index" msgstr "Globale Module-index" -#: sphinx/builders/html.py:227 +#: sphinx/builders/html.py:244 msgid "modules" msgstr "modules" -#: sphinx/builders/html.py:281 +#: sphinx/builders/html.py:300 msgid "next" msgstr "volgende" -#: sphinx/builders/html.py:290 +#: sphinx/builders/html.py:309 msgid "previous" msgstr "vorige" @@ -108,9 +119,8 @@ msgid "Return type" msgstr "Return type" #: sphinx/directives/desc.py:186 -#, fuzzy msgid "Parameter" -msgstr "Parameters" +msgstr "Parameter" #: sphinx/directives/desc.py:190 msgid "Parameters" @@ -121,7 +131,8 @@ msgstr "Parameters" msgid "%s() (built-in function)" msgstr "%s() (geïntegreerde functie)" -#: sphinx/directives/desc.py:419 sphinx/directives/desc.py:476 +#: sphinx/directives/desc.py:419 +#: sphinx/directives/desc.py:476 #: sphinx/directives/desc.py:488 #, python-format msgid "%s() (in module %s)" @@ -132,15 +143,16 @@ msgstr "%s() (in module %s)" msgid "%s (built-in variable)" msgstr "%s (geïntegreerde variabele)" -#: sphinx/directives/desc.py:423 sphinx/directives/desc.py:514 +#: sphinx/directives/desc.py:423 +#: sphinx/directives/desc.py:514 #, python-format msgid "%s (in module %s)" msgstr "%s (in module %s)" #: sphinx/directives/desc.py:439 -#, fuzzy, python-format +#, python-format msgid "%s (built-in class)" -msgstr "%s (geïntegreerde variabele)" +msgstr "%s (geïntegreerde klasse)" #: sphinx/directives/desc.py:440 #, python-format @@ -203,57 +215,57 @@ msgid "%s (C variable)" msgstr "%s (C-variabele)" #: sphinx/directives/desc.py:665 -#, fuzzy, python-format +#, python-format msgid "%scommand line option; %s" -msgstr "%scommandolijn optie; %s" +msgstr "%sopdrachtregel optie; %s" -#: sphinx/directives/other.py:138 +#: sphinx/directives/other.py:140 msgid "Platforms: " msgstr "Platformen: " -#: sphinx/directives/other.py:144 +#: sphinx/directives/other.py:146 #, python-format msgid "%s (module)" msgstr "%s (module)" -#: sphinx/directives/other.py:193 +#: sphinx/directives/other.py:195 msgid "Section author: " msgstr "Auteur van deze sectie: " -#: sphinx/directives/other.py:195 +#: sphinx/directives/other.py:197 msgid "Module author: " msgstr "Auteur van deze module: " -#: sphinx/directives/other.py:197 +#: sphinx/directives/other.py:199 msgid "Author: " msgstr "Auteur: " -#: sphinx/directives/other.py:317 +#: sphinx/directives/other.py:319 msgid "See also" msgstr "Zie ook" -#: sphinx/ext/autodoc.py:883 +#: sphinx/ext/autodoc.py:889 #, python-format msgid " Bases: %s" msgstr "" -#: sphinx/ext/autodoc.py:916 +#: sphinx/ext/autodoc.py:922 #, python-format msgid "alias of :class:`%s`" msgstr "" #: sphinx/ext/todo.py:41 msgid "Todo" -msgstr "" +msgstr "Te doen" #: sphinx/ext/todo.py:99 #, python-format msgid "(The original entry is located in %s, line %d and can be found " -msgstr "" +msgstr "(Het originele item is te vinden in %s, regel %d en kan gevonden worden hier" #: sphinx/ext/todo.py:105 msgid "here" -msgstr "" +msgstr "hier" #: sphinx/locale/__init__.py:15 msgid "Attention" @@ -285,7 +297,7 @@ msgstr "Notitie" #: sphinx/locale/__init__.py:22 msgid "See Also" -msgstr "Zie Ook" +msgstr "Zie ook" #: sphinx/locale/__init__.py:23 msgid "Tip" @@ -348,7 +360,7 @@ msgstr "Indices en tabellen:" #: sphinx/themes/basic/defindex.html:14 msgid "Complete Table of Contents" -msgstr "Volledige inhoudstafel" +msgstr "Volledige inhoudsopgave" #: sphinx/themes/basic/defindex.html:15 msgid "lists all sections and subsections" @@ -392,7 +404,7 @@ msgstr "Navigatie" #: sphinx/themes/basic/layout.html:42 msgid "Table Of Contents" -msgstr "Inhoudstafel" +msgstr "Inhoudsopgave" #: sphinx/themes/basic/layout.html:48 msgid "Previous topic" @@ -412,7 +424,7 @@ msgstr "volgend hoofdstuk" #: sphinx/themes/basic/layout.html:60 msgid "This Page" -msgstr "Deze Pagina" +msgstr "Deze pagina" #: sphinx/themes/basic/layout.html:63 msgid "Show Source" @@ -424,54 +436,50 @@ msgstr "Snel zoeken" #: sphinx/themes/basic/layout.html:76 msgid "Go" -msgstr "Go" +msgstr "Ga" #: sphinx/themes/basic/layout.html:81 -#, fuzzy msgid "Enter search terms or a module, class or function name." -msgstr "Geef de naam van een module, klasse of functie." +msgstr "Geef zoekterm of de naam van een module, klasse of functie." -#: sphinx/themes/basic/layout.html:119 +#: sphinx/themes/basic/layout.html:122 #, python-format msgid "Search within %(docstitle)s" msgstr "Zoeken in %(docstitle)s" -#: sphinx/themes/basic/layout.html:128 +#: sphinx/themes/basic/layout.html:131 msgid "About these documents" msgstr "Over deze documenten" -#: sphinx/themes/basic/layout.html:134 sphinx/themes/basic/search.html:2 +#: sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/search.html:2 #: sphinx/themes/basic/search.html:5 msgid "Search" msgstr "Zoeken" -#: sphinx/themes/basic/layout.html:137 +#: sphinx/themes/basic/layout.html:140 msgid "Copyright" msgstr "Copyright" -#: sphinx/themes/basic/layout.html:183 +#: sphinx/themes/basic/layout.html:187 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/themes/basic/layout.html:185 +#: sphinx/themes/basic/layout.html:189 #, python-format msgid "© Copyright %(copyright)s." msgstr "© Copyright %(copyright)s." -#: sphinx/themes/basic/layout.html:188 +#: sphinx/themes/basic/layout.html:193 #, python-format msgid "Last updated on %(last_updated)s." msgstr "Laatste aanpassing op %(last_updated)s." -#: sphinx/themes/basic/layout.html:191 +#: sphinx/themes/basic/layout.html:196 #, python-format -msgid "" -"Created using Sphinx " -"%(sphinx_version)s." -msgstr "" -"Aangemaakt met Sphinx " -"%(sphinx_version)s." +msgid "Created using Sphinx %(sphinx_version)s." +msgstr "Aangemaakt met Sphinx %(sphinx_version)s." #: sphinx/themes/basic/modindex.html:36 msgid "Deprecated" @@ -486,10 +494,9 @@ msgstr "Zoeken %(docstitle)s" msgid "" "Please activate JavaScript to enable the search\n" " functionality." -msgstr "" +msgstr "Activeer JavaSscript om de zoekfunctionaliteit in te schakelen." #: sphinx/themes/basic/search.html:14 -#, fuzzy msgid "" "From here you can search these documents. Enter your search\n" " words into the box below and click \"search\". Note that the search\n" @@ -497,10 +504,8 @@ msgid "" " containing fewer words won't appear in the result list." msgstr "" "Hier kan u de documenten doorzoeken. Geef enkele trefwoorden\n" -" in het veld hieronder en klik \"zoeken\". Merk op dat de zoekfunctie" -"\n" -" steeds naar alle woorden zoekt. Pagina's die minder woorden bevatten" -"\n" +" in het veld hieronder en klik \"zoeken\". Merk op dat de zoekfunctie\n" +" steeds naar alle woorden zoekt. Pagina's die minder woorden bevatten\n" " zullen niet tussen de resultaten verschijnen." #: sphinx/themes/basic/search.html:21 @@ -508,7 +513,7 @@ msgid "search" msgstr "zoeken" #: sphinx/themes/basic/search.html:25 -#: sphinx/themes/basic/static/searchtools.js:453 +#: sphinx/themes/basic/static/searchtools.js:462 msgid "Search Results" msgstr "Zoekresultaten" @@ -544,12 +549,14 @@ msgstr "Veranderingen in de C-API" msgid "Other changes" msgstr "Andere veranderingen" -#: sphinx/themes/basic/static/doctools.js:139 sphinx/writers/html.py:473 +#: sphinx/themes/basic/static/doctools.js:139 +#: sphinx/writers/html.py:473 #: sphinx/writers/html.py:478 msgid "Permalink to this headline" msgstr "Permanente link naar deze titel" -#: sphinx/themes/basic/static/doctools.js:145 sphinx/writers/html.py:80 +#: sphinx/themes/basic/static/doctools.js:145 +#: sphinx/writers/html.py:80 msgid "Permalink to this definition" msgstr "Permanente link naar deze definitie" @@ -563,46 +570,40 @@ msgstr "Zoeken" #: sphinx/themes/basic/static/searchtools.js:279 msgid "Preparing search..." -msgstr "Het zoeken wordt voorbereid" - -#: sphinx/themes/basic/static/searchtools.js:338 -#, fuzzy -msgid "module, in " -msgstr "module" +msgstr "Het zoeken wordt voorbereid..." #: sphinx/themes/basic/static/searchtools.js:347 +msgid "module, in " +msgstr "module, in" + +#: sphinx/themes/basic/static/searchtools.js:356 msgid ", in " -msgstr "" +msgstr ", in " -#: sphinx/themes/basic/static/searchtools.js:455 -msgid "" -"Your search did not match any documents. Please make sure that all words " -"are spelled correctly and that you've selected enough categories." -msgstr "" -"Uw zoekopdracht leverde geen resultaten op. Controleer of alle " -"woordencorrect gespeld zijn en dat u genoeg categoriën hebt geselecteerd." +#: sphinx/themes/basic/static/searchtools.js:464 +msgid "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories." +msgstr "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woorden correct gespeld zijn en dat u genoeg categoriën hebt geselecteerd." -#: sphinx/themes/basic/static/searchtools.js:457 +#: sphinx/themes/basic/static/searchtools.js:466 #, python-format msgid "Search finished, found %s page(s) matching the search query." msgstr "Zoeken voltooid, %s pagina(s) gevonden." -#: sphinx/writers/latex.py:185 +#: sphinx/writers/latex.py:187 msgid "Release" msgstr "Release" -#: sphinx/writers/latex.py:571 +#: sphinx/writers/latex.py:578 msgid "Footnotes" -msgstr "" +msgstr "Voetnoten" -#: sphinx/writers/latex.py:639 +#: sphinx/writers/latex.py:646 msgid "continued from previous page" -msgstr "" +msgstr "Vervolgd van vorige pagina" -#: sphinx/writers/latex.py:644 -#, fuzzy +#: sphinx/writers/latex.py:651 msgid "Continued on next page" -msgstr "Volledige index op een pagina" +msgstr "Vervolgd op volgende pagina" #: sphinx/writers/text.py:166 #, python-format From dd500ce6fba731671d480e33f7c3ea04d3f4dc46 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 16:21:02 +0100 Subject: [PATCH 06/20] Catch OSError in copyfile(); os.utime() raises that. --- CHANGES | 2 ++ sphinx/util/__init__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index bb6076d08..8e070c1e3 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,8 @@ Release 0.6.4 (in development) * Fix the handling of non-data, but non-method descriptors in autodoc. +* When copying file times, ignore OSErrors raised by ``os.utime()``. + Release 0.6.3 (Sep 03, 2009) ============================ diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py index ec7f164fa..257143266 100644 --- a/sphinx/util/__init__.py +++ b/sphinx/util/__init__.py @@ -414,7 +414,7 @@ def copyfile(source, dest): try: # don't do full copystat because the source may be read-only copytimes(source, dest) - except shutil.Error: + except OSError: pass From 360bcbcfbb5befcac57f0fa5199200e3c6e22773 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 16:34:38 +0100 Subject: [PATCH 07/20] Add http://dip.sun.ac.za/. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index 9d41f6952..818ce8b4d 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 `_. +* Applied Mathematics at the Stellenbosch University: http://dip.sun.ac.za/ * APSW: http://apsw.googlecode.com/svn/publish/index.html * boostmpi: http://documen.tician.de/boostmpi/ * Calibre: http://calibre.kovidgoyal.net/user_manual/ From adad88b42915215bddbbeff720a536ab53f3373d Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 16:54:06 +0100 Subject: [PATCH 08/20] Add notes on rst2pdf pdf builder. --- doc/builders.rst | 5 +++++ doc/faq.rst | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/doc/builders.rst b/doc/builders.rst index bee0094c6..9050eec94 100644 --- a/doc/builders.rst +++ b/doc/builders.rst @@ -65,6 +65,11 @@ The builder's "name" must be given to the **-b** command-line option of Its name is ``latex``. +Note that a direct PDF builder using ReportLab is available in `rst2pdf +`_ version 0.12 or greater. You need to add +``'rst2pdf.pdfbuilder'`` to your :confval:`extensions` to enable it, its name is +``pdf``. + .. module:: sphinx.builders.text .. class:: TextBuilder diff --git a/doc/faq.rst b/doc/faq.rst index a724ddcaf..ed45613bd 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -9,6 +9,11 @@ suggest new entries! How do I... ----------- +... create PDF builds without LaTeX? + You can use `rst2pdf `_ version 0.12 or greater + which comes with built-in Sphinx integration. See the :ref:`builders` + section for details. + ... get section numbers? They are automatic in LaTeX output; for HTML, give a ``:numbered:`` option to the :dir:`toctree` directive where you want to start numbering. From b0ee52829843b50d40cc4c17290f2670fab6bb2b Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 17:00:56 +0100 Subject: [PATCH 09/20] #265: restore Jython compatibility. --- sphinx/highlighting.py | 10 +++++++++- sphinx/util/__init__.py | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py index 5bd0fe00a..7663279c6 100644 --- a/sphinx/highlighting.py +++ b/sphinx/highlighting.py @@ -12,9 +12,14 @@ import sys import cgi import re -import parser import textwrap +try: + import parser +except ImportError: + # parser is not available on Jython + parser = None + from sphinx.util.texescape import tex_hl_escape_map try: @@ -155,6 +160,9 @@ class PygmentsBridge(object): # just replace all non-ASCII characters. src = src.encode('ascii', 'replace') + if parser is None: + return True + try: parser.suite(src) except parsing_exceptions: diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py index 257143266..ae778fde3 100644 --- a/sphinx/util/__init__.py +++ b/sphinx/util/__init__.py @@ -14,6 +14,7 @@ import re import sys import stat import time +import errno import types import shutil import fnmatch @@ -67,7 +68,8 @@ def ensuredir(path): try: os.makedirs(path) except OSError, err: - if not err.errno == 17: + # 0 for Jython/Win32 + if err.errno not in [0, getattr(errno, 'EEXIST', 0)]: raise From 278a5faf3293a869bb58a6d50300123ed93e0f34 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 17:03:13 +0100 Subject: [PATCH 10/20] Add Fityk. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index 818ce8b4d..9d29769da 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -18,6 +18,7 @@ included, please mail to `the Google group * Djagios: http://djagios.org/ * Django: http://docs.djangoproject.com/ * F2py: http://www.f2py.org/html/ +* Fityk: http://www.unipress.waw.pl/fityk/ * GeoDjango: http://geodjango.org/docs/ * GeoServer: http://docs.geoserver.org/ * Glashammer: http://glashammer.org/ From 54b48298a75cf2d9efb7843617b3737dbe900ac7 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 17:05:36 +0100 Subject: [PATCH 11/20] Add sqlparse. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index 9d29769da..9be13aff1 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -72,6 +72,7 @@ included, please mail to `the Google group * Sprox: http://sprox.org/ * SQLAlchemy: http://www.sqlalchemy.org/docs/ * Sqlkit: http://sqlkit.argolinux.org/ +* sqlparse: http://python-sqlparse.googlecode.com/svn/docs/api/index.html * SymPy: http://docs.sympy.org/ * tinyTiM: http://tinytim.sourceforge.net/docs/2.0/ * The Wine Cellar Book: http://www.thewinecellarbook.com/doc/en/ From d4446af75779e7b026c900259b7aa85a5964c0f3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 18:16:19 +0100 Subject: [PATCH 12/20] Add GSL Shell. --- EXAMPLES | 1 + 1 file changed, 1 insertion(+) diff --git a/EXAMPLES b/EXAMPLES index 9be13aff1..9ad45a0c7 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -23,6 +23,7 @@ included, please mail to `the Google group * GeoServer: http://docs.geoserver.org/ * Glashammer: http://glashammer.org/ * Grok: http://grok.zope.org/doc/current/ +* GSL Shell: http://www.nongnu.org/gsl-shell/ * Hedge: http://documen.tician.de/hedge/ * IFM: http://fluffybunny.memebot.com/ifm-docs/index.html * Jinja: http://jinja.pocoo.org/2/documentation/ From 77c50261983e6b103c438057a157c4cdce5cb267 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 18:20:53 +0100 Subject: [PATCH 13/20] Add link to matplotlib's sampledoc, because I suck at writing tutorials. --- doc/_templates/index.html | 5 +++++ doc/faq.rst | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/_templates/index.html b/doc/_templates/index.html index 1c399f926..62b4f6594 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -58,6 +58,11 @@

Documentation

+

You may be interested in the very nice + tutorial on how to + create a customized documentation using Sphinx written by the matplotlib + developers.

+

Contents
diff --git a/doc/faq.rst b/doc/faq.rst index ed45613bd..34502dc41 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -9,7 +9,7 @@ suggest new entries! How do I... ----------- -... create PDF builds without LaTeX? +... create PDF files without LaTeX? You can use `rst2pdf `_ version 0.12 or greater which comes with built-in Sphinx integration. See the :ref:`builders` section for details. From cecc7a3a696d3ead8c90656ced441920a6477de6 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 18:38:24 +0100 Subject: [PATCH 14/20] Add ASE and GPAW. --- EXAMPLES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EXAMPLES b/EXAMPLES index 9ad45a0c7..6f6375773 100644 --- a/EXAMPLES +++ b/EXAMPLES @@ -8,6 +8,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/ * boostmpi: http://documen.tician.de/boostmpi/ * Calibre: http://calibre.kovidgoyal.net/user_manual/ * Chaco: http://code.enthought.com/projects/chaco/docs/html/ @@ -22,6 +23,7 @@ included, please mail to `the Google group * GeoDjango: http://geodjango.org/docs/ * GeoServer: http://docs.geoserver.org/ * Glashammer: http://glashammer.org/ +* GPAW: https://wiki.fysik.dtu.dk/gpaw/ * Grok: http://grok.zope.org/doc/current/ * GSL Shell: http://www.nongnu.org/gsl-shell/ * Hedge: http://documen.tician.de/hedge/ From a2c483c20b8f8bc5fc895cf03cfe69be70a61524 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 18:52:08 +0100 Subject: [PATCH 15/20] #261: fix template nit. --- sphinx/themes/basic/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html index dd2e2d511..2c8c4d7db 100644 --- a/sphinx/themes/basic/layout.html +++ b/sphinx/themes/basic/layout.html @@ -93,7 +93,7 @@ {{ metatags }} - {%- if not embedded %} + {%- if not embedded and docstitle %} {%- set titlesuffix = " — "|safe + docstitle|e %} {%- else %} {%- set titlesuffix = "" %} From 630c39d6e12065ad0d4714006cf30476e025bddd Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 19:01:31 +0100 Subject: [PATCH 16/20] Change the name of mathbase.setup() so that putting it in extensions doesn't fail with an obscure TypeError. --- sphinx/ext/jsmath.py | 2 +- sphinx/ext/mathbase.py | 2 +- sphinx/ext/pngmath.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sphinx/ext/jsmath.py b/sphinx/ext/jsmath.py index e51af4550..79e2565a7 100644 --- a/sphinx/ext/jsmath.py +++ b/sphinx/ext/jsmath.py @@ -13,7 +13,7 @@ from docutils import nodes from sphinx.application import ExtensionError -from sphinx.ext.mathbase import setup as mathbase_setup +from sphinx.ext.mathbase import setup_math as mathbase_setup def html_visit_math(self, node): diff --git a/sphinx/ext/mathbase.py b/sphinx/ext/mathbase.py index fea786e3e..b2baa6287 100644 --- a/sphinx/ext/mathbase.py +++ b/sphinx/ext/mathbase.py @@ -132,7 +132,7 @@ def number_equations(app, doctree, docname): node[0] = nodes.Text(num, num) -def setup(app, htmlinlinevisitors, htmldisplayvisitors): +def setup_math(app, htmlinlinevisitors, htmldisplayvisitors): app.add_node(math, latex=(latex_visit_math, None), text=(text_visit_math, None), diff --git a/sphinx/ext/pngmath.py b/sphinx/ext/pngmath.py index b9353d7f5..02f46e3d3 100644 --- a/sphinx/ext/pngmath.py +++ b/sphinx/ext/pngmath.py @@ -25,7 +25,7 @@ from docutils import nodes from sphinx.errors import SphinxError from sphinx.util import ensuredir from sphinx.util.png import read_png_depth, write_png_depth -from sphinx.ext.mathbase import setup as mathbase_setup, wrap_displaymath +from sphinx.ext.mathbase import setup_math as mathbase_setup, wrap_displaymath class MathExtError(SphinxError): category = 'Math extension error' From 51a1698dc6505b477bb0f8da90324810caa2d677 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 19:03:57 +0100 Subject: [PATCH 17/20] Added ``htmltitle`` block in layout template. --- CHANGES | 2 ++ sphinx/themes/basic/layout.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 62a7cc803..6f1a7ef52 100644 --- a/CHANGES +++ b/CHANGES @@ -34,6 +34,8 @@ Release 1.0 (in development) * Added ``latexpdf`` target in quickstart Makefile. +* Added ``htmltitle`` block in layout template. + Release 0.6.4 (in development) ============================== diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html index 2f643c5da..c030a6364 100644 --- a/sphinx/themes/basic/layout.html +++ b/sphinx/themes/basic/layout.html @@ -98,7 +98,9 @@ {%- else %} {%- set titlesuffix = "" %} {%- endif %} + {%- block htmltitle %} {{ title|striptags }}{{ titlesuffix }} + {%- endblock %} {%- for cssfile in css_files %} From 598f2dda3a04bf06ffbe7314223d82991bb5a03a Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 8 Nov 2009 19:36:16 +0100 Subject: [PATCH 18/20] Add link to Japanese translation of the docs. --- doc/_templates/index.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/_templates/index.html b/doc/_templates/index.html index 62b4f6594..0f4d4c641 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -58,10 +58,6 @@

Documentation

-

You may be interested in the very nice - tutorial on how to - create a customized documentation using Sphinx written by the matplotlib - developers.

@@ -77,6 +73,14 @@
+

You may also be interested in the very nice + tutorial on how to + create a customized documentation using Sphinx written by the matplotlib + developers.

+ +

There is a Japanese translation + of this documentation, thanks to Yoshiki Shibukawa.

+

Get Sphinx

Sphinx is available as an Date: Sun, 8 Nov 2009 22:37:29 +0100 Subject: [PATCH 19/20] #238: In autodoc, catch all errors that occur on module import, not just ``ImportError``. --- CHANGES | 3 +++ sphinx/ext/autodoc.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8e070c1e3..7e07e7896 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ Release 0.6.4 (in development) ============================== +* #238: In autodoc, catch all errors that occur on module import, + not just ``ImportError``. + * Fix the handling of non-data, but non-method descriptors in autodoc. * When copying file times, ignore OSErrors raised by ``os.utime()``. diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index f5b988789..8b249b916 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -322,7 +322,9 @@ class Documenter(object): obj = self.get_attr(obj, part) self.object = obj return True - except (SyntaxError, ImportError, AttributeError), err: + # this used to only catch SyntaxError, ImportError and AttributeError, + # but importing modules with side effects can raise all kinds of errors + except Exception, err: self.directive.warn( 'autodoc can\'t import/find %s %r, it reported error: ' '"%s", please check your spelling and sys.path' % From 4f03d86b4abcbf053df5227e4798f3072ed57915 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 9 Nov 2009 00:34:14 +0100 Subject: [PATCH 20/20] Regenerate Dutch catalogs. --- sphinx/locale/nl/LC_MESSAGES/sphinx.js | 4 +--- sphinx/locale/nl/LC_MESSAGES/sphinx.mo | Bin 8159 -> 8159 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.js b/sphinx/locale/nl/LC_MESSAGES/sphinx.js index 2314d76f7..7a7a821a0 100644 --- a/sphinx/locale/nl/LC_MESSAGES/sphinx.js +++ b/sphinx/locale/nl/LC_MESSAGES/sphinx.js @@ -1,3 +1 @@ -<<<<<<< local -Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woordencorrect gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": "", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module", "Hide Search Matches": "Zoekresultaten verbergen"}});======= -Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woorden correct gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": ", in ", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module, in", "Hide Search Matches": "Zoekresultaten verbergen"}});>>>>>>> other +Documentation.addTranslations({"locale": "nl", "plural_expr": "(n != 1)", "messages": {"Search Results": "Zoekresultaten", "Preparing search...": "Het zoeken wordt voorbereid...", "Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories.": "Uw zoekopdracht leverde geen resultaten op. Controleer of alle woorden correct gespeld zijn en dat u genoeg categori\u00ebn hebt geselecteerd.", "Search finished, found %s page(s) matching the search query.": "Zoeken voltooid, %s pagina(s) gevonden.", ", in ": ", in ", "Permalink to this headline": "Permanente link naar deze titel", "Searching": "Zoeken", "Permalink to this definition": "Permanente link naar deze definitie", "module, in ": "module, in", "Hide Search Matches": "Zoekresultaten verbergen"}}); \ No newline at end of file diff --git a/sphinx/locale/nl/LC_MESSAGES/sphinx.mo b/sphinx/locale/nl/LC_MESSAGES/sphinx.mo index b9be8617d9f7aee9eb943e340f9fc9b5c9dc7f25..9d9dd4d42d8d2c7261fd7b92baad382129e07d27 100644 GIT binary patch delta 20 bcmca_f8TyXmN2`ef`NgRvGL|Y;XEDyPYeco delta 20 bcmca_f8TyXmN2`8f}xp}f!XFl;XEDyPdx^K