Add GTK+ 2.6 properties ellipsize, ellipsize-set, width-chars. Alphabetize

	* pygtk-gtkcellrenderertext.xml (Properties): Add GTK+ 2.6
	properties ellipsize, ellipsize-set, width-chars. Alphabetize entries.
	Fixes #167504 (Rafael Villar Burke)

2 files changed, 140 insertions, 92 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 86f8cc69..b6dde85f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-15  John Finlay  <finlay@moeraki.com>
+
+	* pygtk-gtkcellrenderertext.xml (Properties): Add GTK+ 2.6
+	properties ellipsize, ellipsize-set, width-chars. Alphabetize entries.
+	Fixes #167504 (Rafael Villar Burke)
+
 2005-02-03  John Finlay  <finlay@moeraki.com>
 
 	* pygtk-gtkcellrenderer.xml (stop_editing, "editing-started"):
diff --git a/docs/reference/pygtk-gtkcellrenderertext.xml b/docs/reference/pygtk-gtkcellrenderertext.xml
index d258c758..ff05378f 100644
--- a/docs/reference/pygtk-gtkcellrenderertext.xml
+++ b/docs/reference/pygtk-gtkcellrenderertext.xml
@@ -53,18 +53,6 @@ linkend="method-gtkcellrenderertext--set-fixed-height-from-font">set_fixed_heigh
 	  <colspec column="3" colwidth="3.5in"/>
 	  <tbody>
 
-	    <row valign="top">
-	      <entry>"text"</entry>
-	      <entry>Read/Write</entry>
-	<entry>Text to render</entry>
-	  </row>
-
-	<row valign="top">
-	  <entry>"markup"</entry>
-	  <entry>Read/Write</entry>
-	  <entry>Marked up text to render</entry>
-	</row>
-
 	<row valign="top">
 	  <entry>"attributes"</entry>
 	  <entry>Read/Write</entry>
@@ -75,224 +63,278 @@ renderer.</entry>
 	<row valign="top">
 	  <entry>"background"</entry>
 	  <entry>Write</entry>
-	  <entry>Background color as a string</entry>
+	  <entry>Background color as a string. Default:
+<literal>None</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"foreground"</entry>
-	  <entry>Write</entry>
-	  <entry>Foreground color as a string</entry>
+	  <entry>"background-gdk"</entry>
+	  <entry>Read/Write</entry>
+	  <entry>Background color as a gtk.gdk.Color</entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"background-gdk"</entry>
+	  <entry>"background-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Background color as a gtk.gdk.Color</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the background
+color. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"foreground-gdk"</entry>
+	  <entry>"editable"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Foreground color as a gtk.gdk.Color</entry>
+	  <entry>If <literal>TRUE</literal> the text can be modified by the
+user. GTK+ 2.4 and above. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"font"</entry>
+	  <entry>"editable-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font description as a string</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the text
+editability. GTK+ 2.4 and above. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"font-desc"</entry>
+          <entry>"ellipsize"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font description as a pango.FontDescription</entry>
+	  <entry>The preferred place to ellipsize the string, if the cell
+renderer does not have enough room to display the entire string, if at all.
+GTK+ 2.6 and above. Default: <literal>pango.ELLIPSIZE_NONE</literal></entry>
+	</row>
+
+	<row valign="top">
+	  <entry>"ellipsize-set"</entry>
+	  <entry>Read/Write</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the text
+editability. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
 	  <entry>"family"</entry>
 	  <entry>Read/Write</entry>
 	  <entry>Name of the font family, e.g. Sans, Helvetica, Times,
-Monospace</entry>
+Monospace. Default: <literal>None</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"style"</entry>
+	  <entry>"family-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font style</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the font
+family. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"variant"</entry>
+	  <entry>"font"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font variant</entry>
+	  <entry>Font description as a string. Default:
+<literal>None</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"weight"</entry>
+	  <entry>"font-desc"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font weight</entry>
+	  <entry>Font description as a <link
+linkend="class-pangofontdescription"><classname>pango.FontDescription</classname></link></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"stretch"</entry>
-	  <entry>Read/Write</entry>
-	  <entry>Font stretch</entry>
+	  <entry>"foreground"</entry>
+	  <entry>Write</entry>
+	  <entry>Foreground color as a string. Default:
+<literal>None</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"size"</entry>
+	  <entry>"foreground-gdk"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font size</entry>
+	  <entry>Foreground color as a <link
+linkend="class-gdkcolor"><classname>gtk.gdk.Color</classname></link></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"size-points"</entry>
+	  <entry>"foreground-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font size in points</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the foreground
+color. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"scale"</entry>
+	  <entry>"language"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Font scaling factor</entry>
+	  <entry>The language this text is in, as an ISO code. Pango can use
+this as a hint when rendering the text. If you don't understand this parameter,
+you probably don't need it. GTK+ 2.4 and above. Default:
+<literal>None</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"editable"</entry>
+	  <entry>"language-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> the text can be modified by the
-user</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the
+language used to render the text. GTK+ 2.4 and above. Default:
+<literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"strikethrough"</entry>
+	  <entry>"markup"</entry>
+	  <entry>Write</entry>
+	  <entry>Marked up text to render. Default:
+<literal>None</literal></entry>
+	</row>
+
+	<row valign="top">
+	  <entry>"rise"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> strike through the text</entry>
+	  <entry>Offset of text above the baseline (below the baseline if
+rise is negative). Default: 0</entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"underline"</entry>
+	  <entry>"rise-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Style of underline for this text</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the
+rise. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"rise"</entry>
+	  <entry>"scale"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>Offset of text above the baseline (below the baseline if
-rise is negative)</entry>
+	  <entry>Font scaling factor. Allowed values &gt;= 0.
+Default: 1</entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"language"</entry>
+	  <entry>"scale-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>The language this text is in, as an ISO code. Pango can use
-this as a hint when rendering the text. If you don't understand this parameter,
-you probably don't need it. GTK+ 2.4 and above.</entry>
+	  <entry>If <literal>TRUE</literal> this tag scales the font.
+Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
 	  <entry>"single-paragraph-mode"</entry>
 	  <entry>Read/Write</entry>
 	  <entry>If <literal>TRUE</literal>, keep all text in a single
-paragraph. GTK+ 2.4 and above.</entry>
+paragraph. GTK+ 2.4 and above. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"background-set"</entry>
+	  <entry>"size"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the background
-color</entry>
+	  <entry>Font size. Allowed values &gt;= 0. Default: 0</entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"foreground-set"</entry>
+	  <entry>"size-points"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the foreground
-color</entry>
+	  <entry>Font size in points. Allowed values &gt;= 0.
+Default: 0</entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"family-set"</entry>
+	  <entry>"size-set"</entry>
 	  <entry>Read/Write</entry>
 	  <entry>If <literal>TRUE</literal> this tag affects the font
-family</entry>
+size. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"style-set"</entry>
+	  <entry>"stretch"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the font
-style</entry>
+	  <entry>Font stretch. Default:
+<literal>pango.STRETCH_NORMAL</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"variant-set"</entry>
+	  <entry>"stretch-set"</entry>
 	  <entry>Read/Write</entry>
 	  <entry>If <literal>TRUE</literal> this tag affects the font
-variant</entry>
+stretch. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"weight-set"</entry>
+	  <entry>"strikethrough"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the font
-weight</entry>
+	  <entry>If <literal>TRUE</literal> strike through the text.
+Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"stretch-set"</entry>
+	  <entry>"strikethrough-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the font
-stretch</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the
+strikethrough. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"size-set"</entry>
+	  <entry>"style"</entry>
+	  <entry>Read/Write</entry>
+            <entry>Font style. Default:
+<literal>pango.STYLE_NORMAL</literal></entry>
+	</row>
+
+	<row valign="top">
+	  <entry>"style-set"</entry>
 	  <entry>Read/Write</entry>
 	  <entry>If <literal>TRUE</literal> this tag affects the font
-size</entry>
+style. Default: <literal>FALSE</literal></entry>
 	</row>
 
+        <row valign="top">
+          <entry>"text"</entry>
+          <entry>Read/Write</entry>
+            <entry>Text to render. Default: <literal>None</literal></entry>
+	  </row>
+
 	<row valign="top">
-	  <entry>"scale-set"</entry>
+	  <entry>"underline"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag scales the font</entry>
+	  <entry>Style of underline for this text.
+Default: <literal>pango.UNDERLINE_NONE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"editable-set"</entry>
+	  <entry>"underline-set"</entry>
 	  <entry>Read/Write</entry>
 	  <entry>If <literal>TRUE</literal> this tag affects the text
-editability</entry>
+underlining. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"strikethrough-set"</entry>
+	  <entry>"variant"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the
-strikethrough</entry>
+	  <entry>Font variant. Default:
+<literal>pango.VARIANT_NORMAL</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"underline-set"</entry>
+	  <entry>"variant-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the text
-underlining</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the font
+variant. Default: <literal>FALSE</literal></entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"rise-set"</entry>
+	  <entry>"weight"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the
-rise</entry>
+	  <entry>Font weight. Allowed values &gt;= 0. Default value:
+400</entry>
 	</row>
 
 	<row valign="top">
-	  <entry>"language-set"</entry>
+	  <entry>"weight-set"</entry>
 	  <entry>Read/Write</entry>
-	  <entry>If <literal>TRUE</literal> this tag affects the
-language used to render the text. GTK+ 2.4 and above.</entry>
+	  <entry>If <literal>TRUE</literal> this tag affects the font
+weight. Default: <literal>FALSE</literal></entry>
+	</row>
+
+	<row valign="top">
+	  <entry>"width-chars"</entry>
+	  <entry>Read/Write</entry>
+	  <entry>The desired width of the cell, in characters. If this
+property is set to -1, the width will be calculated automatically,
+otherwise the cell will request either 3 characters or the property
+value, whichever is greater. GTK+ 2.6 and above.
+Allowed values &gt;= -1. Default value: -1</entry>
 	</row>
 
 	</tbody>