Commit 58841ba4 authored by John Ellson's avatar John Ellson

Merge branch 'master' of github.com:ellson/graphviz

parents a21d519f feee8a9f
......@@ -1079,6 +1079,13 @@ of the layout programs.
If a node's <A HREF=#d:shape>shape</A> is record, then the label can
have a <A HREF=shapes.html#record>special format</A>
which describes the record layout.
<P>
Note that a node's default label is "&#92;N", so the node's name or ID becomes
its label. Technically, a node's name can be an HTML string but this will not
mean that the node's label will be interpreted as an <a href="shapes.html#html">HTML-like label</a>. This is
because the node's actual label is an ordinary string, which will be replaced
by the raw bytes stored in the node's name.
To get an HTML-like label, the label attribute value itself must be an HTML string.
<DT><A NAME=d:labelURL HREF=#a:labelURL><STRONG>labelURL</STRONG></A>
<DD> If <B>labelURL</B> is defined, this is the link used for the label
......
......@@ -122,7 +122,7 @@ digits (<TT>[0-9]</TT>), not beginning with a digit;
<LI> a numeral [<tt>-</tt>]<sup>?</sup>(<tt>.</tt>[<tt>0</tt>-<tt>9</tt>]<sup>+</sup> | [<tt>0</tt>-<tt>9</tt>]<sup>+</sup>(<tt>.</tt>[<tt>0</tt>-<tt>9</tt>]<sup>*</sup>)<sup>?</sup> );
<LI> any double-quoted string (&quot;...&quot;) possibly containing escaped
quotes (\&quot;)<SUP>1</SUP>;
<LI> an <A NAME=html>HTML string</A> (&lt;...&gt;).
<LI> an HTML string (&lt;...&gt;).
</MENU>
An ID is just a string; the lack of quote characters in the first two
forms is just for simplicity. There is no semantic difference between
......@@ -134,6 +134,9 @@ characters are allowed.
In addition, the content must be legal XML, so that the special XML
escape sequences for &quot;, &amp;, &lt;, and &gt; may be necessary
in order to embed these characters in attribute values or raw text.
As an ID, an HTML string can be any legal XML string. However, if used
as a label attribute, it is interpreted specially and must follow the syntax
for <A HREF=shapes.html#html>HTML-like labels</A>.
<P>
Both quoted strings and HTML strings are scanned as a unit, so
any embedded comments will be treated as part of the strings.
......
......@@ -454,14 +454,12 @@ the markup for strike-through (<TT>&lt;S&gt;</TT>) requires versions later than
In addition, all of these markups are
currently only available via the cairo and svg renderers.
The horizontal and vertical rules </EM>(<TT>&lt;HR&gt;</TT> and <TT>&lt;VR&gt;</TT>)
<EM>are only available in versions
later than 8 July 2011.
</EM>
<EM>are only available in versions later than 8 July 2011. </EM>
<P>
<B>NOTE:</B><EM>For releases later than 9 September 2014, one can use <TT>shape=plain</TT> so that the size
<B>NOTE:</B><EM>For releases later than 9 September 2014, one can use </EM><TT>shape=plain</TT> <EM>so that the size
of the node is totally determined by the label. Otherwise, the node's margin, width and height values may cause the
node to be larger, so that edges are clipped away from the label. In effect, <TT>shape=plain</TT> is shorthand
for <TT>shape=none width=0 height=0 margin=0</TT>.
node to be larger, so that edges are clipped away from the label. In effect, </EM><TT>shape=plain</TT> <EM>is shorthand
for </EM> <TT>shape=none width=0 height=0 margin=0</TT>.
<P>
If the value of a label attribute
(<A HREF=attrs.html#d:label><TT>label</TT></A> for nodes, edges, clusters, and
......@@ -560,6 +558,11 @@ Note that, as in HTML, element and attribute names are case-insensitive.
<TD ALIGN=LEFT>|</TD>
<TD ALIGN=LEFT><B>&lt;U&gt;</B> <I>text</I> <B>&lt;/U&gt</B></TD>
</TR>
<TR>
<TD ALIGN=RIGHT></TD>
<TD ALIGN=LEFT>|</TD>
<TD ALIGN=LEFT><B>&lt;O&gt;</B> <I>text</I> <B>&lt;/O&gt</B></TD>
</TR>
<TR>
<TD ALIGN=RIGHT></TD>
<TD ALIGN=LEFT>|</TD>
......@@ -746,11 +749,17 @@ Attribute values must appear in double quotes.
&gt;
</PRE>
<P>
&lt;!-- Underlined text --&gt;
&lt;!-- Underline text --&gt;
<PRE>&lt;U
&lt;!-- No attributes --&gt;
&gt;
</PRE>
<P>
&lt;!-- Overline text --&gt;
<PRE>&lt;O
&lt;!-- No attributes --&gt;
&gt;
</PRE>
<P>
&lt;!-- Subscript text --&gt;
<PRE>&lt;SUB
......
......@@ -561,6 +561,13 @@ Text label attached to objects.
If a node's <A HREF=#d:shape>shape</A> is record, then the label can
have a <A HREF=shapes.html#record>special format</A>
which describes the record layout.
<P>
Note that a node's default label is "\&#92;N", so the node's name or ID becomes
its label. Technically, a node's name can be an HTML string but this will not
mean that the node's label will be interpreted as an <a href="shapes.html#html">HTML-like label</a>. This is
because the node's actual label is an ordinary string, which will be replaced
by the raw bytes stored in the node's name.
To get an HTML-like label, the label attribute value itself must be an HTML string.
:labelURL:E:escString:""; map,svg
If <B>labelURL</B> is defined, this is the link used for the label
of an edge. This value overrides any <A HREF=#d:URL>URL</A>
......
......@@ -11,9 +11,12 @@ the markup for strike-through (<TT>&lt;S&gt;</TT>) requires versions later than
In addition, all of these markups are
currently only available via the cairo and svg renderers.
The horizontal and vertical rules </EM>(<TT>&lt;HR&gt;</TT> and <TT>&lt;VR&gt;</TT>)
<EM>are only available in versions
later than 8 July 2011.
</EM>
<EM>are only available in versions later than 8 July 2011. </EM>
<P>
<B>NOTE:</B><EM>For releases later than 9 September 2014, one can use </EM><TT>shape=plain</TT> <EM>so that the size
of the node is totally determined by the label. Otherwise, the node's margin, width and height values may cause the
node to be larger, so that edges are clipped away from the label. In effect, </EM><TT>shape=plain</TT> <EM>is shorthand
for </EM> <TT>shape=none width=0 height=0 margin=0</TT>.
<P>
If the value of a label attribute
(<A HREF=attrs.html#d:label><TT>label</TT></A> for nodes, edges, clusters, and
......
......@@ -13,7 +13,7 @@ digits (<TT>[0-9]</TT>), not beginning with a digit;
<LI> a numeral [<tt>-</tt>]<sup>?</sup>(<tt>.</tt>[<tt>0</tt>-<tt>9</tt>]<sup>+</sup> | [<tt>0</tt>-<tt>9</tt>]<sup>+</sup>(<tt>.</tt>[<tt>0</tt>-<tt>9</tt>]<sup>*</sup>)<sup>?</sup> );
<LI> any double-quoted string (&quot;...&quot;) possibly containing escaped
quotes (\&quot;)<SUP>1</SUP>;
<LI> an <A NAME=html>HTML string</A> (&lt;...&gt;).
<LI> an HTML string (&lt;...&gt;).
</MENU>
An ID is just a string; the lack of quote characters in the first two
forms is just for simplicity. There is no semantic difference between
......@@ -25,6 +25,9 @@ characters are allowed.
In addition, the content must be legal XML, so that the special XML
escape sequences for &quot;, &amp;, &lt;, and &gt; may be necessary
in order to embed these characters in attribute values or raw text.
As an ID, an HTML string can be any legal XML string. However, if used
as a label attribute, it is interpreted specially and must follow the syntax
for <A HREF=shapes.html#html>HTML-like labels</A>.
<P>
Both quoted strings and HTML strings are scanned as a unit, so
any embedded comments will be treated as part of the strings.
......
......@@ -57,7 +57,9 @@ static void svg_bzptarray(GVJ_t * job, pointf * A, int n)
char c;
c = 'M'; /* first point */
#if EDGEALIGN
if (A[0].x <= A[n-1].x) {
#endif
for (i = 0; i < n; i++) {
gvprintf(job, "%c%g,%g", c, A[i].x, -A[i].y);
if (i == 0)
......@@ -65,6 +67,7 @@ static void svg_bzptarray(GVJ_t * job, pointf * A, int n)
else
c = ' '; /* remaining points */
}
#if EDGEALIGN
} else {
for (i = n-1; i >= 0; i--) {
gvprintf(job, "%c%g,%g", c, A[i].x, -A[i].y);
......@@ -74,6 +77,7 @@ static void svg_bzptarray(GVJ_t * job, pointf * A, int n)
c = ' '; /* remaining points */
}
}
#endif
}
static void svg_print_color(GVJ_t * job, gvcolor_t color)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment