--- a/artifacts/doc/conf/meta-data.xml	Fri Sep 12 08:42:41 2014 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Fri Sep 12 13:12:25 2014 +0200
@@ -166,9 +166,7 @@
                     </computed_discharge_curve>
                   </dc:when>
                   <dc:when test="$out = 'discharge_curve'">
-                    <dc:call-macro name="discharge-curve-prototype"/>
-                    <dc:call-macro name="basedata_1_additionals_wq"/>
-                    <dc:call-macro name="basedata_5_flood-protections"/>
+                    <dc:call-macro name="discharge-prototype"/>
                     <computed_discharge_curve>
                       <dc:call-macro name="mainvalues"/>
                     </computed_discharge_curve>
@@ -188,11 +186,7 @@
                     <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
                   </dc:when>
                   <dc:when test="$out = 'fix_wq_curve'">
-                    <dc:call-macro name="discharge-curve-prototype"/>
-                    <dc:call-macro name="basedata_1_additionals_marks"/>
-                    <dc:call-macro name="basedata_2_fixations_wqkms"/>
-                    <dc:call-macro name="basedata_3_officials"/>
-                    <dc:call-macro name="basedata_5_flood-protections_relative_points"/>
+                    <dc:call-macro name="discharge-prototype"/>
                   </dc:when>
                   <dc:when test="$out = 'fix_longitudinal_section_curve'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
@@ -1342,6 +1336,24 @@
       <dc:call-macro name="sediment-load"/>
     </dc:macro>
 
+    <dc:macro name="discharge-prototype">
+      <dc:call-macro name="discharge-curve-prototype"/>
+      <dc:call-macro name="basedata_5_flood-protections"/>
+      <dc:call-macro name="basedata_0"/>
+      <dc:call-macro name="basedata_1_additionals"/>
+      <dc:call-macro name="basedata_4_heightmarks-points"/>
+      <dc:call-macro name="basedata_1_additionals-relative_point"/>
+      <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:call-macro name="mainvalues"/>
+      <dc:call-macro name="annotations"/>
+
+      <computed_discharge_curve>
+        <dc:call-macro name="mainvalues"/>
+      </computed_discharge_curve>
+    </dc:macro>
+
     <dc:macro name="porosities">
       <porosities>
       <dc:context>