Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch

This commit is contained in:
eehouse@eehouse.org 2011-01-10 06:48:25 -08:00 committed by Andy2
commit 09da57f165
2 changed files with 47 additions and 46 deletions

View file

@ -1,4 +1,4 @@
# -*- mode: makefile -*- # -*- coding: utf-8; -*-
# Copyright 2002-2007 by Eric House (xwords@eehouse.org). All rights reserved. # Copyright 2002-2007 by Eric House (xwords@eehouse.org). All rights reserved.
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
@ -15,21 +15,23 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
XWLANG=Russian XWLANG = Russian
LANGCODE=ru_RU LANGCODE = ru_RU
ENC = UTF-8
DICT2DAWGARGS = -r DICT2DAWGARGS = -r
TARGET_TYPE ?= WINCE TARGET_TYPE ?= WINCE
include ../Makefile.langcommon include ../Makefile.langcommon
SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/RU5000.txt.gz SOURCEDICT ?= $(XWDICTPATH)/Russian/RU5000.txt.gz
$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile $(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile
zcat $< | tr -d '\r' | \ zcat $< | tr -d '\r' | \
tr [àáâãäåæçèéêëìíîïğñòóôõö÷øùÚûüışÿ] [ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖ×ØÙÚÛÜİŞß] | \ iconv -f ISO_8859-2 -t utf8 | \
gzip -c > $@ sed 's,.,\U\0,g' | \
grep '^[ŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢß]*$$' | \
gzip -c > $@
# Everything but creating of the Main.dict file is inherited from the # Everything but creating of the Main.dict file is inherited from the
# "parent" Makefile.langcommon in the parent directory. # "parent" Makefile.langcommon in the parent directory.

View file

@ -1,3 +1,4 @@
# -*- mode: conf; coding: utf-8; -*-
# Copyright 2002,2007 by Eric House (xwords@eehouse.org). All rights # Copyright 2002,2007 by Eric House (xwords@eehouse.org). All rights
# reserved. # reserved.
# #
@ -21,56 +22,54 @@ CHARSET:windows-1251
# deal with DOS files # deal with DOS files
LANGFILTER: tr -d '\r' LANGFILTER: tr -d '\r'
# uppercase all # uppercase all
LANGFILTER: | tr [àáâãäåæçèéêëìíîïðñòóôõö÷øùÚûüýþÿ] [ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß] LANGFILTER: | tr [ŕáâăäĺćçčéęëěíîďđńňóôőö÷řůÚűüýţ˙] [ŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ×ŘŮÚŰÜÝŢß]
# LANGFILTER: | tr -s '\n' '\000' # LANGFILTER: | tr -s '\n' '\000'
# note: don't turn off sorting! Can't do it with GNU 'sort' without # note: don't turn off sorting! Can't do it with GNU 'sort' without
# setting LANG # setting LANG
D2DARGS: -r -term 10 D2DARGS: -r -term 10
LANGINFO: <p>Russian wordlists must be in the Windows-1251 LANGINFO: <p>Russian wordlists must be in utf-8: codepage. Lower-case
LANGINFO: codepage. Lower-case letters are converted to upper case and LANGINFO: letters are converted to upper case and any words that
LANGINFO: any words that contain letters not listed below are LANGINFO: contain letters not listed below are removed.</p>
LANGINFO: removed.</p>
# High bit means "official". Next 7 bits are an enum where # High bit means "official". Next 7 bits are an enum where
# Russian==0x0F. Low byte is padding. # Russian==0x0F. Low byte is padding.
XLOC_HEADER:0x8F00 XLOC_HEADER:0x8F00
<BEGIN_TILES> <BEGIN_TILES>
8 1 'À' 8 1 'Ŕ'
2 3 'Á' 2 3 'Á'
4 1 'Â' 4 1 'Â'
2 3 'Ã' 2 3 'Ă'
2 2 'Ä' 2 2 'Ä'
7 1 'Å' 7 1 'Ĺ'
1 4 'Æ' 1 4 'Ć'
1 3 'Ç' 1 3 'Ç'
7 1 'È' 7 1 'Č'
1 2 'É' 1 2 'É'
4 2 'Ê' 4 2 'Ę'
4 2 'Ë' 4 2 'Ë'
2 3 'Ì' 2 3 'Ě'
4 1 'Í' 4 1 'Í'
9 1 'Î' 9 1 'Î'
4 2 'Ï' 4 2 'Ď'
5 1 'Ð' 5 1 'Đ'
5 1 'Ñ' 5 1 'Ń'
7 1 'Ò' 7 1 'Ň'
4 2 'Ó' 4 2 'Ó'
1 5 'Ô' 1 5 'Ô'
1 4 'Õ' 1 4 'Ő'
1 4 'Ö' 1 4 'Ö'
1 3 '×' 1 3 '×'
1 4 'Ø' 1 4 'Ř'
1 5 'Ù' 1 5 'Ů'
1 10 'Ú' 1 10 'Ú'
2 2 'Û' 2 2 'Ű'
4 1 'Ü' 4 1 'Ü'
1 8 'Ý' 1 8 'Ý'
1 5 'Þ' 1 5 'Ţ'
2 2 'ß' 2 2 'ß'
2 0 {"_"} 2 0 {"_"}
<END_TILES> <END_TILES>
# should ignore all after the <END_TILES> above # should ignore all after the <END_TILES> above