DejaVuSansMono-Roman is a variant of VeraMono with lots of added unicode glyphes ...

check out http://dejavu.sourceforge.net

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@469 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/DejaVuSansMono-Roman.ttf b/program/src/DejaVuSansMono-Roman.ttf
new file mode 100644 (file)
index 0000000..691c8d6
Binary files /dev/null and b/program/src/DejaVuSansMono-Roman.ttf differ

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index 29e69241d07ebca75eb656abe8b5dfff0ec77871..6b5c808f3cec2a4e770e35fa6f8384f8d54d4aaf 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/src/Makefile.am
@@ -6,7 +6,7 @@
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
 DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
 fontsdir =  $(datadir)/rrdtool/fonts
-fonts_DATA = VeraMono.ttf
+fonts_DATA = DejaVuSansMono-Roman.ttf
 
 #INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
 #           $(PNG_INCLUDES) $(ZLIB_INCLUDES)

diff --git a/program/src/rrd_graph.c b/program/src/rrd_graph.c
index 630486eb37eec67440ef2929179b1fc2b590cee9..2745ae959edf949bd8d83920c29777aa8ead1d6e 100644 (file)
--- a/program/src/rrd_graph.c
+++ b/program/src/rrd_graph.c
@@ -30,7 +30,7 @@
 
 #ifndef RRD_DEFAULT_FONT
 /* there is special code later to pick Cour.ttf when running on windows */
-#define RRD_DEFAULT_FONT "VeraMono.ttf"
+#define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf"
 #endif
 
 text_prop_t text_prop[] = {   
@@ -2168,7 +2168,7 @@ graph_size_location(image_desc_t *im, int elements
                        im->text_prop[TEXT_PROP_AXIS].font,
                        im->text_prop[TEXT_PROP_AXIS].size,
                        im->tabwidth,
-                       "0", 0) * im->unitslength + im->text_prop[TEXT_PROP_AXIS].size * 2;
+                       "0", 0) * im->unitslength + Xspacing;
        }
     }