[Getfem-commits] (no subject)

[Tetsuo Koyama]

branch: devel-tetsuo-VersionUp-sphinx
commit f952e9d00d922ec173c7d1b8bebec475b47fca84
Author: Tetsuo Koyama <address@hidden>
Date:   Sat Feb 9 18:30:13 2019 +0900

    Update path and latex_elements
---
 doc/sphinx/Makefile.am    | 5 +++--
 doc/sphinx/source/conf.py | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index e4be687..332ff11 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -22,8 +22,9 @@
 PYTHON        = python
 LANGUAGE      = en
 SPHINXOPTS    = -D language=$(LANGUAGE)
-SPHINXBUILD   = sphinx-build
-SPHINXINTL    = sphinx-intl
+SPHINXROOT   = ~/.local/bin/
+SPHINXBUILD   = $(SPHINXROOT)sphinx-build
+SPHINXINTL    = $(SPHINXROOT)sphinx-intl
 PAPER         =
 SOURCES       = $(srcdir)/source
 DISTVERSION   = @VERSION@
diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
index e88487c..81bb3b1 100644
--- a/doc/sphinx/source/conf.py
+++ b/doc/sphinx/source/conf.py
@@ -294,9 +294,9 @@ latex_logo = '.static/logogetfem.png'
 #  'fncychap'  : Inclusion of the "fncychap" package, default 
'\\usepackage[Bjarne]{fncychap}' 
 #  'preamble'  : Additional preamble content, default empty.
 #  'footer'    : Additional footer content (before the indices), default empty.
-latex_elements = [
-    ('preamble',user_preamble),
-]
+latex_elements = {
+    'preamble': 'user_preamble',
+}
 
 # A list of file names, relative to the configuration directory, to copy to
 # the build directory when building LaTeX output.