commit 777c18bcacc62a7de5914c91f66722a10aae6c9a
parent 4f710a1c4e571c2eed9e2ae64e0b6ccdf2b69747
Author: Elena Razlogova <elena.razlogova@gmail.com>
Date: Tue, 19 Feb 2008 04:36:49 +0000
Label for editor-as-author should be based on context while label for translator-as-author should always be plural in Chicago
Simplifies contributor conditionals
Sets point-locator macro
Diffstat:
4 files changed, 181 insertions(+), 153 deletions(-)
diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
@@ -21,112 +21,127 @@
<category term="numeric"/>
<updated></updated>
</info>
- <macro name="translator">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=", ">
- <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="translator-bib">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=". ">
- <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="translator-chapter-bib">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=", ">
- <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="secondary-contributor">
+ <macro name="secondary-contributors">
<group delimiter=", ">
+ <choose>
+ <if variable="author">
<names variable="editor" delimiter=", ">
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
<name and="text" delimiter=", "/>
</names>
+ </if>
+ </choose>
<choose>
- <if type="article-journal article-magazine article-newspaper" match="none">
- <text macro="translator"/>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=", ">
+ <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
+ <name and="text" delimiter=", "/>
+ </names>
</if>
</choose>
</group>
</macro>
- <macro name="secondary-contributor-bib">
+ <macro name="contributors">
+ <choose>
+ <if type="chapter" match="none">
+ <text macro="secondary-contributors"/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="container-contributors">
+ <choose>
+ <if type="chapter">
+ <text macro="secondary-contributors"/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="contributors-bib">
<choose>
<if type="chapter" match="none">
<group delimiter=". ">
+ <choose>
+ <if variable="author">
<names variable="editor" delimiter=". ">
<label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
+ </if>
+ </choose>
<choose>
- <if type="article-journal article-magazine article-newspaper" match="none">
- <text macro="translator-bib"/>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=". ">
+ <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+ <name and="text" delimiter=", "/>
+ </names>
</if>
</choose>
</group>
</if>
</choose>
</macro>
- <macro name="secondary-contributor-chapter-bib">
+ <macro name="container-contributors-bib">
<choose>
<if type="chapter">
<group delimiter=", ">
+ <choose>
+ <if variable="author">
<names variable="editor" delimiter=", ">
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
- <text macro="translator-chapter-bib"/>
+ </if>
+ </choose>
+ <choose>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=", ">
+ <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ </if>
+ </choose>
</group>
</if>
</choose>
</macro>
- <macro name="translator-article">
- <choose>
- <if type="article-journal article-magazine article-newspaper" match="any">
- <text macro="translator"/>
- </if>
- </choose>
+ <macro name="editor">
+ <names variable="editor">
+ <name and="text" sort-separator=", " delimiter=", "/>
+ <label form="short" prefix=", " suffix="."/>
+ </names>
</macro>
- <macro name="translator-article-bib">
- <choose>
- <if type="article-journal article-magazine article-newspaper" match="any">
- <text macro="translator-bib"/>
- </if>
- </choose>
+ <macro name="translator">
+ <names variable="translator">
+ <name and="text" sort-separator=", " delimiter=", "/>
+ <label form="verb-short" prefix=", " suffix="."/>
+ </names>
</macro>
<macro name="author">
<names variable="author">
- <name and="text" sort-separator=", "
- delimiter=", "/>
- <label form="verb-short" prefix=", " suffix="."/>
+ <name and="text" sort-separator=", " delimiter=", "/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <text macro="editor"/>
+ <text macro="translator"/>
</substitute>
</names>
- </macro>
+ </macro>
+ <macro name="editor-bib">
+ <names variable="editor">
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=", " suffix="."/>
+ </names>
+ </macro>
+ <macro name="translator-bib">
+ <names variable="translator">
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="verb-short" prefix=", " suffix="."/>
+ </names>
+ </macro>
<macro name="author-bib">
<names variable="author">
- <name name-as-sort-order="first" and="text" sort-separator=", "
- delimiter=", " delimiter-precedes-last="always"/>
- <label form="verb-short" prefix=", " suffix="."/>
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <text macro="editor-bib"/>
+ <text macro="translator-bib"/>
</substitute>
</names>
</macro>
@@ -381,7 +396,7 @@
</else>
</choose>
</macro>
- <macro name="locator">
+ <macro name="point-locators">
<choose>
<if variable="locator" match="none">
<text macro="pages"/>
@@ -553,18 +568,18 @@
</group>
<text macro="title"/>
<text macro="description"/>
- <text macro="translator-article"/>
+ <text macro="contributors"/>
<group>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
</group>
- <text macro="secondary-contributor"/>
+ <text macro="container-contributors"/>
</group>
<text macro="locators"/>
<text variable="collection-title" prefix=", "/>
<text macro="issue"/>
<text macro="locators-newspaper" prefix=", "/>
- <text macro="locator"/>
+ <text macro="point-locators"/>
<text macro="access" prefix=", "/>
</else>
</choose>
@@ -584,16 +599,15 @@
<text macro="recipient-bib"/>
<text macro="title-bib"/>
<text macro="description-bib"/>
- <text macro="translator-article-bib"/>
+ <text macro="contributors-bib"/>
<group delimiter=", ">
<group>
<text macro="container-prefix-bib"/>
<text variable="container-title" font-style="italic"/>
</group>
- <text macro="secondary-contributor-chapter-bib"/>
+ <text macro="container-contributors-bib"/>
<text macro="pages-chapter"/>
</group>
- <text macro="secondary-contributor-bib"/>
</group>
<text macro="locators-bib"/>
<text variable="collection-title" text-case="capitalize-first" prefix=". "/>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
@@ -23,27 +23,7 @@
<category term="numeric"/>
<updated></updated>
</info>
- <macro name="translator-bib">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=". ">
- <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="translator-chapter-bib">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=", ">
- <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="secondary-contributor-bib">
+ <macro name="contributors-bib">
<choose>
<if type="chapter" match="none">
<group delimiter=". ">
@@ -52,15 +32,18 @@
<name and="text" delimiter=", "/>
</names>
<choose>
- <if type="article-journal article-magazine article-newspaper" match="none">
- <text macro="translator-bib"/>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=". ">
+ <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+ <name and="text" delimiter=", "/>
+ </names>
</if>
</choose>
</group>
</if>
</choose>
</macro>
- <macro name="secondary-contributor-chapter-bib">
+ <macro name="container-contributors-bib">
<choose>
<if type="chapter">
<group delimiter=", ">
@@ -68,26 +51,36 @@
<label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
- <text macro="translator-chapter-bib"/>
+ <choose>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=", ">
+ <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+ <name and="text" delimiter=", "/>
+ </names>
+ </if>
+ </choose>
</group>
</if>
</choose>
</macro>
- <macro name="translator-article-bib">
- <choose>
- <if type="article-journal article-magazine article-newspaper" match="any">
- <text macro="translator-bib"/>
- </if>
- </choose>
+ <macro name="editor-bib">
+ <names variable="editor">
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=", " suffix="."/>
+ </names>
+ </macro>
+ <macro name="translator-bib">
+ <names variable="translator">
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="verb-short" prefix=", " suffix="."/>
+ </names>
</macro>
<macro name="author-bib">
<names variable="author">
- <name name-as-sort-order="first" and="text" sort-separator=", "
- delimiter=", " delimiter-precedes-last="always"/>
- <label form="verb-short" prefix=", " suffix="."/>
+ <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <text macro="editor-bib"/>
+ <text macro="translator-bib"/>
</substitute>
</names>
</macro>
@@ -391,16 +384,15 @@
<text macro="recipient-bib"/>
<text macro="title-bib"/>
<text macro="description-bib"/>
- <text macro="translator-article-bib"/>
+ <text macro="contributors-bib"/>
<group delimiter=", ">
<group>
<text macro="container-prefix-bib"/>
<text variable="container-title" font-style="italic"/>
</group>
- <text macro="secondary-contributor-chapter-bib"/>
+ <text macro="container-contributors-bib"/>
<text macro="pages-chapter"/>
</group>
- <text macro="secondary-contributor-bib"/>
</group>
<text macro="locators-bib"/>
<text variable="collection-title" text-case="capitalize-first" prefix=". "/>
diff --git a/csl/chicago-note-no-ibid.csl b/csl/chicago-note-no-ibid.csl
@@ -23,43 +23,54 @@
<category term="note"/>
<updated/>
</info>
- <macro name="translator">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=", ">
- <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="secondary-contributor">
+ <macro name="secondary-contributors">
<group delimiter=", ">
<names variable="editor" delimiter=", ">
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
<name and="text" delimiter=", "/>
</names>
<choose>
- <if type="article-journal article-magazine article-newspaper" match="none">
- <text macro="translator"/>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=", ">
+ <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
+ <name and="text" delimiter=", "/>
+ </names>
</if>
</choose>
</group>
</macro>
- <macro name="translator-article">
+ <macro name="contributors">
+ <choose>
+ <if type="chapter" match="none">
+ <text macro="secondary-contributors"/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="container-contributors">
<choose>
- <if type="article-journal article-magazine article-newspaper" match="any">
- <text macro="translator"/>
+ <if type="chapter">
+ <text macro="secondary-contributors"/>
</if>
</choose>
</macro>
+ <macro name="editor">
+ <names variable="editor">
+ <name and="text" sort-separator=", " delimiter=", "/>
+ <label form="short" prefix=", " suffix="."/>
+ </names>
+ </macro>
+ <macro name="translator">
+ <names variable="translator">
+ <name and="text" sort-separator=", " delimiter=", "/>
+ <label form="verb-short" prefix=", " suffix="."/>
+ </names>
+ </macro>
<macro name="author">
<names variable="author">
<name and="text" sort-separator=", " delimiter=", "/>
- <label form="verb-short" prefix=", " suffix="."/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <text macro="editor"/>
+ <text macro="translator"/>
</substitute>
</names>
</macro>
@@ -232,7 +243,7 @@
</else-if>
</choose>
</macro>
- <macro name="locator">
+ <macro name="point-locators">
<choose>
<if variable="locator" match="none">
<text macro="pages"/>
@@ -317,18 +328,18 @@
</group>
<text macro="title"/>
<text macro="description"/>
- <text macro="translator-article"/>
+ <text macro="contributors"/>
<group>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
</group>
- <text macro="secondary-contributor"/>
+ <text macro="container-contributors"/>
</group>
<text macro="locators"/>
<text variable="collection-title" prefix=", "/>
<text macro="issue"/>
<text macro="locators-newspaper" prefix=", "/>
- <text macro="locator"/>
+ <text macro="point-locators"/>
<text macro="access" prefix=", "/>
</else>
</choose>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
@@ -23,43 +23,54 @@
<category term="note"/>
<updated/>
</info>
- <macro name="translator">
- <choose>
- <if variable="author editor" match="any">
- <names variable="translator" delimiter=", ">
- <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
- <name and="text" delimiter=", "/>
- </names>
- </if>
- </choose>
- </macro>
- <macro name="secondary-contributor">
+ <macro name="secondary-contributors">
<group delimiter=", ">
<names variable="editor" delimiter=", ">
<label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
<name and="text" delimiter=", "/>
</names>
<choose>
- <if type="article-journal article-magazine article-newspaper" match="none">
- <text macro="translator"/>
+ <if variable="author editor" match="any">
+ <names variable="translator" delimiter=", ">
+ <label form="verb-short" prefix=" " text-case="lowercase" suffix=". "/>
+ <name and="text" delimiter=", "/>
+ </names>
</if>
</choose>
</group>
</macro>
- <macro name="translator-article">
+ <macro name="contributors">
+ <choose>
+ <if type="chapter" match="none">
+ <text macro="secondary-contributors"/>
+ </if>
+ </choose>
+ </macro>
+ <macro name="container-contributors">
<choose>
- <if type="article-journal article-magazine article-newspaper" match="any">
- <text macro="translator"/>
+ <if type="chapter">
+ <text macro="secondary-contributors"/>
</if>
</choose>
</macro>
+ <macro name="editor">
+ <names variable="editor">
+ <name and="text" sort-separator=", " delimiter=", "/>
+ <label form="short" prefix=", " suffix="."/>
+ </names>
+ </macro>
+ <macro name="translator">
+ <names variable="translator">
+ <name and="text" sort-separator=", " delimiter=", "/>
+ <label form="verb-short" prefix=", " suffix="."/>
+ </names>
+ </macro>
<macro name="author">
<names variable="author">
<name and="text" sort-separator=", " delimiter=", "/>
- <label form="verb-short" prefix=", " suffix="."/>
<substitute>
- <names variable="editor"/>
- <names variable="translator"/>
+ <text macro="editor"/>
+ <text macro="translator"/>
</substitute>
</names>
</macro>
@@ -232,7 +243,7 @@
</else-if>
</choose>
</macro>
- <macro name="locator">
+ <macro name="point-locators">
<choose>
<if variable="locator" match="none">
<text macro="pages"/>
@@ -326,18 +337,18 @@
</group>
<text macro="title"/>
<text macro="description"/>
- <text macro="translator-article"/>
+ <text macro="contributors"/>
<group>
<text macro="container-prefix"/>
<text variable="container-title" font-style="italic"/>
</group>
- <text macro="secondary-contributor"/>
+ <text macro="container-contributors"/>
</group>
<text macro="locators"/>
<text variable="collection-title" prefix=", "/>
<text macro="issue"/>
<text macro="locators-newspaper" prefix=", "/>
- <text macro="locator"/>
+ <text macro="point-locators"/>
<text macro="access" prefix=", "/>
</else>
</choose>
