Move quotes from affixes to quotes="true" in a number of styles

rdsteed · Jul 3, 2012 · bf9a297 · bf9a297
1 parent 71f17f2
commit bf9a297
Show file tree

Hide file tree

Showing 18 changed files with 143 additions and 84 deletions.
diff --git a/annales.csl b/annales.csl
@@ -70,26 +70,26 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
       <else-if type="thesis" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
         </group>
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»,"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" suffix=","/>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
@@ -102,7 +102,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -250,11 +250,15 @@
   <macro name="collection">
     <choose>
       <if is-numeric="collection-number">
-        <text variable="collection-title" prefix=" coll.&#160;«&#160;" suffix="&#160;»"/>
+        <group prefix=" coll.">
+          <text variable="collection-title" prefix=" quotes="true"/>
+        </group>
         <text variable="collection-number" prefix=", n˚&#160;"/>
       </if>
       <else>
-        <text variable="collection-title" prefix=" coll.&#160;«&#160;" suffix="&#160;»"/>
+        <group prefix=" coll.">
+          <text variable="collection-title" quotes="true"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -278,7 +282,7 @@
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+                <text variable="title" text-case="capitalize-first" form="short" quotes="true" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>

diff --git a/french1.csl b/french1.csl
@@ -136,7 +136,7 @@
           </choose>
         </if>
         <else>
-          <text variable="title" prefix="«&#160;" suffix="&#160;»."/>
+          <text variable="title" quotes="true" suffix="."/>
         </else>
       </choose>
     </group>

diff --git a/french2.csl b/french2.csl
@@ -136,7 +136,7 @@
           </choose>
         </if>
         <else>
-          <text variable="title" prefix="«&#160;" suffix="&#160;»."/>
+          <text variable="title" quotes="true" suffix="."/>
         </else>
       </choose>
     </group>

diff --git a/french3.csl b/french3.csl
@@ -153,7 +153,7 @@
           </choose>
         </if>
         <else>
-          <text variable="title" prefix="«&#160;" suffix="&#160;»."/>
+          <text variable="title" quotes="true" suffix="."/>
         </else>
       </choose>
     </group>

diff --git a/french4.csl b/french4.csl
@@ -153,7 +153,7 @@
           </choose>
         </if>
         <else>
-          <text variable="title" prefix="«&#160;" suffix="&#160;»."/>
+          <text variable="title" quotes="true" suffix="."/>
         </else>
       </choose>
     </group>

diff --git a/geneses.csl b/geneses.csl
@@ -89,26 +89,30 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
       <else-if type="thesis" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»," font-style="normal"/>
+          <group suffix=",">
+            <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
+          </group>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
         </group>
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»,"/>
+          <group suffix=",">
+            <text variable="title" text-case="capitalize-first" quotes="true"/>
+          </group>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=" "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
@@ -121,7 +125,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>

diff --git a/histoire-at-politique.csl b/histoire-at-politique.csl
@@ -87,7 +87,7 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
@@ -100,13 +100,15 @@
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»," font-style="normal"/>
+          <group suffix=",">
+            <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
+          </group>
           <text value="dans" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
@@ -119,7 +121,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+        <text variable="title" quotes="true" font-style="normal"/>
       </else>
     </choose>
   </macro>
@@ -352,11 +354,15 @@
   <macro name="collection">
     <choose>
       <if is-numeric="collection-number">
-        <text variable="collection-title" prefix=" coll.&#160;«&#160;" suffix="&#160;»"/>
+        <group prefix=" coll.">
+          <text variable="collection-title" quotes="true"/>
+        </group>
         <text variable="collection-number" prefix=", n˚&#160;"/>
       </if>
       <else>
-        <text variable="collection-title" prefix=" coll.&#160;«&#160;" suffix="&#160;»"/>
+        <group prefix=" coll.">
+          <text variable="collection-title" quotes="true"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -380,7 +386,7 @@
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+                <text variable="title" text-case="capitalize-first" form="short" quotes="true" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>

diff --git a/histoire-et-mesure.csl b/histoire-et-mesure.csl
@@ -89,7 +89,7 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
@@ -102,13 +102,15 @@
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»,"/>
+          <group suffix=",">
+            <text variable="title" text-case="capitalize-first" quotes="true"/>
+          </group>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
@@ -121,7 +123,9 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»,"/>
+        <group suffix=",">
+          <text variable="title" quotes="true"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -345,7 +349,7 @@
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+                <text variable="title" text-case="capitalize-first" form="short" quotes="true" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>

diff --git a/invisu.csl b/invisu.csl
@@ -110,7 +110,7 @@
       </else-if>
       <else-if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
@@ -132,21 +132,25 @@
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»," font-style="normal"/>
+          <group suffix=",">
+            <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
+          </group>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="entry-dictionary entry-encyclopedia paper-conference chapter" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»,"/>
+          <group suffix=",">
+            <text variable="title" text-case="capitalize-first" quotes="true"/>
+          </group>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
         </group>
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre"/>
           <text variable="container-title" font-style="italic"/>
         </group>
@@ -296,7 +300,7 @@
       <if type="motion_picture map entry-dictionary entry-encyclopedia book speech paper-conference chapter" match="any">
         <group prefix=" (" suffix=")">
           <group delimiter=", ">
-            <text variable="collection-title" prefix="«&#160;" suffix="&#160;»"/>
+            <text variable="collection-title" quotes="true"/>
             <text macro="volume"/>
             <text variable="collection-number" prefix="n°&#160;"/>
           </group>
@@ -551,7 +555,7 @@
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+                <text variable="title" text-case="capitalize-first" form="short" quotes="true" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>

diff --git a/le-mouvement-social.csl b/le-mouvement-social.csl
@@ -74,7 +74,7 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
@@ -87,13 +87,15 @@
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;», " font-style="normal"/>
+          <group suffix=", ">
+            <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
+          </group>
           <text macro="editor" prefix="in " suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
         </group>
@@ -105,7 +107,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+        <text variable="title" quotes="true" font-style="normal"/>
       </else>
     </choose>
   </macro>
@@ -252,7 +254,7 @@
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
+                <text variable="title" text-case="capitalize-first" form="short" quotes="true" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>

diff --git a/lettres-et-sciences-humaines-fr.csl b/lettres-et-sciences-humaines-fr.csl
@@ -147,7 +147,7 @@
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
       <else>
-        <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -386,9 +386,10 @@
   </macro>
   <macro name="collection">
     <group>
-      <text variable="collection-title" text-case="capitalize-first" prefix="(«&#160;" suffix="&#160;»"/>
-      <text variable="collection-number" prefix=", "/>
-      <text value=")"/>
+      <group delimiter=", " prefix="(" suffix=")">
+        <text variable="collection-title" text-case="capitalize-first" quotes="true"/>
+        <text variable="collection-number"/>
+      </group>
     </group>
   </macro>
   <macro name="access">