diff --git a/.gitmodules b/.gitmodules index c4c3d49..83b71ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,7 @@ [submodule "plugins/thirdparty/pelidoc"] path = plugins/thirdparty/pelidoc url = git@git.246060.ru:/f1x1t/pelican-pelidoc.git +[submodule "plugins/thirdparty/pandoc_reader"] + path = plugins/thirdparty/pandoc_reader + url = git@git.246060.ru:/f1x1t/pelican-pandoc-reader + branch = master diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..b9f88d1 Binary files /dev/null and b/favicon.ico differ diff --git a/pelicanconf-full.py b/pelicanconf-full.py index 571d997..c8b85b3 100644 --- a/pelicanconf-full.py +++ b/pelicanconf-full.py @@ -80,9 +80,20 @@ I18N_GETTEXT_DOMAIN = 'messages' JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] -PLUGINS = [i18n(), "pelidoc", "md-metayaml", "render_math", "series", "subcategory", "tag_cloud", "tipue_search", "pelican-css"] +PLUGINS = [i18n(), "pandoc_reader", "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "plantuml"] +#, "render_math", "md-metayaml" #PLUGINS = ["better_tables", "just_table"] +PANDOC_ARGS = [ + "--variable=documentclass:extarticle", + "--variable=toc-title:Содержание", + "--filter=skip-toc-tag", + "--filter=pandoc_plantuml_filter.py", + "--highlight-style=tango", + "--template=wiki", + "--resource-path=wiki" +] + PDF_PROCESSOR = True PANDOC_OUTPUTS = { @@ -90,9 +101,10 @@ PANDOC_OUTPUTS = { } PANDOC_EXTRA_OPTIONS = [ - "-V", "documentclass:extarticle", - "-V", "toc-title:Содержание", - "-F", "skip-toc-tag", + "--variable=documentclass:extarticle", + "--variable=toc-title:Содержание", + "--filter=skip-toc-tag", + "--filter=pandoc_plantuml_filter.py", "--highlight-style=tango", "--resource-path=wiki", "--template=wiki", @@ -104,6 +116,9 @@ PANDOC_MARKDOWN_EXTENSIONS = [ "+backtick_code_blocks", "+fenced_code_blocks", "+fenced_code_attributes" + "+fenced_divs" + "+native_divs" + "+native_spans" ] YUICOMPRESSOR_EXECUTABLE = "yui-compressor" diff --git a/pelicanconf.py b/pelicanconf.py index 1677930..41fcb89 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -80,9 +80,23 @@ I18N_GETTEXT_DOMAIN = 'messages' JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']} PLUGIN_PATHS = ["plugins/official", "plugins/thirdparty"] -PLUGINS = [i18n(), "pelidoc", "md-metayaml", "render_math", "series", "subcategory", "tag_cloud", "tipue_search", "pelican-css"] +PLUGINS = [i18n(), "pandoc_reader", "pelican-css", "pelidoc", "series", "subcategory", "tag_cloud", "tipue_search", "plantuml"] +#, "render_math", "md-metayaml" #PLUGINS = ["better_tables", "just_table"] +PANDOC_ARGS = [ + "--variable=documentclass:extarticle", + "--variable=toc-title:Содержание", + "--filter=skip-toc-tag", + "--filter=pandoc_plantuml_filter.py", + "--highlight-style=tango", + "--template=wiki", + "--resource-path=wiki" +] + + +### for PDF """ + #PDF_PROCESSOR = True PANDOC_OUTPUTS = { @@ -90,9 +104,10 @@ PANDOC_OUTPUTS = { } PANDOC_EXTRA_OPTIONS = [ - "-V", "documentclass:extarticle", - "-V", "toc-title:Содержание", - "-F", "skip-toc-tag", + "--variable=documentclass:extarticle", + "--variable=toc-title:Содержание", + "--filter=skip-toc-tag", + "--filter=pandoc_plantuml_filter.py", "--highlight-style=tango", "--resource-path=wiki", "--template=wiki", @@ -109,6 +124,8 @@ PANDOC_MARKDOWN_EXTENSIONS = [ "+native_spans" ] +### ### + YUICOMPRESSOR_EXECUTABLE = "yui-compressor" YUICOMPRESSOR_EXTRA_OPTIONS = ["--nomunge"] #PLUGINS += ["yuicompressor-opt"] diff --git a/plugins/thirdparty/pandoc_reader b/plugins/thirdparty/pandoc_reader new file mode 160000 index 0000000..3d88725 --- /dev/null +++ b/plugins/thirdparty/pandoc_reader @@ -0,0 +1 @@ +Subproject commit 3d88725c97847914a1aae4954d96b68c0ef036f2 diff --git a/themes/bootstrap4 b/themes/bootstrap4 index cffae9c..4471139 160000 --- a/themes/bootstrap4 +++ b/themes/bootstrap4 @@ -1 +1 @@ -Subproject commit cffae9c2972798c7fd7ca378c798d9412775275a +Subproject commit 4471139a1a419abc4e2aa94c09f0ef7550c65b00 diff --git a/wiki/Latex/ЕСПД в LyX.md b/wiki/Latex/ЕСПД в LyX.md index 0bf71fd..43dee5a 100644 --- a/wiki/Latex/ЕСПД в LyX.md +++ b/wiki/Latex/ЕСПД в LyX.md @@ -34,71 +34,36 @@ git clone https://git.246060.ru:/f1x1t/lyx-layout-espdx.git ~/.lyx/layouts Пример настройки:  -Класс документа -{: .img-center }  -Модули -{: .img-center }  -Шрифты -{: .img-center }  -Макет текста -{: .img-center }  -Макет страницы -{: .img-center }  -Поля страницы -{: .img-center }  -Язык -{: .img-center }  -Нумерация и содержание -{: .img-center }  -Библиография -{: .img-center }  -Предметный указатель -{: .img-center }  -Свойства PDF / Общие -{: .img-center }  -Свойства PDF / Гиперссылки -{: .img-center }  -Свойства PDF / Закладки -{: .img-center }  -Параметры математики -{: .img-center }  -Размещение плавающих объектов -{: .img-center }  -Форматы -{: .img-center }  -Преамбула LaTeX -{: .img-center } - diff --git a/wiki/Prog/GIS/Построение профиля местности в QGis.md b/wiki/Prog/GIS/Построение профиля местности в QGis.md index 0231a85..af8c0c4 100644 --- a/wiki/Prog/GIS/Построение профиля местности в QGis.md +++ b/wiki/Prog/GIS/Построение профиля местности в QGis.md @@ -13,10 +13,6 @@ summary:  -::: {.text-center} -Слои карты -::: - 3) На панели **Панель слоёв** правой кнопкой мыши щелкнуть на слое, содержащем данные о высотах, и выбрать **Фильтр...**. @@ -30,7 +26,6 @@ summary: 6) В появившемся диалоговом окне выбрать имя выходного файла, например, `heights`.  -