diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-09-26 02:29:02 +0900 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2014-09-26 02:29:02 +0900 |
| commit | 9f517bb20bdc5571c2f23bd058a95f69e37d14f8 (patch) | |
| tree | 144c0da124c32df29cc49e4bd54f79f2f9b91f46 | |
| parent | 7c9565f5104d4ce568c69fe0ad09ef72b399c8f4 (diff) | |
| download | sphinx-git-9f517bb20bdc5571c2f23bd058a95f69e37d14f8.tar.gz | |
update CHANGES for pull request #295, #1520.
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | sphinx/quickstart.py | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -145,6 +145,8 @@ Bugs fixed * #1547: pgen2 tokenizer doesn't recognize ``...`` literal (Ellipsis for py3). * PR#294: On LaTeX builder, wrap float environment on writing literal_block to avoid separation of caption and body. Thanks to Takeshi Komiya. +* PR#295, #1520: ``make.bat latexpdf`` mechanism to ``cd`` back to the current + directory. Thanks to Peter Suter. Documentation ------------- diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index e41b23cfc..3cd04f056 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -637,7 +637,7 @@ REM Command file for Sphinx documentation if "%%SPHINXBUILD%%" == "" ( \tset SPHINXBUILD=sphinx-build ) -set BUILDDIR=%%~dp0%(rbuilddir)s +set BUILDDIR=%(rbuilddir)s set ALLSPHINXOPTS=-d %%BUILDDIR%%/doctrees %%SPHINXOPTS%% %(rsrcdir)s set I18NSPHINXOPTS=%%SPHINXOPTS%% %(rsrcdir)s if NOT "%%PAPER%%" == "" ( @@ -793,7 +793,7 @@ if "%%1" == "latexpdf" ( \t%%SPHINXBUILD%% -b latex %%ALLSPHINXOPTS%% %%BUILDDIR%%/latex \tcd %%BUILDDIR%%/latex \tmake all-pdf -\tcd %%BUILDDIR%%/.. +\tcd %%~dp0 \techo. \techo.Build finished; the PDF files are in %%BUILDDIR%%/latex. \tgoto end @@ -803,7 +803,7 @@ if "%%1" == "latexpdfja" ( \t%%SPHINXBUILD%% -b latex %%ALLSPHINXOPTS%% %%BUILDDIR%%/latex \tcd %%BUILDDIR%%/latex \tmake all-pdf-ja -\tcd %%BUILDDIR%%/.. +\tcd %%~dp0 \techo. \techo.Build finished; the PDF files are in %%BUILDDIR%%/latex. \tgoto end |