Fix for Bug #437567 (PDF Save As dialog convert text to paths option is confusing).

Fixed bugs:
  - https://launchpad.net/bugs/437567

(bzr r13880)

3 files changed, 97 insertions, 79 deletions

diff --git a/po/inkscape.pot b/po/inkscape.pot
index ecf235b78..9c74dc340 100644
--- a/po/inkscape.pot
+++ b/po/inkscape.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2015-01-25 08:39+0100\n"
+"POT-Creation-Date: 2015-01-28 11:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5600,100 +5600,108 @@ msgid "PostScript"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:329
-#: ../src/extension/internal/cairo-ps-out.cpp:368
+#: ../src/extension/internal/cairo-ps-out.cpp:371
 msgid "Restrict to PS level:"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:330
-#: ../src/extension/internal/cairo-ps-out.cpp:369
+#: ../src/extension/internal/cairo-ps-out.cpp:372
 msgid "PostScript level 3"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:331
-#: ../src/extension/internal/cairo-ps-out.cpp:370
+#: ../src/extension/internal/cairo-ps-out.cpp:373
 msgid "PostScript level 2"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:333
-#: ../src/extension/internal/cairo-ps-out.cpp:372
+#: ../src/extension/internal/cairo-ps-out.cpp:375
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250
-#: ../src/extension/internal/emf-inout.cpp:3569
-#: ../src/extension/internal/wmf-inout.cpp:3144
-msgid "Convert texts to paths"
+msgid "Text output options:"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:334
-msgid "PS+LaTeX: Omit text in PS, and create LaTeX file"
+#: ../src/extension/internal/cairo-ps-out.cpp:376
+#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251
+msgid "Embed fonts"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:335
-#: ../src/extension/internal/cairo-ps-out.cpp:374
+#: ../src/extension/internal/cairo-ps-out.cpp:377
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252
-msgid "Rasterize filter effects"
+msgid "Convert text to paths"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:336
-#: ../src/extension/internal/cairo-ps-out.cpp:375
+#: ../src/extension/internal/cairo-ps-out.cpp:378
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253
-msgid "Resolution for rasterization (dpi):"
-msgstr ""
-
-#: ../src/extension/internal/cairo-ps-out.cpp:337
-#: ../src/extension/internal/cairo-ps-out.cpp:376
-msgid "Output page size"
+msgid "Omit text in PDF and create LaTeX file"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:338
-#: ../src/extension/internal/cairo-ps-out.cpp:377
+#: ../src/extension/internal/cairo-ps-out.cpp:380
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255
-msgid "Use document's page size"
+msgid "Rasterize filter effects"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:339
-#: ../src/extension/internal/cairo-ps-out.cpp:378
+#: ../src/extension/internal/cairo-ps-out.cpp:381
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256
-msgid "Use exported object's size"
+msgid "Resolution for rasterization (dpi):"
+msgstr ""
+
+#: ../src/extension/internal/cairo-ps-out.cpp:340
+#: ../src/extension/internal/cairo-ps-out.cpp:382
+msgid "Output page size"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:341
+#: ../src/extension/internal/cairo-ps-out.cpp:383
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:258
-msgid "Bleed/margin (mm):"
+msgid "Use document's page size"
 msgstr ""
 
 #: ../src/extension/internal/cairo-ps-out.cpp:342
-#: ../src/extension/internal/cairo-ps-out.cpp:381
+#: ../src/extension/internal/cairo-ps-out.cpp:384
 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:259
+msgid "Use exported object's size"
+msgstr ""
+
+#: ../src/extension/internal/cairo-ps-out.cpp:344
+#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:261
+msgid "Bleed/margin (mm):"
+msgstr ""
+
+#: ../src/extension/internal/cairo-ps-out.cpp:345
+#: ../src/extension/internal/cairo-ps-out.cpp:387
+#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:262
 msgid "Limit export to the object with ID:"
 msgstr ""
 
-#: ../src/extension/internal/cairo-ps-out.cpp:346
+#: ../src/extension/internal/cairo-ps-out.cpp:349
 #: ../share/extensions/ps_input.inx.h:2
 msgid "PostScript (*.ps)"
 msgstr ""
 
-#: ../src/extension/internal/cairo-ps-out.cpp:347
+#: ../src/extension/internal/cairo-ps-out.cpp:350
 msgid "PostScript File"
 msgstr ""
 
-#: ../src/extension/internal/cairo-ps-out.cpp:366
+#: ../src/extension/internal/cairo-ps-out.cpp:369
 #: ../share/extensions/eps_input.inx.h:3
 msgid "Encapsulated PostScript"
 msgstr ""
 
-#: ../src/extension/internal/cairo-ps-out.cpp:373
-msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file"
-msgstr ""
-
-#: ../src/extension/internal/cairo-ps-out.cpp:380
+#: ../src/extension/internal/cairo-ps-out.cpp:386
 msgid "Bleed/margin (mm)"
 msgstr ""
 
-#: ../src/extension/internal/cairo-ps-out.cpp:385
+#: ../src/extension/internal/cairo-ps-out.cpp:391
 #: ../share/extensions/eps_input.inx.h:2
 msgid "Encapsulated PostScript (*.eps)"
 msgstr ""
 
-#: ../src/extension/internal/cairo-ps-out.cpp:386
+#: ../src/extension/internal/cairo-ps-out.cpp:392
 msgid "Encapsulated PostScript File"
 msgstr ""
 
@@ -5709,11 +5717,7 @@ msgstr ""
 msgid "PDF 1.4"
 msgstr ""
 
-#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251
-msgid "PDF+LaTeX: Omit text in PDF, and create LaTeX file"
-msgstr ""
-
-#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:254
+#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:257
 msgid "Output page size:"
 msgstr ""
 
@@ -5800,6 +5804,11 @@ msgstr ""
 msgid "EMF Output"
 msgstr ""
 
+#: ../src/extension/internal/emf-inout.cpp:3569
+#: ../src/extension/internal/wmf-inout.cpp:3144
+msgid "Convert texts to paths"
+msgstr ""
+
 #: ../src/extension/internal/emf-inout.cpp:3570
 #: ../src/extension/internal/wmf-inout.cpp:3145
 msgid "Map Unicode to Symbol font"
@@ -8336,8 +8345,7 @@ msgstr ""
 msgid "Luminance to Alpha"
 msgstr ""
 
-#. File
-#: ../src/filter-enums.cpp:87 ../src/verbs.cpp:2431
+#: ../src/filter-enums.cpp:87
 #: ../share/extensions/jessyInk_mouseHandler.inx.h:3
 #: ../share/extensions/jessyInk_transitions.inx.h:7
 msgid "Default"
@@ -11370,99 +11378,94 @@ msgstr ""
 msgid "_File"
 msgstr ""
 
-#. Tag
-#: ../src/menus-skeleton.h:17 ../src/verbs.cpp:2726
-msgid "_New"
-msgstr ""
-
 #. "       <verb verb-id=\"FileExportToOCAL\" />\n"
 #. "       <verb verb-id=\"DialogMetadata\" />\n"
-#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2713 ../src/verbs.cpp:2721
+#: ../src/menus-skeleton.h:41 ../src/verbs.cpp:2713 ../src/verbs.cpp:2721
 msgid "_Edit"
 msgstr ""
 
-#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2477
+#: ../src/menus-skeleton.h:51 ../src/verbs.cpp:2477
 msgid "Paste Si_ze"
 msgstr ""
 
-#: ../src/menus-skeleton.h:65
+#: ../src/menus-skeleton.h:63
 msgid "Clo_ne"
 msgstr ""
 
-#: ../src/menus-skeleton.h:79
+#: ../src/menus-skeleton.h:77
 msgid "Select Sa_me"
 msgstr ""
 
-#: ../src/menus-skeleton.h:97
+#: ../src/menus-skeleton.h:95
 msgid "_View"
 msgstr ""
 
-#: ../src/menus-skeleton.h:98
+#: ../src/menus-skeleton.h:96
 msgid "_Zoom"
 msgstr ""
 
-#: ../src/menus-skeleton.h:114
+#: ../src/menus-skeleton.h:112
 msgid "_Display mode"
 msgstr ""
 
 #. Better location in menu needs to be found
 #. "         <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n"
 #. "         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
-#: ../src/menus-skeleton.h:123
+#: ../src/menus-skeleton.h:121
 msgid "_Color display mode"
 msgstr ""
 
 #. Better location in menu needs to be found
 #. "         <verb verb-id=\"ViewColorModePrintColorsPreview\" radio=\"yes\"/>\n"
 #. "         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
-#: ../src/menus-skeleton.h:136
+#: ../src/menus-skeleton.h:134
 msgid "Sh_ow/Hide"
 msgstr ""
 
 #. Not quite ready to be in the menus.
 #. "       <verb verb-id=\"FocusToggle\" />\n"
-#: ../src/menus-skeleton.h:156
+#: ../src/menus-skeleton.h:154
 msgid "_Layer"
 msgstr ""
 
-#: ../src/menus-skeleton.h:180
+#: ../src/menus-skeleton.h:178
 msgid "_Object"
 msgstr ""
 
-#: ../src/menus-skeleton.h:191
+#: ../src/menus-skeleton.h:189
 msgid "Cli_p"
 msgstr ""
 
-#: ../src/menus-skeleton.h:195
+#: ../src/menus-skeleton.h:193
 msgid "Mas_k"
 msgstr ""
 
-#: ../src/menus-skeleton.h:199
+#: ../src/menus-skeleton.h:197
 msgid "Patter_n"
 msgstr ""
 
-#: ../src/menus-skeleton.h:223
+#: ../src/menus-skeleton.h:221
 msgid "_Path"
 msgstr ""
 
-#: ../src/menus-skeleton.h:251 ../src/ui/dialog/find.cpp:77
+#: ../src/menus-skeleton.h:249 ../src/ui/dialog/find.cpp:77
 #: ../src/ui/dialog/text-edit.cpp:71
 msgid "_Text"
 msgstr ""
 
-#: ../src/menus-skeleton.h:269
+#: ../src/menus-skeleton.h:267
 msgid "Filter_s"
 msgstr ""
 
-#: ../src/menus-skeleton.h:275
+#: ../src/menus-skeleton.h:273
 msgid "Exte_nsions"
 msgstr ""
 
-#: ../src/menus-skeleton.h:281
+#: ../src/menus-skeleton.h:279
 msgid "_Help"
 msgstr ""
 
-#: ../src/menus-skeleton.h:285
+#: ../src/menus-skeleton.h:283
 msgid "Tutorials"
 msgstr ""
 
@@ -23890,6 +23893,12 @@ msgstr ""
 msgid "Does nothing"
 msgstr ""
 
+#. File
+#. Tag
+#: ../src/verbs.cpp:2431 ../src/verbs.cpp:2726
+msgid "_New"
+msgstr ""
+
 #: ../src/verbs.cpp:2431
 msgid "Create new document from the default template"
 msgstr ""
@@ -24000,7 +24009,7 @@ msgid "Quit Inkscape"
 msgstr ""
 
 #: ../src/verbs.cpp:2461
-msgid "_Templates..."
+msgid "New from _Template..."
 msgstr ""
 
 #: ../src/verbs.cpp:2462
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index f6790687c..5dc412301 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -146,12 +146,12 @@ CairoPsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar con
 
     bool new_textToPath  = FALSE;
     try {
-        new_textToPath  = mod->get_param_bool("textToPath");
+        new_textToPath = (strcmp(mod->get_param_optiongroup("textToPath"), "paths") == 0);
     } catch(...) {}
 
     bool new_textToLaTeX  = FALSE;
     try {
-        new_textToLaTeX  = mod->get_param_bool("textToLaTeX");
+        new_textToLaTeX = (strcmp(mod->get_param_optiongroup("textToPath"), "LaTeX") == 0);
     }
     catch(...) {
         g_warning("Parameter <textToLaTeX> might not exist");
@@ -235,12 +235,12 @@ CairoEpsOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar co
 
     bool new_textToPath  = FALSE;
     try {
-        new_textToPath  = mod->get_param_bool("textToPath");
+        new_textToPath = (strcmp(mod->get_param_optiongroup("textToPath"), "paths") == 0);
     } catch(...) {}
 
     bool new_textToLaTeX  = FALSE;
     try {
-        new_textToLaTeX  = mod->get_param_bool("textToLaTeX");
+        new_textToLaTeX = (strcmp(mod->get_param_optiongroup("textToPath"), "LaTeX") == 0);
     }
     catch(...) {
         g_warning("Parameter <textToLaTeX> might not exist");
@@ -330,8 +330,11 @@ CairoPsOutput::init (void)
                 "<_item value='PS3'>" N_("PostScript level 3") "</_item>\n"
                 "<_item value='PS2'>" N_("PostScript level 2") "</_item>\n"
             "</param>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"textToLaTeX\" gui-text=\"" N_("PS+LaTeX: Omit text in PS, and create LaTeX file") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"textToPath\" gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
+                "<option value=\"embed\">" N_("Embed fonts") "</option>\n"
+                "<option value=\"paths\">" N_("Convert text to paths") "</option>\n"
+                "<option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</option>\n"
+            "</param>\n"
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
@@ -369,8 +372,11 @@ CairoEpsOutput::init (void)
                 "<_item value='PS3'>" N_("PostScript level 3") "</_item>\n"
                 "<_item value='PS2'>" N_("PostScript level 2") "</_item>\n"
             "</param>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"textToLaTeX\" gui-text=\"" N_("EPS+LaTeX: Omit text in EPS, and create LaTeX file") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"textToPath\" gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
+                "<option value=\"embed\">" N_("Embed fonts") "</option>\n"
+                "<option value=\"paths\">" N_("Convert text to paths") "</option>\n"
+                "<option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</option>\n"
+            "</param>\n"
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size") "\" type=\"optiongroup\" >\n"
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 0c4ad4f0a..e5c9406c9 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -149,7 +149,7 @@ CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc,
 
     bool new_textToPath  = FALSE;
     try {
-        new_textToPath  = mod->get_param_bool("textToPath");
+        new_textToPath = (strcmp(mod->get_param_optiongroup("textToPath"), "paths") == 0);
     }
     catch(...) {
         g_warning("Parameter <textToPath> might not exist");
@@ -157,7 +157,7 @@ CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc,
 
     bool new_textToLaTeX  = FALSE;
     try {
-        new_textToLaTeX  = mod->get_param_bool("textToLaTeX");
+        new_textToLaTeX = (strcmp(mod->get_param_optiongroup("textToPath"), "LaTeX") == 0);
     }
     catch(...) {
         g_warning("Parameter <textToLaTeX> might not exist");
@@ -247,8 +247,11 @@ CairoRendererPdfOutput::init (void)
 #endif
                 "<_item value='PDF-1.4'>" N_("PDF 1.4") "</_item>\n"
             "</param>\n"
-            "<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">false</param>\n"
-            "<param name=\"textToLaTeX\" gui-text=\"" N_("PDF+LaTeX: Omit text in PDF, and create LaTeX file") "\" type=\"boolean\">false</param>\n"
+            "<param name=\"textToPath\" gui-text=\"" N_("Text output options:") "\" type=\"optiongroup\">\n"
+                "<option value=\"embed\">" N_("Embed fonts") "</option>\n"
+                "<option value=\"paths\">" N_("Convert text to paths") "</option>\n"
+                "<option value=\"LaTeX\">" N_("Omit text in PDF and create LaTeX file") "</option>\n"
+            "</param>\n"
             "<param name=\"blurToBitmap\" gui-text=\"" N_("Rasterize filter effects") "\" type=\"boolean\">true</param>\n"
             "<param name=\"resolution\" gui-text=\"" N_("Resolution for rasterization (dpi):") "\" type=\"int\" min=\"1\" max=\"10000\">96</param>\n"
             "<param name=\"area\" gui-text=\"" N_("Output page size:") "\" type=\"optiongroup\" >\n"