Bug#507190: Patch from Ubuntu (Fixes minor typo in webcpp/engine.cpp)

[Nick Ellery]

Package: webcpp
Version: 0.8.4-6

Hi,

As specified in https://bugs.launchpad.net/bugs/302985, I am submitting
a patch from Fedora, described as 'Fixes minor typo in webcpp/engine.cpp'.

Thanks,

Nick

#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_engine.cpp_typo.dpatch by Nathan Handler <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad webcpp-0.8.4~/webcpp/engine.cpp webcpp-0.8.4/webcpp/engine.cpp
--- webcpp-0.8.4~/webcpp/engine.cpp     2004-01-04 18:52:47.000000000 -0600
+++ webcpp-0.8.4/webcpp/engine.cpp      2008-07-14 18:01:14.000000000 -0500
@@ -18,21 +18,21 @@
  */
 
 //--build=i386-linux --host=i386-linux --target=i386-linux
-
-#define CHILD( x , y ) Child=new ( x );\
-Child->setLangExt( y )
-
-// uncomment to debug
-//#include "defdebug.h"
-
+
+#define CHILD( x , y ) Child=new ( x );\
+Child->setLangExt( y )
+
+// uncomment to debug
+//#include "defdebug.h"
+
 #include "deflangs.h"
 #include "defparse.h"
 #include "defsys.h"
-#include "engine.h"
-#include <cstdlib>
+#include "engine.h"
+#include <cstdlib>
 #include <cctype>
 using namespace std;
-
+
 
 // initialize data members ----------------------------------------------------
 void Engine::init_switches() {
@@ -911,12 +911,12 @@
 
        string gen;
        string style;
-       string openht;
-
-       string ImgPath;
-       string CssFile;
-       string Path;
-       int dir_idx;
+       string openht;
+
+       string ImgPath;
+       string CssFile;
+       string Path;
+       int dir_idx;
 
 
        gen = "\
@@ -924,25 +924,25 @@
 \n\n<!--\nSyntax highlighting generated by Web C Plus Plus software v0.8.4\n\
 Webcpp Copyright (C)2001-2004 Jeffrey Bakker under the GNU GPL\n\
 Get webcpp at http://webcpp.sf.net\n-->\n\n";
-
-
-       if(Scs2.getImageFile() != "\0") {
-
-               string CopyCmd = COPY;
-
-               ImgPath = Scs2.getImageFile();
-               dir_idx = IO->getStrOf().rfind(DIRECTORY_SLASH);
-
-               if(dir_idx != -1) {
-
-                       Path = IO->getStrOf().substr(0,dir_idx+1);
-
-                       Scs2.setImageLeaf();
-                       CopyCmd += " \"" + ImgPath + "\" \"" + Path + 
Scs2.getImageFile() + "\"";
-                       system(CopyCmd.data());
-//                     IO->backup(ImgPath, Path + Scs2.getImageFile(), true);
-               }
-       }
+
+
+       if(Scs2.getImageFile() != "\0") {
+
+               string CopyCmd = COPY;
+
+               ImgPath = Scs2.getImageFile();
+               dir_idx = IO->getStrOf().rfind(DIRECTORY_SLASH);
+
+               if(dir_idx != -1) {
+
+                       Path = IO->getStrOf().substr(0,dir_idx+1);
+
+                       Scs2.setImageLeaf();
+                       CopyCmd += " \"" + ImgPath + "\" \"" + Path + 
Scs2.getImageFile() + "\"";
+                       system(CopyCmd.data());
+//                     IO->backup(ImgPath, Path + Scs2.getImageFile(), true);
+               }
+       }
 
        // external or embedded stylesheet
        if(opt_extcss) {
@@ -1005,7 +1005,7 @@
 </tr><tr><td colspan=6>\n\
 <a href=\"http://webcpp.sf.net\";><center><b>\
 <font color=#ffffff>web c plus plus</font></b></center>\n\
-</a></td></tr>\n\</table>\n<br>\n</center>";
+</a></td></tr>\n</table>\n<br>\n</center>";
 
                *IO << made;
        }
@@ -1157,7 +1157,7 @@
                if(opt_anchor) {Child->toggleAnchor();}
                if(opt_number) {Child->toggleNumber();} 
 
-               if(langext == CPP_FILE)
+               if(langext == CPP_FILE)
                        {Child->setInline();}
                if(langext == HTM_FILE && inComment)
                        {*IO << "</font>";}