From fee74ead2429e7cbbbf931a1d89e00feea496a97 Mon Sep 17 00:00:00 2001
From: Louis Simard <cynthia@jolteon>
Date: Mon, 4 Oct 2010 19:19:40 -0400
Subject: [PATCH] Add the option --no-renderer-workaround, which disables
 renderer workarounds. Made --renderer-workaround the default, to avoid
 duplicate bugs reported against Scour instead of librsvg.

(The option --renderer-workaround still exists, for compatibility with Scour 0.25, but is now a dummy option.)
---
 scour.inx | 2 +-
 scour.py  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scour.inx b/scour.inx
index 26d9b62..5831fdf 100644
--- a/scour.inx
+++ b/scour.inx
@@ -17,7 +17,7 @@
             <param name="keep-editor-data"  type="boolean" _gui-text="Keep editor data">false</param>
             <param name="remove-metadata"  type="boolean" _gui-text="Remove metadata">false</param>
             <param name="enable-comment-stripping"  type="boolean" _gui-text="Remove comments">false</param>
-            <param name="renderer-workaround"  type="boolean" _gui-text="Work around renderer bugs">false</param>
+            <param name="renderer-workaround"  type="boolean" _gui-text="Work around renderer bugs">true</param>
             <param name="enable-viewboxing" type="boolean" _gui-text="Enable viewboxing">false</param>
             <param name="strip-xml-prolog"  type="boolean" _gui-text="Remove the &lt;?xml?&gt; declaration">false</param>
             <param name="set-precision"  type="int" _gui-text="Number of significant digits for coords">5</param>
diff --git a/scour.py b/scour.py
index a654597..7b20244 100755
--- a/scour.py
+++ b/scour.py
@@ -2839,8 +2839,11 @@ _options_parser.add_option("--remove-metadata",
 	action="store_true", dest="remove_metadata", default=False,
 	help="remove <metadata> elements (which may contain license metadata etc.)")
 _options_parser.add_option("--renderer-workaround",
-	action="store_true", dest="renderer_workaround", default=False,
-	help="work around various renderer bugs (currently only librsvg)")
+	action="store_true", dest="renderer_workaround", default=True,
+	help="work around various renderer bugs (currently only librsvg) (default)")
+_options_parser.add_option("--no-renderer-workaround",
+	action="store_false", dest="renderer_workaround", default=True,
+	help="do not work around various renderer bugs (currently only librsvg)")
 _options_parser.add_option("--strip-xml-prolog",
 	action="store_true", dest="strip_xml_prolog", default=False,
 	help="won't output the <?xml ?> prolog")