moving conditionals around for clarity

This commit is contained in:
Elena Razlogova 2008-01-23 02:08:26 +00:00
parent fbd5360b7e
commit 658175ca17
2 changed files with 18 additions and 26 deletions

View file

@ -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>

View file

@ -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>