Address bug report 1799

diff --git a/doc/info/attrs.html b/doc/info/attrs.html
index b68e4f190d19827e2f83376dde58e4f96879bd94..a498e06c9bfddfc5a8ff5a439c0c0c66a02f7bf9 100644 (file)
--- a/doc/info/attrs.html
+++ b/doc/info/attrs.html
@@ -240,9 +240,7 @@ This field indicates which graph component uses the attribute.
  <TR><TD><A NAME=a:labeljust HREF=#d:labeljust>labeljust</A>
 </TD><TD>GC</TD><TD>string</TD><TD ALIGN="CENTER">"c"</TD><TD></TD><TD></TD> </TR>
  <TR><TD><A NAME=a:labelloc HREF=#d:labelloc>labelloc</A>
-</TD><TD>GC</TD><TD>string</TD><TD ALIGN="CENTER">"t"(clusters)<BR>"b"(root graphs)</TD><TD></TD><TD></TD> </TR>
- <TR><TD><A NAME=aa:labelloc HREF=#dd:labelloc>labelloc</A>
-</TD><TD>N</TD><TD>string</TD><TD ALIGN="CENTER">"c"(clusters)</TD><TD></TD><TD></TD> </TR>
+</TD><TD>NGC</TD><TD>string</TD><TD ALIGN="CENTER">"t"(clusters)<BR>"b"(root graphs)<BR>"c"(nodes)</TD><TD></TD><TD></TD> </TR>
  <TR><TD><A NAME=a:labeltarget HREF=#d:labeltarget>labeltarget</A>
 </TD><TD>E</TD><TD><A HREF=#k:escString>escString</A>
 </TD><TD ALIGN="CENTER">&#60;none&#62;</TD><TD></TD><TD>svg, map only</TD> </TR>
@@ -959,20 +957,21 @@ This field indicates which graph component uses the attribute.
   this value.
 
 <DT><A NAME=d:labelloc HREF=#a:labelloc><STRONG>labelloc</STRONG></A>
-<DD>  Top/bottom placement of graph and cluster labels.
-  If the attribute is "t", place label at the top;
-  if the attribute is "b", place label at the bottom.
+<DD>  Vertical placement of labels for nodes, root graphs and clusters.
+  <P>
+  For graphs and clusters, only "t" and "b" are allowed, corresponding
+  to placement at the top and bottom, respectively.
   By default, root
   graph labels go on the bottom and cluster labels go on the top.
   Note that a subgraph inherits attributes from its parent. Thus, if
   the root graph sets <B>labelloc</B> to "b", the subgraph inherits
   this value.
-
-<DT><A NAME=dd:labelloc HREF=#aa:labelloc><STRONG>labelloc</STRONG></A>
-<DD>  Vertical placement of node label. By default, if the height of a node
-  is larger than the height of its label, the label is vertically centered.
+  <P>
+  For nodes, this attribute is used only when the height of the node
+  is larger than the height of its label. 
   If <TT>labelloc</TT> is set to "t", "c", or "b", the label is aligned
   with the top, centered, or aligned with the bottom of the node, respectively.
+  In the default case, the label is vertically centered.
 
 <DT><A NAME=d:labeltarget HREF=#a:labeltarget><STRONG>labeltarget</STRONG></A>
 <DD>  If the edge has a <A HREF=#d:URL>URL</A> or <A HREF=#d:labelURL>labelURL</A>

diff --git a/doc/infosrc/attrs b/doc/infosrc/attrs
index 901d25be23483a9df01be2ca46e8c0d476acd395..77135e55e9a9af77a4fe0977bf42bc061c38ed11 100644 (file)
--- a/doc/infosrc/attrs
+++ b/doc/infosrc/attrs
@@ -475,20 +475,22 @@ else the label is centered.
 Note that a subgraph inherits attributes from its parent. Thus, if
 the root graph sets <B>labeljust</B> to "l", the subgraph inherits
 this value.
-:labelloc:GC:string:"t"(clusters)/"b"(root graphs);
-Top/bottom placement of graph and cluster labels.
-If the attribute is "t", place label at the top;
-if the attribute is "b", place label at the bottom.
+:labelloc:NGC:string:"t"(clusters)/"b"(root graphs)/"c"(nodes);
+Vertical placement of labels for nodes, root graphs and clusters.
+<P>
+For graphs and clusters, only "t" and "b" are allowed, corresponding
+to placement at the top and bottom, respectively.
 By default, root
 graph labels go on the bottom and cluster labels go on the top.
 Note that a subgraph inherits attributes from its parent. Thus, if
 the root graph sets <B>labelloc</B> to "b", the subgraph inherits
 this value.
-:labelloc:N:string:"c"(clusters);
-Vertical placement of node label. By default, if the height of a node
-is larger than the height of its label, the label is vertically centered.
+<P>
+For nodes, this attribute is used only when the height of the node
+is larger than the height of its label. 
 If <TT>labelloc</TT> is set to "t", "c", or "b", the label is aligned
 with the top, centered, or aligned with the bottom of the node, respectively.
+In the default case, the label is vertically centered.
 :labeltarget:E:escString:<none>;   map,svg
 If the edge has a <A HREF=#d:URL>URL</A> or <A HREF=#d:labelURL>labelURL</A>
 attribute, this attribute determines which window of the