From e4659d400ed3ce79e248abf80d15751868d7d853 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Wed, 26 Feb 2020 23:00:21 +0100 Subject: Use toml-mode for syntax highlighting and align a la Cargo.toml --- site/cleopatra/Contents/Org.org | 1 + site/cleopatra/Soupault.org | 90 +++++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 44 deletions(-) (limited to 'site/cleopatra') diff --git a/site/cleopatra/Contents/Org.org b/site/cleopatra/Contents/Org.org index db1b534..8320ca1 100644 --- a/site/cleopatra/Contents/Org.org +++ b/site/cleopatra/Contents/Org.org @@ -34,6 +34,7 @@ (use-package lua-mode :ensure t :defer t) (use-package sass-mode :ensure t :defer t) (use-package haskell-mode :ensure t :defer t) +(use-package toml-mode :ensure t :defer t) (use-package json-mode :ensure t :defer t) (use-package soft-stone-theme :ensure t :defer t :init diff --git a/site/cleopatra/Soupault.org b/site/cleopatra/Soupault.org index ea3bf82..a5703be 100644 --- a/site/cleopatra/Soupault.org +++ b/site/cleopatra/Soupault.org @@ -27,24 +27,24 @@ ARTIFACTS += build/ #+BEGIN_SRC toml :tangle soupault.conf :noweb tangle [settings] - strict = true - verbose = false - debug = false - site_dir = "site" - build_dir = "build/<>" - - page_file_extensions = ["html"] - ignore_extensions = [ - "draft", "vo", "vok", "vos", "glob", - "html~", "org", "aux", "sass", - ] - - generator_mode = true - complete_page_selector = "html" - default_template = "templates/main.html" - content_selector = "main" - doctype = "" - clean_urls = false +strict = true +verbose = false +debug = false +site_dir = "site" +build_dir = "build/<>" + +page_file_extensions = ["html"] +ignore_extensions = [ + "draft", "vo", "vok", "vos", "glob", + "html~", "org", "aux", "sass", +] + +generator_mode = true +complete_page_selector = "html" +default_template = "templates/main.html" +content_selector = "main" +doctype = "" +clean_urls = false #+END_SRC * Widgets @@ -53,10 +53,10 @@ ARTIFACTS += build/ #+BEGIN_SRC toml :tangle soupault.conf [widgets.page-title] - widget = "title" - selector = "h1" - default = "~lthms" - prepend = "~lthms: " +widget = "title" +selector = "h1" +default = "~lthms" +prepend = "~lthms: " #+END_SRC ** Acknowledging ~soupault~ @@ -75,20 +75,22 @@ The configuration of the widget becomes #+BEGIN_SRC toml :tangle soupault.conf :noweb tangle [widgets.generator-meta] - widget = "insert_html" - html = '' - selector = "head" +widget = "insert_html" +html = """ + +""" +selector = "head" #+END_SRC ** Generating Table of Contents #+BEGIN_SRC toml :tangle soupault.conf [widgets.table-of-contents] - widget = "toc" - selector = "div#generate-toc" - action = "replace_element" - min_level = 2 - numbered_list = true +widget = "toc" +selector = "div#generate-toc" +action = "replace_element" +min_level = 2 +numbered_list = true #+END_SRC ** Rewriting URLs @@ -137,11 +139,11 @@ prefix_urls(HTML.select(page, "script"), "src", prefix_url) #+BEGIN_SRC toml :tangle soupault.conf :noweb tangle [plugins.urls-rewriting] - file = "plugins/urls-rewriting.lua" +file = "plugins/urls-rewriting.lua" [widgets.urls-rewriting] - widget = "urls-rewriting" - prefix_url = "<>" +widget = "urls-rewriting" +prefix_url = "<>" #+END_SRC ** Marking External Links @@ -188,11 +190,11 @@ end #+BEGIN_SRC toml :tangle soupault.conf [plugins.external_links] - file = "plugins/external-urls.lua" +file = "plugins/external-urls.lua" [widgets.mark-external-urls] - after = "generate-history" - widget = "external_links" +after = "generate-history" +widget = "external_links" #+END_SRC ** Generating Per-File Revisions Tables @@ -438,10 +440,10 @@ main "$(cat)" "${1}" #+BEGIN_SRC toml :tangle soupault.conf [widgets.generate-history] - widget = "preprocess_element" - selector = "#history" - command = 'scripts/history.sh templates/history.html' - action = "replace_content" +widget = "preprocess_element" +selector = "#history" +command = 'scripts/history.sh templates/history.html' +action = "replace_content" #+END_SRC ** Rendering Equations Offline @@ -523,10 +525,10 @@ with the result of our script. #+BEGIN_SRC toml :tangle soupault.conf [widgets.inline-math] - widget = "preprocess_element" - selector = ".imath" - command = "node scripts/katex.js" - action = "replace_content" +widget = "preprocess_element" +selector = ".imath" +command = "node scripts/katex.js" +action = "replace_content" #+END_SRC The @@html:\KaTeX@@ font is bigger than the serif -- cgit v1.2.3