Update xdot output to support strike-through text

diff --git a/doc/info/output.html b/doc/info/output.html
index 93045d729e9c0e0096ed2c6120df49d1b5a86a6b..3f3e8103577f5eb4e1f78c48f4b23738130b07e9 100644 (file)
--- a/doc/info/output.html
+++ b/doc/info/output.html
@@ -183,7 +183,7 @@ n bytes following '-'. The text should be left-aligned (centered,
 right-aligned) on the point if j is -1 (0, 1), respectively. The value
 w gives the width of the text as computed by the library.
 <TR><TD>t f
-<TD>Set font characteristics. The integer f is the OR of BOLD=1, ITALIC=2, UNDERLINE=4, SUPERSCRIPT=8 and SUBSCRIPT=16.
+<TD>Set font characteristics. The integer f is the OR of BOLD=1, ITALIC=2, UNDERLINE=4, SUPERSCRIPT=8, SUBSCRIPT=16, and STRIKE-THROUGH=32.
 <TR><TD>C n -<I>b<sub>1</sub>b<sub>2</sub>...b<sub>n</sub></I>
 <TD>Set fill color. The color value consists of the
 n bytes following '-'. (1.1)
@@ -259,6 +259,7 @@ Version info:
 <TR><TD>1.3</TD><TD>2.31</TD><TD>Add numerical precision</TD</TR>
 <TR><TD>1.4</TD><TD>2.32</TD><TD>Add gradient colors</TD</TR>
 <TR><TD>1.5</TD><TD>2.34</TD><TD>Fix text layout problem; fix inverted vector in gradient; support version-specific output; new <B>t</B> op for text characteristics</TD</TR>
+<TR><TD>1.6</TD><TD>2.35</TD><TD>Add STRIKE-THROUGH bit for <tt>t</tt></TD</TR>
 </TABLE>
 
 <DT><A NAME=d:cmap HREF=#a:cmap><STRONG>cmap</STRONG></A>

diff --git a/doc/infosrc/outputs b/doc/infosrc/outputs
index 8e0b947ee197c3024dc6034a795ebd583c0ee510..7f2e8a1fc1d8fce7b7e9e018e0d22164526b7195 100644 (file)
--- a/doc/infosrc/outputs
+++ b/doc/infosrc/outputs
@@ -233,7 +233,7 @@ n bytes following '-'. The text should be left-aligned (centered,
 right-aligned) on the point if j is -1 (0, 1), respectively. The value
 w gives the width of the text as computed by the library.
 <TR><TD>t f
-<TD>Set font characteristics. The integer f is the OR of BOLD=1, ITALIC=2, UNDERLINE=4, SUPERSCRIPT=8 and SUBSCRIPT=16.
+<TD>Set font characteristics. The integer f is the OR of BOLD=1, ITALIC=2, UNDERLINE=4, SUPERSCRIPT=8, SUBSCRIPT=16, and STRIKE-THROUGH=32.
 <TR><TD>C n -<I>b<sub>1</sub>b<sub>2</sub>...b<sub>n</sub></I>
 <TD>Set fill color. The color value consists of the
 n bytes following '-'. (1.1)
@@ -309,6 +309,7 @@ Version info:
 <TR><TD>1.3</TD><TD>2.31</TD><TD>Add numerical precision</TD</TR>
 <TR><TD>1.4</TD><TD>2.32</TD><TD>Add gradient colors</TD</TR>
 <TR><TD>1.5</TD><TD>2.34</TD><TD>Fix text layout problem; fix inverted vector in gradient; support version-specific output; new <B>t</B> op for text characteristics</TD</TR>
+<TR><TD>1.6</TD><TD>2.35</TD><TD>Add STRIKE-THROUGH bit for <tt>t</tt></TD</TR>
 </TABLE>
 :plain/plain-ext:Simple text format
 The plain and plain-ext formats produce output using

diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
index 25578cd4d9f88a1878e92487b5dbaf693094c087..9999d5611bd099e8438b7742e753d2d0b4dca833 100644 (file)
--- a/plugin/core/gvrender_core_dot.c
+++ b/plugin/core/gvrender_core_dot.c
@@ -58,7 +58,7 @@ typedef enum {
 //    #pragma comment( lib, "ingraphs.lib" )
 #endif
 
-#define XDOTVERSION "1.5"
+#define XDOTVERSION "1.6"
 
 #define NUMXBUFS (EMIT_HLABEL+1)
 /* There are as many xbufs as there are values of emit_state_t.
@@ -651,8 +651,11 @@ static void xdot_textpara(GVJ_t * job, pointf p, textpara_t * para)
        flags = para->font->flags;
     else
        flags = 0;
-    if (xd->version >= 15) sprintf (buf, "t %d ", flags);
-    agxbput(xbufs[emit_state], buf);
+    if (xd->version >= 15) {
+       unsigned int mask = (xd->version >= 16?0x3F:0x1F);
+       sprintf (buf, "t %d ", flags & mask);
+       agxbput(xbufs[emit_state], buf);
+    }
 
     p.y += para->yoffset_centerline;
     agxbput(xbufs[emit_state], "T ");