diff -urN pdf2htm_src/readme.txt pdfconv/readme.txt
--- pdf2htm_src/readme.txt	Mon May 17 16:29:24 2004
+++ pdfconv/readme.txt	Wed Mar 30 15:30:30 2005
@@ -1,14 +1,14 @@
 Readme File
 
-PDF2HTML(PDF to HTML) is licensed under the GNU General Public
+PDFCONV(PDF to HTML) is licensed under the GNU General Public
 License (GPL).  See the 'COPYING' file for details.
 
 
-Copyright(C) 2000--2004 verypdf.com Inc
+Copyright(C) 2004--2005 mbloom.com 
 
 Contact infomation:
-http://www.verypdf.com/
-support@verypdf.com
+http://www.mbloom.com/
+mail@mbloom.com
 
 This program is shareware; you can redistribute and/or 
 modify it under the terms of the GNU General Public License.
diff -urN pdf2htm_src/src/Array.cpp pdfconv/src/Array.cpp
--- pdf2htm_src/src/Array.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Array.cpp	Thu Jun  3 21:26:50 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Array.h pdfconv/src/Array.h
--- pdf2htm_src/src/Array.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Array.h	Thu Jun  3 21:27:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef ARRAY_H
 #define ARRAY_H
 
diff -urN pdf2htm_src/src/BROWSEFORFOLDER.CPP pdfconv/src/BROWSEFORFOLDER.CPP
--- pdf2htm_src/src/BROWSEFORFOLDER.CPP	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BROWSEFORFOLDER.CPP	Thu Jun  3 21:27:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "BrowseForFolder.h"
 
diff -urN pdf2htm_src/src/BROWSEFORFOLDER.H pdfconv/src/BROWSEFORFOLDER.H
--- pdf2htm_src/src/BROWSEFORFOLDER.H	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BROWSEFORFOLDER.H	Thu Jun  3 21:27:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef __SHELLBROWSER_H__
 #define __SHELLBROWSER_H__
 
diff -urN pdf2htm_src/src/BmpProc.cpp pdfconv/src/BmpProc.cpp
--- pdf2htm_src/src/BmpProc.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BmpProc.cpp	Fri Jun  4 04:50:38 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -3025,7 +3002,7 @@
 	// 读取位数据
 	dwCurPos = file.GetPosition();
 	file.Seek(bmfHeader.bfOffBits, CFile::begin);
-	dwRet = file.ReadHuge((void*)pBits, (dwSize-bmfHeader.bfOffBits));
+	dwRet = file.Read((void*)pBits, (dwSize-bmfHeader.bfOffBits));
 	file.Seek(dwCurPos, CFile::begin);
 
 	if (dwRet != (dwSize-bmfHeader.bfOffBits))
@@ -5460,7 +5437,7 @@
 		m_nText.y	   = y;
 		//m_nText.szCode	   = lpszString;
 		m_nText.szCode.resize(nCount*2+1);
-		memcpy(m_nText.szCode.begin(),lpszString,nCount*2);
+		memcpy((void*)&(*m_nText.szCode.begin()),lpszString,nCount*2);
 		m_nText.nCount	   = nCount;
 		m_nText.szFontName = sFont.lfFaceName;
 		m_nText.nFontWidth  = nFontSizeWidth;
@@ -5773,7 +5750,7 @@
 			m_nImage.m_bIsText = 0;
 		int imgbytes = (width*bitcount+31)/32*4*height;
 		m_nImage.pData.resize(imgbytes);
-		memcpy(m_nImage.pData.begin(),pData,imgbytes);
+		memcpy((void*)&(*m_nImage.pData.begin()),pData,imgbytes);
 		lpCurrentPage->m_pageBlock.push_back(m_nContent);
 	}
 	else
@@ -5840,7 +5817,7 @@
 			if(length <= 0)
 				return;
 			m_nClippingRgn.m_aryClipRegion.resize(length);
-			::GetRegionData(hClipRgn,length,(LPRGNDATA)m_nClippingRgn.m_aryClipRegion.begin());
+			::GetRegionData(hClipRgn,length,(LPRGNDATA)&(*m_nClippingRgn.m_aryClipRegion.begin()));
 			lpCurrentPage->m_pageBlock.push_back(m_nContent);
 		}
 	}
diff -urN pdf2htm_src/src/BmpProc.h pdfconv/src/BmpProc.h
--- pdf2htm_src/src/BmpProc.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BmpProc.h	Sat Jun 19 22:17:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef __BMPPROC_H__
 #define __BMPPROC_H__
 #include "pdfrlib.h"
@@ -220,5 +197,7 @@
 	static DWORD m_ObjectCount;	// 本类构造的实例目标个数，供调试使用
 #endif
 };
+
+void ConvertFromBMPToJPEG( LPSTR szBmpFile );
 
 #endif /*__BMPPROC_H__*/
diff -urN pdf2htm_src/src/BuiltinFont.cpp pdfconv/src/BuiltinFont.cpp
--- pdf2htm_src/src/BuiltinFont.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BuiltinFont.cpp	Thu Jun  3 21:27:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/BuiltinFont.h pdfconv/src/BuiltinFont.h
--- pdf2htm_src/src/BuiltinFont.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BuiltinFont.h	Thu Jun  3 21:28:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef BUILTINFONT_H
 #define BUILTINFONT_H
 
diff -urN pdf2htm_src/src/BuiltinFontTables.cpp pdfconv/src/BuiltinFontTables.cpp
--- pdf2htm_src/src/BuiltinFontTables.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BuiltinFontTables.cpp	Thu Jun  3 21:28:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <aconf.h>
 #include <stdlib.h>
 #include "FontEncodingTables.h"
diff -urN pdf2htm_src/src/BuiltinFontTables.h pdfconv/src/BuiltinFontTables.h
--- pdf2htm_src/src/BuiltinFontTables.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/BuiltinFontTables.h	Thu Jun  3 21:29:14 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef BUILTINFONTTABLES_H
 #define BUILTINFONTTABLES_H
 
diff -urN pdf2htm_src/src/CMap.cpp pdfconv/src/CMap.cpp
--- pdf2htm_src/src/CMap.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CMap.cpp	Thu Jun  3 21:28:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/CMap.h pdfconv/src/CMap.h
--- pdf2htm_src/src/CMap.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CMap.h	Thu Jun  3 21:28:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef CMAP_H
 #define CMAP_H
 
diff -urN pdf2htm_src/src/Catalog.cpp pdfconv/src/Catalog.cpp
--- pdf2htm_src/src/Catalog.cpp	Mon Feb  2 22:29:44 2004
+++ pdfconv/src/Catalog.cpp	Thu Jun  3 21:28:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Catalog.h pdfconv/src/Catalog.h
--- pdf2htm_src/src/Catalog.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Catalog.h	Thu Jun  3 21:28:22 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef CATALOG_H
 #define CATALOG_H
 
diff -urN pdf2htm_src/src/CharCodeToUnicode.cpp pdfconv/src/CharCodeToUnicode.cpp
--- pdf2htm_src/src/CharCodeToUnicode.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CharCodeToUnicode.cpp	Thu Jun  3 21:29:14 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/CharCodeToUnicode.h pdfconv/src/CharCodeToUnicode.h
--- pdf2htm_src/src/CharCodeToUnicode.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CharCodeToUnicode.h	Thu Jun  3 21:29:14 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef CHARCODETOUNICODE_H
 #define CHARCODETOUNICODE_H
 
diff -urN pdf2htm_src/src/CharTypes.h pdfconv/src/CharTypes.h
--- pdf2htm_src/src/CharTypes.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CharTypes.h	Thu Jun  3 21:29:14 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef CHARTYPES_H
 #define CHARTYPES_H
 
diff -urN pdf2htm_src/src/CommandUsage.cpp pdfconv/src/CommandUsage.cpp
--- pdf2htm_src/src/CommandUsage.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CommandUsage.cpp	Thu Jun  3 21:29:14 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "win_pdf2htm.h"
 #include "CommandUsage.h"
diff -urN pdf2htm_src/src/CommandUsage.h pdfconv/src/CommandUsage.h
--- pdf2htm_src/src/CommandUsage.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CommandUsage.h	Thu Jun  3 21:29:48 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_COMMANDUSAGE_H__95330DE6_07D4_47B9_9109_4C8066C14BDB__INCLUDED_)
 #define AFX_COMMANDUSAGE_H__95330DE6_07D4_47B9_9109_4C8066C14BDB__INCLUDED_
 
diff -urN pdf2htm_src/src/CompactFontTables.h pdfconv/src/CompactFontTables.h
--- pdf2htm_src/src/CompactFontTables.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/CompactFontTables.h	Thu Jun  3 21:29:14 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef COMPACTFONTINFO_H
 #define COMPACTFONTINFO_H
 
diff -urN pdf2htm_src/src/Decrypt.cpp pdfconv/src/Decrypt.cpp
--- pdf2htm_src/src/Decrypt.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Decrypt.cpp	Thu Jun  3 21:29:48 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Decrypt.h pdfconv/src/Decrypt.h
--- pdf2htm_src/src/Decrypt.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Decrypt.h	Thu Jun  3 21:29:48 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef DECRYPT_H
 #define DECRYPT_H
 
diff -urN pdf2htm_src/src/DialogRegP2H.cpp pdfconv/src/DialogRegP2H.cpp
--- pdf2htm_src/src/DialogRegP2H.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/DialogRegP2H.cpp	Sun Jun 13 19:32:28 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "win_pdf2htm.h"
 #include "DialogregP2H.h"
@@ -48,7 +25,7 @@
 {
 	CDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(DialogP2H)
-	DDX_Text(pDX, IDC_EDIT_SN, m_Sn);
+//	DDX_Text(pDX, IDC_EDIT_SN, m_Sn);
 	//}}AFX_DATA_MAP
 }
 
diff -urN pdf2htm_src/src/DialogRegP2H.h pdfconv/src/DialogRegP2H.h
--- pdf2htm_src/src/DialogRegP2H.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/DialogRegP2H.h	Thu Jun  3 21:29:48 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_DIALOGP2H_H__D82DBE10_F8C6_431B_94DB_59AA94BCECDF__INCLUDED_)
 #define AFX_DIALOGP2H_H__D82DBE10_F8C6_431B_94DB_59AA94BCECDF__INCLUDED_
 
diff -urN pdf2htm_src/src/Dict.cpp pdfconv/src/Dict.cpp
--- pdf2htm_src/src/Dict.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Dict.cpp	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Dict.h pdfconv/src/Dict.h
--- pdf2htm_src/src/Dict.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Dict.h	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef DICT_H
 #define DICT_H
 
diff -urN pdf2htm_src/src/DisplayFontTable.h pdfconv/src/DisplayFontTable.h
--- pdf2htm_src/src/DisplayFontTable.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/DisplayFontTable.h	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 static struct {
   char *name;
   char *xlfd;
diff -urN pdf2htm_src/src/Error.cpp pdfconv/src/Error.cpp
--- pdf2htm_src/src/Error.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Error.cpp	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Error.h pdfconv/src/Error.h
--- pdf2htm_src/src/Error.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Error.h	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef ERROR_H
 #define ERROR_H
 
diff -urN pdf2htm_src/src/FTFont.cpp pdfconv/src/FTFont.cpp
--- pdf2htm_src/src/FTFont.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FTFont.cpp	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/FTFont.h pdfconv/src/FTFont.h
--- pdf2htm_src/src/FTFont.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FTFont.h	Thu Jun  3 21:37:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef FTFONT_H
 #define FTFONT_H
 
diff -urN pdf2htm_src/src/FontEncodingTables.cpp pdfconv/src/FontEncodingTables.cpp
--- pdf2htm_src/src/FontEncodingTables.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FontEncodingTables.cpp	Thu Jun  3 21:37:08 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <aconf.h>
 #include <stdlib.h>
 #include "FontEncodingTables.h"
diff -urN pdf2htm_src/src/FontEncodingTables.h pdfconv/src/FontEncodingTables.h
--- pdf2htm_src/src/FontEncodingTables.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FontEncodingTables.h	Thu Jun  3 21:37:30 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef FONTENCODINGTABLES_H
 #define FONTENCODINGTABLES_H
 
diff -urN pdf2htm_src/src/FontFile.cpp pdfconv/src/FontFile.cpp
--- pdf2htm_src/src/FontFile.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FontFile.cpp	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/FontFile.h pdfconv/src/FontFile.h
--- pdf2htm_src/src/FontFile.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FontFile.h	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef FONTFILE_H
 #define FONTFILE_H
 
diff -urN pdf2htm_src/src/FormWidget.cpp pdfconv/src/FormWidget.cpp
--- pdf2htm_src/src/FormWidget.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FormWidget.cpp	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/FormWidget.h pdfconv/src/FormWidget.h
--- pdf2htm_src/src/FormWidget.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/FormWidget.h	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef FORMWIDGET_H
 #define FORMWIDGET_H
 
diff -urN pdf2htm_src/src/Function.cpp pdfconv/src/Function.cpp
--- pdf2htm_src/src/Function.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Function.cpp	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Function.h pdfconv/src/Function.h
--- pdf2htm_src/src/Function.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Function.h	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef FUNCTION_H
 #define FUNCTION_H
 
diff -urN pdf2htm_src/src/GHash.cpp pdfconv/src/GHash.cpp
--- pdf2htm_src/src/GHash.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GHash.cpp	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/GHash.h pdfconv/src/GHash.h
--- pdf2htm_src/src/GHash.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GHash.h	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GHASH_H
 #define GHASH_H
 
diff -urN pdf2htm_src/src/GList.cpp pdfconv/src/GList.cpp
--- pdf2htm_src/src/GList.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GList.cpp	Thu Jun  3 21:38:20 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/GList.h pdfconv/src/GList.h
--- pdf2htm_src/src/GList.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GList.h	Thu Jun  3 21:41:50 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GLIST_H
 #define GLIST_H
 
diff -urN pdf2htm_src/src/GString.cpp pdfconv/src/GString.cpp
--- pdf2htm_src/src/GString.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GString.cpp	Thu Jun  3 21:41:50 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/GString.h pdfconv/src/GString.h
--- pdf2htm_src/src/GString.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GString.h	Thu Jun  3 21:41:50 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GSTRING_H
 #define GSTRING_H
 
diff -urN pdf2htm_src/src/Gfx.cpp pdfconv/src/Gfx.cpp
--- pdf2htm_src/src/Gfx.cpp	Mon May 17 16:05:58 2004
+++ pdfconv/src/Gfx.cpp	Thu Jun  3 21:41:50 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Gfx.h pdfconv/src/Gfx.h
--- pdf2htm_src/src/Gfx.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Gfx.h	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GFX_H
 #define GFX_H
 
diff -urN pdf2htm_src/src/GfxFont.cpp pdfconv/src/GfxFont.cpp
--- pdf2htm_src/src/GfxFont.cpp	Mon May 17 16:06:18 2004
+++ pdfconv/src/GfxFont.cpp	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/GfxFont.h pdfconv/src/GfxFont.h
--- pdf2htm_src/src/GfxFont.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GfxFont.h	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GFXFONT_H
 #define GFXFONT_H
 
diff -urN pdf2htm_src/src/GfxState.cpp pdfconv/src/GfxState.cpp
--- pdf2htm_src/src/GfxState.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GfxState.cpp	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/GfxState.h pdfconv/src/GfxState.h
--- pdf2htm_src/src/GfxState.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GfxState.h	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GFXSTATE_H
 #define GFXSTATE_H
 
diff -urN pdf2htm_src/src/GlobalParams.cpp pdfconv/src/GlobalParams.cpp
--- pdf2htm_src/src/GlobalParams.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GlobalParams.cpp	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/GlobalParams.h pdfconv/src/GlobalParams.h
--- pdf2htm_src/src/GlobalParams.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GlobalParams.h	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GLOBALPARAMS_H
 #define GLOBALPARAMS_H
 
diff -urN pdf2htm_src/src/GradientProgressCtrl.cpp pdfconv/src/GradientProgressCtrl.cpp
--- pdf2htm_src/src/GradientProgressCtrl.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GradientProgressCtrl.cpp	Thu Jun  3 21:41:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "GradientProgressCtrl.h"
 
diff -urN pdf2htm_src/src/GradientProgressCtrl.h pdfconv/src/GradientProgressCtrl.h
--- pdf2htm_src/src/GradientProgressCtrl.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/GradientProgressCtrl.h	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_ENHPROGRESSCTRL_H__12909D73_C393_11D1_9FAE_8192554015AD__INCLUDED_)
 #define AFX_ENHPROGRESSCTRL_H__12909D73_C393_11D1_9FAE_8192554015AD__INCLUDED_
 
diff -urN pdf2htm_src/src/HTMLPage.cpp pdfconv/src/HTMLPage.cpp
--- pdf2htm_src/src/HTMLPage.cpp	Fri Dec 19 12:31:34 2003
+++ pdfconv/src/HTMLPage.cpp	Sun Jun 13 19:35:56 2004
@@ -36,10 +36,10 @@
 {
 	CPropertyPage::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CHTMLPage)
-	DDX_Text(pDX, IDC_EDIT_HTML_PAGE_TITLE, m_szPageTitle);
-	DDX_Text(pDX, IDC_EDIT_HTML_KEYWORDS, m_szPageKeywords);
-	DDX_Check(pDX, IDC_CHECK_HOMEURL, m_bHomepageURL);
-	DDX_Text(pDX, IDC_EDIT_HOMEPAGEURL, m_strHomepageURL);
+//	DDX_Text(pDX, IDC_EDIT_HTML_PAGE_TITLE, m_szPageTitle);
+//	DDX_Text(pDX, IDC_EDIT_HTML_KEYWORDS, m_szPageKeywords);
+//	DDX_Check(pDX, IDC_CHECK_HOMEURL, m_bHomepageURL);
+//	DDX_Text(pDX, IDC_EDIT_HOMEPAGEURL, m_strHomepageURL);
 	//}}AFX_DATA_MAP
 }
 
@@ -48,9 +48,9 @@
 	//{{AFX_MSG_MAP(CHTMLPage)
 	ON_BN_CLICKED(IDC_RADIO_PAGETITLE1, OnRadioPagetitle1)
 	ON_BN_CLICKED(IDC_RADIO_PAGETITLE2, OnRadioPagetitle2)
-	ON_BN_CLICKED(IDC_BUTTON_COLOR, OnButtonColor)
+//	ON_BN_CLICKED(IDC_BUTTON_COLOR, OnButtonColor)
 	ON_WM_PAINT()
-	ON_BN_CLICKED(IDC_CHECK_HOMEURL, OnCheckHomeurl)
+//	ON_BN_CLICKED(IDC_CHECK_HOMEURL, OnCheckHomeurl)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -79,7 +79,7 @@
 	m_clBackground = AfxGetApp()->GetProfileInt("CHTMLPage","m_clBackground",m_clBackground);
 	m_szPageKeywords = AfxGetApp()->GetProfileString("CHTMLPage","m_szPageKeywords");
 	m_bHomepageURL = AfxGetApp()->GetProfileInt("CHTMLPage","m_bHomepageURL",0);
-	m_strHomepageURL = AfxGetApp()->GetProfileString("CHTMLPage","m_strHomepageURL","http://www.verypdf.com");
+	m_strHomepageURL = AfxGetApp()->GetProfileString("CHTMLPage","m_strHomepageURL","http://www.bumpnetworks.com/?software");
 
 	UpdateOptions();
 	UpdateData(FALSE);
@@ -105,15 +105,15 @@
 	case 0:
 		((CButton*)GetDlgItem(IDC_RADIO_PAGETITLE1))->SetCheck(1);
 		((CButton*)GetDlgItem(IDC_RADIO_PAGETITLE2))->SetCheck(0);
-		((CButton*)GetDlgItem(IDC_EDIT_HTML_PAGE_TITLE))->EnableWindow(FALSE);
+//		((CButton*)GetDlgItem(IDC_EDIT_HTML_PAGE_TITLE))->EnableWindow(FALSE);
 		break;
 	case 1:
 		((CButton*)GetDlgItem(IDC_RADIO_PAGETITLE1))->SetCheck(0);
 		((CButton*)GetDlgItem(IDC_RADIO_PAGETITLE2))->SetCheck(1);
-		((CButton*)GetDlgItem(IDC_EDIT_HTML_PAGE_TITLE))->EnableWindow(TRUE);
+//		((CButton*)GetDlgItem(IDC_EDIT_HTML_PAGE_TITLE))->EnableWindow(TRUE);
 		break;
 	}
-	((CButton*)GetDlgItem(IDC_EDIT_HOMEPAGEURL))->EnableWindow(m_bHomepageURL);
+//	((CButton*)GetDlgItem(IDC_EDIT_HOMEPAGEURL))->EnableWindow(m_bHomepageURL);
 }
 
 void Links_SetButtonColor(HWND hDlg,COLORREF color)
diff -urN pdf2htm_src/src/Html2pdf.cpp pdfconv/src/Html2pdf.cpp
--- pdf2htm_src/src/Html2pdf.cpp	Mon May 17 16:06:42 2004
+++ pdfconv/src/Html2pdf.cpp	Sun Jun 13 19:35:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "win_pdf2htm.h"
 #include "Html2pdf.h"
@@ -53,9 +30,9 @@
 	CPropertyPage::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CHtml2pdf)
 	DDX_Control(pDX, IDC_SPIN_SPACE, m_ctrlSpinSpace);
-	DDX_Text(pDX, IDC_EDIT_SPACES, m_charSpace);
+//	DDX_Text(pDX, IDC_EDIT_SPACES, m_charSpace);
 	DDV_MinMaxInt(pDX, m_charSpace, 0, 50);
-	DDX_Check(pDX, IDC_CHECK_CHECKSPACE, m_bCheckSpace);
+//	DDX_Check(pDX, IDC_CHECK_CHECKSPACE, m_bCheckSpace);
 	//}}AFX_DATA_MAP
 }
 
@@ -81,7 +58,7 @@
 
 	m_bCheckSpace = AfxGetApp()->GetProfileInt("PDF2HTM","CheckSpaces",1);
 
-	m_ctrlSpinSpace.SetBuddy(GetDlgItem(IDC_EDIT_SPACES));
+//	m_ctrlSpinSpace.SetBuddy(GetDlgItem(IDC_EDIT_SPACES));
 	m_ctrlSpinSpace.SetRange(0,50);
 
 	UpdateData(FALSE);
diff -urN pdf2htm_src/src/Html2pdf.h pdfconv/src/Html2pdf.h
--- pdf2htm_src/src/Html2pdf.h	Mon May 17 16:06:52 2004
+++ pdfconv/src/Html2pdf.h	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_HTML2PDF_H__102B6619_9B95_4D15_A1EA_A1F507905E2A__INCLUDED_)
 #define AFX_HTML2PDF_H__102B6619_9B95_4D15_A1EA_A1F507905E2A__INCLUDED_
 
diff -urN pdf2htm_src/src/HyperLink.cpp pdfconv/src/HyperLink.cpp
--- pdf2htm_src/src/HyperLink.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/HyperLink.cpp	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "HyperLink.h"
 
diff -urN pdf2htm_src/src/HyperLink.h pdfconv/src/HyperLink.h
--- pdf2htm_src/src/HyperLink.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/HyperLink.h	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_HYPERLINK_H__D1625061_574B_11D1_ABBA_00A0243D1382__INCLUDED_)
 #define AFX_HYPERLINK_H__D1625061_574B_11D1_ABBA_00A0243D1382__INCLUDED_
 
diff -urN pdf2htm_src/src/Hyperlinks.cpp pdfconv/src/Hyperlinks.cpp
--- pdf2htm_src/src/Hyperlinks.cpp	Mon Mar 15 13:52:50 2004
+++ pdfconv/src/Hyperlinks.cpp	Sun Jun 13 19:36:02 2004
@@ -31,7 +31,7 @@
 {
 	CPropertyPage::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CHyperlinks)
-	DDX_Check(pDX, IDC_CHECK_ENABLE_LINKS, m_bEnableLinks);
+//	DDX_Check(pDX, IDC_CHECK_ENABLE_LINKS, m_bEnableLinks);
 	//}}AFX_DATA_MAP
 }
 
diff -urN pdf2htm_src/src/ImageOutputDev.cpp pdfconv/src/ImageOutputDev.cpp
--- pdf2htm_src/src/ImageOutputDev.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/ImageOutputDev.cpp	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/ImageOutputDev.h pdfconv/src/ImageOutputDev.h
--- pdf2htm_src/src/ImageOutputDev.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/ImageOutputDev.h	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef IMAGEOUTPUTDEV_H
 #define IMAGEOUTPUTDEV_H
 
diff -urN pdf2htm_src/src/Label.cpp pdfconv/src/Label.cpp
--- pdf2htm_src/src/Label.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Label.cpp	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "Resource.h"
 #include "Label.h"
diff -urN pdf2htm_src/src/Label.h pdfconv/src/Label.h
--- pdf2htm_src/src/Label.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Label.h	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_LABEL_H__A4EABEC5_2E8C_11D1_B79F_00805F9ECE10__INCLUDED_)
 #define AFX_LABEL_H__A4EABEC5_2E8C_11D1_B79F_00805F9ECE10__INCLUDED_
 
diff -urN pdf2htm_src/src/Lexer.cpp pdfconv/src/Lexer.cpp
--- pdf2htm_src/src/Lexer.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Lexer.cpp	Thu Jun  3 21:43:00 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Lexer.h pdfconv/src/Lexer.h
--- pdf2htm_src/src/Lexer.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Lexer.h	Thu Jun  3 21:43:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef LEXER_H
 #define LEXER_H
 
diff -urN pdf2htm_src/src/Link.cpp pdfconv/src/Link.cpp
--- pdf2htm_src/src/Link.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Link.cpp	Thu Jun  3 21:43:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Link.h pdfconv/src/Link.h
--- pdf2htm_src/src/Link.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Link.h	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef LINK_H
 #define LINK_H
 
diff -urN pdf2htm_src/src/MenuSpawn.cpp pdfconv/src/MenuSpawn.cpp
--- pdf2htm_src/src/MenuSpawn.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/MenuSpawn.cpp	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "resource.h"
 #include "MenuSpawn.h"
diff -urN pdf2htm_src/src/MenuSpawn.h pdfconv/src/MenuSpawn.h
--- pdf2htm_src/src/MenuSpawn.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/MenuSpawn.h	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_MENUSPAWN_H__BB6F2F01_91FA_11D1_8B78_0000B43382FE__INCLUDED_)
 #define AFX_MENUSPAWN_H__BB6F2F01_91FA_11D1_8B78_0000B43382FE__INCLUDED_
 
diff -urN pdf2htm_src/src/MyMenu.h pdfconv/src/MyMenu.h
--- pdf2htm_src/src/MyMenu.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/MyMenu.h	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_MYMENU_H__14A79F1F_7393_49E8_BF12_15E3A8EE5BAE__INCLUDED_)
 #define AFX_MYMENU_H__14A79F1F_7393_49E8_BF12_15E3A8EE5BAE__INCLUDED_
 
diff -urN pdf2htm_src/src/MyReg.cpp pdfconv/src/MyReg.cpp
--- pdf2htm_src/src/MyReg.cpp	Mon May 17 16:19:44 2004
+++ pdfconv/src/MyReg.cpp	Mon Jun 14 02:27:14 2004
@@ -1,38 +1,14 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "resource.h"
 
 //Config file info
 #define SERIAL_FILE	"pdf2html.DAT"
 #define CONFIG_FILE	"pdf2html.ini"
-#define SOFTWARE_NAME	"pdf2html v1.6"
-char szMailTo[] = "mailto:support@verypdf.com";
+#define SOFTWARE_NAME	"PDFConv v1.0"
+char szMailTo[] = "";
 char szEnglishHomepage[] = "http://www.globalpdf.com/pdf2htm/index.html";
 char szEnglishRegister[] = "http://www.globalpdf.com/pdf2htm/index.html";
 
-#define INCNAME		"verypdf.com Inc."
 char szMailContent[] = 
 	"Dear verypdf.com Inc:%0a"
 	"I want register "SOFTWARE_NAME" software,...%0a"
@@ -73,12 +49,16 @@
     return retval;
 }
 
-HINSTANCE MyGotoURL(LPCTSTR url, int showcmd)
+HINSTANCE MyGotoURL(LPCTSTR in_url, int showcmd)
 {
     TCHAR key[MAX_PATH + MAX_PATH];
+	TCHAR url[ 1024 ] = { 0 };
+
+	strcpy( url, "\"" );
+	strcat( url, in_url );
+	strcat( url, "\"" );
 
-    // First try ShellExecute()
-    HINSTANCE result = ShellExecute(NULL, _T("open"), url, NULL,NULL, showcmd);
+    HINSTANCE result = ShellExecute(NULL, "open", url, NULL,NULL, showcmd);
 
     // If it failed, get the .htm regkey and lookup the program
     if ((UINT)result <= HINSTANCE_ERROR) {
@@ -349,9 +329,6 @@
 
 VOID SendEmail(HWND hWnd,LPCTSTR pszSubject)
 {
-	char szMailToContent[1024];
-	sprintf(szMailToContent,"mailto:%s?subject=%s&Body=%s",szMailTo,pszSubject,szMailContent);
-	ShellExecute(NULL,"open",szMailToContent,NULL,NULL,SW_SHOWNORMAL);
 }
 char szPassword[200];
 BOOL CALLBACK RegisterDlgFunc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
@@ -367,7 +344,7 @@
 			//m_base64.Encode(szPassword,16,Feature);
 			char szPassword1[200];
 			sprintf(szPassword1,"[%s]",szPassword);
-			SetDlgItemText(hDlg,IDC_EDIT_PRODUCTID,szPassword1);
+//			SetDlgItemText(hDlg,IDC_EDIT_PRODUCTID,szPassword1);
 			if(CheckSerialNo() == 0)
 			{
 				IsRegistered = TRUE;
@@ -375,7 +352,7 @@
 			}
 			else
 			{
-				SetDlgItemText(hDlg,IDC_EDIT_SERIALNO,"");
+//				SetDlgItemText(hDlg,IDC_EDIT_SERIALNO,"");
 				SetDlgItemText(hDlg,IDC_STATIC_INFO1,REGISTER" "SOFTWARE_NAME"!");
 			}
 			CenterWindow(hDlg,GetDesktopWindow());
@@ -392,7 +369,7 @@
 			case	IDOK:
 				{
 					memset(szPassword,0,200);
-					GetDlgItemText(hDlg,IDC_EDIT_SERIALNO,szPassword,200);
+//					GetDlgItemText(hDlg,IDC_EDIT_SERIALNO,szPassword,200);
 					if(IsCorrect((LPBYTE)szPassword))
 					{//OK
 						MessageBox(hDlg,
@@ -402,7 +379,7 @@
 					else
 					{
 						MessageBox(hDlg,SERIESERR,NULL,MB_OK|MB_ICONERROR);
-						SetFocus(GetDlgItem(hDlg,IDC_EDIT_SERIALNO));
+//						SetFocus(GetDlgItem(hDlg,IDC_EDIT_SERIALNO));
 						return 0;
 					}
 
@@ -425,7 +402,7 @@
 */			case	IDCANCEL:
 				{
 					memset(szPassword,0,200);
-					GetDlgItemText(hDlg,IDC_EDIT_SERIALNO,szPassword,200);
+//					GetDlgItemText(hDlg,IDC_EDIT_SERIALNO,szPassword,200);
 					if(IsCorrect((LPBYTE)szPassword))
 						IsRegistered = TRUE;
 					else
@@ -438,7 +415,7 @@
 					EndDialog(hDlg,wmId);
 					break;
 				}
-			case	IDC_BUTTON_TRY:
+/*			case	IDC_BUTTON_TRY:
 				{
 					int	iTrail = GetTrailCount();
 					if(iTrail == -1)
@@ -461,11 +438,11 @@
 					}
 					EndDialog(hDlg,wmId);
 					break;
-				}
-			case IDC_BUTTON_BUYNOW:
+				}*/
+/*			case IDC_BUTTON_BUYNOW:
 				ShellExecute(NULL,"open",szEnglishRegister,
 					NULL,NULL,SW_SHOWNORMAL);
-				break;
+				break;*/
 			}
 			break;
 		}
diff -urN pdf2htm_src/src/NameToCharCode.cpp pdfconv/src/NameToCharCode.cpp
--- pdf2htm_src/src/NameToCharCode.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/NameToCharCode.cpp	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/NameToCharCode.h pdfconv/src/NameToCharCode.h
--- pdf2htm_src/src/NameToCharCode.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/NameToCharCode.h	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef NAMETOCHARCODE_H
 #define NAMETOCHARCODE_H
 
diff -urN pdf2htm_src/src/NameToUnicodeTable.h pdfconv/src/NameToUnicodeTable.h
--- pdf2htm_src/src/NameToUnicodeTable.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/NameToUnicodeTable.h	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 static struct {
   Unicode u;
   char *name;
diff -urN pdf2htm_src/src/Object.cpp pdfconv/src/Object.cpp
--- pdf2htm_src/src/Object.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Object.cpp	Thu Jun  3 21:43:52 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Object.h pdfconv/src/Object.h
--- pdf2htm_src/src/Object.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Object.h	Thu Jun  3 21:43:54 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef OBJECT_H
 #define OBJECT_H
 
diff -urN pdf2htm_src/src/OptionsDlg.cpp pdfconv/src/OptionsDlg.cpp
--- pdf2htm_src/src/OptionsDlg.cpp	Mon Mar 15 14:02:36 2004
+++ pdfconv/src/OptionsDlg.cpp	Sun Jun 13 19:37:40 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "win_pdf2htm.h"
 #include "OptionsDlg.h"
@@ -56,18 +33,18 @@
 {
 	CPropertyPage::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(COptionsDlg)
-	DDX_Control(pDX, IDC_COMBO_PAGERANGE, m_ctrlPageRange);
+//	DDX_Control(pDX, IDC_COMBO_PAGERANGE, m_ctrlPageRange);
 	DDX_Control(pDX, IDC_SLIDER_OUTPUTZOOM, m_ctrlPageZoom);
 	DDX_Slider(pDX, IDC_SLIDER_OUTPUTZOOM, m_iPageZoom);
 	DDX_Text(pDX, IDC_STATIC_PAGEZOOM, m_strPageZoom);
-	DDX_CBIndex(pDX, IDC_COMBO_PAGERANGE, m_iPageRange);
-	DDX_Text(pDX, IDC_EDIT_FROM, m_iPageFrom);
+//	DDX_CBIndex(pDX, IDC_COMBO_PAGERANGE, m_iPageRange);
+//	DDX_Text(pDX, IDC_EDIT_FROM, m_iPageFrom);
 	DDV_MinMaxInt(pDX, m_iPageFrom, 1, 100000);
-	DDX_Text(pDX, IDC_EDIT_TO, m_iPageTo);
+//	DDX_Text(pDX, IDC_EDIT_TO, m_iPageTo);
 	DDV_MinMaxInt(pDX, m_iPageTo, 1, 100000);
 	DDX_Check(pDX, IDC_CHECK_OPENIT, m_bPreview);
 	DDX_Check(pDX, IDC_CHECK_ONEHTMLPAGE, m_bForceContinuePages);
-	DDX_Check(pDX, IDC_CHECK_REMOVEPICS, m_bRemovePics);
+//	DDX_Check(pDX, IDC_CHECK_REMOVEPICS, m_bRemovePics);
 	//}}AFX_DATA_MAP
 }
 
@@ -75,7 +52,7 @@
 BEGIN_MESSAGE_MAP(COptionsDlg, CPropertyPage)
 	//{{AFX_MSG_MAP(COptionsDlg)
 	ON_WM_HSCROLL()
-	ON_CBN_SELCHANGE(IDC_COMBO_PAGERANGE, OnSelchangeComboPagerange)
+//	ON_CBN_SELCHANGE(IDC_COMBO_PAGERANGE, OnSelchangeComboPagerange)
 	ON_BN_CLICKED(IDC_CHECK_ONEHTMLPAGE, OnCheckOnehtmlpage)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -96,8 +73,8 @@
 	m_iPageRange = AfxGetApp()->GetProfileInt("PageRangeType","Type",0);
 	if(m_iPageRange == 0)
 	{//All pages
-		GetDlgItem(IDC_EDIT_FROM)->EnableWindow(FALSE);
-		GetDlgItem(IDC_EDIT_TO)->EnableWindow(FALSE);
+//		GetDlgItem(IDC_EDIT_FROM)->EnableWindow(FALSE);
+//		GetDlgItem(IDC_EDIT_TO)->EnableWindow(FALSE);
 	}
 	m_iPageFrom = AfxGetApp()->GetProfileInt("PageRange","From",1);
 	m_iPageTo = AfxGetApp()->GetProfileInt("PageRange","To",100000);
@@ -113,7 +90,7 @@
 		GetDlgItem(IDC_STATIC_ZOOM)->EnableWindow(FALSE);
 		GetDlgItem(IDC_SLIDER_OUTPUTZOOM)->EnableWindow(FALSE);
 	}
-	GetDlgItem(IDC_CHECK_REMOVEPICS)->EnableWindow(m_bForceContinuePages);
+//	GetDlgItem(IDC_CHECK_REMOVEPICS)->EnableWindow(m_bForceContinuePages);
 	UpdateData(FALSE);
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
@@ -133,8 +110,8 @@
 void COptionsDlg::OnSelchangeComboPagerange() 
 {
 	UpdateData();
-	GetDlgItem(IDC_EDIT_FROM)->EnableWindow(m_iPageRange==0?FALSE:TRUE);
-	GetDlgItem(IDC_EDIT_TO)->EnableWindow(m_iPageRange==0?FALSE:TRUE);
+//	GetDlgItem(IDC_EDIT_FROM)->EnableWindow(m_iPageRange==0?FALSE:TRUE);
+//	GetDlgItem(IDC_EDIT_TO)->EnableWindow(m_iPageRange==0?FALSE:TRUE);
 }
 void COptionsDlg::OnOK() 
 {
@@ -157,5 +134,5 @@
 void COptionsDlg::OnCheckOnehtmlpage() 
 {
 	UpdateData();
-	GetDlgItem(IDC_CHECK_REMOVEPICS)->EnableWindow(m_bForceContinuePages);
+//	GetDlgItem(IDC_CHECK_REMOVEPICS)->EnableWindow(m_bForceContinuePages);
 }
diff -urN pdf2htm_src/src/OptionsDlg.h pdfconv/src/OptionsDlg.h
--- pdf2htm_src/src/OptionsDlg.h	Mon Mar 15 14:02:54 2004
+++ pdfconv/src/OptionsDlg.h	Thu Jun  3 21:43:54 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_OPTIONSDLG_H__395EEAB9_65DF_45A2_A056_E5E33F2349E8__INCLUDED_)
 #define AFX_OPTIONSDLG_H__395EEAB9_65DF_45A2_A056_E5E33F2349E8__INCLUDED_
 
diff -urN pdf2htm_src/src/OutputDev.cpp pdfconv/src/OutputDev.cpp
--- pdf2htm_src/src/OutputDev.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/OutputDev.cpp	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/OutputDev.h pdfconv/src/OutputDev.h
--- pdf2htm_src/src/OutputDev.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/OutputDev.h	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef OUTPUTDEV_H
 #define OUTPUTDEV_H
 
diff -urN pdf2htm_src/src/PBMOutputDev.cpp pdfconv/src/PBMOutputDev.cpp
--- pdf2htm_src/src/PBMOutputDev.cpp	Sun Mar 14 18:13:34 2004
+++ pdfconv/src/PBMOutputDev.cpp	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/PBMOutputDev.h pdfconv/src/PBMOutputDev.h
--- pdf2htm_src/src/PBMOutputDev.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/PBMOutputDev.h	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef PBMOUTPUTDEV_H
 #define PBMOUTPUTDEV_H
 
diff -urN pdf2htm_src/src/PDFDoc.cpp pdfconv/src/PDFDoc.cpp
--- pdf2htm_src/src/PDFDoc.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/PDFDoc.cpp	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/PDFDoc.h pdfconv/src/PDFDoc.h
--- pdf2htm_src/src/PDFDoc.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/PDFDoc.h	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef PDFDOC_H
 #define PDFDOC_H
 
diff -urN pdf2htm_src/src/Page.cpp pdfconv/src/Page.cpp
--- pdf2htm_src/src/Page.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Page.cpp	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Page.h pdfconv/src/Page.h
--- pdf2htm_src/src/Page.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Page.h	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef PAGE_H
 #define PAGE_H
 
diff -urN pdf2htm_src/src/Parser.cpp pdfconv/src/Parser.cpp
--- pdf2htm_src/src/Parser.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Parser.cpp	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Parser.h pdfconv/src/Parser.h
--- pdf2htm_src/src/Parser.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Parser.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef PARSER_H
 #define PARSER_H
 
diff -urN pdf2htm_src/src/PropertySheetWithLogoDlg.cpp pdfconv/src/PropertySheetWithLogoDlg.cpp
--- pdf2htm_src/src/PropertySheetWithLogoDlg.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/PropertySheetWithLogoDlg.cpp	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "PropertySheetWithLogoDlg.h"
 #include "playlist.h"
diff -urN pdf2htm_src/src/PropertySheetWithLogoDlg.h pdfconv/src/PropertySheetWithLogoDlg.h
--- pdf2htm_src/src/PropertySheetWithLogoDlg.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/PropertySheetWithLogoDlg.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_PROPERTYSHEETWITHLOGODLG_H__D17EA810_E6A4_11D1_BB81_0040F684401F__INCLUDED_)
 #define AFX_PROPERTYSHEETWITHLOGODLG_H__D17EA810_E6A4_11D1_BB81_0040F684401F__INCLUDED_
 
Binary files pdf2htm_src/src/RES/bmp00002.bmp and pdfconv/src/RES/bmp00002.bmp differ
Binary files pdf2htm_src/src/RES/img/back.bmp and pdfconv/src/RES/img/back.bmp differ
Binary files pdf2htm_src/src/RES/img/back2.bmp and pdfconv/src/RES/img/back2.bmp differ
Binary files pdf2htm_src/src/RES/logo.bmp and pdfconv/src/RES/logo.bmp differ
Binary files pdf2htm_src/src/RES/toolbar2.bmp and pdfconv/src/RES/toolbar2.bmp differ
Binary files pdf2htm_src/src/RES/win_pdf2htm.ico and pdfconv/src/RES/win_pdf2htm.ico differ
diff -urN pdf2htm_src/src/RasterImage.cpp pdfconv/src/RasterImage.cpp
--- pdf2htm_src/src/RasterImage.cpp	Fri Dec 19 12:02:32 2003
+++ pdfconv/src/RasterImage.cpp	Sun Jun 13 19:32:04 2004
@@ -35,7 +35,7 @@
 	//{{AFX_DATA_MAP(CRasterImage)
 	DDX_Control(pDX, IDC_SLIDER_JPEGQUALITY, m_ctrlJPEGQuality);
 	DDX_Text(pDX, IDC_STATIC_JPEGQUALITY, m_szJPEGQuality);
-	DDX_Check(pDX, IDC_CHECK_GRAYSCALE, m_bGrayscale);
+//	DDX_Check(pDX, IDC_CHECK_GRAYSCALE, m_bGrayscale);
 	DDX_Slider(pDX, IDC_SLIDER_JPEGQUALITY, m_iJPGQuality);
 	//}}AFX_DATA_MAP
 }
diff -urN pdf2htm_src/src/Registry.cpp pdfconv/src/Registry.cpp
--- pdf2htm_src/src/Registry.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Registry.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "Registry.h"
 
diff -urN pdf2htm_src/src/Registry.h pdfconv/src/Registry.h
--- pdf2htm_src/src/Registry.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Registry.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <winreg.h>
 
 #define REG_RECT	0x0001
diff -urN pdf2htm_src/src/Rotate.cpp pdfconv/src/Rotate.cpp
--- pdf2htm_src/src/Rotate.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Rotate.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <windows.h>
 #include "RotateByShear.h"
 
diff -urN pdf2htm_src/src/RotateByShear.h pdfconv/src/RotateByShear.h
--- pdf2htm_src/src/RotateByShear.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/RotateByShear.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef _ROTATE_BY_SHEAR_H_
 #define _ROTATE_BY_SHEAR_H_
 
diff -urN pdf2htm_src/src/SBDESTINATION.CPP pdfconv/src/SBDESTINATION.CPP
--- pdf2htm_src/src/SBDESTINATION.CPP	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/SBDESTINATION.CPP	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "SBDestination.h"
 
diff -urN pdf2htm_src/src/SBDESTINATION.H pdfconv/src/SBDESTINATION.H
--- pdf2htm_src/src/SBDESTINATION.H	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/SBDESTINATION.H	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef __SBDESTINATION_H__
 #define __SBDESTINATION_H__
 
diff -urN pdf2htm_src/src/SFont.cpp pdfconv/src/SFont.cpp
--- pdf2htm_src/src/SFont.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/SFont.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/SFont.h pdfconv/src/SFont.h
--- pdf2htm_src/src/SFont.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/SFont.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef SFONT_H
 #define SFONT_H
 
diff -urN pdf2htm_src/src/Shadow.h pdfconv/src/Shadow.h
--- pdf2htm_src/src/Shadow.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Shadow.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_SHADOW_H__105223A6_8A70_4B93_935C_A0E4903489D2__INCLUDED_)
 #define AFX_SHADOW_H__105223A6_8A70_4B93_935C_A0E4903489D2__INCLUDED_
 
diff -urN pdf2htm_src/src/StdAfx.cpp pdfconv/src/StdAfx.cpp
--- pdf2htm_src/src/StdAfx.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/StdAfx.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 
 // TODO: reference any additional headers you need in STDAFX.H
diff -urN pdf2htm_src/src/StdAfx.h pdfconv/src/StdAfx.h
--- pdf2htm_src/src/StdAfx.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/StdAfx.h	Thu Jun 10 07:11:32 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_STDAFX_H__198B5868_CA85_11D3_B11D_5254ABDE3519__INCLUDED_)
 #define AFX_STDAFX_H__198B5868_CA85_11D3_B11D_5254ABDE3519__INCLUDED_
 
@@ -28,9 +5,12 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
+//#define WINVER 0x0500
 
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define _AFX_NO_DEBUG_CRT
 
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#include <assert.h>
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
 #include <afxdisp.h>        // MFC Automation classes
diff -urN pdf2htm_src/src/Stream-CCITT.h pdfconv/src/Stream-CCITT.h
--- pdf2htm_src/src/Stream-CCITT.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Stream-CCITT.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 struct CCITTCode {
   short bits;
   short n;
diff -urN pdf2htm_src/src/Stream.cpp pdfconv/src/Stream.cpp
--- pdf2htm_src/src/Stream.cpp	Wed Oct  1 09:22:28 2003
+++ pdfconv/src/Stream.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/Stream.h pdfconv/src/Stream.h
--- pdf2htm_src/src/Stream.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/Stream.h	Thu Jun  3 21:48:02 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef STREAM_H
 #define STREAM_H
 
diff -urN pdf2htm_src/src/T1Font.cpp pdfconv/src/T1Font.cpp
--- pdf2htm_src/src/T1Font.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/T1Font.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/T1Font.h pdfconv/src/T1Font.h
--- pdf2htm_src/src/T1Font.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/T1Font.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef T1FONT_H
 #define T1FONT_H
 
diff -urN pdf2htm_src/src/TTFont.cpp pdfconv/src/TTFont.cpp
--- pdf2htm_src/src/TTFont.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/TTFont.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/TTFont.h pdfconv/src/TTFont.h
--- pdf2htm_src/src/TTFont.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/TTFont.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef TTFONT_H
 #define TTFONT_H
 
diff -urN pdf2htm_src/src/TextOutputDev.cpp pdfconv/src/TextOutputDev.cpp
--- pdf2htm_src/src/TextOutputDev.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/TextOutputDev.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/TextOutputDev.h pdfconv/src/TextOutputDev.h
--- pdf2htm_src/src/TextOutputDev.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/TextOutputDev.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef TEXTOUTPUTDEV_H
 #define TEXTOUTPUTDEV_H
 
diff -urN pdf2htm_src/src/UTF8.h pdfconv/src/UTF8.h
--- pdf2htm_src/src/UTF8.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/UTF8.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 static int mapUTF8(Unicode u, char *buf, int bufSize) {
   if        (u <= 0x0000007f) {
     if (bufSize < 1) {
diff -urN pdf2htm_src/src/UnicodeMap.cpp pdfconv/src/UnicodeMap.cpp
--- pdf2htm_src/src/UnicodeMap.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/UnicodeMap.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/UnicodeMap.h pdfconv/src/UnicodeMap.h
--- pdf2htm_src/src/UnicodeMap.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/UnicodeMap.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef UNICODEMAP_H
 #define UNICODEMAP_H
 
diff -urN pdf2htm_src/src/UnicodeMapTables.h pdfconv/src/UnicodeMapTables.h
--- pdf2htm_src/src/UnicodeMapTables.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/UnicodeMapTables.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 static UnicodeMapRange latin1UnicodeMapRanges[] = {
   { 0x000a, 0x000a, 0x0a, 1 },
   { 0x000c, 0x000d, 0x0c, 1 },
diff -urN pdf2htm_src/src/WriteDir.cpp pdfconv/src/WriteDir.cpp
--- pdf2htm_src/src/WriteDir.cpp	Sun Sep 21 22:24:30 2003
+++ pdfconv/src/WriteDir.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "WriteDir.h"
 #include <direct.h>
diff -urN pdf2htm_src/src/WriteDir.h pdfconv/src/WriteDir.h
--- pdf2htm_src/src/WriteDir.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/WriteDir.h	Thu Jun  3 21:46:26 2004
@@ -1,25 +1 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
-
 BOOL WriteDirectory(CString dd);
diff -urN pdf2htm_src/src/X11/X11_stubs.cpp pdfconv/src/X11/X11_stubs.cpp
--- pdf2htm_src/src/X11/X11_stubs.cpp	Mon Jan  6 17:13:46 2003
+++ pdfconv/src/X11/X11_stubs.cpp	Thu Jun  3 21:40:42 2004
@@ -1,25 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/TXT/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
 #define XlibSpecificationRelease 6
 
 #include "config.h"
diff -urN pdf2htm_src/src/XOutputDev.cpp pdfconv/src/XOutputDev.cpp
--- pdf2htm_src/src/XOutputDev.cpp	Wed Sep 24 12:37:24 2003
+++ pdfconv/src/XOutputDev.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/XOutputDev.h pdfconv/src/XOutputDev.h
--- pdf2htm_src/src/XOutputDev.h	Mon Mar 15 13:27:36 2004
+++ pdfconv/src/XOutputDev.h	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef XOUTPUTDEV_H
 #define XOUTPUTDEV_H
 
diff -urN pdf2htm_src/src/XRef.cpp pdfconv/src/XRef.cpp
--- pdf2htm_src/src/XRef.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/XRef.cpp	Thu Jun  3 21:46:26 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff -urN pdf2htm_src/src/XRef.h pdfconv/src/XRef.h
--- pdf2htm_src/src/XRef.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/XRef.h	Thu Jun  3 21:46:24 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef XREF_H
 #define XREF_H
 
diff -urN pdf2htm_src/src/aconf.h pdfconv/src/aconf.h
--- pdf2htm_src/src/aconf.h	Mon May 17 16:26:32 2004
+++ pdfconv/src/aconf.h	Thu Jun  3 21:46:24 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef ACONF_H
 #define ACONF_H
 
diff -urN pdf2htm_src/src/config.h pdfconv/src/config.h
--- pdf2htm_src/src/config.h	Mon May 17 16:05:52 2004
+++ pdfconv/src/config.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef CONFIG_H
 #define CONFIG_H
 
diff -urN pdf2htm_src/src/folder_dialog.h pdfconv/src/folder_dialog.h
--- pdf2htm_src/src/folder_dialog.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/folder_dialog.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_MYFD_H__F9CB9441_F91B_11D1_8610_0040055C08D9__INCLUDED_)
 #define AFX_MYFD_H__F9CB9441_F91B_11D1_8610_0040055C08D9__INCLUDED_
 
diff -urN pdf2htm_src/src/gfile.cpp pdfconv/src/gfile.cpp
--- pdf2htm_src/src/gfile.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/gfile.cpp	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <aconf.h>
 
 #ifdef WIN32
diff -urN pdf2htm_src/src/gfile.h pdfconv/src/gfile.h
--- pdf2htm_src/src/gfile.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/gfile.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GFILE_H
 #define GFILE_H
 
diff -urN pdf2htm_src/src/gmem.cpp pdfconv/src/gmem.cpp
--- pdf2htm_src/src/gmem.cpp	Thu Jan 23 15:07:54 2003
+++ pdfconv/src/gmem.cpp	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <aconf.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -urN pdf2htm_src/src/gmem.h pdfconv/src/gmem.h
--- pdf2htm_src/src/gmem.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/gmem.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GMEM_H
 #define GMEM_H
 
diff -urN pdf2htm_src/src/gmempp.cpp pdfconv/src/gmempp.cpp
--- pdf2htm_src/src/gmempp.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/gmempp.cpp	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include <aconf.h>
 #include "gmem.h"
 
diff -urN pdf2htm_src/src/gtypes.h pdfconv/src/gtypes.h
--- pdf2htm_src/src/gtypes.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/gtypes.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef GTYPES_H
 #define GTYPES_H
 
diff -urN pdf2htm_src/src/parseargs.cpp pdfconv/src/parseargs.cpp
--- pdf2htm_src/src/parseargs.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/parseargs.cpp	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include <stdio.h>
 #include <stddef.h>
diff -urN pdf2htm_src/src/parseargs.h pdfconv/src/parseargs.h
--- pdf2htm_src/src/parseargs.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/parseargs.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef PARSEARGS_H
 #define PARSEARGS_H
 
diff -urN pdf2htm_src/src/pdf_util.cpp pdfconv/src/pdf_util.cpp
--- pdf2htm_src/src/pdf_util.cpp	Mon Mar 15 14:05:00 2004
+++ pdfconv/src/pdf_util.cpp	Wed Jul  7 23:07:00 2004
@@ -1,30 +1,17 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "config.h"
 #include "pdfrlib.h"
 #include "BmpProc.h"
 
+typedef struct PDF_IMG_INFO
+{
+	TCHAR	File[ MAX_PATH ];
+	int		x;
+	int		y;
+	int		width;
+	int		height;
+} *LPPDF_IMG_INFO;
+typedef std::vector< PDF_IMG_INFO >		PDFFileList;
+
 extern BOOL m_bForceContinuePages;
 extern POINT m_pointLastPage;
 //首先统计字体的属性
@@ -281,9 +268,13 @@
 	}
 }
 
+
 void WriteToHtmlFile(LPSPAGE ptrPage,LPARY_HTMLINK m_pHtmLink,
-		     CString strHtmName, CString strImageName)
+		     CString strHtmName, /*CString strImageName, */PDFFileList* lpSubImg )
 {
+
+	char szFileName[ MAX_PATH ] = { 0 };
+
 	if(!m_bForceContinuePages)
 	{
 		m_aryFont.clear();
@@ -330,10 +321,14 @@
 		_splitpath(strHtmName, drive, dir, fname, ext );
 		_makepath(path_buffer,drive, dir,"index",".htm");
 		//写文件头
+		strcpy( szFileName, path_buffer );
 		m_pFile = fopen(path_buffer,"a");
 	}
 	else
+	{
+		strcpy( szFileName, strHtmName );
 		m_pFile = fopen(strHtmName,"w");
+	};
 	if(m_pFile == NULL)
 	{
 		CString errormsg;
@@ -384,7 +379,7 @@
 		fprintf(m_pFile,"%s",m_strFontAttrib);
 	}
 	COLORREF m_clBackground = AfxGetApp()->GetProfileInt("CHTMLPage","m_clBackground",RGB(255,255,255));
-	fprintf(m_pFile,"-->\n</style>\n</head>\n<body vlink=\"#FFFFFF\" link=\"#FFFFFF\" bgcolor=\"#%02x%02x%02x\">\n",
+	fprintf(m_pFile,"-->\n</style>\n</head>\n<body vlink=\"#0000FF\" link=\"#0000FF\" bgcolor=\"#%02x%02x%02x\">\n",
 		GetRValue(m_clBackground),GetGValue(m_clBackground),GetBValue(m_clBackground));
 	fputs("\n\
 <script language=\"JavaScript\">\n\
@@ -413,67 +408,74 @@
 	size.cx = ptrPage->m_Width;
 	size.cy = ptrPage->m_Height;
 
-	_splitpath( strImageName, drive, dir, fname, ext );
+/*	_splitpath( strImageName, drive, dir, fname, ext );
 	strImageName = fname;
-	strImageName += ext;
+	strImageName += ext;*/
    
 	CString m_strImage;
 	int nlinksize = 0;
 	if(m_pHtmLink && m_bForceContinuePages == FALSE)
 		nlinksize = m_pHtmLink->size();
 
-	if(nlinksize <= 0)
-		m_strImage.Format("<div style=\"position:absolute;top:%d;left:0\"><img width=\"%d\" height=\"%d\" src=\"%s\"></div>\n",
-			m_pointLastPage.y, size.cx,size.cy,strImageName);
-	else
+	for ( PDFFileList::iterator it = lpSubImg->begin(); it != lpSubImg->end(); ++it )
 	{
-		m_strImage.Format("<div style=\"position:absolute;top:%d;left:0\"><map name=\"FPMap0\">\n",
-			m_pointLastPage.y);
-		CString temp;
-		for(int i = 0; i < nlinksize; i++)
+		PDF_IMG_INFO* lpInfo = &( *it );
+		if ( nlinksize <= 0 || m_bForceContinuePages == FALSE )
+			m_strImage.Format("<div style=\"position:absolute;top:%d;left:%d\"><img width=\"%d\" height=\"%d\" src=\"%s\"></div>\n",
+				m_pointLastPage.y + lpInfo->y, lpInfo->x, lpInfo->width, lpInfo->height, lpInfo->File );
+		else
 		{
-			CRect rect;
-			SetRect(&rect,(*m_pHtmLink)[i].xMin,
-				m_pointLastPage.y+(*m_pHtmLink)[i].yMin,
-				(*m_pHtmLink)[i].xMax,
-				m_pointLastPage.y+(*m_pHtmLink)[i].yMax
-				);
-			CString m_strGotoPage;
-			m_strGotoPage = (*m_pHtmLink)[i].szDest.c_str();
-			if(m_strGotoPage.Left(strlen("actionGoTo:")) == "actionGoTo:")
+			m_strImage.Format("<div style=\"position:absolute;top:%d;left:%d\"><map name=\"FPMap0\">\n",
+				m_pointLastPage.y + lpInfo->y, lpInfo->x );
+			CString temp;
+			for(int i = 0; i < nlinksize; i++)
 			{
-				m_strGotoPage.Replace("actionGoTo:",NULL);
-				int m_iGotoPage = atoi(m_strGotoPage);
-
-				char drive[_MAX_DRIVE];
-				char dir[_MAX_DIR];
-				char fname[_MAX_PATH];
-				char ext[_MAX_EXT];
-				_splitpath(strHtmName, drive, dir, fname, ext );
-
-				CString m_strHtmlFile;
-				m_strHtmlFile.Format("pg_%04d%s",m_iGotoPage,ext);
-				m_strGotoPage = m_strHtmlFile;
-			}
-			else if(m_strGotoPage.Left(strlen("actionURI:")) == "actionURI:")
-			{
-				m_strGotoPage.Replace("actionURI:",NULL);
+				CRect rect;
+				SetRect(&rect,(*m_pHtmLink)[i].xMin,
+					m_pointLastPage.y+(*m_pHtmLink)[i].yMin,
+					(*m_pHtmLink)[i].xMax,
+					m_pointLastPage.y+(*m_pHtmLink)[i].yMax
+					);
+				CString m_strGotoPage;
+				m_strGotoPage = (*m_pHtmLink)[i].szDest.c_str();
+				if(m_strGotoPage.Left(strlen("actionGoTo:")) == "actionGoTo:")
+				{
+					m_strGotoPage.Replace("actionGoTo:",NULL);
+					int m_iGotoPage = atoi(m_strGotoPage);
+
+					char drive[_MAX_DRIVE];
+					char dir[_MAX_DIR];
+					char fname[_MAX_PATH];
+					char ext[_MAX_EXT];
+					_splitpath(strHtmName, drive, dir, fname, ext );
+
+					CString m_strHtmlFile;
+					m_strHtmlFile.Format("pg_%04d%s",m_iGotoPage,ext);
+					m_strGotoPage = m_strHtmlFile;
+				}
+				else if(m_strGotoPage.Left(strlen("actionURI:")) == "actionURI:")
+				{
+					m_strGotoPage.Replace("actionURI:",NULL);
+				}
+				temp.Format("<area href=\"%s\" shape=\"rect\" coords=\"%d,%d,%d,%d\">\n",
+					m_strGotoPage,rect.left,rect.top,rect.right,rect.bottom);
+				m_strImage += temp;
 			}
-			temp.Format("<area href=\"%s\" shape=\"rect\" coords=\"%d,%d,%d,%d\">\n",
-				m_strGotoPage,rect.left,rect.top,rect.right,rect.bottom);
+			m_strImage += "</map>\n";
+			temp.Format("<img width=\"%d\" height=\"%d\" src=\"%s\" usemap=\"#FPMap0\"></div>\n",
+				lpInfo->width, lpInfo->height, lpInfo->File );
 			m_strImage += temp;
 		}
-		m_strImage += "</map>\n";
-		temp.Format("<img width=\"%d\" height=\"%d\" src=\"%s\" usemap=\"#FPMap0\"></div>\n",
-			size.cx,size.cy,strImageName);
-		m_strImage += temp;
-	}
-	//BOOL m_bForceContinuePages = AfxGetApp()->GetProfileInt("GenerateInOneHTMLPage","Flag",0);
-	BOOL m_bRemovePics = AfxGetApp()->GetProfileInt("m_bRemovePics","Flag",0);
-	if(!m_bForceContinuePages)
-		fprintf(m_pFile,"%s",m_strImage);
-	else if(!m_bRemovePics)
-		fprintf(m_pFile,"%s",m_strImage);
+
+		//BOOL m_bForceContinuePages = AfxGetApp()->GetProfileInt("GenerateInOneHTMLPage","Flag",0);
+		BOOL m_bRemovePics = AfxGetApp()->GetProfileInt("m_bRemovePics","Flag",0);
+		if(!m_bForceContinuePages)
+			fprintf(m_pFile,"%s",m_strImage);
+		else if(!m_bRemovePics)
+			fprintf(m_pFile,"%s",m_strImage);
+
+	};
+
 	BOOL m_bAutoSpace = AfxGetApp()->GetProfileInt("PDF2HTM","CheckSpaces",1);
 
 	//<div style="position:absolute;top:23;left:55"><nobr><span class="ft0">使用单片机的容量滴定法水分测定仪的研制</span></nobr></div>
@@ -653,8 +655,11 @@
 	}
 	fprintf(m_pFile,"%s","</body>\n</html>");
 	fclose(m_pFile);
+
+//		
 	//ShellExecute(NULL,"open",strHtmName,NULL,NULL,SW_SHOWNORMAL);
-}
+};
+
 int NTSystemCommand(const char *command)
 {
 	char
@@ -706,6 +711,30 @@
 	CloseHandle(process_info.hThread);
 	return((int) child_status);
 }
+
+inline void SetBMPXY( BITMAP* lpBMP, BYTE* lpData, int nX, int nY, DWORD dwColor )
+{
+	assert( lpBMP->bmBitsPixel >= 8 );
+	int iBytes = lpBMP->bmBitsPixel / 8;
+	memcpy( lpData + ( nX + nY * lpBMP->bmWidth ) * iBytes, &dwColor, iBytes );
+};
+
+inline DWORD GetBMPXY( BITMAP* lpBMP, BYTE* lpData, int nX, int nY )
+{
+	assert( lpBMP->bmBitsPixel >= 8 );
+	int iBytes = lpBMP->bmBitsPixel / 8;
+	DWORD dwColor = 0;
+	memcpy( &dwColor, lpData + ( nX + nY * lpBMP->bmWidth ) * iBytes, iBytes );
+	return dwColor;
+};
+
+#define BREAK_SIZE			50
+#define WHITE_CLR			0x00FFFFFF
+
+#define MAX_USED_SIZE		512
+typedef char				USED_LINE[ MAX_USED_SIZE ];
+typedef USED_LINE			USED_MAP[ MAX_USED_SIZE ];
+
 INT WINAPI PDF_ConvertToHtmlFile(LPSPAGE ptrPage,
 				 LPARY_HTMLINK	m_pHtmLink,
 				 LPCTSTR pszHtmlFile)
@@ -715,21 +744,26 @@
 	SIZE size;
 	size.cx = ptrPage->m_Width;
 	size.cy = ptrPage->m_Height;
-
+	
 	HDC m_hDC = ::GetDC(NULL);
 	CDC *pDC = CDC::FromHandle(m_hDC);
 
-	char path_buffer[_MAX_PATH];
+//	char path_buffer[_MAX_PATH];
 	char drive[_MAX_DRIVE];
 	char dir[_MAX_DIR];
 	char fname[_MAX_PATH];
 	char ext[_MAX_EXT];
 	_splitpath(pszHtmlFile, drive, dir, fname, ext );
 
-	char m_strBmpName[_MAX_PATH];
+/*	char m_strBmpName[_MAX_PATH];
 	_makepath(m_strBmpName,drive, dir,fname,".bmp");
 	char m_strJpgName[_MAX_PATH];
-	_makepath(m_strJpgName,drive, dir,fname,".jpg");
+	_makepath(m_strJpgName,drive, dir,fname,".jpg");*/
+
+
+	PDFFileList		SubImages;
+	USED_MAP*		UseMap = (USED_MAP*) new USED_LINE[ MAX_USED_SIZE ];
+	memset( UseMap, 0x00, sizeof( *UseMap ) );
 
 	CBmpProc	m_bmpSrc1;
 	CBitmap		*pOldBmp;
@@ -751,10 +785,174 @@
 
 		compDC.SelectObject(pOldBmp);
 
-		m_bmpSrc1.Save(m_strBmpName,24);
+
+		int iTotalBmp = 0;
+
+		BITMAP bmp;
+		m_bmpSrc1.GetBitmap( &bmp );
+		BYTE* bmpsrc = (BYTE*) malloc( 0x00800000 );
+		int iSize = m_bmpSrc1.GetBitmapBits( 0x00800000, bmpsrc );
+
+		int ny;
+		int iy = 0;
+		int iyCount = 0;
+		int ixCount = 0;
+		for ( ny = 0; ny < bmp.bmHeight; ny += BREAK_SIZE, ++iy )
+		{
+		
+			int ix = 0;
+			int nx;
+			for ( nx = 0; nx < bmp.bmWidth; nx += BREAK_SIZE, ++ix )
+			{
+				bool bExclude = true;
+				for ( int y = 0; y < BREAK_SIZE; ++y )
+				{
+					for ( int x = 0; x < BREAK_SIZE; ++x )
+					{
+						if ( GetBMPXY( &bmp, bmpsrc, nx + x, ny + y ) != WHITE_CLR )
+						{
+							if ( iy >= iyCount )
+								iyCount = iy + 1;
+							if ( ix >= ixCount )
+								ixCount = ix + 1;
+							(*UseMap) [ iy ][ ix ] = 1;
+							bExclude = false;
+							break;
+						};
+					};
+					if ( !bExclude )
+						break;
+				};
+			};
+		};
+		for ( int i = 0; i < iyCount; ++i )
+		{
+			for ( int j = 0; j < ixCount; ++j )
+			{
+				if ( (*UseMap) [ i ][ j ] )
+				{
+					int itlx = j;
+					int itly = i;
+					int ilastx;
+					for ( ilastx = itlx; ilastx < ixCount; ++ilastx )
+						if ( !( (*UseMap)[ itly ][ ilastx ] ) )
+							break;
+					--ilastx;
+					int irbx;
+					int irby;
+					for ( irby = itly; irby < iyCount; ++irby )
+					{
+						bool bStopLine = false;
+						for ( irbx = itlx; irbx <= ilastx; ++irbx )
+							if ( !( (*UseMap)[ irby ][ irbx ] ) )
+							{
+								--irby;
+								bStopLine = true;
+								break;
+							};
+						if ( bStopLine )
+							break;
+					};
+
+				
+/*					TCHAR szBuf[ 1024 ] = { 0 };
+					_stprintf( szBuf, _T( "x1:%d  y1:%d  x2:%d  y2:%d"  ), itlx, itly, ilastx, irby );
+					MessageBox( 0, szBuf, 0, 0 );*/
+
+					{
+						char szSubBmp[ _MAX_PATH ];
+						char szFName2[ MAX_PATH ];
+						sprintf( szFName2, "%s%d", fname, ++iTotalBmp );
+						_makepath( szSubBmp, drive, dir, szFName2, ".bmp" );
+
+						int ny = ( irby - itly + 1 ) * BREAK_SIZE;
+						int nx = ( ilastx - itlx + 1 ) * BREAK_SIZE;
+
+						CBmpProc m_bmpSrc2;
+						m_bmpSrc2.CreateCompatible( nx, ny, pDC );
+
+						BITMAP bmpSub;
+						m_bmpSrc2.GetBitmap( &bmpSub );
+						BYTE* bmpsrcSub = (BYTE*) malloc( nx * ny * 4 );
+
+						int iSizeSub = m_bmpSrc2.GetBitmapBits( nx * ny * 4, bmpsrcSub );
+
+						for ( int y = 0; y < ny; ++y )
+							for ( int x = 0; x < nx; ++x )
+							{
+								SetBMPXY( &bmpSub, bmpsrcSub, x, y, GetBMPXY( &bmp, bmpsrc, itlx * BREAK_SIZE + x, itly * BREAK_SIZE + y ) );
+	//							SetBMPXY( &bmp, bmpsrc, nx + x, ny + y, 0x000000FF );
+							};
+
+						iSizeSub = m_bmpSrc2.SetBitmapBits( iSizeSub, bmpsrcSub );
+						assert( iSizeSub );
+
+						m_bmpSrc2.Save( szSubBmp, 24 );
+						ConvertFromBMPToJPEG( szSubBmp );
+
+						PDF_IMG_INFO info;
+						_tcscpy( info.File, szFName2 );
+						_tcscat( info.File, _T( ".jpg" ) );
+						info.x = itlx * BREAK_SIZE;
+						info.y = itly * BREAK_SIZE;
+						info.width = nx;
+						info.height = ny;
+						SubImages.push_back( info );
+
+						free( bmpsrcSub );
+
+					};
+					
+					for ( int ii = itly; ii <= irby; ++ii )
+						for ( int jj = itlx; jj <= ilastx; ++jj )
+							(*UseMap)[ ii ][ jj ] = 0;
+				};
+			};
+		};
+
+/*
+				if ( !bExclude )
+				{
+					char szSubBmp[ _MAX_PATH ];
+					char szFName2[ MAX_PATH ];
+					sprintf( szFName2, "%s%d", fname, ++iTotalBmp );
+					_makepath( szSubBmp, drive, dir, szFName2, ".bmp" );
+
+					int iSizeSub = m_bmpSrc2.GetBitmapBits( BREAK_SIZE * BREAK_SIZE * 32, bmpsrcSub );
+
+					for ( int y = 0; y < BREAK_SIZE; ++y )
+						for ( int x = 0; x < BREAK_SIZE; ++x )
+						{
+							SetBMPXY( &bmpSub, bmpsrcSub, x, y, GetBMPXY( &bmp, bmpsrc, nx + x, ny + y ) );
+//							SetBMPXY( &bmp, bmpsrc, nx + x, ny + y, 0x000000FF );
+						};
+
+					iSizeSub = m_bmpSrc2.SetBitmapBits( iSizeSub, bmpsrcSub );
+					assert( iSizeSub );
+
+					m_bmpSrc2.Save( szSubBmp, 24 );
+					ConvertFromBMPToJPEG( szSubBmp );
+
+					PDF_IMG_INFO info;
+					_tcscpy( info.File, szFName2 );
+					_tcscat( info.File, _T( ".jpg" ) );
+					info.x = nx;
+					info.y = ny;
+					info.width = BREAK_SIZE;
+					info.height = BREAK_SIZE;
+					SubImages.push_back( info );
+				};
+*/
+
+/*		iSize = m_bmpSrc1.SetBitmapBits( iSize, bmpsrc );
+		assert( iSize );*/
+		free( bmpsrc );
+
+//		m_bmpSrc1.Save(m_strBmpName,24);
 	}
 	ReleaseDC(NULL,m_hDC);
-
+	delete [] UseMap;
+/*
 	int m_iJPGQuality = AfxGetApp()->GetProfileInt("CRasterImage","m_iJPGQuality",75);
 	int m_bGrayscale = AfxGetApp()->GetProfileInt("CRasterImage","m_bGrayscale",0);
 	//转换成JPG文件
@@ -787,8 +985,9 @@
 	NTSystemCommand(m_strCommandLine);
 
 	DeleteFile(m_strBmpName);
+*/
 	//输出为Html格式
-	WriteToHtmlFile(ptrPage,m_pHtmLink,pszHtmlFile,m_strJpgName);
+	WriteToHtmlFile(ptrPage,m_pHtmLink,pszHtmlFile,/*m_strJpgName, */&SubImages );
 
 	if(m_bForceContinuePages)
 	{
diff -urN pdf2htm_src/src/pdfrlib.cpp pdfconv/src/pdfrlib.cpp
--- pdf2htm_src/src/pdfrlib.cpp	Mon Mar 15 13:24:42 2004
+++ pdfconv/src/pdfrlib.cpp	Fri Jun  4 04:47:16 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "pdfrlib.h"
 
@@ -470,7 +447,7 @@
 				char buf[1024];
 				memset(buf,0,1024);
 				int destCount = WideCharToMultiByte(CP_ACP,0,
-					(unsigned short *)m_Codes.szCode.begin(),
+					/*(unsigned short *)*/ (LPCWSTR)*m_Codes.szCode.begin(),
 					m_Codes.nCount,buf,1024,
 					NULL,NULL
 					);
diff -urN pdf2htm_src/src/pdfrlib.h pdfconv/src/pdfrlib.h
--- pdf2htm_src/src/pdfrlib.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/pdfrlib.h	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #ifndef __PDFCORE_H__
 #define __PDFCORE_H__
 
diff -urN pdf2htm_src/src/registerman.cpp pdfconv/src/registerman.cpp
--- pdf2htm_src/src/registerman.cpp	Sun Sep 21 22:24:44 2003
+++ pdfconv/src/registerman.cpp	Thu Jun  3 21:40:44 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "registry.h"
 BOOL CheckRegister(HKEY hKeyRoot, LPCTSTR sRegPath,LPCTSTR regkey)
diff -urN pdf2htm_src/src/registerman.h pdfconv/src/registerman.h
--- pdf2htm_src/src/registerman.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/registerman.h	Thu Jun  3 21:46:24 2004
@@ -1,25 +1,2 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 BOOL  CheckRegister(HKEY hKeyRoot, LPCTSTR sRegPath,LPCTSTR regkey);
 BOOL WriteP2HRegInfo(HKEY hKeyRoot, LPCTSTR sRegPath,LPCTSTR regkey, LPCTSTR keydata);
diff -urN pdf2htm_src/src/resource.h pdfconv/src/resource.h
--- pdf2htm_src/src/resource.h	Mon Mar 15 13:47:50 2004
+++ pdfconv/src/resource.h	Sun Jun 13 19:43:06 2004
@@ -41,7 +41,6 @@
 #define IDB_MENUCHK                     162
 #define IDD_DIALOG_REGISTER             163
 #define IMAGEVIEW_TOOLBARID             164
-#define IDB_BMP_MENU                    167
 #define IDD_REGP2H                      171
 #define IDD_DIALOG_PDF2HTM              173
 #define IDD_DIALOGCOMMAND               174
@@ -49,68 +48,61 @@
 #define IDD_DIALOG_PASSWORDS            183
 #define IDD_DIALOG_RASTERIMAGE          185
 #define IDD_DIALOG_HYPERLINKS           186
+#define IDB_BITMAP1                     187
 #define IDC_PROGRESS_PAGE               1000
 #define IDC_PROGRESS_FILES              1001
-#define IDC_ANIMATE1                    1002
-#define IDC_COMBO_PAGERANGE             1003
-#define IDC_EDIT1                       1004
-#define IDC_EDIT_FROM                   1004
-#define IDC_EDIT_SN                     1004
-#define IDC_EDIT_INFO                   1004
 #define IDC_EDIT_USAGE                  1004
-#define IDC_EDIT_SPACES                 1004
-#define IDC_EDIT_HTML_PAGE_TITLE        1004
 #define IDC_EDIT_USERPASS               1004
-#define IDC_EDIT2                       1005
-#define IDC_EDIT_TO                     1005
 #define IDC_EDIT_OWNERPASS              1005
-#define IDC_EDIT_HTML_KEYWORDS          1005
 #define IDC_SLIDER1                     1006
 #define IDC_SLIDER_OUTPUTZOOM           1006
+#define IDC_EDIT_FROM2                  1006
 #define IDC_SLIDER2                     1007
 #define IDC_SLIDER_JPEGZOOM             1007
 #define IDC_SLIDER_JPEGQUALITY          1007
+#define IDC_EDIT_TO2                    1007
+#define IDC_SLIDER_OUTPUTZOOM2          1008
+#define IDC_SLIDER_JPEGQUALITY2         1009
 #define IDC_CHECK_OPENIT                1011
 #define IDC_STATIC_FILENAME             1012
 #define IDC_STATIC_FILESIZE             1013
-#define IDC_STATIC_VERSION              1014
+#define IDC_PRVAUTO                     1014
 #define IDC_STATIC_VERSION2             1015
 #define IDC_STATIC_VERSION3             1016
-#define IDC_STATIC_TOTALFILES           1016
 #define IDC_STATIC_TOTALPAGES           1017
 #define IDC_STATIC_PAGEZOOM             1018
 #define IDC_STATIC_JPG                  1019
-#define IDC_EDIT_SERIALNO               1019
 #define IDC_STATIC_JPEGQUALITY          1019
 #define IDC_STATIC_HOMEPAGE             1020
 #define IDC_STATIC_MAILTO               1021
-#define IDC_EDIT_USERNAME               1021
 #define IDC_STATIC_PDFVER               1022
-#define IDC_EDIT_PRODUCTID              1022
 #define IDC_STATIC_HOMEPAGE2            1022
-#define IDC_EXPLORER_PDFIMAGE           1023
 #define IDPAUSE                         1024
-#define IDC_EDIT_INC                    1024
-#define IDC_EDIT_EMAIL                  1026
-#define IDC_BUTTON_BUYNOW               1029
 #define IDC_STATIC_ZOOM                 1030
 #define IDC_VERSION                     1031
-#define IDC_CHECK_MODE                  1032
 #define IDC_CHECK_ONEHTMLPAGE           1033
 #define IDC_SPIN_SPACE                  1035
-#define IDC_CHECK_REMOVEPICS            1036
 #define IDC_RADIO_PAGETITLE1            1037
 #define IDC_RADIO_PAGETITLE2            1038
-#define IDC_BUTTON_COLOR                1039
 #define IDC_STATIC_BACKGROUND           1040
-#define IDC_CHECK_GRAYSCALE             1042
-#define IDC_EDIT_HOMEPAGEURL            1043
-#define IDC_BUTTON_REGISTER             1044
-#define IDC_CHECK_HOMEURL               1044
-#define IDC_BUTTON_TRY                  1045
-#define IDC_CHECK_CHECKSPACE            1045
-#define IDC_CHECK_ENABLE_LINKS          1046
+#define IDC_USEPAGERANGE                1047
+#define IDC_SELECTGO                    1048
+#define IDC_PRVHOME                     1049
+#define IDC_PREVIEW                     1050
+#define IDC_PRVPREV                     1051
+#define IDC_PRVEND                      1052
+#define IDC_PRVNEXT                     1053
 #define IDC_STATIC_INFO1                1054
+#define IDC_PRVEXP                      1055
+#define IDC_PRVCUR                      1057
+#define IDC_PRVOF                       1058
+#define IDC_STATIC_STATUS               1059
+#define IDC_STATIC_FILE                 1060
+#define IDC_STATIC_SIZE                 1061
+#define IDC_STATIC_PAGES                1062
+#define IDC_STATIC_CURR                 1063
+#define IDC_STATIC_TOTAL                1064
+#define IDC_OPENED_FILES                1065
 #define IDM_FILE_OPEN                   32771
 #define IDM_FILE_EXIT                   32772
 #define IDM_FILE_PREFERENCES            32773
@@ -125,6 +117,10 @@
 #define IDM_HELP_PDF2HTM_ONWEB          32790
 #define IDM_TOOLS_PDF2HTM               32791
 #define IDM_TOOLS_PDF2BMP               32793
+#define ID_FILE_SAVEASHTML              32796
+#define ID_FILE_SAVEJPEGSEQUENCE        32797
+#define ID_FILE_SAVEBMPSEQUENCE         32798
+#define ID_HELP_CONTENTS                32799
 #define SC_SIZE                         0xF000
 #define SC_MOVE                         0xF010
 #define SC_MINIMIZE                     0xF020
@@ -146,9 +142,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        187
-#define _APS_NEXT_COMMAND_VALUE         32795
-#define _APS_NEXT_CONTROL_VALUE         1047
+#define _APS_NEXT_RESOURCE_VALUE        189
+#define _APS_NEXT_COMMAND_VALUE         32800
+#define _APS_NEXT_CONTROL_VALUE         1066
 #define _APS_NEXT_SYMED_VALUE           104
 #endif
 #endif
Binary files pdf2htm_src/src/win_pdf2htm.aps and pdfconv/src/win_pdf2htm.aps differ
diff -urN pdf2htm_src/src/win_pdf2htm.cpp pdfconv/src/win_pdf2htm.cpp
--- pdf2htm_src/src/win_pdf2htm.cpp	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/win_pdf2htm.cpp	Fri Jun  4 02:14:46 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "win_pdf2htm.h"
 #include "win_pdf2htmDlg.h"
diff -urN pdf2htm_src/src/win_pdf2htm.dsp pdfconv/src/win_pdf2htm.dsp
--- pdf2htm_src/src/win_pdf2htm.dsp	Mon May 17 16:26:44 2004
+++ pdfconv/src/win_pdf2htm.dsp	Thu Jun 10 01:47:02 2004
@@ -36,24 +36,24 @@
 # PROP BASE Output_Dir "Release"
 # PROP BASE Intermediate_Dir "Release"
 # PROP BASE Target_Dir ""
-# PROP Use_MFC 5
+# PROP Use_MFC 6
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "bin"
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I ".\\" /I ".\freetype\include" /I ".\T1Lib\lib\t1lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\\" /I ".\freetype\include" /I ".\T1Lib\lib\t1lib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x804 /d "NDEBUG"
-# ADD RSC /l 0x804 /d "NDEBUG"
+# ADD RSC /l 0x804 /d "NDEBUG" /d "_AFXDLL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /out:"bin/pdftools.exe"
+# ADD LINK32 ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /out:"bin/pdf2html.exe"
 # SUBTRACT LINK32 /force
 
 !ELSEIF  "$(CFG)" == "win_pdf2htm - Win32 Debug"
@@ -63,24 +63,24 @@
 # PROP BASE Output_Dir "Debug"
 # PROP BASE Intermediate_Dir "Debug"
 # PROP BASE Target_Dir ""
-# PROP Use_MFC 5
+# PROP Use_MFC 6
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "bin"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\freetype\include" /I ".\T1Lib\lib\t1lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\freetype\include" /I ".\T1Lib\lib\t1lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x804 /d "_DEBUG"
-# ADD RSC /l 0x804 /d "_DEBUG"
+# ADD RSC /l 0x804 /d "_DEBUG" /d "_AFXDLL"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /out:"bin/pdftools.exe" /pdbtype:sept
+# ADD LINK32 ws2_32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /out:"../../utils/pdf2htmlD.exe" /pdbtype:sept
 # SUBTRACT LINK32 /force
 
 !ENDIF 
@@ -671,6 +671,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\RES\bmp00002.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=.\RES\bookmark.js
 # End Source File
 # Begin Source File
@@ -870,6 +874,10 @@
 SOURCE=.\pdfrlib.h
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=.\win_pdf2htm.manifest
+# End Source File
 # End Target
 # End Project
 # Section win_pdf2htm : {D30C1661-CDAF-11D0-8A3E-00C04FC9E26E}
diff -urN pdf2htm_src/src/win_pdf2htm.h pdfconv/src/win_pdf2htm.h
--- pdf2htm_src/src/win_pdf2htm.h	Thu Jan 23 10:07:54 2003
+++ pdfconv/src/win_pdf2htm.h	Thu Jun  3 21:40:42 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #if !defined(AFX_WIN_PDF2HTM_H__77B815CE_623B_4730_98EB_6C15065F78EB__INCLUDED_)
 #define AFX_WIN_PDF2HTM_H__77B815CE_623B_4730_98EB_6C15065F78EB__INCLUDED_
 
diff -urN pdf2htm_src/src/win_pdf2htm.manifest pdfconv/src/win_pdf2htm.manifest
--- pdf2htm_src/src/win_pdf2htm.manifest	Wed Dec 31 18:00:00 1969
+++ pdfconv/src/win_pdf2htm.manifest	Fri Jun  4 04:29:32 2004
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
+<assembly 
+   xmlns="urn:schemas-microsoft-com:asm.v1" 
+   manifestVersion="1.0">
+ <assemblyIdentity 
+    processorArchitecture="x86" 
+    version="5.1.0.0"
+    type="win32"
+    name="win_pdf2htm.exe"/>
+ <description>PDF2HTML Convertor</description>
+ <dependency>
+  <dependentAssembly>
+    <assemblyIdentity
+         type="win32"
+         name="Microsoft.Windows.Common-Controls"
+         version="6.0.0.0"
+         publicKeyToken="6595b64144ccf1df"
+         language="*"
+         processorArchitecture="x86"/>
+  </dependentAssembly>
+ </dependency>
+</assembly>
\ No newline at end of file
Binary files pdf2htm_src/src/win_pdf2htm.ncb and pdfconv/src/win_pdf2htm.ncb differ
Binary files pdf2htm_src/src/win_pdf2htm.opt and pdfconv/src/win_pdf2htm.opt differ
diff -urN pdf2htm_src/src/win_pdf2htm.plg pdfconv/src/win_pdf2htm.plg
--- pdf2htm_src/src/win_pdf2htm.plg	Wed Dec 31 18:00:00 1969
+++ pdfconv/src/win_pdf2htm.plg	Thu Aug  5 00:23:40 2004
@@ -0,0 +1,360 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: win_pdf2htm - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating command line "rc.exe /l 0x804 /fo"Debug/win_pdf2htm.res" /d "_DEBUG" /d "_AFXDLL" "D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\win_pdf2htm.rc"" 
+Creating temporary file "F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP41.tmp" with contents
+[
+/nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\freetype\include" /I ".\T1Lib\lib\t1lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"Debug/" /Fp"Debug/win_pdf2htm.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Array.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\BROWSEFORFOLDER.CPP"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\BuiltinFont.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\BuiltinFontTables.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Catalog.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\CharCodeToUnicode.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\CMap.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\CommandUsage.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Decrypt.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\DialogRegP2H.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Dict.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Error.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\folder_dialog.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\FontEncodingTables.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\FontFile.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\FormWidget.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\FTFont.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Function.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\gfile.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Gfx.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GfxFont.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GfxState.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GHash.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GList.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GlobalParams.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\gmem.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\gmempp.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GradientProgressCtrl.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\GString.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Html2pdf.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\HTMLPage.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\HyperLink.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Hyperlinks.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\ImageOutputDev.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Label.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Lexer.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Link.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\MenuSpawn.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\MyReg.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\NameToCharCode.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Object.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\OptionsDlg.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Page.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\parseargs.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Parser.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\PDFDoc.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\PDFPassword.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\PropertySheetWithLogoDlg.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\RasterImage.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\registerman.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Registry.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\SBDESTINATION.CPP"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\SFont.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Shadow.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\ShellFileOp.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Stream.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\T1Font.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\TTFont.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\UnicodeMap.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\webbrowser2.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\win_pdf2htm.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\win_pdf2htmDlg.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\WriteDir.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\XRef.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\BmpProc.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\OutputDev.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\PBMOutputDev.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\TextOutputDev.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\XOutputDev.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\X11\X11_stubs.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\Rotate.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\pdf_util.cpp"
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\pdfrlib.cpp"
+]
+Creating command line "cl.exe @F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP41.tmp" 
+Creating temporary file "F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP42.tmp" with contents
+[
+/nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\\" /I ".\freetype\include" /I ".\T1Lib\lib\t1lib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_AFXDLL" /FR"Debug/" /Fp"Debug/win_pdf2htm.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"D:\Dev\outsource\PDF2HTML\pdf_final\Win\winGUI\PDFConv\StdAfx.cpp"
+]
+Creating command line "cl.exe @F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP42.tmp" 
+Creating temporary file "F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP43.tmp" with contents
+[
+ws2_32.lib winmm.lib /nologo /subsystem:windows /incremental:yes /pdb:"bin/pdf2htmlD.pdb" /debug /machine:I386 /out:"../../utils/pdf2htmlD.exe" /pdbtype:sept 
+.\Debug\Array.obj
+.\Debug\BROWSEFORFOLDER.OBJ
+.\Debug\BuiltinFont.obj
+.\Debug\BuiltinFontTables.obj
+.\Debug\Catalog.obj
+.\Debug\CharCodeToUnicode.obj
+.\Debug\CMap.obj
+.\Debug\CommandUsage.obj
+.\Debug\Decrypt.obj
+.\Debug\DialogRegP2H.obj
+.\Debug\Dict.obj
+.\Debug\Error.obj
+.\Debug\folder_dialog.obj
+.\Debug\FontEncodingTables.obj
+.\Debug\FontFile.obj
+.\Debug\FormWidget.obj
+.\Debug\FTFont.obj
+.\Debug\Function.obj
+.\Debug\gfile.obj
+.\Debug\Gfx.obj
+.\Debug\GfxFont.obj
+.\Debug\GfxState.obj
+.\Debug\GHash.obj
+.\Debug\GList.obj
+.\Debug\GlobalParams.obj
+.\Debug\gmem.obj
+.\Debug\gmempp.obj
+.\Debug\GradientProgressCtrl.obj
+.\Debug\GString.obj
+.\Debug\Html2pdf.obj
+.\Debug\HTMLPage.obj
+.\Debug\HyperLink.obj
+.\Debug\Hyperlinks.obj
+.\Debug\ImageOutputDev.obj
+.\Debug\Label.obj
+.\Debug\Lexer.obj
+.\Debug\Link.obj
+.\Debug\MenuSpawn.obj
+.\Debug\MyReg.obj
+.\Debug\NameToCharCode.obj
+.\Debug\Object.obj
+.\Debug\OptionsDlg.obj
+.\Debug\Page.obj
+.\Debug\parseargs.obj
+.\Debug\Parser.obj
+.\Debug\PDFDoc.obj
+.\Debug\PDFPassword.obj
+.\Debug\PropertySheetWithLogoDlg.obj
+.\Debug\RasterImage.obj
+.\Debug\registerman.obj
+.\Debug\Registry.obj
+.\Debug\SBDESTINATION.OBJ
+.\Debug\SFont.obj
+.\Debug\Shadow.obj
+.\Debug\ShellFileOp.obj
+.\Debug\StdAfx.obj
+.\Debug\Stream.obj
+.\Debug\T1Font.obj
+.\Debug\TTFont.obj
+.\Debug\UnicodeMap.obj
+.\Debug\webbrowser2.obj
+.\Debug\win_pdf2htm.obj
+.\Debug\win_pdf2htmDlg.obj
+.\Debug\WriteDir.obj
+.\Debug\XRef.obj
+.\Debug\BmpProc.obj
+.\Debug\OutputDev.obj
+.\Debug\PBMOutputDev.obj
+.\Debug\TextOutputDev.obj
+.\Debug\XOutputDev.obj
+.\Debug\X11_stubs.obj
+.\Debug\Rotate.obj
+.\Debug\pdf_util.obj
+.\Debug\pdfrlib.obj
+.\Debug\win_pdf2htm.res
+]
+Creating command line "link.exe @F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP43.tmp"
+<h3>Output Window</h3>
+Compiling resources...
+Compiling...
+StdAfx.cpp
+Compiling...
+Array.cpp
+BROWSEFORFOLDER.CPP
+BuiltinFont.cpp
+BuiltinFontTables.cpp
+Catalog.cpp
+CharCodeToUnicode.cpp
+CMap.cpp
+CommandUsage.cpp
+Decrypt.cpp
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(361) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(362) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(363) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(364) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(365) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(366) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(367) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(368) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(369) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(370) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(371) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(372) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(373) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(374) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(375) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\decrypt.cpp(376) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+DialogRegP2H.cpp
+Dict.cpp
+Error.cpp
+folder_dialog.cpp
+FontEncodingTables.cpp
+FontFile.cpp
+FormWidget.cpp
+FTFont.cpp
+Function.cpp
+gfile.cpp
+Gfx.cpp
+GfxFont.cpp
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\gfxfont.cpp(274) : warning C4244: '=' : conversion from 'double' to 'int', possible loss of data
+GfxState.cpp
+GHash.cpp
+GList.cpp
+GlobalParams.cpp
+gmem.cpp
+gmempp.cpp
+GradientProgressCtrl.cpp
+GString.cpp
+Html2pdf.cpp
+HTMLPage.cpp
+HyperLink.cpp
+Hyperlinks.cpp
+ImageOutputDev.cpp
+Label.cpp
+Lexer.cpp
+Link.cpp
+MenuSpawn.cpp
+MyReg.cpp
+NameToCharCode.cpp
+Object.cpp
+OptionsDlg.cpp
+Page.cpp
+parseargs.cpp
+Parser.cpp
+PDFDoc.cpp
+PDFPassword.cpp
+PropertySheetWithLogoDlg.cpp
+RasterImage.cpp
+registerman.cpp
+Registry.cpp
+SBDESTINATION.CPP
+SFont.cpp
+Shadow.cpp
+ShellFileOp.cpp
+Stream.cpp
+d:\dev\outsource\pdf2html\pdf_final\win\wingui\pdfconv\stream.cpp(543) : warning C4244: '=' : conversion from 'unsigned long' to 'unsigned char', possible loss of data
+T1Font.cpp
+TTFont.cpp
+UnicodeMap.cpp
+webbrowser2.cpp
+win_pdf2htm.cpp
+win_pdf2htmDlg.cpp
+WriteDir.cpp
+XRef.cpp
+BmpProc.cpp
+OutputDev.cpp
+PBMOutputDev.cpp
+TextOutputDev.cpp
+XOutputDev.cpp
+X11_stubs.cpp
+Rotate.cpp
+pdf_util.cpp
+pdfrlib.cpp
+Linking...
+   Creating library ../../utils/pdf2htmlD.lib and object ../../utils/pdf2htmlD.exp
+LINK : warning LNK4098: defaultlib "msvcrt.lib" conflicts with use of other libs; use /NODEFAULTLIB:library
+Creating temporary file "F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP47.tmp" with contents
+[
+/nologo /o"bin/win_pdf2htm.bsc" 
+.\Debug\StdAfx.sbr
+.\Debug\Array.sbr
+.\Debug\BROWSEFORFOLDER.SBR
+.\Debug\BuiltinFont.sbr
+.\Debug\BuiltinFontTables.sbr
+.\Debug\Catalog.sbr
+.\Debug\CharCodeToUnicode.sbr
+.\Debug\CMap.sbr
+.\Debug\CommandUsage.sbr
+.\Debug\Decrypt.sbr
+.\Debug\DialogRegP2H.sbr
+.\Debug\Dict.sbr
+.\Debug\Error.sbr
+.\Debug\folder_dialog.sbr
+.\Debug\FontEncodingTables.sbr
+.\Debug\FontFile.sbr
+.\Debug\FormWidget.sbr
+.\Debug\FTFont.sbr
+.\Debug\Function.sbr
+.\Debug\gfile.sbr
+.\Debug\Gfx.sbr
+.\Debug\GfxFont.sbr
+.\Debug\GfxState.sbr
+.\Debug\GHash.sbr
+.\Debug\GList.sbr
+.\Debug\GlobalParams.sbr
+.\Debug\gmem.sbr
+.\Debug\gmempp.sbr
+.\Debug\GradientProgressCtrl.sbr
+.\Debug\GString.sbr
+.\Debug\Html2pdf.sbr
+.\Debug\HTMLPage.sbr
+.\Debug\HyperLink.sbr
+.\Debug\Hyperlinks.sbr
+.\Debug\ImageOutputDev.sbr
+.\Debug\Label.sbr
+.\Debug\Lexer.sbr
+.\Debug\Link.sbr
+.\Debug\MenuSpawn.sbr
+.\Debug\MyReg.sbr
+.\Debug\NameToCharCode.sbr
+.\Debug\Object.sbr
+.\Debug\OptionsDlg.sbr
+.\Debug\Page.sbr
+.\Debug\parseargs.sbr
+.\Debug\Parser.sbr
+.\Debug\PDFDoc.sbr
+.\Debug\PDFPassword.sbr
+.\Debug\PropertySheetWithLogoDlg.sbr
+.\Debug\RasterImage.sbr
+.\Debug\registerman.sbr
+.\Debug\Registry.sbr
+.\Debug\SBDESTINATION.SBR
+.\Debug\SFont.sbr
+.\Debug\Shadow.sbr
+.\Debug\ShellFileOp.sbr
+.\Debug\Stream.sbr
+.\Debug\T1Font.sbr
+.\Debug\TTFont.sbr
+.\Debug\UnicodeMap.sbr
+.\Debug\webbrowser2.sbr
+.\Debug\win_pdf2htm.sbr
+.\Debug\win_pdf2htmDlg.sbr
+.\Debug\WriteDir.sbr
+.\Debug\XRef.sbr
+.\Debug\BmpProc.sbr
+.\Debug\OutputDev.sbr
+.\Debug\PBMOutputDev.sbr
+.\Debug\TextOutputDev.sbr
+.\Debug\XOutputDev.sbr
+.\Debug\X11_stubs.sbr
+.\Debug\Rotate.sbr
+.\Debug\pdf_util.sbr
+.\Debug\pdfrlib.sbr]
+Creating command line "bscmake.exe @F:\DOCUME~1\AlexBS\LOCALS~1\Temp\RSP47.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
+
+
+
+<h3>Results</h3>
+pdf2htmlD.exe - 0 error(s), 19 warning(s)
+</pre>
+</body>
+</html>
diff -urN pdf2htm_src/src/win_pdf2htm.rc pdfconv/src/win_pdf2htm.rc
--- pdf2htm_src/src/win_pdf2htm.rc	Mon Mar 15 13:52:40 2004
+++ pdfconv/src/win_pdf2htm.rc	Mon Jul 19 18:42:42 2004
@@ -67,35 +67,52 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDR_MAINFRAME           ICON    DISCARDABLE     "res\\win_pdf2htm.ico"
+#endif    // Chinese (P.R.C.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Russian resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+#ifdef _WIN32
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-IDB_MENUCHK             BITMAP  DISCARDABLE     "res\\bitmap1.bmp"
-IMAGEVIEW_TOOLBARID     BITMAP  DISCARDABLE     "res\\toolbar1.bmp"
-IDB_BMP_MENU            BITMAP  DISCARDABLE     "res\\bmp00001.bmp"
+IDB_BITMAP1             BITMAP  DISCARDABLE     "res\\bmp00002.bmp"
+#endif    // Russian resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Toolbar
+// RT_MANIFEST
 //
 
-IMAGEVIEW_TOOLBARID TOOLBAR DISCARDABLE  16, 15
-BEGIN
-    BUTTON      IDM_FILE_OPEN
-    BUTTON      IDM_FILE_PREFERENCES
-    BUTTON      IDM_HELP_ABOUT
-    BUTTON      IDM_FILE_EXIT
-    BUTTON      SC_RESTORE
-    BUTTON      SC_MINIMIZE
-    BUTTON      SC_MAXIMIZE
-    BUTTON      IDM_HELP_HELP
-    BUTTON      SC_CLOSE
-END
+1                       RT_MANIFEST MOVEABLE PURE "win_pdf2htm.manifest"
 
-#endif    // Chinese (P.R.C.) resources
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_MENUCHK             BITMAP  DISCARDABLE     "res\\bitmap1.bmp"
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -113,118 +130,90 @@
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 251, 190
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 280, 121
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "About..."
 FONT 8, "MS Sans Serif"
 BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,20,20,SS_SUNKEN
-    LTEXT           "PDF2HTML version 1.0",IDC_VERSION,40,10,133,8,
-                    SS_NOPREFIX
-    LTEXT           "Copyright (C) 2003 verypdf.com Inc",IDC_STATIC,40,25,
-                    147,8
-    LTEXT           "http://www.verypdf.com/pdf2htm/index.html",
-                    IDC_STATIC_HOMEPAGE,40,40,204,8
-    LTEXT           "E-mail: verypdf.com Inc",IDC_STATIC_MAILTO,40,55,138,8
-    PUSHBUTTON      "OK",IDOK,191,7,53,16
-    EDITTEXT        IDC_EDIT_INFO,21,70,208,103,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
-END
-
-IDD_WIN_PDF2HTM_DIALOG DIALOGEX 0, 0, 250, 183
-STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
+    LTEXT           "PdfConv 1.0\nDesktop Version 1.03",IDC_VERSION,140,8,
+                    124,20,SS_NOPREFIX
+    CTEXT           "Copyright (C) 2004 Bump Networks",IDC_STATIC,8,100,124,
+                    8
+    LTEXT           "http://www.mbloom.com",IDC_STATIC_HOMEPAGE,140,80,124,8
+    DEFPUSHBUTTON   "OK",IDOK,216,100,53,14
+    CONTROL         187,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,7,7,63,79
+    LTEXT           "Converts files from PDF to HTML format",IDC_STATIC,140,
+                    48,132,8
+    LTEXT           "Visit our site:",IDC_STATIC,140,68,124,8
+    LTEXT           "Trial version",IDC_STATIC,140,32,100,8
+END
+
+IDD_WIN_PDF2HTM_DIALOG DIALOGEX 0, 0, 476, 404
+STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
+    WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_APPWINDOW
 MENU IDR_MAINFRAME_MENU
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "Pause",IDPAUSE,188,89,52,16
-    PUSHBUTTON      "Close",IDCLOSE,188,107,52,16
-    LTEXT           "Compatibility: Acrobat 6.0 (PDF 1.5)",IDC_STATIC_PDFVER,
-                    7,10,178,10
-    GROUPBOX        "Info",IDC_STATIC,7,26,178,96
-    RTEXT           "PDF Name:",IDC_STATIC,18,39,43,8
-    RTEXT           "PDF Size:",IDC_STATIC,19,54,42,8
-    RTEXT           "Version:",IDC_STATIC,28,69,33,8
-    GROUPBOX        "Progress",IDC_STATIC,7,125,236,50
+    CONTROL         "Generate single HTML file",IDC_CHECK_ONEHTMLPAGE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,68,112,10
+    CONTROL         "Range only",IDC_USEPAGERANGE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,16,86,52,10
+    EDITTEXT        IDC_EDIT_FROM2,92,84,28,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_TO2,144,84,28,12,ES_AUTOHSCROLL
+    CONTROL         "Slider1",IDC_SLIDER_OUTPUTZOOM2,"msctls_trackbar32",
+                    TBS_AUTOTICKS | TBS_TOP | TBS_NOTICKS | WS_TABSTOP,60,
+                    105,88,12
+    CONTROL         "Slider1",IDC_SLIDER_JPEGQUALITY2,"msctls_trackbar32",
+                    TBS_AUTOTICKS | TBS_TOP | TBS_NOTICKS | WS_TABSTOP,60,
+                    121,88,12
+    EDITTEXT        IDC_EDIT_USERPASS,92,140,80,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_OWNERPASS,92,156,80,12,ES_AUTOHSCROLL
+    CONTROL         "View after conversion",IDC_CHECK_OPENIT,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,177,112,10
+    PUSHBUTTON      "<<",IDC_PRVHOME,16,212,20,12,0,WS_EX_STATICEDGE
+    PUSHBUTTON      "<",IDC_PRVPREV,36,212,20,12,0,WS_EX_STATICEDGE
+    EDITTEXT        IDC_PRVCUR,56,212,19,12,ES_AUTOHSCROLL | ES_NUMBER
+    DEFPUSHBUTTON   "Show",IDC_PREVIEW,76,212,24,12
+    PUSHBUTTON      ">",IDC_PRVNEXT,134,212,20,12,0,WS_EX_STATICEDGE
+    PUSHBUTTON      ">>",IDC_PRVEND,154,212,20,12,0,WS_EX_STATICEDGE
+    CONTROL         "Preview after open",IDC_PRVAUTO,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,16,239,80,10
+    EDITTEXT        IDC_STATIC_FILENAME,48,281,124,12,ES_AUTOHSCROLL | 
+                    ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP
+    PUSHBUTTON      "Pause",IDPAUSE,116,364,56,14
+    PUSHBUTTON      "Convert",IDC_SELECTGO,16,364,28,14,NOT WS_VISIBLE
+    PUSHBUTTON      "Close",IDCLOSE,52,364,28,14,NOT WS_VISIBLE
+    RTEXT           "File",IDC_STATIC_FILE,16,281,24,8
+    RTEXT           "Size",IDC_STATIC_SIZE,20,297,19,8
+    GROUPBOX        " Status ",IDC_STATIC_STATUS,8,265,172,120
     CONTROL         "Progress1",IDC_PROGRESS_PAGE,"msctls_progress32",
-                    PBS_SMOOTH,54,138,166,13
+                    PBS_SMOOTH,48,327,124,12
     CONTROL         "Progress1",IDC_PROGRESS_FILES,"msctls_progress32",
-                    PBS_SMOOTH,54,157,166,13
-    RTEXT           "Current:",IDC_STATIC,14,141,33,8
-    RTEXT           "Total:",IDC_STATIC,14,158,33,8
-    RTEXT           "Total Pages:",IDC_STATIC,12,84,49,8
-    RTEXT           "Total Files:",IDC_STATIC,12,99,49,8
-    LTEXT           "",IDC_STATIC_TOTALFILES,68,97,111,12,SS_SUNKEN
-    LTEXT           "",IDC_STATIC_TOTALPAGES,68,82,111,12,SS_SUNKEN
-    LTEXT           "",IDC_STATIC_VERSION,68,67,111,12,SS_SUNKEN
-    LTEXT           "",IDC_STATIC_FILESIZE,68,52,111,12,SS_SUNKEN
-    EDITTEXT        IDC_STATIC_FILENAME,68,37,111,12,ES_AUTOHSCROLL | 
-                    ES_READONLY | NOT WS_BORDER,WS_EX_STATICEDGE
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,1,249,1
-    CONTROL         "",IDC_EXPLORER_PDFIMAGE,
-                    "{8856F961-340A-11D0-A96B-00C04FD705A2}",WS_TABSTOP,186,
-                    6,56,80
-END
-
-IDD_DIALOG_PREFERENCE DIALOG DISCARDABLE  0, 0, 220, 177
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "General"
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_COMBO_PAGERANGE,12,23,92,63,CBS_DROPDOWNLIST | 
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_EDIT_FROM,144,16,42,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_TO,144,29,42,12,ES_AUTOHSCROLL
-    CONTROL         "Slider1",IDC_SLIDER_OUTPUTZOOM,"msctls_trackbar32",
-                    TBS_AUTOTICKS | TBS_TOP | TBS_NOTICKS | WS_TABSTOP,15,73,
-                    188,18
-    CONTROL         "Generate in one continuous html page",
-                    IDC_CHECK_ONEHTMLPAGE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,15,113,172,10
-    CONTROL         "Remove all pictures",IDC_CHECK_REMOVEPICS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,29,129,103,10
-    CONTROL         "View after convert",IDC_CHECK_OPENIT,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,154,156,10
-    GROUPBOX        "Page Range",IDC_STATIC,8,7,203,39
-    RTEXT           "From:",IDC_STATIC,118,16,20,8
-    RTEXT           "To:",IDC_STATIC,127,29,11,8
-    GROUPBOX        "Output Options",IDC_STATIC,8,49,203,49
-    LTEXT           "Output Page Zoom:",IDC_STATIC_ZOOM,19,62,69,8
-    LTEXT           "100%",IDC_STATIC_PAGEZOOM,113,62,23,8
-    GROUPBOX        "",IDC_STATIC,8,104,203,42
-END
-
-IDD_DIALOG_REGISTER DIALOGEX 0, 0, 228, 108
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Please register PDF2HTML"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    EDITTEXT        IDC_EDIT_EMAIL,75,41,131,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_SERIALNO,75,58,131,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,49,82,38,16
-    PUSHBUTTON      "Buy now",IDC_BUTTON_BUYNOW,95,82,38,16
-    PUSHBUTTON      "Try",IDC_BUTTON_TRY,141,82,38,16
-    RTEXT           "Series:",IDC_STATIC,22,59,45,8,SS_CENTERIMAGE
-    RTEXT           "E-Mail:",IDC_STATIC,22,42,45,8,SS_CENTERIMAGE
-    ICON            IDR_MAINFRAME,IDC_STATIC,7,6,21,20,SS_REALSIZEIMAGE | 
-                    WS_BORDER
-    EDITTEXT        IDC_STATIC_INFO1,37,6,184,22,ES_MULTILINE | 
-                    ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | 
-                    ES_WANTRETURN | NOT WS_BORDER,WS_EX_STATICEDGE
-END
-
-IDD_DIALOG_PDF2HTM DIALOG DISCARDABLE  0, 0, 220, 143
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Character position"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_EDIT_SPACES,27,29,48,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Space between characters (UNIT: pixel)",IDC_STATIC,11,
-                    13,190,8
-    CONTROL         "Spin1",IDC_SPIN_SPACE,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ALIGNRIGHT | UDS_ARROWKEYS,65,29,11,15
-    CONTROL         "Auto process the spaces",IDC_CHECK_CHECKSPACE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,68,190,8
+                    PBS_SMOOTH,48,343,124,12
+    RTEXT           "Current",IDC_STATIC_CURR,12,329,29,8
+    RTEXT           "Total",IDC_STATIC_TOTAL,16,345,24,8
+    RTEXT           "Pages",IDC_STATIC_PAGES,20,313,21,8
+    LTEXT           "",IDC_STATIC_TOTALPAGES,48,313,40,10
+    LTEXT           "",IDC_STATIC_FILESIZE,48,297,40,10
+    LTEXT           "User password",IDC_STATIC,16,142,68,8
+    LTEXT           "Owner password",IDC_STATIC,16,158,68,8
+    RTEXT           "From",IDC_STATIC,68,86,20,8
+    RTEXT           "To",IDC_STATIC,128,86,11,8
+    RTEXT           "Zoom",IDC_STATIC_ZOOM,16,106,40,8
+    LTEXT           "100%",IDC_STATIC_PAGEZOOM,152,106,20,8
+    RTEXT           "JPEG Quality",IDC_STATIC,12,122,44,8
+    LTEXT           "100%",IDC_STATIC_JPEGQUALITY,152,122,20,8
+    GROUPBOX        " Options ",IDC_STATIC,8,52,172,140
+    CONTROL         "",IDC_PRVEXP,"{8856F961-340A-11D0-A96B-00C04FD705A2}",
+                    WS_TABSTOP,184,12,288,328
+    GROUPBOX        " Preview ",IDC_STATIC,8,196,172,64
+    EDITTEXT        IDC_PRVOF,114,212,19,12,ES_AUTOHSCROLL | ES_READONLY | 
+                    ES_NUMBER
+    LTEXT           "of",IDC_STATIC,104,214,8,8
+    GROUPBOX        " Files ",IDC_STATIC,8,8,172,40
+    LTEXT           "Not opened yet",IDC_OPENED_FILES,16,20,160,24,
+                    SS_NOPREFIX
 END
 
 IDD_DIALOGCOMMAND DIALOGEX 0, 0, 311, 207
@@ -238,66 +227,6 @@
                     ES_READONLY | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
 END
 
-IDD_DIALOG_HTMLPAGE DIALOG DISCARDABLE  0, 0, 220, 196
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "HTML Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_EDIT_HTML_PAGE_TITLE,26,50,168,12,ES_AUTOHSCROLL
-    CONTROL         "Insert your Homepage url into the ""page index"" page",
-                    IDC_CHECK_HOMEURL,"Button",BS_AUTOCHECKBOX | 
-                    BS_MULTILINE | WS_TABSTOP,14,80,177,17
-    EDITTEXT        IDC_EDIT_HOMEPAGEURL,26,101,168,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_HTML_KEYWORDS,26,141,168,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "Set HTML Background",IDC_BUTTON_COLOR,72,163,96,21
-    CONTROL         "Use the filename as html page title",
-                    IDC_RADIO_PAGETITLE1,"Button",BS_AUTORADIOBUTTON,14,21,
-                    177,10
-    CONTROL         "Use this page title",IDC_RADIO_PAGETITLE2,"Button",
-                    BS_AUTORADIOBUTTON,14,35,177,10
-    GROUPBOX        "",IDC_STATIC,7,8,205,60
-    CONTROL         "",IDC_STATIC_BACKGROUND,"Static",SS_ETCHEDFRAME,26,163,
-                    37,21
-    LTEXT           "Set HTML Page Keywords:",IDC_STATIC,14,126,177,8
-    GROUPBOX        "",IDC_STATIC,7,70,205,49
-END
-
-IDD_DIALOG_PASSWORDS DIALOG DISCARDABLE  0, 0, 220, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "PDF Passwords"
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "User Password:",IDC_STATIC,16,19,175,8
-    EDITTEXT        IDC_EDIT_USERPASS,16,32,190,12,ES_AUTOHSCROLL
-    LTEXT           "Owner Password:",IDC_STATIC,16,49,190,8
-    EDITTEXT        IDC_EDIT_OWNERPASS,16,62,190,12,ES_AUTOHSCROLL
-    GROUPBOX        "",IDC_STATIC,7,8,205,83
-END
-
-IDD_DIALOG_RASTERIMAGE DIALOG DISCARDABLE  0, 0, 227, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Raster Image"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Slider1",IDC_SLIDER_JPEGQUALITY,"msctls_trackbar32",
-                    TBS_AUTOTICKS | TBS_TOP | TBS_NOTICKS | WS_TABSTOP,17,35,
-                    188,18
-    LTEXT           "Output JPEG Quality:",IDC_STATIC,21,22,81,8
-    LTEXT           "100%",IDC_STATIC_JPEGQUALITY,115,22,23,8
-    GROUPBOX        "JPEG Options",IDC_STATIC,7,7,203,82
-    CONTROL         "Grayscale",IDC_CHECK_GRAYSCALE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,21,63,143,16
-END
-
-IDD_DIALOG_HYPERLINKS DIALOG DISCARDABLE  0, 0, 187, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Hyperlinks"
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Enable hyperlinks",IDC_CHECK_ENABLE_LINKS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,23,30,103,13
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -310,40 +239,15 @@
     IDD_ABOUTBOX, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 244
+        RIGHTMARGIN, 273
         TOPMARGIN, 7
-        BOTTOMMARGIN, 183
+        BOTTOMMARGIN, 114
     END
 
     IDD_WIN_PDF2HTM_DIALOG, DIALOG
     BEGIN
-        LEFTMARGIN, 7
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 176
-    END
-
-    IDD_DIALOG_PREFERENCE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 211
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 170
-    END
-
-    IDD_DIALOG_REGISTER, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 221
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 101
-    END
-
-    IDD_DIALOG_PDF2HTM, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 214
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 136
+        RIGHTMARGIN, 352
+        BOTTOMMARGIN, 397
     END
 
     IDD_DIALOGCOMMAND, DIALOG
@@ -353,40 +257,29 @@
         TOPMARGIN, 7
         BOTTOMMARGIN, 200
     END
+END
+#endif    // APSTUDIO_INVOKED
 
-    IDD_DIALOG_HTMLPAGE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 212
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 189
-    END
 
-    IDD_DIALOG_PASSWORDS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 212
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 145
-    END
-
-    IDD_DIALOG_RASTERIMAGE, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 220
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 193
-    END
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
 
-    IDD_DIALOG_HYPERLINKS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 180
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 87
-    END
+IDD_WIN_PDF2HTM_DIALOG DLGINIT
+BEGIN
+    IDC_PRVEXP, 0x376, 160, 0
+0x0000, 0x0000, 0x004c, 0x0000, 0x2ca6, 0x0000, 0x3716, 0x0000, 0x0000, 
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+0x0000, 0x0000, 0x004c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 
+0x0000, 0xd0e0, 0x0057, 0x3573, 0x11cf, 0x69ae, 0x0008, 0x2e2b, 0x6212, 
+0x0008, 0x0000, 0x0000, 0x0000, 0x004c, 0x0000, 0x1401, 0x0002, 0x0000, 
+0x0000, 0x00c0, 0x0000, 0x0000, 0x4600, 0x0080, 0x0000, 0x0000, 0x0000, 
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 
+0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+    0
 END
-#endif    // APSTUDIO_INVOKED
 
 
 #ifndef _MAC
@@ -410,17 +303,20 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904B0"
+        BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "win_pdf2htm MFC Application\0"
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Bump Networks\0"
+            VALUE "FileDescription", "PDFConv\0"
             VALUE "FileVersion", "1, 0, 0, 1\0"
             VALUE "InternalName", "win_pdf2htm\0"
-            VALUE "LegalCopyright", "Copyright (C) 2002\0"
+            VALUE "LegalCopyright", "Copyright (C) Bump Networks 2004\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "win_pdf2htm.EXE\0"
-            VALUE "ProductName", "win_pdf2htm Application\0"
+            VALUE "OriginalFilename", "PDFConv.exe\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "PDFConverter\0"
             VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "SpecialBuild", "\0"
         END
     END
     BLOCK "VarFileInfo"
@@ -441,73 +337,37 @@
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&Open...\tCtrl+F",            IDM_FILE_OPEN
+        MENUITEM "&Open PDF\tCtrl+O",           IDM_FILE_OPEN
         MENUITEM SEPARATOR
-        MENUITEM "&Preferences...\tCtrl+D",     IDM_FILE_PREFERENCES
+        MENUITEM "Save as HTML",                ID_FILE_SAVEASHTML
+        MENUITEM "Save JPEG sequence",          ID_FILE_SAVEJPEGSEQUENCE
+        MENUITEM "Save BMP sequence",           ID_FILE_SAVEBMPSEQUENCE
         MENUITEM SEPARATOR
-        MENUITEM "On The &Top\tCtrl+T",         IDM_FILE_TOP
-        MENUITEM SEPARATOR
-        MENUITEM "&Exit\tCtrl+Q",               IDM_FILE_EXIT
+        MENUITEM "&Exit",                       IDM_FILE_EXIT
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help...\tF1",                IDM_HELP_HELP
-        MENUITEM SEPARATOR
-        MENUITEM "Buy now ...",                 IDM_HELP_BUYNOW
-        MENUITEM "&Technical support ...",      IDM_HELP_SUPPORT
-        MENUITEM "&PDF2HTML on the web ...",    IDM_HELP_PDF2HTM_ONWEB
+        MENUITEM "Contents",                    ID_HELP_CONTENTS
         MENUITEM SEPARATOR
-        MENUITEM "&Register PDF2HTML ...",      IDM_HELP_REGISTER
-        MENUITEM SEPARATOR
-        MENUITEM "&About PDF2HTML...",          IDM_HELP_ABOUT
+        MENUITEM "&About...",                   IDM_HELP_ABOUT
     END
 END
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
-// Dialog Info
-//
-
-IDD_DIALOG_PREFERENCE DLGINIT
-BEGIN
-    IDC_COMBO_PAGERANGE, 0x403, 4, 0
-0x6c41, 0x006c, 
-    IDC_COMBO_PAGERANGE, 0x403, 15, 0
-0x6553, 0x656c, 0x7463, 0x6465, 0x5020, 0x6761, 0x7365, "\000" 
-    0
-END
-
-IDD_WIN_PDF2HTM_DIALOG DLGINIT
-BEGIN
-    IDC_EXPLORER_PDFIMAGE, 0x376, 160, 0
-0x0000, 0x0000, 0x004c, 0x0000, 0x08af, 0x0000, 0x0b5e, 0x0000, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-0x0000, 0x0000, 0x004c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 
-0x0000, 0xd0e0, 0x0057, 0x3573, 0x11cf, 0x69ae, 0x0008, 0x2e2b, 0x6212, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x004c, 0x0000, 0x1401, 0x0002, 0x0000, 
-0x0000, 0x00c0, 0x0000, 0x0000, 0x4600, 0x0080, 0x0000, 0x0000, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 
-0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // String Table
 //
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_ABOUTBOX            "&About PDF2HTML..."
+    IDS_ABOUTBOX            "&About PDFConv..."
     IDS_BROWDIRTITLE_E      "Please select directory to save html files:"
 END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    AFX_IDS_APP_TITLE       "PDF2HTML v1.6"
+    AFX_IDS_APP_TITLE       "PDFConv v1.0"
 END
 
 #endif    // English (U.S.) resources
diff -urN pdf2htm_src/src/win_pdf2htmDlg.cpp pdfconv/src/win_pdf2htmDlg.cpp
--- pdf2htm_src/src/win_pdf2htmDlg.cpp	Mon Mar 15 13:55:16 2004
+++ pdfconv/src/win_pdf2htmDlg.cpp	Thu Aug  5 00:22:18 2004
@@ -1,26 +1,3 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
-
 #include "stdafx.h"
 #include "Registry.h"
 #include "registerman.h"
@@ -49,6 +26,7 @@
 #include "PDFPassword.h"
 #include "RasterImage.h"
 #include "Hyperlinks.h"
+#include "BmpProc.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -98,6 +76,15 @@
 int  m_iJpegQuality = 75;
 BOOL m_bGrayscale = FALSE;
 
+
+HWND h_DlgHandle = 0;
+char m_PrevName[ MAX_PATH ] = { 0 };
+char m_OpenedFiles[ 4096 ] = { 0 };
+char m_FirstFile[ MAX_PATH ] = { 0 };
+bool m_IsMulti = false;
+int	 m_MaxPage = 0;
+bool m_ToJPEG = false;
+
 static char PDFFileName[260] = "";
 static char HTMFileName[260] = "";
 static ArgDesc argDesc[] = {
@@ -149,6 +136,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CAboutDlg dialog used for App About
 
+void UpdateUI( HWND hDlg );
 
 class CAboutDlg : public CDialog
 {
@@ -158,9 +146,7 @@
 // Dialog Data
 	//{{AFX_DATA(CAboutDlg)
 	enum { IDD = IDD_ABOUTBOX };
-	CHyperLink	m_HyperEmailLink;
 	CHyperLink	m_HyperHomePageLink;
-	CString	m_szRegisterInfo;
 	//}}AFX_DATA
 
 	// ClassWizard generated virtual function overrides
@@ -180,7 +166,6 @@
 CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
 {
 	//{{AFX_DATA_INIT(CAboutDlg)
-	m_szRegisterInfo = _T("");
 	//}}AFX_DATA_INIT
 }
 
@@ -188,9 +173,7 @@
 {
 	CDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CAboutDlg)
-	DDX_Control(pDX, IDC_STATIC_MAILTO, m_HyperEmailLink);
 	DDX_Control(pDX, IDC_STATIC_HOMEPAGE, m_HyperHomePageLink);
-	DDX_Text(pDX, IDC_EDIT_INFO, m_szRegisterInfo);
 	//}}AFX_DATA_MAP
 }
 
@@ -215,10 +198,9 @@
 {
 	CDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CWin_pdf2htmDlg)
-	DDX_Control(pDX, IDC_STATIC_PDFVER, m_ctrlPDFVer);
 	DDX_Control(pDX, IDC_PROGRESS_PAGE, m_wndPageProgress);
 	DDX_Control(pDX, IDC_PROGRESS_FILES, m_wndFileProgress);
-	DDX_Control(pDX, IDC_EXPLORER_PDFIMAGE, m_ctrlPDFImage);
+	DDX_Control(pDX, IDC_PRVEXP, m_wndBrowser);
 	//}}AFX_DATA_MAP
 }
 
@@ -226,13 +208,17 @@
 	//{{AFX_MSG_MAP(CWin_pdf2htmDlg)
 	ON_WM_SYSCOMMAND()
 	ON_WM_PAINT()
+	ON_WM_SIZE()
 	ON_WM_QUERYDRAGICON()
 	ON_COMMAND(IDM_FILE_PREFERENCES, OnFilePreferences)
-	ON_COMMAND(IDM_FILE_OPEN, OnFileOpen)
+	ON_COMMAND(IDM_FILE_OPEN, OnOpenPDF)
+	ON_COMMAND(ID_FILE_SAVEASHTML, OnSaveHTML)
+	ON_COMMAND(ID_FILE_SAVEJPEGSEQUENCE, OnSaveJPEG)
+	ON_COMMAND(ID_FILE_SAVEBMPSEQUENCE, OnSaveBMP)
 	ON_UPDATE_COMMAND_UI(IDM_FILE_OPEN, OnUpdateFileOpen)
 	ON_COMMAND(IDM_HELP_ABOUT, OnHelpAbout)
 	ON_COMMAND(IDM_FILE_EXIT, OnFileExit)
-	ON_COMMAND(IDM_HELP_SUPPORT, OnHelpSupport)
+	ON_COMMAND(IDM_HELP_SUPPORT, OnEndPreview)
 	ON_WM_DROPFILES()
 	ON_COMMAND(IDM_FILE_TOP, OnFileTop)
 	ON_UPDATE_COMMAND_UI(IDM_FILE_TOP, OnUpdateFileTop)
@@ -243,6 +229,12 @@
 	ON_COMMAND(IDM_HELP_HELP, OnHelpHelp)
 	ON_BN_CLICKED(IDPAUSE, OnPause)
 	ON_BN_CLICKED(IDCLOSE, OnClose)
+	ON_BN_CLICKED(IDC_SELECTGO, OnOpenPDF)
+	ON_BN_CLICKED(IDC_PREVIEW, OnPreview)
+	ON_BN_CLICKED(IDC_PRVHOME, OnPreviewHome)
+	ON_BN_CLICKED(IDC_PRVPREV, OnPreviewPrev)
+	ON_BN_CLICKED(IDC_PRVNEXT, OnPreviewNext)
+	ON_BN_CLICKED(IDC_PRVEND, OnPreviewEnd)
 	ON_COMMAND(IDM_HELP_REGISTER, OnHelpRegister)
 	ON_COMMAND(IDM_HELP_PRODUCTLIST, OnHelpProductlist)
 	ON_COMMAND(IDM_HELP_BUYNOW, OnHelpBuynow)
@@ -250,6 +242,7 @@
 	ON_COMMAND(IDM_TOOLS_PDF2HTM, OnToolsPdf2htm)
 	ON_COMMAND(IDM_TOOLS_PDF2BMP, OnToolsPdf2bmp)
 	ON_WM_TIMER()
+	ON_WM_HSCROLL()
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -267,6 +260,7 @@
 	{
 		while(g_bStrActive && m_pMainDlg->m_aryPDF2HTMFile.GetSize() > 0)
 		{
+			m_pMainDlg->ShowStat( true );
 			BOOL m_bConversionOK = TRUE;
 			//设置close按钮的标题为stop
 			m_pMainDlg->GetDlgItem(IDCLOSE)->SetWindowText("Stop");
@@ -279,7 +273,7 @@
 			//如果文件已经存在
 			if (FindHtm.FindFile((LPCTSTR)m_coreConvert.szHTMName))
 			{
-				if(m_bOverwriteWithoutPrompt)
+				if( true || m_bOverwriteWithoutPrompt)
 					ReturnMsg = IDYES;
 				else
 					ReturnMsg = AfxMessageBox(m_coreConvert.szHTMName+" existed,override? Select Cancel to skip the file.",MB_YESNOCANCEL);
@@ -287,7 +281,7 @@
 				{
 					char sFilter[100];
 					char szTitle[20];
-					switch(m_convertType)
+					switch( m_convertType )
 					{
 					case PDF2HTM:strcpy(szTitle,"htm");strcpy(sFilter,"HTM Files (*.HTM)|*.HTM|All Files (*.*)|*.*||");break;
 					case PDF2BMP:strcpy(szTitle,"bmp");strcpy(sFilter,"BMP Files (*.BMP)|*.BMP|All Files (*.*)|*.*||");break;
@@ -320,7 +314,6 @@
 			{
 				m_bConversionOK = m_pMainDlg->ConvertPDF2HTML(m_coreConvert.szPDFName,m_coreConvert.szHTMName);
 			}
-			
 			//删掉，使用信号量标志
 			if(IsRegistered)
 			{
@@ -331,15 +324,20 @@
 				//转完以后显示提示信息
 				if(m_pMainDlg->m_aryPDF2HTMFile.GetSize() == 0)
 				{
+					m_pMainDlg->ShowStat( false );
 					if(m_bAutoExit)
 						ExitProcess(0);
 					else
-						m_pMainDlg->MessageBox("Convert Finished!","PDF2HTM software",MB_OK|MB_ICONEXCLAMATION|MB_APPLMODAL|MB_TOPMOST|MB_SYSTEMMODAL);
+					{
+						if ( strlen( m_PrevName ) )
+							::SendNotifyMessage( h_DlgHandle, WM_COMMAND, IDM_HELP_SUPPORT, 0 );
+						else
+							m_pMainDlg->MessageBox("Conversion completed!", "Converter", MB_ICONINFORMATION );
+					};
 				}
 			}
 			else
 			{//未注册版本,立刻将剩余文件全部清空
-				AfxMessageBox("Convert finished! Your softerware is not registered, you can only process one file and five pages in one time! The registered version hasn't these limitations.");
 			
 				EnterCriticalSection(&m_pMainDlg->nCriticalSection);
 				m_pMainDlg->m_aryPDF2HTMFile.RemoveAll();
@@ -349,7 +347,7 @@
 			if(m_pMainDlg->m_aryPDF2HTMFile.GetSize() == 0)
 			{
 				int m_bPreview = AfxGetApp()->GetProfileInt("Preview","Flag",0);
-				if(m_bPreview && m_bConversionOK)
+				if( m_bPreview && m_bConversionOK )
 				{
 					MyGotoURL(m_strHtmlFile,SW_SHOWNORMAL);
 				}
@@ -364,9 +362,9 @@
 			m_pMainDlg->m_wndFileProgress.SetPos(0);
 			m_pMainDlg->GetDlgItem(IDC_STATIC_FILENAME)->SetWindowText("");
 			m_pMainDlg->GetDlgItem(IDC_STATIC_TOTALPAGES)->SetWindowText("");
-			m_pMainDlg->GetDlgItem(IDC_STATIC_TOTALFILES)->SetWindowText("");
+//			m_pMainDlg->GetDlgItem(IDC_STATIC_TOTALFILES)->SetWindowText("");
 			m_pMainDlg->GetDlgItem(IDC_STATIC_FILESIZE)->SetWindowText("");
-			m_pMainDlg->GetDlgItem(IDC_STATIC_VERSION)->SetWindowText("");
+//			m_pMainDlg->GetDlgItem(IDC_STATIC_VERSION)->SetWindowText("");
 		}
 		Sleep(100);
 	}
@@ -378,28 +376,32 @@
 	HMENU hMenu = ::GetMenu(m_hWnd);
 
 	char szTitle[200];
-	switch(m_convertType)
+	switch( m_convertType )
 	{
 	case PDF2HTM:
-		strcpy(szTitle,"PDF2HTML v1.6");
+		strcpy(szTitle,"PDFConv v1.0");
 		CheckMenuItem(hMenu,IDM_TOOLS_PDF2HTM,MF_CHECKED);
 		CheckMenuItem(hMenu,IDM_TOOLS_PDF2BMP,MF_UNCHECKED);
 		break;
 	case PDF2BMP:
-		strcpy(szTitle,"PDF2BMP v1.6");
+		strcpy(szTitle,"PDFConv v1.0");
 		CheckMenuItem(hMenu,IDM_TOOLS_PDF2HTM,MF_UNCHECKED);
 		CheckMenuItem(hMenu,IDM_TOOLS_PDF2BMP,MF_CHECKED);
 		break;
 	}
 	AfxGetApp()->WriteProfileInt("m_convertType","type",m_convertType);
-	if(!IsRegistered)
-		strcat(szTitle," (Trial version)");
+/*	if(!IsRegistered)
+		strcat(szTitle," (Trial version)");*/
 	SetWindowText(szTitle);
 }
 //初始化对话框
 BOOL CWin_pdf2htmDlg::OnInitDialog()
 {
 	CDialog::OnInitDialog();
+
+	h_DlgHandle = *this;
+
+	ShowStat( false );
 	
 	// Add "About..." menu item to system menu.
 
@@ -433,8 +435,12 @@
 	hAniCursor = LoadCursorFromFile(szExeDir);
 	DragAcceptFiles();
 
+	m_wndPageProgress.SetStartColor( RGB( 0, 0, 255 ) );
+	m_wndPageProgress.SetEndColor( RGB( 0, 0, 250 ) );
 	m_wndPageProgress.SetRange(0,100);
 	m_wndPageProgress.ShowPercent();
+	m_wndFileProgress.SetStartColor( RGB( 0, 0, 255 ) );
+	m_wndFileProgress.SetEndColor( RGB( 0, 0, 250 ) );
 	m_wndFileProgress.SetRange(0,100);
 	m_wndFileProgress.ShowPercent();
 
@@ -447,70 +453,30 @@
 		HMENU hMenu = ::GetMenu(m_hWnd);
 		CheckMenuItem(hMenu,IDM_FILE_TOP,(dwStyle&WS_EX_TOPMOST?MF_CHECKED:MF_UNCHECKED));
 	}
-	//创建互斥信号量
 	InitializeCriticalSection(&nCriticalSection);
-	//启动监听线程
 	g_bStrActive = TRUE;
 	DWORD dwThreadId;
 	hNetBarThread = CreateThread(NULL,0,NetBarListenThread,this,0,&dwThreadId);
 	if(hNetBarThread == NULL)
 	{
-		::MessageBox(NULL,"CreateThread error.","Error",MB_OK|MB_ICONSTOP);
 		return FALSE;
 	}
 
 	cSpawn.Init(AfxGetInstanceHandle());
-	cSpawn.SetBarImage(IDB_BMP_MENU,21);
-	//cSpawn.SetBackBitmap(IDB_BMP_MENU);
 	cSpawn.LoadToolBarResource(IMAGEVIEW_TOOLBARID);
 
-	m_ctrlPDFVer
-		.SetTextColor(RGB(255,255,0))
-		.SetBkColor(RGB(0,0,0))
-		.SetFontBold(TRUE)
-		//.SetBorder(TRUE)
-		.SetSunken(TRUE);
-
-////////////////////////////测试连接////////////////////////////////////////////////
-	{
-		CHAR	szPDFImageUrl[MAX_PATH];
-		GetModuleFileName(AfxGetInstanceHandle(),szPDFImageUrl,MAX_PATH);
-		CHAR drive[_MAX_DRIVE],dir[_MAX_DIR],fname[_MAX_FNAME],ext[_MAX_EXT];
-		_splitpath(szPDFImageUrl, drive, dir, fname, ext );
-		_makepath(szPDFImageUrl, drive, dir,"","");
-		if(szExeDir[strlen(szPDFImageUrl)-1] != '\\')
-		strcat(szPDFImageUrl,"\\");
-
-		strcat(szPDFImageUrl,"pdf2html.htm");
-	
-		
-		COleVariant varEmpty;
-		m_ctrlPDFImage.Navigate(szPDFImageUrl, &varEmpty, &varEmpty,&varEmpty, &varEmpty );
-	}
-///////////////////////////////////////////////////////////////////////////////////
 	IsRegisteredHTM = TRUE;
 	IsRegisteredBMP = TRUE;
 	AfxGetApp()->WriteProfileInt("Register","IsRegisteredHTM",IsRegisteredHTM);
 	AfxGetApp()->WriteProfileInt("Register","IsRegisteredBMP",IsRegisteredBMP);
 
 	IsRegistered = TRUE;
-	if(CheckSerialNo())
-	{
-		IsRegistered = FALSE;
-		IsRegistered = ShowRegisterDlg(IsRegistered,m_hWnd);
-	}
+
 	HMENU hMenu = ::GetMenu(m_hWnd);
-	if(IsRegistered)
-		EnableMenuItem(hMenu,IDM_HELP_REGISTER,MF_GRAYED);
 
 	m_convertType = (CONVERTTYPE)AfxGetApp()->GetProfileInt("m_convertType","type",PDF2HTM);
 	UpdateTitle();
 
-	if(IsRegisteredHTM == FALSE)
-		DeleteMenu(hMenu,IDM_TOOLS_PDF2HTM,MF_BYCOMMAND);
-	if(IsRegisteredBMP == FALSE)
-		DeleteMenu(hMenu,IDM_TOOLS_PDF2BMP,MF_BYCOMMAND);
-
 	// parse args
 	int argc = __argc;
 	char **argv = __argv;
@@ -595,6 +561,12 @@
 			LeaveCriticalSection(&nCriticalSection);
 		}
 	}
+
+	::CheckDlgButton( *this, IDC_PRVAUTO, BST_CHECKED );
+
+	UpdateUI( *this );
+	ResizeFace();
+
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
 void CWin_pdf2htmDlg::OnSysCommand(UINT nID, LPARAM lParam)
@@ -648,8 +620,9 @@
 
 void CWin_pdf2htmDlg::OnFilePreferences() 
 {
+	return;
 	CPropertySheetWithLogoDlg m_dlgOption("Preferences");
-	m_dlgOption.SetLogoText("PDF2HTML");
+	m_dlgOption.SetLogoText("PDFConv");
 	m_dlgOption.m_psh.dwFlags &= ~PSH_HASHELP;
 	m_dlgOption.m_psh.dwFlags |= PSH_NOAPPLYNOW;
 
@@ -731,76 +704,352 @@
 
 /////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////打开文件//////////////////////
-void CWin_pdf2htmDlg::OnFileOpen() 
+
+void CWin_pdf2htmDlg::OnEndPreview()
 {
-	char path_buffer[_MAX_PATH];
-	char drive[_MAX_DRIVE];
-	char dir[_MAX_DIR];
-	char fname[_MAX_PATH];
-	char ext[_MAX_EXT];
-	char *m_pChBuf = NULL;
-	char sFilterPDF[] = "PDF Files (*.PDF)|*.pdf|All Files (*.*)|*.*||";
+	CString csAddress( m_PrevName );
+	COleVariant vtEmpty;
+	m_wndBrowser.Navigate( csAddress, &vtEmpty, &vtEmpty, &vtEmpty, &vtEmpty );
+};
 
-	char sFilter[100];
-	char szTitle[20];
-	switch(m_convertType)
-	{
-	case PDF2HTM:strcpy(szTitle,"htm");strcpy(sFilter,"HTM Files (*.HTM)|*.HTM|All Files (*.*)|*.*||");break;
-	case PDF2BMP:strcpy(szTitle,"bmp");strcpy(sFilter,"BMP Files (*.BMP)|*.BMP|All Files (*.*)|*.*||");break;
+void CWin_pdf2htmDlg::OnPreview()
+{
+
+	int iPage = GetCurPreviewPage();
+	if ( iPage < 1 )
+		iPage = 1;
+	DoPreview( iPage );
+};
+
+void CWin_pdf2htmDlg::OnPreviewHome()
+{
+	DoPreview( 1 );
+};
+
+void CWin_pdf2htmDlg::OnPreviewPrev()
+{
+	int iCur = GetCurPreviewPage();
+	if ( iCur < 1 )
+		iCur = 1;
+
+	int iPage = iCur - 1;
+	if ( iPage < 1 )
+		iPage = 1;
+
+	if ( iCur != iPage )
+		DoPreview( iPage );
+};
+
+void CWin_pdf2htmDlg::OnPreviewNext()
+{
+	int iCur = GetCurPreviewPage();
+	if ( iCur > m_MaxPage )
+		iCur = m_MaxPage;
+
+	int iPage = iCur + 1;
+	if ( iPage > m_MaxPage )
+		iPage = m_MaxPage;
+
+	if ( iCur != iPage )
+		DoPreview( iPage );
+};
+
+void CWin_pdf2htmDlg::OnPreviewEnd()
+{
+	DoPreview( m_MaxPage );
+};
+
+
+int CWin_pdf2htmDlg::GetCurPreviewPage()
+{
+	char szNum[ 16 ] = { 0 };
+	::GetWindowText( ::GetDlgItem( *this, IDC_PRVCUR ), szNum, 15 );
+	return atoi( szNum );
+};
+
+void CWin_pdf2htmDlg::SetCurPreviewPage( int iPage )
+{
+	char szNum[ 16 ] = { 0 };
+	_itoa( iPage, szNum, 10 );
+	::SetWindowText( ::GetDlgItem( *this, IDC_PRVCUR ), szNum );
+};
+
+void CWin_pdf2htmDlg::ApplyUIValues()
+{
+	bool bApply;
+	bApply = ::IsDlgButtonChecked( *this, IDC_CHECK_ONEHTMLPAGE ) == BST_CHECKED;
+	AfxGetApp()->WriteProfileInt("GenerateInOneHTMLPage","Flag", ( bApply ) ? ( 1 ) : ( 0 ) );
+
+	bApply = ::IsDlgButtonChecked( *this, IDC_CHECK_OPENIT ) == BST_CHECKED;
+	AfxGetApp()->WriteProfileInt("Preview","Flag", ( bApply ) ? ( 1 ) : ( 0 ) );
+	
+	TCHAR szText[ MAX_PATH ] = { 0 };
+	bApply = ::IsDlgButtonChecked( *this, IDC_USEPAGERANGE ) == BST_CHECKED;
+	if ( bApply )
+	{
+		AfxGetApp()->WriteProfileInt("PageRangeType","Type", 1 );
+		::GetWindowText( ::GetDlgItem( *this, IDC_EDIT_FROM2 ), szText, MAX_PATH );
+		AfxGetApp()->WriteProfileInt("PageRange","From", _ttoi( szText ) );
+		::GetWindowText( ::GetDlgItem( *this, IDC_EDIT_TO2 ), szText, MAX_PATH );
+		AfxGetApp()->WriteProfileInt("PageRange","To", _ttoi( szText ) );
 	}
-	if ( ( m_pChBuf	= ( char * ) malloc( 1024*100 )) == NULL )
+	else
+		AfxGetApp()->WriteProfileInt("PageRangeType","Type", 0 );
+
+#ifdef IS_SFT_TRIAL
+		AfxGetApp()->WriteProfileInt("PageRangeType","Type", 1 );
+		AfxGetApp()->WriteProfileInt("PageRange","From", 1 );
+		AfxGetApp()->WriteProfileInt("PageRange","To", 1 );
+#endif
+
+	memset( szText, 0x00, sizeof( szText ) );
+	::GetWindowText( ::GetDlgItem( *this, IDC_EDIT_OWNERPASS ), szText, MAX_PATH );
+	AfxGetApp()->WriteProfileString("CPDFPassword","m_szOwnerPassword",szText);
+	memset( szText, 0x00, sizeof( szText ) );
+	::GetWindowText( ::GetDlgItem( *this, IDC_EDIT_USERPASS ), szText, MAX_PATH );
+	AfxGetApp()->WriteProfileString("CPDFPassword","m_szUserPassword",szText);
+};
+
+void CWin_pdf2htmDlg::DoPreview( int iPage )
+{
+	if ( !strlen( m_FirstFile ) )
+	{
+		::MessageBox( *this, "No files loaded yet", "Preview", MB_ICONSTOP );
 		return;
-	memset(m_pChBuf,0,1024*100);
+	}
+#ifdef IS_SFT_TRIAL
+	iPage = 1;
+#endif 
 
-	CFileDialog DlgFile(TRUE,"PDF","",
-	OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_ALLOWMULTISELECT,sFilterPDF,NULL);
-	DlgFile.m_ofn.lpstrTitle = "Open PDF Files";
-	DlgFile.m_ofn.lpstrFile = m_pChBuf;
-	DlgFile.m_ofn.nMaxFile = 20000;
-	DlgFile.m_ofn.nFilterIndex = 0;
-	DlgFile.m_ofn.lpstrInitialDir = AfxGetApp()->GetProfileString("FilePath","LastOpenPath","C:\\");
+	SetCurPreviewPage( iPage );
 
-	CString m_szFileName;
+	ApplyUIValues();
+	
+	AfxGetApp()->WriteProfileInt("PageRangeType","Type", 1 );
+	AfxGetApp()->WriteProfileInt("PageRange","From", iPage );
+	AfxGetApp()->WriteProfileInt("PageRange","To", iPage );
+	AfxGetApp()->WriteProfileInt("Preview","Flag", 0 );
+
+	TCHAR szTmpDir[ MAX_PATH ];
+	GetTempPath( MAX_PATH, szTmpDir );
+	strcat( szTmpDir, "pdftest" );
+
+	strcpy( m_PrevName, szTmpDir );
+	strcat( m_PrevName, "\\index.htm" );
+
+	EnterCriticalSection(&nCriticalSection);
+	SCORECONVERT m_coreConvert;
+	m_coreConvert.szPDFName = m_FirstFile;
+	m_coreConvert.szHTMName = m_PrevName;
+	m_aryPDF2HTMFile.Add(m_coreConvert);
+	LeaveCriticalSection(&nCriticalSection);
+
+};
+
+void CWin_pdf2htmDlg::OnOpenPDF()
+{
+	strcpy( m_PrevName, "" );
+
+	char sFilterPDF[] = "PDF Files (*.PDF)|*.pdf|All Files (*.*)|*.*||";
+	CFileDialog DlgFile( TRUE, "PDF", "", OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ALLOWMULTISELECT, sFilterPDF, NULL );
+	DlgFile.m_ofn.lpstrTitle = "Open files";
+	DlgFile.m_ofn.lpstrFile = m_OpenedFiles;
+	DlgFile.m_ofn.nMaxFile = sizeof( m_OpenedFiles );
+	DlgFile.m_ofn.nFilterIndex = 0;
+	DlgFile.m_ofn.lpstrInitialDir = AfxGetApp()->GetProfileString( "FilePath", "LastOpenPath", "C:\\" );
 
+	char szBuffer[ _MAX_PATH ];
 	if ( DlgFile.DoModal() == IDOK)
 	{
-		//
-		//如果选择单个文件，需要用户提供另存为的文件名称，如果是多个
-		//文件，直接批量处理
-		//
-		char* pChBuf = m_pChBuf;
-		pChBuf += strlen( pChBuf ) + 1;
-		if ( *pChBuf == 0 )		//only one file
-		{
-			_splitpath(m_pChBuf, drive, dir, fname, ext );
-			_makepath(path_buffer,drive, dir,"","");
-			AfxGetApp()->WriteProfileString("FilePath","LastOpenPath",path_buffer);
-
-			CFileDialog m_dlgFile(FALSE,szTitle,fname,
-				OFN_HIDEREADONLY|OFN_ALLOWMULTISELECT,sFilter,NULL);
-			if(m_dlgFile.DoModal() == IDOK)
+		strcpy( m_FirstFile, m_OpenedFiles );
+
+		char szDrive[ _MAX_DRIVE ];
+		char szDir[ _MAX_DIR ];
+		char* szFirstFile = (char*) ( m_OpenedFiles + strlen( m_OpenedFiles ) + 1 );
+		if ( !( *szFirstFile ) )
+		{
+			m_IsMulti = false;
+			_splitpath( m_OpenedFiles, szDrive, szDir, NULL, NULL );
+			_makepath( szBuffer, szDrive, szDir, NULL, NULL );
+
+			char szTitle[ MAX_PATH ];
+			GetFileTitle( m_OpenedFiles, szTitle, MAX_PATH );
+			::SetWindowText( ::GetDlgItem( *this, IDC_OPENED_FILES ), szTitle );
+		}
+		else
+		{
+			m_IsMulti = true;
+			strcpy( szBuffer, m_OpenedFiles );
+			strcat( szBuffer, "\\." );
+
+			strcat( m_FirstFile, "\\" );
+			strcat( m_FirstFile, szFirstFile );
+
+			char szTitles[ 65536 ] = { 0 };
+			strcpy( szTitles, szFirstFile );
+			szFirstFile = (char*) ( szFirstFile + strlen( szFirstFile ) + 1 );
+			while ( *szFirstFile )
 			{
-				CString strHtmlFileName = m_dlgFile.GetPathName();
-				//增加进入文件队列，使用信号量标志
-				EnterCriticalSection(&nCriticalSection);
-				SCORECONVERT m_coreConvert;
-				m_coreConvert.szPDFName = m_pChBuf;
+				strcat( szTitles, ", " );
+				strcat( szTitles, szFirstFile );
+				szFirstFile = (char*) ( szFirstFile + strlen( szFirstFile ) + 1 );
+			};
+			::SetWindowText( ::GetDlgItem( *this, IDC_OPENED_FILES ), szTitles );
+		};
+		AfxGetApp()->WriteProfileString( "FilePath", "LastOpenPath", szBuffer );
+
+		ApplyUIValues();
+
+		CString m_szOwnerPassword = AfxGetApp()->GetProfileString("CPDFPassword","m_szOwnerPassword");
+		CString m_szUserPassword = AfxGetApp()->GetProfileString("CPDFPassword","m_szUserPassword");
+		int m_iZoomRatio = AfxGetApp()->GetProfileInt("ZoomRatio","Zoom",100);
+		HPDF hPDF = PDF_Open( m_FirstFile, m_szOwnerPassword, m_szUserPassword, m_iZoomRatio );
+		if ( hPDF )
+		{
+			m_MaxPage = PDF_GetPageCount( hPDF );
+			PDF_Close( hPDF );
+			char szNum[ 16 ] = { 0 };
+			_itoa( m_MaxPage, szNum, 10 );
+			::SetWindowText( ::GetDlgItem( *this, IDC_PRVOF ), szNum );
+			SetCurPreviewPage( 1 );
+			if ( ::IsDlgButtonChecked( *this, IDC_PRVAUTO ) == BST_CHECKED )
+			{
+				DoPreview( 1 );
+			};
+		}
+		else
+		{
+			memset( m_FirstFile, 0x00, sizeof( m_FirstFile ) );
+			memset( m_OpenedFiles, 0x00, sizeof( m_OpenedFiles ) );
+			::SetWindowText( ::GetDlgItem( *this, IDC_OPENED_FILES ), "Not opened yet" );
+			::MessageBox( *this, "Non-PDF file selected or invalid password specified", "PDFConv", MB_ICONSTOP );
+		};
+	};
 
-				_splitpath(strHtmlFileName, drive, dir, fname, ext );
-				_makepath(path_buffer,drive, dir,fname,"");
-				if(path_buffer[strlen(path_buffer)-1] != '\\')
-					strcat(path_buffer,"\\");
-				strcat(path_buffer,"index.htm");
+};
 
-				m_coreConvert.szHTMName = path_buffer;				
+void CWin_pdf2htmDlg::OnSaveHTML()
+{
+	if ( !strlen( m_FirstFile ) )
+	{
+		::MessageBox( *this, "No files loaded yet", "Preview", MB_ICONSTOP );
+		return;
+	}
 
-				m_aryPDF2HTMFile.Add(m_coreConvert);
-				LeaveCriticalSection(&nCriticalSection);
-			}
-			free(m_pChBuf);
+/*	if ( m_IsMulti )
+	{
+	}
+	else
+	{
+		char szFilter[] = "HTM Files (*.HTM)|*.HTM|All Files (*.*)|*.*||";
+		CFileDialog fdDest( FALSE, "Save as HTML", NULL, OFN_HIDEREADONLY | OFN_ALLOWMULTISELECT, szFilter, NULL );
+		if(fdDest.DoModal() != IDOK)
 			return;
+
+		CString sFileName = fdDest.GetPathName();
+		char szBuffer[ _MAX_PATH ];
+		char szDrive[ _MAX_DRIVE ];
+		char szDir[ _MAX_DIR ];
+		char szName[ _MAX_PATH ];
+
+		_splitpath( sFileName, szDrive, szDir, szName, NULL );
+		_makepath( szBuffer, szDrive, szDir, szName, "" );
+		if( szBuffer[ strlen( szBuffer ) - 1 ] != '\\' )
+			strcat( szBuffer, "\\" );
+		strcat( szBuffer,"index.htm" );
+	};*/
+
+	DoConvert( true ); // path_buffer
+};
+
+void CWin_pdf2htmDlg::OnSaveJPEG()
+{
+	if ( !strlen( m_FirstFile ) )
+	{
+		::MessageBox( *this, "No files loaded yet", "Preview", MB_ICONSTOP );
+		return;
+	}
+	m_ToJPEG = true;
+	DoConvert( false );
+};
+
+void CWin_pdf2htmDlg::OnSaveBMP()
+{
+	if ( !strlen( m_FirstFile ) )
+	{
+		::MessageBox( *this, "No files loaded yet", "Preview", MB_ICONSTOP );
+		return;
+	}
+	m_ToJPEG = false;
+	DoConvert( false );
+};
+
+void CWin_pdf2htmDlg::DoConvert( bool bIsHTML )
+{
+	char path_buffer[_MAX_PATH];
+	char drive[_MAX_DRIVE];
+	char dir[_MAX_DIR];
+	char fname[_MAX_EXT];
+
+	strcpy( m_PrevName, "" );
+
+	ApplyUIValues();
+	if ( bIsHTML )
+		m_convertType = PDF2HTM;
+	else
+		m_convertType = PDF2BMP;
+
+
+	char szFilter[ 100 ] = { 0 };
+	char szTitle[ 20 ];
+	if ( m_ToJPEG )
+	{
+		strcpy( szTitle,"Save as JPEG");
+		strcpy( szFilter,"JPEG Files (*.JPG)|*.JPG|All Files (*.*)|*.*||");
+	}
+	else
+		switch ( m_convertType )
+		{
+		case PDF2HTM:
+			strcpy( szTitle,"Save as HTM" );
+			strcpy( szFilter,"HTM Files (*.HTM)|*.HTM|All Files (*.*)|*.*||" );
+			break;
+
+		case PDF2BMP:
+			strcpy( szTitle,"Save as BMP");
+			strcpy( szFilter,"BMP Files (*.BMP)|*.BMP|All Files (*.*)|*.*||" );
+			break;
 		}
-		//批量处理
+
+
+	if ( !m_IsMulti )
+	{
+		CFileDialog fdDest( FALSE, szTitle, NULL, OFN_HIDEREADONLY | OFN_ALLOWMULTISELECT, szFilter, NULL );
+		if(fdDest.DoModal() != IDOK)
+			return;
+
+		CString sFileName = fdDest.GetPathName();
+		char szBuffer[ _MAX_PATH ];
+		char szDrive[ _MAX_DRIVE ];
+		char szDir[ _MAX_DIR ];
+		char szName[ _MAX_PATH ];
+
+		_splitpath( sFileName, szDrive, szDir, szName, NULL );
+		_makepath( szBuffer, szDrive, szDir, szName, "" );
+		if( szBuffer[ strlen( szBuffer ) - 1 ] != '\\' )
+			strcat( szBuffer, "\\" );
+		strcat( szBuffer,"index.htm" );
+
+
+		EnterCriticalSection(&nCriticalSection);
+		SCORECONVERT m_coreConvert;
+		m_coreConvert.szPDFName = m_OpenedFiles;
+		m_coreConvert.szHTMName = szBuffer;
+		m_aryPDF2HTMFile.Add( m_coreConvert );
+		LeaveCriticalSection( &nCriticalSection );
+	}
+	else
+	{
 		CSBDestination sb(m_hWnd,IDS_BROWDIRTITLE_E);
 		sb.SetFlags(BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT);
 		CString pathstr = AfxGetApp()->GetProfileString("htmSaveDefaultDirectory","Path","");
@@ -813,14 +1062,13 @@
 		}
 		else
 			return;
-		AfxGetApp()->WriteProfileString("FilePath","LastOpenPath",m_pChBuf);
-		//增加进入文件队列，使用信号量标志
+
 		EnterCriticalSection(&nCriticalSection);
-		POSITION pos = DlgFile.GetStartPosition();
-		while(pos)
+		char* szOneFile = m_OpenedFiles + strlen( m_OpenedFiles ) + 1;
+		while ( *szOneFile )
 		{
-			m_szFileName = DlgFile.GetNextPathName(pos);
-			_splitpath(m_szFileName, drive, dir, fname, ext );
+			char* m_szFileName = szOneFile;
+			_splitpath(m_szFileName, drive, dir, fname, NULL );
 
 			CString strHtmlFileName = strSaveHtmDirectory;
 			if(strHtmlFileName[strHtmlFileName.GetLength()-1] != '\\')
@@ -832,7 +1080,7 @@
 			SCORECONVERT m_coreConvert;
 			m_coreConvert.szPDFName = m_szFileName;
 
-			_splitpath(strHtmlFileName, drive, dir, fname, ext );
+			_splitpath(strHtmlFileName, drive, dir, fname, NULL );
 			_makepath(path_buffer,drive, dir,fname,"");
 			if(path_buffer[strlen(path_buffer)-1] != '\\')
 				strcat(path_buffer,"\\");
@@ -840,11 +1088,11 @@
 			
 			m_coreConvert.szHTMName = path_buffer;
 			m_aryPDF2HTMFile.Add(m_coreConvert);
+
+			szOneFile += strlen( szOneFile ) + 1;
 		}
 		LeaveCriticalSection(&nCriticalSection);
-
 	}
-	free(m_pChBuf);
 }
 
 void CWin_pdf2htmDlg::OnUpdateFileOpen(CCmdUI* pCmdUI) 
@@ -867,9 +1115,9 @@
 //Close buttom
 void CWin_pdf2htmDlg::OnCancel() 
 {
-	if(MessageBox("Do you want exit?","PDF2HTML",MB_YESNO) == IDYES)
-		ExitProcess(0);
+	TerminateProcess( GetCurrentProcess(), 0 );
 }
+
 void CWin_pdf2htmDlg::OnHelpSupport() 
 {
 	ShellExecute(NULL,"open",szMailTo,NULL,NULL,SW_SHOWNORMAL);
@@ -895,6 +1143,78 @@
 	fclose(filedest1);
 	return TRUE;
 }
+
+inline bool			IsChar( TCHAR szSymb ) { return ( ( ( szSymb >= _T( 'a' ) ) && ( szSymb <= _T( 'z' ) ) ) || ( ( szSymb >= _T( 'A' ) ) && ( szSymb <= _T( 'Z' ) ) ) ); }
+inline bool			IsNumChar( TCHAR szSymb ) { return ( ( szSymb >= _T( '0' ) ) && ( szSymb <= _T( '9' ) ) ); }
+inline bool			IsURLChar( TCHAR szSymb ) { return ( IsChar( szSymb ) || IsNumChar( szSymb ) || ( szSymb == _T( ':' ) ) || ( szSymb == _T( '/' ) || ( szSymb == _T( '.' ) ) || ( szSymb == _T( ',' ) ) || ( szSymb == _T( '?' ) ) || ( szSymb == _T( '&' ) ) || ( szSymb == _T( '+' ) ) || ( szSymb == _T( '-' ) ) || ( szSymb == _T( '=' ) ) ) ); }
+
+inline bool			IsLinked( TCHAR* szPos )
+{
+	const TCHAR szHRef1[] = _T( "href='" );
+	const TCHAR szHRef2[] = _T( "href=\"" );
+	bool bResult = _tcsnicmp( szPos - _tcslen( szHRef1 ), szHRef1, _tcslen( szHRef1 ) ) == 0;
+	if ( !bResult )
+		bResult = _tcsnicmp( szPos - _tcslen( szHRef2 ), szHRef2, _tcslen( szHRef2 ) ) == 0;
+	return bResult;
+};
+
+void FixupLinks( TCHAR* szFileName )
+{
+	static char FileBuffer[ 0x00400000 ] = { 0 };
+
+	HANDLE hFile = CreateFile( szFileName, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+	if ( hFile != INVALID_HANDLE_VALUE )
+	{
+		DWORD dwSize = 0;
+		DWORD dwNewSize = 0;
+
+		memset( FileBuffer, 0x00, sizeof( FileBuffer ) );
+		ReadFile( hFile, FileBuffer, sizeof( FileBuffer ), &dwSize, NULL );
+		dwNewSize = dwSize;
+
+		char szChange[] = "<a href=\"%s%s\">%s</a>";
+		char* szPos = strstr( FileBuffer, "http://" );
+		char* szPos1 = strstr( FileBuffer, "www." );
+		if ( szPos > szPos1 )
+			szPos = szPos1;
+		while ( szPos )
+		{
+			char* szNewPos = szPos;
+			for ( ; ( *szNewPos ) && ( ( szNewPos - szPos ) < 256 ); ++szNewPos )
+				if ( !IsURLChar( *szNewPos ) )
+					break;
+
+			char szNewLine[ 4096 ] = { 0 };
+			char szLink[ 256 ] = { 0 };
+			strncpy( szLink, szPos, szNewPos - szPos );
+			if ( strstr( szLink, "http://" ) )
+				sprintf( szNewLine, szChange, "", szLink, szLink );
+			else
+				sprintf( szNewLine, szChange, "http://", szLink, szLink );
+			int iDelta = strlen( szNewLine ) - strlen( szLink );
+			DWORD dwAddSize = strlen( szNewLine );
+
+			if ( !IsLinked( szPos ) )
+			{
+				memmove( szNewPos + iDelta, szNewPos, dwSize - iDelta );
+				memcpy( szPos, szNewLine, dwAddSize );
+			};
+			dwNewSize += dwAddSize;
+
+			char* szPosEnd = szPos + dwAddSize;
+			szPos = strstr( szPosEnd, "http://" );
+			szPos1 = strstr( szPosEnd, "www." );
+			if ( szPos > szPos1 )
+				szPos = szPos1;
+		};
+
+		SetFilePointer( hFile, 0, NULL, FILE_BEGIN );
+		WriteFile( hFile, FileBuffer, dwNewSize, &dwSize, NULL );
+		CloseHandle( hFile );
+	};
+};
+
+
 BOOL CWin_pdf2htmDlg::ConvertPDF2HTML(CString m_strPDFFile, CString m_strHtmlFile)
 {
 	m_bForceContinuePages = AfxGetApp()->GetProfileInt("GenerateInOneHTMLPage","Flag",0);
@@ -940,16 +1260,16 @@
 	{
 		if(buf.st_size/1024 < 1024)
 		{//KB
-			m_strFileSize.Format("%d<%.2fK>",buf.st_size,buf.st_size/1024.0);
+			m_strFileSize.Format("%.2fK",buf.st_size/1024.0);
 		}
 		else
-			m_strFileSize.Format("%d<%.2fM>",buf.st_size,buf.st_size/1024.0/1024.0);
+			m_strFileSize.Format("%.2fM",buf.st_size/1024.0/1024.0);
 	}
 	GetDlgItem(IDC_STATIC_FILESIZE)->SetWindowText(m_strFileSize);
 
 	//缩放系数
 	int m_iZoomRatio = AfxGetApp()->GetProfileInt("ZoomRatio","Zoom",100);
-	switch(m_convertType)
+	switch( m_convertType )
 	{
 	case PDF2HTM:
 		{
@@ -1003,7 +1323,7 @@
 		if(m_iPageFrom > m_iPageTo || m_iPageFrom < 0 || m_iPageTo < 0)
 		{
 			if(!m_bWithoutShowMainWnd)
-				AfxMessageBox("Page range is incorrect,Please check it in option dialog,and try again.");
+				AfxMessageBox( "Invalid Page Range!" );
 			return FALSE;
 		}
 	}
@@ -1029,7 +1349,7 @@
 			m_iPageTo = min(m_iPageTo,UNREGISTER_MAX_PAGES);
 		else
 		{//如果系统已经注册，然后注册其中的每一个功能
-			switch(m_convertType)
+			switch( m_convertType )
 			{
 			case PDF2HTM:
 				if(!IsRegisteredHTM)
@@ -1046,13 +1366,13 @@
 		if(m_iPageFrom > m_iPageTo)
 		{
 			CString strErrMessage;
-			strErrMessage.Format("The '%s' file only contain %d pages, please correct the page range in the setting dialog and try again.",LPCTSTR(m_strPDFFile),m_PageCount);
+			strErrMessage.Format("The '%s' file has only %d pages!",LPCTSTR(m_strPDFFile),m_PageCount);
 			if(!m_bWithoutShowMainWnd)
 				AfxMessageBox(strErrMessage);
 			return FALSE;
 		}
 
-		if(m_convertType == PDF2HTM)
+		if( m_convertType == PDF2HTM )
 		{
 			WriteMainHtm(m_HtmRootPath,m_MainHtmName,m_iPageFrom,m_iPageTo);
 			WriteIndexHtm(m_CssFilePath,m_MainHtmName,m_iPageFrom,m_iPageTo);
@@ -1074,25 +1394,38 @@
 			//处理界面反应部分------------------------------------
 			//文件进度
 			int totalFiles = m_aryPDF2HTMFile.GetSize();
-			m_strTotalFiles.Format("%d files",totalFiles);
-			GetDlgItem(IDC_STATIC_TOTALFILES)->SetWindowText(m_strTotalFiles);
+/*			m_strTotalFiles.Format("%d",totalFiles);
+			GetDlgItem(IDC_STATIC_TOTALFILES)->SetWindowText(m_strTotalFiles);*/
 			m_wndFileProgress.SetPos(99/totalFiles);
 			//页进度
 			//m_strTotalPageInfo.Format("page %d of %d",page,m_PageCount);
-			m_strTotalPageInfo.Format("page %d of %d",page-m_iPageFrom+1,(m_iPageTo-m_iPageFrom+1));
+			m_strTotalPageInfo.Format("%d/%d",page-m_iPageFrom+1,(m_iPageTo-m_iPageFrom+1));
 			GetDlgItem(IDC_STATIC_TOTALPAGES)->SetWindowText(m_strTotalPageInfo);
 			//m_wndPageProgress.SetPos((page*100-1)/m_PageCount);
 			m_wndPageProgress.SetPos(((page-m_iPageFrom+1)*100-1)/(m_iPageTo-m_iPageFrom+1));
 			//核心处理部分-------------------------------------------
-			switch(m_convertType)
+			switch( m_convertType )
 			{
 			case PDF2BMP:
 				{
+					char drive[_MAX_DRIVE];
+					char dir[_MAX_DIR];
+					char fname[_MAX_PATH];
+					char fname2[_MAX_PATH];
+					_splitpath(m_strHtmlFile, drive, dir, fname, NULL );
+
+					sprintf(fname2,"%s_%03d.bmp",fname,page);
 					char m_strBmpFile[MAX_PATH];
+					_makepath(m_strBmpFile,drive, dir,fname2,NULL);
+
 					sprintf(m_strBmpFile,"%s_%03d.bmp",m_strPDFFile,page);
 					HANDLE	m_hDIBInfo = PDF_GetPageBmp(m_hPDF,page);
 					if(!m_bTerminateProcessPage && g_bStrActive && m_hDIBInfo)
+					{
 						PDF_WriteToBMPFile(m_hDIBInfo,m_strBmpFile);
+						if ( m_ToJPEG )
+							ConvertFromBMPToJPEG( m_strBmpFile );
+					};
 					if(m_hDIBInfo)
 						PDF_DestroyPageBmp(m_hDIBInfo);
 					m_hDIBInfo = NULL;
@@ -1101,11 +1434,11 @@
 			case PDF2HTM:
 				{
 					LPSPAGE	ptrPage = PDF_GetPageObject(m_hPDF,page);
-					if(ptrPage)
+/*					if(ptrPage)
 					{
-						m_strVersion.Format("%%PDF-%.1f",ptrPage->m_PDFVersion);
+						m_strVersion.Format("PDF-%.1f",ptrPage->m_PDFVersion);
 						GetDlgItem(IDC_STATIC_VERSION)->SetWindowText(m_strVersion);
-					}
+					}*/
 					if(!m_bTerminateProcessPage && g_bStrActive && ptrPage)
 						ConvertPdfPage2HTML(m_hPDF,m_iPageFrom,ptrPage,m_strHtmlFile);
 					if(ptrPage)
@@ -1116,15 +1449,41 @@
 			}
 		}
 		PDF_Close(m_hPDF);
+		if ( m_bForceContinuePages ) 
+		{
+			FixupLinks( m_strHtmlFile.LockBuffer() );
+			m_strHtmlFile.UnlockBuffer();
+		}
+		else
+		{
+			char drive[_MAX_DRIVE];
+			char dir[_MAX_DIR];
+			char fname[_MAX_PATH];
+			char fname2[_MAX_PATH];
+			_splitpath(m_strHtmlFile, drive, dir, fname, NULL );
+
+			if ( strlen( m_PrevName ) )
+			{
+				char szFile[MAX_PATH];
+				_makepath(szFile,drive, dir,"pg_0001.htm",NULL);
+				FixupLinks( szFile );
+			}
+			else
+ 				for( int page = m_iPageFrom; page <= m_iPageTo; page++)
+				{
+					sprintf(fname2,"pg_%04d.htm",page);
+					char szFile[MAX_PATH];
+					_makepath(szFile,drive, dir,fname2,NULL);
+					FixupLinks( szFile );
+				};
+		};
 	}
 	else
 	{
 		if(!m_bWithoutShowMainWnd)
 		{
 			CString strErrMessage;
-			strErrMessage.Format("Can't extract the information from the '%s' file, "
-				"this pdf file perhaps been encrypted, please double check this pdf file.",
-				LPCTSTR(m_strPDFFile));
+			strErrMessage.Format("Error when loading '%s'", LPCTSTR(m_strPDFFile));
 			AfxMessageBox(strErrMessage);
 		}
 	}
@@ -1245,7 +1604,7 @@
 var firstpage = %d;\n\
 var lastpage = %d;\n\
 </script></head>\n\
-<frameset rows=\"30,*\" framespacing=\"1\" border=\"0\" frameborder=\"0\">\n\
+<frameset rows=\"55,*\" framespacing=\"1\" border=\"0\" frameborder=\"0\">\n\
     <frame name=\"ltop\" scrolling=\"no\" target=\"lbottom\" src=\"%s\">\n\
     <frameset name = \"leftpane\" cols=\"150,*\">\n\
 	<frame name=\"lbottom\" target=\"contents\" src=\"%s\">\n\
@@ -1262,10 +1621,33 @@
 1,lastpage-firstpage+1,
 LPCTSTR(strNavPage),LPCTSTR(strIndexPage),LPCTSTR(strFirstPage));
 
+  /*
+	CString tempstr;
+	tempstr.Format("<html><head><title>%s</title>%s\
+<script language=\"javascript\">\n\
+var firstpage = %d;\n\
+var lastpage = %d;\n\
+</script></head>\n\
+<frameset rows=\"30,*\" framespacing=\"1\" border=\"0\" frameborder=\"0\">\n\
+    <frame name=\"ltop\" scrolling=\"no\" target=\"lbottom\" src=\"%s\">\n\
+    <frameset name = \"leftpane\" cols=\"*\">\n\
+	<frame name=\"contents\" src=\"%s\">\n\
+    </frameset>\n\
+\
+  <noframes>\n\
+  <body>\n\
+  	<p>This page uses frames, but your browser doesn't support them.</p>\n\
+  </body>\n\
+  </noframes>\n\
+</frameset></html>\n",
+LPCTSTR(MainHtmName),m_szPageKeywords2,
+1,lastpage-firstpage+1,
+LPCTSTR(strNavPage),LPCTSTR(strFirstPage));
+*/
 	StrText = tempstr;
 
 	FILE *stream;
-	stream = fopen(CssPathName+"\\index.htm", "w" );//创建并打开文件
+	stream = fopen(CssPathName+"\\index.htm", "w" );
 	if(stream)
 	{
 		fprintf(stream,StrText);
@@ -1497,10 +1879,10 @@
 
 LRESULT CWin_pdf2htmDlg::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) 
 {
-	if(MenuPreTranslateMessage(cSpawn,m_hWnd,
+/*	if(MenuPreTranslateMessage(cSpawn,m_hWnd,
 		message,wParam,lParam) == TRUE)
 		return 1;
-	
+*/	
 	return CDialog::WindowProc(message, wParam, lParam);
 }
 
@@ -1508,42 +1890,20 @@
 {
 	CDialog::OnInitDialog();
 	
-	m_HyperEmailLink.SetURL(szMailTo);
-	m_HyperEmailLink.SetUnderline(FALSE);
-	
-	m_HyperHomePageLink.SetURL("http://www.verypdf.com/");
+	m_HyperHomePageLink.SetURL("http://www.mbloom.com");
 	m_HyperHomePageLink.SetUnderline(FALSE);
 
-	char szVersion[] = "PDF2HTML version 1.6";
-	SetWindowText(szVersion);
-	GetDlgItem(IDC_VERSION)->SetWindowText(szVersion);
-
-	m_szRegisterInfo.Format(
-		"PDF2HTML Version 1.6\r\n"
-		"Register type: %s\r\n"
-		"PDF2HTM function: %s\r\n",
-		IsRegistered?"Registered":"Unregister",
-		IsRegisteredHTM?"Yes":"No"
-		);
-	m_szRegisterInfo += "\r\n";
-	m_szRegisterInfo += "PDF2HTML v1.6 is licensed under ";
-	m_szRegisterInfo += "the GNU General Public License (GPL).  ";
-	m_szRegisterInfo += "See the 'COPYING' file for details. \r\nPortions of ";
-	m_szRegisterInfo += "this software are copyright 1996-2002 Glyph & Cog, LLC.\r\n";
-
-
-	UpdateData(FALSE);
 	return TRUE;  // return TRUE unless you set the focus to a control
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
 void CWin_pdf2htmDlg::OnRButtonUp(UINT nFlags, CPoint point) 
 {
-	POINT	CurPos;
+/*	POINT	CurPos;
 	GetCursorPos(&CurPos);
 	CMenu *m_menuSub = GetMenu()->GetSubMenu(0);
 	m_menuSub->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON,
-		CurPos.x,CurPos.y+2,this);
+		CurPos.x,CurPos.y+2,this);*/
 //	CDialog::OnRButtonUp(nFlags, point);
 }
 BOOL CWin_pdf2htmDlg::MyCheckKeyDown(HWND hWnd,WPARAM wParam, LPARAM lParam)
@@ -1556,9 +1916,9 @@
 	case VK_ESCAPE:
 		OnFileExit();
 		return TRUE;
-	case 'F':
+	case 'O':
 		if(GetKeyState(VK_CONTROL)&0x8000)
-			OnFileOpen();
+			OnOpenPDF();
 		return TRUE;
 	case 'D':
 		if(GetKeyState(VK_CONTROL)&0x8000)
@@ -1605,22 +1965,16 @@
 	CString m_strClose;
 	GetDlgItem(IDCLOSE)->GetWindowText(m_strClose);
 	if(m_strClose == "Stop")
-	{//当前正在处理中
-		if (MessageBox("Are you sure to stop?","PDF2HTML",MB_YESNO)==IDYES)
-		{
-			//设置页中断标志，停止当前文件的转换
-			m_bTerminateProcessPage = TRUE;
-			//清空文件处理队列，终止剩余PDF文件的处理
-			EnterCriticalSection(&nCriticalSection);
-			m_aryPDF2HTMFile.RemoveAll();
-			LeaveCriticalSection(&nCriticalSection);
-		}
+	{
+		m_bTerminateProcessPage = TRUE;
+		EnterCriticalSection(&nCriticalSection);
+		m_aryPDF2HTMFile.RemoveAll();
+		LeaveCriticalSection(&nCriticalSection);
 	}
 	else if(m_strClose == "Close")
 	{
-		if(MessageBox("Do you want exit?","PDF2HTML",MB_YESNO) == IDYES)
-			ExitProcess(0);
-
+//		ExitProcess(0);
+		TerminateProcess( GetCurrentProcess(), 0 );
 	}
 }
 void CWin_pdf2htmDlg::OnHelpRegister() 
@@ -1682,3 +2036,121 @@
 		ShowWindow(SW_HIDE);
 	CDialog::OnTimer(nIDEvent);
 }
+
+void CWin_pdf2htmDlg::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) 
+{
+	HWND hWnd = (*pScrollBar);
+	int iPos = (int) ::SendMessage( hWnd, TBM_GETPOS, 0, 0 );
+
+	if ( hWnd == ::GetDlgItem( *this, IDC_SLIDER_OUTPUTZOOM2 ) )
+	{
+		AfxGetApp()->WriteProfileInt("ZoomRatio","Zoom", iPos );
+	}
+	else if ( hWnd == ::GetDlgItem( *this, IDC_SLIDER_JPEGQUALITY2 ) )
+	{
+		AfxGetApp()->WriteProfileInt( "CRasterImage", "m_iJPGQuality", iPos );
+	};
+	UpdateUI( *this );
+}
+
+
+void CWin_pdf2htmDlg::ShowStat( bool bShow )
+{
+	int iShow = ( bShow ) ? ( SW_SHOW ) : ( SW_HIDE );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_STATUS ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_FILE ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_FILENAME ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_SIZE ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_FILESIZE ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_PAGES ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_TOTALPAGES ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_CURR ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_PROGRESS_PAGE ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_STATIC_TOTAL ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDC_PROGRESS_FILES ), iShow );
+	::ShowWindow( ::GetDlgItem( *this, IDPAUSE ), iShow );
+};
+
+void CWin_pdf2htmDlg::ResizeFace()
+{
+
+	RECT rcc;
+	::GetClientRect( *this, &rcc );
+	RECT rc;
+	POINT pt;
+	::GetWindowRect( m_wndBrowser, &rc );
+	pt.x = rc.left;
+	pt.y = rc.top;
+	::ScreenToClient( ::GetParent( m_wndBrowser ), &pt );
+	::SetWindowPos( m_wndBrowser, NULL, 0, 0, rcc.right - pt.x - 10, rcc.bottom - pt.y - 10, SWP_SHOWWINDOW | SWP_NOMOVE );
+};
+
+void CWin_pdf2htmDlg::OnSize(UINT nType, int cx, int cy) 
+{
+	CDialog::OnSize(nType, cx, cy);
+	ResizeFace();
+}
+
+void UpdateUI( HWND hDlg )
+{
+	int iPos = AfxGetApp()->GetProfileInt("ZoomRatio","Zoom",100);
+	TCHAR szText[ MAX_PATH ] = { 0 };
+	_stprintf( szText, _T( "%d%%" ), iPos );
+	::SendMessage( ::GetDlgItem( hDlg, IDC_SLIDER_OUTPUTZOOM2 ), TBM_SETRANGE, 1, MAKELONG( 0, 200 ) );
+	::SendMessage( ::GetDlgItem( hDlg, IDC_SLIDER_OUTPUTZOOM2 ), TBM_SETPOS, 1, iPos );
+	::SetWindowText( ::GetDlgItem( hDlg, IDC_STATIC_PAGEZOOM ), szText );
+
+	iPos = AfxGetApp()->GetProfileInt("CRasterImage","m_iJPGQuality",100);
+	_stprintf( szText, _T( "%d%%" ), iPos );
+	::SendMessage( ::GetDlgItem( hDlg, IDC_SLIDER_JPEGQUALITY2 ), TBM_SETRANGE, 1, MAKELONG( 0, 100 ) );
+	::SendMessage( ::GetDlgItem( hDlg, IDC_SLIDER_JPEGQUALITY2 ), TBM_SETPOS, 1, iPos );
+	::SetWindowText( ::GetDlgItem( hDlg, IDC_STATIC_JPEGQUALITY ), szText );
+};
+
+
+void ConvertFromBMPToJPEG( LPSTR szBmpFile )
+{
+	char path_buffer[_MAX_PATH];
+	char drive[_MAX_DRIVE];
+	char dir[_MAX_DIR];
+	char fname[_MAX_PATH];
+	char ext[_MAX_EXT];
+
+	_splitpath(szBmpFile, drive, dir, fname, ext );
+	char m_strJpgName[_MAX_PATH];
+	_makepath(m_strJpgName,drive, dir,fname,".jpg");
+
+	int m_iJPGQuality = AfxGetApp()->GetProfileInt("CRasterImage","m_iJPGQuality",75);
+	int m_bGrayscale = AfxGetApp()->GetProfileInt("CRasterImage","m_bGrayscale",0);
+	//转换成JPG文件
+	GetModuleFileName(NULL,path_buffer,_MAX_PATH);
+	_splitpath(path_buffer, drive, dir, fname, ext );
+	_makepath( path_buffer, drive, dir,"","");
+	if(path_buffer[strlen(path_buffer)-1] != '\\')
+		strcat(path_buffer,"\\");
+	strcat(path_buffer,"jpeg.exe");
+
+	CString m_strCommandLine;
+
+	m_strCommandLine = path_buffer;
+	m_strCommandLine += " -outfile ";
+	m_strCommandLine += "\"";
+	m_strCommandLine += m_strJpgName;
+	m_strCommandLine += "\"";
+
+	if(m_bGrayscale)
+		m_strCommandLine += " -grayscale";
+	if(m_iJPGQuality > 0 && m_iJPGQuality <= 100)
+	{
+		CString m_strQuality;
+		m_strQuality.Format(" -quality %d",m_iJPGQuality);
+		m_strCommandLine += m_strQuality;
+	}
+	m_strCommandLine += " ";
+	m_strCommandLine += "\"";
+	m_strCommandLine += szBmpFile;
+	m_strCommandLine += "\"";
+	NTSystemCommand( m_strCommandLine );
+
+	DeleteFile( szBmpFile );
+};
\ No newline at end of file
diff -urN pdf2htm_src/src/win_pdf2htmDlg.h pdfconv/src/win_pdf2htmDlg.h
--- pdf2htm_src/src/win_pdf2htmDlg.h	Wed Oct  1 11:37:18 2003
+++ pdfconv/src/win_pdf2htmDlg.h	Mon Jul 19 18:42:02 2004
@@ -1,31 +1,13 @@
-//////////////////////////////////////////////////////////////
-//
-//  Description	: PDF2HTML/BMP software
-//  Author	: verypdf.com Inc
-//  Version	: Ver1.2
-//  Platform	: Windows95/98/Me/NT/2000/XP
-//  Environment	: Visual C++ 6.0
-//  Date	: 2002/04/03
-//
-//  Copyright(C) 2000--2003 verypdf.com Inc
-//      
-//  Contact infomation:
-//        http://www.verypdf.com/
-//        support@verypdf.com
-//
-//  This program is shareware; you can redistribute and/or 
-//  modify it under the terms of the GNU General Public License.
-//  See the GNU General Public License for more details.
-//
-//               Portion base on Xpdf code
-//         Copyright 1996-2003 Glyph && Cog, LLC
-//////////////////////////////////////////////////////////////
 // win_pdf2htmDlg.h : header file
 //
 //{{AFX_INCLUDES()
 #include "webbrowser2.h"
 //}}AFX_INCLUDES
 
+
+#define IS_SFT_TRIAL
+
+
 #if !defined(AFX_WIN_PDF2HTMDLG_H__B84EE622_1D4D_4EEA_9861_7B76289E160A__INCLUDED_)
 #define AFX_WIN_PDF2HTMDLG_H__B84EE622_1D4D_4EEA_9861_7B76289E160A__INCLUDED_
 
@@ -40,6 +22,11 @@
 #include <afxtempl.h>
 #include "MenuSpawn.h"
 #include "Label.h"
+
+
+int NTSystemCommand(const char *command);
+void ConvertFromBMPToJPEG( LPSTR szBmpFile );
+
 /////////////////////////////////////////////////////////////////////////////
 // CWin_pdf2htmDlg dialog
 typedef struct SCORECONVERTtag{
@@ -62,7 +49,16 @@
 	void WriteNavHtm(CString CssPathName,CString MainHtmName,int firstpage,int lastpage);
 	void WriteBmarkHtm(HPDF m_hPDF,CString CssPathName,CString MainHtmName,int firstpage,int lastpage);
 	BOOL CheckExpired();
+
+	void ApplyUIValues();
 	void UpdateTitle();
+	void ResizeFace();
+	void ShowStat( bool bShow );
+	int  GetCurPreviewPage();
+	void SetCurPreviewPage( int iPage );
+
+	void DoPreview( int iPage );
+	void DoConvert( bool bIsHTML );
 
 	CWin_pdf2htmDlg(CWnd* pParent = NULL);	// standard constructor
 
@@ -80,6 +76,7 @@
 	CLabel	m_ctrlPDFVer;
 	CGradientProgressCtrl	m_wndPageProgress;
 	CGradientProgressCtrl	m_wndFileProgress;
+	CWebBrowser2	m_wndBrowser;
 	CWebBrowser2	m_ctrlPDFImage;
 	//}}AFX_DATA
 
@@ -105,7 +102,16 @@
 	afx_msg void OnPaint();
 	afx_msg HCURSOR OnQueryDragIcon();
 	afx_msg void OnFilePreferences();
-	afx_msg void OnFileOpen();
+	afx_msg void OnOpenPDF();
+	afx_msg void OnSaveHTML();
+	afx_msg void OnSaveJPEG();
+	afx_msg void OnSaveBMP();
+	afx_msg void OnPreview();
+	afx_msg void OnEndPreview();
+	afx_msg void OnPreviewHome();
+	afx_msg void OnPreviewPrev();
+	afx_msg void OnPreviewNext();
+	afx_msg void OnPreviewEnd();
 	afx_msg void OnUpdateFileOpen(CCmdUI* pCmdUI);
 	afx_msg void OnHelpAbout();
 	afx_msg void OnFileExit();
@@ -128,6 +134,8 @@
 	afx_msg void OnToolsPdf2htm();
 	afx_msg void OnToolsPdf2bmp();
 	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnSize(UINT nType, int cx, int cy);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
@@ -136,3 +144,4 @@
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
 
 #endif // !defined(AFX_WIN_PDF2HTMDLG_H__B84EE622_1D4D_4EEA_9861_7B76289E160A__INCLUDED_)
+
