From: Kevin Day Date: Tue, 13 Aug 2024 17:29:03 +0000 (-0500) Subject: Bugfix: FSS Extended Read needs to only print new line if Object or Content is printed. X-Git-Tag: 0.6.12~28 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=27406bd70d5310f6037a4784df779c3572346330;p=fll Bugfix: FSS Extended Read needs to only print new line if Object or Content is printed. Do not always print the new line for the case when printing Object or Content. When the Content is being printed and is empty Content, then do not print the new line. --- diff --git a/level_3/fss_extended_read/c/private-print.c b/level_3/fss_extended_read/c/private-print.c index f94030d75..bd913d998 100644 --- a/level_3/fss_extended_read/c/private-print.c +++ b/level_3/fss_extended_read/c/private-print.c @@ -79,9 +79,9 @@ extern "C" { if ((data->option & fss_extended_read_data_option_content_d) && data->contents.array[at].used) { if (data->option & fss_extended_read_data_option_select_d) { if (data->select < data->contents.array[at].used) { - content_printed = F_true; - if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[data->select]) { + content_printed = F_true; + f_print_dynamic_raw( data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s @@ -92,9 +92,15 @@ extern "C" { ); } - f_print_except_dynamic_partial(data->buffer, data->contents.array[at].array[data->select], delimits_content, main->output.to.stream); + if (data->contents.array[at].array[data->select].start <= data->contents.array[at].array[data->select].stop) { + content_printed = F_true; + + 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_original_d) && data->quotes_content.array[at].array[data->select]) { + content_printed = F_true; + f_print_dynamic_raw( data->quotes_content.array[at].array[data->select] == f_fss_quote_type_single_e ? f_fss_quote_single_s @@ -113,9 +119,9 @@ extern "C" { continue; } - content_printed = F_true; - if ((data->option & fss_extended_read_data_option_original_d) && data->quotes_content.array[at].array[i]) { + content_printed = F_true; + f_print_dynamic_raw( data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s @@ -126,9 +132,15 @@ extern "C" { ); } - f_print_except_dynamic_partial(data->buffer, data->contents.array[at].array[i], delimits_content, main->output.to.stream); + if (data->contents.array[at].array[i].start <= data->contents.array[at].array[i].stop) { + content_printed = F_true; + + 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_original_d) && data->quotes_content.array[at].array[i]) { + content_printed = F_true; + f_print_dynamic_raw( data->quotes_content.array[at].array[i] == f_fss_quote_type_single_e ? f_fss_quote_single_s