Updated runtime files.

17 files changed, 2371 insertions, 2172 deletions

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index b78cddfef1..087e31a1f5 100644
--- 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
diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt
index 54b07ac48d..2e2f852845 100644
--- 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 :help xim from Vim command prompt.
 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
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 18db324b81..cee9e0127a 100644
--- 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-CHECKCOMPOUNDTRIPLE*
 		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-COMPOUNDFIRST*
 		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|
 
-COMPOUNDEND	(Hunspell)				*spell-COMPOUNDEND*
+COMPOUNDLAST	(Hunspell)				*spell-COMPOUNDLAST*
+		Words signed with COMPOUNDLAST may be last elements in
+		compound words.
 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
 
+COMPOUNDEND	(Hunspell)				*spell-COMPOUNDEND*
+		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*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index a090a24230..4cc2fa7b69 100644
--- 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-CHECKCOMPOUNDDUP*
 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-COMPOUNDEND*
 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*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 4ade4a131c..024b7a7cd3 100644
--- 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 codes for these):
 	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 codes for these):
 	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'*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 5437298880..95fdfeb924 100644
--- 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/issues/1234
 							*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,9 +139,9 @@ Signs:
 Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
 13, #2910)  Can't reproduce?
 
-Merge checking for 'cursorline' and 'concealcursor', see neovim #9492.
+Patch to recognize more systems with has().  (Ozaki Kiichi, #3855)
 
-Patch to not call setActiveWindow. Yasuhiro Matsumoto, 2019 Jan 8, #3778)
+Merge checking for 'cursorline' and 'concealcursor', see neovim #9492.
 
 Errors found with random data:
     heap-buffer-overflow in alist_add (#2472)
@@ -190,6 +183,9 @@ Patch on #3690 to fix that "wincmd p" does not always behave properly.
 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 handle accented chars? (nivaemail,
 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 Nov 17, #3621)
 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" to go to the end of the line, suddenly
 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 @@ sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep
 - 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
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 30ce129182..5a21a1dfb9 100644
--- 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")
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index dc03211916..87773ed279 100644
--- 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
diff --git a/runtime/ftplugin/mma.vim b/runtime/ftplugin/mma.vim
new file mode 100644
index 0000000000..ce4cee18ae
--- /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*\)
diff --git a/runtime/spell/README.txt b/runtime/spell/README.txt
index d427a3c152..9fc3fd1efb 100644
--- a/runtime/spell/README.txt
+++ b/runtime/spell/README.txt
@@ -17,10 +17,10 @@ ftp://ftp.gnu.org/gnu/aspell/dict/.  Most go under the GPL or LGPL copyright.
 
 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 the Aap recipe :-).
 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 @@ This procedure should work well:
    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
diff --git a/runtime/spell/de/de_19.diff b/runtime/spell/de/de_19.diff
index 8689840e3d..a2b9fa4408 100644
--- 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
diff --git a/runtime/spell/de/de_20.diff b/runtime/spell/de/de_20.diff
index 73141b6216..bbac7a0b64 100644
--- 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        . 
-!  
-  
---- 46,49 ----
-  PFX V Y 1
-! PFX V   0     ver          .
+*** 536,553 ****
+  #LANG de_DE
+! CHECKSHARPS
 ! 
   
+- 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
+--- 566,571 ----
+  #LANG de_DE
+! # CHECKSHARPS
+  
+  FORBIDDENWORD d
+  
+  # my PSEUDOROOT h(elper) flag
 ***************
-*** 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