suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closes #985: Generated Biblographies Should Not Include Two Breaks After Each Reference

Browse Source 
Simplifies macros
This commit is contained in:
Elena Razlogova 2008-04-07 10:29:35 +00:00
parent bead92010e
commit 55369e7920
5 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
csl/chicago-author-date.csl
View File

@ -334,6 +334,7 @@
<option name="et-al-min" value="6"/> <option name="et-al-min" value="6"/>
<option name="et-al-use-first" value="3"/> <option name="et-al-use-first" value="3"/>
<option name="subsequent-author-substitute" value="---"/> <option name="subsequent-author-substitute" value="---"/>
<option name="entry-spacing" value="0"/>
<sort> <sort>
<key macro="contributors"/> <key macro="contributors"/>
<key variable="issued"/> <key variable="issued"/>

26
csl/chicago-fullnote-bibliography.csl
View File

@ -288,19 +288,21 @@
</choose> </choose>
</group> </group>
</macro> </macro>
<macro name="container-prefix-note"> <macro name="container-title-note">
<choose> <choose>
<if type="chapter"> <if type="chapter">
<text term="in" text-case="lowercase" suffix=" "/> <text term="in" text-case="lowercase" suffix=" "/>
</if> </if>
</choose> </choose>
<text variable="container-title" font-style="italic"/>
</macro> </macro>
<macro name="container-prefix"> <macro name="container-title">
<choose> <choose>
<if type="chapter"> <if type="chapter">
<text term="in" text-case="capitalize-first" suffix=" "/> <text term="in" text-case="capitalize-first" suffix=" "/>
</if> </if>
</choose> </choose>
<text variable="container-title" font-style="italic"/>
</macro> </macro>
<macro name="locators-note"> <macro name="locators-note">
<choose> <choose>
@ -432,7 +434,7 @@
</else-if> </else-if>
</choose> </choose>
</macro> </macro>
<macro name="pages-chapter"> <macro name="locators-chapter">
<choose> <choose>
<if type="chapter"> <if type="chapter">
<text variable="volume" suffix=":"/> <text variable="volume" suffix=":"/>
@ -440,7 +442,7 @@
</if> </if>
</choose> </choose>
</macro> </macro>
<macro name="pages-article"> <macro name="locators-journal">
<choose> <choose>
<if type="article-journal"> <if type="article-journal">
<text variable="page" prefix=": "/> <text variable="page" prefix=": "/>
@ -579,13 +581,9 @@
<text macro="title-note"/> <text macro="title-note"/>
<text macro="description-note"/> <text macro="description-note"/>
<text macro="secondary-contributors-note"/> <text macro="secondary-contributors-note"/>
<group> <text macro="container-title-note"/>
<text macro="container-prefix-note"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="container-contributors-note"/> <text macro="container-contributors-note"/>
</group> </group>
<text macro="locators-note"/>
<text variable="collection-title" prefix=", "/> <text variable="collection-title" prefix=", "/>
<text macro="issue-note"/> <text macro="issue-note"/>
<text macro="locators-newspaper" prefix=", "/> <text macro="locators-newspaper" prefix=", "/>
@ -600,6 +598,7 @@
<option name="et-al-min" value="6"/> <option name="et-al-min" value="6"/>
<option name="et-al-use-first" value="6"/> <option name="et-al-use-first" value="6"/>
<option name="subsequent-author-substitute" value="---"/> <option name="subsequent-author-substitute" value="---"/>
<option name="entry-spacing" value="0"/>
<sort> <sort>
<key macro="sort-key"/> <key macro="sort-key"/>
</sort> </sort>
@ -610,19 +609,16 @@
<text macro="description"/> <text macro="description"/>
<text macro="secondary-contributors"/> <text macro="secondary-contributors"/>
<group delimiter=", "> <group delimiter=", ">
<group> <text macro="container-title"/>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="container-contributors"/> <text macro="container-contributors"/>
<text macro="pages-chapter"/> <text macro="locators-chapter"/>
</group> </group>
</group> </group>
<text macro="locators"/> <text macro="locators"/>
<text variable="collection-title" text-case="capitalize-first" prefix=". "/> <text variable="collection-title" text-case="capitalize-first" prefix=". "/>
<text macro="issue"/> <text macro="issue"/>
<text macro="locators-newspaper" prefix=", "/> <text macro="locators-newspaper" prefix=", "/>
<text macro="pages-article"/> <text macro="locators-journal"/>
<text macro="access" prefix=". "/> <text macro="access" prefix=". "/>
</layout> </layout>
</bibliography> </bibliography>

9
csl/chicago-note-bibliography.csl
View File

@ -194,12 +194,13 @@
</choose> </choose>
</group> </group>
</macro> </macro>
<macro name="container-prefix"> <macro name="container-title">
<choose> <choose>
<if type="chapter"> <if type="chapter">
<text term="in" text-case="capitalize-first" suffix=" "/> <text term="in" text-case="capitalize-first" suffix=" "/>
</if> </if>
</choose> </choose>
<text variable="container-title" font-style="italic"/>
</macro> </macro>
<macro name="locators"> <macro name="locators">
<choose> <choose>
@ -387,6 +388,7 @@
<option name="et-al-min" value="6"/> <option name="et-al-min" value="6"/>
<option name="et-al-use-first" value="6"/> <option name="et-al-use-first" value="6"/>
<option name="subsequent-author-substitute" value="---"/> <option name="subsequent-author-substitute" value="---"/>
<option name="entry-spacing" value="0"/>
<sort> <sort>
<key macro="sort-key"/> <key macro="sort-key"/>
</sort> </sort>
@ -397,10 +399,7 @@
<text macro="description"/> <text macro="description"/>
<text macro="secondary-contributors"/> <text macro="secondary-contributors"/>
<group delimiter=", "> <group delimiter=", ">
<group> <text macro="container-title"/>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="container-contributors"/> <text macro="container-contributors"/>
<text macro="pages-chapter"/> <text macro="pages-chapter"/>
</group> </group>

6
csl/chicago-note-no-ibid.csl
View File

@ -158,6 +158,7 @@
<text term="in" text-case="lowercase" suffix=" "/> <text term="in" text-case="lowercase" suffix=" "/>
</if> </if>
</choose> </choose>
<text variable="container-title" font-style="italic"/>
</macro> </macro>
<macro name="locators-note"> <macro name="locators-note">
<choose> <choose>
@ -335,10 +336,7 @@
<text macro="title-note"/> <text macro="title-note"/>
<text macro="description-note"/> <text macro="description-note"/>
<text macro="secondary-contributors-note"/> <text macro="secondary-contributors-note"/>
<group> <text macro="container-title-note"/>
<text macro="container-prefix-note"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="container-contributors-note"/> <text macro="container-contributors-note"/>
</group> </group>
<text macro="locators-note"/> <text macro="locators-note"/>

8
csl/chicago-note.csl
View File

@ -152,12 +152,13 @@
</choose> </choose>
</group> </group>
</macro> </macro>
<macro name="container-prefix-note"> <macro name="container-title-note">
<choose> <choose>
<if type="chapter"> <if type="chapter">
<text term="in" text-case="lowercase" suffix=" "/> <text term="in" text-case="lowercase" suffix=" "/>
</if> </if>
</choose> </choose>
<text variable="container-title" font-style="italic"/>
</macro> </macro>
<macro name="locators-note"> <macro name="locators-note">
<choose> <choose>
@ -344,10 +345,7 @@
<text macro="title-note"/> <text macro="title-note"/>
<text macro="description-note"/> <text macro="description-note"/>
<text macro="secondary-contributors-note"/> <text macro="secondary-contributors-note"/>
<group> <text macro="container-title-note"/>
<text macro="container-prefix-note"/>
<text variable="container-title" font-style="italic"/>
</group>
<text macro="container-contributors-note"/> <text macro="container-contributors-note"/>
</group> </group>
<text macro="locators-note"/> <text macro="locators-note"/>