From dca38b27afc25d329fd7a7241095b40e2a1ecae2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 27 Jul 2019 11:38:53 +0200
Subject: Add support for option merging (--generate-merge)

---
 cli/options.cli | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'cli/options.cli')

diff --git a/cli/options.cli b/cli/options.cli
index 631f52f..da9a52a 100644
--- a/cli/options.cli
+++ b/cli/options.cli
@@ -51,9 +51,18 @@ class options
 
   bool --generate-parse
   {
-    "Generate \cb{parse()} functions instead of parsing constructors. This
-     is primarily useful for being able to parse into an already initialized
-     options class instance, for example, to implement merging/overriding."
+    "Generate \cb{parse()} functions instead of parsing constructors. This is
+     primarily useful for being able to parse into an already initialized
+     options class instance, for example, to implement option
+     appending/overriding."
+  };
+
+  bool --generate-merge
+  {
+    "Generate \cb{merge()} functions. This is primarily useful for being able
+     to merge several already parsed options class instances, for example, to
+     implement option appending/overriding. Note that this option forces
+     \cb{--generate-specifier}."
   };
 
   bool --generate-description
@@ -63,20 +72,20 @@ class options
 
   bool --generate-file-scanner
   {
-    "Generate the \c{argv_file_scanner} implementation. This scanner is
-     capable of reading command line arguments from the \c{argv} array as
+    "Generate the \cb{argv_file_scanner} implementation. This scanner is
+     capable of reading command line arguments from the \cb{argv} array as
      well as files specified with command line options."
   };
 
   bool --generate-vector-scanner
   {
-    "Generate the \c{vector_scanner} implementation. This scanner is capable
+    "Generate the \cb{vector_scanner} implementation. This scanner is capable
      of reading command line arguments from \cb{vector<string>}."
   };
 
   bool --generate-group-scanner
   {
-    "Generate the \c{group_scanner} implementation. This scanner supports
+    "Generate the \cb{group_scanner} implementation. This scanner supports
      grouping of arguments (usually options) to apply only to a certain
      argument.
 
-- 
cgit v1.1