[mapserver-commits] r12047 - branches/branch-6-0/docs/en/mapfile trunk/docs/en/mapfile

[svn at osgeo.org]

Author: havatv
Date: 2011-08-12 05:08:25 -0700 (Fri, 12 Aug 2011)
New Revision: 12047

Modified:
   branches/branch-6-0/docs/en/mapfile/label.txt
   trunk/docs/en/mapfile/label.txt
Log:
Included references to symbolscaledenom in the label document (#3061).  Also changed integer to number in label-size.

Modified: branches/branch-6-0/docs/en/mapfile/label.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/label.txt	2011-08-11 22:19:29 UTC (rev 12046)
+++ branches/branch-6-0/docs/en/mapfile/label.txt	2011-08-12 12:08:25 UTC (rev 12047)
@@ -133,7 +133,8 @@
 MAXSIZE [double]
     Maximum font size to use when scaling text (pixels). Default is 256.
     Starting from version 5.4, the value can also be a fractional value 
-    (and not only integer).     
+    (and not only integer).
+    See :ref:`LAYER` :ref:`SYMBOLSCALEDENOM <symbolscaledenom>`.   
 
 MINDISTANCE [integer]
     Minimum distance between duplicate labels. Given in pixels.
@@ -149,12 +150,14 @@
     Minimum font size to use when scaling text (pixels). Default is 4.
     Starting from version 5.4, the value can also be a fractional value 
     (and not only integer).     
+    See :ref:`LAYER` :ref:`SYMBOLSCALEDENOM <symbolscaledenom>`.   
 
 OFFSET [x][y]
     Offset values for labels, relative to the lower left hand corner of the 
     label and the label point. Given in pixels. In the case of rotated text 
     specify the values as if all labels are horizontal and any rotation will 
     be compensated for.
+    See :ref:`LAYER` :ref:`SYMBOLSCALEDENOM <symbolscaledenom>`.
 
 .. _OUTLINECOLOR:
 
@@ -241,8 +244,15 @@
 
 
 SIZE [double]|[tiny|small|medium|large|giant]|[attribute]
-    - Text size. Use "integer" to give the size in pixels of your TrueType font 
-      based label, or any of the other 5 listed keywords to bitmap fonts.
+    - Text size. Use a number to give the size in pixels of your
+      TrueType font based label, or any of the other 5 listed keywords
+      for bitmap fonts.
+
+      When scaling is in effect (:ref:`SYMBOLSCALEDENOM
+      <symbolscaledenom>` is specified for the :ref:`LAYER`), `SIZE`
+      gives the size of the font to be used at the map scale
+      1:`SYMBOLSCALEDENOM`.
+
     - Starting from version 5.4, the value can also be a fractional value (and not
       only integer).       
     - [*Attribute*] was introduced in version 5.0, to specify the item name in

Modified: trunk/docs/en/mapfile/label.txt
===================================================================
--- trunk/docs/en/mapfile/label.txt	2011-08-11 22:19:29 UTC (rev 12046)
+++ trunk/docs/en/mapfile/label.txt	2011-08-12 12:08:25 UTC (rev 12047)
@@ -133,7 +133,8 @@
 MAXSIZE [double]
     Maximum font size to use when scaling text (pixels). Default is 256.
     Starting from version 5.4, the value can also be a fractional value 
-    (and not only integer).     
+    (and not only integer).
+    See :ref:`LAYER` :ref:`SYMBOLSCALEDENOM <symbolscaledenom>`.   
 
 MINDISTANCE [integer]
     Minimum distance between duplicate labels. Given in pixels.
@@ -149,12 +150,14 @@
     Minimum font size to use when scaling text (pixels). Default is 4.
     Starting from version 5.4, the value can also be a fractional value 
     (and not only integer).     
+    See :ref:`LAYER` :ref:`SYMBOLSCALEDENOM <symbolscaledenom>`.   
 
 OFFSET [x][y]
     Offset values for labels, relative to the lower left hand corner of the 
     label and the label point. Given in pixels. In the case of rotated text 
     specify the values as if all labels are horizontal and any rotation will 
     be compensated for.
+    See :ref:`LAYER` :ref:`SYMBOLSCALEDENOM <symbolscaledenom>`.
 
 .. _OUTLINECOLOR:
 
@@ -241,8 +244,15 @@
 
 
 SIZE [double]|[tiny|small|medium|large|giant]|[attribute]
-    - Text size. Use "integer" to give the size in pixels of your TrueType font 
-      based label, or any of the other 5 listed keywords to bitmap fonts.
+    - Text size. Use a number to give the size in pixels of your
+      TrueType font based label, or any of the other 5 listed keywords
+      for bitmap fonts.
+
+      When scaling is in effect (:ref:`SYMBOLSCALEDENOM
+      <symbolscaledenom>` is specified for the :ref:`LAYER`), `SIZE`
+      gives the size of the font to be used at the map scale
+      1:`SYMBOLSCALEDENOM`.
+
     - Starting from version 5.4, the value can also be a fractional value (and not
       only integer).       
     - [*Attribute*] was introduced in version 5.0, to specify the item name in