make publications and bandali-bib actual pages

this seems better than the initial pass

diff --git a/Makefile b/Makefile
index a7071a1..a8b6ccb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 SRC := $(filter-out $(wildcard meta_*), \
 $(wildcard *.m4 fsf-internship/*.m4))
 OUTPUTS := $(patsubst %.m4,out/%.html, $(SRC))
 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)
 
 
 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): ; 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)
        $(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/
 
 clean:
        rm -rf out/


@@ -31,8 +30,7 @@ deploy:
 watch:
        while true; do \
        echo $(SRC) header.html footer.html \
 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
 
        Makefile static/Makefile | \
        tr " " "\n" | entr -d make; done
 

diff --git a/bandali-bib.m4 b/bandali-bib.m4
new file mode 100644 (file)
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
+
+<article id="bandali-bib">
+include(static/bandali-bib-partial.html)
+</article>
+
+include(footer.html)dnl

diff --git a/publications.m4 b/publications.m4
index 8a32f8a..4302e03 100644 (file)
--- a/publications.m4
+++ b/publications.m4
@@ -3,10 +3,10 @@ define(__title, `Publications')dnl
 define(__slug, `publications')dnl
 include(header.html)dnl
 
 define(__slug, `publications')dnl
 include(header.html)dnl
 

-<article id="pubs">
+<article id="publications">

 <h1>Publications</h1>
 
 <h1>Publications</h1>
 

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

 
 <p class="muted bibtex2html"><em>bibliography generated using
 <a href="//www.lri.fr/~filliatr/bibtex2html/">bibtex2html</a></em></p>
 
 <p class="muted bibtex2html"><em>bibliography generated using
 <a href="//www.lri.fr/~filliatr/bibtex2html/">bibtex2html</a></em></p>

diff --git a/static/Makefile b/static/Makefile
index 07c43a6..112de86 100644 (file)
--- 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
        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 (file)
index 0000000..eb58572
--- /dev/null
+++ b/static/bandali-bib-partial.html
@@ -0,0 +1,58 @@
+<h1><a href="bandali.bib">bandali.bib</a></h1><a name="DBLP:conf/re/AbbassiBDS18"></a><pre>
+@inproceedings{<a href="publications#DBLP:conf/re/AbbassiBDS18">DBLP:conf/re/AbbassiBDS18</a>,
+  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 = {<a href="#DBLP:conf/re/2018modre">DBLP:conf/re/2018modre</a>},
+  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}
+}
+</pre>
+
+<a name="DBLP:conf/re/2018modre"></a><pre>
+@proceedings{<a href="publications#DBLP:conf/re/2018modre">DBLP:conf/re/2018modre</a>,
+  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 = {<a href="http://ieeexplore.ieee.org/xpl/mostRecentIssue.jsp?punumber=8500723">http://ieeexplore.ieee.org/xpl/mostRecentIssue.jsp?punumber=8500723</a>},
+  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}
+}
+</pre>
+
+<a name="bandali2020"></a><pre>
+@mastersthesis{<a href="publications#bandali2020">bandali2020</a>,
+  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 = {<a href="http://hdl.handle.net/10012/16059">http://hdl.handle.net/10012/16059</a>},
+  note = {\url{http://hdl.handle.net/10012/16059} and
+                  \url{https://bndl.org/mmath}},
+  pdf = {https://p.bndl.org/bandali-mmath-thesis.pdf}
+}
+</pre>
+

diff --git a/static/bandali-bib.html b/static/bandali-bib.html
deleted file mode 100644 (file)
index eb58572..0000000
--- a/static/bandali-bib.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1><a href="bandali.bib">bandali.bib</a></h1><a name="DBLP:conf/re/AbbassiBDS18"></a><pre>
-@inproceedings{<a href="publications#DBLP:conf/re/AbbassiBDS18">DBLP:conf/re/AbbassiBDS18</a>,
-  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 = {<a href="#DBLP:conf/re/2018modre">DBLP:conf/re/2018modre</a>},
-  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}
-}
-</pre>
-
-<a name="DBLP:conf/re/2018modre"></a><pre>
-@proceedings{<a href="publications#DBLP:conf/re/2018modre">DBLP:conf/re/2018modre</a>,
-  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 = {<a href="http://ieeexplore.ieee.org/xpl/mostRecentIssue.jsp?punumber=8500723">http://ieeexplore.ieee.org/xpl/mostRecentIssue.jsp?punumber=8500723</a>},
-  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}
-}
-</pre>
-
-<a name="bandali2020"></a><pre>
-@mastersthesis{<a href="publications#bandali2020">bandali2020</a>,
-  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 = {<a href="http://hdl.handle.net/10012/16059">http://hdl.handle.net/10012/16059</a>},
-  note = {\url{http://hdl.handle.net/10012/16059} and
-                  \url{https://bndl.org/mmath}},
-  pdf = {https://p.bndl.org/bandali-mmath-thesis.pdf}
-}
-</pre>
-

diff --git a/static/publications-partial.html b/static/publications-partial.html
new file mode 100644 (file)
index 0000000..0650d32
--- /dev/null
+++ b/static/publications-partial.html
@@ -0,0 +1,40 @@
+<table>
+
+<tr valign="top">
+<td align="right" class="bibtexnumber">
+[<a name="bandali2020">2</a>]
+</td>
+<td class="bibtexitem">
+<a href="https://bndl.org">Amin Bandali</a>.
+ A Comprehensive Study of Declarative Modelling Languages.
+ MMath thesis, University of Waterloo, David R. Cheriton School of
+  Computer Science, July 2020.
+ <a href="http://hdl.handle.net/10012/16059">http://hdl.handle.net/10012/16059</a> and
+  <a href="https://bndl.org/mmath">https://bndl.org/mmath</a>.
+[&nbsp;<a href="bandali-bib#bandali2020">bib</a>&nbsp;| 
+<a href="http://hdl.handle.net/10012/16059">http</a>&nbsp;| 
+<a href="https://p.bndl.org/bandali-mmath-thesis.pdf">.pdf</a>&nbsp;]
+
+</td>
+</tr>
+
+
+<tr valign="top">
+<td align="right" class="bibtexnumber">
+[<a name="DBLP:conf/re/AbbassiBDS18">1</a>]
+</td>
+<td class="bibtexitem">
+Ali Abbassi, <a href="https://bndl.org">Amin Bandali</a>, <a href="https://cs.uwaterloo.ca/~nday/">Nancy&nbsp;A. Day</a>, and Jos&eacute; Serna.
+ A comparison of the declarative modelling languages B, Dash, and
+  TLA<sup>+</sup>.
+ In Ana Moreira, Gunter Mussbacher, Jo&atilde;o Ara&uacute;jo, and Pablo
+  S&aacute;nchez, editors, <em>8th IEEE International Model-Driven
+  Requirements Engineering Workshop, MoDRE@RE 2018, Banff, AB, Canada, August
+  20, 2018</em>, pages 11&#x2013;20. IEEE Computer Society, 2018.
+[&nbsp;<a href="bandali-bib#DBLP:conf/re/AbbassiBDS18">bib</a>&nbsp;| 
+<a href="https://doi.org/10.1109/MoDRE.2018.00008">http</a>&nbsp;| 
+<a href="https://p.bndl.org/modre2018-declarative.pdf">.pdf</a>&nbsp;]
+
+</td>
+</tr>
+</table>
\ No newline at end of file

diff --git a/static/publications.html b/static/publications.html
deleted file mode 100644 (file)
index 0650d32..0000000
--- a/static/publications.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<table>
-
-<tr valign="top">
-<td align="right" class="bibtexnumber">
-[<a name="bandali2020">2</a>]
-</td>
-<td class="bibtexitem">
-<a href="https://bndl.org">Amin Bandali</a>.
- A Comprehensive Study of Declarative Modelling Languages.
- MMath thesis, University of Waterloo, David R. Cheriton School of
-  Computer Science, July 2020.
- <a href="http://hdl.handle.net/10012/16059">http://hdl.handle.net/10012/16059</a> and
-  <a href="https://bndl.org/mmath">https://bndl.org/mmath</a>.
-[&nbsp;<a href="bandali-bib#bandali2020">bib</a>&nbsp;| 
-<a href="http://hdl.handle.net/10012/16059">http</a>&nbsp;| 
-<a href="https://p.bndl.org/bandali-mmath-thesis.pdf">.pdf</a>&nbsp;]
-
-</td>
-</tr>
-
-
-<tr valign="top">
-<td align="right" class="bibtexnumber">
-[<a name="DBLP:conf/re/AbbassiBDS18">1</a>]
-</td>
-<td class="bibtexitem">
-Ali Abbassi, <a href="https://bndl.org">Amin Bandali</a>, <a href="https://cs.uwaterloo.ca/~nday/">Nancy&nbsp;A. Day</a>, and Jos&eacute; Serna.
- A comparison of the declarative modelling languages B, Dash, and
-  TLA<sup>+</sup>.
- In Ana Moreira, Gunter Mussbacher, Jo&atilde;o Ara&uacute;jo, and Pablo
-  S&aacute;nchez, editors, <em>8th IEEE International Model-Driven
-  Requirements Engineering Workshop, MoDRE@RE 2018, Banff, AB, Canada, August
-  20, 2018</em>, pages 11&#x2013;20. IEEE Computer Society, 2018.
-[&nbsp;<a href="bandali-bib#DBLP:conf/re/AbbassiBDS18">bib</a>&nbsp;| 
-<a href="https://doi.org/10.1109/MoDRE.2018.00008">http</a>&nbsp;| 
-<a href="https://p.bndl.org/modre2018-declarative.pdf">.pdf</a>&nbsp;]
-
-</td>
-</tr>
-</table>
\ No newline at end of file

diff --git a/static/style.css b/static/style.css
index 4031953..fdcea52 100644 (file)
--- a/static/style.css
+++ b/static/style.css
@@ -113,8 +113,16 @@ blockquote#abstract {
 pre, code {
   background: #f6f6f6;
   font: 1.15em monospace;
 pre, code {
   background: #f6f6f6;
   font: 1.15em monospace;

+}
+pre {
+  display: inline-block;
+  margin: 0.5em 0;
+  min-width: 100%;

   padding: 1em;
 }
   padding: 1em;
 }

+pre:first-of-type {
+  margin-top: 0;
+}

 pre > code {
   padding: 0;
   background: initial;
 pre > code {
   padding: 0;
   background: initial;


@@ -133,7 +141,7 @@ em {
 table td {
   padding: 0.125em 0.3em;
 }
 table td {
   padding: 0.125em 0.3em;
 }

-#pubs td {
+#publications td {

   padding-top: 0.4em;
   padding-bottom: 0.4em;
 }
   padding-top: 0.4em;
   padding-bottom: 0.4em;
 }