From e0432b0fb590eb109aca208170db87247747a5c1 Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 20 Jan 2012 07:57:59 +0000 Subject: [PATCH] added a nop control for string formating, so that strings ending in /x are possible by entering \x\. fix for #331 git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.4@2262 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/doc/rrdgraph_graph.pod | 5 +++++ program/src/rrd_graph.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/program/doc/rrdgraph_graph.pod b/program/doc/rrdgraph_graph.pod index c740aad3..56a774a0 100644 --- a/program/doc/rrdgraph_graph.pod +++ b/program/doc/rrdgraph_graph.pod @@ -372,6 +372,11 @@ to go one line back like this: COMMENT:\u COMMENT:right\r +There is also a 'nop' control for situations where you want a string to +actually end in a backslash character sequence B<\.> + + COMMENT:OS\2\. + When using a proportional font in your graph, the tab characters or the sequence B<\t> will line-up legend elements. Note that the tabs inserted are relative to the start of the current legend diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c index 28a4e4fb..f40f16f7 100644 --- a/program/src/rrd_graph.c +++ b/program/src/rrd_graph.c @@ -1772,6 +1772,7 @@ int leg_place( prt_fctn != 'j' && prt_fctn != 'c' && prt_fctn != 'u' && + prt_fctn != '.' && prt_fctn != 's' && prt_fctn != '\0' && prt_fctn != 'g') { free(legspace); rrd_set_error @@ -1783,6 +1784,10 @@ int leg_place( if (prt_fctn == 'n') { prt_fctn = 'l'; } + /* \. is a null operation to allow strings ending in \x */ + if (prt_fctn == '.') { + prt_fctn = '\0'; + } /* remove exess space from the end of the legend for \g */ while (prt_fctn == 'g' && -- 2.30.2