RubyGems - sassc - Versions diffs - 1.8.3 → 1.8.4 - Mend

sassc 1.8.3 → 1.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (96) hide show

checksums.yaml +4 -4
data/README.md +3 -1
data/ext/libsass/.editorconfig +1 -1
data/ext/libsass/.gitignore +1 -0
data/ext/libsass/LICENSE +1 -1
data/ext/libsass/Makefile +20 -14
data/ext/libsass/Makefile.conf +0 -1
data/ext/libsass/Readme.md +3 -1
data/ext/libsass/appveyor.yml +19 -11
data/ext/libsass/docs/api-importer-example.md +2 -1235
data/ext/libsass/docs/build-with-autotools.md +10 -0
data/ext/libsass/docs/build-with-makefiles.md +18 -0
data/ext/libsass/include/sass/base.h +4 -1
data/ext/libsass/include/sass/values.h +2 -1
data/ext/libsass/src/ast.cpp +279 -346
data/ext/libsass/src/ast.hpp +234 -60
data/ext/libsass/src/base64vlq.cpp +1 -0
data/ext/libsass/src/bind.cpp +35 -45
data/ext/libsass/src/bind.hpp +1 -0
data/ext/libsass/src/color_maps.cpp +1 -0
data/ext/libsass/src/constants.cpp +4 -1
data/ext/libsass/src/constants.hpp +2 -1
data/ext/libsass/src/context.cpp +41 -31
data/ext/libsass/src/context.hpp +10 -10
data/ext/libsass/src/cssize.cpp +7 -4
data/ext/libsass/src/cssize.hpp +1 -3
data/ext/libsass/src/debugger.hpp +73 -14
data/ext/libsass/src/emitter.cpp +37 -25
data/ext/libsass/src/emitter.hpp +10 -9
data/ext/libsass/src/environment.cpp +16 -5
data/ext/libsass/src/environment.hpp +5 -3
data/ext/libsass/src/error_handling.cpp +91 -14
data/ext/libsass/src/error_handling.hpp +105 -4
data/ext/libsass/src/eval.cpp +519 -330
data/ext/libsass/src/eval.hpp +12 -13
data/ext/libsass/src/expand.cpp +92 -56
data/ext/libsass/src/expand.hpp +5 -3
data/ext/libsass/src/extend.cpp +60 -51
data/ext/libsass/src/extend.hpp +1 -3
data/ext/libsass/src/file.cpp +37 -27
data/ext/libsass/src/functions.cpp +78 -62
data/ext/libsass/src/functions.hpp +1 -0
data/ext/libsass/src/inspect.cpp +293 -64
data/ext/libsass/src/inspect.hpp +2 -0
data/ext/libsass/src/lexer.cpp +1 -0
data/ext/libsass/src/listize.cpp +14 -15
data/ext/libsass/src/listize.hpp +3 -5
data/ext/libsass/src/memory_manager.cpp +1 -0
data/ext/libsass/src/node.cpp +2 -3
data/ext/libsass/src/operation.hpp +70 -71
data/ext/libsass/src/output.cpp +28 -32
data/ext/libsass/src/output.hpp +1 -2
data/ext/libsass/src/parser.cpp +402 -183
data/ext/libsass/src/parser.hpp +19 -9
data/ext/libsass/src/plugins.cpp +1 -0
data/ext/libsass/src/position.cpp +1 -0
data/ext/libsass/src/prelexer.cpp +134 -56
data/ext/libsass/src/prelexer.hpp +51 -3
data/ext/libsass/src/remove_placeholders.cpp +35 -9
data/ext/libsass/src/remove_placeholders.hpp +4 -3
data/ext/libsass/src/sass.cpp +1 -0
data/ext/libsass/src/sass.hpp +129 -0
data/ext/libsass/src/sass_context.cpp +31 -14
data/ext/libsass/src/sass_context.hpp +2 -31
data/ext/libsass/src/sass_functions.cpp +1 -0
data/ext/libsass/src/sass_interface.cpp +5 -6
data/ext/libsass/src/sass_util.cpp +1 -2
data/ext/libsass/src/sass_util.hpp +5 -5
data/ext/libsass/src/sass_values.cpp +13 -10
data/ext/libsass/src/source_map.cpp +4 -3
data/ext/libsass/src/source_map.hpp +2 -2
data/ext/libsass/src/subset_map.hpp +0 -1
data/ext/libsass/src/to_c.cpp +1 -0
data/ext/libsass/src/to_c.hpp +1 -3
data/ext/libsass/src/to_value.cpp +3 -5
data/ext/libsass/src/to_value.hpp +1 -1
data/ext/libsass/src/units.cpp +96 -59
data/ext/libsass/src/units.hpp +10 -8
data/ext/libsass/src/utf8_string.cpp +5 -0
data/ext/libsass/src/util.cpp +23 -156
data/ext/libsass/src/util.hpp +10 -14
data/ext/libsass/src/values.cpp +1 -0
data/ext/libsass/test/test_node.cpp +2 -6
data/ext/libsass/test/test_selector_difference.cpp +1 -3
data/ext/libsass/test/test_specificity.cpp +0 -2
data/ext/libsass/test/test_superselector.cpp +0 -2
data/ext/libsass/test/test_unification.cpp +1 -3
data/ext/libsass/win/libsass.targets +18 -5
data/ext/libsass/win/libsass.vcxproj +9 -7
data/ext/libsass/win/libsass.vcxproj.filters +148 -106
data/lib/sassc/version.rb +1 -1
data/test/engine_test.rb +12 -0
data/test/native_test.rb +1 -1
metadata +3 -4
data/ext/libsass/src/to_string.cpp +0 -48
data/ext/libsass/src/to_string.hpp +0 -38

data/ext/libsass/src/util.hpp CHANGED

@@ -4,6 +4,7 @@
 #include <vector>
 #include <string>
 #include <assert.h>
+#include "sass.hpp"
 #include "sass/base.h"
 #include "ast_fwd_decl.hpp"
@@ -11,23 +12,18 @@
 namespace Sass {
-  double round(double val);
+  double round(double val, size_t precision = 0);
   char* sass_strdup(const char* str);
   double sass_atof(const char* str);
   const char* safe_str(const char *, const char* = "");
   void free_string_array(char **);
   char **copy_strings(const std::vector<std::string>&, char ***, int = 0);
-  std::string string_escape(const std::string& str);
-  std::string string_unescape(const std::string& str);
-  std::string string_eval_escapes(const std::string& str);
   std::string read_css_string(const std::string& str);
-  std::string evacuate_quotes(const std::string& str);
   std::string evacuate_escapes(const std::string& str);
   std::string string_to_output(const std::string& str);
   std::string comment_to_string(const std::string& text);
-  std::string normalize_wspace(const std::string& str);
-  std::string quote(const std::string&, char q = 0, bool keep_linefeed_whitespace = false);
+  std::string quote(const std::string&, char q = 0);
   std::string unquote(const std::string&, char* q = 0, bool keep_utf8_sequences = false);
   char detect_best_quotemark(const char* s, char qm = '"');
@@ -47,13 +43,13 @@ namespace Sass {
     std::string vecJoin(const std::vector<std::string>& vec, const std::string& sep);
     bool containsAnyPrintableStatements(Block* b);
-    bool isPrintable(Ruleset* r, Sass_Output_Style style = SASS_STYLE_NESTED);
-    bool isPrintable(Supports_Block* r, Sass_Output_Style style = SASS_STYLE_NESTED);
-    bool isPrintable(Media_Block* r, Sass_Output_Style style = SASS_STYLE_NESTED);
-    bool isPrintable(Block* b, Sass_Output_Style style = SASS_STYLE_NESTED);
-    bool isPrintable(String_Constant* s, Sass_Output_Style style = SASS_STYLE_NESTED);
-    bool isPrintable(String_Quoted* s, Sass_Output_Style style = SASS_STYLE_NESTED);
-    bool isPrintable(Declaration* d, Sass_Output_Style style = SASS_STYLE_NESTED);
+    bool isPrintable(Ruleset* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(Supports_Block* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(Media_Block* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(Block* b, Sass_Output_Style style = NESTED);
+    bool isPrintable(String_Constant* s, Sass_Output_Style style = NESTED);
+    bool isPrintable(String_Quoted* s, Sass_Output_Style style = NESTED);
+    bool isPrintable(Declaration* d, Sass_Output_Style style = NESTED);
     bool isAscii(const char chr);
   }

data/ext/libsass/src/values.cpp CHANGED

@@ -1,3 +1,4 @@
+#include "sass.hpp"
 #include "sass.h"
 #include "values.hpp"

data/ext/libsass/test/test_node.cpp CHANGED

@@ -2,7 +2,6 @@
 #include <sstream>
 #include "node.hpp"
-#include "to_string.hpp"
 #include "parser.hpp"
@@ -13,9 +12,6 @@ namespace Sass {
   Context ctx = Context::Data();
-  To_String to_string;
   const char* const ROUNDTRIP_TESTS[] = {
     NULL,
     "~",
@@ -47,7 +43,7 @@ namespace Sass {
       pOrigSelector = createComplexSelector(toTest);
     }
-    std::string expected(pOrigSelector ? pOrigSelector->perform(&to_string) : "NULL");
+    std::string expected(pOrigSelector ? pOrigSelector->to_string() : "NULL");
     // Roundtrip the selector into a node and back
@@ -63,7 +59,7 @@ namespace Sass {
     // Show the result
-    std::string result(pNewSelector ? pNewSelector->perform(&to_string) : "NULL");
+    std::string result(pNewSelector ? pNewSelector->to_string() : "NULL");
     cout << "SELECTOR: " << expected << endl;
     cout << "NEW SELECTOR:   " << result << endl;

data/ext/libsass/test/test_selector_difference.cpp CHANGED

@@ -1,21 +1,19 @@
 #include "../ast.hpp"
 #include "../context.hpp"
 #include "../parser.hpp"
-#include "../to_string.hpp"
 #include <string>
 #include <iostream>
 using namespace Sass;
 Context ctx = Context::Data();
-To_String to_string;
 Compound_Selector* selector(std::string src)
 { return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_compound_selector(); }
 void diff(std::string s, std::string t)
 {
-  std::cout << s << " - " << t << " = " << selector(s + ";")->minus(selector(t + ";"), ctx)->perform(&to_string) << std::endl;
+  std::cout << s << " - " << t << " = " << selector(s + ";")->minus(selector(t + ";"), ctx)->to_string() << std::endl;
 }
 int main()

data/ext/libsass/test/test_specificity.cpp CHANGED

@@ -1,14 +1,12 @@
 #include "../ast.hpp"
 #include "../context.hpp"
 #include "../parser.hpp"
-#include "../to_string.hpp"
 #include <string>
 #include <iostream>
 using namespace Sass;
 Context ctx = Context::Data();
-To_String to_string;
 Selector* selector(std::string src)
 { return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_selector_list(); }

data/ext/libsass/test/test_superselector.cpp CHANGED

@@ -1,13 +1,11 @@
 #include "../ast.hpp"
 #include "../context.hpp"
 #include "../parser.hpp"
-#include "../to_string.hpp"
 #include <string>
 using namespace Sass;
 Context ctx = Context(Context::Data());
-To_String to_string;
 Compound_Selector* compound_selector(std::string src)
 { return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_compound_selector(); }

data/ext/libsass/test/test_unification.cpp CHANGED

@@ -1,13 +1,11 @@
 #include "../ast.hpp"
 #include "../context.hpp"
 #include "../parser.hpp"
-#include "../to_string.hpp"
 #include <string>
 using namespace Sass;
 Context ctx = Context(Context::Data());
-To_String to_string;
 Compound_Selector* selector(std::string src)
 { return Parser::from_c_str(src.c_str(), ctx, "", Position()).parse_compound_selector(); }
@@ -15,7 +13,7 @@ Compound_Selector* selector(std::string src)
 void unify(std::string lhs, std::string rhs)
 {
   Compound_Selector* unified = selector(lhs + ";")->unify_with(selector(rhs + ";"), ctx);
-  std::cout << lhs << " UNIFIED WITH " << rhs << " =\t" << (unified ? unified->perform(&to_string) : "NOTHING") << std::endl;
+  std::cout << lhs << " UNIFIED WITH " << rhs << " =\t" << (unified ? unified->to_string() : "NOTHING") << std::endl;
 }
 int main()

data/ext/libsass/win/libsass.targets CHANGED

@@ -1,5 +1,16 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="LibSass Header files">
+  <ItemGroup Label="LibSass Include Headers">
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass2scss.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\base.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\context.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\functions.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\interface.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\values.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h" />
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h.in" />
+  </ItemGroup>
+  <ItemGroup Label="LibSass Headers">
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_def_macros.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_factory.hpp" />
@@ -7,6 +18,7 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\backtrace.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\base64vlq.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\bind.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\b64\cencode.h" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\color_maps.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\constants.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\context.hpp" />
@@ -36,11 +48,14 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\position.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\prelexer.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\remove_placeholders.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_context.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_functions.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_util.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_values.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\source_map.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\subset_map.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_c.hpp" />
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_string.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_value.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\units.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8.h" />
@@ -51,8 +66,7 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\util.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\values.hpp" />
   </ItemGroup>
-  <ItemGroup Label="LibSass Source files">
+  <ItemGroup Label="LibSass Sources">
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\base64vlq.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\bind.cpp" />
@@ -91,7 +105,6 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass2scss.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\source_map.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_c.cpp" />
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\to_string.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_value.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\units.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\utf8_string.cpp" />

data/ext/libsass/win/libsass.vcxproj CHANGED

@@ -4,16 +4,17 @@
     <LIBSASS_VERSION>[NA]</LIBSASS_VERSION>
     <LIBSASS_SRC_DIR>..\src</LIBSASS_SRC_DIR>
     <LIBSASS_HEADERS_DIR>..\src</LIBSASS_HEADERS_DIR>
+    <LIBSASS_INCLUDES_DIR>..\include</LIBSASS_INCLUDES_DIR>
   </PropertyGroup>
   <Target Name="GitVersion">
-    <Exec Command="git -C .. describe --abbrev=4 --dirty --always --tags" LogStandardErrorAsError="true" ContinueOnError="true">
+    <Exec Command="git -C .. describe --abbrev=4 --dirty --always --tags" LogStandardErrorAsError="true" ContinueOnError="true" ConsoleToMSBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="LIBSASS_VERSION" />
     </Exec>
   </Target>
   <Target Name="VersionMacros">
     <ItemGroup>
       <ClCompile>
-        <PreprocessorDefinitions>%(PreprocessorDefinitions);LIBSASS_VERSION="$(LIBSASS_VERSION)"</PreprocessorDefinitions>
+        <PreprocessorDefinitions>%(PreprocessorDefinitions);LIBSASS_VERSION="$(LIBSASS_VERSION)";</PreprocessorDefinitions>
       </ClCompile>
     </ItemGroup>
   </Target>
@@ -54,6 +55,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(LIBSASS_STATIC_LIB) == ''">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PreprocessorDefinitions>ADD_EXPORTS;$(PreprocessorDefinitions);</PreprocessorDefinitions>
   </PropertyGroup>
   <PropertyGroup Condition="$(LIBSASS_STATIC_LIB) != ''">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -125,7 +127,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;$(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -138,7 +140,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;$(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -153,7 +155,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;$(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -170,7 +172,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;$(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -179,7 +181,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <Import Project="libsass.targets"/>
+  <Import Project="libsass.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

data/ext/libsass/win/libsass.vcxproj.filters CHANGED

@@ -1,303 +1,345 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files">
+    <Filter Include="Headers">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Include Headers">
+      <UniqueIdentifier>{bb9c270d-e9f5-49bf-afda-771a1a4bb5b7}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;in;inl;inc;xsd</Extensions>
     </Filter>
   </ItemGroup>
+  <ItemGroup Label="Includes">
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass2scss.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\base.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\context.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\functions.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\interface.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\values.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_INCLUDES_DIR)\sass\version.h.in">
+      <Filter>Include Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
   <ItemGroup Label="Headers">
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_def_macros.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_factory.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_fwd_decl.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\b64\cencode.h">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\backtrace.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\base64vlq.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\bind.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\color_maps.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\constants.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\context.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\cssize.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\debug.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\emitter.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\environment.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\error_handling.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\eval.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\expand.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\extend.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\file.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\functions.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\inspect.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\json.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\kwd_arg_macros.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\lexer.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\listize.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\mapping.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\memory_manager.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\node.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\operation.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\output.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\parser.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\paths.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\plugins.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\position.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\prelexer.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\remove_placeholders.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_context.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_functions.hpp">
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_util.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_values.hpp">
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\source_map.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\subset_map.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_c.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_string.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_value.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\units.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8.h">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8\checked.h">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8\core.h">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8\unchecked.h">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8_string.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\util.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\values.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\b64\cencode.h">
+      <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup Label="Sources">
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\base64vlq.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\bind.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Condition="$(VisualStudioVersion) &lt; 14.0" Include="$(LIBSASS_SRC_DIR)\c99func.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\cencode.c">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\color_maps.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\constants.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\context.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\cssize.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\emitter.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\environment.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\error_handling.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\eval.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\expand.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\extend.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\file.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\functions.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\inspect.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\json.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\lexer.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\listize.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\memory_manager.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\node.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\output.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\parser.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\plugins.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\position.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\prelexer.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\remove_placeholders.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_interface.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_context.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_functions.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_util.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_values.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass2scss.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\source_map.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_c.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\to_string.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_value.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\units.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\utf8_string.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\util.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\values.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>