From: Amin Bandali Date: Thu, 16 Jul 2020 14:47:24 +0000 (-0400) Subject: make publications and bandali-bib actual pages X-Git-Url: https://git.shemshak.org/~bandali/bndl.org/commitdiff_plain/842b89b2d2d87b57442b14b4fd63477fd234137a?ds=sidebyside;hp=8c1ba2f235553b96215e157a4b686d0dd626d100 make publications and bandali-bib actual pages this seems better than the initial pass --- 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-partial.html b/static/bandali-bib-partial.html new file mode 100644 index 0000000..eb58572 --- /dev/null +++ b/static/bandali-bib-partial.html @@ -0,0 +1,58 @@ +

bandali.bib

+@inproceedings{DBLP:conf/re/AbbassiBDS18,
+  author = {Ali Abbassi and
+               Amin Bandali and
+               Nancy A. Day and
+               Jos{\'{e}} Serna},
+  title = {A Comparison of the Declarative Modelling Languages
+                  {B}, {Dash}, and {TLA\textsuperscript{+}}},
+  booktitle = {8th {IEEE} International Model-Driven Requirements
+                  Engineering Workshop, MoDRE@RE 2018, Banff, AB,
+                  Canada, August 20, 2018},
+  pages = {11--20},
+  year = {2018},
+  crossref = {DBLP:conf/re/2018modre},
+  url = {https://doi.org/10.1109/MoDRE.2018.00008},
+  doi = {10.1109/MoDRE.2018.00008},
+  timestamp = {Thu, 14 Feb 2019 15:07:29 +0100},
+  biburl = {https://dblp.org/rec/bib/conf/re/AbbassiBDS18},
+  bibsource = {dblp computer science bibliography, https://dblp.org},
+  pdf = {https://p.bndl.org/modre2018-declarative.pdf}
+}
+
+ +
+@proceedings{DBLP:conf/re/2018modre,
+  editor = {Ana Moreira and
+               Gunter Mussbacher and
+               Jo{\~{a}}o Ara{\'{u}}jo and
+               Pablo S{\'{a}}nchez},
+  title = {8th {IEEE} International Model-Driven Requirements
+                  Engineering Workshop, MoDRE@RE 2018, Banff, AB,
+                  Canada, August 20, 2018},
+  publisher = {{IEEE} Computer Society},
+  year = {2018},
+  url = {http://ieeexplore.ieee.org/xpl/mostRecentIssue.jsp?punumber=8500723},
+  isbn = {978-1-5386-8406-1},
+  timestamp = {Thu, 14 Feb 2019 15:07:29 +0100},
+  biburl = {https://dblp.org/rec/bib/conf/re/2018modre},
+  bibsource = {dblp computer science bibliography, https://dblp.org}
+}
+
+ +
+@mastersthesis{bandali2020,
+  type = {{MMath} thesis},
+  author = {Amin Bandali},
+  title = {{A Comprehensive Study of Declarative Modelling Languages}},
+  school = {University of Waterloo, David R. Cheriton School of Computer Science},
+  year = 2020,
+  month = {July},
+  publisher = {UWSpace},
+  url = {http://hdl.handle.net/10012/16059},
+  note = {\url{http://hdl.handle.net/10012/16059} and
+                  \url{https://bndl.org/mmath}},
+  pdf = {https://p.bndl.org/bandali-mmath-thesis.pdf}
+}
+
+ diff --git a/static/bandali-bib.html b/static/bandali-bib.html deleted file mode 100644 index eb58572..0000000 --- a/static/bandali-bib.html +++ /dev/null @@ -1,58 +0,0 @@ -

bandali.bib

-@inproceedings{DBLP:conf/re/AbbassiBDS18,
-  author = {Ali Abbassi and
-               Amin Bandali and
-               Nancy A. Day and
-               Jos{\'{e}} Serna},
-  title = {A Comparison of the Declarative Modelling Languages
-                  {B}, {Dash}, and {TLA\textsuperscript{+}}},
-  booktitle = {8th {IEEE} International Model-Driven Requirements
-                  Engineering Workshop, MoDRE@RE 2018, Banff, AB,
-                  Canada, August 20, 2018},
-  pages = {11--20},
-  year = {2018},
-  crossref = {DBLP:conf/re/2018modre},
-  url = {https://doi.org/10.1109/MoDRE.2018.00008},
-  doi = {10.1109/MoDRE.2018.00008},
-  timestamp = {Thu, 14 Feb 2019 15:07:29 +0100},
-  biburl = {https://dblp.org/rec/bib/conf/re/AbbassiBDS18},
-  bibsource = {dblp computer science bibliography, https://dblp.org},
-  pdf = {https://p.bndl.org/modre2018-declarative.pdf}
-}
-
- -
-@proceedings{DBLP:conf/re/2018modre,
-  editor = {Ana Moreira and
-               Gunter Mussbacher and
-               Jo{\~{a}}o Ara{\'{u}}jo and
-               Pablo S{\'{a}}nchez},
-  title = {8th {IEEE} International Model-Driven Requirements
-                  Engineering Workshop, MoDRE@RE 2018, Banff, AB,
-                  Canada, August 20, 2018},
-  publisher = {{IEEE} Computer Society},
-  year = {2018},
-  url = {http://ieeexplore.ieee.org/xpl/mostRecentIssue.jsp?punumber=8500723},
-  isbn = {978-1-5386-8406-1},
-  timestamp = {Thu, 14 Feb 2019 15:07:29 +0100},
-  biburl = {https://dblp.org/rec/bib/conf/re/2018modre},
-  bibsource = {dblp computer science bibliography, https://dblp.org}
-}
-
- -
-@mastersthesis{bandali2020,
-  type = {{MMath} thesis},
-  author = {Amin Bandali},
-  title = {{A Comprehensive Study of Declarative Modelling Languages}},
-  school = {University of Waterloo, David R. Cheriton School of Computer Science},
-  year = 2020,
-  month = {July},
-  publisher = {UWSpace},
-  url = {http://hdl.handle.net/10012/16059},
-  note = {\url{http://hdl.handle.net/10012/16059} and
-                  \url{https://bndl.org/mmath}},
-  pdf = {https://p.bndl.org/bandali-mmath-thesis.pdf}
-}
-
- diff --git a/static/publications-partial.html b/static/publications-partial.html new file mode 100644 index 0000000..0650d32 --- /dev/null +++ b/static/publications-partial.html @@ -0,0 +1,40 @@ + + + + + + + + + + + + +
+[2] + +Amin Bandali. + A Comprehensive Study of Declarative Modelling Languages. + MMath thesis, University of Waterloo, David R. Cheriton School of + Computer Science, July 2020. + http://hdl.handle.net/10012/16059 and + https://bndl.org/mmath. +[ bib | +http | +.pdf ] + +
+[1] + +Ali Abbassi, Amin Bandali, Nancy A. Day, and José Serna. + A comparison of the declarative modelling languages B, Dash, and + TLA+. + In Ana Moreira, Gunter Mussbacher, João Araújo, and Pablo + Sánchez, editors, 8th IEEE International Model-Driven + Requirements Engineering Workshop, MoDRE@RE 2018, Banff, AB, Canada, August + 20, 2018, pages 11–20. IEEE Computer Society, 2018. +[ bib | +http | +.pdf ] + +
\ No newline at end of file diff --git a/static/publications.html b/static/publications.html deleted file mode 100644 index 0650d32..0000000 --- a/static/publications.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - -
-[2] - -Amin Bandali. - A Comprehensive Study of Declarative Modelling Languages. - MMath thesis, University of Waterloo, David R. Cheriton School of - Computer Science, July 2020. - http://hdl.handle.net/10012/16059 and - https://bndl.org/mmath. -[ bib | -http | -.pdf ] - -
-[1] - -Ali Abbassi, Amin Bandali, Nancy A. Day, and José Serna. - A comparison of the declarative modelling languages B, Dash, and - TLA+. - In Ana Moreira, Gunter Mussbacher, João Araújo, and Pablo - Sánchez, editors, 8th IEEE International Model-Driven - Requirements Engineering Workshop, MoDRE@RE 2018, Banff, AB, Canada, August - 20, 2018, pages 11–20. IEEE Computer Society, 2018. -[ bib | -http | -.pdf ] - -
\ No newline at end of file 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; }