Merge branch 'master' of github.com:doxygen/doxygen

1 files changed, 244 insertions, 176 deletions

diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj
index 5137f9a..b687c4c 100644
--- a/winbuild/Doxygen.vcproj
+++ b/winbuild/Doxygen.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Doxygen"
 	ProjectGUID="{309C9A4A-94D2-4837-9A11-45B0A6CF35C3}"
 	RootNamespace="Doxygen"
@@ -31,6 +31,9 @@
 		<ToolFile
 			RelativePath=".\Gen_head.rules"
 		/>
+		<ToolFile
+			RelativePath=".\Languages.rules"
+		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
@@ -42,27 +45,34 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
+				Name="Config_dw"
+			/>
+			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="Lex"
+				Name="Config"
+			/>
+			<Tool
+				Name="Version"
 			/>
 			<Tool
 				Name="Settings"
 			/>
 			<Tool
-				Name="Version"
+				Name="Gen_head"
 			/>
 			<Tool
-				Name="Config"
+				Name="Languages"
 			/>
 			<Tool
-				Name="Genhead"
+				Name="Lex"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -91,6 +101,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
+				ProgramDatabaseFileName=".\Debug\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -111,9 +122,9 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Debug"
 				GenerateManifest="false"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				IgnoreDefaultLibraryNames="libcmtd.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/Doxygen.pdb"
+				ProgramDatabaseFile=".\Debug\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
@@ -145,35 +156,42 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\bin\Debug64"
-			IntermediateDirectory=".\Debug64"
+			Name="Release|Win32"
+			OutputDirectory="..\bin\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
+				Name="Config_dw"
+			/>
+			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="Lex"
+				Name="Config"
+			/>
+			<Tool
+				Name="Version"
 			/>
 			<Tool
 				Name="Settings"
 			/>
 			<Tool
-				Name="Version"
+				Name="Gen_head"
 			/>
 			<Tool
-				Name="Config"
+				Name="Languages"
 			/>
 			<Tool
-				Name="Genhead"
+				Name="Lex"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -183,33 +201,36 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug64\Doxygen.tlb"
+				TypeLibraryName=".\Release\Doxygen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200 /bigobj"
-				Optimization="0"
+				AdditionalOptions="/Zm200 "
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,."
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug64/Doxygen.pch"
-				AssemblerListingLocation=".\Debug64/"
-				ObjectFile=".\Debug64/"
-				ProgramDataBaseFileName=".\Debug64/"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/Doxygen.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
+				ProgramDatabaseFileName=".\Release\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -217,19 +238,18 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="qtools.lib ws2_32.lib iconv64.lib shell32.lib"
-				OutputFile="..\bin\Debug64\doxygen.exe"
-				LinkIncremental="2"
+				AdditionalOptions="/LTCG"
+				AdditionalDependencies="qtools.lib iconv.lib shell32.lib"
+				OutputFile="..\bin\Release\doxygen.exe"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Debug64"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug64/Doxygen.pdb"
+				AdditionalLibraryDirectories="Release"
+				ProgramDatabaseFile=".\Release\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -243,7 +263,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug64/Doxygen.bsc"
+				OutputFile=".\Release/Doxygen.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -256,14 +276,15 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\bin\Release"
-			IntermediateDirectory=".\Release"
+			Name="Debug|x64"
+			OutputDirectory="..\bin\Debug64"
+			IntermediateDirectory=".\Debug64"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -284,7 +305,10 @@
 				Name="Config"
 			/>
 			<Tool
-				Name="Genhead"
+				Name="Gen_head"
+			/>
+			<Tool
+				Name="Languages"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -294,35 +318,34 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release\Doxygen.tlb"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug64\Doxygen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200 "
-				Optimization="2"
-				InlineFunctionExpansion="2"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
+				AdditionalOptions="/Zm200 /bigobj"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,."
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/Doxygen.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\Debug64/Doxygen.pch"
+				AssemblerListingLocation=".\Debug64/"
+				ObjectFile=".\Debug64/"
+				ProgramDataBaseFileName=".\Debug64/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
+				ProgramDatabaseFileName=".\Debug64\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 			/>
 			<Tool
@@ -330,18 +353,19 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/LTCG"
-				AdditionalDependencies="qtools.lib iconv.lib shell32.lib"
-				OutputFile="..\bin\Release\doxygen.exe"
-				LinkIncremental="1"
+				AdditionalDependencies="qtools.lib ws2_32.lib iconv64.lib shell32.lib"
+				OutputFile="..\bin\Debug64\doxygen.exe"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="Release"
-				ProgramDatabaseFile=".\Release/Doxygen.pdb"
+				AdditionalLibraryDirectories="Debug64"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug64\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -355,7 +379,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release/Doxygen.bsc"
+				OutputFile=".\Debug64/Doxygen.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -376,6 +400,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -396,7 +421,10 @@
 				Name="Config"
 			/>
 			<Tool
-				Name="Genhead"
+				Name="Gen_head"
+			/>
+			<Tool
+				Name="Languages"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -429,6 +457,7 @@
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
+				ProgramDatabaseFileName=".\Release64\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -449,7 +478,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Release64"
-				ProgramDatabaseFile=".\Release64/Doxygen.pdb"
+				ProgramDatabaseFile=".\Release64\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
@@ -493,10 +522,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\constexp.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\src\ce_parse.cpp"
 				>
 			</File>
@@ -545,6 +570,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\constexp.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\src\cppvalue.cpp"
 				>
 			</File>
@@ -577,6 +606,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\dia.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\src\diagram.cpp"
 				>
 			</File>
@@ -841,17 +874,17 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\textdocvisitor.h"
+				RelativePath="..\src\textdocvisitor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\textdocvisitor.cpp"
+				RelativePath="..\src\textdocvisitor.h"
 				>
 			</File>
 			<File
 				RelativePath="..\src\tooltip.cpp"
 				>
-			</File>			
+			</File>
 			<File
 				RelativePath="..\src\util.cpp"
 				>
@@ -894,22 +927,22 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c"
+						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c&#x0D;&#x0A;"
 						Outputs="$(InputDir)\..\src\ce_parse.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c"
+						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c&#x0D;&#x0A;"
 						Outputs="$(InputDir)\..\src\ce_parse.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -938,22 +971,22 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on vhdlparser.y"
-						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c"
+						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;"
 						Outputs="$(InputDir)$(InputName).cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on vhdlparser.y"
-						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c"
+						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;"
 						Outputs="$(InputDir)$(InputName).cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1022,7 +1055,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Lex"
@@ -1030,7 +1063,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Lex"
@@ -1058,7 +1091,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Lex"
@@ -1066,7 +1099,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Lex"
@@ -1110,7 +1143,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Lex"
@@ -1118,7 +1151,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Lex"
@@ -1146,7 +1179,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Lex"
@@ -1154,7 +1187,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Lex"
@@ -1182,7 +1215,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Lex"
@@ -1190,7 +1223,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Lex"
@@ -1209,27 +1242,58 @@
 		</Filter>
 		<Filter
 			Name="Python Files"
-			Filter="py"
 			>
 			<File
-				RelativePath="..\src\settings.py"
+				RelativePath="..\src\lang_cfg.py"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
-						Name="Settings"
+						Name="Languages"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="Languages"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
 					<Tool
+						Name="Languages"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="Languages"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\settings.py"
+				>
+				<FileConfiguration
+					Name="Debug|win32"
+					>
+					<Tool
 						Name="Settings"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Release|win32"
+					>
+					<Tool
+						Name="Settings"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Settings"
@@ -1247,21 +1311,21 @@
 				RelativePath="..\src\version.py"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Debug|win32"
 					>
 					<Tool
 						Name="Version"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|win32"
 					>
 					<Tool
 						Name="Version"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Version"
@@ -1284,21 +1348,21 @@
 				RelativePath="..\src\config.xml"
 				>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Debug|win32"
 					>
 					<Tool
 						Name="Config"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|win32"
 					>
 					<Tool
 						Name="Config"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Config"
@@ -1317,7 +1381,7 @@
 			Name="Generating header Files"
 			>
 			<File
-				RelativePath="..\src\index.xsd"
+				RelativePath="..\src\bib2xhtml.pl"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1327,14 +1391,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1359,14 +1423,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1381,7 +1445,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\layout_default.xml"
+				RelativePath="..\src\doxygen.bst"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1391,14 +1455,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1413,7 +1477,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\header.html"
+				RelativePath="..\src\doxygen.css"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1423,14 +1487,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1445,7 +1509,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\footer.html"
+				RelativePath="..\src\doxygen.sty"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1455,14 +1519,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1477,7 +1541,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\search_functions.php"
+				RelativePath="..\src\dynsections.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1487,14 +1551,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1509,7 +1573,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\search_opensearch.php"
+				RelativePath="..\src\extsearch.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1519,14 +1583,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1541,7 +1605,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\search.js"
+				RelativePath="..\src\footer.html"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1551,14 +1615,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1573,7 +1637,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\search.css"
+				RelativePath="..\src\header.html"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1583,14 +1647,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1605,7 +1669,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\extsearch.js"
+				RelativePath="..\src\index.xsd"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1615,14 +1679,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1637,7 +1701,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\doxygen.css"
+				RelativePath="..\src\jquery_fx.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1647,14 +1711,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1669,7 +1733,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\doxygen.sty"
+				RelativePath="..\src\jquery_p1.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1679,14 +1743,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1701,7 +1765,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\navtree.js"
+				RelativePath="..\src\jquery_p2.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1711,14 +1775,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1733,7 +1797,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\resize.js"
+				RelativePath="..\src\jquery_p3.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1743,14 +1807,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1765,7 +1829,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\jquery_p1.js"
+				RelativePath="..\src\jquery_pt.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1775,14 +1839,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1797,7 +1861,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\jquery_p2.js"
+				RelativePath="..\src\jquery_ui.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1807,14 +1871,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1829,7 +1893,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\jquery_p3.js"
+				RelativePath="..\src\layout_default.xml"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1839,14 +1903,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1861,7 +1925,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\jquery_ui.js"
+				RelativePath="..\src\navtree.css"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1871,14 +1935,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1893,7 +1957,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\jquery_fx.js"
+				RelativePath="..\src\navtree.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1903,14 +1967,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1925,7 +1989,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\jquery_pt.js"
+				RelativePath="..\src\resize.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1935,14 +1999,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1957,7 +2021,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\navtree.css"
+				RelativePath="..\src\search.css"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1967,14 +2031,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -1989,7 +2053,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\svgpan.js"
+				RelativePath="..\src\search.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1999,14 +2063,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -2021,7 +2085,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\dynsections.js"
+				RelativePath="..\src\search_functions.php"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2031,14 +2095,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -2053,7 +2117,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\doxygen.bst"
+				RelativePath="..\src\search_opensearch.php"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2063,14 +2127,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -2085,7 +2149,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\bib2xhtml.pl"
+				RelativePath="..\src\svgpan.js"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2095,14 +2159,14 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="Gen_head"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="Gen_head"
@@ -2218,6 +2282,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\dia.h"
+				>
+			</File>
+			<File
 				RelativePath="..\src\diagram.h"
 				>
 			</File>
@@ -2743,7 +2811,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2753,7 +2821,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"