100 changed files with 4144 additions and 10426 deletions
--- a/.codecov.yml
+++ b/.codecov.yml
@ -1,7 +0,0 @@
-comment: false
-coverage:
-  status:
-    project:
-      default:
-        informational: true
-    patch: off
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-tests/data/* -text
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,8 +0,0 @@
---
-name: Bug report
-about: Create a report if you believe you've found a bug in this project; please use GitHub Discussions instead if you think the bug may be in your code.
-title: ''
-labels: bug
-assignees: ''
-
---
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Help and support
-    url: https://github.com/zeux/pugixml/discussions
-    about: Please use GitHub Discussions if you have questions or need help.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,8 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
---
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,52 +0,0 @@
-name: build
-
-on:
-  push:
-    branches:
-      - 'master'
-  pull_request:
-
-jobs:
-  unix:
-    strategy:
-      matrix:
-        os: [ubuntu, macos]
-        compiler: [g++, clang++]
-        defines: [standard, PUGIXML_WCHAR_MODE, PUGIXML_COMPACT, PUGIXML_NO_EXCEPTIONS]
-        exclude:
-          - os: macos
-            compiler: g++
-    name: ${{matrix.os}} (${{matrix.compiler}}, ${{matrix.defines}})
-    runs-on: ${{matrix.os}}-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: make test
-      run: |
-        export CXX=${{matrix.compiler}}
-        make test cxxstd=c++11 defines=${{matrix.defines}} config=release -j2
-        make test cxxstd=c++98 defines=${{matrix.defines}} config=debug -j2
-        make test defines=${{matrix.defines}} config=sanitize -j2
-    - name: make coverage
-      if: ${{!(matrix.os == 'ubuntu' && matrix.compiler == 'clang++')}} # linux/clang produces coverage info gcov can't parse
-      run: |
-        export CXX=${{matrix.compiler}}
-        make test defines=${{matrix.defines}} config=coverage -j2
-        bash <(curl -s https://codecov.io/bash) -f pugixml.cpp.gcov -X search -t ${{secrets.CODECOV_TOKEN}} -B ${{github.ref}}
-
-  windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        arch: [Win32, x64]
-        defines: [standard, PUGIXML_WCHAR_MODE, PUGIXML_COMPACT, PUGIXML_NO_EXCEPTIONS]
-    steps:
-    - uses: actions/checkout@v1
-    - name: cmake configure
-      run: cmake . -DPUGIXML_BUILD_TESTS=ON -D${{matrix.defines}}=ON -A ${{matrix.arch}}
-    - name: cmake test
-      shell: bash # necessary for fail-fast
-      run: |
-        cmake --build . -- -property:Configuration=Debug -verbosity:minimal
-        Debug/pugixml-check.exe
-        cmake --build . -- -property:Configuration=Release -verbosity:minimal
-        Release/pugixml-check.exe
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-/build/
-/.vscode/
+build/
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,14 @@
+sudo: false
+language: cpp
+os:
+  - linux
+  - osx
+env:
+  - CONFIG=coverage DEFINES=standard
+  - CONFIG=coverage DEFINES=PUGIXML_WCHAR_MODE
+  - CONFIG=coverage DEFINES=PUGIXML_COMPACT
+  - CONFIG=release DEFINES=standard
+  - CONFIG=release DEFINES=PUGIXML_WCHAR_MODE
+  - CONFIG=release DEFINES=PUGIXML_COMPACT
+script: make test defines=$DEFINES config=$CONFIG -j2
+after_success: bash <(curl -s https://codecov.io/bash) -f pugixml.cpp.gcov
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,263 +0,0 @@
-cmake_minimum_required(VERSION 3.4)
-project(pugixml VERSION 1.13 LANGUAGES CXX)
-
-include(CMakePackageConfigHelpers)
-include(CMakeDependentOption)
-include(GNUInstallDirs)
-include(CTest)
-
-cmake_dependent_option(PUGIXML_USE_VERSIONED_LIBDIR
-  "Use a private subdirectory to install the headers and libraries" OFF
-  "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF)
-
-cmake_dependent_option(PUGIXML_USE_POSTFIX
-  "Use separate postfix for each configuration to make sure you can install multiple build outputs" OFF
-  "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF)
-
-cmake_dependent_option(PUGIXML_STATIC_CRT
-  "Use static MSVC RT libraries" OFF
-  "MSVC" OFF)
-
-cmake_dependent_option(PUGIXML_BUILD_TESTS
-  "Build pugixml tests" OFF
-  "BUILD_TESTING;CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF)
-
-# Custom build defines
-set(PUGIXML_BUILD_DEFINES CACHE STRING "Build defines for custom options")
-separate_arguments(PUGIXML_BUILD_DEFINES)
-
-# Technically not needed for this file. This is builtin CMAKE global variable.
-option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) 
-
-# Expose option to build PUGIXML as static as well when the global BUILD_SHARED_LIBS variable is set
-cmake_dependent_option(PUGIXML_BUILD_SHARED_AND_STATIC_LIBS
-  "Build both shared and static libraries" OFF
-  "BUILD_SHARED_LIBS" OFF)
-
-# Expose options from the pugiconfig.hpp
-option(PUGIXML_WCHAR_MODE "Enable wchar_t mode" OFF)
-option(PUGIXML_COMPACT "Enable compact mode" OFF)
-
-# Advanced options from pugiconfig.hpp
-option(PUGIXML_NO_XPATH "Disable XPath" OFF)
-option(PUGIXML_NO_STL "Disable STL" OFF)
-option(PUGIXML_NO_EXCEPTIONS "Disable Exceptions" OFF)
-mark_as_advanced(PUGIXML_NO_XPATH PUGIXML_NO_STL PUGIXML_NO_EXCEPTIONS)
-
-# Policy configuration
-if(POLICY CMP0091)
-    cmake_policy(SET CMP0091 NEW) # Enables use of MSVC_RUNTIME_LIBRARY
-endif()
-
-set(PUGIXML_PUBLIC_DEFINITIONS
-  $<$<BOOL:${PUGIXML_WCHAR_MODE}>:PUGIXML_WCHAR_MODE>
-  $<$<BOOL:${PUGIXML_COMPACT}>:PUGIXML_COMPACT>
-  $<$<BOOL:${PUGIXML_NO_XPATH}>:PUGIXML_NO_XPATH>
-  $<$<BOOL:${PUGIXML_NO_STL}>:PUGIXML_NO_STL>
-  $<$<BOOL:${PUGIXML_NO_EXCEPTIONS}>:PUGIXML_NO_EXCEPTIONS>)
-
-# This is used to backport a CMake 3.15 feature, but is also forwards compatible
-if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
-  set(CMAKE_MSVC_RUNTIME_LIBRARY
-    MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<NOT:$<BOOL:${PUGIXML_STATIC_CRT}>>:DLL>)
-endif()
-
-if (NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-
-if (NOT DEFINED CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 11)
-endif()
-
-if (PUGIXML_USE_POSTFIX)
-  set(CMAKE_RELWITHDEBINFO_POSTFIX _r)
-  set(CMAKE_MINSIZEREL_POSTFIX _m)
-  set(CMAKE_DEBUG_POSTFIX _d)
-endif()
-
-if (CMAKE_VERSION VERSION_LESS 3.15)
-  set(msvc-rt $<TARGET_PROPERTY:MSVC_RUNTIME_LIBRARY>)
-
-  set(msvc-rt-mtd-shared $<STREQUAL:${msvc-rt},MultiThreadedDebugDLL>)
-  set(msvc-rt-mtd-static $<STREQUAL:${msvc-rt},MultiThreadedDebug>)
-  set(msvc-rt-mt-shared $<STREQUAL:${msvc-rt},MultiThreadedDLL>)
-  set(msvc-rt-mt-static $<STREQUAL:${msvc-rt},MultiThreaded>)
-  unset(msvc-rt)
-
-  set(msvc-rt-mtd-shared $<${msvc-rt-mtd-shared}:-MDd>)
-  set(msvc-rt-mtd-static $<${msvc-rt-mtd-static}:-MTd>)
-  set(msvc-rt-mt-shared $<${msvc-rt-mt-shared}:-MD>)
-  set(msvc-rt-mt-static $<${msvc-rt-mt-static}:-MT>)
-endif()
-
-set(versioned-dir $<$<BOOL:${PUGIXML_USE_VERSIONED_LIBDIR}>:/pugixml-${PROJECT_VERSION}>)
-
-set(libs)
-
-if (BUILD_SHARED_LIBS)
-  add_library(pugixml-shared SHARED
-    ${PROJECT_SOURCE_DIR}/scripts/pugixml_dll.rc
-    ${PROJECT_SOURCE_DIR}/src/pugixml.cpp)
-  add_library(pugixml::shared ALIAS pugixml-shared)
-  list(APPEND libs pugixml-shared)
-  string(CONCAT pugixml.msvc $<OR:
-    $<STREQUAL:${CMAKE_CXX_COMPILER_FRONTEND_VARIANT},MSVC>,
-    $<CXX_COMPILER_ID:MSVC>
-  >)
-
-  set_property(TARGET pugixml-shared PROPERTY EXPORT_NAME shared)
-  target_include_directories(pugixml-shared
-    PUBLIC
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-  target_compile_definitions(pugixml-shared
-    PUBLIC
-      ${PUGIXML_BUILD_DEFINES}
-      ${PUGIXML_PUBLIC_DEFINITIONS}
-    PRIVATE
-      PUGIXML_API=$<IF:${pugixml.msvc},__declspec\(dllexport\),__attribute__\(\(visibility\("default"\)\)\)>
-    )
-  target_compile_options(pugixml-shared
-    PRIVATE
-      ${msvc-rt-mtd-shared}
-      ${msvc-rt-mtd-static}
-      ${msvc-rt-mt-shared}
-      ${msvc-rt-mt-static})
-endif()
-
-if (NOT BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS)
-  add_library(pugixml-static STATIC
-    ${PROJECT_SOURCE_DIR}/src/pugixml.cpp)
-  add_library(pugixml::static ALIAS pugixml-static)
-  list(APPEND libs pugixml-static)
-
-  set_property(TARGET pugixml-static PROPERTY EXPORT_NAME static)
-  target_include_directories(pugixml-static
-    PUBLIC
-      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
-  target_compile_definitions(pugixml-static
-    PUBLIC
-      ${PUGIXML_BUILD_DEFINES}
-      ${PUGIXML_PUBLIC_DEFINITIONS})
-  target_compile_options(pugixml-static
-    PRIVATE
-      ${msvc-rt-mtd-shared}
-      ${msvc-rt-mtd-static}
-      ${msvc-rt-mt-shared}
-      ${msvc-rt-mt-static})
-endif()
-
-if (BUILD_SHARED_LIBS)
-  set(pugixml-alias pugixml-shared)
-else()
-  set(pugixml-alias pugixml-static)
-endif()
-add_library(pugixml INTERFACE)
-target_link_libraries(pugixml INTERFACE ${pugixml-alias})
-add_library(pugixml::pugixml ALIAS pugixml)
-
-set_target_properties(${libs}
-  PROPERTIES
-    MSVC_RUNTIME_LIBRARY ${CMAKE_MSVC_RUNTIME_LIBRARY}
-    EXCLUDE_FROM_ALL ON
-    POSITION_INDEPENDENT_CODE ON
-    SOVERSION ${PROJECT_VERSION_MAJOR}
-    VERSION ${PROJECT_VERSION}
-    OUTPUT_NAME pugixml)
-
-set_target_properties(${libs}
-  PROPERTIES
-    EXCLUDE_FROM_ALL OFF)
-set(install-targets pugixml ${libs})
-
-configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/scripts/pugixml-config.cmake.in"
-  "${PROJECT_BINARY_DIR}/pugixml-config.cmake"
-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-  NO_SET_AND_CHECK_MACRO)
-
-write_basic_package_version_file(
-  "${PROJECT_BINARY_DIR}/pugixml-config-version.cmake"
-  COMPATIBILITY SameMajorVersion)
-
-if (PUGIXML_USE_POSTFIX)
-  if(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-    set(LIB_POSTFIX ${CMAKE_RELWITHDEBINFO_POSTFIX})
-  elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)
-    set(LIB_POSTFIX ${CMAKE_MINSIZEREL_POSTFIX})
-  elseif(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-  endif()
-endif()
-
-configure_file(scripts/pugixml.pc.in pugixml.pc @ONLY)
-
-if (NOT DEFINED PUGIXML_RUNTIME_COMPONENT)
-  set(PUGIXML_RUNTIME_COMPONENT Runtime)
-endif()
-
-if (NOT DEFINED PUGIXML_LIBRARY_COMPONENT)
-  set(PUGIXML_LIBRARY_COMPONENT Library)
-endif()
-
-if (NOT DEFINED PUGIXML_DEVELOPMENT_COMPONENT)
-  set(PUGIXML_DEVELOPMENT_COMPONENT Development)
-endif()
-
-set(namelink-component)
-if (NOT CMAKE_VERSION VERSION_LESS 3.12)
-  set(namelink-component NAMELINK_COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
-endif()
-install(TARGETS ${install-targets}
-  EXPORT pugixml-targets
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${PUGIXML_RUNTIME_COMPONENT}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${PUGIXML_LIBRARY_COMPONENT} ${namelink-component}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${versioned-dir})
-
-install(EXPORT pugixml-targets
-  NAMESPACE pugixml::
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
-
-export(EXPORT pugixml-targets
-  NAMESPACE pugixml::)
-
-install(FILES
-  "${PROJECT_BINARY_DIR}/pugixml-config-version.cmake"
-  "${PROJECT_BINARY_DIR}/pugixml-config.cmake"
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
-
-install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
-
-install(
-  FILES
-    "${PROJECT_SOURCE_DIR}/src/pugiconfig.hpp"
-    "${PROJECT_SOURCE_DIR}/src/pugixml.hpp"
-  DESTINATION
-    ${CMAKE_INSTALL_INCLUDEDIR}${versioned-dir} COMPONENT ${PUGIXML_DEVELOPMENT_COMPONENT})
-
-if (PUGIXML_BUILD_TESTS)
-  set(fuzz-pattern "tests/fuzz_*.cpp")
-  set(test-pattern "tests/*.cpp")
-  if (CMAKE_VERSION VERSION_GREATER 3.11)
-    list(INSERT fuzz-pattern 0 CONFIGURE_DEPENDS)
-    list(INSERT test-pattern 0 CONFIGURE_DEPENDS)
-  endif()
-  file(GLOB test-sources ${test-pattern})
-  file(GLOB fuzz-sources ${fuzz-pattern})
-  list(REMOVE_ITEM test-sources ${fuzz-sources})
-
-  add_custom_target(check
-    COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
-
-  add_executable(pugixml-check ${test-sources})
-  add_test(NAME pugixml::test
-    COMMAND pugixml-check
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-  add_dependencies(check pugixml-check)
-  target_link_libraries(pugixml-check
-    PRIVATE
-      pugixml::pugixml)
-endif()
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,24 +0,0 @@
-MIT License
-
-Copyright (c) 2006-2022 Arseny Kapoulkine
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
--- a/36
+++ b/36
@ -3,18 +3,16 @@ MAKEFLAGS+=-r

 config=debug
 defines=standard
-cxxstd=c++11
-# set cxxstd=any to disable use of -std=...

-BUILD=build/make-$(CXX)-$(config)-$(defines)-$(cxxstd)
+BUILD=build/make-$(CXX)-$(config)-$(defines)

 SOURCES=src/pugixml.cpp $(filter-out tests/fuzz_%,$(wildcard tests/*.cpp))
 EXECUTABLE=$(BUILD)/test

 VERSION=$(shell sed -n 's/.*version \(.*\).*/\1/p' src/pugiconfig.hpp)
-RELEASE=$(filter-out scripts/archive.py docs/%.adoc,$(shell git ls-files docs scripts src CMakeLists.txt LICENSE.md readme.txt))
+RELEASE=$(shell git ls-files src docs/*.html docs/*.css docs/samples docs/images scripts contrib readme.txt)

-CXXFLAGS=-g -Wall -Wextra -Werror -pedantic -Wundef -Wshadow -Wcast-align -Wcast-qual -Wold-style-cast -Wdouble-promotion
+CXXFLAGS=-g -Wall -Wextra -Werror -pedantic -Wundef -Wshadow -Wold-style-cast -Wcast-align
 LDFLAGS=

 ifeq ($(config),release)
@ -27,8 +25,13 @@ ifeq ($(config),coverage)
 endif

 ifeq ($(config),sanitize)
-	CXXFLAGS+=-fsanitize=address,undefined -fno-sanitize=float-divide-by-zero,float-cast-overflow -fno-sanitize-recover=all
-	LDFLAGS+=-fsanitize=address,undefined
+	CXXFLAGS+=-fsanitize=address
+	LDFLAGS+=-fsanitize=address
+
+	ifneq ($(shell uname),Darwin)
+		CXXFLAGS+=-fsanitize=undefined
+		LDFLAGS+=-fsanitize=undefined
+	endif
 endif

 ifeq ($(config),analyze)
@ -44,8 +47,9 @@ ifneq ($(findstring PUGIXML_NO_EXCEPTIONS,$(defines)),)
 	CXXFLAGS+=-fno-exceptions
 endif

-ifneq ($(cxxstd),any)
-	CXXFLAGS+=-std=$(cxxstd)
+ifeq ($(findstring PUGIXML_NO_CXX11,$(defines)),)
+	# Can't use std=c++11 since Travis-CI has gcc 4.6.3
+	CXXFLAGS+=-std=c++0x
 endif

 OBJECTS=$(SOURCES:%=$(BUILD)/%.o)
@ -58,15 +62,15 @@ test: $(EXECUTABLE)
 	./$(EXECUTABLE)
 	@gcov -b -o $(BUILD)/src/ pugixml.cpp.gcda | sed -e '/./{H;$!d;}' -e 'x;/pugixml.cpp/!d;'
 	@find . -name '*.gcov' -and -not -name 'pugixml.cpp.gcov' -exec rm {} +
-	@sed -i -e "s/#####\(.*\)\(\/\/ unreachable.*\)/    1\1\2/" pugixml.cpp.gcov
 else
 test: $(EXECUTABLE)
 	./$(EXECUTABLE)
 endif

-fuzz_%: $(BUILD)/fuzz_%
-	@mkdir -p build/$@
-	$< build/$@ tests/data_fuzz_$* -max_len=1024 -dict=tests/fuzz_$*.dict
+fuzz:
+	@mkdir -p $(BUILD)
+	$(AFL)/afl-clang++ tests/fuzz_parse.cpp tests/allocator.cpp src/pugixml.cpp $(CXXFLAGS) -o $(BUILD)/fuzz_parse
+	$(AFL)/afl-fuzz -i tests/data_fuzz_parse -o $(BUILD)/fuzz_parse_out -x $(AFL)/testcases/_extras/xml/ -- $(BUILD)/fuzz_parse @@

 clean:
 	rm -rf $(BUILD)
@ -77,15 +81,11 @@ docs: docs/quickstart.html docs/manual.html

 build/pugixml-%: .FORCE | $(RELEASE)
 	@mkdir -p $(BUILD)
-	TIMESTAMP=`git show v$(VERSION) -s --format=%ct` && python3 scripts/archive.py $@ pugixml-$(VERSION) $$TIMESTAMP $|
+	perl tests/archive.pl $@ $|

 $(EXECUTABLE): $(OBJECTS)
 	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@

-$(BUILD)/fuzz_%: tests/fuzz_%.cpp src/pugixml.cpp
-	@mkdir -p $(BUILD)
-	$(CXX) $(CXXFLAGS) -fsanitize=address,fuzzer $^ -o $@
-
 $(BUILD)/%.o: %
 	@mkdir -p $(dir $@)
 	$(CXX) $< $(CXXFLAGS) -c -MMD -MP -o $@
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-pugixml [![Actions Status](https://github.com/zeux/pugixml/workflows/build/badge.svg)](https://github.com/zeux/pugixml/actions) [![Build status](https://ci.appveyor.com/api/projects/status/9hdks1doqvq8pwe7/branch/master?svg=true)](https://ci.appveyor.com/project/zeux/pugixml) [![codecov.io](https://codecov.io/github/zeux/pugixml/coverage.svg?branch=master)](https://codecov.io/github/zeux/pugixml?branch=master) ![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
+pugixml [![Build Status](https://travis-ci.org/zeux/pugixml.svg?branch=master)](https://travis-ci.org/zeux/pugixml) [![Build status](https://ci.appveyor.com/api/projects/status/9hdks1doqvq8pwe7/branch/master?svg=true)](https://ci.appveyor.com/project/zeux/pugixml) [![codecov.io](http://codecov.io/github/zeux/pugixml/coverage.svg?branch=master)](http://codecov.io/github/zeux/pugixml?branch=master)
 =======

 pugixml is a C++ XML processing library, which consists of a DOM-like interface with rich traversal/modification
@ -12,61 +12,33 @@ pugixml is used by a lot of projects, both open-source and proprietary, for perf

 Documentation for the current release of pugixml is available on-line as two separate documents:

-* [Quick-start guide](https://pugixml.org/docs/quickstart.html), that aims to provide enough information to start using the library;
-* [Complete reference manual](https://pugixml.org/docs/manual.html), that describes all features of the library in detail.
+* [Quick-start guide](http://pugixml.org/docs/quickstart.html), that aims to provide enough information to start using the library;
+* [Complete reference manual](http://pugixml.org/docs/manual.html), that describes all features of the library in detail.

 You’re advised to start with the quick-start guide; however, many important library features are either not described in it at all or only mentioned briefly; if you require more information you should read the complete manual.

-## Example
-
-Here's an example of how code using pugixml looks; it opens an XML file, goes over all Tool nodes and prints tools that have a Timeout attribute greater than 0:
-
-```c++
-#include "pugixml.hpp"
-#include <iostream>
-
-int main()
-{
-    pugi::xml_document doc;
-    pugi::xml_parse_result result = doc.load_file("xgconsole.xml");
-    if (!result)
-        return -1;
-        
-    for (pugi::xml_node tool: doc.child("Profile").child("Tools").children("Tool"))
-    {
-        int timeout = tool.attribute("Timeout").as_int();
-        
-        if (timeout > 0)
-            std::cout << "Tool " << tool.attribute("Filename").value() << " has timeout " << timeout << "\n";
-    }
-}
-```
-
-And the same example using XPath:
-
-```c++
-#include "pugixml.hpp"
-#include <iostream>
-
-int main()
-{
-    pugi::xml_document doc;
-    pugi::xml_parse_result result = doc.load_file("xgconsole.xml");
-    if (!result)
-        return -1;
-        
-    pugi::xpath_node_set tools_with_timeout = doc.select_nodes("/Profile/Tools/Tool[@Timeout > 0]");
-    
-    for (pugi::xpath_node node: tools_with_timeout)
-    {
-        pugi::xml_node tool = node.node();
-        std::cout << "Tool " << tool.attribute("Filename").value() <<
-            " has timeout " << tool.attribute("Timeout").as_int() << "\n";
-    }
-}
-```
-
-
 ## License
+This library is available to anybody free of charge, under the terms of MIT License:

-This library is available to anybody free of charge, under the terms of MIT License (see LICENSE.md).
+Copyright (c) 2006-2015 Arseny Kapoulkine
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,9 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Please verify that the vulnerabilities reported can be reproduced on the [latest released version](https://github.com/zeux/pugixml/releases).
-
-## Reporting a Vulnerability
-
-Vulnerabilities can be reported via e-mail to the [project maintainer](https://github.com/zeux).
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,25 +1,5 @@
-image:
-  - Visual Studio 2022
-  - Visual Studio 2019
-  - Visual Studio 2017
-  - Visual Studio 2015
-
+os: Visual Studio 2015 RC
 version: "{branch}-{build}"

 build_script:
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2013") { .\scripts\nuget_build.ps1 2013}
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") { .\scripts\nuget_build.ps1 2015}
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017") { .\scripts\nuget_build.ps1 2017}
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") { .\scripts\nuget_build.ps1 2019}
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") { .\scripts\nuget_build.ps1 2022}
-
-test_script:
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") { .\tests\autotest-appveyor.ps1 9 10 11 12 14 }
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017") { .\tests\autotest-appveyor.ps1 15 }
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") { .\tests\autotest-appveyor.ps1 19 }
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") { .\tests\autotest-appveyor.ps1 22 }
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") { & C:\cygwin\bin\bash.exe -c "PATH=/usr/bin:/usr/local/bin:$PATH; make config=coverage test && bash <(curl -s https://codecov.io/bash) -f pugixml.cpp.gcov 2>&1" }
-  - ps: if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015") { & C:\cygwin\bin\bash.exe -c "PATH=/usr/bin:/usr/local/bin:$PATH; make config=coverage defines=PUGIXML_WCHAR_MODE test && bash <(curl -s https://codecov.io/bash) -f pugixml.cpp.gcov 2>&1" }
-
-artifacts:
-  - path: .\scripts\*.nupkg
+  - ps: .\tests\autotest-appveyor.ps1
--- a/contrib/foreach.hpp
+++ b/contrib/foreach.hpp
@ -0,0 +1,63 @@
+/*
+ * Boost.Foreach support for pugixml classes.
+ * This file is provided to the public domain.
+ * Written by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ */
+
+#ifndef HEADER_PUGIXML_FOREACH_HPP
+#define HEADER_PUGIXML_FOREACH_HPP
+
+#include <boost/range/iterator.hpp>
+
+#include "pugixml.hpp"
+
+/*
+ * These types add support for BOOST_FOREACH macro to xml_node and xml_document classes (child iteration only).
+ * Example usage:
+ * BOOST_FOREACH(xml_node n, doc) {}
+ */
+
+namespace boost
+{
+	template<> struct range_mutable_iterator<pugi::xml_node>
+	{
+		typedef pugi::xml_node::iterator type;
+	};
+
+	template<> struct range_const_iterator<pugi::xml_node>
+	{
+		typedef pugi::xml_node::iterator type;
+	};
+
+	template<> struct range_mutable_iterator<pugi::xml_document>
+	{
+		typedef pugi::xml_document::iterator type;
+	};
+
+	template<> struct range_const_iterator<pugi::xml_document>
+	{
+		typedef pugi::xml_document::iterator type;
+	};
+}
+
+/*
+ * These types add support for BOOST_FOREACH macro to xml_node and xml_document classes (child/attribute iteration).
+ * Example usage:
+ * BOOST_FOREACH(xml_node n, children(doc)) {}
+ * BOOST_FOREACH(xml_node n, attributes(doc)) {}
+ */
+
+namespace pugi
+{
+	inline xml_object_range<xml_node_iterator> children(const pugi::xml_node& node)
+	{
+		return node.children();
+	}
+
+	inline xml_object_range<xml_attribute_iterator> attributes(const pugi::xml_node& node)
+	{
+		return node.attributes();
+	}
+}
+
+#endif
--- a/docs/config.adoc
+++ b/docs/config.adoc
@ -1,7 +1,7 @@
-website <https://pugixml.org>; repository <https://github.com/zeux/pugixml>
+website <http://pugixml.org>; repository <http://github.com/zeux/pugixml>
 :toc: right
 :source-highlighter: pygments
 :source-language: c++
 :sectanchors:
 :sectlinks:
-:imagesdir: images
+:imagesdir: images
--- a/docs/images/dom_tree.png
+++ b/docs/images/dom_tree.png
--- a/docs/manual.adoc
+++ b/docs/manual.adoc
--- a/docs/manual.html
+++ b/docs/manual.html
--- a/docs/quickstart.adoc
+++ b/docs/quickstart.adoc
@ -4,7 +4,7 @@ include::config.adoc[]
 [[introduction]]
 == Introduction

-https://pugixml.org/[pugixml] is a light-weight C{plus}{plus} XML processing library. It consists of a DOM-like interface with rich traversal/modification capabilities, an extremely fast XML parser which constructs the DOM tree from an XML file/buffer, and an XPath 1.0 implementation for complex data-driven tree queries. Full Unicode support is also available, with two Unicode interface variants and conversions between different Unicode encodings (which happen automatically during parsing/saving). The library is extremely portable and easy to integrate and use. pugixml is developed and maintained since 2006 and has many users. All code is distributed under the <<license,MIT license>>, making it completely free to use in both open-source and proprietary applications.
+http://pugixml.org/[pugixml] is a light-weight C{plus}{plus} XML processing library. It consists of a DOM-like interface with rich traversal/modification capabilities, an extremely fast XML parser which constructs the DOM tree from an XML file/buffer, and an XPath 1.0 implementation for complex data-driven tree queries. Full Unicode support is also available, with two Unicode interface variants and conversions between different Unicode encodings (which happen automatically during parsing/saving). The library is extremely portable and easy to integrate and use. pugixml is developed and maintained since 2006 and has many users. All code is distributed under the <<license,MIT license>>, making it completely free to use in both open-source and proprietary applications.

 pugixml enables very fast, convenient and memory-efficient XML document processing. However, since pugixml has a DOM parser, it can't process XML documents that do not fit in memory; also the parser is a non-validating one, so if you need DTD/Schema validation, the library is not for you.

@ -24,8 +24,8 @@ https://github.com/zeux/pugixml/releases/download/v{version}/pugixml-{version}.t
 The distribution contains library source, documentation (the guide you're reading now and the manual) and some code examples. After downloading the distribution, install pugixml by extracting all files from the compressed archive.

 The complete pugixml source consists of three files - one source file, `pugixml.cpp`, and two header files, `pugixml.hpp` and `pugiconfig.hpp`. `pugixml.hpp` is the primary header which you need to include in order to use pugixml classes/functions. The rest of this guide assumes that `pugixml.hpp` is either in the current directory or in one of include directories of your projects, so that `#include "pugixml.hpp"` can find the header; however you can also use relative path (i.e. `#include "../libs/pugixml/src/pugixml.hpp"`) or include directory-relative path (i.e. `#include <xml/thirdparty/pugixml/src/pugixml.hpp>`).
-
-The easiest way to build pugixml is to compile the source file, `pugixml.cpp`, along with the existing library/executable. This process depends on the method of building your application; for example, if you're using Microsoft Visual Studio footnote:[All trademarks used are properties of their respective owners.], Apple Xcode, Code::Blocks or any other IDE, just *add `pugixml.cpp` to one of your projects*. There are other building methods available, including building pugixml as a standalone static/shared library; link:manual.html#install.building[read the manual] for further information.
+ 
+The easiest way to build pugixml is to compile the source file, `pugixml.cpp`, along with the existing library/executable. This process depends on the method of building your application; for example, if you're using Microsoft Visual Studio footnote:[All trademarks used are properties of their respective owners.], Apple Xcode, Code::Blocks or any other IDE, just add `pugixml.cpp` to one of your projects. There are other building methods available, including building pugixml as a standalone static/shared library; link:manual/install.html#install.building[read the manual] for further information.

 [[dom]]
 == Document object model
@ -54,7 +54,7 @@ There is a special value of `xml_node` type, known as null node or empty node. I

 `xml_attribute` is the handle to an XML attribute; it has the same semantics as `xml_node`, i.e. there can be several `xml_attribute` handles pointing to the same underlying object and there is a special null attribute value, which propagates to function results.

-There are two choices of interface and internal representation when configuring pugixml: you can either choose the UTF-8 (also called char) interface or UTF-16/32 (also called wchar_t) one. The choice is controlled via `PUGIXML_WCHAR_MODE` define; you can set it via `pugiconfig.hpp` or via preprocessor options. All tree functions that work with strings work with either C-style null terminated strings or STL strings of the selected character type. link:manual.html#dom.unicode[Read the manual] for additional information on Unicode interface.
+There are two choices of interface and internal representation when configuring pugixml: you can either choose the UTF-8 (also called char) interface or UTF-16/32 (also called wchar_t) one. The choice is controlled via `PUGIXML_WCHAR_MODE` define; you can set it via `pugiconfig.hpp` or via preprocessor options. All tree functions that work with strings work with either C-style null terminated strings or STL strings of the selected character type. link:manual/dom.html#dom.unicode[Read the manual] for additional information on Unicode interface.

 [[loading]]
 == Loading document
@ -67,7 +67,7 @@ This is an example of loading XML document from file (link:samples/load_file.cpp

 [source,indent=0]
 ----
-include::samples/load_file.cpp[tags=code]
+include::samples/load_file.cpp[tags=code] 
 ----

 `load_file`, as well as other loading functions, destroys the existing document tree and then tries to load the new tree from the specified file. The result of the operation is returned in an `xml_parse_result` object; this object contains the operation status, and the related information (i.e. last successfully parsed position in the input file, if parsing fails).
@ -78,7 +78,7 @@ This is an example of handling loading errors (link:samples/load_error_handling.

 [source,indent=0]
 ----
-include::samples/load_error_handling.cpp[tags=code]
+include::samples/load_error_handling.cpp[tags=code] 
 ----

 Sometimes XML data should be loaded from some other source than file, i.e. HTTP URL; also you may want to load XML data from file using non-standard functions, i.e. to use your virtual file system facilities or to load XML from gzip-compressed files. These scenarios either require loading document from memory, in which case you should prepare a contiguous memory block with all XML data and to pass it to one of buffer loading functions, or loading document from C{plus}{plus} IOstream, in which case you should provide an object which implements `std::istream` or `std::wistream` interface.
@ -240,7 +240,7 @@ This is a simple example of custom writer for saving document data to STL string
 include::samples/save_custom_writer.cpp[tags=code]
 ----

-While the previously described functions save the whole document to the destination, it is easy to save a single subtree. Instead of calling `xml_document::save`, just call `xml_node::print` function on the target node. You can save node contents to C{plus}{plus} IOstream object or custom writer in this way. Saving a subtree slightly differs from saving the whole document; link:manual.html#saving.subtree[read the manual] for more information.
+While the previously described functions save the whole document to the destination, it is easy to save a single subtree. Instead of calling `xml_document::save`, just call `xml_node::print` function on the target node. You can save node contents to C{plus}{plus} IOstream object or custom writer in this way. Saving a subtree slightly differs from saving the whole document; link:manual/saving.html#saving.subtree[read the manual] for more information.

 [[feedback]]
 == Feedback
@ -255,7 +255,7 @@ If filing an issue is not possible due to privacy or other concerns, you can con
 The pugixml library is distributed under the MIT license:

 ....
-Copyright (c) 2006-2022 Arseny Kapoulkine
+Copyright (c) 2006-2015 Arseny Kapoulkine

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@ -280,8 +280,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 ....

 This means that you can freely use pugixml in your applications, both open-source and proprietary. If you use pugixml in a product, it is sufficient to add an acknowledgment like this to the product distribution:
-
-....
-This software is based on pugixml library (https://pugixml.org).
-pugixml is Copyright (C) 2006-2022 Arseny Kapoulkine.
+ 
 ....
+This software is based on pugixml library (http://pugixml.org).
+pugixml is Copyright (C) 2006-2015 Arseny Kapoulkine.
+....
--- a/docs/quickstart.html
+++ b/docs/quickstart.html
--- a/docs/samples/include.cpp
+++ b/docs/samples/include.cpp
@ -48,7 +48,7 @@ bool preprocess(pugi::xml_node node)
 bool load_preprocess(pugi::xml_document& doc, const char* path)
 {
    pugi::xml_parse_result result = doc.load_file(path, pugi::parse_default | pugi::parse_pi); // for <?include?>
-
+    
    return result ? preprocess(doc) : false;
 }
 // end::code[]
--- a/docs/samples/save_declaration.cpp
+++ b/docs/samples/save_declaration.cpp
@ -15,7 +15,7 @@ int main()
    decl.append_attribute("encoding") = "UTF-8";
    decl.append_attribute("standalone") = "no";

-    // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    // <?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    // <foo bar="baz">
    //         <call>hey</call>
    // </foo>
--- a/readme.txt
+++ b/readme.txt
@ -1,7 +1,7 @@
-pugixml 1.13 - an XML processing library
+pugixml 1.7 - an XML processing library

-Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
-Report bugs and download new versions at https://pugixml.org/
+Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+Report bugs and download new versions at http://pugixml.org/

 This is the distribution of pugixml, which is a C++ XML processing library,
 which consists of a DOM-like interface with rich traversal/modification
@ -13,6 +13,8 @@ automatically during parsing/saving).

 The distribution contains the following folders:

+	contrib/ - various contributions to pugixml
+
 	docs/ - documentation
 		docs/samples - pugixml usage examples
 		docs/quickstart.html - quick start guide
@ -26,7 +28,7 @@ The distribution contains the following folders:

 This library is distributed under the MIT License:

-Copyright (c) 2006-2022 Arseny Kapoulkine
+Copyright (c) 2006-2015 Arseny Kapoulkine

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@ -0,0 +1,52 @@
+project(pugixml)
+
+cmake_minimum_required(VERSION 2.6)
+
+option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
+option(BUILD_TESTS "Build tests" OFF)
+set(BUILD_DEFINES "" CACHE STRING "Build defines")
+
+# Pre-defines standard install locations on *nix systems.
+include(GNUInstallDirs)
+mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR)
+
+set(HEADERS ../src/pugixml.hpp ../src/pugiconfig.hpp)
+set(SOURCES ${HEADERS} ../src/pugixml.cpp)
+
+if(DEFINED BUILD_DEFINES)
+	foreach(DEFINE ${BUILD_DEFINES})
+		add_definitions("-D" ${DEFINE})
+	endforeach()
+endif()
+
+if(BUILD_SHARED_LIBS)
+	add_library(pugixml SHARED ${SOURCES})
+else()
+	add_library(pugixml STATIC ${SOURCES})
+endif()
+
+# Enable C++11 long long for compilers that are capable of it
+if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
+	target_compile_features(pugixml PUBLIC cxx_long_long_type)
+endif()
+
+set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
+
+install(TARGETS pugixml EXPORT pugixml-config 
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+
+if(BUILD_TESTS)
+	file(GLOB TEST_SOURCES ../tests/*.cpp)
+	file(GLOB FUZZ_SOURCES ../tests/fuzz_*.cpp)
+	list(REMOVE_ITEM TEST_SOURCES ${FUZZ_SOURCES})
+
+	add_executable(check ${TEST_SOURCES})
+	target_link_libraries(check pugixml)
+	add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..)
+endif()
--- a/scripts/archive.py
+++ b/scripts/archive.py
@ -1,54 +0,0 @@
-import io
-import os.path
-import sys
-import tarfile
-import time
-import zipfile
-
-def read_file(path, use_crlf):
-	with open(path, 'rb') as file:
-		data = file.read()
-
-	if b'\0' not in data:
-		data = data.replace(b'\r', b'')
-		if use_crlf:
-			data = data.replace(b'\n', b'\r\n')
-
-	return data
-
-def write_zip(target, arcprefix, timestamp, sources):
-	with zipfile.ZipFile(target, 'w') as archive:
-		for source in sorted(sources):
-			data = read_file(source, use_crlf = True)
-			path = os.path.join(arcprefix, source)
-			info = zipfile.ZipInfo(path)
-			info.date_time = time.localtime(timestamp)
-			info.compress_type = zipfile.ZIP_DEFLATED
-			info.external_attr = 0o644 << 16
-			archive.writestr(info, data)
-
-def write_tar(target, arcprefix, timestamp, sources, compression):
-	with tarfile.open(target, 'w:' + compression) as archive:
-		for source in sorted(sources):
-			data = read_file(source, use_crlf = False)
-			path = os.path.join(arcprefix, source)
-			info = tarfile.TarInfo(path)
-			info.size = len(data)
-			info.mtime = timestamp
-			archive.addfile(info, io.BytesIO(data))
-
-if len(sys.argv) < 5:
-	raise RuntimeError('Usage: python archive.py <target> <archive prefix> <timestamp> <source files>')
-
-target, arcprefix, timestamp = sys.argv[1:4]
-sources = sys.argv[4:]
-
-# tarfile._Stream._init_write_gz always writes current time to gzip header
-time.time = lambda: timestamp
-
-if target.endswith('.zip'):
-	write_zip(target, arcprefix, int(timestamp), sources)
-elif target.endswith('.tar.gz') or target.endswith('.tar.bz2'):
-	write_tar(target, arcprefix, int(timestamp), sources, compression = os.path.splitext(target)[1][1:])
-else:
-	raise NotImplementedError('File type not supported: ' + target)
--- a/scripts/cocoapods_push.sh
+++ b/scripts/cocoapods_push.sh
@ -1,4 +0,0 @@
-#!/bin/bash
-
-#Push to igagis repo for now
-pod repo push igagis pugixml.podspec --use-libraries --verbose
--- a/scripts/natvis/pugixml.natvis
+++ b/scripts/natvis/pugixml.natvis
@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="pugi::xml_node">
-    <DisplayString Condition="_root">{_root}</DisplayString>
-    <DisplayString Condition="!_root">none</DisplayString>
-    <Expand>
-      <ExpandedItem Condition="_root">_root</ExpandedItem>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xml_node_struct">
-    <DisplayString Condition="name &amp;&amp; value">{(pugi::xml_node_type)(header &amp; 0xf),en} name={name,na} value={value,na}</DisplayString>
-    <DisplayString Condition="name">{(pugi::xml_node_type)(header &amp; 0xf),en} name={name,na}</DisplayString>
-    <DisplayString Condition="value">{(pugi::xml_node_type)(header &amp; 0xf),en} value={value,na}</DisplayString>
-    <DisplayString>{(pugi::xml_node_type)(header &amp; 0xf),en}</DisplayString>
-    <Expand>
-      <Item Name="value" Condition="value">value,na</Item>
-      <Synthetic Name="attributes" Condition="first_attribute">
-        <Expand>
-          <CustomListItems>
-            <Variable Name="curr" InitialValue="first_attribute" />
-
-            <Loop Condition="curr">
-              <Item Name="{curr->name,na}">curr,view(child)na</Item>
-              <Exec>curr = curr->next_attribute</Exec>
-            </Loop>
-          </CustomListItems>
-        </Expand>
-      </Synthetic>
-      <LinkedListItems>
-        <HeadPointer>first_child</HeadPointer>
-        <NextPointer>next_sibling</NextPointer>
-        <ValueNode>this,na</ValueNode>
-      </LinkedListItems>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xml_attribute">
-    <DisplayString Condition="_attr">{_attr}</DisplayString>
-    <DisplayString Condition="!_attr">none</DisplayString>
-    <Expand>
-      <ExpandedItem Condition="_attr">_attr</ExpandedItem>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xml_attribute_struct">
-    <DisplayString ExcludeView="child">{name,na} = {value,na}</DisplayString>
-    <DisplayString>{value,na}</DisplayString>
-    <Expand>
-      <Item Name="name">name,na</Item>
-      <Item Name="value">value,na</Item>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xpath_node">
-    <DisplayString Condition="_node._root &amp;&amp; _attribute._attr">{_node,na} "{_attribute._attr->name,na}"="{_attribute._attr->value,na}"</DisplayString>
-    <DisplayString Condition="_node._root">{_node,na}</DisplayString>
-    <DisplayString Condition="_attribute._attr">{_attribute}</DisplayString>
-    <DisplayString>empty</DisplayString>
-    <Expand HideRawView="1">
-      <ExpandedItem Condition="_node._root &amp;&amp; !_attribute._attr">_node</ExpandedItem>
-      <ExpandedItem Condition="!_node._root &amp;&amp; _attribute._attr">_attribute</ExpandedItem>
-      <Item Name="node" Condition="_node._root &amp;&amp; _attribute._attr">_node,na</Item>
-      <Item Name="attribute" Condition="_node._root &amp;&amp; _attribute._attr">_attribute,na</Item>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xpath_node_set">
-    <Expand>
-      <Item Name="type">_type</Item>
-      <ArrayItems>
-        <Size>_end - _begin</Size>
-        <ValuePointer>_begin</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-</AutoVisualizer>
--- a/scripts/natvis/pugixml_compact.natvis
+++ b/scripts/natvis/pugixml_compact.natvis
@ -1,506 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="pugi::xml_node">
-    <DisplayString Condition="_root">{_root}</DisplayString>
-    <DisplayString Condition="!_root">none</DisplayString>
-    <Expand>
-      <ExpandedItem Condition="_root">_root</ExpandedItem>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xml_attribute">
-    <DisplayString Condition="_attr">{_attr}</DisplayString>
-    <DisplayString Condition="!_attr">none</DisplayString>
-    <Expand>
-      <ExpandedItem Condition="_attr">_attr</ExpandedItem>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xml_node_struct">
-    <Expand>
-      <Item Name="type">(pugi::xml_node_type)(header._flags &amp; 15)</Item>
-      <Item Name="name" Condition="name._data">name,na</Item>
-      <Item Name="value" Condition="value._data">value,na</Item>
-      
-      <Synthetic Name="attributes" Condition="first_attribute._data">
-        <DisplayString>...</DisplayString>
-        <Expand>
-          <CustomListItems>
-            <Variable Name="attribute_this" InitialValue="(size_t)&amp;first_attribute" />
-            <Variable Name="attribute_data" InitialValue="first_attribute._data" />
-            <Variable Name="attribute_data_copy" InitialValue="attribute_data" />
-            
-            <!-- first_attribute struct template arguments -->
-            <Variable Name="attribute_T1" InitialValue="11" />
-            <Variable Name="attribute_T2" InitialValue="0" />
-
-            <Variable Name="compact_alignment_log2" InitialValue="2" />
-            <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-            
-            <!-- compact_get_page() -->
-            <Variable Name="_page" InitialValue="*(char*)(attribute_this - attribute_T1)" />
-            <Variable Name="page" InitialValue="((attribute_this - attribute_T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(attribute_this - attribute_T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-            <!-- page->allocator->_hash -->
-            <Variable Name="allocator" InitialValue="*(size_t*)page" />
-            <Variable Name="_hash" InitialValue="*(size_t*)(allocator + 2 * sizeof(size_t))" /><!--2 pointer offsetof(allocator, _hash)-->
-            <Variable Name="_items" InitialValue="*(size_t*)_hash" />
-            <Variable Name="_capacity" InitialValue="*((size_t*)_hash + 1)" /><!--1 pointer offsetof(_hash, _capacity)-->
-            <Variable Name="_count" InitialValue="*((size_t*)_hash + 2)" /><!--2 pointer offsetof(_hash, _count)-->
-
-            <!-- find() prolog -->
-            <Variable Name="hashmod" InitialValue="_capacity - 1" />
-
-            <Variable Name="h" InitialValue="(unsigned)attribute_this" />
-            <Variable Name="bucket" InitialValue="0" />
-
-            <Variable Name="probe" InitialValue="0" />
-            <Variable Name="probe_item" InitialValue="(size_t*)0" />
-
-            <Variable Name="attribute_real" InitialValue="(pugi::xml_attribute_struct*)0" />
-
-            <!-- if _data < 255 -->
-            <Variable Name="attribute_short" InitialValue="(pugi::xml_attribute_struct*)(((size_t)attribute_this &amp; ~(compact_alignment - 1)) + (attribute_data - 1 + attribute_T2) * compact_alignment)" />
-
-            <Variable Name="number" InitialValue="0" />
-
-            <!-- Loop over all attributes -->
-            <Loop Condition="attribute_this &amp;&amp; attribute_data">
-              <!-- find() hash -->
-              <Exec>h = h ^ (h >> 16)</Exec>
-              <Exec>h = h * (0x85ebca6bu)</Exec>
-              <Exec>h = h ^ (h >> 13)</Exec>
-              <Exec>h = h * (0xc2b2ae35u)</Exec>
-              <Exec>h = h ^ (h >> 16)</Exec>
-
-              <Exec>bucket = h &amp; hashmod</Exec>
-
-              <!-- find() loop -->
-              <Loop Condition="probe &lt;= hashmod &amp;&amp;_capacity">
-                <Exec>probe_item = (size_t*)_items + bucket * 2</Exec><!--2 pointer sizeof(item_t)-->
-
-                <If Condition="*probe_item == attribute_this || *probe_item == 0">
-                  <Exec>attribute_real = *(pugi::xml_attribute_struct**)(probe_item + 1)</Exec><!--1 pointer offsetof(item_t, value)-->
-                  <Break/>
-                </If>
-
-                <Exec>bucket = (bucket + probe + 1) &amp; hashmod</Exec>
-                <Exec>probe++</Exec>
-              </Loop>
-
-              <Exec>attribute_data_copy = attribute_data</Exec>
-
-              <If Condition="attribute_data_copy &gt;= 255 &amp;&amp; attribute_real">
-                <Item Name="[{number}]">*attribute_real,view(child)</Item>
-                <Exec>attribute_this = (size_t)&amp;(*attribute_real).next_attribute</Exec>
-                <Exec>attribute_data = (*attribute_real).next_attribute._data</Exec>
-              </If>
-              <If Condition="attribute_data_copy &lt; 255 &amp;&amp; attribute_short">
-                <Item Name="[{number}]">*attribute_short,view(child)</Item>
-                <Exec>attribute_this = (size_t)&amp;(*attribute_short).next_attribute</Exec>
-                <Exec>attribute_data = (*attribute_short).next_attribute._data</Exec>
-              </If>
-
-              <!-- next_attribute struct template arguments -->
-              <Exec>attribute_T1 = 7</Exec>
-              <Exec>attribute_T2 = 0</Exec>
-
-              <!-- find() prolog again -->
-              <Exec>h = (unsigned)attribute_this</Exec>
-              <Exec>bucket = 0</Exec>
-
-              <Exec>probe = 0</Exec>
-              <Exec>probe_item = (size_t*)0</Exec>
-
-              <Exec>attribute_real = (pugi::xml_attribute_struct*)0</Exec>
-              <Exec>attribute_short = (pugi::xml_attribute_struct*)(((size_t)attribute_this &amp; ~(compact_alignment - 1)) + (attribute_data - 1 + attribute_T2) * compact_alignment)</Exec>
-
-              <Exec>number++</Exec>
-            </Loop>
-          </CustomListItems>
-        </Expand>
-      </Synthetic>
-      
-      <CustomListItems>
-        <Variable Name="child_this" InitialValue="&amp;first_child" />
-        <Variable Name="child_data" InitialValue="first_child._data" />
-        <Variable Name="child_data_copy" InitialValue="child_data" />
-
-        <!-- first_child struct template arguments -->
-        <Variable Name="child_T1" InitialValue="8" />
-        <Variable Name="child_T2" InitialValue="0" />
-
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-
-        <!-- compact_get_page() -->
-        <Variable Name="_page" InitialValue="*(char*)(child_this - child_T1)" />
-        <Variable Name="page" InitialValue="((child_this - child_T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(child_this - child_T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-        <!-- page->allocator->_hash -->
-        <Variable Name="allocator" InitialValue="*(size_t*)page" />
-        <Variable Name="_hash" InitialValue="*(size_t*)(allocator + 2 * sizeof(size_t))" /><!--2 pointer offsetof(allocator, _hash)-->
-        <Variable Name="_items" InitialValue="*(size_t*)_hash" />
-        <Variable Name="_capacity" InitialValue="*((size_t*)_hash + 1)" /><!--1 pointer offsetof(_hash, _capacity)-->
-        <Variable Name="_count" InitialValue="*((size_t*)_hash + 2)" /><!--2 pointer offsetof(_hash, _count)-->
-
-        <!-- find() prolog -->
-        <Variable Name="hashmod" InitialValue="_capacity - 1" />
-
-        <Variable Name="h" InitialValue="(unsigned)child_this" />
-        <Variable Name="bucket" InitialValue="0" />
-
-        <Variable Name="probe" InitialValue="0" />
-        <Variable Name="probe_item" InitialValue="(size_t*)0" />
-
-        <Variable Name="child_real" InitialValue="(pugi::xml_node_struct*)0" />
-
-        <!-- if _data < 255 -->
-        <Variable Name="child_short" InitialValue="(pugi::xml_node_struct*)(((size_t)child_this &amp; ~(compact_alignment - 1)) + (child_data - 1 + child_T2) * compact_alignment)" />
-
-        <Variable Name="number" InitialValue="0" />
-
-        <Loop Condition="child_this &amp;&amp; child_data">
-          <!-- find() hash -->
-          <Exec>h = h ^ (h >> 16)</Exec>
-          <Exec>h = h * (0x85ebca6bu)</Exec>
-          <Exec>h = h ^ (h >> 13)</Exec>
-          <Exec>h = h * (0xc2b2ae35u)</Exec>
-          <Exec>h = h ^ (h >> 16)</Exec>
-
-          <Exec>bucket = h &amp; hashmod</Exec>
-
-          <!-- find() loop -->
-          <Loop Condition="probe &lt;= hashmod &amp;&amp;_capacity">
-            <Exec>probe_item = (size_t*)_items + bucket * 2</Exec><!--2 pointer sizeof(item_t)-->
-
-            <If Condition="*probe_item == child_this || *probe_item == 0">
-              <Exec>child_real = *(pugi::xml_node_struct**)(probe_item + 1)</Exec><!--1 pointer offsetof(item_t, value)-->
-              <Break/>
-            </If>
-
-            <Exec>bucket = (bucket + probe + 1) &amp; hashmod</Exec>
-            <Exec>probe++</Exec>
-          </Loop>
-
-          <Exec>child_data_copy = child_data</Exec>
-
-          <If Condition="child_data_copy &gt;= 255 &amp;&amp; child_real">
-            <Item Name="[{number}]">*child_real,view(child)</Item>
-            <Exec>child_this = (size_t)&amp;(*child_real).next_sibling</Exec>
-            <Exec>child_data = (*child_real).next_sibling._data</Exec>
-          </If>
-          <If Condition="child_data_copy &lt; 255 &amp;&amp; child_short">
-            <Item Name="[{number}]">*child_short,view(child)</Item>
-            <Exec>child_this = (size_t)&amp;(*child_short).next_sibling</Exec>
-            <Exec>child_data = (*child_short).next_sibling._data</Exec>
-          </If>
-
-          <!-- next_sibling struct template arguments -->
-          <Exec>child_T1 = 10</Exec>
-          <Exec>child_T2 = 0</Exec>
-
-          <!-- find() prolog again -->
-          <Exec>h = (unsigned)child_this</Exec>
-          <Exec>bucket = 0</Exec>
-
-          <Exec>probe = 0</Exec>
-          <Exec>probe_item = (size_t*)0</Exec>
-
-          <Exec>child_real = (pugi::xml_node_struct*)0</Exec>
-          <Exec>child_short = (pugi::xml_node_struct*)(((size_t)child_this &amp; ~(compact_alignment - 1)) + (child_data - 1 + child_T2) * compact_alignment)</Exec>
-
-          <Exec>number++</Exec>
-        </Loop>
-      </CustomListItems>
-      
-      <Item Name="next_sibling" ExcludeView="child">next_sibling</Item>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xml_attribute_struct">
-    <Expand>
-      <Item Name="name">name,na</Item>
-      <Item Name="value">value,na</Item>
-      
-      <CustomListItems ExcludeView="child">
-        <Variable Name="attribute_this" InitialValue="&amp;next_attribute" />
-        <Variable Name="attribute_data" InitialValue="next_attribute._data" />
-
-        <!-- next_attribute struct template arguments -->
-        <Variable Name="attribute_T1" InitialValue="7" />
-        <Variable Name="attribute_T2" InitialValue="0" />
-
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-
-        <!-- compact_get_page() -->
-        <Variable Name="_page" InitialValue="*(char*)(attribute_this - attribute_T1)" />
-        <Variable Name="page" InitialValue="((attribute_this - attribute_T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(attribute_this - attribute_T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-        <!-- page->allocator->_hash -->
-        <Variable Name="allocator" InitialValue="*(size_t*)page" />
-        <Variable Name="_hash" InitialValue="*(size_t*)(allocator + 2 * sizeof(size_t))" /><!--2 pointer offsetof(allocator, _hash)-->
-        <Variable Name="_items" InitialValue="*(size_t*)_hash" />
-        <Variable Name="_capacity" InitialValue="*((size_t*)_hash + 1)" /><!--1 pointer offsetof(_hash, _capacity)-->
-        <Variable Name="_count" InitialValue="*((size_t*)_hash + 2)" /><!--2 pointer offsetof(_hash, _count)-->
-
-        <!-- find() prolog -->
-        <Variable Name="hashmod" InitialValue="_capacity - 1" />
-
-        <Variable Name="h" InitialValue="(unsigned)attribute_this" />
-        <Variable Name="bucket" InitialValue="0" />
-
-        <Variable Name="probe" InitialValue="0" />
-        <Variable Name="probe_item" InitialValue="(size_t*)0" />
-
-        <Variable Name="attribute_real" InitialValue="(pugi::xml_attribute_struct*)0" />
-
-        <!-- if _data < 255 -->
-        <Variable Name="attribute_short" InitialValue="(pugi::xml_attribute_struct*)(((size_t)attribute_this &amp; ~(compact_alignment - 1)) + (attribute_data - 1 + attribute_T2) * compact_alignment)" />
-
-        <!-- find() hash -->
-        <Exec>h = h ^ (h >> 16)</Exec>
-        <Exec>h = h * (0x85ebca6bu)</Exec>
-        <Exec>h = h ^ (h >> 13)</Exec>
-        <Exec>h = h * (0xc2b2ae35u)</Exec>
-        <Exec>h = h ^ (h >> 16)</Exec>
-
-        <Exec>bucket = h &amp; hashmod</Exec>
-
-        <!-- find() loop -->
-        <Loop Condition="probe &lt;= hashmod &amp;&amp;_capacity">
-          <Exec>probe_item = (size_t*)_items + bucket * 2</Exec><!--2 pointer sizeof(item_t)-->
-
-          <If Condition="*probe_item == attribute_this || *probe_item == 0">
-            <Exec>attribute_real = *(pugi::xml_attribute_struct**)(probe_item + 1)</Exec><!--1 pointer offsetof(item_t, value)-->
-            <Break/>
-          </If>
-
-          <Exec>bucket = (bucket + probe + 1) &amp; hashmod</Exec>
-          <Exec>probe++</Exec>
-        </Loop>
-
-        <If Condition="attribute_data &gt;= 255 &amp;&amp; attribute_real">
-          <Item Name="next_attribute">*attribute_real</Item>
-        </If>
-        <If Condition="attribute_data != 0 &amp;&amp; attribute_data &lt; 255 &amp;&amp; attribute_short">
-          <Item Name="next_attribute">*attribute_short</Item>
-        </If>
-      </CustomListItems>
-    </Expand>
-  </Type>
-
-  <Type Name="pugi::impl::`anonymous-namespace'::compact_string&lt;*,*&gt;">
-    <Expand HideRawView="1">
-      <CustomListItems Condition="_data &amp;&amp; _data &lt; 255">
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-        
-        <!-- compact_get_page() -->
-        <Variable Name="_page" InitialValue="*(char*)(this - $T1)" />
-        <Variable Name="page" InitialValue="((this - $T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(this - $T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-        <Variable Name="compact_string_base" InitialValue="*(size_t*)(page + 5 * sizeof(void*))" /><!-- 5 pointer offsetof(page, compact_string_base)-->
-        <Variable Name="base" InitialValue="this - $T2" />
-        <Variable Name="offset" InitialValue="((*(short*)base - 1) &lt;&lt; 7) + (_data - 1)" />
-        
-        <Item Name="value">(pugi::char_t*)(compact_string_base + offset * sizeof(pugi::char_t)),na</Item>
-      </CustomListItems>
-      
-      <CustomListItems Condition="_data &amp;&amp; _data &gt;= 255">
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-        
-        <!-- compact_get_page() -->
-        <Variable Name="_page" InitialValue="*(char*)(this - $T1)" />
-        <Variable Name="page" InitialValue="((this - $T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(this - $T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-        <!-- page->allocator->_hash -->
-        <Variable Name="allocator" InitialValue="*(size_t*)page" />
-        <Variable Name="_hash" InitialValue="*(size_t*)(allocator + 2 * sizeof(size_t))" /><!--2 pointer offsetof(allocator, _hash)-->
-        <Variable Name="_items" InitialValue="*(size_t*)_hash" />
-        <Variable Name="_capacity" InitialValue="*((size_t*)_hash + 1)" /><!--1 pointer offsetof(_hash, _capacity)-->
-        <Variable Name="_count" InitialValue="*((size_t*)_hash + 2)" /><!--2 pointer offsetof(_hash, _count)-->
-
-        <!-- find() prolog -->
-        <Variable Name="hashmod" InitialValue="_capacity - 1" />
-
-        <Variable Name="h" InitialValue="(unsigned)this" />
-        <Variable Name="bucket" InitialValue="0" />
-
-        <Variable Name="probe" InitialValue="0" />
-        <Variable Name="probe_item" InitialValue="(size_t*)0" />
-
-        <!-- find() hash -->
-        <Exec>h = h ^ (h >> 16)</Exec>
-        <Exec>h = h * (0x85ebca6bu)</Exec>
-        <Exec>h = h ^ (h >> 13)</Exec>
-        <Exec>h = h * (0xc2b2ae35u)</Exec>
-        <Exec>h = h ^ (h >> 16)</Exec>
-
-        <Exec>bucket = h &amp; hashmod</Exec>
-
-        <!-- find() loop -->
-        <Loop Condition="probe &lt;= hashmod &amp;&amp;_capacity">
-          <Exec>probe_item = (size_t*)_items + bucket * 2</Exec><!--2 pointer sizeof(item_t)-->
-
-          <If Condition="*probe_item == this || *probe_item == 0">
-            <Item Name="value">*(pugi::char_t**)(probe_item + 1)</Item><!--1 pointer offsetof(item_t, value)-->
-            <Break/>
-          </If>
-
-          <Exec>bucket = (bucket + probe + 1) &amp; hashmod</Exec>
-          <Exec>probe++</Exec>
-        </Loop>
-      </CustomListItems>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::impl::`anonymous-namespace'::compact_pointer&lt;pugi::xml_node_struct,*,*&gt;">
-    <DisplayString Condition="!_data">nullptr</DisplayString>
-    <DisplayString Condition="_data">...</DisplayString>
-    
-    <Expand HideRawView="1">
-      <CustomListItems Condition="_data &amp;&amp; _data &lt; 255">
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-        
-        <Item Name="value">*(pugi::xml_node_struct*)(((size_t)this &amp; ~(compact_alignment - 1)) + (_data - 1 + $T2) * compact_alignment)</Item>
-      </CustomListItems>
-      
-      <CustomListItems Condition="_data &amp;&amp; _data &gt;= 255">
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-        
-        <!-- compact_get_page() -->
-        <Variable Name="_page" InitialValue="*(char*)(this - $T1)" />
-        <Variable Name="page" InitialValue="((this - $T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(this - $T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-        <!-- page->allocator->_hash -->
-        <Variable Name="allocator" InitialValue="*(size_t*)page" />
-        <Variable Name="_hash" InitialValue="*(size_t*)(allocator + 2 * sizeof(size_t))" /><!--2 pointer offsetof(allocator, _hash)-->
-        <Variable Name="_items" InitialValue="*(size_t*)_hash" />
-        <Variable Name="_capacity" InitialValue="*((size_t*)_hash + 1)" /><!--1 pointer offsetof(_hash, _capacity)-->
-        <Variable Name="_count" InitialValue="*((size_t*)_hash + 2)" /><!--2 pointer offsetof(_hash, _count)-->
-
-        <!-- find() prolog -->
-        <Variable Name="hashmod" InitialValue="_capacity - 1" />
-
-        <Variable Name="h" InitialValue="(unsigned)this" />
-        <Variable Name="bucket" InitialValue="0" />
-
-        <Variable Name="probe" InitialValue="0" />
-        <Variable Name="probe_item" InitialValue="(size_t*)0" />
-
-        <!-- find() hash -->
-        <Exec>h = h ^ (h >> 16)</Exec>
-        <Exec>h = h * (0x85ebca6bu)</Exec>
-        <Exec>h = h ^ (h >> 13)</Exec>
-        <Exec>h = h * (0xc2b2ae35u)</Exec>
-        <Exec>h = h ^ (h >> 16)</Exec>
-
-        <Exec>bucket = h &amp; hashmod</Exec>
-
-        <!-- find() loop -->
-        <Loop Condition="probe &lt;= hashmod &amp;&amp;_capacity">
-          <Exec>probe_item = (size_t*)_items + bucket * 2</Exec><!--2 pointer sizeof(item_t)-->
-
-          <If Condition="*probe_item == this || *probe_item == 0">
-            <Item Name="value">**(pugi::xml_node_struct**)(probe_item + 1)</Item><!--1 pointer offsetof(item_t, value)-->
-            <Break/>
-          </If>
-
-          <Exec>bucket = (bucket + probe + 1) &amp; hashmod</Exec>
-          <Exec>probe++</Exec>
-        </Loop>
-      </CustomListItems>
-    </Expand>
-  </Type>
-
-  <Type Name="pugi::impl::`anonymous-namespace'::compact_pointer&lt;pugi::xml_attribute_struct,*,*&gt;">
-    <DisplayString Condition="!_data">nullptr</DisplayString>
-    <DisplayString Condition="_data">...</DisplayString>
-    
-    <Expand HideRawView="1">
-      <CustomListItems Condition="_data &amp;&amp; _data &lt; 255">
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-        
-        <Item Name="value">*(pugi::xml_attribute_struct*)(((size_t)this &amp; ~(compact_alignment - 1)) + (_data - 1 + $T2) * compact_alignment)</Item>
-      </CustomListItems>
-      
-      <CustomListItems Condition="_data &amp;&amp; _data &gt;= 255">
-        <Variable Name="compact_alignment_log2" InitialValue="2" />
-        <Variable Name="compact_alignment" InitialValue="1 &lt;&lt; compact_alignment_log2" />
-        
-        <!-- compact_get_page() -->
-        <Variable Name="_page" InitialValue="*(char*)(this - $T1)" />
-        <Variable Name="page" InitialValue="((this - $T1 - (_page &lt;&lt; compact_alignment_log2)) - *(unsigned*)(this - $T1 - (_page &lt;&lt; compact_alignment_log2)))" />
-
-        <!-- page->allocator->_hash -->
-        <Variable Name="allocator" InitialValue="*(size_t*)page" />
-        <Variable Name="_hash" InitialValue="*(size_t*)(allocator + 2 * sizeof(size_t))" /><!--2 pointer offsetof(allocator, _hash)-->
-        <Variable Name="_items" InitialValue="*(size_t*)_hash" />
-        <Variable Name="_capacity" InitialValue="*((size_t*)_hash + 1)" /><!--1 pointer offsetof(_hash, _capacity)-->
-        <Variable Name="_count" InitialValue="*((size_t*)_hash + 2)" /><!--2 pointer offsetof(_hash, _count)-->
-
-        <!-- find() prolog -->
-        <Variable Name="hashmod" InitialValue="_capacity - 1" />
-
-        <Variable Name="h" InitialValue="(unsigned)this" />
-        <Variable Name="bucket" InitialValue="0" />
-
-        <Variable Name="probe" InitialValue="0" />
-        <Variable Name="probe_item" InitialValue="(size_t*)0" />
-
-        <!-- find() hash -->
-        <Exec>h = h ^ (h >> 16)</Exec>
-        <Exec>h = h * (0x85ebca6bu)</Exec>
-        <Exec>h = h ^ (h >> 13)</Exec>
-        <Exec>h = h * (0xc2b2ae35u)</Exec>
-        <Exec>h = h ^ (h >> 16)</Exec>
-
-        <Exec>bucket = h &amp; hashmod</Exec>
-
-        <!-- find() loop -->
-        <Loop Condition="probe &lt;= hashmod &amp;&amp;_capacity">
-          <Exec>probe_item = (size_t*)_items + bucket * 2</Exec><!--2 pointer sizeof(item_t)-->
-
-          <If Condition="*probe_item == this || *probe_item == 0">
-            <Item Name="value">**(pugi::xml_attribute_struct**)(probe_item + 1)</Item><!--1 pointer offsetof(item_t, value)-->
-            <Break/>
-          </If>
-
-          <Exec>bucket = (bucket + probe + 1) &amp; hashmod</Exec>
-          <Exec>probe++</Exec>
-        </Loop>
-      </CustomListItems>
-    </Expand>
-  </Type>
-
-  <Type Name="pugi::xpath_node">
-    <DisplayString Condition="_node._root &amp;&amp; _attribute._attr">{_node,na} {_attribute,na}</DisplayString>
-    <DisplayString Condition="_node._root">{_node,na}</DisplayString>
-    <DisplayString Condition="_attribute._attr">{_attribute}</DisplayString>
-    <DisplayString>empty</DisplayString>
-    
-    <Expand HideRawView="1">
-      <ExpandedItem Condition="_node._root &amp;&amp; !_attribute._attr">_node</ExpandedItem>
-      <ExpandedItem Condition="!_node._root &amp;&amp; _attribute._attr">_attribute</ExpandedItem>
-      
-      <Item Name="node" Condition="_node._root &amp;&amp; _attribute._attr">_node,na</Item>
-      <Item Name="attribute" Condition="_node._root &amp;&amp; _attribute._attr">_attribute,na</Item>
-    </Expand>
-  </Type>
-  
-  <Type Name="pugi::xpath_node_set">
-    <Expand>
-      <Item Name="type">_type</Item>
-      <ArrayItems>
-        <Size>_end - _begin</Size>
-        <ValuePointer>_begin</ValuePointer>
-      </ArrayItems>
-    </Expand>
-  </Type>
-</AutoVisualizer>
--- a/scripts/nuget.autopkg
+++ b/scripts/nuget.autopkg
@ -0,0 +1,32 @@
+nuget {
+	nuspec {
+		id = pugixml;
+		version: 1.7.0;
+
+		authors: {Arseny Kapoulkine};
+		owners: {Arseny Kapoulkine};
+
+		projectUrl: "http://pugixml.org/";
+		iconUrl: "https://github.com/zeux/pugixml/logo.svg";
+
+		title: pugixml;
+		summary: "Light-weight, simple and fast XML parser for C++ with XPath support";
+		releaseNotes: "http://pugixml.org/docs/manual.html#changes";
+		copyright: "Copyright (c) 2006-2015 Arseny Kapoulkine";
+		licenseUrl: "http://pugixml.org/license.html";
+		requireLicenseAcceptance: false;
+
+		description: @"pugixml is a C++ XML processing library, which consists of a DOM-like interface with rich traversal/modification capabilities, an extremely fast XML parser which constructs the DOM tree from an XML file/buffer, and an XPath 1.0 implementation for complex data-driven tree queries. Full Unicode support is also available, with Unicode interface variants and conversions between different Unicode encodings (which happen automatically during parsing/saving).
+		pugixml is used by a lot of projects, both open-source and proprietary, for performance and easy-to-use interface.";
+
+		tags: { native };
+	}
+	files {
+		include: { "..\src\*.hpp" };
+		
+		[x86,release] { lib: vs2015\Win32_Release\pugixml.lib; }
+		[x86,debug] { lib: vs2015\Win32_Debug\pugixml.lib; }
+		[x64,release] { lib: vs2015\x64_Release\pugixml.lib; }
+		[x64,debug] { lib: vs2015\x64_Debug\pugixml.lib; }
+	}
+}
--- a/scripts/nuget/build/native/pugixml-propertiesui.xml
+++ b/scripts/nuget/build/native/pugixml-propertiesui.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="ReferencedPackages05032e35-86af-4ab2-a3dc-d3e348583165" PageTemplate="tool" DisplayName="Referenced Packages" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="pugixml" DisplayName="pugixml" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-pugixml" DisplayName="Linkage" Description="Which version of the runtime library to use for this library" Category="pugixml">
-      <EnumValue Name="dynamic" DisplayName="Dynamic CRT (/MD, /MDd)" />
-      <EnumValue Name="static" DisplayName="Static CRT (/MT, /MTd)" />
-      <EnumValue Name="source" DisplayName="Include pugixml.cpp" />
-      <EnumValue Name="header" DisplayName="Header Only" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/scripts/nuget/build/native/pugixml.targets
+++ b/scripts/nuget/build/native/pugixml.targets
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Default initializers for properties">
-    <Linkage-pugixml Condition="'$(Linkage-pugixml)' == ''">dynamic</Linkage-pugixml>
-    <Configuration-pugixml Condition="$(Configuration.ToLower().IndexOf('debug')) != -1">Debug</Configuration-pugixml>
-    <Configuration-pugixml Condition="$(Configuration.ToLower().IndexOf('debug')) == -1">Release</Configuration-pugixml>
-  </PropertyGroup>
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)\pugixml-propertiesui.xml" />
-  </ItemGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Linkage-pugixml)' == 'header'">PUGIXML_HEADER_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup Condition="'$(Linkage-pugixml)' == 'source'">
-    <ClCompile Include="$(MSBuildThisFileDirectory)include\pugixml.cpp"/>
-  </ItemGroup>
-  <ItemDefinitionGroup Condition="'$(Linkage-pugixml)' != 'header' AND '$(Linkage-pugixml)' != 'source'">
-    <Link>
-      <AdditionalDependencies>$(MSBuildThisFileDirectory)lib/$(Platform)\$(PlatformToolset.Split('_')[0])\$(Linkage-pugixml)\$(Configuration-pugixml)\pugixml.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
--- a/scripts/nuget/pugixml.nuspec
+++ b/scripts/nuget/pugixml.nuspec
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
-  <metadata>
-    <id>pugixml</id>
-    <version>1.13.0-appveyor</version>
-    <title>pugixml</title>
-    <authors>Arseny Kapoulkine</authors>
-    <owners>Arseny Kapoulkine</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <projectUrl>https://pugixml.org/</projectUrl>
-    <description>pugixml is a C++ XML processing library, which consists of a DOM-like interface with rich traversal/modification capabilities, an extremely fast XML parser which constructs the DOM tree from an XML file/buffer, and an XPath 1.0 implementation for complex data-driven tree queries. Full Unicode support is also available, with Unicode interface variants and conversions between different Unicode encodings (which happen automatically during parsing/saving).
-pugixml is used by a lot of projects, both open-source and proprietary, for performance and easy-to-use interface.
-This package contains builds for VS2013, VS2015, VS2017, VS2019 and VS2022, for both statically linked and DLL CRT; you can switch the CRT linkage in Project -> Properties -> Referenced Packages -> pugixml.</description>
-    <summary>Light-weight, simple and fast XML parser for C++ with XPath support</summary>
-    <releaseNotes>https://pugixml.org/docs/manual.html#changes</releaseNotes>
-    <copyright>Copyright (c) 2006-2022 Arseny Kapoulkine</copyright>
-    <tags>native nativepackage</tags>
-  </metadata>
-</package>
--- a/scripts/nuget_build.bat
+++ b/scripts/nuget_build.bat
@ -0,0 +1,8 @@
+@echo off
+
+"%VS140COMNTOOLS%\VsMSBuildCmd.bat" && ^
+msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x86 /v:minimal /nologo && ^
+msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal /nologo && ^
+msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Debug /p:Platform=x64 /v:minimal /nologo && ^
+msbuild pugixml_vs2015.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /v:minimal /nologo && ^
+powershell Write-NuGetPackage nuget.autopkg
--- a/scripts/nuget_build.ps1
+++ b/scripts/nuget_build.ps1
@ -1,70 +0,0 @@
-function Run-Command([string]$cmd)
-{
-	Invoke-Expression $cmd
-	if ($LastExitCode) { exit $LastExitCode }
-}
-
-function Force-Copy([string]$from, [string]$to)
-{
-	Write-Host $from "->" $to
-	New-Item -Force $to | Out-Null
-	Copy-Item -Force $from $to
-	if (! $?) { exit 1 }
-}
-
-function Build-Version([string]$vs, [string]$toolset, [string]$linkage)
-{
-	$prjsuffix = if ($linkage -eq "static") { "_static" } else { "" }
-	$cfgsuffix = if ($linkage -eq "static") { "Static" } else { "" }
-
-	foreach ($configuration in "Debug","Release")
-	{
-		Run-Command "msbuild pugixml_$vs$prjsuffix.vcxproj /t:Rebuild /p:Configuration=$configuration /p:Platform=x86 /v:minimal /nologo"
-		Run-Command "msbuild pugixml_$vs$prjsuffix.vcxproj /t:Rebuild /p:Configuration=$configuration /p:Platform=x64 /v:minimal /nologo"
-
-		Force-Copy "$vs/Win32_$configuration$cfgsuffix/pugixml.lib" "nuget/build/native/lib/Win32/$toolset/$linkage/$configuration/pugixml.lib"
-		Force-Copy "$vs/x64_$configuration$cfgsuffix/pugixml.lib" "nuget/build/native/lib/x64/$toolset/$linkage/$configuration/pugixml.lib"
-	}
-}
-
-Push-Location
-$scriptdir = Split-Path $MyInvocation.MyCommand.Path
-cd $scriptdir
-
-Force-Copy "../src/pugiconfig.hpp" "nuget/build/native/include/pugiconfig.hpp"
-Force-Copy "../src/pugixml.hpp" "nuget/build/native/include/pugixml.hpp"
-Force-Copy "../src/pugixml.cpp" "nuget/build/native/include/pugixml.cpp"
-
-if ($args[0] -eq 2022){
-	Build-Version "vs2022" "v143" "dynamic"
-	Build-Version "vs2022" "v143" "static"
-
-} elseif ($args[0] -eq 2019){
-	Build-Version "vs2019" "v142" "dynamic"
-	Build-Version "vs2019" "v142" "static"
-
-} elseif ($args[0] -eq 2017){
-	Build-Version "vs2017" "v141" "dynamic"
-	Build-Version "vs2017" "v141" "static"
-
-	Build-Version "vs2015" "v140" "dynamic"
-	Build-Version "vs2015" "v140" "static"
-
-	Build-Version "vs2013" "v120" "dynamic"
-	Build-Version "vs2013" "v120" "static"
-
-} elseif($args[0] -eq 2015){
-	Build-Version "vs2015" "v140" "dynamic"
-	Build-Version "vs2015" "v140" "static"
-
-	Build-Version "vs2013" "v120" "dynamic"
-	Build-Version "vs2013" "v120" "static"
-
-} elseif($args[0] -eq 2013){
-	Build-Version "vs2013" "v120" "dynamic"
-	Build-Version "vs2013" "v120" "static"
-}
-
-Run-Command "nuget pack nuget"
-
-Pop-Location
--- a/scripts/pugixml-config.cmake.in
+++ b/scripts/pugixml-config.cmake.in
@ -1,12 +0,0 @@
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/pugixml-targets.cmake")
-
-# If the user is not requiring 1.11 (either by explicitly requesting an older
-# version or not requesting one at all), provide the old imported target name
-# for compatibility.
-if (NOT TARGET pugixml AND (NOT DEFINED PACKAGE_FIND_VERSION OR PACKAGE_FIND_VERSION VERSION_LESS "1.11"))
-  add_library(pugixml INTERFACE IMPORTED)
-  # Equivalent to target_link_libraries INTERFACE, but compatible with CMake 3.10
-  set_target_properties(pugixml PROPERTIES INTERFACE_LINK_LIBRARIES pugixml::pugixml)
-endif ()
--- a/scripts/pugixml.pc.in
+++ b/scripts/pugixml.pc.in
@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@@INSTALL_SUFFIX@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@@INSTALL_SUFFIX@
-
-Name: pugixml
-Description: Light-weight, simple and fast XML parser for C++ with XPath support.
-URL: https://pugixml.org/
-Version: @pugixml_VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -lpugixml@LIB_POSTFIX@
--- a/scripts/pugixml.podspec
+++ b/scripts/pugixml.podspec
@ -1,14 +0,0 @@
-Pod::Spec.new do |s|
-  s.name         = "pugixml"
-  s.version      = "1.13"
-  s.summary      = "C++ XML parser library."
-  s.homepage     = "https://pugixml.org"
-  s.license      = "MIT"
-  s.author       = { "Arseny Kapoulkine" => "arseny.kapoulkine@gmail.com" }
-  s.platform     = :ios, "7.0"
-  
-  s.source = { :git => "https://github.com/zeux/pugixml.git", :tag => "v" + s.version.to_s }
-
-  s.source_files  = "src/**/*.{hpp,cpp}"
-  s.header_mappings_dir = "src"
-end
--- a/scripts/pugixml_dll.rc
+++ b/scripts/pugixml_dll.rc
@ -1,45 +0,0 @@
-#include <winver.h>
-
-#define PUGIXML_VERSION_MAJOR 1
-#define PUGIXML_VERSION_MINOR 13
-#define PUGIXML_VERSION_PATCH 0
-#define PUGIXML_VERSION_NUMBER "1.13.0\0"
-
-#if defined(GCC_WINDRES) || defined(__MINGW32__) || defined(__CYGWIN__)
-VS_VERSION_INFO		VERSIONINFO
-#else
-VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-#endif
-  FILEVERSION		PUGIXML_VERSION_MAJOR,PUGIXML_VERSION_MINOR,PUGIXML_VERSION_PATCH,0
-  PRODUCTVERSION	PUGIXML_VERSION_MAJOR,PUGIXML_VERSION_MINOR,PUGIXML_VERSION_PATCH,0
-  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS		1
-#else
-  FILEFLAGS		0
-#endif
-  FILEOS		VOS__WINDOWS32
-  FILETYPE		VFT_DLL
-  FILESUBTYPE		0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-    BEGIN
-      VALUE "CompanyName",	"zeux/pugixml\0"
-      VALUE "FileDescription",	"pugixml library\0"
-      VALUE "FileVersion",	PUGIXML_VERSION_NUMBER
-      VALUE "InternalName",	"pugixml.dll\0"
-      VALUE "LegalCopyright",	"Copyright (C) 2006-2022, by Arseny Kapoulkine\0"
-      VALUE "OriginalFilename",	"pugixml.dll\0"
-      VALUE "ProductName",	"pugixml\0"
-      VALUE "ProductVersion",	PUGIXML_VERSION_NUMBER
-      VALUE "Comments",		"For more information visit https://github.com/zeux/pugixml/\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
--- a/scripts/pugixml_vs2010.vcxproj
+++ b/scripts/pugixml_vs2010.vcxproj
@ -64,17 +64,17 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_Debug\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_Debug\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_Debug\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_Release\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_Release\</IntDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixmld</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\Debug\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixmld</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_Release\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_Release\</IntDir>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\Release\</IntDir>
 		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -93,12 +93,12 @@
 			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)pugixml.lib</OutputFile>
+		<OutputFile>$(OutDir)pugixmld.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)pugixmld.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -117,12 +117,12 @@
 			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)pugixml.lib</OutputFile>
+		<OutputFile>$(OutDir)pugixmld.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)pugixmld.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
--- a/scripts/pugixml_vs2010_static.vcxproj
+++ b/scripts/pugixml_vs2010_static.vcxproj
@ -64,18 +64,18 @@
 	<PropertyGroup Label="UserMacros" />
 	<PropertyGroup>
 		<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_DebugStatic\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\Win32_DebugStatic\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_DebugStatic\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64_DebugStatic\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_ReleaseStatic\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\Win32_ReleaseStatic\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName>
-		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_ReleaseStatic\</OutDir>
-		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64_ReleaseStatic\</IntDir>
-		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2010\x32\DebugStatic\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixmlsd</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2010\x64\DebugStatic\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixmlsd</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2010\x32\ReleaseStatic\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixmls</TargetName>
+		<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\</OutDir>
+		<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2010\x64\ReleaseStatic\</IntDir>
+		<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixmls</TargetName>
 	</PropertyGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 		<ClCompile>
@ -93,12 +93,12 @@
 			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)pugixml.lib</OutputFile>
+		<OutputFile>$(OutDir)pugixmlsd.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)pugixmlsd.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -117,12 +117,12 @@
 			<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)pugixml.lib</OutputFile>
+		<OutputFile>$(OutDir)pugixmlsd.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
-			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)pugixmlsd.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -141,14 +141,14 @@
 			<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)pugixml.lib</OutputFile>
+		<OutputFile>$(OutDir)pugixmls.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)pugixmls.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -167,14 +167,14 @@
 			<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 		</ResourceCompile>
 	<Lib>
-		<OutputFile>$(OutDir)pugixml.lib</OutputFile>
+		<OutputFile>$(OutDir)pugixmls.lib</OutputFile>
 	</Lib>
 		<Link>
 			<SubSystem>Windows</SubSystem>
 			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<OptimizeReferences>true</OptimizeReferences>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
-			<ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
+			<ProgramDataBaseFileName>$(OutDir)pugixmls.pdb</ProgramDataBaseFileName>
 		</Link>
 	</ItemDefinitionGroup>
 	<ItemGroup>
--- a/scripts/pugixml_vs2013.vcxproj
+++ b/scripts/pugixml_vs2013.vcxproj
@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{89A1E353-E2DC-495C-B403-742BE206ACED}</ProjectGuid>
-    <RootNamespace>pugixml</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_Debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_Debug\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_Debug\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_Release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_Release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugixml.hpp" />
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2013_static.vcxproj
+++ b/scripts/pugixml_vs2013_static.vcxproj
@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{89A1E353-E2DC-495C-B403-742BE206ACED}</ProjectGuid>
-    <RootNamespace>pugixml</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_DebugStatic\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">vs2013\Win32_DebugStatic\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">pugixml</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_DebugStatic\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">vs2013\x64_DebugStatic\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pugixml</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_ReleaseStatic\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">vs2013\Win32_ReleaseStatic\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">pugixml</TargetName>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_ReleaseStatic\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">vs2013\x64_ReleaseStatic\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)pugixml.lib</OutputFile>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ProgramDataBaseFileName>$(OutDir)pugixml.pdb</ProgramDataBaseFileName>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugixml.hpp" />
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp">
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2015_static.vcxproj
+++ b/scripts/pugixml_vs2015_static.vcxproj
@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2015\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2015\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2015\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2015\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2015\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2015\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2015\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2015\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2017.vcxproj
+++ b/scripts/pugixml_vs2017.vcxproj
@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2017_static.vcxproj
+++ b/scripts/pugixml_vs2017_static.vcxproj
@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2017\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2017\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2019.vcxproj
+++ b/scripts/pugixml_vs2019.vcxproj
@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2019_static.vcxproj
+++ b/scripts/pugixml_vs2019_static.vcxproj
@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2019\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2019\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2022.vcxproj
+++ b/scripts/pugixml_vs2022.vcxproj
@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/scripts/pugixml_vs2022_static.vcxproj
+++ b/scripts/pugixml_vs2022_static.vcxproj
@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{07CF01C0-B887-499D-AD9C-799CB6A9FE64}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>pugixml</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>vs2022\$(Platform)_$(Configuration)Static\</OutDir>
-    <IntDir>vs2022\$(Platform)_$(Configuration)Static\</IntDir>
-    <TargetName>pugixml</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\pugiconfig.hpp" />
-    <ClInclude Include="..\src\pugixml.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\pugixml.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/src/pugiconfig.hpp
+++ b/src/pugiconfig.hpp
@ -1,8 +1,8 @@
 /**
- * pugixml parser - version 1.13
+ * pugixml parser - version 1.7
 * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
+ * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
 *
 * This library is distributed under the MIT License. See notice at the end
 * of this file.
@ -40,9 +40,6 @@
 // #define PUGIXML_MEMORY_OUTPUT_STACK 10240
 // #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096

-// Tune this constant to adjust max nesting for XPath queries
-// #define PUGIXML_XPATH_DEPTH_LIMIT 1024
-
 // Uncomment this to switch to header-only version
 // #define PUGIXML_HEADER_ONLY

@ -52,7 +49,7 @@
 #endif

 /**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
+ * Copyright (c) 2006-2015 Arseny Kapoulkine
 *
 * Permission is hereby granted, free of charge, to any person
 * obtaining a copy of this software and associated documentation
@ -65,7 +62,7 @@
 *
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
- *
+ * 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@ -1,8 +1,8 @@
 /**
- * pugixml parser - version 1.13
+ * pugixml parser - version 1.7
 * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
+ * Copyright (C) 2006-2015, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at http://pugixml.org/
 *
 * This library is distributed under the MIT License. See notice at the end
 * of this file.
@ -11,10 +11,9 @@
 * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
 */

-// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
-// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
 #ifndef PUGIXML_VERSION
-#	define PUGIXML_VERSION 1130 // 1.13
+// Define version macro; evaluates to major * 100 + minor so that it's safe to use in less-than comparisons
+#	define PUGIXML_VERSION 170
 #endif

 // Include user configuration file (this can define various configuration macros)
@ -73,55 +72,6 @@
 #	endif
 #endif

-// If the platform is known to have move semantics support, compile move ctor/operator implementation
-#ifndef PUGIXML_HAS_MOVE
-#	if __cplusplus >= 201103
-#		define PUGIXML_HAS_MOVE
-#	elif defined(_MSC_VER) && _MSC_VER >= 1600
-#		define PUGIXML_HAS_MOVE
-#	endif
-#endif
-
-// If C++ is 2011 or higher, add 'noexcept' specifiers
-#ifndef PUGIXML_NOEXCEPT
-#	if __cplusplus >= 201103
-#		define PUGIXML_NOEXCEPT noexcept
-#	elif defined(_MSC_VER) && _MSC_VER >= 1900
-#		define PUGIXML_NOEXCEPT noexcept
-#	else
-#		define PUGIXML_NOEXCEPT
-#	endif
-#endif
-
-// Some functions can not be noexcept in compact mode
-#ifdef PUGIXML_COMPACT
-#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-#else
-#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
-#endif
-
-// If C++ is 2011 or higher, add 'override' qualifiers
-#ifndef PUGIXML_OVERRIDE
-#	if __cplusplus >= 201103
-#		define PUGIXML_OVERRIDE override
-#	elif defined(_MSC_VER) && _MSC_VER >= 1700
-#		define PUGIXML_OVERRIDE override
-#	else
-#		define PUGIXML_OVERRIDE
-#	endif
-#endif
-
-// If C++ is 2011 or higher, use 'nullptr'
-#ifndef PUGIXML_NULL
-#	if __cplusplus >= 201103
-#		define PUGIXML_NULL nullptr
-#	elif defined(_MSC_VER) && _MSC_VER >= 1600
-#		define PUGIXML_NULL nullptr
-#	else
-#		define PUGIXML_NULL 0
-#	endif
-#endif
-
 // Character interface macros
 #ifdef PUGIXML_WCHAR_MODE
 #	define PUGIXML_TEXT(t) L ## t
@ -183,13 +133,13 @@ namespace pugi

 	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
 	const unsigned int parse_eol = 0x0020;
-
+	
 	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
 	const unsigned int parse_wconv_attribute = 0x0040;

 	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
 	const unsigned int parse_wnorm_attribute = 0x0080;
-
+	
 	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
 	const unsigned int parse_declaration = 0x0100;

@ -208,11 +158,6 @@ namespace pugi
 	// is a valid document. This flag is off by default.
 	const unsigned int parse_fragment = 0x1000;

-	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
-	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
-	// This flag is off by default.
-	const unsigned int parse_embed_pcdata = 0x2000;
-
 	// The default parsing mode.
 	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
 	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
@ -239,16 +184,16 @@ namespace pugi
 	};

 	// Formatting flags
-
+	
 	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
 	const unsigned int format_indent = 0x01;
-
+	
 	// Write encoding-specific BOM to the output stream. This flag is off by default.
 	const unsigned int format_write_bom = 0x02;

 	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
 	const unsigned int format_raw = 0x04;
-
+	
 	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
 	const unsigned int format_no_declaration = 0x08;

@ -261,22 +206,10 @@ namespace pugi
 	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
 	const unsigned int format_indent_attributes = 0x40;

-	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
-	const unsigned int format_no_empty_element_tags = 0x80;
-
-	// Skip characters belonging to range [0; 32) instead of "&#xNN;" encoding. This flag is off by default.
-	const unsigned int format_skip_control_chars = 0x100;
-
-	// Use single quotes ' instead of double quotes " for enclosing attribute values. This flag is off by default.
-	const unsigned int format_attribute_single_quote = 0x200;
-
 	// The default set of formatting flags.
 	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
 	const unsigned int format_default = format_indent;

-	const int default_double_precision = 17;
-	const int default_float_precision = 9;
-
 	// Forward declarations
 	struct xml_attribute_struct;
 	struct xml_node_struct;
@ -292,7 +225,7 @@ namespace pugi
 	class xml_node;

 	class xml_text;
-
+	
 	#ifndef PUGIXML_NO_XPATH
 	class xpath_node;
 	class xpath_node_set;
@ -314,8 +247,6 @@ namespace pugi
 		It begin() const { return _begin; }
 		It end() const { return _end; }

-		bool empty() const { return _begin == _end; }
-
 	private:
 		It _begin, _end;
 	};
@ -337,7 +268,7 @@ namespace pugi
 		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
 		xml_writer_file(void* file);

-		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+		virtual void write(const void* data, size_t size);

 	private:
 		void* file;
@ -352,7 +283,7 @@ namespace pugi
 		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
 		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);

-		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+		virtual void write(const void* data, size_t size);

 	private:
 		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
@ -368,13 +299,13 @@ namespace pugi

 	private:
 		xml_attribute_struct* _attr;
-
+	
 		typedef void (*unspecified_bool_type)(xml_attribute***);

 	public:
 		// Default constructor. Constructs an empty attribute.
 		xml_attribute();
-
+		
 		// Constructs attribute from internal pointer
 		explicit xml_attribute(xml_attribute_struct* attr);

@ -418,18 +349,13 @@ namespace pugi

 		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
 		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
 		bool set_value(const char_t* rhs);

 		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
 		bool set_value(int rhs);
 		bool set_value(unsigned int rhs);
-		bool set_value(long rhs);
-		bool set_value(unsigned long rhs);
 		bool set_value(double rhs);
-		bool set_value(double rhs, int precision);
 		bool set_value(float rhs);
-		bool set_value(float rhs, int precision);
 		bool set_value(bool rhs);

 	#ifdef PUGIXML_HAS_LONG_LONG
@ -441,8 +367,6 @@ namespace pugi
 		xml_attribute& operator=(const char_t* rhs);
 		xml_attribute& operator=(int rhs);
 		xml_attribute& operator=(unsigned int rhs);
-		xml_attribute& operator=(long rhs);
-		xml_attribute& operator=(unsigned long rhs);
 		xml_attribute& operator=(double rhs);
 		xml_attribute& operator=(float rhs);
 		xml_attribute& operator=(bool rhs);
@ -493,7 +417,7 @@ namespace pugi

 		// Borland C++ workaround
 		bool operator!() const;
-
+	
 		// Comparison operators (compares wrapped node pointers)
 		bool operator==(const xml_node& r) const;
 		bool operator!=(const xml_node& r) const;
@ -514,7 +438,7 @@ namespace pugi
 		// Get node value, or "" if node is empty or it has no value
 		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
 		const char_t* value() const;
-
+	
 		// Get attribute list
 		xml_attribute first_attribute() const;
 		xml_attribute last_attribute() const;
@ -526,7 +450,7 @@ namespace pugi
 		// Get next/previous sibling in the children list of the parent node
 		xml_node next_sibling() const;
 		xml_node previous_sibling() const;
-
+		
 		// Get parent node
 		xml_node parent() const;

@ -553,9 +477,8 @@ namespace pugi

 		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
 		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
 		bool set_value(const char_t* rhs);
-
+		
 		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
 		xml_attribute append_attribute(const char_t* name);
 		xml_attribute prepend_attribute(const char_t* name);
@ -596,16 +519,10 @@ namespace pugi
 		bool remove_attribute(const xml_attribute& a);
 		bool remove_attribute(const char_t* name);

-		// Remove all attributes
-		bool remove_attributes();
-
 		// Remove specified child
 		bool remove_child(const xml_node& n);
 		bool remove_child(const char_t* name);

-		// Remove all children
-		bool remove_children();
-
 		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
 		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
 		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
@ -615,11 +532,11 @@ namespace pugi
 		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
 		{
 			if (!_root) return xml_attribute();
-
+			
 			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
 				if (pred(attrib))
 					return attrib;
-
+		
 			return xml_attribute();
 		}

@ -627,11 +544,11 @@ namespace pugi
 		template <typename Predicate> xml_node find_child(Predicate pred) const
 		{
 			if (!_root) return xml_node();
-
+	
 			for (xml_node node = first_child(); node; node = node.next_sibling())
 				if (pred(node))
 					return node;
-
+		
 			return xml_node();
 		}

@ -641,7 +558,7 @@ namespace pugi
 			if (!_root) return xml_node();

 			xml_node cur = first_child();
-
+			
 			while (cur._root && cur._root != _root)
 			{
 				if (pred(cur)) return cur;
@ -673,22 +590,22 @@ namespace pugi

 		// Recursively traverse subtree with xml_tree_walker
 		bool traverse(xml_tree_walker& walker);
-
+	
 	#ifndef PUGIXML_NO_XPATH
 		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
-		xpath_node select_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		xpath_node select_node(const char_t* query, xpath_variable_set* variables = 0) const;
 		xpath_node select_node(const xpath_query& query) const;

 		// Select node set by evaluating XPath query
-		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = 0) const;
 		xpath_node_set select_nodes(const xpath_query& query) const;

 		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
-		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
+		xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
+		xpath_node select_single_node(const xpath_query& query) const;

 	#endif
-
+		
 		// Print subtree using a writer object
 		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;

@ -779,18 +696,13 @@ namespace pugi
 		bool as_bool(bool def = false) const;

 		// Set text (returns false if object is empty or there is not enough memory)
-		bool set(const char_t* rhs, size_t sz);
 		bool set(const char_t* rhs);

 		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
 		bool set(int rhs);
 		bool set(unsigned int rhs);
-		bool set(long rhs);
-		bool set(unsigned long rhs);
 		bool set(double rhs);
-		bool set(double rhs, int precision);
 		bool set(float rhs);
-		bool set(float rhs, int precision);
 		bool set(bool rhs);

 	#ifdef PUGIXML_HAS_LONG_LONG
@ -802,8 +714,6 @@ namespace pugi
 		xml_text& operator=(const char_t* rhs);
 		xml_text& operator=(int rhs);
 		xml_text& operator=(unsigned int rhs);
-		xml_text& operator=(long rhs);
-		xml_text& operator=(unsigned long rhs);
 		xml_text& operator=(double rhs);
 		xml_text& operator=(float rhs);
 		xml_text& operator=(bool rhs);
@ -858,10 +768,10 @@ namespace pugi
 		xml_node& operator*() const;
 		xml_node* operator->() const;

-		xml_node_iterator& operator++();
+		const xml_node_iterator& operator++();
 		xml_node_iterator operator++(int);

-		xml_node_iterator& operator--();
+		const xml_node_iterator& operator--();
 		xml_node_iterator operator--(int);
 	};

@ -900,10 +810,10 @@ namespace pugi
 		xml_attribute& operator*() const;
 		xml_attribute* operator->() const;

-		xml_attribute_iterator& operator++();
+		const xml_attribute_iterator& operator++();
 		xml_attribute_iterator operator++(int);

-		xml_attribute_iterator& operator--();
+		const xml_attribute_iterator& operator--();
 		xml_attribute_iterator operator--(int);
 	};

@ -936,10 +846,10 @@ namespace pugi
 		xml_node& operator*() const;
 		xml_node* operator->() const;

-		xml_named_node_iterator& operator++();
+		const xml_named_node_iterator& operator++();
 		xml_named_node_iterator operator++(int);

-		xml_named_node_iterator& operator--();
+		const xml_named_node_iterator& operator--();
 		xml_named_node_iterator operator--(int);

 	private:
@ -957,11 +867,11 @@ namespace pugi

 	private:
 		int _depth;
-
+	
 	protected:
 		// Get current traversal depth
 		int depth() const;
-
+	
 	public:
 		xml_tree_walker();
 		virtual ~xml_tree_walker();
@ -1032,14 +942,13 @@ namespace pugi
 		char_t* _buffer;

 		char _memory[192];
-
+		
 		// Non-copyable semantics
 		xml_document(const xml_document&);
 		xml_document& operator=(const xml_document&);

-		void _create();
-		void _destroy();
-		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+		void create();
+		void destroy();

 	public:
 		// Default constructor, makes empty document
@ -1048,12 +957,6 @@ namespace pugi
 		// Destructor, invalidates all node/attribute handles to this document
 		~xml_document();

-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-	#endif
-
 		// Removes all nodes, leaving the empty document
 		void reset();

@ -1067,7 +970,7 @@ namespace pugi
 	#endif

 		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
-		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
+		xml_parse_result load(const char_t* contents, unsigned int options = parse_default);

 		// Load document from zero-terminated string. No encoding conversions are applied.
 		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
@ -1148,7 +1051,7 @@ namespace pugi
 		// Non-copyable semantics
 		xpath_variable(const xpath_variable&);
 		xpath_variable& operator=(const xpath_variable&);
-
+		
 	public:
 		// Get variable name
 		const char_t* name() const;
@ -1192,10 +1095,10 @@ namespace pugi
 		xpath_variable_set(const xpath_variable_set& rhs);
 		xpath_variable_set& operator=(const xpath_variable_set& rhs);

-	#ifdef PUGIXML_HAS_MOVE
+	#if __cplusplus >= 201103
 		// Move semantics support
-		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
-		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_variable_set(xpath_variable_set&& rhs);
+		xpath_variable_set& operator=(xpath_variable_set&& rhs);
 	#endif

 		// Add a new variable or get the existing one, if the types match
@ -1228,7 +1131,7 @@ namespace pugi
 	public:
 		// Construct a compiled object from XPath expression.
 		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
-		explicit xpath_query(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL);
+		explicit xpath_query(const char_t* query, xpath_variable_set* variables = 0);

 		// Constructor
 		xpath_query();
@ -1236,29 +1139,29 @@ namespace pugi
 		// Destructor
 		~xpath_query();

-	#ifdef PUGIXML_HAS_MOVE
+	#if __cplusplus >= 201103
 		// Move semantics support
-		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
-		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+		xpath_query(xpath_query&& rhs);
+		xpath_query& operator=(xpath_query&& rhs);
 	#endif

 		// Get query expression return type
 		xpath_value_type return_type() const;
-
+		
 		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
 		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
 		bool evaluate_boolean(const xpath_node& n) const;
-
+		
 		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
 		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
 		double evaluate_number(const xpath_node& n) const;
-
+		
 	#ifndef PUGIXML_NO_STL
 		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
 		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
 		string_t evaluate_string(const xpath_node& n) const;
 	#endif
-
+		
 		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
 		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
 		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
@ -1285,14 +1188,8 @@ namespace pugi
 		// Borland C++ workaround
 		bool operator!() const;
 	};
-
+	
 	#ifndef PUGIXML_NO_EXCEPTIONS
-        #if defined(_MSC_VER)
-          // C4275 can be ignored in Visual C++ if you are deriving
-          // from a type in the Standard C++ Library
-          #pragma warning(push)
-          #pragma warning(disable: 4275)
-        #endif
 	// XPath exception class
 	class PUGIXML_CLASS xpath_exception: public std::exception
 	{
@ -1304,29 +1201,26 @@ namespace pugi
 		explicit xpath_exception(const xpath_parse_result& result);

 		// Get error message
-		virtual const char* what() const throw() PUGIXML_OVERRIDE;
+		virtual const char* what() const throw();

 		// Get parse result
 		const xpath_parse_result& result() const;
 	};
-        #if defined(_MSC_VER)
-          #pragma warning(pop)
-        #endif
 	#endif
-
+	
 	// XPath node class (either xml_node or xml_attribute)
 	class PUGIXML_CLASS xpath_node
 	{
 	private:
 		xml_node _node;
 		xml_attribute _attribute;
-
+	
 		typedef void (*unspecified_bool_type)(xpath_node***);

 	public:
 		// Default constructor; constructs empty XPath node
 		xpath_node();
-
+		
 		// Construct XPath node from XML node/attribute
 		xpath_node(const xml_node& node);
 		xpath_node(const xml_attribute& attribute, const xml_node& parent);
@ -1334,13 +1228,13 @@ namespace pugi
 		// Get node/attribute, if any
 		xml_node node() const;
 		xml_attribute attribute() const;
-
+		
 		// Get parent of contained node/attribute
 		xml_node parent() const;

 		// Safe bool conversion operator
 		operator unspecified_bool_type() const;
-
+		
 		// Borland C++ workaround
 		bool operator!() const;

@ -1366,13 +1260,13 @@ namespace pugi
 			type_sorted,			// Sorted by document order (ascending)
 			type_sorted_reverse		// Sorted by document order (descending)
 		};
-
+		
 		// Constant iterator type
 		typedef const xpath_node* const_iterator;

 		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
 		typedef const xpath_node* iterator;
-
+	
 		// Default constructor. Constructs empty set.
 		xpath_node_set();

@ -1381,49 +1275,49 @@ namespace pugi

 		// Destructor
 		~xpath_node_set();
-
+		
 		// Copy constructor/assignment operator
 		xpath_node_set(const xpath_node_set& ns);
 		xpath_node_set& operator=(const xpath_node_set& ns);

-	#ifdef PUGIXML_HAS_MOVE
+	#if __cplusplus >= 201103
 		// Move semantics support
-		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
-		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_node_set(xpath_node_set&& rhs);
+		xpath_node_set& operator=(xpath_node_set&& rhs);
 	#endif

 		// Get collection type
 		type_t type() const;
-
+		
 		// Get collection size
 		size_t size() const;

 		// Indexing operator
 		const xpath_node& operator[](size_t index) const;
-
+		
 		// Collection iterators
 		const_iterator begin() const;
 		const_iterator end() const;

 		// Sort the collection in ascending/descending order by document order
 		void sort(bool reverse = false);
-
+		
 		// Get first node in the collection by document order
 		xpath_node first() const;
-
+		
 		// Check if collection is empty
 		bool empty() const;
-
+	
 	private:
 		type_t _type;
-
-		xpath_node _storage[1];
-
+		
+		xpath_node _storage;
+		
 		xpath_node* _begin;
 		xpath_node* _end;

 		void _assign(const_iterator begin, const_iterator end, type_t type);
-		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
+		void _move(xpath_node_set& rhs);
 	};
 #endif

@ -1431,7 +1325,7 @@ namespace pugi
 	// Convert wide string to UTF8
 	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
 	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
-
+	
 	// Convert UTF8 to wide string
 	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
 	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
@ -1439,13 +1333,13 @@ namespace pugi

 	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
 	typedef void* (*allocation_function)(size_t size);
-
+	
 	// Memory deallocation function interface
 	typedef void (*deallocation_function)(void* ptr);

 	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
 	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
-
+	
 	// Get current memory management functions
 	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
 	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
@ -1481,7 +1375,7 @@ namespace std
 #endif

 /**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
+ * Copyright (c) 2006-2015 Arseny Kapoulkine
 *
 * Permission is hereby granted, free of charge, to any person
 * obtaining a copy of this software and associated documentation
@ -1494,7 +1388,7 @@ namespace std
 *
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
- *
+ * 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
--- a/tests/allocator.cpp
+++ b/tests/allocator.cpp
@ -8,11 +8,7 @@
 #if defined(__has_feature)
 #	define ADDRESS_SANITIZER __has_feature(address_sanitizer)
 #else
-#	if defined(__SANITIZE_ADDRESS__)
-#		define ADDRESS_SANITIZER 1
-#	else
-#		define ADDRESS_SANITIZER 0
-#	endif
+#	define ADDRESS_SANITIZER defined(__SANITIZE_ADDRESS__)
 #endif

 // Low-level allocation functions
--- a/tests/archive.pl
+++ b/tests/archive.pl
@ -0,0 +1,72 @@
+#!/usr/bin/perl
+
+use Archive::Tar;
+use Archive::Zip;
+use File::Basename;
+
+my $target = shift @ARGV;
+my @sources = @ARGV;
+
+my $basedir = basename($target, ('.zip', '.tar.gz', '.tgz')) . '/';
+
+my $zip = $target =~ /\.zip$/;
+my $arch = $zip ? Archive::Zip->new : Archive::Tar->new;
+
+for $source (sort {$a cmp $b} @sources)
+{
+	my $contents = &readfile_contents($source);
+	my $meta = &readfile_meta($source);
+	my $file = $basedir . $source;
+
+    if (-T $source)
+    {
+        # convert all newlines to Unix format
+        $contents =~ s/\r//g;
+
+        if ($zip)
+        {
+            # convert all newlines to Windows format for .zip distribution
+            $contents =~ s/\n/\r\n/g;
+        }
+    }
+
+	if ($zip)
+	{
+		my $path = $file;
+		$arch->addDirectory($path) if $path =~ s/\/[^\/]+$/\// && !defined($arch->memberNamed($path));
+
+		my $member = $arch->addString($contents, $file);
+
+		$member->desiredCompressionMethod(COMPRESSION_DEFLATED);
+		$member->desiredCompressionLevel(9);
+
+		$member->setLastModFileDateTimeFromUnix($$meta{mtime});
+	}
+	else
+	{
+		$arch->add_data($file, $contents, $meta);
+	}
+}
+
+$zip ? $arch->overwriteAs($target) : $arch->write($target, 9);
+
+sub readfile_contents
+{
+	my $file = shift;
+
+	open FILE, $file or die "Can't open $file: $!";
+	binmode FILE;
+	my @contents = <FILE>;
+	close FILE;
+
+	return join('', @contents);
+}
+
+sub readfile_meta
+{
+	my $file = shift;
+
+    my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file);
+
+	return {mtime => $mtime};
+}
--- a/tests/autotest-appveyor.ps1
+++ b/tests/autotest-appveyor.ps1
@ -12,29 +12,13 @@ function Invoke-CmdScript($scriptName)
 $sources = @("src/pugixml.cpp") + (Get-ChildItem -Path "tests/*.cpp" -Exclude "fuzz_*.cpp")
 $failed = $FALSE

-foreach ($vs in $args)
+foreach ($vs in 9,10,11,12,14)
 {
 	foreach ($arch in "x86","x64")
 	{
 		Write-Output "# Setting up VS$vs $arch"

-		if ($vs -eq 15) {
-			$vsdevcmdarch = if ($arch -eq "x64") { "amd64" } else { "x86" }
-			Invoke-CmdScript "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" "-arch=$vsdevcmdarch"
-		}
-		elseif ($vs -eq 19) {
-			$vsdevcmdarch = if ($arch -eq "x64") { "amd64" } else { "x86" }
-			Invoke-CmdScript "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" "-arch=$vsdevcmdarch"
-		}
-		elseif ($vs -eq 22) {
-			$vsdevcmdarch = if ($arch -eq "x64") { "amd64" } else { "x86" }
-			Invoke-CmdScript "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat" "-arch=$vsdevcmdarch"
-		}
-		else
-		{
-			Invoke-CmdScript "C:\Program Files (x86)\Microsoft Visual Studio $vs.0\VC\vcvarsall.bat" $arch
-		}
-
+		Invoke-CmdScript "C:\Program Files (x86)\Microsoft Visual Studio $vs.0\VC\vcvarsall.bat" $arch
 		if (! $?) { throw "Error setting up VS$vs $arch" }

 		foreach ($defines in "standard", "PUGIXML_WCHAR_MODE", "PUGIXML_COMPACT")
--- a/tests/common.hpp
+++ b/tests/common.hpp
@ -0,0 +1,8 @@
+#ifndef HEADER_TEST_COMMON_HPP
+#define HEADER_TEST_COMMON_HPP
+
+#include "test.hpp"
+
+using namespace pugi;
+
+#endif
--- a/tests/data_fuzz_xpath/basic.xpath
+++ b/tests/data_fuzz_xpath/basic.xpath
@ -1 +0,0 @@
-a/b/c
--- a/tests/data_fuzz_xpath/functions.xpath
+++ b/tests/data_fuzz_xpath/functions.xpath
@ -1 +0,0 @@
-sum(nodes) + round(concat(//a[translate(@id, 'abc', '012')]))
--- a/tests/data_fuzz_xpath/math.xpath
+++ b/tests/data_fuzz_xpath/math.xpath
@ -1 +0,0 @@
-1+2*3 div 4 mod 5-6
--- a/tests/data_fuzz_xpath/path.xpath
+++ b/tests/data_fuzz_xpath/path.xpath
@ -1 +0,0 @@
-@*/ancestor::*/near-north/*[4]/@*/preceding::text()
--- a/tests/data_fuzz_xpath/predicate.xpath
+++ b/tests/data_fuzz_xpath/predicate.xpath
@ -1 +0,0 @@
-library/nodes[@id=12]/element[@type='translate'][1]
--- a/tests/fuzz_parse.cpp
+++ b/tests/fuzz_parse.cpp
@ -1,14 +1,16 @@
 #include "../src/pugixml.hpp"
+#include "allocator.hpp"

-#include <stdint.h>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
+int main(int argc, const char** argv)
 {
+    pugi::set_memory_management_functions(memory_allocate, memory_deallocate);
+
    pugi::xml_document doc;

-	doc.load_buffer(Data, Size);
-	doc.load_buffer(Data, Size, pugi::parse_minimal);
-	doc.load_buffer(Data, Size, pugi::parse_full);
-
-	return 0;
+    for (int i = 1; i < argc; ++i)
+    {
+	    doc.load_file(argv[i]);
+	    doc.load_file(argv[i], pugi::parse_minimal);
+	    doc.load_file(argv[i], pugi::parse_full);
+	}
 }
--- a/tests/fuzz_parse.dict
+++ b/tests/fuzz_parse.dict
@ -1,72 +0,0 @@
-#
-# AFL dictionary for XML
-# ----------------------
-#
-# Several basic syntax elements and attributes, modeled on libxml2.
-#
-# Created by Michal Zalewski <lcamtuf@google.com>
-#
-
-attr_encoding=" encoding=\"1\""
-attr_generic=" a=\"1\""
-attr_href=" href=\"1\""
-attr_standalone=" standalone=\"no\""
-attr_version=" version=\"1\""
-attr_xml_base=" xml:base=\"1\""
-attr_xml_id=" xml:id=\"1\""
-attr_xml_lang=" xml:lang=\"1\""
-attr_xml_space=" xml:space=\"1\""
-attr_xmlns=" xmlns=\"1\""
-
-entity_builtin="&lt;"
-entity_decimal="&#1;"
-entity_external="&a;"
-entity_hex="&#x1;"
-
-string_any="ANY"
-string_brackets="[]"
-string_cdata="CDATA"
-string_col_fallback=":fallback"
-string_col_generic=":a"
-string_col_include=":include"
-string_dashes="--"
-string_empty="EMPTY"
-string_empty_dblquotes="\"\""
-string_empty_quotes="''"
-string_entities="ENTITIES"
-string_entity="ENTITY"
-string_fixed="#FIXED"
-string_id="ID"
-string_idref="IDREF"
-string_idrefs="IDREFS"
-string_implied="#IMPLIED"
-string_nmtoken="NMTOKEN"
-string_nmtokens="NMTOKENS"
-string_notation="NOTATION"
-string_parentheses="()"
-string_pcdata="#PCDATA"
-string_percent="%a"
-string_public="PUBLIC"
-string_required="#REQUIRED"
-string_schema=":schema"
-string_system="SYSTEM"
-string_ucs4="UCS-4"
-string_utf16="UTF-16"
-string_utf8="UTF-8"
-string_xmlns="xmlns:"
-
-tag_attlist="<!ATTLIST"
-tag_cdata="<![CDATA["
-tag_close="</a>"
-tag_doctype="<!DOCTYPE"
-tag_element="<!ELEMENT"
-tag_entity="<!ENTITY"
-tag_ignore="<![IGNORE["
-tag_include="<![INCLUDE["
-tag_notation="<!NOTATION"
-tag_open="<a>"
-tag_open_close="<a />"
-tag_open_exclamation="<!"
-tag_open_q="<?"
-tag_sq2_close="]]>"
-tag_xml_q="<?xml?>"
--- a/tests/fuzz_setup.sh
+++ b/tests/fuzz_setup.sh
@ -1,11 +0,0 @@
-#!/bin/bash
-
-sudo apt-get --yes install subversion screen gcc g++ cmake ninja-build golang autoconf libtool apache2 python-dev pkg-config zlib1g-dev libgcrypt11-dev
-
-mkdir -p clang
-cd clang
-git clone https://chromium.googlesource.com/chromium/src/tools/clang
-cd ..
-clang/clang/scripts/update.py
-sudo cp -rf third_party/llvm-build/Release+Asserts/lib/* /usr/local/lib/
-sudo cp -rf third_party/llvm-build/Release+Asserts/bin/* /usr/local/bin
--- a/tests/fuzz_xpath.cpp
+++ b/tests/fuzz_xpath.cpp
@ -1,26 +0,0 @@
-#include "../src/pugixml.hpp"
-
-#include <stdint.h>
-#include <string.h>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
-{
-	char* text = new char[Size + 1];
-	memcpy(text, Data, Size);
-	text[Size] = 0;
-
-#ifdef PUGIXML_NO_EXCEPTIONS
-	pugi::xpath_query q(text);
-#else
-	try
-	{
-		pugi::xpath_query q(text);
-	}
-	catch (pugi::xpath_exception&)
-	{
-	}
-#endif
-
-	delete[] text;
-	return 0;
-}
--- a/tests/fuzz_xpath.dict
+++ b/tests/fuzz_xpath.dict
@ -1,72 +0,0 @@
-"boolean"
-"count"
-"contains"
-"concat"
-"ceiling"
-"false"
-"floor"
-"id"
-"last"
-"lang"
-"local-name"
-"name"
-"namespace-uri"
-"normalize-space"
-"not"
-"number"
-"position"
-"round"
-"string"
-"string-length"
-"starts-with"
-"substring-before"
-"substring-after"
-"substring"
-"sum"
-"translate"
-"true"
-"ancestor"
-"ancestor-or-self"
-"attribute"
-"child"
-"descendant"
-"descendant-or-self"
-"following"
-"following-sibling"
-"namespace"
-"parent"
-"preceding"
-"preceding-sibling"
-"self"
-"comment"
-"node"
-"processing-instruction"
-"text"
-"or"
-"and"
-"div"
-"mod"
-">"
-">="
-"<"
-"<="
-"!"
-"!="
-"="
-"+"
-"-"
-"*"
-"|"
-"$"
-"("
-")"
-"["
-"]"
-","
-"//"
-"/"
-".."
-"."
-"@"
-"::"
-":"
--- a/tests/helpers.hpp
+++ b/tests/helpers.hpp
@ -1,7 +1,7 @@
 #ifndef HEADER_TEST_HELPERS_HPP
 #define HEADER_TEST_HELPERS_HPP

-#include "test.hpp"
+#include "common.hpp"

 #include <utility>

--- a/tests/main.cpp
+++ b/tests/main.cpp
@ -41,11 +41,11 @@ static void* custom_allocate(size_t size)
 	else
 	{
 		void* ptr = memory_allocate(size);
-		if (!ptr) return 0;
+		assert(ptr);

 		g_memory_total_size += memory_size(ptr);
 		g_memory_total_count++;
-
+		
 		return ptr;
 	}
 }
@ -68,7 +68,7 @@ static void custom_deallocate(void* ptr)

 	g_memory_total_size -= memory_size(ptr);
 	g_memory_total_count--;
-
+	
 	memory_deallocate(ptr);
 }

@ -105,9 +105,9 @@ static bool run_test(test_runner* test, const char* test_name, pugi::allocation_
 		g_memory_fail_triggered = false;
 		test_runner::_memory_fail_threshold = 0;
 		test_runner::_memory_fail_triggered = false;
-
+	
 		pugi::set_memory_management_functions(allocate, custom_deallocate);
-
+		
 #ifdef _MSC_VER
 #	pragma warning(push)
 #	pragma warning(disable: 4611) // interaction between _setjmp and C++ object destruction is non-portable
@ -115,7 +115,7 @@ static bool run_test(test_runner* test, const char* test_name, pugi::allocation_
 #endif

 		volatile int result = setjmp(test_runner::_failure_buffer);
-
+	
 #ifdef _MSC_VER
 #	pragma warning(pop)
 #endif
@ -177,7 +177,7 @@ int main(int, char** argv)
 	temp.erase((slash != std::string::npos) ? slash + 1 : 0);

 	test_runner::_temp_path = temp.c_str();
-
+	
 	replace_memory_management();

 	unsigned int total = 0;
@ -190,14 +190,13 @@ int main(int, char** argv)
 		total++;
 		passed += run_test(test, test->_name, custom_allocate);

+	#ifndef PUGIXML_NO_EXCEPTIONS
 		if (g_memory_fail_triggered)
 		{
-			// run tests that trigger memory failures twice - with an allocator that returns NULL and with an allocator that throws
-		#ifndef PUGIXML_NO_EXCEPTIONS
 			total++;
 			passed += run_test(test, (test->_name + std::string(" (throw)")).c_str(), custom_allocate_throw);
-		#endif
 		}
+	#endif
 	}

 	unsigned int failed = total - passed;
--- a/tests/test.cpp
+++ b/tests/test.cpp
@ -117,7 +117,7 @@ bool test_xpath_number(const pugi::xpath_node& node, const pugi::char_t* query,
 	double value = q.evaluate_number(node);
 	double absolute_error = fabs(value - expected);

-	const double tolerance = 1e-15;
+	const double tolerance = 1e-15f;
 	return absolute_error < tolerance || absolute_error < fabs(expected) * tolerance;
 }

--- a/tests/test.hpp
+++ b/tests/test.hpp
@ -5,10 +5,6 @@

 #include <setjmp.h>

-#ifndef PUGIXML_NO_EXCEPTIONS
-#include <new>
-#endif
-
 struct test_runner
 {
 	test_runner(const char* name)
@ -82,7 +78,7 @@ struct dummy_fixture {};
 	{ \
 		test_runner_##name(): test_runner(#name) {} \
 		\
-		virtual void run() PUGIXML_OVERRIDE \
+		virtual void run() \
 		{ \
 			test_runner_helper_##name helper; \
 			helper.run(); \
@ -116,8 +112,8 @@ struct dummy_fixture {};
 #define CHECK_TEXT(condition, text) if (condition) ; else test_runner::_failure_message = CHECK_JOIN2(text, __FILE__, __LINE__), longjmp(test_runner::_failure_buffer, 1)
 #define CHECK_FORCE_FAIL(text) test_runner::_failure_message = CHECK_JOIN2(text, __FILE__, __LINE__), longjmp(test_runner::_failure_buffer, 1)

-#if (defined(_MSC_VER) && _MSC_VER == 1200) || defined(__MWERKS__) || (defined(__BORLANDC__) && __BORLANDC__ <= 0x540)
-#	define STRINGIZE(value) "??" // Some compilers have issues with stringizing expressions that contain strings w/escaping inside
+#if (defined(_MSC_VER) && _MSC_VER == 1200) || defined(__MWERKS__)
+#	define STRINGIZE(value) "??" // MSVC 6.0 and CodeWarrior have troubles stringizing stuff with strings w/escaping inside
 #else
 #	define STRINGIZE(value) #value
 #endif
@ -154,14 +150,14 @@ struct dummy_fixture {};

 #define STR(text) PUGIXML_TEXT(text)

-#if defined(__DMC__) || defined(__BORLANDC__)
+#ifdef __DMC__
 #define U_LITERALS // DMC does not understand \x01234 (it parses first three digits), but understands \u01234
 #endif

 #if (defined(_MSC_VER) && _MSC_VER == 1200) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER == 800) || defined(__BORLANDC__)
 // NaN comparison on MSVC6 is incorrect, see http://www.nabble.com/assertDoubleEquals,-NaN---Microsoft-Visual-Studio-6-td9137859.html
 // IC8 and BCC are also affected by the same bug
-#	define MSVC6_NAN_BUG
+#	define MSVC6_NAN_BUG 
 #endif

 inline wchar_t wchar_cast(unsigned int value)
--- a/tests/test_compact.cpp
+++ b/tests/test_compact.cpp
@ -1,150 +0,0 @@
-#ifdef PUGIXML_COMPACT
-#include "test.hpp"
-
-using namespace pugi;
-
-static void overflow_hash_table(xml_document& doc)
-{
-	xml_node n = doc.child(STR("n"));
-
-	// compact encoding assumes next_sibling is a forward-only pointer so we can allocate hash entries by reordering nodes
-	// we allocate enough hash entries to be exactly on the edge of rehash threshold
-	for (int i = 0; i < 8; ++i)
-		CHECK(n.prepend_child(node_element));
-}
-
-TEST_XML_FLAGS(compact_out_of_memory_string, "<n a='v'/><?n v?>", parse_pi)
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_attribute a = doc.child(STR("n")).attribute(STR("a"));
-	xml_node pi = doc.last_child();
-
-	CHECK_ALLOC_FAIL(CHECK(!pi.set_name(STR("name"))));
-	CHECK_ALLOC_FAIL(CHECK(!pi.set_value(STR("value"))));
-	CHECK_ALLOC_FAIL(CHECK(!a.set_name(STR("name"))));
-	CHECK_ALLOC_FAIL(CHECK(!a.set_value(STR("value"))));
-}
-
-TEST_XML(compact_out_of_memory_attribute, "<n a='v'/>")
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_node n = doc.child(STR("n"));
-	xml_attribute a = n.attribute(STR("a"));
-
-	CHECK_ALLOC_FAIL(CHECK(!n.append_attribute(STR(""))));
-	CHECK_ALLOC_FAIL(CHECK(!n.prepend_attribute(STR(""))));
-	CHECK_ALLOC_FAIL(CHECK(!n.insert_attribute_after(STR(""), a)));
-	CHECK_ALLOC_FAIL(CHECK(!n.insert_attribute_before(STR(""), a)));
-}
-
-TEST_XML(compact_out_of_memory_attribute_copy, "<n a='v'/>")
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_node n = doc.child(STR("n"));
-	xml_attribute a = n.attribute(STR("a"));
-
-	CHECK_ALLOC_FAIL(CHECK(!n.append_copy(a)));
-	CHECK_ALLOC_FAIL(CHECK(!n.prepend_copy(a)));
-	CHECK_ALLOC_FAIL(CHECK(!n.insert_copy_after(a, a)));
-	CHECK_ALLOC_FAIL(CHECK(!n.insert_copy_before(a, a)));
-}
-
-TEST_XML(compact_out_of_memory_node, "<n/>")
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_node n = doc.child(STR("n"));
-
-	CHECK_ALLOC_FAIL(CHECK(!doc.append_child(node_element)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.prepend_child(node_element)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.insert_child_after(node_element, n)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.insert_child_before(node_element, n)));
-}
-
-TEST_XML(compact_out_of_memory_node_copy, "<n/>")
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_node n = doc.child(STR("n"));
-
-	CHECK_ALLOC_FAIL(CHECK(!doc.append_copy(n)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.prepend_copy(n)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.insert_copy_after(n, n)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.insert_copy_before(n, n)));
-}
-
-TEST_XML(compact_out_of_memory_node_move, "<n/><ne/>")
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_node n = doc.child(STR("n"));
-	xml_node ne = doc.child(STR("ne"));
-
-	CHECK_ALLOC_FAIL(CHECK(!doc.append_move(n)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.prepend_move(n)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.insert_move_after(n, ne)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.insert_move_before(n, ne)));
-}
-
-TEST_XML(compact_out_of_memory_remove, "<n a='v'/>")
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	overflow_hash_table(doc);
-
-	xml_node n = doc.child(STR("n"));
-	xml_attribute a = n.attribute(STR("a"));
-
-	CHECK_ALLOC_FAIL(CHECK(!n.remove_attribute(a)));
-	CHECK_ALLOC_FAIL(CHECK(!doc.remove_child(n)));
-}
-
-TEST_XML(compact_pointer_attribute_list, "<n a='v'/>")
-{
-	xml_node n = doc.child(STR("n"));
-	xml_attribute a = n.attribute(STR("a"));
-
-	// make sure we fill the page with node x
-	for (int i = 0; i < 1000; ++i)
-		doc.append_child(STR("x"));
-
-	// this requires extended encoding for prev_attribute_c/next_attribute
-	n.append_attribute(STR("b"));
-
-	// this requires extended encoding for first_attribute
-	n.remove_attribute(a);
-
-	CHECK(!n.attribute(STR("a")));
-	CHECK(n.attribute(STR("b")));
-}
-
-TEST_XML(compact_pointer_node_list, "<n/>")
-{
-	xml_node n = doc.child(STR("n"));
-
-	// make sure we fill the page with node x
-	// this requires extended encoding for prev_sibling_c/next_sibling
-	for (int i = 0; i < 1000; ++i)
-		doc.append_child(STR("x"));
-
-	// this requires extended encoding for first_child
-	n.append_child(STR("child"));
-
-	CHECK(n.child(STR("child")));
-}
-#endif
--- a/tests/test_deprecated.cpp
+++ b/tests/test_deprecated.cpp
@ -1,25 +0,0 @@
-#define PUGIXML_DEPRECATED // Suppress deprecated declarations to avoid warnings
-
-#include "test.hpp"
-
-using namespace pugi;
-
-TEST(document_deprecated_load)
-{
-	xml_document doc;
-	CHECK(doc.load(STR("<node/>")));
-	CHECK_NODE(doc, STR("<node/>"));
-}
-
-#ifndef PUGIXML_NO_XPATH
-TEST_XML(xpath_api_deprecated_select_single_node, "<node><head/><foo id='1'/><foo/><tail/></node>")
-{
-	xpath_node n1 = doc.select_single_node(STR("node/foo"));
-
-	xpath_query q(STR("node/foo"));
-	xpath_node n2 = doc.select_single_node(q);
-
-	CHECK(n1.node().attribute(STR("id")).as_int() == 1);
-	CHECK(n2.node().attribute(STR("id")).as_int() == 1);
-}
-#endif
--- a/tests/test_document.cpp
+++ b/tests/test_document.cpp
--- a/tests/test_dom_modify.cpp
+++ b/tests/test_dom_modify.cpp
--- a/tests/test_dom_text.cpp
+++ b/tests/test_dom_text.cpp
@ -1,11 +1,7 @@
-#include "test.hpp"
+#include "common.hpp"

 #include "helpers.hpp"

-#include <limits.h>
-
-using namespace pugi;
-
 TEST_XML_FLAGS(dom_text_empty, "<node><a>foo</a><b><![CDATA[bar]]></b><c><?pi value?></c><d/></node>", parse_default | parse_pi)
 {
    xml_node node = doc.child(STR("node"));
@ -124,12 +120,12 @@ TEST_XML(dom_text_as_float, "<node><text1>0</text1><text2>1</text2><text3>0.12</
 	xml_node node = doc.child(STR("node"));

 	CHECK(xml_text().as_float() == 0);
-	CHECK_DOUBLE(double(node.child(STR("text1")).text().as_float()), 0);
-	CHECK_DOUBLE(double(node.child(STR("text2")).text().as_float()), 1);
-	CHECK_DOUBLE(double(node.child(STR("text3")).text().as_float()), 0.12);
-	CHECK_DOUBLE(double(node.child(STR("text4")).text().as_float()), -5.1);
-	CHECK_DOUBLE(double(node.child(STR("text5")).text().as_float()), 3e-4);
-	CHECK_DOUBLE(double(node.child(STR("text6")).text().as_float()), 3.14159265358979323846);
+	CHECK_DOUBLE(node.child(STR("text1")).text().as_float(), 0);
+	CHECK_DOUBLE(node.child(STR("text2")).text().as_float(), 1);
+	CHECK_DOUBLE(node.child(STR("text3")).text().as_float(), 0.12);
+	CHECK_DOUBLE(node.child(STR("text4")).text().as_float(), -5.1);
+	CHECK_DOUBLE(node.child(STR("text5")).text().as_float(), 3e-4);
+	CHECK_DOUBLE(node.child(STR("text6")).text().as_float(), 3.14159265358979323846);
 }

 TEST_XML(dom_text_as_double, "<node><text1>0</text1><text2>1</text2><text3>0.12</text3><text4>-5.1</text4><text5>3e-4</text5><text6>3.14159265358979323846</text6></node>")
@ -249,46 +245,6 @@ TEST_XML(dom_text_set, "<node/>")
    CHECK_NODE(node, STR("<node>foobarfoobar</node>"));
 }

-TEST_XML(dom_text_set_with_size, "<node/>")
-{
-    xml_node node = doc.child(STR("node"));
-    xml_text t = node.text();
-
-    t.set(STR(""), 0);
-    CHECK(node.first_child().type() == node_pcdata);
-    CHECK_NODE(node, STR("<node></node>"));
-
-    t.set(STR("boo"), 3);
-    CHECK(node.first_child().type() == node_pcdata);
-    CHECK(node.first_child() == node.last_child());
-    CHECK_NODE(node, STR("<node>boo</node>"));
-
-    t.set(STR("foobarfoobar"), 12);
-    CHECK(node.first_child().type() == node_pcdata);
-    CHECK(node.first_child() == node.last_child());
-    CHECK_NODE(node, STR("<node>foobarfoobar</node>"));
-}
-
-TEST_XML(dom_text_set_partially_with_size, "<node/>")
-{
-    xml_node node = doc.child(STR("node"));
-    xml_text t = node.text();
-
-    t.set(STR("foo"), 0);
-    CHECK(node.first_child().type() == node_pcdata);
-    CHECK_NODE(node, STR("<node></node>"));
-
-    t.set(STR("boofoo"), 3);
-    CHECK(node.first_child().type() == node_pcdata);
-    CHECK(node.first_child() == node.last_child());
-    CHECK_NODE(node, STR("<node>boo</node>"));
-
-    t.set(STR("foobarfoobar"), 3);
-    CHECK(node.first_child().type() == node_pcdata);
-    CHECK(node.first_child() == node.last_child());
-    CHECK_NODE(node, STR("<node>foo</node>"));
-}
-
 TEST_XML(dom_text_assign, "<node/>")
 {
 	xml_node node = doc.child(STR("node"));
@ -343,73 +299,11 @@ TEST_XML(dom_text_set_value, "<node/>")
 	CHECK_NODE(node, STR("<node><text1>v1</text1><text2>-2147483647</text2><text3>-2147483648</text3><text4>4294967295</text4><text5>4294967294</text5><text6>0.5</text6><text7>0.25</text7><text8>true</text8></node>"));
 }

-#if LONG_MAX > 2147483647
-TEST_XML(dom_text_assign_long, "<node/>")
-{
-	xml_node node = doc.child(STR("node"));
-
-	node.append_child(STR("text1")).text() = -9223372036854775807l;
-	node.append_child(STR("text2")).text() = -9223372036854775807l - 1;
-	xml_text() = -9223372036854775807l - 1;
-
-	node.append_child(STR("text3")).text() = 18446744073709551615ul;
-	node.append_child(STR("text4")).text() = 18446744073709551614ul;
-	xml_text() = 18446744073709551615ul;
-
-	CHECK_NODE(node, STR("<node><text1>-9223372036854775807</text1><text2>-9223372036854775808</text2><text3>18446744073709551615</text3><text4>18446744073709551614</text4></node>"));
-}
-
-TEST_XML(dom_text_set_value_long, "<node/>")
-{
-	xml_node node = doc.child(STR("node"));
-
-	CHECK(node.append_child(STR("text1")).text().set(-9223372036854775807l));
-	CHECK(node.append_child(STR("text2")).text().set(-9223372036854775807l - 1));
-	CHECK(!xml_text().set(-9223372036854775807l - 1));
-
-	CHECK(node.append_child(STR("text3")).text().set(18446744073709551615ul));
-	CHECK(node.append_child(STR("text4")).text().set(18446744073709551614ul));
-	CHECK(!xml_text().set(18446744073709551615ul));
-
-	CHECK_NODE(node, STR("<node><text1>-9223372036854775807</text1><text2>-9223372036854775808</text2><text3>18446744073709551615</text3><text4>18446744073709551614</text4></node>"));
-}
-#else
-TEST_XML(dom_text_assign_long, "<node/>")
-{
-	xml_node node = doc.child(STR("node"));
-
-	node.append_child(STR("text1")).text() = -2147483647l;
-	node.append_child(STR("text2")).text() = -2147483647l - 1;
-	xml_text() = -2147483647l - 1;
-
-	node.append_child(STR("text3")).text() = 4294967295ul;
-	node.append_child(STR("text4")).text() = 4294967294ul;
-	xml_text() = 4294967295ul;
-
-	CHECK_NODE(node, STR("<node><text1>-2147483647</text1><text2>-2147483648</text2><text3>4294967295</text3><text4>4294967294</text4></node>"));
-}
-
-TEST_XML(dom_text_set_value_long, "<node/>")
-{
-	xml_node node = doc.child(STR("node"));
-
-	CHECK(node.append_child(STR("text1")).text().set(-2147483647l));
-	CHECK(node.append_child(STR("text2")).text().set(-2147483647l - 1));
-	CHECK(!xml_text().set(-2147483647l - 1));
-
-	CHECK(node.append_child(STR("text3")).text().set(4294967295ul));
-	CHECK(node.append_child(STR("text4")).text().set(4294967294ul));
-	CHECK(!xml_text().set(4294967295ul));
-
-	CHECK_NODE(node, STR("<node><text1>-2147483647</text1><text2>-2147483648</text2><text3>4294967295</text3><text4>4294967294</text4></node>"));
-}
-#endif
-
 #ifdef PUGIXML_HAS_LONG_LONG
 TEST_XML(dom_text_assign_llong, "<node/>")
 {
 	xml_node node = doc.child(STR("node"));
-
+	
 	node.append_child(STR("text1")).text() = -9223372036854775807ll;
 	node.append_child(STR("text2")).text() = -9223372036854775807ll - 1;
 	xml_text() = -9223372036854775807ll - 1;
@ -417,14 +311,14 @@ TEST_XML(dom_text_assign_llong, "<node/>")
 	node.append_child(STR("text3")).text() = 18446744073709551615ull;
 	node.append_child(STR("text4")).text() = 18446744073709551614ull;
 	xml_text() = 18446744073709551615ull;
-
+	
 	CHECK_NODE(node, STR("<node><text1>-9223372036854775807</text1><text2>-9223372036854775808</text2><text3>18446744073709551615</text3><text4>18446744073709551614</text4></node>"));
 }

 TEST_XML(dom_text_set_value_llong, "<node/>")
 {
 	xml_node node = doc.child(STR("node"));
-
+	
 	CHECK(node.append_child(STR("text1")).text().set(-9223372036854775807ll));
 	CHECK(node.append_child(STR("text2")).text().set(-9223372036854775807ll - 1));
 	CHECK(!xml_text().set(-9223372036854775807ll - 1));
@ -445,16 +339,16 @@ TEST_XML(dom_text_middle, "<node><c1>notthisone</c1>text<c2/></node>")
    CHECK_STRING(t.get(), STR("text"));
    t.set(STR("notext"));

-    CHECK_NODE(node, STR("<node><c1>notthisone</c1>notext<c2/></node>"));
+    CHECK_NODE(node, STR("<node><c1>notthisone</c1>notext<c2 /></node>"));
    CHECK(node.remove_child(t.data()));

    CHECK(!t);
-    CHECK_NODE(node, STR("<node><c1>notthisone</c1><c2/></node>"));
+    CHECK_NODE(node, STR("<node><c1>notthisone</c1><c2 /></node>"));

    t.set(STR("yestext"));

    CHECK(t);
-    CHECK_NODE(node, STR("<node><c1>notthisone</c1><c2/>yestext</node>"));
+    CHECK_NODE(node, STR("<node><c1>notthisone</c1><c2 />yestext</node>"));
    CHECK(t.data() == node.last_child());
 }

--- a/tests/test_dom_traverse.cpp
+++ b/tests/test_dom_traverse.cpp
@ -2,7 +2,7 @@
 #define _SCL_SECURE_NO_WARNINGS
 #define _SCL_SECURE_NO_DEPRECATE

-#include "test.hpp"
+#include "common.hpp"

 #include <string.h>
 #include <stdio.h>
@ -15,8 +15,6 @@

 #include "helpers.hpp"

-using namespace pugi;
-
 #ifdef PUGIXML_NO_STL
 template <typename I> static I move_iter(I base, int n)
 {
@ -59,10 +57,10 @@ TEST_XML(dom_attr_next_previous_attribute, "<node attr1='1' attr2='2' />")

 	CHECK(attr1.next_attribute() == attr2);
 	CHECK(attr2.next_attribute() == xml_attribute());
-
+	
 	CHECK(attr1.previous_attribute() == xml_attribute());
 	CHECK(attr2.previous_attribute() == attr1);
-
+	
 	CHECK(xml_attribute().next_attribute() == xml_attribute());
 	CHECK(xml_attribute().previous_attribute() == xml_attribute());
 }
@ -139,10 +137,6 @@ TEST_XML(dom_attr_as_integer_space, "<node attr1=' \t1234' attr2='\t 0x123' attr
 	CHECK(node.attribute(STR("attr2")).as_int() == 291);
 	CHECK(node.attribute(STR("attr3")).as_int() == 0);
 	CHECK(node.attribute(STR("attr4")).as_int() == 0);
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	CHECK(node.attribute(STR("attr1")).as_llong() == 1234);
-#endif
 }

 TEST_XML(dom_attr_as_float, "<node attr1='0' attr2='1' attr3='0.12' attr4='-5.1' attr5='3e-4' attr6='3.14159265358979323846'/>")
@ -150,12 +144,12 @@ TEST_XML(dom_attr_as_float, "<node attr1='0' attr2='1' attr3='0.12' attr4='-5.1'
 	xml_node node = doc.child(STR("node"));

 	CHECK(xml_attribute().as_float() == 0);
-	CHECK_DOUBLE(double(node.attribute(STR("attr1")).as_float()), 0);
-	CHECK_DOUBLE(double(node.attribute(STR("attr2")).as_float()), 1);
-	CHECK_DOUBLE(double(node.attribute(STR("attr3")).as_float()), 0.12);
-	CHECK_DOUBLE(double(node.attribute(STR("attr4")).as_float()), -5.1);
-	CHECK_DOUBLE(double(node.attribute(STR("attr5")).as_float()), 3e-4);
-	CHECK_DOUBLE(double(node.attribute(STR("attr6")).as_float()), 3.14159265358979323846);
+	CHECK_DOUBLE(node.attribute(STR("attr1")).as_float(), 0);
+	CHECK_DOUBLE(node.attribute(STR("attr2")).as_float(), 1);
+	CHECK_DOUBLE(node.attribute(STR("attr3")).as_float(), 0.12);
+	CHECK_DOUBLE(node.attribute(STR("attr4")).as_float(), -5.1);
+	CHECK_DOUBLE(node.attribute(STR("attr5")).as_float(), 3e-4);
+	CHECK_DOUBLE(node.attribute(STR("attr6")).as_float(), 3.14159265358979323846);
 }

 TEST_XML(dom_attr_as_double, "<node attr1='0' attr2='1' attr3='0.12' attr4='-5.1' attr5='3e-4' attr6='3.14159265358979323846'/>")
@ -339,11 +333,11 @@ TEST_XML(dom_attr_iterator_invalidate, "<node><node1 attr1='0'/><node2 attr1='0'

 TEST_XML(dom_attr_iterator_const, "<node attr1='0' attr2='1'/>")
 {
-    xml_node node = doc.child(STR("node"));
+    pugi::xml_node node = doc.child(STR("node"));

-    const xml_attribute_iterator i1 = node.attributes_begin();
-    const xml_attribute_iterator i2 = ++xml_attribute_iterator(i1);
-    const xml_attribute_iterator i3 = ++xml_attribute_iterator(i2);
+    const pugi::xml_attribute_iterator i1 = node.attributes_begin();
+    const pugi::xml_attribute_iterator i2 = ++xml_attribute_iterator(i1);
+    const pugi::xml_attribute_iterator i3 = ++xml_attribute_iterator(i2);

    CHECK(*i1 == node.attribute(STR("attr1")));
    CHECK(*i2 == node.attribute(STR("attr2")));
@ -461,11 +455,11 @@ TEST_XML(dom_node_iterator_invalidate, "<node><node1><child1/></node1><node2><ch

 TEST_XML(dom_node_iterator_const, "<node><child1/><child2/></node>")
 {
-    xml_node node = doc.child(STR("node"));
+    pugi::xml_node node = doc.child(STR("node"));

-    const xml_node_iterator i1 = node.begin();
-    const xml_node_iterator i2 = ++xml_node_iterator(i1);
-    const xml_node_iterator i3 = ++xml_node_iterator(i2);
+    const pugi::xml_node_iterator i1 = node.begin();
+    const pugi::xml_node_iterator i2 = ++xml_node_iterator(i1);
+    const pugi::xml_node_iterator i3 = ++xml_node_iterator(i2);

    CHECK(*i1 == node.child(STR("child1")));
    CHECK(*i2 == node.child(STR("child2")));
@ -503,7 +497,7 @@ TEST_XML_FLAGS(dom_node_type, "<?xml?><!DOCTYPE><?pi?><!--comment--><node>pcdata
 	CHECK((it++)->type() == node_element);

 	xml_node_iterator cit = doc.child(STR("node")).begin();
-
+	
 	CHECK((cit++)->type() == node_pcdata);
 	CHECK((cit++)->type() == node_cdata);
 }
@ -522,7 +516,7 @@ TEST_XML_FLAGS(dom_node_name_value, "<?xml?><!DOCTYPE id><?pi?><!--comment--><no
 	CHECK_NAME_VALUE(*it++, STR("node"), STR(""));

 	xml_node_iterator cit = doc.child(STR("node")).begin();
-
+	
 	CHECK_NAME_VALUE(*cit++, STR(""), STR("pcdata"));
 	CHECK_NAME_VALUE(*cit++, STR(""), STR("cdata"));
 }
@ -561,10 +555,10 @@ TEST_XML(dom_node_next_previous_sibling, "<node><child1/><child2/><child3/></nod

 	CHECK(child1.next_sibling() == child2);
 	CHECK(child3.next_sibling() == xml_node());
-
+	
 	CHECK(child1.previous_sibling() == xml_node());
 	CHECK(child3.previous_sibling() == child2);
-
+	
 	CHECK(child1.next_sibling(STR("child3")) == child3);
 	CHECK(child1.next_sibling(STR("child")) == xml_node());

@ -671,9 +665,9 @@ struct find_predicate_const

 struct find_predicate_prefix
 {
-	const char_t* prefix;
+	const pugi::char_t* prefix;

-	find_predicate_prefix(const char_t* prefix_): prefix(prefix_)
+	find_predicate_prefix(const pugi::char_t* prefix_): prefix(prefix_)
 	{
 	}

@ -681,7 +675,7 @@ struct find_predicate_prefix
 	{
 	#ifdef PUGIXML_WCHAR_MODE
 		// can't use wcsncmp here because of a bug in DMC
-		return std::basic_string<char_t>(obj.name()).compare(0, wcslen(prefix), prefix) == 0;
+		return std::basic_string<pugi::char_t>(obj.name()).compare(0, wcslen(prefix), prefix) == 0;
 	#else
 		return strncmp(obj.name(), prefix, strlen(prefix)) == 0;
 	#endif
@ -734,17 +728,14 @@ TEST_XML(dom_node_find_node, "<node><child1/><child2/></node>")
 TEST_XML(dom_node_path, "<node><child1>text<child2/></child1></node>")
 {
 	CHECK(xml_node().path() == STR(""));
-
+	
 	CHECK(doc.path() == STR(""));
 	CHECK(doc.child(STR("node")).path() == STR("/node"));
 	CHECK(doc.child(STR("node")).child(STR("child1")).path() == STR("/node/child1"));
 	CHECK(doc.child(STR("node")).child(STR("child1")).child(STR("child2")).path() == STR("/node/child1/child2"));
 	CHECK(doc.child(STR("node")).child(STR("child1")).first_child().path() == STR("/node/child1/"));
-
+	
 	CHECK(doc.child(STR("node")).child(STR("child1")).path('\\') == STR("\\node\\child1"));
-
-	doc.append_child(node_element);
-	CHECK(doc.last_child().path() == STR("/"));
 }
 #endif

@ -752,7 +743,7 @@ TEST_XML(dom_node_first_element_by_path, "<node><child1>text<child2/></child1></
 {
 	CHECK(xml_node().first_element_by_path(STR("/")) == xml_node());
 	CHECK(xml_node().first_element_by_path(STR("a")) == xml_node());
-
+	
 	CHECK(doc.first_element_by_path(STR("")) == doc);
 	CHECK(doc.first_element_by_path(STR("/")) == doc);

@ -766,7 +757,7 @@ TEST_XML(dom_node_first_element_by_path, "<node><child1>text<child2/></child1></
 #endif

 	CHECK(doc.first_element_by_path(STR("/node/child2")) == xml_node());
-
+	
 	CHECK(doc.first_element_by_path(STR("\\node\\child1"), '\\') == doc.child(STR("node")).child(STR("child1")));

 	CHECK(doc.child(STR("node")).first_element_by_path(STR("..")) == doc);
@ -784,7 +775,7 @@ TEST_XML(dom_node_first_element_by_path, "<node><child1>text<child2/></child1></

 struct test_walker: xml_tree_walker
 {
-	std::basic_string<char_t> log;
+	std::basic_string<pugi::char_t> log;
 	unsigned int call_count;
 	unsigned int stop_count;

@ -792,27 +783,22 @@ struct test_walker: xml_tree_walker
 	{
 	}

-	std::basic_string<char_t> depthstr() const
+	std::basic_string<pugi::char_t> depthstr() const
 	{
 		char buf[32];
-
-	#if __cplusplus >= 201103 || defined(__APPLE__) // Xcode 14 warns about use of sprintf in C++98 builds
-		snprintf(buf, sizeof(buf), "%d", depth());
-	#else
 		sprintf(buf, "%d", depth());
-	#endif

 	#ifdef PUGIXML_WCHAR_MODE
 		wchar_t wbuf[32];
 		std::copy(buf, buf + strlen(buf) + 1, &wbuf[0]);

-		return std::basic_string<char_t>(wbuf);
+		return std::basic_string<pugi::char_t>(wbuf);
 	#else
-		return std::basic_string<char_t>(buf);
+		return std::basic_string<pugi::char_t>(buf);
 	#endif
 	}

-	virtual bool begin(xml_node& node) PUGIXML_OVERRIDE
+	virtual bool begin(xml_node& node)
 	{
 		log += STR("|");
 		log += depthstr();
@ -824,7 +810,7 @@ struct test_walker: xml_tree_walker
 		return ++call_count != stop_count && xml_tree_walker::begin(node);
 	}

-	virtual bool for_each(xml_node& node) PUGIXML_OVERRIDE
+	virtual bool for_each(xml_node& node)
 	{
 		log += STR("|");
 		log += depthstr();
@ -836,7 +822,7 @@ struct test_walker: xml_tree_walker
 		return ++call_count != stop_count && xml_tree_walker::end(node);
 	}

-	virtual bool end(xml_node& node) PUGIXML_OVERRIDE
+	virtual bool end(xml_node& node)
 	{
 		log += STR("|");
 		log += depthstr();
@ -933,7 +919,7 @@ TEST_XML_FLAGS(dom_offset_debug, "<?xml?><!DOCTYPE><?pi?><!--comment--><node>pcd
 	CHECK((it++)->offset_debug() == 38);

 	xml_node_iterator cit = doc.child(STR("node")).begin();
-
+	
 	CHECK((cit++)->offset_debug() == 43);
 	CHECK((cit++)->offset_debug() == 58);
 }
@ -980,7 +966,7 @@ TEST_XML(dom_internal_object, "<node attr='value'>value</node>")
 	xml_node node = doc.child(STR("node"));
 	xml_attribute attr = node.first_attribute();
 	xml_node value = node.first_child();
-
+	
 	CHECK(xml_node().internal_object() == 0);
 	CHECK(xml_attribute().internal_object() == 0);

@ -1002,7 +988,7 @@ TEST_XML(dom_hash_value, "<node attr='value'>value</node>")
 	xml_node node = doc.child(STR("node"));
 	xml_attribute attr = node.first_attribute();
 	xml_node value = node.first_child();
-
+	
 	CHECK(xml_node().hash_value() == 0);
 	CHECK(xml_attribute().hash_value() == 0);

@ -1288,17 +1274,3 @@ TEST_XML(dom_as_int_plus, "<node attr1='+1' attr2='+0xa' />")
 	CHECK(node.attribute(STR("attr2")).as_ullong() == 10);
 #endif
 }
-
-TEST(dom_node_anonymous)
-{
-	xml_document doc;
-	doc.append_child(node_element);
-	doc.append_child(node_element);
-	doc.append_child(node_pcdata);
-
-	CHECK(doc.child(STR("node")) == xml_node());
-	CHECK(doc.first_child().next_sibling(STR("node")) == xml_node());
-	CHECK(doc.last_child().previous_sibling(STR("node")) == xml_node());
-	CHECK_STRING(doc.child_value(), STR(""));
-	CHECK_STRING(doc.last_child().child_value(), STR(""));
-}
--- a/tests/test_header_only_1.cpp
+++ b/tests/test_header_only_1.cpp
@ -1,14 +1,12 @@
 #define PUGIXML_HEADER_ONLY
 #define pugi pugih

-#include "test.hpp"
+#include "common.hpp"

 // Check header guards
 #include "../src/pugixml.hpp"
 #include "../src/pugixml.hpp"

-using namespace pugi;
-
 TEST(header_only_1)
 {
 	xml_document doc;
--- a/tests/test_header_only_2.cpp
+++ b/tests/test_header_only_2.cpp
@ -1,14 +1,12 @@
 #define PUGIXML_HEADER_ONLY
 #define pugi pugih

-#include "test.hpp"
+#include "common.hpp"

 // Check header guards
 #include "../src/pugixml.hpp"
 #include "../src/pugixml.hpp"

-using namespace pugi;
-
 TEST(header_only_2)
 {
 	xml_document doc;
--- a/tests/test_memory.cpp
+++ b/tests/test_memory.cpp
@ -1,4 +1,4 @@
-#include "test.hpp"
+#include "common.hpp"

 #include "writer_string.hpp"
 #include "allocator.hpp"
@ -6,8 +6,6 @@
 #include <string>
 #include <vector>

-using namespace pugi;
-
 namespace
 {
 	int page_allocs = 0;
@ -50,7 +48,7 @@ TEST(memory_custom_memory_management)
 		CHECK(page_allocs == 0 && page_deallocs == 0);

 		CHECK(doc.load_string(STR("<node />")));
-
+	
 		CHECK(page_allocs == 1 && page_deallocs == 0);

 		// modify document (no new page)
@ -58,7 +56,7 @@ TEST(memory_custom_memory_management)
 		CHECK(page_allocs == 1 && page_deallocs == 0);

 		// modify document (new page)
-		std::basic_string<char_t> s(65536, 'x');
+		std::basic_string<pugi::char_t> s(65536, 'x');

 		CHECK(doc.first_child().set_name(s.c_str()));
 		CHECK(page_allocs == 2 && page_deallocs == 0);
@ -95,7 +93,7 @@ TEST(memory_large_allocations)
 		// initial fill
 		for (size_t i = 0; i < 128; ++i)
 		{
-			std::basic_string<char_t> s(i * 128, 'x');
+			std::basic_string<pugi::char_t> s(i * 128, 'x');

 			CHECK(doc.append_child(node_pcdata).set_value(s.c_str()));
 		}
@ -105,12 +103,12 @@ TEST(memory_large_allocations)
 		// grow-prune loop
 		while (doc.first_child())
 		{
-			xml_node node;
+			pugi::xml_node node;

 			// grow
 			for (node = doc.first_child(); node; node = node.next_sibling())
 			{
-				std::basic_string<char_t> s = node.value();
+				std::basic_string<pugi::char_t> s = node.value();

 				CHECK(node.set_value((s + s).c_str()));
 			}
@ -118,7 +116,7 @@ TEST(memory_large_allocations)
 			// prune
 			for (node = doc.first_child(); node; )
 			{
-				xml_node next = node.next_sibling().next_sibling();
+				pugi::xml_node next = node.next_sibling().next_sibling();

 				node.parent().remove_child(node);

@ -161,7 +159,7 @@ TEST(memory_page_management)

 		for (size_t i = 0; i < 4000; ++i)
 		{
-			xml_node node = doc.append_child(STR("n"));
+			xml_node node = doc.append_child(STR("node"));
 			CHECK(node);

 			nodes.push_back(node);
--- a/tests/test_parse.cpp
+++ b/tests/test_parse.cpp
@ -1,9 +1,7 @@
-#include "test.hpp"
+#include "common.hpp"

 #include "writer_string.hpp"

-using namespace pugi;
-
 TEST(parse_pi_skip)
 {
 	xml_document doc;
@ -84,22 +82,12 @@ TEST(parse_pi_error)
 		CHECK(doc.load_string(STR("<?name&"), flags).status == status_bad_pi);
 		CHECK(doc.load_string(STR("<?name&?"), flags).status == status_bad_pi);
 	}
-
+	
 	CHECK(doc.load_string(STR("<?xx#?>"), parse_fragment | parse_pi).status == status_bad_pi);
 	CHECK(doc.load_string(STR("<?name&?>"), parse_fragment | parse_pi).status == status_bad_pi);
 	CHECK(doc.load_string(STR("<?name& x?>"), parse_fragment | parse_pi).status == status_bad_pi);
 }

-TEST(parse_pi_error_buffer_boundary)
-{
-	char buf1[] = "<?name?>";
-	char buf2[] = "<?name?x";
-
-	xml_document doc;
-	CHECK(doc.load_buffer_inplace(buf1, 8, parse_fragment | parse_pi));
-	CHECK(doc.load_buffer_inplace(buf2, 8, parse_fragment | parse_pi).status == status_bad_pi);
-}
-
 TEST(parse_comments_skip)
 {
 	xml_document doc;
@ -247,9 +235,9 @@ TEST(parse_ws_pcdata_skip)
 	CHECK(!doc.first_child());

 	CHECK(doc.load_string(STR("<root>  <node>  </node>  </root>"), parse_minimal));
-
+	
 	xml_node root = doc.child(STR("root"));
-
+	
 	CHECK(root.first_child() == root.last_child());
 	CHECK(!root.first_child().first_child());
 }
@ -292,46 +280,46 @@ TEST(parse_ws_pcdata_permutations)
    struct test_data_t
    {
        unsigned int mask; // 1 = default flags, 2 = parse_ws_pcdata, 4 = parse_ws_pcdata_single
-        const char_t* source;
-        const char_t* result;
+        const pugi::char_t* source;
+        const pugi::char_t* result;
        int nodes; // negative if parsing should fail
    };

    test_data_t test_data[] =
    {
        // external pcdata should be discarded (whitespace or not)
-        {7, STR("ext1<node/>"), STR("<node/>"), 2},
-        {7, STR("ext1<node/>ext2"), STR("<node/>"), 2},
-        {7, STR(" <node/>"), STR("<node/>"), 2},
-        {7, STR("<node/> "), STR("<node/>"), 2},
-        {7, STR(" <node/> "), STR("<node/>"), 2},
+        {7, STR("ext1<node/>"), STR("<node />"), 2},
+        {7, STR("ext1<node/>ext2"), STR("<node />"), 2},
+        {7, STR(" <node/>"), STR("<node />"), 2},
+        {7, STR("<node/> "), STR("<node />"), 2},
+        {7, STR(" <node/> "), STR("<node />"), 2},
        // inner pcdata should be preserved
        {7, STR("<node>inner</node>"), STR("<node>inner</node>"), 3},
-        {7, STR("<node>inner1<child/>inner2</node>"), STR("<node>inner1<child/>inner2</node>"), 5},
+        {7, STR("<node>inner1<child/>inner2</node>"), STR("<node>inner1<child />inner2</node>"), 5},
        {7, STR("<node>inner1<child>deep</child>inner2</node>"), STR("<node>inner1<child>deep</child>inner2</node>"), 6},
        // empty pcdata nodes should never be created
-        {7, STR("<node>inner1<child></child>inner2</node>"), STR("<node>inner1<child/>inner2</node>"), 5},
-        {7, STR("<node><child></child>inner2</node>"), STR("<node><child/>inner2</node>"), 4},
-        {7, STR("<node>inner1<child></child></node>"), STR("<node>inner1<child/></node>"), 4},
-        {7, STR("<node><child></child></node>"), STR("<node><child/></node>"), 3},
+        {7, STR("<node>inner1<child></child>inner2</node>"), STR("<node>inner1<child />inner2</node>"), 5},
+        {7, STR("<node><child></child>inner2</node>"), STR("<node><child />inner2</node>"), 4},
+        {7, STR("<node>inner1<child></child></node>"), STR("<node>inner1<child /></node>"), 4},
+        {7, STR("<node><child></child></node>"), STR("<node><child /></node>"), 3},
        // comments, pi or other nodes should not cause pcdata creation either
-        {7, STR("<node><!----><child><?pi?></child><![CDATA[x]]></node>"), STR("<node><child/><![CDATA[x]]></node>"), 4},
+        {7, STR("<node><!----><child><?pi?></child><![CDATA[x]]></node>"), STR("<node><child /><![CDATA[x]]></node>"), 4},
        // leading/trailing pcdata whitespace should be preserved (note: this will change if parse_ws_pcdata_trim is introduced)
        {7, STR("<node>\t \tinner1<child> deep   </child>\t\ninner2\n\t</node>"), STR("<node>\t \tinner1<child> deep   </child>\t\ninner2\n\t</node>"), 6},
        // whitespace-only pcdata preservation depends on the parsing mode
-        {1, STR("<node>\n\t<child>   </child>\n\t<child> <deep>  </deep> </child>\n\t<!---->\n\t</node>"), STR("<node><child/><child><deep/></child></node>"), 5},
+        {1, STR("<node>\n\t<child>   </child>\n\t<child> <deep>  </deep> </child>\n\t<!---->\n\t</node>"), STR("<node><child /><child><deep /></child></node>"), 5},
        {2, STR("<node>\n\t<child>   </child>\n\t<child> <deep>  </deep> </child>\n\t<!---->\n\t</node>"), STR("<node>\n\t<child>   </child>\n\t<child> <deep>  </deep> </child>\n\t\n\t</node>"), 13},
        {4, STR("<node>\n\t<child>   </child>\n\t<child> <deep>  </deep> </child>\n\t<!---->\n\t</node>"), STR("<node><child>   </child><child><deep>  </deep></child></node>"), 7},
        // current implementation of parse_ws_pcdata_single has an unfortunate bug; reproduce it here
        {4, STR("<node>\t\t<!---->\n\n</node>"), STR("<node>\n\n</node>"), 3},
        // error case: terminate PCDATA in the middle
        {7, STR("<node>abcdef"), STR("<node>abcdef</node>"), -3},
-        {5, STR("<node>      "), STR("<node/>"), -2},
+        {5, STR("<node>      "), STR("<node />"), -2},
        {2, STR("<node>      "), STR("<node>      </node>"), -3},
        // error case: terminate PCDATA as early as possible
-        {7, STR("<node>"), STR("<node/>"), -2},
+        {7, STR("<node>"), STR("<node />"), -2},
        {7, STR("<node>a"), STR("<node>a</node>"), -3},
-        {5, STR("<node> "), STR("<node/>"), -2},
+        {5, STR("<node> "), STR("<node />"), -2},
        {2, STR("<node> "), STR("<node> </node>"), -3},
    };

@ -361,8 +349,8 @@ TEST(parse_ws_pcdata_fragment_permutations)
    struct test_data_t
    {
        unsigned int mask; // 1 = default flags, 2 = parse_ws_pcdata, 4 = parse_ws_pcdata_single
-        const char_t* source;
-        const char_t* result;
+        const pugi::char_t* source;
+        const pugi::char_t* result;
        int nodes; // negative if parsing should fail
    };

@ -372,18 +360,18 @@ TEST(parse_ws_pcdata_fragment_permutations)
        {7, STR("ext1"), STR("ext1"), 2},
        {5, STR("    "), STR(""), 1},
        {2, STR("    "), STR("    "), 2},
-        {7, STR("ext1<node/>"), STR("ext1<node/>"), 3},
-        {7, STR("<node/>ext2"), STR("<node/>ext2"), 3},
-        {7, STR("ext1<node/>ext2"), STR("ext1<node/>ext2"), 4},
-        {7, STR("ext1<node1/>ext2<node2/>ext3"), STR("ext1<node1/>ext2<node2/>ext3"), 6},
-        {5, STR(" <node/>"), STR("<node/>"), 2},
-        {2, STR(" <node/>"), STR(" <node/>"), 3},
-        {5, STR("<node/> "), STR("<node/>"), 2},
-        {2, STR("<node/> "), STR("<node/> "), 3},
-        {5, STR(" <node/> "), STR("<node/>"), 2},
-        {2, STR(" <node/> "), STR(" <node/> "), 4},
-        {5, STR(" <node1/> <node2/> "), STR("<node1/><node2/>"), 3},
-        {2, STR(" <node1/> <node2/> "), STR(" <node1/> <node2/> "), 6},
+        {7, STR("ext1<node/>"), STR("ext1<node />"), 3},
+        {7, STR("<node/>ext2"), STR("<node />ext2"), 3},
+        {7, STR("ext1<node/>ext2"), STR("ext1<node />ext2"), 4},
+        {7, STR("ext1<node1/>ext2<node2/>ext3"), STR("ext1<node1 />ext2<node2 />ext3"), 6},
+        {5, STR(" <node/>"), STR("<node />"), 2},
+        {2, STR(" <node/>"), STR(" <node />"), 3},
+        {5, STR("<node/> "), STR("<node />"), 2},
+        {2, STR("<node/> "), STR("<node /> "), 3},
+        {5, STR(" <node/> "), STR("<node />"), 2},
+        {2, STR(" <node/> "), STR(" <node /> "), 4},
+        {5, STR(" <node1/> <node2/> "), STR("<node1 /><node2 />"), 3},
+        {2, STR(" <node1/> <node2/> "), STR(" <node1 /> <node2 /> "), 6},
    };

    for (size_t i = 0; i < sizeof(test_data) / sizeof(test_data[0]); ++i)
@ -441,8 +429,8 @@ TEST(parse_pcdata_trim)
 {
    struct test_data_t
    {
-        const char_t* source;
-        const char_t* result;
+        const pugi::char_t* source;
+        const pugi::char_t* result;
        unsigned int flags;
    };

@ -474,7 +462,7 @@ TEST(parse_pcdata_trim)
        xml_document doc;
        CHECK(doc.load_string(td.source, td.flags | parse_trim_pcdata));

-        const char_t* value = doc.child(STR("node")) ? doc.child_value(STR("node")) : doc.text().get();
+        const pugi::char_t* value = doc.child(STR("node")) ? doc.child_value(STR("node")) : doc.text().get();
        CHECK_STRING(value, td.result);
    }
 }
@ -563,7 +551,7 @@ TEST(parse_escapes_unicode)
 	CHECK(doc.load_string(STR("<node>&#x03B3;&#x03b3;&#x24B62;</node>"), parse_minimal | parse_escapes));

 #ifdef PUGIXML_WCHAR_MODE
-	const char_t* v = doc.child_value(STR("node"));
+	const pugi::char_t* v = doc.child_value(STR("node"));

 	size_t wcharsize = sizeof(wchar_t);

@ -758,48 +746,18 @@ TEST(parse_attribute_quot_inside)
 			}
 }

-TEST(parse_attribute_wnorm_coverage)
-{
-	xml_document doc;
-	CHECK(doc.load_string(STR("<n a1='v' a2=' ' a3='x y' a4='x  y' a5='x   y' />"), parse_wnorm_attribute));
-	CHECK_NODE(doc, STR("<n a1=\"v\" a2=\"\" a3=\"x y\" a4=\"x y\" a5=\"x y\"/>"));
-
-	CHECK(doc.load_string(STR("<n a1='v' a2=' ' a3='x y' a4='x  y' a5='x   y' />"), parse_wnorm_attribute | parse_escapes));
-	CHECK_NODE(doc, STR("<n a1=\"v\" a2=\"\" a3=\"x y\" a4=\"x y\" a5=\"x y\"/>"));
-}
-
-TEST(parse_attribute_wconv_coverage)
-{
-	xml_document doc;
-	CHECK(doc.load_string(STR("<n a1='v' a2='\r' a3='\r\n\n' a4='\n' />"), parse_wconv_attribute));
-	CHECK_NODE(doc, STR("<n a1=\"v\" a2=\" \" a3=\"  \" a4=\" \"/>"));
-
-	CHECK(doc.load_string(STR("<n a1='v' a2='\r' a3='\r\n\n' a4='\n' />"), parse_wconv_attribute | parse_escapes));
-	CHECK_NODE(doc, STR("<n a1=\"v\" a2=\" \" a3=\"  \" a4=\" \"/>"));
-}
-
-TEST(parse_attribute_eol_coverage)
-{
-	xml_document doc;
-	CHECK(doc.load_string(STR("<n a1='v' a2='\r' a3='\r\n\n' a4='\n' />"), parse_eol));
-	CHECK_NODE(doc, STR("<n a1=\"v\" a2=\"&#10;\" a3=\"&#10;&#10;\" a4=\"&#10;\"/>"));
-
-	CHECK(doc.load_string(STR("<n a1='v' a2='\r' a3='\r\n\n' a4='\n' />"), parse_eol | parse_escapes));
-	CHECK_NODE(doc, STR("<n a1=\"v\" a2=\"&#10;\" a3=\"&#10;&#10;\" a4=\"&#10;\"/>"));
-}
-
 TEST(parse_tag_single)
 {
 	xml_document doc;
 	CHECK(doc.load_string(STR("<node/><node /><node\n/>"), parse_minimal));
-	CHECK_NODE(doc, STR("<node/><node/><node/>"));
+	CHECK_NODE(doc, STR("<node /><node /><node />"));
 }

 TEST(parse_tag_hierarchy)
 {
 	xml_document doc;
 	CHECK(doc.load_string(STR("<node><n1><n2/></n1><n3><n4><n5></n5></n4></n3 \r\n></node>"), parse_minimal));
-	CHECK_NODE(doc, STR("<node><n1><n2/></n1><n3><n4><n5/></n4></n3></node>"));
+	CHECK_NODE(doc, STR("<node><n1><n2 /></n1><n3><n4><n5 /></n4></n3></node>"));
 }

 TEST(parse_tag_error)
@ -897,7 +855,7 @@ TEST(parse_declaration_error)
 		CHECK(doc.load_string(STR("<?xml>"), flags).status == status_bad_pi);
 		CHECK(doc.load_string(STR("<?xml version='1>"), flags).status == status_bad_pi);
 	}
-
+	
 	CHECK(doc.load_string(STR("<?xml version='1?>"), parse_fragment | parse_declaration).status == status_bad_attribute);
 	CHECK(doc.load_string(STR("<foo><?xml version='1'?></foo>"), parse_fragment | parse_declaration).status == status_bad_pi);
 }
@ -935,8 +893,8 @@ TEST(parse_out_of_memory_halfway_node)
 	test_runner::_memory_fail_threshold = 65536;

 	xml_document doc;
-	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer_inplace(text, sizeof(text)).status == status_out_of_memory));
-	CHECK_NODE(doc.first_child(), STR("<n/>"));
+	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer_inplace(text, count * 4).status == status_out_of_memory));
+	CHECK_NODE(doc.first_child(), STR("<n />"));
 }

 TEST(parse_out_of_memory_halfway_attr)
@ -962,7 +920,7 @@ TEST(parse_out_of_memory_halfway_attr)
 	test_runner::_memory_fail_threshold = 65536;

 	xml_document doc;
-	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer_inplace(text, sizeof(text)).status == status_out_of_memory));
+	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer_inplace(text, count * 5 + 4).status == status_out_of_memory));
 	CHECK_STRING(doc.first_child().name(), STR("n"));
 	CHECK_STRING(doc.first_child().first_attribute().name(), STR("a"));
 	CHECK_STRING(doc.first_child().last_attribute().name(), STR("a"));
@ -970,7 +928,7 @@ TEST(parse_out_of_memory_halfway_attr)

 TEST(parse_out_of_memory_conversion)
 {
-	test_runner::_memory_fail_threshold = 1;
+	test_runner::_memory_fail_threshold = 256;

 	xml_document doc;
 	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer("<foo\x90/>", 7, parse_default, encoding_latin1).status == status_out_of_memory));
@ -993,8 +951,8 @@ TEST(parse_out_of_memory_allocator_state_sync)
 	test_runner::_memory_fail_threshold = 65536;

 	xml_document doc;
-	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer_inplace(text, sizeof(text)).status == status_out_of_memory));
-	CHECK_NODE(doc.first_child(), STR("<n/>"));
+	CHECK_ALLOC_FAIL(CHECK(doc.load_buffer_inplace(text, count * 4).status == status_out_of_memory));
+	CHECK_NODE(doc.first_child(), STR("<n />"));

 	test_runner::_memory_fail_threshold = 0;

@ -1002,7 +960,7 @@ TEST(parse_out_of_memory_allocator_state_sync)
 		CHECK(doc.append_child(STR("n")));
 }

-static bool test_offset(const char_t* contents, unsigned int options, xml_parse_status status, ptrdiff_t offset)
+static bool test_offset(const char_t* contents, unsigned int options, pugi::xml_parse_status status, ptrdiff_t offset)
 {
 	xml_document doc;
 	xml_parse_result res = doc.load_string(contents, options);
@ -1047,8 +1005,8 @@ TEST(parse_error_offset)
 	CHECK_OFFSET("<n></n $>", parse_default, status_bad_end_element, 7);
 	CHECK_OFFSET("<n></n", parse_default, status_bad_end_element, 5);

-	CHECK_OFFSET("<no></na>", parse_default, status_end_element_mismatch, 6);
-	CHECK_OFFSET("<no></nod>", parse_default, status_end_element_mismatch, 6);
+	CHECK_OFFSET("<no></na>", parse_default, status_end_element_mismatch, 8);
+	CHECK_OFFSET("<no></nod>", parse_default, status_end_element_mismatch, 9);
 }

 TEST(parse_result_default)
@ -1181,177 +1139,3 @@ TEST(parse_fuzz_doctype)
 	xml_document doc;
 	CHECK(doc.load_buffer(data, sizeof(data)).status == status_bad_doctype);
 }
-
-TEST(parse_embed_pcdata)
-{
-	// parse twice - once with default and once with embed_pcdata flags
-	for (int i = 0; i < 2; ++i)
-	{
-		unsigned int flags = (i == 0) ? parse_default : parse_default | parse_embed_pcdata;
-
-		xml_document doc;
-		xml_parse_result res = doc.load_string(STR("<node><key>value</key><child><inner1>value1</inner1><inner2>value2</inner2>outer</child><two>text<data /></two></node>"), flags);
-		CHECK(res);
-
-		xml_node child = doc.child(STR("node")).child(STR("child"));
-
-		// parse_embed_pcdata omits PCDATA nodes so DOM is different
-		if (flags & parse_embed_pcdata)
-		{
-			CHECK_STRING(doc.child(STR("node")).child(STR("key")).value(), STR("value"));
-			CHECK(!doc.child(STR("node")).child(STR("key")).first_child());
-		}
-		else
-		{
-			CHECK_STRING(doc.child(STR("node")).child(STR("key")).value(), STR(""));
-			CHECK(doc.child(STR("node")).child(STR("key")).first_child());
-			CHECK_STRING(doc.child(STR("node")).child(STR("key")).first_child().value(), STR("value"));
-		}
-
-		// higher-level APIs work the same though
-		CHECK_STRING(child.text().get(), STR("outer"));
-		CHECK_STRING(child.child(STR("inner1")).text().get(), STR("value1"));
-
-		CHECK_STRING(child.child_value(), STR("outer"));
-		CHECK_STRING(child.child_value(STR("inner2")), STR("value2"));
-
-	#ifndef PUGIXML_NO_XPATH
-		CHECK_XPATH_NUMBER(doc, STR("count(node/child/*[starts-with(., 'value')])"), 2);
-	#endif
-
-		CHECK_NODE(doc, STR("<node><key>value</key><child><inner1>value1</inner1><inner2>value2</inner2>outer</child><two>text<data/></two></node>"));
-		CHECK_NODE_EX(doc, STR("<node>\n<key>value</key>\n<child>\n<inner1>value1</inner1>\n<inner2>value2</inner2>outer</child>\n<two>text<data />\n</two>\n</node>\n"), STR("\t"), 0);
-		CHECK_NODE_EX(doc, STR("<node>\n\t<key>value</key>\n\t<child>\n\t\t<inner1>value1</inner1>\n\t\t<inner2>value2</inner2>outer</child>\n\t<two>text<data />\n\t</two>\n</node>\n"), STR("\t"), format_indent);
-	}
-}
-
-TEST_XML_FLAGS(parse_embed_pcdata_fragment, "text", parse_fragment | parse_embed_pcdata)
-{
-	CHECK_NODE(doc, STR("text"));
-	CHECK(doc.first_child().type() == node_pcdata);
-	CHECK_STRING(doc.first_child().value(), STR("text"));
-}
-
-TEST_XML_FLAGS(parse_embed_pcdata_child, "<n><child/>text</n>", parse_embed_pcdata)
-{
-	xml_node n = doc.child(STR("n"));
-
-	CHECK_NODE(doc, STR("<n><child/>text</n>"));
-	CHECK(n.last_child().type() == node_pcdata);
-	CHECK_STRING(n.last_child().value(), STR("text"));
-}
-
-TEST_XML_FLAGS(parse_embed_pcdata_comment, "<n>text1<!---->text2</n>", parse_embed_pcdata)
-{
-	xml_node n = doc.child(STR("n"));
-
-	CHECK_NODE(doc, STR("<n>text1text2</n>"));
-	CHECK_STRING(n.value(), STR("text1"));
-	CHECK(n.first_child() == n.last_child());
-	CHECK(n.last_child().type() == node_pcdata);
-	CHECK_STRING(n.last_child().value(), STR("text2"));
-}
-
-TEST(parse_encoding_detect)
-{
-	char test[] = "<?xml version='1.0' encoding='utf-8'?><n/>";
-
-	xml_document doc;
-	CHECK(doc.load_buffer(test, sizeof(test)));
-}
-
-TEST(parse_encoding_detect_latin1)
-{
-	char test0[] = "<?xml version='1.0' encoding='utf-8'?><n/>";
-	char test1[] = "<?xml version='1.0' encoding='iso-8859-1'?><n/>";
-	char test2[] = "<?xml version='1.0' encoding = \"latin1\"?><n/>";
-	char test3[] = "<?xml version='1.0' encoding='ISO-8859-1'?><n/>";
-	char test4[] = "<?xml version='1.0' encoding = \"LATIN1\"?><n/>";
-
-	xml_document doc;
-	CHECK(doc.load_buffer(test0, sizeof(test0)).encoding == encoding_utf8);
-	CHECK(doc.load_buffer(test1, sizeof(test1)).encoding == encoding_latin1);
-	CHECK(doc.load_buffer(test2, sizeof(test2)).encoding == encoding_latin1);
-	CHECK(doc.load_buffer(test3, sizeof(test3)).encoding == encoding_latin1);
-	CHECK(doc.load_buffer(test4, sizeof(test4)).encoding == encoding_latin1);
-}
-
-TEST(parse_encoding_detect_auto)
-{
-	struct data_t
-	{
-		const char* contents;
-		size_t size;
-		xml_encoding encoding;
-	};
-
-	const data_t data[] =
-	{
-		// BOM
-		{ "\x00\x00\xfe\xff", 4, encoding_utf32_be },
-		{ "\xff\xfe\x00\x00", 4, encoding_utf32_le },
-		{ "\xfe\xff  ", 4, encoding_utf16_be },
-		{ "\xff\xfe  ", 4, encoding_utf16_le },
-		{ "\xef\xbb\xbf ", 4, encoding_utf8 },
-		// automatic tag detection for < or <?
-		{ "\x00\x00\x00<\x00\x00\x00n\x00\x00\x00/\x00\x00\x00>", 16, encoding_utf32_be },
-		{ "<\x00\x00\x00n\x00\x00\x00/\x00\x00\x00>\x00\x00\x00", 16, encoding_utf32_le },
-		{ "\x00<\x00?\x00n\x00?\x00>", 10, encoding_utf16_be },
-		{ "<\x00?\x00n\x00?\x00>\x00", 10, encoding_utf16_le },
-		{ "\x00<\x00n\x00/\x00>", 8, encoding_utf16_be },
-		{ "<\x00n\x00/\x00>\x00", 8, encoding_utf16_le },
-		// <?xml encoding
-		{ "<?xml encoding='latin1'?>", 25, encoding_latin1 },
-	};
-
-	for (size_t i = 0; i < sizeof(data) / sizeof(data[0]); ++i)
-	{
-		xml_document doc;
-		xml_parse_result result = doc.load_buffer(data[i].contents, data[i].size, parse_fragment);
-
-		CHECK(result);
-		CHECK(result.encoding == data[i].encoding);
-	}
-}
-
-TEST(parse_encoding_detect_auto_incomplete)
-{
-	struct data_t
-	{
-		const char* contents;
-		size_t size;
-		xml_encoding encoding;
-	};
-
-	const data_t data[] =
-	{
-		// BOM
-		{ "\x00\x00\xfe ", 4, encoding_utf8 },
-		{ "\x00\x00  ", 4, encoding_utf8 },
-		{ "\xff\xfe\x00 ", 4, encoding_utf16_le },
-		{ "\xfe   ", 4, encoding_utf8 },
-		{ "\xff   ", 4, encoding_utf8 },
-		{ "\xef\xbb  ", 4, encoding_utf8 },
-		{ "\xef   ", 4, encoding_utf8 },
-		// automatic tag detection for < or <?
-		{ "\x00\x00\x00 ", 4, encoding_utf8 },
-		{ "<\x00\x00n/\x00>\x00", 8, encoding_utf16_le },
-		{ "\x00<n\x00\x00/\x00>", 8, encoding_utf16_be },
-		{ "<\x00?n/\x00>\x00", 8, encoding_utf16_le },
-		{ "\x00 ", 2, encoding_utf8 },
-		// <?xml encoding
-		{ "<?xmC encoding='latin1'?>", 25, encoding_utf8 },
-		{ "<?xBC encoding='latin1'?>", 25, encoding_utf8 },
-		{ "<?ABC encoding='latin1'?>", 25, encoding_utf8 },
-		{ "<_ABC encoding='latin1'/>", 25, encoding_utf8 },
-	};
-
-	for (size_t i = 0; i < sizeof(data) / sizeof(data[0]); ++i)
-	{
-		xml_document doc;
-		xml_parse_result result = doc.load_buffer(data[i].contents, data[i].size, parse_fragment);
-
-		CHECK(result);
-		CHECK(result.encoding == data[i].encoding);
-	}
-}
--- a/tests/test_parse_doctype.cpp
+++ b/tests/test_parse_doctype.cpp
@ -1,13 +1,11 @@
 #define _CRT_SECURE_NO_WARNINGS

-#include "test.hpp"
+#include "common.hpp"

 #include <string.h>
 #include <wchar.h>
 #include <string>

-using namespace pugi;
-
 static xml_parse_result load_concat(xml_document& doc, const char_t* a, const char_t* b = STR(""), const char_t* c = STR(""))
 {
 	char_t buffer[768];
@ -38,9 +36,9 @@ static bool test_doctype_wf(const char_t* decl)
 	if (!load_concat(doc, STR("a"), decl, STR("b")) || !test_node(doc, STR("ab"), STR(""), format_raw)) return false;

 	// node pre/postfix
-	if (!load_concat(doc, STR("<nodea/>"), decl) || !test_node(doc, STR("<nodea/>"), STR(""), format_raw)) return false;
-	if (!load_concat(doc, decl, STR("<nodeb/>")) || !test_node(doc, STR("<nodeb/>"), STR(""), format_raw)) return false;
-	if (!load_concat(doc, STR("<nodea/>"), decl, STR("<nodeb/>")) || !test_node(doc, STR("<nodea/><nodeb/>"), STR(""), format_raw)) return false;
+	if (!load_concat(doc, STR("<nodea/>"), decl) || !test_node(doc, STR("<nodea />"), STR(""), format_raw)) return false;
+	if (!load_concat(doc, decl, STR("<nodeb/>")) || !test_node(doc, STR("<nodeb />"), STR(""), format_raw)) return false;
+	if (!load_concat(doc, STR("<nodea/>"), decl, STR("<nodeb/>")) || !test_node(doc, STR("<nodea /><nodeb />"), STR(""), format_raw)) return false;

    // check load-store contents preservation
    CHECK(doc.load_string(decl, parse_doctype | parse_fragment));
@ -221,7 +219,7 @@ TEST(parse_doctype_xmlconf_ibm_2)
 	TEST_DOCTYPE_NWF("<!DOCTYPE animal [ <!ELEMENT animal ANY> <!ENTITY % parameterE \"A music file ?>\"> <?music %parameterE; ]>");
 	TEST_DOCTYPE_NWF("<!DOCTYPE animal [ <!ELEMENT animal ANY> <!ENTITY % parameterE \"leopard EMPTY>\"> <!ELEMENT %parameterE; ]>");
 	TEST_DOCTYPE_WF("<!DOCTYPE root [ <!ELEMENT root ANY> <!ATTLIST root attr1 CDATA #IMPLIED> <!ATTLIST root attr2 CDATA #IMPLIED> <!ENTITY withlt \"have <lessthan> inside\"> <!ENTITY aIndirect \"&withlt;\"> ]>");
-	TEST_DOCTYPE_WF("<!DOCTYPE root [ <!ELEMENT root (#PCDATA)> <!--* Missing Name S contentspec in elementdecl *--> <!ELEMENT > ]>");
+	TEST_DOCTYPE_WF("<!DOCTYPE root [ <!ELEMENT root (#PCDATA)> <!--* Mising Name S contentspec in elementdecl *--> <!ELEMENT > ]>");
 	TEST_DOCTYPE_WF("<!DOCTYPE root [ <!ELEMENT root (#PCDATA)> <!ELEMENT a ANY> <!ELEMENT b ANY> <!--* extra separator in seq *--> <!ELEMENT aElement ((a|b),,a)? > ]>");
 	TEST_DOCTYPE_WF("<!DOCTYPE root [ <!ELEMENT root (#PCDATA)> <!ELEMENT a ANY> <!--* Missing white space before Name in AttDef *--> <!ATTLIST a attr1 CDATA \"default\"attr2 ID #required> ]>");
 	TEST_DOCTYPE_WF("<!DOCTYPE test [ <!ELEMENT test ANY> <!ELEMENT one EMPTY> <!ELEMENT two EMPTY> <!NOTATION this SYSTEM \"alpha\"> <!ATTLIST three attr NOTATION (\"this\") #IMPLIED> ]>");
--- a/tests/test_unicode.cpp
+++ b/tests/test_unicode.cpp
@ -1,11 +1,9 @@
 #ifndef PUGIXML_NO_STL

-#include "test.hpp"
+#include "common.hpp"

 #include <string>

-using namespace pugi;
-
 // letters taken from http://www.utf8-chartable.de/

 TEST(as_wide_empty)
--- a/tests/test_version.cpp
+++ b/tests/test_version.cpp
@ -1,5 +1,5 @@
 #include "../src/pugixml.hpp"

-#if PUGIXML_VERSION != 1130
+#if PUGIXML_VERSION != 170
 #error Unexpected pugixml version
 #endif
--- a/tests/test_write.cpp
+++ b/tests/test_write.cpp
@ -1,4 +1,4 @@
-#include "test.hpp"
+#include "common.hpp"

 #include "writer_string.hpp"

@ -6,8 +6,6 @@
 #include <sstream>
 #include <stdexcept>

-using namespace pugi;
-
 TEST_XML(write_simple, "<node attr='1'><child>text</child></node>")
 {
 	CHECK_NODE_EX(doc, STR("<node attr=\"1\">\n<child>text</child>\n</node>\n"), STR(""), 0);
@ -71,12 +69,6 @@ TEST_XML_FLAGS(write_cdata_escape, "<![CDATA[value]]>", parse_cdata | parse_frag

 	doc.first_child().set_value(STR("1]]>2]]>3"));
 	CHECK_NODE(doc, STR("<![CDATA[1]]]]><![CDATA[>2]]]]><![CDATA[>3]]>"));
-
-	doc.first_child().set_value(STR("1]"));
-	CHECK_NODE(doc, STR("<![CDATA[1]]]>"));
-
-	doc.first_child().set_value(STR("1]]"));
-	CHECK_NODE(doc, STR("<![CDATA[1]]]]>"));
 }

 TEST_XML(write_cdata_inner, "<node><![CDATA[value]]></node>")
@ -193,35 +185,19 @@ TEST_XML(write_escape, "<node attr=''>text</node>")
 	doc.child(STR("node")).attribute(STR("attr")) = STR("<>'\"&\x04\r\n\t");
 	doc.child(STR("node")).first_child().set_value(STR("<>'\"&\x04\r\n\t"));

-	CHECK_NODE(doc, STR("<node attr=\"&lt;>'&quot;&amp;&#04;&#13;&#10;&#09;\">&lt;&gt;'\"&amp;&#04;\r\n\t</node>"));
-	CHECK_NODE_EX(doc, STR("<node attr='&lt;>&apos;\"&amp;&#04;&#13;&#10;&#09;'>&lt;&gt;'\"&amp;&#04;\r\n\t</node>"), STR(""), format_raw | format_attribute_single_quote);
-}
-
-TEST_XML(write_escape_roundtrip, "<node attr=''>text</node>")
-{
-	doc.child(STR("node")).attribute(STR("attr")) = STR("<>'\"&\x04\r\n\t");
-	doc.child(STR("node")).first_child().set_value(STR("<>'\"&\x04\r\n\t"));
-
-	std::string contents = write_narrow(doc, format_raw, encoding_utf8);
-
-	CHECK(doc.load_buffer(contents.c_str(), contents.size()));
-
-	// Note: this string is almost identical to the string from write_escape with the exception of \r
-	// \r in PCDATA doesn't roundtrip because it has to go through newline conversion (which could be disabled, but is active by default)
-	CHECK_NODE(doc, STR("<node attr=\"&lt;>'&quot;&amp;&#04;&#13;&#10;&#09;\">&lt;&gt;'\"&amp;&#04;\n\t</node>"));
-	CHECK_NODE_EX(doc, STR("<node attr='&lt;>&apos;\"&amp;&#04;&#13;&#10;&#09;'>&lt;&gt;'\"&amp;&#04;\n\t</node>"), STR(""), format_raw | format_attribute_single_quote);
+	CHECK_NODE(doc, STR("<node attr=\"&lt;&gt;'&quot;&amp;&#04;&#13;&#10;\t\">&lt;&gt;'\"&amp;&#04;\r\n\t</node>"));
 }

 TEST_XML(write_escape_unicode, "<node attr='&#x3c00;'/>")
 {
 #ifdef PUGIXML_WCHAR_MODE
 	#ifdef U_LITERALS
-		CHECK_NODE(doc, STR("<node attr=\"\u3c00\"/>"));
+		CHECK_NODE(doc, STR("<node attr=\"\u3c00\" />"));
 	#else
-		CHECK_NODE(doc, STR("<node attr=\"\x3c00\"/>"));
+		CHECK_NODE(doc, STR("<node attr=\"\x3c00\" />"));
 	#endif
 #else
-	CHECK_NODE(doc, STR("<node attr=\"\xe3\xb0\x80\"/>"));
+	CHECK_NODE(doc, STR("<node attr=\"\xe3\xb0\x80\" />"));
 #endif
 }

@ -235,12 +211,12 @@ TEST_XML(write_no_escapes, "<node attr=''>text</node>")

 struct test_writer: xml_writer
 {
-	std::basic_string<char_t> contents;
+	std::basic_string<pugi::char_t> contents;

-	virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE
+	virtual void write(const void* data, size_t size)
 	{
-		CHECK(size % sizeof(char_t) == 0);
-		contents.append(static_cast<const char_t*>(data), size / sizeof(char_t));
+		CHECK(size % sizeof(pugi::char_t) == 0);
+		contents.append(static_cast<const pugi::char_t*>(data), size / sizeof(pugi::char_t));
 	}
 };

@ -280,7 +256,7 @@ TEST_XML(write_print_stream_wide, "<node/>")

 TEST_XML(write_huge_chunk, "<node/>")
 {
-	std::basic_string<char_t> name(10000, STR('n'));
+	std::basic_string<pugi::char_t> name(10000, STR('n'));
 	doc.child(STR("node")).set_name(name.c_str());

 	test_writer writer;
@ -497,7 +473,7 @@ TEST(write_no_name_element)
 	root.append_child();
 	root.append_child().append_child(node_pcdata).set_value(STR("text"));

-	CHECK_NODE(doc, STR("<:anonymous><:anonymous/><:anonymous>text</:anonymous></:anonymous>"));
+	CHECK_NODE(doc, STR("<:anonymous><:anonymous /><:anonymous>text</:anonymous></:anonymous>"));
 	CHECK_NODE_EX(doc, STR("<:anonymous>\n\t<:anonymous />\n\t<:anonymous>text</:anonymous>\n</:anonymous>\n"), STR("\t"), format_default);
 }

@ -515,7 +491,7 @@ TEST(write_no_name_attribute)
 	doc.append_child().set_name(STR("root"));
 	doc.child(STR("root")).append_attribute(STR(""));

-	CHECK_NODE(doc, STR("<root :anonymous=\"\"/>"));
+	CHECK_NODE(doc, STR("<root :anonymous=\"\" />"));
 }

 TEST(write_print_empty)
@ -541,7 +517,7 @@ TEST(write_print_stream_empty_wide)
 TEST(write_stackless)
 {
 	unsigned int count = 20000;
-	std::basic_string<char_t> data;
+	std::basic_string<pugi::char_t> data;

 	for (unsigned int i = 0; i < count; ++i)
 		data += STR("<a>");
@ -620,74 +596,15 @@ TEST(write_pcdata_whitespace_fixedpoint)

 TEST_XML_FLAGS(write_mixed, "<node><child1/><child2>pre<![CDATA[data]]>mid<!--comment--><test/>post<?pi value?>fin</child2><child3/></node>", parse_full)
 {
-	CHECK_NODE(doc, STR("<node><child1/><child2>pre<![CDATA[data]]>mid<!--comment--><test/>post<?pi value?>fin</child2><child3/></node>"));
+	CHECK_NODE(doc, STR("<node><child1 /><child2>pre<![CDATA[data]]>mid<!--comment--><test />post<?pi value?>fin</child2><child3 /></node>"));
 	CHECK_NODE_EX(doc, STR("<node>\n<child1 />\n<child2>pre<![CDATA[data]]>mid<!--comment-->\n<test />post<?pi value?>fin</child2>\n<child3 />\n</node>\n"), STR("\t"), 0);
 	CHECK_NODE_EX(doc, STR("<node>\n\t<child1 />\n\t<child2>pre<![CDATA[data]]>mid<!--comment-->\n\t\t<test />post<?pi value?>fin</child2>\n\t<child3 />\n</node>\n"), STR("\t"), format_indent);
 }

-TEST_XML(write_no_empty_element_tags, "<node><child1/><child2>text</child2><child3></child3></node>")
-{
-	CHECK_NODE(doc, STR("<node><child1/><child2>text</child2><child3/></node>"));
-	CHECK_NODE_EX(doc, STR("<node><child1></child1><child2>text</child2><child3></child3></node>"), STR("\t"), format_raw | format_no_empty_element_tags);
-	CHECK_NODE_EX(doc, STR("<node>\n\t<child1></child1>\n\t<child2>text</child2>\n\t<child3></child3>\n</node>\n"), STR("\t"), format_indent | format_no_empty_element_tags);
-}
-
-TEST_XML_FLAGS(write_roundtrip, "<node><child1 attr1='value1' attr2='value2'/><child2 attr='value'>pre<![CDATA[data]]>mid&lt;text&amp;escape<!--comment--><test/>post<?pi value?>fin</child2><child3/></node>", parse_full)
-{
-	const unsigned int flagset[] = { format_indent, format_raw, format_no_declaration, format_indent_attributes, format_no_empty_element_tags, format_attribute_single_quote };
-	size_t flagcount = sizeof(flagset) / sizeof(flagset[0]);
-
-	for (size_t i = 0; i < (size_t(1) << flagcount); ++i)
-	{
-		unsigned int flags = 0;
-
-		for (size_t j = 0; j < flagcount; ++j)
-			if (i & (size_t(1) << j))
-				flags |= flagset[j];
-
-		std::string contents = write_narrow(doc, flags, encoding_utf8);
-
-		xml_document verify;
-		CHECK(verify.load_buffer(contents.c_str(), contents.size(), parse_full));
-		CHECK(test_write_narrow(verify, flags, encoding_utf8, contents.c_str(), contents.size()));
-
-		xml_document verifyws;
-		CHECK(verifyws.load_buffer(contents.c_str(), contents.size(), parse_full | parse_ws_pcdata));
-		CHECK(test_write_narrow(verifyws, flags, encoding_utf8, contents.c_str(), contents.size()));
-	}
-}
-
-TEST(write_flush_coverage)
-{
-	xml_document doc;
-
-	// this creates a node that uses short sequences of lengths 1-6 for output
-	xml_node n = doc.append_child(STR("n"));
-
-	xml_attribute a = n.append_attribute(STR("a"));
-
-	xml_attribute b = n.append_attribute(STR("b"));
-	b.set_value(STR("<&\""));
-
-	n.append_child(node_comment);
-
-	size_t basel = save_narrow(doc, format_raw, encoding_auto).size();
-	size_t bufl = 2048;
-
-	for (size_t l = 0; l <= basel; ++l)
-	{
-		std::basic_string<char_t> pad(bufl - l, STR('v'));
-		a.set_value(pad.c_str());
-
-		std::string s = save_narrow(doc, format_raw, encoding_auto);
-		CHECK(s.size() == basel + bufl - l);
-	}
-}
-
 #ifndef PUGIXML_NO_EXCEPTIONS
-struct throwing_writer: xml_writer
+struct throwing_writer: pugi::xml_writer
 {
-	virtual void write(const void*, size_t) PUGIXML_OVERRIDE
+	virtual void write(const void*, size_t)
 	{
 		throw std::runtime_error("write failed");
 	}
@ -721,13 +638,3 @@ TEST_XML(write_throw_encoding, "<node><child/></node>")
 	}
 }
 #endif
-
-TEST_XML(write_skip_control_chars, "<a>\f\t\n\x0F\x19</a>")
-{
-	CHECK_NODE_EX(doc.first_child(), STR("<a>\t\n</a>\n"), STR(""), pugi::format_default | pugi::format_skip_control_chars);
-}
-
-TEST_XML(write_keep_control_chars, "<a>\f\t\n\x0F\x19</a>")
-{
-	CHECK_NODE_EX(doc.first_child(), STR("<a>&#12;\t\n&#15;&#25;</a>\n"), STR(""), pugi::format_default);
-}
--- a/tests/test_xpath.cpp
+++ b/tests/test_xpath.cpp
@ -1,6 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
+#include "common.hpp"

 #include <string.h>
 #include <wchar.h>
@ -10,8 +10,6 @@
 #include <algorithm>
 #include <limits>

-using namespace pugi;
-
 static void load_document_copy(xml_document& doc, const char_t* text)
 {
 	xml_document source;
@ -20,22 +18,6 @@ static void load_document_copy(xml_document& doc, const char_t* text)
 	doc.append_copy(source.first_child());
 }

-template <typename T>
-static void random_shuffle(std::vector<T>& v)
-{
-	size_t rng = 2147483647;
-
-	for (size_t i = v.size() - 1; i > 0; --i)
-	{
-		// Fisher-Yates shuffle
-		size_t j = rng % (i + 1);
-		std::swap(v[j], v[i]);
-
-		// LCG RNG, constants from Numerical Recipes
-		rng = rng * 1664525 + 1013904223;
-	}
-}
-
 TEST(xpath_allocator_many_pages)
 {
 	std::basic_string<char_t> query = STR("0");
@ -171,7 +153,7 @@ TEST(xpath_sort_random_medium)
 	xpath_node_set ns = doc.select_nodes(STR("//node() | //@*"));

 	std::vector<xpath_node> nsv(ns.begin(), ns.end());
-	random_shuffle(nsv);
+	std::random_shuffle(nsv.begin(), nsv.end());

 	xpath_node_set copy(&nsv[0], &nsv[0] + nsv.size());
 	copy.sort();
@ -200,7 +182,7 @@ TEST(xpath_sort_random_large)
 	xpath_node_set ns = doc.select_nodes(STR("//node() | //@*"));

 	std::vector<xpath_node> nsv(ns.begin(), ns.end());
-	random_shuffle(nsv);
+	std::random_shuffle(nsv.begin(), nsv.end());

 	xpath_node_set copy(&nsv[0], &nsv[0] + nsv.size());
 	copy.sort();
@ -212,40 +194,40 @@ TEST(xpath_sort_random_large)

 TEST(xpath_long_numbers_parse)
 {
-	const char_t* str_flt_max = STR("340282346638528860000000000000000000000");
-	const char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000");
-
-	const char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-	const char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000");
+	const pugi::char_t* str_flt_max = STR("340282346638528860000000000000000000000");
+	const pugi::char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000");
+	
+	const pugi::char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	const pugi::char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000");

 	xml_node c;

 	// check parsing
-	CHECK_XPATH_NUMBER(c, str_flt_max, double(std::numeric_limits<float>::max()));
-	CHECK_XPATH_NUMBER(c, str_flt_max_dec, double(std::numeric_limits<float>::max()));
+	CHECK_XPATH_NUMBER(c, str_flt_max, std::numeric_limits<float>::max());
+	CHECK_XPATH_NUMBER(c, str_flt_max_dec, std::numeric_limits<float>::max());
 	CHECK_XPATH_NUMBER(c, str_dbl_max, std::numeric_limits<double>::max());
 	CHECK_XPATH_NUMBER(c, str_dbl_max_dec, std::numeric_limits<double>::max());
 }

-static bool test_xpath_string_prefix(const xml_node& node, const char_t* query, const char_t* expected, size_t match_length)
+static bool test_xpath_string_prefix(const pugi::xml_node& node, const pugi::char_t* query, const pugi::char_t* expected, size_t match_length)
 {
-	xpath_query q(query);
+	pugi::xpath_query q(query);

-	char_t result[32];
+	pugi::char_t result[32];
 	size_t size = q.evaluate_string(result, sizeof(result) / sizeof(result[0]), node);

-	size_t expected_length = std::char_traits<char_t>::length(expected);
+	size_t expected_length = std::char_traits<pugi::char_t>::length(expected);

-	return size == expected_length + 1 && std::char_traits<char_t>::compare(result, expected, match_length) == 0;
+	return size == expected_length + 1 && std::char_traits<pugi::char_t>::compare(result, expected, match_length) == 0;
 }

 TEST(xpath_long_numbers_stringize)
 {
-	const char_t* str_flt_max = STR("340282346638528860000000000000000000000");
-	const char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000");
-
-	const char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-	const char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000");
+	const pugi::char_t* str_flt_max = STR("340282346638528860000000000000000000000");
+	const pugi::char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000");
+	
+	const pugi::char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+	const pugi::char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000");

 	xml_node c;

@ -258,7 +240,7 @@ TEST(xpath_long_numbers_stringize)

 TEST(xpath_denorm_numbers)
 {
-	std::basic_string<char_t> query;
+	std::basic_string<pugi::char_t> query;

 	// 10^-318 - double denormal
 	for (int i = 0; i < 106; ++i)
@ -267,13 +249,7 @@ TEST(xpath_denorm_numbers)
 		query += STR("0.001");
 	}

-	// check if current fpu setup supports denormals
-	double denorm = xpath_query(query.c_str()).evaluate_number(xml_node());
-
-	if (denorm != 0.0)
-	{
-		CHECK_XPATH_STRING(xml_node(), query.c_str(), STR("0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009999987484955998"));
-	}
+	CHECK_XPATH_STRING(xml_node(), query.c_str(), STR("0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009999987484955998"));
 }

 TEST_XML(xpath_rexml_1, "<a><b><c id='a'/></b><c id='b'/></a>")
@ -391,36 +367,6 @@ TEST(xpath_large_node_set)
 	CHECK(ns.size() == 10001);
 }

-TEST(xpath_out_of_memory_query)
-{
-	test_runner::_memory_fail_threshold = 1;
-
-	CHECK_ALLOC_FAIL(xpath_query q(STR("node")));
-}
-
-TEST_XML(xpath_out_of_memory_evaluate, "<n/>")
-{
-	test_runner::_memory_fail_threshold = 4196 * sizeof(char_t) + 4096 * 2 + 32768;
-
-	std::basic_string<char_t> query = STR("*[concat(\"a\", \"");
-
-	query.resize(4196, 'a');
-	query += STR("\")]");
-
-	xpath_query q(query.c_str());
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_boolean(doc) == false));
-	CHECK_ALLOC_FAIL(CHECK_DOUBLE_NAN(q.evaluate_number(doc)));
-
-#ifndef PUGIXML_NO_STL
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(doc).empty()));
-#endif
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, doc) == 1));
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_node(doc) == xpath_node()));
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc).empty()));
-}
-
 TEST(xpath_out_of_memory_evaluate_concat)
 {
 	test_runner::_memory_fail_threshold = 4196 * sizeof(char_t) + 4096 * 2;
@ -430,23 +376,7 @@ TEST(xpath_out_of_memory_evaluate_concat)
 	query.resize(4196, 'a');
 	query += STR("\")");

-	xpath_query q(query.c_str());
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, xml_node()) == 1));
-}
-
-TEST(xpath_out_of_memory_evaluate_concat_list)
-{
-	std::basic_string<char_t> query = STR("concat(");
-
-	for (size_t i = 0; i < 500; ++i)
-		query += STR("\"\",");
-
-	query += STR("\"\")");
-
-	xpath_query q(query.c_str());
-
-	test_runner::_memory_fail_threshold = 1;
+	pugi::xpath_query q(query.c_str());

 	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, xml_node()) == 1));
 }
@ -460,151 +390,43 @@ TEST(xpath_out_of_memory_evaluate_substring)
 	query.resize(4196, 'a');
 	query += STR("\", 1, 4097)");

-	xpath_query q(query.c_str());
+	pugi::xpath_query q(query.c_str());

 	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, xml_node()) == 1));
 }

-TEST_XML(xpath_out_of_memory_evaluate_union, "<node />")
-{
-	// left hand side: size * sizeof(xpath_node) (8 on 32-bit, 16 on 64-bit)
-	// right hand side: same
-	// to make sure that when we append right hand side to left hand side, we run out of an XPath stack page (4K), we need slightly more than 2K/8 = 256 nodes on 32-bit, 128 nodes on 64-bit
-	size_t count = sizeof(void*) == 4 ? 300 : 150;
-
-	for (size_t i = 0; i < count; ++i)
-		doc.first_child().append_child(STR("a"));
-
-	xpath_query q(STR("a|a"));
-
-	test_runner::_memory_fail_threshold = 1;
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc.child(STR("node"))).empty()));
-}
-
-TEST_XML(xpath_out_of_memory_evaluate_union_hash, "<node />")
-{
-	// left hand side: size * sizeof(xpath_node) (8 on 32-bit, 16 on 64-bit)
-	// right hand side: same
-	// hash table: size * 1.5 * sizeof(void*)
-	// to make sure that when we append right hand side to left hand side, we do *not* run out of an XPath stack page (4K), we need slightly less than 2K/8 = 256 nodes on 32-bit, 128 nodes on 64-bit
-	size_t count = sizeof(void*) == 4 ? 200 : 100;
-
-	for (size_t i = 0; i < count; ++i)
-		doc.first_child().append_child(STR("a"));
-
-	xpath_query q(STR("a|a"));
-
-	test_runner::_memory_fail_threshold = 1;
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc.child(STR("node"))).empty()));
-}
-
-
-TEST_XML(xpath_out_of_memory_evaluate_predicate, "<node><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/></node>")
+TEST_XML(xpath_out_of_memory_evaluate_union, "<node><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/></node>")
 {
 	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;

-	xpath_query q(STR("//a[//a[//a[//a[true()]]]]"));
+	pugi::xpath_query q(STR("a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|a)))))))))))))))))))"));
+
+	CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc.child(STR("node"))).empty()));
+}
+
+TEST_XML(xpath_out_of_memory_evaluate_predicate, "<node><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/><a/></node>")
+{
+	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;
+
+	pugi::xpath_query q(STR("//a[//a[//a[//a[//a[//a[//a[//a[//a[//a[//a[//a[//a[//a[true()]]]]]]]]]]]]]]"));

 	CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc).empty()));
 }

-TEST_XML(xpath_out_of_memory_evaluate_normalize_space_0, "<node> a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z </node>")
-{
-	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;
-
-	xpath_query q(STR("concat(normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space())"));
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, doc.first_child()) == 1));
-}
-
-TEST_XML(xpath_out_of_memory_evaluate_normalize_space_1, "<node> a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z </node>")
-{
-	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;
-
-	xpath_query q(STR("concat(normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node))"));
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, doc) == 1));
-}
-
-TEST_XML(xpath_out_of_memory_evaluate_translate, "<node> a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z </node>")
-{
-	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;
-
-	xpath_query q(STR("concat(translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'))"));
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, doc) == 1));
-}
-
-TEST_XML(xpath_out_of_memory_evaluate_translate_table, "<node> a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z a b c d e f g h i j k l m n o p q r s t u v w x y z </node>")
-{
-	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;
-
-	xpath_query q(STR("concat(translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'))"));
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, doc) == 1));
-}
-
-TEST(xpath_out_of_memory_evaluate_string_append)
-{
-	test_runner::_memory_fail_threshold = 32768 + 4096 * 2;
-
-	std::basic_string<char_t> literal(5000, 'a');
-
-	std::basic_string<char_t> buf;
-	buf += STR("<n><c>text</c><c>");
-	buf += literal;
-	buf += STR("</c></n>");
-
-	xml_document doc;
-	CHECK(doc.load_buffer_inplace(&buf[0], buf.size() * sizeof(char_t)));
-
-	xpath_query q(STR("string(n)"));
-	CHECK(q);
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, doc) == 1));
-}
-
-TEST(xpath_out_of_memory_evaluate_number_to_string)
-{
-	test_runner::_memory_fail_threshold = 4096 + 128;
-
-	xpath_variable_set vars;
-	vars.set(STR("x"), 1e+308);
-
-	xpath_query q(STR("concat($x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x, $x)"), &vars);
-
-	CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, xml_node()) == 1));
-}
-
 TEST(xpath_memory_concat_massive)
 {
-	xml_document doc;
-	xml_node node = doc.append_child(STR("node"));
+	pugi::xml_document doc;
+	pugi::xml_node node = doc.append_child(STR("node"));

 	for (int i = 0; i < 5000; ++i)
 		node.append_child(STR("c")).text().set(i % 10);

-	xpath_query q(STR("/"));
+	pugi::xpath_query q(STR("/"));
 	size_t size = q.evaluate_string(0, 0, node);

 	CHECK(size == 5001);
 }

-TEST_XML(xpath_memory_translate_table, "<node>a</node>")
-{
-	test_runner::_memory_fail_threshold = 32768 + 4096 + 128;
-
-	// 128b per table => we need 32+ translate calls to exhaust a page
-	std::basic_string<char_t> query = STR("concat(");
-	for (int i = 0; i < 64; ++i)
-		query += STR("translate(.,'a','A'),");
-	query += STR("'')");
-
-	CHECK_ALLOC_FAIL(CHECK(!xpath_query(query.c_str())));
-}
-
 TEST_XML(xpath_sort_copy_share, "<node><child1 attr1='value1' attr2='value2'/><child2 attr1='value1'>test</child2></node>")
 {
 	// copy sharing shares the name/value data for nodes that can potentially make document order optimization invalid (silently)
@ -756,17 +578,6 @@ TEST(xpath_sort_crossdoc_different_depth)
 	CHECK((ns[0] == ns1[0] && ns[1] == ns2[0]) || (ns[0] == ns2[0] && ns[1] == ns1[0]));
 }

-TEST_XML(xpath_sort_empty_node, "<node><child1/><child2/></node>")
-{
-	xml_node n = doc.child(STR("node"));
-	xpath_node nodes[] = { n.child(STR("child2")), xml_node(), n.child(STR("child1")), xml_node() };
-	xpath_node_set ns(nodes, nodes + sizeof(nodes) / sizeof(nodes[0]));
-
-	ns.sort();
-
-	CHECK(!ns[0] && !ns[1] && ns[2] == nodes[2] && ns[3] == nodes[0]);
-}
-
 TEST(xpath_allocate_string_out_of_memory)
 {
 	std::basic_string<char_t> query;
@ -801,15 +612,4 @@ TEST(xpath_remove_duplicates)
 			tester % (2 + i);
 	}
 }
-
-TEST(xpath_anonymous_nodes)
-{
-	xml_document doc;
-	doc.append_child(node_element);
-	doc.append_child(node_pi);
-
-	CHECK_XPATH_NODESET(doc, STR("/name"));
-	CHECK_XPATH_NODESET(doc, STR("/processing-instruction('a')"));
-	CHECK_XPATH_NODESET(doc, STR("/ns:*"));
-}
 #endif
--- a/tests/test_xpath_api.cpp
+++ b/tests/test_xpath_api.cpp
@ -2,15 +2,13 @@

 #include <string.h> // because Borland's STL is braindead, we have to include <string.h> _before_ <string> in order to get memcmp

-#include "test.hpp"
+#include "common.hpp"

 #include "helpers.hpp"

 #include <string>
 #include <vector>

-using namespace pugi;
-
 TEST_XML(xpath_api_select_nodes, "<node><head/><foo/><foo/><tail/></node>")
 {
 	xpath_node_set ns1 = doc.select_nodes(STR("node/foo"));
@ -33,12 +31,12 @@ TEST_XML(xpath_api_select_node, "<node><head/><foo id='1'/><foo/><tail/></node>"
 	CHECK(n2.node().attribute(STR("id")).as_int() == 1);

 	xpath_node n3 = doc.select_node(STR("node/bar"));
-
+	
 	CHECK(!n3);

 	xpath_node n4 = doc.select_node(STR("node/head/following-sibling::foo"));
 	xpath_node n5 = doc.select_node(STR("node/tail/preceding-sibling::foo"));
-
+	
 	CHECK(n4.node().attribute(STR("id")).as_int() == 1);
 	CHECK(n5.node().attribute(STR("id")).as_int() == 1);
 }
@ -109,7 +107,6 @@ TEST_XML(xpath_api_nodeset_accessors, "<node><foo/><foo/></node>")

 TEST_XML(xpath_api_nodeset_copy, "<node><foo/><foo/></node>")
 {
-	xpath_node_set empty;
 	xpath_node_set set = doc.select_nodes(STR("node/foo"));

 	xpath_node_set copy1 = set;
@ -123,7 +120,7 @@ TEST_XML(xpath_api_nodeset_copy, "<node><foo/><foo/></node>")

 	xpath_node_set copy3;
 	copy3 = set;
-	copy3 = xpath_node_set(copy3);
+	copy3 = copy3;
 	CHECK(copy3.size() == 2);
 	CHECK_STRING(copy3[0].node().name(), STR("foo"));

@ -135,7 +132,7 @@ TEST_XML(xpath_api_nodeset_copy, "<node><foo/><foo/></node>")

 	xpath_node_set copy5;
 	copy5 = set;
-	copy5 = empty;
+	copy5 = xpath_node_set();
 	CHECK(copy5.size() == 0);
 }

@ -261,7 +258,7 @@ TEST(xpath_api_evaluate_string)
 	// test for just enough space
 	std::basic_string<char_t> s1 = base;
 	CHECK(q.evaluate_string(&s1[0], 11, xml_node()) == 11 && memcmp(&s1[0], STR("0123456789\0xxxxx"), 16 * sizeof(char_t)) == 0);
-
+	
 	// test for just not enough space
 	std::basic_string<char_t> s2 = base;
 	CHECK(q.evaluate_string(&s2[0], 10, xml_node()) == 11 && memcmp(&s2[0], STR("012345678\0xxxxxx"), 16 * sizeof(char_t)) == 0);
@ -295,7 +292,7 @@ TEST(xpath_api_return_type)
 TEST(xpath_api_query_bool)
 {
 	xpath_query q(STR("node"));
-
+	
 	CHECK(q);
 	CHECK((!q) == false);
 }
@ -304,7 +301,7 @@ TEST(xpath_api_query_bool)
 TEST(xpath_api_query_bool_fail)
 {
 	xpath_query q(STR(""));
-
+	
 	CHECK((q ? true : false) == false);
 	CHECK((!q) == true);
 }
@ -401,6 +398,17 @@ TEST_XML(xpath_api_node_set_assign_out_of_memory_preserve, "<node><a/><b/></node
 	CHECK(ns[0] == doc.child(STR("node")).child(STR("a")) && ns[1] == doc.child(STR("node")).child(STR("b")));
 }

+TEST_XML(xpath_api_deprecated_select_single_node, "<node><head/><foo id='1'/><foo/><tail/></node>")
+{
+	xpath_node n1 = doc.select_single_node(STR("node/foo"));
+
+	xpath_query q(STR("node/foo"));
+	xpath_node n2 = doc.select_single_node(q);
+
+	CHECK(n1.node().attribute(STR("id")).as_int() == 1);
+	CHECK(n2.node().attribute(STR("id")).as_int() == 1);
+}
+
 TEST(xpath_api_empty)
 {
 	xml_node c;
@ -410,7 +418,7 @@ TEST(xpath_api_empty)
 	CHECK(!q.evaluate_boolean(c));
 }

-#ifdef PUGIXML_HAS_MOVE
+#if __cplusplus >= 201103
 TEST_XML(xpath_api_nodeset_move_ctor, "<node><foo/><foo/><bar/></node>")
 {
 	xpath_node_set set = doc.select_nodes(STR("node/bar/preceding::*"));
@ -564,18 +572,6 @@ TEST(xpath_api_nodeset_move_assign_empty)
 	CHECK(move.type() == xpath_node_set::type_sorted);
 }

-TEST_XML(xpath_api_nodeset_move_assign_self, "<node><foo/><foo/><bar/></node>")
-{
-	xpath_node_set set = doc.select_nodes(STR("node/bar"));
-
-	CHECK(set.size() == 1);
-	CHECK(set.type() == xpath_node_set::type_sorted);
-
-	test_runner::_memory_fail_threshold = 1;
-
-	set = std::move(*&set);
-}
-
 TEST(xpath_api_query_move)
 {
 	xml_node c;
@ -635,8 +631,8 @@ TEST(xpath_api_query_vector)

 	double result = 0;

-	for (size_t i = 0; i < qv.size(); ++i)
-		result += qv[i].evaluate_number(xml_node());
+	for (auto& q: qv)
+		result += q.evaluate_number(xml_node());

 	CHECK(result == 45);
 }
--- a/tests/test_xpath_functions.cpp
+++ b/tests/test_xpath_functions.cpp
@ -1,16 +1,12 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-#include <string>
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_number_number, "<node>123</node>")
 {
 	xml_node c;
 	xml_node n = doc.child(STR("node")).first_child();
-
+	
 	// number with 0 arguments
 	CHECK_XPATH_NUMBER_NAN(c, STR("number()"));
 	CHECK_XPATH_NUMBER(n, STR("number()"), 123);
@ -39,7 +35,7 @@ TEST_XML(xpath_number_number, "<node>123</node>")

 	// number with 1 number argument
 	CHECK_XPATH_NUMBER(c, STR("number(1)"), 1);
-
+	
 	// number with 2 arguments
 	CHECK_XPATH_FAIL(STR("number(1, 2)"));
 }
@ -48,21 +44,21 @@ TEST_XML(xpath_number_sum, "<node>123<child>789</child></node><node/>")
 {
 	xml_node c;
 	xml_node n = doc.child(STR("node"));
-
+	
 	// sum with 0 arguments
 	CHECK_XPATH_FAIL(STR("sum()"));

 	// sum with 1 argument
 	CHECK_XPATH_NUMBER(c, STR("sum(.)"), 0);
 	CHECK_XPATH_NUMBER(n, STR("sum(.)"), 123789); // 123 .. 789
-
+	
 	CHECK_XPATH_NUMBER(n, STR("sum(./descendant-or-self::node())"), 125490); // node + 123 + child + 789 = 123789 + 123 + 789 + 789 = 125490
 	CHECK_XPATH_NUMBER(n, STR("sum(.//node())"), 1701); // 123 + child + 789 = 123 + 789 + 789
 	CHECK_XPATH_NUMBER_NAN(doc.last_child(), STR("sum(.)"));

 	// sum with 2 arguments
 	CHECK_XPATH_FAIL(STR("sum(1, 2)"));
-
+	
 	// sum with 1 non-node-set argument
 	CHECK_XPATH_FAIL(STR("sum(1)"));
 }
@ -159,7 +155,7 @@ TEST(xpath_number_round)
 TEST_XML(xpath_boolean_boolean, "<node />")
 {
 	xml_node c;
-
+	
 	// boolean with 0 arguments
 	CHECK_XPATH_FAIL(STR("boolean()"));

@ -186,14 +182,14 @@ TEST_XML(xpath_boolean_boolean, "<node />")
 TEST(xpath_boolean_not)
 {
 	xml_node c;
-
+	
 	// not with 0 arguments
 	CHECK_XPATH_FAIL(STR("not()"));

 	// not with 1 argument
 	CHECK_XPATH_BOOLEAN(c, STR("not(true())"), false);
 	CHECK_XPATH_BOOLEAN(c, STR("not(false())"), true);
-
+	
 	// boolean with 2 arguments
 	CHECK_XPATH_FAIL(STR("not(1, 2)"));
 }
@ -201,7 +197,7 @@ TEST(xpath_boolean_not)
 TEST(xpath_boolean_true)
 {
 	xml_node c;
-
+	
 	// true with 0 arguments
 	CHECK_XPATH_BOOLEAN(c, STR("true()"), true);

@ -212,7 +208,7 @@ TEST(xpath_boolean_true)
 TEST(xpath_boolean_false)
 {
 	xml_node c;
-
+	
 	// false with 0 arguments
 	CHECK_XPATH_BOOLEAN(c, STR("false()"), false);

@ -223,7 +219,7 @@ TEST(xpath_boolean_false)
 TEST_XML(xpath_boolean_lang, "<node xml:lang='en'><child xml:lang='zh-UK'><subchild attr=''/></child></node><foo><bar/></foo>")
 {
 	xml_node c;
-
+	
 	// lang with 0 arguments
 	CHECK_XPATH_FAIL(STR("lang()"));

@ -232,7 +228,7 @@ TEST_XML(xpath_boolean_lang, "<node xml:lang='en'><child xml:lang='zh-UK'><subch
 	CHECK_XPATH_BOOLEAN(doc.child(STR("foo")), STR("lang('en')"), false);
 	CHECK_XPATH_BOOLEAN(doc.child(STR("foo")), STR("lang('')"), false);
 	CHECK_XPATH_BOOLEAN(doc.child(STR("foo")).child(STR("bar")), STR("lang('en')"), false);
-
+	
 	// lang with 1 argument, same language/prefix
 	CHECK_XPATH_BOOLEAN(doc.child(STR("node")), STR("lang('en')"), true);
 	CHECK_XPATH_BOOLEAN(doc.child(STR("node")).child(STR("child")), STR("lang('zh-uk')"), true);
@ -377,7 +373,7 @@ TEST(xpath_string_substring_before)

 	// substring-before with 1 argument
 	CHECK_XPATH_FAIL(STR("substring-before('a')"));
-
+	
 	// substring-before with 2 arguments
 	CHECK_XPATH_STRING(c, STR("substring-before('abc', 'abc')"), STR(""));
 	CHECK_XPATH_STRING(c, STR("substring-before('abc', 'a')"), STR(""));
@ -386,7 +382,7 @@ TEST(xpath_string_substring_before)
 	CHECK_XPATH_STRING(c, STR("substring-before('abc', 'c')"), STR("ab"));
 	CHECK_XPATH_STRING(c, STR("substring-before('abc', '')"), STR(""));
 	CHECK_XPATH_STRING(c, STR("substring-before('', '')"), STR(""));
-
+	
 	// substring-before with 2 arguments, from W3C standard
 	CHECK_XPATH_STRING(c, STR("substring-before(\"1999/04/01\",\"/\")"), STR("1999"));

@ -403,7 +399,7 @@ TEST(xpath_string_substring_after)

 	// substring-after with 1 argument
 	CHECK_XPATH_FAIL(STR("substring-after('a')"));
-
+	
 	// substring-after with 2 arguments
 	CHECK_XPATH_STRING(c, STR("substring-after('abc', 'abc')"), STR(""));
 	CHECK_XPATH_STRING(c, STR("substring-after('abc', 'a')"), STR("bc"));
@ -434,10 +430,10 @@ TEST(xpath_string_substring)

 	// substring with 0 arguments
 	CHECK_XPATH_FAIL(STR("substring()"));
-
+	
 	// substring with 1 argument
 	CHECK_XPATH_FAIL(STR("substring('')"));
-
+	
 	// substring with 2 arguments
 	CHECK_XPATH_STRING(c, STR("substring('abcd', 2)"), STR("bcd"));
 	CHECK_XPATH_STRING(c, STR("substring('abcd', 1)"), STR("abcd"));
@ -521,7 +517,7 @@ TEST_XML_FLAGS(xpath_string_normalize_space, "<node> \t\r\rval1  \rval2\r\nval3\
 	// normalize-space with 0 arguments
 	CHECK_XPATH_STRING(c, STR("normalize-space()"), STR(""));
 	CHECK_XPATH_STRING(n, STR("normalize-space()"), STR("val1 val2 val3 val4"));
-
+	
 	// normalize-space with 1 argument
 	CHECK_XPATH_STRING(c, STR("normalize-space('')"), STR(""));
 	CHECK_XPATH_STRING(c, STR("normalize-space('abcd')"), STR("abcd"));
@ -530,7 +526,7 @@ TEST_XML_FLAGS(xpath_string_normalize_space, "<node> \t\r\rval1  \rval2\r\nval3\
 	CHECK_XPATH_STRING(c, STR("normalize-space('ab\r\n\tcd')"), STR("ab cd"));
 	CHECK_XPATH_STRING(c, STR("normalize-space('ab    cd')"), STR("ab cd"));
 	CHECK_XPATH_STRING(c, STR("normalize-space('\07')"), STR("\07"));
-
+	
 	// normalize-space with 2 arguments
 	CHECK_XPATH_FAIL(STR("normalize-space(1, 2)"));
 }
@ -541,13 +537,13 @@ TEST(xpath_string_translate)

 	// translate with 0 arguments
 	CHECK_XPATH_FAIL(STR("translate()"));
-
+	
 	// translate with 1 argument
 	CHECK_XPATH_FAIL(STR("translate('a')"));

 	// translate with 2 arguments
 	CHECK_XPATH_FAIL(STR("translate('a', 'b')"));
-
+	
 	// translate with 3 arguments
 	CHECK_XPATH_STRING(c, STR("translate('abc', '', '')"), STR("abc"));
 	CHECK_XPATH_STRING(c, STR("translate('abc', '', 'foo')"), STR("abc"));
@ -570,7 +566,6 @@ TEST(xpath_string_translate_table)

 	CHECK_XPATH_STRING(c, STR("translate('abcd\xe9 ', 'abc', 'ABC')"), STR("ABCd\xe9 "));
 	CHECK_XPATH_STRING(c, STR("translate('abcd\xe9 ', 'abc\xe9', 'ABC!')"), STR("ABCd! "));
-	CHECK_XPATH_STRING(c, STR("translate('abcd! ', 'abc!', 'ABC\xe9')"), STR("ABCd\xe9 "));
 	CHECK_XPATH_STRING(c, STR("translate('abcde', concat('abc', 'd'), 'ABCD')"), STR("ABCDe"));
 	CHECK_XPATH_STRING(c, STR("translate('abcde', 'abcd', concat('ABC', 'D'))"), STR("ABCDe"));
 }
@ -609,7 +604,7 @@ TEST_XML(xpath_nodeset_position, "<node><c1/><c1/><c2/><c3/><c3/><c3/><c3/></nod
 	CHECK_XPATH_NODESET(n, STR("c1[position() = 3]"));
 	CHECK_XPATH_NODESET(n, STR("c2/preceding-sibling::node()[position() = 1]")) % 4;
 	CHECK_XPATH_NODESET(n, STR("c2/preceding-sibling::node()[position() = 2]")) % 3;
-
+	
 	// position with 1 argument
 	CHECK_XPATH_FAIL(STR("position(c)"));
 }
@ -645,7 +640,7 @@ TEST_XML(xpath_nodeset_id, "<node id='foo'/>")

 	// id with 0 arguments
 	CHECK_XPATH_FAIL(STR("id()"));
-
+	
 	// id with 1 argument - no DTD => no id
 	CHECK_XPATH_NODESET(n, STR("id('foo')"));

@ -661,7 +656,7 @@ TEST_XML_FLAGS(xpath_nodeset_local_name, "<node xmlns:foo='http://foo'><c1>text<
 	// local-name with 0 arguments
 	CHECK_XPATH_STRING(c, STR("local-name()"), STR(""));
 	CHECK_XPATH_STRING(n, STR("local-name()"), STR("node"));
-
+	
 	// local-name with 1 non-node-set argument
 	CHECK_XPATH_FAIL(STR("local-name(1)"));

@ -686,7 +681,7 @@ TEST_XML_FLAGS(xpath_nodeset_namespace_uri, "<node xmlns:foo='http://foo'><c1>te
 	// namespace-uri with 0 arguments
 	CHECK_XPATH_STRING(c, STR("namespace-uri()"), STR(""));
 	CHECK_XPATH_STRING(n.child(STR("c2")).child(STR("foo:child")), STR("namespace-uri()"), STR("http://foo2"));
-
+	
 	// namespace-uri with 1 non-node-set argument
 	CHECK_XPATH_FAIL(STR("namespace-uri(1)"));

@ -715,7 +710,7 @@ TEST_XML_FLAGS(xpath_nodeset_name, "<node xmlns:foo='http://foo'><c1>text</c1><c
 	// name with 0 arguments
 	CHECK_XPATH_STRING(c, STR("name()"), STR(""));
 	CHECK_XPATH_STRING(n, STR("name()"), STR("node"));
-
+	
 	// name with 1 non-node-set argument
 	CHECK_XPATH_FAIL(STR("name(1)"));

@ -738,7 +733,7 @@ TEST(xpath_function_arguments)

 	// conversion to string
 	CHECK_XPATH_NUMBER(c, STR("string-length(12)"), 2);
-
+	
 	// conversion to number
 	CHECK_XPATH_NUMBER(c, STR("round('1.2')"), 1);
 	CHECK_XPATH_NUMBER(c, STR("round('1.7')"), 2);
@ -746,13 +741,13 @@ TEST(xpath_function_arguments)
 	// conversion to boolean
 	CHECK_XPATH_BOOLEAN(c, STR("not('1')"), false);
 	CHECK_XPATH_BOOLEAN(c, STR("not('')"), true);
-
+	
 	// conversion to node set
 	CHECK_XPATH_FAIL(STR("sum(1)"));

 	// expression evaluation
 	CHECK_XPATH_NUMBER(c, STR("round((2 + 2 * 2) div 4)"), 2);
-
+	
 	// empty expressions
 	CHECK_XPATH_FAIL(STR("round(,)"));
 	CHECK_XPATH_FAIL(STR("substring(,)"));
@ -804,41 +799,4 @@ TEST_XML(xpath_string_concat_translate, "<node>foobar</node>")
 	CHECK_XPATH_STRING(doc, STR("concat('a', 'b', 'c', translate(node, 'o', 'a'), 'd')"), STR("abcfaabard"));
 }

-TEST(xpath_unknown_functions)
-{
-	char_t query[] = STR("a()");
-
-	for (char ch = 'a'; ch <= 'z'; ++ch)
-	{
-		query[0] = ch;
-		CHECK_XPATH_FAIL(query);
-
-		query[0] = char_t(ch - 32);
-		CHECK_XPATH_FAIL(query);
-	}
-}
-
-TEST(xpath_string_translate_table_out_of_memory)
-{
-	xml_node c;
-
-	// our goal is to generate translate table OOM without generating query OOM
-	std::basic_string<char_t> query = STR("concat(");
-
-	size_t count = 20;
-
-	for (size_t i = 0; i < count; ++i)
-	{
-		if (i != 0) query += STR(",");
-		query += STR("translate('a','a','A')");
-	}
-
-	query += STR(")");
-
-	std::basic_string<char_t> result(count, 'A');
-
-	test_runner::_memory_fail_threshold = 5000;
-
-	CHECK_ALLOC_FAIL(CHECK_XPATH_STRING(c, query.c_str(), result.c_str()));
-}
 #endif
--- a/tests/test_xpath_operators.cpp
+++ b/tests/test_xpath_operators.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST(xpath_operators_arithmetic)
 {
@ -65,7 +63,7 @@ TEST(xpath_operators_arithmetic_specials)
 	CHECK_XPATH_STRING(c, STR("1 div 0 + 100"), STR("Infinity"));
 	CHECK_XPATH_STRING(c, STR("-1 div 0 + 100"), STR("-Infinity"));
 	CHECK_XPATH_STRING(c, STR("0 div 0 + 100"), STR("NaN"));
-
+	
 	// unary - and multiplication clarifications from recommendations errata
 	CHECK_XPATH_STRING(c, STR("1 div -0"), STR("-Infinity"));
 	CHECK_XPATH_STRING(c, STR("-1 div -0"), STR("Infinity"));
@ -101,7 +99,7 @@ TEST(xpath_operators_logical)
 	CHECK_XPATH_BOOLEAN(c, STR("true() and false()"), false);
 	CHECK_XPATH_BOOLEAN(c, STR("false() and false()"), false);
 	CHECK_XPATH_BOOLEAN(c, STR("false() and true()"), false);
-
+	
 	// boolean conversion
 	CHECK_XPATH_BOOLEAN(c, STR("1 or ''"), true);
 	CHECK_XPATH_BOOLEAN(c, STR("1 and ''"), false);
@ -194,7 +192,7 @@ TEST_XML(xpath_operators_equality_node_set_node_set, "<node><c1><v>a</v><v>b</v>
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v != c3/v"), true);
 	CHECK_XPATH_BOOLEAN(n, STR("c2/v != c3/v"), true);
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v != c4/v"), true);
-	CHECK_XPATH_BOOLEAN(n, STR("c1/v != c5/v"), true); // (a, b) != (a, b), since a != b, as per XPath spec (comparison operators are so not intuitive)
+	CHECK_XPATH_BOOLEAN(n, STR("c1/v != c5/v"), true); // (a, b) != (a, b), since a != b, as per XPath spec (comparison operators are so not intutive)
 	CHECK_XPATH_BOOLEAN(n, STR("c3/v != c6/v"), false);
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v != x"), false);
 	CHECK_XPATH_BOOLEAN(n, STR("x != c1/v"), false);
@ -227,7 +225,7 @@ TEST_XML(xpath_operators_equality_node_set_primitive, "<node><c1><v>1</v><v>-1</
 	CHECK_XPATH_BOOLEAN(n, STR("c2/v != 1"), true);
 	CHECK_XPATH_BOOLEAN(n, STR("1 != c2/v"), true);
 #endif
-
+	
 	// node set vs string
 	CHECK_XPATH_BOOLEAN(c, STR("x = '1'"), false);
 	CHECK_XPATH_BOOLEAN(c, STR("x != '1'"), false);
@ -334,21 +332,11 @@ TEST_XML(xpath_operators_inequality_node_set_node_set, "<node><c1><v>1</v><v>-1<
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v < c3/v"), true);
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v <= c3/v"), true);

-	CHECK_XPATH_BOOLEAN(n, STR("c1/v[1] > c1/v[1]"), false);
-	CHECK_XPATH_BOOLEAN(n, STR("c1/v[1] < c1/v[1]"), false);
-	CHECK_XPATH_BOOLEAN(n, STR("c1/v[1] >= c1/v[1]"), true);
-	CHECK_XPATH_BOOLEAN(n, STR("c1/v[1] <= c1/v[1]"), true);
-
 #ifndef MSVC6_NAN_BUG
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v > c2/v"), false);
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v >= c2/v"), true);
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v < c2/v"), true);
 	CHECK_XPATH_BOOLEAN(n, STR("c1/v <= c2/v"), true);
-
-	CHECK_XPATH_BOOLEAN(n, STR("c2/v[2] < c2/v[2]"), false);
-	CHECK_XPATH_BOOLEAN(n, STR("c2/v[2] > c2/v[2]"), false);
-	CHECK_XPATH_BOOLEAN(n, STR("c2/v[2] <= c2/v[2]"), false);
-	CHECK_XPATH_BOOLEAN(n, STR("c2/v[2] >= c2/v[2]"), false);
 #endif
 }

@ -435,24 +423,6 @@ TEST_XML(xpath_operators_union, "<node><employee/><employee secretary=''/><emplo
 	CHECK_XPATH_NODESET(n, STR(". | tail/preceding-sibling::employee | .")) % 2 % 3 % 4 % 6 % 8 % 11;
 }

-TEST_XML(xpath_operators_union_order, "<node />")
-{
-	xml_node n = doc.child(STR("node"));
-
-	n.append_child(STR("c"));
-	n.prepend_child(STR("b"));
-	n.append_child(STR("d"));
-	n.prepend_child(STR("a"));
-
-	xpath_node_set ns = n.select_nodes(STR("d | d | b | c | b | a | c | d | b"));
-
-	CHECK(ns.size() == 4);
-	CHECK_STRING(ns[0].node().name(), STR("d"));
-	CHECK_STRING(ns[1].node().name(), STR("b"));
-	CHECK_STRING(ns[2].node().name(), STR("c"));
-	CHECK_STRING(ns[3].node().name(), STR("a"));
-}
-
 TEST(xpath_operators_union_error)
 {
 	CHECK_XPATH_FAIL(STR(". | true()"));
--- a/tests/test_xpath_parse.cpp
+++ b/tests/test_xpath_parse.cpp
@ -1,11 +1,9 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
+#include "common.hpp"

 #include <string>

-using namespace pugi;
-
 TEST(xpath_literal_parse)
 {
 	xml_node c;
@ -224,7 +222,7 @@ TEST(xpath_parse_paths_valid_unicode)
 	#if defined(PUGIXML_WCHAR_MODE)
 		xpath_query q(paths[i]);
 	#elif !defined(PUGIXML_NO_STL)
-		std::basic_string<char> path_utf8 = as_utf8(paths[i]);
+		std::basic_string<char> path_utf8 = pugi::as_utf8(paths[i]);
 		xpath_query q(path_utf8.c_str());
 	#endif
 	}
@ -276,7 +274,7 @@ TEST_XML(xpath_parse_absolute, "<div><s/></div>")

 TEST(xpath_parse_out_of_memory_first_page)
 {
-	test_runner::_memory_fail_threshold = 128;
+	test_runner::_memory_fail_threshold = 1;

 	CHECK_ALLOC_FAIL(CHECK_XPATH_FAIL(STR("1")));
 }
@ -295,27 +293,6 @@ TEST(xpath_parse_out_of_memory_string_to_number)
 	CHECK_ALLOC_FAIL(CHECK_XPATH_FAIL(STR("0.11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111")));
 }

-TEST(xpath_parse_out_of_memory_quoted_string)
-{
-	test_runner::_memory_fail_threshold = 4096 + 128;
-
-	std::basic_string<char_t> literal(5000, 'a');
-	std::basic_string<char_t> query = STR("'") + literal + STR("'");
-
-	CHECK_ALLOC_FAIL(CHECK_XPATH_FAIL(query.c_str()));
-}
-
-TEST(xpath_parse_out_of_memory_variable)
-{
-	test_runner::_memory_fail_threshold = 4096 + 128;
-
-	std::basic_string<char_t> literal(5000, 'a');
-	std::basic_string<char_t> query = STR("$") + literal;
-
-	xpath_variable_set vars;
-	CHECK_ALLOC_FAIL(CHECK_XPATH_FAIL_VAR(query.c_str(), &vars));
-}
-
 TEST(xpath_parse_qname_error)
 {
 	CHECK_XPATH_FAIL(STR("foo: bar"));
@ -336,81 +313,4 @@ TEST(xpath_parse_result_default)
 	CHECK(result.offset == 0);
 }

-TEST(xpath_parse_error_propagation)
-{
-	char_t query[] = STR("(//foo[count(. | @*)] | ((a)//b)[1] | /foo | /foo/bar//more/ancestor-or-self::foobar | /text() | a[1 + 2 * 3 div (1+0) mod 2]//b[1]/c | a[$x])[true()]");
-
-	xpath_variable_set vars;
-	vars.set(STR("x"), 1.0);
-
-	xpath_query q(query, &vars);
-	CHECK(q);
-
-	for (size_t i = 0; i + 1 < sizeof(query) / sizeof(query[0]); ++i)
-	{
-		char_t ch = query[i];
-
-		query[i] = '%';
-
-		CHECK_XPATH_FAIL(query);
-
-		query[i] = ch;
-	}
-}
-
-TEST(xpath_parse_oom_propagation)
-{
-	const char_t* query_base = STR("(//foo[count(. | @*)] | ((a)//b)[1] | /foo | /foo/bar//more/ancestor-or-self::foobar | /text() | a[1 + 2 * 3 div (1+0) mod 2]//b[1]/c | a[$x])[true()]");
-
-	xpath_variable_set vars;
-	vars.set(STR("x"), 1.0);
-
-	test_runner::_memory_fail_threshold = 4096 + 128;
-
-	{
-		xpath_query q(query_base, &vars);
-		CHECK(q);
-	}
-
-	for (size_t i = 3200; i < 4200; ++i)
-	{
-		std::basic_string<char_t> literal(i, 'a');
-		std::basic_string<char_t> query = STR("processing-instruction('") + literal + STR("') | ") + query_base;
-		
-		CHECK_ALLOC_FAIL(CHECK_XPATH_FAIL(query.c_str()));
-	}
-}
-
-static std::basic_string<char_t> rep(const std::basic_string<char_t>& base, size_t count)
-{
-	std::basic_string<char_t> result;
-	result.reserve(base.size() * count);
-
-	for (size_t i = 0; i < count; ++i)
-		result += base;
-
-	return result;
-}
-
-TEST(xpath_parse_depth_limit)
-{
-	const size_t limit = 1500;
-
-	CHECK_XPATH_FAIL((rep(STR("("), limit) + STR("1") + rep(STR(")"), limit)).c_str());
-	CHECK_XPATH_FAIL((STR("(id('a'))") + rep(STR("[1]"), limit)).c_str());
-	CHECK_XPATH_FAIL((STR("/foo") + rep(STR("[1]"), limit)).c_str());
-	CHECK_XPATH_FAIL((STR("/foo") + rep(STR("/x"), limit)).c_str());
-	CHECK_XPATH_FAIL((STR("1") + rep(STR("+1"), limit)).c_str());
-	CHECK_XPATH_FAIL((STR("concat(") + rep(STR("1,"), limit) + STR("1)")).c_str());
-	CHECK_XPATH_FAIL((STR("/foo") + rep(STR("//x"), limit / 2)).c_str());
-}
-
-TEST_XML(xpath_parse_location_path, "<node><child/></node>")
-{
-	CHECK_XPATH_NODESET(doc, STR("/node")) % 2;
-	CHECK_XPATH_NODESET(doc, STR("/@*"));
-	CHECK_XPATH_NODESET(doc, STR("/.")) % 1;
-	CHECK_XPATH_NODESET(doc, STR("/.."));
-	CHECK_XPATH_NODESET(doc, STR("/*")) % 2;
-}
 #endif
--- a/tests/test_xpath_paths.cpp
+++ b/tests/test_xpath_paths.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_paths_axes_child, "<node attr='value'><child attr='value'><subchild/></child><another/><last/></node>")
 {
@ -360,13 +358,6 @@ TEST_XML_FLAGS(xpath_paths_nodetest_principal, "<node attr='value'>pcdata<child/
 	CHECK_XPATH_NODESET(doc, STR("child::abra:*/attribute::abra:*/descendant-or-self::abra:*")); // attribute is not of element type
 }

-TEST_XML(xpath_paths_nodetest_attribute_namespace, "<node a1='v1' xmlns:x='?' />")
-{
-	CHECK_XPATH_NODESET(doc, STR("node/attribute::node()")) % 3;
-	CHECK_XPATH_NODESET(doc, STR("node/attribute::xmlns:x"));
-	CHECK_XPATH_NODESET(doc, STR("node/attribute::xmlns:*"));
-}
-
 TEST_XML(xpath_paths_absolute, "<node attr='value'><foo><foo/><foo/></foo></node>")
 {
 	xml_node c;
@ -705,79 +696,4 @@ TEST_XML(xpath_paths_null_nodeset_entries, "<node attr='value'/>")
    CHECK(rs[0] == nodes[0]);
    CHECK(rs[1] == nodes[2]);
 }
-
-TEST_XML(xpath_paths_step_leaf_coverage, "<n><n1/><n2 a='v'><child/></n2><n3/></n>")
-{
-	xml_node n = doc.child(STR("n")).child(STR("n2"));
-
-	CHECK_XPATH_NODESET(n, STR("ancestor::node()")) % 2 % 1;
-	CHECK_XPATH_NODESET(n, STR("ancestor-or-self::node()")) % 4 % 2 % 1;
-	CHECK_XPATH_NODESET(n, STR("attribute::node()")) % 5;
-	CHECK_XPATH_NODESET(n, STR("child::node()")) % 6;
-	CHECK_XPATH_NODESET(n, STR("descendant::node()")) % 6;
-	CHECK_XPATH_NODESET(n, STR("descendant-or-self::node()")) % 4 % 6;
-	CHECK_XPATH_NODESET(n, STR("following::node()")) % 7;
-	CHECK_XPATH_NODESET(n, STR("following-sibling::node()")) % 7;
-	CHECK_XPATH_NODESET(n, STR("namespace::node()"));
-	CHECK_XPATH_NODESET(n, STR("parent::node()")) % 2;
-	CHECK_XPATH_NODESET(n, STR("preceding::node()")) % 3;
-	CHECK_XPATH_NODESET(n, STR("preceding-sibling::node()")) % 3;
-	CHECK_XPATH_NODESET(n, STR("self::node()")) % 4;
-}
-TEST_XML(xpath_paths_step_leaf_predicate_coverage, "<n><n1/><n2 a='v'><child/></n2><n3/></n>")
-{
-	xml_node n = doc.child(STR("n")).child(STR("n2"));
-
-	CHECK_XPATH_NODESET(n, STR("ancestor::node()[1]")) % 2;
-	CHECK_XPATH_NODESET(n, STR("ancestor-or-self::node()[1]")) % 4;
-	CHECK_XPATH_NODESET(n, STR("attribute::node()[1]")) % 5;
-	CHECK_XPATH_NODESET(n, STR("child::node()[1]")) % 6;
-	CHECK_XPATH_NODESET(n, STR("descendant::node()[1]")) % 6;
-	CHECK_XPATH_NODESET(n, STR("descendant-or-self::node()[1]")) % 4;
-	CHECK_XPATH_NODESET(n, STR("following::node()[1]")) % 7;
-	CHECK_XPATH_NODESET(n, STR("following-sibling::node()[1]")) % 7;
-	CHECK_XPATH_NODESET(n, STR("namespace::node()[1]"));
-	CHECK_XPATH_NODESET(n, STR("parent::node()[1]")) % 2;
-	CHECK_XPATH_NODESET(n, STR("preceding::node()[1]")) % 3;
-	CHECK_XPATH_NODESET(n, STR("preceding-sibling::node()[1]")) % 3;
-	CHECK_XPATH_NODESET(n, STR("self::node()[1]")) % 4;
-}
-
-TEST_XML(xpath_paths_step_step_coverage, "<n><n1/><n2 a='v'><child/></n2><n3/></n>")
-{
-	xml_node n = doc.child(STR("n")).child(STR("n2"));
-
-	CHECK_XPATH_NODESET(n, STR("./ancestor::node()")) % 2 % 1;
-	CHECK_XPATH_NODESET(n, STR("./ancestor-or-self::node()")) % 4 % 2 % 1;
-	CHECK_XPATH_NODESET(n, STR("./attribute::node()")) % 5;
-	CHECK_XPATH_NODESET(n, STR("./child::node()")) % 6;
-	CHECK_XPATH_NODESET(n, STR("./descendant::node()")) % 6;
-	CHECK_XPATH_NODESET(n, STR("./descendant-or-self::node()")) % 4 % 6;
-	CHECK_XPATH_NODESET(n, STR("./following::node()")) % 7;
-	CHECK_XPATH_NODESET(n, STR("./following-sibling::node()")) % 7;
-	CHECK_XPATH_NODESET(n, STR("./namespace::node()"));
-	CHECK_XPATH_NODESET(n, STR("./parent::node()")) % 2;
-	CHECK_XPATH_NODESET(n, STR("./preceding::node()")) % 3;
-	CHECK_XPATH_NODESET(n, STR("./preceding-sibling::node()")) % 3;
-	CHECK_XPATH_NODESET(n, STR("./self::node()")) % 4;
-}
-
-TEST_XML(xpath_paths_step_step_predicate_coverage, "<n><n1/><n2 a='v'><child/></n2><n3/></n>")
-{
-	xml_node n = doc.child(STR("n")).child(STR("n2"));
-
-	CHECK_XPATH_NODESET(n, STR("./ancestor::node()[1]")) % 2;
-	CHECK_XPATH_NODESET(n, STR("./ancestor-or-self::node()[1]")) % 4;
-	CHECK_XPATH_NODESET(n, STR("./attribute::node()[1]")) % 5;
-	CHECK_XPATH_NODESET(n, STR("./child::node()[1]")) % 6;
-	CHECK_XPATH_NODESET(n, STR("./descendant::node()[1]")) % 6;
-	CHECK_XPATH_NODESET(n, STR("./descendant-or-self::node()[1]")) % 4;
-	CHECK_XPATH_NODESET(n, STR("./following::node()[1]")) % 7;
-	CHECK_XPATH_NODESET(n, STR("./following-sibling::node()[1]")) % 7;
-	CHECK_XPATH_NODESET(n, STR("./namespace::node()[1]"));
-	CHECK_XPATH_NODESET(n, STR("./parent::node()[1]")) % 2;
-	CHECK_XPATH_NODESET(n, STR("./preceding::node()[1]")) % 3;
-	CHECK_XPATH_NODESET(n, STR("./preceding-sibling::node()[1]")) % 3;
-	CHECK_XPATH_NODESET(n, STR("./self::node()[1]")) % 4;
-}
 #endif
--- a/tests/test_xpath_paths_abbrev_w3c.cpp
+++ b/tests/test_xpath_paths_abbrev_w3c.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_paths_abbrev_w3c_1, "<node><para/><foo/><para/></node>")
 {
--- a/tests/test_xpath_paths_w3c.cpp
+++ b/tests/test_xpath_paths_w3c.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_paths_w3c_1, "<node><para/><foo/><para/></node>")
 {
--- a/tests/test_xpath_variables.cpp
+++ b/tests/test_xpath_variables.cpp
@ -1,11 +1,9 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
+#include "common.hpp"

 #include <string>

-using namespace pugi;
-
 TEST(xpath_variables_type_none)
 {
 	xpath_variable_set set;
@ -263,7 +261,7 @@ TEST(xpath_variables_multiple_documents)

 	CHECK(ns.size() == 3);
 	CHECK(ns[0] != ns[1] && ns[0] != ns[2]);
-
+	
 	xml_node n0 = doc.child(STR("node")), n1 = doc1.child(STR("node")), n2 = doc2.child(STR("node"));

 	CHECK(n0 == ns[0].node() || n0 == ns[1].node() || n0 == ns[2].node());
@ -304,23 +302,7 @@ TEST_XML(xpath_variables_select, "<node attr='1'/><node attr='2'/>")
 TEST(xpath_variables_empty_name)
 {
 	xpath_variable_set set;
-	CHECK(!set.add(STR(""), xpath_type_node_set));
 	CHECK(!set.add(STR(""), xpath_type_number));
-	CHECK(!set.add(STR(""), xpath_type_string));
-	CHECK(!set.add(STR(""), xpath_type_boolean));
-}
-
-TEST(xpath_variables_long_name_out_of_memory_add)
-{
-	std::basic_string<char_t> name(1000, 'a');
-
-	test_runner::_memory_fail_threshold = 1000;
-
-	xpath_variable_set set;
-	CHECK_ALLOC_FAIL(CHECK(!set.add(name.c_str(), xpath_type_node_set)));
-	CHECK_ALLOC_FAIL(CHECK(!set.add(name.c_str(), xpath_type_number)));
-	CHECK_ALLOC_FAIL(CHECK(!set.add(name.c_str(), xpath_type_string)));
-	CHECK_ALLOC_FAIL(CHECK(!set.add(name.c_str(), xpath_type_boolean)));
 }

 TEST_XML(xpath_variables_inside_filter, "<node key='1' value='2'/><node key='2' value='1'/><node key='1' value='1'/>")
@ -454,7 +436,7 @@ TEST_XML(xpath_variables_copy, "<node />")

 	CHECK_XPATH_STRING_VAR(xml_node(), STR("substring($c, count($d[$a]) + $b)"), &set2, STR("ring"));

-	set3 = xpath_variable_set(set3);
+	set3 = set3;

 	CHECK_XPATH_STRING_VAR(xml_node(), STR("substring($c, count($d[$a]) + $b)"), &set2, STR("ring"));

@ -492,19 +474,7 @@ TEST_XML(xpath_variables_copy_out_of_memory, "<node1 /><node2 />")
 	CHECK(set2.get(STR("d"))->get_node_set().size() == 2);
 }

-TEST(xpath_variables_copy_out_of_memory_clone)
-{
-	xpath_variable_set set1;
-	set1.set(STR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"), true);
-
-	xpath_variable_set set2 = set1;
-
-	test_runner::_memory_fail_threshold = 60;
-
-	CHECK_ALLOC_FAIL(xpath_variable_set set3 = set1);
-}
-
-#ifdef PUGIXML_HAS_MOVE
+#if __cplusplus >= 201103
 TEST_XML(xpath_variables_move, "<node />")
 {
 	xpath_variable_set set;
@ -609,65 +579,4 @@ TEST(xpath_variables_copy_big_out_of_memory)
 		CHECK(!copy.get(name));
 	}
 }
-
-TEST(xpath_variables_copy_big_value_out_of_memory)
-{
-	xpath_variable_set set;
-
-	std::basic_string<char_t> var(10000, 'a');
-	set.set(STR("x"), var.c_str());
-
-	test_runner::_memory_fail_threshold = 15000;
-
-	xpath_variable_set copy;
-	CHECK_ALLOC_FAIL(copy = set);
-
-	CHECK(!copy.get(STR("x")));
-}
-
-TEST_XML(xpath_variables_evaluate_node_set_out_of_memory, "<node />")
-{
-	for (size_t i = 0; i < 600; ++i)
-		doc.append_child(STR("node"));
-
-	xpath_node_set ns = doc.select_nodes(STR("node"));
-	CHECK(ns.size() == 601);
-
-	xpath_variable_set set;
-	set.set(STR("nodes"), ns);
-
-	xpath_query q(STR("$nodes"), &set);
-
-	test_runner::_memory_fail_threshold = 1;
-
-	CHECK_ALLOC_FAIL(q.evaluate_node_set(xml_node()).empty());
-}
-
-TEST_XML(xpath_variables_type_conversion, "<node>15</node>")
-{
-	xpath_variable_set set;
-
-	set.set(STR("a"), true);
-	set.set(STR("b"), 42.0);
-	set.set(STR("c"), STR("test"));
-	set.set(STR("d"), doc.select_nodes(STR("node")));
-
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("boolean($a) = true()"), &set, true);
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("number($a) = 1"), &set, true);
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("string($a) = 'true'"), &set, true);
-
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("boolean($b) = true()"), &set, true);
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("number($b) = 42"), &set, true);
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("string($b) = '42'"), &set, true);
-
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("boolean($c) = true()"), &set, true);
-#ifndef MSVC6_NAN_BUG
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("number($c) = 0"), &set, false);
-#endif
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("string($c) = 'test'"), &set, true);
-
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("boolean($d) = true()"), &set, true);
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("number($d) = 15"), &set, true);
-	CHECK_XPATH_BOOLEAN_VAR(xml_node(), STR("string($d) = '15'"), &set, true);
-}
 #endif
--- a/tests/test_xpath_xalan_1.cpp
+++ b/tests/test_xpath_xalan_1.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST(xpath_xalan_boolean_1)
 {
@ -365,7 +363,7 @@ TEST_XML(xpath_xalan_math_8, "<k>0.0004</k>")
 	CHECK_XPATH_NUMBER(doc, STR("number(4 div 10000)"), 0.0004);

 	// +0 works around extended precision in div on x86 (this is needed for some configurations in MinGW 3.4)
-	CHECK_XPATH_BOOLEAN(doc, STR("(number(k) = (4 div 10000 + 0))"), true);
+	CHECK_XPATH_BOOLEAN(doc, STR("(number(k) = (4 div 10000 + 0))"), true); 
 	CHECK_XPATH_NUMBER(doc, STR("number(0.0001 * 4)"), 0.0004);
 	CHECK_XPATH_BOOLEAN(doc, STR("(number(k) = (0.0001 * 4))"), true);
 }
--- a/tests/test_xpath_xalan_2.cpp
+++ b/tests/test_xpath_xalan_2.cpp
@ -2,13 +2,11 @@

 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
+#include "common.hpp"

 #include <string>
 #include <algorithm>

-using namespace pugi;
-
 TEST_XML(xpath_xalan_string_1, "<doc a='test'>ENCYCLOPEDIA</doc>")
 {
 	xml_node c;
--- a/tests/test_xpath_xalan_3.cpp
+++ b/tests/test_xpath_xalan_3.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_xalan_axes_1, "<far-north><north-north-west1/><north-north-west2/><north><near-north><far-west/><west/><near-west/><center center-attr-1='c1' center-attr-2='c2' center-attr-3='c3'><near-south-west/><near-south><south><far-south/></south></near-south><near-south-east/></center><near-east/><east/><far-east/></near-north></north><north-north-east1/><north-north-east2/></far-north>")
 {
--- a/tests/test_xpath_xalan_4.cpp
+++ b/tests/test_xpath_xalan_4.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_xalan_position_1, "<doc><a>1</a><a>2</a><a>3</a><a>4</a></doc>")
 {
--- a/tests/test_xpath_xalan_5.cpp
+++ b/tests/test_xpath_xalan_5.cpp
@ -1,8 +1,6 @@
 #ifndef PUGIXML_NO_XPATH

-#include "test.hpp"
-
-using namespace pugi;
+#include "common.hpp"

 TEST_XML(xpath_xalan_select_1, "<doc><a><b attr='test'/></a><c><d><e/></d></c></doc>")
 {
--- a/tests/writer_string.hpp
+++ b/tests/writer_string.hpp
@ -8,8 +8,8 @@
 struct xml_writer_string: public pugi::xml_writer
 {
 	std::string contents;
-
-	virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+	
+	virtual void write(const void* data, size_t size);

 	std::string as_narrow() const;
 	std::basic_string<wchar_t> as_wide() const;
				`@ -1 +0,0 @@`
				`sum(nodes) + round(concat(//a[translate(@id, 'abc', '012')]))`
				`@ -1 +0,0 @@`
				`@/ancestor::/near-north/[4]/@/preceding::text()`
				`@ -1 +0,0 @@`
				`library/nodes[@id=12]/element[@type='translate'][1]`