From 9800551bdca7709e7d8a7c04dd98e2fdf12e63f7 Mon Sep 17 00:00:00 2001 From: pnemade Date: Wed, 7 Apr 2010 06:00:47 +0000 Subject: [PATCH] - update to new upstream release 1.6.0 --- .cvsignore | 2 +- m17n-db.spec | 325 +++++---- m17n-gen-ibus-engine | 33 - si-wijesekera-keymap-rename_key-summary.patch | 26 - si-wijesekera_surrounding_to_preedit.patch | 684 ------------------ sources | 2 +- 6 files changed, 163 insertions(+), 909 deletions(-) delete mode 100755 m17n-gen-ibus-engine delete mode 100644 si-wijesekera-keymap-rename_key-summary.patch delete mode 100644 si-wijesekera_surrounding_to_preedit.patch diff --git a/.cvsignore b/.cvsignore index f1f2834..31946bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -m17n-db-1.5.5.tar.gz +m17n-db-1.6.0.tar.gz diff --git a/m17n-db.spec b/m17n-db.spec index 4f5f96d..0a7a0e4 100644 --- a/m17n-db.spec +++ b/m17n-db.spec @@ -1,7 +1,7 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.5.5 -Release: 3%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://www.m17n.org/m17n-lib/index.html @@ -10,26 +10,117 @@ BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext Patch1: number_pad_itrans-222634.patch -Patch2: si-wijesekera-keymap-rename_key-summary.patch -Patch4: bn-itrans-t-182227.patch -Patch5: kn-itrans-ZWNJ-221965.patch -Patch6: kn-itrans_key-summary_228806.patch -Patch7: ml-itrans-keysummary-435260.patch +Patch2: bn-itrans-t-182227.patch +Patch3: kn-itrans-ZWNJ-221965.patch +Patch4: kn-itrans_key-summary_228806.patch +Patch5: ml-itrans-keysummary-435260.patch + +Obsoletes: m17n-db-khmer < 1.5.5-4 +Obsoletes: m17n-db-kannada < 1.5.5-4 +Obsoletes: m17n-db-sanskrit < 1.5.5-4 +Obsoletes: m17n-db-greek < 1.5.5-4 +Obsoletes: m17n-db-croatian < 1.5.5-4 +Obsoletes: m17n-db-amharic < 1.5.5-4 +Obsoletes: m17n-db-tamil < 1.5.5-4 +Obsoletes: m17n-db-generic < 1.5.5-4 +Obsoletes: m17n-db-dhivehi < 1.5.5-4 +Obsoletes: m17n-db-assamese < 1.5.5-4 +Obsoletes: m17n-db-farsi < 1.5.5-4 +Obsoletes: m17n-db-punjabi < 1.5.5-4 +Obsoletes: m17n-db-lao < 1.5.5-4 +Obsoletes: m17n-db-korean < 1.5.5-4 +Obsoletes: m17n-db-oriya < 1.5.5-4 +Obsoletes: m17n-db-sinhala < 1.5.5-4 +Obsoletes: m17n-db-swedish < 1.5.5-4 +Obsoletes: m17n-db-devel < 1.5.5-4 +Obsoletes: m17n-db-armenian < 1.5.5-4 +Obsoletes: m17n-db-japanese < 1.5.5-4 +Obsoletes: m17n-db-thai < 1.5.5-4 +Obsoletes: m17n-db-bengali < 1.5.5-4 +Obsoletes: m17n-db-hindi < 1.5.5-4 +Obsoletes: m17n-db-syriac < 1.5.5-4 +Obsoletes: m17n-db-danish < 1.5.5-4 +Obsoletes: m17n-db-gregorian < 1.5.5-4 +Obsoletes: m17n-db-malayalam < 1.5.5-4 +Obsoletes: m17n-db-common-cjk < 1.5.5-4 +Obsoletes: m17n-db-slovak < 1.5.5-4 +Obsoletes: m17n-db-latin < 1.5.5-4 +Obsoletes: m17n-db-serbian < 1.5.5-4 +Obsoletes: m17n-db-vietnamese < 1.5.5-4 +Obsoletes: m17n-db-kazakh < 1.5.5-4 +Obsoletes: m17n-db-telugu < 1.5.5-4 +Obsoletes: m17n-db-myanmar < 1.5.5-4 +Obsoletes: m17n-db-arabic < 1.5.5-4 +Obsoletes: m17n-db-gujarati < 1.5.5-4 +Obsoletes: m17n-db-french < 1.5.5-4 +Obsoletes: m17n-db-cham < 1.5.5-4 +Obsoletes: m17n-db-chinese < 1.5.5-4 +Obsoletes: m17n-db-uyghur < 1.5.5-4 +Obsoletes: m17n-db-russian < 1.5.5-4 +Obsoletes: m17n-db-hebrew < 1.5.5-4 +Obsoletes: m17n-db-tibetan < 1.5.5-4 +Obsoletes: m17n-db-flt < 1.5.5-4 + +Provides: m17n-db-khmer = %{version}-%{release} +Provides: m17n-db-kannada = %{version}-%{release} +Provides: m17n-db-sanskrit = %{version}-%{release} +Provides: m17n-db-greek = %{version}-%{release} +Provides: m17n-db-croatian = %{version}-%{release} +Provides: m17n-db-amharic = %{version}-%{release} +Provides: m17n-db-tamil = %{version}-%{release} +Provides: m17n-db-generic = %{version}-%{release} +Provides: m17n-db-dhivehi = %{version}-%{release} +Provides: m17n-db-assamese = %{version}-%{release} +Provides: m17n-db-farsi = %{version}-%{release} +Provides: m17n-db-punjabi = %{version}-%{release} +Provides: m17n-db-lao = %{version}-%{release} +Provides: m17n-db-korean = %{version}-%{release} +Provides: m17n-db-oriya = %{version}-%{release} +Provides: m17n-db-sinhala = %{version}-%{release} +Provides: m17n-db-swedish = %{version}-%{release} +Provides: m17n-db-devel = %{version}-%{release} +Provides: m17n-db-armenian = %{version}-%{release} +Provides: m17n-db-japanese = %{version}-%{release} +Provides: m17n-db-thai = %{version}-%{release} +Provides: m17n-db-bengali = %{version}-%{release} +Provides: m17n-db-hindi = %{version}-%{release} +Provides: m17n-db-syriac = %{version}-%{release} +Provides: m17n-db-danish = %{version}-%{release} +Provides: m17n-db-gregorian = %{version}-%{release} +Provides: m17n-db-malayalam = %{version}-%{release} +Provides: m17n-db-common-cjk = %{version}-%{release} +Provides: m17n-db-slovak = %{version}-%{release} +Provides: m17n-db-latin = %{version}-%{release} +Provides: m17n-db-serbian = %{version}-%{release} +Provides: m17n-db-vietnamese = %{version}-%{release} +Provides: m17n-db-kazakh = %{version}-%{release} +Provides: m17n-db-telugu = %{version}-%{release} +Provides: m17n-db-myanmar = %{version}-%{release} +Provides: m17n-db-arabic = %{version}-%{release} +Provides: m17n-db-gujarati = %{version}-%{release} +Provides: m17n-db-french = %{version}-%{release} +Provides: m17n-db-cham = %{version}-%{release} +Provides: m17n-db-chinese = %{version}-%{release} +Provides: m17n-db-uyghur = %{version}-%{release} +Provides: m17n-db-russian = %{version}-%{release} +Provides: m17n-db-hebrew = %{version}-%{release} +Provides: m17n-db-tibetan = %{version}-%{release} +Provides: m17n-db-flt = %{version}-%{release} %description This package contains multilingualization (m17n) datafiles for m17n-lib -which describe input maps, encoding maps, and OpenType font data -for many languages. +which describe input maps, encoding maps, OpenType font data and +font layout text rendering for languages. - -%package datafiles -Summary: Multilingualization datafiles for m17n-lib +%package extras +Summary: Extra m17n-db files Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: m17n-db-datafiles < 1.5.5-4 +Provides: m17n-db-datafiles = %{version}-%{release} -%description datafiles -m17n-db datafiles not needed for using the input maps. - +%description extras +m17n-db extra files for input maps that are less used. %package devel Summary: Development files for m17n-db @@ -41,130 +132,14 @@ Requires: pkgconfig m17n-db development files -%package common-cjk -Summary: Common m17n-db files for CJK input -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description common-cjk -m17n-db common files for Chinese, Japanese and Korean input maps. - - -%package flt -Summary: m17n Font Layout Text data files -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description flt -Font Layout Text rendering datafiles used by -m17n-lib's flt library for complex text layout. - - -%package generic -Summary: Generic m17n-db input maps -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - -%description generic -This package contains generic m17n-db input maps. - - -# mk_pkg (name lang [icons] [cjk]) -%define mk_pkg() \ -%package %1\ -Summary: m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\ -Group: System Environment/Libraries\ -Requires: %{name} = %{version}-%{release}\ -%{?4:Requires: %{name}-common-cjk}\ -Obsoletes: ibus-m17n-%1 < 0.1.1.20081013-3\ -\ -%description %1\ -This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/").\ -\ -%files %1\ -%defattr(-,root,root)\ -%{_datadir}/m17n/%2-*.mim\ -%if %3\ -%{_datadir}/m17n/icons/%2-*.png\ -%else\ -%{nil}\ -%endif - -# mk_pkg_uses_contrib (name lang [icons]) -%define mk_pkg_uses_contrib() \ -%package %1\ -Summary: m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/")\ -Group: System Environment/Libraries\ -Requires: %{name} = %{version}-%{release} \ -Requires: m17n-contrib-%1 >= 1.1.3 \ -Obsoletes: ibus-m17n-%1 < 0.1.1.20081013-3\ -\ -%description %1\ -This package contains m17n-db input maps for %(echo %1 | sed -e "s/\\(.*\\)/\\u\\1/").\ -\ -%files %1\ -%defattr(-,root,root)\ -%{_datadir}/m17n/%2-*.mim\ -%if %3\ -%{_datadir}/m17n/icons/%2-*.png\ -%else\ -%{nil}\ -%endif - -%mk_pkg amharic am 1 -%mk_pkg arabic ar 1 -%mk_pkg armenian hy 1 -%mk_pkg_uses_contrib assamese as 1 -%mk_pkg_uses_contrib bengali bn 1 -%mk_pkg cham cmc 1 -%mk_pkg chinese zh 1 1 -%{_datadir}/m17n/icons/bopo-*.png -%mk_pkg croatian hr 1 -%mk_pkg danish da 0 -%mk_pkg dhivehi dv 1 -%mk_pkg farsi fa 1 -%mk_pkg french fr 0 -%mk_pkg gregorian ka 1 -%mk_pkg greek el 1 -%{_datadir}/m17n/grc-*.mim -%mk_pkg_uses_contrib gujarati gu 1 -%mk_pkg hebrew he 1 -%mk_pkg_uses_contrib hindi hi 1 -%mk_pkg japanese ja 1 -%mk_pkg_uses_contrib kannada kn 1 -%mk_pkg kazakh kk 1 -%mk_pkg khmer km 1 -%mk_pkg korean ko 1 1 -%mk_pkg lao lo 1 -%mk_pkg latin latn 1 -%mk_pkg_uses_contrib malayalam ml 1 -%mk_pkg myanmar my 1 -%mk_pkg_uses_contrib oriya or 1 -%mk_pkg_uses_contrib punjabi pa 1 -%mk_pkg_uses_contrib russian ru 1 -%mk_pkg sanskrit sa 0 -%mk_pkg serbian sr 1 -%mk_pkg_uses_contrib sinhala si 1 -%mk_pkg slovak sk 1 -%mk_pkg swedish sv 1 -%mk_pkg syriac syrc 1 -%mk_pkg_uses_contrib tamil ta 1 -%mk_pkg_uses_contrib telugu te 1 -%mk_pkg thai th 1 -%mk_pkg tibetan bo 1 -%mk_pkg uyghur ug 0 -%mk_pkg_uses_contrib vietnamese vi 1 - - %prep -%setup -q +%setup -q pushd MIM %patch1 -p1 -b .1 -%patch2 -p0 -b .2 -%patch4 -p1 -b .4 +%patch2 -p1 -b .2 +%patch3 -p0 -b .3 +%patch4 -p0 -b .4 %patch5 -p0 -b .5 -%patch6 -p0 -b .6 -%patch7 -p0 -b .7 popd %build @@ -174,14 +149,11 @@ make %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # don't ship unijoy map for now rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png} -# dont install si-wijesekera.mim as si-wijesekera-predit.mim works for us, see RH bug 208104 -rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wijesekera.mim - # For installing the translation files %find_lang %name @@ -190,19 +162,59 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wijesekera.mim rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root) +%files +%defattr(-,root,root,-) %doc AUTHORS COPYING README %dir %{_datadir}/m17n %dir %{_datadir}/m17n/icons %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl -%{_datadir}/m17n/global.mim +%{_datadir}/m17n/a*.mim +%{_datadir}/m17n/b*.mim +%{_datadir}/m17n/c*.mim +%{_datadir}/m17n/d*.mim +%{_datadir}/m17n/e*.mim +%{_datadir}/m17n/f*.mim +%{_datadir}/m17n/g*.mim +%{_datadir}/m17n/h*.mim +%{_datadir}/m17n/i*.mim +%{_datadir}/m17n/k*.mim +%{_datadir}/m17n/l*.mim +%{_datadir}/m17n/m*.mim +%{_datadir}/m17n/o*.mim +%{_datadir}/m17n/p*.mim +%{_datadir}/m17n/r*.mim +%{_datadir}/m17n/s*.mim +%{_datadir}/m17n/t*.mim +%{_datadir}/m17n/u*.mim +%{_datadir}/m17n/v*.mim +%{_datadir}/m17n/icons/a*.png +%{_datadir}/m17n/icons/b*.png +%{_datadir}/m17n/icons/c*.png +%{_datadir}/m17n/icons/d*.png +%{_datadir}/m17n/icons/e*.png +%{_datadir}/m17n/icons/f*.png +%{_datadir}/m17n/icons/g*.png +%{_datadir}/m17n/icons/h*.png +%{_datadir}/m17n/icons/k*.png +%{_datadir}/m17n/icons/l*.png +%{_datadir}/m17n/icons/m*.png +%{_datadir}/m17n/icons/o*.png +%{_datadir}/m17n/icons/p*.png +%{_datadir}/m17n/icons/r*.png +%{_datadir}/m17n/icons/s*.png +%{_datadir}/m17n/icons/t*.png +%{_datadir}/m17n/icons/u*.png +%{_datadir}/m17n/icons/v*.png +%{_datadir}/m17n/*.flt -# include translations -%files datafiles -f %{name}.lang -%defattr(-,root,root) +%files extras -f %{name}.lang +%defattr(-,root,root,-) +%{_datadir}/m17n/zh-*.mim +%{_datadir}/m17n/icons/zh*.png +%{_datadir}/m17n/ja*.mim +%{_datadir}/m17n/icons/ja*.png %{_datadir}/m17n/*.fst %{_datadir}/m17n/*.map %{_datadir}/m17n/*.tab @@ -210,29 +222,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/m17n/LOCALE.* %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/m17n-db %{_datadir}/pkgconfig/m17n-db.pc -%files common-cjk -%defattr(-,root,root) -%{_datadir}/m17n/cjk-*.mim - -%files flt -%defattr(-,root,root) -%{_datadir}/m17n/*.flt - -%files generic -%defattr(-,root,root) -%{_datadir}/m17n/ispell.mim -%{_datadir}/m17n/icons/en-ispell.png -%{_datadir}/m17n/rfc1345.mim -%{_datadir}/m17n/icons/rfc1345.png -%{_datadir}/m17n/unicode.mim -%{_datadir}/m17n/icons/unicode.png - - %changelog +* Wed Apr 07 2010 Parag Nemade - 1.6.0-1 +- update to new upstream release 1.6.0 + * Wed Dec 23 2009 Jens Petersen - 1.5.5-3 - separate .flt files to flt subpackage for m17n-lib-flt diff --git a/m17n-gen-ibus-engine b/m17n-gen-ibus-engine deleted file mode 100755 index b5928d6..0000000 --- a/m17n-gen-ibus-engine +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# generates .engine files from m17n .mim files for ibus-m17n - -PROG=`basename $0` - -if [ $# -le 1 ]; then - echo "Usage: $PROG [output-dir]" - exit 1 -fi - -FILE=$1 -OUTDIR=${2:-.} - -MAP=$(basename $1 .mim) - -LANG=$(echo $MAP | sed -e "s/-.*//") -if grep -q "(input-method t " $FILE; then - LANG=$MAP -fi -if [ "$LANG" = "$MAP" ]; then - STYLE=$LANG - LANG=t -else - STYLE=$(echo $MAP | sed -e "s/^.*-//") -fi -cat > $OUTDIR/m17n-$MAP.engine << EOF -Exec=/usr/bin/ibus-engine-m17n $LANG:$STYLE -Name=$STYLE -Lang=$LANG -Icon=/usr/share/m17n/icons/$MAP.png -Author= -Credits= -EOF diff --git a/si-wijesekera-keymap-rename_key-summary.patch b/si-wijesekera-keymap-rename_key-summary.patch deleted file mode 100644 index c6842af..0000000 --- a/si-wijesekera-keymap-rename_key-summary.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- si-wijesekera-preedit.mim.orig 2007-05-29 14:44:23.000000000 +0530 -+++ si-wijesekera-preedit.mim 2008-08-29 09:35:17.000000000 +0530 -@@ -21,11 +21,21 @@ - ;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - ;; Boston, MA 02110-1301, USA. - --(input-method si wijesekera-preedit) -+(input-method si wijesekera) - - (description "Sinhala input method based on SLS 1134 Rev. 2:2004. - - This input method uses preedit rather than surrounding text. -+ -+Key Summary : -+ඳ --> alt-gr+o -+ඟ --> alt-gr+. -+ඬ --> alt-gr+v -+ඦ --> alt-gr+c -+ඃ --> alt-gr+x -+෴ --> alt-gr+' -+ -+Key summary: Tyronne Wickramarathne - ") - - (title "සි") - diff --git a/si-wijesekera_surrounding_to_preedit.patch b/si-wijesekera_surrounding_to_preedit.patch deleted file mode 100644 index f216e01..0000000 --- a/si-wijesekera_surrounding_to_preedit.patch +++ /dev/null @@ -1,684 +0,0 @@ ---- m17n-db-1.3.3/si-wijesekera.mim.orig 2006-11-28 12:51:48.000000000 +0530 -+++ m17n-db-1.3.3/si-wijesekera.mim 2006-10-16 18:47:08.000000000 +0530 -@@ -1,4 +1,4 @@ --;; Copyright (C) 2005 -+;; Copyright (C) 2006 - ;; National Institute of Advanced Industrial Science and Technology (AIST) - ;; Registration Number H15PRO112 - -@@ -20,491 +20,231 @@ - ;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - ;; 02111-1307, USA. - --(input-method si wijesekera) -+(input-method si wijesekera) - - (description "Sinhala input method based on SLS 1134 Rev. 2:2004. -- -+ -+Reference URL : http://http://www.fonts.lk/doc/sin-kbd-layout4.pdf -+ -+This input method uses preedit rather than surrounding text. -+ -+Key Summary : -+ඳ --> alt-gr+o -+ඟ --> alt-gr+. -+ඬ --> alt-gr+v -+ඦ --> alt-gr+c -+ඃ --> alt-gr+x -+෴ --> alt-gr+' -+ -+Key summary: Tyronne Wickramarathne -+ - ") - --(title "Wijesekera") -+(title "සි") - - (map - (consonant -- ("l" "ක") ; 0D9A -- ("L" "ඛ") ; 0D9B -- ("." "ග") ; 0D9C -- (">" "ඝ") ; 0D9D -- ("X" "ඞ") ; 0D9E -- ((A-.) "ඟ") ; 0D9F -- ("p" "ච") ; 0DA0 -- ("P" "ඡ") ; 0DA1 -- ("c" "ජ") ; 0DA2 -- ("C" "ඣ") ; 0DA3 -- ("\[" "ඤ") ; 0DA4 -- ("{" "ඥ") ; 0DA5 -- ((A-c) "ඦ") ; 0DA6 -- ("g" "ට") ; 0DA7 -- ("G" "ඨ") ; 0DA8 -- ("v" "ඩ") ; 0DA9 -- ("V" "ඪ") ; 0DAA -- ("K" "ණ") ; 0DAB -- ((A-v) "ඬ") ; 0DAC -- (";" "ත") ; 0DAD -- (":" "ථ") ; 0DAE -- ("o" "ද") ; 0DAF -- ("O" "ධ") ; 0DB0 -- ("k" "න") ; 0DB1 -- ((A-o) "ඳ") ; 0DB3 -- ("m" "ප") ; 0DB4 -- ("M" "ඵ") ; 0DB5 -- ("n" "බ") ; 0DB6 -- ("N" "භ") ; 0DB7 -- ("u" "ම") ; 0DB8 -- ("U" "ඹ") ; 0DB9 -- ("h" "ය") ; 0DBA -- ("r" "ර") ; 0DBB -- ("," "ල") ; 0DBD -- ("j" "ව") ; 0DC0 -- ("Y" "ශ") ; 0DC1 -- ("I" "ෂ") ; 0DC2 -- ("i" "ස") ; 0DC3 -- ("y" "හ") ; 0DC4 -- ("<" "ළ") ; 0DC5 -- ("F" "ෆ") ; 0DC6 -- ) -+ ("l" "ක") ; 0D9A -+ ("L" "ඛ") ; 0D9B -+ ("." "ග") ; 0D9C -+ (">" "ඝ") ; 0D9D -+ ("X" "ඞ") ; 0D9E -+ ((A-.) "ඟ") ((0x2E A-z) "ඟ") ; 0D9F -+ ("p" "ච") ; 0DA0 -+ ("P" "ඡ") ; 0DA1 -+ ("c" "ජ") ; 0DA2 -+ ("C" "ඣ") ; 0DA3 -+ ("\[" "ඤ") ; 0DA4 -+ ("{" "ඥ") ; 0DA5 -+ ((A-c) "ඦ") ((0x63 A-z) "ඦ") ; 0DA6 -+ ("g" "ට") ; 0DA7 -+ ("G" "ඨ") ; 0DA8 -+ ("v" "ඩ") ; 0DA9 -+ ("V" "ඪ") ; 0DAA -+ ("K" "ණ") ; 0DAB -+ ((A-v) "ඬ") ((0x76 A-z) "ඬ") ; 0DAC -+ (";" "ත") ; 0DAD -+ (":" "ථ") ; 0DAE -+ ("o" "ද") ; 0DAF -+ ("O" "ධ") ; 0DB0 -+ ("k" "න") ; 0DB1 -+ ((A-o) "ඳ") ((0x6F A-z) "ඳ") ; 0DB3 -+ ("m" "ප") ; 0DB4 -+ ("M" "ඵ") ; 0DB5 -+ ("n" "බ") ; 0DB6 -+ ("N" "භ") ; 0DB7 -+ ("u" "ම") ; 0DB8 -+ ("U" "ඹ") ; 0DB9 -+ ("h" "ය") ; 0DBA -+ ("r" "ර") ; 0DBB -+ ("," "ල") ; 0DBD -+ ("j" "ව") ; 0DC0 -+ ("Y" "ශ") ; 0DC1 -+ ("I" "ෂ") ; 0DC2 -+ ("i" "ස") ; 0DC3 -+ ("y" "හ") ; 0DC4 -+ ("<" "ළ") ; 0DC5 -+ ("F" "ෆ") ; 0DC6 -+ -+ (" c 0x0DC6)) -- (delete @-1) -- 0x0D93) -- (1 -- 0x0D91))) -- (1 -- 0x0D91))) -- -- ("a" -- (set c @-1) -- (cond -- ((= c 0x0D91) -- (delete @-1) -- 0x0D92) -- ((= c 0x0D94) -- (delete @-1) -- 0x0D95) -- ((= c 0x0DD9) -- (delete @-1) -- 0x0DDA) -- ((= c 0x0DDC) -- (delete @-1) -- 0x0DDD) -- (1 -- 0x0DCA))) -- -- ("d" -- (set c @-1) -- (cond -- ((= c 0x0D85) -- (delete @-1) -- 0x0D86) -- ((= c 0x0DD9) -- (delete @-1) -- 0x0DDC) -- (1 -- 0x0DCF))) -- -- ("e" -- (cond -- ((= @-1 0x0D85) -- (delete @-1) -- 0x0D87) -- (1 -- 0x0DD0))) -- -- ("E" -- (set c @-1) -- (cond -- ((= c 0x0D85) -- (delete @-1) -- 0x0D88) -- ((= c 0x0DD4) -- (cond -- ((= @-2 0x0DC5) -- (delete @-1) -- 0x0DD6) -- (1 -- 0x0DD1))) -- (1 -- 0x0DD1))) -- -- ("D" -- (set c @-1) -- (cond -- ((= c 0x0D8D) -- (delete @-1) -- 0x0D8E) -- ((= c 0x0DD8) -- (delete @-1) -- 0x0DF2) -- (1 -- 0x0DD8))) -- -- ("A" -- (set c @-1) -- (cond -- ((= c 0x0D8B) -- (delete @-1) -- 0x0D8C) -- ((= c 0x0D8F) -- (delete @-1) -- 0x0D90) -- ((= c 0x0D94) -- (delete @-1) -- 0x0D96) -- ((= c 0x0DD9) -- (delete @-1) -- 0x0DDE) -- (1 -- 0x0DDF))) -- -- ("f" -- (set c @+1) -- (cond -- ((& (> c 0x0D99) (< c 0x0DC7)) -- (delete @+1) -- (insert c) -- (forward) -- (set c @+1) -- (cond -- ((= c 0x0DCA) -- (delete @+1) -- 0x0DDA) -- ((= c 0x0DD9) -- (delete @+1) -- 0x0DDB) -- ((= c 0x0DCF) -- (delete @+1) -- 0x0DDC) -- ((= c 0x0DDF) -- (delete @+1) -- 0x0DDE) -- (1 -- 0x0DD9))) -- ((= c 0x0D91) -- (delete @+1) -- 0x0D93) -- ((= c 0x0DD9) -- (delete @+1) -- 0x0DDB) -- ((& (= c 0x200C) (= @+2 0x0DD9)) -- (delete @+2) -- 0x200C 0x0DDB) -- ((& (= @-1 0x0DD9) -- (| (< @-2 0x0D9A) (> @-2 0x0DC6))) -- (delete @-1) -- 0x0DDB) -- ((& (> @-1 0x0D99) (< @-1 0xDC7)) -- 0x200C 0x0DD9) -- (1 -- 0x0DD9))) -- -- ;; sanyaka letters -- ((A-z) -- (set c @-1) -- (cond -- ((= c 0x0DAF) -- (delete @-1) -- 0x0DB3) -- ((= c 0x0D9C) -- (delete @-1) -- 0x0D9F) -- ((= c 0x0DA9) -- (delete @-1) -- 0x0DAC) -- ((= c 0x0DA2) -- (delete @-1) -- 0x0DA6))) -- -- ;; yansaya -- ("H" -- (set c @-1) -- (cond -- ((= c 0x0DD9) -- (delete @-1)) -- ((= c 0x0DDB) -- (delete @-1)) -- (1 -- (set c 0))) -- (cond -- ((& (> @-1 0x0D99) (< @-1 0x0DC6)) -- 0x0DCA 0x200D 0x0DBA)) -- (cond -- ((> c 0) -- (insert c)))) -- -- ;; rakaransaya -- ("`" -- (set c @-1) -- (cond -- ((| (= c 0x0DD9) (= c 0x0DDB) (= c 0x0DD2) (= c 0x0DD3)) -- (delete @-1)) -- (1 -- (set c 0))) -- (cond -- ((& (> @-1 0x0D99) (< @-1 0x0DC7)) -- 0x0DCA 0x200D 0x0DBB)) -- (cond -- ((> c 0) -- (insert c)))) -- --;; Repaya is disabled. --;; ("~" --;; (set c @-1) --;; (cond --;; ((| (= c 0x0DD9) (= c 0x0DDB)) --;; (delete @-1)) --;; (1 --;; (set c 0))) --;; (backward) --;; (cond --;; ((& (> @-1 0x0D99) (< @-1 0x0DC7)) --;; (set c1 @-1) --;; (delete @-1) --;; (insert c1) --;; (move @<) --;; 0x0DBB 0x0DCA 0x200D)) --;; (cond --;; ((> c 0) --;; (move @>) --;; (insert c)))) -- -- ((BackSpace) -- (delete-preceding-zw) -- (set c @-1) -- (cond -- ((< c 0) -- (unhandle))) -- (delete @-1) -- (cond -- ((= c 0x0D86) -- 0x0D85) -- ((= c 0x0D87) -- 0x0D85) -- ((= c 0x0D88) -- 0x0D85) -- ((= c 0x0D8C) -- 0x0D8B) -- ((= c 0x0D8E) -- 0x0D8D) -- ((= c 0x0D90) -- 0x0D8F) -- ((= c 0x0D92) -- 0x0D8F) -- ((= c 0x0D93) -- (cond ((& (> @-1 0x0D99) (< @-1 0x0DC7)) 0x200C)) -- 0x0DD9) -- ((= c 0x0D95) -- 0x0D94) -- ((= c 0x0D96) -- 0x0D94) -- -- ((& (> c 0x0D99) (< c 0x0DC7) (= @-2 0x0DCA) (= @-1 0x200D)) -- (delete @-2)) -- -- ((= c 0x0DD9) -- (cond -- ((| (< @-1 0x0D9A) (> @-1 0x0DC6))) -- ((= @+1 0x0D91) -- (delete @-1) -- (delete @+1) -- 0x0D93) -- ((& (> @+1 0x0D99) (< @+1 0x0DC7)) -- (set c1 @+1) -- (cond -- ((= @+2 0x0DD9) -- (merge-combuva) -- 0x0DDB) -- ((= @+2 0x0DCA) -- (merge-combuva) -- 0x0DDA) -- ((= @+2 0x0DCF) -- (merge-combuva) -- 0x0DDC) -- ((= @+2 0x0DDF) -- (merge-combuva) -- 0x0DDE) -- (1 -- (delete @-1) -- (delete @+1) -- (insert c1) -- 0x0DD9))) -- ((& (> @-2 0x0D99) (< @-2 0x0DC7)) -- (delete @-1) -- 0x200C -- 0x0DD9) -- ((& (> @-4 0x0D99) (< @-4 0x0DC7) (= @-3 0x0DCA) (= @-2 0x200D)) -- (delete @-3) -- 0x0DD9) -- (1 -- (delete @-1) -- 0x0DD9))) -- -- ((= c 0x0DDA) -- 0x0DD9) -- -- ((= c 0x0DDB) -- (cond -- ((| (< @-1 0x0D9A) (> @-1 0x0DC6)) -- 0x0DD9) -- ((& (> @-2 0x0D99) (< @-2 0x0DC7)) -- (delete @-1) -- 0x200C -- 0x0DDB) -- ((& (> @-4 0x0D99) (< @-4 0x0DC7) (= @-3 0x0DCA) (= @-2 0x200D)) -- (delete @-3) -- 0x0DDB) -- (1 -- (delete @-1) -- 0x0DDB))) -- -- ((= c 0x0DDC) -- 0x0DD9) -- ((= c 0x0DDD) -- 0x0DDC) -- ((= c 0x0DDE) -- 0x0DD9) -- ((= c 0x0DF2) -- 0x0DD8)) -- -- (cond -- ((& (> @-1 0x0D99) -- (< @-1 0x0DC7) -- (| (= @+1 0x0DD9) (= @+1 0x0DDB))) -- 0x200C))) -- -- ("\\" (shift join)))) -- --(macro -- ;; prototype -- (forward (set x 0)) -- (backward (set x 0)) -- (delete-preceding-zw (set x 0)) -- -- ;; skip following (virama zwj consonant)* sequence -- (forward -- (set cc3 @+3) -- (cond -- ((& (= @+1 0x0DCA) (= @+2 0x200D) (> cc3 0x0D99) (< cc3 0x0DC7)) -- (delete @+3) -- 0x0DCA 0x200D -- (insert cc3) -- (forward)))) -- -- (backward -- (set cc1 @-1) -- (cond -- ((& (= @-3 0x0DCA) (= @-2 0x200D) (> cc1 0x0D99) (< cc1 0x0DC7)) -- (delete @-3) -- 0x0DCA -- 0x200D -- (insert cc1) -- (move @<) -- (backward)))) -- -- (delete-preceding-zw -- (cond -- ((| (= @-1 0x200C) (= @-1 0x200D)) -- (delete @-1) -- (delete-preceding-zw)))) -- -- (merge-combuva -- (delete @-1) -- (delete @+2) -- (insert c1))) -+ (kombuva -+ ("f" "ෙ")) ; 0DD9 - --(state -- (init -- (consonant -- (cond -- ((= @-1 0x0DD9) -- (cond -- ((= @-2 0x200C) -- (delete @-2) -- 0x0DD9) -- ((| (< @-2 0x0D9A) (> @-2 0x0DC6)) -- (delete @-1) -- 0x0DD9))) -- ((= @-1 0x0DDB) -- (cond -- ((= @-2 0x200C) -- (delete @-2) -- 0x0DDB) -- ((| (< @-2 0x0D9A) (> @-2 0x0DC6)) -- (delete @-1) -- 0x0DDB))))) -- (misc)) -+ (yansaka -+ ("H")) -+ -+ (rakaransaya -+ ("`")) -+ -+ (repaya -+ ("~")) -+ -+ (eyanna -+ ("w")) -+ -+ (al-lakuna -+ ("a")) -+ -+ (aela-pilla -+ ("d")) -+ -+ (gayanukitta -+ ("A")) - - (join -- (consonant -- (set c @-1) -- (cond -- ((| (= c 0x0DD9) (= c 0x0DDB)) -- (cond -- ((& (> @-2 0x0D99) (< @-2 0x0DC7)) -- (delete @-1) -- (move @<) -- 0x0DCA 0x200D -- (move @>) -- (insert c)))) -- ((& (> c 0x0D99) (< c 0x0DC7)) -- (move @<) -- 0x0DCA 0x200D)) -- (shift init)) -+ ("\\") -+ ("|")) -+ -+ (backspace -+ ((BackSpace))) -+ ) - -- (nil -- (shift init)))) -+(state -+ (init -+ (consonant (shift consonant)) -+ (others) -+ (is-pilla (shift is-pilla)) -+ (kombuva (shift kombuva))) -+ -+ (consonant -+ (rakaransaya 0x0DCA 0x200D 0x0DBB) -+ (yansaya 0x0DCA 0x200D 0x0DBA) -+ (repaya (move @-) 0x0DBB 0x0DCA 0x200D (move @+)) -+ (is-pilla (shift is-pilla)) -+ (join 0x0DCA 0x200D (shift consonant+join))) -+ -+ (consonant+join -+ (consonant (shift consonant)) -+ (backspace (undo))) -+ -+ (is-pilla -+ (rakaransaya (move @-) 0x0DCA 0x200D 0x0DBB (shift init))) -+ -+ (kombuva -+ (eyanna (delete @<) 0x0D93 (shift init)) -+ (al-lakuna (delete @<) 0x0DDA (shift init)) -+ (kombuva (delete @<) 0x0DDB (shift combu_deka)) -+ (aela-pilla (delete @<) 0x0DDC (shift kombuva_haa_aela-pilla)) -+ (gayanukitta (delete @<) 0x0DDE (shift init)) -+ (consonant (move @1) (delete @0) (move @>) 0x0DD9 (shift consonant+kombuva)) -+ (backspace (undo))) -+ -+ (combu_deka -+ (consonant (move @1) (delete @0) (move @>) 0x0DDB (shift init)) -+ (backspace (undo))) -+ -+ (kombuva_haa_aela-pilla -+ (al-lakuna (delete @<) 0x0DDD (shift init)) -+ (backspace (undo))) -+ -+ (consonant+kombuva -+ (al-lakuna (delete @-) 0x0DDA (shift init)) -+ (aela-pilla (delete @-) 0x0DDC (shift consonant+kombuva_haa_aela-pilla)) -+ (gayanukitta (delete @-) 0x0DDE (shift init)) -+ (yansaka (move @-) 0x0DCA 0x200D 0x0DBA (move @>)) -+ (rakaransaya (move @-) 0x0DCA 0x200D 0x0DBB (move @>)) -+ (join (shift consonant+join+kombuva)) -+ (touch (move @-) 0x200D 0x0DCA (move @>)) -+ (backspace (undo))) -+ -+ (consonant+kombuva_haa_aela-pilla -+ (al-lakuna (delete @-) 0x0DDD (shift init)) -+ (backspace (undo))) -+ -+ (consonant+join+kombuva -+ (consonant (move @-) (delete @-) 0x0DCA 0x200D (move @+) 0x0DD9 -+ (shift consonant+kombuva)) -+ (backspace (undo))) -+ ) - - ;; Local Variables: - ;; coding: utf-8 - ;; mode: emacs-lisp - ;; End: -+ diff --git a/sources b/sources index 2218b8b..26ff25d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6fa9486caed6fe2a09d89fe97787696 m17n-db-1.5.5.tar.gz +f8dc1ad76ff8e9c255cf273aae85a7ff m17n-db-1.6.0.tar.gz