Refactor: Rename -R/--raw to -O/--original in programs.

The help for this parameter reads "Print with the original quotes and escapes.".
Using the word "original" simply makes more sense that "raw".

Now that there is a reason to use "raw" for other purposes, refactor "raw" into "original" so that "raw" can be made available for defining.

diff --git a/level_3/fss_basic_list_read/c/common.c b/level_3/fss_basic_list_read/c/common.c
index 7042a10..a31922b 100644 (file)
--- a/level_3/fss_basic_list_read/c/common.c
+++ b/level_3/fss_basic_list_read/c/common.c
@@ -32,7 +32,7 @@ extern "C" {
   const f_string_static_t fss_basic_list_read_short_name_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_name_s, 0, FSS_BASIC_LIST_READ_short_name_s_length);
   const f_string_static_t fss_basic_list_read_short_object_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_object_s, 0, FSS_BASIC_LIST_READ_short_object_s_length);
   const f_string_static_t fss_basic_list_read_short_pipe_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_pipe_s, 0, FSS_BASIC_LIST_READ_short_pipe_s_length);
-  const f_string_static_t fss_basic_list_read_short_raw_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_raw_s, 0, FSS_BASIC_LIST_READ_short_raw_s_length);
+  const f_string_static_t fss_basic_list_read_short_original_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_original_s, 0, FSS_BASIC_LIST_READ_short_original_s_length);
   const f_string_static_t fss_basic_list_read_short_select_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_select_s, 0, FSS_BASIC_LIST_READ_short_select_s_length);
   const f_string_static_t fss_basic_list_read_short_total_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_total_s, 0, FSS_BASIC_LIST_READ_short_total_s_length);
   const f_string_static_t fss_basic_list_read_short_trim_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_short_trim_s, 0, FSS_BASIC_LIST_READ_short_trim_s_length);
@@ -47,7 +47,7 @@ extern "C" {
   const f_string_static_t fss_basic_list_read_long_name_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_name_s, 0, FSS_BASIC_LIST_READ_long_name_s_length);
   const f_string_static_t fss_basic_list_read_long_object_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_object_s, 0, FSS_BASIC_LIST_READ_long_object_s_length);
   const f_string_static_t fss_basic_list_read_long_pipe_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_pipe_s, 0, FSS_BASIC_LIST_READ_long_pipe_s_length);
-  const f_string_static_t fss_basic_list_read_long_raw_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_raw_s, 0, FSS_BASIC_LIST_READ_long_raw_s_length);
+  const f_string_static_t fss_basic_list_read_long_original_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_original_s, 0, FSS_BASIC_LIST_READ_long_original_s_length);
   const f_string_static_t fss_basic_list_read_long_select_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_select_s, 0, FSS_BASIC_LIST_READ_long_select_s_length);
   const f_string_static_t fss_basic_list_read_long_total_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_total_s, 0, FSS_BASIC_LIST_READ_long_total_s_length);
   const f_string_static_t fss_basic_list_read_long_trim_s = macro_f_string_static_t_initialize(FSS_BASIC_LIST_READ_long_trim_s, 0, FSS_BASIC_LIST_READ_long_trim_s_length);

diff --git a/level_3/fss_basic_list_read/c/common.h b/level_3/fss_basic_list_read/c/common.h
index 1159184..5482781 100644 (file)
--- a/level_3/fss_basic_list_read/c/common.h
+++ b/level_3/fss_basic_list_read/c/common.h
@@ -94,65 +94,65 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_fss_basic_list_read_parameters_
-  #define FSS_BASIC_LIST_READ_short_at_s      "a"
-  #define FSS_BASIC_LIST_READ_short_content_s "c"
-  #define FSS_BASIC_LIST_READ_short_columns_s "C"
-  #define FSS_BASIC_LIST_READ_short_delimit_s "D"
-  #define FSS_BASIC_LIST_READ_short_depth_s   "d"
-  #define FSS_BASIC_LIST_READ_short_empty_s   "e"
-  #define FSS_BASIC_LIST_READ_short_line_s    "l"
-  #define FSS_BASIC_LIST_READ_short_name_s    "n"
-  #define FSS_BASIC_LIST_READ_short_object_s  "o"
-  #define FSS_BASIC_LIST_READ_short_pipe_s    "p"
-  #define FSS_BASIC_LIST_READ_short_raw_s     "R"
-  #define FSS_BASIC_LIST_READ_short_select_s  "s"
-  #define FSS_BASIC_LIST_READ_short_total_s   "t"
-  #define FSS_BASIC_LIST_READ_short_trim_s    "T"
-
-  #define FSS_BASIC_LIST_READ_long_at_s      "at"
-  #define FSS_BASIC_LIST_READ_long_content_s "content"
-  #define FSS_BASIC_LIST_READ_long_columns_s "columns"
-  #define FSS_BASIC_LIST_READ_long_delimit_s "delimit"
-  #define FSS_BASIC_LIST_READ_long_depth_s   "depth"
-  #define FSS_BASIC_LIST_READ_long_empty_s   "empty"
-  #define FSS_BASIC_LIST_READ_long_line_s    "line"
-  #define FSS_BASIC_LIST_READ_long_name_s    "name"
-  #define FSS_BASIC_LIST_READ_long_object_s  "object"
-  #define FSS_BASIC_LIST_READ_long_pipe_s    "pipe"
-  #define FSS_BASIC_LIST_READ_long_raw_s     "raw"
-  #define FSS_BASIC_LIST_READ_long_select_s  "select"
-  #define FSS_BASIC_LIST_READ_long_total_s   "total"
-  #define FSS_BASIC_LIST_READ_long_trim_s    "trim"
-
-  #define FSS_BASIC_LIST_READ_short_at_s_length      1
-  #define FSS_BASIC_LIST_READ_short_content_s_length 1
-  #define FSS_BASIC_LIST_READ_short_columns_s_length 1
-  #define FSS_BASIC_LIST_READ_short_delimit_s_length 1
-  #define FSS_BASIC_LIST_READ_short_depth_s_length   1
-  #define FSS_BASIC_LIST_READ_short_empty_s_length   1
-  #define FSS_BASIC_LIST_READ_short_line_s_length    1
-  #define FSS_BASIC_LIST_READ_short_name_s_length    1
-  #define FSS_BASIC_LIST_READ_short_object_s_length  1
-  #define FSS_BASIC_LIST_READ_short_pipe_s_length    1
-  #define FSS_BASIC_LIST_READ_short_raw_s_length     1
-  #define FSS_BASIC_LIST_READ_short_select_s_length  1
-  #define FSS_BASIC_LIST_READ_short_total_s_length   1
-  #define FSS_BASIC_LIST_READ_short_trim_s_length    1
-
-  #define FSS_BASIC_LIST_READ_long_at_s_length      2
-  #define FSS_BASIC_LIST_READ_long_content_s_length 7
-  #define FSS_BASIC_LIST_READ_long_columns_s_length 8
-  #define FSS_BASIC_LIST_READ_long_delimit_s_length 7
-  #define FSS_BASIC_LIST_READ_long_depth_s_length   5
-  #define FSS_BASIC_LIST_READ_long_empty_s_length   5
-  #define FSS_BASIC_LIST_READ_long_line_s_length    4
-  #define FSS_BASIC_LIST_READ_long_name_s_length    4
-  #define FSS_BASIC_LIST_READ_long_object_s_length  6
-  #define FSS_BASIC_LIST_READ_long_pipe_s_length    4
-  #define FSS_BASIC_LIST_READ_long_raw_s_length     3
-  #define FSS_BASIC_LIST_READ_long_select_s_length  6
-  #define FSS_BASIC_LIST_READ_long_total_s_length   5
-  #define FSS_BASIC_LIST_READ_long_trim_s_length    4
+  #define FSS_BASIC_LIST_READ_short_at_s       "a"
+  #define FSS_BASIC_LIST_READ_short_content_s  "c"
+  #define FSS_BASIC_LIST_READ_short_columns_s  "C"
+  #define FSS_BASIC_LIST_READ_short_delimit_s  "D"
+  #define FSS_BASIC_LIST_READ_short_depth_s    "d"
+  #define FSS_BASIC_LIST_READ_short_empty_s    "e"
+  #define FSS_BASIC_LIST_READ_short_line_s     "l"
+  #define FSS_BASIC_LIST_READ_short_name_s     "n"
+  #define FSS_BASIC_LIST_READ_short_object_s   "o"
+  #define FSS_BASIC_LIST_READ_short_pipe_s     "p"
+  #define FSS_BASIC_LIST_READ_short_original_s "O"
+  #define FSS_BASIC_LIST_READ_short_select_s   "s"
+  #define FSS_BASIC_LIST_READ_short_total_s    "t"
+  #define FSS_BASIC_LIST_READ_short_trim_s     "T"
+
+  #define FSS_BASIC_LIST_READ_long_at_s       "at"
+  #define FSS_BASIC_LIST_READ_long_content_s  "content"
+  #define FSS_BASIC_LIST_READ_long_columns_s  "columns"
+  #define FSS_BASIC_LIST_READ_long_delimit_s  "delimit"
+  #define FSS_BASIC_LIST_READ_long_depth_s    "depth"
+  #define FSS_BASIC_LIST_READ_long_empty_s    "empty"
+  #define FSS_BASIC_LIST_READ_long_line_s     "line"
+  #define FSS_BASIC_LIST_READ_long_name_s     "name"
+  #define FSS_BASIC_LIST_READ_long_object_s   "object"
+  #define FSS_BASIC_LIST_READ_long_pipe_s     "pipe"
+  #define FSS_BASIC_LIST_READ_long_original_s "original"
+  #define FSS_BASIC_LIST_READ_long_select_s   "select"
+  #define FSS_BASIC_LIST_READ_long_total_s    "total"
+  #define FSS_BASIC_LIST_READ_long_trim_s     "trim"
+
+  #define FSS_BASIC_LIST_READ_short_at_s_length       1
+  #define FSS_BASIC_LIST_READ_short_content_s_length  1
+  #define FSS_BASIC_LIST_READ_short_columns_s_length  1
+  #define FSS_BASIC_LIST_READ_short_delimit_s_length  1
+  #define FSS_BASIC_LIST_READ_short_depth_s_length    1
+  #define FSS_BASIC_LIST_READ_short_empty_s_length    1
+  #define FSS_BASIC_LIST_READ_short_line_s_length     1
+  #define FSS_BASIC_LIST_READ_short_name_s_length     1
+  #define FSS_BASIC_LIST_READ_short_object_s_length   1
+  #define FSS_BASIC_LIST_READ_short_pipe_s_length     1
+  #define FSS_BASIC_LIST_READ_short_original_s_length 1
+  #define FSS_BASIC_LIST_READ_short_select_s_length   1
+  #define FSS_BASIC_LIST_READ_short_total_s_length    1
+  #define FSS_BASIC_LIST_READ_short_trim_s_length     1
+
+  #define FSS_BASIC_LIST_READ_long_at_s_length       2
+  #define FSS_BASIC_LIST_READ_long_content_s_length  7
+  #define FSS_BASIC_LIST_READ_long_columns_s_length  8
+  #define FSS_BASIC_LIST_READ_long_delimit_s_length  7
+  #define FSS_BASIC_LIST_READ_long_depth_s_length    5
+  #define FSS_BASIC_LIST_READ_long_empty_s_length    5
+  #define FSS_BASIC_LIST_READ_long_line_s_length     4
+  #define FSS_BASIC_LIST_READ_long_name_s_length     4
+  #define FSS_BASIC_LIST_READ_long_object_s_length   6
+  #define FSS_BASIC_LIST_READ_long_pipe_s_length     4
+  #define FSS_BASIC_LIST_READ_long_original_s_length 8
+  #define FSS_BASIC_LIST_READ_long_select_s_length   6
+  #define FSS_BASIC_LIST_READ_long_total_s_length    5
+  #define FSS_BASIC_LIST_READ_long_trim_s_length     4
 
   extern const f_string_static_t fss_basic_list_read_short_at_s;
   extern const f_string_static_t fss_basic_list_read_short_content_s;
@@ -164,7 +164,7 @@ extern "C" {
   extern const f_string_static_t fss_basic_list_read_short_name_s;
   extern const f_string_static_t fss_basic_list_read_short_object_s;
   extern const f_string_static_t fss_basic_list_read_short_pipe_s;
-  extern const f_string_static_t fss_basic_list_read_short_raw_s;
+  extern const f_string_static_t fss_basic_list_read_short_original_s;
   extern const f_string_static_t fss_basic_list_read_short_select_s;
   extern const f_string_static_t fss_basic_list_read_short_total_s;
   extern const f_string_static_t fss_basic_list_read_short_trim_s;
@@ -179,7 +179,7 @@ extern "C" {
   extern const f_string_static_t fss_basic_list_read_long_name_s;
   extern const f_string_static_t fss_basic_list_read_long_object_s;
   extern const f_string_static_t fss_basic_list_read_long_pipe_s;
-  extern const f_string_static_t fss_basic_list_read_long_raw_s;
+  extern const f_string_static_t fss_basic_list_read_long_original_s;
   extern const f_string_static_t fss_basic_list_read_long_select_s;
   extern const f_string_static_t fss_basic_list_read_long_total_s;
   extern const f_string_static_t fss_basic_list_read_long_trim_s;
@@ -205,7 +205,7 @@ extern "C" {
     fss_basic_list_read_parameter_name_e,
     fss_basic_list_read_parameter_object_e,
     fss_basic_list_read_parameter_pipe_e,
-    fss_basic_list_read_parameter_raw_e,
+    fss_basic_list_read_parameter_original_e,
     fss_basic_list_read_parameter_select_e,
     fss_basic_list_read_parameter_total_e,
     fss_basic_list_read_parameter_trim_e,
@@ -232,7 +232,7 @@ extern "C" {
       macro_f_console_parameter_t_initialize(fss_basic_list_read_short_name_s.string, fss_basic_list_read_long_name_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_list_read_short_object_s.string, fss_basic_list_read_long_object_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_list_read_short_pipe_s.string, fss_basic_list_read_long_pipe_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(fss_basic_list_read_short_raw_s.string, fss_basic_list_read_long_raw_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(fss_basic_list_read_short_original_s.string, fss_basic_list_read_long_original_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_list_read_short_select_s.string, fss_basic_list_read_long_select_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_list_read_short_total_s.string, fss_basic_list_read_long_total_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_list_read_short_trim_s.string, fss_basic_list_read_long_trim_s.string, 0, 0, f_console_type_normal_e), \

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
index 4d2ddde..849ccda 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
@@ -36,7 +36,7 @@ extern "C" {
     fll_program_print_help_option(file, context, fss_basic_list_read_short_name_s, fss_basic_list_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Select Object with this name.");
     fll_program_print_help_option(file, context, fss_basic_list_read_short_object_s, fss_basic_list_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Print the Object.");
     fll_program_print_help_option(file, context, fss_basic_list_read_short_pipe_s, fss_basic_list_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Print using the special pipe format.");
-    fll_program_print_help_option(file, context, fss_basic_list_read_short_raw_s, fss_basic_list_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Print with the original quotes and escapes.");
+    fll_program_print_help_option(file, context, fss_basic_list_read_short_original_s, fss_basic_list_read_long_original_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print with the original quotes and escapes.");
     fll_program_print_help_option(file, context, fss_basic_list_read_short_select_s, fss_basic_list_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Select sub-Content at this index.");
     fll_program_print_help_option(file, context, fss_basic_list_read_short_total_s, fss_basic_list_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   Print the total number of lines.");
     fll_program_print_help_option(file, context, fss_basic_list_read_short_trim_s, fss_basic_list_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Trim Object names on select or print.");

diff --git a/level_3/fss_basic_list_read/c/private-common.h b/level_3/fss_basic_list_read/c/private-common.h
index a6cf5a4..2208948 100644 (file)
--- a/level_3/fss_basic_list_read/c/private-common.h
+++ b/level_3/fss_basic_list_read/c/private-common.h
@@ -137,17 +137,17 @@ extern "C" {
  * The data structure for FSS Basic Read.
  *
  * fss_basic_list_read_data_option_*:
- *   - at:      The object at the given position is being selected (Think of this as select a row for some Object).
- *   - columns: The total columns found and selected is printed instead of the Content.
- *   - content: The Content is to be printed.
- *   - empty:   Empty Content will be printed (Objects that have no Content will have their empty Content printed).
- *   - line:    A specific Content at a given line is to be selected (Think of this as select a row for some Content).
- *   - name:    A specific Object name has been requested.
- *   - object:  The Object is to be printed.
- *   - raw:     Enable raw printing, where the quotes are printed and no delimits are applied.
- *   - select:  A specific Content at a given position is to be selected (Think of this as select a column for some Content).
- *   - total:   The total lines found and selected is printed instead of the Content.
- *   - trim:    Empty space before and after Objects and Content will not be printed (They will be trimmed).
+ *   - at:       The object at the given position is being selected (Think of this as select a row for some Object).
+ *   - columns:  The total columns found and selected is printed instead of the Content.
+ *   - content:  The Content is to be printed.
+ *   - empty:    Empty Content will be printed (Objects that have no Content will have their empty Content printed).
+ *   - line:     A specific Content at a given line is to be selected (Think of this as select a row for some Content).
+ *   - name:     A specific Object name has been requested.
+ *   - object:   The Object is to be printed.
+ *   - original: Enable original printing, where the quotes are printed and no delimits are applied.
+ *   - select:   A specific Content at a given position is to be selected (Think of this as select a column for some Content).
+ *   - total:    The total lines found and selected is printed instead of the Content.
+ *   - trim:     Empty space before and after Objects and Content will not be printed (They will be trimmed).
  *
  * argv:             The argument structure in the progam data parameters for simplifying syntax.
  * options:          Bitwise flags representing parameters.
@@ -164,17 +164,17 @@ extern "C" {
  * delimits_content: The positions within the buffer representing Content character delimits.
  */
 #ifndef _di_fss_basic_list_read_data_t_
-  #define fss_basic_list_read_data_option_at_d      0x1
-  #define fss_basic_list_read_data_option_columns_d 0x2
-  #define fss_basic_list_read_data_option_content_d 0x4
-  #define fss_basic_list_read_data_option_empty_d   0x8
-  #define fss_basic_list_read_data_option_line_d    0x10
-  #define fss_basic_list_read_data_option_name_d    0x20
-  #define fss_basic_list_read_data_option_object_d  0x40
-  #define fss_basic_list_read_data_option_raw_d     0x80
-  #define fss_basic_list_read_data_option_select_d  0x100
-  #define fss_basic_list_read_data_option_total_d   0x200
-  #define fss_basic_list_read_data_option_trim_d    0x400
+  #define fss_basic_list_read_data_option_at_d       0x1
+  #define fss_basic_list_read_data_option_columns_d  0x2
+  #define fss_basic_list_read_data_option_content_d  0x4
+  #define fss_basic_list_read_data_option_empty_d    0x8
+  #define fss_basic_list_read_data_option_line_d     0x10
+  #define fss_basic_list_read_data_option_name_d     0x20
+  #define fss_basic_list_read_data_option_object_d   0x40
+  #define fss_basic_list_read_data_option_original_d 0x80
+  #define fss_basic_list_read_data_option_select_d   0x100
+  #define fss_basic_list_read_data_option_total_d    0x200
+  #define fss_basic_list_read_data_option_trim_d     0x400
 
   typedef struct {
     uint16_t option;

diff --git a/level_3/fss_basic_list_read/c/private-read.c b/level_3/fss_basic_list_read/c/private-read.c
index 108969a..05001e4 100644 (file)
--- a/level_3/fss_basic_list_read/c/private-read.c
+++ b/level_3/fss_basic_list_read/c/private-read.c
@@ -346,7 +346,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_basic_list_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_basic_list_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_basic_list_read_data_option_raw_d) {
+    if (data->option & fss_basic_list_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -391,7 +391,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_basic_list_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_basic_list_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_basic_list_read_data_option_raw_d) {
+    if (data->option & fss_basic_list_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -617,7 +617,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_basic_list_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_basic_list_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_basic_list_read_data_option_raw_d) {
+    if (data->option & fss_basic_list_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -707,8 +707,8 @@ extern "C" {
       data->option |= fss_basic_list_read_data_option_object_d;
     }
 
-    if (main->parameters.array[fss_basic_list_read_parameter_raw_e].result == f_console_result_found_e) {
-      data->option |= fss_basic_list_read_data_option_raw_d;
+    if (main->parameters.array[fss_basic_list_read_parameter_original_e].result == f_console_result_found_e) {
+      data->option |= fss_basic_list_read_data_option_original_d;
     }
 
     if (main->parameters.array[fss_basic_list_read_parameter_select_e].result == f_console_result_additional_e) {

diff --git a/level_3/fss_basic_read/c/common.c b/level_3/fss_basic_read/c/common.c
index 388b3a5..b9c097a 100644 (file)
--- a/level_3/fss_basic_read/c/common.c
+++ b/level_3/fss_basic_read/c/common.c
@@ -31,7 +31,7 @@ extern "C" {
   const f_string_static_t fss_basic_read_short_name_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_name_s, 0, FSS_BASIC_READ_short_name_s_length);
   const f_string_static_t fss_basic_read_short_object_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_object_s, 0, FSS_BASIC_READ_short_object_s_length);
   const f_string_static_t fss_basic_read_short_pipe_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_pipe_s, 0, FSS_BASIC_READ_short_pipe_s_length);
-  const f_string_static_t fss_basic_read_short_raw_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_raw_s, 0, FSS_BASIC_READ_short_raw_s_length);
+  const f_string_static_t fss_basic_read_short_original_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_original_s, 0, FSS_BASIC_READ_short_original_s_length);
   const f_string_static_t fss_basic_read_short_select_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_select_s, 0, FSS_BASIC_READ_short_select_s_length);
   const f_string_static_t fss_basic_read_short_total_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_total_s, 0, FSS_BASIC_READ_short_total_s_length);
   const f_string_static_t fss_basic_read_short_trim_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_short_trim_s, 0, FSS_BASIC_READ_short_trim_s_length);
@@ -46,7 +46,7 @@ extern "C" {
   const f_string_static_t fss_basic_read_long_name_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_name_s, 0, FSS_BASIC_READ_long_name_s_length);
   const f_string_static_t fss_basic_read_long_object_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_object_s, 0, FSS_BASIC_READ_long_object_s_length);
   const f_string_static_t fss_basic_read_long_pipe_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_pipe_s, 0, FSS_BASIC_READ_long_pipe_s_length);
-  const f_string_static_t fss_basic_read_long_raw_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_raw_s, 0, FSS_BASIC_READ_long_raw_s_length);
+  const f_string_static_t fss_basic_read_long_original_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_original_s, 0, FSS_BASIC_READ_long_original_s_length);
   const f_string_static_t fss_basic_read_long_select_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_select_s, 0, FSS_BASIC_READ_long_select_s_length);
   const f_string_static_t fss_basic_read_long_total_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_total_s, 0, FSS_BASIC_READ_long_total_s_length);
   const f_string_static_t fss_basic_read_long_trim_s = macro_f_string_static_t_initialize(FSS_BASIC_READ_long_trim_s, 0, FSS_BASIC_READ_long_trim_s_length);

diff --git a/level_3/fss_basic_read/c/common.h b/level_3/fss_basic_read/c/common.h
index 53391a5..f359d56 100644 (file)
--- a/level_3/fss_basic_read/c/common.h
+++ b/level_3/fss_basic_read/c/common.h
@@ -94,65 +94,65 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_fss_basic_read_parameters_
-  #define FSS_BASIC_READ_short_at_s      "a"
-  #define FSS_BASIC_READ_short_content_s "c"
-  #define FSS_BASIC_READ_short_columns_s "C"
-  #define FSS_BASIC_READ_short_delimit_s "D"
-  #define FSS_BASIC_READ_short_depth_s   "d"
-  #define FSS_BASIC_READ_short_empty_s   "e"
-  #define FSS_BASIC_READ_short_line_s    "l"
-  #define FSS_BASIC_READ_short_name_s    "n"
-  #define FSS_BASIC_READ_short_object_s  "o"
-  #define FSS_BASIC_READ_short_pipe_s    "p"
-  #define FSS_BASIC_READ_short_raw_s     "R"
-  #define FSS_BASIC_READ_short_select_s  "s"
-  #define FSS_BASIC_READ_short_total_s   "t"
-  #define FSS_BASIC_READ_short_trim_s    "T"
-
-  #define FSS_BASIC_READ_long_at_s      "at"
-  #define FSS_BASIC_READ_long_content_s "content"
-  #define FSS_BASIC_READ_long_columns_s "columns"
-  #define FSS_BASIC_READ_long_delimit_s "delimit"
-  #define FSS_BASIC_READ_long_depth_s   "depth"
-  #define FSS_BASIC_READ_long_empty_s   "empty"
-  #define FSS_BASIC_READ_long_line_s    "line"
-  #define FSS_BASIC_READ_long_name_s    "name"
-  #define FSS_BASIC_READ_long_object_s  "object"
-  #define FSS_BASIC_READ_long_pipe_s    "pipe"
-  #define FSS_BASIC_READ_long_raw_s     "raw"
-  #define FSS_BASIC_READ_long_select_s  "select"
-  #define FSS_BASIC_READ_long_total_s   "total"
-  #define FSS_BASIC_READ_long_trim_s    "trim"
-
-  #define FSS_BASIC_READ_short_at_s_length      1
-  #define FSS_BASIC_READ_short_content_s_length 1
-  #define FSS_BASIC_READ_short_columns_s_length 1
-  #define FSS_BASIC_READ_short_delimit_s_length 1
-  #define FSS_BASIC_READ_short_depth_s_length   1
-  #define FSS_BASIC_READ_short_empty_s_length   1
-  #define FSS_BASIC_READ_short_line_s_length    1
-  #define FSS_BASIC_READ_short_name_s_length    1
-  #define FSS_BASIC_READ_short_object_s_length  1
-  #define FSS_BASIC_READ_short_pipe_s_length    1
-  #define FSS_BASIC_READ_short_raw_s_length     1
-  #define FSS_BASIC_READ_short_select_s_length  1
-  #define FSS_BASIC_READ_short_total_s_length   1
-  #define FSS_BASIC_READ_short_trim_s_length    1
-
-  #define FSS_BASIC_READ_long_at_s_length      2
-  #define FSS_BASIC_READ_long_content_s_length 7
-  #define FSS_BASIC_READ_long_columns_s_length 7
-  #define FSS_BASIC_READ_long_delimit_s_length 7
-  #define FSS_BASIC_READ_long_depth_s_length   5
-  #define FSS_BASIC_READ_long_empty_s_length   5
-  #define FSS_BASIC_READ_long_line_s_length    4
-  #define FSS_BASIC_READ_long_name_s_length    4
-  #define FSS_BASIC_READ_long_object_s_length  6
-  #define FSS_BASIC_READ_long_pipe_s_length    4
-  #define FSS_BASIC_READ_long_raw_s_length     3
-  #define FSS_BASIC_READ_long_select_s_length  6
-  #define FSS_BASIC_READ_long_total_s_length   5
-  #define FSS_BASIC_READ_long_trim_s_length    4
+  #define FSS_BASIC_READ_short_at_s       "a"
+  #define FSS_BASIC_READ_short_content_s  "c"
+  #define FSS_BASIC_READ_short_columns_s  "C"
+  #define FSS_BASIC_READ_short_delimit_s  "D"
+  #define FSS_BASIC_READ_short_depth_s    "d"
+  #define FSS_BASIC_READ_short_empty_s    "e"
+  #define FSS_BASIC_READ_short_line_s     "l"
+  #define FSS_BASIC_READ_short_name_s     "n"
+  #define FSS_BASIC_READ_short_object_s   "o"
+  #define FSS_BASIC_READ_short_pipe_s     "p"
+  #define FSS_BASIC_READ_short_original_s "O"
+  #define FSS_BASIC_READ_short_select_s   "s"
+  #define FSS_BASIC_READ_short_total_s    "t"
+  #define FSS_BASIC_READ_short_trim_s     "T"
+
+  #define FSS_BASIC_READ_long_at_s       "at"
+  #define FSS_BASIC_READ_long_content_s  "content"
+  #define FSS_BASIC_READ_long_columns_s  "columns"
+  #define FSS_BASIC_READ_long_delimit_s  "delimit"
+  #define FSS_BASIC_READ_long_depth_s    "depth"
+  #define FSS_BASIC_READ_long_empty_s    "empty"
+  #define FSS_BASIC_READ_long_line_s     "line"
+  #define FSS_BASIC_READ_long_name_s     "name"
+  #define FSS_BASIC_READ_long_object_s   "object"
+  #define FSS_BASIC_READ_long_pipe_s     "pipe"
+  #define FSS_BASIC_READ_long_original_s "original"
+  #define FSS_BASIC_READ_long_select_s   "select"
+  #define FSS_BASIC_READ_long_total_s    "total"
+  #define FSS_BASIC_READ_long_trim_s     "trim"
+
+  #define FSS_BASIC_READ_short_at_s_length       1
+  #define FSS_BASIC_READ_short_content_s_length  1
+  #define FSS_BASIC_READ_short_columns_s_length  1
+  #define FSS_BASIC_READ_short_delimit_s_length  1
+  #define FSS_BASIC_READ_short_depth_s_length    1
+  #define FSS_BASIC_READ_short_empty_s_length    1
+  #define FSS_BASIC_READ_short_line_s_length     1
+  #define FSS_BASIC_READ_short_name_s_length     1
+  #define FSS_BASIC_READ_short_object_s_length   1
+  #define FSS_BASIC_READ_short_pipe_s_length     1
+  #define FSS_BASIC_READ_short_original_s_length 1
+  #define FSS_BASIC_READ_short_select_s_length   1
+  #define FSS_BASIC_READ_short_total_s_length    1
+  #define FSS_BASIC_READ_short_trim_s_length     1
+
+  #define FSS_BASIC_READ_long_at_s_length       2
+  #define FSS_BASIC_READ_long_content_s_length  7
+  #define FSS_BASIC_READ_long_columns_s_length  7
+  #define FSS_BASIC_READ_long_delimit_s_length  7
+  #define FSS_BASIC_READ_long_depth_s_length    5
+  #define FSS_BASIC_READ_long_empty_s_length    5
+  #define FSS_BASIC_READ_long_line_s_length     4
+  #define FSS_BASIC_READ_long_name_s_length     4
+  #define FSS_BASIC_READ_long_object_s_length   6
+  #define FSS_BASIC_READ_long_pipe_s_length     4
+  #define FSS_BASIC_READ_long_original_s_length 8
+  #define FSS_BASIC_READ_long_select_s_length   6
+  #define FSS_BASIC_READ_long_total_s_length    5
+  #define FSS_BASIC_READ_long_trim_s_length     4
 
   extern const f_string_static_t fss_basic_read_short_at_s;
   extern const f_string_static_t fss_basic_read_short_content_s;
@@ -164,7 +164,7 @@ extern "C" {
   extern const f_string_static_t fss_basic_read_short_name_s;
   extern const f_string_static_t fss_basic_read_short_object_s;
   extern const f_string_static_t fss_basic_read_short_pipe_s;
-  extern const f_string_static_t fss_basic_read_short_raw_s;
+  extern const f_string_static_t fss_basic_read_short_original_s;
   extern const f_string_static_t fss_basic_read_short_select_s;
   extern const f_string_static_t fss_basic_read_short_total_s;
   extern const f_string_static_t fss_basic_read_short_trim_s;
@@ -179,7 +179,7 @@ extern "C" {
   extern const f_string_static_t fss_basic_read_long_name_s;
   extern const f_string_static_t fss_basic_read_long_object_s;
   extern const f_string_static_t fss_basic_read_long_pipe_s;
-  extern const f_string_static_t fss_basic_read_long_raw_s;
+  extern const f_string_static_t fss_basic_read_long_original_s;
   extern const f_string_static_t fss_basic_read_long_select_s;
   extern const f_string_static_t fss_basic_read_long_total_s;
   extern const f_string_static_t fss_basic_read_long_trim_s;
@@ -205,7 +205,7 @@ extern "C" {
     fss_basic_read_parameter_name_e,
     fss_basic_read_parameter_object_e,
     fss_basic_read_parameter_pipe_e,
-    fss_basic_read_parameter_raw_e,
+    fss_basic_read_parameter_original_e,
     fss_basic_read_parameter_select_e,
     fss_basic_read_parameter_total_e,
     fss_basic_read_parameter_trim_e,
@@ -232,7 +232,7 @@ extern "C" {
       macro_f_console_parameter_t_initialize(fss_basic_read_short_name_s.string, fss_basic_read_long_name_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_read_short_object_s.string, fss_basic_read_long_object_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_read_short_pipe_s.string, fss_basic_read_long_pipe_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(fss_basic_read_short_raw_s.string, fss_basic_read_long_raw_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(fss_basic_read_short_original_s.string, fss_basic_read_long_original_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_read_short_select_s.string, fss_basic_read_long_select_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_read_short_total_s.string, fss_basic_read_long_total_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_basic_read_short_trim_s.string, fss_basic_read_long_trim_s.string, 0, 0, f_console_type_normal_e), \

diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c
index eb039ca..81e0c0d 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.c
+++ b/level_3/fss_basic_read/c/fss_basic_read.c
@@ -36,7 +36,7 @@ extern "C" {
     fll_program_print_help_option(file, context, fss_basic_read_short_name_s, fss_basic_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Select Object with this name.");
     fll_program_print_help_option(file, context, fss_basic_read_short_object_s, fss_basic_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Print the Object.");
     fll_program_print_help_option(file, context, fss_basic_read_short_pipe_s, fss_basic_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Print using the special pipe format.");
-    fll_program_print_help_option(file, context, fss_basic_read_short_raw_s, fss_basic_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Print with the original quotes and escapes.");
+    fll_program_print_help_option(file, context, fss_basic_read_short_original_s, fss_basic_read_long_original_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print with the original quotes and escapes.");
     fll_program_print_help_option(file, context, fss_basic_read_short_select_s, fss_basic_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Select sub-Content at this index.");
     fll_program_print_help_option(file, context, fss_basic_read_short_total_s, fss_basic_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   Print the total number of lines.");
     fll_program_print_help_option(file, context, fss_basic_read_short_trim_s, fss_basic_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Trim Object names on select or print.");

diff --git a/level_3/fss_basic_read/c/private-common.h b/level_3/fss_basic_read/c/private-common.h
index 049f1e9..3175ac9 100644 (file)
--- a/level_3/fss_basic_read/c/private-common.h
+++ b/level_3/fss_basic_read/c/private-common.h
@@ -137,17 +137,17 @@ extern "C" {
  * The data structure for FSS Basic Read.
  *
  * fss_basic_read_data_option_*:
- *   - at:      The object at the given position is being selected (Think of this as select a row for some Object).
- *   - columns: The total columns found and selected is printed instead of the Content.
- *   - content: The Content is to be printed.
- *   - empty:   Empty Content will be printed (Objects that have no Content will have their empty Content printed).
- *   - line:    A specific Content at a given line is to be selected (Think of this as select a row for some Content).
- *   - name:    A specific Object name has been requested.
- *   - object:  The Object is to be printed.
- *   - raw:     Enable raw printing, where the quotes are printed and no delimits are applied.
- *   - select:  A specific Content at a given position is to be selected (Think of this as select a column for some Content).
- *   - total:   The total lines found and selected is printed instead of the Content.
- *   - trim:    Empty space before and after Objects and Content will not be printed (They will be trimmed).
+ *   - at:       The object at the given position is being selected (Think of this as select a row for some Object).
+ *   - columns:  The total columns found and selected is printed instead of the Content.
+ *   - content:  The Content is to be printed.
+ *   - empty:    Empty Content will be printed (Objects that have no Content will have their empty Content printed).
+ *   - line:     A specific Content at a given line is to be selected (Think of this as select a row for some Content).
+ *   - name:     A specific Object name has been requested.
+ *   - object:   The Object is to be printed.
+ *   - original: Enable original printing, where the quotes are printed and no delimits are applied.
+ *   - select:   A specific Content at a given position is to be selected (Think of this as select a column for some Content).
+ *   - total:    The total lines found and selected is printed instead of the Content.
+ *   - trim:     Empty space before and after Objects and Content will not be printed (They will be trimmed).
  *
  * argv:          The argument structure in the progam data parameters for simplifying syntax.
  * options:       Bitwise flags representing parameters.
@@ -163,17 +163,17 @@ extern "C" {
  * delimits:      The positions within the buffer representing character delimits.
  */
 #ifndef _di_fss_basic_read_data_t_
-  #define fss_basic_read_data_option_at_d      0x1
-  #define fss_basic_read_data_option_columns_d 0x2
-  #define fss_basic_read_data_option_content_d 0x4
-  #define fss_basic_read_data_option_empty_d   0x8
-  #define fss_basic_read_data_option_line_d    0x10
-  #define fss_basic_read_data_option_name_d    0x20
-  #define fss_basic_read_data_option_object_d  0x40
-  #define fss_basic_read_data_option_raw_d     0x80
-  #define fss_basic_read_data_option_select_d  0x100
-  #define fss_basic_read_data_option_total_d   0x200
-  #define fss_basic_read_data_option_trim_d    0x400
+  #define fss_basic_read_data_option_at_d       0x1
+  #define fss_basic_read_data_option_columns_d  0x2
+  #define fss_basic_read_data_option_content_d  0x4
+  #define fss_basic_read_data_option_empty_d    0x8
+  #define fss_basic_read_data_option_line_d     0x10
+  #define fss_basic_read_data_option_name_d     0x20
+  #define fss_basic_read_data_option_object_d   0x40
+  #define fss_basic_read_data_option_original_d 0x80
+  #define fss_basic_read_data_option_select_d   0x100
+  #define fss_basic_read_data_option_total_d    0x200
+  #define fss_basic_read_data_option_trim_d     0x400
 
   typedef struct {
     uint16_t option;

diff --git a/level_3/fss_basic_read/c/private-print.c b/level_3/fss_basic_read/c/private-print.c
index c0ab8d8..56cac0d 100644 (file)
--- a/level_3/fss_basic_read/c/private-print.c
+++ b/level_3/fss_basic_read/c/private-print.c
@@ -18,7 +18,7 @@ extern "C" {
 
       if (data->option & fss_basic_read_data_option_object_d) {
         if (data->option & fss_basic_read_data_option_trim_d) {
-          if (data->option & fss_basic_read_data_option_raw_d) {
+          if (data->option & fss_basic_read_data_option_original_d) {
             if (data->quotes.array[at]) {
               f_print_dynamic_raw(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
@@ -34,7 +34,7 @@ extern "C" {
           }
         }
         else {
-          if (data->option & fss_basic_read_data_option_raw_d) {
+          if (data->option & fss_basic_read_data_option_original_d) {
             if (data->quotes.array[at]) {
               f_print_dynamic_raw(data->quotes.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
@@ -56,7 +56,7 @@ extern "C" {
       }
 
       if ((data->option & fss_basic_read_data_option_content_d) && data->contents.array[at].used) {
-        if (data->option & fss_basic_read_data_option_raw_d) {
+        if (data->option & fss_basic_read_data_option_original_d) {
           f_print_dynamic_partial(data->buffer, data->contents.array[at].array[0], main->output.to.stream);
         }
         else {

diff --git a/level_3/fss_basic_read/c/private-read.c b/level_3/fss_basic_read/c/private-read.c
index 41e2783..388a68c 100644 (file)
--- a/level_3/fss_basic_read/c/private-read.c
+++ b/level_3/fss_basic_read/c/private-read.c
@@ -606,8 +606,8 @@ extern "C" {
       data->option |= fss_basic_read_data_option_object_d;
     }
 
-    if (main->parameters.array[fss_basic_read_parameter_raw_e].result == f_console_result_found_e) {
-      data->option |= fss_basic_read_data_option_raw_d;
+    if (main->parameters.array[fss_basic_read_parameter_original_e].result == f_console_result_found_e) {
+      data->option |= fss_basic_read_data_option_original_d;
     }
 
     if (main->parameters.array[fss_basic_read_parameter_select_e].result == f_console_result_additional_e) {

diff --git a/level_3/fss_embedded_list_read/c/common.c b/level_3/fss_embedded_list_read/c/common.c
index 5379a05..d93b633 100644 (file)
--- a/level_3/fss_embedded_list_read/c/common.c
+++ b/level_3/fss_embedded_list_read/c/common.c
@@ -31,7 +31,7 @@ extern "C" {
   const f_string_static_t fss_embedded_list_read_short_name_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_name_s, 0, FSS_EMBEDDED_LIST_READ_short_name_s_length);
   const f_string_static_t fss_embedded_list_read_short_object_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_object_s, 0, FSS_EMBEDDED_LIST_READ_short_object_s_length);
   const f_string_static_t fss_embedded_list_read_short_pipe_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_pipe_s, 0, FSS_EMBEDDED_LIST_READ_short_pipe_s_length);
-  const f_string_static_t fss_embedded_list_read_short_raw_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_raw_s, 0, FSS_EMBEDDED_LIST_READ_short_raw_s_length);
+  const f_string_static_t fss_embedded_list_read_short_original_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_original_s, 0, FSS_EMBEDDED_LIST_READ_short_original_s_length);
   const f_string_static_t fss_embedded_list_read_short_select_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_select_s, 0, FSS_EMBEDDED_LIST_READ_short_select_s_length);
   const f_string_static_t fss_embedded_list_read_short_total_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_total_s, 0, FSS_EMBEDDED_LIST_READ_short_total_s_length);
   const f_string_static_t fss_embedded_list_read_short_trim_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_short_trim_s, 0, FSS_EMBEDDED_LIST_READ_short_trim_s_length);
@@ -46,7 +46,7 @@ extern "C" {
   const f_string_static_t fss_embedded_list_read_long_name_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_name_s, 0, FSS_EMBEDDED_LIST_READ_long_name_s_length);
   const f_string_static_t fss_embedded_list_read_long_object_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_object_s, 0, FSS_EMBEDDED_LIST_READ_long_object_s_length);
   const f_string_static_t fss_embedded_list_read_long_pipe_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_pipe_s, 0, FSS_EMBEDDED_LIST_READ_long_pipe_s_length);
-  const f_string_static_t fss_embedded_list_read_long_raw_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_raw_s, 0, FSS_EMBEDDED_LIST_READ_long_raw_s_length);
+  const f_string_static_t fss_embedded_list_read_long_original_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_original_s, 0, FSS_EMBEDDED_LIST_READ_long_original_s_length);
   const f_string_static_t fss_embedded_list_read_long_select_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_select_s, 0, FSS_EMBEDDED_LIST_READ_long_select_s_length);
   const f_string_static_t fss_embedded_list_read_long_total_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_total_s, 0, FSS_EMBEDDED_LIST_READ_long_total_s_length);
   const f_string_static_t fss_embedded_list_read_long_trim_s = macro_f_string_static_t_initialize(FSS_EMBEDDED_LIST_READ_long_trim_s, 0, FSS_EMBEDDED_LIST_READ_long_trim_s_length);

diff --git a/level_3/fss_embedded_list_read/c/common.h b/level_3/fss_embedded_list_read/c/common.h
index 109ddcc..ade4bcd 100644 (file)
--- a/level_3/fss_embedded_list_read/c/common.h
+++ b/level_3/fss_embedded_list_read/c/common.h
@@ -94,65 +94,65 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_fss_embedded_list_read_parameters_
-  #define FSS_EMBEDDED_LIST_READ_short_at_s      "a"
-  #define FSS_EMBEDDED_LIST_READ_short_content_s "c"
-  #define FSS_EMBEDDED_LIST_READ_short_columns_s "C"
-  #define FSS_EMBEDDED_LIST_READ_short_delimit_s "D"
-  #define FSS_EMBEDDED_LIST_READ_short_depth_s   "d"
-  #define FSS_EMBEDDED_LIST_READ_short_empty_s   "e"
-  #define FSS_EMBEDDED_LIST_READ_short_line_s    "l"
-  #define FSS_EMBEDDED_LIST_READ_short_name_s    "n"
-  #define FSS_EMBEDDED_LIST_READ_short_object_s  "o"
-  #define FSS_EMBEDDED_LIST_READ_short_pipe_s    "p"
-  #define FSS_EMBEDDED_LIST_READ_short_raw_s     "R"
-  #define FSS_EMBEDDED_LIST_READ_short_select_s  "s"
-  #define FSS_EMBEDDED_LIST_READ_short_total_s   "t"
-  #define FSS_EMBEDDED_LIST_READ_short_trim_s    "T"
-
-  #define FSS_EMBEDDED_LIST_READ_long_at_s      "at"
-  #define FSS_EMBEDDED_LIST_READ_long_content_s "content"
-  #define FSS_EMBEDDED_LIST_READ_long_columns_s "columns"
-  #define FSS_EMBEDDED_LIST_READ_long_delimit_s "delimit"
-  #define FSS_EMBEDDED_LIST_READ_long_depth_s   "depth"
-  #define FSS_EMBEDDED_LIST_READ_long_empty_s   "empty"
-  #define FSS_EMBEDDED_LIST_READ_long_line_s    "line"
-  #define FSS_EMBEDDED_LIST_READ_long_name_s    "name"
-  #define FSS_EMBEDDED_LIST_READ_long_object_s  "object"
-  #define FSS_EMBEDDED_LIST_READ_long_pipe_s    "pipe"
-  #define FSS_EMBEDDED_LIST_READ_long_raw_s     "raw"
-  #define FSS_EMBEDDED_LIST_READ_long_select_s  "select"
-  #define FSS_EMBEDDED_LIST_READ_long_total_s   "total"
-  #define FSS_EMBEDDED_LIST_READ_long_trim_s    "trim"
-
-  #define FSS_EMBEDDED_LIST_READ_short_at_s_length      1
-  #define FSS_EMBEDDED_LIST_READ_short_content_s_length 1
-  #define FSS_EMBEDDED_LIST_READ_short_columns_s_length 1
-  #define FSS_EMBEDDED_LIST_READ_short_delimit_s_length 1
-  #define FSS_EMBEDDED_LIST_READ_short_depth_s_length   1
-  #define FSS_EMBEDDED_LIST_READ_short_empty_s_length   1
-  #define FSS_EMBEDDED_LIST_READ_short_line_s_length    1
-  #define FSS_EMBEDDED_LIST_READ_short_name_s_length    1
-  #define FSS_EMBEDDED_LIST_READ_short_object_s_length  1
-  #define FSS_EMBEDDED_LIST_READ_short_pipe_s_length    1
-  #define FSS_EMBEDDED_LIST_READ_short_raw_s_length     1
-  #define FSS_EMBEDDED_LIST_READ_short_select_s_length  1
-  #define FSS_EMBEDDED_LIST_READ_short_total_s_length   1
-  #define FSS_EMBEDDED_LIST_READ_short_trim_s_length    1
-
-  #define FSS_EMBEDDED_LIST_READ_long_at_s_length      2
-  #define FSS_EMBEDDED_LIST_READ_long_content_s_length 7
-  #define FSS_EMBEDDED_LIST_READ_long_columns_s_length 7
-  #define FSS_EMBEDDED_LIST_READ_long_delimit_s_length 7
-  #define FSS_EMBEDDED_LIST_READ_long_depth_s_length   5
-  #define FSS_EMBEDDED_LIST_READ_long_empty_s_length   5
-  #define FSS_EMBEDDED_LIST_READ_long_line_s_length    4
-  #define FSS_EMBEDDED_LIST_READ_long_name_s_length    4
-  #define FSS_EMBEDDED_LIST_READ_long_object_s_length  6
-  #define FSS_EMBEDDED_LIST_READ_long_pipe_s_length    4
-  #define FSS_EMBEDDED_LIST_READ_long_raw_s_length     3
-  #define FSS_EMBEDDED_LIST_READ_long_select_s_length  6
-  #define FSS_EMBEDDED_LIST_READ_long_total_s_length   5
-  #define FSS_EMBEDDED_LIST_READ_long_trim_s_length    4
+  #define FSS_EMBEDDED_LIST_READ_short_at_s       "a"
+  #define FSS_EMBEDDED_LIST_READ_short_content_s  "c"
+  #define FSS_EMBEDDED_LIST_READ_short_columns_s  "C"
+  #define FSS_EMBEDDED_LIST_READ_short_delimit_s  "D"
+  #define FSS_EMBEDDED_LIST_READ_short_depth_s    "d"
+  #define FSS_EMBEDDED_LIST_READ_short_empty_s    "e"
+  #define FSS_EMBEDDED_LIST_READ_short_line_s     "l"
+  #define FSS_EMBEDDED_LIST_READ_short_name_s     "n"
+  #define FSS_EMBEDDED_LIST_READ_short_object_s   "o"
+  #define FSS_EMBEDDED_LIST_READ_short_pipe_s     "p"
+  #define FSS_EMBEDDED_LIST_READ_short_original_s "O"
+  #define FSS_EMBEDDED_LIST_READ_short_select_s   "s"
+  #define FSS_EMBEDDED_LIST_READ_short_total_s    "t"
+  #define FSS_EMBEDDED_LIST_READ_short_trim_s     "T"
+
+  #define FSS_EMBEDDED_LIST_READ_long_at_s       "at"
+  #define FSS_EMBEDDED_LIST_READ_long_content_s  "content"
+  #define FSS_EMBEDDED_LIST_READ_long_columns_s  "columns"
+  #define FSS_EMBEDDED_LIST_READ_long_delimit_s  "delimit"
+  #define FSS_EMBEDDED_LIST_READ_long_depth_s    "depth"
+  #define FSS_EMBEDDED_LIST_READ_long_empty_s    "empty"
+  #define FSS_EMBEDDED_LIST_READ_long_line_s     "line"
+  #define FSS_EMBEDDED_LIST_READ_long_name_s     "name"
+  #define FSS_EMBEDDED_LIST_READ_long_object_s   "object"
+  #define FSS_EMBEDDED_LIST_READ_long_pipe_s     "pipe"
+  #define FSS_EMBEDDED_LIST_READ_long_original_s "original"
+  #define FSS_EMBEDDED_LIST_READ_long_select_s   "select"
+  #define FSS_EMBEDDED_LIST_READ_long_total_s    "total"
+  #define FSS_EMBEDDED_LIST_READ_long_trim_s     "trim"
+
+  #define FSS_EMBEDDED_LIST_READ_short_at_s_length       1
+  #define FSS_EMBEDDED_LIST_READ_short_content_s_length  1
+  #define FSS_EMBEDDED_LIST_READ_short_columns_s_length  1
+  #define FSS_EMBEDDED_LIST_READ_short_delimit_s_length  1
+  #define FSS_EMBEDDED_LIST_READ_short_depth_s_length    1
+  #define FSS_EMBEDDED_LIST_READ_short_empty_s_length    1
+  #define FSS_EMBEDDED_LIST_READ_short_line_s_length     1
+  #define FSS_EMBEDDED_LIST_READ_short_name_s_length     1
+  #define FSS_EMBEDDED_LIST_READ_short_object_s_length   1
+  #define FSS_EMBEDDED_LIST_READ_short_pipe_s_length     1
+  #define FSS_EMBEDDED_LIST_READ_short_original_s_length 1
+  #define FSS_EMBEDDED_LIST_READ_short_select_s_length   1
+  #define FSS_EMBEDDED_LIST_READ_short_total_s_length    1
+  #define FSS_EMBEDDED_LIST_READ_short_trim_s_length     1
+
+  #define FSS_EMBEDDED_LIST_READ_long_at_s_length       2
+  #define FSS_EMBEDDED_LIST_READ_long_content_s_length  7
+  #define FSS_EMBEDDED_LIST_READ_long_columns_s_length  7
+  #define FSS_EMBEDDED_LIST_READ_long_delimit_s_length  7
+  #define FSS_EMBEDDED_LIST_READ_long_depth_s_length    5
+  #define FSS_EMBEDDED_LIST_READ_long_empty_s_length    5
+  #define FSS_EMBEDDED_LIST_READ_long_line_s_length     4
+  #define FSS_EMBEDDED_LIST_READ_long_name_s_length     4
+  #define FSS_EMBEDDED_LIST_READ_long_object_s_length   6
+  #define FSS_EMBEDDED_LIST_READ_long_pipe_s_length     4
+  #define FSS_EMBEDDED_LIST_READ_long_original_s_length 8
+  #define FSS_EMBEDDED_LIST_READ_long_select_s_length   6
+  #define FSS_EMBEDDED_LIST_READ_long_total_s_length    5
+  #define FSS_EMBEDDED_LIST_READ_long_trim_s_length     4
 
   extern const f_string_static_t fss_embedded_list_read_short_at_s;
   extern const f_string_static_t fss_embedded_list_read_short_content_s;
@@ -164,7 +164,7 @@ extern "C" {
   extern const f_string_static_t fss_embedded_list_read_short_name_s;
   extern const f_string_static_t fss_embedded_list_read_short_object_s;
   extern const f_string_static_t fss_embedded_list_read_short_pipe_s;
-  extern const f_string_static_t fss_embedded_list_read_short_raw_s;
+  extern const f_string_static_t fss_embedded_list_read_short_original_s;
   extern const f_string_static_t fss_embedded_list_read_short_select_s;
   extern const f_string_static_t fss_embedded_list_read_short_total_s;
   extern const f_string_static_t fss_embedded_list_read_short_trim_s;
@@ -179,7 +179,7 @@ extern "C" {
   extern const f_string_static_t fss_embedded_list_read_long_name_s;
   extern const f_string_static_t fss_embedded_list_read_long_object_s;
   extern const f_string_static_t fss_embedded_list_read_long_pipe_s;
-  extern const f_string_static_t fss_embedded_list_read_long_raw_s;
+  extern const f_string_static_t fss_embedded_list_read_long_original_s;
   extern const f_string_static_t fss_embedded_list_read_long_select_s;
   extern const f_string_static_t fss_embedded_list_read_long_total_s;
   extern const f_string_static_t fss_embedded_list_read_long_trim_s;
@@ -205,7 +205,7 @@ extern "C" {
     fss_embedded_list_read_parameter_name_e,
     fss_embedded_list_read_parameter_object_e,
     fss_embedded_list_read_parameter_pipe_e,
-    fss_embedded_list_read_parameter_raw_e,
+    fss_embedded_list_read_parameter_original_e,
     fss_embedded_list_read_parameter_select_e,
     fss_embedded_list_read_parameter_total_e,
     fss_embedded_list_read_parameter_trim_e,
@@ -232,7 +232,7 @@ extern "C" {
       macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_name_s.string, fss_embedded_list_read_long_name_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_object_s.string, fss_embedded_list_read_long_object_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_pipe_s.string, fss_embedded_list_read_long_pipe_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_raw_s.string, fss_embedded_list_read_long_raw_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_original_s.string, fss_embedded_list_read_long_original_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_select_s.string, fss_embedded_list_read_long_select_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_total_s.string, fss_embedded_list_read_long_total_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_embedded_list_read_short_trim_s.string, fss_embedded_list_read_long_trim_s.string, 0, 0, f_console_type_normal_e), \

diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
index b73519f..ab6acba 100644 (file)
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
@@ -36,7 +36,7 @@ extern "C" {
     fll_program_print_help_option(file, context, fss_embedded_list_read_short_name_s, fss_embedded_list_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Select Object with this name.");
     fll_program_print_help_option(file, context, fss_embedded_list_read_short_object_s, fss_embedded_list_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Print the Object.");
     fll_program_print_help_option(file, context, fss_embedded_list_read_short_pipe_s, fss_embedded_list_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Print using the special pipe format.");
-    fll_program_print_help_option(file, context, fss_embedded_list_read_short_raw_s, fss_embedded_list_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Print with the original quotes and escapes.");
+    fll_program_print_help_option(file, context, fss_embedded_list_read_short_original_s, fss_embedded_list_read_long_original_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print with the original quotes and escapes.");
     fll_program_print_help_option(file, context, fss_embedded_list_read_short_select_s, fss_embedded_list_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Select sub-Content at this index.");
     fll_program_print_help_option(file, context, fss_embedded_list_read_short_total_s, fss_embedded_list_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   Print the total number of lines.");
     fll_program_print_help_option(file, context, fss_embedded_list_read_short_trim_s, fss_embedded_list_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Trim Object names on select or print.");

diff --git a/level_3/fss_embedded_list_read/c/private-read.c b/level_3/fss_embedded_list_read/c/private-read.c
index cfc7837..38de2fa 100644 (file)
--- a/level_3/fss_embedded_list_read/c/private-read.c
+++ b/level_3/fss_embedded_list_read/c/private-read.c
@@ -337,7 +337,7 @@ extern "C" {
     const fss_embedded_list_read_skip_t parents = fss_embedded_list_read_skip_t_initialize;
 
 
-    if (data->main->parameters.array[fss_embedded_list_read_parameter_raw_e].result == f_console_result_found_e) {
+    if (data->main->parameters.array[fss_embedded_list_read_parameter_original_e].result == f_console_result_found_e) {
       f_fss_delimits_t except_none = f_fss_delimits_t_initialize;
 
       return fss_embedded_list_read_main_process_for_depth(data, filename, depths, 0, line, parents, &except_none, &except_none);

diff --git a/level_3/fss_extended_list_read/c/common.c b/level_3/fss_extended_list_read/c/common.c
index 7675a99..e7fedce 100644 (file)
--- a/level_3/fss_extended_list_read/c/common.c
+++ b/level_3/fss_extended_list_read/c/common.c
@@ -31,7 +31,7 @@ extern "C" {
   const f_string_static_t fss_extended_list_read_short_name_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_name_s, 0, FSS_EXTENDED_LIST_READ_short_name_s_length);
   const f_string_static_t fss_extended_list_read_short_object_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_object_s, 0, FSS_EXTENDED_LIST_READ_short_object_s_length);
   const f_string_static_t fss_extended_list_read_short_pipe_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_pipe_s, 0, FSS_EXTENDED_LIST_READ_short_pipe_s_length);
-  const f_string_static_t fss_extended_list_read_short_raw_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_raw_s, 0, FSS_EXTENDED_LIST_READ_short_raw_s_length);
+  const f_string_static_t fss_extended_list_read_short_original_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_original_s, 0, FSS_EXTENDED_LIST_READ_short_original_s_length);
   const f_string_static_t fss_extended_list_read_short_select_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_select_s, 0, FSS_EXTENDED_LIST_READ_short_select_s_length);
   const f_string_static_t fss_extended_list_read_short_total_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_total_s, 0, FSS_EXTENDED_LIST_READ_short_total_s_length);
   const f_string_static_t fss_extended_list_read_short_trim_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_short_trim_s, 0, FSS_EXTENDED_LIST_READ_short_trim_s_length);
@@ -46,7 +46,7 @@ extern "C" {
   const f_string_static_t fss_extended_list_read_long_name_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_name_s, 0, FSS_EXTENDED_LIST_READ_long_name_s_length);
   const f_string_static_t fss_extended_list_read_long_object_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_object_s, 0, FSS_EXTENDED_LIST_READ_long_object_s_length);
   const f_string_static_t fss_extended_list_read_long_pipe_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_pipe_s, 0, FSS_EXTENDED_LIST_READ_long_pipe_s_length);
-  const f_string_static_t fss_extended_list_read_long_raw_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_raw_s, 0, FSS_EXTENDED_LIST_READ_long_raw_s_length);
+  const f_string_static_t fss_extended_list_read_long_original_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_original_s, 0, FSS_EXTENDED_LIST_READ_long_original_s_length);
   const f_string_static_t fss_extended_list_read_long_select_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_select_s, 0, FSS_EXTENDED_LIST_READ_long_select_s_length);
   const f_string_static_t fss_extended_list_read_long_total_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_total_s, 0, FSS_EXTENDED_LIST_READ_long_total_s_length);
   const f_string_static_t fss_extended_list_read_long_trim_s = macro_f_string_static_t_initialize(FSS_EXTENDED_LIST_READ_long_trim_s, 0, FSS_EXTENDED_LIST_READ_long_trim_s_length);

diff --git a/level_3/fss_extended_list_read/c/common.h b/level_3/fss_extended_list_read/c/common.h
index 5f5f681..847917d 100644 (file)
--- a/level_3/fss_extended_list_read/c/common.h
+++ b/level_3/fss_extended_list_read/c/common.h
@@ -94,65 +94,65 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_fss_extended_list_read_parameters_
-  #define FSS_EXTENDED_LIST_READ_short_at_s      "a"
-  #define FSS_EXTENDED_LIST_READ_short_content_s "c"
-  #define FSS_EXTENDED_LIST_READ_short_columns_s "C"
-  #define FSS_EXTENDED_LIST_READ_short_delimit_s "D"
-  #define FSS_EXTENDED_LIST_READ_short_depth_s   "d"
-  #define FSS_EXTENDED_LIST_READ_short_empty_s   "e"
-  #define FSS_EXTENDED_LIST_READ_short_line_s    "l"
-  #define FSS_EXTENDED_LIST_READ_short_name_s    "n"
-  #define FSS_EXTENDED_LIST_READ_short_object_s  "o"
-  #define FSS_EXTENDED_LIST_READ_short_pipe_s    "p"
-  #define FSS_EXTENDED_LIST_READ_short_raw_s     "R"
-  #define FSS_EXTENDED_LIST_READ_short_select_s  "s"
-  #define FSS_EXTENDED_LIST_READ_short_total_s   "t"
-  #define FSS_EXTENDED_LIST_READ_short_trim_s    "T"
-
-  #define FSS_EXTENDED_LIST_READ_long_at_s      "at"
-  #define FSS_EXTENDED_LIST_READ_long_content_s "content"
-  #define FSS_EXTENDED_LIST_READ_long_columns_s "columns"
-  #define FSS_EXTENDED_LIST_READ_long_delimit_s "delimit"
-  #define FSS_EXTENDED_LIST_READ_long_depth_s   "depth"
-  #define FSS_EXTENDED_LIST_READ_long_empty_s   "empty"
-  #define FSS_EXTENDED_LIST_READ_long_line_s    "line"
-  #define FSS_EXTENDED_LIST_READ_long_name_s    "name"
-  #define FSS_EXTENDED_LIST_READ_long_object_s  "object"
-  #define FSS_EXTENDED_LIST_READ_long_pipe_s    "pipe"
-  #define FSS_EXTENDED_LIST_READ_long_raw_s     "raw"
-  #define FSS_EXTENDED_LIST_READ_long_select_s  "select"
-  #define FSS_EXTENDED_LIST_READ_long_total_s   "total"
-  #define FSS_EXTENDED_LIST_READ_long_trim_s    "trim"
-
-  #define FSS_EXTENDED_LIST_READ_short_at_s_length      1
-  #define FSS_EXTENDED_LIST_READ_short_content_s_length 1
-  #define FSS_EXTENDED_LIST_READ_short_columns_s_length 1
-  #define FSS_EXTENDED_LIST_READ_short_delimit_s_length 1
-  #define FSS_EXTENDED_LIST_READ_short_depth_s_length   1
-  #define FSS_EXTENDED_LIST_READ_short_empty_s_length   1
-  #define FSS_EXTENDED_LIST_READ_short_line_s_length    1
-  #define FSS_EXTENDED_LIST_READ_short_name_s_length    1
-  #define FSS_EXTENDED_LIST_READ_short_object_s_length  1
-  #define FSS_EXTENDED_LIST_READ_short_pipe_s_length    1
-  #define FSS_EXTENDED_LIST_READ_short_raw_s_length     1
-  #define FSS_EXTENDED_LIST_READ_short_select_s_length  1
-  #define FSS_EXTENDED_LIST_READ_short_total_s_length   1
-  #define FSS_EXTENDED_LIST_READ_short_trim_s_length    1
-
-  #define FSS_EXTENDED_LIST_READ_long_at_s_length      2
-  #define FSS_EXTENDED_LIST_READ_long_content_s_length 7
-  #define FSS_EXTENDED_LIST_READ_long_columns_s_length 7
-  #define FSS_EXTENDED_LIST_READ_long_delimit_s_length 7
-  #define FSS_EXTENDED_LIST_READ_long_depth_s_length   5
-  #define FSS_EXTENDED_LIST_READ_long_empty_s_length   5
-  #define FSS_EXTENDED_LIST_READ_long_line_s_length    4
-  #define FSS_EXTENDED_LIST_READ_long_name_s_length    4
-  #define FSS_EXTENDED_LIST_READ_long_object_s_length  6
-  #define FSS_EXTENDED_LIST_READ_long_pipe_s_length    4
-  #define FSS_EXTENDED_LIST_READ_long_raw_s_length     3
-  #define FSS_EXTENDED_LIST_READ_long_select_s_length  6
-  #define FSS_EXTENDED_LIST_READ_long_total_s_length   5
-  #define FSS_EXTENDED_LIST_READ_long_trim_s_length    4
+  #define FSS_EXTENDED_LIST_READ_short_at_s       "a"
+  #define FSS_EXTENDED_LIST_READ_short_content_s  "c"
+  #define FSS_EXTENDED_LIST_READ_short_columns_s  "C"
+  #define FSS_EXTENDED_LIST_READ_short_delimit_s  "D"
+  #define FSS_EXTENDED_LIST_READ_short_depth_s    "d"
+  #define FSS_EXTENDED_LIST_READ_short_empty_s    "e"
+  #define FSS_EXTENDED_LIST_READ_short_line_s     "l"
+  #define FSS_EXTENDED_LIST_READ_short_name_s     "n"
+  #define FSS_EXTENDED_LIST_READ_short_object_s   "o"
+  #define FSS_EXTENDED_LIST_READ_short_pipe_s     "p"
+  #define FSS_EXTENDED_LIST_READ_short_original_s "O"
+  #define FSS_EXTENDED_LIST_READ_short_select_s   "s"
+  #define FSS_EXTENDED_LIST_READ_short_total_s    "t"
+  #define FSS_EXTENDED_LIST_READ_short_trim_s     "T"
+
+  #define FSS_EXTENDED_LIST_READ_long_at_s       "at"
+  #define FSS_EXTENDED_LIST_READ_long_content_s  "content"
+  #define FSS_EXTENDED_LIST_READ_long_columns_s  "columns"
+  #define FSS_EXTENDED_LIST_READ_long_delimit_s  "delimit"
+  #define FSS_EXTENDED_LIST_READ_long_depth_s    "depth"
+  #define FSS_EXTENDED_LIST_READ_long_empty_s    "empty"
+  #define FSS_EXTENDED_LIST_READ_long_line_s     "line"
+  #define FSS_EXTENDED_LIST_READ_long_name_s     "name"
+  #define FSS_EXTENDED_LIST_READ_long_object_s   "object"
+  #define FSS_EXTENDED_LIST_READ_long_pipe_s     "pipe"
+  #define FSS_EXTENDED_LIST_READ_long_original_s "original"
+  #define FSS_EXTENDED_LIST_READ_long_select_s   "select"
+  #define FSS_EXTENDED_LIST_READ_long_total_s    "total"
+  #define FSS_EXTENDED_LIST_READ_long_trim_s     "trim"
+
+  #define FSS_EXTENDED_LIST_READ_short_at_s_length       1
+  #define FSS_EXTENDED_LIST_READ_short_content_s_length  1
+  #define FSS_EXTENDED_LIST_READ_short_columns_s_length  1
+  #define FSS_EXTENDED_LIST_READ_short_delimit_s_length  1
+  #define FSS_EXTENDED_LIST_READ_short_depth_s_length    1
+  #define FSS_EXTENDED_LIST_READ_short_empty_s_length    1
+  #define FSS_EXTENDED_LIST_READ_short_line_s_length     1
+  #define FSS_EXTENDED_LIST_READ_short_name_s_length     1
+  #define FSS_EXTENDED_LIST_READ_short_object_s_length   1
+  #define FSS_EXTENDED_LIST_READ_short_pipe_s_length     1
+  #define FSS_EXTENDED_LIST_READ_short_original_s_length 1
+  #define FSS_EXTENDED_LIST_READ_short_select_s_length   1
+  #define FSS_EXTENDED_LIST_READ_short_total_s_length    1
+  #define FSS_EXTENDED_LIST_READ_short_trim_s_length     1
+
+  #define FSS_EXTENDED_LIST_READ_long_at_s_length       2
+  #define FSS_EXTENDED_LIST_READ_long_content_s_length  7
+  #define FSS_EXTENDED_LIST_READ_long_columns_s_length  7
+  #define FSS_EXTENDED_LIST_READ_long_delimit_s_length  7
+  #define FSS_EXTENDED_LIST_READ_long_depth_s_length    5
+  #define FSS_EXTENDED_LIST_READ_long_empty_s_length    5
+  #define FSS_EXTENDED_LIST_READ_long_line_s_length     4
+  #define FSS_EXTENDED_LIST_READ_long_name_s_length     4
+  #define FSS_EXTENDED_LIST_READ_long_object_s_length   6
+  #define FSS_EXTENDED_LIST_READ_long_pipe_s_length     4
+  #define FSS_EXTENDED_LIST_READ_long_original_s_length 8
+  #define FSS_EXTENDED_LIST_READ_long_select_s_length   6
+  #define FSS_EXTENDED_LIST_READ_long_total_s_length    5
+  #define FSS_EXTENDED_LIST_READ_long_trim_s_length     4
 
   extern const f_string_static_t fss_extended_list_read_short_at_s;
   extern const f_string_static_t fss_extended_list_read_short_content_s;
@@ -164,7 +164,7 @@ extern "C" {
   extern const f_string_static_t fss_extended_list_read_short_name_s;
   extern const f_string_static_t fss_extended_list_read_short_object_s;
   extern const f_string_static_t fss_extended_list_read_short_pipe_s;
-  extern const f_string_static_t fss_extended_list_read_short_raw_s;
+  extern const f_string_static_t fss_extended_list_read_short_original_s;
   extern const f_string_static_t fss_extended_list_read_short_select_s;
   extern const f_string_static_t fss_extended_list_read_short_total_s;
   extern const f_string_static_t fss_extended_list_read_short_trim_s;
@@ -179,7 +179,7 @@ extern "C" {
   extern const f_string_static_t fss_extended_list_read_long_name_s;
   extern const f_string_static_t fss_extended_list_read_long_object_s;
   extern const f_string_static_t fss_extended_list_read_long_pipe_s;
-  extern const f_string_static_t fss_extended_list_read_long_raw_s;
+  extern const f_string_static_t fss_extended_list_read_long_original_s;
   extern const f_string_static_t fss_extended_list_read_long_select_s;
   extern const f_string_static_t fss_extended_list_read_long_total_s;
   extern const f_string_static_t fss_extended_list_read_long_trim_s;
@@ -205,7 +205,7 @@ extern "C" {
     fss_extended_list_read_parameter_name_e,
     fss_extended_list_read_parameter_object_e,
     fss_extended_list_read_parameter_pipe_e,
-    fss_extended_list_read_parameter_raw_e,
+    fss_extended_list_read_parameter_original_e,
     fss_extended_list_read_parameter_select_e,
     fss_extended_list_read_parameter_total_e,
     fss_extended_list_read_parameter_trim_e,
@@ -232,7 +232,7 @@ extern "C" {
       macro_f_console_parameter_t_initialize(fss_extended_list_read_short_name_s.string, fss_extended_list_read_long_name_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_list_read_short_object_s.string, fss_extended_list_read_long_object_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_list_read_short_pipe_s.string, fss_extended_list_read_long_pipe_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(fss_extended_list_read_short_raw_s.string, fss_extended_list_read_long_raw_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(fss_extended_list_read_short_original_s.string, fss_extended_list_read_long_original_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_list_read_short_select_s.string, fss_extended_list_read_long_select_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_list_read_short_total_s.string, fss_extended_list_read_long_total_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_list_read_short_trim_s.string, fss_extended_list_read_long_trim_s.string, 0, 0, f_console_type_normal_e), \

diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c
index b18f5ce..2afd8d9 100644 (file)
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c
@@ -36,7 +36,7 @@ extern "C" {
     fll_program_print_help_option(file, context, fss_extended_list_read_short_name_s, fss_extended_list_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Select Object with this name.");
     fll_program_print_help_option(file, context, fss_extended_list_read_short_object_s, fss_extended_list_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Print the Object.");
     fll_program_print_help_option(file, context, fss_extended_list_read_short_pipe_s, fss_extended_list_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Print using the special pipe format.");
-    fll_program_print_help_option(file, context, fss_extended_list_read_short_raw_s, fss_extended_list_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Print with the original quotes and escapes.");
+    fll_program_print_help_option(file, context, fss_extended_list_read_short_original_s, fss_extended_list_read_long_original_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print with the original quotes and escapes.");
     fll_program_print_help_option(file, context, fss_extended_list_read_short_select_s, fss_extended_list_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Select sub-Content at this index.");
     fll_program_print_help_option(file, context, fss_extended_list_read_short_total_s, fss_extended_list_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   Print the total number of lines.");
     fll_program_print_help_option(file, context, fss_extended_list_read_short_trim_s, fss_extended_list_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Trim Object names on select or print.");

diff --git a/level_3/fss_extended_list_read/c/private-common.h b/level_3/fss_extended_list_read/c/private-common.h
index 914cae6..24df2c0 100644 (file)
--- a/level_3/fss_extended_list_read/c/private-common.h
+++ b/level_3/fss_extended_list_read/c/private-common.h
@@ -138,17 +138,17 @@ extern "C" {
  * The data structure for FSS Basic Read.
  *
  * fss_extended_list_read_data_option_*:
- *   - at:      The object at the given position is being selected (Think of this as select a row for some Object).
- *   - columns: The total columns found and selected is printed instead of the Content.
- *   - content: The Content is to be printed.
- *   - empty:   Empty Content will be printed (Objects that have no Content will have their empty Content printed).
- *   - line:    A specific Content at a given line is to be selected (Think of this as select a row for some Content).
- *   - name:    A specific Object name has been requested.
- *   - object:  The Object is to be printed.
- *   - raw:     Enable raw printing, where the quotes are printed and no delimits are applied.
- *   - select:  A specific Content at a given position is to be selected (Think of this as select a column for some Content).
- *   - total:   The total lines found and selected is printed instead of the Content.
- *   - trim:    Empty space before and after Objects and Content will not be printed (They will be trimmed).
+ *   - at:       The object at the given position is being selected (Think of this as select a row for some Object).
+ *   - columns:  The total columns found and selected is printed instead of the Content.
+ *   - content:  The Content is to be printed.
+ *   - empty:    Empty Content will be printed (Objects that have no Content will have their empty Content printed).
+ *   - line:     A specific Content at a given line is to be selected (Think of this as select a row for some Content).
+ *   - name:     A specific Object name has been requested.
+ *   - object:   The Object is to be printed.
+ *   - original: Enable original printing, where the quotes are printed and no delimits are applied.
+ *   - select:   A specific Content at a given position is to be selected (Think of this as select a column for some Content).
+ *   - total:    The total lines found and selected is printed instead of the Content.
+ *   - trim:     Empty space before and after Objects and Content will not be printed (They will be trimmed).
  *
  * argv:             The argument structure in the progam data parameters for simplifying syntax.
  * options:          Bitwise flags representing parameters.
@@ -165,17 +165,17 @@ extern "C" {
  * delimits_content: The positions within the buffer representing Content character delimits.
  */
 #ifndef _di_fss_extended_list_read_data_t_
-  #define fss_extended_list_read_data_option_at_d      0x1
-  #define fss_extended_list_read_data_option_columns_d 0x2
-  #define fss_extended_list_read_data_option_content_d 0x4
-  #define fss_extended_list_read_data_option_empty_d   0x8
-  #define fss_extended_list_read_data_option_line_d    0x10
-  #define fss_extended_list_read_data_option_name_d    0x20
-  #define fss_extended_list_read_data_option_object_d  0x40
-  #define fss_extended_list_read_data_option_raw_d     0x80
-  #define fss_extended_list_read_data_option_select_d  0x100
-  #define fss_extended_list_read_data_option_total_d   0x200
-  #define fss_extended_list_read_data_option_trim_d    0x400
+  #define fss_extended_list_read_data_option_at_d       0x1
+  #define fss_extended_list_read_data_option_columns_d  0x2
+  #define fss_extended_list_read_data_option_content_d  0x4
+  #define fss_extended_list_read_data_option_empty_d    0x8
+  #define fss_extended_list_read_data_option_line_d     0x10
+  #define fss_extended_list_read_data_option_name_d     0x20
+  #define fss_extended_list_read_data_option_object_d   0x40
+  #define fss_extended_list_read_data_option_original_d 0x80
+  #define fss_extended_list_read_data_option_select_d   0x100
+  #define fss_extended_list_read_data_option_total_d    0x200
+  #define fss_extended_list_read_data_option_trim_d     0x400
 
   typedef struct {
     uint16_t option;

diff --git a/level_3/fss_extended_list_read/c/private-read.c b/level_3/fss_extended_list_read/c/private-read.c
index d856fcd..0b669e7 100644 (file)
--- a/level_3/fss_extended_list_read/c/private-read.c
+++ b/level_3/fss_extended_list_read/c/private-read.c
@@ -339,7 +339,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_extended_list_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_extended_list_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_extended_list_read_data_option_raw_d) {
+    if (data->option & fss_extended_list_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -374,7 +374,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_extended_list_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_extended_list_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_extended_list_read_data_option_raw_d) {
+    if (data->option & fss_extended_list_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -607,7 +607,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_extended_list_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_extended_list_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_extended_list_read_data_option_raw_d) {
+    if (data->option & fss_extended_list_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -689,8 +689,8 @@ extern "C" {
       data->option |= fss_extended_list_read_data_option_object_d;
     }
 
-    if (main->parameters.array[fss_extended_list_read_parameter_raw_e].result == f_console_result_found_e) {
-      data->option |= fss_extended_list_read_data_option_raw_d;
+    if (main->parameters.array[fss_extended_list_read_parameter_original_e].result == f_console_result_found_e) {
+      data->option |= fss_extended_list_read_data_option_original_d;
     }
 
     if (main->parameters.array[fss_extended_list_read_parameter_select_e].result == f_console_result_additional_e) {

diff --git a/level_3/fss_extended_read/c/common.c b/level_3/fss_extended_read/c/common.c
index 0622266..0f44d43 100644 (file)
--- a/level_3/fss_extended_read/c/common.c
+++ b/level_3/fss_extended_read/c/common.c
@@ -31,7 +31,7 @@ extern "C" {
   const f_string_static_t fss_extended_read_short_name_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_name_s, 0, FSS_EXTENDED_READ_short_name_s_length);
   const f_string_static_t fss_extended_read_short_object_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_object_s, 0, FSS_EXTENDED_READ_short_object_s_length);
   const f_string_static_t fss_extended_read_short_pipe_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_pipe_s, 0, FSS_EXTENDED_READ_short_pipe_s_length);
-  const f_string_static_t fss_extended_read_short_raw_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_raw_s, 0, FSS_EXTENDED_READ_short_raw_s_length);
+  const f_string_static_t fss_extended_read_short_original_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_original_s, 0, FSS_EXTENDED_READ_short_original_s_length);
   const f_string_static_t fss_extended_read_short_select_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_select_s, 0, FSS_EXTENDED_READ_short_select_s_length);
   const f_string_static_t fss_extended_read_short_total_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_total_s, 0, FSS_EXTENDED_READ_short_total_s_length);
   const f_string_static_t fss_extended_read_short_trim_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_short_trim_s, 0, FSS_EXTENDED_READ_short_trim_s_length);
@@ -46,7 +46,7 @@ extern "C" {
   const f_string_static_t fss_extended_read_long_name_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_name_s, 0, FSS_EXTENDED_READ_long_name_s_length);
   const f_string_static_t fss_extended_read_long_object_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_object_s, 0, FSS_EXTENDED_READ_long_object_s_length);
   const f_string_static_t fss_extended_read_long_pipe_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_pipe_s, 0, FSS_EXTENDED_READ_long_pipe_s_length);
-  const f_string_static_t fss_extended_read_long_raw_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_raw_s, 0, FSS_EXTENDED_READ_long_raw_s_length);
+  const f_string_static_t fss_extended_read_long_original_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_original_s, 0, FSS_EXTENDED_READ_long_original_s_length);
   const f_string_static_t fss_extended_read_long_select_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_select_s, 0, FSS_EXTENDED_READ_long_select_s_length);
   const f_string_static_t fss_extended_read_long_total_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_total_s, 0, FSS_EXTENDED_READ_long_total_s_length);
   const f_string_static_t fss_extended_read_long_trim_s = macro_f_string_static_t_initialize(FSS_EXTENDED_READ_long_trim_s, 0, FSS_EXTENDED_READ_long_trim_s_length);

diff --git a/level_3/fss_extended_read/c/common.h b/level_3/fss_extended_read/c/common.h
index 2b78846..737a06d 100644 (file)
--- a/level_3/fss_extended_read/c/common.h
+++ b/level_3/fss_extended_read/c/common.h
@@ -94,65 +94,65 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_fss_extended_read_parameters_
-  #define FSS_EXTENDED_READ_short_at_s      "a"
-  #define FSS_EXTENDED_READ_short_content_s "c"
-  #define FSS_EXTENDED_READ_short_columns_s "C"
-  #define FSS_EXTENDED_READ_short_delimit_s "D"
-  #define FSS_EXTENDED_READ_short_depth_s   "d"
-  #define FSS_EXTENDED_READ_short_empty_s   "e"
-  #define FSS_EXTENDED_READ_short_line_s    "l"
-  #define FSS_EXTENDED_READ_short_name_s    "n"
-  #define FSS_EXTENDED_READ_short_object_s  "o"
-  #define FSS_EXTENDED_READ_short_pipe_s    "p"
-  #define FSS_EXTENDED_READ_short_raw_s     "R"
-  #define FSS_EXTENDED_READ_short_select_s  "s"
-  #define FSS_EXTENDED_READ_short_total_s   "t"
-  #define FSS_EXTENDED_READ_short_trim_s    "T"
-
-  #define FSS_EXTENDED_READ_long_at_s      "at"
-  #define FSS_EXTENDED_READ_long_content_s "content"
-  #define FSS_EXTENDED_READ_long_columns_s "columns"
-  #define FSS_EXTENDED_READ_long_delimit_s "delimit"
-  #define FSS_EXTENDED_READ_long_depth_s   "depth"
-  #define FSS_EXTENDED_READ_long_empty_s   "empty"
-  #define FSS_EXTENDED_READ_long_line_s    "line"
-  #define FSS_EXTENDED_READ_long_name_s    "name"
-  #define FSS_EXTENDED_READ_long_object_s  "object"
-  #define FSS_EXTENDED_READ_long_pipe_s    "pipe"
-  #define FSS_EXTENDED_READ_long_raw_s     "raw"
-  #define FSS_EXTENDED_READ_long_select_s  "select"
-  #define FSS_EXTENDED_READ_long_total_s   "total"
-  #define FSS_EXTENDED_READ_long_trim_s    "trim"
-
-  #define FSS_EXTENDED_READ_short_at_s_length      1
-  #define FSS_EXTENDED_READ_short_content_s_length 1
-  #define FSS_EXTENDED_READ_short_columns_s_length 1
-  #define FSS_EXTENDED_READ_short_delimit_s_length 1
-  #define FSS_EXTENDED_READ_short_depth_s_length   1
-  #define FSS_EXTENDED_READ_short_empty_s_length   1
-  #define FSS_EXTENDED_READ_short_line_s_length    1
-  #define FSS_EXTENDED_READ_short_name_s_length    1
-  #define FSS_EXTENDED_READ_short_object_s_length  1
-  #define FSS_EXTENDED_READ_short_pipe_s_length    1
-  #define FSS_EXTENDED_READ_short_raw_s_length     1
-  #define FSS_EXTENDED_READ_short_select_s_length  1
-  #define FSS_EXTENDED_READ_short_total_s_length   1
-  #define FSS_EXTENDED_READ_short_trim_s_length    1
-
-  #define FSS_EXTENDED_READ_long_at_s_length      2
-  #define FSS_EXTENDED_READ_long_content_s_length 7
-  #define FSS_EXTENDED_READ_long_columns_s_length 7
-  #define FSS_EXTENDED_READ_long_delimit_s_length 7
-  #define FSS_EXTENDED_READ_long_depth_s_length   5
-  #define FSS_EXTENDED_READ_long_empty_s_length   5
-  #define FSS_EXTENDED_READ_long_line_s_length    4
-  #define FSS_EXTENDED_READ_long_name_s_length    4
-  #define FSS_EXTENDED_READ_long_object_s_length  6
-  #define FSS_EXTENDED_READ_long_pipe_s_length    4
-  #define FSS_EXTENDED_READ_long_raw_s_length     3
-  #define FSS_EXTENDED_READ_long_select_s_length  6
-  #define FSS_EXTENDED_READ_long_total_s_length   5
-  #define FSS_EXTENDED_READ_long_trim_s_length    4
+  #define FSS_EXTENDED_READ_short_at_s       "a"
+  #define FSS_EXTENDED_READ_short_content_s  "c"
+  #define FSS_EXTENDED_READ_short_columns_s  "C"
+  #define FSS_EXTENDED_READ_short_delimit_s  "D"
+  #define FSS_EXTENDED_READ_short_depth_s    "d"
+  #define FSS_EXTENDED_READ_short_empty_s    "e"
+  #define FSS_EXTENDED_READ_short_line_s     "l"
+  #define FSS_EXTENDED_READ_short_name_s     "n"
+  #define FSS_EXTENDED_READ_short_object_s   "o"
+  #define FSS_EXTENDED_READ_short_pipe_s     "p"
+  #define FSS_EXTENDED_READ_short_original_s "O"
+  #define FSS_EXTENDED_READ_short_select_s   "s"
+  #define FSS_EXTENDED_READ_short_total_s    "t"
+  #define FSS_EXTENDED_READ_short_trim_s     "T"
+
+  #define FSS_EXTENDED_READ_long_at_s       "at"
+  #define FSS_EXTENDED_READ_long_content_s  "content"
+  #define FSS_EXTENDED_READ_long_columns_s  "columns"
+  #define FSS_EXTENDED_READ_long_delimit_s  "delimit"
+  #define FSS_EXTENDED_READ_long_depth_s    "depth"
+  #define FSS_EXTENDED_READ_long_empty_s    "empty"
+  #define FSS_EXTENDED_READ_long_line_s     "line"
+  #define FSS_EXTENDED_READ_long_name_s     "name"
+  #define FSS_EXTENDED_READ_long_object_s   "object"
+  #define FSS_EXTENDED_READ_long_pipe_s     "pipe"
+  #define FSS_EXTENDED_READ_long_original_s "original"
+  #define FSS_EXTENDED_READ_long_select_s   "select"
+  #define FSS_EXTENDED_READ_long_total_s    "total"
+  #define FSS_EXTENDED_READ_long_trim_s     "trim"
+
+  #define FSS_EXTENDED_READ_short_at_s_length       1
+  #define FSS_EXTENDED_READ_short_content_s_length  1
+  #define FSS_EXTENDED_READ_short_columns_s_length  1
+  #define FSS_EXTENDED_READ_short_delimit_s_length  1
+  #define FSS_EXTENDED_READ_short_depth_s_length    1
+  #define FSS_EXTENDED_READ_short_empty_s_length    1
+  #define FSS_EXTENDED_READ_short_line_s_length     1
+  #define FSS_EXTENDED_READ_short_name_s_length     1
+  #define FSS_EXTENDED_READ_short_object_s_length   1
+  #define FSS_EXTENDED_READ_short_pipe_s_length     1
+  #define FSS_EXTENDED_READ_short_original_s_length 1
+  #define FSS_EXTENDED_READ_short_select_s_length   1
+  #define FSS_EXTENDED_READ_short_total_s_length    1
+  #define FSS_EXTENDED_READ_short_trim_s_length     1
+
+  #define FSS_EXTENDED_READ_long_at_s_length       2
+  #define FSS_EXTENDED_READ_long_content_s_length  7
+  #define FSS_EXTENDED_READ_long_columns_s_length  7
+  #define FSS_EXTENDED_READ_long_delimit_s_length  7
+  #define FSS_EXTENDED_READ_long_depth_s_length    5
+  #define FSS_EXTENDED_READ_long_empty_s_length    5
+  #define FSS_EXTENDED_READ_long_line_s_length     4
+  #define FSS_EXTENDED_READ_long_name_s_length     4
+  #define FSS_EXTENDED_READ_long_object_s_length   6
+  #define FSS_EXTENDED_READ_long_pipe_s_length     4
+  #define FSS_EXTENDED_READ_long_original_s_length 8
+  #define FSS_EXTENDED_READ_long_select_s_length   6
+  #define FSS_EXTENDED_READ_long_total_s_length    5
+  #define FSS_EXTENDED_READ_long_trim_s_length     4
 
   extern const f_string_static_t fss_extended_read_short_at_s;
   extern const f_string_static_t fss_extended_read_short_content_s;
@@ -164,7 +164,7 @@ extern "C" {
   extern const f_string_static_t fss_extended_read_short_name_s;
   extern const f_string_static_t fss_extended_read_short_object_s;
   extern const f_string_static_t fss_extended_read_short_pipe_s;
-  extern const f_string_static_t fss_extended_read_short_raw_s;
+  extern const f_string_static_t fss_extended_read_short_original_s;
   extern const f_string_static_t fss_extended_read_short_select_s;
   extern const f_string_static_t fss_extended_read_short_total_s;
   extern const f_string_static_t fss_extended_read_short_trim_s;
@@ -179,7 +179,7 @@ extern "C" {
   extern const f_string_static_t fss_extended_read_long_name_s;
   extern const f_string_static_t fss_extended_read_long_object_s;
   extern const f_string_static_t fss_extended_read_long_pipe_s;
-  extern const f_string_static_t fss_extended_read_long_raw_s;
+  extern const f_string_static_t fss_extended_read_long_original_s;
   extern const f_string_static_t fss_extended_read_long_select_s;
   extern const f_string_static_t fss_extended_read_long_total_s;
   extern const f_string_static_t fss_extended_read_long_trim_s;
@@ -205,7 +205,7 @@ extern "C" {
     fss_extended_read_parameter_name_e,
     fss_extended_read_parameter_object_e,
     fss_extended_read_parameter_pipe_e,
-    fss_extended_read_parameter_raw_e,
+    fss_extended_read_parameter_original_e,
     fss_extended_read_parameter_select_e,
     fss_extended_read_parameter_total_e,
     fss_extended_read_parameter_trim_e,
@@ -232,7 +232,7 @@ extern "C" {
       macro_f_console_parameter_t_initialize(fss_extended_read_short_name_s.string, fss_extended_read_long_name_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_read_short_object_s.string, fss_extended_read_long_object_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_read_short_pipe_s.string, fss_extended_read_long_pipe_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(fss_extended_read_short_raw_s.string, fss_extended_read_long_raw_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(fss_extended_read_short_original_s.string, fss_extended_read_long_original_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_read_short_select_s.string, fss_extended_read_long_select_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_read_short_total_s.string, fss_extended_read_long_total_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_extended_read_short_trim_s.string, fss_extended_read_long_trim_s.string, 0, 0, f_console_type_normal_e), \

diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c
index dd9c88a..bc17a8b 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.c
+++ b/level_3/fss_extended_read/c/fss_extended_read.c
@@ -36,7 +36,7 @@ extern "C" {
     fll_program_print_help_option(file, context, fss_extended_read_short_name_s, fss_extended_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Select Object with this name.");
     fll_program_print_help_option(file, context, fss_extended_read_short_object_s, fss_extended_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Print the Object.");
     fll_program_print_help_option(file, context, fss_extended_read_short_pipe_s, fss_extended_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Print using the special pipe format.");
-    fll_program_print_help_option(file, context, fss_extended_read_short_raw_s, fss_extended_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Print with the original quotes and escapes.");
+    fll_program_print_help_option(file, context, fss_extended_read_short_original_s, fss_extended_read_long_original_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print with the original quotes and escapes.");
     fll_program_print_help_option(file, context, fss_extended_read_short_select_s, fss_extended_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Select sub-Content at this index.");
     fll_program_print_help_option(file, context, fss_extended_read_short_total_s, fss_extended_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   Print the total number of lines.");
     fll_program_print_help_option(file, context, fss_extended_read_short_trim_s, fss_extended_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Trim Object names on select or print.");

diff --git a/level_3/fss_extended_read/c/private-common.h b/level_3/fss_extended_read/c/private-common.h
index a7f6424..996d03e 100644 (file)
--- a/level_3/fss_extended_read/c/private-common.h
+++ b/level_3/fss_extended_read/c/private-common.h
@@ -137,17 +137,17 @@ extern "C" {
  * The data structure for FSS Basic Read.
  *
  * fss_extended_read_data_option_*:
- *   - at:      The object at the given position is being selected (Think of this as select a row for some Object).
- *   - columns: The total columns found and selected is printed instead of the Content.
- *   - content: The Content is to be printed.
- *   - empty:   Empty Content will be printed (Objects that have no Content will have their empty Content printed).
- *   - line:    A specific Content at a given line is to be selected (Think of this as select a row for some Content).
- *   - name:    A specific Object name has been requested.
- *   - object:  The Object is to be printed.
- *   - raw:     Enable raw printing, where the quotes are printed and no delimits are applied.
- *   - select:  A specific Content at a given position is to be selected (Think of this as select a column for some Content).
- *   - total:   The total lines found and selected is printed instead of the Content.
- *   - trim:    Empty space before and after Objects and Content will not be printed (They will be trimmed).
+ *   - at:       The object at the given position is being selected (Think of this as select a row for some Object).
+ *   - columns:  The total columns found and selected is printed instead of the Content.
+ *   - content:  The Content is to be printed.
+ *   - empty:    Empty Content will be printed (Objects that have no Content will have their empty Content printed).
+ *   - line:     A specific Content at a given line is to be selected (Think of this as select a row for some Content).
+ *   - name:     A specific Object name has been requested.
+ *   - object:   The Object is to be printed.
+ *   - original: Enable original printing, where the quotes are printed and no delimits are applied.
+ *   - select:   A specific Content at a given position is to be selected (Think of this as select a column for some Content).
+ *   - total:    The total lines found and selected is printed instead of the Content.
+ *   - trim:     Empty space before and after Objects and Content will not be printed (They will be trimmed).
  *
  * argv:             The argument structure in the progam data parameters for simplifying syntax.
  * options:          Bitwise flags representing parameters.
@@ -164,17 +164,17 @@ extern "C" {
  * delimits_content: The positions within the buffer representing Content character delimits.
  */
 #ifndef _di_fss_extended_read_data_t_
-  #define fss_extended_read_data_option_at_d      0x1
-  #define fss_extended_read_data_option_columns_d 0x2
-  #define fss_extended_read_data_option_content_d 0x4
-  #define fss_extended_read_data_option_empty_d   0x8
-  #define fss_extended_read_data_option_line_d    0x10
-  #define fss_extended_read_data_option_name_d    0x20
-  #define fss_extended_read_data_option_object_d  0x40
-  #define fss_extended_read_data_option_raw_d     0x80
-  #define fss_extended_read_data_option_select_d  0x100
-  #define fss_extended_read_data_option_total_d   0x200
-  #define fss_extended_read_data_option_trim_d    0x400
+  #define fss_extended_read_data_option_at_d       0x1
+  #define fss_extended_read_data_option_columns_d  0x2
+  #define fss_extended_read_data_option_content_d  0x4
+  #define fss_extended_read_data_option_empty_d    0x8
+  #define fss_extended_read_data_option_line_d     0x10
+  #define fss_extended_read_data_option_name_d     0x20
+  #define fss_extended_read_data_option_object_d   0x40
+  #define fss_extended_read_data_option_original_d 0x80
+  #define fss_extended_read_data_option_select_d   0x100
+  #define fss_extended_read_data_option_total_d    0x200
+  #define fss_extended_read_data_option_trim_d     0x400
 
   typedef struct {
     uint16_t option;

diff --git a/level_3/fss_extended_read/c/private-print.c b/level_3/fss_extended_read/c/private-print.c
index 788974b..f318c56 100644 (file)
--- a/level_3/fss_extended_read/c/private-print.c
+++ b/level_3/fss_extended_read/c/private-print.c
@@ -19,24 +19,24 @@ extern "C" {
     if ((data->option & fss_extended_read_data_option_object_d) || (data->option & fss_extended_read_data_option_content_d) && (data->contents.array[at].used || (data->option & fss_extended_read_data_option_empty_d))) {
       if (data->option & fss_extended_read_data_option_object_d) {
         if (data->option & fss_extended_read_data_option_trim_d) {
-          if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) {
+          if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_object.array[at]) {
             f_print_dynamic_raw(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
 
           fl_print_trim_except_dynamic_partial(data->buffer, data->objects.array[at], delimits_object, main->output.to.stream);
 
-          if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) {
+          if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_object.array[at]) {
             f_print_dynamic_raw(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
         }
         else {
-          if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) {
+          if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_object.array[at]) {
             f_print_dynamic_raw(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
 
           f_print_except_dynamic_partial(data->buffer, data->objects.array[at], delimits_object, main->output.to.stream);
 
-          if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) {
+          if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_object.array[at]) {
             f_print_dynamic_raw(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
         }
@@ -53,13 +53,13 @@ extern "C" {
           if (data->select < data->contents.array[at].used) {
             content_printed = F_true;
 
-            if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[data->select]) {
+            if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[data->select]) {
               f_print_dynamic_raw(data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
 
             f_print_except_dynamic_partial(data->buffer, data->contents.array[at].array[data->select], delimits_content, main->output.to.stream);
 
-            if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[data->select]) {
+            if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[data->select]) {
               f_print_dynamic_raw(data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
           }
@@ -73,13 +73,13 @@ extern "C" {
 
             content_printed = F_true;
 
-            if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) {
+            if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[i]) {
               f_print_dynamic_raw(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
 
             f_print_except_dynamic_partial(data->buffer, data->contents.array[at].array[i], delimits_content, main->output.to.stream);
 
-            if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) {
+            if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[i]) {
               f_print_dynamic_raw(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
 

diff --git a/level_3/fss_extended_read/c/private-read.c b/level_3/fss_extended_read/c/private-read.c
index f6ead16..773d4be 100644 (file)
--- a/level_3/fss_extended_read/c/private-read.c
+++ b/level_3/fss_extended_read/c/private-read.c
@@ -336,7 +336,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_extended_read_delimit_object_is(0, data) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_extended_read_delimit_content_is((data->option & fss_extended_read_data_option_select_d) ? data->select : 0, data) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_extended_read_data_option_raw_d) {
+    if (data->option & fss_extended_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -386,7 +386,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_extended_read_delimit_object_is(0, data) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_extended_read_delimit_content_is((data->option & fss_extended_read_data_option_select_d) ? data->select : 0, data) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_extended_read_data_option_raw_d) {
+    if (data->option & fss_extended_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -409,13 +409,13 @@ extern "C" {
             }
           }
           else {
-            if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) {
+            if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_object.array[at]) {
               f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
             }
 
             fss_extended_read_print_at(main, i, *delimits_object, *delimits_content, data);
 
-            if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_object.array[at]) {
+            if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_object.array[at]) {
               f_print_character_safely(data->quotes_object.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
             }
           }
@@ -429,13 +429,13 @@ extern "C" {
           }
         }
         else {
-          if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) {
+          if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[i]) {
             f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
           }
 
           fss_extended_read_print_at(main, i, *delimits_object, *delimits_content, data);
 
-          if ((data->option & fss_extended_read_data_option_raw_d) && data->quotes_content.array[at].array[i]) {
+          if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[i]) {
             f_print_character_safely(data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
           }
         }
@@ -495,7 +495,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_extended_read_delimit_object_is(0, data) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_extended_read_delimit_content_is((data->option & fss_extended_read_data_option_select_d) ? data->select : 0, data) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_extended_read_data_option_raw_d) {
+    if (data->option & fss_extended_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -610,8 +610,8 @@ extern "C" {
       data->option |= fss_extended_read_data_option_object_d;
     }
 
-    if (main->parameters.array[fss_extended_read_parameter_raw_e].result == f_console_result_found_e) {
-      data->option |= fss_extended_read_data_option_raw_d;
+    if (main->parameters.array[fss_extended_read_parameter_original_e].result == f_console_result_found_e) {
+      data->option |= fss_extended_read_data_option_original_d;
     }
 
     if (main->parameters.array[fss_extended_read_parameter_select_e].result == f_console_result_additional_e) {

diff --git a/level_3/fss_payload_read/c/common.c b/level_3/fss_payload_read/c/common.c
index e2eaeff..0c742fa 100644 (file)
--- a/level_3/fss_payload_read/c/common.c
+++ b/level_3/fss_payload_read/c/common.c
@@ -23,7 +23,7 @@ extern "C" {
   const f_string_static_t fss_payload_read_short_name_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_name_s, 0, FSS_PAYLOAD_READ_short_name_s_length);
   const f_string_static_t fss_payload_read_short_object_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_object_s, 0, FSS_PAYLOAD_READ_short_object_s_length);
   const f_string_static_t fss_payload_read_short_pipe_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_pipe_s, 0, FSS_PAYLOAD_READ_short_pipe_s_length);
-  const f_string_static_t fss_payload_read_short_raw_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_raw_s, 0, FSS_PAYLOAD_READ_short_raw_s_length);
+  const f_string_static_t fss_payload_read_short_original_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_original_s, 0, FSS_PAYLOAD_READ_short_original_s_length);
   const f_string_static_t fss_payload_read_short_select_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_select_s, 0, FSS_PAYLOAD_READ_short_select_s_length);
   const f_string_static_t fss_payload_read_short_total_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_total_s, 0, FSS_PAYLOAD_READ_short_total_s_length);
   const f_string_static_t fss_payload_read_short_trim_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_short_trim_s, 0, FSS_PAYLOAD_READ_short_trim_s_length);
@@ -38,7 +38,7 @@ extern "C" {
   const f_string_static_t fss_payload_read_long_name_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_name_s, 0, FSS_PAYLOAD_READ_long_name_s_length);
   const f_string_static_t fss_payload_read_long_object_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_object_s, 0, FSS_PAYLOAD_READ_long_object_s_length);
   const f_string_static_t fss_payload_read_long_pipe_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_pipe_s, 0, FSS_PAYLOAD_READ_long_pipe_s_length);
-  const f_string_static_t fss_payload_read_long_raw_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_raw_s, 0, FSS_PAYLOAD_READ_long_raw_s_length);
+  const f_string_static_t fss_payload_read_long_original_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_original_s, 0, FSS_PAYLOAD_READ_long_original_s_length);
   const f_string_static_t fss_payload_read_long_select_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_select_s, 0, FSS_PAYLOAD_READ_long_select_s_length);
   const f_string_static_t fss_payload_read_long_total_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_total_s, 0, FSS_PAYLOAD_READ_long_total_s_length);
   const f_string_static_t fss_payload_read_long_trim_s = macro_f_string_static_t_initialize(FSS_PAYLOAD_READ_long_trim_s, 0, FSS_PAYLOAD_READ_long_trim_s_length);

diff --git a/level_3/fss_payload_read/c/common.h b/level_3/fss_payload_read/c/common.h
index 01cb855..c2a5c6e 100644 (file)
--- a/level_3/fss_payload_read/c/common.h
+++ b/level_3/fss_payload_read/c/common.h
@@ -88,65 +88,65 @@ extern "C" {
  * The main program parameters.
  */
 #ifndef _di_fss_payload_read_parameters_
-  #define FSS_PAYLOAD_READ_short_at_s      "a"
-  #define FSS_PAYLOAD_READ_short_content_s "c"
-  #define FSS_PAYLOAD_READ_short_columns_s "C"
-  #define FSS_PAYLOAD_READ_short_delimit_s "D"
-  #define FSS_PAYLOAD_READ_short_depth_s   "d"
-  #define FSS_PAYLOAD_READ_short_empty_s   "e"
-  #define FSS_PAYLOAD_READ_short_line_s    "l"
-  #define FSS_PAYLOAD_READ_short_name_s    "n"
-  #define FSS_PAYLOAD_READ_short_object_s  "o"
-  #define FSS_PAYLOAD_READ_short_pipe_s    "p"
-  #define FSS_PAYLOAD_READ_short_raw_s     "R"
-  #define FSS_PAYLOAD_READ_short_select_s  "s"
-  #define FSS_PAYLOAD_READ_short_total_s   "t"
-  #define FSS_PAYLOAD_READ_short_trim_s    "T"
-
-  #define FSS_PAYLOAD_READ_long_at_s      "at"
-  #define FSS_PAYLOAD_READ_long_content_s "content"
-  #define FSS_PAYLOAD_READ_long_columns_s "columns"
-  #define FSS_PAYLOAD_READ_long_delimit_s "delimit"
-  #define FSS_PAYLOAD_READ_long_depth_s   "depth"
-  #define FSS_PAYLOAD_READ_long_empty_s   "empty"
-  #define FSS_PAYLOAD_READ_long_line_s    "line"
-  #define FSS_PAYLOAD_READ_long_name_s    "name"
-  #define FSS_PAYLOAD_READ_long_object_s  "object"
-  #define FSS_PAYLOAD_READ_long_pipe_s    "pipe"
-  #define FSS_PAYLOAD_READ_long_raw_s     "raw"
-  #define FSS_PAYLOAD_READ_long_select_s  "select"
-  #define FSS_PAYLOAD_READ_long_total_s   "total"
-  #define FSS_PAYLOAD_READ_long_trim_s    "trim"
-
-  #define FSS_PAYLOAD_READ_short_at_s_length      1
-  #define FSS_PAYLOAD_READ_short_content_s_length 1
-  #define FSS_PAYLOAD_READ_short_columns_s_length 1
-  #define FSS_PAYLOAD_READ_short_delimit_s_length 1
-  #define FSS_PAYLOAD_READ_short_depth_s_length   1
-  #define FSS_PAYLOAD_READ_short_empty_s_length   1
-  #define FSS_PAYLOAD_READ_short_line_s_length    1
-  #define FSS_PAYLOAD_READ_short_name_s_length    1
-  #define FSS_PAYLOAD_READ_short_object_s_length  1
-  #define FSS_PAYLOAD_READ_short_pipe_s_length    1
-  #define FSS_PAYLOAD_READ_short_raw_s_length     1
-  #define FSS_PAYLOAD_READ_short_select_s_length  1
-  #define FSS_PAYLOAD_READ_short_total_s_length   1
-  #define FSS_PAYLOAD_READ_short_trim_s_length    1
-
-  #define FSS_PAYLOAD_READ_long_at_s_length      2
-  #define FSS_PAYLOAD_READ_long_content_s_length 7
-  #define FSS_PAYLOAD_READ_long_columns_s_length 7
-  #define FSS_PAYLOAD_READ_long_delimit_s_length 7
-  #define FSS_PAYLOAD_READ_long_depth_s_length   5
-  #define FSS_PAYLOAD_READ_long_empty_s_length   5
-  #define FSS_PAYLOAD_READ_long_line_s_length    4
-  #define FSS_PAYLOAD_READ_long_name_s_length    4
-  #define FSS_PAYLOAD_READ_long_object_s_length  6
-  #define FSS_PAYLOAD_READ_long_pipe_s_length    4
-  #define FSS_PAYLOAD_READ_long_raw_s_length     3
-  #define FSS_PAYLOAD_READ_long_select_s_length  6
-  #define FSS_PAYLOAD_READ_long_total_s_length   5
-  #define FSS_PAYLOAD_READ_long_trim_s_length    4
+  #define FSS_PAYLOAD_READ_short_at_s       "a"
+  #define FSS_PAYLOAD_READ_short_content_s  "c"
+  #define FSS_PAYLOAD_READ_short_columns_s  "C"
+  #define FSS_PAYLOAD_READ_short_delimit_s  "D"
+  #define FSS_PAYLOAD_READ_short_depth_s    "d"
+  #define FSS_PAYLOAD_READ_short_empty_s    "e"
+  #define FSS_PAYLOAD_READ_short_line_s     "l"
+  #define FSS_PAYLOAD_READ_short_name_s     "n"
+  #define FSS_PAYLOAD_READ_short_object_s   "o"
+  #define FSS_PAYLOAD_READ_short_pipe_s     "p"
+  #define FSS_PAYLOAD_READ_short_original_s "O"
+  #define FSS_PAYLOAD_READ_short_select_s   "s"
+  #define FSS_PAYLOAD_READ_short_total_s    "t"
+  #define FSS_PAYLOAD_READ_short_trim_s     "T"
+
+  #define FSS_PAYLOAD_READ_long_at_s       "at"
+  #define FSS_PAYLOAD_READ_long_content_s  "content"
+  #define FSS_PAYLOAD_READ_long_columns_s  "columns"
+  #define FSS_PAYLOAD_READ_long_delimit_s  "delimit"
+  #define FSS_PAYLOAD_READ_long_depth_s    "depth"
+  #define FSS_PAYLOAD_READ_long_empty_s    "empty"
+  #define FSS_PAYLOAD_READ_long_line_s     "line"
+  #define FSS_PAYLOAD_READ_long_name_s     "name"
+  #define FSS_PAYLOAD_READ_long_object_s   "object"
+  #define FSS_PAYLOAD_READ_long_pipe_s     "pipe"
+  #define FSS_PAYLOAD_READ_long_original_s "original"
+  #define FSS_PAYLOAD_READ_long_select_s   "select"
+  #define FSS_PAYLOAD_READ_long_total_s    "total"
+  #define FSS_PAYLOAD_READ_long_trim_s     "trim"
+
+  #define FSS_PAYLOAD_READ_short_at_s_length       1
+  #define FSS_PAYLOAD_READ_short_content_s_length  1
+  #define FSS_PAYLOAD_READ_short_columns_s_length  1
+  #define FSS_PAYLOAD_READ_short_delimit_s_length  1
+  #define FSS_PAYLOAD_READ_short_depth_s_length    1
+  #define FSS_PAYLOAD_READ_short_empty_s_length    1
+  #define FSS_PAYLOAD_READ_short_line_s_length     1
+  #define FSS_PAYLOAD_READ_short_name_s_length     1
+  #define FSS_PAYLOAD_READ_short_object_s_length   1
+  #define FSS_PAYLOAD_READ_short_pipe_s_length     1
+  #define FSS_PAYLOAD_READ_short_original_s_length 1
+  #define FSS_PAYLOAD_READ_short_select_s_length   1
+  #define FSS_PAYLOAD_READ_short_total_s_length    1
+  #define FSS_PAYLOAD_READ_short_trim_s_length     1
+
+  #define FSS_PAYLOAD_READ_long_at_s_length       2
+  #define FSS_PAYLOAD_READ_long_content_s_length  7
+  #define FSS_PAYLOAD_READ_long_columns_s_length  7
+  #define FSS_PAYLOAD_READ_long_delimit_s_length  7
+  #define FSS_PAYLOAD_READ_long_depth_s_length    5
+  #define FSS_PAYLOAD_READ_long_empty_s_length    5
+  #define FSS_PAYLOAD_READ_long_line_s_length     4
+  #define FSS_PAYLOAD_READ_long_name_s_length     4
+  #define FSS_PAYLOAD_READ_long_object_s_length   6
+  #define FSS_PAYLOAD_READ_long_pipe_s_length     4
+  #define FSS_PAYLOAD_READ_long_original_s_length 8
+  #define FSS_PAYLOAD_READ_long_select_s_length   6
+  #define FSS_PAYLOAD_READ_long_total_s_length    5
+  #define FSS_PAYLOAD_READ_long_trim_s_length     4
 
   extern const f_string_static_t fss_payload_read_short_at_s;
   extern const f_string_static_t fss_payload_read_short_content_s;
@@ -158,7 +158,7 @@ extern "C" {
   extern const f_string_static_t fss_payload_read_short_name_s;
   extern const f_string_static_t fss_payload_read_short_object_s;
   extern const f_string_static_t fss_payload_read_short_pipe_s;
-  extern const f_string_static_t fss_payload_read_short_raw_s;
+  extern const f_string_static_t fss_payload_read_short_original_s;
   extern const f_string_static_t fss_payload_read_short_select_s;
   extern const f_string_static_t fss_payload_read_short_total_s;
   extern const f_string_static_t fss_payload_read_short_trim_s;
@@ -173,7 +173,7 @@ extern "C" {
   extern const f_string_static_t fss_payload_read_long_name_s;
   extern const f_string_static_t fss_payload_read_long_object_s;
   extern const f_string_static_t fss_payload_read_long_pipe_s;
-  extern const f_string_static_t fss_payload_read_long_raw_s;
+  extern const f_string_static_t fss_payload_read_long_original_s;
   extern const f_string_static_t fss_payload_read_long_select_s;
   extern const f_string_static_t fss_payload_read_long_total_s;
   extern const f_string_static_t fss_payload_read_long_trim_s;
@@ -199,7 +199,7 @@ extern "C" {
     fss_payload_read_parameter_name_e,
     fss_payload_read_parameter_object_e,
     fss_payload_read_parameter_pipe_e,
-    fss_payload_read_parameter_raw_e,
+    fss_payload_read_parameter_original_e,
     fss_payload_read_parameter_select_e,
     fss_payload_read_parameter_total_e,
     fss_payload_read_parameter_trim_e,
@@ -226,7 +226,7 @@ extern "C" {
       macro_f_console_parameter_t_initialize(fss_payload_read_short_name_s.string, fss_payload_read_long_name_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_payload_read_short_object_s.string, fss_payload_read_long_object_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_payload_read_short_pipe_s.string, fss_payload_read_long_pipe_s.string, 0, 0, f_console_type_normal_e), \
-      macro_f_console_parameter_t_initialize(fss_payload_read_short_raw_s.string, fss_payload_read_long_raw_s.string, 0, 0, f_console_type_normal_e), \
+      macro_f_console_parameter_t_initialize(fss_payload_read_short_original_s.string, fss_payload_read_long_original_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_payload_read_short_select_s.string, fss_payload_read_long_select_s.string, 0, 1, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_payload_read_short_total_s.string, fss_payload_read_long_total_s.string, 0, 0, f_console_type_normal_e), \
       macro_f_console_parameter_t_initialize(fss_payload_read_short_trim_s.string, fss_payload_read_long_trim_s.string, 0, 0, f_console_type_normal_e), \

diff --git a/level_3/fss_payload_read/c/fss_payload_read.c b/level_3/fss_payload_read/c/fss_payload_read.c
index 3d363d5..59d5708 100644 (file)
--- a/level_3/fss_payload_read/c/fss_payload_read.c
+++ b/level_3/fss_payload_read/c/fss_payload_read.c
@@ -45,7 +45,7 @@ extern "C" {
     fll_program_print_help_option(file, context, fss_payload_read_short_name_s, fss_payload_read_long_name_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Select Object with this name.");
     fll_program_print_help_option(file, context, fss_payload_read_short_object_s, fss_payload_read_long_object_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Print the Object.");
     fll_program_print_help_option(file, context, fss_payload_read_short_pipe_s, fss_payload_read_long_pipe_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Print using the special pipe format.");
-    fll_program_print_help_option(file, context, fss_payload_read_short_raw_s, fss_payload_read_long_raw_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "     Print with the original quotes and escapes.");
+    fll_program_print_help_option(file, context, fss_payload_read_short_original_s, fss_payload_read_long_original_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "Print with the original quotes and escapes.");
     fll_program_print_help_option(file, context, fss_payload_read_short_select_s, fss_payload_read_long_select_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "  Select sub-Content at this index.");
     fll_program_print_help_option(file, context, fss_payload_read_short_total_s, fss_payload_read_long_total_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "   Print the total number of lines.");
     fll_program_print_help_option(file, context, fss_payload_read_short_trim_s, fss_payload_read_long_trim_s, f_console_symbol_short_enable_s, f_console_symbol_long_enable_s, "    Trim Object names on select or print.");

diff --git a/level_3/fss_payload_read/c/private-common.h b/level_3/fss_payload_read/c/private-common.h
index 9a6c75b..7ae1c1d 100644 (file)
--- a/level_3/fss_payload_read/c/private-common.h
+++ b/level_3/fss_payload_read/c/private-common.h
@@ -145,7 +145,7 @@ extern "C" {
  *   - line:     A specific Content at a given line is to be selected (Think of this as select a row for some Content).
  *   - name:     A specific Object name has been requested.
  *   - object:   The Object is to be printed.
- *   - raw:      Enable raw printing, where the quotes are printed and no delimits are applied.
+ *   - original: Enable original printing, where the quotes are printed and no delimits are applied.
  *   - select:   A specific Content at a given position is to be selected (Think of this as select a column for some Content).
  *   - total:    The total lines found and selected is printed instead of the Content.
  *   - trim:     Empty space before and after Objects and Content will not be printed (They will be trimmed).
@@ -177,7 +177,7 @@ extern "C" {
   #define fss_payload_read_data_option_line_d     0x20
   #define fss_payload_read_data_option_name_d     0x40
   #define fss_payload_read_data_option_object_d   0x80
-  #define fss_payload_read_data_option_raw_d      0x100
+  #define fss_payload_read_data_option_original_d 0x100
   #define fss_payload_read_data_option_select_d   0x200
   #define fss_payload_read_data_option_total_d    0x400
   #define fss_payload_read_data_option_trim_d     0x800

diff --git a/level_3/fss_payload_read/c/private-print.c b/level_3/fss_payload_read/c/private-print.c
index 5e1ee2a..db7a459 100644 (file)
--- a/level_3/fss_payload_read/c/private-print.c
+++ b/level_3/fss_payload_read/c/private-print.c
@@ -67,24 +67,24 @@ extern "C" {
     if ((data->option & fss_payload_read_data_option_object_d) || (data->option & fss_payload_read_data_option_content_d) && (data->contents_header.array[at].used || (data->option & fss_payload_read_data_option_empty_d))) {
       if (data->option & fss_payload_read_data_option_object_d) {
         if (data->option & fss_payload_read_data_option_trim_d) {
-          if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) {
+          if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_object_header.array[at]) {
             f_print_dynamic_raw(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
 
           fl_print_trim_except_dynamic_partial(data->buffer, data->objects_header.array[at], delimits_object, main->output.to.stream);
 
-          if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) {
+          if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_object_header.array[at]) {
             f_print_dynamic_raw(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
         }
         else {
-          if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) {
+          if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_object_header.array[at]) {
             f_print_dynamic_raw(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
 
           f_print_except_dynamic_partial(data->buffer, data->objects_header.array[at], delimits_object, main->output.to.stream);
 
-          if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) {
+          if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_object_header.array[at]) {
             f_print_dynamic_raw(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
           }
         }
@@ -101,13 +101,13 @@ extern "C" {
           if (data->select < data->contents_header.array[at].used) {
             content_printed = F_true;
 
-            if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[data->select]) {
+            if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_content_header.array[at].array[data->select]) {
               f_print_dynamic_raw(data->quotes_content_header.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
 
             f_print_except_dynamic_partial(data->buffer, data->contents_header.array[at].array[data->select], delimits_content, main->output.to.stream);
 
-            if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[data->select]) {
+            if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_content_header.array[at].array[data->select]) {
               f_print_dynamic_raw(data->quotes_content_header.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
           }
@@ -121,13 +121,13 @@ extern "C" {
 
             content_printed = F_true;
 
-            if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) {
+            if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_content_header.array[at].array[i]) {
               f_print_dynamic_raw(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
 
             f_print_except_dynamic_partial(data->buffer, data->contents_header.array[at].array[i], delimits_content, main->output.to.stream);
 
-            if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) {
+            if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_content_header.array[at].array[i]) {
               f_print_dynamic_raw(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s : f_fss_quote_double_s, main->output.to.stream);
             }
 

diff --git a/level_3/fss_payload_read/c/private-read.c b/level_3/fss_payload_read/c/private-read.c
index 626efc9..8679d80 100644 (file)
--- a/level_3/fss_payload_read/c/private-read.c
+++ b/level_3/fss_payload_read/c/private-read.c
@@ -407,7 +407,7 @@ extern "C" {
       f_array_lengths_t *delimits_object = fss_payload_read_delimit_object_is(data, 0) ? &data->delimits_object_header : &except_none;
       f_array_lengths_t *delimits_content = fss_payload_read_delimit_content_is(data, (data->option & fss_payload_read_data_option_select_d) ? data->select : 0) ? &data->delimits_content_header : &except_none;
 
-      if (data->option & fss_payload_read_data_option_raw_d) {
+      if (data->option & fss_payload_read_data_option_original_d) {
         delimits_object = &except_none;
         delimits_content = &except_none;
       }
@@ -443,7 +443,7 @@ extern "C" {
     f_array_lengths_t *delimits_content = fss_payload_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
     bool is_payload = F_false;
 
-    if (data->option & fss_payload_read_data_option_raw_d) {
+    if (data->option & fss_payload_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -490,7 +490,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_payload_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_payload_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_payload_read_data_option_raw_d) {
+    if (data->option & fss_payload_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -593,7 +593,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_payload_read_delimit_object_is(data, 0) ? &data->delimits_object_header : &except_none;
     f_array_lengths_t *delimits_content = fss_payload_read_delimit_content_is(data, (data->option & fss_payload_read_data_option_select_d) ? data->select : 0) ? &data->delimits_content_header : &except_none;
 
-    if (data->option & fss_payload_read_data_option_raw_d) {
+    if (data->option & fss_payload_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -616,13 +616,13 @@ extern "C" {
             }
           }
           else {
-            if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) {
+            if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_object_header.array[at]) {
               f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
             }
 
             fss_payload_read_print_at_extended(main, i, *delimits_object, *delimits_content, data);
 
-            if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_object_header.array[at]) {
+            if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_object_header.array[at]) {
               f_print_character_safely(data->quotes_object_header.array[at] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
             }
           }
@@ -636,13 +636,13 @@ extern "C" {
           }
         }
         else {
-          if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) {
+          if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_content_header.array[at].array[i]) {
             f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
           }
 
           fss_payload_read_print_at_extended(main, i, *delimits_object, *delimits_content, data);
 
-          if ((data->option & fss_payload_read_data_option_raw_d) && data->quotes_content_header.array[at].array[i]) {
+          if ((data->option & fss_payload_read_data_option_original_d) && data->quotes_content_header.array[at].array[i]) {
             f_print_character_safely(data->quotes_content_header.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s.string[0] : f_fss_quote_double_s.string[0], main->output.to.stream);
           }
         }
@@ -847,7 +847,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_payload_read_delimit_object_is(data, 0) ? &data->delimits_object : &except_none;
     f_array_lengths_t *delimits_content = fss_payload_read_delimit_content_is(data, 0) ? &data->delimits_content : &except_none;
 
-    if (data->option & fss_payload_read_data_option_raw_d) {
+    if (data->option & fss_payload_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -884,7 +884,7 @@ extern "C" {
     f_array_lengths_t *delimits_object = fss_payload_read_delimit_object_is(data, 0) ? &data->delimits_object_header : &except_none;
     f_array_lengths_t *delimits_content = fss_payload_read_delimit_content_is(data, (data->option & fss_payload_read_data_option_select_d) ? data->select : 0) ? &data->delimits_content_header : &except_none;
 
-    if (data->option & fss_payload_read_data_option_raw_d) {
+    if (data->option & fss_payload_read_data_option_original_d) {
       delimits_object = &except_none;
       delimits_content = &except_none;
     }
@@ -1025,8 +1025,8 @@ extern "C" {
       data->option |= fss_payload_read_data_option_object_d;
     }
 
-    if (main->parameters.array[fss_payload_read_parameter_raw_e].result == f_console_result_found_e) {
-      data->option |= fss_payload_read_data_option_raw_d;
+    if (main->parameters.array[fss_payload_read_parameter_original_e].result == f_console_result_found_e) {
+      data->option |= fss_payload_read_data_option_original_d;
     }
 
     if (main->parameters.array[fss_payload_read_parameter_select_e].result == f_console_result_additional_e) {