summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Letan <lthms@soap.coffee>2020-02-19 16:19:00 +0100
committerThomas Letan <lthms@soap.coffee>2020-02-19 16:19:00 +0100
commit06809e86a9805f237aa8ce2c6f1a676db2130e97 (patch)
treed306e69127a99f516c760047aa5d4696eab294ba
parent2b78fd32196a5193dd1932c06d89aeb004f84afd (diff)
Various improvement in the content generation process
-rw-r--r--.gitignore16
-rw-r--r--Makefile1
-rw-r--r--site/posts/DiscoveringCommonLisp.org1
-rw-r--r--site/posts/ExtensibleTypeSafeErrorHandling.org1
-rw-r--r--site/posts/meta/Contents.org28
-rw-r--r--site/style/main.sass7
6 files changed, 29 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index 6472c52..3824c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,19 +12,19 @@ package-lock.json
# begin generated files
site/style/main.css
+site/posts.html
site/news/ColorlessThemes-0.2.html
-site/posts/ExtensibleTypeSafeErrorHandling.html
-site/posts/DiscoveringCommonLisp.html
-site/posts/MonadTransformers.html
-site/posts/meta/Soupault.html
site/posts/meta/Contents.html
+site/posts/meta/Soupault.html
site/posts/Thanks.html
-site/posts.html
-site/posts/RewritingInCoq.html
-site/posts/StronglySpecifiedFunctions.html
-site/posts/Ltac101.html
+site/posts/DiscoveringCommonLisp.html
+site/posts/ExtensibleTypeSafeErrorHandling.html
+site/posts/MonadTransformers.html
site/posts/StronglySpecifiedFunctionsProgram.html
site/posts/MiniHTTPServer.html
+site/posts/StronglySpecifiedFunctions.html
+site/posts/RewritingInCoq.html
+site/posts/Ltac101.html
org.mk
coq.mk
# begin generated files
diff --git a/Makefile b/Makefile
index b8dbffc..6611f7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
SASS := $(shell find site/ -name "*.sass")
INPUTS := $(SASS:.sass=.css)
MAKEFILES := org.mk coq.mk
+ROOT := $(shell pwd)
include ${MAKEFILES}
diff --git a/site/posts/DiscoveringCommonLisp.org b/site/posts/DiscoveringCommonLisp.org
index cf31874..f7bf74d 100644
--- a/site/posts/DiscoveringCommonLisp.org
+++ b/site/posts/DiscoveringCommonLisp.org
@@ -27,7 +27,6 @@ pijul clone "https://pijul.lthms.xyz/lkn/lysk"
In addition, the complete project detailed in this article is available [[https://gist.github.com/lthms/9833f4851843119c966917775b4c4180][as a
gist]].
-#+OPTIONS: toc:nil
#+TOC: headlines 2
#+BEGIN_EXPORT html
diff --git a/site/posts/ExtensibleTypeSafeErrorHandling.org b/site/posts/ExtensibleTypeSafeErrorHandling.org
index 0d40ed7..3af3d44 100644
--- a/site/posts/ExtensibleTypeSafeErrorHandling.org
+++ b/site/posts/ExtensibleTypeSafeErrorHandling.org
@@ -5,7 +5,6 @@
2018</span>.</p>
#+END_EXPORT
-#+OPTIONS: toc:nil
#+TOC: headlines 2
#+BEGIN_EXPORT html
diff --git a/site/posts/meta/Contents.org b/site/posts/meta/Contents.org
index c2e67d7..cc580d8 100644
--- a/site/posts/meta/Contents.org
+++ b/site/posts/meta/Contents.org
@@ -8,8 +8,9 @@
** Generation Process
-#+BEGIN_SRC emacs-lisp :tangle ../../../scripts/configure-org.el
+#+BEGIN_SRC emacs-lisp :tangle ../../../scripts/export-org.el
(setq org-html-htmlize-output-type nil)
+(setq org-export-with-toc nil)
(org-html-export-to-html nil nil nil t)
#+END_SRC
@@ -19,28 +20,31 @@ INPUTS += $(ORG_POSTS:.org=.html)
%.html: %.org
@echo "export $*.org"
- @emacs $< \
- --batch \
- --load=$(shell pwd)/scripts/configure-org.el \
- --kill
+ @emacs $< --batch --kill \
+ --load="${ROOT}/scripts/export-org.el" \
#+END_SRC
* Using Coq files
+** Author Guidelines
+
+** Generation Process
+
#+BEGIN_SRC makefile :tangle ../../../coq.mk
COQ_POSTS := $(shell find site/ -name "*.v")
INPUTS += $(COQ_POSTS:.v=.html)
-COQCARGS := -async-proofs-cache force -w -custom-entry-overriden
+COQCARGS := -async-proofs-cache force \
+ -w -custom-entry-overriden
+COQDOCARGS := --no-index --charset utf8 --short --body-only \
+ --coqlib "https://coq.inria.fr/distrib/current/stdlib/"
%.html: %.v
@echo "export $*.v"
- @coqc ${COQCARGS} $*.v
- @coqdoc --no-index --charset utf8 --short --body-only -d site/posts/ \
- --coqlib "https://coq.inria.fr/distrib/current/stdlib/" \
- $*.v
- @sed -i -e 's/href="$(shell basename $*.html)\#/href="\#/g' $*.html
- @rm -f site/posts/coqdoc.css
+ @coqc ${COQCARGS} $<
+ @coqdoc ${COQDOCARGS} -d $(shell dirname $<) $<
+ @sed -i -e 's/href="$(shell basename $@)\#/href="\#/g' $@
+ @rm -f $(shell dirname $<)/coqdoc.css
#+END_SRC
# Local Variables:
diff --git a/site/style/main.sass b/site/style/main.sass
index 5ec0d90..9872654 100644
--- a/site/style/main.sass
+++ b/site/style/main.sass
@@ -80,7 +80,6 @@ body#default main .code, code, pre, .inlinecode, tt
body#default
main
/* coqdoc output */
-
div.code
white-space: nowrap
overflow-x: visible
@@ -96,13 +95,15 @@ body#default
margin-bottom: 1em
/* org-mode output */
-
.footpara
display: inline
margin-left: .2em
-/* VCARD (index.html) */
+ .section-number-2:after, .section-number-3:after, .section-number-4:after
+ content: ". "
+
+/* VCARD (index.html) */
body#vcard
display: flex
align-items: center