[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/kioslave/man
From:       Martin Koller <kollix () aon ! at>
Date:       2011-01-03 1:18:55
Message-ID: 20110103011855.AC4FDAC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211052 by mkoller:

Fix Comment #2 from bug 144942 by handling "Tag-Labeled-List items"


 M  +14 -2     man2html.cpp  


--- trunk/KDE/kdebase/runtime/kioslave/man/man2html.cpp #1211051:1211052
@@ -3383,6 +3383,7 @@
 #define REQ_while    148 // groff(7) "WHILE loop"
 #define REQ_do       149 // groff(7) "DO command"
 #define REQ_Dx       150 // mdoc(7) "DragonFly" macro
+#define REQ_Ta       151 // mdoc(7) "Ta" inside .It macro
 
 static int get_request(char *req, int len)
 {
@@ -3400,7 +3401,7 @@
     "Cd", "Cm", "Ic", "Ms", "Or", "Sy", "Dv", "Ev", "Fr", "Li", "No", "Ns",
     "Tn", "nN", "%A", "%D", "%N", "%O", "%P", "%Q", "%V", "%B", "%J", "%R",
     "%T", "An", "Aq", "Bq", "Qq", "UR", "UE", "UN", "tr", "troff", "nroff", "als",
-    "rr", "rnn", "aln", "shift", "while", "do", "Dx", 0
+    "rr", "rnn", "aln", "shift", "while", "do", "Dx", "Ta", 0
   };
   int r = 0;
   while (requests[r] && qstrncmp(req, requests[r], len)) r++;
@@ -3647,7 +3648,6 @@
           char* result = 0;
           c = scan_troff(c, 1, &result);
           QMap<QByteArray, StringDefinition>::iterator it = s_stringDefinitionMap.find(name);
-              qWarning("XXXX DS: %s -> %s\n", name.constData(), result);
           if (it == s_stringDefinitionMap.end())
           {
             StringDefinition def;
@@ -4724,8 +4724,10 @@
           char *nl = strchr(c, '\n');
           c = c + j;
           if (dl_set[itemdepth])
+          {
             /* These things can nest. */
             itemdepth++;
+          }
           if (nl)
           {
             /* Parse list options */
@@ -5321,6 +5323,16 @@
             curpos = 0;
           break;
         }
+        case REQ_Ta:    /* mdoc(7) */
+        {
+          // ### FIXME: this is a simplification
+          // for a list item element in a ".Bl -tag -width indent" type list
+          // man:mdoc says: "indent == Six constant width spaces"
+          out_html("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+          c = c + j;
+          if (*c == '\n') c++;
+          break;
+        }
         // ### FIXME: punctuation is handled badly!
         case REQ_Dv:    /* mdoc(7) */
         case REQ_Ev:    /* mdoc(7) */
[prev in list] [next in list] [prev in thread] [next in thread]