Reorganize Chicago Figures code (#2220)

citation-style-language · Oct 8, 2016 · 191073357cffaa663dd6856cafb0d46143d71006 · 1910733
1 parent f009c6a
commit 191073357cffaa663dd6856cafb0d46143d71006
Unified Split

Showing with 35 additions and 37 deletions.

+35 −37 chicago-figures.csl
diff --git a/chicago-figures.csl b/chicago-figures.csl
@@ -16,55 +16,53 @@
     <updated>2013-06-20T20:16:50+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
-  <macro name="Figure">
-    <text term="figure" suffix=" "/>
-    <text variable="citation-number" suffix=". "/>
-  </macro>
   <citation>
     <sort>
       <key variable="citation-number"/>
     </sort>
     <layout delimiter=", " prefix="(" suffix=")">
-      <text term="figure" form="short" suffix=" "/>
-      <text variable="citation-number"/>
+      <group delimiter=" ">
+        <text term="figure" form="short"/>
+        <text variable="citation-number"/>
+      </group>
     </layout>
   </citation>
   <bibliography>
     <sort>
       <key variable="citation-number"/>
     </sort>
     <layout suffix=".">
-      <choose>
-        <if type="graphic" match="any">
-          <group>
-            <text macro="Figure"/>
-            <names variable="author"/>
-            <text variable="title" font-style="italic" prefix=", "/>
-            <date date-parts="year" form="text" variable="issued" prefix=", ">
-              <date-part name="year"/>
-            </date>
-            <text variable="medium" prefix=", "/>
-            <text variable="dimensions" prefix=", "/>
-            <text variable="archive" prefix=", "/>
-          </group>
-        </if>
-      </choose>
-      <choose>
-        <if type="chapter" match="any">
-          <group>
-            <text macro="Figure"/>
-            <names variable="author"/>
-            <text variable="title" font-style="italic" prefix=", "/>
-            <text variable="container-title" font-style="italic" font-weight="normal" prefix=", in "/>
-            <names variable="container-author" prefix=", by "/>
-            <names variable="editor" prefix=", edited by "/>
-            <date date-parts="year" form="text" variable="issued" prefix=", ">
-              <date-part name="year"/>
-            </date>
-            <text variable="publisher-place" prefix=", "/>
-          </group>
-        </if>
-      </choose>
+      <group delimiter=" ">
+        <text term="figure"/>
+        <text variable="citation-number" suffix="."/>
+        <group delimiter=", ">
+          <names variable="author"/>
+          <text variable="title" font-style="italic"/>
+          <choose>
+            <if type="graphic" match="any">
+              <group delimiter=", ">
+                <date date-parts="year" form="text" variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text variable="medium"/>
+                <text variable="dimensions"/>
+                <text variable="archive"/>
+              </group>
+            </if>
+            <else-if type="chapter" match="any">
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic" font-weight="normal" prefix="in "/>
+                <names variable="container-author" prefix="by "/>
+                <names variable="editor" prefix="edited by "/>
+                <date date-parts="year" form="text" variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text variable="publisher-place"/>
+              </group>
+            </else-if>
+          </choose>
+        </group>
+      </group>
     </layout>
   </bibliography>
 </style>