Fix sort by a single macro (#5136)

So styles don't rely on the behavior described in citation-style-language/test-suite#31
JabRef · Nov 27, 2020 · ca3839b · ca3839b
1 parent 5d1a7e8
commit ca3839b
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 10 deletions.
diff --git a/beltz-padagogik.csl b/beltz-padagogik.csl
@@ -128,7 +128,7 @@
   <bibliography>
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=". " suffix=".">

diff --git a/berlin-school-of-economics-and-law-international-marketing-management.csl b/berlin-school-of-economics-and-law-international-marketing-management.csl
@@ -146,7 +146,7 @@
   <bibliography>
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=", ">

diff --git a/biuletyn-polskiego-towarzystwa-jezykoznawczego.csl b/biuletyn-polskiego-towarzystwa-jezykoznawczego.csl
@@ -78,6 +78,9 @@
       </else>
     </choose>
   </macro>
+  <macro name="year">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
   <macro name="collection-title-number">
     <group delimiter=" " prefix="(= " suffix=")">
       <text variable="collection-title"/>
@@ -132,7 +135,7 @@
   <bibliography delimiter-precedes-et-al="never" et-al-min="3" et-al-use-first="2" hanging-indent="true">
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=". " suffix=".">

diff --git a/deutsche-sprache.csl b/deutsche-sprache.csl
@@ -60,6 +60,9 @@
       <date date-parts="year" form="text" variable="issued"/>
     </group>
   </macro>
+  <macro name="year">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
   <macro name="edition">
     <choose>
       <if match="any" is-numeric="edition">
@@ -135,7 +138,7 @@
   <bibliography et-al-min="4" et-al-use-first="1">
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=". " suffix=".">

diff --git a/hochschule-hannover-soziale-arbeit.csl b/hochschule-hannover-soziale-arbeit.csl
@@ -129,7 +129,7 @@
   <bibliography>
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=". " suffix=".">

diff --git a/keel-ja-kirjandus.csl b/keel-ja-kirjandus.csl
@@ -63,6 +63,9 @@
       <date date-parts="year" form="text" variable="issued"/>
     </group>
   </macro>
+  <macro name="year">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
   <macro name="edition">
     <choose>
       <if match="any" is-numeric="edition">
@@ -138,7 +141,7 @@
   <bibliography et-al-min="4" et-al-use-first="1">
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=". " suffix=".">

diff --git a/wirtschaftsuniversitat-wien-abteilung-fur-bildungswissenschaft.csl b/wirtschaftsuniversitat-wien-abteilung-fur-bildungswissenschaft.csl
@@ -232,6 +232,36 @@
       </else>
     </choose>
   </macro>
+  <macro name="author-sort">
+    <choose>
+      <if type="legislation" match="any">
+        <group delimiter=" ">
+          <text variable="title"/>
+          <text variable="title-short" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <choose>
+          <if type="bill" match="any">
+            <choose>
+              <if match="none" variable="author editor">
+                <text variable="title-short"/>
+              </if>
+              <else>
+                <text macro="u__author"/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="article-newspaper" match="any">
+            <text variable="container-title"/>
+          </else-if>
+          <else>
+            <text macro="u__author"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
   <macro name="b__container">
     <choose>
       <if type="chapter report paper-conference" match="any">
@@ -412,7 +442,9 @@
   </citation>
   <bibliography et-al-min="4" et-al-use-first="3" initialize="false" entry-spacing="0" hanging-indent="true">
     <sort>
-      <key macro="b__author-year-title"/>
+      <key macro="author-sort"/>
+      <key macro="u__issued"/>
+      <key macro="u__title"/>
     </sort>
     <layout suffix=".">
       <group delimiter=". ">

diff --git a/wirtschaftsuniversitat-wien-unternehmensrechnung-und-controlling.csl b/wirtschaftsuniversitat-wien-unternehmensrechnung-und-controlling.csl
@@ -220,6 +220,36 @@
       </else>
     </choose>
   </macro>
+  <macro name="author-sort">
+    <choose>
+      <if type="legislation" match="any">
+        <group delimiter=" ">
+          <text variable="title"/>
+          <text variable="title-short" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <choose>
+          <if type="bill" match="any">
+            <choose>
+              <if match="none" variable="author editor">
+                <text variable="title-short"/>
+              </if>
+              <else>
+                <text macro="u__author"/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="article-newspaper" match="any">
+            <text variable="container-title"/>
+          </else-if>
+          <else>
+            <text macro="u__author"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
   <macro name="b__container">
     <choose>
       <if type="chapter report paper-conference" match="any">
@@ -389,7 +419,9 @@
   </citation>
   <bibliography entry-spacing="0" hanging-indent="true">
     <sort>
-      <key macro="b__author-year-title"/>
+      <key macro="author-sort"/>
+      <key macro="u__issued"/>
+      <key macro="u__title"/>
     </sort>
     <layout suffix=".">
       <choose>

diff --git a/wirtschaftsuniversitat-wien-wirtschaftspadagogik.csl b/wirtschaftsuniversitat-wien-wirtschaftspadagogik.csl
@@ -277,6 +277,36 @@
       </else>
     </choose>
   </macro>
+  <macro name="author-sort">
+    <choose>
+      <if type="legislation" match="any">
+        <group delimiter=" ">
+          <text variable="title"/>
+          <text variable="title-short" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <choose>
+          <if type="bill" match="any">
+            <choose>
+              <if match="none" variable="author editor">
+                <text variable="title-short"/>
+              </if>
+              <else>
+                <text macro="u__author"/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="article-newspaper" match="any">
+            <text variable="container-title"/>
+          </else-if>
+          <else>
+            <text macro="u__author"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
   <macro name="b__in-editor-container">
     <choose>
       <if type="chapter report paper-conference" match="any">
@@ -459,7 +489,9 @@
   <bibliography initialize="false" entry-spacing="0" hanging-indent="true">
     <sort>
       <key macro="sort_keys"/>
-      <key macro="b__author-year-title"/>
+      <key macro="author-sort"/>
+      <key macro="u__issued"/>
+      <key macro="u__title"/>
     </sort>
     <layout>
       <group delimiter=". ">

diff --git a/zeitschrift-fur-qualitative-forschung.csl b/zeitschrift-fur-qualitative-forschung.csl
@@ -138,7 +138,7 @@
   <bibliography>
     <sort>
       <key macro="creator-short"/>
-      <key macro="creator-year-short"/>
+      <key macro="year"/>
     </sort>
     <layout>
       <group delimiter=". " suffix=".">