gui: Fix configuring Unicode box characters.

Commit 14b3603043 "ascii: Add support for multibyte characters"
changed how the box characters are configured but failed to
update psppire-output-window.c, so attempting to paste a table
into an application that accepts UTF-8 text would output many
warnings like "unknown option `box[0201]'" and not actually use
Unicode box characters.

This fixes the problem.

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 3b865cbd51d9d85e3e4ce8b713a28f17ac89f8e8..4793b3b305b007f8d10480ebf01875df96d29467 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -692,123 +692,6 @@ enum {
   SELECT_FMT_ODT
 };
 
-
-static void
-insert_glyph (struct string_map *map, const char *opt, gunichar glyph)
-{
-  char s[6] = {0,0,0,0,0,0};
-
-  g_unichar_to_utf8 (glyph, s);
-  string_map_insert (map, opt, s);
-}
-
-struct glyph_pair
-{
-  gunichar glyph;
-  char opt[10];
-};
-
-/* See the table at 
-   http://en.wikipedia.org/wiki/Box-drawing_characters */
-struct glyph_pair table[] = {
-  {0x2500, "box[1010]"},
-  {0x2501, "box[2020]"},
-  {0x2502, "box[0101]"},
-  {0x2503, "box[0202]"},
-
-  {0x250C, "box[1100]"},
-  {0x250D, "box[2100]"},
-  {0x250E, "box[1200]"},
-  {0x250F, "box[2200]"},
-  {0x2510, "box[0110]"},
-  {0x2511, "box[0110]"},
-  {0x2512, "box[0210]"},
-  {0x2513, "box[0220]"},
-  {0x2514, "box[1001]"},
-  {0x2515, "box[2001]"},
-  {0x2516, "box[1002]"},
-  {0x2517, "box[2002]"},
-  {0x2518, "box[0011]"},
-  {0x2519, "box[0021]"},
-  {0x251A, "box[0012]"},
-  {0x251B, "box[0022]"},
-  {0x251C, "box[1101]"},
-  {0x251D, "box[2101]"},
-  {0x251E, "box[1102]"},
-  {0x251F, "box[1201]"},
-  {0x2520, "box[1202]"},
-  {0x2521, "box[2102]"},
-  {0x2522, "box[2201]"},
-  {0x2523, "box[2202]"},
-  {0x2524, "box[0111]"},
-  {0x2525, "box[0121]"},
-  {0x2526, "box[0112]"},
-  {0x2527, "box[0211]"},
-  {0x2528, "box[0212]"},
-  {0x2529, "box[0122]"},
-  {0x252A, "box[0221]"},
-  {0x252B, "box[0222]"},
-  {0x252C, "box[1110]"},
-  {0x252D, "box[1120]"},
-  {0x252E, "box[2110]"},
-  {0x252F, "box[2120]"},
-  {0x2530, "box[1210]"},
-  {0x2531, "box[1220]"},
-  {0x2532, "box[2210]"},
-  {0x2533, "box[2220]"},
-  {0x2534, "box[1011]"},
-  {0x2535, "box[1021]"},
-  {0x2536, "box[2011]"},
-  {0x2537, "box[2021]"},
-  {0x2538, "box[1012]"},
-  {0x2539, "box[1022]"},
-  {0x253A, "box[2012]"},
-  {0x253B, "box[2022]"},
-  {0x253C, "box[1111]"},
-  {0x253D, "box[1121]"},
-  {0x253E, "box[2111]"},
-  {0x253F, "box[2121]"},
-  {0x2540, "box[1112]"},
-  {0x2541, "box[1211]"},
-  {0x2542, "box[1212]"},
-  {0x2543, "box[1122]"},
-  {0x2544, "box[2112]"},
-  {0x2545, "box[1221]"},
-  {0x2546, "box[2211]"},
-  {0x2547, "box[2122]"},
-  {0x2548, "box[2221]"},
-  {0x2549, "box[1222]"},
-  {0x254A, "box[2212]"},
-  {0x254B, "box[2222]"},
-
-  {0x2574, "box[0010]"},
-  {0x2575, "box[0001]"},
-  {0x2576, "box[1000]"},
-  {0x2577, "box[0100]"},
-  {0x2578, "box[0020]"},
-  {0x2579, "box[0002]"},
-  {0x257A, "box[2000]"},
-  {0x257B, "box[0200]"},
-  {0x257C, "box[2010]"},
-  {0x257D, "box[0201]"},
-  {0x257E, "box[1020]"},
-  {0x257F, "box[0102]"},
-};
-
-
-static void
-utf8_box_chars (struct string_map *map)
-{
-  int i;
-  for (i = 0; i < sizeof (table) / sizeof (table[0]); ++i)
-    {
-      const struct glyph_pair *p = &table[i];
-      insert_glyph (map, p->opt, p->glyph);
-    }
-}
-
-
-
 static void
 clipboard_get_cb (GtkClipboard     *clipboard,
                  GtkSelectionData *selection_data,
@@ -846,7 +729,7 @@ clipboard_get_cb (GtkClipboard     *clipboard,
   switch (info)
     {
     case SELECT_FMT_UTF8:
-      utf8_box_chars (&options);
+      string_map_insert (&options, "box", "unicode");
       /* fall-through */
 
     case SELECT_FMT_TEXT: