Permalink
Browse files

Add legislation to bill in conditional tests, part 2.

The Statute field in Zotero will soon be mapped to legislation. No
styles yet discriminate between enacted laws (legislation) and
proposed law drafts (bill), so it is sufficient to add legislation to
tests where it is missing.

This changeset covers styles where bill was included in tests,
but legislation was not. There should be no effect on current
style behavior. Styles receiving this change will not be
affected by the new mapping, but it will be open to style
designers to apply separate treatment to bills and enacted
legislation.
  • Loading branch information...
1 parent 116d134 commit df761f8eafb25cc26178ec9d23e8e0cb9f0ec387 @fbennett fbennett committed Apr 3, 2012
Showing 487 changed files with 1,272 additions and 1,272 deletions.
@@ -142,7 +142,7 @@
<text variable="page"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter=". ">
<text variable="title" font-style="italic"/>
<text variable="publisher"/>
View
@@ -142,7 +142,7 @@
<text variable="page"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter=". ">
<text variable="title" font-style="italic"/>
<text variable="publisher"/>
@@ -45,7 +45,7 @@
</macro>
<macro name="title">
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text variable="title" font-style="italic" quotes="false"/>
</if>
<else>
@@ -105,7 +105,7 @@
<text macro="author" suffix=". "/>
<text macro="title" suffix=". "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text macro="book-publisher" suffix="."/>
</if>
<else-if type="paper-conference">
View
@@ -42,7 +42,7 @@
</macro>
<macro name="title">
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text variable="title" font-style="italic" quotes="false"/>
</if>
<else>
@@ -101,7 +101,7 @@
<text macro="title"/>
</group>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text macro="book-publisher" suffix="."/>
</if>
<else-if type="paper-conference">
View
@@ -32,7 +32,7 @@
<date-part name="year"/>
</date>
<choose>
- <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
+ <if type="bill legislation book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
<date variable="issued">
<date-part prefix=", " name="month"/>
<date-part prefix=" " name="day"/>
@@ -60,7 +60,7 @@
</macro>
<macro name="edition">
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
@@ -77,7 +77,7 @@
</macro>
<macro name="pages-book-chapter">
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<label variable="page" form="short" prefix=", " suffix=" " strip-periods="true"/>
<text variable="page"/>
</if>
View
@@ -119,7 +119,7 @@
<text macro="pages"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter="; ">
<text variable="title" text-case="title" font-style="italic"/>
<text macro="editor" prefix=" "/>
View
@@ -81,7 +81,7 @@
<text variable="citation-number" prefix="[" suffix="]"/>
<text macro="author" suffix=". "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter=". ">
<group delimiter=", ">
<text variable="title" text-case="title"/>
@@ -85,7 +85,7 @@
</macro>
<macro name="title">
<choose>
- <if type="bill book graphic legal_case motion_picture report song patent thesis webpage" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song patent thesis webpage" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
@@ -146,7 +146,7 @@
<text variable="page"/>
</group>
</if>
- <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<group prefix=" " suffix="" delimiter=", ">
<text macro="edition"/>
<group>
@@ -165,7 +165,7 @@
</macro>
<macro name="type">
<choose>
- <if type="bill book graphic legal_case motion_picture report song article-journal webpage" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song article-journal webpage" match="any">
<choose>
<if variable="URL">
<text value="[online]" prefix=" "/>
@@ -298,7 +298,7 @@
<group prefix=" (" suffix=")" delimiter=" ">
<text macro="collection-title"/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<text variable="volume"/>
</if>
</choose>
@@ -323,14 +323,14 @@
<group prefix=" " delimiter=" ">
<text macro="collection-title"/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<text variable="volume"/>
</if>
</choose>
</group>
<text macro="access" prefix=". "/>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<choose>
<if variable="URL">
<text macro="issued" suffix=" "/>
@@ -380,7 +380,7 @@
<group prefix=" (" suffix=")" delimiter=" ">
<text macro="collection-title"/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<text variable="volume"/>
</if>
</choose>
@@ -80,7 +80,7 @@
<text variable="publisher"/>
<text variable="title" form="short"/>
</if>
- <else-if type="bill book graphic legal_case motion_picture song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture song" match="any">
<text variable="title" form="short"/>
</else-if>
<else>
@@ -158,7 +158,7 @@
<text variable="number" prefix=" No. "/>
</group>
</if>
- <else-if type="bill book graphic legal_case motion_picture report song manuscript speech" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song manuscript speech" match="any">
<text variable="title"/>
</else-if>
<else>
@@ -220,7 +220,7 @@
<date-part name="year"/>
</date>
<choose>
- <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
+ <if type="bill legislation book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
<date variable="issued">
<date-part prefix=", " name="month"/>
<date-part prefix=" " name="day"/>
@@ -278,7 +278,7 @@
<text variable="page"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<group prefix=" " delimiter=", ">
<text macro="edition"/>
<group>
@@ -68,7 +68,7 @@
<text variable="citation-number" prefix="[" suffix="]"/>
<text macro="author" prefix=" " suffix=", "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter=", ">
<text variable="title" text-case="title" font-style="italic"/>
<text macro="publisher"/>
View
@@ -87,7 +87,7 @@
<text variable="citation-number" prefix="[" suffix="]"/>
<text macro="author" prefix=" " suffix=", "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter=", ">
<text variable="title" text-case="title" font-style="italic"/>
<text macro="publisher"/>
@@ -79,7 +79,7 @@
<text variable="citation-number" prefix="[" suffix="]"/>
<text macro="author" prefix=" " suffix=", "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter=", ">
<text variable="title" font-style="italic"/>
<text macro="edition"/>
View
@@ -67,7 +67,7 @@
</macro>
<macro name="title">
<choose>
- <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song thesis" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
@@ -137,7 +137,7 @@
<date-part name="year"/>
</date>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group prefix=" " delimiter=" " suffix=",">
<text macro="title"/>
<text macro="edition"/>
View
@@ -155,7 +155,7 @@
<text macro="author"/>
<text macro="title" suffix=". "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group prefix=" " delimiter=" ">
<text macro="edition"/>
<text macro="publisher"/>
View
@@ -62,12 +62,12 @@
</if>
</choose>
<choose>
- <if type="bill">
- <text value="Type is bill "/>
+ <if type="bill legislation">
+ <text value="Type is bill legislation "/>
</if>
</choose>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text value="Type is book "/>
</if>
</choose>
@@ -177,7 +177,7 @@
</if>
</choose>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text value="Type is review-book "/>
</if>
</choose>
@@ -66,7 +66,7 @@
</macro>
<macro name="title">
<choose>
- <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song thesis" match="any">
<text variable="title" font-style="normal"/>
</if>
<else>
@@ -139,7 +139,7 @@
<date-part name="year"/>
</date>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group prefix=" " delimiter=". " suffix=".">
<text macro="title"/>
<text macro="edition"/>
@@ -159,7 +159,7 @@
<text variable="title" text-case="title"/>
<group>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group>
<text term="volume" form="short" text-case="lowercase"/>
<number variable="volume" form="numeric"/>
@@ -173,7 +173,7 @@
</macro>
<macro name="edition">
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
View
@@ -135,7 +135,7 @@
<if type="graphic report" match="any">
<text macro="archive"/>
</if>
- <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
<text macro="archive"/>
</else-if>
</choose>
@@ -152,7 +152,7 @@
</if>
</choose>
</if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text variable="title" font-style="italic"/>
</else-if>
<else>
@@ -162,7 +162,7 @@
</macro>
<macro name="edition">
<choose>
- <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
@@ -183,7 +183,7 @@
<text variable="volume" prefix=" "/>
<text variable="issue" prefix="(" suffix=")"/>
</if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group prefix=". " delimiter=". ">
<group>
<text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
@@ -93,7 +93,7 @@
<text macro="author"/>
<text macro="title" suffix=". "/>
<choose>
- <if type="bill book graphic legal_case motion_picture report song" match="any">
+ <if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<text macro="edition" prefix="" suffix=" "/>
<text macro="publisher" prefix=""/>
</if>
@@ -129,7 +129,7 @@
<text macro="pages"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture song" match="any">
<group delimiter="; ">
<text variable="title" font-style="italic"/>
<text macro="editor" prefix=" "/>
@@ -123,7 +123,7 @@
<text macro="pages"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter="; ">
<text variable="title" font-style="italic"/>
<text macro="editor" prefix=" "/>
@@ -118,7 +118,7 @@
<text macro="pages"/>
</group>
</else-if>
- <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+ <else-if type="bill legislation book graphic legal_case motion_picture report song" match="any">
<group delimiter="; ">
<text variable="title" font-style="italic"/>
<text macro="editor" prefix=" "/>
Oops, something went wrong.

0 comments on commit df761f8

Please sign in to comment.