Allow locator labels on non-page pinpoints in Chicago family.

DmitryS111 · Jan 31, 2012 · a493d9d · a493d9d
1 parent 7132887
commit a493d9d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/chicago-fullnote-bibliography-delimiter-fixes.csl b/chicago-fullnote-bibliography-delimiter-fixes.csl
@@ -597,6 +597,9 @@
                     </else>
                   </choose>
                 </if>
+                <else>
+                  <label variable="locator" form="short" suffix=" "/>
+                </else>
               </choose>
               <text variable="locator"/>
             </group>
@@ -645,7 +648,14 @@
         </choose>
       </if>
       <else-if type="article-journal">
-        <text variable="locator"/>
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short" suffix=" "/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
       </else-if>
       <else-if type="legal_case"/>
       <else>

diff --git a/chicago-fullnote-bibliography-no-ibid-delimiter-fixes.csl b/chicago-fullnote-bibliography-no-ibid-delimiter-fixes.csl
@@ -597,6 +597,9 @@
                     </else>
                   </choose>
                 </if>
+                <else>
+                  <label variable="locator" form="short" suffix=" "/>
+                </else>
               </choose>
               <text variable="locator"/>
             </group>
@@ -637,7 +640,14 @@
       <if variable="locator" match="none">
         <choose>
           <if type="article-journal">
-            <text variable="page"/>
+            <group delimiter=" ">
+              <choose>
+                <if locator="page" match="none">
+                  <label variable="locator" form="short" suffix=" "/>
+                </if>
+              </choose>
+              <text variable="locator"/>
+            </group>
           </if>
           <else-if type="chapter paper-conference" match="any">
             <text variable="page"/>

diff --git a/chicago-fullnote-bibliography.csl b/chicago-fullnote-bibliography.csl
@@ -531,6 +531,9 @@
                 </else>
               </choose>
             </if>
+            <else>
+              <label variable="locator" form="short" suffix=" "/>
+            </else>
           </choose>
         </if>
         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
@@ -546,7 +549,14 @@
         <text macro="pages"/>
       </if>
       <else-if type="article-journal">
-        <text variable="locator" prefix=": "/>
+        <group delimiter=" " prefix=": ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short" suffix=" "/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
       </else-if>
       <else-if type="legal_case"/>
       <else>

diff --git a/chicago-note-bibliography.csl b/chicago-note-bibliography.csl
@@ -396,6 +396,9 @@
                   </else>
                 </choose>
               </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
             </choose>
           </if>
           <else-if type="bill book graphic legal_case motion_picture report song" match="any">