1 diff -Naur jpgraph-1.5.2.org/src/jpgraph_dir.php jpgraph-1.5.2/src/jpgraph_dir.php
2 --- jpgraph-1.5.2.org/src/jpgraph_dir.php 2010-03-30 23:47:09.000000000 +0200
3 +++ jpgraph-1.5.2/src/jpgraph_dir.php 2010-03-30 23:51:52.000000000 +0200
5 DEFINE("APACHE_CACHE_DIR","/jpgraph_cache/");
7 // Directory for TTF fonts. Must end with '/'
8 -DEFINE("TTF_DIR","/usr/share/fonts/truetype/msttcorefonts/");
9 +DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
11 -// Add Free liberation font as suggested by Alain Peyrat
12 -DEFINE("LIBERATION_DIR","/usr/share/fonts/truetype/ttf-liberation/");
13 +// Add Free liberation font
14 +DEFINE("LIBERATION_DIR","/usr/share/fonts/liberation/");
17 diff -Naur jpgraph-1.5.2.org/src/jpgraph.php jpgraph-1.5.2/src/jpgraph.php
18 --- jpgraph-1.5.2.org/src/jpgraph.php 2010-03-30 23:47:09.000000000 +0200
19 +++ jpgraph-1.5.2/src/jpgraph.php 2010-03-30 23:55:57.000000000 +0200
20 @@ -1095,13 +1095,13 @@
22 // Base file names for available fonts
23 $this->font_fam=array(
24 - FF_COURIER => TTF_DIR."Courier_New",
25 - FF_VERDANA => TTF_DIR."Verdana",
26 - FF_TIMES => TTF_DIR."Times",
27 - FF_HANDWRT => TTF_DIR."Handwriting",
28 - FF_COMIC => TTF_DIR."Comic",
29 - FF_ARIAL => TTF_DIR."Arial",
30 - FF_BOOK => TTF_DIR."Bookant",
31 + FF_COURIER => TTF_DIR."courier",
32 + FF_VERDANA => TTF_DIR."verdana",
33 + FF_TIMES => TTF_DIR."times",
34 + FF_HANDWRT => TTF_DIR."handwriting",
35 + FF_COMIC => TTF_DIR."comic",
36 + FF_ARIAL => TTF_DIR."arial",
37 + FF_BOOK => TTF_DIR."bookant",
38 FF_LIBERATION_SANS => LIBERATION_DIR."LiberationSans-Regular");
41 @@ -1114,11 +1114,11 @@
45 - case FS_BOLD: $f .= "_Bold";
46 + case FS_BOLD: $f .= "bd";
48 - case FS_ITALIC: $f .= "_Italic";
49 + case FS_ITALIC: $f .= "i";
51 - case FS_BOLDIT: $f .= "_Bold_Italic";
52 + case FS_BOLDIT: $f .= "bi";
55 JpGraphError::Raise("<b>JpGraph Error:</b> Unknown TTF Style.");