Add option to generate SVG charts

https://bugzilla.gnome.org/show_bug.cgi?id=761137

diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index f770bc2076a00e6b777425768333179216b174dc..8e51234a20fe3418054fd8c2f71fafddb0bc5c91 100644 (file)
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -1026,8 +1026,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 
        protected void write_image_block (Api.Node element) {
                if (element is Class || element is Interface || element is Struct) {
+                       unowned string format = (settings.use_svg_images ? "svg" : "png");
                        var chart = new Charts.Hierarchy (image_factory, element);
-                       chart.save (this.get_img_path (element, "png"), "png");
+                       chart.save (this.get_img_path (element, format), format);
 
                        writer.start_tag ("h2", {"class", css_title})
                                .text ("Object Hierarchy:")
@@ -1040,7 +1041,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
                                                                           "alt",
                                                                           "Object hierarchy for %s".printf (element.name),
                                                                           "src",
-                                                                          this.get_img_path_html (element, "png")});
+                                                                          this.get_img_path_html (element, format)});
                        writer.add_usemap (chart);
                }
        }

diff --git a/src/libvaladoc/settings.vala b/src/libvaladoc/settings.vala
index 1b5c420399f0eb0d1e15d22ee6dd575d56808f93..823dd5b2059e5f79d2144342f608d6abdca3adc3 100644 (file)
--- a/src/libvaladoc/settings.vala
+++ b/src/libvaladoc/settings.vala
@@ -159,6 +159,11 @@ public class Valadoc.Settings : Object {
        public string gir_namespace;
 
        public string gir_version;
+
+       /**
+        * Use SVG as chart images
+        */
+       public bool use_svg_images = false;
 }
 
 

diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index 2e7801be46a4842380eeae1846e923d1b6f548ef..a4aa3277f45f7d32d38947c30031e7077794b685 100644 (file)
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -50,6 +50,7 @@ public class ValaDoc : Object {
        private static bool with_deps = false;
        private static bool _private = false;
        private static bool version = false;
+       private static bool use_svg_images = false;
 
        private static bool disable_diagnostic_colors = false;
        private static bool verbose = false;
@@ -110,6 +111,7 @@ public class ValaDoc : Object {
                { "no-protected", 0, OptionFlags.REVERSE, OptionArg.NONE, ref _protected, "Removes protected elements from documentation", null },
                { "internal", 0, 0, OptionArg.NONE, ref _internal, "Adds internal elements to documentation", null },
                { "private", 0, 0, OptionArg.NONE, ref _private, "Adds private elements to documentation", null },
+               { "use-svg-images", 0, 0, OptionArg.NONE, ref use_svg_images, "Generate SVG image charts instead of PNG", null },
 
                { "package-name", 0, 0, OptionArg.STRING, ref pkg_name, "package name", "NAME" },
                { "package-version", 0, 0, OptionArg.STRING, ref pkg_version, "package version", "VERSION" },
@@ -235,6 +237,7 @@ public class ValaDoc : Object {
                settings.metadata_directories = metadata_directories;
                settings.gir_directories = gir_directories;
                settings.target_glib = target_glib;
+               settings.use_svg_images = use_svg_images;
 
                settings.source_files = tsources;
                settings.packages = packages;