Major documentation updates. The original Freestyle API reference

(http://freestyle.sourceforge.net/doc/html/index.html) has been
incorporated into the Blender/Freestyle Python API implementation
in the form of Sphinx-based embedded docstrings.  Some C++-specific
descriptions of classes and functions were revised so that they are
suitable for Python programmers.  Missing docstrings were filled,
and sparse descriptions were extended.  By means of the new
documentation system for Blender, an up-to-date Freestyle Python
API reference will be part of the Blender 2.5 documentation.

9 files changed, 249 insertions, 132 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
index 40dae69fd8a..b5a16c3c238 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
@@ -6,8 +6,26 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for ContourUP1D instance  -----------*/
-static int ContourUP1D___init__(BPy_ContourUP1D* self, PyObject *args);
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char ContourUP1D___doc__[] =
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the Interface1D is a contour.  An Interface1D is a\n"
+"   contour if it is borded by a different shape on each of its sides.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if the Interface1D is a contour, false otherwise.\n"
+"   :rtype: bool\n";
+
+static int ContourUP1D___init__( BPy_ContourUP1D* self, PyObject *args )
+{
+	if(!( PyArg_ParseTuple(args, "") ))
+		return -1;
+	self->py_up1D.up1D = new Predicates1D::ContourUP1D();
+	return 0;
+}
 
 /*-----------------------BPy_ContourUP1D type definition ------------------------------*/
 
@@ -32,7 +50,7 @@ PyTypeObject ContourUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"ContourUP1D objects",            /* tp_doc */
+	ContourUP1D___doc__,            /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,16 +70,6 @@ PyTypeObject ContourUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int ContourUP1D___init__( BPy_ContourUP1D* self, PyObject *args )
-{
-	if(!( PyArg_ParseTuple(args, "") ))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::ContourUP1D();
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
index 3e4b9924258..97bd6409bf2 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
@@ -8,8 +8,40 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for DensityLowerThanUP1D instance  -----------*/
-static int DensityLowerThanUP1D___init__(BPy_DensityLowerThanUP1D* self, PyObject *args);
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char DensityLowerThanUP1D___doc__[] =
+".. method:: __init__(threshold, sigma=2.0)\n"
+"\n"
+"   Builds a DensityLowerThanUP1D object.\n"
+"\n"
+"   :arg threshold: The value of the threshold density.  Any Interface1D\n"
+"      having a density lower than this threshold will match.\n"
+"   :type threshold: float\n"
+"   :arg sigma: The sigma value defining the density evaluation window\n"
+"      size used in the :class:`DensityF0D` functor.\n"
+"   :type sigma: float\n"
+"\n"
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the density evaluated for the Interface1D is less\n"
+"   than a user-defined density value.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if the density is lower than a threshold.\n"
+"   :rtype: bool\n";
+
+static int DensityLowerThanUP1D___init__( BPy_DensityLowerThanUP1D* self, PyObject *args )
+{
+	double d1, d2 = 2.0;
+
+	if( !PyArg_ParseTuple(args, "d|d", &d1, &d2) )
+		return -1;
+	
+	self->py_up1D.up1D = new Predicates1D::DensityLowerThanUP1D(d1,d2);
+	return 0;
+}
 
 /*-----------------------BPy_DensityLowerThanUP1D type definition ------------------------------*/
 
@@ -34,7 +66,7 @@ PyTypeObject DensityLowerThanUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"DensityLowerThanUP1D objects", /* tp_doc */
+	DensityLowerThanUP1D___doc__,   /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -54,19 +86,6 @@ PyTypeObject DensityLowerThanUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int DensityLowerThanUP1D___init__( BPy_DensityLowerThanUP1D* self, PyObject *args )
-{
-	double d1, d2 = 2.0;
-
-	if( !PyArg_ParseTuple(args, "d|d", &d1, &d2) )
-		return -1;
-	
-	self->py_up1D.up1D = new Predicates1D::DensityLowerThanUP1D(d1,d2);
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
index d8db3e2ed0f..3a5c66aef59 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
@@ -6,8 +6,36 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for EqualToChainingTimeStampUP1D instance  -----------*/
-static int EqualToChainingTimeStampUP1D___init__(BPy_EqualToChainingTimeStampUP1D* self, PyObject *args );
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char EqualToChainingTimeStampUP1D___doc__[] =
+".. method:: __init__(ts)\n"
+"\n"
+"   Builds a EqualToChainingTimeStampUP1D object.\n"
+"\n"
+"   :arg ts: A time stamp value.\n"
+"   :type ts: int\n"
+"\n"
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the Interface1D's time stamp is equal to a certain\n"
+"   user-defined value.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if the time stamp is equal to a user-defined value.\n"
+"   :rtype: bool\n";
+
+static int EqualToChainingTimeStampUP1D___init__( BPy_EqualToChainingTimeStampUP1D* self, PyObject *args )
+{
+	unsigned u;
+
+	if( !PyArg_ParseTuple(args, "I", &u) )
+		return -1;
+	
+	self->py_up1D.up1D = new Predicates1D::EqualToChainingTimeStampUP1D(u);
+	return 0;
+}
 
 /*-----------------------BPy_EqualToChainingTimeStampUP1D type definition ------------------------------*/
 
@@ -32,7 +60,7 @@ PyTypeObject EqualToChainingTimeStampUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"EqualToChainingTimeStampUP1D objects", /* tp_doc */
+	EqualToChainingTimeStampUP1D___doc__, /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,19 +80,6 @@ PyTypeObject EqualToChainingTimeStampUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int EqualToChainingTimeStampUP1D___init__( BPy_EqualToChainingTimeStampUP1D* self, PyObject *args )
-{
-	unsigned u;
-
-	if( !PyArg_ParseTuple(args, "I", &u) )
-		return -1;
-	
-	self->py_up1D.up1D = new Predicates1D::EqualToChainingTimeStampUP1D(u);
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
index d27bf47b57a..2427f6d0169 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
@@ -6,8 +6,36 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for EqualToTimeStampUP1D instance  -----------*/
-static int EqualToTimeStampUP1D___init__(BPy_EqualToTimeStampUP1D* self, PyObject *args );
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char EqualToTimeStampUP1D___doc__[] =
+".. method:: __init__(ts)\n"
+"\n"
+"   Builds a EqualToTimeStampUP1D object.\n"
+"\n"
+"   :arg ts: A time stamp value.\n"
+"   :type ts: int\n"
+"\n"
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the Interface1D's time stamp is equal to a certain\n"
+"   user-defined value.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if the time stamp is equal to a user-defined value.\n"
+"   :rtype: bool\n";
+
+static int EqualToTimeStampUP1D___init__( BPy_EqualToTimeStampUP1D* self, PyObject *args )
+{
+	unsigned u;
+
+	if( !PyArg_ParseTuple(args, "I", &u) )
+		return -1;
+	
+	self->py_up1D.up1D = new Predicates1D::EqualToTimeStampUP1D(u);
+	return 0;
+}
 
 /*-----------------------BPy_EqualToTimeStampUP1D type definition ------------------------------*/
 
@@ -32,7 +60,7 @@ PyTypeObject EqualToTimeStampUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"EqualToTimeStampUP1D objects", /* tp_doc */
+	EqualToTimeStampUP1D___doc__,   /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,19 +80,6 @@ PyTypeObject EqualToTimeStampUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int EqualToTimeStampUP1D___init__( BPy_EqualToTimeStampUP1D* self, PyObject *args )
-{
-	unsigned u;
-
-	if( !PyArg_ParseTuple(args, "I", &u) )
-		return -1;
-	
-	self->py_up1D.up1D = new Predicates1D::EqualToTimeStampUP1D(u);
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
index 09d6c5e3ae4..f94b6653c7e 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
@@ -6,8 +6,28 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for ExternalContourUP1D instance  -----------*/
-static int ExternalContourUP1D___init__(BPy_ExternalContourUP1D* self, PyObject *args);
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char ExternalContourUP1D___doc__[] =
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the Interface1D is an external contour.  An\n"
+"   Interface1D is an external contour if it is borded by no shape on\n"
+"   one of its sides.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if the Interface1D is an external contour, false\n"
+"      otherwise.\n"
+"   :rtype: bool\n";
+
+static int ExternalContourUP1D___init__( BPy_ExternalContourUP1D* self, PyObject *args )
+{
+	if(!( PyArg_ParseTuple(args, "") ))
+		return -1;
+	self->py_up1D.up1D = new Predicates1D::ExternalContourUP1D();
+	return 0;
+}
 
 /*-----------------------BPy_ExternalContourUP1D type definition ------------------------------*/
 
@@ -32,7 +52,7 @@ PyTypeObject ExternalContourUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"ExternalContourUP1D objects",  /* tp_doc */
+	ExternalContourUP1D___doc__,    /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,16 +72,6 @@ PyTypeObject ExternalContourUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int ExternalContourUP1D___init__( BPy_ExternalContourUP1D* self, PyObject *args )
-{
-	if(!( PyArg_ParseTuple(args, "") ))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::ExternalContourUP1D();
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
index ada7eabe834..fa8b145f83a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
@@ -6,8 +6,25 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for FalseUP1D instance  -----------*/
-static int FalseUP1D___init__(BPy_FalseUP1D* self, PyObject *args);
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char FalseUP1D___doc__[] =
+".. method:: __call__(inter)\n"
+"\n"
+"   Always returns false.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: False.\n"
+"   :rtype: bool\n";
+
+static int FalseUP1D___init__( BPy_FalseUP1D* self, PyObject *args )
+{
+	if(!( PyArg_ParseTuple(args, "") ))
+		return -1;
+	self->py_up1D.up1D = new Predicates1D::FalseUP1D();
+	return 0;
+}
 
 /*-----------------------BPy_FalseUP1D type definition ------------------------------*/
 
@@ -32,7 +49,7 @@ PyTypeObject FalseUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"FalseUP1D objects",            /* tp_doc */
+	FalseUP1D___doc__,              /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,16 +69,6 @@ PyTypeObject FalseUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int FalseUP1D___init__( BPy_FalseUP1D* self, PyObject *args )
-{
-	if(!( PyArg_ParseTuple(args, "") ))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::FalseUP1D();
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
index b297be28d70..ebc27787776 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
@@ -6,8 +6,39 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for QuantitativeInvisibilityUP1D instance  -----------*/
-static int QuantitativeInvisibilityUP1D___init__(BPy_QuantitativeInvisibilityUP1D* self, PyObject *args );
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char QuantitativeInvisibilityUP1D___doc__[] =
+".. method:: __init__(qi=0)\n"
+"\n"
+"   Builds a QuantitativeInvisibilityUP1D object.\n"
+"\n"
+"   :arg qi: The Quantitative Invisibility you want the Interface1D to\n"
+"      have.\n"
+"   :type qi: int\n"
+"\n"
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the Quantitative Invisibility evaluated at an\n"
+"   Interface1D, using the :class:`QuantitativeInvisibilityF1D`\n"
+"   functor, equals a certain user-defined value.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if Quantitative Invisibility equals a user-defined\n"
+"      value.\n"
+"   :rtype: bool\n";
+
+static int QuantitativeInvisibilityUP1D___init__( BPy_QuantitativeInvisibilityUP1D* self, PyObject *args )
+{
+	int i = 0;
+
+	if( !PyArg_ParseTuple(args, "|i", &i) )
+		return -1;
+	
+	self->py_up1D.up1D = new Predicates1D::QuantitativeInvisibilityUP1D(i);
+	return 0;
+}
 
 /*-----------------------BPy_QuantitativeInvisibilityUP1D type definition ------------------------------*/
 
@@ -32,7 +63,7 @@ PyTypeObject QuantitativeInvisibilityUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"QuantitativeInvisibilityUP1D objects", /* tp_doc */
+	QuantitativeInvisibilityUP1D___doc__, /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,19 +83,6 @@ PyTypeObject QuantitativeInvisibilityUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int QuantitativeInvisibilityUP1D___init__( BPy_QuantitativeInvisibilityUP1D* self, PyObject *args )
-{
-	int i = 0;
-
-	if( !PyArg_ParseTuple(args, "|i", &i) )
-		return -1;
-	
-	self->py_up1D.up1D = new Predicates1D::QuantitativeInvisibilityUP1D(i);
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
index 1726bd80ae1..50a1de751fb 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
@@ -6,8 +6,39 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for ShapeUP1D instance  -----------*/
-static int ShapeUP1D___init__(BPy_ShapeUP1D* self, PyObject *args );
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char ShapeUP1D___doc__[] =
+".. method:: __init__(idFirst, idSecond=0)\n"
+"\n"
+"   Builds a ShapeUP1D object.\n"
+"\n"
+"   :arg idFirst: The first Id component.\n"
+"   :type idFirst: int\n"
+"   :arg idSecond: The second Id component.\n"
+"   :type idSecond: int\n"
+"\n"
+".. method:: __call__(inter)\n"
+"\n"
+"   Returns true if the shape to which the Interface1D belongs to has\n"
+"   the same :class:`Id` as the one specified by the user.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True if Interface1D belongs to the shape of the\n"
+"      user-specified Id.\n"
+"   :rtype: bool\n";
+
+static int ShapeUP1D___init__( BPy_ShapeUP1D* self, PyObject *args )
+{
+	unsigned u1, u2 = 0;
+
+	if( !PyArg_ParseTuple(args, "I|I", &u1, &u2) )
+		return -1;
+
+	self->py_up1D.up1D = new Predicates1D::ShapeUP1D(u1,u2);
+	return 0;
+}
 
 /*-----------------------BPy_ShapeUP1D type definition ------------------------------*/
 
@@ -32,7 +63,7 @@ PyTypeObject ShapeUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"ShapeUP1D objects",            /* tp_doc */
+	ShapeUP1D___doc__,              /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,19 +83,6 @@ PyTypeObject ShapeUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int ShapeUP1D___init__( BPy_ShapeUP1D* self, PyObject *args )
-{
-	unsigned u1, u2 = 0;
-
-	if( !PyArg_ParseTuple(args, "I|I", &u1, &u2) )
-		return -1;
-
-	self->py_up1D.up1D = new Predicates1D::ShapeUP1D(u1,u2);
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
index ea7b8d934be..320b1eb1c31 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
@@ -6,8 +6,25 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for TrueUP1D instance  -----------*/
-static int TrueUP1D___init__(BPy_TrueUP1D* self, PyObject *args);
+//------------------------INSTANCE METHODS ----------------------------------
+
+static char TrueUP1D___doc__[] =
+".. method:: __call__(inter)\n"
+"\n"
+"   Always returns true.\n"
+"\n"
+"   :arg inter: An Interface1D object.\n"
+"   :type inter: :class:`Interface1D`\n"
+"   :return: True.\n"
+"   :rtype: bool\n";
+
+static int TrueUP1D___init__( BPy_TrueUP1D* self, PyObject *args )
+{
+	if(!( PyArg_ParseTuple(args, "") ))
+		return -1;
+	self->py_up1D.up1D = new Predicates1D::TrueUP1D();
+	return 0;
+}
 
 /*-----------------------BPy_TrueUP1D type definition ------------------------------*/
 
@@ -32,7 +49,7 @@ PyTypeObject TrueUP1D_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	"TrueUP1D objects",             /* tp_doc */
+	TrueUP1D___doc__,               /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
@@ -52,16 +69,6 @@ PyTypeObject TrueUP1D_Type = {
 	0,                              /* tp_new */
 };
 
-//------------------------INSTANCE METHODS ----------------------------------
-
-int TrueUP1D___init__( BPy_TrueUP1D* self, PyObject *args )
-{
-	if(!( PyArg_ParseTuple(args, "") ))
-		return -1;
-	self->py_up1D.up1D = new Predicates1D::TrueUP1D();
-	return 0;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus