updated for version 7.0141

3 files changed, 57 insertions, 37 deletions

diff --git a/runtime/spell/ru/main.aap b/runtime/spell/ru/main.aap
index 85aeca9aa..e3d37a1b8 100644
--- a/runtime/spell/ru/main.aap
+++ b/runtime/spell/ru/main.aap
@@ -6,7 +6,7 @@
 @else:
     :progsearch VIM vim
 
-REGIONS = RU IE YO
+REGIONS = RU YO
 SPELLDIR = ..
 FILES    = ru_$*(REGIONS).aff ru_$*(REGIONS).dic
 
@@ -14,21 +14,18 @@ all: $SPELLDIR/ru.koi8-r.spl $SPELLDIR/ru.utf-8.spl \
         $SPELLDIR/ru.cp1251.spl ../README_ru.txt
 
 $SPELLDIR/ru.koi8-r.spl : $FILES
-        :sys env LANG=ru_RU.KOI8-R $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q
+        :sys env LANG=ru_RU.KOI8-R $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_YO" -c q
 
 $SPELLDIR/ru.utf-8.spl : $FILES
-        :sys env LANG=ru_RU.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q
+        :sys env LANG=ru_RU.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_YO" -c q
 
 $SPELLDIR/ru.cp1251.spl : $FILES
-        :sys env LANG=ru_RU.CP1251 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_IE ru_YO" -c q
+        :sys env LANG=ru_RU.CP1251 $VIM -u NONE -e -c "mkspell! $SPELLDIR/ru ru_RU ru_YO" -c q
 
 ../README_ru.txt: README_ru_$*(REGIONS).txt
         :print ru_RU >! $target
         :cat README_ru_RU.txt >> $target
         :print =================================================== >>$target
-        :print ru_IE >> $target
-        :cat README_ru_IE.txt >> $target
-        :print =================================================== >>$target
         :print ru_YO >> $target
         :cat README_ru_YO.txt >> $target
 
@@ -36,7 +33,7 @@ $SPELLDIR/ru.cp1251.spl : $FILES
 # Fetching the files from OpenOffice.org.
 #
 OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
-:attr {fetch = $OODIR/%file%} ru_RU.zip ru_RU_ye.zip ru_RU_yo.zip
+:attr {fetch = $OODIR/%file%} ru_RU.zip ru_RU_yo.zip
 
 # The files don't depend on the .zip file so that we can delete it.
 # Only download the zip file if the targets don't exist.
@@ -53,21 +50,6 @@ ru_RU.aff ru_RU.dic: {buildcheck=}
         @if os.path.exists('ru_RU.diff'):
             :sys patch <ru_RU.diff
 
-ru_IE.aff ru_IE.dic: {buildcheck=}
-        :assertpkg unzip
-        :fetch ru_RU_ye.zip
-        :sys unzip ru_RU_ye.zip
-        :delete ru_RU_ye.zip
-        :move ru_RU_ie.aff ru_IE.aff
-        :move ru_RU_ie.dic ru_IE.dic
-        :move README_ru_RU_ie.txt README_ru_IE.txt
-        @if not os.path.exists('ru_IE.orig.aff'):
-            :copy ru_IE.aff ru_IE.orig.aff
-        @if not os.path.exists('ru_IE.orig.dic'):
-            :copy ru_IE.dic ru_IE.orig.dic
-        @if os.path.exists('ru_IE.diff'):
-            :sys patch <ru_IE.diff
-
 ru_YO.aff ru_YO.dic: {buildcheck=}
         :assertpkg unzip
         :fetch ru_RU_yo.zip
@@ -91,8 +73,6 @@ diff:
         :assertpkg diff
         :sys {force} diff -a -C 1 ru_RU.orig.aff ru_RU.aff >ru_RU.diff
         :sys {force} diff -a -C 1 ru_RU.orig.dic ru_RU.dic >>ru_RU.diff
-        :sys {force} diff -a -C 1 ru_IE.orig.aff ru_IE.aff >ru_IE.diff
-        :sys {force} diff -a -C 1 ru_IE.orig.dic ru_IE.dic >>ru_IE.diff
         :sys {force} diff -a -C 1 ru_YO.orig.aff ru_YO.aff >ru_YO.diff
         :sys {force} diff -a -C 1 ru_YO.orig.dic ru_YO.dic >>ru_YO.diff
 
diff --git a/runtime/spell/ru/ru_RU.diff b/runtime/spell/ru/ru_RU.diff
index 18560c3c1..c79fb0c6b 100644
--- a/runtime/spell/ru/ru_RU.diff
+++ b/runtime/spell/ru/ru_RU.diff
@@ -1,5 +1,21 @@
-*** ru_RU.orig.dic	Sat Aug 27 22:54:55 2005
---- ru_RU.dic	Sun Aug 28 11:46:34 2005
+*** ru_RU.orig.aff	Sun Aug 28 21:12:27 2005
+--- ru_RU.aff	Sun Sep  4 17:21:40 2005
+***************
+*** 3,4 ****
+--- 3,13 ----
+  
++ FOL абвгдеёжзийклмнопрстуфхцчшщьыъэюя
++ LOW абвгдеёжзийклмнопрстуфхцчшщьыъэюя
++ UPP АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ
++ 
++ SOFOFROM абвгдеёжзийклмнопрстуфхцчшщьыъэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ
++ SOFOTO   ебвгдеежзейклннепрстефхцчшшье'еееЕБВГДЕЕЖЗЕЙКЛННЕПРСТЕФХЦЧШШЬЕ'ЕЕЕ
++ 
++ MIDWORD '-
++ 
+  SFX L Y 52
+*** ru_RU.orig.dic	Sun Aug 28 21:12:27 2005
+--- ru_RU.dic	Sun Sep  4 17:23:27 2005
 ***************
 *** 8767,8769 ****
   блеклость/F
@@ -13,11 +29,15 @@
   разубедивший/A
 --- 98085,98086 ----
 ***************
-*** 115007,115009 ****
-  толки/B
-- толки/O
+*** 115006,115009 ****
+  толкающийся/A
+! толки/B
+! толки/O
+  толкла/L
+--- 115004,115006 ----
+  толкающийся/A
+! толки/BO
   толкла/L
---- 115005,115006 ----
 ***************
 *** 119209,119211 ****
   униженный/ASX
diff --git a/runtime/spell/ru/ru_YO.diff b/runtime/spell/ru/ru_YO.diff
index 2cf8177ff..cd2eb5abb 100644
--- a/runtime/spell/ru/ru_YO.diff
+++ b/runtime/spell/ru/ru_YO.diff
@@ -1,5 +1,21 @@
-*** ru_YO.orig.dic	Sat Aug 27 22:54:55 2005
---- ru_YO.dic	Sun Aug 28 11:46:58 2005
+*** ru_YO.orig.aff	Sun Aug 28 21:12:35 2005
+--- ru_YO.aff	Sun Sep  4 17:23:51 2005
+***************
+*** 3,4 ****
+--- 3,13 ----
+  
++ FOL абвгдеёжзийклмнопрстуфхцчшщьыъэюя
++ LOW абвгдеёжзийклмнопрстуфхцчшщьыъэюя
++ UPP АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ
++ 
++ SOFOFROM абвгдеёжзийклмнопрстуфхцчшщьыъэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ
++ SOFOTO   ебвгдеежзейклннепрстефхцчшшье'еееЕБВГДЕЕЖЗЕЙКЛННЕПРСТЕФХЦЧШШЬЕ'ЕЕЕ
++ 
++ MIDWORD '-
++ 
+  SFX L Y 56
+*** ru_YO.orig.dic	Sun Aug 28 21:12:35 2005
+--- ru_YO.dic	Sun Sep  4 17:24:26 2005
 ***************
 *** 86471,86473 ****
   почтённый/AS
@@ -7,8 +23,12 @@
   почти/B
 --- 86471,86472 ----
 ***************
-*** 115246,115248 ****
-  толки/B
-- толки/O
+*** 115245,115248 ****
+  толкающийся/A
+! толки/B
+! толки/O
+  толкла/L
+--- 115244,115246 ----
+  толкающийся/A
+! толки/BO
   толкла/L
---- 115245,115246 ----