Release-1.2.18-20021030

13 files changed, 1518 insertions, 559 deletions

diff --git a/wintools/Doxygen.dsp b/wintools/Doxygen.dsp
index c19e181..1387c8e 100644
--- a/wintools/Doxygen.dsp
+++ b/wintools/Doxygen.dsp
@@ -24,7 +24,7 @@ CFG=Doxygen - Win32 Debug
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName "Doxygen"
-# PROP Scc_LocalPath ".."
+# PROP Scc_LocalPath "."
 CPP=xicl6.exe
 RSC=rc.exe
 
@@ -42,15 +42,16 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\qtools" /I "..\src" /I "..\libpng" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "QT_NO_CODECS" /FR /YX /FD /Zm200 /c
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG" /d "QT_NO_CODECS"
+# ADD CPP /nologo /W3 /GX /O2 /I "..\src" /I "..\qtools" /I "..\libpng" /D "ENGLISH_ONLY" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=snBsc.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 qtools.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
 
 !ELSEIF  "$(CFG)" == "Doxygen - Win32 Debug"
 
@@ -66,15 +67,17 @@ LINK32=xilink6.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\qtools" /I "..\src" /I "..\libpng" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "QT_NO_CODECS" /FR /YX /FD /Zm200 /GZ /c
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG" /d "QT_NO_CODECS"
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\src" /I "..\qtools" /I "..\libpng" /D "ENGLISH_ONLY" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+# SUBTRACT RSC /x
 BSC32=snBsc.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=xilink6.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 qtools.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
+# SUBTRACT LINK32 /nodefaultlib
 
 !ENDIF 
 
@@ -87,10 +90,6 @@ LINK32=xilink6.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\libpng\adler32.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\ce_lex.cpp
 # End Source File
 # Begin Source File
@@ -107,15 +106,15 @@ SOURCE=..\src\classlist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\code.cpp
+SOURCE=..\src\cmdmapper.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\commentcnv.cpp
+SOURCE=..\src\code.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\compress.c
+SOURCE=..\src\commentcnv.cpp
 # End Source File
 # Begin Source File
 
@@ -127,10 +126,6 @@ SOURCE=..\src\cppvalue.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\crc32.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\debug.cpp
 # End Source File
 # Begin Source File
@@ -155,15 +150,15 @@ SOURCE=..\src\definition.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\deflate.c
+SOURCE=..\src\diagram.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\diagram.cpp
+SOURCE=..\src\docparser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\doc.cpp
+SOURCE=..\src\doctokenizer.cpp
 # End Source File
 # Begin Source File
 
@@ -199,7 +194,7 @@ SOURCE=..\src\groupdef.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\gzio.c
+SOURCE=..\src\htmldocvisitor.cpp
 # End Source File
 # Begin Source File
 
@@ -219,35 +214,15 @@ SOURCE=..\src\index.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\infblock.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\infcodes.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\infutil.c
+SOURCE=..\src\instdox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\instdox.cpp
+SOURCE=..\src\language.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\language.cpp
+SOURCE=..\src\latexdocvisitor.cpp
 # End Source File
 # Begin Source File
 
@@ -263,6 +238,10 @@ SOURCE=..\src\main.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\mandocvisitor.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\mangen.cpp
 # End Source File
 # Begin Source File
@@ -303,7 +282,7 @@ SOURCE=..\src\packagedef.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\png.c
+SOURCE=..\src\perlmodgen.cpp
 # End Source File
 # Begin Source File
 
@@ -311,187 +290,27 @@ SOURCE=..\src\pngenc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\pngerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pnggccrd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngpread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngrio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngrtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngrutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngvcrd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngwutil.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\pre.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\qtools\qbuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcollection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcstring.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatastream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatetime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdir_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfile_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfileinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfileinfo_win32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgarray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgdict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglobal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgvector.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qiodevice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qregexp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstring.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstringlist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtextcodec.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtextstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qxml.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\reflist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfgen.cpp
+SOURCE=..\src\rtfdocvisitor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\scanner.cpp
+SOURCE=..\src\rtfgen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\searchindex.cpp
+SOURCE=..\src\rtfstyle.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\suffixtree.cpp
+SOURCE=..\src\scanner.cpp
 # End Source File
 # Begin Source File
 
@@ -503,14 +322,6 @@ SOURCE=..\src\translator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\uncompr.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\util.cpp
 # End Source File
 # Begin Source File
@@ -519,11 +330,11 @@ SOURCE=..\src\version.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlgen.cpp
+SOURCE=..\src\xmldocvisitor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\zutil.c
+SOURCE=..\src\xmlgen.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -547,6 +358,10 @@ SOURCE=..\src\classlist.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\cmdmapper.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\code.h
 # End Source File
 # Begin Source File
@@ -591,15 +406,15 @@ SOURCE=..\src\definition.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\deflate.h
+SOURCE=..\src\diagram.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\diagram.h
+SOURCE=..\src\docparser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\doc.h
+SOURCE=..\src\doctokenizer.h
 # End Source File
 # Begin Source File
 
@@ -643,6 +458,10 @@ SOURCE=..\src\groupdef.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\htmldocvisitor.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\htmlgen.h
 # End Source File
 # Begin Source File
@@ -659,47 +478,31 @@ SOURCE=..\src\index.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\infblock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\infcodes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inffast.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inffixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\inftrees.h
+SOURCE=..\src\instdox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\infutil.h
+SOURCE=..\src\lang_cfg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\instdox.h
+SOURCE=..\src\language.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\lang_cfg.h
+SOURCE=..\src\latexdocvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\language.h
+SOURCE=..\src\latexgen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\latexgen.h
+SOURCE=..\src\logos.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\logos.h
+SOURCE=..\src\mandocvisitor.h
 # End Source File
 # Begin Source File
 
@@ -747,15 +550,7 @@ SOURCE=..\src\page.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\png.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngasmrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\pngconf.h
+SOURCE=..\src\perlmodgen.h
 # End Source File
 # Begin Source File
 
@@ -771,179 +566,15 @@ SOURCE=..\src\printdocvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\qtools\qarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qasciidict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcollection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qcstring.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatastream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdatetime.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qdir.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfeatures.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfiledefs_p.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qfileinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgeneric.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qglobal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qgvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qintdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qiodevice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qmodules.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qptrdict.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qqueue.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qregexp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qshared.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qsortedlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstring.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstringlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstrlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qstrvec.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\qtbc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\qtools\qtextcodec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtextstream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qtl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qvaluelist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qvaluestack.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qvector.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\qtools\qxml.h
+SOURCE=..\src\reflist.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\reflist.h
+SOURCE=..\src\rtfdocvisitor.h
 # End Source File
 # Begin Source File
 
@@ -951,11 +582,11 @@ SOURCE=..\src\rtfgen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\scanner.h
+SOURCE=..\src\rtfstyle.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\searchindex.h
+SOURCE=..\src\scanner.h
 # End Source File
 # Begin Source File
 
@@ -967,10 +598,6 @@ SOURCE=..\src\sortdict.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\suffixtree.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\tagreader.h
 # End Source File
 # Begin Source File
@@ -979,127 +606,51 @@ SOURCE=..\src\translator.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\translator_adapter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_br.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_cn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_cz.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_de.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_dk.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\translator_en.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\translator_es.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_fi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_fr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_gr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_hr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_hu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_it.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_jp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_kr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_nl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_no.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_pl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_pt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_ro.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_ru.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\translator_se.h
+SOURCE=..\src\treeview.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\translator_si.h
-# End Source File
-# Begin Source File
+SOURCE=..\src\unistd.h
 
-SOURCE=..\src\translator_sk.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "Doxygen - Win32 Release"
 
-SOURCE=..\src\translator_std.h
-# End Source File
-# Begin Source File
+USERDEP__UNIST="..\src\ce_lex.cpp"	"..\src\code.cpp"	"..\src\commentcnv.cpp"	"..\src\config.cpp"	"..\src\declinfo.cpp"	"..\src\defargs.cpp"	"..\src\doctokenizer.cpp"	"..\src\formula.cpp"	"..\src\pre.cpp"	"..\src\scanner.cpp"	"..\src\util.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
 
-SOURCE=..\src\translator_tw.h
-# End Source File
-# Begin Source File
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
 
-SOURCE=..\src\translator_ua.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "Doxygen - Win32 Debug"
 
-SOURCE=..\libpng\trees.h
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+USERDEP__UNIST="..\src\ce_lex.cpp"	"..\src\code.cpp"	"..\src\commentcnv.cpp"	"..\src\config.cpp"	"..\src\declinfo.cpp"	"..\src\defargs.cpp"	"..\src\doctokenizer.cpp"	"..\src\formula.cpp"	"..\src\pre.cpp"	"..\src\scanner.cpp"	"..\src\util.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
+
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
 
-SOURCE=..\src\treeview.h
-# End Source File
-# Begin Source File
+!ENDIF 
 
-SOURCE=..\src\unistd.h
 # End Source File
 # Begin Source File
 
@@ -1111,24 +662,12 @@ SOURCE=..\src\version.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\xmlgen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\zconf.h
+SOURCE=..\src\xmldocvisitor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libpng\zlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libpng\zutil.h
+SOURCE=..\src\xmlgen.h
 # End Source File
 # End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
 # End Target
 # End Project
diff --git a/wintools/Doxygen.dsw b/wintools/Doxygen.dsw
index 6e7bceb..90728a8 100644
--- a/wintools/Doxygen.dsw
+++ b/wintools/Doxygen.dsw
@@ -3,13 +3,111 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Doxygen"=".\Doxygen.dsp" - Package Owner=<4>
+Project: "Doxygen"=.\Doxygen.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
     begin source code control
     Doxygen
-    ..
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libpng
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib.dsp
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name zlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Doxysearch
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Doxysearch"=.\Doxysearch.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxysearch
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Doxytag
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Doxytag"=.\Doxytag.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxytag
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name qtools
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "libpng"=.\libpng.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    libpng
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "qtools"=.\qtools.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    qtools
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "zlib"=.\zlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    zlib
+    .
     end source code control
 }}}
 
@@ -23,6 +121,10 @@ Global:
 
 Package=<5>
 {{{
+    begin source code control
+    Doxygen
+    .
+    end source code control
 }}}
 
 Package=<3>
diff --git a/wintools/Doxysearch.dsp b/wintools/Doxysearch.dsp
new file mode 100644
index 0000000..e0bba31
--- /dev/null
+++ b/wintools/Doxysearch.dsp
@@ -0,0 +1,97 @@
+# Microsoft Developer Studio Project File - Name="Doxysearch" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Doxysearch - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxysearch.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxysearch.mak" CFG="Doxysearch - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Doxysearch - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Doxysearch - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Doxysearch"
+# PROP Scc_LocalPath "."
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Doxysearch - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\src" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "Doxysearch - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\src" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_DEBUG" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+# SUBTRACT RSC /x
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Doxysearch - Win32 Release"
+# Name "Doxysearch - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\doxysearch.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/Doxysearch.dsw b/wintools/Doxysearch.dsw
new file mode 100644
index 0000000..4a93e06
--- /dev/null
+++ b/wintools/Doxysearch.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Doxysearch"=".\Doxysearch.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxysearch
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/Doxytag.dsp b/wintools/Doxytag.dsp
new file mode 100644
index 0000000..5c896d5
--- /dev/null
+++ b/wintools/Doxytag.dsp
@@ -0,0 +1,173 @@
+# Microsoft Developer Studio Project File - Name="Doxytag" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Doxytag - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxytag.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Doxytag.mak" CFG="Doxytag - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Doxytag - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Doxytag - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "Doxytag"
+# PROP Scc_LocalPath "."
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Doxytag - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\src" /I "..\qtools" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "NDEBUG" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 qtools.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
+
+!ELSEIF  "$(CFG)" == "Doxytag - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\src" /I "..\qtools" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_DEBUG" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+# SUBTRACT RSC /x
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=xilink6.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 qtools.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Doxytag - Win32 Release"
+# Name "Doxytag - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\src\doxytag.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\logos.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\searchindex.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\suffixtree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\version.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\src\logos.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\searchindex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\suffixtree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\unistd.h
+
+!IF  "$(CFG)" == "Doxytag - Win32 Release"
+
+USERDEP__UNIST="..\src\doxytag.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
+
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Doxytag - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__UNIST="..\src\doxytag.cpp"	
+# Begin Custom Build
+InputPath=..\src\unistd.h
+
+"$(InputPath)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	echo /* this is a dummy file, that is needed for compiling files that are > $(InputPath) 
+	echo  * generated with flex under Windows 95/NT. >> $(InputPath) 
+	echo  */ >> $(InputPath) 
+	echo #if defined(_MSC_VER) >> $(InputPath) 
+	echo #include ^<io.h^> >> $(InputPath) 
+	echo #endif >> $(InputPath) 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\version.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/Doxytag.dsw b/wintools/Doxytag.dsw
new file mode 100644
index 0000000..b64be4a
--- /dev/null
+++ b/wintools/Doxytag.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Doxytag"=".\Doxytag.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    Doxytag
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/README b/wintools/README
index 4f3e599..e7ef5f2 100644
--- a/wintools/README
+++ b/wintools/README
@@ -1,9 +1,20 @@
 The files Doxygen.dsw and Doxygen.dsp can
 be used to build doxygen from within 
-Microsoft's Developer Studio 6.0.
+Microsoft's Developer Studio 6.0, and
+converted for use with DevStudio .NET.
 
-These files are created and maintained by 
-Simon Goodwin <simon.goodwin@atd.co.uk>. 
-Please contact him in case of question or
-problems with these files. 
+The project has been compartmentalised
+in the course of development of Doxygen
+1.2.19 so that there are separate project
+files for the Doxysearch and Doxytag tools
+and for the three libraries zlib, libpng
+and qtools. Credit for this update is due
+to Jorge Ramos for the original idea, and
+Johan Eriksson <johan.eriksson@uab.ericsson.se>
+for the current implementation. 
+
+These files are maintained by Simon Goodwin
+<simon.goodwin@atd.co.uk>. Please contact him
+in the event of questions or problems with
+these files. 
 
diff --git a/wintools/libpng.dsp b/wintools/libpng.dsp
new file mode 100644
index 0000000..f651b91
--- /dev/null
+++ b/wintools/libpng.dsp
@@ -0,0 +1,326 @@
+# Microsoft Developer Studio Project File - Name="libpng" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libpng - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libpng.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libpng - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libpng - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "libpng"
+# PROP Scc_LocalPath "."
+CPP=xicl6.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\libpng" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=xilink6.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libpng" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=snBsc.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=xilink6.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libpng - Win32 Release"
+# Name "libpng - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\libpng\png.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngerror.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pnggccrd.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngget.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngmem.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngpread.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngread.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngrio.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngrtran.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngrutil.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngset.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngtrans.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngvcrd.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwio.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwrite.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwtran.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngwutil.c
+
+!IF  "$(CFG)" == "libpng - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libpng - Win32 Debug"
+
+# ADD CPP /GR-
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\libpng\png.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngasmrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\pngconf.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/libpng.dsw b/wintools/libpng.dsw
new file mode 100644
index 0000000..353ef6c
--- /dev/null
+++ b/wintools/libpng.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libpng"=".\libpng.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/qtools.dsp b/wintools/qtools.dsp
new file mode 100644
index 0000000..0cf982c
--- /dev/null
+++ b/wintools/qtools.dsp
@@ -0,0 +1,357 @@
+# Microsoft Developer Studio Project File - Name="qtools" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=qtools - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "qtools.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "qtools.mak" CFG="qtools - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "qtools - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "qtools - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "qtools"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "qtools - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\qtools" /D "QT_NO_CODECS" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "qtools - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\qtools" /D "QT_NO_CODECS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "qtools - Win32 Release"
+# Name "qtools - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\qtools\qbuffer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcollection.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatastream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatetime.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdir.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdir_win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfile_win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfileinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfileinfo_win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgarray.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgdict.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglobal.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgvector.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qiodevice.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qmap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qregexp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstringlist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextcodec.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextstream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qxml.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\qtools\qarray.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qasciidict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcollection.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qcstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatastream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdatetime.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qdir.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfeatures.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfiledefs_p.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qfileinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgarray.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgeneric.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qglobal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qgvector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qintdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qiodevice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qmodules.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qptrdict.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qqueue.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qregexp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qshared.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qsortedlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstringlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstrlist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qstrvec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextcodec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtextstream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qtl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qvaluelist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qvaluestack.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qvector.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\qtools\qxml.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/qtools.dsw b/wintools/qtools.dsw
new file mode 100644
index 0000000..2549ea2
--- /dev/null
+++ b/wintools/qtools.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "qtools"=".\qtools.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    qtools
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wintools/zlib.dsp b/wintools/zlib.dsp
new file mode 100644
index 0000000..ba723ab
--- /dev/null
+++ b/wintools/zlib.dsp
@@ -0,0 +1,193 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName "zlib"
+# PROP Scc_LocalPath "."
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\libpng" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libpng" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /I /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "zlib - Win32 Release"
+# Name "zlib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\libpng\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\libpng\deflate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infblock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infcodes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inffast.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inffixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\inftrees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\infutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\trees.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libpng\zutil.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/wintools/zlib.dsw b/wintools/zlib.dsw
new file mode 100644
index 0000000..7a57279
--- /dev/null
+++ b/wintools/zlib.dsw
@@ -0,0 +1,33 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+    begin source code control
+    zlib
+    .
+    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+