Permalink
Browse files

Update som independent styles

  • Loading branch information...
rmzelle committed Apr 6, 2011
1 parent 64ff0f7 commit aafba24bccb9d6b26162579ddf5e9bf5c957aece
View
24 aag.csl
@@ -41,17 +41,19 @@
</names>
</macro>
<macro name="access">
- <group>
- <text variable="URL"/>
- <group prefix=" (" suffix=")">
- <text term="accessed" text-case="lowercase" prefix="last " suffix=" "/>
- <date variable="accessed">
- <date-part name="day" suffix=" "/>
- <date-part name="month" suffix=" "/>
- <date-part name="year"/>
- </date>
- </group>
- </group>
+ <choose>
+ <if variable="URL">
+ <text variable="URL"/>
+ <group prefix=" (" suffix=")">
+ <text term="accessed" text-case="lowercase" prefix="last " suffix=" "/>
+ <date variable="accessed">
+ <date-part name="day" suffix=" "/>
+ <date-part name="month" suffix=" "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ </if>
+ </choose>
</macro>
<macro name="title">
<choose>
@@ -79,16 +79,18 @@
</names>
</macro>
<macro name="access">
- <group>
- <text variable="URL"/>
- <group prefix=", ">
- <date variable="accessed" suffix="">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
- </group>
- </group>
+ <choose>
+ <if variable="URL">
+ <text variable="URL"/>
+ <group prefix=", ">
+ <date variable="accessed" suffix="">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ </if>
+ </choose>
</macro>
<macro name="title">
<choose>
@@ -162,7 +164,7 @@
</date>
</if>
<else>
- <text term="no date" form="short" strip-periods="true"/>
+ <text term="no date" form="short"/>
</else>
</choose>
</macro>
@@ -9,6 +9,10 @@
<email>nesfaha2@gmu.edu</email>
<uri>http://mason.gmu.edu/~nesfaha2/</uri>
</author>
+ <contributor>
+ <name>Chris Horn</name>
+ <email>chris.horn@securedecisions.com</email>
+ </contributor>
<category field="science"/>
<category field="engineering"/>
<category field="generic-base"/>
@@ -20,7 +24,7 @@
<macro name="author">
<choose>
<if type="webpage">
- <text variable="title"/>
+ <text variable="title" suffix=":"/>
</if>
<else>
<names variable="author">
@@ -31,9 +35,6 @@
<names variable="translator"/>
</substitute>
</names>
- <date variable="issued">
- <date-part name="year" prefix=" "/>
- </date>
</else>
</choose>
</macro>
@@ -45,10 +46,9 @@
</macro>
<citation collapse="citation-number">
<sort>
- <key macro="author"/>
- <key variable="title"/>
+ <key variable="citation-number"/>
</sort>
- <layout prefix="[" suffix="]" delimiter=",">
+ <layout prefix="[" suffix="]" delimiter=", ">
<text variable="citation-number"/>
</layout>
</citation>
@@ -59,7 +59,10 @@
</sort>
<layout suffix=".">
<text variable="citation-number" prefix="[" suffix="]"/>
- <text macro="author" prefix=" " suffix=". "/>
+ <text macro="author" suffix=" "/>
+ <date variable="issued" suffix=". ">
+ <date-part name="year"/>
+ </date>
<choose>
<if type="paper-conference">
<group delimiter=". ">
@@ -70,7 +73,7 @@
<group delimiter=", " prefix="(" suffix=")">
<text variable="publisher-place"/>
<date variable="issued">
- <date-part name="month" suffix=" "/>
+ <date-part name="month" form="short" suffix=". " strip-periods="true"/>
<date-part name="year"/>
</date>
</group>
@@ -101,7 +104,7 @@
<text variable="title"/>
<text variable="number" prefix="U.S. Patent #"/>
<date variable="issued">
- <date-part name="month" suffix=" "/>
+ <date-part name="month" form="short" suffix=". " strip-periods="true"/>
<date-part name="day" suffix=", "/>
<date-part name="year"/>
</date>
@@ -125,9 +128,9 @@
<group delimiter=". ">
<text variable="URL" font-style="italic"/>
<date variable="accessed" prefix="Accessed: ">
+ <date-part name="year" suffix="-"/>
<date-part name="month" form="numeric-leading-zeros" suffix="-"/>
- <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
- <date-part name="year"/>
+ <date-part name="day" form="numeric-leading-zeros"/>
</date>
</group>
</else-if>
View
@@ -9,6 +9,10 @@
<email>nesfaha2@gmu.edu</email>
<uri>http://mason.gmu.edu/~nesfaha2/</uri>
</author>
+ <contributor>
+ <name>Chris Horn</name>
+ <email>chris.horn@securedecisions.com</email>
+ </contributor>
<category field="science"/>
<category field="engineering"/>
<category field="generic-base"/>
@@ -20,7 +24,7 @@
<macro name="author">
<choose>
<if type="webpage">
- <text variable="title"/>
+ <text variable="title" suffix=":"/>
</if>
<else>
<names variable="author">
@@ -31,9 +35,6 @@
<names variable="translator"/>
</substitute>
</names>
- <date variable="issued">
- <date-part name="year" prefix=" "/>
- </date>
</else>
</choose>
</macro>
@@ -45,10 +46,9 @@
</macro>
<citation collapse="citation-number">
<sort>
- <key macro="author"/>
- <key variable="title"/>
+ <key variable="citation-number"/>
</sort>
- <layout prefix="[" suffix="]" delimiter=",">
+ <layout prefix="[" suffix="]" delimiter=", ">
<text variable="citation-number"/>
</layout>
</citation>
@@ -59,7 +59,10 @@
</sort>
<layout suffix=".">
<text variable="citation-number" prefix="[" suffix="]"/>
- <text macro="author" prefix=" " suffix=". "/>
+ <text macro="author" suffix=" "/>
+ <date variable="issued" suffix=". ">
+ <date-part name="year"/>
+ </date>
<choose>
<if type="paper-conference">
<group delimiter=". ">
@@ -70,7 +73,7 @@
<group delimiter=", " prefix="(" suffix=")">
<text variable="publisher-place"/>
<date variable="issued">
- <date-part name="month" suffix=" "/>
+ <date-part name="month" form="short" suffix=". " strip-periods="true"/>
<date-part name="year"/>
</date>
</group>
@@ -101,7 +104,7 @@
<text variable="title"/>
<text variable="number" prefix="U.S. Patent #"/>
<date variable="issued">
- <date-part name="month" suffix=" "/>
+ <date-part name="month" form="short" suffix=". " strip-periods="true"/>
<date-part name="day" suffix=", "/>
<date-part name="year"/>
</date>
@@ -125,9 +128,9 @@
<group delimiter=". ">
<text variable="URL" font-style="italic"/>
<date variable="accessed" prefix="Accessed: ">
+ <date-part name="year" suffix="-"/>
<date-part name="month" form="numeric-leading-zeros" suffix="-"/>
- <date-part name="day" form="numeric-leading-zeros" suffix="-"/>
- <date-part name="year"/>
+ <date-part name="day" form="numeric-leading-zeros"/>
</date>
</group>
</else-if>
View
@@ -54,18 +54,22 @@
</names>
</macro>
<macro name="access">
- <group delimiter=" ">
- <text value="Available at:"/>
- <text variable="URL"/>
- <group prefix="[" suffix="]">
- <text term="accessed" text-case="capitalize-first" suffix=" "/>
- <date variable="accessed">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
- </group>
- </group>
+ <choose>
+ <if variable="URL">
+ <group delimiter=" ">
+ <text value="Available at:"/>
+ <text variable="URL"/>
+ <group prefix="[" suffix="]">
+ <text term="accessed" text-case="capitalize-first" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ </group>
+ </if>
+ </choose>
</macro>
<macro name="title">
<choose>
View
@@ -48,17 +48,21 @@
<macro name="access">
<choose>
<if type="legal_case" match="none">
- <group delimiter=" ">
- <text variable="URL"/>
- <group prefix="(" suffix=")">
- <text term="accessed" text-case="capitalize-first" suffix=" "/>
- <date variable="accessed">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
- </group>
- </group>
+ <choose>
+ <if variable="URL">
+ <group delimiter=" ">
+ <text variable="URL"/>
+ <group prefix="(" suffix=")">
+ <text term="accessed" text-case="capitalize-first" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
+ </group>
+ </if>
+ </choose>
</if>
</choose>
</macro>
View
@@ -47,20 +47,22 @@
</names>
</macro>
<macro name="access">
- <group>
- <text value="Available at:" suffix=" "/>
- <group delimiter=". ">
- <text variable="URL"/>
- <group>
- <text term="accessed" text-case="capitalize-first" suffix=" "/>
- <date variable="accessed">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
+ <choose>
+ <if variable="URL">
+ <text value="Available at:" suffix=" "/>
+ <group delimiter=". ">
+ <text variable="URL"/>
+ <group>
+ <text term="accessed" text-case="capitalize-first" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
</group>
- </group>
- </group>
+ </if>
+ </choose>
</macro>
<macro name="title">
<choose>
View
28 ama.csl
@@ -47,20 +47,22 @@
</names>
</macro>
<macro name="access">
- <group>
- <text value="Available at:" suffix=" "/>
- <group delimiter=". ">
- <text variable="URL"/>
- <group>
- <text term="accessed" text-case="capitalize-first" suffix=" "/>
- <date variable="accessed">
- <date-part name="month" suffix=" "/>
- <date-part name="day" suffix=", "/>
- <date-part name="year"/>
- </date>
+ <choose>
+ <if variable="URL">
+ <text value="Available at:" suffix=" "/>
+ <group delimiter=". ">
+ <text variable="URL"/>
+ <group>
+ <text term="accessed" text-case="capitalize-first" suffix=" "/>
+ <date variable="accessed">
+ <date-part name="month" suffix=" "/>
+ <date-part name="day" suffix=", "/>
+ <date-part name="year"/>
+ </date>
+ </group>
</group>
- </group>
- </group>
+ </if>
+ </choose>
</macro>
<macro name="title">
<choose>
Oops, something went wrong.

0 comments on commit aafba24

Please sign in to comment.