SF.net SVN: jazzplusplus: [605] tex2rtf/src/htmlutil.cpp

[<pst...@us...>]

Revision: 605
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=605&view=rev
Author:   pstieber
Date:     2008-06-14 13:41:24 -0700 (Sat, 14 Jun 2008)

Log Message:
-----------
1. Changed stdio.h to cstdio.
2. Added curly brackets around some single line conditional statements.
3. Changed the HTML generation code to use the image path specified in the
input *.tex file instead of removing the path.

Modified Paths:
--------------
    tex2rtf/src/htmlutil.cpp

Modified: tex2rtf/src/htmlutil.cpp
===================================================================
--- tex2rtf/src/htmlutil.cpp	2008-06-14 19:15:50 UTC (rev 604)
+++ tex2rtf/src/htmlutil.cpp	2008-06-14 20:41:24 UTC (rev 605)
@@ -25,7 +25,9 @@
 #include "tex2any.h"
 #include "tex2rtf.h"
 #include "table.h"
-#include <stdio.h>
+
+#include <cstdio>
+
 #define HTML_FILENAME_PATTERN _T("%s_%s.html")
 
 #if !WXWIN_COMPATIBILITY_2_4
@@ -2187,9 +2189,13 @@
       {
         const wxChar *alignment = _T("");
         if (macroId == ltIMAGEL)
+        {
           alignment = _T(" align=left");
+        }
         else if  (macroId == ltIMAGER)
+        {
           alignment = _T(" align=right");
+        }
 
         // Try to find an XBM or GIF image first.
         wxChar *filename = copystring(GetArgData());
@@ -2246,7 +2252,7 @@
 #endif
           {
             TexOutput(_T("<img src=\""));
-            TexOutput(ConvertCase(wxFileNameFromPath(inlineFilename)));
+            TexOutput(ConvertCase(buf));
             TexOutput(_T("\""));
             TexOutput(alignment);
             TexOutput(_T(">"));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.