Add SBL short-note style; correct series handling in full-note style.

chicago-author-date.csl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
   <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. -->
   <info>
     <title>Chicago Manual of Style 18th edition (author-date)</title>
@@ -88,7 +88,7 @@
     </terms>
   </locale>
   <!-- Contents:
-
+    
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -109,11 +109,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-
-       Freeform annotations to bibliography entries:
-
+      
+       Freeform annotations to bibliography entries: 
+        
         5. Notes
-
+       
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -403,6 +403,8 @@
         </if>
       </choose>
       <text variable="volume"/>
+      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
+      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -524,7 +526,7 @@
               </if>
               <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
                 <!-- contributors fall after the title of unsigned reference entries (CMOS18 14.130) -->
-                <text macro="author-title-substitute-container-short"/>
+                <text macro="author-title-substitute-container"/>
               </else-if>
             </choose>
             <names variable="illustrator"/>
@@ -733,14 +735,7 @@
       </else-if>
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
-        <choose>
-          <if variable="container-title-short">
-            <text text-case="title" variable="container-title-short"/>
-          </if>
-          <else>
-            <text text-case="title" variable="container-title"/>
-          </else>
-        </choose>
+        <text text-case="title" variable="container-title"/>
       </else-if>
     </choose>
   </macro>
@@ -2412,8 +2407,7 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
-        <else-if match="any" variable="available-date status"/>
+        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -2560,16 +2554,14 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
-        <else-if variable="issued"/>
-        <else-if variable="available-date">
+        <if match="none" variable="collection-title issue number page supplement-number volume">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </else-if>
+        </if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3227,16 +3219,7 @@
       <choose>
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
-          <!-- avoid possible repetition of `container-title` with author-date: -->
-          <choose>
-            <if variable="publisher">
-              <text text-case="title" variable="container-title"/>
-            </if>
-            <else-if type="webpage" variable="container-title container-title-short"/>
-            <else>
-              <text text-case="title" variable="container-title"/>
-            </else>
-          </choose>
+          <text text-case="title" variable="container-title"/>
         </if>
       </choose>
       <choose>
@@ -4149,17 +4132,7 @@
           <text variable="references"/>
         </if>
         <else>
-          <group delimiter=" ">
-            <text macro="author-bib"/>
-            <choose>
-              <!-- give key to abbreviations (CMOS18 13.127, 14.104) -->
-              <!-- TODO: add `authority` and `publisher` if it becomes possible to test for short forms -->
-              <if type="webpage" variable="publisher"/>
-              <else-if type="webpage" variable="container-title container-title-short">
-                <text prefix="(" suffix=")" text-case="title" variable="container-title"/>
-              </else-if>
-            </choose>
-          </group>
+          <text macro="author-bib"/>
           <text macro="date"/>
           <text macro="title-and-source-bib"/>
           <text variable="references"/>

chicago-notes-bibliography.csl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" initialize-with=". " page-range-format="chicago-16" version="1.0">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" demote-non-dropping-particle="display-and-sort" initialize-with=". " page-range-format="chicago-16" version="1.0">
   <!-- This file was generated by the Style Variant Builder <https://github.com/citation-style-language/style-variant-builder>. To contribute changes, modify the template and regenerate variants. -->
   <info>
     <title>Chicago Manual of Style 18th edition (notes and bibliography)</title>
@@ -87,7 +87,7 @@
     </terms>
   </locale>
   <!-- Contents:
-
+    
        This file interprets Chicago using APA's four basic reference elements
        (cf. CMOS18 14.2, 14.64, 14.161):
 
@@ -108,11 +108,11 @@
             4.8. Medium
             4.9. Archival location
             4.10. URL or persistent identifier
-
-       Freeform annotations to bibliography entries:
-
+      
+       Freeform annotations to bibliography entries: 
+        
         5. Notes
-
+       
        Chicago also provides parallel rules for legal references following
        The Bluebook: A Uniform System of Citation (code shared with APA):
 
@@ -423,6 +423,8 @@
         </if>
       </choose>
       <text variable="volume"/>
+      <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
+      <!-- <choose><if is-numeric="number-of-volumes" variable="volume"><text value="of"/><text variable="number-of-volumes"/></if></choose>-->
     </group>
   </macro>
   <macro name="label-volume-capitalized">
@@ -545,7 +547,7 @@
           </if>
           <else-if type="broadcast" variable="container-title number title">
             <!-- note contributors fall after the title of `broadcast` (CMOS18 14.165) -->
-            <text macro="author-title-substitute-container-short"/>
+            <text macro="author-title-substitute-container"/>
           </else-if>
           <else-if match="any" type="broadcast motion_picture song">
             <!-- note contributors fall after the title of `broadcast`, `motion_picture` (CMOS18 14.165), `song` (CMOS18 14.163)  -->
@@ -648,7 +650,7 @@
               </if>
               <else-if type="broadcast" variable="container-title number title">
                 <!-- note contributors fall after the title of `broadcast` (CMOS18 14.165) -->
-                <text macro="author-title-substitute-container-short"/>
+                <text macro="author-title-substitute-container"/>
               </else-if>
               <else-if match="any" type="broadcast motion_picture song">
                 <!-- note contributors fall after the title of `broadcast`, `motion_picture` (CMOS18 14.165), `song` (CMOS18 14.163)  -->
@@ -657,7 +659,7 @@
               <!-- unsigned reference articles consulted in physical formats list `title` in the manner of a `sub-verbo` locator (CMOS18 14.130) -->
               <else-if match="any" variable="DOI URL"/>
               <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
-                <text macro="author-title-substitute-container-short"/>
+                <text macro="author-title-substitute-container"/>
               </else-if>
             </choose>
             <names variable="illustrator"/>
@@ -900,8 +902,6 @@
       <else-if type="webpage">
         <!-- list a webpage under the website title if there is no owner or sponsor (CMOS18 14.104) -->
         <text text-case="title" variable="container-title"/>
-        <!-- for author-date:
-        <choose><if variable="container-title-short"><text text-case="title" variable="container-title-short"/></if><else><text text-case="title" variable="container-title"/></else></choose>-->
       </else-if>
     </choose>
   </macro>
@@ -3015,7 +3015,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -3202,6 +3202,8 @@
             <else-if match="any" variable="container-author editor editor-translator translator">
               <text macro="label-volume"/>
             </else-if>
+            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
+            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if is-numeric="volume" variable="page">
@@ -3216,6 +3218,8 @@
               <!-- remove condition in styles that print chapter page numbers (CMOS17/classic) -->
               <text macro="label-volume"/>
             </else-if>
+            <!-- always display number of volumes in notes without bibliography (CMOS18 14.20): -->
+            <!-- <else><text macro="label-number-of-volumes"/></else>-->
           </choose>
         </else-if>
         <else-if variable="volume">
@@ -3359,8 +3363,7 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
-        <else-if match="any" variable="available-date status"/>
+        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3390,8 +3393,7 @@
       <text macro="source-serial-name"/>
       <choose>
         <!-- 'ahead of print' is placed akin to a series (CMOS18 14.75) -->
-        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
-        <else-if match="any" variable="available-date status"/>
+        <if match="any" variable="available-date collection-title issue number page status supplement-number volume volume-title"/>
         <else-if type="article-journal" variable="DOI issued">
           <text term="advance-online-publication"/>
         </else-if>
@@ -3648,16 +3650,14 @@
   <macro name="source-serial-volume-status-bib">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
-        <else-if variable="issued"/>
-        <else-if variable="available-date">
+        <if match="none" variable="collection-title issue number page supplement-number volume">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </else-if>
+        </if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-bib"/>
@@ -3670,16 +3670,14 @@
   <macro name="source-serial-volume-status-note">
     <group delimiter=", ">
       <choose>
-        <if match="any" variable="collection-title issue number page supplement-number volume volume-title"/>
-        <else-if variable="issued"/>
-        <else-if variable="available-date">
+        <if match="none" variable="collection-title issue number page supplement-number volume">
           <group delimiter=" ">
             <!-- article accepted for publication and available on publisher website (CMOS18 14.75) -->
             <!-- TODO: use CSL term for `available-date` when available -->
             <text value="accepted"/>
             <date form="text" variable="available-date"/>
           </group>
-        </else-if>
+        </if>
       </choose>
       <group delimiter=" ">
         <text macro="source-date-status-note"/>
@@ -4161,7 +4159,7 @@
       <text macro="identifier-volume-note"/>
       <text macro="source-monographic-identifier-contributors-note"/>
       <choose>
-        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243 -->
+        <!-- notes only show the number of volumes if there is no physical locator, which should include a volume number, e.g. 4:243; except when using notes without bibliography (CMOS18 14.20) -->
         <if match="any" variable="part-number part-title volume volume-title"/>
         <else-if locator="column"/>
         <else-if locator="folio"/>
@@ -4716,8 +4714,6 @@
         <if match="any" type="post webpage">
           <!-- print `container-title` on `post` or `webpage` in the same way as `publisher` (CMOS18 14.104-106) -->
           <text text-case="title" variable="container-title"/>
-          <!-- avoid possible repetition of `container-title` with author-date: -->
-          <!-- <choose><if variable="publisher"><text text-case="title" variable="container-title"/></if><else-if type="webpage" variable="container-title container-title-short"/><else><text text-case="title" variable="container-title"/></else></choose>-->
         </if>
       </choose>
       <choose>
@@ -5872,23 +5868,9 @@
       <group delimiter=", ">
         <text macro="author-short"/>
         <choose>
-          <if match="any" type="bill hearing legal_case legislation regulation treaty"/>
-          <else-if match="any" type="entry entry-dictionary entry-encyclopedia">
-            <group delimiter=" ">
-              <choose>
-                <if locator="sub-verbo"/>
-                <!-- Only print reference entries use `sub-verbo` (CMOS18 14.131) -->
-                <else-if match="any" variable="DOI URL"/>
-                <else-if variable="container-title title">
-                  <text form="short" term="sub-verbo"/>
-                </else-if>
-              </choose>
-              <text macro="title-and-descriptions-short"/>
-            </group>
-          </else-if>
-          <else>
+          <if match="none" type="bill hearing legal_case legislation regulation treaty">
             <text macro="title-and-descriptions-short"/>
-          </else>
+          </if>
         </choose>
         <text macro="citation-notes-shortened-author-title-disambiguate"/>
         <choose>