Skip to content
Please note that GitHub no longer supports your web browser.

We recommend upgrading to the latest Google Chrome or Firefox.

Learn more
Permalink
Browse files

Reindent/reorder (#4328)

  • Loading branch information
rmzelle committed Oct 2, 2019
1 parent ca4feff commit 6ead27bca765563a8b49c4a20b2900f57caeae29
@@ -26,7 +26,7 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</substitute>
</names>
</macro>
<macro name="editor">
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<style class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB" xmlns="http://purl.org/net/xbiblio/csl">
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
<info>
<title>Australian Archaeology</title>
<id>http://www.zotero.org/styles/australian-archaeology</id>
@@ -29,12 +29,12 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
</substitute>
</substitute>
</names>
</macro>
<macro name="editor">
<names variable="editor">
<name sort-separator=" " initialize-with="." delimiter=", "/>
<name sort-separator=" " initialize-with="." delimiter=", "/>
<label form="short" prefix=" (" suffix=")"/>
</names>
</macro>
@@ -146,7 +146,7 @@
<else-if type="chapter" match="any">
<group delimiter=". ">
<text variable="title"/>
<group delimiter=" ">
<group delimiter=" ">
<text term="in" font-style="italic" text-case="capitalize-first"/>
<text macro="editor"/>
</group>
@@ -94,41 +94,41 @@
</choose>
</macro>
<macro name="contributors">
<choose>
<if type="book">
<group delimiter=". ">
<names variable="author">
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<et-al/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<names variable="director"/>
<text macro="substitute-title"/>
<text macro="title"/>
</substitute>
</names>
<text macro="recipient"/>
</group>
</if>
<else-if type="book" match="none">
<group delimiter=". ">
<names variable="author">
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<et-al/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<names variable="director"/>
<text macro="substitute-title"/>
<text macro="title"/>
</substitute>
</names>
<text macro="recipient"/>
</group>
</else-if>
<choose>
<if type="book">
<group delimiter=". ">
<names variable="author">
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<et-al/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<names variable="director"/>
<text macro="substitute-title"/>
<text macro="title"/>
</substitute>
</names>
<text macro="recipient"/>
</group>
</if>
<else-if type="book" match="none">
<group delimiter=". ">
<names variable="author">
<name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
<et-al/>
<label form="short" prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
<names variable="director"/>
<text macro="substitute-title"/>
<text macro="title"/>
</substitute>
</names>
<text macro="recipient"/>
</group>
</else-if>
</choose>
</macro>
<macro name="contributors-long">
@@ -187,8 +187,8 @@
</if>
<else-if type="post-weblog">
<date variable="issued">
<date-part name="day" form="numeric"/>
<date-part name="month" form="long" prefix=" "/>
<date-part name="day" form="numeric"/>
<date-part name="month" form="long" prefix=" "/>
</date>
</else-if>
<else-if type="entry-encyclopedia" variable="DOI" match="all">
@@ -667,49 +667,47 @@
</sort>
<layout suffix=".">
<choose>
<if type="entry-encyclopedia">
<group delimiter=" ">

<choose>
<if variable="author" match="none">
<if type="entry-encyclopedia">
<group delimiter=" ">
<choose>
<if variable="author" match="none">
<group delimiter=", ">
<text variable="container-title" font-style="italic" suffix="."/>
<group delimiter=". ">
<text macro="container-contributors"/>
<group delimiter=", ">
<text variable="container-title" font-style="italic" suffix="."/>
<group delimiter=". ">
<text macro="container-contributors"/>
<group delimiter=", ">
<text macro="publisher"/>
<text macro="date"/>
</group>
</group>
<text variable="title" prefix=" s.v. " quotes="true"/>
</group>
</if>
<else-if variable="author">
<group delimiter=". ">
<text macro="contributors" suffix="."/>
<text macro="date"/>
<text variable="title" quotes="true"/>
<text macro="container-title"/>
<text macro="container-contributors" text-case="capitalize-first"/>
<text macro="publisher"/>
<text macro="access"/>
<text macro="date"/>
</group>
</else-if>
</choose>
</group>
</if>

</group>
<text variable="title" prefix=" s.v. " quotes="true"/>
</group>
</if>
<else-if variable="author">
<group delimiter=". ">
<text macro="contributors" suffix="."/>
<text macro="date"/>
<text variable="title" quotes="true"/>
<text macro="container-title"/>
<text macro="container-contributors" text-case="capitalize-first"/>
<text macro="publisher"/>
<text macro="access"/>
</group>
</else-if>
</choose>
</group>
</if>
<else-if type="motion_picture">
<group delimiter=". ">
<group delimiter=". ">
<group delimiter=" ">
<group delimiter=". ">
<group delimiter=", ">
<group delimiter=". ">
<group delimiter=", ">
<text variable="title" font-style="italic"/>
<text variable="medium"/>
</group>
<text macro="contributors-long" prefix="Réalisé par "/>
<group delimiter=", ">
</group>
<text macro="contributors-long" prefix="Réalisé par "/>
<group delimiter=", ">
<text macro="publisher"/>
<text macro="date"/>
</group>
@@ -718,47 +716,45 @@
</group>
</group>
</else-if>

<else-if type="legislation">
<text macro="contributors" suffix=". "/>
<group delimiter=" ">
<text variable="title" font-style="italic"/>
<group prefix="(" suffix=")" delimiter=", ">
<text variable="section" prefix="chapitre "/>
<text variable="volume" prefix="r. "/>
</group>
<else-if type="legislation">
<text macro="contributors" suffix=". "/>
<group delimiter=" ">
<text variable="title" font-style="italic"/>
<group prefix="(" suffix=")" delimiter=", ">
<text variable="section" prefix="chapitre "/>
<text variable="volume" prefix="r. "/>
</group>
</group>
</else-if>

<else-if type="bill">
<text macro="contributors" suffix=". "/>
<group delimiter=" ">
<text variable="title" font-style="italic"/>
<group prefix="(RLRQ, " suffix=")" delimiter=", ">
<text variable="section" prefix="chapitre "/>
<text variable="number" prefix="r. "/>
</group>
<text macro="contributors" suffix=". "/>
<group delimiter=" ">
<text variable="title" font-style="italic"/>
<group prefix="(RLRQ, " suffix=")" delimiter=", ">
<text variable="section" prefix="chapitre "/>
<text variable="number" prefix="r. "/>
</group>
</group>
</else-if>
<else>
<group delimiter=". ">
<text macro="contributors"/>
<text macro="date"/>
<text macro="title"/>
</group>
<text macro="description"/>
<text macro="secondary-contributors" prefix=". "/>
<text macro="container-title" prefix=". "/>
<text macro="container-contributors"/>
<text macro="edition"/>
<text macro="locators-chapter"/>
<text macro="collection-title-journal" prefix=", " suffix=", "/>
<text macro="locators"/>
<text macro="collection-title" prefix=". "/>
<text macro="issue"/>
<text macro="locators-article"/>
<text macro="access" prefix=". "/>
</else>
<else>
<group delimiter=". ">
<text macro="contributors"/>
<text macro="date"/>
<text macro="title"/>
</group>
<text macro="description"/>
<text macro="secondary-contributors" prefix=". "/>
<text macro="container-title" prefix=". "/>
<text macro="container-contributors"/>
<text macro="edition"/>
<text macro="locators-chapter"/>
<text macro="collection-title-journal" prefix=", " suffix=", "/>
<text macro="locators"/>
<text macro="collection-title" prefix=". "/>
<text macro="issue"/>
<text macro="locators-article"/>
<text macro="access" prefix=". "/>
</else>
</choose>
</layout>
</bibliography>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<style class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US" xmlns="http://purl.org/net/xbiblio/csl">
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
<info>
<title>Karger journals</title>
<id>http://www.zotero.org/styles/karger-journals</id>
@@ -104,7 +104,7 @@
<else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
<text variable="title" font-style="italic" text-case="title"/>
<choose>
<if variable="URL"></if>
<if variable="URL"/>
</choose>
<text macro="edition" prefix=", "/>
</else-if>
@@ -22,7 +22,8 @@
<terms>
<term name="accessed">last accessed</term>
</terms>
</locale><macro name="author">
</locale>
<macro name="author">
<group>
<names variable="author">
<name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>

0 comments on commit 6ead27b

Please sign in to comment.
You can’t perform that action at this time.