Group all publications together

1 files changed, 100 insertions, 112 deletions

diff --git a/resources/pug/finals/index.pug b/resources/pug/finals/index.pug
index 041e2ec..fe122c0 100644
--- a/resources/pug/finals/index.pug
+++ b/resources/pug/finals/index.pug
@@ -72,7 +72,23 @@ block content
 		section#publications
 			h2 Publications
 			mixin pub(year, title)
-				p
+				td.icon
+					if attributes.type
+						if attributes.type == 'phd-thesis'
+							i.fa.fa-graduation-cap(title="PhD thesis")
+						else if attributes.type == 'master-thesis'
+							i.fa.fa-graduation-cap(title="Master thesis")
+						else if attributes.type == 'bachelor-thesis'
+							i.fa.fa-graduation-cap(title="Bachelor thesis")
+						else if attributes.type == 'review'
+							i.far.fa-comment(title="Book review")
+						else if attributes.type == 'chapter'
+							i.fa.fa-book-open(title="Book chapter")
+						else
+							- throw 'pub: unknown type'
+					else
+						i.far.fa-file-lines(title="Journal article")
+				td.icon
 					if attributes.oa
 						if attributes.url
 							- var oaurl = attributes.url
@@ -83,142 +99,112 @@ block content
 						a.oa(href!=oaurl, target='_blank')
 							i.ai.ai-lg.ai-open-access(title="Open Access")
 
-					if !attributes.authors
-						- attributes.authors = 'Staps, Camil'
-					| !{attributes.authors}. #{year}. 
-					|
-					if attributes.url
-						a(href!=attributes.url, target='_blank')!= title
-					else if attributes.publisher && !attributes.pages
-						i!= title
-					else
-						| !{title}
-					|
-					if attributes.journal
-						|. !{attributes.prejournal}#[em!=attributes.journal]
-						if attributes.volume
-							|  #{attributes.volume}
-							if attributes.issue
-								| (#{attributes.issue})
-					else if attributes.booktitle
-						| . In !{attributes.editors} (eds.), #[em!=attributes.booktitle]
-					else if attributes.misc
-						| . #{attributes.misc}
-					if attributes.pages
-						- attributes.pages = attributes.pages.replace('-', '–')
-						if attributes.journal
-							| :!{attributes.pages}
+				td
+					p
+						if !attributes.authors
+							- attributes.authors = 'Staps, Camil'
+						| !{attributes.authors}. #{year}. 
+						|
+						if attributes.url
+							a(href!=attributes.url, target='_blank')!= title
+						else if attributes.publisher && !attributes.pages
+							i!= title
 						else
-							| , !{attributes.pages}
-					| .
-					if attributes.address
-						|  #{attributes.address}:
-					if attributes.publisher
-						|  #{attributes.publisher}.
-					if attributes.doi
-						|  #[span.sc doi]: 
-						- var doiurl = 'https://doi.org/'+attributes.doi
-						a(href!=doiurl, target='_blank')!= attributes.doi
+							| !{title}
+						|
+						if attributes.journal
+							|. !{attributes.prejournal}#[em!=attributes.journal]
+							if attributes.volume
+								|  #{attributes.volume}
+								if attributes.issue
+									| (#{attributes.issue})
+						else if attributes.booktitle
+							| . In !{attributes.editors} (eds.), #[em!=attributes.booktitle]
+						else if attributes.misc
+							| . #{attributes.misc}
+						if attributes.pages
+							- attributes.pages = attributes.pages.replace('-', '–')
+							if attributes.journal
+								| :!{attributes.pages}
+							else
+								| , !{attributes.pages}
 						| .
-					if attributes.errata
-						|  (There are #[a(href!=attributes.errata) errata].)
+						if attributes.address
+							|  #{attributes.address}:
+						if attributes.publisher
+							|  #{attributes.publisher}.
+						if attributes.doi
+							|  #[span.sc doi]: 
+							- var doiurl = 'https://doi.org/'+attributes.doi
+							a(href!=doiurl, target='_blank')!= attributes.doi
+							| .
+						if attributes.errata
+							|  (There are #[a(href!=attributes.errata) errata].)
+
 			mixin review(year, author, title)
 				+pub(year, 'Review of: ' + author + ', ' + title)&attributes(attributes)
 
-			p I keep track of #[a(href='/publications.html') time from submission to publication].
-
-			h4 Dissertation
-			table.main_table.publications
-				tr
-					td 2024
-					td
-						+pub(2024, 'The persistence of space: Formalizing the polysemy of spatial relations in functional elements')(misc='Leiden University dissertation', address='Amsterdam', publisher='LOT', doi='10.48273/LOT0673', oa, errata='/dissertation-errata.html')
-
-			h4 Refereed articles and book chapters
 			table.main_table.publications
 				tr
 					td In preparation
-					td
-						+pub('In preparation', 'Iconic features in nominal reduplication')
+					+pub('In preparation', 'Iconic features in nominal reduplication')
 				tr
 					td
-					td
-						+pub('In preparation', 'Complementation and Common Ground: Discursive effects in Biblical Hebrew')(url='https://lingbuzz.net/lingbuzz/007711', oa)
+					+pub('In preparation', 'Complementation and Common Ground: Discursive effects in Biblical Hebrew')(url='https://lingbuzz.net/lingbuzz/007711', oa)
 				tr
 					td 2024
-					td
-						+pub(2024, 'Large Language Models and Biblical Hebrew: Limitations, pitfalls, opportunities')(journal='HIPHIL Novum', volume=9, issue=1, pages='46-55', doi='10.7146/hn.v9i1.144177', oa)
+					+pub(2024, 'The persistence of space: Formalizing the polysemy of spatial relations in functional elements')(misc='Leiden University dissertation', address='Amsterdam', publisher='LOT', doi='10.48273/LOT0673', oa, errata='/dissertation-errata.html', type='phd-thesis')
 				tr
 					td
-					td
-						+pub(2024, 'Semantic properties of prepositions: The distinction between causal <i>min</i> &lsquo;from&rsquo; and <i>bə</i> &lsquo;in&rsquo;')(authors='Staps, Camil & Martijn Beukenhorst', journal='Brill\'s Journal of Afroasiatic Languages and Linguistics', volume=16, issue=2, pages='217-250', doi='10.1163/18776930-01602002', oa)
+					+pub(2024, 'Large Language Models and Biblical Hebrew: Limitations, pitfalls, opportunities')(journal='HIPHIL Novum', volume=9, issue=1, pages='46-55', doi='10.7146/hn.v9i1.144177', oa)
 				tr
 					td
+					+pub(2024, 'Semantic properties of prepositions: The distinction between causal <i>min</i> &lsquo;from&rsquo; and <i>bə</i> &lsquo;in&rsquo;')(authors='Staps, Camil & Martijn Beukenhorst', journal='Brill\'s Journal of Afroasiatic Languages and Linguistics', volume=16, issue=2, pages='217-250', doi='10.1163/18776930-01602002', oa)
+				tr
 					td
-						+pub(2024, 'Formalizing spatial-causal polysemy of Agent prepositions')(authors='Staps, Camil & Johan Rooryck', journal='Semantics & Pragmatics', volume=17, issue=4, pages='1-47', doi='10.3765/sp.17.4', oa)
+					+pub(2024, 'Formalizing spatial-causal polysemy of Agent prepositions')(authors='Staps, Camil & Johan Rooryck', journal='Semantics & Pragmatics', volume=17, issue=4, pages='1-47', doi='10.3765/sp.17.4', oa)
 				tr
 					td 2023
-					td
-						+pub(2023, 'The interpretation of [+distal] in demonstratives and complementizers')(authors='Staps, Camil & Johan Rooryck', journal='Linguistics', volume=61, issue=5, pages='1195-1231', doi='10.1515/ling-2022-0178', oa)
+					+pub(2023, 'The interpretation of [+distal] in demonstratives and complementizers')(authors='Staps, Camil & Johan Rooryck', journal='Linguistics', volume=61, issue=5, pages='1195-1231', doi='10.1515/ling-2022-0178', oa)
 				tr
 					td 2022
-					td
-						+pub(2022, 'Voice, discourse prominence, and aspect: The niphal and passive qal of <em>yālad</em>')(booktitle='Where is the way to the dwelling of light? Studies in Genesis, Job and linguistics in honor of Ellen van Wolde', editors='Pierre Van Hecke & Hanneke van Loon', pages='387-408', address='Leiden', publisher='Brill', doi='10.1163/9789004536296_020', url='https://hdl.handle.net/1887/3641662', oa)
+					+pub(2022, 'Voice, discourse prominence, and aspect: The niphal and passive qal of <em>yālad</em>')(booktitle='Where is the way to the dwelling of light? Studies in Genesis, Job and linguistics in honor of Ellen van Wolde', editors='Pierre Van Hecke & Hanneke van Loon', pages='387-408', address='Leiden', publisher='Brill', doi='10.1163/9789004536296_020', url='https://hdl.handle.net/1887/3641662', oa, type='chapter')
 				tr
 					td
-					td
-						+pub(2022, '<em>Lip̄nē</em> &lsquo;in the face of&rsquo;: A Locative preposition with a threatening connotation')(journal='Journal of Hebrew Scriptures', volume=22, issue=1, pages='1-24', doi='10.5508/jhs29582', oa)
+					+pub(2022, '<em>Lip̄nē</em> &lsquo;in the face of&rsquo;: A Locative preposition with a threatening connotation')(journal='Journal of Hebrew Scriptures', volume=22, issue=1, pages='1-24', doi='10.5508/jhs29582', oa)
 				tr
-					td 2020
-					td
-						+pub(2020, '&ldquo;When dust was poured out&rdquo;: Creation in Job 38.36&ndash;38')(journal='Journal for the Study of the Old Testament', volume=44, issue=3, pages='456-471', doi='10.1177/0309089219862828', oa)
+					td 2021
+					+review(2021, 'Peter Bekins', 'Inscriptions from the world of the Bible: A reader and introduction to Old Northwest Semitic')(journal='Bibliotheca Orientalis', volume=78, issue='5/6', pages='723-726', url='https://hdl.handle.net/1887/3641664', oa, type='review')
 				tr
 					td
-					td
-						+pub(2020, 'Prepositions and the grammaticalization of Ancient Hebrew bipartite reciprocal markers')(journal='Journal of Semitic Studies', volume=65, issue=1, pages='61-84', doi='10.1093/jss/fgz050', oa)
+					+review(2021, 'Margaret Winters', 'Historical linguistics')(journal='LINGUIST List', volume=32, issue=1438, url='https://linguistlist.org/issues/32/32-1438/', oa, type='review')
 				tr
-					td 2019
-					td
-						+pub(2019, 'Lazy interworking of compiled and interpreted code for sandboxing and distributed systems')(authors='Staps, Camil, John van Groningen & Rinus Plasmeijer', booktitle='Implementation and Application of Functional Languages (IFL \'19), September 25–27, 2019, Singapore, Singapore', editors='Jurriën Stutterheim & Wei Ngan Chin', doi='10.1145/3412932.3412941', oa)
+					td 2020
+					+pub(2020, '&ldquo;When dust was poured out&rdquo;: Creation in Job 38.36&ndash;38')(journal='Journal for the Study of the Old Testament', volume=44, issue=3, pages='456-471', doi='10.1177/0309089219862828', oa)
 				tr
-					td 2018
 					td
-						+pub(2018, 'A case study of reciprocal middles in Biblical Hebrew: The niphal of לחם')(journal='Orientalia', volume=87, issue=2, pages='159-183', url='http://www.academia.edu/37896637')
-
-			h4#book-reviews Book reviews
-			table.main_table.publications
+					+pub(2020, 'Prepositions and the grammaticalization of Ancient Hebrew bipartite reciprocal markers')(journal='Journal of Semitic Studies', volume=65, issue=1, pages='61-84', doi='10.1093/jss/fgz050', oa)
 				tr
-					td 2021
 					td
-						+review(2021, 'Peter Bekins', 'Inscriptions from the world of the Bible: A reader and introduction to Old Northwest Semitic')(journal='Bibliotheca Orientalis', volume=78, issue='5/6', pages='723-726', url='https://hdl.handle.net/1887/3641664', oa)
+					+review(2020, 'Elitzur A. Bar-Asher Siegal', 'The NP-strategy for expressing reciprocity')(journal='Bibliotheca Orientalis', volume=77, issue='3/4', pages='318-322', url='https://hdl.handle.net/1887/3142525', oa, type='review')
 				tr
-					td
-					td
-						+review(2021, 'Margaret Winters', 'Historical linguistics')(journal='LINGUIST List', volume=32, issue=1438, url='https://linguistlist.org/issues/32/32-1438/', oa)
+					td 2019
+					+pub(2019, 'Lazy interworking of compiled and interpreted code for sandboxing and distributed systems')(authors='Staps, Camil, John van Groningen & Rinus Plasmeijer', booktitle='Implementation and Application of Functional Languages (IFL \'19), September 25–27, 2019, Singapore, Singapore', editors='Jurriën Stutterheim & Wei Ngan Chin', doi='10.1145/3412932.3412941', oa, type='chapter')
 				tr
-					td 2020
 					td
-						+review(2020, 'Elitzur A. Bar-Asher Siegal', 'The NP-strategy for expressing reciprocity')(journal='Bibliotheca Orientalis', volume=77, issue='3/4', pages='318-322', url='https://hdl.handle.net/1887/3142525', oa)
-
-			h4 Non-refereed work
-			table.main_table.publications
+					+pub(2019, 'Lazy interworking of compiled and interpreted code for sandboxing and distributed systems')(misc='Radboud University Nijmegen MSc. thesis', url='https://www.ru.nl/publish/pages/769526/thesis_1.pdf', oa, type='master-thesis')
 				tr
-					td 2019
 					td
-						+pub(2019, 'Tense, aspect and modality in Jewish Palestinian Aramaic')(misc='Leiden University MA. thesis', url='https://hdl.handle.net/1887/77991', oa)
+					+pub(2019, 'Tense, aspect and modality in Jewish Palestinian Aramaic')(misc='Leiden University MA. thesis', url='https://hdl.handle.net/1887/77991', oa, type='master-thesis')
 				tr
-					td
-					td
-						+pub(2019, 'Lazy interworking of compiled and interpreted code for sandboxing and distributed systems')(misc='Radboud University Nijmegen MSc. thesis', url='https://www.ru.nl/publish/pages/769526/thesis_1.pdf', oa)
+					td 2018
+					+pub(2018, 'A case study of reciprocal middles in Biblical Hebrew: The niphal of לחם')(journal='Orientalia', volume=87, issue=2, pages='159-183', url='http://www.academia.edu/37896637')
 				tr
 					td 2017
-					td
-						+pub(2017, 'Code generation for the Thumb-2 instruction set')(misc='Radboud University Nijmegen BSc. thesis', url='https://cs.ru.nl/bachelorscripties/2017/Camil_Staps___4498062___Code-generation-for-the-Thumb-2-instruction-set.pdf', oa)
+					+pub(2017, 'Code generation for the Thumb-2 instruction set')(misc='Radboud University Nijmegen BSc. thesis', url='https://cs.ru.nl/bachelorscripties/2017/Camil_Staps___4498062___Code-generation-for-the-Thumb-2-instruction-set.pdf', oa, type='bachelor-thesis')
 
 		section#talks
 			h2 Talks
-			p.
-				I keep track of #[a(href='/conferences.html') the conferences I visit and how much CO#[sub 2] I emit in doing so].
 
 			table.main_table.presentations
 				tr
@@ -281,6 +267,25 @@ block content
 					td Jan 5, #[a(href="http://clean.cs.ru.nl/NL-FP_dag_2018", title="Dutch Functional Programming Day", target="_blank") NL-FP day]
 					td #[a(href="https://cloogle.org", target="_blank") Cloogle]: a programming language search engine and its applications (#[a(href="https://clean.cs.ru.nl/NL-FP_dag_2018#Camil_Staps_-_Cloogle:_a_programming_language_search_engine_and_its_applications", target="_blank") abstract &amp; slides]).
 
+		section#service
+			h2 Service
+			table.main_table
+				tr
+					td 2024
+					td Proofreader for #[a(href='https://langsci-press.org/', target='_blank') Language Science Press].
+				tr
+					td
+					td Reviewer for #[a(href='https://www.glossa-journal.org/', target='_blank') #[i Glossa]].
+				tr
+					td 2023
+					td Reviewer for #[a(href='https://www.glossa-journal.org/', target='_blank') #[i Glossa]], #[a(href='https://direct.mit.edu/opmi', target='_blank') #[i Open Mind]], and #[a(href='https://www.thenewscholar.nl/', target='_blank') #[i The New Scholar]].
+
+		section#statistics
+			h2 Statistics
+			p.
+				I keep track of #[a(href='/publications.html') time from submission to publication] for my writings,
+				as well as #[a(href='/conferences.html') the conferences I visit and how much CO#[sub 2] I emit in doing so].
+
 		section#projects
 			h2 Software projects
 			table.main_table
@@ -320,23 +325,6 @@ block content
 						Student assistant for various courses in computing science, Radboud University Nijmegen.
 						See under #[a(href='#employment') Employment] for a list of courses.
 
-		section#service
-			h2 Service
-			table.main_table
-				tr
-					td 2024
-					td Proofreader for #[a(href='https://langsci-press.org/', target='_blank') Language Science Press].
-				tr
-					td
-					td Reviewer for #[a(href='https://www.glossa-journal.org/', target='_blank') #[i Glossa]].
-				tr
-					td 2023
-					td Reviewer for #[a(href='https://www.glossa-journal.org/', target='_blank') #[i Glossa]], #[a(href='https://direct.mit.edu/opmi', target='_blank') #[i Open Mind]], and #[a(href='https://www.thenewscholar.nl/', target='_blank') #[i The New Scholar]].
-
-			p
-				| For journal review details, see #[a(href='/publications.html') here].
-				| For book reviews, see #[a(href='#book-reviews') above].
-
 		section#grants
 			h2 Grants
 			table.main_table