Fixed path_factory to be a proper sequence container. Added types for color_stop and color_stop_group, the latter of which is also a sequence container. Changed the location of the path elements since nested classes can't be forward declared. Fixed various errors. Began work on brushes. The remaining changes should be easy enough. Then surfaces. Added a circle class and moved it, vector_2d, rectangle, and matrix_2d into a new section located in geometry.tex.

Author: mikebmcl

source/abs-cubic-curve.tex

@@ -1,48 +1,50 @@
 %!TEX root = io2d.tex
-\rSec0 [pathfactory.pathabscubiccurve] {Class \tcode{path_factory::path_abs_cubic_curve}}
+\rSec0 [abscubiccurve] {Class \tcode{abs_cubic_curve}}
 
 \pnum
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}}
-The class \tcode{path_factory::path_abs_cubic_curve} describes a path segment that is a cubic \bezierlocal curve.
+\indexlibrary{\idxcode{abs_cubic_curve}}
+The class \tcode{abs_cubic_curve} describes a path segment that is a cubic \bezierlocal curve.
 
 \pnum
 It has a first control point of type \tcode{vector_2d}, a second control point of type \tcode{vector_2d}, and an end point of type \tcode{vector_2d}.
 
-\rSec1 [pathfactory.pathabscubiccurve.synopsis] {\tcode{path_factory::path_abs_cubic_curve} synopsis}
+\rSec1 [abscubiccurve.synopsis] {\tcode{abs_cubic_curve} synopsis}
 
 \begin{codeblock}
 namespace std { namespace experimental { namespace io2d { inline namespace v1 {
-  class path_factory::path_abs_cubic_curve {
-  public:
-    // \ref{pathfactory.pathabscubiccurve.cons}, construct/copy/move/destroy:
-    path_abs_cubic_curve(const vector_2d& cp1, const vector_2d& cp2,
-      const vector_2d& ep) noexcept;
-
-    // \ref{pathfactory.pathabscubiccurve.modifiers}, modifiers:
-    void control_point_1(const vector_2d& cp) noexcept;
-    void control_point_2(const vector_2d& cp) noexcept;
-    void end_point(const vector_2d& ep) noexcept;
-
-
-    // \ref{pathfactory.pathabscubiccurve.observers}, observers:
-    vector_2d control_point_1() const noexcept;
-    vector_2d control_point_2() const noexcept;
-    vector_2d end_point() const noexcept;
+  namespace path_data {
+    class abs_cubic_curve {
+    public:
+      // \ref{abscubiccurve.cons}, construct:
+      abs_cubic_curve(const vector_2d& cp1, const vector_2d& cp2,
+        const vector_2d& ep) noexcept;
+
+      // \ref{abscubiccurve.modifiers}, modifiers:
+      void control_point_1(const vector_2d& cp) noexcept;
+      void control_point_2(const vector_2d& cp) noexcept;
+      void end_point(const vector_2d& ep) noexcept;
+
+
+      // \ref{abscubiccurve.observers}, observers:
+      vector_2d control_point_1() const noexcept;
+      vector_2d control_point_2() const noexcept;
+      vector_2d end_point() const noexcept;
+    };
   };
 } } } }
 \end{codeblock}
 
-\rSec1 [pathfactory.pathabscubiccurve.cons] {\tcode{path_factory::path_abs_cubic_curve} constructors}
+\rSec1 [abscubiccurve.cons] {\tcode{abs_cubic_curve} constructors}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!constructor}
+\indexlibrary{\idxcode{abs_cubic_curve}!constructor}
 \begin{itemdecl}
-    path_abs_cubic_curve(const vector_2d& cp1, const vector_2d& cp2,
+    abs_cubic_curve(const vector_2d& cp1, const vector_2d& cp2,
       const vector_2d& ep) noexcept;
 \end{itemdecl}
 \begin{itemdescr}
 	\pnum
 	\effects
-	Constructs an object of type \tcode{path_factory::path_abs_cubic_curve}.
+	Constructs an object of type \tcode{abs_cubic_curve}.
 
 	\pnum
 	The first control point shall be set to the value of \tcode{cp1}.
@@ -54,10 +56,10 @@
 	The end point shall be set to the value of \tcode{ep}.
 \end{itemdescr}
 
-\rSec1 [pathfactory.pathabscubiccurve.modifiers]{\tcode{path_factory::path_abs_cubic_curve} modifiers}
+\rSec1 [abscubiccurve.modifiers]{\tcode{abs_cubic_curve} modifiers}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!\idxcode{control_point_1}}
-\indexlibrary{\idxcode{control_point_1}!\idxcode{path_factory::path_abs_cubic_curve}}
+\indexlibrary{\idxcode{abs_cubic_curve}!\idxcode{control_point_1}}
+\indexlibrary{\idxcode{control_point_1}!\idxcode{abs_cubic_curve}}
 \begin{itemdecl}
     void control_point_1(const vector_2d& cp) noexcept;
 \end{itemdecl}
@@ -67,8 +69,8 @@
 	The first control point shall be set to the value of \tcode{cp}.
 \end{itemdescr}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!\idxcode{control_point_2}}
-\indexlibrary{\idxcode{control_point_2}!\idxcode{path_factory::path_abs_cubic_curve}}
+\indexlibrary{\idxcode{abs_cubic_curve}!\idxcode{control_point_2}}
+\indexlibrary{\idxcode{control_point_2}!\idxcode{abs_cubic_curve}}
 \begin{itemdecl}
     void control_point_2(const vector_2d& cp) noexcept;
 \end{itemdecl}
@@ -78,8 +80,8 @@
 	The second control point shall be set to the value of \tcode{cp}.
 \end{itemdescr}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!\idxcode{end_point}}
-\indexlibrary{\idxcode{end_point}!\idxcode{path_factory::path_abs_cubic_curve}}
+\indexlibrary{\idxcode{abs_cubic_curve}!\idxcode{end_point}}
+\indexlibrary{\idxcode{end_point}!\idxcode{abs_cubic_curve}}
 \begin{itemdecl}
     void end_point(const vector_2d& ep) noexcept;
 \end{itemdecl}
@@ -89,10 +91,10 @@
 	The end point shall be set to the value of \tcode{ep}.
 \end{itemdescr}
 
-\rSec1 [pathfactory.pathabscubiccurve.observers]{\tcode{path_factory::path_abs_cubic_curve} observers}
+\rSec1 [abscubiccurve.observers]{\tcode{abs_cubic_curve} observers}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!\idxcode{control_point_1}}
-\indexlibrary{\idxcode{control_point_1}!\idxcode{path_factory::path_abs_cubic_curve}}
+\indexlibrary{\idxcode{abs_cubic_curve}!\idxcode{control_point_1}}
+\indexlibrary{\idxcode{control_point_1}!\idxcode{abs_cubic_curve}}
 \begin{itemdecl}
     vector_2d control_point_1() const noexcept;
 \end{itemdecl}
@@ -102,8 +104,8 @@
 	The value of the first control point.
 \end{itemdescr}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!\idxcode{control_point_2}}
-\indexlibrary{\idxcode{control_point_2}!\idxcode{path_factory::path_abs_cubic_curve}}
+\indexlibrary{\idxcode{abs_cubic_curve}!\idxcode{control_point_2}}
+\indexlibrary{\idxcode{control_point_2}!\idxcode{abs_cubic_curve}}
 \begin{itemdecl}
     vector_2d control_point_2() const noexcept;
 \end{itemdecl}
@@ -113,8 +115,8 @@
 	The value of the second control point.
 \end{itemdescr}
 
-\indexlibrary{\idxcode{path_factory::path_abs_cubic_curve}!\idxcode{end_point}}
-\indexlibrary{\idxcode{end_point}!\idxcode{path_factory::path_abs_cubic_curve}}
+\indexlibrary{\idxcode{abs_cubic_curve}!\idxcode{end_point}}
+\indexlibrary{\idxcode{end_point}!\idxcode{abs_cubic_curve}}
 \begin{itemdecl}
     vector_2d end_point() const noexcept;
 \end{itemdecl}

source/abs-line.tex

@@ -1,50 +1,52 @@
 %!TEX root = io2d.tex
-\rSec0 [pathfactory.pathabsline] {Class \tcode{path_factory::path_abs_line}}
+\rSec0 [absline] {Class \tcode{abs_line}}
 
 \pnum
-\indexlibrary{\idxcode{path_factory::path_abs_line}}
-The class \tcode{path_factory::path_abs_line} describes a path segment that is a line.
+\indexlibrary{\idxcode{abs_line}}
+The class \tcode{abs_line} describes a path segment that is a line.
 
 \pnum
 It has an end point of type \tcode{vector_2d}.
 
-\rSec1 [pathfactory.pathabsline.synopsis] {\tcode{path_factory::path_abs_line} synopsis}
+\rSec1 [absline.synopsis] {\tcode{abs_line} synopsis}
 
 \begin{codeblock}
 namespace std { namespace experimental { namespace io2d { inline namespace v1 {
-  class path_factory::path_abs_line {
-  public:
-    // \ref{pathfactory.pathabsline.cons}, construct:
-    explicit path_abs_line(const vector_2d& pt) noexcept;
+  namespace path_data {
+    class abs_line {
+    public:
+      // \ref{absline.cons}, construct:
+      explicit abs_line(const vector_2d& pt) noexcept;
 
-    // \ref{pathfactory.pathabsline.modifiers}, modifiers:
-    void to(const vector_2d& pt) noexcept;
+      // \ref{absline.modifiers}, modifiers:
+      void to(const vector_2d& pt) noexcept;
 
-    // \ref{pathfactory.pathabsline.observers}, observers:
-    vector_2d to() const noexcept;
+      // \ref{absline.observers}, observers:
+      vector_2d to() const noexcept;
+    };
   };
 } } } }
 \end{codeblock}
 
-\rSec1 [pathfactory.pathabsline.cons] {\tcode{path_factory::path_abs_line} constructors and assignment operators}
+\rSec1 [absline.cons] {\tcode{abs_line} constructors and assignment operators}
 
-\indexlibrary{\idxcode{path_factory::path_abs_line}!constructor}
+\indexlibrary{\idxcode{abs_line}!constructor}
 \begin{itemdecl}
-    explicit path_abs_line(const vector_2d& pt) noexcept;
+    explicit abs_line(const vector_2d& pt) noexcept;
 \end{itemdecl}
 \begin{itemdescr}
 	\pnum
 	\effects
-	Constructs an object of type \tcode{path_factory::path_abs_line}.
+	Constructs an object of type \tcode{abs_line}.
 
 	\pnum
 	The end point shall be set to the value of \tcode{pt}.
 \end{itemdescr}
 
-\rSec1 [pathfactory.pathabsline.modifiers]{\tcode{path_factory::path_abs_line} modifiers}
+\rSec1 [absline.modifiers]{\tcode{abs_line} modifiers}
 
-\indexlibrary{\idxcode{path_factory::path_abs_line}!\idxcode{to}}
-\indexlibrary{\idxcode{to}!\idxcode{path_factory::path_abs_line}}
+\indexlibrary{\idxcode{abs_line}!\idxcode{to}}
+\indexlibrary{\idxcode{to}!\idxcode{abs_line}}
 \begin{itemdecl}
     void to(const vector_2d& pt) noexcept;
 \end{itemdecl}
@@ -54,10 +56,10 @@
 	The end point shall be set to the value of \tcode{pt}.
 \end{itemdescr}
 
-\rSec1 [pathfactory.pathabsline.observers]{\tcode{path_factory::path_abs_line} observers}
+\rSec1 [absline.observers]{\tcode{abs_line} observers}
 
-\indexlibrary{\idxcode{path_factory::path_abs_line}!\idxcode{to}}
-\indexlibrary{\idxcode{to}!\idxcode{path_factory::path_abs_line}}
+\indexlibrary{\idxcode{abs_line}!\idxcode{to}}
+\indexlibrary{\idxcode{to}!\idxcode{abs_line}}
 \begin{itemdecl}
     vector_2d to() const noexcept;
 \end{itemdecl}

source/abs-move.tex

@@ -1,53 +1,55 @@
 %!TEX root = io2d.tex
-\rSec0 [pathfactory.pathabsmove] {Class \tcode{path_factory::path_abs_move}}
+\rSec0 [absmove] {Class \tcode{abs_move}}
 
 \pnum
-\indexlibrary{\idxcode{path_factory::path_abs_move}}
-The class \tcode{path_factory::path_abs_move} describes a path operation that creates a new path and makes the previous path, if any, an open path unless it was closed by \tcode{path_factory::path_close_path}.
+\indexlibrary{\idxcode{abs_move}}
+The class \tcode{abs_move} describes a path operation that creates a new path and makes the previous path, if any, an open path unless it was closed by \tcode{close_path}.
 
 \pnum
 It has an end point of type \tcode{vector_2d}.
 
 \pnum
 The end point is also the start point of the new path and its last-move-to point.
 
-\rSec1 [pathfactory.pathabsmove.synopsis] {\tcode{path_factory::path_abs_move} synopsis}
+\rSec1 [absmove.synopsis] {\tcode{abs_move} synopsis}
 
 \begin{codeblock}
 namespace std { namespace experimental { namespace io2d { inline namespace v1 {
-  class path_factory::path_abs_move {
-  public:
-    // \ref{pathfactory.pathabsmove.cons}, construct:
-    explicit move_to(const vector_2d& pt) noexcept;
+  namespace path_data {
+    class abs_move {
+    public:
+      // \ref{absmove.cons}, construct:
+      explicit abs_move(const vector_2d& pt) noexcept;
 
-    // \ref{pathfactory.pathabsmove.modifiers}, modifiers:
-    void to(const vector_2d& pt) noexcept;
+      // \ref{absmove.modifiers}, modifiers:
+      void to(const vector_2d& pt) noexcept;
 
-    // \ref{pathfactory.pathabsmove.observers}, observers:
-    vector_2d to() const noexcept;
+      // \ref{absmove.observers}, observers:
+      vector_2d to() const noexcept;
+    };
   };
 } } } }
 \end{codeblock}
 
-\rSec1 [pathfactory.pathabsmove.cons] {\tcode{path_factory::path_abs_move} constructors}
+\rSec1 [absmove.cons] {\tcode{abs_move} constructors}
 
-\indexlibrary{\idxcode{path_factory::path_abs_move}!constructor}
+\indexlibrary{\idxcode{abs_move}!constructor}
 \begin{itemdecl}
-    explicit path_abs_move(const vector_2d& pt) noexcept;
+    explicit abs_move(const vector_2d& pt) noexcept;
 \end{itemdecl}
 \begin{itemdescr}
 	\pnum
 	\effects
-	Constructs an object of type \tcode{path_factory::path_abs_move}.
+	Constructs an object of type \tcode{abs_move}.
 
 	\pnum
 	The end point shall be set to the value of \tcode{pt}.
 \end{itemdescr}
 
-\rSec1 [pathfactory.pathabsmove.modifiers]{\tcode{path_factory::path_abs_move} modifiers}
+\rSec1 [absmove.modifiers]{\tcode{abs_move} modifiers}
 
-\indexlibrary{\idxcode{path_factory::path_abs_move}!\idxcode{to}}
-\indexlibrary{\idxcode{to}!\idxcode{path_factory::path_abs_move}}
+\indexlibrary{\idxcode{abs_move}!\idxcode{to}}
+\indexlibrary{\idxcode{to}!\idxcode{abs_move}}
 \begin{itemdecl}
     void to(const vector_2d& pt) noexcept;
 \end{itemdecl}
@@ -57,10 +59,10 @@
 	The end point shall be set to the value of \tcode{pt}.
 \end{itemdescr}
 
-\rSec1 [pathfactory.pathabsmove.observers]{\tcode{path_factory::path_abs_move} observers}
+\rSec1 [absmove.observers]{\tcode{abs_move} observers}
 
-\indexlibrary{\idxcode{path_factory::path_move_to}!\idxcode{to}}
-\indexlibrary{\idxcode{to}!\idxcode{path_factory::path_move_to}}
+\indexlibrary{\idxcode{abs_move}!\idxcode{to}}
+\indexlibrary{\idxcode{to}!\idxcode{abs_move}}
 \begin{itemdecl}
     vector_2d to() const noexcept;
 \end{itemdecl}