--- a/flys-artifacts/doc/conf/meta-data.xml	Mon Dec 03 17:25:49 2012 +0100
+++ b/flys-artifacts/doc/conf/meta-data.xml	Mon Dec 03 17:27:08 2012 +0100
@@ -674,6 +674,19 @@
           </flowvelocitymeasurement>
         </dc:macro>
 
+        <dc:macro name="longitudinal-section-prototype">
+                 <dc:call-macro name="basedata_0"/>
+                 <dc:call-macro name="basedata_1_additionals"/>
+                 <dc:comment comment=" FIXATIONS ---------------------------"/>
+                 <dc:call-macro name="basedata_2_fixations"/>
+                 <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
+                 <dc:call-macro name="basedata_4_heightmarks-points"/>
+                 <dc:comment comment=" AMTL LINIEN  ---------------------------"/>
+                 <dc:call-macro name="basedata_3_officials"/>
+                 <dc:call-macro name="basedata_5_flood-protections"/>
+                 <dc:call-macro name="annotations_per_type"/>
+        </dc:macro>
+
         <dc:comment>
 
         + River-Node
@@ -698,6 +711,9 @@
                <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
                  <dc:call-macro name="mainvalues"/>
                </dc:if>
+               <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+                 <dc:call-macro name="mainvalues"/>
+               </dc:if>
                <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                  <dc:call-macro name="annotations"/>
                  <dc:call-macro name="mainvalues"/>
@@ -734,31 +750,19 @@
                  <dc:call-macro name="cross_sections"/>
                  <dc:call-macro name="hyks"/>
               </dc:if>
-              <dc:if test="dc:contains($artifact-outs, 'discharge_longitudinal_section')">
-                 <dc:call-macro name="basedata_0"/>
-                 <dc:call-macro name="basedata_1_additionals"/>
-                 <dc:call-macro name="basedata_2_fixations"/>
-                 <dc:call-macro name="basedata_3_officials"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points"/>
-                 <dc:call-macro name="basedata_5_flood-protections"/>
-              </dc:if>
               <!--dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')">
                  <dc:call-macro name="basedata_0_wq"/>
                  <dc:call-macro name="basedata_4_heightmarks-wq"/>
               </dc:if-->
-              <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences'))">
-                 <dc:call-macro name="basedata_0"/>
-                 <dc:call-macro name="basedata_1_additionals"/>
-                 <dc:comment comment=" FIXATIONS ---------------------------"/>
-                 <dc:call-macro name="basedata_2_fixations"/>
-                 <dc:comment comment=" HOEHENMARKEN ---------------------------"/>
-                 <dc:call-macro name="basedata_4_heightmarks-points"/>
-                 <dc:comment comment=" AMTL LINIEN  ---------------------------"/>
-                 <dc:call-macro name="basedata_3_officials"/>
-                 <dc:call-macro name="basedata_5_flood-protections"/>
-                 <dc:call-macro name="annotations_per_type"/>
+              <dc:if test="dc:contains($artifact-outs, 'longitudinal_section') or (dc:contains($artifact-outs, 'w_differences')) or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))">
+                  <dc:call-macro name="longitudinal-section-prototype"/>
               </dc:if>
-
+              <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
+                  <dc:call-macro name="mainvalues"/>
+                  <dc:call-macro name="basedata_2_fixations_relative_point"/>
+                  <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
+                  <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+              </dc:if>
               <dc:if test="dc:contains($artifact-outs, 'reference_curve')">
                 <dc:call-macro name="annotations"/>
                 <!--dc:call-macro name="basedata_0"/-->
@@ -782,6 +786,11 @@
               <dc:if test="dc:contains($artifact-outs, 'fix_longitudinal_section_curve')">
                 <dc:call-macro name="annotations"/>
               </dc:if>
+              <dc:if test="dc:contains($artifact-outs, 'map')">
+                 <map>
+                   <dc:call-macro name="flood-map-complete"/>
+                 </map>
+              </dc:if>
               <dc:if test="dc:contains($artifact-outs, 'flow_velocity')">
                 <dc:call-macro name="annotations"/>
                 <dc:call-macro name="flow_velocity_measurements"/>
@@ -901,20 +910,6 @@
               </computed_discharge_curve>
           </dc:if>
 
-          <dc:if test="dc:contains($artifact-outs, 'duration_curve')">
-            <dc:choose>
-                <dc:when test="dc:contains($parameters, 'recommended')">
-                  <dc:call-macro name="mainvalues"/>
-                </dc:when>
-                <dc:otherwise>
-                  <dc:call-macro name="mainvalues"/>
-                  <dc:call-macro name="basedata_2_fixations_relative_point"/>
-                  <dc:call-macro name="basedata_4_heightmarks-points-relative_points"/>
-                  <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
-                </dc:otherwise>
-            </dc:choose>
-          </dc:if>
-
           <dc:if test="dc:contains($artifact-outs, 'fix_wq_curve') and not (dc:contains($parameters, 'recommended'))">
               <discharge_table_nn>
                 <discharge_table_gauge>
@@ -939,17 +934,6 @@
               </discharge_table_nn>
           </dc:if>
 
-          <dc:if test="dc:contains($artifact-outs, 'map')">
-              <map>
-              <dc:choose>
-                  <dc:when test="dc:contains($parameters, 'recommended')">
-                  </dc:when>
-                  <dc:otherwise>
-                      <dc:call-macro name="flood-map-complete"/>
-                  </dc:otherwise>
-              </dc:choose>
-              </map>
-          </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'floodmap')">
               <floodmap>
               <dc:choose>