updated for version 7.0137

2 files changed, 35 insertions, 16 deletions

diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 291a3d366..a90763d00 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 24
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -775,16 +775,16 @@ item can be used if more affixes are to be used.  Possible values:
 
 	FLAG long	use two-character flags
 	FLAG num	use numbers, from 1 up to 65000
-	FLAG huh	use one-character flags without A-Z and two-character
+	FLAG caplong	use one-character flags without A-Z and two-character
 			flags that start with A-Z
 
 With "FLAG num" the numbers in a list of affixes need to be separated with a
 comma: "234,2143,1435".  This method is inefficient, but useful if the file is
 generated with a program.
 
-When using "huh" the two-character flags all start with a capital: "Aa", "B1",
-"BB", etc.  This is useful to use one-character flags for the most common
-items and two-character flags for uncommon items.
+When using "caplong" the two-character flags all start with a capital: "Aa",
+"B1", "BB", etc.  This is useful to use one-character flags for the most
+common items and two-character flags for uncommon items.
 
 Note: When using utf-8 only characters up to 65000 may be used for flags.
 
@@ -802,6 +802,17 @@ Example:
 	SFX F 0 in   [^i]n      # Spion > Spionin  ~
 	SFX F 0 nen  in         # Bauerin > Bauerinnen ~
 
+Apparently Myspell allows an affix name to appear more than once.  Since this
+might also be a mistake, Vim checks for an extra "S".  The affix files for
+Myspell that use this feature apparently have this flag.  Example:
+
+	SFX a Y 1 S ~
+	SFX a 0 an . ~
+
+	SFX a Y 2 S ~
+	SFX a 0 en . ~
+	SFX a 0 on . ~
+
 							*spell-affix-rare*
 An extra item for Vim is the "rare" flag.  It must come after the other
 fields, before a comment.  When used then all words that use the affix will be
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 21d7926f8..81c93f926 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 24
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -31,16 +31,29 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 -------------------- Known bugs and current work -----------------------
 
 Spelling:
-- Bug: with 'nowrap' spell checking may start halfway a word.
-
 - Use 'wrapscan' for "[s" and "]s"?
 
+- Is there a way to avoid compound IDs taking two utf-8 bytes?
+
+- Make COMPOUNDMIN 3 characters instead of 3 bytes.
+
 - Check support of flags of two characters, numbers (comma separated) and HUH.
   When using many compound flags, does regexp still work?
 
 - Compound word is accepted if nr of words is <= COMPOUNDMAX OR nr of
   syllables <= COMPOUNDSYLMAX.  Specify AND in the affix file?
 
+- ONLYINCOMPOUND -> NEEDCOMPOUND (also used for affix? or use "needcomp"
+  after affix)
+
+- COMPOUNDMAX -> COMPOUNDWORDMAX?
+
+- Support flags on a suffix.  Used for second level affixes.
+  The flags may also be used for compounding.  Default is an OR mechanism with
+  the flags of the word.  Adding "compset" on the affixes means the compound
+  flags of the word are not used.
+  Instead of "SFX a 0 add/FLAGS ." we could use "SFX a 0 add . /FLAGS".
+
 - Do we need a flag for the rule that when compounding is done the following
   word doesn't have a capital after a word character, even for Onecap words?
 
@@ -51,20 +64,15 @@ Spelling:
     - Example with compounding dash is bad, gets in the way of setting
       COMPOUNDMIN and COMPOUNDMAX to a reasonable value.
     - PSEUDOROOT == NEEDAFFIX
-- Make COMPOUNDMIN 3 characters instead of 3 bytes?
-- COMPOUNDMAX -> COMPOUNDWORDMAX?
-- ONLYINCOMPOUND -> NEEDCOMPOUND (also used for affix? or use "needcomp"
-  after affix)
-- Use "comp" flag on affix to allow compounding for word that uses this
-  affix.  However, also need to define which compound flag to be used.
-  "comp/m"?  Alternative: use flags after add string.
+    - COMPOUNDROOT -> COMPOUNDED?  For a word that already is a compound word
+	    Or use COMPOUNDED2, COMPOUNDED3, etc.
 - CIRCUMFIX: when a word uses a prefix marked with the CIRCUMFIX flag,
   then the word must also have a suffix marked with the CIRCUMFIX flag.
   It's a bit primitive, since only one flag is used, which doesn't allow
   matching specific prefixes with suffixes.
   Alternative:
 	PSFX {flag} {pchop} {padd} {pcond} {schop} {sadd}[/flags] {scond}
-- Support two suffixes by adding "/flags" to add part of suffix.
+  We might not need this at all, you can use the NEEDAFFIX flag.
 - When a suffix has more than one syllable, it may count as a word for
   COMPOUNDMAX.
 - Add flags to count extra syllables in a word.  SYLLABLEADDONE