8 files changed, 493 insertions, 0 deletions
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/Cairo Resources.txt b/upstream/clipper-6.4.2/cpp/cpp_cairo/Cairo Resources.txt
new file mode 100644
index 0000000..e868eec
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/Cairo Resources.txt
@@ -0,0 +1,6 @@
+http://cairographics.org/
+
+The Windows dynamic linked libraries necessary to run Cairo can be downloaded from
+http://www.gtk.org/download/win32.php
+All the dlls listed under the heading "Required third party dependencies" are 
+required except gettext-runtime.dll.
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo.sln b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo.sln
new file mode 100644
index 0000000..651e81a
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cairo", "cairo.vcxproj", "{6AFBCA2B-9262-6D28-7506-E13747347388}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6AFBCA2B-9262-6D28-7506-E13747347388}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6AFBCA2B-9262-6D28-7506-E13747347388}.Debug|Win32.Build.0 = Debug|Win32
+		{6AFBCA2B-9262-6D28-7506-E13747347388}.Release|Win32.ActiveCfg = Release|Win32
+		{6AFBCA2B-9262-6D28-7506-E13747347388}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo.vcxproj b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo.vcxproj
new file mode 100644
index 0000000..9816ce1
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo.vcxproj
@@ -0,0 +1,93 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>C:\Program Files %28x86%29\Borland\Clipper\PreReleaseTesting\cpp\cairo_src;$(IncludePath)</IncludePath>
+    <SourcePath>C:\Program Files %28x86%29\Borland\Clipper\PreReleaseTesting\cpp\cairo_src;C:\Program Files %28x86%29\Borland\graphics32\Examples\Vcl\Drawing\Clipper\PreReleaseTesting\cpp\cairo_src;$(SourcePath)</SourcePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Borland\graphics32\Examples\Vcl\Drawing\Clipper\PreReleaseTesting\cpp\cairo_src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <UseUnicodeForAssemblerListing>
+      </UseUnicodeForAssemblerListing>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Borland\graphics32\Examples\Vcl\Drawing\Clipper\PreReleaseTesting\cpp\cairo_src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\clipper.cpp" />
+    <ClCompile Include="cairo_clipper.cpp" />
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\cairo_src\cairo.h" />
+    <ClInclude Include="..\clipper.hpp" />
+    <ClInclude Include="cairo_clipper.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="libcairo-2.lib" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.cpp b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.cpp
new file mode 100644
index 0000000..72d5930
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.cpp
@@ -0,0 +1,133 @@
+/*******************************************************************************
+*                                                                              *
+* Author        :  Angus Johnson                                               *
+* Version       :  1.1                                                         *
+* Date          :  4 April 2011                                                *
+* Copyright :  Angus Johnson 2010-2011                                         *
+*                                                                              *
+* License:                                                                     *
+* Use, modification & distribution is subject to Boost Software License Ver 1. *
+* http://www.boost.org/LICENSE_1_0.txt                                         *
+*                                                                              *
+* Modified by Mike Owens to support coordinate transformation                  *
+*******************************************************************************/
+
+#include <stdexcept>
+#include <cmath>
+#include <iostream>
+#include <cairo.h>
+#include "clipper.hpp"
+#include "cairo_clipper.hpp"
+
+namespace ClipperLib {
+    namespace cairo {
+
+        namespace {
+
+            inline cInt Round(double val)
+            {
+                if ((val < 0)) return (cInt)(val - 0.5); else return (cInt)(val + 0.5);
+            }
+
+            void transform_point(cairo_t* pen, Transform transform, cInt* x, cInt* y)
+            {
+                double _x = (double)*x, _y = (double)*y;
+                switch (transform)
+                {
+                    case tDeviceToUser:
+                        cairo_device_to_user(pen, &_x, &_y);
+                        break;
+                    case tUserToDevice:
+                        cairo_user_to_device(pen, &_x, &_y);
+                        break;
+                    default:
+                        ;
+                }
+                *x = Round(_x); *y = Round(_y);
+            }
+        }
+
+        void cairo_to_clipper(cairo_t* cr,
+                                                    Paths &pg,
+                                                    int scaling_factor,
+                                                    Transform transform)
+        {
+            if (scaling_factor > 8 || scaling_factor < 0)
+                throw clipperCairoException("cairo_to_clipper: invalid scaling factor");
+            double scaling = std::pow((double)10, scaling_factor);
+
+            pg.clear();
+            cairo_path_t *path = cairo_copy_path_flat(cr);
+
+            int poly_count = 0;
+            for (int i = 0; i < path->num_data; i += path->data[i].header.length) {
+                if( path->data[i].header.type == CAIRO_PATH_CLOSE_PATH) poly_count++;
+            }
+
+            pg.resize(poly_count);
+            int i = 0, pc = 0;
+            while (pc < poly_count)
+            {
+                int vert_count = 1;
+                int j = i;
+                while(j < path->num_data && path->data[j].header.type != CAIRO_PATH_CLOSE_PATH)
+                {
+                    if (path->data[j].header.type == CAIRO_PATH_LINE_TO)
+                        vert_count++;
+                    j += path->data[j].header.length;
+                }
+                pg[pc].resize(vert_count);
+                if (path->data[i].header.type != CAIRO_PATH_MOVE_TO) {
+                    pg.resize(pc);
+                    break;
+                }
+                pg[pc][0].X = Round(path->data[i+1].point.x *scaling);
+                pg[pc][0].Y = Round(path->data[i+1].point.y *scaling);
+                if (transform != tNone)
+                    transform_point(cr, transform, &pg[pc][0].X, &pg[pc][0].Y);
+
+                i += path->data[i].header.length;
+
+                j = 1;
+                while (j < vert_count && i < path->num_data && path->data[i].header.type == CAIRO_PATH_LINE_TO) {
+                    pg[pc][j].X = Round(path->data[i+1].point.x *scaling);
+                    pg[pc][j].Y = Round(path->data[i+1].point.y *scaling);
+                    if (transform != tNone)
+                        transform_point(cr, transform, &pg[pc][j].X, &pg[pc][j].Y);
+                    j++;
+                    i += path->data[i].header.length;
+                }
+                pc++;
+                i += path->data[i].header.length;
+            }
+            cairo_path_destroy(path);
+        }
+        //--------------------------------------------------------------------------
+
+        void clipper_to_cairo(const Paths &pg, cairo_t* cr, int scaling_factor, Transform transform)
+        {
+            if (scaling_factor > 8 || scaling_factor < 0)
+                throw clipperCairoException("clipper_to_cairo: invalid scaling factor");
+            double scaling = std::pow((double)10, scaling_factor);
+            for (size_t i = 0; i < pg.size(); ++i)
+            {
+                size_t sz = pg[i].size();
+                if (sz < 3)
+                    continue;
+                cairo_new_sub_path(cr);
+                //std::cerr << "sub path";
+                for (size_t j = 0; j < sz; ++j) {
+                    cInt x = pg[i][j].X, y = pg[i][j].Y;
+                    if (transform != tNone)
+                        transform_point(cr, transform, &x, &y);
+                    //std::cerr << " (" << (double)x / scaling << "," << (double)y / scaling << ")";
+                    cairo_line_to(cr, (double)x / scaling, (double)y / scaling);
+                }
+                //std::cerr << std::endl;
+                cairo_close_path(cr);
+            }
+        }
+        //--------------------------------------------------------------------------
+
+    }
+}
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.hpp b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.hpp
new file mode 100644
index 0000000..7c52dfd
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.hpp
@@ -0,0 +1,59 @@
+/*******************************************************************************
+*                                                                              *
+* Author    :  Angus Johnson                                                   *
+* Version   :  1.1                                                             *
+* Date      :  4 April 2011                                                    *
+* Copyright :  Angus Johnson 2010-2011                                         *
+*                                                                              *
+* License:                                                                     *
+* Use, modification & distribution is subject to Boost Software License Ver 1. *
+* http://www.boost.org/LICENSE_1_0.txt                                         *
+*                                                                              *
+* Modified by Mike Owens to support coordinate transformation                  *
+*******************************************************************************/
+
+#ifndef CLIPPER_CAIRO_CLIPPER_HPP
+#define CLIPPER_CAIRO_CLIPPER_HPP
+
+#include "clipper.hpp"
+
+typedef struct _cairo cairo_t;
+
+namespace ClipperLib {
+  namespace cairo {
+
+    enum Transform {
+      tNone,
+      tUserToDevice,
+      tDeviceToUser
+    };
+
+//nb: Since Clipper only accepts integer coordinates, fractional values have to
+//be scaled up and down when being passed to and from Clipper. This is easily
+//accomplished by setting the scaling factor (10^x) in the following functions.
+//When scaling, remember that on most platforms, integer is only a 32bit value.
+    void cairo_to_clipper(cairo_t* cr,
+                          ClipperLib::Paths &pg,
+                          int scaling_factor = 0,
+                          Transform transform = tNone);
+
+    void clipper_to_cairo(const ClipperLib::Paths &pg,
+                          cairo_t* cr,
+                          int scaling_factor = 0,
+                          Transform transform = tNone);
+  }
+
+  class clipperCairoException : public std::exception
+  {
+    public:
+      clipperCairoException(const char* description)
+        throw(): std::exception(), m_description (description) {}
+      virtual ~clipperCairoException() throw() {}
+      virtual const char* what() const throw() {return m_description.c_str();}
+    private:
+      std::string m_description;
+  };
+}
+
+#endif
+
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.o b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.o
new file mode 100644
index 0000000..c7ca888
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/cairo_clipper.o
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/libcairo-2.lib b/upstream/clipper-6.4.2/cpp/cpp_cairo/libcairo-2.lib
new file mode 100644
index 0000000..9be9bc1
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/libcairo-2.lib
diff --git a/upstream/clipper-6.4.2/cpp/cpp_cairo/main.cpp b/upstream/clipper-6.4.2/cpp/cpp_cairo/main.cpp
new file mode 100644
index 0000000..b196a22
--- /dev/null
+++ b/upstream/clipper-6.4.2/cpp/cpp_cairo/main.cpp
@@ -0,0 +1,182 @@
+//---------------------------------------------------------------------------
+
+#include <windows.h>
+#include <cstring>
+#include <cmath>
+#include <sstream>
+#pragma hdrstop
+
+#include "clipper.hpp"
+#include "cairo.h"
+#include "cairo-win32.h"
+#include "cairo_clipper.hpp"
+//---------------------------------------------------------------------------
+
+int offsetVal;
+
+LRESULT CALLBACK WndProcedure(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+int CALLBACK wWinMain(HINSTANCE hInstance,
+  HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
+{
+  WCHAR* ClsName = L"CairoApp";
+  WCHAR* WndName = L"A Simple Cairo Clipper Demo";
+  offsetVal = 0;
+
+  MSG        Msg;
+  HWND       hWnd;
+  WNDCLASSEX WndClsEx;
+
+  // Create the application window
+  WndClsEx.cbSize        = sizeof(WNDCLASSEX);
+  WndClsEx.style         = CS_HREDRAW | CS_VREDRAW;
+  WndClsEx.lpfnWndProc   = WndProcedure;
+  WndClsEx.cbClsExtra    = 0;
+  WndClsEx.cbWndExtra    = 0;
+  WndClsEx.hIcon         = LoadIcon(NULL, IDI_APPLICATION);
+  WndClsEx.hCursor       = LoadCursor(NULL, IDC_ARROW);
+  WndClsEx.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
+  WndClsEx.lpszMenuName  = NULL;
+  WndClsEx.lpszClassName = ClsName;
+  WndClsEx.hInstance     = hInstance;
+  WndClsEx.hIconSm       = LoadIcon(NULL, IDI_APPLICATION);
+
+  // Register the application
+  RegisterClassEx(&WndClsEx);
+
+  // Create the window object
+  hWnd = CreateWindow(ClsName, WndName, WS_OVERLAPPEDWINDOW,
+    CW_USEDEFAULT, CW_USEDEFAULT, 400, 300,
+    NULL, NULL, hInstance, NULL);
+  if( !hWnd ) return 0;
+
+  ShowWindow(hWnd, SW_SHOWNORMAL);
+  UpdateWindow(hWnd);
+
+  while( GetMessage(&Msg, NULL, 0, 0) )
+  {
+     TranslateMessage(&Msg);
+     DispatchMessage(&Msg);
+  }
+  return Msg.wParam;
+}
+//------------------------------------------------------------------------------
+
+
+void OnPaint(HWND hWnd, HDC dc)
+{
+  RECT rec;
+  GetClientRect(hWnd, &rec);
+  cairo_surface_t* surface = cairo_win32_surface_create(dc);
+  cairo_t* cr = cairo_create(surface);
+
+  cairo_set_fill_rule(cr, CAIRO_FILL_RULE_WINDING);
+  cairo_set_line_width (cr, 2.0);
+
+  //fill background with white ...
+  cairo_rectangle(cr, 0, 0, rec.right, rec.bottom);
+  cairo_set_source_rgba(cr, 1, 1, 1, 1);
+  cairo_fill(cr);
+
+  using namespace ClipperLib;
+
+  const int scaling = 2;
+
+  Clipper clpr;    //clipper class
+  Paths pg; //std::vector for polygon(s) storage
+
+  //create a circular pattern, add the path to clipper and then draw it ...
+  cairo_arc(cr, 170,110,70,0,2*3.1415926);
+  cairo_close_path(cr);
+  cairo::cairo_to_clipper(cr, pg, scaling);
+  clpr.AddPaths(pg, ptSubject, true);
+  cairo_set_source_rgba(cr, 0, 0, 1, 0.25);
+  cairo_fill_preserve (cr);
+  cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
+  cairo_stroke (cr);
+
+  //draw a star and another circle, add them to clipper and draw ...
+  cairo_move_to(cr, 60,110);
+  cairo_line_to (cr, 240,70);
+  cairo_line_to (cr, 110,210);
+  cairo_line_to (cr, 140,25);
+  cairo_line_to (cr, 230,200);
+  cairo_close_path(cr);
+  cairo_new_sub_path(cr);
+  cairo_arc(cr, 190,50,20,0,2*3.1415926);
+  cairo_close_path(cr);
+  cairo::cairo_to_clipper(cr, pg, scaling);
+  clpr.AddPaths(pg, ptClip, true);
+  cairo_set_source_rgba(cr, 1, 0, 0, 0.25);
+  cairo_fill_preserve (cr);
+  cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
+  cairo_stroke (cr);
+
+  clpr.Execute(ctIntersection, pg, pftNonZero, pftNonZero);
+  //now do something fancy with the returned polygons ...
+  OffsetPaths(pg, pg, offsetVal * std::pow((double)10,scaling), jtMiter, etClosed);
+
+  //finally copy the clipped path back to the cairo context and draw it ...
+  cairo::clipper_to_cairo(pg, cr, scaling);
+  cairo_set_source_rgba(cr, 1, 1, 0, 1);
+  cairo_fill_preserve (cr);
+  cairo_set_source_rgba(cr, 0, 0, 0, 1);
+  cairo_stroke (cr);
+
+  cairo_text_extents_t extent;
+  cairo_set_font_size(cr,11);
+  std::stringstream ss;
+  ss << "Polygon offset = " << offsetVal << ".  (Adjust with arrow keys)";
+  std::string s = ss.str();
+  cairo_text_extents(cr, s.c_str(), &extent);
+  cairo_move_to(cr, 10, rec.bottom - extent.height);
+  cairo_show_text(cr, s.c_str());
+
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+}
+//------------------------------------------------------------------------------
+
+LRESULT CALLBACK WndProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+{
+    PAINTSTRUCT ps;
+    HDC Handle;
+
+    switch(Msg)
+    {
+      case WM_DESTROY:
+        PostQuitMessage(WM_QUIT);
+        return 0;
+
+      case WM_PAINT:
+        Handle = BeginPaint(hWnd, &ps);
+        OnPaint(hWnd, Handle);
+        EndPaint(hWnd, &ps);
+        return 0;
+
+      case WM_KEYDOWN:
+        switch(wParam)
+        {
+          case VK_ESCAPE:
+            PostQuitMessage(0);
+            return 0;
+          case VK_RIGHT:
+          case VK_UP:
+            if (offsetVal < 20) offsetVal++;
+            InvalidateRect(hWnd, 0, false);
+            return 0;
+          case VK_LEFT:
+          case VK_DOWN:
+            if (offsetVal > -20) offsetVal--;
+            InvalidateRect(hWnd, 0, false);
+            return 0;
+          default:
+            return DefWindowProc(hWnd, Msg, wParam, lParam);
+        }
+
+      default:
+        return DefWindowProc(hWnd, Msg, wParam, lParam);
+    }
+}
+//---------------------------------------------------------------------------
+