X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fcompose-parse.py;h=493c48873309a4b5dec58487f396ed820f1871ba;hb=9f41970832b60f3cf6644dfbd154df7ec24f26ce;hp=18d9f3f162666da10db51f5717199f3de1b37fd9;hpb=920e8b434367f9aa8aab306721cc024e66892e2e;p=~andy%2Fgtk

diff --git a/gtk/compose-parse.py b/gtk/compose-parse.py
index 18d9f3f16..493c48873 100755
--- a/gtk/compose-parse.py
+++ b/gtk/compose-parse.py
@@ -24,7 +24,7 @@ import getopt
 URL_COMPOSE = 'http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre'
 URL_KEYSYMSTXT = "http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt"
 URL_GDKKEYSYMSH = "http://git.gnome.org/browse/gtk%2B/plain/gdk/gdkkeysyms.h"
-URL_UNICODEDATATXT = 'http://www.unicode.org/Public/5.2.0/ucd/UnicodeData.txt'
+URL_UNICODEDATATXT = 'http://www.unicode.org/Public/6.0.0/ucd/UnicodeData.txt'
 FILENAME_COMPOSE_SUPPLEMENTARY = 'gtk-compose-lookaside.txt'
 
 # We currently support keysyms of size 2; once upstream xorg gets sorted, 
@@ -52,9 +52,7 @@ headerfile_start = """/* GTK - The GIMP Tool Kit
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -270,7 +268,7 @@ def process_gdkkeysymsh():
 			unival = long(components[2][2:], 16)
 			if unival == 0:
 				continue
-			keysymdb[components[1][4:]] = unival
+			keysymdb[components[1][8:]] = unival
 		else:
 			print "Invalid line %(linenum)d in %(filename)s: %(line)s"\
 			% {'linenum': linenum_gdkkeysymsh, 'filename': filename_gdkkeysymsh, 'line': line}
@@ -354,6 +352,8 @@ def process_keysymstxt():
 	keysymdb['dead_stroke'] = 0x338
 	""" This is for a missing keysym from Markus Kuhn's db """
 	keysymdb['Oslash'] = 0x0d8		
+	""" This is for a missing keysym from Markus Kuhn's db """
+	keysymdb['Ssharp'] = 0x1e9e
 
 	""" This is for a missing (recently added) keysym """
 	keysymdb['dead_psili'] = 0x313		
@@ -755,11 +755,11 @@ for sequence in xorg_compose_sequences_algorithmic_uniqued:
 if opt_algorithmic:
 	for sequence in xorg_compose_sequences_algorithmic_uniqued:
 		letter = "".join(sequence[-1:])
-		print '0x%(cp)04X, %(uni)c, seq: [ <0x%(base)04X>,' % { 'cp': ord(unicode(letter)), 'uni': letter, 'base': sequence[-2] },
+		print '0x%(cp)04X, %(uni)s, seq: [ <0x%(base)04X>,' % { 'cp': ord(unicode(letter)), 'uni': letter.encode('utf-8'), 'base': sequence[-2] },
 		for elem in sequence[:-2]:
 			print "<0x%(keysym)04X>," % { 'keysym': elem },
 		""" Yeah, verified... We just want to keep the output similar to -u, so we can compare/sort easily """
-		print "], recomposed as", letter, "verified"
+		print "], recomposed as", letter.encode('utf-8'), "verified"
 
 def num_of_keysyms(seq):
 	return len(seq) - 1