updated sort order

This commit is contained in:
Elena Razlogova 2008-01-02 09:19:52 +00:00
parent 62a7c2b35a
commit 8ab07ed8f7

View File

@ -26,6 +26,12 @@
<name and="text" delimiter=", "/> <name and="text" delimiter=", "/>
</names> </names>
</macro> </macro>
<macro name="editor-translator-bib">
<names variable="editor translator" delimiter=". ">
<label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
<name and="text" delimiter=", "/>
</names>
</macro>
<macro name="editor-translator-short"> <macro name="editor-translator-short">
<choose> <choose>
<if variable="author"> <if variable="author">
@ -164,6 +170,11 @@
</else> </else>
</choose> </choose>
</macro> </macro>
<macro name="sort-key">
<text macro="author-bib" suffix=" "/>
<text variable="title" suffix=" "/>
<text variable="genre"/>
</macro>
<citation> <citation>
<option name="et-al-min" value="4"/> <option name="et-al-min" value="4"/>
<option name="et-al-use-first" value="1"/> <option name="et-al-use-first" value="1"/>
@ -336,6 +347,9 @@
<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="---"/>
<sort>
<key macro="sort-key"/>
</sort>
<layout suffix="."> <layout suffix=".">
<group delimiter=". "> <group delimiter=". ">
<text macro="author-bib"/> <text macro="author-bib"/>
@ -356,7 +370,7 @@
<text variable="container-title" font-style="italic" /> <text variable="container-title" font-style="italic" />
</group> </group>
<text variable="collection-title"/> <text variable="collection-title"/>
<text macro="editor-translator" /> <text macro="editor-translator-bib" />
</group> </group>
<text variable="page" prefix=", "/> <text variable="page" prefix=", "/>
<text macro="publisher" prefix=". "/> <text macro="publisher" prefix=". "/>
@ -364,7 +378,7 @@
</group> </group>
</else-if> </else-if>
<else-if type="article-journal"> <else-if type="article-journal">
<text macro="editor-translator" suffix=". "/> <text macro="editor-translator-bib" suffix=". "/>
<group class="container"> <group class="container">
<text variable="container-title" font-style="italic"/> <text variable="container-title" font-style="italic"/>
<text variable="volume" prefix=" "/> <text variable="volume" prefix=" "/>
@ -374,14 +388,14 @@
</group> </group>
</else-if> </else-if>
<else-if type="article-newspaper article-magazine" match="any"> <else-if type="article-newspaper article-magazine" match="any">
<text macro="editor-translator" suffix=". "/> <text macro="editor-translator-bib" suffix=". "/>
<group delimiter=", "> <group delimiter=", ">
<text variable="container-title" font-style="italic"/> <text variable="container-title" font-style="italic"/>
<text macro="issued"/> <text macro="issued"/>
</group> </group>
</else-if> </else-if>
<else-if type="paper-conference"> <else-if type="paper-conference">
<text macro="editor-translator" suffix=". "/> <text macro="editor-translator-bib" suffix=". "/>
<text variable="genre" text-case="capitalize-first" suffix=" presented at the "/> <text variable="genre" text-case="capitalize-first" suffix=" presented at the "/>
<text variable="event" suffix=", "/> <text variable="event" suffix=", "/>
<text variable="event-place" suffix=", "/> <text variable="event-place" suffix=", "/>
@ -412,20 +426,20 @@
<text macro="issued"/> <text macro="issued"/>
</else-if> </else-if>
<else-if type="report"> <else-if type="report">
<text macro="editor-translator" suffix=". "/> <text macro="editor-translator-bib" suffix=". "/>
<text variable="genre" suffix=". "/> <text variable="genre" suffix=". "/>
<text macro="publisher" suffix=", "/> <text macro="publisher" suffix=", "/>
<text macro="issued"/> <text macro="issued"/>
</else-if> </else-if>
<else-if type="book"> <else-if type="book">
<text macro="editor-translator" suffix=". "/> <text macro="editor-translator-bib" suffix=". "/>
<text variable="collection-title" suffix=". "/> <text variable="collection-title" suffix=". "/>
<text macro="publisher" suffix=", "/> <text macro="publisher" suffix=", "/>
<text macro="issued"/> <text macro="issued"/>
</else-if> </else-if>
<else> <else>
<group class="container" delimiter=". "> <group class="container" delimiter=". ">
<text macro="editor-translator"/> <text macro="editor-translator-bib"/>
<text variable="container-title" font-style="italic"/> <text variable="container-title" font-style="italic"/>
<text variable="collection-title" font-style="italic"/> <text variable="collection-title" font-style="italic"/>
<text variable="genre" text-case="capitalize-first"/> <text variable="genre" text-case="capitalize-first"/>