Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to style module: juris-us.csl #96

Merged
merged 6 commits into from May 24, 2015
Merged

Update to style module: juris-us.csl #96

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db7f83b
Juris-M module update: juris-us.csl
fbennett May 23, 2015
5fd037e
Juris-M module update: juris-us.csl
fbennett May 24, 2015
95ea9c8
Juris-M module update: juris-us.csl
fbennett May 24, 2015
bf72e18
Juris-M module update: juris-us.csl
fbennett May 24, 2015
695362d
Juris-M module update: juris-us.csl
fbennett May 24, 2015
866752a
Juris-M module update: juris-us.csl
fbennett May 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
124 changes: 83 additions & 41 deletions juris-us.csl
View file
Open in desktop
Expand Up @@ -39,16 +39,39 @@
<macro name="juris-title">
<choose>
<if type="legal_case">
<text variable="title" form="short"/>
<choose>
<if variable="document-name">
<group delimiter=", ">
<group delimiter=" ">
<text variable="document-name"/>
<group delimiter=" ">
<choose>
<if locator="page">
<text value="at"/>
</if>
<else>
<label variable="locator" form="symbol"/>
</else>
</choose>
<number variable="locator"/>
</group>
</group>
<text variable="title"/>
</group>
</if>
<else>
<text variable="title" form="short"/>
</else>
</choose>
</if>
<else-if match="all" type="bill" variable="event"/>
<else-if type="bill">
<else-if match="all" type="bill" variable="title">
<group delimiter=" of ">
<text variable="title"/>
<date variable="issued" form="text" date-parts="year"/>
</group>
</else-if>
<else-if match="all" type="hearing" variable="title">
<else-if match="all" type="hearing" variable="committee">
<group delimiter=": ">
<text variable="title" text-case="title"/>
<group delimiter=" ">
Expand Down Expand Up @@ -172,7 +195,11 @@
</else>
</choose>
<choose>
<if variable="locator">
<if>
<conditions match="all">
<condition variable="locator"/>
<condition match="none" variable="document-name"/>
</conditions>
<group delimiter=" ">
<text value="slip op."/>
<number variable="page"/>
Expand Down Expand Up @@ -224,12 +251,17 @@
<group delimiter=" ">
<number variable="volume"/>
<text variable="container-title"/>
<choose>
<if match="all" variable="gazette-flag">
<number variable="page"/>
</if>
</choose>
</group>
</else-if>
<else-if>
<conditions match="all">
<condition type="hearing"/>
<condition match="none" variable="title"/>
<condition match="none" variable="committee"/>
</conditions>
<group delimiter=" ">
<number variable="volume"/>
Expand Down Expand Up @@ -304,6 +336,13 @@
</conditions>
<text macro="juris-default-spotter"/>
</else-if>
<else-if>
<conditions match="all">
<condition type="regulation"/>
<condition match="all" variable="gazette-flag"/>
</conditions>
<text macro="juris-default-spotter"/>
</else-if>
<else-if match="any" type="bill regulation hearing"/>
<else-if>
<conditions match="all">
Expand Down Expand Up @@ -443,7 +482,7 @@
<else-if>
<conditions match="all">
<condition type="hearing"/>
<condition match="none" variable="title"/>
<condition match="none" variable="committee"/>
</conditions>
</else-if>
<else-if variable="title-short">
Expand All @@ -456,9 +495,9 @@
</macro>

<macro name="juris-main-short">
<group delimiter=" ">
<choose>
<if type="gazette"/>
<else-if type="bill">
<if type="bill">
<group delimiter=" ">
<choose>
<if variable="event">
Expand All @@ -473,7 +512,7 @@
</choose>
<number variable="number"/>
</group>
</else-if>
</if>
<else-if>
<conditions match="all">
<condition type="hearing"/>
Expand Down Expand Up @@ -517,6 +556,17 @@
</group>
</else>
</choose>
<choose>
<!-- basically anything with no locator that uses pages or page-first in juris-main -->
<if>
<conditions match="all">
<condition match="none" variable="locator"/>
<condition match="all" variable="container-title"/>
</conditions>
<number variable="page"/>
</if>
</choose>
</group>
</macro>

<macro name="juris-comma-spotter-short">
Expand All @@ -534,19 +584,7 @@
</macro>

<macro name="juris-default-spotter-short">
<choose>
<if>
<conditions match="none">
<condition match="all" variable="locator" type="legal_case"/>
<condition match="none" variable="container-title"/>
<condition match="any" type="report"/>
</conditions>
<number variable="page-first"/>
</if>
<else>
<text macro="juris-default-spotter"/>
</else>
</choose>
<text macro="juris-default-spotter"/>
</macro>

<macro name="juris-tail-short">
Expand Down Expand Up @@ -600,13 +638,21 @@
<conditions match="any">
<condition match="all" position="near-note"/>
<condition match="all" type="report" variable="title" position="far-note"/>
<condition match="all" type="hearing" variable="title" position="far-note"/>
<condition match="all" type="hearing" variable="committee" position="far-note"/>
<condition match="all" type="legal_case" variable="document-name" position="far-note"/>
</conditions>
<group delimiter=", ">
<choose>
<if type="legal_case hearing">
<if>
<conditions match="all">
<condition type="legal_case"/>
<condition match="none" variable="document-name"/>
</conditions>
<text macro="juris-title-short" font-style="italic"/>
</if>
<else-if type="hearing">
<text macro="juris-title-short" font-style="italic"/>
</else-if>
<else-if match="all" type="report">
<text macro="juris-title-short" font-variant="small-caps"/>
</else-if>
Expand All @@ -617,8 +663,9 @@
<choose>
<if>
<conditions match="any">
<condition match="all" type="hearing" variable="title"/>
<condition match="all" type="hearing" variable="committee"/>
<condition match="all" type="report" variable="title"/>
<condition match="all" type="legal_case" variable="document-name"/>
</conditions>
<group delimiter=", ">
<group delimiter=" ">
Expand All @@ -639,7 +686,7 @@
<if>
<conditions match="all">
<condition type="hearing"/>
<condition match="none" variable="title"/>
<condition match="none" variable="committee"/>
</conditions>
<text macro="juris-main-short" font-variant="small-caps"/>
</if>
Expand All @@ -650,20 +697,8 @@
<text macro="juris-comma-spotter-short" label-form="symbol"/>
</group>
<group delimiter=" ">
<choose>
<if>
<conditions match="all">
<condition type="hearing"/>
<condition match="none" variable="title"/>
<condition match="none" variable="locator"/>
</conditions>
<number variable="page"/>
</if>
<else>
<text macro="juris-locator-label" alternative-macro="at-locator-label" label-form="symbol"/>
<text macro="juris-locator" label-form="symbol"/>
</else>
</choose>
<text macro="juris-locator-label" alternative-macro="at-locator-label" label-form="symbol"/>
<text macro="juris-locator" label-form="symbol"/>
</group>
<text macro="juris-tail-short"/>
</group>
Expand Down Expand Up @@ -691,11 +726,18 @@
<choose>
<if>
<conditions match="all">
<condition match="any" type="report hearing"/>
<condition match="all" type="report"/>
<condition match="none" variable="title"/>
</conditions>
<text macro="juris-main" font-variant="small-caps"/>
</if>
<else-if>
<conditions match="all">
<condition match="all" type="hearing"/>
<condition match="none" variable="committee"/>
</conditions>
<text macro="juris-main" font-variant="small-caps"/>
</else-if>
<else>
<text macro="juris-main"/>
</else>
Expand Down