From 471556a19e68b372155095c1b11aa568735fe867 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 11 Feb 2016 04:25:00 +0200
Subject: First part of TOC generation support (no links yet)

Currently only supported in the HTML output.
---
 cli/html.cxx | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'cli/html.cxx')

diff --git a/cli/html.cxx b/cli/html.cxx
index da94a65..2d018e0 100644
--- a/cli/html.cxx
+++ b/cli/html.cxx
@@ -139,10 +139,10 @@ namespace
       if (n > 1)
         translate_arg (ds[0], arg_set);
 
-      string s (format (ds.scope (),
-                        ot_html,
-                        escape_html (translate (d, arg_set)),
-                        true));
+      unsigned short t (toc); // Detect the switch to/from TOC mode.
+
+      string s (
+        format (ds.scope (), escape_html (translate (d, arg_set)), true));
 
       if (s.empty ())
         return;
@@ -154,9 +154,11 @@ namespace
         list_ = false;
       }
 
-      wrap_lines (os, s, 2);
-      os << endl
-         << endl;
+      wrap_lines (os, s, (t || toc) ? 0 : 2); // TOC mode does its own thing.
+
+      if (!toc) // TOC mode does its own thing.
+        os << endl
+           << endl;
     }
 
   private:
@@ -179,6 +181,9 @@ namespace
       if (options.suppress_undocumented () && doc.empty ())
         return;
 
+      if (toc)
+        return; // No option documentation in the TOC mode.
+
       if (!list_)
       {
         os << "  <dl class=\"options\">" << endl;
@@ -211,7 +216,7 @@ namespace
           translate_arg (
             doc.size () > 0 ? doc[0] : string ("<arg>"), arg_set));
 
-        os << ' ' << format (o.scope (), ot_html, escape_html (s), false);
+        os << ' ' << format (o.scope (), escape_html (s), false);
       }
 
       os << "</dt>" << endl;
@@ -234,10 +239,7 @@ namespace
 
       // Format the documentation string.
       //
-      d = format (o.scope (),
-                  ot_html,
-                  escape_html (translate (d, arg_set)),
-                  false);
+      d = format (o.scope (), escape_html (translate (d, arg_set)), false);
 
       wrap_lines (os, "<dd>" + d + "</dd>", 4);
       os << endl;
-- 
cgit v1.1