Commit Graph

231 Commits

Author SHA1 Message Date
Takayuki Shimizukawa
ce4d342e20 use six privided iteritems(),itervalues() to support py2/py3 in one source. refs #1350. 2014-04-29 21:20:56 +09:00
Takayuki Shimizukawa
c3c879f2c6 use six privided functions/classes to support py2/py3 in one source. refs #1350. 2014-04-29 19:59:58 +09:00
Georg Brandl
afd6c0b28d Merged in shibu/sphinx/add_stemmer (pull request #214) 2014-03-04 19:10:19 +01:00
Georg Brandl
ac92719ac3 Update copyright year. 2014-03-01 08:18:23 +01:00
Georg Brandl
e030031321 Update copyright year. 2014-03-01 08:18:16 +01:00
Dmitry Shachnev
953b33d3f7 Merge 2014-01-22 18:34:51 +04:00
shibukawa yoshiki
ca63dba2ad merge default 2014-01-22 00:10:09 -08:00
shibukawa yoshiki
6892b5f191 Add html_search_* options templates to conf.py
Fix encode error when building
Add printing search language label when building
2014-01-20 20:41:47 -08:00
Georg Brandl
317930a7fb merge with stable 2014-01-20 21:21:33 +01:00
Viktor Haag
3c0c9cd198 updates per Georg Brandl:
- Change alteration to docs to express path relative to "configuration directory" and not "conf.py"
- Update block in HTML builder copying favicon to _static to mirror handling of html_logo
2014-01-20 13:27:52 -05:00
Viktor Haag
3706ed02ac address issue #1352 -- make sure to check for the actual file stored in config.html_logo. 2014-01-20 10:37:37 -05:00
Dmitry Shachnev
c2eaf2af81 Merge 2014-01-20 18:32:47 +04:00
Georg Brandl
8c2fabe117 The deprecated config values `exclude_trees, exclude_dirnames and unused_docs` have been removed. 2014-01-19 17:46:06 +01:00
Dmitry Shachnev
ce2185ce27 Modernize the code now that Python 2.5 is no longer supported
- Use print function instead of print statement;
- Use new exception handling;
- Use in operator instead of has_key();
- Do not use tuple arguments in functions;
- Other miscellaneous improvements.

This is based on output of `futurize --stage1`, with some
manual corrections.
2014-01-19 14:17:10 +04:00
Takayuki Shimizukawa
cc7509966c merge heads 2014-01-15 05:25:56 +00:00
Georg Brandl
8d2715ebd9 html builder: add missing "done" output 2014-01-11 19:54:58 +01:00
Georg Brandl
9afe960855 Closes #1319: Do not crash if the `html_logo` file does not exist. 2014-01-10 15:07:17 +01:00
Takayuki Shimizukawa
a8fc938d1b Drop python-2.5 and remove 2.4,2.5 support codes 2013-12-15 14:16:53 +09:00
Georg Brandl
8b85355a22 Fix new html_extra_path option for singlehtml builder. 2013-09-16 04:33:02 +02:00
Matthias C. M. Troffaes
af73fc486e Actual implementation. 2013-08-22 09:30:25 +01:00
Takayuki Shimizukawa
f26de54a12 Support docutils.conf 'writers' and 'html4css1 writer' section by html writer.
latex, manpage and texinfo writers support 'writers' section.
2013-07-26 23:23:46 +09:00
Dmitry Shachnev
cec583b119 SingleHtml builder now calls write_doc_serialized(). Closes #1162. 2013-05-05 21:21:06 +04:00
Georg Brandl
ba39edb5db merge with parallel repo 2013-03-29 13:01:21 +01:00
Georg Brandl
519be8ed6e html builder: rename get_object_hash to get_stable hash
Also amend the docstring so that it is easier to understand the need for the function.
2013-03-29 11:17:34 +01:00
Roland Meister
a567d77e51 epub_use_index instead of html_use_index for epub builder (Issue #1106)
The change adds the method get_builder_config.
This allows use of the option epub_use_index instead
of html_use_index for epub output.
2013-03-06 18:43:21 +01:00
Takayuki Shimizukawa
a1bf7dbcf8 fix: output all html every time with python3.3.
Sphinx detect config changing by hash(str(cfgdict)).
In python3.3, str(dict_instance) retun another string per process.
2013-01-15 14:16:16 +09:00
Georg Brandl
5cd0841e5f builder: fix parallel build globals problems by splitting write_doc in two
stages: write_doc() and write_doc_serialized(), the latter of which is not
called in the parallel processes.

This costs speedup, of course: from about 50% we are down to about 30%
improvement on my 4-core machine.
2013-01-13 19:46:34 +01:00
Georg Brandl
83c6b8231e Set "allow_parallel" to false by default. 2013-01-13 19:44:09 +01:00
Georg Brandl
1832284e89 Closes #1067: implement pluggable search scorer and tweak scoring to give good results. Patch by Hernan Grecco. 2013-01-04 11:17:32 +01:00
Roland Meister
a0ebe5a3c5 Merge with birkenfeld/sphinx 2013-01-02 09:40:37 +01:00
Georg Brandl
151856819c Copyright update. 2013-01-01 22:13:15 +01:00
Roland Meister
50fadb9e94 Bug #1047: templating toctree()'s includehidden argument
Document the includehidden option and give it sane defaults.
See bug #1047 for implementation alternatives.
2012-12-10 21:54:11 +01:00
ms4py
88e852aa7e Create link to full size image if it is scaled with width or height. 2012-03-16 10:45:51 +01:00
Georg Brandl
17591ffe93 Fixes #892: Fix single-HTML builder misbehaving with the master document in a subdirectory. 2012-03-10 19:24:03 +01:00
Georg Brandl
07427c48fb Merge with 1.0. 2011-09-22 14:39:27 +02:00
Georg Brandl
f250397f77 Always close .buildinfo file after reading. 2011-09-22 14:28:31 +02:00
Georg Brandl
0e1db6ad90 New year update. 2011-01-04 10:00:51 +01:00
Georg Brandl
22777a5128 #528: Observe :confval:locale_dirs when looking for the JS translations file. 2011-01-04 09:34:44 +01:00
Georg Brandl
6219286df9 Use XML-entity-replace error handling in HTML output files. Fixes test_build.test_htmlhelp. 2011-01-04 00:17:08 +01:00
amenohi
0c7d972c81 On HTML Help, ignore 'html_output_encoding' and use langage encoding. 2010-11-18 17:18:15 +09:00
Georg Brandl
936c78cd32 Section headings in :rst:dir:only directives are now correctly handled. 2011-01-08 19:56:32 +01:00
Georg Brandl
357f8472c7 #534: warning message instead of crash if invalid Pygments lexer name is used. 2010-10-22 10:02:10 +02:00
Georg Brandl
7e5ff71c40 #513: Allow giving non-local URIs for JavaScript files, e.g. in the JSMath extension. 2010-08-25 10:26:15 +00:00
Georg Brandl
8c0c728d1b Fix building with SingleHTMLBuilder when there is no toctree. 2010-07-27 13:27:00 +02:00
Georg Brandl
ebb7a54141 Add a custom json serializer implementation that forces translation proxies. Fixes building with the JSON builder. 2010-07-25 14:52:37 +02:00
Georg Brandl
2b29038d0c The behavior of :confval:html_file_suffix changed slightly: the empty string now means "no suffix" instead of "default suffix", use `None` for "default suffix". 2010-07-17 19:45:54 +02:00
Georg Brandl
cfe85b4e8b Determine search language in builder, and add missing method in websupport indexer implementations. 2011-01-04 12:47:49 +01:00
Georg Brandl
7beb8533b5 #273: Add an API for adding full-text search support for languages other than English. Add support for Japanese.
Based on the implementation by SHIBUKAWA Yoshiki in https://bitbucket.org/shibu/sphinx/.
2011-01-04 12:40:19 +01:00
Georg Brandl
17efae5622 merge with 1.0 2011-01-04 11:29:09 +01:00
Georg Brandl
3642b521ed merge with 1.0 2011-01-04 00:35:27 +01:00
Georg Brandl
7fe2f8ca5b merge with 1.0 2010-12-28 10:57:51 +01:00
Georg Brandl
de0cf8f665 Fix calling all serializers with pickle.HIGHEST_PROTOCOL argument. 2010-11-20 09:45:05 +01:00
Georg Brandl
c62a19bca5 Make Theme class usable without a builder object. 2010-10-30 16:47:05 +00:00
Georg Brandl
65505907f1 Fix loading JS searchindex data in Py3k. 2010-10-29 07:17:14 +02:00
Georg Brandl
db8189083d merge with 1.0 2010-10-22 11:16:48 +02:00
Georg Brandl
3ddd7d9075 merge with 1.0 2010-08-25 12:02:59 +00:00
Georg Brandl
630791c42c Docstring harmonization. 2010-08-22 11:36:08 +02:00
Georg Brandl
9fca66a690 merge with 0.6 2010-06-13 21:39:44 +02:00
Georg Brandl
c88cb38f42 #445: Fix links to result pages when using the search function of HTML built with the `dirhtml` builder. 2010-06-13 21:35:42 +02:00
Georg Brandl
50d16ce68e Use status iterator for images and dlfiles. 2010-05-30 14:57:44 +02:00
Georg Brandl
35f0b555a4 The `toctree callable in templates now accepts a titles_only` keyword argument. 2010-05-30 13:16:26 +02:00
Georg Brandl
0d4c3a31b6 #426: Fix encoding issues when saving/loading intersphinx inventories. 2010-05-26 19:51:09 +02:00
Georg Brandl
0238e83013 Merge with http://bitbucket.org/tpowers/sphinx/ (rewriting the external/internal distinction code)
In HTML output, references now get the class ``internal`` if they are internal to the whole project, as opposed to internal to the current page.

The ``menuselection`` and ``guilabel`` roles now support ampersand accelerators.
2010-05-24 12:57:07 +02:00
Georg Brandl
5b7e794e2b #413: Added a way for intersphinx to refer to named labels in other
projects, and to specify the project you want to link to.
2010-05-23 13:06:01 +02:00
Georg Brandl
c8c703805c merge with 0.6 2010-05-22 12:59:18 +02:00
Georg Brandl
be23bc91da #418: Allow relocation of the translation JavaScript files to the system directory on Unix systems.
Patch by Toshio Kuratomi.
2010-05-22 10:52:53 +02:00
Georg Brandl
bd2eb1e085 Declare if serializers/indexers dump unicode or bytes. Removes duplication of methods. 2010-07-28 19:24:48 +02:00
Daniel Neuhäuser
14ca77a1d4 Fixed the JSONHTMLBuilder 2010-07-27 21:01:27 +02:00
Daniel Neuhäuser
eaa3cb4f1f Use utf-8 instead of ascii to encode strings for hashing 2010-06-20 18:54:19 +02:00
Daniel Neuhäuser
24d8ce4734 make sure to encode strings passed to md5 2010-06-20 18:50:22 +02:00
Georg Brandl
7add175598 Fix code formatting. 2010-07-28 18:58:18 +02:00
Daniel Neuhäuser
bf14a7c362 Encode strings after they have been formatted 2010-06-16 23:20:30 +02:00
Georg Brandl
f0c316f6c5 Pass document name as bytes. 2010-07-28 18:55:39 +02:00
Georg Brandl
28b337dd0c merge 2010-04-18 09:41:44 +02:00
Georg Brandl
d7f1aeba8c Review changes from http://bitbucket.org/tpowers/sphinx/ and add docs. 2010-04-07 13:02:03 +02:00
Georg Brandl
751e02c767 merge with trunk 2010-04-06 09:23:03 +02:00
Georg Brandl
517b045f86 merge with 0.6 2010-04-06 09:21:22 +02:00
Georg Brandl
0ca72d4199 Fix the handling of multiple toctrees when creating the global TOC for the `toctree()` template function.
Fix the handling of hidden toctrees when creating the global TOC for the ``toctree()`` template function.
2010-04-06 09:12:22 +02:00
Georg Brandl
04f660d021 Change domain-index API: introduce a class. 2010-02-28 14:45:43 +01:00
Georg Brandl
1ad03286c0 Add method for adding custom indexes. 2010-02-21 21:49:38 +01:00
Georg Brandl
1b5fbd6fa1 Observe the deprecated *_use_modindex config values. 2010-02-20 14:28:58 +01:00
Georg Brandl
454ecf80a4 Make the concept of "module index" generalized to domains. As a side-effect, the latex modindex is no longer generated by LaTeX. 2010-02-20 01:13:23 +01:00
Georg Brandl
98bcd2fab4 Make the _ gettext alias an explicit import instead of installing into builtins. 2010-01-17 19:33:23 +01:00
Georg Brandl
bacb6435e4 merge with trunk 2010-01-17 17:52:51 +01:00
Georg Brandl
1ec19290e1 Rename os to osutil, thanks to relative imports. 2010-01-17 17:49:01 +01:00
Georg Brandl
b0e2c44dc8 merge with trunk 2010-01-17 17:43:33 +01:00
Georg Brandl
c5d67b0321 Refactor util package. 2010-01-17 17:35:12 +01:00
Georg Brandl
e4f4cd2bf9 merge with trunk 2010-01-17 17:00:37 +01:00
Georg Brandl
744a519c92 Add single-file HTML builder. Closes #151. 2010-01-17 16:48:02 +01:00
Georg Brandl
5d40d8bd63 merge with trunk 2010-01-17 14:24:24 +01:00
Georg Brandl
cbbae81e8f Add html-collect-pages event. 2010-01-13 23:42:58 +01:00
Georg Brandl
8bb4d4320d merge with 0.6 2010-01-12 10:47:29 +00:00
Georg Brandl
43d08313a0 Improve the handling of non-Unicode strings in the configuration:
warn about non-ascii bytestrings, and give nicer messages if unicode errors
occur.
2010-01-12 10:45:38 +00:00
Georg Brandl
c197c29f2e #313: fix search on Internet Explorer; add underscore.js to JavaScript libs. 2010-01-12 09:35:18 +00:00
Georg Brandl
c227fc2720 merge with trunk (and remove debugging leftover from test layout.html template) 2010-01-07 21:51:23 +01:00
Georg Brandl
03b9d79b34 Fix compatibility with blocks in the old sidebar scheme: blocks cannot be used in included templates. Deprecate the blocks accordingly. 2010-01-07 21:49:31 +01:00
Georg Brandl
b1c937f0d9 merge with trunk (not working perfectly yet) 2010-01-07 21:41:03 +01:00
Georg Brandl
a43738e47a merge with trunk 2010-01-07 19:07:50 +01:00
Georg Brandl
75be813edc Unify logo and favicon handling. 2010-01-07 18:07:22 +01:00
Georg Brandl
2f09d24472 The `html_sidebars` config value can now contain patterns as keys, and the values can be lists that explicitly select which sidebar templates should be rendered.
That means that the builtin sidebar contents can be included only selectively.
2010-01-07 17:56:09 +01:00