|
23 | 23 |
|
24 | 24 | public enum Format { |
25 | 25 | PNG("svg", "png", true, true) { |
26 | | - @Override |
27 | | - String preProcess(String src) { |
28 | | - return encodeXml(super.preProcess(src)); |
29 | | - } |
30 | | - |
31 | 26 | @Override |
32 | 27 | EngineResult postProcess(Graphviz graphviz, EngineResult result) { |
33 | 28 | return result.mapString(s -> postProcessSvg(graphviz.processOptions, s, true)); |
34 | 29 | } |
35 | 30 | }, |
36 | 31 |
|
37 | 32 | SVG("svg", "svg", false, true) { |
38 | | - @Override |
39 | | - String preProcess(String src) { |
40 | | - return encodeXml(super.preProcess(src)); |
41 | | - } |
42 | | - |
43 | 33 | @Override |
44 | 34 | EngineResult postProcess(Graphviz graphviz, EngineResult result) { |
45 | 35 | return result.mapString(s -> postProcessSvg(graphviz.processOptions, s, true)); |
46 | 36 | } |
47 | 37 | }, |
48 | 38 |
|
49 | 39 | SVG_STANDALONE("svg", "svg", false, true) { |
50 | | - @Override |
51 | | - String preProcess(String src) { |
52 | | - return encodeXml(super.preProcess(src)); |
53 | | - } |
54 | | - |
55 | 40 | @Override |
56 | 41 | EngineResult postProcess(Graphviz graphviz, EngineResult result) { |
57 | 42 | return result.mapString(s -> postProcessSvg(graphviz.processOptions, s, false)); |
@@ -108,10 +93,6 @@ private static String replaceSubSpaces(String src) { |
108 | 93 | return new String(chars); |
109 | 94 | } |
110 | 95 |
|
111 | | - private static String encodeXml(String src) { |
112 | | - return src.replace("&", "&"); |
113 | | - } |
114 | | - |
115 | 96 | private static String postProcessSvg(ProcessOptions options, String result, boolean prefix) { |
116 | 97 | final String unprefixed = prefix ? withoutPrefix(result) : result; |
117 | 98 | return pointsToPixels(unprefixed, options.dpi, options.width, options.height, options.scale); |
|
0 commit comments