[PATCH 6 of 6] issue1395: Renamed bedheight-differences macro, call it from wdiff DC context

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1374143828 -7200
# Node ID 61897a2b8283cab15c20804208e33636c6ef356f
# Parent  2228baf1012ae7c01d1ab78920235b17fb9f4880
issue1395: Renamed bedheight-differences macro, call it from wdiff DC context.

diff -r 2228baf1012a -r 61897a2b8283 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Jul 18 12:36:08 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Jul 18 12:37:08 2013 +0200
@@ -138,6 +138,7 @@
                   </dc:when>
                   <dc:when test="$out = 'w_differences'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
+                    <dc:call-macro name="bedheight_differences"/>
                   </dc:when>
                   <dc:when test="$out = 'discharge_longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
@@ -392,20 +393,20 @@
                     </dc:when>
                     <dc:when test="$out = 'sedimentload_ls'">
                       <dc:call-macro name="differences"/>
-                      <dc:call-macro name="bedheight-differences"/>
+                      <dc:call-macro name="bedheight_differences"/>
                       <dc:call-macro name="flow-velocity"/>
                       <dc:call-macro name="sediment-load"/>
                     </dc:when>
                     <dc:when test="$out = 'bed_difference_year'">
                       <dc:call-macro name="waterlevels-discharge"/>
-                      <dc:call-macro name="bedheight-differences"/>
+                      <dc:call-macro name="bedheight_differences"/>
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="waterlevels-fix"/>
                       <dc:call-macro name="delta-wt-ls"/>
                     </dc:when>
                     <dc:when test="$out = 'bed_difference_epoch'">
                       <dc:call-macro name="waterlevels-discharge"/>
-                      <dc:call-macro name="bedheight-differences"/>
+                      <dc:call-macro name="bedheight_differences"/>
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="waterlevels-fix"/>
                       <dc:call-macro name="delta-wt-ls"/>
@@ -731,7 +732,7 @@
     <dc:comment comment="For building differences." />
     <dc:macro name="differenceable-fix">
       <beddifferences>
-         <dc:call-macro name="bedheight-differences"/>
+         <dc:call-macro name="bedheight_differences"/>
       </beddifferences>
       <dc:comment comment="Vollmer curves need own factory"/>
       <dc:filter expr="$a_state = 'state.fix.vollmer.compute' and (($out_name = 'longitudinal_section' and $facet_name = 'longitudinal_section.w') and
@@ -964,11 +965,11 @@
       </dc:filter>
     </dc:macro>
 
-    <dc:macro name="bedheight-differences">
+    <dc:macro name="bedheight_differences">
       <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and
         (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))">
         <dc:if test="dc:has-result()">
-          <bedheight-differences>
+          <bedheight_differences>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)">
               <difference description="{dc:group-key()}">
                 <dc:for-each>
@@ -983,7 +984,7 @@
                 </dc:for-each>
               </difference>
             </dc:group>
-          </bedheight-differences>
+          </bedheight_differences>
         </dc:if>
       </dc:filter>
     </dc:macro>