diff --git a/.gitignore b/.gitignore index 8196051..9f23597 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ m17n-db-1.6.1.tar.gz /inscript2-20120320.tar.gz /m17n-db-1.7.0.tar.gz /inscript2-20160423.tar.gz -/minglish.mim /m17n-db-1.8.0RC.tar.gz /m17n-db-1.8.0.tar.gz /m17n-db-sayura-1.0.0.tar.gz @@ -14,3 +13,5 @@ m17n-db-1.6.1.tar.gz /inscript2-20210809.tar.gz /inscript2-20210812.tar.gz /inscript2-20210820.tar.gz +/m17n-db-1.8.1.tar.gz +/m17n-db-1.8.2.tar.gz diff --git a/m17n-db-1.6.5-bn-itrans-bug182227.patch b/m17n-db-1.6.5-bn-itrans-bug182227.patch deleted file mode 100644 index 0825a4b..0000000 --- a/m17n-db-1.6.5-bn-itrans-bug182227.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- MIM/bn-itrans.mim.orig 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/bn-itrans.mim 2014-01-27 19:27:28.818981529 +0530 -@@ -127,16 +127,10 @@ - ("U" "ঊ") - ("RRi" "ঋ") - ("R^i" "ঋ") -- ("LLi" "ঌ") ; not in ITRANS Bengali table -- ("L^i" "ঌ") ; not in ITRANS Bengali table - ("e" "এ") - ("ai" "ঐ") - ("o" "ও") - ("au" "ঔ") -- ("RRI" "ৠ") ; not in ITRANS Bengali table -- ("R^I" "ৠ") ; not in ITRANS Bengali table -- ("LLI" "ৡ") ; not in ITRANS Bengali table -- ("L^I" "ৡ") ; not in ITRANS Bengali table - (".N" "ঁ") - (".n" "ং") - ("M" "ং") ; not in ITRANS Bengali table -@@ -153,10 +147,6 @@ - ("7" "৭") - ("8" "৮") - ("9" "৯") -- ("#" "্র") ; not in ITRANS Bengali table -- ("$" "র্") ; not in ITRANS Bengali table -- ("^" "ত্র") ; not in ITRANS Bengali table -- ("*" "শ্র") ; not in ITRANS Bengali table - ("]" "়") ; not in ITRANS Bengali table - ((KP_1) "১") - ((KP_2) "২") -@@ -183,16 +173,10 @@ - ("U" (delete @-) "ূ") - ("RRi" (delete @-) "ৃ") - ("R^i" (delete @-) "ৃ") -- ("LLi" (delete @-) "ৢ") ; not in ITRANS Bengali table -- ("L^i" (delete @-) "ৢ") ; not in ITRANS Bengali table - ("e" (delete @-) "ে") - ("ai" (delete @-) "ৈ") - ("o" (delete @-) "ো") -- ("au" (delete @-) "ৌ") -- ("RRI" (delete @-) "ৄ") ; not in ITRANS Bengali table -- ("R^I" (delete @-) "ৄ") ; not in ITRANS Bengali table -- ("LLI" (delete @-) "ৣ") ; not in ITRANS Bengali table -- ("L^I" (delete @-) "ৣ")) ; not in ITRANS Bengali table -+ ("au" (delete @-) "ৌ")) - - (return - ((Return))) diff --git a/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch b/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch deleted file mode 100644 index 20ab169..0000000 --- a/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- MIM/kn-inscript.mim.orig 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/kn-inscript.mim 2014-01-27 14:55:52.000000000 +0530 -@@ -59,6 +59,9 @@ - \"ಜ್ಞ\" : ಜ + ್ + ಞ - p + d + } [OR] % - -+9) ZWNJ is assigned to key 'V' -+ ZWJ is assigned to key '\\\\' -+ - Key summary: Shankar Prasad - - ") -@@ -161,7 +164,7 @@ - ("X" "") - ("C" ?ಣ) - ("c" ?ಮ) --;; V -+ ("V" "‌") - ("v" ?ನ) - ;; B - ("b" ?ವ) diff --git a/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch b/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch deleted file mode 100644 index 41fdada..0000000 --- a/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- MIM/kn-itrans.mim.orig 2013-08-20 14:55:29.000000000 +0530 -+++ MIM/kn-itrans.mim 2014-01-27 19:36:23.056606114 +0530 -@@ -46,8 +46,44 @@ - Kannada l10n Team, kannada.l10n@gmail.com - - on 18 Aug 2005. --") - -+Key summary : -+ -+1) \"praa\" = pa + halant + raa -+ \"ಪ್ರಾ\" = ಪ + ್ + ರ + ಾ -+ p + r + A -+ -+2) \"ska\" = sa+halant+ka -+ \"ಸ್ಕ\" = ಸ + ್ + ಕ -+ s + k + a -+ -+3) \"ththhaa\" = th + halanth + thhaa -+ \" ತ್ಥಾ\" = ತ + ್ +ಥ + ಾ -+ t + th + A -+ -+4) \"shhtya\" : shh + halat + T + halant + ya -+ \"ಷ್ಟ್ಯ\" = ಷ +್ + ಟ + ್ + ಯ -+ S + h + T + ya -+ -+5) \"dgaa\" : d + halant + gaa -+ \"ದ್ಗಾ\" : ದ + ್ + ಗ +ಾ -+ d + g + aa -+ -+6) \"ksha\" : k + halant + sha -+ \"ಕ್ಷ\" : ಕ + ್ + ಷ -+ k + Sh + a [OR] x -+ -+7) \"thra\": th + halant + r + a -+ \"ತ್ರ\" : ತ + ್ +ರ -+ t + r + a -+ -+8) \"jna\" : j + halant + na -+ \"ಜ್ಞ\" : ಜ + ್ + ಞ -+ G + Y + a -+ -+Key summary: Shankar Prasad -+ -+") - (title "ಕ") - - (map diff --git a/m17n-db-1.6.5-number_pad_itrans-222634.patch b/m17n-db-1.6.5-number_pad_itrans-222634.patch deleted file mode 100644 index ca96024..0000000 --- a/m17n-db-1.6.5-number_pad_itrans-222634.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -urN MIM/as-itrans.mim.old MIM/as-itrans.mim ---- MIM/as-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/as-itrans.mim 2014-01-27 19:43:43.608461146 +0530 -@@ -142,6 +142,11 @@ - ((KP_8) "৮") - ((KP_9) "৯") - ((KP_0) "০") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") - ((C-@) "‍")) - -diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim ---- MIM/gu-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/gu-itrans.mim 2014-01-27 19:44:15.069380103 +0530 -@@ -143,6 +143,11 @@ - ((KP_8) "૮") - ((KP_9) "૯") - ((KP_0) "૦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") ; not in ITRANS Gujarati table - ((C-@) "‍")) ; not in ITRANS Gujarati table - -diff -urN MIM/hi-itrans.mim.old MIM/hi-itrans.mim ---- MIM/hi-itrans.mim.old 2013-11-09 14:48:20.000000000 +0530 -+++ MIM/hi-itrans.mim 2014-01-27 19:50:10.952215133 +0530 -@@ -229,7 +229,12 @@ - ((KP_6) "६") - ((KP_7) "७") - ((KP_8) "८") -- ((KP_9) "९")) -+ ((KP_9) "९") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-")) - - (dependent - ("a" (delete @-) "") -diff -urN MIM/kn-itrans.mim.old MIM/kn-itrans.mim ---- MIM/kn-itrans.mim.old 2014-01-27 19:51:21.086953700 +0530 -+++ MIM/kn-itrans.mim 2014-01-27 19:47:10.035916349 +0530 -@@ -251,6 +251,11 @@ - ((KP_8) "೮") - ((KP_9) "೯") - ((KP_0) "೦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") ; not in ITRANS Kannada table - ((C-@) "‍")) ; not in ITRANS Kannada table - -diff -urN MIM/ml-itrans.mim.old MIM/ml-itrans.mim ---- MIM/ml-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/ml-itrans.mim 2014-01-27 19:46:50.472981057 +0530 -@@ -175,6 +175,11 @@ - ((KP_8) "൮") - ((KP_9) "൯") - ((KP_0) "൦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") - ((C-@) "‍")) - -diff -urN MIM/or-itrans.mim.old MIM/or-itrans.mim ---- MIM/or-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/or-itrans.mim 2014-01-27 19:46:33.923023456 +0530 -@@ -143,6 +143,11 @@ - ((KP_8) "୮") - ((KP_9) "୯") - ((KP_0) "୦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") - ((C-@) "‍")) - -diff -urN MIM/pa-itrans.mim.old MIM/pa-itrans.mim ---- MIM/pa-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/pa-itrans.mim 2014-01-27 19:46:13.724075235 +0530 -@@ -136,6 +136,11 @@ - ((KP_8) "੮") - ((KP_9) "੯") - ((KP_0) "੦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") ; not in ITRANS Gurmukhi table - ((C-@) "‍")) ; not in ITRANS Gurmukhi table - -diff -urN MIM/ta-itrans.mim.old MIM/ta-itrans.mim ---- MIM/ta-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/ta-itrans.mim 2014-01-27 19:45:52.657129275 +0530 -@@ -130,6 +130,11 @@ - ((KP_8) "௮") - ((KP_9) "௯") - ((KP_0) "௦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") ; not in ITRANS Tamil table - ((C-@) "‍") ; not in ITRANS Tamil table - ("SRI" "ஶ்ரீ")) -diff -urN MIM/te-itrans.mim.old MIM/te-itrans.mim ---- MIM/te-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 -+++ MIM/te-itrans.mim 2014-01-27 19:44:51.452286491 +0530 -@@ -146,6 +146,11 @@ - ((KP_8) "౮") - ((KP_9) "౯") - ((KP_0) "౦") -+ ((KP_Decimal) ".") -+ ((KP_Divide) "/") -+ ((KP_Multiply) "*") -+ ((KP_Add) "+") -+ ((KP_Subtract) "-") - ((S-\ ) "‌") ; not in ITRANS Telugu table - ((C-@) "‍")) ; not in ITRANS Telugu table - diff --git a/m17n-db-1.7.0-fix-e-o-mappings.patch b/m17n-db-1.7.0-fix-e-o-mappings.patch deleted file mode 100644 index 3ad48bb..0000000 --- a/m17n-db-1.7.0-fix-e-o-mappings.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim ---- MIM/gu-itrans.mim.old 2015-08-24 22:30:15.723875911 +0530 -+++ MIM/gu-itrans.mim 2015-08-24 22:32:56.198910959 +0530 -@@ -166,11 +166,13 @@ - ("RRI" (delete @-) "ૄ") ; not in ITRANS Gujarati table - ("R^I" (delete @-) "ૄ") ; not in ITRANS Gujarati table - (".c" (delete @-) "ૅ") -+ ("e." (delete @-) "ે.") ; not in ITRANS Gujarati table - ("e.c" (delete @-) "ૅ") ; not in ITRANS Gujarati table - ("e" (delete @-) "ે") - ("ai" (delete @-) "ૈ") -- ("o.c" (delete @-) "ૉ") - ("o" (delete @-) "ો") -+ ("o." (delete @-) "ો.") ; not in ITRANS Gujarati table -+ ("o.c" (delete @-) "ૉ") - ("au" (delete @-) "ૌ")) - - diff --git a/m17n-db-1.8.0-inscript2-mni-sat.patch b/m17n-db-1.8.0-inscript2-mni-sat.patch deleted file mode 100644 index 74dfd67..0000000 --- a/m17n-db-1.8.0-inscript2-mni-sat.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- inscript2/IM/mni-inscript2-beng.mim 2016-04-23 09:41:08.000000000 +0200 -+++ inscript2/IM/mni-inscript2-beng.mim 2019-10-10 11:58:18.068555240 +0200 -@@ -18,7 +18,7 @@ - ;; - ;; Author: Parag Nemade - --(input-method mni inscript2) -+(input-method mni inscript2-beng) - - (description "Manipuri input method for enhanced inscript layout. - ---- inscript2/IM/mni-inscript2-mtei.mim 2016-04-23 09:41:10.000000000 +0200 -+++ inscript2/IM/mni-inscript2-mtei.mim 2019-10-10 11:58:18.069555230 +0200 -@@ -18,7 +18,7 @@ - ;; - ;; Author: Parag Nemade - --(input-method mni inscript2) -+(input-method mni inscript2-mtei) - - (description "Manipuri Meetei Mayek input method for enhanced inscript layout. - -@@ -87,13 +87,13 @@ - ((G-U) "ꯡ") - ("Y" "ꯚ") - ("]" "꯬") -- ("a" "ꯣ " -+ ("a" "ꯣ") - ("b" "ꯋ") - ("c" "ꯃ") - ((G-c) "ꯝ") - ("d" "꯭") - ("e" "ꯥ") -- ("f" "ꯤ) -+ ("f" "ꯤ") - ("g" "ꯨ") - ("h" "ꯄ") - ((G-h) "ꯞ") ---- inscript2/IM/sat-inscript2-deva.mim 2016-04-23 09:41:51.000000000 +0200 -+++ inscript2/IM/sat-inscript2-deva.mim 2019-10-10 11:58:46.793249433 +0200 -@@ -18,7 +18,7 @@ - ;; - ;; Author: Parag Nemade - --(input-method sat inscript2) -+(input-method sat inscript2-deva) - - (description "Santali input method for enhanced inscript layout. - ---- inscript2/IM/sat-inscript2-olck.mim 2016-04-23 09:41:49.000000000 +0200 -+++ inscript2/IM/sat-inscript2-olck.mim 2019-10-10 11:58:46.793249433 +0200 -@@ -18,7 +18,7 @@ - ;; - ;; Author: Parag Nemade - --(input-method sat inscript2) -+(input-method sat inscript2-olck) - - (description "Santali Ol Chicky input method for enhanced inscript layout. - diff --git a/m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch b/m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch deleted file mode 100644 index 269b796..0000000 --- a/m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 3e26647b3ec04c95f97e435b79f1f148ba8a6950 -Author: Rajeesh K V -Date: Mon Dec 14 15:58:11 2020 +0530 - - Malayalam mozhi input method: fix spurious ZWNJ being added - -diff --git a/MIM/ml-mozhi.mim b/MIM/ml-mozhi.mim -index e502c7a..ce0b84f 100644 ---- MIM/ml-mozhi.mim -+++ MIM/ml-mozhi.mim -@@ -113,7 +113,7 @@ For the details, see the page: - ("N__" "ണ്‍") - ("n__" "ന്‍") - ("l__" "ല്‍") -- ("L__" "‌‌ള്‍") -+ ("L__" "ള്‍") - ("r__" "ര്‍") - ("R__" "ര്‍") - ("x" "ക്ഷ്")) -@@ -147,7 +147,7 @@ For the details, see the page: - (".n" "ം") - ("M" "ം") - ("~" "്") -- ("_" "‌‌") -+ ("_" "‌") - ("m_" "ം") - ("m " "ം ") - ("m," "ം,") diff --git a/m17n-db.spec b/m17n-db.spec index 85f2752..9b8350a 100644 --- a/m17n-db.spec +++ b/m17n-db.spec @@ -1,18 +1,13 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.8.0 -Release: 25%{?dist} +Version: 1.8.2 +Release: 1%{?dist} License: LGPLv2+ URL: http://www.nongnu.org/m17n Source0: http://download-mirror.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz -## Till the Inscript2 gets upstreamed in m17n-db, use this source -Source1: https://releases.pagure.org/inscript2/inscript2-20210820.tar.gz # Following is awaiting for upstream commit -Source2: https://raw.githubusercontent.com/gnuman/m17n-inglish-mims/master/minglish/minglish.mim -Source3: https://github.com/mike-fabian/m17n-db-sayura/archive/1.0.0.tar.gz#/m17n-db-sayura-1.0.0.tar.gz -Source4: https://raw.githubusercontent.com/shantanuo/gamabhana/main/usr/share/m17n/mr-gamabhana.mim -Source5: https://github.com/shantanuo/gamabhana/blob/main/usr/share/m17n/icons/mr-gamabhana.png +Source1: https://raw.githubusercontent.com/gnuman/m17n-inglish-mims/master/minglish/minglish.mim BuildArch: noarch BuildRequires: make @@ -23,15 +18,6 @@ BuildRequires: gcc Obsoletes: m17n-contrib < 1.1.14-4.fc20 Provides: m17n-contrib = 1.1.14-4.fc20 -# Fedora specific patches -Patch0: %{name}-1.6.5-bn-itrans-bug182227.patch -Patch1: %{name}-1.6.5-kn-itrans_key-summary_bug228806.patch -Patch2: %{name}-1.6.5-kn-inscript-ZWNJ-bug440007.patch -Patch3: %{name}-1.6.5-number_pad_itrans-222634.patch -Patch4: %{name}-1.7.0-fix-e-o-mappings.patch -# https://savannah.nongnu.org/bugs/?59681 -Patch6: %{name}-1.8.0-ml-mozhi-savannah-bug-59681.patch - %description This package contains multilingualization (m17n) datafiles for m17n-lib which describe input maps, encoding maps, OpenType font data and @@ -58,16 +44,8 @@ m17n-db development files %prep %autosetup -N -##extract inscript2 maps -tar xzf %{SOURCE1} -##extract m17n-db-sayura -tar xzf %{SOURCE3} - %autopatch -p0 -# Following fixes https://bugzilla.redhat.com/show_bug.cgi?id=1487512 -sed -i 's/ ("ld" "སྡ")/ ("ld" "ལྡ")/g' MIM/bo-ewts.mim - %build %configure %{make_build} @@ -78,20 +56,8 @@ sed -i 's/ ("ld" "སྡ")/ ("ld" "ལྡ")/g' MIM/bo-ewts.mim #removing ispell.mim for rh#587927 rm %{buildroot}%{_datadir}/m17n/ispell.mim -#install inscript2 keymaps -cp -p inscript2/IM/* %{buildroot}%{_datadir}/m17n/ -cp -p inscript2/icons/* %{buildroot}%{_datadir}/m17n/icons - # install minglish keymap -/usr/bin/install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/m17n - -# install si-sayura -cp -p m17n-db-sayura-1.0.0/si-sayura.mim %{buildroot}%{_datadir}/m17n -cp -p m17n-db-sayura-1.0.0/icons/si-sayura.png %{buildroot}%{_datadir}/m17n/icons - -# install mr-gamabhana -/usr/bin/install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/m17n -/usr/bin/install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/m17n/icons +/usr/bin/install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/m17n # For installing the translation files %find_lang %name @@ -149,6 +115,41 @@ cp -p m17n-db-sayura-1.0.0/icons/si-sayura.png %{buildroot}%{_datadir}/m17n/icon %{_datadir}/pkgconfig/m17n-db.pc %changelog +* Mon May 08 2023 Mike FABIAN - 1.8.2-1 +- Update to 1.8.2 +- Remove bn-national-jatiya input method (included upstream) +- Remove si-sayura input method (included upstream) +- Remove mr-gamabhana input method (included upstream) +- Update German translations (100%) +- Remove m17n-db-1.8.0-inscript2-mni-sat.patch (included upstream) +- Remove m17n-db-1.6.5-number_pad_itrans-222634.patch + This patch is not needed, numbers are typed in language representation + when using the number pad with numlock on even without this patch. + (I.e. the problem reported in https://bugzilla.redhat.com/show_bug.cgi?id=222634 + is still fixed) +- Add icon for hu-rovas-post input method +- Remove m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch + (See: https://git.savannah.nongnu.org/cgit/m17n/m17n-db.git/commit/?id=f10cfe21d49afbef40bdc681ff70563b6154eac0 + after these upstream changes to kn-itrans, the summary added by the patch is wrong) +- Remove m17n-db-1.6.5-bn-itrans-bug182227.patch + (This patch removed mappings which are "not in ITRANS Bengali table", nevertheless + these mappings might be useful to some users, better keep them for the time being) +- Remove m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch (included upstream) +- Remove m17n-db-1.7.0-fix-e-o-mappings.patch (included upstream) +- Remvove fix for ld mapping in MIM/bo-ewts.mim (include upstream) + (See: https://bugzilla.redhat.com/show_bug.cgi?id=1487512) +- MIM/bo-ewts.mim: remove whitespace in rn and brn mapping + +* Wed May 03 2023 Mike FABIAN - 1.8.1-1 +- Update to 1.8.1 +- Remove inscript2-20210820.tar.gz because it is now included upstream +- Remove m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch because it is included upstream +- Remove unicode.mim because the improvement is included upstream + +* Fri Aug 19 2022 Mike FABIAN - 1.8.0-26 +- Add bn-national-jatiya.{mim,png} +- Add improved unicode.mim + * Tue Jul 12 2022 Mike FABIAN - 1.8.0-25 - Add mr-gamabhana.png icon for mr-gamabhana.mim input method diff --git a/minglish.mim b/minglish.mim new file mode 100644 index 0000000..93954d0 --- /dev/null +++ b/minglish.mim @@ -0,0 +1,258 @@ +;; minglish.mim -- Marathi input method with Minglish input method +;; Author:- Anish Patil +;; Minglish is combination of Marathi and English language +;; +;; + +;; This file is part of the m17n contrib; a sub-part of the m17n +;; library. + +;; The m17n library is free software; you can redistribute it and/or +;; modify it under the terms of the GNU Lesser General Public License +;; as published by the Free Software Foundation; either version 2.1 of +;; the License, or (at your option) any later version. + +;; The m17n library is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; Lesser General Public License for more details. + +;; You should have received a copy of the GNU Lesser General Public +;; License along with the m17n library; if not, write to the Free +;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +(input-method mr minglish) + +(description "Marathi input method for Marathi and English +Author: Anish Patil +") + +(title "क") + +(map + (starter + (".") ("~") ("#") ("$") ("^") ("*") ((S-\ )) ((C-@)) + ("0") ("1") ("2") ("3") ("4") + ("5") ("6") ("7") ("8") ("9") + ("A") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") ("L") + ("M") ("N") ("O") ("R") ("S") ("T") ("U") ("Y") + ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i") + ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r") + ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z") + ((G-s)) ((G-k)) ((G-K)) ((G-g)) ((G-G)) + ((G-j)) ((G-J)) ((G-d)) ((G-D)) ((G-n)) ((G-N)) ((G-t)) ((G-T)) + ((G-p)) ((G-P)) ((G-f)) ((G-F)) ((G-m)) + ((G-y)) ((G-r)) ((G-l)) ((G-L)) + ((G-v)) ((G-w)) ((G-h)) ((G-z)) + ) + + + (consonant + ("k" "क") + ((G-k) "क्") + ("K" "ख") + ("kh" "ख") + ((G-K) "ख्") + ("g" "ग") + ((G-g) "ग्") + ("G" "घ") + ("gh" "घ") + ((G-G) "घ्") + ("~N" "ङ्") + ("N^" "ङ्") + ("c" "च") + ("ch" "छ") + ("chh" "छ्") + ("j" "ज") + ((G-j) "ज्") + ("J" "झ") + ("jh" "झ") + ((G-J) "झ्") + ("~n" "ञ") + ("JN" "ञ्") + ("d" "ड") + ((G-d) "ड्") + ("D" "ढ") + ("dh" "ढ") + ((G-D) "ढ्") + ("n" "न") + ((G-n) "न्") + ("N" "ण") + ((G-N) "ण्") + ("t" "त") + ((G-t) "त्") + ("T" "ट") + ("Th" "ठ") + ("th" "थ") + ((G-T) "थ्") + ("the" "द") + ("dha" "ध") + ("nh" "ऩ्") + ("p" "प") + ((G-p) "प्") + ("P" "फ") + ((G-P) "फ्") + ("f" "फ") + ((G-f) "फ्") + ((G-F) "फ्") + ("F" "फ") + ("ph" "फ") + ("b" "ब") + ((G-b) "ब्") + ("B" "भ") + ("bh" "भ") + ((G-B) "भ्") + ("m" "म") + ((G-m) "म्") + ("M" "ं") + ("y" "य") + ("Y" "य़्") + ("yh" "य़्") + ((G-y) "य़्") + ("r" "र") + ((G-r) "र्") + ("rh" "ऱ्") + ("l" "ल") + ((G-l) "ल्") + ("L" "ळ") + ("ld" "ळ") + ((G-L) "ळ्") + ("v" "व") + ((G-v) "व्") + ("w" "व्") + ((G-w) "व्") + ("s" "स") + ((G-s) "स्") + ("sh" "श") + ("S" "श") + ((G-S) "श्") + ("shh" "ष") + ("Sh" "ष") + ("h" "ह") + ((G-h) "ह्") + ("q" "कु") + ("K" "ख़्") + ("G" "ग़्") + ("z" "झ्") + ("Z" "ँ") + ((G-z) "झ्") + (".D" "ड़्") + (".Dh" "ढ़्") + ("j~n" "ज्ञ्") + ("GY" "ज्ञ्") + ("dny" "ज्ञ") + ("x" "क्ष्")) + + (independent + ("a" "अ") + ("aa" "आ") + ("A" "ा") + ("i" "इ") + ("ii" "ई") + ("I" "ई") + ("u" "उ") + ("uu" "ऊ") + ("U" "ऊ") + ("RRi" "ऋ") + ("R^i" "ऋ") + ("LLi" "ऌ") + ("L^i" "ऌ") + (".c" "ऍ") + ("e.c" "ऍ") + ("ee" "ऎ") + ("E" "ऎ") + ("e" "ए") + ("ai" "ऐ") + ("o.c" "ऑ") + ("oo" "ऒ") + ("O" "ऒ") + ("o" "ओ") + ("au" "औ") + ("RRI" "ॠ") + ("R^I" "ॠ") + ("LLI" "ॡ") + ("L^I" "ॡ") + (".N" "ँ") + (".n" "ं") + ("M" "ं") + ("H" "ः") + (".a" "ऽ") + (".h" "्") + ("AUM" "ॐ") + ("OM" "ॐ") + (".." "।") + ("0" "०") + ("1" "१") + ("2" "२") + ("3" "३") + ("4" "४") + ("5" "५") + ("6" "६") + ("7" "७") + ("8" "८") + ("9" "९") + ("#" "्र") + ("$" "र्") + ("^" "त्र") + ("*" "श्र") + ("]" "़") + ((S-\ ) "‌") + ((C-@) "‍")) + + (dependent + ("a" "ा") + ("aa" "ा") + ("A" "ा") + ("i" "ि") + ("ii" "ी") + ("I" "ी") + ("u" "ु") + ("uu" "ू") + ("U" "ू") + ("RRi" "ृ") + ("R^i" "ृ") + ("LLi" "ॢ") + ("L^i" "ॢ") + (".c" "ॅ") + ("e.c" "ॅ") + ("ee" "ॆ") + ("E" "ॆ") + ("e" "े") + ("ai" "ै") + ("o.c" "ॉ") + ("oo" "ॊ") + ("O" "ॊ") + ("o" "ो") + ("au" "ौ") + ("RRI" "ॄ") + ("R^I" "ॄ") + ("LLI" "ॣ") + ("L^I" "ॣ")) + + (return + ((Return))) + + (backspace + ((BackSpace) (undo)))) + +(state + (init + (starter (pushback 1) (shift intermediate))) + + (intermediate + (consonant (shift second)) + (independent (shift init)) + (backspace) + (return(shift init) )) + + (second + (consonant) + (dependent (shift init)) + (backspace) + (return (shift init)))) + +;; Local Variables: +;; coding: utf-8 +;; mode: emacs-lisp +;; End: diff --git a/mr-gamabhana.mim b/mr-gamabhana.mim deleted file mode 100644 index c5bf7ff..0000000 --- a/mr-gamabhana.mim +++ /dev/null @@ -1,333 +0,0 @@ -;; mr-gamabhana.mim -- Marathi input method with GaMaBhaNa -;; This file is part of the m17n database; a sub-part of the m17n -;; library. - -;; The m17n library is free software; you can redistribute it and/or -;; modify it under the terms of the GNU Lesser General Public License -;; as published by the Free Software Foundation; either version 2.1 of -;; the License, or (at your option) any later version. - -;; The m17n library is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; Lesser General Public License for more details. - -;; You should have received a copy of the GNU Lesser General Public -;; License along with the m17n library; if not, write to the Free -;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -(input-method mr gamabhana) - -(description "Based on Hindi input method by ITRANS and Harvard-Kyoto -transliteration systems. -You can use all the standard ITRANS key sequences plus key -sequences such as the below. - - nk->ङ्क्, nkh->ङ्ख्, ng->ङ्ग्, ngh->ङ्घ् - nch->ञ्च्, nCh->ञ्छ्, nc->ञ्च्, nC->ञ्छ्, nchh->ञ्छ्, - nj->ञ्ज्, njh->ञ्झ्, nT->ण्ट्, nTh->ण्ठ्, nD->ण्ड्, nDh->ण्ढ् - c->च्, C->छ्, z->श्, S->ष्, jn->ज्ञ्, R->ऋ - -In addition, for convenience, when a consonant + halant sequence -is followed by non Devanagari letter, the last halant is removed. -For instance, 'k SPC'->'क ', 'k..'->'क।'. - -The motivation behind additions made to the basic ITRANS scheme -is described in http://sanskritnlp.appspot.com/optitrans.html, -along with a tabulated comparison with several other -transliteration schemes. - -Also, see: http://en.wikipedia.org/wiki/Devanagari_transliteration.") - -(title "क") - -(variable - (trim-last-halant - (_"If this variable is 1 (the default), the last Halant in a syllable -is removed if it is followed by non Devanagari letter. For instance, -typing \"har..\" produces \"हर।\", not \"हर्।\".") - 1 0 1)) - -(map - (starter - (".") ("~") ("#") ("$") ("*") ("]") ((S-\ )) ((C-@)) - ("0") ("1") ("2") ("3") ("4") ("5") ("6") ("7") ("8") ("9") - ("A") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") ("L") - ("M") ("N") ("O") ("R") ("S") ("T") ("U") ("Y") - ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i") - ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r") - ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z") - ((KP_1)) ((KP_2)) ((KP_3)) ((KP_4)) ((KP_5)) - ((KP_6)) ((KP_7)) ((KP_8)) ((KP_9)) ((KP_0))) - - (consonant - ("k" "क्") - ("kh" "ख्") - ("K" "ख्") - ("g" "ग्") - ("gh" "घ्") - ("G" "घ्") - (".k" "क़् ") - ("q" "क़्") - (".kh" "ख़्") - (".K" "ख़्") - (".g" "ग़्") - ("nk" "ङ्क्") - ("nx" "ङ्क्ष्") - ("nkh" "ङ्ख्") - ("nK" "ङ्ख्") - ("ng" "ङ्ग्") - ("ngh" "ङ्घ्") - ("nG" "ङ्घ्") - ("~N" "ङ्") - ("N^" "ङ्") - ("NG" "ङ्") - ("ch" "च्") - ("Ch" "छ्") ; not in ITRANS Devenagari table - ("c" "च्") - ("C" "छ्") ; not in ITRANS Devenagari table - ("chh" "छ्") - ("j" "ज्") - ("jh" "झ्") - ("J" "झ्") - ("nch" "ञ्च्") - ("nCh" "ञ्छ्") ; not in ITRANS Devenagari table - ("nc" "ञ्च्") - ("nC" "ञ्छ्") ; not in ITRANS Devenagari table - ("nchh" "ञ्छ्") - ("nj" "ञ्ज्") - ("njh" "ञ्झ्") - ("nJ" "ञ्झ्") - ("~n" "ञ्") - ("JN" "ञ्") - ("NY" "ञ्") - ("T" "ट्") - ("Th" "ठ्") - ("D" "ड्") - ("Dh" "ढ्") - (".D" "ड़्") - (".Dh" "ढ़्") - ("nT" "ण्ट्") - ("nTh" "ण्ठ्") - ("nD" "ण्ड्") - ("nDh" "ण्ढ्") - ("N" "ण्") - ("t" "त्") - ("th" "थ्") - ("d" "द्") - ("dh" "ध्") - ("n" "न्") - (":n" "ऩ्") ; not in ITRANS Devenagari table - ("p" "प्") - ("ph" "फ्") - ("P" "फ्") - (".ph" "फ़्") - ("f" "फ्") - ("b" "ब्") - ("bh" "भ्") - ("B" "भ्") - ("m" "म्") - ("y" "य्") - ("Y" "य़्") ; not in ITRANS Devanagari table - ("yh" "य़्") ; not in ITRANS Devanagari table - (".y" "य़्") - ("r" "र्") - ("l" "ल्") - ("L" "ळ्") - ("ld" "ळ्") - ("v" "व्") - ("w" "व्") - ("sh" "श्") - ("z" "ज़्") - (".j" "ज़्") -; ("z" "श्") - ("S" "ष्") - ("Sh" "ष्") - ("shh" "ष्") - ("s" "स्") - ("h" "ह्") - ("jn" "ज्ञ्") - ("j~n" "ज्ञ्") - ("jn" "ज्ञ्") - ("GY" "ज्ञ्") - ("Gy" "ज्ञ्") - ("dny" "ज्ञ्") ; not in ITRANS Devanagari table - ("x" "क्ष्") - ("ks" "क्स्") - ("ksh" "क्ष्") - ("gH" ॻ्) - ("jH" ॼ्) - ("DH" "ॾ्") - ("Ry" "ऱ्य्") - ("Rh" "ऱ्ह्") - ("dhd" "द्ध्") - ("vd" "द्व्") - ("kn" "क्न्") - ("gn" "ग्‍न्") - ("ghn" "घ्‍न्") - ("tn" "त्‍न्") - ("dn" "द्‍न्") - ("nn" "न्‍न्") - ("pn" "प्‍न्") - ("mn" "म्‍न्") - ("sn" "स्‍न्") - ("shn" "श्‍न्") - ("bH" "ॿ्")) - - (independent - ("a" "अ") - ("aa" "आ") - ("A" "आ") - ("i" "इ") - ("ii" "ई") - ("I" "ई") - ("u" "उ") - ("uu" "ऊ") - ("U" "ऊ") - ("RU" "ऋ") - ("Ri" "ऋ") - ("RI" "ॠ") - ("O" "ऑ") - ("E" "ॲ") - ("RRi" "ऋ") - ("R^i" "ऋ") - ("LLi" "ऌ") ; not in ITRANS Devanagari table - ("L^i" "ऌ") ; not in ITRANS Devanagari table - (".c" "ऍ") ; not in ITRANS Devanagari table - ("ea" "ऍ") ; not in ITRANS Devanagari table - ("ee" (set CANDRA-E-O 0) "ई") ; not in ITRANS Devanagari table - ("e" (set CANDRA-E-O ?ऍ) "ए") - ("ai" "ऐ") - ("oo" (set CANDRA-E-O 0) "ऊ") - ("o" (set CANDRA-E-O ?ऑ) "ओ") - ("oa" "ऑ") - ("au" "औ") - ("ou" "औ") - ("RRI" "ॠ") ; not in ITRANS Devanagari table - ("RR" "ॠ") ; not in ITRANS Devanagari table - ("R^I" "ॠ") ; not in ITRANS Devanagari table - ("LLI" "ॡ") ; not in ITRANS Devanagari table - ("L^I" "ॡ") ; not in ITRANS Devanagari table - (".N" "ँ") - (".n" "ं") - ("M" "ं") - ("H" "ः") - ("kH" "ᳵ") - ("pH" "ᳶ") - (".a" "ऽ") - (".h" "्") - ("AUM" "ॐ") - ("OM" "ॐ") - ("$" "र्") ; not in ITRANS Devanagari table - ((S-\ ) "‌") ; not in ITRANS Devanagari table - ((C-@) "‍")) ; not in ITRANS Devanagari table - - (digit - ("0" "०") - ("1" "१") - ("2" "२") - ("3" "३") - ("4" "४") - ("5" "५") - ("6" "६") - ("7" "७") - ("8" "८") - ("9" "९") - ((KP_0) "०") - ((KP_1) "१") - ((KP_2) "२") - ((KP_3) "३") - ((KP_4) "४") - ((KP_5) "५") - ((KP_6) "६") - ((KP_7) "७") - ((KP_8) "८") - ((KP_9) "९")) - - (dependent - ("O" (delete @-) "ॉ") - ("E" (delete @-) "ॅ") - ("a" (delete @-) "") - ("aa" (delete @-) "ा") - ("A" (delete @-) "ा") - ("i" (delete @-) "ि") - ("ii" (delete @-) "ी") - ("I" (delete @-) "ी") - ("u" (delete @-) "ु") - ("uu" (delete @-) "ू") - ("U" (delete @-) "ू") - ("R" (delete @-) "ृ") - ("RRi" (delete @-) "ृ") - ("R^i" (delete @-) "ृ") - ("LLi" (delete @-) "ॢ") ; not in ITRANS Devanagari table - ("L^i" (delete @-) "ॢ") ; not in ITRANS Devanagari table - (".c" (delete @-) "ॅ") ; not in ITRANS Devanagari table - ("ea" (delete @-) "ॅ") ; not in ITRANS Devanagari table - ("ee" (delete @-) (set CANDRA-E-O 0) "ी") ; not in ITRANS Devanagari table - ("e" (delete @-) (set CANDRA-E-O ?ॅ) "े") - ("ai" (delete @-) "ै") - ("oo" (delete @-) (set CANDRA-E-O 0) "ू") - ("o" (delete @-) (set CANDRA-E-O ?ॉ) "ो") - ("oa" "ॉ") - ("au" (delete @-) "ौ") - ("ou" (delete @-) "ौ") - ("RR" (delete @-) "ॄ") ; not in ITRANS Devanagari table - ("RRI" (delete @-) "ॄ") ; not in ITRANS Devanagari table - ("R^I" (delete @-) "ॄ") ; not in ITRANS Devanagari table - ("LLI" (delete @-) "ॣ") ; not in ITRANS Devanagari table - ("L^I" (delete @-) "ॣ")) ; not in ITRANS Devanagari table - - (dot - ("." (set DOT 1) ".")) - - (eo-dot-c - (".c" (delete @-) (insert CANDRA-E-O))) - - (commit-key - ((S-C-Return))) - - (backspace - ((BackSpace) (undo)))) - -(state - (init - (starter (pushback 1) (shift intermediate))) - - (intermediate - ;; CANDRA-E-O is set to the character CANDRA E or CANDRA O when "e" - ;; or "o" is typed, and in that case, if ".c" is typed, the - ;; character set to CANDRA-E-O is inserted. - (t (set CANDRA-E-O 0)) - ;; LAST-HALANT-POS is set to the position after a consonat + HALANT - ;; sequence. If the following key is for non-letter, that HALANT - ;; character is removed. - (consonant (mark LAST-HALANT-POS) (shift second)) - (independent (cond (CANDRA-E-O (shift after-eo)) (1 (shift init)))) - (digit (shift init)) - (backspace) - (commit-key (shift init))) - - (second - ;; CANDRA-E-O is set to the character CANDRA E or CANDRA O when "e" - ;; or "o" is typed, and in that case, if ".c" is typed, the - ;; character set to CANDRA-E-O is inserted. - (t (set CANDRA-E-O 0)) - (consonant (mark LAST-HALANT-POS)) - (dependent (cond (CANDRA-E-O (shift after-eo)) (1 (shift init)))) - (backspace) - (commit-key (shift init)) - (nil (cond (trim-last-halant (move LAST-HALANT-POS) (delete @-) (move @>))) - (shift init))) - - (after-eo - (t (set DOT 0)) - (dot) - (eo-dot-c (shift init)) - (commit-key (shift init)) - (nil (cond (DOT (delete @-) (pushback 1))) (shift init)))) - -;; Local Variables: -;; coding: utf-8 -;; mode: emacs-lisp -;; End: diff --git a/mr-gamabhana.png b/mr-gamabhana.png deleted file mode 100644 index 4b6b99c..0000000 Binary files a/mr-gamabhana.png and /dev/null differ diff --git a/sources b/sources index f1f2f67..26df8be 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -SHA512 (m17n-db-1.8.0.tar.gz) = b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5 -SHA512 (m17n-db-sayura-1.0.0.tar.gz) = 59e89cb15f375057e9c506e6686db53ef617d3020e66711eaa0c6f8e31339d27345fc3490aefbf42193ce51cfa683f161a2b9c27b45f6b75e314892b15feba02 -SHA512 (minglish.mim) = bb5ce81cd3c8457458b1ebeafc7ccad2dffda3a42fead59e25f9c4e98d6c19c36a221907d024a21aa750bfe0a06c327aa1ae8f79eb2d381a0f39b50c58e235ed -SHA512 (inscript2-20210820.tar.gz) = 8405286926a1f59271f8988f95e37d62c3200ba14bf1d323bdf2cd6cee88aa683b86af6389bd7aba779a36649b7e83c8afc5d1472d7b32c428ef271659176ed5 +SHA512 (m17n-db-1.8.2.tar.gz) = 75e3f37e5665424325f87ad2c0826f26ed0dcf5eab86beaa02be2e89febbb1ccdec5ecd54e8eedac550aed2807157e7884492037572883c37097b26930d8c211