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

List:       kde-commits
Subject:    KDE/kdebase/kioslave/man
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2005-06-02 11:07:45
Message-ID: 1117710465.954027.21356.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 421157 by goutte:

HACK: add character definitions for names when the HTML conversion has
already been done.
(kio_man makes the conversion to HTML mmuch too early, leading to multiple
problems in macros, including this one.)


 M  +14 -7     man2html.cpp  


--- trunk/KDE/kdebase/kioslave/man/man2html.cpp #421156:421157
@@ -284,6 +284,13 @@
 static void InitCharacterDefinitions( void )
 {
     fill_old_character_definitions();
+    // ### HACK: as we are converting to HTML too early, define characters with HTML \
references +    s_characterDefinitionMap.insert( "&lt;-", StringDefinition( 1, \
"&larr;" ) ); // <- +    s_characterDefinitionMap.insert( "-&gt;", StringDefinition( \
1, "&rarr;" ) ); // -> +    s_characterDefinitionMap.insert( "&lt;&gt;", \
StringDefinition( 1, "&harr;" ) ); // <> +    s_characterDefinitionMap.insert( \
"&lt;=", StringDefinition( 1, "&le;" ) ); // <= +    s_characterDefinitionMap.insert( \
"&gt;=", StringDefinition( 1, "&ge;" ) ); // >= +    // End HACK
 }
 
 /**
@@ -1135,8 +1142,8 @@
         {
             QCString cstr;
             c = scan_escape_direct( c+2, cstr );
-            // ### FIXME: check if we have really 2 characters (and only 2, not more \
                either)
-            name = cstr.left(2);
+            // ### HACK: as we convert characters too early to HTML, we need to \
support more than 2 characters here and assume that all characters passed by the \
variable are to be used. +            name = cstr;
         }
         else
         {
@@ -1239,8 +1246,8 @@
             QCString cstr;
             c = scan_escape_direct( c+2, cstr );
             kdDebug(7107) << "\(" << cstr << endl;
-            // ### FIXME: check if we have really 2 characters (and only 2, not more \
                either)
-            name = cstr.left(2);
+            // ### HACK: as we convert characters too early to HTML, we need to \
support more than 2 characters here and assume that all characters passed by the \
variable are to be used. +            name = cstr;
         }
         else
         {
@@ -1530,8 +1537,8 @@
             QCString cstr;
             c = scan_escape_direct( c+2, cstr );
             kdDebug(7107) << "\(" << cstr << endl;
-            // ### FIXME: check if we have really 2 characters (and only 2, not more \
                either)
-            name = cstr.left(2);
+            // ### HACK: as we convert characters too early to HTML, we need to \
support more than 2 characters here and assume that all characters passed by the \
variable are to be used. +            name = cstr;
         }
         else
         {
@@ -5521,7 +5528,7 @@
 #ifdef SIMPLE_MAN2HTML
 void output_real(const char *insert)
 {
-    cout << insert << endl;
+    cout << insert;
 }
 
 char *read_man_page(const char *filename)


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