From bf9a297fba16663366a5965cde210f3acb817bbd Mon Sep 17 00:00:00 2001
From: Frank Bennett <biercenator@gmail.com>
Date: Tue, 3 Jul 2012 10:25:03 +0900
Subject: [PATCH] Move quotes from affixes to quotes="true" in a number of
 styles

---
 annales.csl                                  | 20 +++++++++-------
 french1.csl                                  |  2 +-
 french2.csl                                  |  2 +-
 french3.csl                                  |  2 +-
 french4.csl                                  |  2 +-
 geneses.csl                                  | 14 ++++++++----
 histoire-at-politique.csl                    | 20 ++++++++++------
 histoire-et-mesure.csl                       | 14 ++++++++----
 invisu.csl                                   | 16 ++++++++-----
 le-mouvement-social.csl                      | 12 ++++++----
 lettres-et-sciences-humaines-fr.csl          |  9 ++++----
 mcrj7.csl                                    | 18 +++++++--------
 presses-universitaires-de-rennes.csl         | 20 ++++++++++------
 revue-dhistoire-moderne-et-contemporaine.csl | 24 +++++++++++++-------
 traces.csl                                   |  8 +++++--
 universite-de-liege-histoire.csl             | 20 +++++++++++-----
 universite-laval-com.csl                     |  4 +++-
 vingtieme-siecle.csl                         | 20 ++++++++++------
 18 files changed, 143 insertions(+), 84 deletions(-)

diff --git a/annales.csl b/annales.csl
index 89d458965b..18b27dfa7f 100644
--- 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
index 6d202a378e..ae3df9f0b2 100644
--- 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
index fe82763a0e..5138e6b5a5 100644
--- 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
index d80ac8eb89..81081d8de7 100644
--- 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
index 373cd636e2..4160ea2a37 100644
--- 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
index ced873c8cc..6201880763 100644
--- 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
index 0a27bb1fae..e73aaa12d3 100644
--- 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
index ebdb6c4a07..c0666b9024 100644
--- 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
index f554ea10f4..8335e9e5b0 100644
--- 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,13 +132,17 @@
       </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"/>
@@ -146,7 +150,7 @@
       </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
index 641a96f6da..315c16a661 100644
--- 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
index 587edc69d2..64f0fb8574 100644
--- 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">
diff --git a/mcrj7.csl b/mcrj7.csl
index e1caf026f5..c9a6c2ef9b 100644
--- a/mcrj7.csl
+++ b/mcrj7.csl
@@ -261,7 +261,7 @@
         <text variable="title" form="short" font-style="italic"/>
       </else-if>
       <else>
-        <text variable="title" form="short" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" form="short" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -370,7 +370,7 @@
   <macro name="title-chapter-special">
     <choose>
       <if variable="container-title" match="any">
-        <text variable="title" font-style="italic" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" font-style="italic" quotes="true"/>
         <text term="in" text-case="lowercase" suffix=" " prefix=", "/>
       </if>
       <else>
@@ -488,7 +488,7 @@
   <macro name="note-article-newspaper">
     <group delimiter=", ">
       <text macro="contributors-note" suffix=""/>
-      <text macro="title" prefix="«&#160;" suffix="&#160;»"/>
+      <text macro="title" quotes="true"/>
       <text variable="container-title" prefix="" font-style="italic"/>
       <text macro="publisher-place"/>
       <text macro="issued-year" prefix="" suffix=""/>
@@ -499,7 +499,7 @@
   <macro name="article-newspaper">
     <group delimiter=", ">
       <text macro="contributors" suffix=""/>
-      <text macro="title" prefix="«&#160;" suffix="&#160;»"/>
+      <text macro="title" quotes="true"/>
       <text variable="container-title" prefix="" font-style="italic"/>
       <text macro="publisher-place"/>
       <text macro="issued-year" prefix="" suffix=""/>
@@ -510,7 +510,7 @@
   <macro name="note-article-magazine">
     <group delimiter=" ">
       <text macro="contributors-note" suffix=","/>
-      <text macro="title" prefix="«&#160;" suffix="&#160;»"/>
+      <text macro="title" quotes="true"/>
       <text variable="container-title" prefix="" font-style="italic"/>
       <choose>
         <if variable="volume" match="any">
@@ -532,7 +532,7 @@
   <macro name="article-magazine">
     <group delimiter=" ">
       <text macro="contributors" suffix=","/>
-      <text macro="title" prefix="«&#160;" suffix="&#160;»"/>
+      <text macro="title" quotes="true"/>
       <text variable="container-title" prefix="" font-style="italic"/>
       <choose>
         <if variable="volume" match="any">
@@ -554,7 +554,7 @@
   <macro name="note-article-journal">
     <group delimiter=" ">
       <text macro="contributors-note" suffix=","/>
-      <text macro="title" prefix="«&#160;" suffix="&#160;»"/>
+      <text macro="title" quotes="true"/>
       <text macro="issued-year" prefix="(" suffix=")"/>
       <group delimiter="&#160;: ">
         <text variable="volume" prefix=""/>
@@ -569,7 +569,7 @@
   <macro name="article-journal">
     <group delimiter=" ">
       <text macro="contributors" suffix=","/>
-      <text macro="title" prefix="«&#160;" suffix="&#160;»"/>
+      <text macro="title" quotes="true"/>
       <text macro="issued-year" prefix="(" suffix=")"/>
       <group delimiter="&#160;: ">
         <text variable="volume" prefix=""/>
@@ -720,7 +720,7 @@
         <choose>
           <if locator="page" match="none">
             <label variable="locator" prefix=", " suffix=" " form="long"/>
-            <text variable="locator" prefix="«&#160;" suffix="&#160;»"/>
+            <text variable="locator" quotes="true"/>
           </if>
           <else-if locator="page" match="any">
             <text variable="page" prefix=", " suffix=" "/>
diff --git a/presses-universitaires-de-rennes.csl b/presses-universitaires-de-rennes.csl
index c4f8dd62d1..b73ae634de 100644
--- a/presses-universitaires-de-rennes.csl
+++ b/presses-universitaires-de-rennes.csl
@@ -73,7 +73,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>
@@ -86,13 +86,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 macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
         </group>
@@ -104,7 +106,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -340,11 +342,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>
@@ -368,7 +374,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/revue-dhistoire-moderne-et-contemporaine.csl b/revue-dhistoire-moderne-et-contemporaine.csl
index 2a70fab2ea..a5536053a8 100644
--- a/revue-dhistoire-moderne-et-contemporaine.csl
+++ b/revue-dhistoire-moderne-et-contemporaine.csl
@@ -113,7 +113,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>
@@ -126,13 +126,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"/>
@@ -140,7 +142,7 @@
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»"/>
+          <text variable="title" text-case="capitalize-first" quotes="true"/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
           <date variable="issued">
             <date-part name="day" suffix=" "/>
@@ -151,7 +153,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -341,11 +343,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>
@@ -369,7 +375,9 @@
                 <text variable="title" form="short" font-style="italic" suffix="..."/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="...&#160;»" font-style="normal"/>
+                <group quotes="true">
+                  <text variable="title" text-case="capitalize-first" form="short" suffix="..." font-style="normal"/>
+                </group>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>
diff --git a/traces.csl b/traces.csl
index ae823ec99b..32315434fc 100644
--- a/traces.csl
+++ b/traces.csl
@@ -135,7 +135,9 @@
           <text prefix=" " suffix="." macro="publisher"/>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix="«&#160;" suffix="&#160;»,"/>
+          <group suffix=",">
+            <text macro="title" quotes="true"/>
+          </group>
           <group prefix=" " delimiter=" ">
             <text variable="container-title" font-style="italic" suffix=","/>
             <text variable="collection-title" suffix=","/>
@@ -150,7 +152,9 @@
         </else-if>
         <else>
           <group prefix=" " delimiter=" " suffix=".">
-            <text macro="title" prefix="«&#160;" suffix="&#160;»,"/>
+            <group suffix=",">
+              <text macro="title" quotes="true"/>
+            </group>
             <text macro="editor"/>
           </group>
           <group prefix=" " suffix=".">
diff --git a/universite-de-liege-histoire.csl b/universite-de-liege-histoire.csl
index 9d6bbb4c73..b2d95b33e7 100644
--- a/universite-de-liege-histoire.csl
+++ b/universite-de-liege-histoire.csl
@@ -94,7 +94,9 @@
       </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"/>
+          <group suffix=", ">
+            <text variable="title" text-case="capitalize-first" quote="true" font-style="normal"/>
+          </group>
           <text value="in " font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
@@ -116,7 +118,9 @@
       </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="normal" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
@@ -129,7 +133,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -350,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>
@@ -378,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/universite-laval-com.csl b/universite-laval-com.csl
index b09bd04edd..52be6c1d1d 100644
--- a/universite-laval-com.csl
+++ b/universite-laval-com.csl
@@ -132,7 +132,9 @@
           </choose>
         </if>
         <else>
-          <text variable="title" prefix="«&#160;" suffix="&#160;»."/>
+          <group suffix=".">
+            <text variable="title" quotes="true"/>
+          </group>
         </else>
       </choose>
     </group>
diff --git a/vingtieme-siecle.csl b/vingtieme-siecle.csl
index adefbffef9..eb756cd8ff 100644
--- a/vingtieme-siecle.csl
+++ b/vingtieme-siecle.csl
@@ -71,7 +71,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>
@@ -84,13 +84,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"/>
@@ -103,7 +105,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -342,11 +344,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>
@@ -370,7 +376,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="."/>