1- <!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.249 2010/06/29 00 :03:39 petere Exp $ -->
1+ <!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.250 2010/07/03 04 :03:06 tgl Exp $ -->
22
33 <chapter id="datatype">
44 <title>Data Types</title>
@@ -3061,7 +3061,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
30613061
30623062 <para>
30633063 A rich set of functions and operators is available to perform various geometric
3064- operations such as scaling, translation, rotation, and determining
3064+ operations such as scaling, translation, rotation, and determining
30653065 intersections. They are explained in <xref linkend="functions-geometry">.
30663066 </para>
30673067
@@ -3073,8 +3073,9 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
30733073 </indexterm>
30743074
30753075 <para>
3076- Points are the fundamental two-dimensional building block for geometric types.
3077- Values of type <type>point</type> are specified using the following syntax:
3076+ Points are the fundamental two-dimensional building block for geometric
3077+ types. Values of type <type>point</type> are specified using either of
3078+ the following syntaxes:
30783079
30793080<synopsis>
30803081( <replaceable>x</replaceable> , <replaceable>y</replaceable> )
@@ -3084,6 +3085,10 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
30843085 where <replaceable>x</> and <replaceable>y</> are the respective
30853086 coordinates, as floating-point numbers.
30863087 </para>
3088+
3089+ <para>
3090+ Points are output using the first syntax.
3091+ </para>
30873092 </sect2>
30883093
30893094 <sect2>
@@ -3099,11 +3104,13 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
30993104
31003105 <para>
31013106 Line segments (<type>lseg</type>) are represented by pairs of points.
3102- Values of type <type>lseg</type> are specified using the following syntax:
3107+ Values of type <type>lseg</type> are specified using any of the following
3108+ syntaxes:
31033109
31043110<synopsis>
3111+ [ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> ) ]
31053112( ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> ) )
3106- ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> )
3113+ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> )
31073114 <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , <replaceable>x2</replaceable> , <replaceable>y2</replaceable>
31083115</synopsis>
31093116
@@ -3113,6 +3120,10 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
31133120 <literal>(<replaceable>x2</replaceable>,<replaceable>y2</replaceable>)</literal>
31143121 are the end points of the line segment.
31153122 </para>
3123+
3124+ <para>
3125+ Line segments are output using the first syntax.
3126+ </para>
31163127 </sect2>
31173128
31183129 <sect2>
@@ -3129,11 +3140,12 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
31293140 <para>
31303141 Boxes are represented by pairs of points that are opposite
31313142 corners of the box.
3132- Values of type <type>box</type> are specified using the following syntax:
3143+ Values of type <type>box</type> are specified using any of the following
3144+ syntaxes:
31333145
31343146<synopsis>
31353147( ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> ) )
3136- ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> )
3148+ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ( <replaceable>x2</replaceable> , <replaceable>y2</replaceable> )
31373149 <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , <replaceable>x2</replaceable> , <replaceable>y2</replaceable>
31383150</synopsis>
31393151
@@ -3145,10 +3157,13 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
31453157 </para>
31463158
31473159 <para>
3148- Boxes are output using the first syntax.
3160+ Boxes are output using the second syntax.
3161+ </para>
3162+
3163+ <para>
31493164 Any two opposite corners can be supplied on input, but the values
31503165 will be reordered as needed to store the
3151- upper right and lower left corners.
3166+ upper right and lower left corners, in that order .
31523167 </para>
31533168 </sect2>
31543169
@@ -3168,20 +3183,22 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
31683183 </para>
31693184
31703185 <para>
3171- Values of type <type>path</type> are specified using the following syntax:
3186+ Values of type <type>path</type> are specified using any of the following
3187+ syntaxes:
31723188
31733189<synopsis>
3174- ( ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> ) )
31753190[ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> ) ]
3176- ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3177- ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3178- <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable>
3191+ ( ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> ) )
3192+ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3193+ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3194+ <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable>
31793195</synopsis>
31803196
31813197 where the points are the end points of the line segments
31823198 comprising the path. Square brackets (<literal>[]</>) indicate
31833199 an open path, while parentheses (<literal>()</>) indicate a
3184- closed path.
3200+ closed path. When the outermost parentheses are omitted, as
3201+ in the third through fifth syntaxes, a closed path is assumed.
31853202 </para>
31863203
31873204 <para>
@@ -3199,18 +3216,18 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
31993216 <para>
32003217 Polygons are represented by lists of points (the vertexes of the
32013218 polygon). Polygons are very similar to closed paths, but are
3202- stored differently
3203- and have their own set of support routines.
3219+ stored differently and have their own set of support routines.
32043220 </para>
32053221
32063222 <para>
3207- Values of type <type>polygon</type> are specified using the following syntax:
3223+ Values of type <type>polygon</type> are specified using any of the
3224+ following syntaxes:
32083225
32093226<synopsis>
32103227( ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> ) )
3211- ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3212- ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3213- <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable>
3228+ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> ) , ... , ( <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3229+ ( <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable> )
3230+ <replaceable>x1</replaceable> , <replaceable>y1</replaceable> , ... , <replaceable>xn</replaceable> , <replaceable>yn</replaceable>
32143231</synopsis>
32153232
32163233 where the points are the end points of the line segments
@@ -3231,18 +3248,20 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
32313248
32323249 <para>
32333250 Circles are represented by a center point and radius.
3234- Values of type <type>circle</type> are specified using the following syntax:
3251+ Values of type <type>circle</type> are specified using any of the
3252+ following syntaxes:
32353253
32363254<synopsis>
32373255< ( <replaceable>x</replaceable> , <replaceable>y</replaceable> ) , <replaceable>r</replaceable> >
32383256( ( <replaceable>x</replaceable> , <replaceable>y</replaceable> ) , <replaceable>r</replaceable> )
3239- ( <replaceable>x</replaceable> , <replaceable>y</replaceable> ) , <replaceable>r</replaceable>
3240- <replaceable>x</replaceable> , <replaceable>y</replaceable> , <replaceable>r</replaceable>
3257+ ( <replaceable>x</replaceable> , <replaceable>y</replaceable> ) , <replaceable>r</replaceable>
3258+ <replaceable>x</replaceable> , <replaceable>y</replaceable> , <replaceable>r</replaceable>
32413259</synopsis>
32423260
32433261 where
3244- <literal>(<replaceable>x</replaceable>,<replaceable>y</replaceable>)</literal>
3245- is the center point and <replaceable>r</replaceable> is the radius of the circle.
3262+ <literal>(<replaceable>x</replaceable>,<replaceable>y</replaceable>)</>
3263+ is the center point and <replaceable>r</replaceable> is the radius of the
3264+ circle.
32463265 </para>
32473266
32483267 <para>
0 commit comments