Mercurial > vim

changeset 15640:7cfe57329284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated runtime files. commit https://github.com/vim/vim/commit/2a953fcf107d24229fec8af820ee62c908caafbf Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 26 17:41:47 2019 +0100 Updated runtime files.
author Bram Moolenaar <Bram@vim.org>
date Sat, 26 Jan 2019 17:45:13 +0100
parents 250b8b1a25ab
children 2c264fda0f59
files runtime/doc/autocmd.txt runtime/doc/os_vms.txt runtime/doc/spell.txt runtime/doc/tags runtime/doc/term.txt runtime/doc/todo.txt runtime/filetype.vim runtime/ftplugin/man.vim runtime/ftplugin/mma.vim runtime/spell/README.txt runtime/spell/de/de_19.diff runtime/spell/de/de_20.diff runtime/spell/de/de_AT.diff runtime/spell/de/de_CH.diff runtime/spell/de/de_DE.diff runtime/spell/de/main.aap runtime/spell/fixdup.vim
diffstat 17 files changed, 2377 insertions(+), 2178 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.1.  Last change: 2019 Jan 11
+*autocmd.txt*   For Vim version 8.1.  Last change: 2019 Jan 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -311,6 +311,7 @@ Name			triggered by ~
 |FuncUndefined|		a user function is used but it isn't defined
 |SpellFileMissing|	a spell file is used but it can't be found
 |SourcePre|		before sourcing a Vim script
+|SourcePost|		after sourcing a Vim script
 |SourceCmd|		before sourcing a Vim script |Cmd-event|
 
 |VimResized|		after the Vim window size changed
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 8.1.  Last change: 2019 Jan 18
+*os_vms.txt*    For Vim version 8.1.  Last change: 2019 Jan 19
 
 
 		  VIM REFERENCE MANUAL
@@ -104,7 +104,7 @@ to set up GUI fonts etc. correctly.  See
 You may want to use GUI with GTK icons, then you have to download and install
 GTK for OpenVMS or at least runtime shareable images - LIBGTK from
 polarhome.com
-Post 7.2 Vim uses GTK2+ while the last GTK on OpenVMS is 1.2.10, thefore
+Post 7.2 Vim uses GTK2+ while the last GTK on OpenVMS is 1.2.10, therefore
 the GTK build is no longer available. 
 
 For more advanced questions, please send your problem to Vim on VMS mailing
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 8.1.  Last change: 2019 Jan 09
+*spell.txt*	For Vim version 8.1.  Last change: 2019 Jan 19
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1582,6 +1582,10 @@ CHECKCOMPOUNDTRIPLE  (Hunspell)			*spell
 		Forbid three identical characters when compounding.  Not
 		supported.
 
+CHECKSHARPS  (Hunspell))			*spell-CHECKSHARPS*
+		SS letter pair in uppercased (German) words may be upper case
+		sharp s (ß). Not supported.
+
 COMPLEXPREFIXES  (Hunspell)				*spell-COMPLEXPREFIXES*
 		Enables using two prefixes.  Not supported.
 
@@ -1595,12 +1599,21 @@ COMPOUNDFIRST	(Hunspell)				*spell-COMPO
 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
 
 COMPOUNDBEGIN	(Hunspell)				*spell-COMPOUNDBEGIN*
+		Words signed with COMPOUNDBEGIN may be first elements in
+		compound words.
+		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
+
+COMPOUNDLAST	(Hunspell)				*spell-COMPOUNDLAST*
+		Words signed with COMPOUNDLAST may be last elements in
+		compound words.
 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
 
 COMPOUNDEND	(Hunspell)				*spell-COMPOUNDEND*
-		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
+		Probably the same as COMPOUNDLAST
 
 COMPOUNDMIDDLE	(Hunspell)				*spell-COMPOUNDMIDDLE*
+		Words signed with COMPOUNDMIDDLE may be middle elements in
+		compound words.
 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
 
 COMPOUNDRULES	(Hunspell)				*spell-COMPOUNDRULES*
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -4592,7 +4592,10 @@ E892	eval.txt	/*E892*
 E893	eval.txt	/*E893*
 E894	eval.txt	/*E894*
 E895	if_mzsch.txt	/*E895*
+E896	eval.txt	/*E896*
+E897	eval.txt	/*E897*
 E898	channel.txt	/*E898*
+E899	eval.txt	/*E899*
 E90	message.txt	/*E90*
 E901	channel.txt	/*E901*
 E902	channel.txt	/*E902*
@@ -4680,6 +4683,7 @@ E977	eval.txt	/*E977*
 E978	eval.txt	/*E978*
 E979	eval.txt	/*E979*
 E98	diff.txt	/*E98*
+E980	eval.txt	/*E980*
 E99	diff.txt	/*E99*
 EX	intro.txt	/*EX*
 EXINIT	starting.txt	/*EXINIT*
@@ -8562,6 +8566,7 @@ spell-CHECKCOMPOUNDDUP	spell.txt	/*spell
 spell-CHECKCOMPOUNDPATTERN	spell.txt	/*spell-CHECKCOMPOUNDPATTERN*
 spell-CHECKCOMPOUNDREP	spell.txt	/*spell-CHECKCOMPOUNDREP*
 spell-CHECKCOMPOUNDTRIPLE	spell.txt	/*spell-CHECKCOMPOUNDTRIPLE*
+spell-CHECKSHARPS	spell.txt	/*spell-CHECKSHARPS*
 spell-CIRCUMFIX	spell.txt	/*spell-CIRCUMFIX*
 spell-COMMON	spell.txt	/*spell-COMMON*
 spell-COMPLEXPREFIXES	spell.txt	/*spell-COMPLEXPREFIXES*
@@ -8571,6 +8576,7 @@ spell-COMPOUNDEND	spell.txt	/*spell-COMP
 spell-COMPOUNDFIRST	spell.txt	/*spell-COMPOUNDFIRST*
 spell-COMPOUNDFLAG	spell.txt	/*spell-COMPOUNDFLAG*
 spell-COMPOUNDFORBIDFLAG	spell.txt	/*spell-COMPOUNDFORBIDFLAG*
+spell-COMPOUNDLAST	spell.txt	/*spell-COMPOUNDLAST*
 spell-COMPOUNDMIDDLE	spell.txt	/*spell-COMPOUNDMIDDLE*
 spell-COMPOUNDMIN	spell.txt	/*spell-COMPOUNDMIN*
 spell-COMPOUNDPERMITFLAG	spell.txt	/*spell-COMPOUNDPERMITFLAG*
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 8.1.  Last change: 2017 Oct 14
+*term.txt*      For Vim version 8.1.  Last change: 2019 Jan 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -334,11 +334,15 @@ Added by Vim (there are no standard code
 	t_EI	end insert or replace mode (block cursor shape)	*t_EI* *'t_EI'*
 		|termcap-cursor-shape|
 	t_RV	request terminal version string (for xterm)	*t_RV* *'t_RV'*
-		|xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes|
+		The response is stored in |v:termresponse|
+		|xterm-8bit| |'ttymouse'| |xterm-codes|
 	t_u7	request cursor position (for xterm)		*t_u7* *'t_u7'*
 		see |'ambiwidth'|
+		The response is stored in |v:termu7resp|
 	t_RF	request terminal foreground color		*t_RF* *'t_RF'*
+		The response is stored in |v:termrfgresp|
 	t_RB	request terminal background color		*t_RB* *'t_RB'*
+		The response is stored in |v:termrbgresp|
 	t_8f	set foreground color (R, G, B)			*t_8f* *'t_8f'*
 		|xterm-true-color|
 	t_8b	set background color (R, G, B)			*t_8b* *'t_8b'*
@@ -351,7 +355,9 @@ Added by Vim (there are no standard code
 	t_EC	set cursor color end				*t_EC* *'t_EC'*
 	t_SH	set cursor shape				*t_SH* *'t_SH'*
 	t_RC	request terminal cursor blinking		*t_RC* *'t_RC'*
+		The response is stored in |v:termblinkresp|
 	t_RS	request terminal cursor style			*t_RS* *'t_RS'*
+		The response is stored in |v:termstyleresp|
 	t_ST	save window title to stack			*t_ST* *'t_ST'*
 	t_RT	restore window title from stack			*t_RT* *'t_RT'*
 	t_Si	save icon text to stack				*t_Si* *'t_Si'*
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Jan 17
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Jan 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,15 +38,9 @@ browser use: https://github.com/vim/vim/
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Blob: the string form can't be parsed back.  Use 0z00112233.44556677 ?
-
-Make msg() and msg_attr() also use "char *" intead of "char_u *"?
-
-Feature to possibly graduate: FEAT_MBYTE
-    Integrate EBCDIC feature, use 'encoding' == "ebcdic" ?
-    Or drop EBCDIC?
-
 'incsearch' with :s: (#3321)
+- Get E20 when using command history to get "'<,'>s/a/b" and no Visual area
+  was set. (#3837)
 - :s/foo  using CTRL-G moves to another line, should not happen, or use the
   correct line (it uses the last but one line) (Lifepillar, Aug 18, #3345)
 - :s@pat/tern@ doesn't include "/" in the pattern. (Takahiro Yoshihara, #3637)
@@ -109,18 +103,10 @@ Terminal emulator window:
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-Patch with updates for VMS. (Zoltan Arpadffy, 2019 Jan 14)
-
-Update for German spell files: https://github.com/chrisbra/vim/compare/5e021c990f8817a50d3264782a5...3b27c92f297540761ebbd92d04fb3
-(Christian Brabandt, 2018 Nov 4)
-
 Problem with Visual yank when 'linebreak' and 'showbreak' are set.
 Patch with tests, but it's not clear how it is supposed to work. (tommm, 2018
 Nov 17)  Asked about this, Dec 22. Christian will have a look.
 
-Patch to deal with signs at the end of the buffer when lines are deleted.
-(Yegappan Lakshmanan, #3798)
-
 Key mapping times out when using a timer in Gvim. (Michael Henry, 2018 Sep 9,
 #3417)
 Another report, with reproduction steps. (#3799)
@@ -130,13 +116,20 @@ Does not build with MinGW out of the box
 - _stat64 is not defined, need to use "struct stat" in vim.h
 - WINVER conflict, should use 0x0600 by default?
 
-Patch to remove flicker from popup menu. (Yasuhiro Matsumoto, 2013 Aug 15)
-When redrawing for updating the popup menu, don't redraw the part when the new
-popup menu will be displayed?
-
 js_decode() does not handle infinity properly. (Dominique Pelle, 2019 Jan 10,
 #3788)
 
+Patch to avoid skipping buffers when loading a session. (Jason Franklin, 2019
+Jan 20)
+
+Patch to update example of how to restore the cursor. (Ken Takata, 2019 Jan
+21)
+
+Patch to fix problems with timer in GUI. (Ozaki Kiichi, #3817)
+Should also fix #3824.
+Change the order in which GUI handles events?  Make it work like os_unix.c,
+check timer on lower level, check for pending messages higher up.
+
 Signs:
 -   screen not redrawn correctly. (Dominique Pelle, 2019 Jan 14, #3803)
 -   Use a sign group in the Termdebug plugin.
@@ -146,10 +139,10 @@ Signs:
 Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 13, #2910)  Can't reproduce?
 
+Patch to recognize more systems with has().  (Ozaki Kiichi, #3855)
+
 Merge checking for 'cursorline' and 'concealcursor', see neovim #9492.
 
-Patch to not call setActiveWindow. Yasuhiro Matsumoto, 2019 Jan 8, #3778)
-
 Errors found with random data:
     heap-buffer-overflow in alist_add (#2472)
 
@@ -190,6 +183,9 @@ Patch on #3690 to fix that "wincmd p" do
 Patch: When using %v in 'errorformat', assume the number is the screen column
 not bytes, also handle multi-byte charactes. (Yegappan Lakshmanan, #3700)
 
+Support setting the character displayed below the last line?  Neovim uses
+"eob:X" in 'fillchars'.
+
 Make balloon_show() work outside of 'balloonexpr'?  Users expect it to work:
 #2948. (related to #1512?)
 On Win32 it stops showing, because showState is already ShS_SHOWING.
@@ -201,8 +197,6 @@ balloonexpr() on MS-Windows GUI doesn't 
 2018 Sep 14)
 Another request: #3811.
 
-Patch to add FOR_ALL_FRAMES. (Yegappan, 2018 Dec 11, #3686)
-
 Patch for MinGW build with static libraries. (Ken Takata, 2018 Dec 16)
 
 Patch to add new regexp classes :ident:, :keyword:, :fname:.
@@ -244,9 +238,6 @@ punctiuation is repeated. (Smylers, 2018
 Using CTRL-L during search only picks up the base character, not a combining
 character. (Rick, 2018 Dec 11, #3682)
 
-":mksession" cannot handle a very long 'runtimepath'. (Timothy Madden, 21 Sep
-2018, #3466)  Patch from Christian, 2018 Oct 30 (with comments).
-
 ml_get error: (Israel Chauca Fuentes, 2018 Oct 17, #3550).
 
 Patch to convert temp file name. (Yasuhiro Matsumoto, #3520)
@@ -259,6 +250,9 @@ When 'sidescrolloff' is set, using "zl" 
 scrolls back.  Should allow for this scrolling, like 'scrolloff' does when
 using CTRL-E. (Yee Cheng Chin, #3721)
 
+Patch to add ":vsbuffer" - vertical split + :sbuffer. (Rob Pilling, 2019 Jan
+17, #3816)  Do we really need this?
+
 Invalid memory access with old regexp engine. (Dominique Pelle, 2018 Sep 3,
 #3405)  Introduced by 8.0.1517, which was fixing another memory access error.
 (Sep 8)
@@ -967,6 +961,8 @@ 4#1038)
 - When out_cb executes :sleep, the close_cb may be invoked. (Daniel Hahler,
   2016 Dec 11, #1320)
 - Implement |job-term| ?
+- Calling a function when receiving a "call" on a channel, using feedkeys()
+  does not work.  It does work from a timer. (Qiming Zhao, #3852)
 - Channel test fails with Motif.  Sometimes kills the X11 server.
 - When a message in the queue but there is no callback, drop it after a while?
   Add timestamp to queued messages and callbacks with ID, remove after a
@@ -1829,6 +1825,7 @@ cleared.  See test64.
 Patch to make "z=" work when 'spell' is off.  Does this have nasty side
 effects?  (Christian Brabandt, 2012 Aug 5, Update 2013 Aug 12)
 Would also need to do this for spellbadword() and spellsuggest().
+https://github.com/chrisbra/vim-mq-patches/blob/master/enable_spellchecking
 
 On 64 bit MS-Windows "long" is only 32 bits, but we sometimes need to store a
 64 bits value.  Change all number options to use nropt_T and define it to the
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2018 May 04
+" Last Change:	2019 Jan 18
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	man
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Last Change: 	2018 Jul 25
+" Last Change: 	2019 Jan 22
 
 " To make the ":Man" command available before editing a manual page, source
 " this script from your startup vimrc file.
@@ -206,10 +206,10 @@ func <SID>GetPage(cmdmods, ...)
     let $MANWIDTH = ''
   endif
   " Remove blank lines from top and bottom.
-  while getline(1) =~ '^\s*$'
+  while line('$') > 1 && getline(1) =~ '^\s*$'
     silent keepj norm! ggdd
   endwhile
-  while getline('$') =~ '^\s*$'
+  while line('$') > 1 && getline('$') =~ '^\s*$'
     silent keepj norm! Gdd
   endwhile
   1
new file mode 100644
--- /dev/null
+++ b/runtime/ftplugin/mma.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language:	Mathematica
+" Maintainer:	Ian Ford <ianf@wolfram.com>
+" Last Change:	22 January 2019
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+	finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setlocal commentstring<"
+
+setlocal commentstring=\(*%s*\)
--- a/runtime/spell/README.txt
+++ b/runtime/spell/README.txt
@@ -17,10 +17,10 @@ ftp://ftp.gnu.org/gnu/aspell/dict/.  Mos
 
 GENERATING .SPL FILES
 
-This involves downloading the files from the OpenOffice.org server, applying a
+This involves downloading the files from the github server, applying a
 patch and running Vim to generate the .spl file.  To do this all in one go use
 the Aap program (www.a-a-p.org).  It's simple to install, it only requires
-Python.
+Python (http://www.a-a-p.org/download.html)
 
 Before generating spell files, verify your system has the required locale
 support.  Source the check_locales.vim script to find out.  If something is
@@ -29,7 +29,7 @@ missing, see LOCALE below.
 
 You can also do it manually:
 1. Fetch the right spell file from:
-   http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+   https://github.com/LibreOffice/dictionaries
 
 2. Unzip the archive:
 	unzip LL_RR.zip
@@ -56,12 +56,11 @@ Now you understand why I prefer using th
 MAINTAINING A LANGUAGE
 
 Every language should have a maintainer.  His tasks are to track the changes
-in the OpenOffice.org spell files and make updated patches.  Words that
-haven't been added/removed from the OpenOffice lists can also be handled by
-the patches.
+in the spell files and make updated patches.  Words that haven't been
+added/removed from the LibreOffice lists can also be handled by the patches.
 
 It is important to keep the version of the .dic and .aff files that you
-started with.  When OpenOffice brings out new versions of these files you can
+started with.  When LibreOffice brings out new versions of these files you can
 find out what changed and take over these changes in your patch.  When there
 are very many changes you can do it the other way around: re-apply the changes
 for Vim to the new versions of the .dic and .aff files.
@@ -79,20 +78,25 @@ 2. Tweak the .aff and .dic files to gene
    aren't really words, they mess up the suggestions (English has this
    problem).  You can use the "fixdup.vim" Vim script to find duplicate words.
 
-3. Make the diff file.  "aap diff" will do this for you.  If a diff would be
+3. Include needed parts from the aspell phonetic dictionary to the aff files. For
+   example add the relevant SAL lines to the .aff file (this is needed to make good
+   suggestions). The aspell dictionaries can be found here:
+   https://ftp.gnu.org/gnu/aspell/dict/0index.html
+
+4. Make the diff file.  "aap diff" will do this for you.  If a diff would be
    too big you might consider writing a Vim script to do systematic changes.
    Do check that someone else can reproduce building the spell file.  Send the
    result to Bram for inclusion in the distribution.  Bram will generate the
    .spl file and upload it to the ftp server (if he can't generate it you will
    have to send him the .spl file too).
 
-4. When OpenOffice makes a new zip file available you need to update the
+5. When OpenOffice makes a new zip file available you need to update the
    patch.  "aap check" should do most of the work for you: if there are
    changes the .new.dic and .new.aff files will appear.  You can now figure
    out the differences with .orig.dic and .orig.aff, adjust the .dic and .aff
    files and finally move the .new.dic to .orig.dic and .new.aff to .orig.aff.
 
-5. Repeat step 4. regularly.
+6. Repeat step 5. regularly.
 
 
 LOCALE
--- a/runtime/spell/de/de_19.diff
+++ b/runtime/spell/de/de_19.diff
@@ -1,5 +1,5 @@
-*** de_19.orig.aff	Thu Aug 25 11:22:08 2005
---- de_19.aff	Thu Sep 29 11:43:46 2005
+*** de_19.orig.aff	2019-01-19 18:45:26.468520305 +0100
+--- de_19.aff	2019-01-19 18:45:26.472520278 +0100
 ***************
 *** 3,4 ****
 --- 3,21 ----
@@ -501,8 +501,8 @@
 + SAL ZURÜCK^^             ZURIK
 + SAL ZUVER^^              ZUFA    # x
 + SAL Z                    Z
-*** de_19.orig.dic	Thu Aug 25 11:22:08 2005
---- de_19.dic	Sat Jan  7 12:32:09 2006
+*** de_19.orig.dic	2019-01-19 18:45:26.468520305 +0100
+--- de_19.dic	2019-01-19 18:45:26.476520252 +0100
 ***************
 *** 76258,76259 ****
   zynismusfördernd/A
--- a/runtime/spell/de/de_20.diff
+++ b/runtime/spell/de/de_20.diff
@@ -1,10 +1,9 @@
-*** de_20.orig.aff	Sat Nov 26 19:59:52 2005
---- de_20.aff	Sat Nov 26 20:13:50 2005
+*** de_DE.orig.aff	2019-01-19 18:45:26.132522538 +0100
+--- de_DE.aff	2019-01-19 19:23:37.233297530 +0100
 ***************
-*** 2,3 ****
---- 2,21 ----
-  TRY esianrtolcdugmphbyfvkwäüößáéêàâñESIANRTOLCDUGMPHBYFVKWÄÜÖ
-+ 
+*** 15,16 ****
+--- 15,46 ----
+  
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + UPP  ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ
@@ -22,512 +21,560 @@
 + MAP yÿý
 + MAP sß
 + 
-  #
++ COMPOUNDRULE xy?z
++ #COMPOUNDBEGIN x
++ #COMPOUNDMIDDLE y
++ #COMPOUNDEND z
++ 
++ # Prefixes are allowed at the beginning of compounds,
++ # suffixes are allowed at the end of compounds by default:
++ # (prefix)?(root)+(affix)?
++ # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
++ COMPOUNDPERMITFLAG c
++ 
++ ONLYINCOMPOUND o
++ 
+  PFX U Y 1
 ***************
-*** 28,31 ****
-  PFX V Y 1
-! PFX V   0     ver        . 
-!  
+*** 536,553 ****
+  #LANG de_DE
+! CHECKSHARPS
+! 
+  
+- COMPOUNDBEGIN x
+- COMPOUNDMIDDLE y
+- COMPOUNDEND z
+  FORBIDDENWORD d
   
---- 46,49 ----
-  PFX V Y 1
-! PFX V   0     ver          .
-! 
+- # Prefixes are allowed at the beginning of compounds,
+- # suffixes are allowed at the end of compounds by default:
+- # (prefix)?(root)+(affix)?
+- # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
+- COMPOUNDPERMITFLAG c
+- 
+- ONLYINCOMPOUND o
+- 
+  # my PSEUDOROOT h(elper) flag
+--- 566,571 ----
+  #LANG de_DE
+! # CHECKSHARPS
+  
+  FORBIDDENWORD d
+  
+  # my PSEUDOROOT h(elper) flag
+***************
+*** 571,573 ****
+  
+! WORDCHARS ß-.
+  
+--- 589,591 ----
+  
+! # WORDCHARS ß-.
   
 ***************
-*** 235,237 ****
-  SFX F   arzt  ärztin       arzt  
-! SFX F   arzt  Ärztinnen    arzt  
-  SFX F   Arzt  Ärztin       Arzt  
---- 253,255 ----
-  SFX F   arzt  ärztin       arzt  
-! SFX F   arzt  ärztinnen    arzt  
-  SFX F   Arzt  Ärztin       Arzt  
-***************
-*** 1410 ****
---- 1428,1904 ----
-  REP ö öe
-+ 
-+ #   German phonetic transformation rules from Aspell
-+ #   Copyright (C) 2000 Björn Jacke, distributed under LGPL.
-+ #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
-+ #   Last changed 2000-01-07
-+ 
-+ SAL followup        1
-+ SAL collapse_result 1
-+ 
-+ SAL ÄER-                 E
-+ SAL ÄU<                  EU
-+ SAL Ä<                   E
-+ SAL É                    E
-+ SAL ÖER-                 Ö
-+ SAL Ö                    Ö
-+ SAL ÜBER^^               IPA
-+ SAL ÜER-                 I
-+ SAL Ü                    I
-+ SAL ß                    Z
-+ SAL ABELLE$              APL
-+ SAL ABELL$               APL
-+ SAL ABIENNE$             APIN
-+ SAL ACEY$                AZI
-+ SAL AEU<                 EU
-+ SAL AE2                  E
-+ SAL AGNI-^               AKN
-+ SAL AGNIE-               ANI
-+ SAL AGN(AEOU)-$          ANI
-+ SAL AIA2                 AIA
-+ SAL AIE$                 E
-+ SAL AILL(EOU)-           ALI
-+ SAL AINE$                EN
-+ SAL AIRE$                ER
-+ SAL AIR-                 E
-+ SAL AISE$                EZ
-+ SAL AISSANCE$            EZANZ
-+ SAL AISSE$               EZ
-+ SAL AIX$                 EX
-+ SAL AJ(AÄEIOÖUÜ)--       A
-+ SAL AKTIE                AXIE
-+ SAL ALO(IY)^             ALUI
-+ SAL AMATEU(RS)-          ANATÖ
-+ SAL ANIELLE$             ANIL
-+ SAL ANTI^^               ANTI
-+ SAL ANVER^^              ANFA
-+ SAL ATIA$                ATIA
-+ SAL ATIA(NS)--           ATI
-+ SAL ATI(AÄOÖUÜ)-         AZI
-+ SAL AUAU--               _
-+ SAL AUER<                AUA
-+ SAL AUF^^                AUF
-+ SAL AULT$                U
-+ SAL AUSSE$               UZ
-+ SAL AUS(ST)-^            AUZ
-+ SAL AUS^^                AUZ
-+ SAL AUTO^^               AUTU
-+ SAL AUX(IY)-             AUX
-+ SAL AUX                  U
-+ SAL AU                   AU
-+ SAL AVIER$               AFIE
-+ SAL AYER--<              EI
-+ SAL AY(AÄEIOÖUÜ)--       A
-+ SAL A(IJY)<              EI
-+ SAL A                    A
-+ SAL BEA(BCMNRU)-^        PEA
-+ SAL BEAT(AEIMORU)-^      PEAT
-+ SAL BEIGE^$              PEZ
-+ SAL BE(LMNRST)-^         PE
-+ SAL BETTE$               PET
-+ SAL BIC$                 PIZ
-+ SAL BOWL(EI)-            PUL
-+ SAL BP(AÄEIOÖRUÜY)-      P
-+ SAL BUDGET7              PIKE
-+ SAL BUFFET7              PIFE
-+ SAL BYLLE$               PILE
-+ SAL BYLL$                PIL
-+ SAL BYTE<                PEIT
-+ SAL B                    P
-+ SAL CÄ-                  Z
-+ SAL CÜ$                  ZI
-+ SAL CACH(EI)-^           KEZ
-+ SAL CAE--                Z
-+ SAL CA(IY)$              ZEI
-+ SAL CCH                  Z
-+ SAL CCE-                 X
-+ SAL CE(EIJUY)--          Z
-+ SAL CENT<                ZENT
-+ SAL CERST(EI)----^       KE
-+ SAL CER$                 ZA
-+ SAL CE3                  ZE
-+ SAL CHAO(ST)-            KAU
-+ SAL CHAMPIO-^            ZENPI
-+ SAL CHAR(AI)-^           KAR
-+ SAL CHAU(CDFSVWXZ)-      ZU
-+ SAL CHE(CF)-             ZE
-+ SAL CHEM-^               KE
-+ SAL CHEQUE<              ZEK
-+ SAL CHI(CFGPVW)-         ZI
-+ SAL CH(AEUY)-<^          Z
-+ SAL CHK-                 _
-+ SAL CH(LOR)-<^           K
-+ SAL CHST-                X
-+ SAL CH(SßXZ)3            X
-+ SAL CH                   K
-+ SAL CIER$                ZIE
-+ SAL CYB-^                ZEI
-+ SAL CY9^                 ZI
-+ SAL C(IJY)-3             Z
-+ SAL CKST                 XT
-+ SAL CK(SßXZ)3            X
-+ SAL C(CK)-               _
-+ SAL CLAUDET---           KLU
-+ SAL CLAUDINE^$           KLUTIN
-+ SAL COLE$                KUL
-+ SAL COUCH                KAUZ
-+ SAL CQUES$               K
-+ SAL CQUE                 K
-+ SAL CREAT-^              KREA
-+ SAL CST                  XT
-+ SAL CS<^                 Z
-+ SAL C(SßX)               X
-+ SAL CT(SßXZ)             X
-+ SAL CZ<                  Z
-+ SAL C<                   K
-+ SAL D'H^                 T
-+ SAL D'S3$                Z
-+ SAL DAVO(NR)-^$          TAFU
-+ SAL DD(SZ)--<            _
-+ SAL DEPOT7               TEPU
-+ SAL DESIGN               TIZEIN
-+ SAL DE(LMNRST)-3^        TE
-+ SAL DETTE$               TET
-+ SAL DIC$                 TIZ
-+ SAL DJ(AEIOU)-^          I
-+ SAL DS(CH)--<            T
-+ SAL DST                  ZT
-+ SAL DT-                  _
-+ SAL DUIS-^               TI
-+ SAL DURCH^^              TURK
-+ SAL DZS(CH)--            T
-+ SAL D(SßZ)               Z
-+ SAL D                    T
-+ SAL EAULT$               U
-+ SAL EAUX$                U
-+ SAL EAU                  U
-+ SAL EAV                  IF
-+ SAL EA(AÄEIOÖÜY)-3       EA
-+ SAL EA3$                 EA
-+ SAL EA3                  I
-+ SAL EBEN^^               EPN
-+ SAL EE9                  E
-+ SAL EIEI--               _
-+ SAL EIH--                E
-+ SAL EILLE$               EI
-+ SAL EI                   EI
-+ SAL EJ$                  EI
-+ SAL EL-^                 E
-+ SAL EL(DKL)--1           E
-+ SAL EL(MNT)--1$          E
-+ SAL ELYNE$               ELINE
-+ SAL ELYN$                ELIN
-+ SAL EL(AÄEIOÖUÜY)-1      EL
-+ SAL EL-1                 L
-+ SAL EM-^                 E
-+ SAL EM(DFKMPQT)--1       E
-+ SAL EM(AÄEIOÖUÜY)--1     E
-+ SAL EM-1                 N
-+ SAL EN-^                 E
-+ SAL EN(CDGKQT)--1        E
-+ SAL ENZ(AEIOUY)--1       EN
-+ SAL EN(AÄEINOÖUÜY)-1     EN
-+ SAL EN-<1                N
-+ SAL ERH(AÄEIOÖUÜ)-^      ER
-+ SAL ER-^                 E
-+ SAL ER(AÄEIOÖUÜY)-1      A
-+ SAL ER1$                 A
-+ SAL ER<1                 A
-+ SAL ETI(AÄOÖÜU)-         EZI
-+ SAL EUEU--               _
-+ SAL EUILLE$              Ö
-+ SAL EUR$                 ÖR
-+ SAL EUX                  Ö
-+ SAL EUYS$                EUZ
-+ SAL EU                   EU
-+ SAL EYER<                EIA
-+ SAL EY<                  EI
-+ SAL E                    E
-+ SAL FANS--^$             FE
-+ SAL FAN-^$               FE
-+ SAL FAULT-               FUL
-+ SAL FEE(DL)-             FI
-+ SAL FEHLER               FELA
-+ SAL FE(LMNRST)-3^        FE
-+ SAL FOND7                FUN
-+ SAL FRAIN$               FRA
-+ SAL FRISEU(RS)-          FRIZÖ  # x
-+ SAL F                    F
-+ SAL G'S$                 X
-+ SAL GAGS^$               KEX
-+ SAL GAG^$                KEK
-+ SAL GD                   KT
-+ SAL GEGEN^^              KEKN
-+ SAL GE(LMNRST)-3^        KE
-+ SAL GETTE$               KET
-+ SAL G(CK)-               _
-+ SAL GG-                  _
-+ SAL GI(AO)-^             I
-+ SAL GION$                KIUN
-+ SAL GIUS-^               IU
-+ SAL GMBH^$               GMPH
-+ SAL GNAC$                NIAK
-+ SAL GNON$                NIUN
-+ SAL GN$                  N
-+ SAL GONCAL-^             KUNZA
-+ SAL GS(CH)--             K
-+ SAL GST                  XT
-+ SAL G(SßXZ)              X
-+ SAL GUCK-                KU
-+ SAL GUI-^                K
-+ SAL G                    K
-+ SAL HEAD-                E
-+ SAL HE(LMNRST)-3^        E
-+ SAL HE(LMN)-1            E
-+ SAL HEUR1$               ÖR
-+ SAL H^                   _
-+ SAL IEC$                 IZ
-+ SAL IEI-3                _
-+ SAL IELL3                IEL
-+ SAL IENNE$               IN
-+ SAL IERRE$               IER
-+ SAL IETTE$               IT
-+ SAL IEU                  IÖ
-+ SAL IE<4                 I
-+ SAL IGHT3$               EIT
-+ SAL IGNI(EO)-            INI
-+ SAL IGN(AEOU)-$          INI
-+ SAL IJ(AOU)-             I
-+ SAL IJ$                  I
-+ SAL IJ<                  EI
-+ SAL IKOLE$               IKUL
-+ SAL ILLAN(STZ)--         ILIA
-+ SAL ILLAR(DT)--          ILIA
-+ SAL INVER-               INFE
-+ SAL ITI(AÄOÖUÜ)-         IZI
-+ SAL IVIER$               IFIE
-+ SAL I                    I
-+ SAL JAVIE---<^           ZA
-+ SAL JEAN^$               IA
-+ SAL JEAN-^               IA
-+ SAL JER-^                IE
-+ SAL JE(LMNST)-           IE
-+ SAL JOR(GK)^$            IÖRK
-+ SAL J                    I
-+ SAL KC(ÄEIJ)-            X
-+ SAL KE(LMNRST)-3^        KE
-+ SAL KH<^                 K
-+ SAL KIC$                 KIZ
-+ SAL KLE(LMNRST)-3^       KLE
-+ SAL KOTELE-^             KUTL
-+ SAL KREAT-^              KREA
-+ SAL KST                  XT
-+ SAL K(SßXZ)              X
-+ SAL KTI(AIOU)-3          XI
-+ SAL KT(SßXZ)             X
-+ SAL K                    K
-+ SAL LARVE-               LARF
-+ SAL LEAND-^              LEAN
-+ SAL LEL-                 LE
-+ SAL LE(MNRST)-3^         LE
-+ SAL LETTE$               LET
-+ SAL LFGNAG-              LFKAN
-+ SAL LIC$                 LIZ
-+ SAL LIVE^$               LEIF
-+ SAL LUI(GS)--            LU
-+ SAL L                    L
-+ SAL MASSEU(RS)-          NAZÖ
-+ SAL MAURICE              NURIZ
-+ SAL MBH^$                MPH
-+ SAL MB(SßZ)-             N
-+ SAL MC9^                 NK
-+ SAL MEMOIR-^             NENUA
-+ SAL ME(LMNRST)-3^        NE
-+ SAL MIGUEL               NIKL
-+ SAL MIKE^$               NEIK
-+ SAL MN                   N
-+ SAL MPJUTE-              NPUT
-+ SAL MP(SßZ)-             N
-+ SAL MP(BDJLMNPQRTVW)-    NP
-+ SAL M                    N
-+ SAL NACH^^               NAK
-+ SAL NADINE               NATIN
-+ SAL NAIV--               NA
-+ SAL NAISE$               NEZE
-+ SAL NCOISE$              ZUA
-+ SAL NCOIS$               ZUA
-+ SAL NEBEN^^              NEPN
-+ SAL NE(LMNRST)-3^        NE
-+ SAL NEN-3                NE
-+ SAL NETTE$               NET
-+ SAL NG(BDFJLMNPQRTVW)-   NK
-+ SAL NICHTS^^             NIX
-+ SAL NICHT^^              NIKT
-+ SAL NINE$                NIN
-+ SAL NON^^                NUN
-+ SAL NOT^^                NUT
-+ SAL NTI(AIOU)-3          NZI
-+ SAL NTIEL--3             NZI
-+ SAL NYLON                NEILUN
-+ SAL ND(SßZ)$             NZ
-+ SAL NT(SßZ)$             NZ
-+ SAL ND'S$                NZ
-+ SAL NT'S$                NZ
-+ SAL NSTS$                NZ
-+ SAL N                    N
-+ SAL OBER^^               UPA
-+ SAL OE2                  Ö
-+ SAL OGNIE-               UNI
-+ SAL OGN(AEOU)-$          UNI
-+ SAL OIE$                 Ö
-+ SAL OIR$                 UAR
-+ SAL OIX                  UA
-+ SAL OI<3                 EU
-+ SAL OJ(AÄEIOÖUÜ)--       U
-+ SAL OKAY^$               UKE
-+ SAL OLYN$                ULIN
-+ SAL OTI(AÄOÖUÜ)-         UZI
-+ SAL OUI^                 FI
-+ SAL OUILLE$              ULIE
-+ SAL OU(DT)-^             AU
-+ SAL OUSE$                AUZ
-+ SAL OUT-                 AU
-+ SAL OU                   U
-+ SAL OWS$                 UZ
-+ SAL OY(AÄEIOÖUÜ)--       U
-+ SAL O(JY)<               EU
-+ SAL O                    U
-+ SAL PATIEN--^            PAZI
-+ SAL PENSIO-^             PANZI
-+ SAL PE(LMNRST)-3^        PE
-+ SAL PFER-^               FE
-+ SAL P(FH)<               F
-+ SAL POLY^^               PULI
-+ SAL PORTRAIT7            PURTRE
-+ SAL PP(FH)--<            P
-+ SAL PP-                  _
-+ SAL PRIX^$               PRI
-+ SAL P(SßZ)^              Z
-+ SAL PTI(AÄOÖUÜ)-3        PZI
-+ SAL PIC^$                PIK
-+ SAL P                    P
-+ SAL QUE(LMNRST)-3        KFE
-+ SAL QUE$                 K
-+ SAL QUI(NS)$             KI
-+ SAL QU                   KF
-+ SAL Q<                   K
-+ SAL RCH                  RK
-+ SAL RECHERCH^            REZAZ
-+ SAL RER$                 RA
-+ SAL RE(MNR)-4            RE
-+ SAL RETTE$               RET
-+ SAL RH<^                 R
-+ SAL RJA(MN)--            RI
-+ SAL RTI(AÄOÖUÜ)-3        RZI
-+ SAL RY(KN)-$             RI
-+ SAL R                    R
-+ SAL SAFE^$               ZEIF
-+ SAL SAUCE-^              ZUZ
-+ SAL SCHSCH---7           _
-+ SAL SCHTSCH              Z
-+ SAL SC(HZ)<              Z
-+ SAL SC                   ZK
-+ SAL SELBSTST--7^^        ZELP
-+ SAL SELBST7^^            ZELPZT
-+ SAL SERVICE7^            ZÖRFIZ
-+ SAL SE(LMNRST)-3^        ZE
-+ SAL SETTE$               ZET
-+ SAL SHP-^                Z
-+ SAL SHST                 ZT
-+ SAL SHTSH                Z
-+ SAL SHT                  Z
-+ SAL SH3                  Z
-+ SAL SIEGLI-^             ZIKL
-+ SAL SIGLI-^              ZIKL
-+ SAL SIGHT                ZEIT
-+ SAL SIGN                 ZEIN
-+ SAL SKI(NPZ)-            ZKI
-+ SAL SKI<^                ZI
-+ SAL SOUND-               ZAUN
-+ SAL STAATS^^             ZTAZ
-+ SAL STADT^^              ZTAT
-+ SAL START^^              ZTART
-+ SAL STAURANT7            ZTURAN
-+ SAL STEAK-               ZTE
-+ SAL STRAF^^              ZTRAF
-+ SAL ST'S$                Z
-+ SAL STST--               _
-+ SAL STS(ACEHIOUÄÜÖ)--    ZT
-+ SAL ST(SZ)               Z
-+ SAL STYN(AE)-$           ZTIN
-+ SAL ST                   ZT
-+ SAL SZE(NPT)-^           ZE
-+ SAL SZI(ELN)-^           ZI
-+ SAL SZCZ<                Z
-+ SAL SZT<                 ZT
-+ SAL SZ<3                 Z
-+ SAL S                    Z
-+ SAL T'S3$                Z
-+ SAL TCH                  Z
-+ SAL TEAT-^               TEA
-+ SAL TE(LMNRST)-3^        TE
-+ SAL TH<                  T
-+ SAL TIC$                 TIZ
-+ SAL TOAS-^               TU
-+ SAL TOILET-              TULE
-+ SAL TOIN-                TUA
-+ SAL TRAINI-              TREN
-+ SAL TSCH                 Z
-+ SAL TSH                  Z
-+ SAL TST                  ZT
-+ SAL T(Sß)                Z
-+ SAL TT(SZ)--<            _
-+ SAL TT9                  T
-+ SAL TZ-                  _
-+ SAL T                    T
-+ SAL UEBER^^              IPA
-+ SAL UE2                  I
-+ SAL UIE$                 I
-+ SAL UM^^                 UN
-+ SAL UNTERE--             UNTE
-+ SAL UNTER^^              UNTA
-+ SAL UNVER^^              UNFA
-+ SAL UN^^                 UN
-+ SAL UTI(AÄOÖUÜ)-         UZI
-+ SAL U                    U
-+ SAL VACL-^               FAZ
-+ SAL VAC$                 FAZ
-+ SAL VEDD-^               FE
-+ SAL VEREIN               FAEIN
-+ SAL VERSEN^              FAZN
-+ SAL VER^^                FA
-+ SAL VER                  FA
-+ SAL VET(HT)-^            FET
-+ SAL VETTE$               FET
-+ SAL VIC$                 FIZ
-+ SAL VIEL                 FIL
-+ SAL VIEW                 FIU
-+ SAL VOR^^                FUR
-+ SAL VY9^                 FI
-+ SAL V<                   F
-+ SAL WE(LMNRST)-3^        FE
-+ SAL WIC$                 FIZ
-+ SAL WIEDER^^             FITA
-+ SAL WY9^                 FI
-+ SAL W                    F
-+ SAL XE(LMNRST)-3^        XE
-+ SAL X<^                  Z
-+ SAL X(CSZ)               X
-+ SAL XTS(CH)--            XT
-+ SAL XT(SZ)               Z
-+ SAL X                    X
-+ SAL YE(LMNRST)-3^        IE
-+ SAL YE-3                 I
-+ SAL YOR(GK)^$            IÖRK
-+ SAL Y(AOU)-<7            I
-+ SAL YVES^$               IF
-+ SAL YVONNE^$             IFUN
-+ SAL Y                    I
-+ SAL ZC(AOU)-             ZK
-+ SAL ZE(LMNRST)-3^        ZE
-+ SAL ZH<                  Z
-+ SAL ZS(CHT)--            _
-+ SAL ZS                   Z
-+ SAL ZUERST               ZUERZT
-+ SAL ZURÜCK^^             ZURIK
-+ SAL ZUVER^^              ZUFA    # x
-+ SAL Z                    Z
-*** de_20.orig.dic	Sat Nov 26 19:59:53 2005
---- de_20.dic	Mon Jan  2 20:19:18 2006
-***************
-*** 1,3 ****
-  314626
-- 23394
-  A-Bombe/N
---- 1,2 ----
+*** 725,729 ****
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! BREAK 2
+! BREAK -
+! BREAK .
+! 
+--- 743,1241 ----
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! # BREAK 2
+! # BREAK -
+! # BREAK .
+! 
+! #   German phonetic transformation rules for use with Aspell
+! #   Copyright (C) 2000 Björn Jacke
+! #
+! #   This library is free software; you can redistribute it and/or
+! #   modify it under the terms of the GNU Lesser General Public
+! #   License version 2.1 as published by the Free Software Foundation;
+! #
+! #   This 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 this library; if not, write to the Free Software
+! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+! #
+! #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
+! #
+! #   Changelog:
+! #
+! #   2000-01-05  Björn Jacke <bjoern.jacke@gmx.de>
+! #               Initial Release
+! #   2000-01-07  Kevin Atkinson <kevinatk@home.com>
+! #               Converted from header to data file.
+! SAL followup        1
+! SAL collapse_result 1
+! 
+! SAL ÄER-                 E
+! SAL ÄU<                  EU
+! SAL Ä<                   E
+! SAL É                    E
+! SAL ÖER-                 Ö
+! SAL Ö                    Ö
+! SAL ÜBER^^               IPA
+! SAL ÜER-                 I
+! SAL Ü                    I
+! SAL ß                    Z
+! SAL ABELLE$              APL
+! SAL ABELL$               APL
+! SAL ABIENNE$             APIN
+! SAL ACEY$                AZI
+! SAL AEU<                 EU
+! SAL AE2                  E
+! SAL AGNI-^               AKN
+! SAL AGNIE-               ANI
+! SAL AGN(AEOU)-$          ANI
+! SAL AIA2                 AIA
+! SAL AIE$                 E
+! SAL AILL(EOU)-           ALI
+! SAL AINE$                EN
+! SAL AIRE$                ER
+! SAL AIR-                 E
+! SAL AISE$                EZ
+! SAL AISSANCE$            EZANZ
+! SAL AISSE$               EZ
+! SAL AIX$                 EX
+! SAL AJ(AÄEIOÖUÜ)--       A
+! SAL AKTIE                AXIE
+! SAL ALO(IY)^             ALUI
+! SAL AMATEU(RS)-          ANATÖ
+! SAL ANIELLE$             ANIL
+! SAL ANTI^^               ANTI
+! SAL ANVER^^              ANFA
+! SAL ATIA$                ATIA
+! SAL ATIA(NS)--           ATI
+! SAL ATI(AÄOÖUÜ)-         AZI
+! SAL AUAU--               _
+! SAL AUER<                AUA
+! SAL AUF^^                AUF
+! SAL AULT$                U
+! SAL AUSSE$               UZ
+! SAL AUS(ST)-^            AUZ
+! SAL AUS^^                AUZ
+! SAL AUTO^^               AUTU
+! SAL AUX(IY)-             AUX
+! SAL AUX                  U
+! SAL AU                   AU
+! SAL AVIER$               AFIE
+! SAL AYER--<              EI
+! SAL AY(AÄEIOÖUÜ)--       A
+! SAL A(IJY)<              EI
+! SAL A                    A
+! SAL BEA(BCMNRU)-^        PEA
+! SAL BEAT(AEIMORU)-^      PEAT
+! SAL BEIGE^$              PEZ
+! SAL BE(LMNRST)-^         PE
+! SAL BETTE$               PET
+! SAL BIC$                 PIZ
+! SAL BOWL(EI)-            PUL
+! SAL BP(AÄEIOÖRUÜY)-      P
+! SAL BUDGET7              PIKE
+! SAL BUFFET7              PIFE
+! SAL BYLLE$               PILE
+! SAL BYLL$                PIL
+! SAL BYTE<                PEIT
+! SAL B                    P
+! SAL CÄ-                  Z
+! SAL CÜ$                  ZI
+! SAL CACH(EI)-^           KEZ
+! SAL CAE--                Z
+! SAL CA(IY)$              ZEI
+! SAL CCH                  Z
+! SAL CCE-                 X
+! SAL CE(EIJUY)--          Z
+! SAL CENT<                ZENT
+! SAL CERST(EI)----^       KE
+! SAL CER$                 ZA
+! SAL CE3                  ZE
+! SAL CHAO(ST)-            KAU
+! SAL CHAMPIO-^            ZENPI
+! SAL CHAR(AI)-^           KAR
+! SAL CHAU(CDFSVWXZ)-      ZU
+! SAL CHE(CF)-             ZE
+! SAL CHEM-^               KE
+! SAL CHEQUE<              ZEK
+! SAL CHI(CFGPVW)-         ZI
+! SAL CH(AEUY)-<^          Z
+! SAL CHK-                 _
+! SAL CH(LOR)-<^           K
+! SAL CHST-                X
+! SAL CH(SßXZ)3            X
+! SAL CH                   K
+! SAL CIER$                ZIE
+! SAL CYB-^                ZEI
+! SAL CY9^                 ZI
+! SAL C(IJY)-3             Z
+! SAL CKST                 XT
+! SAL CK(SßXZ)3            X
+! SAL C(CK)-               _
+! SAL CLAUDET---           KLU
+! SAL CLAUDINE^$           KLUTIN
+! SAL COLE$                KUL
+! SAL COUCH                KAUZ
+! SAL CQUES$               K
+! SAL CQUE                 K
+! SAL CREAT-^              KREA
+! SAL CST                  XT
+! SAL CS<^                 Z
+! SAL C(SßX)               X
+! SAL CT(SßXZ)             X
+! SAL CZ<                  Z
+! SAL C<                   K
+! SAL D'H^                 T
+! SAL D'S3$                Z
+! SAL DAVO(NR)-^$          TAFU
+! SAL DD(SZ)--<            _
+! SAL DEPOT7               TEPU
+! SAL DESIGN               TIZEIN
+! SAL DE(LMNRST)-3^        TE
+! SAL DETTE$               TET
+! SAL DIC$                 TIZ
+! SAL DJ(AEIOU)-^          I
+! SAL DS(CH)--<            T
+! SAL DST                  ZT
+! SAL DT-                  _
+! SAL DUIS-^               TI
+! SAL DURCH^^              TURK
+! SAL DZS(CH)--            T
+! SAL D(SßZ)               Z
+! SAL D                    T
+! SAL EAULT$               U
+! SAL EAUX$                U
+! SAL EAU                  U
+! SAL EAV                  IF
+! SAL EA(AÄEIOÖÜY)-3       EA
+! SAL EA3$                 EA
+! SAL EA3                  I
+! SAL EBEN^^               EPN
+! SAL EE9                  E
+! SAL EIEI--               _
+! SAL EIH--                E
+! SAL EILLE$               EI
+! SAL EI                   EI
+! SAL EJ$                  EI
+! SAL EL-^                 E
+! SAL EL(DKL)--1           E
+! SAL EL(MNT)--1$          E
+! SAL ELYNE$               ELINE
+! SAL ELYN$                ELIN
+! SAL EL(AÄEIOÖUÜY)-1      EL
+! SAL EL-1                 L
+! SAL EM-^                 E
+! SAL EM(DFKMPQT)--1       E
+! SAL EM(AÄEIOÖUÜY)--1     E
+! SAL EM-1                 N
+! SAL EN-^                 E
+! SAL EN(CDGKQT)--1        E
+! SAL ENZ(AEIOUY)--1       EN
+! SAL EN(AÄEINOÖUÜY)-1     EN
+! SAL EN-<1                N
+! SAL ERH(AÄEIOÖUÜ)-^      ER
+! SAL ER-^                 E
+! SAL ER(AÄEIOÖUÜY)-1      A
+! SAL ER1$                 A
+! SAL ER<1                 A
+! SAL ETI(AÄOÖÜU)-         EZI
+! SAL EUEU--               _
+! SAL EUILLE$              Ö
+! SAL EUR$                 ÖR
+! SAL EUX                  Ö
+! SAL EUYS$                EUZ
+! SAL EU                   EU
+! SAL EYER<                EIA
+! SAL EY<                  EI
+! SAL E                    E
+! SAL FANS--^$             FE
+! SAL FAN-^$               FE
+! SAL FAULT-               FUL
+! SAL FEE(DL)-             FI
+! SAL FEHLER               FELA
+! SAL FE(LMNRST)-3^        FE
+! SAL FOND7                FUN
+! SAL FRAIN$               FRA
+! SAL FRISEU(RS)-          FRIZÖ  # x
+! SAL F                    F
+! SAL G'S$                 X
+! SAL GAGS^$               KEX
+! SAL GAG^$                KEK
+! SAL GD                   KT
+! SAL GEGEN^^              KEKN
+! SAL GE(LMNRST)-3^        KE
+! SAL GETTE$               KET
+! SAL G(CK)-               _
+! SAL GG-                  _
+! SAL GI(AO)-^             I
+! SAL GION$                KIUN
+! SAL GIUS-^               IU
+! SAL GMBH^$               GMPH
+! SAL GNAC$                NIAK
+! SAL GNON$                NIUN
+! SAL GN$                  N
+! SAL GONCAL-^             KUNZA
+! SAL GS(CH)--             K
+! SAL GST                  XT
+! SAL G(SßXZ)              X
+! SAL GUCK-                KU
+! SAL GUI-^                K
+! SAL G                    K
+! SAL HEAD-                E
+! SAL HE(LMNRST)-3^        E
+! SAL HE(LMN)-1            E
+! SAL HEUR1$               ÖR
+! SAL H^                   _
+! SAL IEC$                 IZ
+! SAL IEI-3                _
+! SAL IELL3                IEL
+! SAL IENNE$               IN
+! SAL IERRE$               IER
+! SAL IETTE$               IT
+! SAL IEU                  IÖ
+! SAL IE<4                 I
+! SAL IGHT3$               EIT
+! SAL IGNI(EO)-            INI
+! SAL IGN(AEOU)-$          INI
+! SAL IJ(AOU)-             I
+! SAL IJ$                  I
+! SAL IJ<                  EI
+! SAL IKOLE$               IKUL
+! SAL ILLAN(STZ)--         ILIA
+! SAL ILLAR(DT)--          ILIA
+! SAL INVER-               INFE
+! SAL ITI(AÄOÖUÜ)-         IZI
+! SAL IVIER$               IFIE
+! SAL I                    I
+! SAL JAVIE---<^           ZA
+! SAL JEAN^$               IA
+! SAL JEAN-^               IA
+! SAL JER-^                IE
+! SAL JE(LMNST)-           IE
+! SAL JOR(GK)^$            IÖRK
+! SAL J                    I
+! SAL KC(ÄEIJ)-            X
+! SAL KE(LMNRST)-3^        KE
+! SAL KH<^                 K
+! SAL KIC$                 KIZ
+! SAL KLE(LMNRST)-3^       KLE
+! SAL KOTELE-^             KUTL
+! SAL KREAT-^              KREA
+! SAL KST                  XT
+! SAL K(SßXZ)              X
+! SAL KTI(AIOU)-3          XI
+! SAL KT(SßXZ)             X
+! SAL K                    K
+! SAL LARVE-               LARF
+! SAL LEAND-^              LEAN
+! SAL LEL-                 LE
+! SAL LE(MNRST)-3^         LE
+! SAL LETTE$               LET
+! SAL LFGNAG-              LFKAN
+! SAL LIC$                 LIZ
+! SAL LIVE^$               LEIF
+! SAL LUI(GS)--            LU
+! SAL L                    L
+! SAL MASSEU(RS)-          NAZÖ
+! SAL MAURICE              NURIZ
+! SAL MBH^$                MPH
+! SAL MB(SßZ)-             N
+! SAL MC9^                 NK
+! SAL MEMOIR-^             NENUA
+! SAL ME(LMNRST)-3^        NE
+! SAL MIGUEL               NIKL
+! SAL MIKE^$               NEIK
+! SAL MN                   N
+! SAL MPJUTE-              NPUT
+! SAL MP(SßZ)-             N
+! SAL MP(BDJLMNPQRTVW)-    NP
+! SAL M                    N
+! SAL NACH^^               NAK
+! SAL NADINE               NATIN
+! SAL NAIV--               NA
+! SAL NAISE$               NEZE
+! SAL NCOISE$              ZUA
+! SAL NCOIS$               ZUA
+! SAL NEBEN^^              NEPN
+! SAL NE(LMNRST)-3^        NE
+! SAL NEN-3                NE
+! SAL NETTE$               NET
+! SAL NG(BDFJLMNPQRTVW)-   NK
+! SAL NICHTS^^             NIX
+! SAL NICHT^^              NIKT
+! SAL NINE$                NIN
+! SAL NON^^                NUN
+! SAL NOT^^                NUT
+! SAL NTI(AIOU)-3          NZI
+! SAL NTIEL--3             NZI
+! SAL NYLON                NEILUN
+! SAL ND(SßZ)$             NZ
+! SAL NT(SßZ)$             NZ
+! SAL ND'S$                NZ
+! SAL NT'S$                NZ
+! SAL NSTS$                NZ
+! SAL N                    N
+! SAL OBER^^               UPA
+! SAL OE2                  Ö
+! SAL OGNIE-               UNI
+! SAL OGN(AEOU)-$          UNI
+! SAL OIE$                 Ö
+! SAL OIR$                 UAR
+! SAL OIX                  UA
+! SAL OI<3                 EU
+! SAL OJ(AÄEIOÖUÜ)--       U
+! SAL OKAY^$               UKE
+! SAL OLYN$                ULIN
+! SAL OTI(AÄOÖUÜ)-         UZI
+! SAL OUI^                 FI
+! SAL OUILLE$              ULIE
+! SAL OU(DT)-^             AU
+! SAL OUSE$                AUZ
+! SAL OUT-                 AU
+! SAL OU                   U
+! SAL OWS$                 UZ
+! SAL OY(AÄEIOÖUÜ)--       U
+! SAL O(JY)<               EU
+! SAL O                    U
+! SAL PATIEN--^            PAZI
+! SAL PENSIO-^             PANZI
+! SAL PE(LMNRST)-3^        PE
+! SAL PFER-^               FE
+! SAL P(FH)<               F
+! SAL POLY^^               PULI
+! SAL PORTRAIT7            PURTRE
+! SAL PP(FH)--<            P
+! SAL PP-                  _
+! SAL PRIX^$               PRI
+! SAL P(SßZ)^              Z
+! SAL PTI(AÄOÖUÜ)-3        PZI
+! SAL PIC^$                PIK
+! SAL P                    P
+! SAL QUE(LMNRST)-3        KFE
+! SAL QUE$                 K
+! SAL QUI(NS)$             KI
+! SAL QU                   KF
+! SAL Q<                   K
+! SAL RCH                  RK
+! SAL RECHERCH^            REZAZ
+! SAL RER$                 RA
+! SAL RE(MNR)-4            RE
+! SAL RETTE$               RET
+! SAL RH<^                 R
+! SAL RJA(MN)--            RI
+! SAL RTI(AÄOÖUÜ)-3        RZI
+! SAL RY(KN)-$             RI
+! SAL R                    R
+! SAL SAFE^$               ZEIF
+! SAL SAUCE-^              ZUZ
+! SAL SCHSCH---7           _
+! SAL SCHTSCH              Z
+! SAL SC(HZ)<              Z
+! SAL SC                   ZK
+! SAL SELBSTST--7^^        ZELP
+! SAL SELBST7^^            ZELPZT
+! SAL SERVICE7^            ZÖRFIZ
+! SAL SE(LMNRST)-3^        ZE
+! SAL SETTE$               ZET
+! SAL SHP-^                Z
+! SAL SHST                 ZT
+! SAL SHTSH                Z
+! SAL SHT                  Z
+! SAL SH3                  Z
+! SAL SIEGLI-^             ZIKL
+! SAL SIGLI-^              ZIKL
+! SAL SIGHT                ZEIT
+! SAL SIGN                 ZEIN
+! SAL SKI(NPZ)-            ZKI
+! SAL SKI<^                ZI
+! SAL SOUND-               ZAUN
+! SAL STAATS^^             ZTAZ
+! SAL STADT^^              ZTAT
+! SAL START^^              ZTART
+! SAL STAURANT7            ZTURAN
+! SAL STEAK-               ZTE
+! SAL STRAF^^              ZTRAF
+! SAL ST'S$                Z
+! SAL STST--               _
+! SAL STS(ACEHIOUÄÜÖ)--    ZT
+! SAL ST(SZ)               Z
+! SAL STYN(AE)-$           ZTIN
+! SAL ST                   ZT
+! SAL SZE(NPT)-^           ZE
+! SAL SZI(ELN)-^           ZI
+! SAL SZCZ<                Z
+! SAL SZT<                 ZT
+! SAL SZ<3                 Z
+! SAL S                    Z
+! SAL T'S3$                Z
+! SAL TCH                  Z
+! SAL TEAT-^               TEA
+! SAL TE(LMNRST)-3^        TE
+! SAL TH<                  T
+! SAL TIC$                 TIZ
+! SAL TOAS-^               TU
+! SAL TOILET-              TULE
+! SAL TOIN-                TUA
+! SAL TRAINI-              TREN
+! SAL TSCH                 Z
+! SAL TSH                  Z
+! SAL TST                  ZT
+! SAL T(Sß)                Z
+! SAL TT(SZ)--<            _
+! SAL TT9                  T
+! SAL TZ-                  _
+! SAL T                    T
+! SAL UEBER^^              IPA
+! SAL UE2                  I
+! SAL UIE$                 I
+! SAL UM^^                 UN
+! SAL UNTERE--             UNTE
+! SAL UNTER^^              UNTA
+! SAL UNVER^^              UNFA
+! SAL UN^^                 UN
+! SAL UTI(AÄOÖUÜ)-         UZI
+! SAL U                    U
+! SAL VACL-^               FAZ
+! SAL VAC$                 FAZ
+! SAL VEDD-^               FE
+! SAL VEREIN               FAEIN
+! SAL VERSEN^              FAZN
+! SAL VER^^                FA
+! SAL VER                  FA
+! SAL VET(HT)-^            FET
+! SAL VETTE$               FET
+! SAL VIC$                 FIZ
+! SAL VIEL                 FIL
+! SAL VIEW                 FIU
+! SAL VOR^^                FUR
+! SAL VY9^                 FI
+! SAL V<                   F
+! SAL WE(LMNRST)-3^        FE
+! SAL WIC$                 FIZ
+! SAL WIEDER^^             FITA
+! SAL WY9^                 FI
+! SAL W                    F
+! SAL XE(LMNRST)-3^        XE
+! SAL X<^                  Z
+! SAL X(CSZ)               X
+! SAL XTS(CH)--            XT
+! SAL XT(SZ)               Z
+! SAL X                    X
+! SAL YE(LMNRST)-3^        IE
+! SAL YE-3                 I
+! SAL YOR(GK)^$            IÖRK
+! SAL Y(AOU)-<7            I
+! SAL YVES^$               IF
+! SAL YVONNE^$             IFUN
+! SAL Y                    I
+! SAL ZC(AOU)-             ZK
+! SAL ZE(LMNRST)-3^        ZE
+! SAL ZH<                  Z
+! SAL ZS(CHT)--            _
+! SAL ZS                   Z
+! SAL ZUERST               ZUERZT
+! SAL ZURÜCK^^             ZURIK
+! SAL ZUVER^^              ZUFA    # x
+! SAL Z                    Z
--- a/runtime/spell/de/de_AT.diff
+++ b/runtime/spell/de/de_AT.diff
@@ -1,8 +1,8 @@
-*** de_AT.orig.aff	Sat Nov 26 19:59:53 2005
---- de_AT.aff	Sat Nov 26 20:19:21 2005
+*** de_AT.orig.aff	2019-01-19 19:16:46.616026157 +0100
+--- de_AT.aff	2019-01-19 19:24:24.524983269 +0100
 ***************
-*** 3,4 ****
---- 3,21 ----
+*** 15,16 ****
+--- 15,47 ----
   
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -21,504 +21,553 @@
 + MAP yÿý
 + MAP sß
 + 
++ COMPOUNDRULE xy?z
++ #COMPOUNDBEGIN x
++ #COMPOUNDMIDDLE y
++ #COMPOUNDEND z
++ 
++ # Prefixes are allowed at the beginning of compounds,
++ # suffixes are allowed at the end of compounds by default:
++ # (prefix)?(root)+(affix)?
++ # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
++ COMPOUNDPERMITFLAG c
++ 
++ ONLYINCOMPOUND o
++ 
++ 
+  PFX U Y 1
+***************
+*** 538,553 ****
+  
+- 
+- COMPOUNDBEGIN x
+- COMPOUNDMIDDLE y
+- COMPOUNDEND z
+  FORBIDDENWORD d
+  
+- # Prefixes are allowed at the beginning of compounds,
+- # suffixes are allowed at the end of compounds by default:
+- # (prefix)?(root)+(affix)?
+- # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
+- COMPOUNDPERMITFLAG c
+- 
+- ONLYINCOMPOUND o
+- 
+  # my PSEUDOROOT h(elper) flag
+--- 569,572 ----
+***************
+*** 571,573 ****
+  
+! WORDCHARS ß-.
+  
+--- 590,592 ----
+  
+! # WORDCHARS ß-.
   
 ***************
-*** 501 ****
---- 518,994 ----
-  
-+ 
-+ #   German phonetic transformation rules from Aspell
-+ #   Copyright (C) 2000 Björn Jacke, distributed under LGPL.
-+ #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
-+ #   Last changed 2000-01-07
-+ 
-+ SAL followup        1
-+ SAL collapse_result 1
-+ 
-+ SAL ÄER-                 E
-+ SAL ÄU<                  EU
-+ SAL Ä<                   E
-+ SAL É                    E
-+ SAL ÖER-                 Ö
-+ SAL Ö                    Ö
-+ SAL ÜBER^^               IPA
-+ SAL ÜER-                 I
-+ SAL Ü                    I
-+ SAL ß                    Z
-+ SAL ABELLE$              APL
-+ SAL ABELL$               APL
-+ SAL ABIENNE$             APIN
-+ SAL ACEY$                AZI
-+ SAL AEU<                 EU
-+ SAL AE2                  E
-+ SAL AGNI-^               AKN
-+ SAL AGNIE-               ANI
-+ SAL AGN(AEOU)-$          ANI
-+ SAL AIA2                 AIA
-+ SAL AIE$                 E
-+ SAL AILL(EOU)-           ALI
-+ SAL AINE$                EN
-+ SAL AIRE$                ER
-+ SAL AIR-                 E
-+ SAL AISE$                EZ
-+ SAL AISSANCE$            EZANZ
-+ SAL AISSE$               EZ
-+ SAL AIX$                 EX
-+ SAL AJ(AÄEIOÖUÜ)--       A
-+ SAL AKTIE                AXIE
-+ SAL ALO(IY)^             ALUI
-+ SAL AMATEU(RS)-          ANATÖ
-+ SAL ANIELLE$             ANIL
-+ SAL ANTI^^               ANTI
-+ SAL ANVER^^              ANFA
-+ SAL ATIA$                ATIA
-+ SAL ATIA(NS)--           ATI
-+ SAL ATI(AÄOÖUÜ)-         AZI
-+ SAL AUAU--               _
-+ SAL AUER<                AUA
-+ SAL AUF^^                AUF
-+ SAL AULT$                U
-+ SAL AUSSE$               UZ
-+ SAL AUS(ST)-^            AUZ
-+ SAL AUS^^                AUZ
-+ SAL AUTO^^               AUTU
-+ SAL AUX(IY)-             AUX
-+ SAL AUX                  U
-+ SAL AU                   AU
-+ SAL AVIER$               AFIE
-+ SAL AYER--<              EI
-+ SAL AY(AÄEIOÖUÜ)--       A
-+ SAL A(IJY)<              EI
-+ SAL A                    A
-+ SAL BEA(BCMNRU)-^        PEA
-+ SAL BEAT(AEIMORU)-^      PEAT
-+ SAL BEIGE^$              PEZ
-+ SAL BE(LMNRST)-^         PE
-+ SAL BETTE$               PET
-+ SAL BIC$                 PIZ
-+ SAL BOWL(EI)-            PUL
-+ SAL BP(AÄEIOÖRUÜY)-      P
-+ SAL BUDGET7              PIKE
-+ SAL BUFFET7              PIFE
-+ SAL BYLLE$               PILE
-+ SAL BYLL$                PIL
-+ SAL BYTE<                PEIT
-+ SAL B                    P
-+ SAL CÄ-                  Z
-+ SAL CÜ$                  ZI
-+ SAL CACH(EI)-^           KEZ
-+ SAL CAE--                Z
-+ SAL CA(IY)$              ZEI
-+ SAL CCH                  Z
-+ SAL CCE-                 X
-+ SAL CE(EIJUY)--          Z
-+ SAL CENT<                ZENT
-+ SAL CERST(EI)----^       KE
-+ SAL CER$                 ZA
-+ SAL CE3                  ZE
-+ SAL CHAO(ST)-            KAU
-+ SAL CHAMPIO-^            ZENPI
-+ SAL CHAR(AI)-^           KAR
-+ SAL CHAU(CDFSVWXZ)-      ZU
-+ SAL CHE(CF)-             ZE
-+ SAL CHEM-^               KE
-+ SAL CHEQUE<              ZEK
-+ SAL CHI(CFGPVW)-         ZI
-+ SAL CH(AEUY)-<^          Z
-+ SAL CHK-                 _
-+ SAL CH(LOR)-<^           K
-+ SAL CHST-                X
-+ SAL CH(SßXZ)3            X
-+ SAL CH                   K
-+ SAL CIER$                ZIE
-+ SAL CYB-^                ZEI
-+ SAL CY9^                 ZI
-+ SAL C(IJY)-3             Z
-+ SAL CKST                 XT
-+ SAL CK(SßXZ)3            X
-+ SAL C(CK)-               _
-+ SAL CLAUDET---           KLU
-+ SAL CLAUDINE^$           KLUTIN
-+ SAL COLE$                KUL
-+ SAL COUCH                KAUZ
-+ SAL CQUES$               K
-+ SAL CQUE                 K
-+ SAL CREAT-^              KREA
-+ SAL CST                  XT
-+ SAL CS<^                 Z
-+ SAL C(SßX)               X
-+ SAL CT(SßXZ)             X
-+ SAL CZ<                  Z
-+ SAL C<                   K
-+ SAL D'H^                 T
-+ SAL D'S3$                Z
-+ SAL DAVO(NR)-^$          TAFU
-+ SAL DD(SZ)--<            _
-+ SAL DEPOT7               TEPU
-+ SAL DESIGN               TIZEIN
-+ SAL DE(LMNRST)-3^        TE
-+ SAL DETTE$               TET
-+ SAL DIC$                 TIZ
-+ SAL DJ(AEIOU)-^          I
-+ SAL DS(CH)--<            T
-+ SAL DST                  ZT
-+ SAL DT-                  _
-+ SAL DUIS-^               TI
-+ SAL DURCH^^              TURK
-+ SAL DZS(CH)--            T
-+ SAL D(SßZ)               Z
-+ SAL D                    T
-+ SAL EAULT$               U
-+ SAL EAUX$                U
-+ SAL EAU                  U
-+ SAL EAV                  IF
-+ SAL EA(AÄEIOÖÜY)-3       EA
-+ SAL EA3$                 EA
-+ SAL EA3                  I
-+ SAL EBEN^^               EPN
-+ SAL EE9                  E
-+ SAL EIEI--               _
-+ SAL EIH--                E
-+ SAL EILLE$               EI
-+ SAL EI                   EI
-+ SAL EJ$                  EI
-+ SAL EL-^                 E
-+ SAL EL(DKL)--1           E
-+ SAL EL(MNT)--1$          E
-+ SAL ELYNE$               ELINE
-+ SAL ELYN$                ELIN
-+ SAL EL(AÄEIOÖUÜY)-1      EL
-+ SAL EL-1                 L
-+ SAL EM-^                 E
-+ SAL EM(DFKMPQT)--1       E
-+ SAL EM(AÄEIOÖUÜY)--1     E
-+ SAL EM-1                 N
-+ SAL EN-^                 E
-+ SAL EN(CDGKQT)--1        E
-+ SAL ENZ(AEIOUY)--1       EN
-+ SAL EN(AÄEINOÖUÜY)-1     EN
-+ SAL EN-<1                N
-+ SAL ERH(AÄEIOÖUÜ)-^      ER
-+ SAL ER-^                 E
-+ SAL ER(AÄEIOÖUÜY)-1      A
-+ SAL ER1$                 A
-+ SAL ER<1                 A
-+ SAL ETI(AÄOÖÜU)-         EZI
-+ SAL EUEU--               _
-+ SAL EUILLE$              Ö
-+ SAL EUR$                 ÖR
-+ SAL EUX                  Ö
-+ SAL EUYS$                EUZ
-+ SAL EU                   EU
-+ SAL EYER<                EIA
-+ SAL EY<                  EI
-+ SAL E                    E
-+ SAL FANS--^$             FE
-+ SAL FAN-^$               FE
-+ SAL FAULT-               FUL
-+ SAL FEE(DL)-             FI
-+ SAL FEHLER               FELA
-+ SAL FE(LMNRST)-3^        FE
-+ SAL FOND7                FUN
-+ SAL FRAIN$               FRA
-+ SAL FRISEU(RS)-          FRIZÖ  # x
-+ SAL F                    F
-+ SAL G'S$                 X
-+ SAL GAGS^$               KEX
-+ SAL GAG^$                KEK
-+ SAL GD                   KT
-+ SAL GEGEN^^              KEKN
-+ SAL GE(LMNRST)-3^        KE
-+ SAL GETTE$               KET
-+ SAL G(CK)-               _
-+ SAL GG-                  _
-+ SAL GI(AO)-^             I
-+ SAL GION$                KIUN
-+ SAL GIUS-^               IU
-+ SAL GMBH^$               GMPH
-+ SAL GNAC$                NIAK
-+ SAL GNON$                NIUN
-+ SAL GN$                  N
-+ SAL GONCAL-^             KUNZA
-+ SAL GS(CH)--             K
-+ SAL GST                  XT
-+ SAL G(SßXZ)              X
-+ SAL GUCK-                KU
-+ SAL GUI-^                K
-+ SAL G                    K
-+ SAL HEAD-                E
-+ SAL HE(LMNRST)-3^        E
-+ SAL HE(LMN)-1            E
-+ SAL HEUR1$               ÖR
-+ SAL H^                   _
-+ SAL IEC$                 IZ
-+ SAL IEI-3                _
-+ SAL IELL3                IEL
-+ SAL IENNE$               IN
-+ SAL IERRE$               IER
-+ SAL IETTE$               IT
-+ SAL IEU                  IÖ
-+ SAL IE<4                 I
-+ SAL IGHT3$               EIT
-+ SAL IGNI(EO)-            INI
-+ SAL IGN(AEOU)-$          INI
-+ SAL IJ(AOU)-             I
-+ SAL IJ$                  I
-+ SAL IJ<                  EI
-+ SAL IKOLE$               IKUL
-+ SAL ILLAN(STZ)--         ILIA
-+ SAL ILLAR(DT)--          ILIA
-+ SAL INVER-               INFE
-+ SAL ITI(AÄOÖUÜ)-         IZI
-+ SAL IVIER$               IFIE
-+ SAL I                    I
-+ SAL JAVIE---<^           ZA
-+ SAL JEAN^$               IA
-+ SAL JEAN-^               IA
-+ SAL JER-^                IE
-+ SAL JE(LMNST)-           IE
-+ SAL JOR(GK)^$            IÖRK
-+ SAL J                    I
-+ SAL KC(ÄEIJ)-            X
-+ SAL KE(LMNRST)-3^        KE
-+ SAL KH<^                 K
-+ SAL KIC$                 KIZ
-+ SAL KLE(LMNRST)-3^       KLE
-+ SAL KOTELE-^             KUTL
-+ SAL KREAT-^              KREA
-+ SAL KST                  XT
-+ SAL K(SßXZ)              X
-+ SAL KTI(AIOU)-3          XI
-+ SAL KT(SßXZ)             X
-+ SAL K                    K
-+ SAL LARVE-               LARF
-+ SAL LEAND-^              LEAN
-+ SAL LEL-                 LE
-+ SAL LE(MNRST)-3^         LE
-+ SAL LETTE$               LET
-+ SAL LFGNAG-              LFKAN
-+ SAL LIC$                 LIZ
-+ SAL LIVE^$               LEIF
-+ SAL LUI(GS)--            LU
-+ SAL L                    L
-+ SAL MASSEU(RS)-          NAZÖ
-+ SAL MAURICE              NURIZ
-+ SAL MBH^$                MPH
-+ SAL MB(SßZ)-             N
-+ SAL MC9^                 NK
-+ SAL MEMOIR-^             NENUA
-+ SAL ME(LMNRST)-3^        NE
-+ SAL MIGUEL               NIKL
-+ SAL MIKE^$               NEIK
-+ SAL MN                   N
-+ SAL MPJUTE-              NPUT
-+ SAL MP(SßZ)-             N
-+ SAL MP(BDJLMNPQRTVW)-    NP
-+ SAL M                    N
-+ SAL NACH^^               NAK
-+ SAL NADINE               NATIN
-+ SAL NAIV--               NA
-+ SAL NAISE$               NEZE
-+ SAL NCOISE$              ZUA
-+ SAL NCOIS$               ZUA
-+ SAL NEBEN^^              NEPN
-+ SAL NE(LMNRST)-3^        NE
-+ SAL NEN-3                NE
-+ SAL NETTE$               NET
-+ SAL NG(BDFJLMNPQRTVW)-   NK
-+ SAL NICHTS^^             NIX
-+ SAL NICHT^^              NIKT
-+ SAL NINE$                NIN
-+ SAL NON^^                NUN
-+ SAL NOT^^                NUT
-+ SAL NTI(AIOU)-3          NZI
-+ SAL NTIEL--3             NZI
-+ SAL NYLON                NEILUN
-+ SAL ND(SßZ)$             NZ
-+ SAL NT(SßZ)$             NZ
-+ SAL ND'S$                NZ
-+ SAL NT'S$                NZ
-+ SAL NSTS$                NZ
-+ SAL N                    N
-+ SAL OBER^^               UPA
-+ SAL OE2                  Ö
-+ SAL OGNIE-               UNI
-+ SAL OGN(AEOU)-$          UNI
-+ SAL OIE$                 Ö
-+ SAL OIR$                 UAR
-+ SAL OIX                  UA
-+ SAL OI<3                 EU
-+ SAL OJ(AÄEIOÖUÜ)--       U
-+ SAL OKAY^$               UKE
-+ SAL OLYN$                ULIN
-+ SAL OTI(AÄOÖUÜ)-         UZI
-+ SAL OUI^                 FI
-+ SAL OUILLE$              ULIE
-+ SAL OU(DT)-^             AU
-+ SAL OUSE$                AUZ
-+ SAL OUT-                 AU
-+ SAL OU                   U
-+ SAL OWS$                 UZ
-+ SAL OY(AÄEIOÖUÜ)--       U
-+ SAL O(JY)<               EU
-+ SAL O                    U
-+ SAL PATIEN--^            PAZI
-+ SAL PENSIO-^             PANZI
-+ SAL PE(LMNRST)-3^        PE
-+ SAL PFER-^               FE
-+ SAL P(FH)<               F
-+ SAL POLY^^               PULI
-+ SAL PORTRAIT7            PURTRE
-+ SAL PP(FH)--<            P
-+ SAL PP-                  _
-+ SAL PRIX^$               PRI
-+ SAL P(SßZ)^              Z
-+ SAL PTI(AÄOÖUÜ)-3        PZI
-+ SAL PIC^$                PIK
-+ SAL P                    P
-+ SAL QUE(LMNRST)-3        KFE
-+ SAL QUE$                 K
-+ SAL QUI(NS)$             KI
-+ SAL QU                   KF
-+ SAL Q<                   K
-+ SAL RCH                  RK
-+ SAL RECHERCH^            REZAZ
-+ SAL RER$                 RA
-+ SAL RE(MNR)-4            RE
-+ SAL RETTE$               RET
-+ SAL RH<^                 R
-+ SAL RJA(MN)--            RI
-+ SAL RTI(AÄOÖUÜ)-3        RZI
-+ SAL RY(KN)-$             RI
-+ SAL R                    R
-+ SAL SAFE^$               ZEIF
-+ SAL SAUCE-^              ZUZ
-+ SAL SCHSCH---7           _
-+ SAL SCHTSCH              Z
-+ SAL SC(HZ)<              Z
-+ SAL SC                   ZK
-+ SAL SELBSTST--7^^        ZELP
-+ SAL SELBST7^^            ZELPZT
-+ SAL SERVICE7^            ZÖRFIZ
-+ SAL SE(LMNRST)-3^        ZE
-+ SAL SETTE$               ZET
-+ SAL SHP-^                Z
-+ SAL SHST                 ZT
-+ SAL SHTSH                Z
-+ SAL SHT                  Z
-+ SAL SH3                  Z
-+ SAL SIEGLI-^             ZIKL
-+ SAL SIGLI-^              ZIKL
-+ SAL SIGHT                ZEIT
-+ SAL SIGN                 ZEIN
-+ SAL SKI(NPZ)-            ZKI
-+ SAL SKI<^                ZI
-+ SAL SOUND-               ZAUN
-+ SAL STAATS^^             ZTAZ
-+ SAL STADT^^              ZTAT
-+ SAL START^^              ZTART
-+ SAL STAURANT7            ZTURAN
-+ SAL STEAK-               ZTE
-+ SAL STRAF^^              ZTRAF
-+ SAL ST'S$                Z
-+ SAL STST--               _
-+ SAL STS(ACEHIOUÄÜÖ)--    ZT
-+ SAL ST(SZ)               Z
-+ SAL STYN(AE)-$           ZTIN
-+ SAL ST                   ZT
-+ SAL SZE(NPT)-^           ZE
-+ SAL SZI(ELN)-^           ZI
-+ SAL SZCZ<                Z
-+ SAL SZT<                 ZT
-+ SAL SZ<3                 Z
-+ SAL S                    Z
-+ SAL T'S3$                Z
-+ SAL TCH                  Z
-+ SAL TEAT-^               TEA
-+ SAL TE(LMNRST)-3^        TE
-+ SAL TH<                  T
-+ SAL TIC$                 TIZ
-+ SAL TOAS-^               TU
-+ SAL TOILET-              TULE
-+ SAL TOIN-                TUA
-+ SAL TRAINI-              TREN
-+ SAL TSCH                 Z
-+ SAL TSH                  Z
-+ SAL TST                  ZT
-+ SAL T(Sß)                Z
-+ SAL TT(SZ)--<            _
-+ SAL TT9                  T
-+ SAL TZ-                  _
-+ SAL T                    T
-+ SAL UEBER^^              IPA
-+ SAL UE2                  I
-+ SAL UIE$                 I
-+ SAL UM^^                 UN
-+ SAL UNTERE--             UNTE
-+ SAL UNTER^^              UNTA
-+ SAL UNVER^^              UNFA
-+ SAL UN^^                 UN
-+ SAL UTI(AÄOÖUÜ)-         UZI
-+ SAL U                    U
-+ SAL VACL-^               FAZ
-+ SAL VAC$                 FAZ
-+ SAL VEDD-^               FE
-+ SAL VEREIN               FAEIN
-+ SAL VERSEN^              FAZN
-+ SAL VER^^                FA
-+ SAL VER                  FA
-+ SAL VET(HT)-^            FET
-+ SAL VETTE$               FET
-+ SAL VIC$                 FIZ
-+ SAL VIEL                 FIL
-+ SAL VIEW                 FIU
-+ SAL VOR^^                FUR
-+ SAL VY9^                 FI
-+ SAL V<                   F
-+ SAL WE(LMNRST)-3^        FE
-+ SAL WIC$                 FIZ
-+ SAL WIEDER^^             FITA
-+ SAL WY9^                 FI
-+ SAL W                    F
-+ SAL XE(LMNRST)-3^        XE
-+ SAL X<^                  Z
-+ SAL X(CSZ)               X
-+ SAL XTS(CH)--            XT
-+ SAL XT(SZ)               Z
-+ SAL X                    X
-+ SAL YE(LMNRST)-3^        IE
-+ SAL YE-3                 I
-+ SAL YOR(GK)^$            IÖRK
-+ SAL Y(AOU)-<7            I
-+ SAL YVES^$               IF
-+ SAL YVONNE^$             IFUN
-+ SAL Y                    I
-+ SAL ZC(AOU)-             ZK
-+ SAL ZE(LMNRST)-3^        ZE
-+ SAL ZH<                  Z
-+ SAL ZS(CHT)--            _
-+ SAL ZS                   Z
-+ SAL ZUERST               ZUERZT
-+ SAL ZURÜCK^^             ZURIK
-+ SAL ZUVER^^              ZUFA    # x
-+ SAL Z                    Z
-*** de_AT.orig.dic	Sat Nov 26 19:59:54 2005
---- de_AT.dic	Sat Nov 26 20:21:22 2005
-***************
-*** 18,20 ****
-  Fleischbänke/N
-- Fleischbank
-  Fleischhauer/NS
---- 18,19 ----
-***************
-*** 19748,19750 ****
-  Geschwulstherde
-- Geselchte/N
-  Gesellenbrief
---- 19747,19748 ----
-***************
-*** 21437,21439 ****
-  HTML
-- Häfen
-  Häftling/EPS
---- 21435,21436 ----
+*** 725,729 ****
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! BREAK 2
+! BREAK -
+! BREAK .
+! 
+--- 744,1242 ----
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! # BREAK 2
+! # BREAK -
+! # BREAK .
+! 
+! #   German phonetic transformation rules for use with Aspell
+! #   Copyright (C) 2000 Björn Jacke
+! #
+! #   This library is free software; you can redistribute it and/or
+! #   modify it under the terms of the GNU Lesser General Public
+! #   License version 2.1 as published by the Free Software Foundation;
+! #
+! #   This 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 this library; if not, write to the Free Software
+! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+! #
+! #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
+! #
+! #   Changelog:
+! #
+! #   2000-01-05  Björn Jacke <bjoern.jacke@gmx.de>
+! #               Initial Release
+! #   2000-01-07  Kevin Atkinson <kevinatk@home.com>
+! #               Converted from header to data file.
+! SAL followup        1
+! SAL collapse_result 1
+! 
+! SAL ÄER-                 E
+! SAL ÄU<                  EU
+! SAL Ä<                   E
+! SAL É                    E
+! SAL ÖER-                 Ö
+! SAL Ö                    Ö
+! SAL ÜBER^^               IPA
+! SAL ÜER-                 I
+! SAL Ü                    I
+! SAL ß                    Z
+! SAL ABELLE$              APL
+! SAL ABELL$               APL
+! SAL ABIENNE$             APIN
+! SAL ACEY$                AZI
+! SAL AEU<                 EU
+! SAL AE2                  E
+! SAL AGNI-^               AKN
+! SAL AGNIE-               ANI
+! SAL AGN(AEOU)-$          ANI
+! SAL AIA2                 AIA
+! SAL AIE$                 E
+! SAL AILL(EOU)-           ALI
+! SAL AINE$                EN
+! SAL AIRE$                ER
+! SAL AIR-                 E
+! SAL AISE$                EZ
+! SAL AISSANCE$            EZANZ
+! SAL AISSE$               EZ
+! SAL AIX$                 EX
+! SAL AJ(AÄEIOÖUÜ)--       A
+! SAL AKTIE                AXIE
+! SAL ALO(IY)^             ALUI
+! SAL AMATEU(RS)-          ANATÖ
+! SAL ANIELLE$             ANIL
+! SAL ANTI^^               ANTI
+! SAL ANVER^^              ANFA
+! SAL ATIA$                ATIA
+! SAL ATIA(NS)--           ATI
+! SAL ATI(AÄOÖUÜ)-         AZI
+! SAL AUAU--               _
+! SAL AUER<                AUA
+! SAL AUF^^                AUF
+! SAL AULT$                U
+! SAL AUSSE$               UZ
+! SAL AUS(ST)-^            AUZ
+! SAL AUS^^                AUZ
+! SAL AUTO^^               AUTU
+! SAL AUX(IY)-             AUX
+! SAL AUX                  U
+! SAL AU                   AU
+! SAL AVIER$               AFIE
+! SAL AYER--<              EI
+! SAL AY(AÄEIOÖUÜ)--       A
+! SAL A(IJY)<              EI
+! SAL A                    A
+! SAL BEA(BCMNRU)-^        PEA
+! SAL BEAT(AEIMORU)-^      PEAT
+! SAL BEIGE^$              PEZ
+! SAL BE(LMNRST)-^         PE
+! SAL BETTE$               PET
+! SAL BIC$                 PIZ
+! SAL BOWL(EI)-            PUL
+! SAL BP(AÄEIOÖRUÜY)-      P
+! SAL BUDGET7              PIKE
+! SAL BUFFET7              PIFE
+! SAL BYLLE$               PILE
+! SAL BYLL$                PIL
+! SAL BYTE<                PEIT
+! SAL B                    P
+! SAL CÄ-                  Z
+! SAL CÜ$                  ZI
+! SAL CACH(EI)-^           KEZ
+! SAL CAE--                Z
+! SAL CA(IY)$              ZEI
+! SAL CCH                  Z
+! SAL CCE-                 X
+! SAL CE(EIJUY)--          Z
+! SAL CENT<                ZENT
+! SAL CERST(EI)----^       KE
+! SAL CER$                 ZA
+! SAL CE3                  ZE
+! SAL CHAO(ST)-            KAU
+! SAL CHAMPIO-^            ZENPI
+! SAL CHAR(AI)-^           KAR
+! SAL CHAU(CDFSVWXZ)-      ZU
+! SAL CHE(CF)-             ZE
+! SAL CHEM-^               KE
+! SAL CHEQUE<              ZEK
+! SAL CHI(CFGPVW)-         ZI
+! SAL CH(AEUY)-<^          Z
+! SAL CHK-                 _
+! SAL CH(LOR)-<^           K
+! SAL CHST-                X
+! SAL CH(SßXZ)3            X
+! SAL CH                   K
+! SAL CIER$                ZIE
+! SAL CYB-^                ZEI
+! SAL CY9^                 ZI
+! SAL C(IJY)-3             Z
+! SAL CKST                 XT
+! SAL CK(SßXZ)3            X
+! SAL C(CK)-               _
+! SAL CLAUDET---           KLU
+! SAL CLAUDINE^$           KLUTIN
+! SAL COLE$                KUL
+! SAL COUCH                KAUZ
+! SAL CQUES$               K
+! SAL CQUE                 K
+! SAL CREAT-^              KREA
+! SAL CST                  XT
+! SAL CS<^                 Z
+! SAL C(SßX)               X
+! SAL CT(SßXZ)             X
+! SAL CZ<                  Z
+! SAL C<                   K
+! SAL D'H^                 T
+! SAL D'S3$                Z
+! SAL DAVO(NR)-^$          TAFU
+! SAL DD(SZ)--<            _
+! SAL DEPOT7               TEPU
+! SAL DESIGN               TIZEIN
+! SAL DE(LMNRST)-3^        TE
+! SAL DETTE$               TET
+! SAL DIC$                 TIZ
+! SAL DJ(AEIOU)-^          I
+! SAL DS(CH)--<            T
+! SAL DST                  ZT
+! SAL DT-                  _
+! SAL DUIS-^               TI
+! SAL DURCH^^              TURK
+! SAL DZS(CH)--            T
+! SAL D(SßZ)               Z
+! SAL D                    T
+! SAL EAULT$               U
+! SAL EAUX$                U
+! SAL EAU                  U
+! SAL EAV                  IF
+! SAL EA(AÄEIOÖÜY)-3       EA
+! SAL EA3$                 EA
+! SAL EA3                  I
+! SAL EBEN^^               EPN
+! SAL EE9                  E
+! SAL EIEI--               _
+! SAL EIH--                E
+! SAL EILLE$               EI
+! SAL EI                   EI
+! SAL EJ$                  EI
+! SAL EL-^                 E
+! SAL EL(DKL)--1           E
+! SAL EL(MNT)--1$          E
+! SAL ELYNE$               ELINE
+! SAL ELYN$                ELIN
+! SAL EL(AÄEIOÖUÜY)-1      EL
+! SAL EL-1                 L
+! SAL EM-^                 E
+! SAL EM(DFKMPQT)--1       E
+! SAL EM(AÄEIOÖUÜY)--1     E
+! SAL EM-1                 N
+! SAL EN-^                 E
+! SAL EN(CDGKQT)--1        E
+! SAL ENZ(AEIOUY)--1       EN
+! SAL EN(AÄEINOÖUÜY)-1     EN
+! SAL EN-<1                N
+! SAL ERH(AÄEIOÖUÜ)-^      ER
+! SAL ER-^                 E
+! SAL ER(AÄEIOÖUÜY)-1      A
+! SAL ER1$                 A
+! SAL ER<1                 A
+! SAL ETI(AÄOÖÜU)-         EZI
+! SAL EUEU--               _
+! SAL EUILLE$              Ö
+! SAL EUR$                 ÖR
+! SAL EUX                  Ö
+! SAL EUYS$                EUZ
+! SAL EU                   EU
+! SAL EYER<                EIA
+! SAL EY<                  EI
+! SAL E                    E
+! SAL FANS--^$             FE
+! SAL FAN-^$               FE
+! SAL FAULT-               FUL
+! SAL FEE(DL)-             FI
+! SAL FEHLER               FELA
+! SAL FE(LMNRST)-3^        FE
+! SAL FOND7                FUN
+! SAL FRAIN$               FRA
+! SAL FRISEU(RS)-          FRIZÖ  # x
+! SAL F                    F
+! SAL G'S$                 X
+! SAL GAGS^$               KEX
+! SAL GAG^$                KEK
+! SAL GD                   KT
+! SAL GEGEN^^              KEKN
+! SAL GE(LMNRST)-3^        KE
+! SAL GETTE$               KET
+! SAL G(CK)-               _
+! SAL GG-                  _
+! SAL GI(AO)-^             I
+! SAL GION$                KIUN
+! SAL GIUS-^               IU
+! SAL GMBH^$               GMPH
+! SAL GNAC$                NIAK
+! SAL GNON$                NIUN
+! SAL GN$                  N
+! SAL GONCAL-^             KUNZA
+! SAL GS(CH)--             K
+! SAL GST                  XT
+! SAL G(SßXZ)              X
+! SAL GUCK-                KU
+! SAL GUI-^                K
+! SAL G                    K
+! SAL HEAD-                E
+! SAL HE(LMNRST)-3^        E
+! SAL HE(LMN)-1            E
+! SAL HEUR1$               ÖR
+! SAL H^                   _
+! SAL IEC$                 IZ
+! SAL IEI-3                _
+! SAL IELL3                IEL
+! SAL IENNE$               IN
+! SAL IERRE$               IER
+! SAL IETTE$               IT
+! SAL IEU                  IÖ
+! SAL IE<4                 I
+! SAL IGHT3$               EIT
+! SAL IGNI(EO)-            INI
+! SAL IGN(AEOU)-$          INI
+! SAL IJ(AOU)-             I
+! SAL IJ$                  I
+! SAL IJ<                  EI
+! SAL IKOLE$               IKUL
+! SAL ILLAN(STZ)--         ILIA
+! SAL ILLAR(DT)--          ILIA
+! SAL INVER-               INFE
+! SAL ITI(AÄOÖUÜ)-         IZI
+! SAL IVIER$               IFIE
+! SAL I                    I
+! SAL JAVIE---<^           ZA
+! SAL JEAN^$               IA
+! SAL JEAN-^               IA
+! SAL JER-^                IE
+! SAL JE(LMNST)-           IE
+! SAL JOR(GK)^$            IÖRK
+! SAL J                    I
+! SAL KC(ÄEIJ)-            X
+! SAL KE(LMNRST)-3^        KE
+! SAL KH<^                 K
+! SAL KIC$                 KIZ
+! SAL KLE(LMNRST)-3^       KLE
+! SAL KOTELE-^             KUTL
+! SAL KREAT-^              KREA
+! SAL KST                  XT
+! SAL K(SßXZ)              X
+! SAL KTI(AIOU)-3          XI
+! SAL KT(SßXZ)             X
+! SAL K                    K
+! SAL LARVE-               LARF
+! SAL LEAND-^              LEAN
+! SAL LEL-                 LE
+! SAL LE(MNRST)-3^         LE
+! SAL LETTE$               LET
+! SAL LFGNAG-              LFKAN
+! SAL LIC$                 LIZ
+! SAL LIVE^$               LEIF
+! SAL LUI(GS)--            LU
+! SAL L                    L
+! SAL MASSEU(RS)-          NAZÖ
+! SAL MAURICE              NURIZ
+! SAL MBH^$                MPH
+! SAL MB(SßZ)-             N
+! SAL MC9^                 NK
+! SAL MEMOIR-^             NENUA
+! SAL ME(LMNRST)-3^        NE
+! SAL MIGUEL               NIKL
+! SAL MIKE^$               NEIK
+! SAL MN                   N
+! SAL MPJUTE-              NPUT
+! SAL MP(SßZ)-             N
+! SAL MP(BDJLMNPQRTVW)-    NP
+! SAL M                    N
+! SAL NACH^^               NAK
+! SAL NADINE               NATIN
+! SAL NAIV--               NA
+! SAL NAISE$               NEZE
+! SAL NCOISE$              ZUA
+! SAL NCOIS$               ZUA
+! SAL NEBEN^^              NEPN
+! SAL NE(LMNRST)-3^        NE
+! SAL NEN-3                NE
+! SAL NETTE$               NET
+! SAL NG(BDFJLMNPQRTVW)-   NK
+! SAL NICHTS^^             NIX
+! SAL NICHT^^              NIKT
+! SAL NINE$                NIN
+! SAL NON^^                NUN
+! SAL NOT^^                NUT
+! SAL NTI(AIOU)-3          NZI
+! SAL NTIEL--3             NZI
+! SAL NYLON                NEILUN
+! SAL ND(SßZ)$             NZ
+! SAL NT(SßZ)$             NZ
+! SAL ND'S$                NZ
+! SAL NT'S$                NZ
+! SAL NSTS$                NZ
+! SAL N                    N
+! SAL OBER^^               UPA
+! SAL OE2                  Ö
+! SAL OGNIE-               UNI
+! SAL OGN(AEOU)-$          UNI
+! SAL OIE$                 Ö
+! SAL OIR$                 UAR
+! SAL OIX                  UA
+! SAL OI<3                 EU
+! SAL OJ(AÄEIOÖUÜ)--       U
+! SAL OKAY^$               UKE
+! SAL OLYN$                ULIN
+! SAL OTI(AÄOÖUÜ)-         UZI
+! SAL OUI^                 FI
+! SAL OUILLE$              ULIE
+! SAL OU(DT)-^             AU
+! SAL OUSE$                AUZ
+! SAL OUT-                 AU
+! SAL OU                   U
+! SAL OWS$                 UZ
+! SAL OY(AÄEIOÖUÜ)--       U
+! SAL O(JY)<               EU
+! SAL O                    U
+! SAL PATIEN--^            PAZI
+! SAL PENSIO-^             PANZI
+! SAL PE(LMNRST)-3^        PE
+! SAL PFER-^               FE
+! SAL P(FH)<               F
+! SAL POLY^^               PULI
+! SAL PORTRAIT7            PURTRE
+! SAL PP(FH)--<            P
+! SAL PP-                  _
+! SAL PRIX^$               PRI
+! SAL P(SßZ)^              Z
+! SAL PTI(AÄOÖUÜ)-3        PZI
+! SAL PIC^$                PIK
+! SAL P                    P
+! SAL QUE(LMNRST)-3        KFE
+! SAL QUE$                 K
+! SAL QUI(NS)$             KI
+! SAL QU                   KF
+! SAL Q<                   K
+! SAL RCH                  RK
+! SAL RECHERCH^            REZAZ
+! SAL RER$                 RA
+! SAL RE(MNR)-4            RE
+! SAL RETTE$               RET
+! SAL RH<^                 R
+! SAL RJA(MN)--            RI
+! SAL RTI(AÄOÖUÜ)-3        RZI
+! SAL RY(KN)-$             RI
+! SAL R                    R
+! SAL SAFE^$               ZEIF
+! SAL SAUCE-^              ZUZ
+! SAL SCHSCH---7           _
+! SAL SCHTSCH              Z
+! SAL SC(HZ)<              Z
+! SAL SC                   ZK
+! SAL SELBSTST--7^^        ZELP
+! SAL SELBST7^^            ZELPZT
+! SAL SERVICE7^            ZÖRFIZ
+! SAL SE(LMNRST)-3^        ZE
+! SAL SETTE$               ZET
+! SAL SHP-^                Z
+! SAL SHST                 ZT
+! SAL SHTSH                Z
+! SAL SHT                  Z
+! SAL SH3                  Z
+! SAL SIEGLI-^             ZIKL
+! SAL SIGLI-^              ZIKL
+! SAL SIGHT                ZEIT
+! SAL SIGN                 ZEIN
+! SAL SKI(NPZ)-            ZKI
+! SAL SKI<^                ZI
+! SAL SOUND-               ZAUN
+! SAL STAATS^^             ZTAZ
+! SAL STADT^^              ZTAT
+! SAL START^^              ZTART
+! SAL STAURANT7            ZTURAN
+! SAL STEAK-               ZTE
+! SAL STRAF^^              ZTRAF
+! SAL ST'S$                Z
+! SAL STST--               _
+! SAL STS(ACEHIOUÄÜÖ)--    ZT
+! SAL ST(SZ)               Z
+! SAL STYN(AE)-$           ZTIN
+! SAL ST                   ZT
+! SAL SZE(NPT)-^           ZE
+! SAL SZI(ELN)-^           ZI
+! SAL SZCZ<                Z
+! SAL SZT<                 ZT
+! SAL SZ<3                 Z
+! SAL S                    Z
+! SAL T'S3$                Z
+! SAL TCH                  Z
+! SAL TEAT-^               TEA
+! SAL TE(LMNRST)-3^        TE
+! SAL TH<                  T
+! SAL TIC$                 TIZ
+! SAL TOAS-^               TU
+! SAL TOILET-              TULE
+! SAL TOIN-                TUA
+! SAL TRAINI-              TREN
+! SAL TSCH                 Z
+! SAL TSH                  Z
+! SAL TST                  ZT
+! SAL T(Sß)                Z
+! SAL TT(SZ)--<            _
+! SAL TT9                  T
+! SAL TZ-                  _
+! SAL T                    T
+! SAL UEBER^^              IPA
+! SAL UE2                  I
+! SAL UIE$                 I
+! SAL UM^^                 UN
+! SAL UNTERE--             UNTE
+! SAL UNTER^^              UNTA
+! SAL UNVER^^              UNFA
+! SAL UN^^                 UN
+! SAL UTI(AÄOÖUÜ)-         UZI
+! SAL U                    U
+! SAL VACL-^               FAZ
+! SAL VAC$                 FAZ
+! SAL VEDD-^               FE
+! SAL VEREIN               FAEIN
+! SAL VERSEN^              FAZN
+! SAL VER^^                FA
+! SAL VER                  FA
+! SAL VET(HT)-^            FET
+! SAL VETTE$               FET
+! SAL VIC$                 FIZ
+! SAL VIEL                 FIL
+! SAL VIEW                 FIU
+! SAL VOR^^                FUR
+! SAL VY9^                 FI
+! SAL V<                   F
+! SAL WE(LMNRST)-3^        FE
+! SAL WIC$                 FIZ
+! SAL WIEDER^^             FITA
+! SAL WY9^                 FI
+! SAL W                    F
+! SAL XE(LMNRST)-3^        XE
+! SAL X<^                  Z
+! SAL X(CSZ)               X
+! SAL XTS(CH)--            XT
+! SAL XT(SZ)               Z
+! SAL X                    X
+! SAL YE(LMNRST)-3^        IE
+! SAL YE-3                 I
+! SAL YOR(GK)^$            IÖRK
+! SAL Y(AOU)-<7            I
+! SAL YVES^$               IF
+! SAL YVONNE^$             IFUN
+! SAL Y                    I
+! SAL ZC(AOU)-             ZK
+! SAL ZE(LMNRST)-3^        ZE
+! SAL ZH<                  Z
+! SAL ZS(CHT)--            _
+! SAL ZS                   Z
+! SAL ZUERST               ZUERZT
+! SAL ZURÜCK^^             ZURIK
+! SAL ZUVER^^              ZUFA    # x
+! SAL Z                    Z
--- a/runtime/spell/de/de_CH.diff
+++ b/runtime/spell/de/de_CH.diff
@@ -1,8 +1,8 @@
-*** de_CH.orig.aff	Sat Nov 26 19:38:16 2005
---- de_CH.aff	Sat Nov 26 19:38:08 2005
+*** de_CH.orig.aff	2019-01-19 18:45:30.400494173 +0100
+--- de_CH.aff	2019-01-19 19:24:48.064826847 +0100
 ***************
-*** 3,4 ****
---- 3,21 ----
+*** 15,16 ****
+--- 15,48 ----
   
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
@@ -21,484 +21,554 @@
 + MAP yÿý
 + MAP sß
 + 
++ 
++ COMPOUNDRULE xy?z
++ #COMPOUNDBEGIN x
++ #COMPOUNDMIDDLE y
++ #COMPOUNDEND z
++ 
++ # Prefixes are allowed at the beginning of compounds,
++ # suffixes are allowed at the end of compounds by default:
++ # (prefix)?(root)+(affix)?
++ # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
++ COMPOUNDPERMITFLAG c
++ 
++ ONLYINCOMPOUND o
++ 
++ 
+  PFX U Y 1
+***************
+*** 538,553 ****
+  
+- 
+- COMPOUNDBEGIN x
+- COMPOUNDMIDDLE y
+- COMPOUNDEND z
+  FORBIDDENWORD d
+  
+- # Prefixes are allowed at the beginning of compounds,
+- # suffixes are allowed at the end of compounds by default:
+- # (prefix)?(root)+(affix)?
+- # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
+- COMPOUNDPERMITFLAG c
+- 
+- ONLYINCOMPOUND o
+- 
+  # my PSEUDOROOT h(elper) flag
+--- 570,573 ----
+***************
+*** 571,573 ****
+  
+! WORDCHARS ß-.
+  
+--- 591,593 ----
+  
+! # WORDCHARS ß-.
   
 ***************
-*** 503 ****
---- 520,996 ----
-  REP eh e
-+ 
-+ #   German phonetic transformation rules from Aspell
-+ #   Copyright (C) 2000 Björn Jacke, distributed under LGPL.
-+ #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
-+ #   Last changed 2000-01-07
-+ 
-+ SAL followup        1
-+ SAL collapse_result 1
-+ 
-+ SAL ÄER-                 E
-+ SAL ÄU<                  EU
-+ SAL Ä<                   E
-+ SAL É                    E
-+ SAL ÖER-                 Ö
-+ SAL Ö                    Ö
-+ SAL ÜBER^^               IPA
-+ SAL ÜER-                 I
-+ SAL Ü                    I
-+ SAL ß                    Z
-+ SAL ABELLE$              APL
-+ SAL ABELL$               APL
-+ SAL ABIENNE$             APIN
-+ SAL ACEY$                AZI
-+ SAL AEU<                 EU
-+ SAL AE2                  E
-+ SAL AGNI-^               AKN
-+ SAL AGNIE-               ANI
-+ SAL AGN(AEOU)-$          ANI
-+ SAL AIA2                 AIA
-+ SAL AIE$                 E
-+ SAL AILL(EOU)-           ALI
-+ SAL AINE$                EN
-+ SAL AIRE$                ER
-+ SAL AIR-                 E
-+ SAL AISE$                EZ
-+ SAL AISSANCE$            EZANZ
-+ SAL AISSE$               EZ
-+ SAL AIX$                 EX
-+ SAL AJ(AÄEIOÖUÜ)--       A
-+ SAL AKTIE                AXIE
-+ SAL ALO(IY)^             ALUI
-+ SAL AMATEU(RS)-          ANATÖ
-+ SAL ANIELLE$             ANIL
-+ SAL ANTI^^               ANTI
-+ SAL ANVER^^              ANFA
-+ SAL ATIA$                ATIA
-+ SAL ATIA(NS)--           ATI
-+ SAL ATI(AÄOÖUÜ)-         AZI
-+ SAL AUAU--               _
-+ SAL AUER<                AUA
-+ SAL AUF^^                AUF
-+ SAL AULT$                U
-+ SAL AUSSE$               UZ
-+ SAL AUS(ST)-^            AUZ
-+ SAL AUS^^                AUZ
-+ SAL AUTO^^               AUTU
-+ SAL AUX(IY)-             AUX
-+ SAL AUX                  U
-+ SAL AU                   AU
-+ SAL AVIER$               AFIE
-+ SAL AYER--<              EI
-+ SAL AY(AÄEIOÖUÜ)--       A
-+ SAL A(IJY)<              EI
-+ SAL A                    A
-+ SAL BEA(BCMNRU)-^        PEA
-+ SAL BEAT(AEIMORU)-^      PEAT
-+ SAL BEIGE^$              PEZ
-+ SAL BE(LMNRST)-^         PE
-+ SAL BETTE$               PET
-+ SAL BIC$                 PIZ
-+ SAL BOWL(EI)-            PUL
-+ SAL BP(AÄEIOÖRUÜY)-      P
-+ SAL BUDGET7              PIKE
-+ SAL BUFFET7              PIFE
-+ SAL BYLLE$               PILE
-+ SAL BYLL$                PIL
-+ SAL BYTE<                PEIT
-+ SAL B                    P
-+ SAL CÄ-                  Z
-+ SAL CÜ$                  ZI
-+ SAL CACH(EI)-^           KEZ
-+ SAL CAE--                Z
-+ SAL CA(IY)$              ZEI
-+ SAL CCH                  Z
-+ SAL CCE-                 X
-+ SAL CE(EIJUY)--          Z
-+ SAL CENT<                ZENT
-+ SAL CERST(EI)----^       KE
-+ SAL CER$                 ZA
-+ SAL CE3                  ZE
-+ SAL CHAO(ST)-            KAU
-+ SAL CHAMPIO-^            ZENPI
-+ SAL CHAR(AI)-^           KAR
-+ SAL CHAU(CDFSVWXZ)-      ZU
-+ SAL CHE(CF)-             ZE
-+ SAL CHEM-^               KE
-+ SAL CHEQUE<              ZEK
-+ SAL CHI(CFGPVW)-         ZI
-+ SAL CH(AEUY)-<^          Z
-+ SAL CHK-                 _
-+ SAL CH(LOR)-<^           K
-+ SAL CHST-                X
-+ SAL CH(SßXZ)3            X
-+ SAL CH                   K
-+ SAL CIER$                ZIE
-+ SAL CYB-^                ZEI
-+ SAL CY9^                 ZI
-+ SAL C(IJY)-3             Z
-+ SAL CKST                 XT
-+ SAL CK(SßXZ)3            X
-+ SAL C(CK)-               _
-+ SAL CLAUDET---           KLU
-+ SAL CLAUDINE^$           KLUTIN
-+ SAL COLE$                KUL
-+ SAL COUCH                KAUZ
-+ SAL CQUES$               K
-+ SAL CQUE                 K
-+ SAL CREAT-^              KREA
-+ SAL CST                  XT
-+ SAL CS<^                 Z
-+ SAL C(SßX)               X
-+ SAL CT(SßXZ)             X
-+ SAL CZ<                  Z
-+ SAL C<                   K
-+ SAL D'H^                 T
-+ SAL D'S3$                Z
-+ SAL DAVO(NR)-^$          TAFU
-+ SAL DD(SZ)--<            _
-+ SAL DEPOT7               TEPU
-+ SAL DESIGN               TIZEIN
-+ SAL DE(LMNRST)-3^        TE
-+ SAL DETTE$               TET
-+ SAL DIC$                 TIZ
-+ SAL DJ(AEIOU)-^          I
-+ SAL DS(CH)--<            T
-+ SAL DST                  ZT
-+ SAL DT-                  _
-+ SAL DUIS-^               TI
-+ SAL DURCH^^              TURK
-+ SAL DZS(CH)--            T
-+ SAL D(SßZ)               Z
-+ SAL D                    T
-+ SAL EAULT$               U
-+ SAL EAUX$                U
-+ SAL EAU                  U
-+ SAL EAV                  IF
-+ SAL EA(AÄEIOÖÜY)-3       EA
-+ SAL EA3$                 EA
-+ SAL EA3                  I
-+ SAL EBEN^^               EPN
-+ SAL EE9                  E
-+ SAL EIEI--               _
-+ SAL EIH--                E
-+ SAL EILLE$               EI
-+ SAL EI                   EI
-+ SAL EJ$                  EI
-+ SAL EL-^                 E
-+ SAL EL(DKL)--1           E
-+ SAL EL(MNT)--1$          E
-+ SAL ELYNE$               ELINE
-+ SAL ELYN$                ELIN
-+ SAL EL(AÄEIOÖUÜY)-1      EL
-+ SAL EL-1                 L
-+ SAL EM-^                 E
-+ SAL EM(DFKMPQT)--1       E
-+ SAL EM(AÄEIOÖUÜY)--1     E
-+ SAL EM-1                 N
-+ SAL EN-^                 E
-+ SAL EN(CDGKQT)--1        E
-+ SAL ENZ(AEIOUY)--1       EN
-+ SAL EN(AÄEINOÖUÜY)-1     EN
-+ SAL EN-<1                N
-+ SAL ERH(AÄEIOÖUÜ)-^      ER
-+ SAL ER-^                 E
-+ SAL ER(AÄEIOÖUÜY)-1      A
-+ SAL ER1$                 A
-+ SAL ER<1                 A
-+ SAL ETI(AÄOÖÜU)-         EZI
-+ SAL EUEU--               _
-+ SAL EUILLE$              Ö
-+ SAL EUR$                 ÖR
-+ SAL EUX                  Ö
-+ SAL EUYS$                EUZ
-+ SAL EU                   EU
-+ SAL EYER<                EIA
-+ SAL EY<                  EI
-+ SAL E                    E
-+ SAL FANS--^$             FE
-+ SAL FAN-^$               FE
-+ SAL FAULT-               FUL
-+ SAL FEE(DL)-             FI
-+ SAL FEHLER               FELA
-+ SAL FE(LMNRST)-3^        FE
-+ SAL FOND7                FUN
-+ SAL FRAIN$               FRA
-+ SAL FRISEU(RS)-          FRIZÖ  # x
-+ SAL F                    F
-+ SAL G'S$                 X
-+ SAL GAGS^$               KEX
-+ SAL GAG^$                KEK
-+ SAL GD                   KT
-+ SAL GEGEN^^              KEKN
-+ SAL GE(LMNRST)-3^        KE
-+ SAL GETTE$               KET
-+ SAL G(CK)-               _
-+ SAL GG-                  _
-+ SAL GI(AO)-^             I
-+ SAL GION$                KIUN
-+ SAL GIUS-^               IU
-+ SAL GMBH^$               GMPH
-+ SAL GNAC$                NIAK
-+ SAL GNON$                NIUN
-+ SAL GN$                  N
-+ SAL GONCAL-^             KUNZA
-+ SAL GS(CH)--             K
-+ SAL GST                  XT
-+ SAL G(SßXZ)              X
-+ SAL GUCK-                KU
-+ SAL GUI-^                K
-+ SAL G                    K
-+ SAL HEAD-                E
-+ SAL HE(LMNRST)-3^        E
-+ SAL HE(LMN)-1            E
-+ SAL HEUR1$               ÖR
-+ SAL H^                   _
-+ SAL IEC$                 IZ
-+ SAL IEI-3                _
-+ SAL IELL3                IEL
-+ SAL IENNE$               IN
-+ SAL IERRE$               IER
-+ SAL IETTE$               IT
-+ SAL IEU                  IÖ
-+ SAL IE<4                 I
-+ SAL IGHT3$               EIT
-+ SAL IGNI(EO)-            INI
-+ SAL IGN(AEOU)-$          INI
-+ SAL IJ(AOU)-             I
-+ SAL IJ$                  I
-+ SAL IJ<                  EI
-+ SAL IKOLE$               IKUL
-+ SAL ILLAN(STZ)--         ILIA
-+ SAL ILLAR(DT)--          ILIA
-+ SAL INVER-               INFE
-+ SAL ITI(AÄOÖUÜ)-         IZI
-+ SAL IVIER$               IFIE
-+ SAL I                    I
-+ SAL JAVIE---<^           ZA
-+ SAL JEAN^$               IA
-+ SAL JEAN-^               IA
-+ SAL JER-^                IE
-+ SAL JE(LMNST)-           IE
-+ SAL JOR(GK)^$            IÖRK
-+ SAL J                    I
-+ SAL KC(ÄEIJ)-            X
-+ SAL KE(LMNRST)-3^        KE
-+ SAL KH<^                 K
-+ SAL KIC$                 KIZ
-+ SAL KLE(LMNRST)-3^       KLE
-+ SAL KOTELE-^             KUTL
-+ SAL KREAT-^              KREA
-+ SAL KST                  XT
-+ SAL K(SßXZ)              X
-+ SAL KTI(AIOU)-3          XI
-+ SAL KT(SßXZ)             X
-+ SAL K                    K
-+ SAL LARVE-               LARF
-+ SAL LEAND-^              LEAN
-+ SAL LEL-                 LE
-+ SAL LE(MNRST)-3^         LE
-+ SAL LETTE$               LET
-+ SAL LFGNAG-              LFKAN
-+ SAL LIC$                 LIZ
-+ SAL LIVE^$               LEIF
-+ SAL LUI(GS)--            LU
-+ SAL L                    L
-+ SAL MASSEU(RS)-          NAZÖ
-+ SAL MAURICE              NURIZ
-+ SAL MBH^$                MPH
-+ SAL MB(SßZ)-             N
-+ SAL MC9^                 NK
-+ SAL MEMOIR-^             NENUA
-+ SAL ME(LMNRST)-3^        NE
-+ SAL MIGUEL               NIKL
-+ SAL MIKE^$               NEIK
-+ SAL MN                   N
-+ SAL MPJUTE-              NPUT
-+ SAL MP(SßZ)-             N
-+ SAL MP(BDJLMNPQRTVW)-    NP
-+ SAL M                    N
-+ SAL NACH^^               NAK
-+ SAL NADINE               NATIN
-+ SAL NAIV--               NA
-+ SAL NAISE$               NEZE
-+ SAL NCOISE$              ZUA
-+ SAL NCOIS$               ZUA
-+ SAL NEBEN^^              NEPN
-+ SAL NE(LMNRST)-3^        NE
-+ SAL NEN-3                NE
-+ SAL NETTE$               NET
-+ SAL NG(BDFJLMNPQRTVW)-   NK
-+ SAL NICHTS^^             NIX
-+ SAL NICHT^^              NIKT
-+ SAL NINE$                NIN
-+ SAL NON^^                NUN
-+ SAL NOT^^                NUT
-+ SAL NTI(AIOU)-3          NZI
-+ SAL NTIEL--3             NZI
-+ SAL NYLON                NEILUN
-+ SAL ND(SßZ)$             NZ
-+ SAL NT(SßZ)$             NZ
-+ SAL ND'S$                NZ
-+ SAL NT'S$                NZ
-+ SAL NSTS$                NZ
-+ SAL N                    N
-+ SAL OBER^^               UPA
-+ SAL OE2                  Ö
-+ SAL OGNIE-               UNI
-+ SAL OGN(AEOU)-$          UNI
-+ SAL OIE$                 Ö
-+ SAL OIR$                 UAR
-+ SAL OIX                  UA
-+ SAL OI<3                 EU
-+ SAL OJ(AÄEIOÖUÜ)--       U
-+ SAL OKAY^$               UKE
-+ SAL OLYN$                ULIN
-+ SAL OTI(AÄOÖUÜ)-         UZI
-+ SAL OUI^                 FI
-+ SAL OUILLE$              ULIE
-+ SAL OU(DT)-^             AU
-+ SAL OUSE$                AUZ
-+ SAL OUT-                 AU
-+ SAL OU                   U
-+ SAL OWS$                 UZ
-+ SAL OY(AÄEIOÖUÜ)--       U
-+ SAL O(JY)<               EU
-+ SAL O                    U
-+ SAL PATIEN--^            PAZI
-+ SAL PENSIO-^             PANZI
-+ SAL PE(LMNRST)-3^        PE
-+ SAL PFER-^               FE
-+ SAL P(FH)<               F
-+ SAL POLY^^               PULI
-+ SAL PORTRAIT7            PURTRE
-+ SAL PP(FH)--<            P
-+ SAL PP-                  _
-+ SAL PRIX^$               PRI
-+ SAL P(SßZ)^              Z
-+ SAL PTI(AÄOÖUÜ)-3        PZI
-+ SAL PIC^$                PIK
-+ SAL P                    P
-+ SAL QUE(LMNRST)-3        KFE
-+ SAL QUE$                 K
-+ SAL QUI(NS)$             KI
-+ SAL QU                   KF
-+ SAL Q<                   K
-+ SAL RCH                  RK
-+ SAL RECHERCH^            REZAZ
-+ SAL RER$                 RA
-+ SAL RE(MNR)-4            RE
-+ SAL RETTE$               RET
-+ SAL RH<^                 R
-+ SAL RJA(MN)--            RI
-+ SAL RTI(AÄOÖUÜ)-3        RZI
-+ SAL RY(KN)-$             RI
-+ SAL R                    R
-+ SAL SAFE^$               ZEIF
-+ SAL SAUCE-^              ZUZ
-+ SAL SCHSCH---7           _
-+ SAL SCHTSCH              Z
-+ SAL SC(HZ)<              Z
-+ SAL SC                   ZK
-+ SAL SELBSTST--7^^        ZELP
-+ SAL SELBST7^^            ZELPZT
-+ SAL SERVICE7^            ZÖRFIZ
-+ SAL SE(LMNRST)-3^        ZE
-+ SAL SETTE$               ZET
-+ SAL SHP-^                Z
-+ SAL SHST                 ZT
-+ SAL SHTSH                Z
-+ SAL SHT                  Z
-+ SAL SH3                  Z
-+ SAL SIEGLI-^             ZIKL
-+ SAL SIGLI-^              ZIKL
-+ SAL SIGHT                ZEIT
-+ SAL SIGN                 ZEIN
-+ SAL SKI(NPZ)-            ZKI
-+ SAL SKI<^                ZI
-+ SAL SOUND-               ZAUN
-+ SAL STAATS^^             ZTAZ
-+ SAL STADT^^              ZTAT
-+ SAL START^^              ZTART
-+ SAL STAURANT7            ZTURAN
-+ SAL STEAK-               ZTE
-+ SAL STRAF^^              ZTRAF
-+ SAL ST'S$                Z
-+ SAL STST--               _
-+ SAL STS(ACEHIOUÄÜÖ)--    ZT
-+ SAL ST(SZ)               Z
-+ SAL STYN(AE)-$           ZTIN
-+ SAL ST                   ZT
-+ SAL SZE(NPT)-^           ZE
-+ SAL SZI(ELN)-^           ZI
-+ SAL SZCZ<                Z
-+ SAL SZT<                 ZT
-+ SAL SZ<3                 Z
-+ SAL S                    Z
-+ SAL T'S3$                Z
-+ SAL TCH                  Z
-+ SAL TEAT-^               TEA
-+ SAL TE(LMNRST)-3^        TE
-+ SAL TH<                  T
-+ SAL TIC$                 TIZ
-+ SAL TOAS-^               TU
-+ SAL TOILET-              TULE
-+ SAL TOIN-                TUA
-+ SAL TRAINI-              TREN
-+ SAL TSCH                 Z
-+ SAL TSH                  Z
-+ SAL TST                  ZT
-+ SAL T(Sß)                Z
-+ SAL TT(SZ)--<            _
-+ SAL TT9                  T
-+ SAL TZ-                  _
-+ SAL T                    T
-+ SAL UEBER^^              IPA
-+ SAL UE2                  I
-+ SAL UIE$                 I
-+ SAL UM^^                 UN
-+ SAL UNTERE--             UNTE
-+ SAL UNTER^^              UNTA
-+ SAL UNVER^^              UNFA
-+ SAL UN^^                 UN
-+ SAL UTI(AÄOÖUÜ)-         UZI
-+ SAL U                    U
-+ SAL VACL-^               FAZ
-+ SAL VAC$                 FAZ
-+ SAL VEDD-^               FE
-+ SAL VEREIN               FAEIN
-+ SAL VERSEN^              FAZN
-+ SAL VER^^                FA
-+ SAL VER                  FA
-+ SAL VET(HT)-^            FET
-+ SAL VETTE$               FET
-+ SAL VIC$                 FIZ
-+ SAL VIEL                 FIL
-+ SAL VIEW                 FIU
-+ SAL VOR^^                FUR
-+ SAL VY9^                 FI
-+ SAL V<                   F
-+ SAL WE(LMNRST)-3^        FE
-+ SAL WIC$                 FIZ
-+ SAL WIEDER^^             FITA
-+ SAL WY9^                 FI
-+ SAL W                    F
-+ SAL XE(LMNRST)-3^        XE
-+ SAL X<^                  Z
-+ SAL X(CSZ)               X
-+ SAL XTS(CH)--            XT
-+ SAL XT(SZ)               Z
-+ SAL X                    X
-+ SAL YE(LMNRST)-3^        IE
-+ SAL YE-3                 I
-+ SAL YOR(GK)^$            IÖRK
-+ SAL Y(AOU)-<7            I
-+ SAL YVES^$               IF
-+ SAL YVONNE^$             IFUN
-+ SAL Y                    I
-+ SAL ZC(AOU)-             ZK
-+ SAL ZE(LMNRST)-3^        ZE
-+ SAL ZH<                  Z
-+ SAL ZS(CHT)--            _
-+ SAL ZS                   Z
-+ SAL ZUERST               ZUERZT
-+ SAL ZURÜCK^^             ZURIK
-+ SAL ZUVER^^              ZUFA    # x
-+ SAL Z                    Z
+*** 725,729 ****
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! BREAK 2
+! BREAK -
+! BREAK .
+! 
+--- 745,1243 ----
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! # BREAK 2
+! # BREAK -
+! # BREAK .
+! 
+! #   German phonetic transformation rules for use with Aspell
+! #   Copyright (C) 2000 Björn Jacke
+! #
+! #   This library is free software; you can redistribute it and/or
+! #   modify it under the terms of the GNU Lesser General Public
+! #   License version 2.1 as published by the Free Software Foundation;
+! #
+! #   This 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 this library; if not, write to the Free Software
+! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+! #
+! #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
+! #
+! #   Changelog:
+! #
+! #   2000-01-05  Björn Jacke <bjoern.jacke@gmx.de>
+! #               Initial Release
+! #   2000-01-07  Kevin Atkinson <kevinatk@home.com>
+! #               Converted from header to data file.
+! SAL followup        1
+! SAL collapse_result 1
+! 
+! SAL ÄER-                 E
+! SAL ÄU<                  EU
+! SAL Ä<                   E
+! SAL É                    E
+! SAL ÖER-                 Ö
+! SAL Ö                    Ö
+! SAL ÜBER^^               IPA
+! SAL ÜER-                 I
+! SAL Ü                    I
+! SAL ß                    Z
+! SAL ABELLE$              APL
+! SAL ABELL$               APL
+! SAL ABIENNE$             APIN
+! SAL ACEY$                AZI
+! SAL AEU<                 EU
+! SAL AE2                  E
+! SAL AGNI-^               AKN
+! SAL AGNIE-               ANI
+! SAL AGN(AEOU)-$          ANI
+! SAL AIA2                 AIA
+! SAL AIE$                 E
+! SAL AILL(EOU)-           ALI
+! SAL AINE$                EN
+! SAL AIRE$                ER
+! SAL AIR-                 E
+! SAL AISE$                EZ
+! SAL AISSANCE$            EZANZ
+! SAL AISSE$               EZ
+! SAL AIX$                 EX
+! SAL AJ(AÄEIOÖUÜ)--       A
+! SAL AKTIE                AXIE
+! SAL ALO(IY)^             ALUI
+! SAL AMATEU(RS)-          ANATÖ
+! SAL ANIELLE$             ANIL
+! SAL ANTI^^               ANTI
+! SAL ANVER^^              ANFA
+! SAL ATIA$                ATIA
+! SAL ATIA(NS)--           ATI
+! SAL ATI(AÄOÖUÜ)-         AZI
+! SAL AUAU--               _
+! SAL AUER<                AUA
+! SAL AUF^^                AUF
+! SAL AULT$                U
+! SAL AUSSE$               UZ
+! SAL AUS(ST)-^            AUZ
+! SAL AUS^^                AUZ
+! SAL AUTO^^               AUTU
+! SAL AUX(IY)-             AUX
+! SAL AUX                  U
+! SAL AU                   AU
+! SAL AVIER$               AFIE
+! SAL AYER--<              EI
+! SAL AY(AÄEIOÖUÜ)--       A
+! SAL A(IJY)<              EI
+! SAL A                    A
+! SAL BEA(BCMNRU)-^        PEA
+! SAL BEAT(AEIMORU)-^      PEAT
+! SAL BEIGE^$              PEZ
+! SAL BE(LMNRST)-^         PE
+! SAL BETTE$               PET
+! SAL BIC$                 PIZ
+! SAL BOWL(EI)-            PUL
+! SAL BP(AÄEIOÖRUÜY)-      P
+! SAL BUDGET7              PIKE
+! SAL BUFFET7              PIFE
+! SAL BYLLE$               PILE
+! SAL BYLL$                PIL
+! SAL BYTE<                PEIT
+! SAL B                    P
+! SAL CÄ-                  Z
+! SAL CÜ$                  ZI
+! SAL CACH(EI)-^           KEZ
+! SAL CAE--                Z
+! SAL CA(IY)$              ZEI
+! SAL CCH                  Z
+! SAL CCE-                 X
+! SAL CE(EIJUY)--          Z
+! SAL CENT<                ZENT
+! SAL CERST(EI)----^       KE
+! SAL CER$                 ZA
+! SAL CE3                  ZE
+! SAL CHAO(ST)-            KAU
+! SAL CHAMPIO-^            ZENPI
+! SAL CHAR(AI)-^           KAR
+! SAL CHAU(CDFSVWXZ)-      ZU
+! SAL CHE(CF)-             ZE
+! SAL CHEM-^               KE
+! SAL CHEQUE<              ZEK
+! SAL CHI(CFGPVW)-         ZI
+! SAL CH(AEUY)-<^          Z
+! SAL CHK-                 _
+! SAL CH(LOR)-<^           K
+! SAL CHST-                X
+! SAL CH(SßXZ)3            X
+! SAL CH                   K
+! SAL CIER$                ZIE
+! SAL CYB-^                ZEI
+! SAL CY9^                 ZI
+! SAL C(IJY)-3             Z
+! SAL CKST                 XT
+! SAL CK(SßXZ)3            X
+! SAL C(CK)-               _
+! SAL CLAUDET---           KLU
+! SAL CLAUDINE^$           KLUTIN
+! SAL COLE$                KUL
+! SAL COUCH                KAUZ
+! SAL CQUES$               K
+! SAL CQUE                 K
+! SAL CREAT-^              KREA
+! SAL CST                  XT
+! SAL CS<^                 Z
+! SAL C(SßX)               X
+! SAL CT(SßXZ)             X
+! SAL CZ<                  Z
+! SAL C<                   K
+! SAL D'H^                 T
+! SAL D'S3$                Z
+! SAL DAVO(NR)-^$          TAFU
+! SAL DD(SZ)--<            _
+! SAL DEPOT7               TEPU
+! SAL DESIGN               TIZEIN
+! SAL DE(LMNRST)-3^        TE
+! SAL DETTE$               TET
+! SAL DIC$                 TIZ
+! SAL DJ(AEIOU)-^          I
+! SAL DS(CH)--<            T
+! SAL DST                  ZT
+! SAL DT-                  _
+! SAL DUIS-^               TI
+! SAL DURCH^^              TURK
+! SAL DZS(CH)--            T
+! SAL D(SßZ)               Z
+! SAL D                    T
+! SAL EAULT$               U
+! SAL EAUX$                U
+! SAL EAU                  U
+! SAL EAV                  IF
+! SAL EA(AÄEIOÖÜY)-3       EA
+! SAL EA3$                 EA
+! SAL EA3                  I
+! SAL EBEN^^               EPN
+! SAL EE9                  E
+! SAL EIEI--               _
+! SAL EIH--                E
+! SAL EILLE$               EI
+! SAL EI                   EI
+! SAL EJ$                  EI
+! SAL EL-^                 E
+! SAL EL(DKL)--1           E
+! SAL EL(MNT)--1$          E
+! SAL ELYNE$               ELINE
+! SAL ELYN$                ELIN
+! SAL EL(AÄEIOÖUÜY)-1      EL
+! SAL EL-1                 L
+! SAL EM-^                 E
+! SAL EM(DFKMPQT)--1       E
+! SAL EM(AÄEIOÖUÜY)--1     E
+! SAL EM-1                 N
+! SAL EN-^                 E
+! SAL EN(CDGKQT)--1        E
+! SAL ENZ(AEIOUY)--1       EN
+! SAL EN(AÄEINOÖUÜY)-1     EN
+! SAL EN-<1                N
+! SAL ERH(AÄEIOÖUÜ)-^      ER
+! SAL ER-^                 E
+! SAL ER(AÄEIOÖUÜY)-1      A
+! SAL ER1$                 A
+! SAL ER<1                 A
+! SAL ETI(AÄOÖÜU)-         EZI
+! SAL EUEU--               _
+! SAL EUILLE$              Ö
+! SAL EUR$                 ÖR
+! SAL EUX                  Ö
+! SAL EUYS$                EUZ
+! SAL EU                   EU
+! SAL EYER<                EIA
+! SAL EY<                  EI
+! SAL E                    E
+! SAL FANS--^$             FE
+! SAL FAN-^$               FE
+! SAL FAULT-               FUL
+! SAL FEE(DL)-             FI
+! SAL FEHLER               FELA
+! SAL FE(LMNRST)-3^        FE
+! SAL FOND7                FUN
+! SAL FRAIN$               FRA
+! SAL FRISEU(RS)-          FRIZÖ  # x
+! SAL F                    F
+! SAL G'S$                 X
+! SAL GAGS^$               KEX
+! SAL GAG^$                KEK
+! SAL GD                   KT
+! SAL GEGEN^^              KEKN
+! SAL GE(LMNRST)-3^        KE
+! SAL GETTE$               KET
+! SAL G(CK)-               _
+! SAL GG-                  _
+! SAL GI(AO)-^             I
+! SAL GION$                KIUN
+! SAL GIUS-^               IU
+! SAL GMBH^$               GMPH
+! SAL GNAC$                NIAK
+! SAL GNON$                NIUN
+! SAL GN$                  N
+! SAL GONCAL-^             KUNZA
+! SAL GS(CH)--             K
+! SAL GST                  XT
+! SAL G(SßXZ)              X
+! SAL GUCK-                KU
+! SAL GUI-^                K
+! SAL G                    K
+! SAL HEAD-                E
+! SAL HE(LMNRST)-3^        E
+! SAL HE(LMN)-1            E
+! SAL HEUR1$               ÖR
+! SAL H^                   _
+! SAL IEC$                 IZ
+! SAL IEI-3                _
+! SAL IELL3                IEL
+! SAL IENNE$               IN
+! SAL IERRE$               IER
+! SAL IETTE$               IT
+! SAL IEU                  IÖ
+! SAL IE<4                 I
+! SAL IGHT3$               EIT
+! SAL IGNI(EO)-            INI
+! SAL IGN(AEOU)-$          INI
+! SAL IJ(AOU)-             I
+! SAL IJ$                  I
+! SAL IJ<                  EI
+! SAL IKOLE$               IKUL
+! SAL ILLAN(STZ)--         ILIA
+! SAL ILLAR(DT)--          ILIA
+! SAL INVER-               INFE
+! SAL ITI(AÄOÖUÜ)-         IZI
+! SAL IVIER$               IFIE
+! SAL I                    I
+! SAL JAVIE---<^           ZA
+! SAL JEAN^$               IA
+! SAL JEAN-^               IA
+! SAL JER-^                IE
+! SAL JE(LMNST)-           IE
+! SAL JOR(GK)^$            IÖRK
+! SAL J                    I
+! SAL KC(ÄEIJ)-            X
+! SAL KE(LMNRST)-3^        KE
+! SAL KH<^                 K
+! SAL KIC$                 KIZ
+! SAL KLE(LMNRST)-3^       KLE
+! SAL KOTELE-^             KUTL
+! SAL KREAT-^              KREA
+! SAL KST                  XT
+! SAL K(SßXZ)              X
+! SAL KTI(AIOU)-3          XI
+! SAL KT(SßXZ)             X
+! SAL K                    K
+! SAL LARVE-               LARF
+! SAL LEAND-^              LEAN
+! SAL LEL-                 LE
+! SAL LE(MNRST)-3^         LE
+! SAL LETTE$               LET
+! SAL LFGNAG-              LFKAN
+! SAL LIC$                 LIZ
+! SAL LIVE^$               LEIF
+! SAL LUI(GS)--            LU
+! SAL L                    L
+! SAL MASSEU(RS)-          NAZÖ
+! SAL MAURICE              NURIZ
+! SAL MBH^$                MPH
+! SAL MB(SßZ)-             N
+! SAL MC9^                 NK
+! SAL MEMOIR-^             NENUA
+! SAL ME(LMNRST)-3^        NE
+! SAL MIGUEL               NIKL
+! SAL MIKE^$               NEIK
+! SAL MN                   N
+! SAL MPJUTE-              NPUT
+! SAL MP(SßZ)-             N
+! SAL MP(BDJLMNPQRTVW)-    NP
+! SAL M                    N
+! SAL NACH^^               NAK
+! SAL NADINE               NATIN
+! SAL NAIV--               NA
+! SAL NAISE$               NEZE
+! SAL NCOISE$              ZUA
+! SAL NCOIS$               ZUA
+! SAL NEBEN^^              NEPN
+! SAL NE(LMNRST)-3^        NE
+! SAL NEN-3                NE
+! SAL NETTE$               NET
+! SAL NG(BDFJLMNPQRTVW)-   NK
+! SAL NICHTS^^             NIX
+! SAL NICHT^^              NIKT
+! SAL NINE$                NIN
+! SAL NON^^                NUN
+! SAL NOT^^                NUT
+! SAL NTI(AIOU)-3          NZI
+! SAL NTIEL--3             NZI
+! SAL NYLON                NEILUN
+! SAL ND(SßZ)$             NZ
+! SAL NT(SßZ)$             NZ
+! SAL ND'S$                NZ
+! SAL NT'S$                NZ
+! SAL NSTS$                NZ
+! SAL N                    N
+! SAL OBER^^               UPA
+! SAL OE2                  Ö
+! SAL OGNIE-               UNI
+! SAL OGN(AEOU)-$          UNI
+! SAL OIE$                 Ö
+! SAL OIR$                 UAR
+! SAL OIX                  UA
+! SAL OI<3                 EU
+! SAL OJ(AÄEIOÖUÜ)--       U
+! SAL OKAY^$               UKE
+! SAL OLYN$                ULIN
+! SAL OTI(AÄOÖUÜ)-         UZI
+! SAL OUI^                 FI
+! SAL OUILLE$              ULIE
+! SAL OU(DT)-^             AU
+! SAL OUSE$                AUZ
+! SAL OUT-                 AU
+! SAL OU                   U
+! SAL OWS$                 UZ
+! SAL OY(AÄEIOÖUÜ)--       U
+! SAL O(JY)<               EU
+! SAL O                    U
+! SAL PATIEN--^            PAZI
+! SAL PENSIO-^             PANZI
+! SAL PE(LMNRST)-3^        PE
+! SAL PFER-^               FE
+! SAL P(FH)<               F
+! SAL POLY^^               PULI
+! SAL PORTRAIT7            PURTRE
+! SAL PP(FH)--<            P
+! SAL PP-                  _
+! SAL PRIX^$               PRI
+! SAL P(SßZ)^              Z
+! SAL PTI(AÄOÖUÜ)-3        PZI
+! SAL PIC^$                PIK
+! SAL P                    P
+! SAL QUE(LMNRST)-3        KFE
+! SAL QUE$                 K
+! SAL QUI(NS)$             KI
+! SAL QU                   KF
+! SAL Q<                   K
+! SAL RCH                  RK
+! SAL RECHERCH^            REZAZ
+! SAL RER$                 RA
+! SAL RE(MNR)-4            RE
+! SAL RETTE$               RET
+! SAL RH<^                 R
+! SAL RJA(MN)--            RI
+! SAL RTI(AÄOÖUÜ)-3        RZI
+! SAL RY(KN)-$             RI
+! SAL R                    R
+! SAL SAFE^$               ZEIF
+! SAL SAUCE-^              ZUZ
+! SAL SCHSCH---7           _
+! SAL SCHTSCH              Z
+! SAL SC(HZ)<              Z
+! SAL SC                   ZK
+! SAL SELBSTST--7^^        ZELP
+! SAL SELBST7^^            ZELPZT
+! SAL SERVICE7^            ZÖRFIZ
+! SAL SE(LMNRST)-3^        ZE
+! SAL SETTE$               ZET
+! SAL SHP-^                Z
+! SAL SHST                 ZT
+! SAL SHTSH                Z
+! SAL SHT                  Z
+! SAL SH3                  Z
+! SAL SIEGLI-^             ZIKL
+! SAL SIGLI-^              ZIKL
+! SAL SIGHT                ZEIT
+! SAL SIGN                 ZEIN
+! SAL SKI(NPZ)-            ZKI
+! SAL SKI<^                ZI
+! SAL SOUND-               ZAUN
+! SAL STAATS^^             ZTAZ
+! SAL STADT^^              ZTAT
+! SAL START^^              ZTART
+! SAL STAURANT7            ZTURAN
+! SAL STEAK-               ZTE
+! SAL STRAF^^              ZTRAF
+! SAL ST'S$                Z
+! SAL STST--               _
+! SAL STS(ACEHIOUÄÜÖ)--    ZT
+! SAL ST(SZ)               Z
+! SAL STYN(AE)-$           ZTIN
+! SAL ST                   ZT
+! SAL SZE(NPT)-^           ZE
+! SAL SZI(ELN)-^           ZI
+! SAL SZCZ<                Z
+! SAL SZT<                 ZT
+! SAL SZ<3                 Z
+! SAL S                    Z
+! SAL T'S3$                Z
+! SAL TCH                  Z
+! SAL TEAT-^               TEA
+! SAL TE(LMNRST)-3^        TE
+! SAL TH<                  T
+! SAL TIC$                 TIZ
+! SAL TOAS-^               TU
+! SAL TOILET-              TULE
+! SAL TOIN-                TUA
+! SAL TRAINI-              TREN
+! SAL TSCH                 Z
+! SAL TSH                  Z
+! SAL TST                  ZT
+! SAL T(Sß)                Z
+! SAL TT(SZ)--<            _
+! SAL TT9                  T
+! SAL TZ-                  _
+! SAL T                    T
+! SAL UEBER^^              IPA
+! SAL UE2                  I
+! SAL UIE$                 I
+! SAL UM^^                 UN
+! SAL UNTERE--             UNTE
+! SAL UNTER^^              UNTA
+! SAL UNVER^^              UNFA
+! SAL UN^^                 UN
+! SAL UTI(AÄOÖUÜ)-         UZI
+! SAL U                    U
+! SAL VACL-^               FAZ
+! SAL VAC$                 FAZ
+! SAL VEDD-^               FE
+! SAL VEREIN               FAEIN
+! SAL VERSEN^              FAZN
+! SAL VER^^                FA
+! SAL VER                  FA
+! SAL VET(HT)-^            FET
+! SAL VETTE$               FET
+! SAL VIC$                 FIZ
+! SAL VIEL                 FIL
+! SAL VIEW                 FIU
+! SAL VOR^^                FUR
+! SAL VY9^                 FI
+! SAL V<                   F
+! SAL WE(LMNRST)-3^        FE
+! SAL WIC$                 FIZ
+! SAL WIEDER^^             FITA
+! SAL WY9^                 FI
+! SAL W                    F
+! SAL XE(LMNRST)-3^        XE
+! SAL X<^                  Z
+! SAL X(CSZ)               X
+! SAL XTS(CH)--            XT
+! SAL XT(SZ)               Z
+! SAL X                    X
+! SAL YE(LMNRST)-3^        IE
+! SAL YE-3                 I
+! SAL YOR(GK)^$            IÖRK
+! SAL Y(AOU)-<7            I
+! SAL YVES^$               IF
+! SAL YVONNE^$             IFUN
+! SAL Y                    I
+! SAL ZC(AOU)-             ZK
+! SAL ZE(LMNRST)-3^        ZE
+! SAL ZH<                  Z
+! SAL ZS(CHT)--            _
+! SAL ZS                   Z
+! SAL ZUERST               ZUERZT
+! SAL ZURÜCK^^             ZURIK
+! SAL ZUVER^^              ZUFA    # x
+! SAL Z                    Z
--- a/runtime/spell/de/de_DE.diff
+++ b/runtime/spell/de/de_DE.diff
@@ -1,10 +1,9 @@
-*** de_DE.orig.aff	Sat Nov 26 19:59:50 2005
---- de_DE.aff	Sat Nov 26 20:25:08 2005
+*** de_DE.orig.aff	2019-01-19 18:45:26.132522538 +0100
+--- de_DE.aff	2019-01-19 19:23:37.233297530 +0100
 ***************
-*** 2,3 ****
---- 2,21 ----
-  TRY esianrtolcdugmphbyfvkwäüößáéêàâñESIANRTOLCDUGMPHBYFVKWÄÜÖ
-+ 
+*** 15,16 ****
+--- 15,46 ----
+  
 + FOL  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + LOW  àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + UPP  ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ
@@ -22,512 +21,560 @@
 + MAP yÿý
 + MAP sß
 + 
-  #
++ COMPOUNDRULE xy?z
++ #COMPOUNDBEGIN x
++ #COMPOUNDMIDDLE y
++ #COMPOUNDEND z
++ 
++ # Prefixes are allowed at the beginning of compounds,
++ # suffixes are allowed at the end of compounds by default:
++ # (prefix)?(root)+(affix)?
++ # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
++ COMPOUNDPERMITFLAG c
++ 
++ ONLYINCOMPOUND o
++ 
+  PFX U Y 1
 ***************
-*** 28,31 ****
-  PFX V Y 1
-! PFX V   0     ver        . 
-!  
+*** 536,553 ****
+  #LANG de_DE
+! CHECKSHARPS
+! 
+  
+- COMPOUNDBEGIN x
+- COMPOUNDMIDDLE y
+- COMPOUNDEND z
+  FORBIDDENWORD d
   
---- 46,49 ----
-  PFX V Y 1
-! PFX V   0     ver          .
-! 
+- # Prefixes are allowed at the beginning of compounds,
+- # suffixes are allowed at the end of compounds by default:
+- # (prefix)?(root)+(affix)?
+- # Affixes with COMPOUNDPERMITFLAG may be inside of compounds.
+- COMPOUNDPERMITFLAG c
+- 
+- ONLYINCOMPOUND o
+- 
+  # my PSEUDOROOT h(elper) flag
+--- 566,571 ----
+  #LANG de_DE
+! # CHECKSHARPS
+  
+  FORBIDDENWORD d
+  
+  # my PSEUDOROOT h(elper) flag
+***************
+*** 571,573 ****
+  
+! WORDCHARS ß-.
+  
+--- 589,591 ----
+  
+! # WORDCHARS ß-.
   
 ***************
-*** 235,237 ****
-  SFX F   arzt  ärztin       arzt  
-! SFX F   arzt  Ärztinnen    arzt  
-  SFX F   Arzt  Ärztin       Arzt  
---- 253,255 ----
-  SFX F   arzt  ärztin       arzt  
-! SFX F   arzt  ärztinnen    arzt  
-  SFX F   Arzt  Ärztin       Arzt  
-***************
-*** 1410 ****
---- 1428,1904 ----
-  REP ö öe
-+ 
-+ #   German phonetic transformation rules from Aspell
-+ #   Copyright (C) 2000 Björn Jacke, distributed under LGPL.
-+ #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
-+ #   Last changed 2000-01-07
-+ 
-+ SAL followup        1
-+ SAL collapse_result 1
-+ 
-+ SAL ÄER-                 E
-+ SAL ÄU<                  EU
-+ SAL Ä<                   E
-+ SAL É                    E
-+ SAL ÖER-                 Ö
-+ SAL Ö                    Ö
-+ SAL ÜBER^^               IPA
-+ SAL ÜER-                 I
-+ SAL Ü                    I
-+ SAL ß                    Z
-+ SAL ABELLE$              APL
-+ SAL ABELL$               APL
-+ SAL ABIENNE$             APIN
-+ SAL ACEY$                AZI
-+ SAL AEU<                 EU
-+ SAL AE2                  E
-+ SAL AGNI-^               AKN
-+ SAL AGNIE-               ANI
-+ SAL AGN(AEOU)-$          ANI
-+ SAL AIA2                 AIA
-+ SAL AIE$                 E
-+ SAL AILL(EOU)-           ALI
-+ SAL AINE$                EN
-+ SAL AIRE$                ER
-+ SAL AIR-                 E
-+ SAL AISE$                EZ
-+ SAL AISSANCE$            EZANZ
-+ SAL AISSE$               EZ
-+ SAL AIX$                 EX
-+ SAL AJ(AÄEIOÖUÜ)--       A
-+ SAL AKTIE                AXIE
-+ SAL ALO(IY)^             ALUI
-+ SAL AMATEU(RS)-          ANATÖ
-+ SAL ANIELLE$             ANIL
-+ SAL ANTI^^               ANTI
-+ SAL ANVER^^              ANFA
-+ SAL ATIA$                ATIA
-+ SAL ATIA(NS)--           ATI
-+ SAL ATI(AÄOÖUÜ)-         AZI
-+ SAL AUAU--               _
-+ SAL AUER<                AUA
-+ SAL AUF^^                AUF
-+ SAL AULT$                U
-+ SAL AUSSE$               UZ
-+ SAL AUS(ST)-^            AUZ
-+ SAL AUS^^                AUZ
-+ SAL AUTO^^               AUTU
-+ SAL AUX(IY)-             AUX
-+ SAL AUX                  U
-+ SAL AU                   AU
-+ SAL AVIER$               AFIE
-+ SAL AYER--<              EI
-+ SAL AY(AÄEIOÖUÜ)--       A
-+ SAL A(IJY)<              EI
-+ SAL A                    A
-+ SAL BEA(BCMNRU)-^        PEA
-+ SAL BEAT(AEIMORU)-^      PEAT
-+ SAL BEIGE^$              PEZ
-+ SAL BE(LMNRST)-^         PE
-+ SAL BETTE$               PET
-+ SAL BIC$                 PIZ
-+ SAL BOWL(EI)-            PUL
-+ SAL BP(AÄEIOÖRUÜY)-      P
-+ SAL BUDGET7              PIKE
-+ SAL BUFFET7              PIFE
-+ SAL BYLLE$               PILE
-+ SAL BYLL$                PIL
-+ SAL BYTE<                PEIT
-+ SAL B                    P
-+ SAL CÄ-                  Z
-+ SAL CÜ$                  ZI
-+ SAL CACH(EI)-^           KEZ
-+ SAL CAE--                Z
-+ SAL CA(IY)$              ZEI
-+ SAL CCH                  Z
-+ SAL CCE-                 X
-+ SAL CE(EIJUY)--          Z
-+ SAL CENT<                ZENT
-+ SAL CERST(EI)----^       KE
-+ SAL CER$                 ZA
-+ SAL CE3                  ZE
-+ SAL CHAO(ST)-            KAU
-+ SAL CHAMPIO-^            ZENPI
-+ SAL CHAR(AI)-^           KAR
-+ SAL CHAU(CDFSVWXZ)-      ZU
-+ SAL CHE(CF)-             ZE
-+ SAL CHEM-^               KE
-+ SAL CHEQUE<              ZEK
-+ SAL CHI(CFGPVW)-         ZI
-+ SAL CH(AEUY)-<^          Z
-+ SAL CHK-                 _
-+ SAL CH(LOR)-<^           K
-+ SAL CHST-                X
-+ SAL CH(SßXZ)3            X
-+ SAL CH                   K
-+ SAL CIER$                ZIE
-+ SAL CYB-^                ZEI
-+ SAL CY9^                 ZI
-+ SAL C(IJY)-3             Z
-+ SAL CKST                 XT
-+ SAL CK(SßXZ)3            X
-+ SAL C(CK)-               _
-+ SAL CLAUDET---           KLU
-+ SAL CLAUDINE^$           KLUTIN
-+ SAL COLE$                KUL
-+ SAL COUCH                KAUZ
-+ SAL CQUES$               K
-+ SAL CQUE                 K
-+ SAL CREAT-^              KREA
-+ SAL CST                  XT
-+ SAL CS<^                 Z
-+ SAL C(SßX)               X
-+ SAL CT(SßXZ)             X
-+ SAL CZ<                  Z
-+ SAL C<                   K
-+ SAL D'H^                 T
-+ SAL D'S3$                Z
-+ SAL DAVO(NR)-^$          TAFU
-+ SAL DD(SZ)--<            _
-+ SAL DEPOT7               TEPU
-+ SAL DESIGN               TIZEIN
-+ SAL DE(LMNRST)-3^        TE
-+ SAL DETTE$               TET
-+ SAL DIC$                 TIZ
-+ SAL DJ(AEIOU)-^          I
-+ SAL DS(CH)--<            T
-+ SAL DST                  ZT
-+ SAL DT-                  _
-+ SAL DUIS-^               TI
-+ SAL DURCH^^              TURK
-+ SAL DZS(CH)--            T
-+ SAL D(SßZ)               Z
-+ SAL D                    T
-+ SAL EAULT$               U
-+ SAL EAUX$                U
-+ SAL EAU                  U
-+ SAL EAV                  IF
-+ SAL EA(AÄEIOÖÜY)-3       EA
-+ SAL EA3$                 EA
-+ SAL EA3                  I
-+ SAL EBEN^^               EPN
-+ SAL EE9                  E
-+ SAL EIEI--               _
-+ SAL EIH--                E
-+ SAL EILLE$               EI
-+ SAL EI                   EI
-+ SAL EJ$                  EI
-+ SAL EL-^                 E
-+ SAL EL(DKL)--1           E
-+ SAL EL(MNT)--1$          E
-+ SAL ELYNE$               ELINE
-+ SAL ELYN$                ELIN
-+ SAL EL(AÄEIOÖUÜY)-1      EL
-+ SAL EL-1                 L
-+ SAL EM-^                 E
-+ SAL EM(DFKMPQT)--1       E
-+ SAL EM(AÄEIOÖUÜY)--1     E
-+ SAL EM-1                 N
-+ SAL EN-^                 E
-+ SAL EN(CDGKQT)--1        E
-+ SAL ENZ(AEIOUY)--1       EN
-+ SAL EN(AÄEINOÖUÜY)-1     EN
-+ SAL EN-<1                N
-+ SAL ERH(AÄEIOÖUÜ)-^      ER
-+ SAL ER-^                 E
-+ SAL ER(AÄEIOÖUÜY)-1      A
-+ SAL ER1$                 A
-+ SAL ER<1                 A
-+ SAL ETI(AÄOÖÜU)-         EZI
-+ SAL EUEU--               _
-+ SAL EUILLE$              Ö
-+ SAL EUR$                 ÖR
-+ SAL EUX                  Ö
-+ SAL EUYS$                EUZ
-+ SAL EU                   EU
-+ SAL EYER<                EIA
-+ SAL EY<                  EI
-+ SAL E                    E
-+ SAL FANS--^$             FE
-+ SAL FAN-^$               FE
-+ SAL FAULT-               FUL
-+ SAL FEE(DL)-             FI
-+ SAL FEHLER               FELA
-+ SAL FE(LMNRST)-3^        FE
-+ SAL FOND7                FUN
-+ SAL FRAIN$               FRA
-+ SAL FRISEU(RS)-          FRIZÖ  # x
-+ SAL F                    F
-+ SAL G'S$                 X
-+ SAL GAGS^$               KEX
-+ SAL GAG^$                KEK
-+ SAL GD                   KT
-+ SAL GEGEN^^              KEKN
-+ SAL GE(LMNRST)-3^        KE
-+ SAL GETTE$               KET
-+ SAL G(CK)-               _
-+ SAL GG-                  _
-+ SAL GI(AO)-^             I
-+ SAL GION$                KIUN
-+ SAL GIUS-^               IU
-+ SAL GMBH^$               GMPH
-+ SAL GNAC$                NIAK
-+ SAL GNON$                NIUN
-+ SAL GN$                  N
-+ SAL GONCAL-^             KUNZA
-+ SAL GS(CH)--             K
-+ SAL GST                  XT
-+ SAL G(SßXZ)              X
-+ SAL GUCK-                KU
-+ SAL GUI-^                K
-+ SAL G                    K
-+ SAL HEAD-                E
-+ SAL HE(LMNRST)-3^        E
-+ SAL HE(LMN)-1            E
-+ SAL HEUR1$               ÖR
-+ SAL H^                   _
-+ SAL IEC$                 IZ
-+ SAL IEI-3                _
-+ SAL IELL3                IEL
-+ SAL IENNE$               IN
-+ SAL IERRE$               IER
-+ SAL IETTE$               IT
-+ SAL IEU                  IÖ
-+ SAL IE<4                 I
-+ SAL IGHT3$               EIT
-+ SAL IGNI(EO)-            INI
-+ SAL IGN(AEOU)-$          INI
-+ SAL IJ(AOU)-             I
-+ SAL IJ$                  I
-+ SAL IJ<                  EI
-+ SAL IKOLE$               IKUL
-+ SAL ILLAN(STZ)--         ILIA
-+ SAL ILLAR(DT)--          ILIA
-+ SAL INVER-               INFE
-+ SAL ITI(AÄOÖUÜ)-         IZI
-+ SAL IVIER$               IFIE
-+ SAL I                    I
-+ SAL JAVIE---<^           ZA
-+ SAL JEAN^$               IA
-+ SAL JEAN-^               IA
-+ SAL JER-^                IE
-+ SAL JE(LMNST)-           IE
-+ SAL JOR(GK)^$            IÖRK
-+ SAL J                    I
-+ SAL KC(ÄEIJ)-            X
-+ SAL KE(LMNRST)-3^        KE
-+ SAL KH<^                 K
-+ SAL KIC$                 KIZ
-+ SAL KLE(LMNRST)-3^       KLE
-+ SAL KOTELE-^             KUTL
-+ SAL KREAT-^              KREA
-+ SAL KST                  XT
-+ SAL K(SßXZ)              X
-+ SAL KTI(AIOU)-3          XI
-+ SAL KT(SßXZ)             X
-+ SAL K                    K
-+ SAL LARVE-               LARF
-+ SAL LEAND-^              LEAN
-+ SAL LEL-                 LE
-+ SAL LE(MNRST)-3^         LE
-+ SAL LETTE$               LET
-+ SAL LFGNAG-              LFKAN
-+ SAL LIC$                 LIZ
-+ SAL LIVE^$               LEIF
-+ SAL LUI(GS)--            LU
-+ SAL L                    L
-+ SAL MASSEU(RS)-          NAZÖ
-+ SAL MAURICE              NURIZ
-+ SAL MBH^$                MPH
-+ SAL MB(SßZ)-             N
-+ SAL MC9^                 NK
-+ SAL MEMOIR-^             NENUA
-+ SAL ME(LMNRST)-3^        NE
-+ SAL MIGUEL               NIKL
-+ SAL MIKE^$               NEIK
-+ SAL MN                   N
-+ SAL MPJUTE-              NPUT
-+ SAL MP(SßZ)-             N
-+ SAL MP(BDJLMNPQRTVW)-    NP
-+ SAL M                    N
-+ SAL NACH^^               NAK
-+ SAL NADINE               NATIN
-+ SAL NAIV--               NA
-+ SAL NAISE$               NEZE
-+ SAL NCOISE$              ZUA
-+ SAL NCOIS$               ZUA
-+ SAL NEBEN^^              NEPN
-+ SAL NE(LMNRST)-3^        NE
-+ SAL NEN-3                NE
-+ SAL NETTE$               NET
-+ SAL NG(BDFJLMNPQRTVW)-   NK
-+ SAL NICHTS^^             NIX
-+ SAL NICHT^^              NIKT
-+ SAL NINE$                NIN
-+ SAL NON^^                NUN
-+ SAL NOT^^                NUT
-+ SAL NTI(AIOU)-3          NZI
-+ SAL NTIEL--3             NZI
-+ SAL NYLON                NEILUN
-+ SAL ND(SßZ)$             NZ
-+ SAL NT(SßZ)$             NZ
-+ SAL ND'S$                NZ
-+ SAL NT'S$                NZ
-+ SAL NSTS$                NZ
-+ SAL N                    N
-+ SAL OBER^^               UPA
-+ SAL OE2                  Ö
-+ SAL OGNIE-               UNI
-+ SAL OGN(AEOU)-$          UNI
-+ SAL OIE$                 Ö
-+ SAL OIR$                 UAR
-+ SAL OIX                  UA
-+ SAL OI<3                 EU
-+ SAL OJ(AÄEIOÖUÜ)--       U
-+ SAL OKAY^$               UKE
-+ SAL OLYN$                ULIN
-+ SAL OTI(AÄOÖUÜ)-         UZI
-+ SAL OUI^                 FI
-+ SAL OUILLE$              ULIE
-+ SAL OU(DT)-^             AU
-+ SAL OUSE$                AUZ
-+ SAL OUT-                 AU
-+ SAL OU                   U
-+ SAL OWS$                 UZ
-+ SAL OY(AÄEIOÖUÜ)--       U
-+ SAL O(JY)<               EU
-+ SAL O                    U
-+ SAL PATIEN--^            PAZI
-+ SAL PENSIO-^             PANZI
-+ SAL PE(LMNRST)-3^        PE
-+ SAL PFER-^               FE
-+ SAL P(FH)<               F
-+ SAL POLY^^               PULI
-+ SAL PORTRAIT7            PURTRE
-+ SAL PP(FH)--<            P
-+ SAL PP-                  _
-+ SAL PRIX^$               PRI
-+ SAL P(SßZ)^              Z
-+ SAL PTI(AÄOÖUÜ)-3        PZI
-+ SAL PIC^$                PIK
-+ SAL P                    P
-+ SAL QUE(LMNRST)-3        KFE
-+ SAL QUE$                 K
-+ SAL QUI(NS)$             KI
-+ SAL QU                   KF
-+ SAL Q<                   K
-+ SAL RCH                  RK
-+ SAL RECHERCH^            REZAZ
-+ SAL RER$                 RA
-+ SAL RE(MNR)-4            RE
-+ SAL RETTE$               RET
-+ SAL RH<^                 R
-+ SAL RJA(MN)--            RI
-+ SAL RTI(AÄOÖUÜ)-3        RZI
-+ SAL RY(KN)-$             RI
-+ SAL R                    R
-+ SAL SAFE^$               ZEIF
-+ SAL SAUCE-^              ZUZ
-+ SAL SCHSCH---7           _
-+ SAL SCHTSCH              Z
-+ SAL SC(HZ)<              Z
-+ SAL SC                   ZK
-+ SAL SELBSTST--7^^        ZELP
-+ SAL SELBST7^^            ZELPZT
-+ SAL SERVICE7^            ZÖRFIZ
-+ SAL SE(LMNRST)-3^        ZE
-+ SAL SETTE$               ZET
-+ SAL SHP-^                Z
-+ SAL SHST                 ZT
-+ SAL SHTSH                Z
-+ SAL SHT                  Z
-+ SAL SH3                  Z
-+ SAL SIEGLI-^             ZIKL
-+ SAL SIGLI-^              ZIKL
-+ SAL SIGHT                ZEIT
-+ SAL SIGN                 ZEIN
-+ SAL SKI(NPZ)-            ZKI
-+ SAL SKI<^                ZI
-+ SAL SOUND-               ZAUN
-+ SAL STAATS^^             ZTAZ
-+ SAL STADT^^              ZTAT
-+ SAL START^^              ZTART
-+ SAL STAURANT7            ZTURAN
-+ SAL STEAK-               ZTE
-+ SAL STRAF^^              ZTRAF
-+ SAL ST'S$                Z
-+ SAL STST--               _
-+ SAL STS(ACEHIOUÄÜÖ)--    ZT
-+ SAL ST(SZ)               Z
-+ SAL STYN(AE)-$           ZTIN
-+ SAL ST                   ZT
-+ SAL SZE(NPT)-^           ZE
-+ SAL SZI(ELN)-^           ZI
-+ SAL SZCZ<                Z
-+ SAL SZT<                 ZT
-+ SAL SZ<3                 Z
-+ SAL S                    Z
-+ SAL T'S3$                Z
-+ SAL TCH                  Z
-+ SAL TEAT-^               TEA
-+ SAL TE(LMNRST)-3^        TE
-+ SAL TH<                  T
-+ SAL TIC$                 TIZ
-+ SAL TOAS-^               TU
-+ SAL TOILET-              TULE
-+ SAL TOIN-                TUA
-+ SAL TRAINI-              TREN
-+ SAL TSCH                 Z
-+ SAL TSH                  Z
-+ SAL TST                  ZT
-+ SAL T(Sß)                Z
-+ SAL TT(SZ)--<            _
-+ SAL TT9                  T
-+ SAL TZ-                  _
-+ SAL T                    T
-+ SAL UEBER^^              IPA
-+ SAL UE2                  I
-+ SAL UIE$                 I
-+ SAL UM^^                 UN
-+ SAL UNTERE--             UNTE
-+ SAL UNTER^^              UNTA
-+ SAL UNVER^^              UNFA
-+ SAL UN^^                 UN
-+ SAL UTI(AÄOÖUÜ)-         UZI
-+ SAL U                    U
-+ SAL VACL-^               FAZ
-+ SAL VAC$                 FAZ
-+ SAL VEDD-^               FE
-+ SAL VEREIN               FAEIN
-+ SAL VERSEN^              FAZN
-+ SAL VER^^                FA
-+ SAL VER                  FA
-+ SAL VET(HT)-^            FET
-+ SAL VETTE$               FET
-+ SAL VIC$                 FIZ
-+ SAL VIEL                 FIL
-+ SAL VIEW                 FIU
-+ SAL VOR^^                FUR
-+ SAL VY9^                 FI
-+ SAL V<                   F
-+ SAL WE(LMNRST)-3^        FE
-+ SAL WIC$                 FIZ
-+ SAL WIEDER^^             FITA
-+ SAL WY9^                 FI
-+ SAL W                    F
-+ SAL XE(LMNRST)-3^        XE
-+ SAL X<^                  Z
-+ SAL X(CSZ)               X
-+ SAL XTS(CH)--            XT
-+ SAL XT(SZ)               Z
-+ SAL X                    X
-+ SAL YE(LMNRST)-3^        IE
-+ SAL YE-3                 I
-+ SAL YOR(GK)^$            IÖRK
-+ SAL Y(AOU)-<7            I
-+ SAL YVES^$               IF
-+ SAL YVONNE^$             IFUN
-+ SAL Y                    I
-+ SAL ZC(AOU)-             ZK
-+ SAL ZE(LMNRST)-3^        ZE
-+ SAL ZH<                  Z
-+ SAL ZS(CHT)--            _
-+ SAL ZS                   Z
-+ SAL ZUERST               ZUERZT
-+ SAL ZURÜCK^^             ZURIK
-+ SAL ZUVER^^              ZUFA    # x
-+ SAL Z                    Z
-*** de_DE.orig.dic	Sat Nov 26 19:59:52 2005
---- de_DE.dic	Mon Jan  2 15:35:27 2006
-***************
-*** 1,3 ****
-  319017
-- 23508
-  A-Bombe/N
---- 1,2 ----
+*** 725,729 ****
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! BREAK 2
+! BREAK -
+! BREAK .
+! 
+--- 743,1241 ----
+  # So enabling this is the lesser evil. No perfect solution found so far...
+! # BREAK 2
+! # BREAK -
+! # BREAK .
+! 
+! #   German phonetic transformation rules for use with Aspell
+! #   Copyright (C) 2000 Björn Jacke
+! #
+! #   This library is free software; you can redistribute it and/or
+! #   modify it under the terms of the GNU Lesser General Public
+! #   License version 2.1 as published by the Free Software Foundation;
+! #
+! #   This 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 this library; if not, write to the Free Software
+! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+! #
+! #   Björn Jacke may be reached by email at bjoern.jacke@gmx.de
+! #
+! #   Changelog:
+! #
+! #   2000-01-05  Björn Jacke <bjoern.jacke@gmx.de>
+! #               Initial Release
+! #   2000-01-07  Kevin Atkinson <kevinatk@home.com>
+! #               Converted from header to data file.
+! SAL followup        1
+! SAL collapse_result 1
+! 
+! SAL ÄER-                 E
+! SAL ÄU<                  EU
+! SAL Ä<                   E
+! SAL É                    E
+! SAL ÖER-                 Ö
+! SAL Ö                    Ö
+! SAL ÜBER^^               IPA
+! SAL ÜER-                 I
+! SAL Ü                    I
+! SAL ß                    Z
+! SAL ABELLE$              APL
+! SAL ABELL$               APL
+! SAL ABIENNE$             APIN
+! SAL ACEY$                AZI
+! SAL AEU<                 EU
+! SAL AE2                  E
+! SAL AGNI-^               AKN
+! SAL AGNIE-               ANI
+! SAL AGN(AEOU)-$          ANI
+! SAL AIA2                 AIA
+! SAL AIE$                 E
+! SAL AILL(EOU)-           ALI
+! SAL AINE$                EN
+! SAL AIRE$                ER
+! SAL AIR-                 E
+! SAL AISE$                EZ
+! SAL AISSANCE$            EZANZ
+! SAL AISSE$               EZ
+! SAL AIX$                 EX
+! SAL AJ(AÄEIOÖUÜ)--       A
+! SAL AKTIE                AXIE
+! SAL ALO(IY)^             ALUI
+! SAL AMATEU(RS)-          ANATÖ
+! SAL ANIELLE$             ANIL
+! SAL ANTI^^               ANTI
+! SAL ANVER^^              ANFA
+! SAL ATIA$                ATIA
+! SAL ATIA(NS)--           ATI
+! SAL ATI(AÄOÖUÜ)-         AZI
+! SAL AUAU--               _
+! SAL AUER<                AUA
+! SAL AUF^^                AUF
+! SAL AULT$                U
+! SAL AUSSE$               UZ
+! SAL AUS(ST)-^            AUZ
+! SAL AUS^^                AUZ
+! SAL AUTO^^               AUTU
+! SAL AUX(IY)-             AUX
+! SAL AUX                  U
+! SAL AU                   AU
+! SAL AVIER$               AFIE
+! SAL AYER--<              EI
+! SAL AY(AÄEIOÖUÜ)--       A
+! SAL A(IJY)<              EI
+! SAL A                    A
+! SAL BEA(BCMNRU)-^        PEA
+! SAL BEAT(AEIMORU)-^      PEAT
+! SAL BEIGE^$              PEZ
+! SAL BE(LMNRST)-^         PE
+! SAL BETTE$               PET
+! SAL BIC$                 PIZ
+! SAL BOWL(EI)-            PUL
+! SAL BP(AÄEIOÖRUÜY)-      P
+! SAL BUDGET7              PIKE
+! SAL BUFFET7              PIFE
+! SAL BYLLE$               PILE
+! SAL BYLL$                PIL
+! SAL BYTE<                PEIT
+! SAL B                    P
+! SAL CÄ-                  Z
+! SAL CÜ$                  ZI
+! SAL CACH(EI)-^           KEZ
+! SAL CAE--                Z
+! SAL CA(IY)$              ZEI
+! SAL CCH                  Z
+! SAL CCE-                 X
+! SAL CE(EIJUY)--          Z
+! SAL CENT<                ZENT
+! SAL CERST(EI)----^       KE
+! SAL CER$                 ZA
+! SAL CE3                  ZE
+! SAL CHAO(ST)-            KAU
+! SAL CHAMPIO-^            ZENPI
+! SAL CHAR(AI)-^           KAR
+! SAL CHAU(CDFSVWXZ)-      ZU
+! SAL CHE(CF)-             ZE
+! SAL CHEM-^               KE
+! SAL CHEQUE<              ZEK
+! SAL CHI(CFGPVW)-         ZI
+! SAL CH(AEUY)-<^          Z
+! SAL CHK-                 _
+! SAL CH(LOR)-<^           K
+! SAL CHST-                X
+! SAL CH(SßXZ)3            X
+! SAL CH                   K
+! SAL CIER$                ZIE
+! SAL CYB-^                ZEI
+! SAL CY9^                 ZI
+! SAL C(IJY)-3             Z
+! SAL CKST                 XT
+! SAL CK(SßXZ)3            X
+! SAL C(CK)-               _
+! SAL CLAUDET---           KLU
+! SAL CLAUDINE^$           KLUTIN
+! SAL COLE$                KUL
+! SAL COUCH                KAUZ
+! SAL CQUES$               K
+! SAL CQUE                 K
+! SAL CREAT-^              KREA
+! SAL CST                  XT
+! SAL CS<^                 Z
+! SAL C(SßX)               X
+! SAL CT(SßXZ)             X
+! SAL CZ<                  Z
+! SAL C<                   K
+! SAL D'H^                 T
+! SAL D'S3$                Z
+! SAL DAVO(NR)-^$          TAFU
+! SAL DD(SZ)--<            _
+! SAL DEPOT7               TEPU
+! SAL DESIGN               TIZEIN
+! SAL DE(LMNRST)-3^        TE
+! SAL DETTE$               TET
+! SAL DIC$                 TIZ
+! SAL DJ(AEIOU)-^          I
+! SAL DS(CH)--<            T
+! SAL DST                  ZT
+! SAL DT-                  _
+! SAL DUIS-^               TI
+! SAL DURCH^^              TURK
+! SAL DZS(CH)--            T
+! SAL D(SßZ)               Z
+! SAL D                    T
+! SAL EAULT$               U
+! SAL EAUX$                U
+! SAL EAU                  U
+! SAL EAV                  IF
+! SAL EA(AÄEIOÖÜY)-3       EA
+! SAL EA3$                 EA
+! SAL EA3                  I
+! SAL EBEN^^               EPN
+! SAL EE9                  E
+! SAL EIEI--               _
+! SAL EIH--                E
+! SAL EILLE$               EI
+! SAL EI                   EI
+! SAL EJ$                  EI
+! SAL EL-^                 E
+! SAL EL(DKL)--1           E
+! SAL EL(MNT)--1$          E
+! SAL ELYNE$               ELINE
+! SAL ELYN$                ELIN
+! SAL EL(AÄEIOÖUÜY)-1      EL
+! SAL EL-1                 L
+! SAL EM-^                 E
+! SAL EM(DFKMPQT)--1       E
+! SAL EM(AÄEIOÖUÜY)--1     E
+! SAL EM-1                 N
+! SAL EN-^                 E
+! SAL EN(CDGKQT)--1        E
+! SAL ENZ(AEIOUY)--1       EN
+! SAL EN(AÄEINOÖUÜY)-1     EN
+! SAL EN-<1                N
+! SAL ERH(AÄEIOÖUÜ)-^      ER
+! SAL ER-^                 E
+! SAL ER(AÄEIOÖUÜY)-1      A
+! SAL ER1$                 A
+! SAL ER<1                 A
+! SAL ETI(AÄOÖÜU)-         EZI
+! SAL EUEU--               _
+! SAL EUILLE$              Ö
+! SAL EUR$                 ÖR
+! SAL EUX                  Ö
+! SAL EUYS$                EUZ
+! SAL EU                   EU
+! SAL EYER<                EIA
+! SAL EY<                  EI
+! SAL E                    E
+! SAL FANS--^$             FE
+! SAL FAN-^$               FE
+! SAL FAULT-               FUL
+! SAL FEE(DL)-             FI
+! SAL FEHLER               FELA
+! SAL FE(LMNRST)-3^        FE
+! SAL FOND7                FUN
+! SAL FRAIN$               FRA
+! SAL FRISEU(RS)-          FRIZÖ  # x
+! SAL F                    F
+! SAL G'S$                 X
+! SAL GAGS^$               KEX
+! SAL GAG^$                KEK
+! SAL GD                   KT
+! SAL GEGEN^^              KEKN
+! SAL GE(LMNRST)-3^        KE
+! SAL GETTE$               KET
+! SAL G(CK)-               _
+! SAL GG-                  _
+! SAL GI(AO)-^             I
+! SAL GION$                KIUN
+! SAL GIUS-^               IU
+! SAL GMBH^$               GMPH
+! SAL GNAC$                NIAK
+! SAL GNON$                NIUN
+! SAL GN$                  N
+! SAL GONCAL-^             KUNZA
+! SAL GS(CH)--             K
+! SAL GST                  XT
+! SAL G(SßXZ)              X
+! SAL GUCK-                KU
+! SAL GUI-^                K
+! SAL G                    K
+! SAL HEAD-                E
+! SAL HE(LMNRST)-3^        E
+! SAL HE(LMN)-1            E
+! SAL HEUR1$               ÖR
+! SAL H^                   _
+! SAL IEC$                 IZ
+! SAL IEI-3                _
+! SAL IELL3                IEL
+! SAL IENNE$               IN
+! SAL IERRE$               IER
+! SAL IETTE$               IT
+! SAL IEU                  IÖ
+! SAL IE<4                 I
+! SAL IGHT3$               EIT
+! SAL IGNI(EO)-            INI
+! SAL IGN(AEOU)-$          INI
+! SAL IJ(AOU)-             I
+! SAL IJ$                  I
+! SAL IJ<                  EI
+! SAL IKOLE$               IKUL
+! SAL ILLAN(STZ)--         ILIA
+! SAL ILLAR(DT)--          ILIA
+! SAL INVER-               INFE
+! SAL ITI(AÄOÖUÜ)-         IZI
+! SAL IVIER$               IFIE
+! SAL I                    I
+! SAL JAVIE---<^           ZA
+! SAL JEAN^$               IA
+! SAL JEAN-^               IA
+! SAL JER-^                IE
+! SAL JE(LMNST)-           IE
+! SAL JOR(GK)^$            IÖRK
+! SAL J                    I
+! SAL KC(ÄEIJ)-            X
+! SAL KE(LMNRST)-3^        KE
+! SAL KH<^                 K
+! SAL KIC$                 KIZ
+! SAL KLE(LMNRST)-3^       KLE
+! SAL KOTELE-^             KUTL
+! SAL KREAT-^              KREA
+! SAL KST                  XT
+! SAL K(SßXZ)              X
+! SAL KTI(AIOU)-3          XI
+! SAL KT(SßXZ)             X
+! SAL K                    K
+! SAL LARVE-               LARF
+! SAL LEAND-^              LEAN
+! SAL LEL-                 LE
+! SAL LE(MNRST)-3^         LE
+! SAL LETTE$               LET
+! SAL LFGNAG-              LFKAN
+! SAL LIC$                 LIZ
+! SAL LIVE^$               LEIF
+! SAL LUI(GS)--            LU
+! SAL L                    L
+! SAL MASSEU(RS)-          NAZÖ
+! SAL MAURICE              NURIZ
+! SAL MBH^$                MPH
+! SAL MB(SßZ)-             N
+! SAL MC9^                 NK
+! SAL MEMOIR-^             NENUA
+! SAL ME(LMNRST)-3^        NE
+! SAL MIGUEL               NIKL
+! SAL MIKE^$               NEIK
+! SAL MN                   N
+! SAL MPJUTE-              NPUT
+! SAL MP(SßZ)-             N
+! SAL MP(BDJLMNPQRTVW)-    NP
+! SAL M                    N
+! SAL NACH^^               NAK
+! SAL NADINE               NATIN
+! SAL NAIV--               NA
+! SAL NAISE$               NEZE
+! SAL NCOISE$              ZUA
+! SAL NCOIS$               ZUA
+! SAL NEBEN^^              NEPN
+! SAL NE(LMNRST)-3^        NE
+! SAL NEN-3                NE
+! SAL NETTE$               NET
+! SAL NG(BDFJLMNPQRTVW)-   NK
+! SAL NICHTS^^             NIX
+! SAL NICHT^^              NIKT
+! SAL NINE$                NIN
+! SAL NON^^                NUN
+! SAL NOT^^                NUT
+! SAL NTI(AIOU)-3          NZI
+! SAL NTIEL--3             NZI
+! SAL NYLON                NEILUN
+! SAL ND(SßZ)$             NZ
+! SAL NT(SßZ)$             NZ
+! SAL ND'S$                NZ
+! SAL NT'S$                NZ
+! SAL NSTS$                NZ
+! SAL N                    N
+! SAL OBER^^               UPA
+! SAL OE2                  Ö
+! SAL OGNIE-               UNI
+! SAL OGN(AEOU)-$          UNI
+! SAL OIE$                 Ö
+! SAL OIR$                 UAR
+! SAL OIX                  UA
+! SAL OI<3                 EU
+! SAL OJ(AÄEIOÖUÜ)--       U
+! SAL OKAY^$               UKE
+! SAL OLYN$                ULIN
+! SAL OTI(AÄOÖUÜ)-         UZI
+! SAL OUI^                 FI
+! SAL OUILLE$              ULIE
+! SAL OU(DT)-^             AU
+! SAL OUSE$                AUZ
+! SAL OUT-                 AU
+! SAL OU                   U
+! SAL OWS$                 UZ
+! SAL OY(AÄEIOÖUÜ)--       U
+! SAL O(JY)<               EU
+! SAL O                    U
+! SAL PATIEN--^            PAZI
+! SAL PENSIO-^             PANZI
+! SAL PE(LMNRST)-3^        PE
+! SAL PFER-^               FE
+! SAL P(FH)<               F
+! SAL POLY^^               PULI
+! SAL PORTRAIT7            PURTRE
+! SAL PP(FH)--<            P
+! SAL PP-                  _
+! SAL PRIX^$               PRI
+! SAL P(SßZ)^              Z
+! SAL PTI(AÄOÖUÜ)-3        PZI
+! SAL PIC^$                PIK
+! SAL P                    P
+! SAL QUE(LMNRST)-3        KFE
+! SAL QUE$                 K
+! SAL QUI(NS)$             KI
+! SAL QU                   KF
+! SAL Q<                   K
+! SAL RCH                  RK
+! SAL RECHERCH^            REZAZ
+! SAL RER$                 RA
+! SAL RE(MNR)-4            RE
+! SAL RETTE$               RET
+! SAL RH<^                 R
+! SAL RJA(MN)--            RI
+! SAL RTI(AÄOÖUÜ)-3        RZI
+! SAL RY(KN)-$             RI
+! SAL R                    R
+! SAL SAFE^$               ZEIF
+! SAL SAUCE-^              ZUZ
+! SAL SCHSCH---7           _
+! SAL SCHTSCH              Z
+! SAL SC(HZ)<              Z
+! SAL SC                   ZK
+! SAL SELBSTST--7^^        ZELP
+! SAL SELBST7^^            ZELPZT
+! SAL SERVICE7^            ZÖRFIZ
+! SAL SE(LMNRST)-3^        ZE
+! SAL SETTE$               ZET
+! SAL SHP-^                Z
+! SAL SHST                 ZT
+! SAL SHTSH                Z
+! SAL SHT                  Z
+! SAL SH3                  Z
+! SAL SIEGLI-^             ZIKL
+! SAL SIGLI-^              ZIKL
+! SAL SIGHT                ZEIT
+! SAL SIGN                 ZEIN
+! SAL SKI(NPZ)-            ZKI
+! SAL SKI<^                ZI
+! SAL SOUND-               ZAUN
+! SAL STAATS^^             ZTAZ
+! SAL STADT^^              ZTAT
+! SAL START^^              ZTART
+! SAL STAURANT7            ZTURAN
+! SAL STEAK-               ZTE
+! SAL STRAF^^              ZTRAF
+! SAL ST'S$                Z
+! SAL STST--               _
+! SAL STS(ACEHIOUÄÜÖ)--    ZT
+! SAL ST(SZ)               Z
+! SAL STYN(AE)-$           ZTIN
+! SAL ST                   ZT
+! SAL SZE(NPT)-^           ZE
+! SAL SZI(ELN)-^           ZI
+! SAL SZCZ<                Z
+! SAL SZT<                 ZT
+! SAL SZ<3                 Z
+! SAL S                    Z
+! SAL T'S3$                Z
+! SAL TCH                  Z
+! SAL TEAT-^               TEA
+! SAL TE(LMNRST)-3^        TE
+! SAL TH<                  T
+! SAL TIC$                 TIZ
+! SAL TOAS-^               TU
+! SAL TOILET-              TULE
+! SAL TOIN-                TUA
+! SAL TRAINI-              TREN
+! SAL TSCH                 Z
+! SAL TSH                  Z
+! SAL TST                  ZT
+! SAL T(Sß)                Z
+! SAL TT(SZ)--<            _
+! SAL TT9                  T
+! SAL TZ-                  _
+! SAL T                    T
+! SAL UEBER^^              IPA
+! SAL UE2                  I
+! SAL UIE$                 I
+! SAL UM^^                 UN
+! SAL UNTERE--             UNTE
+! SAL UNTER^^              UNTA
+! SAL UNVER^^              UNFA
+! SAL UN^^                 UN
+! SAL UTI(AÄOÖUÜ)-         UZI
+! SAL U                    U
+! SAL VACL-^               FAZ
+! SAL VAC$                 FAZ
+! SAL VEDD-^               FE
+! SAL VEREIN               FAEIN
+! SAL VERSEN^              FAZN
+! SAL VER^^                FA
+! SAL VER                  FA
+! SAL VET(HT)-^            FET
+! SAL VETTE$               FET
+! SAL VIC$                 FIZ
+! SAL VIEL                 FIL
+! SAL VIEW                 FIU
+! SAL VOR^^                FUR
+! SAL VY9^                 FI
+! SAL V<                   F
+! SAL WE(LMNRST)-3^        FE
+! SAL WIC$                 FIZ
+! SAL WIEDER^^             FITA
+! SAL WY9^                 FI
+! SAL W                    F
+! SAL XE(LMNRST)-3^        XE
+! SAL X<^                  Z
+! SAL X(CSZ)               X
+! SAL XTS(CH)--            XT
+! SAL XT(SZ)               Z
+! SAL X                    X
+! SAL YE(LMNRST)-3^        IE
+! SAL YE-3                 I
+! SAL YOR(GK)^$            IÖRK
+! SAL Y(AOU)-<7            I
+! SAL YVES^$               IF
+! SAL YVONNE^$             IFUN
+! SAL Y                    I
+! SAL ZC(AOU)-             ZK
+! SAL ZE(LMNRST)-3^        ZE
+! SAL ZH<                  Z
+! SAL ZS(CHT)--            _
+! SAL ZS                   Z
+! SAL ZUERST               ZUERZT
+! SAL ZURÜCK^^             ZURIK
+! SAL ZUVER^^              ZUFA    # x
+! SAL Z                    Z
--- 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 @@ DE_REGIONS = de_$*REGIONS
 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 @@ all: $SPELLDIR/de.latin1.spl $SPELLDIR/d
 		$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
-        :print =================================================== >>$target
-        :print de_19 (old)      >> $target
-        :cat README_de_19.txt   >> $target
+        :fetch $READMES
+        :print de_DE_frami.txt            >! $target
+        :cat README_de_DE_frami.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 @@ de_19.aff de_19.dic: {buildcheck=}
         :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 @@ de_19.aff de_19.dic: {buildcheck=}
         @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 @@ de_AT.aff de_AT.dic: {buildcheck=}
             :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 @@ diff:
         :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 @@ diff:
 
 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 @@ check:
                     @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 :
--- a/runtime/spell/fixdup.vim
+++ b/runtime/spell/fixdup.vim
@@ -15,6 +15,9 @@ while lnum <= line('$')
       continue		" don't increment lnum, it's already at the next word
     endif
   endif
+  if lnum%1000 == 0
+    echon "\r Processing line ".lnum. printf(" [ %02d%%]", lnum*100/line('$'))
+  endif
   let lnum += 1
 endwhile