[PATCH 12/23] texi2txt: add support for enumerated lists

[Christophe CURIS]

The texinfo format provides a command to generate list of item which are
prefixed by an auto-incremented number or letter.

This command was not implemented but as it will be used by the Installation
Manual of Window Maker, this patch implements it, reusing much of the code
that was handling the unordered lists.

Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
 script/generate-txt-from-texi.sh | 45 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/script/generate-txt-from-texi.sh b/script/generate-txt-from-texi.sh
index 8c51855..74f17b2 100755
--- a/script/generate-txt-from-texi.sh
+++ b/script/generate-txt-from-texi.sh
@@ -449,8 +449,8 @@ function new_section(level, title, is_numbered,         
local_i, local_line) {
 }
 
 # List of Items
-function start_item_list(mark) {
-  par_mode_push("list");
+function start_item_list(mark, type, default_mark) {
+  par_mode_push(type);
   list_is_first_item = 1;
   list_item_wants_sepline = 0;
   par_indent = 1;
@@ -461,7 +461,7 @@ function start_item_list(mark) {
     line_prefix = line_prefix "    ";
   }
   if (mark == "") {
-    item_list_mark = "*";
+    item_list_mark = default_mark;
   } else {
     item_list_mark = execute_commands(mark);
   }
@@ -556,6 +556,28 @@ function generate_paragraph(          local_prefix, 
local_line, local_length,
       local_line = substr(local_line, 1, length(local_line) - 5) local_prefix;
     }
 
+  } else if (par_mode == "enum") {
+    if (list_item_wants_sepline && !list_is_first_item) {
+      write_line("");
+    }
+    list_is_first_item = 0;
+    list_item_wants_sepline = 0;
+    if (!par_indent) {
+      local_prefix = "  " item_list_mark ". ";
+      local_line = substr(local_line, 1, length(local_line) - 5) local_prefix;
+
+      # Increment the enumeration counter for the next item now
+      if (item_list_mark + 0 == item_list_mark) {
+        item_list_mark++;
+      } else {
+        local_i = 
index("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", item_list_mark);
+        if (local_i == 0) {
+          report_error("value \"" item_list_mark "\" is not supported for 
enumerated list - invalid @enumerate argument or list too long?");
+        }
+        item_list_mark = 
substr("BCDEFGHIJKLMNOPQRSTUVWXYZ!bcdefghijklmnopqrstuvwxyz!", local_i, 1);
+      }
+    }
+
   } else if (par_mode == "titlepage") {
     write_line("");
 
@@ -760,6 +782,11 @@ function process_end(line) {
     generate_paragraph();
     redirect_out = "no";
 
+  } else if (line == "enumerate") {
+    generate_paragraph();
+    par_mode_pop("enum");
+    par_indent = 1;
+
   } else if (line == "example") {
     generate_paragraph();
     par_mode_pop("example");
@@ -897,6 +924,13 @@ BEGIN {
       process_end(line);
       next;
 
+    } else if (command == "enumerate") {
+      if (cond_state) {
+        generate_paragraph();
+        start_item_list(line, "enum", "1");
+      }
+      next;
+
     } else if (command == "example") {
       if (cond_state) {
         generate_paragraph();
@@ -927,7 +961,7 @@ BEGIN {
     } else if (command == "itemize") {
       if (cond_state) {
         generate_paragraph();
-        start_item_list(line);
+        start_item_list(line, "list", "*");
       }
       next;
 
@@ -1089,7 +1123,7 @@ BEGIN {
   # We treat @item specially because it may generate more than 1 paragraph
   if (!cond_state) { next; }
 
-  if (par_mode != "list") {
+  if ((par_mode != "list") && (par_mode != "enum")) {
     report_error("found @item at line " NR " but not inside an @itemize");
   }
 
@@ -1118,6 +1152,7 @@ BEGIN {
   if (!cond_state) { next; }
 
   if ((par_mode == "list") ||
+      (par_mode == "enum") ||
       (par_mode == "par") ||
       (par_mode == "titlepage") ||
       (par_mode == "quotation")) {
-- 
2.1.4


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.