From 658175ca1762f098d77766d78b66eff8ecde5678 Mon Sep 17 00:00:00 2001
From: Elena Razlogova <elena.razlogova@gmail.com>
Date: Wed, 23 Jan 2008 02:08:26 +0000
Subject: [PATCH] moving conditionals around for clarity

---
 csl/chicago-note-no-ibid.csl | 22 +++++++++-------------
 csl/chicago-note.csl         | 22 +++++++++-------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/csl/chicago-note-no-ibid.csl b/csl/chicago-note-no-ibid.csl
index f85881c63d..0a9f4f3950 100644
--- a/csl/chicago-note-no-ibid.csl
+++ b/csl/chicago-note-no-ibid.csl
@@ -246,26 +246,22 @@
     </choose>
   </macro>
   <macro name="archive">
-	<choose>
-	  <if type="graphic report" match="any">
-        <group delimiter=", ">
+    <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
-        </group>
-	  </if>
-	  <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-        <group delimiter=", ">
-      <text variable="archive_location"/>
-      <text variable="archive"/>
-      <text variable="archive-place"/>
-        </group>
-	  </else-if>
-	</choose>
+    </group>
   </macro>
   <macro name="access">
     <group delimiter=", ">
+	  <choose>
+	    <if type="graphic report" match="any">
       <text macro="archive"/>
+	    </if>
+	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+      <text macro="archive"/>
+	    </else-if>
+	  </choose>
       <text variable="URL"/>
     </group>
   </macro>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index 7934bf48c3..573ab668e6 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -246,26 +246,22 @@
     </choose>
   </macro>
   <macro name="archive">
-	<choose>
-	  <if type="graphic report" match="any">
-        <group delimiter=", ">
+    <group delimiter=", ">
       <text variable="archive_location"/>
       <text variable="archive"/>
       <text variable="archive-place"/>
-        </group>
-	  </if>
-	  <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
-        <group delimiter=", ">
-      <text variable="archive_location"/>
-      <text variable="archive"/>
-      <text variable="archive-place"/>
-        </group>
-	  </else-if>
-	</choose>
+    </group>
   </macro>
   <macro name="access">
     <group delimiter=", ">
+	  <choose>
+	    <if type="graphic report" match="any">
       <text macro="archive"/>
+	    </if>
+	    <else-if type="book thesis chapter article-journal article-newspaper article-magazine" match="none">
+      <text macro="archive"/>
+	    </else-if>
+	  </choose>
       <text variable="URL"/>
     </group>
   </macro>