merged from trunk

(bzr r11608.1.56)

1 files changed, 67 insertions, 87 deletions

diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 5a983fc1a..c87e94fc6 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -8,8 +8,9 @@
  *   Johan Engelen <goejendaagh@zonnet.nl>
  *   Abhishek Sharma
  *   John Smith
+ *   Tavmjong Bah
  *
- * Copyright (C) 1999-2012 Authors
+ * Copyright (C) 1999-2013 Authors
  * Copyright (C) 2000-2001 Ximian, Inc.
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -32,6 +33,7 @@ extern "C" {
 #include <gtkmm/stock.h>
 #include <libnrtype/font-instance.h>
 #include <libnrtype/font-style-to-pos.h>
+#include <libnrtype/font-lister.h>
 #include <xml/repr.h>
 
 #include "macros.h"
@@ -55,6 +57,8 @@ extern "C" {
 #include "widgets/icon.h"
 #include "widgets/font-selector.h"
 #include <glibmm/i18n.h>
+#include <glibmm/markup.h>
+#include "unit-constants.h"
 
 
 namespace Inkscape {
@@ -94,41 +98,33 @@ TextEdit::TextEdit()
     styleButton(&align_center, _("Align center"), GTK_STOCK_JUSTIFY_CENTER, &align_left);
     styleButton(&align_right, _("Align right"), GTK_STOCK_JUSTIFY_RIGHT, &align_left);
     styleButton(&align_justify, _("Justify (only flowed text)"), GTK_STOCK_JUSTIFY_FILL, &align_left);
+
+#if WITH_GTKMM_3_0
+    align_sep.set_orientation(Gtk::ORIENTATION_VERTICAL);
+#endif
+
     layout_hbox.pack_start(align_sep, false, false, 10);
 
     /* Direction buttons */
     styleButton(&text_horizontal, _("Horizontal text"), INKSCAPE_ICON("format-text-direction-horizontal"), NULL);
     styleButton(&text_vertical, _("Vertical text"), INKSCAPE_ICON("format-text-direction-vertical"), &text_horizontal);
+
+#if WITH_GTKMM_3_0
+    text_sep.set_orientation(Gtk::ORIENTATION_VERTICAL);
+#endif
+
     layout_hbox.pack_start(text_sep, false, false, 10);
 
     /* Line Spacing */
     GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("text_line_spacing") );
     layout_hbox.pack_start(*Gtk::manage(Glib::wrap(px)), false, false);
 
-/*
-This would introduce dependency on gtk version 2.24 which is currently not available in
-Trisquel GNU/Linux 4.5.1 (released on May 25th, 2011)
-This conditional and its #else block can be deleted in the future.
-*/
-#if GTK_CHECK_VERSION(2, 24,0)
     spacing_combo = gtk_combo_box_text_new_with_entry ();
-#else
-    spacing_combo = gtk_combo_box_entry_new_text ();
-#endif
     gtk_widget_set_size_request (spacing_combo, 90, -1);
 
     const gchar *spacings[] = {"50%", "80%", "90%", "100%", "110%", "120%", "130%", "140%", "150%", "200%", "300%", NULL};
     for (int i = 0; spacings[i]; i++) {
-/*
-This would introduce dependency on gtk version 2.24 which is currently not available in
-Trisquel GNU/Linux 4.5.1 (released on May 25th, 2011)
-This conditional and its #else block can be deleted in the future.
-*/
-#if GTK_CHECK_VERSION(2, 24,0)
         gtk_combo_box_text_append_text((GtkComboBoxText *) spacing_combo, spacings[i]);
-#else
-        gtk_combo_box_append_text((GtkComboBox *) spacing_combo, spacings[i]);
-#endif
     }
 
     gtk_widget_set_tooltip_text (px, _("Spacing between lines (percent of font size)"));
@@ -312,18 +308,20 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ )
 
         // FIXME: process result_family/style == QUERY_STYLE_MULTIPLE_DIFFERENT by showing "Many" in the lists
 
-        // Get a font_instance using the font-specification attribute stored in SPStyle if available
-        font_instance *font = font_factory::Default()->FaceFromStyle(query);
+        Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
 
-        if (font) {
+        // This is done for us by text-toolbar. No need to do it twice.
+        // fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP ));
+        // fontlister->selection_update();
 
-            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-            int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
-            sp_font_selector_set_font (fsel, font, sp_style_get_css_font_size_units(query->font_size.computed, unit) );
-            setPreviewText(font, phrase);
-            font->Unref();
-            font=NULL;
-        }
+        Glib::ustring fontspec = fontlister->get_fontspec();
+
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
+        double size = sp_style_css_size_px_to_units(query->font_size.computed, unit); 
+        sp_font_selector_set_fontspec(fsel, fontspec, size );
+
+        setPreviewText (fontspec, phrase);
 
         if (query->text_anchor.computed == SP_CSS_TEXT_ANCHOR_START) {
             if (query->text_align.computed == SP_CSS_TEXT_ALIGN_JUSTIFY) {
@@ -358,31 +356,31 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ )
     blocked = false;
 }
 
-void TextEdit::setPreviewText (font_instance *font, Glib::ustring phrase)
+
+void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring phrase)
 {
-    if (!font) {
+    if (font_spec.empty()) {
         return;
     }
 
-    char *desc = pango_font_description_to_string(font->descr);
-    double unit_size = sp_font_selector_get_size(fsel);
+    Glib::ustring phrase_escaped = Glib::Markup::escape_text( phrase );
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
-    double px_size = unit_size * (unit_size / sp_style_get_css_font_size_units(unit_size, unit));
-
-    gchar *const phrase_escaped = g_markup_escape_text(phrase.c_str(), -1);
+    double pt_size = sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit) * PT_PER_PX;
 
-    gchar *markup = g_strdup_printf("<span font=\"%s\" size=\"%d\">%s</span>",
-        desc, (int) (px_size * PANGO_SCALE),  phrase_escaped);
+    // Pango font size is in 1024ths of a point
+    // C++11: Glib::ustring size = std::to_string( pt_size * PANGO_SCALE );
+    std::ostringstream size_st;
+    size_st << pt_size * PANGO_SCALE;
 
-    preview_label.set_markup(markup);
+    Glib::ustring markup = "<span font=\"" + font_spec +
+        "\" size=\"" + size_st.str() + "\">" + phrase_escaped + "</span>";
 
-    g_free(desc);
-    g_free(phrase_escaped);
-    g_free(markup);
+    preview_label.set_markup(markup.c_str());
 }
 
+
 SPItem *TextEdit::getSelectedTextItem (void)
 {
     if (!SP_ACTIVE_DESKTOP)
@@ -426,54 +424,38 @@ void TextEdit::onSelectionChange()
 void TextEdit::updateObjectText ( SPItem *text )
 {
         GtkTextIter start, end;
-        gchar *str;
 
         // write text
         if (gtk_text_buffer_get_modified (text_buffer)) {
             gtk_text_buffer_get_bounds (text_buffer, &start, &end);
-            str = gtk_text_buffer_get_text (text_buffer, &start, &end, TRUE);
+            gchar *str = gtk_text_buffer_get_text (text_buffer, &start, &end, TRUE);
             sp_te_set_repr_text_multiline (text, str);
             g_free (str);
             gtk_text_buffer_set_modified (text_buffer, FALSE);
         }
 }
 
-SPCSSAttr *TextEdit::getTextStyle ()
+SPCSSAttr *TextEdit::fillTextStyle ()
 {
         SPCSSAttr *css = sp_repr_css_attr_new ();
 
-        // font
-        font_instance *font = sp_font_selector_get_font (fsel);
-
-        if ( font ) {
-            Glib::ustring fontName = font_factory::Default()->ConstructFontSpecification(font);
-            sp_repr_css_set_property (css, "-inkscape-font-specification", fontName.c_str());
-
-            gchar c[256];
-
-            font->Family(c, 256);
-            sp_repr_css_set_property (css, "font-family", c);
-
-            font->Attribute( "weight", c, 256);
-            sp_repr_css_set_property (css, "font-weight", c);
-
-            font->Attribute("style", c, 256);
-            sp_repr_css_set_property (css, "font-style", c);
+        Glib::ustring fontspec = sp_font_selector_get_fontspec (fsel);
 
-            font->Attribute("stretch", c, 256);
-            sp_repr_css_set_property (css, "font-stretch", c);
+        if( !fontspec.empty() ) {
 
-            font->Attribute("variant", c, 256);
-            sp_repr_css_set_property (css, "font-variant", c);
+            Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance();
+            fontlister->fill_css( css, fontspec );
 
+            // TODO, possibly move this to FontLister::set_css to be shared.
             Inkscape::CSSOStringStream os;
             Inkscape::Preferences *prefs = Inkscape::Preferences::get();
             int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
-            os << sp_font_selector_get_size (fsel) << sp_style_get_css_unit_string(unit);
+            if (prefs->getBool("/options/font/textOutputPx", true)) {
+                os << sp_style_css_size_units_to_px(sp_font_selector_get_size (fsel), unit) << sp_style_get_css_unit_string(SP_CSS_UNIT_PX);
+            } else {
+                os << sp_font_selector_get_size (fsel) << sp_style_get_css_unit_string(unit);
+            }
             sp_repr_css_set_property (css, "font-size", os.str().c_str());
-
-            font->Unref();
-            font=NULL;
         }
 
         // Layout
@@ -501,16 +483,7 @@ SPCSSAttr *TextEdit::getTextStyle ()
         // Note that CSS 1.1 does not support line-height; we set it for consistency, but also set
         // sodipodi:linespacing for backwards compatibility; in 1.2 we use line-height for flowtext
 
-/*
-This would introduce dependency on gtk version 2.24 which is currently not available in
-Trisquel GNU/Linux 4.5.1 (released on May 25th, 2011)
-This conditional and its #else block can be deleted in the future.
-*/
-#if GTK_CHECK_VERSION(2, 24,0)
         const gchar *sstr = gtk_combo_box_text_get_active_text ((GtkComboBoxText *) spacing_combo);
-#else
-        const gchar *sstr = gtk_entry_get_text ((GtkEntry *) (gtk_bin_get_child (GTK_BIN (spacing_combo))));
-#endif
         sp_repr_css_set_property (css, "line-height", sstr);
 
         return css;
@@ -518,7 +491,7 @@ This conditional and its #else block can be deleted in the future.
 
 void TextEdit::onSetDefault()
 {
-    SPCSSAttr *css = getTextStyle ();
+    SPCSSAttr *css = fillTextStyle ();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     blocked = true;
@@ -538,7 +511,7 @@ void TextEdit::onApply()
 
     unsigned items = 0;
     const GSList *item_list = sp_desktop_selection(desktop)->itemList();
-    SPCSSAttr *css = getTextStyle ();
+    SPCSSAttr *css = fillTextStyle ();
     sp_desktop_set_style(desktop, css, true);
 
     for (; item_list != NULL; item_list = item_list->next) {
@@ -569,6 +542,13 @@ void TextEdit::onApply()
         }
     }
 
+    // Update FontLister
+    Glib::ustring fontspec = sp_font_selector_get_fontspec (fsel);
+    if( !fontspec.empty() ) {
+        Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance();
+        fontlister->set_fontspec( fontspec, false );
+    }
+
     // complete the transaction
     DocumentUndo::done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT,
                        _("Set text style"));
@@ -590,11 +570,11 @@ void TextEdit::onTextChange (GtkTextBuffer *text_buffer, TextEdit *self)
     GtkTextIter end;
     gtk_text_buffer_get_bounds (text_buffer, &start, &end);
     gchar *str = gtk_text_buffer_get_text(text_buffer, &start, &end, TRUE);
-    font_instance *font = sp_font_selector_get_font(self->fsel);
+    Glib::ustring fontspec = sp_font_selector_get_fontspec(self->fsel);
 
-    if (font) {
+    if( !fontspec.empty() ) {
         const gchar *phrase = str && *str ? str : self->samplephrase.c_str();
-        self->setPreviewText(font, phrase);
+        self->setPreviewText(fontspec, phrase);
     } else {
         self->preview_label.set_markup("");
     }
@@ -607,7 +587,7 @@ void TextEdit::onTextChange (GtkTextBuffer *text_buffer, TextEdit *self)
     self->setasdefault_button.set_sensitive ( true);
 }
 
-void TextEdit::onFontChange(SPFontSelector * /*fontsel*/, font_instance * font, TextEdit *self)
+void TextEdit::onFontChange(SPFontSelector * /*fontsel*/, gchar* fontspec, TextEdit *self)
 {
     GtkTextIter start, end;
     gchar *str;
@@ -620,9 +600,9 @@ void TextEdit::onFontChange(SPFontSelector * /*fontsel*/, font_instance * font,
     gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
     str = gtk_text_buffer_get_text (self->text_buffer, &start, &end, TRUE);
 
-    if (font) {
+    if (fontspec) {
         const gchar *phrase = str && *str ? str : self->samplephrase.c_str();
-        self->setPreviewText(font, phrase);
+        self->setPreviewText(fontspec, phrase);
     } else {
         self->preview_label.set_markup("");
     }