fix language in society

citation-style-language · Jun 27, 2015 · a3b5229 · a3b5229
1 parent ef605b1
commit a3b5229
Showing 1 changed file with 36 additions and 33 deletions.
diff --git a/language-in-society.csl b/language-in-society.csl
@@ -23,19 +23,17 @@
   <macro name="editor">
     <names variable="editor" delimiter=", ">
       <name and="symbol" delimiter=", "/>
-      <label form="short" prefix=" (" suffix=".)"/>
+      <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
-  </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " delimiter="; "/>
-      <label form="short" prefix=" " suffix="."/>
+      <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
-        <text macro="anon"/>
+        <names variable="translator"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
@@ -45,23 +43,27 @@
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <text macro="anon"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="access">
-    <group>
-      <text value="Available at:" suffix=" "/>
-      <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>
+          <text term="online" text-case="capitalize-first" suffix=": "/>
+          <text variable="URL"/>
+          <group prefix="; ">
+            <text term="accessed" suffix=" "/>
+            <date variable="accessed" delimiter=" ">
+              <date-part name="day"/>
+              <date-part name="month"/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </if>
+    </choose>
   </macro>
   <macro name="title">
     <choose>
@@ -127,19 +129,21 @@
       <key macro="author"/>
       <key variable="title"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <text macro="author" suffix=" "/>
       <date variable="issued" prefix="(" suffix=").">
         <date-part name="year"/>
       </date>
       <choose>
         <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter=" " suffix=",">
-            <text macro="title"/>
-            <text macro="edition"/>
-            <text macro="editor"/>
+          <group delimiter=". ">   
+            <group prefix=" " delimiter=", ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="editor"/>
+            </group>
+            <text macro="publisher" suffix="."/>
           </group>
-          <text prefix=" " suffix="." macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" " suffix="."/>
@@ -171,20 +175,19 @@
             <text macro="title" prefix=" "/>
             <text macro="editor" prefix=" "/>
           </group>
-          <group prefix=" " suffix=".">
+          <group prefix=" " delimiter=" ">
             <text variable="container-title" font-style="italic"/>
-            <group prefix=", ">
-              <text variable="volume"/>
-              <text variable="issue" prefix="(" suffix=")"/>
-            </group>
-            <group prefix=", ">
-              <label variable="locator" form="short"/>
+            <group delimiter=":">            
+              <group>
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
               <text variable="page"/>
             </group>
           </group>
         </else>
       </choose>
-      <text prefix=" " macro="access" suffix="."/>
+      <text prefix=". " macro="access"/>
     </layout>
   </bibliography>
 </style>