Updated runtime files.
diff --git a/runtime/spell/de/main.aap b/runtime/spell/de/main.aap
index 78dfaab..49ec2f2 100644
--- a/runtime/spell/de/main.aap
+++ b/runtime/spell/de/main.aap
@@ -2,7 +2,7 @@
#
# Since there is a big discussion about whether to use the old or the new
# spelling rules, both have been included.
-# "de": all possible words allowed
+# "de": new German spelling
# "de_de": old and new German spelling
# "de_19": old German spelling
# "de_20": new German spelling
@@ -21,14 +21,21 @@
SPELLDIR = ..
FILES = de_$*(REGIONS).aff de_$*(REGIONS).dic
-ZIPFILE_DE = de_DE_comb.zip
-ZIPFILE_19 = de_OLDSPELL.zip
-ZIPFILE_20 = de_DE_neu.zip
-ZIPFILE_AT = de_DE.zip
-ZIPFILE_CH = de_CH.zip
-ZIPFILES = $ZIPFILE_DE $ZIPFILE_19 $ZIPFILE_20 $ZIPFILE_AT $ZIPFILE_CH
+# The de_20 is the same as de_DE dictionary and only uses the
+# new revised orthography
+FILE_DE_AFF = de_DE_frami.aff
+FILE_DE_DIC = de_DE_frami.dic
+FILE_20_AFF = de_DE_frami.aff
+FILE_20_DIC = de_DE_frami.dic
+FILE_AT_AFF = de_AT_frami.aff
+FILE_AT_DIC = de_AT_frami.dic
+FILE_CH_AFF = de_CH_frami.aff
+FILE_CH_DIC = de_CH_frami.dic
+#ZIPFILES = $ZIPFILE_DE $ZIPFILE_20 $ZIPFILE_AT $ZIPFILE_CH
+ZIPFILE_19 = de_OLDSPELL.zip # unmaintained
+DICT_FILES = $FILE_20_AFF $FILE_20_DIC $FILE_AT_AFF $FILE_AT_DIC $FILE_CH_AFF $FILE_CH_DIC
-READMES = README_de_$*(REGIONS).txt
+READMES = README_de_DE_frami.txt README_extension_owner.txt
all: $SPELLDIR/de.latin1.spl $SPELLDIR/de.utf-8.spl ../README_de.txt
@@ -41,46 +48,39 @@
$VIM -u NONE -e -c "mkspell! $SPELLDIR/de $DE_REGIONS" -c q
../README_de.txt: $READMES
- :print de_DE (combined) >! $target
- :cat README_de_DE.txt >> $target
+ :fetch $READMES
+ :print de_DE_frami.txt >! $target
+ :cat README_de_DE_frami.txt >> $target
:print =================================================== >>$target
- :print de_19 (old) >> $target
- :cat README_de_19.txt >> $target
- :print =================================================== >>$target
- :print de_20 (new) >> $target
- :cat README_de_20.txt >> $target
- :print =================================================== >>$target
- :print de_AT (Austria) >> $target
- :cat README_de_AT.txt >> $target
- :print =================================================== >>$target
- :print de_CH (Swiss) >> $target
- :cat README_de_CH.txt >> $target
+ :print extension_owner >> $target
+ :cat README_extension_owner.txt >> $target
#
-# Fetching the files from the OpenOffice.org site.
+# Fetching the files from the LibreOffices github repository.
# The OLDSPELL file comes from elsewhere
#
-OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+OODIR = https://github.com/LibreOffice/dictionaries/raw/master/de
DEDIR = http://www.j3e.de/myspell
-:attr {fetch = $OODIR/%file%} $ZIPFILES
+:attr {fetch = $OODIR/%file%} $DICT_FILES
+:attr {fetch = $OODIR/%file%} $READMES
: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.
-de_DE.aff de_DE.dic: {buildcheck=}
- :assertpkg unzip patch
- :fetch $ZIPFILE_DE
- :sys $UNZIP $ZIPFILE_DE
- :delete $ZIPFILE_DE
- :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
+de_DE.aff de_DE.dic de_20.aff de_20.dic: {buildcheck=}
+ :assertpkg patch
+ :fetch $FILE_DE_AFF
+ :fetch $FILE_DE_DIC
+ :move de_DE_frami.aff de_DE.aff
+ :move de_DE_frami.dic de_DE.dic
@if not os.path.exists('de_DE.orig.aff'):
:copy de_DE.aff de_DE.orig.aff
@if not os.path.exists('de_DE.orig.dic'):
:copy de_DE.dic de_DE.orig.dic
@if os.path.exists('de_DE.diff'):
:sys patch <de_DE.diff
+ :copy de_DE.aff de_20.aff
+ :copy de_DE.dic de_20.dic
de_19.aff de_19.dic: {buildcheck=}
:assertpkg unzip patch
@@ -89,8 +89,6 @@
:delete $ZIPFILE_19
: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'):
@@ -98,54 +96,12 @@
@if os.path.exists('de_19.diff'):
:sys patch <de_19.diff
-de_20.aff de_20.dic: {buildcheck=}
- :assertpkg unzip patch
- :fetch $ZIPFILE_20
- :sys $UNZIP $ZIPFILE_20
- :delete $ZIPFILE_20
- :move de_DE_neu.aff de_20.aff
- :move de_DE_neu.dic de_20.dic
- :move README_de_DE_neu.txt README_de_20.txt
- @if not os.path.exists('de_20.orig.aff'):
- :copy de_20.aff de_20.orig.aff
- @if not os.path.exists('de_20.orig.dic'):
- :copy de_20.dic de_20.orig.dic
- @if os.path.exists('de_20.diff'):
- :sys patch <de_20.diff
-
-# 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
- # delete the first line, the word count
- :sys $VIM -u NONE de_DE.dic -e -c 1delete -c wq
- :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
-
+ :assertpkg patch
+ :fetch $FILE_AT_AFF
+ :fetch $FILE_AT_DIC
+ :move $FILE_AT_AFF de_AT.aff
+ :move $FILE_AT_DIC de_AT.dic
@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'):
@@ -154,10 +110,11 @@
:sys patch <de_AT.diff
de_CH.aff de_CH.dic: {buildcheck=}
- :assertpkg unzip patch
- :fetch $ZIPFILE_CH
- :sys $UNZIP $ZIPFILE_CH
- :delete $ZIPFILE_CH
+ :assertpkg patch
+ :fetch $FILE_CH_AFF
+ :fetch $FILE_CH_DIC
+ :move $FILE_CH_AFF de_CH.aff
+ :move $FILE_CH_DIC de_CH.dic
@if not os.path.exists('de_CH.orig.aff'):
:copy de_CH.aff de_CH.orig.aff
@if not os.path.exists('de_CH.orig.dic'):
@@ -174,12 +131,11 @@
:sys {force} diff -a -C 1 de_DE.orig.dic de_DE.dic >>de_DE.diff
:sys {force} diff -a -C 1 de_19.orig.aff de_19.aff >de_19.diff
:sys {force} diff -a -C 1 de_19.orig.dic de_19.dic >>de_19.diff
- :sys {force} diff -a -C 1 de_20.orig.aff de_20.aff >de_20.diff
- :sys {force} diff -a -C 1 de_20.orig.dic de_20.dic >>de_20.diff
:sys {force} diff -a -C 1 de_AT.orig.aff de_AT.aff >de_AT.diff
:sys {force} diff -a -C 1 de_AT.orig.dic de_AT.dic >>de_AT.diff
:sys {force} diff -a -C 1 de_CH.orig.aff de_CH.aff >de_CH.diff
:sys {force} diff -a -C 1 de_CH.orig.dic de_CH.dic >>de_CH.diff
+ :copy de_DE.diff de_20.diff
# Check for updated OpenOffice spell files. When there are changes the
@@ -187,36 +143,24 @@
check:
:assertpkg unzip patch
- :fetch $ZIPFILES
- :mkdir tmp
- :cd tmp
+ :fetch $ZIPFILE_19
+ :fetch $DICT_FILES
@try:
- # Do the _AT one first, it overwrites the _DE files.
- :sys $UNZIP ../$ZIPFILE_AT
- :print >>de_AT.dic
- # delete the first line, the word count
- :sys ../$VIM -u NONE de_DE.dic -e -c 1delete -c wq
- :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
-
- :sys $UNZIP ../$ZIPFILE_DE
- :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
-
+ :mkdir tmp
+ :cd tmp
:sys $UNZIP ../$ZIPFILE_19
+ :copy ../*.aff .
+ :copy ../*.dic .
: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
- :sys $UNZIP ../$ZIPFILE_20
- :move de_DE_neu.aff de_20.aff
- :move de_DE_neu.dic de_20.dic
- :move README_de_DE_neu.txt README_de_20.txt
-
- :sys $UNZIP ../$ZIPFILE_CH
+ :move de_DE_frami.aff de_DE.aff
+ :move de_DE_frami.dic de_DE.dic
+ :move de_AT_frami.dic de_AT.dic
+ :move de_AT_frami.aff de_AT.aff
+ :move de_CH_frami.dic de_CH.dic
+ :move de_CH_frami.aff de_CH.aff
+ :copy de_DE.dic de_20.dic
+ :copy de_DE.aff de_20.aff
@import stat
@for nm in ['de_DE', 'de_19', 'de_20', 'de_AT', 'de_CH']:
@@ -225,12 +169,8 @@
@if os.stat('d')[stat.ST_SIZE] > 0:
:copy $(nm).$ext ../$(nm).new.$ext
:sys {force} diff ../README_$(nm).txt README_$(nm).txt >d
- @if os.stat('d')[stat.ST_SIZE] > 0:
- :copy README_$(nm).txt ../README_$(nm).new.txt
@finally:
:cd ..
:delete {r}{f}{q} tmp
- :delete $ZIPFILES
-
# vim: set sts=4 sw=4 :