Fix the order of punct_table

diff --git a/scripts/punct.py b/scripts/punct.py
index a40805b..b67e838 100644 (file)
--- a/scripts/punct.py
+++ b/scripts/punct.py
@@ -9,6 +9,7 @@ punct_map = (
     (u'$', (u'＄', u'€', u'﹩', u'￠', u'￡', u'￥',)),
     (u'%', (u'％', u'﹪', u'‰', u'‱', u'㏙', u'㏗',)),
     (u'&', (u'＆', u'﹠',)),
+    (u'\'', (u'、', u'‘', u'’',)),
     (u'(', (u'（', u'︵', u'﹙',)),
     (u')', (u'）', u'︶', u'﹚',)),
     (u'*', (u'＊', u'×', u'※', u'╳', u'﹡', u'⁎', u'⁑', u'⁂', u'⌘',)),
@@ -61,7 +62,6 @@ punct_map = (
     (u'Y', (u'Ｙ',)),
     (u'Z', (u'Ｚ',)),
     (u'[', (u'「', u'［', u'『', u'【', u'｢', u'︻', u'﹁', u'﹃',)),
-    (u'\'', (u'、', u'‘', u'’',)),
     (u'\\', (u'＼', u'↖', u'↘', u'﹨',)),
     (u']', (u'」', u'］', u'』', u'】', u'｣', u'︼', u'﹂', u'﹄',)),
     (u'^', (u'︿', u'〈', u'《', u'︽', u'﹤', u'＜',)),

diff --git a/src/PunctEditor.cc b/src/PunctEditor.cc
index 5304b74..22467bd 100644 (file)
--- a/src/PunctEditor.cc
+++ b/src/PunctEditor.cc
@@ -113,8 +113,6 @@ PunctEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
                   IBUS_META_MASK |
                   IBUS_LOCK_MASK);
 
-    printf("%d %d %d\n",keyval,keycode,modifiers);
-
     if (processPunct(keyval,keycode,modifiers) == TRUE)
         return TRUE;
 
@@ -379,7 +377,7 @@ punct_cmp (const void *p1, const void *p2)
 {
     const gchar *s1 = (gchar *) p1;
     const gchar *s2 = **(gchar ***) p2;
-    return strcmp(s1,s2);
+    return std::strcmp (s1, s2);
 }
 
 void
@@ -439,11 +437,11 @@ PunctEditor::updateAuxiliaryText (void)
 
     m_buffer.clear();
     for (String::iterator i = m_text.begin(); i!=m_text.end(); ++i) {
-        if (i - m_text.begin() == m_cursor)
+        if (i - m_text.begin() == (gint) m_cursor)
             m_buffer << '|';
         m_buffer << *i;
     }
-    if (m_text.end() - m_text.begin() == m_cursor)
+    if (m_text.end() - m_text.begin() == (gint) m_cursor)
         m_buffer << '|';
 
     StaticText aux_text (m_buffer);

diff --git a/src/PunctTable.h b/src/PunctTable.h
index 939c318..1d1e533 100644 (file)
--- a/src/PunctTable.h
+++ b/src/PunctTable.h
@@ -7,6 +7,7 @@ puncts[] = {
     "$", "＄", "€", "﹩", "￠", "￡", "￥", NULL,
     "%", "％", "﹪", "‰", "‱", "㏙", "㏗", NULL,
     "&", "＆", "﹠", NULL,
+    "'", "、", "‘", "’", NULL,
     "(", "（", "︵", "﹙", NULL,
     ")", "）", "︶", "﹚", NULL,
     "*", "＊", "×", "※", "╳", "﹡", "⁎", "⁑", "⁂", "⌘", NULL,
@@ -59,7 +60,6 @@ puncts[] = {
     "Y", "Ｙ", NULL,
     "Z", "Ｚ", NULL,
     "[", "「", "［", "『", "【", "｢", "︻", "﹁", "﹃", NULL,
-    "'", "、", "‘", "’", NULL,
     "\\", "＼", "↖", "↘", "﹨", NULL,
     "]", "」", "］", "』", "】", "｣", "︼", "﹂", "﹄", NULL,
     "^", "︿", "〈", "《", "︽", "﹤", "＜", NULL,
@@ -106,59 +106,59 @@ punct_table[] = {
     &puncts[27],    // "$"
     &puncts[35],    // "%"
     &puncts[43],    // "&"
-    &puncts[47],    // "("
-    &puncts[52],    // ")"
-    &puncts[57],    // "*"
-    &puncts[68],    // "+"
-    &puncts[73],    // ","
-    &puncts[79],    // "-"
-    &puncts[91],    // "."
-    &puncts[98],    // "/"
-    &puncts[105],    // "0"
-    &puncts[108],    // "1"
-    &puncts[111],    // "2"
-    &puncts[114],    // "3"
-    &puncts[117],    // "4"
-    &puncts[120],    // "5"
-    &puncts[123],    // "6"
-    &puncts[126],    // "7"
-    &puncts[129],    // "8"
-    &puncts[132],    // "9"
-    &puncts[135],    // ":"
-    &puncts[140],    // ";"
-    &puncts[144],    // "<"
-    &puncts[152],    // "="
-    &puncts[161],    // ">"
-    &puncts[169],    // "?"
-    &puncts[175],    // "@"
-    &puncts[184],    // "A"
-    &puncts[187],    // "B"
-    &puncts[190],    // "C"
-    &puncts[193],    // "D"
-    &puncts[196],    // "E"
-    &puncts[199],    // "F"
-    &puncts[202],    // "G"
-    &puncts[205],    // "H"
-    &puncts[208],    // "I"
-    &puncts[211],    // "J"
-    &puncts[214],    // "K"
-    &puncts[217],    // "L"
-    &puncts[220],    // "M"
-    &puncts[223],    // "N"
-    &puncts[226],    // "O"
-    &puncts[229],    // "P"
-    &puncts[232],    // "Q"
-    &puncts[235],    // "R"
-    &puncts[238],    // "S"
-    &puncts[241],    // "T"
-    &puncts[244],    // "U"
-    &puncts[247],    // "V"
-    &puncts[250],    // "W"
-    &puncts[253],    // "X"
-    &puncts[256],    // "Y"
-    &puncts[259],    // "Z"
-    &puncts[262],    // "["
-    &puncts[272],    // "'"
+    &puncts[47],    // "'"
+    &puncts[52],    // "("
+    &puncts[57],    // ")"
+    &puncts[62],    // "*"
+    &puncts[73],    // "+"
+    &puncts[78],    // ","
+    &puncts[84],    // "-"
+    &puncts[96],    // "."
+    &puncts[103],    // "/"
+    &puncts[110],    // "0"
+    &puncts[113],    // "1"
+    &puncts[116],    // "2"
+    &puncts[119],    // "3"
+    &puncts[122],    // "4"
+    &puncts[125],    // "5"
+    &puncts[128],    // "6"
+    &puncts[131],    // "7"
+    &puncts[134],    // "8"
+    &puncts[137],    // "9"
+    &puncts[140],    // ":"
+    &puncts[145],    // ";"
+    &puncts[149],    // "<"
+    &puncts[157],    // "="
+    &puncts[166],    // ">"
+    &puncts[174],    // "?"
+    &puncts[180],    // "@"
+    &puncts[189],    // "A"
+    &puncts[192],    // "B"
+    &puncts[195],    // "C"
+    &puncts[198],    // "D"
+    &puncts[201],    // "E"
+    &puncts[204],    // "F"
+    &puncts[207],    // "G"
+    &puncts[210],    // "H"
+    &puncts[213],    // "I"
+    &puncts[216],    // "J"
+    &puncts[219],    // "K"
+    &puncts[222],    // "L"
+    &puncts[225],    // "M"
+    &puncts[228],    // "N"
+    &puncts[231],    // "O"
+    &puncts[234],    // "P"
+    &puncts[237],    // "Q"
+    &puncts[240],    // "R"
+    &puncts[243],    // "S"
+    &puncts[246],    // "T"
+    &puncts[249],    // "U"
+    &puncts[252],    // "V"
+    &puncts[255],    // "W"
+    &puncts[258],    // "X"
+    &puncts[261],    // "Y"
+    &puncts[264],    // "Z"
+    &puncts[267],    // "["
     &puncts[277],    // "\\"
     &puncts[283],    // "]"
     &puncts[293],    // "^"