[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 0:15:28
Message-ID: 20110103001528.C6EB4AC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211043 by mkoller:

Fix Comment #8 of bug 144942 by skipping .tr request and therefore
correctly being able to handle the following .ds request in man:gcc
(The .tr command before .ds was incorrectly handled as .troff)


 M  +21 -13    man2html.cpp  


--- trunk/KDE/kdebase/runtime/kioslave/man/man2html.cpp #1211042:1211043
@@ -130,7 +130,8 @@
 # include <iostream>
 # include <dirent.h>
 # include <sys/stat.h>
-# define kDebug(x) cerr
+# include <QDebug>
+# define kDebug(x) QDebug(QtDebugMsg)
 # define kWarning(x) cerr << "WARNING "
 # define BYTEARRAY(x) x.constData()
 #else
@@ -3371,16 +3372,17 @@
 #define REQ_UR       137 // man(7) "URl"
 #define REQ_UE       138 // man(7) "Url End"
 #define REQ_UN       139 // man(7) "Url Name" (a.k.a. anchors)
-#define REQ_troff    140 // groff(7) "TROFF mode"
-#define REQ_nroff    141 // groff(7) "NROFF mode"
-#define REQ_als      142 // groff(7) "ALias String"
-#define REQ_rr       143 // groff(7) "Remove number Register"
-#define REQ_rnn      144 // groff(7) "ReName Number register"
-#define REQ_aln      145 // groff(7) "ALias Number register"
-#define REQ_shift    146 // groff(7) "SHIFT parameter"
-#define REQ_while    147 // groff(7) "WHILE loop"
-#define REQ_do       148 // groff(7) "DO command"
-#define REQ_Dx       149 // mdoc(7) "DragonFly" macro
+#define REQ_tr       140 // translate
+#define REQ_troff    141 // groff(7) "TROFF mode"
+#define REQ_nroff    142 // groff(7) "NROFF mode"
+#define REQ_als      143 // groff(7) "ALias String"
+#define REQ_rr       144 // groff(7) "Remove number Register"
+#define REQ_rnn      145 // groff(7) "ReName Number register"
+#define REQ_aln      146 // groff(7) "ALias Number register"
+#define REQ_shift    147 // groff(7) "SHIFT parameter"
+#define REQ_while    148 // groff(7) "WHILE loop"
+#define REQ_do       149 // groff(7) "DO command"
+#define REQ_Dx       150 // mdoc(7) "DragonFly" macro
 
 static int get_request(char *req, int len)
 {
@@ -3397,7 +3399,7 @@
     "Oo", "Oc", "Pq", "Ql", "Sq", "Ar", "Ad", "Em", "Va", "Xc", "Nd", "Nm",
     "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", "troff", "nroff", "als",
+    "%T", "An", "Aq", "Bq", "Qq", "UR", "UE", "UN", "tr", "troff", "nroff", "als",
     "rr", "rnn", "aln", "shift", "while", "do", "Dx", 0
   };
   int r = 0;
@@ -3503,7 +3505,6 @@
       c = skip_till_newline(c); // ### TODO
     }
     else
-
       c = scan_escape(c + 1);
   }
   else
@@ -3646,6 +3647,7 @@
           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;
@@ -5433,6 +5435,11 @@
           c = newc;
           break;
         }
+        case REQ_tr:  // translate   TODO
+        {
+          c = skip_till_newline(c);
+          break;
+        }
         case REQ_nroff: // groff(7)  "NROFF mode"
           mode = true;
         case REQ_troff: // groff(7) "TROFF mode"
@@ -5440,6 +5447,7 @@
           s_nroff = mode;
           c += j;
           c = skip_till_newline(c);
+          break;
         }
         case REQ_als: // groff(7) "ALias String"
         {
[prev in list] [next in list] [prev in thread] [next in thread]