changeset 3891:253e7f70dd0c

Better Partial fix for issue880 (dc). flys-artifacts/trunk@5544 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 21 Sep 2012 07:50:26 +0000
parents 2ca035dbc838
children 1dc658c3306b
files flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml
diffstat 2 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Fri Sep 21 07:26:47 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Sep 21 07:50:26 2012 +0000
@@ -1,3 +1,10 @@
+2012-09-20	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Better Partial issue880 (diverse DC).
+
+	* doc/conf/meta-data.xml: Remove double entry for annotations in
+	  longitudinal section case but keep recommending it.
+
 2012-09-20	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Partial issue880 (diverse DC).
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Sep 21 07:26:47 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Sep 21 07:50:26 2012 +0000
@@ -641,7 +641,6 @@
                  <dc:call-macro name="basedata_4_heightmarks-points"/>
                  <dc:comment comment=" AMTL LINIEN  ---------------------------"/>
                  <dc:call-macro name="basedata_3_officials"/>
-                 <dc:call-macro name="annotations"/>
               </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                  <dc:call-macro name="annotations"/>
@@ -797,6 +796,13 @@
               </discharge_table_nn>
           </dc:if>
 
+          <dc:if test="dc:contains($artifact-outs, 'longitudinal_section')">
+
+              <longitudinal_section>
+                <dc:call-macro name="annotations"/>
+              </longitudinal_section>
+          </dc:if>
+
           <dc:if test="dc:contains($artifact-outs, 'map')">
               <map>
               <dc:choose>

http://dive4elements.wald.intevation.org