*** empty log message ***

1 files changed, 0 insertions, 70 deletions

diff --git a/doc/refman.tex b/doc/refman.tex
index 8128ba0..442b276 100644
--- a/doc/refman.tex
+++ b/doc/refman.tex
@@ -756,7 +756,6 @@ resulting attribute value in the leaf items:
 \item\ident{-sensitive}: the sensitivity (to keyboards or mouse event) of an
   item is the result of and-ing together the \ident{-sensitive} attributes
   found when descending from the root group to a specific leaf item.
-  set at the group level,
 \item\ident{-visible}: the visibility of an item is the result of and-ing together
   the \ident{-visible} attributes found when descending from the root group to a
   specific leaf item.
@@ -2703,15 +2702,9 @@ Applicable attributes for \ident{tabular} are:
 \attribute{tabular}{anchor}{anchor}{The anchor used in positionning the item. The default
 value is {\tt nw}.}
 
-<<<<<<< refman.tex
-\attribute{tabular}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{tabular}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{tabular}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -2771,15 +2764,9 @@ value is {\tt nw}.}
 characters, the overstrike and underline lines. The default value is the current value of
 the widget option \optref{forecolor}.}
 
-<<<<<<< refman.tex
-\attribute{text}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{text}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{text}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -2845,15 +2832,9 @@ value is {\tt nw}.}
 \attribute{icon}{color}{gradient}{Specifies the fill color used for drawing the
 bitmap.  The default value is the current value of the widget option \optref{forecolor}.}
 
-<<<<<<< refman.tex
-\attribute{icon}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{icon}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{icon}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt false}.}
 
@@ -2905,15 +2886,9 @@ circles. The default value is the current value of the widget option \optref{for
 \attribute{reticle}{brightlinestyle}{linestyle}{This is the line style of the highlighted
 circles. The default value is {\tt simple}.}
 
-<<<<<<< refman.tex
-\attribute{reticle}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{reticle}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{reticle}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -2971,15 +2946,9 @@ Map items are used for XXX.
 map. The texts and symbols that are part of the map are also drawn in this color.  The
 default value is the current value of the widget option \optref{forecolor}.}
 
-<<<<<<< refman.tex
-\attribute{map}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{map}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{map}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -3032,15 +3001,9 @@ value is {\tt ""}.}
 
   Applicable attributes for \ident{rectangle} are:
 
-<<<<<<< refman.tex
-\attribute{rectangle}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{rectangle}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{rectangle}{composerotation}{boolean}{Specifies if the current rotation should
 be composed with the local transform. The default value is {\tt true}.}
 
@@ -3114,15 +3077,9 @@ value is {\tt true}.}
 closed. This is only pertinent if the arc extent is less than 360 degrees.  The default
 value is {\tt false}.}
 
-<<<<<<< refman.tex
-\attribute{arc}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{arc}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{arc}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -3216,15 +3173,9 @@ flat. The default value is {\tt round}.}
 \attribute{curve}{closed}{boolean}{Specifies if the curve outline should be drawn between
 the first and last vertex or not. The default value is {\tt true}.}
 
-<<<<<<< refman.tex
-\attribute{curve}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{curve}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{curve}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -3322,15 +3273,9 @@ Applicable attributes for \ident{bezier} are:
 attribute is only applicable if the bezier is not closed and the outline relief is
 flat. The default value is {\tt round}.}
 
-<<<<<<< refman.tex
-\attribute{bezier}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{bezier}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{bezier}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -3406,15 +3351,9 @@ XXX A relire et reprendre
 \attribute{triangles}{colors}{gradientlist}{Specifies the colors of each vertex of the
 triangles XXX.}
 
-<<<<<<< refman.tex
-\attribute{triangles}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{triangles}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{triangles}{composerotation}{boolean}{Specifies if the current rotation should
 be composed with the local transform. The default value is {\tt true}.}
 
@@ -3463,15 +3402,9 @@ Applicable attributes for \ident{window} items are:
 \attribute{window}{anchor}{anchor}{The anchor used in positionning the item.  The default
 value is {\tt nw}.}
 
-<<<<<<< refman.tex
-\attribute{window}{composealpha}{boolean}{Specifies if the alpha value inherited from
-the parent group must be composed with the alpha of this item. The default value is {\tt true}.}
-
-=======
 \attribute{window}{composealpha}{boolean}{Specifies if the alpha value inherited from
 the parent group should be composed with the alpha of this item. The default value is {\tt true}.}
 
->>>>>>> 1.29
 \attribute{window}{composerotation}{boolean}{Specifies if the current rotation should be
 composed with the local transform. The default value is {\tt true}.}
 
@@ -3843,14 +3776,11 @@ by any new user of Zinc: \attrtyperef{gradient} and \attrtyperef{labelformat}.}
   others popular formats are added including JPEG, XPM and PNG.
 \end{blockindent}
 
-<<<<<<< refman.tex
-=======
 \attrtype{priority}
 \begin{blockindent}
   A strictly positive integer value for the display priority.
 \end{blockindent}
 
->>>>>>> 1.29
 \attrtype{item}
 \begin{blockindent}
   Describes an item id or a tag. If a tag is provided an item will be searched for the tag