Misc updates

Makefile

@@ -74,7 +74,7 @@ pdf: 00_tex 01_tex 02_tex 03_tex 04_tex 05_tex 06_tex 07_tex
 	[ -f $(BUILDDIR)/thesis.pdf ] && cp $(BUILDDIR)/thesis.pdf $(OUTPUTDIR)
 
 clean:
-	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)
+	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR)/*
 	cd $(BUILDDIR); git clean -f -X
 
 serve:

build/american_physical_society.csl

@@ -80,6 +80,50 @@
       </else>
     </choose>
   </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if type="webpage post-weblog" match="any">
+          <date variable="issued" form="text"/>
+        </if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="DOI: https://doi.org/"/>
+            </if>
+            <else>
+              <text variable="URL" prefix="URL: "/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
   <citation collapse="citation-number">
     <sort>
       <key variable="citation-number"/>
@@ -88,7 +132,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography entry-spacing="0" second-field-align="flush">
+  <bibliography et-al-min="5" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0" second-field-align="flush">
     <layout suffix=".">
       <text variable="citation-number" prefix="[" suffix="]"/>
       <text macro="author" suffix=", "/>
@@ -133,7 +177,7 @@
         </else-if>
         <else-if type="thesis">
           <group delimiter=", ">
-            <text variable="title" text-case="title"/>
+            <text variable="title" text-case="title" font-style="italic"/>
             <text variable="genre"/>
             <text variable="publisher"/>
             <text macro="year-date"/>
@@ -141,7 +185,7 @@
         </else-if>
         <else>
           <group delimiter=" ">
-            <text variable="container-title" form="short" text-case="title"/>
+            <text variable="title" form="short" text-case="title" font-style="italic"/>
             <group delimiter=", ">
               <text variable="volume" font-weight="bold"/>
               <group delimiter=" ">
@@ -152,6 +196,7 @@
           </group>
         </else>
       </choose>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>

convert.py

@@ -15,7 +15,6 @@ def make_tex(infilename):
     run(('pandoc', '--biblatex',
          '-F', 'pandoc-crossref',
          '-F', '../filters/note_filter.py',
-         # '-F', '../filters/shorthand_filter.py',
          '-s', infilename, '-o', outfilename,
          '--metadata=bibliography:references.bib',
          f'--template={template}',
@@ -32,12 +31,11 @@ def make_html(infilename):
     run(('pandoc',
          '-F', 'pandoc-crossref',
          '-F', 'pandoc-citeproc',
-         # '-F', '../filters/shorthand_filter.py',
          '-s', infilename, '-o', outfilename,
          '--mathjax',
          '--metadata=linkReferences:true',
          '--metadata=bibliography:references.bib',
-         '--metadata=citation-style:american-institute-of-physics.csl',
+         '--metadata=citation-style:american_physical_society.csl',
          '--template=chapter',
          ))
 

elegant

@@ -1 +1 @@
-Subproject commit ae72b277465937168931c9e14311233cf3013380
+Subproject commit 6fe53ece8bf41c2debf980a733b2b9405dcb5335

pelicanconf.py

@@ -23,6 +23,8 @@ AUTHOR_SAVE_AS = ''
 IGNORE_FILES = ['.#*', '*.md', 'chapter.html']
 SLUGIFY_SOURCE = 'basename'
 
+DRAFT = False
+
 SITEMAP = {'format': 'txt'}
 DEFAULT_DATE = 'fs'  # filesystem date