From 842b89b2d2d87b57442b14b4fd63477fd234137a Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 16 Jul 2020 10:47:24 -0400 Subject: [PATCH 1/1] make publications and bandali-bib actual pages this seems better than the initial pass --- Makefile | 16 +++++++--------- bandali-bib.m4 | 10 ++++++++++ publications.m4 | 4 ++-- static/Makefile | 10 ++++++---- ...bandali-bib.html => bandali-bib-partial.html} | 0 ...blications.html => publications-partial.html} | 0 static/style.css | 10 +++++++++- 7 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 bandali-bib.m4 rename static/{bandali-bib.html => bandali-bib-partial.html} (100%) rename static/{publications.html => publications-partial.html} (100%) diff --git a/Makefile b/Makefile index a7071a1..a8b6ccb 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ SRC := $(filter-out $(wildcard meta_*), \ $(wildcard *.m4 fsf-internship/*.m4)) OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC)) -STATIC := $(patsubst static/%,out/%, \ -$(filter-out static/publications.html, \ -$(wildcard static/* static/.*))) +STATIC := $(patsubst static/%,out/%, $(wildcard static/* static/.*)) all: $(OUTPUTS) out/notes.atom out/notes.rss out/style.css $(STATIC) @@ -15,11 +13,12 @@ out/notes.rss: meta_feed_rss.m4 ; m4 $< > $@ $(STATIC): ; ln -s $(PWD)/static/$(@F) $@ # publications bibliography -static/publications.html: static/bandali.bib static/bandali-bib-*.txt -static/publications.html: static/publications-sed.txt -static/publications.html: +static/publications-partial.html: static/bandali.bib static/bandali-bib-* +static/publications-partial.html: static/publications-* +static/publications-partial.html: $(MAKE) -C $(@D) $(@F) -out/publications.html: static/publications.html +out/publications.html: static/publications-partial.html +out/bandali-bib.html: static/bandali-bib-partial.html clean: rm -rf out/ @@ -31,8 +30,7 @@ deploy: watch: while true; do \ echo $(SRC) header.html footer.html \ - static/bandali.bib static/bandali-bib-*.txt \ - static/publications-sed.txt \ + static/bandali.bib static/bandali-bib-* static/publications-* \ Makefile static/Makefile | \ tr " " "\n" | entr -d make; done diff --git a/bandali-bib.m4 b/bandali-bib.m4 new file mode 100644 index 0000000..00c5e83 --- /dev/null +++ b/bandali-bib.m4 @@ -0,0 +1,10 @@ +dnl -*- html -*- +define(__title, `bandali.bib')dnl +define(__slug, `bandali-bib')dnl +include(header.html)dnl + +
+include(static/bandali-bib-partial.html) +
+ +include(footer.html)dnl diff --git a/publications.m4 b/publications.m4 index 8a32f8a..4302e03 100644 --- a/publications.m4 +++ b/publications.m4 @@ -3,10 +3,10 @@ define(__title, `Publications')dnl define(__slug, `publications')dnl include(header.html)dnl -
+

Publications

-include(static/publications.html) +include(static/publications-partial.html)

bibliography generated using bibtex2html

diff --git a/static/Makefile b/static/Makefile index 07c43a6..112de86 100644 --- a/static/Makefile +++ b/static/Makefile @@ -1,9 +1,11 @@ -publications.html: bandali.bib bandali-bib-*.txt +publications-partial.html: bandali.bib bandali-bib-*.txt bibtex2html --citefile bandali-bib-citefile.txt \ --nodoc --no-header --no-footer --no-doi \ --reverse-sort --revkeys --sort-by-date --unicode \ --output publications \ bandali.bib - mv publications_bib.html bandali-bib.html - sed -i -f publications-sed.txt publications.html - sed -i -f bandali-bib-sed.txt bandali-bib.html + mv publications.html publications-partial.html + mv publications_bib.html bandali-bib-partial.html + sed -i -f publications-sed.txt publications-partial.html + sed -i -f bandali-bib-sed.txt bandali-bib-partial.html +bandali-bib-partial.html: publications-partial.html diff --git a/static/bandali-bib.html b/static/bandali-bib-partial.html similarity index 100% rename from static/bandali-bib.html rename to static/bandali-bib-partial.html diff --git a/static/publications.html b/static/publications-partial.html similarity index 100% rename from static/publications.html rename to static/publications-partial.html diff --git a/static/style.css b/static/style.css index 4031953..fdcea52 100644 --- a/static/style.css +++ b/static/style.css @@ -113,8 +113,16 @@ blockquote#abstract { pre, code { background: #f6f6f6; font: 1.15em monospace; +} +pre { + display: inline-block; + margin: 0.5em 0; + min-width: 100%; padding: 1em; } +pre:first-of-type { + margin-top: 0; +} pre > code { padding: 0; background: initial; @@ -133,7 +141,7 @@ em { table td { padding: 0.125em 0.3em; } -#pubs td { +#publications td { padding-top: 0.4em; padding-bottom: 0.4em; } -- 2.20.1