From 3d30a208c17921d62e422c37d95814adf97a228b Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 16 Sep 2018 22:01:57 +0200 Subject: [PATCH] "make install" now transfers the build/html file to delta@py.delta.chat ... --- python/doc/Makefile | 53 ++----------------------- python/doc/_static/sphinxdoc.css | 2 +- python/doc/_templates/globaltoc.html | 4 ++ python/doc/_templates/sidebarintro.html | 3 -- python/doc/conf.py | 7 +++- 5 files changed, 15 insertions(+), 54 deletions(-) diff --git a/python/doc/Makefile b/python/doc/Makefile index f309f543..5dd52ac8 100644 --- a/python/doc/Makefile +++ b/python/doc/Makefile @@ -78,6 +78,10 @@ version: doczip: html python doczip.py $(DOCZIP) _build/html +install: html + rsync -avz _build/html/ delta@py.delta.chat:build/master + + html: $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html @echo @@ -190,52 +194,3 @@ doctest: "results in $(BUILDDIR)/doctest/output.txt." -regen: quickstart-pypimirror quickstart-releaseprocess quickstart-server - rm -rf TARGETDIR - -quickstart-pypimirror: - USER=testuser sh regen.sh --update quickstart-pypimirror.rst - -quickstart-releaseprocess: - USER=testuser sh regen.sh --update quickstart-releaseprocess.rst - -quickstart-server: - USER=testuser sh regen.sh --update quickstart-server.rst - - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# USER MANUAL TARGETS - - -$(USER_MAN_CHAPTERS): - @echo Regenerating $@ - USER=testuser python regendoc.py --update userman/devpi_$@.rst - -regen.sample_undo: - -hg revert --all ./userman/pysober - -regen.server-fresh: regen.server-clean - devpi-server --start --serverdir=$(TESTHOME)/.devpi/server --init - -regen.server-restart: - -devpi-server --stop --serverdir=$(TESTHOME)/.devpi/server - devpi-server --start --serverdir=$(TESTHOME)/.devpi/server - -regen.server-clean: regen.sample_undo - @echo stopping server - -devpi-server --stop --serverdir=$(TESTHOME)/.devpi/server - @echo deleting $(TESTHOME)/.devpi state - -rm -rf $(TESTHOME)/.devpi - @echo deleting pysober/dist - -rm -rf userman/pysober/dist - hg revert --all userman/pysober - - - -regen.uman-all : regen.server-fresh $(USER_MAN_CHAPTERS) - hg revert --all userman/pysober - rm -rf userman/pysober/dist - -regen.uman: regen.server-restart $(chapter) - - diff --git a/python/doc/_static/sphinxdoc.css b/python/doc/_static/sphinxdoc.css index ab8ab5dc..81ac068a 100644 --- a/python/doc/_static/sphinxdoc.css +++ b/python/doc/_static/sphinxdoc.css @@ -17,7 +17,7 @@ body { font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif; - font-size: 1.1em; + font-size: 1.7em; letter-spacing: -0.01em; line-height: 150%; text-align: center; diff --git a/python/doc/_templates/globaltoc.html b/python/doc/_templates/globaltoc.html index 70535eb0..6d0d51fe 100644 --- a/python/doc/_templates/globaltoc.html +++ b/python/doc/_templates/globaltoc.html @@ -1,4 +1,6 @@ +
+ #deltachat [freenode] + +
diff --git a/python/doc/_templates/sidebarintro.html b/python/doc/_templates/sidebarintro.html index 30fa436c..dbb2f704 100644 --- a/python/doc/_templates/sidebarintro.html +++ b/python/doc/_templates/sidebarintro.html @@ -1,4 +1 @@

deltachat {{release}}

-

-delta.chat python bindings -

diff --git a/python/doc/conf.py b/python/doc/conf.py index ce512600..5a2fc567 100644 --- a/python/doc/conf.py +++ b/python/doc/conf.py @@ -107,6 +107,11 @@ html_theme = 'alabaster' # documentation. html_theme_options = { # 'index_logo': '_static/delta-chat.svg', + 'font_size': "1.0em", + 'caption_font_size': "0.8em", + 'code_font_size': "1.0em", + + } # Add any paths that contain custom themes here, relative to this directory. @@ -199,7 +204,7 @@ latex_elements = { #'papersize': 'letterpaper', # The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', +'pointsize': '12pt', # Additional stuff for the LaTeX preamble. #'preamble': '',