updated for version 7.0137v7.0137

2 files changed, 38 insertions, 44 deletions

diff --git a/runtime/spell/de/de_CH.diff b/runtime/spell/de/de_CH.diff
index 607f874089..ec44e8c22f 100644
--- a/runtime/spell/de/de_CH.diff
+++ b/runtime/spell/de/de_CH.diff
@@ -1,5 +1,5 @@
-*** de_CH.orig.aff	Mon Aug 15 22:45:43 2005
---- de_CH.aff	Mon Aug 15 22:54:21 2005
+*** de_CH.orig.aff	Thu Aug 25 11:22:18 2005
+--- de_CH.aff	Thu Aug 25 11:22:18 2005
 ***************
 *** 3,4 ****
 --- 3,24 ----
diff --git a/runtime/spell/de/main.aap b/runtime/spell/de/main.aap
index 718e78c6ff..0688e4894f 100644
--- a/runtime/spell/de/main.aap
+++ b/runtime/spell/de/main.aap
@@ -22,9 +22,9 @@ SPELLDIR   = ..
 FILES      = de_$*(REGIONS).aff de_$*(REGIONS).dic
 
 ZIPFILE_DE = de_DE_comb.zip
-ZIPFILE_19 = de_DE.zip
+ZIPFILE_19 = de_OLDSPELL.zip
 ZIPFILE_20 = de_DE_neu.zip
-ZIPFILE_AT = de_AT.zip
+ZIPFILE_AT = de_DE.zip
 ZIPFILE_CH = de_CH.zip
 ZIPFILES   = $ZIPFILE_DE $ZIPFILE_19 $ZIPFILE_20 $ZIPFILE_AT $ZIPFILE_CH
 
@@ -57,10 +57,13 @@ $SPELLDIR/de.utf-8.spl : $FILES
         :cat README_de_CH.txt   >> $target
 
 #
-# Fetching the files from OpenOffice.org.
+# Fetching the files from the OpenOffice.org site.
+# The OLDSPELL file comes from elsewhere
 #
 OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+DEDIR = http://www.j3e.de/myspell
 :attr {fetch = $OODIR/%file%} $ZIPFILES
+:attr {fetch = $DEDIR/%file%} $ZIPFILE_19
 
 # 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.
@@ -82,23 +85,12 @@ de_DE.aff de_DE.dic: {buildcheck=}
 de_19.aff de_19.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch $ZIPFILE_19
-        # Move the other files out of the way.
-        @if os.path.exists("de_DE.aff"):
-            :move de_DE.aff de_DE_comb.aff
-            :move de_DE.dic de_DE_comb.dic
-            :move README_de_DE.txt README_de_DE_comb.txt
-
         :sys $UNZIP $ZIPFILE_19
         :delete $ZIPFILE_19
-        :delete {f} de_AT.dic
-        :move de_DE.aff de_19.aff
-        :move de_DE.dic de_19.dic
-        :move README_de_DE.txt README_de_19.txt
-
-        @if os.path.exists("de_DE_comb.aff"):
-            :move de_DE_comb.aff de_DE.aff
-            :move de_DE_comb.dic de_DE.dic
-            :move README_de_DE_comb.txt README_de_DE.txt
+        :move de_OLDSPELL.aff de_19.aff
+        :move de_OLDSPELL.dic de_19.dic
+        # there is no README file
+        :print There is no README file for the old spelling >!README_de_19.txt
         @if not os.path.exists('de_19.orig.aff'):
             :copy de_19.aff de_19.orig.aff
         @if not os.path.exists('de_19.orig.dic'):
@@ -121,16 +113,37 @@ de_20.aff de_20.dic: {buildcheck=}
         @if os.path.exists('de_20.diff'):
             :sys patch <de_20.diff
 
-# It appears de_AT.dic is only an additional file for another word list.  We
-# guess it's the old spelling one and concatenate them.  Complication is that
-# de_AT.dic is missing a newline at the end.
-de_AT.aff de_AT.dic: {buildcheck=} de_19.dic
+# The de_AT.dic is included in de_DE.zip.  We rename the files and concatenate
+# them.  Complication is that de_AT.dic is missing a newline at the end.
+# And the de_DE.dic file is used for something else.
+de_AT.aff de_AT.dic: {buildcheck=}
         :assertpkg unzip patch
+
+        # Move de_DE files out of the way.
+        @if os.path.exists('de_DE.aff'):
+            :move de_DE.aff de_DE.temp.aff
+        @if os.path.exists('de_DE.dic'):
+            :move de_DE.dic de_DE.temp.dic
+        @if os.path.exists('README_de_DE.txt'):
+            :move README_de_DE.txt README_de_DE.temp.txt
+
         :fetch $ZIPFILE_AT
         :sys $UNZIP $ZIPFILE_AT
         :delete $ZIPFILE_AT
+
         :print >>de_AT.dic
-        :cat de_19.dic >>de_AT.dic
+        :cat de_DE.dic >>de_AT.dic
+        :delete de_DE.dic
+        :move de_DE.aff de_AT.aff
+        :move README_de_DE.txt README_de_AT.txt
+
+        @if os.path.exists('de_DE.temp.aff'):
+            :move de_DE.temp.aff de_DE.aff
+        @if os.path.exists('de_DE.temp.dic'):
+            :move de_DE.temp.dic de_DE.dic
+        @if os.path.exists('README_de_DE.temp.txt'):
+            :move README_de_DE.temp.txt README_de_DE.txt
+
         @if not os.path.exists('de_AT.orig.aff'):
             :copy de_AT.aff de_AT.orig.aff
         @if not os.path.exists('de_AT.orig.dic'):
@@ -172,25 +185,6 @@ diff:
 
 check:
         :print TODO!!!!
-        :assertpkg unzip diff
-        :fetch $ZIPFILE_DE
-        :mkdir tmp
-        :cd tmp
-        @try:
-            @import stat
-            :sys $UNZIP ../$ZIPFILE_DE
-            :move de_DE_comb.aff de_DE.aff
-            :move de_DE_comb.dic de_DE.dic
-            :sys {force} diff ../de_DE.orig.aff de_DE.aff >d
-            @if os.stat('d')[stat.ST_SIZE] > 0:
-                :copy de_DE.aff ../de_DE.new.aff
-            :sys {force} diff ../de_DE.orig.dic de_DE.dic >d
-            @if os.stat('d')[stat.ST_SIZE] > 0:
-                :copy de_DE.dic ../de_DE.new.dic
-        @finally:
-            :cd ..
-            :delete {r}{f}{q} tmp
-            :delete $ZIPFILE_DE
 
 
 # vim: set sts=4 sw=4 :