From 89c40ad32e0c9fe954d5118caee3c9e352d653d8 Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Tue, 23 Jan 2024 16:11:14 +0100
Subject: [PATCH] add options.gml template file for optencod utility options
 source file update optencod utility gml comments

---
 bld/as/h/options.gml                     |  91 ++++-----
 bld/bdiff/gml/optionsi.gml               |  22 ++-
 bld/bdiff/gml/optionsp.gml               |  23 ++-
 bld/bdiff/gml/optionsu.gml               |  23 ++-
 bld/cc/gml/options.gml                   |  23 ++-
 bld/f77/gml/{wfxopts.gml => options.gml} |  17 +-
 bld/f77/wfc/master.mif                   |   2 +-
 bld/f77/wfl/master.mif                   |   2 +-
 bld/fe_misc/h/options.gml                |  92 +++++++++
 bld/mstools/asaxp/gml/options.gml        |  91 ++++-----
 bld/mstools/cl/gml/options.gml           |  91 ++++-----
 bld/mstools/cvtres/gml/options.gml       |  91 ++++-----
 bld/mstools/lib/gml/options.gml          |  91 ++++-----
 bld/mstools/link/gml/options.gml         |  91 ++++-----
 bld/mstools/nmake/gml/options.gml        |  91 ++++-----
 bld/mstools/rc/gml/options.gml           |  91 ++++-----
 bld/ndisasm/stand/options.gml            |  17 +-
 bld/nwlib/optionsa.gml                   |  17 +-
 bld/nwlib/optionsw.gml                   |  17 +-
 bld/plusplus/gml/options.gml             |  23 ++-
 bld/rc/rc/h/options.gml                  |  15 +-
 bld/wasm/h/options.gml                   |  98 ++-------
 bld/wcl/h/optionso.gml                   |  17 +-
 bld/wcl/h/optionsw.gml                   |  17 +-
 bld/wsample/h/options.gml                |  17 +-
 bld/wstrip/options.gml                   |  17 +-
 bld/wtouch/options.gml                   |  17 +-
 docs/doc/cg/cpoptmac.gml                 | 242 +++++++++++++++++++++++
 docs/doc/java/options.gml                |   5 +-
 29 files changed, 894 insertions(+), 557 deletions(-)
 rename bld/f77/gml/{wfxopts.gml => options.gml} (97%)
 create mode 100644 bld/fe_misc/h/options.gml
 create mode 100644 docs/doc/cg/cpoptmac.gml

diff --git a/bld/as/h/options.gml b/bld/as/h/options.gml
index 7e92099395..e608d4eb6c 100644
--- a/bld/as/h/options.gml
+++ b/bld/as/h/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  RISC assembler command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :chain. o v
 
diff --git a/bld/bdiff/gml/optionsi.gml b/bld/bdiff/gml/optionsi.gml
index 767a8efc87..bbf5316d89 100644
--- a/bld/bdiff/gml/optionsi.gml
+++ b/bld/bdiff/gml/optionsi.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  BDIFF utility command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,13 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.               default - any, dbg
-:cmt.               architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.               host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.               extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
 :cmt.
-:cmt.   Translations are required for the :jtitle. and :jusage. tags
+:cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
+:cmt.
 
 
 :noequal.
diff --git a/bld/bdiff/gml/optionsp.gml b/bld/bdiff/gml/optionsp.gml
index 154c23fa4c..57dedcca0b 100644
--- a/bld/bdiff/gml/optionsp.gml
+++ b/bld/bdiff/gml/optionsp.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  BPATCH utility command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.               default - any, dbg
-:cmt.               architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.               host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.               extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
 :cmt.
-:cmt.   Translations are required for the :jtitle. and :jusage. tags
+:cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage: bpatch {-p} {-q} {-b} <file>
 :jtitle. 使用方法: bpatch {-p} {-q} {-b} <file>
diff --git a/bld/bdiff/gml/optionsu.gml b/bld/bdiff/gml/optionsu.gml
index 0e07ecc613..42b0c18238 100644
--- a/bld/bdiff/gml/optionsu.gml
+++ b/bld/bdiff/gml/optionsu.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  BDUMP utility command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.               default - any, dbg
-:cmt.               architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.               host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.               extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
 :cmt.
-:cmt.   Translations are required for the :jtitle. and :jusage. tags
+:cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage: bdump {-p} {-q} {-b} <file>
 :jtitle. 使用方法: bdump {-p} {-q} {-b} <file>
diff --git a/bld/cc/gml/options.gml b/bld/cc/gml/options.gml
index b0cf65fb18..e1f5a38e64 100644
--- a/bld/cc/gml/options.gml
+++ b/bld/cc/gml/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  C compiler command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.               default - any, dbg
-:cmt.               architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.               host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.               extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
 :cmt.
-:cmt.   Translations are required for the :jtitle. and :jusage. tags
+:cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage: wccaxp [options] file [options]
 :jtitle. 使用方法: wccaxp [options] file [options]
diff --git a/bld/f77/gml/wfxopts.gml b/bld/f77/gml/options.gml
similarity index 97%
rename from bld/f77/gml/wfxopts.gml
rename to bld/f77/gml/options.gml
index 36d61e9abf..249c8bc24e 100644
--- a/bld/f77/gml/wfxopts.gml
+++ b/bld/f77/gml/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  WFC and WFL compilers command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage: wfc [options] <file-spec> [options]
 :jtitle. 使用方法: wfc [options] <file-spec> [options]
diff --git a/bld/f77/wfc/master.mif b/bld/f77/wfc/master.mif
index 56bd1c34d0..75884f62a8 100644
--- a/bld/f77/wfc/master.mif
+++ b/bld/f77/wfc/master.mif
@@ -131,6 +131,6 @@ optencod_targets = $(target_cpu) $(host_os)
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res) : $(f77_dir)/gml/wfxopts.gml $(__MAKEFILES__)
+usage.gh $(exetarg_$(host_os)_res) : $(f77_dir)/gml/options.gml $(__MAKEFILES__)
     @%make echo_optencod
     $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/f77/wfl/master.mif b/bld/f77/wfl/master.mif
index 5161b582eb..bc410860fd 100644
--- a/bld/f77/wfl/master.mif
+++ b/bld/f77/wfl/master.mif
@@ -86,6 +86,6 @@ optencod_targets = $(target_cpu) $(host_os) targ1 $(optencod_targets_$(target_cp
 optencod_targets += dbg
 !endif
 
-usage.gh $(exetarg_$(host_os)_res) : $(f77_dir)/gml/wfxopts.gml $(__MAKEFILES__)
+usage.gh $(exetarg_$(host_os)_res) : $(f77_dir)/gml/options.gml $(__MAKEFILES__)
     @%make echo_optencod
     $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/fe_misc/h/options.gml b/bld/fe_misc/h/options.gml
new file mode 100644
index 0000000000..d823461061
--- /dev/null
+++ b/bld/fe_misc/h/options.gml
@@ -0,0 +1,92 @@
+:cmt.*****************************************************************************
+:cmt.*
+:cmt.*                            Open Watcom Project
+:cmt.*
+:cmt.* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
+:cmt.*    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
+:cmt.*
+:cmt.*  ========================================================================
+:cmt.*
+:cmt.*    This file contains Original Code and/or Modifications of Original
+:cmt.*    Code as defined in and that are subject to the Sybase Open Watcom
+:cmt.*    Public License version 1.0 (the 'License'). You may not use this file
+:cmt.*    except in compliance with the License. BY USING THIS FILE YOU AGREE TO
+:cmt.*    ALL TERMS AND CONDITIONS OF THE LICENSE. A copy of the License is
+:cmt.*    provided with the Original Code and Modifications, and is also
+:cmt.*    available at www.sybase.com/developer/opensource.
+:cmt.*
+:cmt.*    The Original Code and all software distributed under the License are
+:cmt.*    distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+:cmt.*    EXPRESS OR IMPLIED, AND SYBASE AND ALL CONTRIBUTORS HEREBY DISCLAIM
+:cmt.*    ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF
+:cmt.*    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR
+:cmt.*    NON-INFRINGEMENT. Please see the License for the specific language
+:cmt.*    governing rights and limitations under the License.
+:cmt.*
+:cmt.*  ========================================================================
+:cmt.*
+:cmt.* Description:  WHEN YOU FIGURE OUT WHAT THIS FILE DOES, PLEASE
+:cmt.*               DESCRIBE IT HERE!
+:cmt.*
+:cmt.*****************************************************************************
+:cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
+:cmt.
+:cmt. GML Macros used:
+:cmt.
+:cmt.	:chain. <option> <option> ...               options that start with <option>
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
+:cmt.
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
+:cmt.
+:cmt. Global macros
+:cmt.
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
+:cmt.
+:cmt. where <targ>:
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
+:cmt.
+
diff --git a/bld/mstools/asaxp/gml/options.gml b/bld/mstools/asaxp/gml/options.gml
index 8ed526ee3b..8a19639aa2 100644
--- a/bld/mstools/asaxp/gml/options.gml
+++ b/bld/mstools/asaxp/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS asaxp RISC assembler command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: asaxp [options] <filename>
 :target. any
diff --git a/bld/mstools/cl/gml/options.gml b/bld/mstools/cl/gml/options.gml
index ed4ad288c4..53bb18c8f9 100644
--- a/bld/mstools/cl/gml/options.gml
+++ b/bld/mstools/cl/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS cl command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: cl [options] file [options]
 :target. any
diff --git a/bld/mstools/cvtres/gml/options.gml b/bld/mstools/cvtres/gml/options.gml
index a3fa97080f..53daecf459 100644
--- a/bld/mstools/cvtres/gml/options.gml
+++ b/bld/mstools/cvtres/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS cvtres command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: cvtres [options] file
 :target. qnx linux osx bsd haiku
diff --git a/bld/mstools/lib/gml/options.gml b/bld/mstools/lib/gml/options.gml
index 2ae3636205..1a7d7afec8 100644
--- a/bld/mstools/lib/gml/options.gml
+++ b/bld/mstools/lib/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS lib command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: lib [options] [files] [@commandfile]
 :target. any
diff --git a/bld/mstools/link/gml/options.gml b/bld/mstools/link/gml/options.gml
index 1f07f408e9..69c8a43764 100644
--- a/bld/mstools/link/gml/options.gml
+++ b/bld/mstools/link/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS link command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: link [options] file [options]
 :target. any
diff --git a/bld/mstools/nmake/gml/options.gml b/bld/mstools/nmake/gml/options.gml
index c45d119145..49cfa275a1 100644
--- a/bld/mstools/nmake/gml/options.gml
+++ b/bld/mstools/nmake/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS nmake command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: nmake [options] [macros] [targets] [@commandfile]
 :target. any
diff --git a/bld/mstools/rc/gml/options.gml b/bld/mstools/rc/gml/options.gml
index cfeeb90332..298055da49 100644
--- a/bld/mstools/rc/gml/options.gml
+++ b/bld/mstools/rc/gml/options.gml
@@ -27,64 +27,67 @@
 :cmt.*
 :cmt.* Description:  MSTOOLS rc command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
-:cmt.						    	can be chained together i.e.,
-:cmt.						    	-oa -ox -ot => -oaxt
-:cmt.	:target. <targ1> <targ2> ...                valid for these targets
-:cmt.	:ntarget. <targ1> <targ2> ...               not valid for these targets
-:cmt.	:usagechain. <option> <usage text>          group of options that start with <option>
-:cmt.                                                	are chained together in usage
-:cmt.	:usagegroup. <num> <usage text>             group of options that have group <num>
-:cmt.                                                	are chained together in usage
-:cmt.	:title. <text>                              English title usage text
-:cmt.	:jtitle. <text>                             Japanese title usage text
-:cmt.	:titleu. <text>                             English title usage text for QNX resource file
-:cmt.	:jtitleu. <text>                            Japanese title usage text for QNX resource file
+:cmt.                                                   can be chained together i.e.,
+:cmt.                                                   -oa -ox -ot => -oaxt
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
+:cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
+:cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
+:cmt.                                                   are chained together in usage
+:cmt.   :usagegroup. <num> <usage text>             group of options that have group <num>
+:cmt.                                                   are chained together in usage
+:cmt.   :title. <text>                              English title usage text
+:cmt.   :jtitle. <text>                             Japanese title usage text
+:cmt.   :titleu. <text>                             English title usage text for QNX resource file
+:cmt.   :jtitleu. <text>                            Japanese title usage text for QNX resource file
 :cmt.
-:cmt.	:option. <option> <synonym> ...             define an option
-:cmt.	:immediate. <fn> [<usage argid>]            <fn> is called when option parsed
-:cmt.	:code. <source-code>                        <source-code> is executed when option parsed
-:cmt.	:enumerate. <name> [<option>]               option is one value in <name> enumeration
-:cmt.	:number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
-:cmt.	:id. [<fn>] [<usage argid>]		    =<id> req'd; call <fn> to check
-:cmt.	:char. [<fn>] [<usage argid>]		    =<char> req'd; call <fn> to check
-:cmt.	:file. [<usage argid>]			    =<file> req'd
-:cmt.	:path. [<usage argid>]			    =<path> req'd
-:cmt.	:special. <fn> [<usage argid>]		    call <fn> to parse option
-:cmt.	:usage. <text>                              English usage text
-:cmt.	:jusage. <text>                             Japanese usage text
+:cmt.   :option. <option> <synonym> ...             define an option
+:cmt.   :immediate. <fn> [<usage argid>]            <fn> is called when option parsed
+:cmt.   :code. <source-code>                        <source-code> is executed when option parsed
+:cmt.   :enumerate. <name> [<option>]               option is one value in <name> enumeration
+:cmt.   :number. [<fn>] [<default>] [<usage argid>] =<num> allowed; call <fn> to check
+:cmt.   :id. [<fn>] [<usage argid>]                 =<id> req'd; call <fn> to check
+:cmt.   :char. [<fn>] [<usage argid>]               =<char> req'd; call <fn> to check
+:cmt.   :file. [<usage argid>]                      =<file> req'd
+:cmt.   :path. [<usage argid>]                      =<path> req'd
+:cmt.   :special. <fn> [<usage argid>]              call <fn> to parse option
+:cmt.   :usage. <text>                              English usage text
+:cmt.   :jusage. <text>                             Japanese usage text
 :cmt.
-:cmt.	:optional.                                  value is optional
-:cmt.	:internal.                                  option is undocumented
-:cmt.	:prefix.                                    prefix of a :special. option
-:cmt.	:nochain.                                   option isn't chained with other options
-:cmt.	:timestamp.                                 kludge to record "when" an option
-:cmt.                                                	is set so that dependencies
-:cmt.                                                	between options can be simulated
-:cmt.	:negate.                                    negate option value
-:cmt.	:group. <num>                               group <num> to which option is included
+:cmt.   :optional.                                  value is optional
+:cmt.   :internal.                                  option is undocumented
+:cmt.   :prefix.                                    prefix of a :special. option
+:cmt.   :nochain.                                   option isn't chained with other options
+:cmt.   :timestamp.                                 kludge to record "when" an option
+:cmt.                                                   is set so that dependencies
+:cmt.                                                   between options can be simulated
+:cmt.   :negate.                                    negate option value
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
-:cmt.	:noequal.                                   args can't have option '='
-:cmt.	:argequal. <char>                           args use <char> instead of '='
+:cmt.   :noequal.                                   args can't have option '='
+:cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.		    default - any, dbg
-:cmt.		    architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.		    host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.		    extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
+:cmt.
+:cmt. Translations are required for the :jtitle. and :jusage. tags
+:cmt.   if there is no text associated with the tag.
 :cmt.
-:cmt.	Translations are required for the :jtitle. and :jusage. tags
-:cmt.	if there is no text associated with the tag.
-
 
 :title. Usage: rc [options] file [options]
 :target. any
diff --git a/bld/ndisasm/stand/options.gml b/bld/ndisasm/stand/options.gml
index 8f392dd294..1a1b7df631 100644
--- a/bld/ndisasm/stand/options.gml
+++ b/bld/ndisasm/stand/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  disassembler wdis command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage:  wdis [options] obj_file [options]
 :jtitle. 使用方法:  wdis [options] obj_file [options]
diff --git a/bld/nwlib/optionsa.gml b/bld/nwlib/optionsa.gml
index 7fb2756393..37815afce5 100644
--- a/bld/nwlib/optionsa.gml
+++ b/bld/nwlib/optionsa.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  librarian ar command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title.  Usage: %s <command> [<modifiers>] <archive> [modules]
 :jtitle. 使用法： %s <command> [<modifiers>] <archive> [modules]
diff --git a/bld/nwlib/optionsw.gml b/bld/nwlib/optionsw.gml
index 40edeb8c8c..d59536b3d6 100644
--- a/bld/nwlib/optionsw.gml
+++ b/bld/nwlib/optionsw.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  librarian wlib command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title.  Usage: wlib { <option> } <library_name> [ <commands> ]
 :jtitle. 使用方法: wlib { <option> } <library_name> [ <commands> ]
diff --git a/bld/plusplus/gml/options.gml b/bld/plusplus/gml/options.gml
index 83919193f6..7854adab21 100644
--- a/bld/plusplus/gml/options.gml
+++ b/bld/plusplus/gml/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  C++ compiler command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.               default - any, dbg
-:cmt.               architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.               host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
-:cmt.               extra - targ1, targ2
+:cmt.   default - any, dbg, unused
+:cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
+:cmt.   extra - targ1, targ2
 :cmt.
-:cmt.   Translations are required for the :jtitle. and :jusage. tags
+:cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title.  Usage: wpp [options] file [options]
 :jtitle. 使用方法: wpp [options] file [options]
diff --git a/bld/rc/rc/h/options.gml b/bld/rc/rc/h/options.gml
index 5ed2695ec5..b4ab490c4c 100644
--- a/bld/rc/rc/h/options.gml
+++ b/bld/rc/rc/h/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  resource compiler wrc command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -79,12 +82,12 @@
 :cmt. where <targ>:
 :cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title.  Usage: wrc {options} input-filename {options} [output-filename] {options}
 :jtitle. 使用方法: wrc {options} input-filename {options} [output-filename] {options}
diff --git a/bld/wasm/h/options.gml b/bld/wasm/h/options.gml
index 38563fdc1f..cc0bfed9e0 100644
--- a/bld/wasm/h/options.gml
+++ b/bld/wasm/h/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  x86 assembler wasm command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,45 +80,43 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title.  Usage: wasm [options] asm_file [options] [@env_var]
 :jtitle. 使用方法: wasm [options] file [options] [@env_var]
 :titleu.  Usage: %C [options] asm_file [options] [@env_var]
 :jtitleu. 使用方法: %C [options] file [options] [@env_var]
-:target. any
 
 :title.  Options:
 :jtitle. オプション:
-:target. any
 :title.  .         ( /option is also accepted )
 :jtitle. .         ( /ｵﾌﾟｼｮﾝ でも指定できます )
-:target. any
 :ntarget. bsd linux osx qnx haiku
 
 :chain. 2 3 4 5 6
 :cmt.:chain. m
 
-:option. h ?
-:target. any
+:option. ?
+:usage. print this message
+:jusage. このメッセージを表示します
+
+:option. h
 :usage. print this message
 :jusage. このメッセージを表示します
 
 :option. 0
-:target. any
 :enumerate. cpu_info
 :usage. 8086 instructions
 :jusage. 8086 命令
 
 :option. 1
-:target. any
 :enumerate. cpu_info
 :usage. 80186 instructions
 :jusage. 80186 命令
@@ -124,13 +125,11 @@
 :jusage. 80286 命令
 
 :option. 2
-:target. any
 :enumerate. cpu_info
 :usage. real mode instructions
 :jusage. real mode instructions
 
 :option. 2p
-:target. any
 :usage. protected mode instructions
 :jusage. protected mode instructions
 
@@ -138,23 +137,19 @@
 :jusage. 80386 命令
 
 :option. 3
-:target. any
 :enumerate. cpu_info
 :usage. real mode instructions
 :jusage. real mode instructions
 
 :option. 3r
-:target. any
 :usage. register calling conventions
 :jusage. レジスタ呼び出し規約
 
 :option. 3s
-:target. any
 :usage. stack calling conventions
 :jusage. スタック呼び出し規約
 
 :option. 3p
-:target. any
 :usage. protected mode instructions
 :jusage. protected mode instructions
 
@@ -162,23 +157,19 @@
 :jusage. 80486 命令
 
 :option. 4
-:target. any
 :enumerate. cpu_info
 :usage. real mode instructions
 :jusage. real mode instructions
 
 :option. 4r
-:target. any
 :usage. register calling conventions
 :jusage. レジスタ呼び出し規約
 
 :option. 4s
-:target. any
 :usage. stack calling conventions
 :jusage. スタック呼び出し規約
 
 :option. 4p
-:target. any
 :usage. protected mode instructions
 :jusage. protected mode instructions
 
@@ -186,23 +177,19 @@
 :jusage. Pentium 命令
 
 :option. 5
-:target. any
 :enumerate. cpu_info
 :usage. real mode instructions
 :jusage. real mode instructions
 
 :option. 5r
-:target. any
 :usage. register calling conventions
 :jusage. レジスタ呼び出し規約
 
 :option. 5s
-:target. any
 :usage. stack calling conventions
 :jusage. スタック呼び出し規約
 
 :option. 5p
-:target. any
 :usage. protected mode instructions
 :jusage. protected mode instructions
 
@@ -210,196 +197,164 @@
 :jusage. 6 Pentium Pro 命令
 
 :option. 6
-:target. any
 :enumerate. cpu_info
 :usage. real mode instructions
 :jusage. real mode instructions
 
 :option. 6r
-:target. any
 :usage. register calling conventions
 :jusage. レジスタ呼び出し規約
 
 :option. 6s
-:target. any
 :usage. stack calling conventions
 :jusage. スタック呼び出し規約
 
 :option. 6p
-:target. any
 :usage. protected mode instructions
 :jusage. protected mode instructions
 
 :option. bt
-:target. any
 :id. . <os>
 :optional.
 :usage. set the build target to <os>
 :jusage. set the build target to <os>
 
 :option. c
-:target. any
 :usage. disable output OMF COMMENT record about data in code
 :jusage. disable output OMF COMMENT record about data in code
 
 :option. cx
-:target. any
 :usage. symbols are not case-sensitive
 :jusage. symbols are not case-sensitive
 
 :option. d
-:target. any
 :special. scanDefine <name>[=text]
 :usage. define text macro <name>[=text]
 :jusage. テキストマクロを定義します <name>[=text]
 
 :option. d+
-:target. any
 :internal.
 :enumerate ignore
 :usage. define extended text macro <name>[=text]
 :jusage. define extended text macro <name>[=text]
 
 :option. d0
-:target. any
 :enumerate. debug_info
 :usage. 
 :jusage. 
 
 :option. d1
-:target. any
 :enumerate. debug_info
 :usage. line number debugging support
 :jusage. 行番号デバッグ情報を出力します
 
 :option. d2
-:target. any
 :enumerate. debug_info
 :internal.
 :usage. 
 :jusage. 
 
 :option. d3
-:target. any
 :enumerate. debug_info
 :internal.
 :usage. 
 :jusage. 
 
 :option. ee
-:target. any
 :usage. stop reading ASM file at END directive
 :jusage. ENDディレクティブでASMファイルの読み込みを止めます
 
 :option. e
-:target. any
 :number.
 :usage. set error limit number
 :jusage. set error limit number
 
 :option. fi
-:target. any
 :file.
 :usage. force <file> to be included
 :jusage. force <file> to be included
 
 :option. fl
-:target. any
 :file.
 :usage. listing file
 :jusage. listing file
 
 :option. fo
-:target. any
 :file.
 :optional.
 :usage. set object file name
 :jusage. オブジェクトファイルを設定します
 
 :option. fp0
-:target. any
 :enumerate. fpu_info
 :usage. floating-point for 8087
 :jusage. floating-point for 8087
 
 :option. fp2
-:target. any
 :enumerate. fpu_info
 :usage. floating-point for 287
 :jusage. floating-point for 287
 
 :option. fp3
-:target. any
 :enumerate. fpu_info
 :usage. floating-point for 387
 :jusage. floating-point for 387
 
 :option. fp5
-:target. any
 :enumerate. fpu_info
 :usage. floating-point for Pentium
 :jusage. floating-point for Pentium
 
 :option. fp6
-:target. any
 :enumerate. fpu_info
 :usage. floating-point for Pentium Pro
 :jusage. floating-point for Pentium Pro
 
 :option. fpc
-:target. any
 :enumerate. fpu_type
 :usage. calls to floating-point library
 :jusage. calls to floating-point library
 
 :option. fpi
-:target. any
 :enumerate. fpu_type
 :usage. inline 80x87 instructions with emulation
 :jusage. inline 80x87 instructions with emulation
 
 :option. fpi87
-:target. any
 :enumerate. fpu_type
 :usage. inline 80x87 instructions
 :jusage. inline 80x87 instructions
 
 :option. fr fe
-:target. any
 :file.
 :optional.
 :usage. set error file name
 :jusage. エラーファイル名を指定します
 
 :option. hc
-:target. any
 :internal.
 :enumerate ignore
 :usage. debug info format CodeView
 :jusage. debug info format CodeView
 
 :option. hd
-:target. any
 :internal.
 :enumerate ignore
 :usage. debug info format DWARF
 :jusage. debug info format DWARF
 
 :option. hw
-:target. any
 :internal.
 :enumerate ignore
 :usage. debug info format WATCOM
 :jusage. debug info format WATCOM
 
 :option. i
-:target. any
 :path.
 :usage. add directory to list of include directories
 :jusage. インクルード・ディレクトリのリストを追加します
 
 :option. j s
-:target. any
 :usage. force signed types to be used for signed values
 :jusage. 符号付き型を符号付き値のために使用するようにします
 
@@ -407,134 +362,111 @@
 :jusage. メモリ・モデル
 
 :option. mc
-:target. any
 :enumerate. mem_model
 :usage. Compact
 :jusage. Compact
 
 :option. mf
-:target. any
 :enumerate. mem_model
 :usage. Flat
 :jusage. Flat
 
 :option. mh
-:target. any
 :enumerate. mem_model
 :usage. Huge
 :jusage. Huge
 
 :option. ml
-:target. any
 :enumerate. mem_model
 :usage. Large
 :jusage. Large
 
 :option. mm
-:target. any
 :enumerate. mem_model
 :usage. Medium
 :jusage. Medium
 
 :option. ms
-:target. any
 :enumerate. mem_model
 :usage. Small
 :jusage. Small
 
 :option. mt
-:target. any
 :enumerate. mem_model
 :usage. Tiny
 :jusage. Tiny
 
 :option. nc
-:target. any
 :id. . <name>
 :internal.
 :usage. set code class name
 :jusage. set code class name
 
 :option. nd
-:target. any
 :id. . <name>
 :usage. set data segment name
 :jusage. set data segment name
 
 :option. nm
-:target. any
 :file. . <name>
 :usage. set module name
 :jusage. set module name
 
 :option. nt
-:target. any
 :id. . <name>
 :usage. set name of text segment
 :jusage. set name of text segment
 
 :option. o
-:target. any
 :usage. allow C form of octal constants
 :jusage. allow C form of octal constants
 
 :option. od
-:target. any
 :internal.
 :usage. disable all optimization
 :jusage. disable all optimization
 
 :option. of
-:target. any
 :enumerate. trace_stack
 :usage. generate traceable stack frames as needed
 :jusage. generate traceable stack frames as needed
 
 :option. of+
-:target. any
 :enumerate. trace_stack
 :usage. always generate traceable stack frames
 :jusage. always generate traceable stack frames
 
 :option. zcm
-:target. any
 :special. scanMode [=<mode>]
 :number.
 :usage. set compatibility mode - watcom (default), masm, tasm or ideal
 :jusage. set compatibility mode - watcom (default), masm, tasm or ideal
 
 :option. zld
-:target. any
 :usage. suppress file dependency info in object file
 :jusage. suppress file dependency info in object file
 
 :option. zq q
-:target. any
 :usage. operate quietly
 :jusage. メッセージ等の出力をしません
 
 :option. zz
-:target. any
 :usage. remove '@size' from STDCALL function names
 :jusage. remove '@size' from STDCALL function names
 
 :option. zzo
-:target. any
 :usage. don't mangle STDCALL symbols (backward compatible)
 :jusage. don't mangle STDCALL symbols (backward compatible)
 
 :option. w
-:target. any
 :number.
 :usage. set warning level number
 :jusage. set warning level number
 
 :option. we
-:target. any
 :usage. treat all warnings as errors
 :jusage. treat all warnings as errors
 
 :option. wx
-:target. any
 :usage. set warning level to the highest level
 :jusage. set warning level to the highest level
diff --git a/bld/wcl/h/optionso.gml b/bld/wcl/h/optionso.gml
index 6588e7ef59..26134737bb 100644
--- a/bld/wcl/h/optionso.gml
+++ b/bld/wcl/h/optionso.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  owcc command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage:  owcc [options] file ...
 :jtitle.
diff --git a/bld/wcl/h/optionsw.gml b/bld/wcl/h/optionsw.gml
index 40d2493096..413d8e973d 100644
--- a/bld/wcl/h/optionsw.gml
+++ b/bld/wcl/h/optionsw.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  wcl command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage:  wclaxp [options] file(s)
 :target. axp
diff --git a/bld/wsample/h/options.gml b/bld/wsample/h/options.gml
index 9d6a056bc2..bcc19bb136 100644
--- a/bld/wsample/h/options.gml
+++ b/bld/wsample/h/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  wsample command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage: wsample [options] program [program arguments]
 :jtitle. 使用方法: wsample [options] program [program arguments]
diff --git a/bld/wstrip/options.gml b/bld/wstrip/options.gml
index 2ea6e44471..bdc3b6027f 100644
--- a/bld/wstrip/options.gml
+++ b/bld/wstrip/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  wstrip command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title.  Usage: wstrip [options] input_file [output_file] [info_file]
 :jtitle. 使用方法: wstrip [options] input_file [output_file] [info_file]
diff --git a/bld/wtouch/options.gml b/bld/wtouch/options.gml
index 0e1b6a9d92..fa7bd07f17 100644
--- a/bld/wtouch/options.gml
+++ b/bld/wtouch/options.gml
@@ -27,17 +27,19 @@
 :cmt.*
 :cmt.* Description:  wtouch command line options.
 :cmt.*
-:cmt.*     UTF-8 encoding, ¥
-:cmt.*
 :cmt.*****************************************************************************
 :cmt.
+:cmt. Source file uses UTF-8 encoding, ¥
+:cmt.
+:cmt. Definition of command line options to use by optencod utility to generate
+:cmt.  	appropriate command line parser.
 :cmt.
 :cmt. GML Macros used:
 :cmt.
 :cmt.	:chain. <option> <option> ...               options that start with <option>
 :cmt.                                                   can be chained together i.e.,
 :cmt.                                                   -oa -ox -ot => -oaxt
-:cmt.   :target. <targ1> <targ2> ...                valid for these targets
+:cmt.   :target. <targ1> <targ2> ...                valid for these targets (default is 'any')
 :cmt.   :ntarget. <targ1> <targ2> ...               not valid for these targets
 :cmt.   :usagechain. <option> <usage text>          group of options that start with <option>
 :cmt.                                                   are chained together in usage
@@ -69,7 +71,8 @@
 :cmt.                                                   is set so that dependencies
 :cmt.                                                   between options can be simulated
 :cmt.   :negate.                                    negate option value
-:cmt.   :group. <num>                               group <num> to which option is included
+:cmt.   :group. <num> [<chain>]                     group <num> to which option is included
+:cmt.                                                   optionaly <chain> can be specified
 :cmt.
 :cmt. Global macros
 :cmt.
@@ -77,14 +80,14 @@
 :cmt.   :argequal. <char>                           args use <char> instead of '='
 :cmt.
 :cmt. where <targ>:
-:cmt.   default - any, dbg
+:cmt.   default - any, dbg, unused
 :cmt.   architecture - i86, 386, x64, axp, ppc, mps, sparc
-:cmt.   host OS - bsd, dos, linux, nt, os2, osx, qnx, haiku, rdos, win
+:cmt.   host OS - bsd, dos, linux, nov, nt, os2, osx, pls, qnx, rsi, haiku, rdos, win
 :cmt.   extra - targ1, targ2
 :cmt.
 :cmt. Translations are required for the :jtitle. and :jusage. tags
 :cmt.   if there is no text associated with the tag.
-
+:cmt.
 
 :title. Usage:   wtouch [<options>] <file_names>
 :jtitle. 使用方法: wtouch [<ｵﾌﾟｼｮﾝ>] <ﾌｧｲﾙ名>
diff --git a/docs/doc/cg/cpoptmac.gml b/docs/doc/cg/cpoptmac.gml
new file mode 100644
index 0000000000..267a50b1ea
--- /dev/null
+++ b/docs/doc/cg/cpoptmac.gml
@@ -0,0 +1,242 @@
+.se __optidx=0
+.*
+.dm optadd begin
+.se optfnd=&'vecpos(&*.,__optid)
+.if '&optfnd.' eq '0' .do begin
+.   .se __optidx=&__optidx.+1
+.   .se __optid(&__optidx.)=&*1
+.   .se __optlst(&__optidx.)=&*2
+.   .se __optstr(&__optidx.)=&*3
+.do end
+.el .do begin
+.   .ty *** &*. - already defined ***
+.do end
+.dm optadd end
+.*
+.* create a wide character entry (e.g., wcscmp)
+.* corresponding to regular entry (e.g., strcmp)
+.*
+.dm optget begin
+.se optfnd=&'vecpos(&*.,__optid)
+.if '&optfnd.' eq '0' .do begin
+.   .ty *** &*. - referenced but not defined ***
+.do end
+.el .do begin
+.   .if &e'&dohelp eq 0 .do begin
+.   .   .se optid=&__optid(&optfnd.).
+.   .do end
+.   .   .se optid=SW&__optid(&optfnd.).
+.   .el .do begin
+.   .do end
+.   .se optlst=&__optlst(&optfnd.).
+.   .se optstr=&__optstr(&optfnd.).
+.   .se optmac=__SW_&'upper(&__optid(&optfnd.).)
+.do end
+.dm optget end
+.*
+.* .optadd 0 0 '&286only. 8088 and 8086 instructions (default for 16-bit)'
+.* .optadd 1 1 '&286only. 188 and 186 instructions'
+.* .optadd 2 2 '&286only. 286 instructions'
+.* .optadd 3 3 '&286only. 386 instructions'
+.* .optadd 3r 3r '&386only. 386 instructions and use register-based argument passing conventions'
+.* .optadd 3s 3s '&386only. 386 instructions and use stack-based argument passing conventions'
+.* .optadd 4 4 '&286only. 486 instructions'
+.* .optadd 4r 4r '&386only. 486 instructions and use register-based argument passing conventions'
+.* .optadd 4s 4s '&386only. 486 instructions and use stack-based argument passing conventions'
+.* .optadd 5 5 '&286only. Pentium instructions'
+.* .optadd 5r 5r '&386only. Pentium instructions and use register-based argument passing conventions'
+.* .optadd 5s 5s '&386only. Pentium instructions and use stack-based argument passing conventions'
+.* .optadd 6 6 '&286only. Pentium Pro instructions'
+.* .optadd 6r 6r '&386only. Pentium Pro instructions and use register-based argument passing conventions'
+.* .optadd 6s 6s '&386only. Pentium Pro instructions and use stack-based argument passing conventions'
+.* .optadd aa aa '(C only) allow non-constant initializers for local aggregates or unions'
+.* .optadd ad 'ad[=<file name>]' 'generate make style automatic dependency file'
+.* .optadd add 'add[=<file name>]' 'specify source dependency name generated in make style auto-dependency file'
+.* .optadd adhp 'adhp[=<file name>]' 'specify path to use for headers with no path given'
+.* .optadd adt 'adt[=<target_name>]' 'specify target name generated in make style auto-dependency file'
+.* .optadd adbs adbs 'force path separators generated in auto-dependency files to backslashes'
+.* .optadd adfs adfs 'force path separators generated in auto-dependency files to forward slashes'
+.* .optadd as as '&AXPonly. assume short integers are aligned'
+.* .optadd bc bc 'build target is a console application'
+.* .optadd bd bd 'build target is a Dynamic Link Library (DLL)'
+.* .optadd bg bg 'build target is a GUI application'
+.* .optadd bm bm
+.* .optadd br br
+.* .optadd bt bt
+.* .optadd bw bw
+.* .optadd d0 d0
+.* .optadd d1 d1
+.* .optadd d1pls d1+
+.* .optadd d2 d2
+.* .optadd d2i d2i
+.* .optadd d2s d2s
+.* .optadd d2t d2t
+.* .optadd d3 d3
+.* .optadd d3i d3i
+.* .optadd d3s d3s
+.* .optadd d 'd<name>[=text]'
+.* .optadd dpls d+
+.* .optadd db db
+.* .optadd e 'e<number>'
+.* .optadd ecc ecc
+.* .optadd ecd ecd
+.* .optadd ecf ecf
+.* .optadd eco eco
+.* .optadd ecp ecp
+.* .optadd ecr ecr
+.* .optadd ecs ecs
+.* .optadd ecw ecw
+.* .optadd ee ee
+.* .optadd ef ef
+.* .optadd ei ei
+.* .optadd em em
+.* .optadd en en
+.* .optadd ep 'ep[<number>]'
+.* .optadd eq eq
+.* .optadd er er
+.* .optadd et et
+.* .optadd ew ew
+.* .optadd ez ez
+.* .optadd fc 'fc=<file name>'
+.* .optadd fh 'fh[=<file name>]'
+.* .optadd fhd fhd
+.* .optadd fhr fhr
+.* .optadd fhw fhw
+.* .optadd fhwe fhwe
+.* .optadd fi 'fi=<file name>'
+.* .optadd fo 'fo=<file name>'
+.* .optadd fo2 fo2
+.* .optadd fpc fpc
+.* .optadd fpi fpi
+.* .optadd fpi87 fpi87
+.* .optadd fp2 fp2
+.* .optadd fp3 fp3
+.* .optadd fp5 fp5
+.* .optadd fp6 fp6
+.* .optadd fpd fpd
+.* .optadd fpr fpr
+.* .optadd fr 'fr=<file name>'
+.* .optadd ft ft
+.* .optadd fti fti
+.* .optadd fx fx
+.* .optadd fzh fzh
+.* .optadd fzs fzs
+.* .optadd g 'g=<codegroup>'
+.* .optadd hw hw
+.* .optadd hd hd
+.* .optadd hc hc
+.* .optadd i 'i=<directory>'
+.* .optadd j j
+.* .optadd k k
+.* .optadd mf mf
+.* .optadd ms ms
+.* .optadd mm mm
+.* .optadd mc mc
+.* .optadd ml ml
+.* .optadd mh mh
+.* .optadd mt mt
+.* .optadd nc 'nc=<name>'
+.* .optadd nd 'nd=<name>'
+.* .optadd nm 'nm=<name>'
+.* .optadd nt 'nt=<name>'
+.* .optadd oa oa
+.* .optadd ob ob
+.* .optadd oc oc
+.* .optadd od od
+.* .optadd oe oe
+.* .optadd of of
+.* .optadd ofpls of+
+.* .optadd oh oh
+.* .optadd oi oi
+.* .optadd oipls oi+
+.* .optadd ok ok
+.* .optadd ol ol
+.* .optadd olpls ol+
+.* .optadd om om
+.* .optadd on on
+.* .optadd oo oo
+.* .optadd op op
+.* .optadd or or
+.* .optadd os os
+.* .optadd ot ot
+.* .optadd ou ou
+.* .optadd ox ox
+.* .optadd oz oz
+.* .optadd pil pil
+.* .optadd pe pe
+.* .optadd pl pl
+.* .optadd pc pc
+.* .optadd pw 'pw=<num>'
+.* .optadd q q
+.* .optadd r r
+.* .optadd ri ri
+.* .optadd s s
+.* .optadd sg sg
+.* .optadd si si
+.* .optadd st st
+.* .optadd t 't=<num>'
+.* .optadd u 'u<name>'
+.* .optadd v v
+.* .optadd vc vc
+.* .optadd w 'w<num>'
+.* .optadd wcd 'wcd=<num>'
+.* .optadd wce 'wce=<num>'
+.* .optadd we we
+.* .optadd wo wo
+.* .optadd wx wx
+.* .optadd x x
+.* .optadd xd xd
+.* .optadd xdt xdt
+.* .optadd xds xds
+.* .optadd xr xr
+.* .optadd xs xs
+.* .optadd xst xst
+.* .optadd xss xss
+.* .optadd xx xx
+.* .optadd za za
+.* .optadd zam zam
+.* .optadd zat zat
+.* .optadd ze ze
+.* .optadd zc zc
+.* .optadd zdf zdf
+.* .optadd zdp zdp
+.* .optadd zdl zdl
+.* .optadd zev zev
+.* .optadd zf zf
+.* .optadd zff zff
+.* .optadd zfp zfp
+.* .optadd zfw zfw
+.* .optadd zg zg
+.* .optadd zgf zgf
+.* .optadd zgp zgp
+.* .optadd zk0 zk0
+.* .optadd zk0u zk0u
+.* .optadd zk1 zk1
+.* .optadd zk2 zk2
+.* .optadd zkl zkl
+.* .optadd zku 'zku=<codpage>'
+.* .optadd zl zl
+.* .optadd zld zld
+.* .optadd zlf zlf
+.* .optadd zls zls
+.* .optadd zm zm
+.* .optadd zmf zmf
+.* .optadd zo zo
+.* .optadd zp zp
+.* .optadd zp1 zp1
+.* .optadd zp2 zp2
+.* .optadd zp4 zp4
+.* .optadd zp8 zp8
+.* .optadd zps zps
+.* .optadd zpw zpw
+.* .optadd zq zq
+.* .optadd zri zri
+.* .optadd zro zro
+.* .optadd zs zs
+.* .optadd zt 'zt<num>'
+.* .optadd zu zu
+.* .optadd zv zv
+.* .optadd zw zw
+.* .optadd zW zW
+.* .optadd zWs zWs
+.* .optadd zz zz
diff --git a/docs/doc/java/options.gml b/docs/doc/java/options.gml
index 47975dde49..8eabf4d554 100644
--- a/docs/doc/java/options.gml
+++ b/docs/doc/java/options.gml
@@ -1,6 +1,6 @@
 :cmt GML Macros used:
 :cmt
-:cmt    :chain. <char> <usage>                  options that start with <char>
+:cmt.	:chain. <option> <option> ...		options that start with <option>
 :cmt                                            can be chained together i.e.,
 :cmt                                            -oa -ox -ot => -oaxt
 :cmt    :option. <option> <synonym> ...         define an option
@@ -50,7 +50,8 @@
 :jtitle. \t    ( �I�[�� '[-]' ����̫�ĵ�߼�݂��g�p���܂� )
 :target. any
 
-:chain. m display message output
+:chain. m
+:usagechain. m display message output
 :jusage. m ү���ޏo�͂�\������
 
 :option. br