Mercurial > dive4elements > river
comparison artifacts/doc/conf/meta-data.xml @ 8900:d32c22fc686c
Merge
| author | mschaefer |
|---|---|
| date | Thu, 22 Feb 2018 14:11:19 +0100 |
| parents | 863f2850dbcf |
| children | 31dff17c6828 |
comparison
equal
deleted
inserted
replaced
| 8899:3dd0c77a4b27 | 8900:d32c22fc686c |
|---|---|
| 115 </dc:when> | 115 </dc:when> |
| 116 <dc:comment> Maps </dc:comment> | 116 <dc:comment> Maps </dc:comment> |
| 117 <dc:when test="$out = 'floodmap'"> | 117 <dc:when test="$out = 'floodmap'"> |
| 118 <dc:call-macro name="flood-map-recommended"/> | 118 <dc:call-macro name="flood-map-recommended"/> |
| 119 </dc:when> | 119 </dc:when> |
| 120 | |
| 121 <dc:when test="$out = 'sinfo_flow_depth'"> | |
| 122 <dc:call-macro name="annotations"/> | |
| 123 </dc:when> | |
| 120 </dc:choose> | 124 </dc:choose> |
| 121 </dc:iterate> | 125 </dc:iterate> |
| 122 </dc:when> | 126 </dc:when> |
| 123 <dc:otherwise> | 127 <dc:otherwise> |
| 124 <dc:comment> | 128 <dc:comment> |
| 253 <dc:call-macro name="basedata_1_additionals"/> | 257 <dc:call-macro name="basedata_1_additionals"/> |
| 254 <dc:call-macro name="basedata_2_fixations"/> | 258 <dc:call-macro name="basedata_2_fixations"/> |
| 255 <dc:call-macro name="basedata_4_heightmarks-points"/> | 259 <dc:call-macro name="basedata_4_heightmarks-points"/> |
| 256 <dc:call-macro name="basedata_5_flood-protections"/> | 260 <dc:call-macro name="basedata_5_flood-protections"/> |
| 257 </dc:when> | 261 </dc:when> |
| 262 | |
| 263 <dc:when test="$out = 'sinfo_flow_depth'"> | |
| 264 <!-- FIXME: chcck --> | |
| 265 <dc:call-macro name="longitudinal-section-prototype"/> | |
| 266 </dc:when> | |
| 267 | |
| 258 </dc:choose> | 268 </dc:choose> |
| 259 </dc:iterate> | 269 </dc:iterate> |
| 260 </dc:otherwise> | 270 </dc:otherwise> |
| 261 </dc:choose> | 271 </dc:choose> |
| 262 </dc:call-macro> | 272 </dc:call-macro> |