From 9644c34ed2a150f0cfb266b68eebf789e48c6404 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 26 Apr 2019 10:56:04 +0300 Subject: [PATCH] Text --- pelicanconf-full.py | 34 ++++++++++------------- pelicanconf.py | 37 ++++++++++--------------- wiki/Misc/Windows/OOShutUp.md | 5 ---- favicon.ico => wiki/extras/favicon.ico | Bin 4 files changed, 29 insertions(+), 47 deletions(-) rename favicon.ico => wiki/extras/favicon.ico (100%) diff --git a/pelicanconf-full.py b/pelicanconf-full.py index c8b85b3..f2e27c3 100644 --- a/pelicanconf-full.py +++ b/pelicanconf-full.py @@ -52,7 +52,11 @@ AUTHOR_FEED_ATOM = None AUTHOR_FEED_RSS = None USE_FOLDER_AS_CATEGORY = True DEFAULT_DATE = 'fs' -STATIC_PATHS = [ 'images', 'files' ] +STATIC_PATHS = [ 'images', 'files', 'extras' ] + +EXTRA_PATH_METADATA = { + 'extras/favicon.ico': {'path': 'favicon.ico'}, +} MARKDOWN = { 'extension_configs': { @@ -81,9 +85,14 @@ JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] PLUGINS = [i18n(), "pandoc_reader", "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "plantuml"] -#, "render_math", "md-metayaml" #PLUGINS = ["better_tables", "just_table"] +PDF_PROCESSOR = True + +PANDOC_OUTPUTS = { + 'pdf': 'pdf', +} + PANDOC_ARGS = [ "--variable=documentclass:extarticle", "--variable=toc-title:Содержание", @@ -91,25 +100,10 @@ PANDOC_ARGS = [ "--filter=pandoc_plantuml_filter.py", "--highlight-style=tango", "--template=wiki", - "--resource-path=wiki" + "--resource-path=wiki:." ] -PDF_PROCESSOR = True - -PANDOC_OUTPUTS = { - 'pdf': 'pdf', -} - -PANDOC_EXTRA_OPTIONS = [ - "--variable=documentclass:extarticle", - "--variable=toc-title:Содержание", - "--filter=skip-toc-tag", - "--filter=pandoc_plantuml_filter.py", - "--highlight-style=tango", - "--resource-path=wiki", - "--template=wiki", - "--pdf-engine=xelatex" -] +PANDOC_EXTRA_OPTIONS = PANDOC_ARGS + [ "--pdf-engine=xelatex" ] PANDOC_MARKDOWN_EXTENSIONS = [ "+smart", @@ -121,6 +115,8 @@ PANDOC_MARKDOWN_EXTENSIONS = [ "+native_spans" ] +PANDOC_EXTENSIONS = PANDOC_MARKDOWN_EXTENSIONS + YUICOMPRESSOR_EXECUTABLE = "yui-compressor" YUICOMPRESSOR_EXTRA_OPTIONS = ["--nomunge"] PLUGINS += ["yuicompressor-opt"] diff --git a/pelicanconf.py b/pelicanconf.py index 41fcb89..fdc2991 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -52,7 +52,11 @@ AUTHOR_FEED_ATOM = None AUTHOR_FEED_RSS = None USE_FOLDER_AS_CATEGORY = True DEFAULT_DATE = 'fs' -STATIC_PATHS = [ 'images', 'files' ] +STATIC_PATHS = [ 'images', 'files', 'extras' ] + +EXTRA_PATH_METADATA = { + 'extras/favicon.ico': {'path': 'favicon.ico'}, +} MARKDOWN = { 'extension_configs': { @@ -81,9 +85,14 @@ JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] PLUGINS = [i18n(), "pandoc_reader", "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "plantuml"] -#, "render_math", "md-metayaml" #PLUGINS = ["better_tables", "just_table"] +#PDF_PROCESSOR = True + +PANDOC_OUTPUTS = { + 'pdf': 'pdf', +} + PANDOC_ARGS = [ "--variable=documentclass:extarticle", "--variable=toc-title:Содержание", @@ -91,28 +100,10 @@ PANDOC_ARGS = [ "--filter=pandoc_plantuml_filter.py", "--highlight-style=tango", "--template=wiki", - "--resource-path=wiki" + "--resource-path=wiki:." ] - -### for PDF """ - -#PDF_PROCESSOR = True - -PANDOC_OUTPUTS = { - 'pdf': 'pdf', -} - -PANDOC_EXTRA_OPTIONS = [ - "--variable=documentclass:extarticle", - "--variable=toc-title:Содержание", - "--filter=skip-toc-tag", - "--filter=pandoc_plantuml_filter.py", - "--highlight-style=tango", - "--resource-path=wiki", - "--template=wiki", - "--pdf-engine=xelatex" -] +PANDOC_EXTRA_OPTIONS = PANDOC_ARGS + [ "--pdf-engine=xelatex" ] PANDOC_MARKDOWN_EXTENSIONS = [ "+smart", @@ -124,7 +115,7 @@ PANDOC_MARKDOWN_EXTENSIONS = [ "+native_spans" ] -### ### +PANDOC_EXTENSIONS = PANDOC_MARKDOWN_EXTENSIONS YUICOMPRESSOR_EXECUTABLE = "yui-compressor" YUICOMPRESSOR_EXTRA_OPTIONS = ["--nomunge"] diff --git a/wiki/Misc/Windows/OOShutUp.md b/wiki/Misc/Windows/OOShutUp.md index 2ba8a62..a83690f 100644 --- a/wiki/Misc/Windows/OOShutUp.md +++ b/wiki/Misc/Windows/OOShutUp.md @@ -10,18 +10,13 @@ summary: Пример приведён ниже: ![1](images/oo-shutup/1.jpg) -{: .img-center } ![2](images/oo-shutup/2.jpg) -{: .img-center } ![3](images/oo-shutup/3.jpg) -{: .img-center } ![4](images/oo-shutup/4.jpg) -{: .img-center } ![5](images/oo-shutup/5.jpg) -{: .img-center } diff --git a/favicon.ico b/wiki/extras/favicon.ico similarity index 100% rename from favicon.ico rename to wiki/extras/favicon.ico