From c10fefe3a9cdbf1d9daac1bc6bf687362d59115d Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 11 Jun 2007 00:22:23 +0000 Subject: [PATCH] * added some documentation * updated version number git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1103 a5681a0c-68f1-0310-ab6d-d61299d08faa --- configure.ac | 2 +- doc/rrdgraph.pod | 42 +++++++++++++++++++++++++++++++++++++++--- src/Makefile.am | 4 ++-- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index db2f497..b27a3e7 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ dnl the released version are dnl a.bccc dnl the devel versions will be something like dnl a.b999yymmddhh -NUMVERS=1.299907052400 +NUMVERS=1.299907061100 AC_SUBST(NUMVERS) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE diff --git a/doc/rrdgraph.pod b/doc/rrdgraph.pod index c451f06..812b247 100644 --- a/doc/rrdgraph.pod +++ b/doc/rrdgraph.pod @@ -297,28 +297,41 @@ elements on the RRD graphs. C sets the default value for all elements, C for the title, C<AXIS> for the axis labels, C<UNIT> for the vertical unit label, C<LEGEND> for the graph legend. -Use Times for the title: C<--font TITLE:13:/usr/lib/fonts/times.ttf> +Use Times for the title: C<--font TITLE:13:Times> If you do not give a font string you can modify just the sice of the default font: C<--font TITLE:13:>. If you specify the size 0 then you can modify just the font without touching the size. This is especially usefull for altering the default font without -resetting the default fontsizes: C<--font DEFAULT:0:/usr/lib/fonts/times.ttf>. +resetting the default fontsizes: C<--font DEFAULT:0:Courier>. RRDtool comes with a preset default font. You can set the environment variable C<RRD_DEFAULT_FONT> if you want to change this. -Truetype fonts are only supported for PNG output. See below. +RRDtool uses Pango for its font handling. This means you can to use +the full Pango syntax when selecting your font: + +The font name has the form "[I<FAMILY-LIST>] [I<STYLE-OPTIONS>] [I<SIZE>]", +where I<FAMILY-LIST> is a comma separated list of families optionally +terminated by a comma, I<STYLE_OPTIONS> is a whitespace separated list of +words where each WORD describes one of style, variant, weight, stretch, or +gravity, and I<SIZE> is a decimal number (size in points) or optionally +followed by the unit modifier "px" for absolute size. Any one of the options +may be absent. [B<-R>|B<--font-render-mode> {I<normal>,I<light>,I<mono>}] +(this gets ignored in 1.3 for now!) + This lets you customize the strength of the font smoothing, or disable it entirely using I<mono>. By default, I<normal> font smoothing is used. [B<-B>|B<--font-smoothing-threshold> I<size>] +(this gets ignored in 1.3 for now!) + This specifies the largest font size which will be rendered bitmapped, that is, without any font smoothing. By default, no text is rendered bitmapped. @@ -339,6 +352,8 @@ Times-Bold, Times-BoldItalic, Times-Italic, Times-Roman, and ZapfDingbats. [B<-i>|B<--interlaced>] +(this gets ignored in 1.3 for now!) + If images are interlaced they become visible on browsers more quickly. [B<-g>|B<--no-legend>] @@ -384,6 +399,27 @@ You need at least one graph element to generate an image and/or at least one print statement to generate a report. See L<rrdgraph_graph> for the exact format. +=item Markup + +All text in rrdtool is rendered using Pango markup. This means text can contain embeded markup instructions. +Simple html markup using + + <span key="value">text</span> + +can be used. Apart from the verbose syntax, there are also the following short tags available. + + b Bold + big Makes font relatively larger, equivalent to <span size="larger"> + i Italic + s Strikethrough + sub Subscript + sup Superscript + small Makes font relatively smaller, equivalent to <span size="smaller"> + tt Monospace font + u Underline + +More details on http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html. + =back =head1 SEE ALSO diff --git a/src/Makefile.am b/src/Makefile.am index 77d9245..43f7ce4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,11 +101,11 @@ librrd_la_LIBADD = librrdupd.la $(ALL_LIBS) # your package will not be binary compatible with any other release. # # see http://www.gnu.org/software/libtool/manual.html#SEC32 for explanation -librrd_la_LDFLAGS = -version-info 2:11:0 +librrd_la_LDFLAGS = -version-info 2:99:0 librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS) -librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info 2:11:0 +librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info 2:99:0 librrd_th_la_LIBADD = $(ALL_LIBS) include_HEADERS = rrd.h -- 2.11.0