From 6947ff531840b67cafd4c7931e6b7bb9ceaf7d70 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sun, 5 Feb 2017 20:24:08 +0100
Subject: forward-port from 0.92.x the line height conversion from <.92 to
 >=.92

Code written by su_v in python as an extension, ported to c++ by Mc,
some fixes added by bryce.

http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15338
http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15339
http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15350
http://bazaar.launchpad.net/~inkscape.dev/inkscape/0.92.x/revision/15351

Option to disable it is called --no-convert-text-baseline-spacing

The terminology "convert" is chosen as a jargon word to be used for all
such legacy file conversions.  The "--no-XXX" naming style is adopted
from the convention used by other software such as GIMP.

(bzr r15481)
---
 src/main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 605c1207e..47cf43456 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -166,6 +166,7 @@ enum {
     SP_ARG_SHELL,
     SP_ARG_VERSION,
     SP_ARG_VACUUM_DEFS,
+    SP_ARG_NO_CONVERT_TEXT_BASELINE_SPACING,
 #ifdef WITH_DBUS
     SP_ARG_DBUS_LISTEN,
     SP_ARG_DBUS_NAME,
@@ -235,7 +236,6 @@ static gchar *sp_xverbs_yaml_utf8 = NULL;
 static gchar *sp_xverbs_yaml = NULL;
 #endif // WITH_YAML
 
-
 /**
  *  Reset variables to default values.
  */
@@ -274,6 +274,7 @@ static void resetCommandlineGlobals() {
         sp_query_all = FALSE;
         sp_query_id = NULL;
         sp_vacuum_defs = FALSE;
+        sp_no_convert_text_baseline_spacing = FALSE;
 #ifdef WITH_DBUS
         sp_dbus_listen = FALSE;
         sp_dbus_name = NULL;
@@ -525,6 +526,11 @@ struct poptOption options[] = {
      N_("Start Inkscape in interactive shell mode."),
      NULL},
 
+    {"no-convert-text-baseline-spacing", 0,
+    POPT_ARG_NONE, &sp_no_convert_text_baseline_spacing, SP_ARG_NO_CONVERT_TEXT_BASELINE_SPACING,
+    N_("Do not fix legacy (pre-0.92) files' text baseline spacing on opening."),
+    NULL},
+
     POPT_AUTOHELP POPT_TABLEEND
 };
 
@@ -1636,7 +1642,6 @@ static int sp_do_export_png(SPDocument *doc)
     return retcode;
 }
 
-
 /**
  *  Perform a PDF/PS/EPS export
  *
-- 
cgit v1.2.3