commit 55369e79209e7c723bfb7f6a268fc504c85ff75a
parent bead92010e505a4736cf43ffeb78cbbbb94bba9e
Author: Elena Razlogova <elena.razlogova@gmail.com>
Date: Mon, 7 Apr 2008 10:29:35 +0000
Closes #985: Generated Biblographies Should Not Include Two Breaks After Each Reference
Simplifies macros
Diffstat:
5 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
@@ -334,6 +334,7 @@
<option name="et-al-min" value="6"/>
<option name="et-al-use-first" value="3"/>
<option name="subsequent-author-substitute" value="---"/>
+ <option name="entry-spacing" value="0"/>
<sort>
<key macro="contributors"/>
<key variable="issued"/>
diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
@@ -288,19 +288,21 @@
</choose>
</group>
</macro>
- <macro name="container-prefix-note">
+ <macro name="container-title-note">
<choose>
<if type="chapter">
<text term="in" text-case="lowercase" suffix=" "/>
</if>
</choose>
+ <text variable="container-title" font-style="italic"/>
</macro>
- <macro name="container-prefix">
+ <macro name="container-title">
<choose>
<if type="chapter">
<text term="in" text-case="capitalize-first" suffix=" "/>
</if>
</choose>
+ <text variable="container-title" font-style="italic"/>
</macro>
<macro name="locators-note">
<choose>
@@ -432,7 +434,7 @@
</else-if>
</choose>
</macro>
- <macro name="pages-chapter">
+ <macro name="locators-chapter">
<choose>
<if type="chapter">
<text variable="volume" suffix=":"/>
@@ -440,7 +442,7 @@
</if>
</choose>
</macro>
- <macro name="pages-article">
+ <macro name="locators-journal">
<choose>
<if type="article-journal">
<text variable="page" prefix=": "/>
@@ -579,13 +581,9 @@
<text macro="title-note"/>
<text macro="description-note"/>
<text macro="secondary-contributors-note"/>
- <group>
- <text macro="container-prefix-note"/>
- <text variable="container-title" font-style="italic"/>
- </group>
+ <text macro="container-title-note"/>
<text macro="container-contributors-note"/>
</group>
- <text macro="locators-note"/>
<text variable="collection-title" prefix=", "/>
<text macro="issue-note"/>
<text macro="locators-newspaper" prefix=", "/>
@@ -600,6 +598,7 @@
<option name="et-al-min" value="6"/>
<option name="et-al-use-first" value="6"/>
<option name="subsequent-author-substitute" value="---"/>
+ <option name="entry-spacing" value="0"/>
<sort>
<key macro="sort-key"/>
</sort>
@@ -610,19 +609,16 @@
<text macro="description"/>
<text macro="secondary-contributors"/>
<group delimiter=", ">
- <group>
- <text macro="container-prefix"/>
- <text variable="container-title" font-style="italic"/>
- </group>
+ <text macro="container-title"/>
<text macro="container-contributors"/>
- <text macro="pages-chapter"/>
+ <text macro="locators-chapter"/>
</group>
</group>
<text macro="locators"/>
<text variable="collection-title" text-case="capitalize-first" prefix=". "/>
<text macro="issue"/>
<text macro="locators-newspaper" prefix=", "/>
- <text macro="pages-article"/>
+ <text macro="locators-journal"/>
<text macro="access" prefix=". "/>
</layout>
</bibliography>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
@@ -194,12 +194,13 @@
</choose>
</group>
</macro>
- <macro name="container-prefix">
+ <macro name="container-title">
<choose>
<if type="chapter">
<text term="in" text-case="capitalize-first" suffix=" "/>
</if>
</choose>
+ <text variable="container-title" font-style="italic"/>
</macro>
<macro name="locators">
<choose>
@@ -387,6 +388,7 @@
<option name="et-al-min" value="6"/>
<option name="et-al-use-first" value="6"/>
<option name="subsequent-author-substitute" value="---"/>
+ <option name="entry-spacing" value="0"/>
<sort>
<key macro="sort-key"/>
</sort>
@@ -397,10 +399,7 @@
<text macro="description"/>
<text macro="secondary-contributors"/>
<group delimiter=", ">
- <group>
- <text macro="container-prefix"/>
- <text variable="container-title" font-style="italic"/>
- </group>
+ <text macro="container-title"/>
<text macro="container-contributors"/>
<text macro="pages-chapter"/>
</group>
diff --git a/csl/chicago-note-no-ibid.csl b/csl/chicago-note-no-ibid.csl
@@ -158,6 +158,7 @@
<text term="in" text-case="lowercase" suffix=" "/>
</if>
</choose>
+ <text variable="container-title" font-style="italic"/>
</macro>
<macro name="locators-note">
<choose>
@@ -335,10 +336,7 @@
<text macro="title-note"/>
<text macro="description-note"/>
<text macro="secondary-contributors-note"/>
- <group>
- <text macro="container-prefix-note"/>
- <text variable="container-title" font-style="italic"/>
- </group>
+ <text macro="container-title-note"/>
<text macro="container-contributors-note"/>
</group>
<text macro="locators-note"/>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
@@ -152,12 +152,13 @@
</choose>
</group>
</macro>
- <macro name="container-prefix-note">
+ <macro name="container-title-note">
<choose>
<if type="chapter">
<text term="in" text-case="lowercase" suffix=" "/>
</if>
</choose>
+ <text variable="container-title" font-style="italic"/>
</macro>
<macro name="locators-note">
<choose>
@@ -344,10 +345,7 @@
<text macro="title-note"/>
<text macro="description-note"/>
<text macro="secondary-contributors-note"/>
- <group>
- <text macro="container-prefix-note"/>
- <text variable="container-title" font-style="italic"/>
- </group>
+ <text macro="container-title-note"/>
<text macro="container-contributors-note"/>
</group>
<text macro="locators-note"/>
