Merge remote-tracking branch 'origin/develop'

akof1314 · Jan 26, 2015 · 8418545 · 8418545
2 parents 09e08ae + 3ace89c
commit 8418545
Showing 303 changed files with 67,578 additions and 56,330 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,15 @@
 *.exe
 *.out
 *.app
+
+*.sdf
+/Lib
+/Temp
+/ipch
+*.opensdf
+*.suo
+*.user
+*.aps
+Tools/MakeSetConfig/ipch/
+Tools/MakeSetConfig/Temp/
+Include/
diff --git a/CoolFormat3.sln b/CoolFormat3.sln
@@ -1,68 +1,101 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoolFormat3", "CoolFormat3\CoolFormat3.vcproj", "{3ED78A39-F379-4B65-9411-E952B7D87793}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyleLib", "FormatterLib\AStyle\build\vs2008\AStyleLib\AStyleLib.vcproj", "{3D0E5F57-72FE-4915-A6A7-F36F74844D38}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tidylib", "FormatterLib\tidy\build\msvc\tidylib.vcproj", "{D4C64229-FDD6-460C-B6D0-37B7A529B630}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsFormatterLib", "FormatterLib\JsFormatterLib\JsFormatterLib.vcproj", "{964A9EA4-EB9A-4660-9148-E31C25631117}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhpFormatterLib", "FormatterLib\PhpFormatterLib\PhpFormatterLib.vcproj", "{48362BDC-C157-42C5-82A3-903965BFE9BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SqlFormatterLib", "FormatterLib\SqlFormatterLib\SqlFormatterLib.vcproj", "{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CssTidyLib", "FormatterLib\CssTidyLib\CssTidyLib.vcproj", "{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonCppLib", "FormatterLib\JsonCppLib\JsonCppLib.vcproj", "{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Static|Win32 = Debug Static|Win32
-		Debug Static|x64 = Debug Static|x64
-		Release Static|Win32 = Release Static|Win32
-		Release Static|x64 = Release Static|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3ED78A39-F379-4B65-9411-E952B7D87793}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
-		{3ED78A39-F379-4B65-9411-E952B7D87793}.Debug Static|Win32.Build.0 = Debug Static|Win32
-		{3ED78A39-F379-4B65-9411-E952B7D87793}.Debug Static|x64.ActiveCfg = Debug Static|Win32
-		{3ED78A39-F379-4B65-9411-E952B7D87793}.Release Static|Win32.ActiveCfg = Release Static|Win32
-		{3ED78A39-F379-4B65-9411-E952B7D87793}.Release Static|Win32.Build.0 = Release Static|Win32
-		{3ED78A39-F379-4B65-9411-E952B7D87793}.Release Static|x64.ActiveCfg = Release Static|Win32
-		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|x64.ActiveCfg = Debug|x64
-		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|x64.Build.0 = Debug|x64
-		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|Win32.ActiveCfg = Release|Win32
-		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|x64.ActiveCfg = Release|x64
-		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|x64.Build.0 = Release|x64
-		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Debug Static|x64.ActiveCfg = Debug|Win32
-		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Release Static|Win32.ActiveCfg = Release|Win32
-		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Release Static|x64.ActiveCfg = Release|Win32
-		{964A9EA4-EB9A-4660-9148-E31C25631117}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{964A9EA4-EB9A-4660-9148-E31C25631117}.Debug Static|x64.ActiveCfg = Debug|Win32
-		{964A9EA4-EB9A-4660-9148-E31C25631117}.Release Static|Win32.ActiveCfg = Release|Win32
-		{964A9EA4-EB9A-4660-9148-E31C25631117}.Release Static|x64.ActiveCfg = Release|Win32
-		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Debug Static|x64.ActiveCfg = Debug|Win32
-		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Release Static|Win32.ActiveCfg = Release|Win32
-		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Release Static|x64.ActiveCfg = Release|Win32
-		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Debug Static|x64.ActiveCfg = Debug|Win32
-		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Release Static|Win32.ActiveCfg = Release|Win32
-		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Release Static|x64.ActiveCfg = Release|Win32
-		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Debug Static|x64.ActiveCfg = Debug|Win32
-		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Release Static|Win32.ActiveCfg = Release|Win32
-		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Release Static|x64.ActiveCfg = Release|Win32
-		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Debug Static|Win32.ActiveCfg = Debug|Win32
-		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Debug Static|x64.ActiveCfg = Debug|Win32
-		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Release Static|Win32.ActiveCfg = Release|Win32
-		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Release Static|x64.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoolFormat3", "CoolFormat3\CoolFormat3.vcxproj", "{3ED78A39-F379-4B65-9411-E952B7D87793}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630} = {D4C64229-FDD6-460C-B6D0-37B7A529B630}
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5} = {5E00DC2E-169B-4570-B7A1-442AE22DE2E5}
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38} = {3D0E5F57-72FE-4915-A6A7-F36F74844D38}
+		{964A9EA4-EB9A-4660-9148-E31C25631117} = {964A9EA4-EB9A-4660-9148-E31C25631117}
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3} = {C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB} = {F726E5CC-2920-4FA9-B4CB-291CD798C1AB}
+		{48362BDC-C157-42C5-82A3-903965BFE9BE} = {48362BDC-C157-42C5-82A3-903965BFE9BE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AStyleLib", "FormatterLib\AStyle\build\vs2008\AStyleLib\AStyleLib.vcxproj", "{3D0E5F57-72FE-4915-A6A7-F36F74844D38}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tidylib", "FormatterLib\tidy\build\msvc\tidylib.vcxproj", "{D4C64229-FDD6-460C-B6D0-37B7A529B630}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsFormatterLib", "FormatterLib\JsFormatterLib\JsFormatterLib.vcxproj", "{964A9EA4-EB9A-4660-9148-E31C25631117}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhpFormatterLib", "FormatterLib\PhpFormatterLib\PhpFormatterLib.vcxproj", "{48362BDC-C157-42C5-82A3-903965BFE9BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SqlFormatterLib", "FormatterLib\SqlFormatterLib\SqlFormatterLib.vcxproj", "{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CssTidyLib", "FormatterLib\CssTidyLib\CssTidyLib.vcxproj", "{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonCppLib", "FormatterLib\JsonCppLib\JsonCppLib.vcxproj", "{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoolFormatUnitTest", "Tools\CoolFormatUnitTest\CoolFormatUnitTest.vcxproj", "{DE8B9158-115D-4877-9238-4BAD385A5EEA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Static|Win32 = Debug Static|Win32
+		Debug Static|x64 = Debug Static|x64
+		Release Static|Win32 = Release Static|Win32
+		Release Static|x64 = Release Static|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3ED78A39-F379-4B65-9411-E952B7D87793}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
+		{3ED78A39-F379-4B65-9411-E952B7D87793}.Debug Static|Win32.Build.0 = Debug Static|Win32
+		{3ED78A39-F379-4B65-9411-E952B7D87793}.Debug Static|x64.ActiveCfg = Debug Static|Win32
+		{3ED78A39-F379-4B65-9411-E952B7D87793}.Release Static|Win32.ActiveCfg = Release Static|Win32
+		{3ED78A39-F379-4B65-9411-E952B7D87793}.Release Static|Win32.Build.0 = Release Static|Win32
+		{3ED78A39-F379-4B65-9411-E952B7D87793}.Release Static|x64.ActiveCfg = Release Static|Win32
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|Win32.Build.0 = Debug|Win32
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|x64.ActiveCfg = Debug|x64
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Debug Static|x64.Build.0 = Debug|x64
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|Win32.ActiveCfg = Release|Win32
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|Win32.Build.0 = Release|Win32
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|x64.ActiveCfg = Release|x64
+		{3D0E5F57-72FE-4915-A6A7-F36F74844D38}.Release Static|x64.Build.0 = Release|x64
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Debug Static|Win32.Build.0 = Debug|Win32
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Debug Static|x64.ActiveCfg = Debug|Win32
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Release Static|Win32.ActiveCfg = Release|Win32
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Release Static|Win32.Build.0 = Release|Win32
+		{D4C64229-FDD6-460C-B6D0-37B7A529B630}.Release Static|x64.ActiveCfg = Release|Win32
+		{964A9EA4-EB9A-4660-9148-E31C25631117}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{964A9EA4-EB9A-4660-9148-E31C25631117}.Debug Static|Win32.Build.0 = Debug|Win32
+		{964A9EA4-EB9A-4660-9148-E31C25631117}.Debug Static|x64.ActiveCfg = Debug|Win32
+		{964A9EA4-EB9A-4660-9148-E31C25631117}.Release Static|Win32.ActiveCfg = Release|Win32
+		{964A9EA4-EB9A-4660-9148-E31C25631117}.Release Static|Win32.Build.0 = Release|Win32
+		{964A9EA4-EB9A-4660-9148-E31C25631117}.Release Static|x64.ActiveCfg = Release|Win32
+		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Debug Static|Win32.Build.0 = Debug|Win32
+		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Debug Static|x64.ActiveCfg = Debug|Win32
+		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Release Static|Win32.ActiveCfg = Release|Win32
+		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Release Static|Win32.Build.0 = Release|Win32
+		{48362BDC-C157-42C5-82A3-903965BFE9BE}.Release Static|x64.ActiveCfg = Release|Win32
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Debug Static|Win32.Build.0 = Debug|Win32
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Debug Static|x64.ActiveCfg = Debug|Win32
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Release Static|Win32.ActiveCfg = Release|Win32
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Release Static|Win32.Build.0 = Release|Win32
+		{5E00DC2E-169B-4570-B7A1-442AE22DE2E5}.Release Static|x64.ActiveCfg = Release|Win32
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Debug Static|Win32.Build.0 = Debug|Win32
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Debug Static|x64.ActiveCfg = Debug|Win32
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Release Static|Win32.ActiveCfg = Release|Win32
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Release Static|Win32.Build.0 = Release|Win32
+		{C9A7BABE-72C8-4FDE-AC09-86D844D18EE3}.Release Static|x64.ActiveCfg = Release|Win32
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Debug Static|Win32.ActiveCfg = Debug|Win32
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Debug Static|Win32.Build.0 = Debug|Win32
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Debug Static|x64.ActiveCfg = Debug|Win32
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Release Static|Win32.ActiveCfg = Release|Win32
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Release Static|Win32.Build.0 = Release|Win32
+		{F726E5CC-2920-4FA9-B4CB-291CD798C1AB}.Release Static|x64.ActiveCfg = Release|Win32
+		{DE8B9158-115D-4877-9238-4BAD385A5EEA}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
+		{DE8B9158-115D-4877-9238-4BAD385A5EEA}.Debug Static|Win32.Build.0 = Debug Static|Win32
+		{DE8B9158-115D-4877-9238-4BAD385A5EEA}.Debug Static|x64.ActiveCfg = Debug Static|Win32
+		{DE8B9158-115D-4877-9238-4BAD385A5EEA}.Release Static|Win32.ActiveCfg = Release Static|Win32
+		{DE8B9158-115D-4877-9238-4BAD385A5EEA}.Release Static|Win32.Build.0 = Release Static|Win32
+		{DE8B9158-115D-4877-9238-4BAD385A5EEA}.Release Static|x64.ActiveCfg = Release Static|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal