From 6e608fe2427a4a05c616e6d00512aa19bbaf7d13 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 2 Mar 2016 21:17:23 +0100
Subject: diag-filter: Do not use the same output block as mscgen

By using the same name for the config it overwrite the one used
by the mscgen plugin. Let's avoid this and switch from svg to png
as well as the docbook classification doesn't seem to work.
---
 build/diag-filter.conf | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'build')

diff --git a/build/diag-filter.conf b/build/diag-filter.conf
index d3d62ab..4f6005e 100644
--- a/build/diag-filter.conf
+++ b/build/diag-filter.conf
@@ -3,7 +3,7 @@
 #
 
 [seqdiag-filter-style]
-seqdiag-style=template="seqdiag-block",subs=(),posattrs=("style","target"),filter='seqdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?svg}} - && echo " "'
+seqdiag-style=template="seqdiag-block",subs=(),posattrs=("style","target"),filter='seqdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "'
 
 [blockdef-listing]
 template::[seqdiag-filter-style]
@@ -12,16 +12,16 @@ template::[seqdiag-filter-style]
 template::[seqdiag-filter-style]
 
 [seqdiag-block]
-template::[filter-image-pngsvg-blockmacro]
+template::[filter-diag-pngsvg-blockmacro]
 
-[filter-image-pngsvg-blockmacro]
+[filter-diag-pngsvg-blockmacro]
 {target%}{counter2:target-number}
-{target%}{set2:target:{docname}__{target-number}.{format={basebackend-docbook!png}{basebackend-docbook?svg}}}
+{target%}{set2:target:{docname}__{target-number}.{format={basebackend-docbook!png}{basebackend-docbook?png}}}
 |
 template::[image-blockmacro]
 
 [blockdiag-filter-style]
-blockdiag-style=template="blockdiag-block",subs=(),posattrs=("style","target"),filter='blockdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?svg}} - && echo " "'
+blockdiag-style=template="blockdiag-block",subs=(),posattrs=("style","target"),filter='blockdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "'
 
 [blockdef-listing]
 template::[blockdiag-filter-style]
@@ -30,12 +30,12 @@ template::[blockdiag-filter-style]
 template::[blockdiag-filter-style]
 
 [blockdiag-block]
-template::[filter-image-pngsvg-blockmacro]
+template::[filter-diag-pngsvg-blockmacro]
 
 
 
 [actdiag-filter-style]
-actdiag-style=template="actdiag-block",subs=(),posattrs=("style","target"),filter='actdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?svg}} - && echo " "'
+actdiag-style=template="actdiag-block",subs=(),posattrs=("style","target"),filter='actdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "'
 
 [blockdef-listing]
 template::[actdiag-filter-style]
@@ -44,12 +44,12 @@ template::[actdiag-filter-style]
 template::[actdiag-filter-style]
 
 [actdiag-block]
-template::[filter-image-pngsvg-blockmacro]
+template::[filter-diag-pngsvg-blockmacro]
 
 
 
 [nwdiag-filter-style]
-nwdiag-style=template="nwdiag-block",subs=(),posattrs=("style","target"),filter='nwdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?svg}} - && echo " "'
+nwdiag-style=template="nwdiag-block",subs=(),posattrs=("style","target"),filter='nwdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "'
 
 [blockdef-listing]
 template::[nwdiag-filter-style]
@@ -58,11 +58,11 @@ template::[nwdiag-filter-style]
 template::[nwdiag-filter-style]
 
 [nwdiag-block]
-template::[filter-image-pngsvg-blockmacro]
+template::[filter-diag-pngsvg-blockmacro]
 
 
 [packetdiag-filter-style]
-packetdiag-style=template="packetdiag-block",subs=(),posattrs=("style","target"),filter='packetdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?svg}} - && echo " "'
+packetdiag-style=template="packetdiag-block",subs=(),posattrs=("style","target"),filter='packetdiag -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -T{format={basebackend-docbook!png}{basebackend-docbook?png}} - && echo " "'
 
 [blockdef-listing]
 template::[packetdiag-filter-style]
@@ -71,6 +71,6 @@ template::[packetdiag-filter-style]
 template::[packetdiag-filter-style]
 
 [packetdiag-block]
-template::[filter-image-pngsvg-blockmacro]
+template::[filter-diag-pngsvg-blockmacro]
 
 
-- 
cgit v1.2.3