Branch: Tag:

1997-03-11

1997-03-11 01:19:46 by Per Hedbor <ph@opera.com>

Fixar i modulerna för det nya modulsystemet

Rev: server/base_server/config/low_describers.pike:1.5
Rev: server/base_server/fonts.pike:1.3
Rev: server/base_server/mainconfig.pike:1.35
Rev: server/base_server/roxen.pike:1.44
Rev: server/base_server/roxenlib.pike:1.17
Rev: server/etc/include/module.h:1.6
Rev: server/modules/directories/fastdir.pike:1.6
Rev: server/modules/filesystems/userfs.pike:1.10
Rev: server/modules/filters/htaccess.pike:1.8
Rev: server/modules/filters/redirect.pike:1.6
Rev: server/modules/graphics/graphic_text.pike:1.38
Rev: server/modules/graphics/tablist.pike:1.3
Rev: server/modules/proxies/connect.pike:1.5
Rev: server/modules/proxies/gopher.pike:1.7
Rev: server/modules/proxies/proxy.pike:1.14
Rev: server/modules/proxies/wais.pike:1.6
Rev: server/modules/scripting/fcgi.pike:1.7
Rev: server/modules/tags/htmlparse.pike:1.23

1: - string cvs_version="$Id: graphic_text.pike,v 1.37 1997/03/01 13:03:14 per Exp $"; + string cvs_version="$Id: graphic_text.pike,v 1.38 1997/03/11 01:19:34 per Exp $";   #include <module.h>   inherit "module";   inherit "roxenlib";
119:    "The size of the image depends on the number of colors",    ({ 1,2,3,4,5,6,7,8,10,16,32,64,128,256 }));    -  defvar("default_size", 32, "Default font size", TYPE_INT_LIST, -  "The default size for the font. This is used for the 'base' size, " -  "and can be scaled up or down in the tags.", -  ({ 16, 32, 64 })); +     -  defvar("default_font", "urw_itc_avant_garde-demi-r", "Default font", -  TYPE_STRING_LIST, -  "The default font. The 'font dir' will be prepended to the path", -  list_fonts()); +  // compatibility variables... +  defvar("default_size", 32, 0, TYPE_INT,0,0,1); +  defvar("default_font", "urw_itc_avant_garde-demi-r",0,TYPE_STRING,0,0,1);   }      string query_location() { return query("location"); }
556:    // Nothing found in the cache. Generate a new image.       -  +  if(args->nfont) +  { +  int bold, italic; +  if(args->bold) bold=1; +  if(args->light) bold=-1; +  if(args->italic) italic=1; +  if(args->black) bold=2; +  data = get_font(args->nfont,(int)args->font_size,bold,italic, +  lower_case(args->talign||"left"), +  (float)(int)args->xpad, (float)(int)args->ypad); +  } else {    string fkey = args->font+"/"+args->talign+"/"+args->xpad+"/"+args->ypad;    data = cache_lookup("fonts", fkey);    if(!data)    { -  data = load_font(args->font, lower_case(args->talign||"left"),(int)args->xpad,(int)args->ypad); +  data = load_font(args->font, lower_case(args->talign||"left"), +  (int)args->xpad,(int)args->ypad);    cache_set("fonts", fkey, data);    } -  +  }       // Fonts and such are now initialized.