diff -urNP ../siag-3.4.1/ChangeLog ./ChangeLog
--- ../siag-3.4.1/ChangeLog	Thu Oct 12 08:12:02 2000
+++ ./ChangeLog	Fri Oct 27 02:25:06 2000
@@ -1,10 +1,29 @@
 
+001026	Added the function pfb2ps which removes the requirement to have
+	t1utils to use fonts in pfb format. Removed readpfa.
+	Commented out Nimbus Sans and Nimbus Roman in fonts.txt:
+	the pfb files aren't supplied, so there's no way they could work.
+	Unbroke Egon (ani_shell wasn't initialized).
+
+001025	Added Latin2 Times font (called it Times2) and code to deal
+	with it. New PFB= directive in fonts.txt.
+	Fixed add_pseudo_menu in siag.scm.
+	Started adding prototypes in Nws.
+
+001024	Ruler.c: Added check if w is None in next_tab.
+
+001020	Always zero out allocated memory in cmalloc. Suggested
+	by Youki Kadobayashi.
+	Changed pw.scm to use new syntax of wvHtml >= 0.6.0.
+
+001019	Released 3.4.1.
+
 001012	Tsiag unbroken.
 
 001008	Added support for the ccmath library.
 
 001004	Added roman numeral conversion: roman(10) => X and
-	roman("X") => "10".
+	roman("X") => 10.
 	Updated Brazilian translation.
 
 000916	Reintroduced the gsiag code! Cleaned up enough to compile.
diff -urNP ../siag-3.4.1/Nws/Base.c ./Nws/Base.c
--- ../siag-3.4.1/Nws/Base.c	Tue Sep  5 10:32:58 2000
+++ ./Nws/Base.c	Wed Oct 25 23:50:23 2000
@@ -167,38 +167,33 @@
 	},
 };
 
-static void Initialize ();
-static Boolean SetValues ();
-static void Redisplay ();
-static void Destroy ();
-static void Realize ();
-static void ClassInitialize();
-static void ResolveInheritance();
-static void Resize ();
-
-#if NeedFunctionPrototypes
-	static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
-	static void SetInternalDimension(Widget,Dimension,Dimension);
-#else
-	static void GetInternalDimension();
-	static void SetInternalDimension();
-#endif
-
-static void  Highlight();
-static void  _Highlight();
-static void  Unhighlight();
-static void  _Unhighlight();
-static void  ShowHelp();
-static void  HideHelp();
-static void  _ShowHelp();
-static void  _FocusIn();
-static void  _FocusOut();
-static void  FocusCurrent();
-static void  TraverseForward();
-static void  TraverseBackward();
-static Boolean AcceptFocus();
-static void  HighlightBorder();
-static void  UnhighlightBorder();
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static void Redisplay (Widget, XEvent *, Region);
+static void Destroy (Widget);
+static void Realize (Widget, Mask *, XSetWindowAttributes *);
+static void ClassInitialize(void);
+static void ResolveInheritance(WidgetClass);
+static void Resize (Widget);
+
+static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
+static void SetInternalDimension(Widget,Dimension,Dimension);
+
+static void  Highlight(Widget, XEvent *, String *, Cardinal *);
+static void  _Highlight(Widget, XEvent *, String *, Cardinal *);
+static void  Unhighlight(Widget, XEvent *, String *, Cardinal *);
+static void  _Unhighlight(Widget, XEvent *, String *, Cardinal *);
+static void  ShowHelp(Widget, XEvent *, String *, Cardinal *);
+static void  HideHelp(Widget, XEvent *, String *, Cardinal *);
+static void  _ShowHelp(XtPointer, XtIntervalId *);
+static void  _FocusIn(Widget, XEvent *, String *, Cardinal *);
+static void  _FocusOut(Widget, XEvent *, String *, Cardinal *);
+static void  FocusCurrent(Widget, XEvent *, String *, Cardinal *);
+static void  TraverseForward(Widget, XEvent *, String *, Cardinal *);
+static void  TraverseBackward(Widget, XEvent *, String *, Cardinal *);
+static Boolean AcceptFocus(Widget, Time *);
+static void  HighlightBorder(Widget);
+static void  UnhighlightBorder(Widget);
 
 static XtActionsRec action [] = {
         {"highlight",Highlight},
@@ -272,7 +267,7 @@
 
 WidgetClass baseWidgetClass = (WidgetClass) &baseClassRec;
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
 
     _InitializeWidgetSet();
@@ -284,8 +279,7 @@
                        NULL, 0, XtCacheNone, NULL);
 }
 
-static void ResolveInheritance(class)
-WidgetClass class;
+static void ResolveInheritance(WidgetClass class)
 {
 	BaseWidgetClass c = (BaseWidgetClass) class;
 	BaseWidgetClass super;
@@ -319,11 +313,8 @@
 
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseWidget nw = (BaseWidget) new_widget;
 	XColor	dark,light,bg;
@@ -370,10 +361,7 @@
 	nw->base.focused = False;
 }
 
-static void Realize(w, valueMask, attributes)
-Widget w;
-Mask *valueMask;
-XSetWindowAttributes *attributes;
+static void Realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -413,8 +401,7 @@
 	}
 }
 
-static void Destroy(w)
-Widget w;
+static void Destroy(Widget w)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -426,10 +413,7 @@
 	XFreeGC(XtDisplay(w),cw->base.gc);
 }
 
-static void Redisplay(w,event,region)
-Widget w;
-XEvent * event;
-Region  region;
+static void Redisplay(Widget w, XEvent *event, Region region)
 {
 	BaseWidget cw = (BaseWidget) w;
 	Display *dpy = XtDisplay(w);
@@ -542,8 +526,7 @@
 	if (!XtIsSensitive(w)) Xt_SetInsensitive(w);
 }
 
-static void Resize(w)
-Widget w;
+static void Resize(Widget w)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -608,12 +591,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> base.component != \
                                              w2 -> base.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseWidget cw = (BaseWidget) current;
 	BaseWidget nw = (BaseWidget) new_widget;
@@ -716,12 +695,8 @@
 	return redraw;
 }
 
-static void GetInternalDimension(w,x,y,width,height)
-Widget w;
-Position *x;
-Position *y;
-Dimension *width;
-Dimension *height;
+static void GetInternalDimension(Widget w, Position *x, Position *y,
+		Dimension *width, Dimension *height)
 {
 	BaseWidget cw = (BaseWidget) w;
 	
@@ -760,10 +735,7 @@
 	}
 }
 
-static void SetInternalDimension(w,width,height)
-Widget w;
-Dimension width;
-Dimension height;
+static void SetInternalDimension(Widget w, Dimension width, Dimension height)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -794,11 +766,8 @@
 	}		
 }
 
-static void Highlight(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Highlight(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 	BaseWidgetClass wclass = (BaseWidgetClass) cw->core.widget_class;
@@ -811,11 +780,8 @@
 
 }
 
-static void _Highlight(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _Highlight(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -835,11 +801,8 @@
 	}
 }
 
-static void Unhighlight(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Unhighlight(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 	BaseWidgetClass wclass = (BaseWidgetClass) cw->core.widget_class;
@@ -851,11 +814,8 @@
 	cw->base.entered = False;
 }
 
-static void _Unhighlight(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _Unhighlight(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 	
@@ -876,11 +836,8 @@
 
 }
 
-static void ShowHelp(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void ShowHelp(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -891,9 +848,7 @@
 	}
 }
 
-static void _ShowHelp(client_data,timer)
-XtPointer  client_data;
-XtIntervalId * timer;
+static void _ShowHelp(XtPointer client_data, XtIntervalId *timer)
 {
 	BaseWidget cw = (BaseWidget) client_data;
 	Position x,y;
@@ -920,11 +875,8 @@
 
 }
 
-static void HideHelp(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void HideHelp(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -937,9 +889,7 @@
 	}
 }
 
-static Boolean AcceptFocus(w , time)
-Widget w;
-Time *time;
+static Boolean AcceptFocus(Widget w , Time *time)
 {
 	BaseWidget cw = (BaseWidget) w;
 	BaseWidgetClass wclass = (BaseWidgetClass) cw->core.widget_class;
@@ -959,11 +909,8 @@
 
 #define focus_detail(detail) (detail ==NotifyAncestor ?"NotifyAncestor":detail ==NotifyVirtual ?"NotifyVirtual":detail ==NotifyInferior ?"NotifyInferior":detail ==NotifyNonlinear ?"NotifyNonlinear":detail ==NotifyNonlinearVirtual ?"NotifyNonlinearVirtual":detail ==NotifyPointer ?"NotifyPointer":detail ==NotifyPointerRoot ?"NotifyPointerRoot":detail ==NotifyDetailNone ?"NotifyDetailNone":"???")
 
-static void _FocusIn(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _FocusIn(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 	BaseWidgetClass wclass = (BaseWidgetClass) cw->core.widget_class;
@@ -978,11 +925,8 @@
 	}
 }
 
-static void _FocusOut(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _FocusOut(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 	BaseWidgetClass wclass = (BaseWidgetClass) cw->core.widget_class;
@@ -994,11 +938,8 @@
 	}	
 }
 
-static void FocusCurrent(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void FocusCurrent(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseWidget cw = (BaseWidget) w;
 	Widget parent = XtParent(w);
@@ -1016,11 +957,8 @@
 	}
 }
 
-static void TraverseForward(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void TraverseForward(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	Widget parent = XtParent(w);
 	
@@ -1033,11 +971,8 @@
 
 }
 
-static void TraverseBackward(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void TraverseBackward(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	Widget parent = XtParent(w);
 
@@ -1049,8 +984,7 @@
         		traverse(parent , TRAVERSE_PREV , &event->xkey.time);
 }
 
-static void HighlightBorder(w)
-Widget w;
+static void HighlightBorder(Widget w)
 {
 	BaseWidget cw = (BaseWidget) w;
 
@@ -1058,8 +992,7 @@
 		cw->core.height , cw->base.bd_width , cw->base.bd_color);
 }
 
-static void UnhighlightBorder(w)
-Widget w;
+static void UnhighlightBorder(Widget w)
 {
 	BaseWidget cw = (BaseWidget) w;
 
diff -urNP ../siag-3.4.1/Nws/BaseComp.c ./Nws/BaseComp.c
--- ../siag-3.4.1/Nws/BaseComp.c	Tue Sep  5 10:32:53 2000
+++ ./Nws/BaseComp.c	Thu Oct 26 00:08:54 2000
@@ -166,39 +166,34 @@
 	},
 };
 
-static void Initialize ();
-static Boolean SetValues ();
-static void Redisplay ();
-static void Destroy ();
-static void Realize ();
-static void ClassInitialize();
-static void ResolveInheritance();
-static void Resize ();
-static Boolean AcceptFocus();
-
-#if NeedFunctionPrototypes
-	static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
-	static void SetInternalDimension(Widget,Dimension,Dimension);
-#else
-	static void GetInternalDimension();
-	static void SetInternalDimension();
-#endif
-
-static Widget Traverse();
-static void  TraverseTo();
-static void  TraverseOut();
-static Widget TraverseInside();
-static void  ShowHelp();
-static void  HideHelp();
-static void  _ShowHelp();
-static void  _FocusIn();
-static void  _FocusOut();
-static void  HighlightBorder();
-static void  UnhighlightBorder();
-static void  TraverseForward();
-static void  TraverseBackward();
-static void  FocusCurrent();
-static void  ChangeManaged();
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static void Redisplay (Widget, XEvent *, Region);
+static void Destroy (Widget);
+static void Realize (Widget, Mask *, XSetWindowAttributes *);
+static void ClassInitialize(void);
+static void ResolveInheritance(WidgetClass);
+static void Resize (Widget);
+static Boolean AcceptFocus(Widget, Time *);
+
+static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
+static void SetInternalDimension(Widget,Dimension,Dimension);
+
+static Widget Traverse(Widget, int, Time *);
+static void  TraverseTo(Widget, Widget, Time *);
+static void  TraverseOut(Widget);
+static Widget TraverseInside(Widget, int, Time *);
+static void  ShowHelp(Widget, XEvent *, String *, Cardinal *);
+static void  HideHelp(Widget, XEvent *, String *, Cardinal *);
+static void  _ShowHelp(XtPointer, XtIntervalId *);
+static void  _FocusIn(Widget, XEvent *, String *, Cardinal *);
+static void  _FocusOut(Widget, XEvent *, String *, Cardinal *);
+static void  HighlightBorder(Widget);
+static void  UnhighlightBorder(Widget);
+static void  TraverseForward(Widget, XEvent *, String *, Cardinal *);
+static void  TraverseBackward(Widget, XEvent *, String *, Cardinal *);
+static void  FocusCurrent(Widget, XEvent *, String *, Cardinal *);
+static void  ChangeManaged(Widget);
 
 static XtActionsRec action [] = {
         {"show_help",ShowHelp},
@@ -285,7 +280,7 @@
                 (cw)->composite.num_children ) ; \
                 (child)++ )
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
 	_InitializeWidgetSet();
 
@@ -300,8 +295,7 @@
 
 }
 
-static void ResolveInheritance(class)
-WidgetClass class;
+static void ResolveInheritance(WidgetClass class)
 {
 	BaseCompWidgetClass c = (BaseCompWidgetClass) class;
 	BaseCompWidgetClass super;
@@ -352,11 +346,8 @@
 
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseCompWidget nw = (BaseCompWidget) new_widget;
 	XColor	dark,light,bg;
@@ -406,10 +397,7 @@
 
 }
 
-static void Realize(w, valueMask, attributes)
-Widget w;
-Mask *valueMask;
-XSetWindowAttributes *attributes;
+static void Realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -450,8 +438,7 @@
 	}
 }
 
-static void Destroy(w)
-Widget w;
+static void Destroy(Widget w)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -461,10 +448,7 @@
         XFreeGC(XtDisplay(w),cw->baseComp.gc);
 }
 
-static void Redisplay(w,event,region)
-Widget w;
-XEvent * event;
-Region  region;
+static void Redisplay(Widget w, XEvent *event, Region region)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	Display *dpy = XtDisplay(w);
@@ -774,8 +758,7 @@
 	if (!XtIsSensitive(w)) Xt_SetInsensitive(w);
 }
 
-static void Resize(w)
-Widget w;
+static void Resize(Widget w)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -839,12 +822,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> baseComp.component != \
                                              w2 -> baseComp.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseCompWidget cw = (BaseCompWidget) current;
 	BaseCompWidget nw = (BaseCompWidget) new_widget;
@@ -958,8 +937,7 @@
 	return redraw;
 }
 
-static void ChangeManaged(w)
-Widget w;
+static void ChangeManaged(Widget w)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	Widget *child;
@@ -983,12 +961,8 @@
 }
 
 
-static void GetInternalDimension(w,x,y,width,height)
-Widget w;
-Position *x;
-Position *y;
-Dimension *width;
-Dimension *height;
+static void GetInternalDimension(Widget w, Position *x, Position *y,
+		Dimension *width, Dimension *height)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	
@@ -1042,10 +1016,7 @@
 	}
 }
 
-static void SetInternalDimension(w,width,height)
-Widget w;
-Dimension width;
-Dimension height;
+static void SetInternalDimension(Widget w, Dimension width, Dimension height)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -1090,11 +1061,8 @@
 }
 
 
-static void ShowHelp(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void ShowHelp(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -1106,9 +1074,7 @@
 	}
 }
 
-static void _ShowHelp(client_data,timer)
-XtPointer  client_data;
-XtIntervalId * timer;
+static void _ShowHelp(XtPointer client_data, XtIntervalId *timer)
 {
 	BaseCompWidget cw = (BaseCompWidget) client_data;
 	Position x,y;
@@ -1135,11 +1101,8 @@
 
 }
 
-static void HideHelp(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void HideHelp(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -1153,10 +1116,7 @@
 	}
 }
 
-static Widget TraverseInside(w , where , time)
-Widget w;
-int where;
-Time *time;
+static Widget TraverseInside(Widget w , int where , Time *time)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	int i;
@@ -1298,10 +1258,7 @@
 	return cw->baseComp.current_focused;		
 }
 
-static Widget Traverse(w , where , time)
-Widget w;
-int where;
-Time *time;
+static Widget Traverse(Widget w , int where , Time *time)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	Widget parent = XtParent(w);
@@ -1373,10 +1330,7 @@
 	return cw->baseComp.current_focused;
 }
 
-static void TraverseTo(w , child , time)
-Widget w;
-Widget child;
-Time *time;
+static void TraverseTo(Widget w , Widget child , Time *time)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	Widget parent = XtParent(w);
@@ -1406,8 +1360,7 @@
 	
 }
 
-static void TraverseOut(w)
-Widget w;
+static void TraverseOut(Widget w)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	Widget cld = cw->baseComp.current_focused;
@@ -1427,9 +1380,7 @@
 }
 
 
-static Boolean AcceptFocus(w , time)
-Widget w;
-Time *time;
+static Boolean AcceptFocus(Widget w , Time *time)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -1466,11 +1417,8 @@
 
 #define focus_detail(detail) (detail ==NotifyAncestor ?"NotifyAncestor":detail ==NotifyVirtual ?"NotifyVirtual":detail ==NotifyInferior ?"NotifyInferior":detail ==NotifyNonlinear ?"NotifyNonlinear":detail ==NotifyNonlinearVirtual ?"NotifyNonlinearVirtual":detail ==NotifyPointer ?"NotifyPointer":detail ==NotifyPointerRoot ?"NotifyPointerRoot":detail ==NotifyDetailNone ?"NotifyDetailNone":"???")
 
-static void _FocusIn(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _FocusIn(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	BaseCompWidgetClass wclass = (BaseCompWidgetClass) cw->core.widget_class;
@@ -1503,11 +1451,8 @@
 	}
 }
 
-static void _FocusOut(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _FocusOut(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	BaseCompWidgetClass wclass = (BaseCompWidgetClass) cw->core.widget_class;
@@ -1520,8 +1465,7 @@
 
 }
 
-static void HighlightBorder(w)
-Widget w;
+static void HighlightBorder(Widget w)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -1529,8 +1473,7 @@
 		cw->core.height , cw->baseComp.bd_width , cw->baseComp.bd_color);
 }
 
-static void UnhighlightBorder(w)
-Widget w;
+static void UnhighlightBorder(Widget w)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 
@@ -1538,11 +1481,8 @@
 		cw->core.height , cw->baseComp.bd_width , cw->core.background_pixel);
 }
 
-static void FocusCurrent(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void FocusCurrent(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseCompWidget cw = (BaseCompWidget) w;
 	Widget parent = XtParent(w);
@@ -1560,11 +1500,8 @@
 	}
 }
 
-static void TraverseForward(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void TraverseForward(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	Widget parent = XtParent(w);
 	
@@ -1577,11 +1514,8 @@
 
 }
 
-static void TraverseBackward(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void TraverseBackward(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	Widget parent = XtParent(w);
 
diff -urNP ../siag-3.4.1/Nws/BaseConst.c ./Nws/BaseConst.c
--- ../siag-3.4.1/Nws/BaseConst.c	Tue Sep  5 10:32:47 2000
+++ ./Nws/BaseConst.c	Thu Oct 26 00:24:00 2000
@@ -167,39 +167,34 @@
 	}
 };
 
-static void Initialize ();
-static Boolean SetValues ();
-static void Redisplay ();
-static void Destroy ();
-static void Realize ();
-static void ClassInitialize();
-static void ResolveInheritance();
-static void Resize ();
-static Widget Traverse();
-static void TraverseTo();
-static void TraverseOut();
-static Widget TraverseInside();
-static Boolean AcceptFocus();
-static void  HighlightBorder();
-static void  UnhighlightBorder();
-static void  TraverseForward();
-static void  TraverseBackward();
-static void  FocusCurrent();
-static void  ChangeManaged();
-
-#if NeedFunctionPrototypes
-	static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
-	static void SetInternalDimension(Widget,Dimension,Dimension);
-#else
-	static void GetInternalDimension();
-	static void SetInternalDimension();
-#endif
-
-static void  ShowHelp();
-static void  HideHelp();
-static void  _ShowHelp();
-static void  _FocusIn();
-static void  _FocusOut();
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static void Redisplay (Widget, XEvent *, Region);
+static void Destroy (Widget);
+static void Realize (Widget, Mask *, XSetWindowAttributes *);
+static void ClassInitialize(void);
+static void ResolveInheritance(WidgetClass);
+static void Resize (Widget);
+static Widget Traverse(Widget, int, Time *);
+static void TraverseTo(Widget, Widget, Time *);
+static void TraverseOut(Widget);
+static Widget TraverseInside(Widget, int, Time *);
+static Boolean AcceptFocus(Widget, Time *);
+static void  HighlightBorder(Widget);
+static void  UnhighlightBorder(Widget);
+static void  TraverseForward(Widget, XEvent *, String *, Cardinal *);
+static void  TraverseBackward(Widget, XEvent *, String *, Cardinal *);
+static void  FocusCurrent(Widget, XEvent *, String *, Cardinal *);
+static void  ChangeManaged(Widget);
+
+static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
+static void SetInternalDimension(Widget,Dimension,Dimension);
+
+static void  ShowHelp(Widget, XEvent *, String *, Cardinal *);
+static void  HideHelp(Widget, XEvent *, String *, Cardinal *);
+static void  _ShowHelp(XtPointer, XtIntervalId *);
+static void  _FocusIn(Widget, XEvent *, String *, Cardinal *);
+static void  _FocusOut(Widget, XEvent *, String *, Cardinal *);
 
 static XtActionsRec action [] = {
         {"show_help",ShowHelp},
@@ -297,7 +292,7 @@
                 (child)++ )
 
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
 	_InitializeWidgetSet();
 
@@ -312,8 +307,7 @@
 
 }
 
-static void ResolveInheritance(class)
-WidgetClass class;
+static void ResolveInheritance(WidgetClass class)
 {
 	BaseConstWidgetClass c = (BaseConstWidgetClass) class;
 	BaseConstWidgetClass super;
@@ -364,11 +358,8 @@
 
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseConstWidget nw = (BaseConstWidget) new_widget;
 	XColor	dark,light,bg;
@@ -420,10 +411,7 @@
 	nw->baseConst.traverse_direction = TRAVERSE_FIRST;
 }
 
-static void Realize(w, valueMask, attributes)
-Widget w;
-Mask *valueMask;
-XSetWindowAttributes *attributes;
+static void Realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -463,8 +451,7 @@
 	}
 }
 
-static void Destroy(w)
-Widget w;
+static void Destroy(Widget w)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -474,10 +461,7 @@
         XFreeGC(XtDisplay(w),cw->baseConst.gc);
 }
 
-static void Redisplay(w,event,region)
-Widget w;
-XEvent * event;
-Region  region;
+static void Redisplay(Widget w, XEvent *event, Region region)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	Display *dpy = XtDisplay(w);
@@ -797,8 +781,7 @@
 	if (!XtIsSensitive(w)) Xt_SetInsensitive(w);
 }
 
-static void Resize(w)
-Widget w;
+static void Resize(Widget w)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -862,12 +845,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> baseConst.component != \
                                              w2 -> baseConst.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseConstWidget cw = (BaseConstWidget) current;
 	BaseConstWidget nw = (BaseConstWidget) new_widget;
@@ -982,8 +961,7 @@
 	return redraw;
 }
 
-static void ChangeManaged(w)
-Widget w;
+static void ChangeManaged(Widget w)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	Widget *child;
@@ -1005,12 +983,8 @@
 	}
 }
 
-static void GetInternalDimension(w,x,y,width,height)
-Widget w;
-Position *x;
-Position *y;
-Dimension *width;
-Dimension *height;
+static void GetInternalDimension(Widget w, Position *x, Position *y,
+		Dimension *width, Dimension *height)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	
@@ -1064,10 +1038,7 @@
 	}
 }
 
-static void SetInternalDimension(w,width,height)
-Widget w;
-Dimension width;
-Dimension height;
+static void SetInternalDimension(Widget w, Dimension width, Dimension height)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -1111,11 +1082,8 @@
 }
 
 
-static void ShowHelp(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void ShowHelp(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -1127,9 +1095,7 @@
 	}
 }
 
-static void _ShowHelp(client_data,timer)
-XtPointer  client_data;
-XtIntervalId * timer;
+static void _ShowHelp(XtPointer client_data, XtIntervalId *timer)
 {
 	BaseConstWidget cw = (BaseConstWidget) client_data;
 	Position x,y;
@@ -1155,11 +1121,8 @@
 	XtPopup(cw->baseConst.hlp,XtGrabNone);
 }
 
-static void HideHelp(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void HideHelp(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -1172,10 +1135,7 @@
 	}
 }
 
-static Widget TraverseInside(w , where , time)
-Widget w;
-int where;
-Time *time;
+static Widget TraverseInside(Widget w , int where , Time *time)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	int i;
@@ -1317,10 +1277,7 @@
 	return cw->baseConst.current_focused;		
 }
 
-static Widget Traverse(w , where , time)
-Widget w;
-int where;
-Time *time;
+static Widget Traverse(Widget w , int where , Time *time)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	Widget parent = XtParent(w);
@@ -1392,10 +1349,7 @@
 	return cw->baseConst.current_focused;
 }
 
-static void TraverseTo(w , child , time)
-Widget w;
-Widget child;
-Time *time;
+static void TraverseTo(Widget w , Widget child , Time *time)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	Widget parent = XtParent(w);
@@ -1425,8 +1379,7 @@
 	
 }
 
-static void TraverseOut(w)
-Widget w;
+static void TraverseOut(Widget w)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	Widget cld = cw->baseConst.current_focused;
@@ -1446,9 +1399,7 @@
 }
 
 
-static Boolean AcceptFocus(w , time)
-Widget w;
-Time *time;
+static Boolean AcceptFocus(Widget w , Time *time)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -1486,11 +1437,8 @@
 
 #define focus_detail(detail) (detail ==NotifyAncestor ?"NotifyAncestor":detail ==NotifyVirtual ?"NotifyVirtual":detail ==NotifyInferior ?"NotifyInferior":detail ==NotifyNonlinear ?"NotifyNonlinear":detail ==NotifyNonlinearVirtual ?"NotifyNonlinearVirtual":detail ==NotifyPointer ?"NotifyPointer":detail ==NotifyPointerRoot ?"NotifyPointerRoot":detail ==NotifyDetailNone ?"NotifyDetailNone":"???")
 
-static void _FocusIn(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _FocusIn(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	BaseConstWidgetClass wclass = (BaseConstWidgetClass) cw->core.widget_class;
@@ -1523,11 +1471,8 @@
 	}
 }
 
-static void _FocusOut(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void _FocusOut(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	BaseConstWidgetClass wclass = (BaseConstWidgetClass) cw->core.widget_class;
@@ -1540,8 +1485,7 @@
 
 }
 
-static void HighlightBorder(w)
-Widget w;
+static void HighlightBorder(Widget w)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -1549,8 +1493,7 @@
 		cw->core.height , cw->baseConst.bd_width , cw->baseConst.bd_color);
 }
 
-static void UnhighlightBorder(w)
-Widget w;
+static void UnhighlightBorder(Widget w)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 
@@ -1558,11 +1501,8 @@
 		cw->core.height , cw->baseConst.bd_width , cw->core.background_pixel);
 }
 
-static void FocusCurrent(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void FocusCurrent(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	BaseConstWidget cw = (BaseConstWidget) w;
 	Widget parent = XtParent(w);
@@ -1580,11 +1520,8 @@
 	}
 }
 
-static void TraverseForward(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void TraverseForward(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	Widget parent = XtParent(w);
 	
@@ -1597,11 +1534,8 @@
 
 }
 
-static void TraverseBackward(w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void TraverseBackward(Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	Widget parent = XtParent(w);
 
diff -urNP ../siag-3.4.1/Nws/BaseME.c ./Nws/BaseME.c
--- ../siag-3.4.1/Nws/BaseME.c	Tue Sep  5 10:31:59 2000
+++ ./Nws/BaseME.c	Wed Oct 25 23:56:10 2000
@@ -107,24 +107,19 @@
 	},
 };
 
-static void Activate ();
-static void Enternotify ();
-static void Leavenotify ();
-
-static void Initialize ();
-static Boolean SetValues ();
-static void Redisplay ();
-static void Destroy ();
-static void ClassInitialize();
-static void ResolveInheritance();
-
-#if NeedFunctionPrototypes
-	static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
-	static void SetInternalDimension(Widget,Dimension,Dimension);
-#else
-	static void GetInternalDimension();
-	static void SetInternalDimension();
-#endif
+static void Activate (Widget);
+static void Enternotify (Widget);
+static void Leavenotify (Widget);
+
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static void Redisplay (Widget, XEvent *, Region);
+static void Destroy (Widget);
+static void ClassInitialize(void);
+static void ResolveInheritance(WidgetClass);
+
+static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
+static void SetInternalDimension(Widget,Dimension,Dimension);
 
 BaseMEClassRec baseMEClassRec = {
 /* core */
@@ -177,7 +172,7 @@
 
 
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     _InitializeWidgetSet();
 
@@ -188,8 +183,7 @@
                        NULL, 0, XtCacheNone, NULL);
 }
 
-static void ResolveInheritance(class)
-WidgetClass class;
+static void ResolveInheritance(WidgetClass class)
 {
 	BaseMEObjectClass c = (BaseMEObjectClass) class;
 	BaseMEObjectClass super;
@@ -220,11 +214,8 @@
 
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseMEObject nw = (BaseMEObject) new_widget;
 	XColor	dark,light,bg;
@@ -253,18 +244,14 @@
 	nw->baseME.entered = False;	
 }
 
-static void Destroy(w)
-Widget w;
+static void Destroy(Widget w)
 {
 	BaseMEObject cw = (BaseMEObject) w;
 
 	XFreeGC(XtDisplayOfObject(w),cw->baseME.gc);
 }
 
-static void Redisplay(w,event,region)
-Widget w;
-XEvent * event;
-Region  region;
+static void Redisplay(Widget w, XEvent *event, Region region)
 {
 	BaseMEObject cw = (BaseMEObject) w;
 	Display *dpy = XtDisplayOfObject(w);
@@ -350,12 +337,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> baseME.component != \
                                              w2 -> baseME.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	BaseMEObject cw = (BaseMEObject) current;
 	BaseMEObject nw = (BaseMEObject) new_widget;
@@ -378,12 +361,8 @@
 	return True;
 }
 
-static void GetInternalDimension(w,x,y,width,height)
-Widget w;
-Position *x;
-Position *y;
-Dimension *width;
-Dimension *height;
+static void GetInternalDimension(Widget w, Position *x, Position *y,
+		Dimension *width, Dimension *height)
 {
 	BaseMEObject cw = (BaseMEObject) w;
 	
@@ -416,10 +395,7 @@
 	}
 }
 
-static void SetInternalDimension(w,width,height)
-Widget w;
-Dimension width;
-Dimension height;
+static void SetInternalDimension(Widget w, Dimension width, Dimension height)
 {
 	BaseMEObject cw = (BaseMEObject) w;
 
@@ -446,15 +422,13 @@
 	}		
 }
 
-static void Activate(w)
-Widget w;
+static void Activate(Widget w)
 {
 	if (XtIsSensitive(w))
 		XtCallCallbackList(w , ((BaseMEObject)w)->baseME.activate , NULL);
 }
 
-static void Enternotify(w)
-Widget w;
+static void Enternotify(Widget w)
 {
 	BaseMEObject cw = (BaseMEObject) w;
 	BaseMEObjectClass class = (BaseMEObjectClass)
@@ -467,8 +441,7 @@
 	}
 }
 
-static void Leavenotify(w)
-Widget w;
+static void Leavenotify(Widget w)
 {
 	BaseMEObject cw = (BaseMEObject) w;
 	BaseMEObjectClass class = (BaseMEObjectClass)
diff -urNP ../siag-3.4.1/Nws/Button.c ./Nws/Button.c
--- ../siag-3.4.1/Nws/Button.c	Sun Nov 28 18:54:50 1999
+++ ./Nws/Button.c	Thu Oct 26 13:47:30 2000
@@ -94,15 +94,17 @@
 
 
  
-static void Class_initialize ();
-static void Initialize ();
-static void Destroy ();
-static void Redisplay ();
-static Boolean SetValues ();
-static XtGeometryResult QueryGeometry();
-
-static void compute_dim();
-static void compute_pos();
+static void Class_initialize (void);
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static void Destroy (Widget);
+static void Redisplay (Widget, XEvent *, Region);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static XtGeometryResult QueryGeometry(Widget,
+		XtWidgetGeometry *, XtWidgetGeometry *);
+
+static void compute_dim(ButtonWidget, Dimension *, Dimension *);
+static void compute_pos(ButtonWidget, Dimension, Dimension,
+		int *, int *, int *, int *);
 
 ButtonClassRec buttonClassRec = {
 /* core */
@@ -161,7 +163,7 @@
 
 WidgetClass buttonWidgetClass = (WidgetClass) & buttonClassRec;
 
-static void Class_initialize()
+static void Class_initialize(void)
 {
 	_InitializeWidgetSet();
 
@@ -172,11 +174,8 @@
 		NULL , 0 , XtCacheNone , NULL);
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	Display *dpy=XtDisplay(new_widget);
 	ButtonWidget nw = (ButtonWidget) new_widget;
@@ -203,8 +202,7 @@
 
 }
 
-static void Destroy(w)
-Widget w;
+static void Destroy(Widget w)
 {
 	ButtonWidget cw = (ButtonWidget) w;
 	
@@ -218,10 +216,7 @@
 		XtFree(cw->button.label);
 }
 
-static void Redisplay(w , event , region)
-Widget w;
-XEvent *event;
-Region region;
+static void Redisplay(Widget w , XEvent *event , Region region)
 {
 	ButtonWidget cw = (ButtonWidget) w;
 	Display *dpy = XtDisplay(w);
@@ -286,12 +281,8 @@
                                              w2 -> button.component)
 
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	ButtonWidget nw = (ButtonWidget) new_widget;
 	ButtonWidget cw = (ButtonWidget) current;
@@ -335,10 +326,8 @@
 
 #undef  WidgetValuesDiffer 
 
-static XtGeometryResult QueryGeometry(w, intended , preferred)
-Widget w;
-XtWidgetGeometry *intended;
-XtWidgetGeometry *preferred;
+static XtGeometryResult QueryGeometry(Widget w,
+		XtWidgetGeometry *intended , XtWidgetGeometry *preferred)
 {
 	ButtonWidget cw = (ButtonWidget) w;
 	Dimension pwidth , pheight;
@@ -350,7 +339,7 @@
 
 	preferred->request_mode = CWWidth | CWHeight;
 
-	compute_dim (w , &pwidth , &pheight);
+	compute_dim (cw , &pwidth , &pheight);
 
 	preferred->width = (Dimension)(pwidth + (cw->core.width - width));
 	preferred->height = (Dimension)(pheight + (cw->core.height - height));
@@ -369,10 +358,7 @@
 	
 }
 
-static void compute_dim(w , width , height)
-ButtonWidget w;
-Dimension * width;
-Dimension * height;
+static void compute_dim(ButtonWidget w , Dimension *width , Dimension *height)
 {
 	Dimension widthi = 0 , widtht = 0 , heighti = 0 , heightt = 0;
 	 
@@ -419,14 +405,8 @@
 	}
 }
 
-static void compute_pos(w , width , height , text_x , text_y , icon_x , icon_y)
-ButtonWidget w;
-Dimension width;
-Dimension height;
-int * text_x;
-int * text_y;
-int * icon_x;
-int * icon_y;
+static void compute_pos(ButtonWidget w, Dimension width, Dimension height,
+		int *text_x, int *text_y, int *icon_x, int *icon_y)
 {
 	int widthi = 0 , widtht = 0 , heighti = 0 , heightt = 0;
 	int pom;
diff -urNP ../siag-3.4.1/Nws/CheckME.c ./Nws/CheckME.c
--- ../siag-3.4.1/Nws/CheckME.c	Tue Sep  5 10:32:06 2000
+++ ./Nws/CheckME.c	Thu Oct 26 00:33:35 2000
@@ -77,12 +77,12 @@
 	},
 };
 
-static void Destroy();
-static void ClassInitialize ();
-static void Initialize();
-static Boolean SetValues();
+static void Destroy(Widget);
+static void ClassInitialize (void);
+static void Initialize(Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues(Widget, Widget, Widget, ArgList, Cardinal *);
 
-static void Activate();
+static void Activate(Widget);
 
 CheckMEClassRec checkMEClassRec = {
 /* core */
@@ -140,7 +140,7 @@
 
 WidgetClass checkMEObjectClass = (WidgetClass) &checkMEClassRec;
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     _InitializeWidgetSet();
 
@@ -148,9 +148,7 @@
                        NULL, 0, XtCacheNone, NULL);
 }
 
-static Icon * get_icon(w,icon_data)
-CheckMEObject w;
-char **icon_data;
+static Icon * get_icon(CheckMEObject w, char **icon_data)
 {
 	XColor top , bottom , bc;
 	Icon *iconfin = (Icon *) XtMalloc(sizeof(Icon));
@@ -194,11 +192,8 @@
 	return iconfin;
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	CheckMEObject nw = (CheckMEObject) new_widget;
 	char ** id_on , ** id_off;
@@ -246,8 +241,7 @@
 	labelMEClassRec.rect_class.initialize(req_widget,new_widget,args,num_args);
 }
 
-static void Destroy (w)
-Widget w;
+static void Destroy (Widget w)
 {
 	CheckMEObject cw = (CheckMEObject) w;
 	Display *dpy = XtDisplayOfObject(w);
@@ -262,12 +256,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> checkME.component != \
                                              w2 -> checkME.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	CheckMEObject cw = (CheckMEObject) current;
 	CheckMEObject nw = (CheckMEObject) new_widget;
@@ -340,8 +330,7 @@
 	return redraw;
 }
 
-static void Activate (w)
-Widget w;
+static void Activate (Widget w)
 {
 	CheckMEObject cw = (CheckMEObject) w;
 
diff -urNP ../siag-3.4.1/Nws/Init.h ./Nws/Init.h
--- ../siag-3.4.1/Nws/Init.h	Thu Jun  5 17:45:51 1997
+++ ./Nws/Init.h	Wed Oct 25 23:33:58 2000
@@ -8,7 +8,7 @@
 #ifndef _Init_h_
 #define _Init_h_
 
-extern void _InitializeWidgetSet();
+extern void _InitializeWidgetSet(void);
 
 #endif
 
diff -urNP ../siag-3.4.1/Nws/LabelME.c ./Nws/LabelME.c
--- ../siag-3.4.1/Nws/LabelME.c	Sun Nov 28 18:55:14 1999
+++ ./Nws/LabelME.c	Thu Oct 26 13:47:45 2000
@@ -82,12 +82,13 @@
 	},
 };
 
-static void Redisplay ();
-static void Destroy ();
-static void ClassInitialize ();
-static void Initialize ();
-static Boolean SetValues ();
-static XtGeometryResult QueryGeometry();
+static void Redisplay (Widget, XEvent *, Region);
+static void Destroy (Widget);
+static void ClassInitialize (void);
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static XtGeometryResult QueryGeometry(Widget,
+                XtWidgetGeometry *, XtWidgetGeometry *);
 
 LabelMEClassRec labelMEClassRec = {
 /* core */
@@ -141,7 +142,7 @@
 
 WidgetClass labelMEObjectClass = (WidgetClass) &labelMEClassRec;
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
     _InitializeWidgetSet();
 
@@ -152,11 +153,8 @@
                        NULL, 0, XtCacheNone, NULL);
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	LabelMEObject nw = (LabelMEObject) new_widget;
 	Dimension width = 0 , height = 0;
@@ -203,8 +201,7 @@
 	labelMEClassRec.baseME_class.set_internal_dimension(new_widget , width , height);
 }
 
-static void Destroy(w)
-Widget w;
+static void Destroy(Widget w)
 {
 	LabelMEObject cw = (LabelMEObject) w;
 
@@ -212,10 +209,7 @@
 		XtFree(cw->labelME.label);
 }
 
-static void Redisplay(w,event,region)
-Widget w;
-XEvent * event;
-Region  region;
+static void Redisplay(Widget w, XEvent *event, Region region)
 {
 	LabelMEObject cw = (LabelMEObject) w;
 	Display *dpy = XtDisplayOfObject(w);
@@ -286,12 +280,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> labelME.component != \
                                              w2 -> labelME.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	LabelMEObject cw = (LabelMEObject) current;
 	LabelMEObject nw = (LabelMEObject) new_widget;
@@ -326,10 +316,8 @@
 	return redraw;	
 }
 
-static XtGeometryResult QueryGeometry(w, intended , preferred)
-Widget w;
-XtWidgetGeometry *intended;
-XtWidgetGeometry *preferred;
+static XtGeometryResult QueryGeometry(Widget w,
+		XtWidgetGeometry *intended , XtWidgetGeometry *preferred)
 {
 	LabelMEObject cw = (LabelMEObject) w;
 	Dimension pwidth = 0 , pheight = 0;
diff -urNP ../siag-3.4.1/Nws/LineME.c ./Nws/LineME.c
--- ../siag-3.4.1/Nws/LineME.c	Thu Jun  5 17:50:44 1997
+++ ./Nws/LineME.c	Thu Oct 26 00:39:03 2000
@@ -11,9 +11,9 @@
 #include	"LineMEP.h"
 #include	"Init.h"
 
-static void ClassInitialize();
-static void Initialize();
-static void Redisplay ();
+static void ClassInitialize(void);
+static void Initialize(Widget, Widget, ArgList, Cardinal *);
+static void Redisplay (Widget, XEvent *, Region);
 
 static XtResource resources[] = {
         {
@@ -79,16 +79,13 @@
 
 WidgetClass lineMEObjectClass = (WidgetClass) &lineMEClassRec;
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
 	_InitializeWidgetSet();
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	LineMEObject nw = (LineMEObject) new_widget;
 	Display * dpy = XtDisplayOfObject(new_widget);
@@ -103,10 +100,7 @@
 
 }
 
-static void Redisplay(w , event , region)
-Widget w;
-XEvent *event;
-Region region;
+static void Redisplay(Widget w , XEvent *event , Region region)
 {
 	LineMEObject cw = (LineMEObject) w;
 	Display * dpy = XtDisplayOfObject(w);
diff -urNP ../siag-3.4.1/Nws/MBButton.c ./Nws/MBButton.c
--- ../siag-3.4.1/Nws/MBButton.c	Tue Sep  5 10:32:17 2000
+++ ./Nws/MBButton.c	Thu Oct 26 00:43:06 2000
@@ -29,15 +29,15 @@
 	},
 };
 
-static void ClassInitialize();
-static void Initialize ();
-static void PopdownMenu ();
-static void Activate ();
-static void Leavenotify ();
-static void ResolveInheritance ();
+static void ClassInitialize(void);
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static void PopdownMenu (Widget);
+static void Activate (Widget);
+static void Leavenotify (Widget);
+static void ResolveInheritance (WidgetClass);
 
-static Widget get_menu();
-static void popdown_menu();
+static Widget get_menu(Widget);
+static void popdown_menu(Widget, XtPointer, XtPointer);
 
 MBButtonClassRec mBButtonClassRec = {
 /* core */
@@ -95,13 +95,12 @@
 
 WidgetClass mBButtonObjectClass = (WidgetClass) &mBButtonClassRec;
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
 	_InitializeWidgetSet();
 }
 
-static void ResolveInheritance(class)
-WidgetClass class;
+static void ResolveInheritance(WidgetClass class)
 {
         MBButtonObjectClass c = (MBButtonObjectClass) class;
         MBButtonObjectClass super;
@@ -115,19 +114,15 @@
 
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	MBButtonObject nw = (MBButtonObject) new_widget;
 
 	nw->mBButton.menu = NULL;
 }
 
-static void Activate (w)
-Widget w;
+static void Activate (Widget w)
 {
 	MBButtonObject cw = (MBButtonObject) w;
 	Display * dpy= XtDisplayOfObject(w);
@@ -176,8 +171,7 @@
 }
 
 
-static void Leavenotify(w)
-Widget w;
+static void Leavenotify(Widget w)
 {
 	MBButtonObject cw = (MBButtonObject) w;
 
@@ -188,8 +182,7 @@
 	}
 }
 
-static void PopdownMenu(w)
-Widget w;
+static void PopdownMenu(Widget w)
 {
 	MBButtonObject cw = (MBButtonObject) w;
 
@@ -207,10 +200,7 @@
 	cw->mBButton.menu = NULL;
 }
 
-static void popdown_menu(w,client_data,call_data)
-Widget w;
-XtPointer client_data;
-XtPointer call_data;
+static void popdown_menu(Widget w, XtPointer client_data, XtPointer call_data)
 {
 	MBButtonObject cw = (MBButtonObject) client_data;
 	MenuBarWidget mw = (MenuBarWidget) XtParent((Widget)cw);
@@ -228,8 +218,7 @@
 
 }
 
-static Widget get_menu(w)
-Widget w;
+static Widget get_menu(Widget w)
 {
 	MBButtonObject cw = (MBButtonObject) w;
         Widget menu = NULL;
diff -urNP ../siag-3.4.1/Nws/Makefile.am ./Nws/Makefile.am
--- ../siag-3.4.1/Nws/Makefile.am	Mon May  8 10:11:56 2000
+++ ./Nws/Makefile.am	Thu Oct 26 13:43:36 2000
@@ -177,6 +177,8 @@
 	@X_CFLAGS@ \
 	-I..
 
+#	-I.. -Wstrict-prototypes
+
 dist_head:
 	for i in $(libNws_a_SOURCES); do\
 		grp=`grep Copyright $$i`;\
diff -urNP ../siag-3.4.1/Nws/Makefile.in ./Nws/Makefile.in
--- ../siag-3.4.1/Nws/Makefile.in	Thu Oct 19 14:44:54 2000
+++ ./Nws/Makefile.in	Fri Oct 27 12:49:51 2000
@@ -335,6 +335,8 @@
 mostlyclean distclean maintainer-clean
 
 
+#	-I.. -Wstrict-prototypes
+
 dist_head:
 	for i in $(libNws_a_SOURCES); do\
 		grp=`grep Copyright $$i`;\
diff -urNP ../siag-3.4.1/Nws/Menu.c ./Nws/Menu.c
--- ../siag-3.4.1/Nws/Menu.c	Mon Sep 25 00:25:17 2000
+++ ./Nws/Menu.c	Thu Oct 26 13:50:06 2000
@@ -88,41 +88,36 @@
 	}
 };
 
-static void Initialize ();
-static Boolean SetValues ();
-static void Redisplay ();
-static void Realize ();
-static void ClassInitialize();
-static void ResolveInheritance();
-static void Resize ();
-static XtGeometryResult GeometryManager();
-static void ChangeManaged();
-
-static void GetPositionEntry ();
-static void GrabAll ();
-static void timerCB ();
-
-static void PopdownSubmenu();
-static void PopdownAll();
-static void InsertSubmenu();
-
-#if NeedFunctionPrototypes
-	static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
-	static void SetInternalDimension(Widget,Dimension,Dimension);
-#else
-	static void GetInternalDimension();
-	static void SetInternalDimension();
-#endif
-
-static Dimension get_height();
-static Dimension get_max_width();
-static void popdown_menu();
-
-static void Button_Press();
-static void Button_Release();
-static void Motion();
-static void Enter();
-static void Leave();
+static void Initialize (Widget, Widget, ArgList, Cardinal *);
+static Boolean SetValues (Widget, Widget, Widget, ArgList, Cardinal *);
+static void Redisplay (Widget, XEvent *, Region);
+static void ClassInitialize(void);
+static void ResolveInheritance(WidgetClass);
+static void Resize (Widget);
+static XtGeometryResult GeometryManager(Widget,
+		XtWidgetGeometry *, XtWidgetGeometry *);
+static void ChangeManaged(Widget);
+
+static void GetPositionEntry (Widget, int, int, XEvent *, BaseMEObject **);
+static void GrabAll (Widget, XtPointer, XtPointer);
+static void timerCB (XtPointer, XtIntervalId *);
+
+static void PopdownSubmenu(Widget);
+static void PopdownAll(Widget);
+static void InsertSubmenu(Widget);
+
+static void GetInternalDimension(Widget,Position *,Position *,Dimension *,Dimension *);
+static void SetInternalDimension(Widget,Dimension,Dimension);
+
+static Dimension get_height(MenuWidget);
+static Dimension get_max_width(MenuWidget);
+static void popdown_menu(Widget);
+
+static void Button_Press(Widget, XEvent *, String *, Cardinal *);
+static void Button_Release(Widget, XEvent *, String *, Cardinal *);
+static void Motion(Widget, XEvent *, String *, Cardinal *);
+static void Enter(Widget, XEvent *, String *, Cardinal *);
+static void Leave(Widget, XEvent *, String *, Cardinal *);
 
 static XtActionsRec action [] = {
 	{"buttonpress",Button_Press},
@@ -214,7 +209,7 @@
 		(cw)->composite.num_children ) ; \
 		(childP)++ )
 
-static void ClassInitialize()
+static void ClassInitialize(void)
 {
 	_InitializeWidgetSet();
 
@@ -228,8 +223,7 @@
 }
 
 
-static void ResolveInheritance(class)
-WidgetClass class;
+static void ResolveInheritance(WidgetClass class)
 {
 	MenuWidgetClass c = (MenuWidgetClass) class;
 	MenuWidgetClass super;
@@ -267,11 +261,8 @@
 
 }
 
-static void Initialize(req_widget,new_widget,args,num_args)
-Widget req_widget;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static void Initialize(Widget req_widget, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	MenuWidget nw = (MenuWidget) new_widget;
 	XColor	dark,light,bg;
@@ -293,35 +284,7 @@
 
 }
 
-#if 0
-#define superclass (&overrideShellClassRec)
-static void Realize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes)
-{
-#if 0
-	MenuWidget cw = (MenuWidget) w;
-	
-	if ((attributes->cursor = cw->menu.cursor) != None)
-		*valueMask |= CWCursor;
-
-	if ((cw->menu.backing_store == Always) ||
-		(cw->menu.backing_store == NotUseful) ||
-		(cw->menu.backing_store == WhenMapped) ) {
-
-		*valueMask |= CWBackingStore;
-		attributes->backing_store = cw->menu.backing_store;
-    	}
-    	else
-        	*valueMask &= ~CWBackingStore;
-#endif
-
-	(*superclass->core_class.realize) (w,valueMask,attributes);
-}
-#endif
-
-static void Redisplay(w,event,region)
-Widget w;
-XEvent * event;
-Region  region;
+static void Redisplay(Widget w, XEvent *event, Region region)
 {
 	MenuWidget cw = (MenuWidget) w;
 	Display *dpy = XtDisplay(w);
@@ -405,8 +368,7 @@
 	if (!XtIsSensitive(w)) Xt_SetInsensitive(w);
 }
 
-static void Resize(w)
-Widget w;
+static void Resize(Widget w)
 {
 	MenuWidget cw = (MenuWidget) w;
 	BaseMEObject * entry;
@@ -426,12 +388,8 @@
 #define WidgetValuesDiffer(w1,w2,component) (w1 -> menu.component != \
                                              w2 -> menu.component)
 
-static Boolean SetValues(current, request, new_widget, args, num_args)
-Widget current;
-Widget request;
-Widget new_widget;
-ArgList args;
-Cardinal *num_args;
+static Boolean SetValues(Widget current, Widget request, Widget new_widget,
+		ArgList args, Cardinal *num_args)
 {
 	MenuWidget cw = (MenuWidget) current;
 	MenuWidget nw = (MenuWidget) new_widget;
@@ -447,10 +405,8 @@
 	return redraw;
 }
 
-static XtGeometryResult GeometryManager(w , request , reply)
-Widget w;
-XtWidgetGeometry * request;
-XtWidgetGeometry * reply;
+static XtGeometryResult GeometryManager(Widget w ,
+		XtWidgetGeometry *request , XtWidgetGeometry *reply)
 {
 	MenuWidget cw = (MenuWidget) XtParent(w);
 	BaseMEObject aentry = (BaseMEObject) w;
@@ -497,8 +453,7 @@
 	return ret_val;		
 }
 
-static void ChangeManaged(w)
-Widget w;
+static void ChangeManaged(Widget w)
 {
 	MenuWidget cw = (MenuWidget) w;
 	Dimension height , width;
@@ -507,7 +462,7 @@
 
 	menuClassRec.menu_class.get_internal_dimension(w , &x , &y , &width , &height);
 
-	width = get_max_width(w);
+	width = get_max_width(cw);
 
 	ForAllChildren(cw , entry)
 	{
@@ -525,8 +480,7 @@
 
 }
 
-static void PopdownSubmenu(w)
-Widget w;
+static void PopdownSubmenu(Widget w)
 {
 	MenuWidget cw = (MenuWidget) w;
 	int i;
@@ -548,8 +502,7 @@
 
 }
 
-static void PopdownAll(w)
-Widget w;
+static void PopdownAll(Widget w)
 {
 	MenuWidget cw = (MenuWidget) w;
 	int i;
@@ -569,8 +522,7 @@
 
 }
 
-static void InsertSubmenu(w)
-Widget w;
+static void InsertSubmenu(Widget w)
 {
 	MenuWidget cw = (MenuWidget) w;
 
@@ -592,12 +544,8 @@
 }
 
 
-static void GetInternalDimension(w,x,y,width,height)
-Widget w;
-Position *x;
-Position *y;
-Dimension *width;
-Dimension *height;
+static void GetInternalDimension(Widget w, Position *x, Position *y,
+		Dimension *width, Dimension *height)
 {
 	MenuWidget cw = (MenuWidget) w;
 	
@@ -630,10 +578,7 @@
 	}
 }
 
-static void SetInternalDimension(w,width,height)
-Widget w;
-Dimension width;
-Dimension height;
+static void SetInternalDimension(Widget w, Dimension width, Dimension height)
 {
 	MenuWidget cw = (MenuWidget) w;
 
@@ -662,8 +607,7 @@
 	XtResizeWidget(w , cw->core.width , cw->core.height , cw->core.border_width);
 }
 
-static Dimension get_height(w)
-MenuWidget w;
+static Dimension get_height(MenuWidget w)
 {
 	BaseMEObject * entry;
 	Dimension height = 0;
@@ -678,8 +622,7 @@
 	return height;
 }
 
-static Dimension get_max_width(w)
-MenuWidget w;
+static Dimension get_max_width(MenuWidget w)
 {
 	BaseMEObject * entry;
 	Dimension width = 0;
@@ -702,10 +645,7 @@
 	return width;
 }
 
-static void GrabAll(w,client_data,call_data)
-Widget w;
-XtPointer client_data;
-XtPointer call_data;
+static void GrabAll(Widget w, XtPointer client_data, XtPointer call_data)
 {
 	MenuWidget cw = (MenuWidget) w;
 	Display *dpy = XtDisplay(w);
@@ -740,22 +680,16 @@
 		((MenuWidgetClass) cw->core.widget_class)->menu_class.insert_submenu(w);
 }
 
-static void Enter (w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Enter (Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	MenuWidget cw = (MenuWidget) w;
 
 	((MenuWidgetClass)cw->core.widget_class)->menu_class.popdown_submenu(w);
 }
 
-static void Leave (w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Leave (Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	MenuWidget cw = (MenuWidget) w;
 	BaseMEObjectClass class;
@@ -772,11 +706,8 @@
 	cw->menu.last_selected = NULL;
 }
 
-static void Motion (w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Motion (Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	MenuWidget cw = (MenuWidget) w;
 	BaseMEObject * entry = NULL;
@@ -807,11 +738,8 @@
 	}
 }
 
-static void Button_Release (w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Button_Release (Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	MenuWidget cw = (MenuWidget) w;
 	BaseMEObject * entry = NULL;
@@ -840,11 +768,8 @@
 	}
 }
 
-static void Button_Press (w, event, params, num_params)
-Widget w;
-XEvent *event;
-String *params;
-Cardinal *num_params;
+static void Button_Press (Widget w, XEvent *event,
+		String *params, Cardinal *num_params)
 {
 	MenuWidget cw = (MenuWidget) w;
 	BaseMEObject * entry = NULL;
@@ -868,21 +793,15 @@
 
 }
 
-static void timerCB(client_data,timer)
-XtPointer  client_data;
-XtIntervalId * timer;
+static void timerCB(XtPointer client_data, XtIntervalId *timer)
 {
 	MenuWidget w = (MenuWidget) client_data;
 
 	w->menu.down_after_br = True;
 }
 
-static void GetPositionEntry(w , x , y , event , entry )
-Widget w;
-int x;
-int y;
-XEvent *event;
-BaseMEObject **entry;
+static void GetPositionEntry(Widget w , int x , int y ,
+		XEvent *event , BaseMEObject **entry )
 {
 	MenuWidget cw = (MenuWidget) w;
 	BaseMEObject * pentry;
@@ -912,8 +831,7 @@
 	}
 }
 
-static void popdown_menu(w)
-Widget w;
+static void popdown_menu(Widget w)
 {
 	BaseMEObjectClass class;
 	BaseMEObject * pentry;
diff -urNP ../siag-3.4.1/common/Makefile.am ./common/Makefile.am
--- ../siag-3.4.1/common/Makefile.am	Mon Sep 11 13:08:12 2000
+++ ./common/Makefile.am	Fri Oct 27 01:33:58 2000
@@ -3,6 +3,9 @@
 
 bin_SCRIPTS = siagrun
 
+bin_PROGRAMS = pfb2ps
+pfb2ps_SOURCES = pfb2ps.c
+
 noinst_LIBRARIES = libcommon.a 
 
 libcommon_a_SOURCES = cmalloc.c common.c richchar.c fonts.c globals.c ps.c
@@ -26,7 +29,7 @@
 	dictionary.no dictionary.hr dictionary.da dictionary.pl \
 	dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR
 
-common_SCRIPTS = any2xpm readpfa
+common_SCRIPTS = any2xpm
 
 EXTRA_DIST = $(bin_SCRIPTS) $(common_DATA) $(common_SCRIPTS) rgb.c rgb.txt \
 	newdict mkt1cfg siag.magic siag.dfmext kdeinst
diff -urNP ../siag-3.4.1/common/Makefile.in ./common/Makefile.in
--- ../siag-3.4.1/common/Makefile.in	Thu Oct 19 14:44:50 2000
+++ ./common/Makefile.in	Fri Oct 27 12:49:47 2000
@@ -89,6 +89,9 @@
 
 bin_SCRIPTS = siagrun
 
+bin_PROGRAMS = pfb2ps
+pfb2ps_SOURCES = pfb2ps.c
+
 noinst_LIBRARIES = libcommon.a 
 
 libcommon_a_SOURCES = cmalloc.c common.c richchar.c fonts.c globals.c ps.c
@@ -105,7 +108,7 @@
 common_DATA = common.scm position.scm tools.scm 	fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc 	dictionary.sv dictionary.es dictionary.de dictionary.fr 	dictionary.it 	dictionary.no dictionary.hr dictionary.da dictionary.pl 	dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR
 
 
-common_SCRIPTS = any2xpm readpfa
+common_SCRIPTS = any2xpm
 
 EXTRA_DIST = $(bin_SCRIPTS) $(common_DATA) $(common_SCRIPTS) rgb.c rgb.txt 	newdict mkt1cfg siag.magic siag.dfmext kdeinst
 
@@ -127,6 +130,12 @@
 libcommon_a_OBJECTS =  cmalloc.o common.o richchar.o fonts.o globals.o \
 ps.o
 AR = ar
+PROGRAMS =  $(bin_PROGRAMS)
+
+pfb2ps_OBJECTS =  pfb2ps.o
+pfb2ps_LDADD = $(LDADD)
+pfb2ps_DEPENDENCIES = 
+pfb2ps_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS) $(common_SCRIPTS)
 
 CFLAGS = @CFLAGS@
@@ -144,8 +153,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(libcommon_a_SOURCES)
-OBJECTS = $(libcommon_a_OBJECTS)
+SOURCES = $(libcommon_a_SOURCES) $(pfb2ps_SOURCES)
+OBJECTS = $(libcommon_a_OBJECTS) $(pfb2ps_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -191,6 +200,35 @@
 	$(AR) cru libcommon.a $(libcommon_a_OBJECTS) $(libcommon_a_LIBADD)
 	$(RANLIB) libcommon.a
 
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	done
+
+pfb2ps: $(pfb2ps_OBJECTS) $(pfb2ps_DEPENDENCIES)
+	@rm -f pfb2ps
+	$(LINK) $(pfb2ps_LDFLAGS) $(pfb2ps_OBJECTS) $(pfb2ps_LDADD) $(LIBS)
+
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -366,6 +404,7 @@
 common.o: common.c ../config.h cmalloc.h common.h traceme.h
 fonts.o: fonts.c common.h cmalloc.h oldfonts.h fonts.h
 globals.o: globals.c
+pfb2ps.o: pfb2ps.c
 ps.o: ps.c ps.h
 richchar.o: richchar.c cmalloc.h fonts.h traceme.h
 
@@ -377,7 +416,7 @@
 check: check-recursive
 installcheck-am:
 installcheck: installcheck-recursive
-install-exec-am: install-binSCRIPTS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
 install-exec: install-exec-recursive
 
 install-data-am: install-commonSCRIPTS install-commonDATA
@@ -386,17 +425,17 @@
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-binSCRIPTS uninstall-commonSCRIPTS \
-		uninstall-commonDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+		uninstall-commonSCRIPTS uninstall-commonDATA
 uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS)
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS)
 all-redirect: all-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(commondir) \
-		$(DESTDIR)$(commondir)
+	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \
+		$(DESTDIR)$(commondir) $(DESTDIR)$(commondir)
 
 
 mostlyclean-generic:
@@ -410,23 +449,26 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-binPROGRAMS mostlyclean-tags \
+		mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-binPROGRAMS \
+		clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-binPROGRAMS distclean-tags distclean-generic \
+		clean-am
 
 distclean: distclean-recursive
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-compile maintainer-clean-binPROGRAMS \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -435,7 +477,9 @@
 .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
+maintainer-clean-compile mostlyclean-binPROGRAMS distclean-binPROGRAMS \
+clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
+install-binPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
 uninstall-commonSCRIPTS install-commonSCRIPTS uninstall-commonDATA \
 install-commonDATA install-data-recursive uninstall-data-recursive \
 install-exec-recursive uninstall-exec-recursive installdirs-recursive \
diff -urNP ../siag-3.4.1/common/cmalloc.c ./common/cmalloc.c
--- ../siag-3.4.1/common/cmalloc.c	Thu Apr  6 14:52:55 2000
+++ ./common/cmalloc.c	Fri Oct 20 09:41:42 2000
@@ -147,6 +147,10 @@
 	p = malloc(size);
 	if (p == NULL) alloc_fail();
 	if (paranoia) insert_node(p);
+
+	/* Courtesy of Youki Kadobayashi <youki-k@is.aist-nara.ac.jp> */
+	memset(p, 1, size);
+
 	return p;
 }
 
diff -urNP ../siag-3.4.1/common/common.c ./common/common.c
--- ../siag-3.4.1/common/common.c	Sun Aug  6 23:23:58 2000
+++ ./common/common.c	Fri Oct 27 01:29:38 2000
@@ -528,3 +528,68 @@
 	return dir;
 }
 
+
+/* This translates ps fonts in .pfb format to ASCII ps files. */
+
+/* 2000-10-26 Snarfed from Groff by Ulric */
+
+/* Binary bytes per output line. */
+#define BYTES_PER_LINE (64/2)
+#define HEX_DIGITS "0123456789abcdef"
+
+#define error(p) { fprintf(stderr, "%s\n", p); return 1; }
+
+int pfb2ps(FILE *fpin, FILE *fpout)
+{
+	if (fpin == NULL || fpout == NULL) error("no file");
+	for (;;) {
+		int type, c, i;
+		long n;
+
+		c = getc(fpin);
+		if (c != 0x80) {
+			/* first byte of packet not 0x80, treat as ascii */
+			do {
+				putc(c, fpout);
+				c = getc(fpin);
+			} while (c != EOF);
+			return 0;
+		}
+		type = getc(fpin);
+		if (type == 3) break;
+		if (type != 1 && type != 2) error("bad packet type");
+		n = 0;
+		for (i = 0; i < 4; i++) {
+			c = getc(fpin);
+			if (c == EOF) error("end of file in packet header");
+			n |= (long) c << (i << 3);
+		}
+		if (n < 0) error("negative packet length");
+		if (type == 1) {
+			while (--n >= 0) {
+				c = getc(fpin);
+				if (c == EOF)
+					error("end of file in text packet");
+				if (c == '\r') c = '\n';
+				putc(c, fpout);
+			}
+			if (c != '\n') putc('\n', fpout);
+		} else {
+			int count = 0;
+			while (--n >= 0) {
+				c = getc(fpin);
+				if (c == EOF)
+					error("end of file in binary packet");
+				if (count >= BYTES_PER_LINE) {
+					putc('\n', fpout);
+					count = 0;
+				}
+				count++;
+				putc(HEX_DIGITS[(c >> 4) & 0xf], fpout);
+				putc(HEX_DIGITS[c & 0xf], fpout);
+			}
+			putc('\n', fpout);
+		}
+	}
+	return 0;
+}
diff -urNP ../siag-3.4.1/common/common.h ./common/common.h
--- ../siag-3.4.1/common/common.h	Sun Aug  6 23:24:58 2000
+++ ./common/common.h	Fri Oct 27 01:07:17 2000
@@ -93,4 +93,6 @@
 extern int pr_scr_flag;		/* if the display needs updating */
 extern int input_warp_pointer;		/* move cursor to input field */
 
+int pfb2ps(FILE *, FILE *);
+
 #endif /* COMMON_H */
diff -urNP ../siag-3.4.1/common/docs/fonts.html ./common/docs/fonts.html
--- ../siag-3.4.1/common/docs/fonts.html	Tue Aug 22 08:02:45 2000
+++ ./common/docs/fonts.html	Thu Oct 26 07:54:11 2000
@@ -13,6 +13,8 @@
 
 <pre>
 [Font Name]   Name as it appears to the user
+AFM=roman|italic|bold|italicbold      AFM filename
+PFB=roman|italic|bold|italicbold      PFB filename
 X=roman|italic|bold|italicbold        X fonts
 PS=roman|italic|bold|italicbold       PS fonts for printing
 T1=roman|italic|bold|italicbold       T1 fonts (used by libt1)
@@ -29,16 +31,28 @@
 AFM=bchr.afm|bchri.afm|bchb.afm|bchbi.afm
 X=-*-new century schoolbook-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-bold-i-*--*-%d-%d-%d-*-*-*-*
 T1=CharterBT-Roman|CharterBT-Italic|CharterBT-Bold|CharterBT-BoldItalic
+
+[Times2]
+AFM=tnrl2___.afm|tnrl2i__.afm|tnrl2b__.afm|tnrl2bi_.afm
+X=-*-times-medium-r-*--*-%d-%d-%d-*-*-*-2|-*-times-medium-i-*--*-%d-%d-%d-*-*-*-2|-*-times-bold-r-*--*-%d-%d-%d-*-*-*-2|-*-times-bold-i-*--*-%d-%d-%d-*-*-*-2
+PS=TimesNewRomanL2|TimesNewRomanL2-Italic|TimesNewRomanL2-Bold|TimesNewRomanL2-BoldItalic
+PFB=tnrl2___.pfb|tnrl2i__.pfb|tnrl2b__.pfb|tnrl2bi_.pfb
 </pre>
 
 The AFM directive specifies where the font metric files are. If the files
 are not available, X metrics will be used instead which will be less precise.
 <p>
-The afm files are by default installed in the directory
+The optional PFB directive specifies where the font files are. A font
+that is not already installed on the printer must be included in the
+printout, which is what this directive accomplishes. In the example,
+Times2 is a Latin2 equivalent of Times. This is necessary because
+Latin2 glyphs are not included in most standard fonts.
+<p>
+The afm and pfb files are by default installed in the directory
 ${prefix}/share/siag/common/fonts.
 
 <hr>
-<address>Ulric Eriksson - August 2000 - ulric@siag.nu</address>
+<address>Ulric Eriksson - October 2000 - ulric@siag.nu</address>
 </body>
 </html>
 
diff -urNP ../siag-3.4.1/common/fonts/Makefile.am ./common/fonts/Makefile.am
--- ../siag-3.4.1/common/fonts/Makefile.am	Thu Oct 12 16:25:46 2000
+++ ./common/fonts/Makefile.am	Wed Oct 25 15:06:22 2000
@@ -13,6 +13,9 @@
 	utmb8a.afm utmbi8a.afm utmr8a.afm utmri8a.afm \
 	zcmi.afm zd.afm \
 	bchb.afm bchb.pfb bchbi.afm bchbi.pfb \
-	bchr.afm bchr.pfb bchri.afm bchri.pfb
+	bchr.afm bchr.pfb bchri.afm bchri.pfb \
+	tnrl2___.afm tnrl2___.pfb tnrl2i__.afm tnrl2i__.pfb \
+	tnrl2b__.afm tnrl2b__.pfb tnrl2bi_.afm tnrl2bi_.pfb
 
 EXTRA_DIST = $(fonts_DATA) README
+
diff -urNP ../siag-3.4.1/common/fonts/Makefile.in ./common/fonts/Makefile.in
--- ../siag-3.4.1/common/fonts/Makefile.in	Thu Oct 19 14:44:53 2000
+++ ./common/fonts/Makefile.in	Fri Oct 27 12:49:49 2000
@@ -86,7 +86,7 @@
 XAWLIB = @XAWLIB@
 
 fontsdir = $(datadir)/siag/common/fonts
-fonts_DATA = agd.afm agdo.afm agw.afm agwo.afm 	bkd.afm bkdi.afm bkl.afm bkli.afm 	cob.afm cobo.afm com.afm coo.afm 	hv.afm hvb.afm hvbo.afm hvn.afm 	hvnb.afm hvnbo.afm hvno.afm hvo.afm 	ncb.afm ncbi.afm nci.afm ncr.afm 	pob.afm pobi.afm poi.afm por.afm 	sy.afm 	tib.afm tibi.afm tii.afm tir.afm 	uhvb8a.afm uhvbo8a.afm uhvr8a.afm uhvro8a.afm 	utmb8a.afm utmbi8a.afm utmr8a.afm utmri8a.afm 	zcmi.afm zd.afm 	bchb.afm bchb.pfb bchbi.afm bchbi.pfb 	bchr.afm bchr.pfb bchri.afm bchri.pfb
+fonts_DATA = agd.afm agdo.afm agw.afm agwo.afm 	bkd.afm bkdi.afm bkl.afm bkli.afm 	cob.afm cobo.afm com.afm coo.afm 	hv.afm hvb.afm hvbo.afm hvn.afm 	hvnb.afm hvnbo.afm hvno.afm hvo.afm 	ncb.afm ncbi.afm nci.afm ncr.afm 	pob.afm pobi.afm poi.afm por.afm 	sy.afm 	tib.afm tibi.afm tii.afm tir.afm 	uhvb8a.afm uhvbo8a.afm uhvr8a.afm uhvro8a.afm 	utmb8a.afm utmbi8a.afm utmr8a.afm utmri8a.afm 	zcmi.afm zd.afm 	bchb.afm bchb.pfb bchbi.afm bchbi.pfb 	bchr.afm bchr.pfb bchri.afm bchri.pfb 	tnrl2___.afm tnrl2___.pfb tnrl2i__.afm tnrl2i__.pfb 	tnrl2b__.afm tnrl2b__.pfb tnrl2bi_.afm tnrl2bi_.pfb
 
 
 EXTRA_DIST = $(fonts_DATA) README
diff -urNP ../siag-3.4.1/common/fonts/README ./common/fonts/README
--- ../siag-3.4.1/common/fonts/README	Sun Aug 13 19:58:09 2000
+++ ./common/fonts/README	Wed Oct 25 15:07:05 2000
@@ -21,3 +21,5 @@
 Nimbus Sans: uhvr8a.afm, uhvro8a.afm, uhvb8a.afm, uhvbo8a.afm
 Nimbus Roman: utmr8a.afm, utmri8a.afm, utmb8a.afm, utmbi8a.afm
 
+Times2 is a Times equivalent in Latin2 encoding.
+
diff -urNP ../siag-3.4.1/common/fonts/tnrl2___.afm ./common/fonts/tnrl2___.afm
--- ../siag-3.4.1/common/fonts/tnrl2___.afm	Thu Jan  1 01:00:00 1970
+++ ./common/fonts/tnrl2___.afm	Wed Oct 25 15:05:07 2000
@@ -0,0 +1,361 @@
+StartFontMetrics 2.0
+Comment Generated by Fontographer 3.5 Sat Jan 25 00:23:32 1997
+FontName TimesNewRomanL2
+FullName Times New Roman L2
+FamilyName Times New Roman L2
+Weight Normal
+Notice This font is created by Peter Soos. The font encoding is Latin-2 (ISO-8859.2).
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -109
+UnderlineThickness 49
+Version 1.000
+EncodingScheme Windows
+FontBBox -77 -226 1009 886
+CapHeight 662
+XHeight 447
+Descender -214
+Ascender 693
+StartCharMetrics 223
+C 5 ; WX 333 ; N breve ; B 26 526 306 663 ; 
+C 6 ; WX 333 ; N dotaccent ; B 113 546 220 652 ; 
+C 8 ; WX 333 ; N ring ; B 73 508 260 695 ; 
+C 10 ; WX 333 ; N hungarumlaut ; B 38 509 314 678 ; 
+C 11 ; WX 333 ; N ogonek ; B 72 -177 296 7 ; 
+C 12 ; WX 333 ; N caron ; B 29 514 304 676 ; 
+C 14 ; WX 278 ; N dotlessi ; B 29 0 253 460 ; 
+C 32 ; WX 250 ; N space ; B 0 0 0 0 ; 
+C 33 ; WX 333 ; N exclam ; B 111 -13 221 677 ; 
+C 34 ; WX 408 ; N quotedbl ; B 64 392 341 677 ; 
+C 35 ; WX 500 ; N numbersign ; B 18 -13 481 677 ; 
+C 36 ; WX 500 ; N dollar ; B 52 -76 449 717 ; 
+C 37 ; WX 833 ; N percent ; B 35 -27 798 677 ; 
+C 38 ; WX 778 ; N ampersand ; B 36 -15 747 677 ; 
+C 39 ; WX 180 ; N quotesingle ; B 39 392 137 677 ; 
+C 40 ; WX 333 ; N parenleft ; B 41 -213 310 694 ; 
+C 41 ; WX 333 ; N parenright ; B 22 -213 291 694 ; 
+C 42 ; WX 500 ; N asterisk ; B 70 289 429 694 ; 
+C 43 ; WX 564 ; N plus ; B 18 68 544 595 ; 
+C 44 ; WX 250 ; N comma ; B 53 -166 199 97 ; 
+C 45 ; WX 333 ; N hyphen ; B 40 187 292 261 ; 
+C 46 ; WX 250 ; N period ; B 70 -13 179 94 ; 
+C 47 ; WX 278 ; N slash ; B 1 -13 280 694 ; 
+C 48 ; WX 500 ; N zero ; B 36 -11 464 675 ; 
+C 49 ; WX 500 ; N one ; B 117 0 377 675 ; 
+C 50 ; WX 500 ; N two ; B 21 0 458 675 ; 
+C 51 ; WX 500 ; N three ; B 40 -11 416 675 ; 
+C 52 ; WX 500 ; N four ; B 15 0 465 675 ; 
+C 53 ; WX 500 ; N five ; B 47 -11 434 662 ; 
+C 54 ; WX 500 ; N six ; B 42 -11 461 675 ; 
+C 55 ; WX 500 ; N seven ; B 37 -13 455 662 ; 
+C 56 ; WX 500 ; N eight ; B 60 -11 442 675 ; 
+C 57 ; WX 500 ; N nine ; B 39 -13 457 675 ; 
+C 58 ; WX 278 ; N colon ; B 85 -13 195 460 ; 
+C 59 ; WX 278 ; N semicolon ; B 69 -166 214 461 ; 
+C 60 ; WX 564 ; N less ; B 19 91 544 572 ; 
+C 61 ; WX 564 ; N equal ; B 18 231 544 431 ; 
+C 62 ; WX 564 ; N greater ; B 18 91 543 572 ; 
+C 63 ; WX 444 ; N question ; B 44 -13 403 677 ; 
+C 64 ; WX 921 ; N at ; B 47 -215 896 694 ; 
+C 65 ; WX 722 ; N A ; B 7 0 710 677 ; 
+C 66 ; WX 667 ; N B ; B 16 0 612 662 ; 
+C 67 ; WX 667 ; N C ; B 36 -15 632 677 ; 
+C 68 ; WX 722 ; N D ; B 17 0 684 662 ; 
+C 69 ; WX 611 ; N E ; B 20 0 587 662 ; 
+C 70 ; WX 556 ; N F ; B 16 0 515 662 ; 
+C 71 ; WX 722 ; N G ; B 35 -15 708 677 ; 
+C 72 ; WX 722 ; N H ; B 17 0 701 662 ; 
+C 73 ; WX 333 ; N I ; B 24 0 308 662 ; 
+C 74 ; WX 389 ; N J ; B 20 -15 383 662 ; 
+C 75 ; WX 722 ; N K ; B 16 0 730 662 ; 
+C 76 ; WX 611 ; N L ; B 20 0 589 662 ; 
+C 77 ; WX 889 ; N M ; B 16 0 868 662 ; 
+C 78 ; WX 722 ; N N ; B -13 -10 708 662 ; 
+C 79 ; WX 722 ; N O ; B 35 -15 683 677 ; 
+C 80 ; WX 556 ; N P ; B 16 0 520 662 ; 
+C 81 ; WX 722 ; N Q ; B 35 -195 684 677 ; 
+C 82 ; WX 667 ; N R ; B 17 0 675 662 ; 
+C 83 ; WX 556 ; N S ; B 62 -15 502 677 ; 
+C 84 ; WX 611 ; N T ; B 30 0 585 662 ; 
+C 85 ; WX 722 ; N U ; B 5 -15 711 662 ; 
+C 86 ; WX 722 ; N V ; B 8 -15 709 662 ; 
+C 87 ; WX 944 ; N W ; B 13 -15 936 662 ; 
+C 88 ; WX 722 ; N X ; B 7 0 710 662 ; 
+C 89 ; WX 722 ; N Y ; B 9 0 707 662 ; 
+C 90 ; WX 611 ; N Z ; B 12 0 583 662 ; 
+C 91 ; WX 333 ; N bracketleft ; B 82 -198 296 677 ; 
+C 92 ; WX 278 ; N backslash ; B 1 -13 279 694 ; 
+C 93 ; WX 333 ; N bracketright ; B 36 -198 251 677 ; 
+C 94 ; WX 469 ; N asciicircum ; B 18 325 450 675 ; 
+C 95 ; WX 500 ; N underscore ; B -8 -215 508 -174 ; 
+C 96 ; WX 333 ; N grave ; B 57 510 218 678 ; 
+C 97 ; WX 444 ; N a ; B 35 -9 441 460 ; 
+C 98 ; WX 500 ; N b ; B -2 -13 465 694 ; 
+C 99 ; WX 444 ; N c ; B 34 -13 411 460 ; 
+C 100 ; WX 500 ; N d ; B 33 -13 502 694 ; 
+C 101 ; WX 444 ; N e ; B 37 -13 415 460 ; 
+C 102 ; WX 333 ; N f ; B 38 0 434 693 ; 
+C 103 ; WX 500 ; N g ; B 29 -215 481 460 ; 
+C 104 ; WX 500 ; N h ; B 6 0 493 694 ; 
+C 105 ; WX 278 ; N i ; B 29 0 253 694 ; 
+C 106 ; WX 278 ; N j ; B -76 -215 194 694 ; 
+C 107 ; WX 500 ; N k ; B 8 0 505 694 ; 
+C 108 ; WX 278 ; N l ; B 29 0 257 694 ; 
+C 109 ; WX 778 ; N m ; B 8 0 773 460 ; 
+C 110 ; WX 500 ; N n ; B 5 0 495 460 ; 
+C 111 ; WX 500 ; N o ; B 33 -13 465 460 ; 
+C 112 ; WX 500 ; N p ; B -3 -213 465 460 ; 
+C 113 ; WX 500 ; N q ; B 33 -213 500 460 ; 
+C 114 ; WX 333 ; N r ; B 6 0 339 460 ; 
+C 115 ; WX 389 ; N s ; B 48 -13 354 460 ; 
+C 116 ; WX 278 ; N t ; B 9 -7 279 594 ; 
+C 117 ; WX 500 ; N u ; B 0 -13 498 447 ; 
+C 118 ; WX 500 ; N v ; B 8 -13 490 447 ; 
+C 119 ; WX 722 ; N w ; B 6 -13 712 447 ; 
+C 120 ; WX 500 ; N x ; B 13 0 487 447 ; 
+C 121 ; WX 500 ; N y ; B 5 -215 494 447 ; 
+C 122 ; WX 444 ; N z ; B 20 0 427 447 ; 
+C 123 ; WX 480 ; N braceleft ; B 138 -215 410 694 ; 
+C 124 ; WX 200 ; N bar ; B 78 -215 119 694 ; 
+C 125 ; WX 480 ; N braceright ; B 86 -215 358 694 ; 
+C 126 ; WX 541 ; N asciitilde ; B 21 194 542 331 ; 
+C 130 ; WX 333 ; N quotesinglbase ; B 99 -166 244 97 ; 
+C 131 ; WX 500 ; N florin ; B 0 -210 487 677 ; 
+C 132 ; WX 444 ; N quotedblbase ; B 32 -154 415 97 ; 
+C 133 ; WX 1000 ; N ellipsis ; B 112 -13 887 94 ; 
+C 134 ; WX 500 ; N dagger ; B 49 -205 450 685 ; 
+C 135 ; WX 500 ; N daggerdbl ; B 67 -215 432 694 ; 
+C 136 ; WX 333 ; N circumflex ; B 29 514 304 676 ; 
+C 137 ; WX 1000 ; N perthousand ; B 31 -26 967 677 ; 
+C 138 ; WX 556 ; N Scaron ; B 62 -15 502 875 ; 
+C 139 ; WX 333 ; N guilsinglleft ; B 58 -3 274 456 ; 
+C 140 ; WX 889 ; N OE ; B 36 -7 860 667 ; 
+C 145 ; WX 333 ; N quoteleft ; B 90 424 239 677 ; 
+C 146 ; WX 333 ; N quoteright ; B 94 424 243 677 ; 
+C 147 ; WX 444 ; N quotedblleft ; B 32 425 415 677 ; 
+C 148 ; WX 444 ; N quotedblright ; B 32 522 415 774 ; 
+C 149 ; WX 350 ; N bullet ; B 54 208 299 453 ; 
+C 150 ; WX 500 ; N endash ; B -8 221 508 256 ; 
+C 151 ; WX 1000 ; N emdash ; B -9 221 1008 257 ; 
+C 152 ; WX 333 ; N tilde ; B 10 533 322 662 ; 
+C 153 ; WX 980 ; N trademark ; B 14 268 963 662 ; 
+C 154 ; WX 389 ; N scaron ; B 48 -13 354 676 ; 
+C 155 ; WX 333 ; N guilsinglright ; B 56 -3 276 456 ; 
+C 156 ; WX 722 ; N oe ; B 32 -13 688 460 ; 
+C 159 ; WX 722 ; N Ydieresis ; B 9 0 707 833 ; 
+C 160 ; WX 250 ; N nbspace ; B 0 0 0 0 ; 
+C 161 ; WX 722 ; N exclamdown ; B 7 -177 725 677 ; 
+C 162 ; WX 333 ; N cent ; B 26 526 306 663 ; 
+C 163 ; WX 611 ; N sterling ; B 10 0 585 662 ; 
+C 164 ; WX 500 ; N currency ; B 13 96 485 566 ; 
+C 165 ; WX 611 ; N yen ; B 20 0 589 677 ; 
+C 166 ; WX 556 ; N brokenbar ; B 62 -15 502 877 ; 
+C 167 ; WX 500 ; N section ; B 76 -195 423 675 ; 
+C 168 ; WX 333 ; N dieresis ; B 27 546 305 652 ; 
+C 169 ; WX 556 ; N copyright ; B 61 -15 501 875 ; 
+C 170 ; WX 556 ; N ordfeminine ; B 62 -190 502 677 ; 
+C 171 ; WX 611 ; N guillemotleft ; B 30 0 585 875 ; 
+C 172 ; WX 611 ; N logicalnot ; B 12 0 583 877 ; 
+C 173 ; WX 333 ; N minus ; B 40 187 292 261 ; 
+C 174 ; WX 611 ; N registered ; B 12 0 583 875 ; 
+C 175 ; WX 611 ; N macron ; B 12 0 583 834 ; 
+C 176 ; WX 400 ; N degree ; B 47 376 348 676 ; 
+C 177 ; WX 444 ; N plusminus ; B 35 -177 504 460 ; 
+C 178 ; WX 333 ; N twosuperior ; B 72 -177 296 7 ; 
+C 179 ; WX 278 ; N threesuperior ; B 14 0 269 694 ; 
+C 180 ; WX 333 ; N acute ; B 115 510 275 678 ; 
+C 181 ; WX 406 ; N mu ; B 29 0 397 694 ; 
+C 182 ; WX 389 ; N paragraph ; B 48 -13 354 678 ; 
+C 183 ; WX 333 ; N periodcentered ; B 29 514 304 676 ; 
+C 184 ; WX 333 ; N cedilla ; B 91 -190 242 7 ; 
+C 185 ; WX 389 ; N onesuperior ; B 48 -13 354 676 ; 
+C 186 ; WX 389 ; N ordmasculine ; B 48 -190 354 460 ; 
+C 187 ; WX 427 ; N guillemotright ; B 9 -7 418 694 ; 
+C 188 ; WX 444 ; N onequarter ; B 20 0 427 678 ; 
+C 189 ; WX 333 ; N onehalf ; B 38 509 314 678 ; 
+C 190 ; WX 444 ; N threequarters ; B 20 0 427 676 ; 
+C 191 ; WX 444 ; N questiondown ; B 20 0 427 652 ; 
+C 192 ; WX 667 ; N Agrave ; B 17 0 675 877 ; 
+C 193 ; WX 722 ; N Aacute ; B 7 0 710 877 ; 
+C 194 ; WX 722 ; N Acircumflex ; B 7 0 710 875 ; 
+C 195 ; WX 722 ; N Atilde ; B 12 0 715 858 ; 
+C 196 ; WX 722 ; N Adieresis ; B 7 0 710 833 ; 
+C 197 ; WX 611 ; N Aring ; B 20 0 589 877 ; 
+C 198 ; WX 667 ; N AE ; B 36 -15 632 877 ; 
+C 199 ; WX 667 ; N Ccedilla ; B 36 -190 632 677 ; 
+C 200 ; WX 667 ; N Egrave ; B 36 -15 632 875 ; 
+C 201 ; WX 611 ; N Eacute ; B 20 0 587 877 ; 
+C 202 ; WX 611 ; N Ecircumflex ; B 20 -177 587 662 ; 
+C 203 ; WX 611 ; N Edieresis ; B 20 0 587 833 ; 
+C 204 ; WX 611 ; N Igrave ; B 20 0 587 875 ; 
+C 205 ; WX 333 ; N Iacute ; B 24 0 308 877 ; 
+C 206 ; WX 333 ; N Icircumflex ; B 24 0 308 875 ; 
+C 207 ; WX 722 ; N Idieresis ; B 17 0 684 875 ; 
+C 208 ; WX 722 ; N Eth ; B 17 0 683 662 ; 
+C 209 ; WX 722 ; N Ntilde ; B -13 -10 708 877 ; 
+C 210 ; WX 722 ; N Ograve ; B -13 -10 708 875 ; 
+C 211 ; WX 722 ; N Oacute ; B 35 -15 683 877 ; 
+C 212 ; WX 722 ; N Ocircumflex ; B 35 -15 683 875 ; 
+C 213 ; WX 722 ; N Otilde ; B 35 -15 683 877 ; 
+C 214 ; WX 722 ; N Odieresis ; B 35 -15 683 833 ; 
+C 215 ; WX 564 ; N multiply ; B 80 131 481 532 ; 
+C 216 ; WX 667 ; N Oslash ; B 17 0 675 875 ; 
+C 217 ; WX 722 ; N Ugrave ; B 5 -15 711 885 ; 
+C 218 ; WX 722 ; N Uacute ; B 5 -15 711 877 ; 
+C 219 ; WX 722 ; N Ucircumflex ; B 5 -15 711 877 ; 
+C 220 ; WX 722 ; N Udieresis ; B 5 -15 711 833 ; 
+C 221 ; WX 722 ; N Yacute ; B 9 0 707 877 ; 
+C 222 ; WX 611 ; N Thorn ; B 30 -225 585 662 ; 
+C 223 ; WX 500 ; N germandbls ; B 17 -6 467 694 ; 
+C 224 ; WX 333 ; N agrave ; B 6 0 339 678 ; 
+C 225 ; WX 444 ; N aacute ; B 35 -9 441 678 ; 
+C 226 ; WX 444 ; N acircumflex ; B 35 -9 441 676 ; 
+C 227 ; WX 444 ; N atilde ; B 34 -9 440 663 ; 
+C 228 ; WX 444 ; N adieresis ; B 35 -9 441 652 ; 
+C 229 ; WX 278 ; N aring ; B 29 0 257 877 ; 
+C 230 ; WX 444 ; N ae ; B 34 -13 411 678 ; 
+C 231 ; WX 444 ; N ccedilla ; B 34 -190 411 460 ; 
+C 232 ; WX 444 ; N egrave ; B 34 -13 411 676 ; 
+C 233 ; WX 444 ; N eacute ; B 37 -13 415 678 ; 
+C 234 ; WX 444 ; N ecircumflex ; B 37 -177 462 460 ; 
+C 235 ; WX 444 ; N edieresis ; B 37 -13 415 652 ; 
+C 236 ; WX 444 ; N igrave ; B 37 -13 415 676 ; 
+C 237 ; WX 278 ; N iacute ; B 29 0 253 678 ; 
+C 238 ; WX 278 ; N icircumflex ; B 6 0 281 676 ; 
+C 239 ; WX 646 ; N idieresis ; B 33 -13 637 694 ; 
+C 240 ; WX 500 ; N eth ; B 18 -13 487 694 ; 
+C 241 ; WX 500 ; N ntilde ; B 5 0 495 678 ; 
+C 242 ; WX 500 ; N ograve ; B 5 0 495 676 ; 
+C 243 ; WX 500 ; N oacute ; B 33 -13 465 678 ; 
+C 244 ; WX 500 ; N ocircumflex ; B 33 -13 465 676 ; 
+C 245 ; WX 500 ; N otilde ; B 33 -13 465 678 ; 
+C 246 ; WX 500 ; N odieresis ; B 33 -13 465 652 ; 
+C 247 ; WX 549 ; N divide ; B 11 136 537 524 ; 
+C 248 ; WX 333 ; N oslash ; B 6 0 339 676 ; 
+C 249 ; WX 500 ; N ugrave ; B 0 -13 498 695 ; 
+C 250 ; WX 500 ; N uacute ; B 0 -13 498 678 ; 
+C 251 ; WX 500 ; N ucircumflex ; B 0 -13 498 678 ; 
+C 252 ; WX 500 ; N udieresis ; B 0 -13 498 652 ; 
+C 253 ; WX 500 ; N yacute ; B 5 -215 494 678 ; 
+C 254 ; WX 278 ; N thorn ; B 9 -225 279 594 ; 
+C 255 ; WX 333 ; N ydieresis ; B 241 291 344 394 ; 
+C 274 ; WX 333 ; N c274 ; B 241 291 344 394 ; 
+EndCharMetrics
+StartKernData
+StartKernPairs 113
+KPX space A -55
+KPX space T -18
+KPX space V -18
+KPX space W -18
+KPX space Y -37
+KPX one one -37
+KPX A space -55
+KPX A T -111
+KPX A V -129
+KPX A W -80
+KPX A Y -92
+KPX A v -74
+KPX A w -92
+KPX A y -92
+KPX A quoteright -111
+KPX F comma -80
+KPX F period -80
+KPX F A -74
+KPX L space -37
+KPX L T -92
+KPX L V -92
+KPX L W -74
+KPX L Y -100
+KPX L y -55
+KPX L quoteright -92
+KPX P space -37
+KPX P comma -111
+KPX P period -111
+KPX P A -92
+KPX R T -60
+KPX R V -80
+KPX R W -55
+KPX R Y -55
+KPX R y -40
+KPX T space -18
+KPX T comma -74
+KPX T hyphen -92
+KPX T period -74
+KPX T colon -50
+KPX T semicolon -55
+KPX T A -80
+KPX T O -18
+KPX T a -70
+KPX T c -70
+KPX T e -70
+KPX T i -35
+KPX T o -70
+KPX T r -35
+KPX T s -70
+KPX T u -35
+KPX T w -70
+KPX T y -70
+KPX V space -18
+KPX V comma -129
+KPX V hyphen -92
+KPX V period -129
+KPX V colon -74
+KPX V semicolon -74
+KPX V A -129
+KPX V a -111
+KPX V e -111
+KPX V i -60
+KPX V o -129
+KPX V r -60
+KPX V u -60
+KPX V y -111
+KPX W space -18
+KPX W comma -92
+KPX W hyphen -55
+KPX W period -92
+KPX W colon -37
+KPX W semicolon -37
+KPX W A -111
+KPX W a -80
+KPX W e -80
+KPX W i -40
+KPX W o -80
+KPX W r -40
+KPX W u -40
+KPX W y -60
+KPX Y space -37
+KPX Y comma -129
+KPX Y hyphen -111
+KPX Y period -129
+KPX Y colon -92
+KPX Y semicolon -92
+KPX Y A -111
+KPX Y a -100
+KPX Y e -100
+KPX Y i -55
+KPX Y o -100
+KPX Y p -92
+KPX Y q -111
+KPX Y u -111
+KPX Y v -100
+KPX f f -18
+KPX f quoteright 55
+KPX r comma -40
+KPX r hyphen -20
+KPX r period -55
+KPX r g -18
+KPX r quoteright 37
+KPX v comma -65
+KPX v period -65
+KPX w comma -65
+KPX w period -65
+KPX y comma -65
+KPX y period -65
+KPX quoteleft quoteleft -74
+KPX quoteright space -74
+KPX quoteright s -55
+KPX quoteright t -18
+KPX quoteright quoteright -74
+EndKernPairs
+EndKernData
+EndFontMetrics
Binary files ../siag-3.4.1/common/fonts/tnrl2___.pfb and ./common/fonts/tnrl2___.pfb differ
diff -urNP ../siag-3.4.1/common/fonts/tnrl2b__.afm ./common/fonts/tnrl2b__.afm
--- ../siag-3.4.1/common/fonts/tnrl2b__.afm	Thu Jan  1 01:00:00 1970
+++ ./common/fonts/tnrl2b__.afm	Wed Oct 25 15:05:07 2000
@@ -0,0 +1,365 @@
+StartFontMetrics 2.0
+Comment Generated by Fontographer 3.5 Sat Jan 25 00:23:03 1997
+FontName TimesNewRomanL2-Bold
+FullName Times New Roman L2 Bold
+FamilyName Times New Roman L2
+Weight Bold
+Notice This font is created by Peter Soos. The font encoding is Latin-2 (ISO-8859.2).
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -109
+UnderlineThickness 95
+Version 1.000
+EncodingScheme Windows
+FontBBox -28 -241 1009 907
+CapHeight 662
+XHeight 457
+Descender -214
+Ascender 662
+StartCharMetrics 223
+C 5 ; WX 333 ; N breve ; B 19 520 314 677 ; 
+C 6 ; WX 333 ; N dotaccent ; B 95 524 238 667 ; 
+C 8 ; WX 333 ; N ring ; B 64 497 269 701 ; 
+C 10 ; WX 333 ; N hungarumlaut ; B 54 516 368 684 ; 
+C 11 ; WX 333 ; N ogonek ; B 49 -225 283 8 ; 
+C 12 ; WX 333 ; N caron ; B 10 510 323 696 ; 
+C 14 ; WX 278 ; N dotlessi ; B 20 0 267 456 ; 
+C 32 ; WX 250 ; N space ; B 0 0 0 0 ; 
+C 33 ; WX 333 ; N exclam ; B 85 -13 248 677 ; 
+C 34 ; WX 555 ; N quotedbl ; B 85 352 465 677 ; 
+C 35 ; WX 500 ; N numbersign ; B 19 -13 479 675 ; 
+C 36 ; WX 500 ; N dollar ; B 38 -67 468 680 ; 
+C 37 ; WX 1000 ; N percent ; B 69 -27 930 677 ; 
+C 38 ; WX 833 ; N ampersand ; B 40 -15 789 677 ; 
+C 39 ; WX 278 ; N quotesingle ; B 68 352 212 677 ; 
+C 40 ; WX 333 ; N parenleft ; B 40 -200 321 677 ; 
+C 41 ; WX 333 ; N parenright ; B 12 -200 293 677 ; 
+C 42 ; WX 500 ; N asterisk ; B 55 299 444 677 ; 
+C 43 ; WX 570 ; N plus ; B 19 66 553 597 ; 
+C 44 ; WX 250 ; N comma ; B 32 -175 217 149 ; 
+C 45 ; WX 333 ; N hyphen ; B 24 179 309 280 ; 
+C 46 ; WX 250 ; N period ; B 43 -12 206 150 ; 
+C 47 ; WX 278 ; N slash ; B 0 -15 280 677 ; 
+C 48 ; WX 500 ; N zero ; B 36 -13 463 675 ; 
+C 49 ; WX 500 ; N one ; B 65 0 423 675 ; 
+C 50 ; WX 500 ; N two ; B 24 0 451 675 ; 
+C 51 ; WX 500 ; N three ; B 16 -14 442 675 ; 
+C 52 ; WX 500 ; N four ; B 24 0 459 675 ; 
+C 53 ; WX 500 ; N five ; B 33 -13 462 662 ; 
+C 54 ; WX 500 ; N six ; B 37 -13 469 675 ; 
+C 55 ; WX 500 ; N seven ; B 33 -13 476 662 ; 
+C 56 ; WX 500 ; N eight ; B 35 -13 464 673 ; 
+C 57 ; WX 500 ; N nine ; B 30 -13 464 675 ; 
+C 58 ; WX 333 ; N colon ; B 85 -12 248 469 ; 
+C 59 ; WX 333 ; N semicolon ; B 74 -175 259 469 ; 
+C 60 ; WX 570 ; N less ; B 20 90 553 567 ; 
+C 61 ; WX 570 ; N equal ; B 19 218 553 441 ; 
+C 62 ; WX 570 ; N greater ; B 20 90 553 567 ; 
+C 63 ; WX 500 ; N question ; B 61 -13 443 677 ; 
+C 64 ; WX 930 ; N at ; B 44 -215 908 677 ; 
+C 65 ; WX 722 ; N A ; B 7 0 710 675 ; 
+C 66 ; WX 667 ; N B ; B 20 0 631 662 ; 
+C 67 ; WX 722 ; N C ; B 39 -15 667 677 ; 
+C 68 ; WX 722 ; N D ; B 13 0 680 662 ; 
+C 69 ; WX 667 ; N E ; B 20 0 622 662 ; 
+C 70 ; WX 611 ; N F ; B 22 0 581 662 ; 
+C 71 ; WX 778 ; N G ; B 40 -15 767 677 ; 
+C 72 ; WX 778 ; N H ; B 20 0 759 662 ; 
+C 73 ; WX 389 ; N I ; B 20 0 366 662 ; 
+C 74 ; WX 500 ; N J ; B 10 -15 494 662 ; 
+C 75 ; WX 778 ; N K ; B 22 0 789 662 ; 
+C 76 ; WX 667 ; N L ; B 18 0 631 662 ; 
+C 77 ; WX 944 ; N M ; B 20 0 925 662 ; 
+C 78 ; WX 722 ; N N ; B 14 -15 698 662 ; 
+C 79 ; WX 778 ; N O ; B 39 -15 742 671 ; 
+C 80 ; WX 611 ; N P ; B 25 0 580 662 ; 
+C 81 ; WX 778 ; N Q ; B 39 -180 742 677 ; 
+C 82 ; WX 722 ; N R ; B 18 0 730 662 ; 
+C 83 ; WX 556 ; N S ; B 51 -15 516 677 ; 
+C 84 ; WX 667 ; N T ; B 36 0 630 662 ; 
+C 85 ; WX 722 ; N U ; B 23 -15 705 662 ; 
+C 86 ; WX 722 ; N V ; B 7 -15 711 662 ; 
+C 87 ; WX 1000 ; N W ; B 8 -15 991 662 ; 
+C 88 ; WX 722 ; N X ; B 6 0 715 662 ; 
+C 89 ; WX 722 ; N Y ; B 8 0 710 662 ; 
+C 90 ; WX 667 ; N Z ; B 16 0 649 662 ; 
+C 91 ; WX 333 ; N bracketleft ; B 104 -182 300 662 ; 
+C 92 ; WX 278 ; N backslash ; B 0 -15 280 677 ; 
+C 93 ; WX 333 ; N bracketright ; B 32 -182 229 662 ; 
+C 94 ; WX 581 ; N asciicircum ; B 71 325 509 675 ; 
+C 95 ; WX 500 ; N underscore ; B -9 -215 509 -151 ; 
+C 96 ; WX 333 ; N grave ; B 18 515 222 684 ; 
+C 97 ; WX 500 ; N a ; B 44 -6 483 470 ; 
+C 98 ; WX 556 ; N b ; B 20 -13 513 662 ; 
+C 99 ; WX 444 ; N c ; B 38 -13 421 470 ; 
+C 100 ; WX 556 ; N d ; B 38 -13 533 662 ; 
+C 101 ; WX 444 ; N e ; B 38 -13 420 470 ; 
+C 102 ; WX 333 ; N f ; B 32 0 407 677 ; 
+C 103 ; WX 500 ; N g ; B 37 -215 481 470 ; 
+C 104 ; WX 556 ; N h ; B 34 0 527 662 ; 
+C 105 ; WX 278 ; N i ; B 20 0 267 677 ; 
+C 106 ; WX 333 ; N j ; B -27 -215 248 677 ; 
+C 107 ; WX 556 ; N k ; B 33 0 565 662 ; 
+C 108 ; WX 278 ; N l ; B 20 0 267 662 ; 
+C 109 ; WX 833 ; N m ; B 37 0 807 470 ; 
+C 110 ; WX 556 ; N n ; B 34 0 526 470 ; 
+C 111 ; WX 500 ; N o ; B 36 -13 464 470 ; 
+C 112 ; WX 556 ; N p ; B 19 -213 512 470 ; 
+C 113 ; WX 556 ; N q ; B 38 -213 536 470 ; 
+C 114 ; WX 444 ; N r ; B 36 0 428 470 ; 
+C 115 ; WX 389 ; N s ; B 39 -13 353 470 ; 
+C 116 ; WX 333 ; N t ; B 18 -6 323 623 ; 
+C 117 ; WX 556 ; N u ; B 30 -13 523 456 ; 
+C 118 ; WX 500 ; N v ; B 9 -13 491 456 ; 
+C 119 ; WX 722 ; N w ; B 8 -13 711 456 ; 
+C 120 ; WX 500 ; N x ; B 22 0 483 456 ; 
+C 121 ; WX 500 ; N y ; B 8 -215 490 456 ; 
+C 122 ; WX 444 ; N z ; B 10 0 427 456 ; 
+C 123 ; WX 394 ; N braceleft ; B 80 -202 351 677 ; 
+C 124 ; WX 220 ; N bar ; B 77 -215 141 677 ; 
+C 125 ; WX 394 ; N braceright ; B 44 -202 315 677 ; 
+C 126 ; WX 520 ; N asciitilde ; B 19 188 550 346 ; 
+C 130 ; WX 333 ; N quotesinglbase ; B 74 -175 259 149 ; 
+C 131 ; WX 500 ; N florin ; B 0 -215 500 677 ; 
+C 132 ; WX 500 ; N quotedblbase ; B 40 -175 460 150 ; 
+C 133 ; WX 1000 ; N ellipsis ; B 85 -13 914 150 ; 
+C 134 ; WX 500 ; N dagger ; B 48 -195 451 662 ; 
+C 135 ; WX 500 ; N daggerdbl ; B 53 -198 445 662 ; 
+C 136 ; WX 333 ; N circumflex ; B 10 510 323 696 ; 
+C 137 ; WX 1000 ; N perthousand ; B 28 -27 970 677 ; 
+C 138 ; WX 556 ; N Scaron ; B 51 -15 516 891 ; 
+C 139 ; WX 333 ; N guilsinglleft ; B 45 3 287 452 ; 
+C 140 ; WX 1000 ; N OE ; B 36 -8 952 671 ; 
+C 145 ; WX 333 ; N quoteleft ; B 74 352 259 677 ; 
+C 146 ; WX 333 ; N quoteright ; B 74 352 259 677 ; 
+C 147 ; WX 500 ; N quotedblleft ; B 39 351 459 677 ; 
+C 148 ; WX 500 ; N quotedblright ; B 40 351 460 677 ; 
+C 149 ; WX 350 ; N bullet ; B 37 190 316 469 ; 
+C 150 ; WX 500 ; N endash ; B -8 201 507 260 ; 
+C 151 ; WX 1000 ; N emdash ; B -9 201 1009 260 ; 
+C 152 ; WX 333 ; N tilde ; B 11 532 325 668 ; 
+C 153 ; WX 1000 ; N trademark ; B -1 268 1005 662 ; 
+C 154 ; WX 389 ; N scaron ; B 33 -13 353 696 ; 
+C 155 ; WX 333 ; N guilsinglright ; B 46 3 288 452 ; 
+C 156 ; WX 722 ; N oe ; B 34 -13 694 470 ; 
+C 159 ; WX 722 ; N Ydieresis ; B 8 0 710 857 ; 
+C 160 ; WX 250 ; N nbspace ; B 0 0 0 0 ; 
+C 161 ; WX 722 ; N exclamdown ; B 7 -225 710 675 ; 
+C 162 ; WX 333 ; N cent ; B 19 520 314 677 ; 
+C 163 ; WX 667 ; N sterling ; B 20 0 630 662 ; 
+C 164 ; WX 500 ; N currency ; B 10 93 491 567 ; 
+C 165 ; WX 667 ; N yen ; B 18 0 631 677 ; 
+C 166 ; WX 556 ; N brokenbar ; B 51 -15 516 888 ; 
+C 167 ; WX 500 ; N section ; B 44 -215 455 677 ; 
+C 168 ; WX 333 ; N dieresis ; B 10 538 323 667 ; 
+C 169 ; WX 556 ; N copyright ; B 51 -15 516 891 ; 
+C 170 ; WX 556 ; N ordfeminine ; B 51 -187 516 677 ; 
+C 171 ; WX 667 ; N guillemotleft ; B 36 0 630 891 ; 
+C 172 ; WX 667 ; N logicalnot ; B 16 0 649 888 ; 
+C 173 ; WX 333 ; N minus ; B 24 179 309 280 ; 
+C 174 ; WX 667 ; N registered ; B 16 0 649 891 ; 
+C 175 ; WX 667 ; N macron ; B 16 0 649 856 ; 
+C 176 ; WX 400 ; N degree ; B 28 337 366 675 ; 
+C 177 ; WX 500 ; N plusminus ; B 44 -225 499 470 ; 
+C 178 ; WX 333 ; N twosuperior ; B 49 -225 283 8 ; 
+C 179 ; WX 278 ; N threesuperior ; B 18 0 264 662 ; 
+C 180 ; WX 333 ; N acute ; B 111 515 314 684 ; 
+C 181 ; WX 469 ; N mu ; B 20 0 455 677 ; 
+C 182 ; WX 389 ; N paragraph ; B 39 -13 353 684 ; 
+C 183 ; WX 333 ; N periodcentered ; B 10 510 323 696 ; 
+C 184 ; WX 333 ; N cedilla ; B 70 -187 236 5 ; 
+C 185 ; WX 389 ; N onesuperior ; B 33 -13 353 696 ; 
+C 186 ; WX 389 ; N ordmasculine ; B 39 -187 353 470 ; 
+C 187 ; WX 521 ; N guillemotright ; B 18 -6 508 677 ; 
+C 188 ; WX 444 ; N onequarter ; B 10 0 427 684 ; 
+C 189 ; WX 333 ; N onehalf ; B 54 516 368 684 ; 
+C 190 ; WX 444 ; N threequarters ; B 10 0 427 696 ; 
+C 191 ; WX 444 ; N questiondown ; B 10 0 427 667 ; 
+C 192 ; WX 722 ; N Agrave ; B 18 0 730 888 ; 
+C 193 ; WX 722 ; N Aacute ; B 7 0 710 888 ; 
+C 194 ; WX 722 ; N Acircumflex ; B 7 0 710 888 ; 
+C 195 ; WX 722 ; N Atilde ; B 7 0 710 875 ; 
+C 196 ; WX 722 ; N Adieresis ; B 7 0 710 857 ; 
+C 197 ; WX 667 ; N Aring ; B 18 0 631 888 ; 
+C 198 ; WX 722 ; N AE ; B 39 -15 667 888 ; 
+C 199 ; WX 722 ; N Ccedilla ; B 39 -187 667 677 ; 
+C 200 ; WX 722 ; N Egrave ; B 39 -15 667 891 ; 
+C 201 ; WX 667 ; N Eacute ; B 20 0 622 888 ; 
+C 202 ; WX 667 ; N Ecircumflex ; B 20 -225 622 662 ; 
+C 203 ; WX 667 ; N Edieresis ; B 20 0 622 857 ; 
+C 204 ; WX 667 ; N Igrave ; B 20 0 622 891 ; 
+C 205 ; WX 389 ; N Iacute ; B 20 0 366 888 ; 
+C 206 ; WX 389 ; N Icircumflex ; B 20 0 366 888 ; 
+C 207 ; WX 722 ; N Idieresis ; B 13 0 680 891 ; 
+C 208 ; WX 722 ; N Eth ; B 17 0 684 662 ; 
+C 209 ; WX 722 ; N Ntilde ; B 14 -15 698 888 ; 
+C 210 ; WX 722 ; N Ograve ; B 14 -15 698 891 ; 
+C 211 ; WX 778 ; N Oacute ; B 39 -15 742 888 ; 
+C 212 ; WX 778 ; N Ocircumflex ; B 39 -15 742 888 ; 
+C 213 ; WX 778 ; N Otilde ; B 39 -15 742 887 ; 
+C 214 ; WX 778 ; N Odieresis ; B 39 -15 742 857 ; 
+C 215 ; WX 570 ; N multiply ; B 75 120 498 542 ; 
+C 216 ; WX 722 ; N Oslash ; B 18 0 730 891 ; 
+C 217 ; WX 722 ; N Ugrave ; B 23 -15 705 907 ; 
+C 218 ; WX 722 ; N Uacute ; B 23 -15 705 888 ; 
+C 219 ; WX 722 ; N Ucircumflex ; B 23 -15 705 887 ; 
+C 220 ; WX 722 ; N Udieresis ; B 23 -15 705 857 ; 
+C 221 ; WX 722 ; N Yacute ; B 8 0 710 888 ; 
+C 222 ; WX 667 ; N Thorn ; B 36 -241 630 662 ; 
+C 223 ; WX 556 ; N germandbls ; B 28 -4 506 677 ; 
+C 224 ; WX 444 ; N agrave ; B 36 0 428 684 ; 
+C 225 ; WX 500 ; N aacute ; B 44 -6 483 684 ; 
+C 226 ; WX 500 ; N acircumflex ; B 44 -6 483 696 ; 
+C 227 ; WX 500 ; N atilde ; B 44 -6 483 677 ; 
+C 228 ; WX 500 ; N adieresis ; B 44 -6 483 668 ; 
+C 229 ; WX 278 ; N aring ; B 20 0 279 888 ; 
+C 230 ; WX 444 ; N ae ; B 38 -13 421 684 ; 
+C 231 ; WX 444 ; N ccedilla ; B 38 -187 421 470 ; 
+C 232 ; WX 444 ; N egrave ; B 38 -13 421 696 ; 
+C 233 ; WX 444 ; N eacute ; B 38 -13 420 684 ; 
+C 234 ; WX 444 ; N ecircumflex ; B 38 -225 420 470 ; 
+C 235 ; WX 444 ; N edieresis ; B 38 -13 420 668 ; 
+C 236 ; WX 444 ; N igrave ; B 38 -13 420 696 ; 
+C 237 ; WX 278 ; N iacute ; B 20 0 289 684 ; 
+C 238 ; WX 278 ; N icircumflex ; B -17 0 296 696 ; 
+C 239 ; WX 733 ; N idieresis ; B 40 -13 722 677 ; 
+C 240 ; WX 556 ; N eth ; B 38 -13 533 662 ; 
+C 241 ; WX 556 ; N ntilde ; B 34 0 526 684 ; 
+C 242 ; WX 556 ; N ograve ; B 34 0 526 696 ; 
+C 243 ; WX 500 ; N oacute ; B 36 -13 464 684 ; 
+C 244 ; WX 500 ; N ocircumflex ; B 36 -13 464 696 ; 
+C 245 ; WX 500 ; N otilde ; B 36 -13 464 684 ; 
+C 246 ; WX 500 ; N odieresis ; B 36 -13 464 668 ; 
+C 247 ; WX 549 ; N divide ; B 7 121 541 544 ; 
+C 248 ; WX 444 ; N oslash ; B 36 0 428 696 ; 
+C 249 ; WX 556 ; N ugrave ; B 30 -13 523 701 ; 
+C 250 ; WX 556 ; N uacute ; B 30 -13 523 684 ; 
+C 251 ; WX 556 ; N ucircumflex ; B 30 -13 523 684 ; 
+C 252 ; WX 556 ; N udieresis ; B 30 -13 523 668 ; 
+C 253 ; WX 500 ; N yacute ; B 8 -215 490 684 ; 
+C 254 ; WX 333 ; N thorn ; B 18 -241 323 623 ; 
+C 255 ; WX 333 ; N ydieresis ; B 214 280 343 409 ; 
+C 274 ; WX 333 ; N c274 ; B 214 280 343 409 ; 
+EndCharMetrics
+StartKernData
+StartKernPairs 117
+KPX space A -55
+KPX space T -18
+KPX space V -18
+KPX space W -18
+KPX space Y -37
+KPX one one -55
+KPX A space -55
+KPX A T -74
+KPX A V -129
+KPX A W -111
+KPX A Y -92
+KPX A v -74
+KPX A w -74
+KPX A y -74
+KPX A quoteright -74
+KPX F space -37
+KPX F comma -92
+KPX F period -92
+KPX F A -74
+KPX L space -55
+KPX L T -92
+KPX L V -92
+KPX L W -92
+KPX L Y -92
+KPX L y -55
+KPX L quoteright -92
+KPX P space -55
+KPX P comma -92
+KPX P period -92
+KPX P A -74
+KPX R T -35
+KPX R V -35
+KPX R W -35
+KPX R Y -35
+KPX R y -35
+KPX T space -18
+KPX T comma -74
+KPX T hyphen -92
+KPX T period -74
+KPX T colon -74
+KPX T semicolon -74
+KPX T A -74
+KPX T O -18
+KPX T a -92
+KPX T c -92
+KPX T e -92
+KPX T i -18
+KPX T o -92
+KPX T r -74
+KPX T s -92
+KPX T u -92
+KPX T w -74
+KPX T y -74
+KPX V space -18
+KPX V comma -129
+KPX V hyphen -74
+KPX V period -129
+KPX V colon -92
+KPX V semicolon -92
+KPX V A -129
+KPX V O -20
+KPX V a -92
+KPX V e -92
+KPX V i -37
+KPX V o -92
+KPX V r -74
+KPX V u -92
+KPX V y -92
+KPX W space -18
+KPX W comma -92
+KPX W hyphen -37
+KPX W period -92
+KPX W colon -55
+KPX W semicolon -55
+KPX W A -111
+KPX W a -55
+KPX W e -55
+KPX W i -18
+KPX W o -55
+KPX W r -18
+KPX W u -18
+KPX W y -37
+KPX Y space -37
+KPX Y comma -92
+KPX Y hyphen -92
+KPX Y period -92
+KPX Y colon -92
+KPX Y semicolon -92
+KPX Y A -92
+KPX Y a -111
+KPX Y e -111
+KPX Y i -37
+KPX Y o -111
+KPX Y p -92
+KPX Y q -111
+KPX Y u -92
+KPX Y v -111
+KPX f quoteright 55
+KPX r space -18
+KPX r comma -92
+KPX r hyphen -37
+KPX r period -92
+KPX r c -18
+KPX r e -18
+KPX r o -18
+KPX r q -18
+KPX r quoteright 18
+KPX v comma -55
+KPX v period -55
+KPX w comma -55
+KPX w period -55
+KPX y comma -55
+KPX y period -55
+KPX quoteleft quoteleft -74
+KPX quoteright space -74
+KPX quoteright s -37
+KPX quoteright quoteright -74
+EndKernPairs
+EndKernData
+EndFontMetrics
Binary files ../siag-3.4.1/common/fonts/tnrl2b__.pfb and ./common/fonts/tnrl2b__.pfb differ
diff -urNP ../siag-3.4.1/common/fonts/tnrl2bi_.afm ./common/fonts/tnrl2bi_.afm
--- ../siag-3.4.1/common/fonts/tnrl2bi_.afm	Thu Jan  1 01:00:00 1970
+++ ./common/fonts/tnrl2bi_.afm	Wed Oct 25 15:05:07 2000
@@ -0,0 +1,356 @@
+StartFontMetrics 2.0
+Comment Generated by Fontographer 3.5 Sat Jan 25 00:22:29 1997
+FontName TimesNewRomanL2-BoldItalic
+FullName Times New Roman L2 Bold Italic
+FamilyName Times New Roman L2
+Weight Bold
+Notice This font is created by Peter Soos. The font encoding is Latin-2 (ISO-8859.2).
+ItalicAngle 16.3
+IsFixedPitch false
+UnderlinePosition -109
+UnderlineThickness 95
+Version 1.000
+EncodingScheme Windows
+FontBBox -170 -256 1009 887
+CapHeight 662
+XHeight 439
+Descender -214
+Ascender 677
+StartCharMetrics 223
+C 5 ; WX 333 ; N breve ; B 132 507 403 677 ; 
+C 6 ; WX 333 ; N dotaccent ; B 192 518 336 662 ; 
+C 8 ; WX 333 ; N ring ; B 164 493 367 696 ; 
+C 10 ; WX 333 ; N hungarumlaut ; B 140 508 450 677 ; 
+C 11 ; WX 333 ; N ogonek ; B -86 -199 130 9 ; 
+C 12 ; WX 333 ; N caron ; B 108 509 418 677 ; 
+C 14 ; WX 278 ; N dotlessi ; B 21 -13 256 452 ; 
+C 32 ; WX 250 ; N space ; B 0 0 0 0 ; 
+C 33 ; WX 389 ; N exclam ; B 55 -13 351 677 ; 
+C 34 ; WX 555 ; N quotedbl ; B 164 352 559 677 ; 
+C 35 ; WX 500 ; N numbersign ; B 19 -13 479 675 ; 
+C 36 ; WX 500 ; N dollar ; B 38 -75 499 704 ; 
+C 37 ; WX 833 ; N percent ; B 107 -28 780 677 ; 
+C 38 ; WX 778 ; N ampersand ; B 45 -15 706 677 ; 
+C 39 ; WX 278 ; N quotesingle ; B 155 352 314 677 ; 
+C 40 ; WX 333 ; N parenleft ; B 50 -190 434 677 ; 
+C 41 ; WX 333 ; N parenright ; B -112 -190 271 677 ; 
+C 42 ; WX 500 ; N asterisk ; B 120 299 508 677 ; 
+C 43 ; WX 570 ; N plus ; B 19 66 553 597 ; 
+C 44 ; WX 250 ; N comma ; B -28 -160 175 148 ; 
+C 45 ; WX 333 ; N hyphen ; B 6 168 322 270 ; 
+C 46 ; WX 250 ; N period ; B -13 -13 147 146 ; 
+C 47 ; WX 278 ; N slash ; B -81 -15 414 675 ; 
+C 48 ; WX 500 ; N zero ; B 55 -13 498 675 ; 
+C 49 ; WX 500 ; N one ; B 23 0 444 675 ; 
+C 50 ; WX 500 ; N two ; B 3 0 482 675 ; 
+C 51 ; WX 500 ; N three ; B 12 -13 469 675 ; 
+C 52 ; WX 500 ; N four ; B 17 -13 501 675 ; 
+C 53 ; WX 500 ; N five ; B 38 -14 503 662 ; 
+C 54 ; WX 500 ; N six ; B 60 -13 510 681 ; 
+C 55 ; WX 500 ; N seven ; B 117 -13 553 662 ; 
+C 56 ; WX 500 ; N eight ; B 37 -13 490 675 ; 
+C 57 ; WX 500 ; N nine ; B 42 -14 492 680 ; 
+C 58 ; WX 333 ; N colon ; B 40 -13 289 451 ; 
+C 59 ; WX 333 ; N semicolon ; B 0 -160 291 452 ; 
+C 60 ; WX 570 ; N less ; B 20 90 553 567 ; 
+C 61 ; WX 570 ; N equal ; B 19 218 553 441 ; 
+C 62 ; WX 570 ; N greater ; B 20 90 553 567 ; 
+C 63 ; WX 500 ; N question ; B 88 -14 476 677 ; 
+C 64 ; WX 832 ; N at ; B 44 -215 908 677 ; 
+C 65 ; WX 667 ; N A ; B -56 0 599 677 ; 
+C 66 ; WX 667 ; N B ; B -25 0 645 662 ; 
+C 67 ; WX 667 ; N C ; B 65 -15 720 677 ; 
+C 68 ; WX 722 ; N D ; B -36 0 701 662 ; 
+C 69 ; WX 667 ; N E ; B -35 0 679 662 ; 
+C 70 ; WX 667 ; N F ; B -32 0 690 662 ; 
+C 71 ; WX 722 ; N G ; B 69 -15 747 677 ; 
+C 72 ; WX 778 ; N H ; B -32 0 861 662 ; 
+C 73 ; WX 389 ; N I ; B -35 0 466 662 ; 
+C 74 ; WX 500 ; N J ; B -7 -15 597 662 ; 
+C 75 ; WX 667 ; N K ; B -32 0 746 662 ; 
+C 76 ; WX 611 ; N L ; B -27 0 574 662 ; 
+C 77 ; WX 889 ; N M ; B -33 0 974 662 ; 
+C 78 ; WX 722 ; N N ; B -32 -7 811 662 ; 
+C 79 ; WX 722 ; N O ; B 53 -15 718 677 ; 
+C 80 ; WX 611 ; N P ; B -29 0 643 662 ; 
+C 81 ; WX 722 ; N Q ; B 53 -208 717 677 ; 
+C 82 ; WX 667 ; N R ; B -31 0 639 662 ; 
+C 83 ; WX 556 ; N S ; B -21 -15 583 677 ; 
+C 84 ; WX 611 ; N T ; B 79 0 692 662 ; 
+C 85 ; WX 722 ; N U ; B 93 -15 808 662 ; 
+C 86 ; WX 667 ; N V ; B 118 -15 776 662 ; 
+C 87 ; WX 889 ; N W ; B 123 -15 1001 662 ; 
+C 88 ; WX 667 ; N X ; B -60 0 763 662 ; 
+C 89 ; WX 611 ; N Y ; B 92 0 716 662 ; 
+C 90 ; WX 611 ; N Z ; B -27 0 678 662 ; 
+C 91 ; WX 333 ; N bracketleft ; B -28 -184 428 662 ; 
+C 92 ; WX 278 ; N backslash ; B 78 -15 203 675 ; 
+C 93 ; WX 333 ; N bracketright ; B -110 -184 346 662 ; 
+C 94 ; WX 570 ; N asciicircum ; B 101 325 539 675 ; 
+C 95 ; WX 500 ; N underscore ; B -10 -215 508 -151 ; 
+C 96 ; WX 333 ; N grave ; B 119 507 314 677 ; 
+C 97 ; WX 500 ; N a ; B 19 -13 479 452 ; 
+C 98 ; WX 500 ; N b ; B 9 -13 468 677 ; 
+C 99 ; WX 444 ; N c ; B 28 -13 437 452 ; 
+C 100 ; WX 500 ; N d ; B 20 -13 545 677 ; 
+C 101 ; WX 444 ; N e ; B 23 -13 441 452 ; 
+C 102 ; WX 333 ; N f ; B -160 -215 507 677 ; 
+C 103 ; WX 500 ; N g ; B -51 -215 516 452 ; 
+C 104 ; WX 556 ; N h ; B 10 -5 500 677 ; 
+C 105 ; WX 278 ; N i ; B 21 -13 298 677 ; 
+C 106 ; WX 278 ; N j ; B -159 -215 299 677 ; 
+C 107 ; WX 500 ; N k ; B 5 -6 513 677 ; 
+C 108 ; WX 278 ; N l ; B 16 -13 317 677 ; 
+C 109 ; WX 778 ; N m ; B 11 -5 725 452 ; 
+C 110 ; WX 556 ; N n ; B 10 -5 501 452 ; 
+C 111 ; WX 500 ; N o ; B 24 -13 469 452 ; 
+C 112 ; WX 500 ; N p ; B -122 -213 474 452 ; 
+C 113 ; WX 500 ; N q ; B 19 -213 483 452 ; 
+C 114 ; WX 389 ; N r ; B 17 0 402 452 ; 
+C 115 ; WX 389 ; N s ; B -2 -13 370 452 ; 
+C 116 ; WX 278 ; N t ; B 20 -13 312 571 ; 
+C 117 ; WX 556 ; N u ; B 32 -13 515 452 ; 
+C 118 ; WX 444 ; N v ; B 29 -13 444 452 ; 
+C 119 ; WX 667 ; N w ; B 27 -13 663 452 ; 
+C 120 ; WX 500 ; N x ; B -45 -13 508 452 ; 
+C 121 ; WX 444 ; N y ; B -91 -215 444 452 ; 
+C 122 ; WX 389 ; N z ; B -12 -84 395 438 ; 
+C 123 ; WX 348 ; N braceleft ; B 66 -202 479 677 ; 
+C 124 ; WX 220 ; N bar ; B 77 -215 141 677 ; 
+C 125 ; WX 348 ; N braceright ; B -69 -202 344 677 ; 
+C 126 ; WX 570 ; N asciitilde ; B 19 188 550 346 ; 
+C 130 ; WX 333 ; N quotesinglbase ; B 13 -160 217 148 ; 
+C 131 ; WX 500 ; N florin ; B 0 -215 500 677 ; 
+C 132 ; WX 500 ; N quotedblbase ; B -29 -161 391 150 ; 
+C 133 ; WX 1000 ; N ellipsis ; B 85 -13 914 150 ; 
+C 134 ; WX 500 ; N dagger ; B 86 -213 509 677 ; 
+C 135 ; WX 500 ; N daggerdbl ; B -5 -215 507 677 ; 
+C 136 ; WX 333 ; N circumflex ; B 73 511 383 677 ; 
+C 137 ; WX 1000 ; N perthousand ; B 25 -27 981 677 ; 
+C 138 ; WX 556 ; N Scaron ; B -21 -15 583 876 ; 
+C 139 ; WX 333 ; N guilsinglleft ; B 58 -5 305 445 ; 
+C 140 ; WX 944 ; N OE ; B 62 -5 958 667 ; 
+C 145 ; WX 333 ; N quoteleft ; B 142 367 346 677 ; 
+C 146 ; WX 333 ; N quoteright ; B 143 367 347 677 ; 
+C 147 ; WX 500 ; N quotedblleft ; B 118 365 538 677 ; 
+C 148 ; WX 500 ; N quotedblright ; B 118 365 539 677 ; 
+C 149 ; WX 350 ; N bullet ; B 39 190 317 469 ; 
+C 150 ; WX 500 ; N endash ; B -7 201 508 260 ; 
+C 151 ; WX 1000 ; N emdash ; B -9 201 1009 260 ; 
+C 152 ; WX 333 ; N tilde ; B 88 526 397 662 ; 
+C 153 ; WX 1000 ; N trademark ; B -1 268 1005 662 ; 
+C 154 ; WX 389 ; N scaron ; B -2 -13 403 677 ; 
+C 155 ; WX 333 ; N guilsinglright ; B 27 -5 274 445 ; 
+C 156 ; WX 722 ; N oe ; B 22 -13 717 452 ; 
+C 159 ; WX 611 ; N Ydieresis ; B 92 0 716 851 ; 
+C 160 ; WX 250 ; N nbspace ; B 0 0 0 0 ; 
+C 161 ; WX 667 ; N exclamdown ; B -56 -199 622 677 ; 
+C 162 ; WX 333 ; N cent ; B 132 507 403 677 ; 
+C 163 ; WX 611 ; N sterling ; B -27 0 574 662 ; 
+C 164 ; WX 500 ; N currency ; B 10 93 491 567 ; 
+C 165 ; WX 611 ; N yen ; B -27 0 665 677 ; 
+C 166 ; WX 556 ; N brokenbar ; B -21 -15 583 872 ; 
+C 167 ; WX 500 ; N section ; B -13 -215 529 677 ; 
+C 168 ; WX 333 ; N dieresis ; B 90 527 401 657 ; 
+C 169 ; WX 556 ; N copyright ; B -21 -15 583 876 ; 
+C 170 ; WX 556 ; N ordfeminine ; B -21 -183 583 677 ; 
+C 171 ; WX 611 ; N guillemotleft ; B 79 0 692 876 ; 
+C 172 ; WX 611 ; N logicalnot ; B -27 0 678 872 ; 
+C 173 ; WX 333 ; N minus ; B 6 168 322 270 ; 
+C 174 ; WX 611 ; N registered ; B -27 0 678 876 ; 
+C 175 ; WX 611 ; N macron ; B -27 0 678 843 ; 
+C 176 ; WX 400 ; N degree ; B 87 337 425 675 ; 
+C 177 ; WX 500 ; N plusminus ; B 19 -204 479 452 ; 
+C 178 ; WX 333 ; N twosuperior ; B -86 -199 130 9 ; 
+C 179 ; WX 278 ; N threesuperior ; B 0 -13 317 677 ; 
+C 180 ; WX 333 ; N acute ; B 196 506 404 677 ; 
+C 181 ; WX 521 ; N mu ; B 16 -13 523 677 ; 
+C 182 ; WX 389 ; N paragraph ; B -2 -13 421 677 ; 
+C 183 ; WX 333 ; N periodcentered ; B 108 509 418 677 ; 
+C 184 ; WX 333 ; N cedilla ; B 5 -183 227 0 ; 
+C 185 ; WX 389 ; N onesuperior ; B -2 -13 403 677 ; 
+C 186 ; WX 389 ; N ordmasculine ; B -2 -183 370 452 ; 
+C 187 ; WX 531 ; N guillemotright ; B 20 -13 544 677 ; 
+C 188 ; WX 389 ; N onequarter ; B -12 -84 426 677 ; 
+C 189 ; WX 333 ; N onehalf ; B 140 508 450 677 ; 
+C 190 ; WX 389 ; N threequarters ; B -12 -84 418 677 ; 
+C 191 ; WX 389 ; N questiondown ; B -12 -84 395 662 ; 
+C 192 ; WX 667 ; N Agrave ; B -31 0 639 872 ; 
+C 193 ; WX 667 ; N Aacute ; B -56 0 737 872 ; 
+C 194 ; WX 667 ; N Acircumflex ; B -56 0 685 875 ; 
+C 195 ; WX 667 ; N Atilde ; B -56 0 733 885 ; 
+C 196 ; WX 667 ; N Adieresis ; B -56 0 721 851 ; 
+C 197 ; WX 611 ; N Aring ; B -27 0 574 872 ; 
+C 198 ; WX 667 ; N AE ; B 65 -15 720 872 ; 
+C 199 ; WX 667 ; N Ccedilla ; B 65 -183 720 677 ; 
+C 200 ; WX 667 ; N Egrave ; B 65 -15 720 876 ; 
+C 201 ; WX 667 ; N Eacute ; B -35 0 679 872 ; 
+C 202 ; WX 667 ; N Ecircumflex ; B -35 -199 679 662 ; 
+C 203 ; WX 667 ; N Edieresis ; B -35 0 679 851 ; 
+C 204 ; WX 667 ; N Igrave ; B -35 0 679 876 ; 
+C 205 ; WX 389 ; N Iacute ; B -35 0 525 872 ; 
+C 206 ; WX 389 ; N Icircumflex ; B -35 0 468 875 ; 
+C 207 ; WX 722 ; N Idieresis ; B -36 0 701 876 ; 
+C 208 ; WX 722 ; N Eth ; B -32 0 708 662 ; 
+C 209 ; WX 722 ; N Ntilde ; B -32 -7 811 872 ; 
+C 210 ; WX 722 ; N Ograve ; B -32 -7 811 876 ; 
+C 211 ; WX 722 ; N Oacute ; B 53 -15 718 886 ; 
+C 212 ; WX 722 ; N Ocircumflex ; B 53 -15 718 863 ; 
+C 213 ; WX 722 ; N Otilde ; B 53 -15 750 885 ; 
+C 214 ; WX 722 ; N Odieresis ; B 53 -15 718 838 ; 
+C 215 ; WX 570 ; N multiply ; B 75 120 498 542 ; 
+C 216 ; WX 667 ; N Oslash ; B -31 0 639 876 ; 
+C 217 ; WX 722 ; N Ugrave ; B 93 -15 808 877 ; 
+C 218 ; WX 722 ; N Uacute ; B 93 -15 808 886 ; 
+C 219 ; WX 722 ; N Ucircumflex ; B 93 -15 808 885 ; 
+C 220 ; WX 722 ; N Udieresis ; B 93 -15 808 838 ; 
+C 221 ; WX 611 ; N Yacute ; B 92 0 716 872 ; 
+C 222 ; WX 611 ; N Thorn ; B 79 -256 692 662 ; 
+C 223 ; WX 500 ; N germandbls ; B -170 -215 505 677 ; 
+C 224 ; WX 389 ; N agrave ; B 17 0 437 677 ; 
+C 225 ; WX 500 ; N aacute ; B 19 -13 482 677 ; 
+C 226 ; WX 500 ; N acircumflex ; B 19 -13 479 677 ; 
+C 227 ; WX 500 ; N atilde ; B 19 -13 479 677 ; 
+C 228 ; WX 500 ; N adieresis ; B 19 -13 486 657 ; 
+C 229 ; WX 278 ; N aring ; B 16 -13 412 872 ; 
+C 230 ; WX 444 ; N ae ; B 28 -13 473 677 ; 
+C 231 ; WX 444 ; N ccedilla ; B 28 -183 437 452 ; 
+C 232 ; WX 444 ; N egrave ; B 28 -13 508 677 ; 
+C 233 ; WX 444 ; N eacute ; B 23 -13 536 677 ; 
+C 234 ; WX 444 ; N ecircumflex ; B 23 -199 441 452 ; 
+C 235 ; WX 444 ; N edieresis ; B 23 -13 460 657 ; 
+C 236 ; WX 444 ; N igrave ; B 23 -13 504 677 ; 
+C 237 ; WX 278 ; N iacute ; B 21 -13 361 677 ; 
+C 238 ; WX 278 ; N icircumflex ; B 21 -13 339 677 ; 
+C 239 ; WX 749 ; N idieresis ; B 20 -13 751 677 ; 
+C 240 ; WX 500 ; N eth ; B 20 -13 588 677 ; 
+C 241 ; WX 556 ; N ntilde ; B 10 -5 501 677 ; 
+C 242 ; WX 556 ; N ograve ; B 10 -5 507 677 ; 
+C 243 ; WX 500 ; N oacute ; B 24 -13 500 677 ; 
+C 244 ; WX 500 ; N ocircumflex ; B 24 -13 469 677 ; 
+C 245 ; WX 500 ; N otilde ; B 24 -13 604 677 ; 
+C 246 ; WX 500 ; N odieresis ; B 24 -13 486 657 ; 
+C 247 ; WX 549 ; N divide ; B 7 121 541 544 ; 
+C 248 ; WX 389 ; N oslash ; B 17 0 420 677 ; 
+C 249 ; WX 556 ; N ugrave ; B 32 -13 515 696 ; 
+C 250 ; WX 556 ; N uacute ; B 32 -13 515 677 ; 
+C 251 ; WX 556 ; N ucircumflex ; B 32 -13 599 677 ; 
+C 252 ; WX 556 ; N udieresis ; B 32 -13 515 657 ; 
+C 253 ; WX 444 ; N yacute ; B -91 -215 467 677 ; 
+C 254 ; WX 278 ; N thorn ; B -4 -256 312 571 ; 
+C 255 ; WX 333 ; N ydieresis ; B 241 270 369 398 ; 
+C 274 ; WX 333 ; N c274 ; B 241 270 369 398 ; 
+EndCharMetrics
+StartKernData
+StartKernPairs 108
+KPX space A -37
+KPX space W -18
+KPX space Y -18
+KPX one one -55
+KPX A space -55
+KPX A T -55
+KPX A V -74
+KPX A W -92
+KPX A Y -55
+KPX A v -74
+KPX A w -74
+KPX A y -74
+KPX A quoteright -74
+KPX F space -18
+KPX F comma -129
+KPX F period -129
+KPX F A -92
+KPX L space -37
+KPX L T -18
+KPX L V -37
+KPX L W -37
+KPX L Y -37
+KPX L y -37
+KPX L quoteright -55
+KPX P space -37
+KPX P comma -129
+KPX P period -129
+KPX P A -74
+KPX R V -18
+KPX R W -18
+KPX R Y -18
+KPX R y -18
+KPX T comma -92
+KPX T hyphen -92
+KPX T period -92
+KPX T colon -74
+KPX T semicolon -74
+KPX T A -55
+KPX T O -18
+KPX T a -92
+KPX T c -92
+KPX T e -92
+KPX T i -37
+KPX T o -92
+KPX T r -37
+KPX T s -92
+KPX T u -37
+KPX T w -37
+KPX T y -37
+KPX V space -18
+KPX V comma -129
+KPX V hyphen -55
+KPX V period -129
+KPX V colon -74
+KPX V semicolon -74
+KPX V A -74
+KPX V a -111
+KPX V e -111
+KPX V i -55
+KPX V o -111
+KPX V r -55
+KPX V u -55
+KPX V y -74
+KPX W space -18
+KPX W comma -74
+KPX W hyphen -37
+KPX W period -74
+KPX W colon -55
+KPX W semicolon -55
+KPX W A -74
+KPX W a -74
+KPX W e -74
+KPX W i -37
+KPX W o -74
+KPX W r -74
+KPX W u -55
+KPX W y -55
+KPX Y space -37
+KPX Y comma -92
+KPX Y hyphen -92
+KPX Y period -74
+KPX Y colon -92
+KPX Y semicolon -92
+KPX Y A -74
+KPX Y a -92
+KPX Y e -111
+KPX Y i -55
+KPX Y o -111
+KPX Y p -74
+KPX Y q -111
+KPX Y u -92
+KPX Y v -92
+KPX f f -18
+KPX f quoteright 55
+KPX r comma -55
+KPX r period -55
+KPX r quoteright 37
+KPX v comma -37
+KPX v period -37
+KPX w comma -37
+KPX w period -37
+KPX y comma -37
+KPX y period -37
+KPX quoteleft quoteleft -74
+KPX quoteright space -74
+KPX quoteright s -74
+KPX quoteright t -37
+KPX quoteright quoteright -74
+EndKernPairs
+EndKernData
+EndFontMetrics
Binary files ../siag-3.4.1/common/fonts/tnrl2bi_.pfb and ./common/fonts/tnrl2bi_.pfb differ
diff -urNP ../siag-3.4.1/common/fonts/tnrl2i__.afm ./common/fonts/tnrl2i__.afm
--- ../siag-3.4.1/common/fonts/tnrl2i__.afm	Thu Jan  1 01:00:00 1970
+++ ./common/fonts/tnrl2i__.afm	Wed Oct 25 15:05:07 2000
@@ -0,0 +1,360 @@
+StartFontMetrics 2.0
+Comment Generated by Fontographer 3.5 Sat Jan 25 00:21:56 1997
+FontName TimesNewRomanL2-Italic
+FullName Times New Roman L2 Italic
+FamilyName Times New Roman L2
+Weight Normal
+Notice This font is created by Peter Soos. The font encoding is Latin-2 (ISO-8859.2).
+ItalicAngle 16.3
+IsFixedPitch false
+UnderlinePosition -109
+UnderlineThickness 49
+Version 1.000
+EncodingScheme Windows
+FontBBox -172 -217 986 883
+CapHeight 662
+XHeight 430
+Descender -214
+Ascender 694
+StartCharMetrics 223
+C 5 ; WX 333 ; N breve ; B 143 542 421 686 ; 
+C 6 ; WX 333 ; N dotaccent ; B 219 549 323 654 ; 
+C 8 ; WX 333 ; N ring ; B 186 509 370 693 ; 
+C 10 ; WX 333 ; N hungarumlaut ; B 147 516 450 684 ; 
+C 11 ; WX 333 ; N ogonek ; B 38 -184 262 0 ; 
+C 12 ; WX 333 ; N caron ; B 165 522 426 677 ; 
+C 14 ; WX 278 ; N dotlessi ; B 42 -11 229 441 ; 
+C 32 ; WX 250 ; N space ; B 0 0 0 0 ; 
+C 33 ; WX 333 ; N exclam ; B 75 -16 317 677 ; 
+C 34 ; WX 420 ; N quotedbl ; B 143 392 452 677 ; 
+C 35 ; WX 500 ; N numbersign ; B 18 -13 481 677 ; 
+C 36 ; WX 500 ; N dollar ; B 41 -65 488 700 ; 
+C 37 ; WX 833 ; N percent ; B 70 -26 816 677 ; 
+C 38 ; WX 778 ; N ampersand ; B 47 -15 732 677 ; 
+C 39 ; WX 214 ; N quotesingle ; B 131 392 261 677 ; 
+C 40 ; WX 333 ; N parenleft ; B 68 -213 442 694 ; 
+C 41 ; WX 333 ; N parenright ; B -108 -213 265 694 ; 
+C 42 ; WX 500 ; N asterisk ; B 70 289 429 694 ; 
+C 43 ; WX 675 ; N plus ; B 18 68 544 595 ; 
+C 44 ; WX 250 ; N comma ; B -10 -125 132 87 ; 
+C 45 ; WX 333 ; N hyphen ; B 26 184 299 249 ; 
+C 46 ; WX 250 ; N period ; B 33 -11 132 87 ; 
+C 47 ; WX 278 ; N slash ; B -33 -15 381 694 ; 
+C 48 ; WX 500 ; N zero ; B 59 -11 493 675 ; 
+C 49 ; WX 500 ; N one ; B 61 0 417 675 ; 
+C 50 ; WX 500 ; N two ; B 15 0 468 675 ; 
+C 51 ; WX 500 ; N three ; B 33 -11 453 675 ; 
+C 52 ; WX 500 ; N four ; B 31 -11 486 662 ; 
+C 53 ; WX 500 ; N five ; B 35 -11 479 662 ; 
+C 54 ; WX 500 ; N six ; B 62 -11 525 675 ; 
+C 55 ; WX 500 ; N seven ; B 113 -11 523 662 ; 
+C 56 ; WX 500 ; N eight ; B 38 -11 488 675 ; 
+C 57 ; WX 500 ; N nine ; B 28 -11 490 675 ; 
+C 58 ; WX 333 ; N colon ; B 59 -9 262 442 ; 
+C 59 ; WX 333 ; N semicolon ; B 17 -125 263 441 ; 
+C 60 ; WX 675 ; N less ; B 19 91 544 572 ; 
+C 61 ; WX 675 ; N equal ; B 18 231 544 431 ; 
+C 62 ; WX 675 ; N greater ; B 18 91 543 572 ; 
+C 63 ; WX 500 ; N question ; B 96 -15 458 677 ; 
+C 64 ; WX 920 ; N at ; B 47 -215 896 694 ; 
+C 65 ; WX 611 ; N A ; B -48 0 546 677 ; 
+C 66 ; WX 611 ; N B ; B -22 0 590 662 ; 
+C 67 ; WX 667 ; N C ; B 67 -15 703 677 ; 
+C 68 ; WX 722 ; N D ; B -29 0 704 662 ; 
+C 69 ; WX 611 ; N E ; B -22 0 632 662 ; 
+C 70 ; WX 611 ; N F ; B -24 0 668 662 ; 
+C 71 ; WX 722 ; N G ; B 69 -15 724 677 ; 
+C 72 ; WX 722 ; N H ; B -26 0 811 662 ; 
+C 73 ; WX 333 ; N I ; B -31 0 410 662 ; 
+C 74 ; WX 444 ; N J ; B -34 -15 546 662 ; 
+C 75 ; WX 667 ; N K ; B -26 0 728 662 ; 
+C 76 ; WX 556 ; N L ; B -32 0 522 662 ; 
+C 77 ; WX 833 ; N M ; B -32 0 923 662 ; 
+C 78 ; WX 667 ; N N ; B -27 -15 761 662 ; 
+C 79 ; WX 722 ; N O ; B 59 -15 717 677 ; 
+C 80 ; WX 611 ; N P ; B -23 0 621 662 ; 
+C 81 ; WX 722 ; N Q ; B 47 -210 717 677 ; 
+C 82 ; WX 611 ; N R ; B -22 0 579 662 ; 
+C 83 ; WX 500 ; N S ; B 6 -15 541 677 ; 
+C 84 ; WX 556 ; N T ; B 69 0 649 662 ; 
+C 85 ; WX 722 ; N U ; B 105 -15 813 662 ; 
+C 86 ; WX 611 ; N V ; B 125 -15 723 662 ; 
+C 87 ; WX 833 ; N W ; B 121 -15 943 662 ; 
+C 88 ; WX 611 ; N X ; B -66 0 740 662 ; 
+C 89 ; WX 556 ; N Y ; B 89 0 666 662 ; 
+C 90 ; WX 556 ; N Z ; B -1 0 610 662 ; 
+C 91 ; WX 389 ; N bracketleft ; B 6 -199 471 677 ; 
+C 92 ; WX 278 ; N backslash ; B 106 -15 231 694 ; 
+C 93 ; WX 389 ; N bracketright ; B -100 -199 364 677 ; 
+C 94 ; WX 422 ; N asciicircum ; B 27 327 459 677 ; 
+C 95 ; WX 500 ; N underscore ; B -8 -215 508 -174 ; 
+C 96 ; WX 333 ; N grave ; B 175 516 336 684 ; 
+C 97 ; WX 500 ; N a ; B 23 -11 469 441 ; 
+C 98 ; WX 500 ; N b ; B 26 -11 469 694 ; 
+C 99 ; WX 444 ; N c ; B 29 -11 427 441 ; 
+C 100 ; WX 500 ; N d ; B 19 -11 541 694 ; 
+C 101 ; WX 444 ; N e ; B 31 -11 430 441 ; 
+C 102 ; WX 278 ; N f ; B -172 -215 473 694 ; 
+C 103 ; WX 500 ; N g ; B -26 -215 520 441 ; 
+C 104 ; WX 500 ; N h ; B 20 -11 458 694 ; 
+C 105 ; WX 278 ; N i ; B 42 -11 272 635 ; 
+C 106 ; WX 278 ; N j ; B -169 -215 280 635 ; 
+C 107 ; WX 444 ; N k ; B 11 -11 489 694 ; 
+C 108 ; WX 278 ; N l ; B 38 -11 297 694 ; 
+C 109 ; WX 722 ; N m ; B 17 -11 678 441 ; 
+C 110 ; WX 500 ; N n ; B 19 -11 459 441 ; 
+C 111 ; WX 500 ; N o ; B 29 -11 462 441 ; 
+C 112 ; WX 500 ; N p ; B -110 -213 472 441 ; 
+C 113 ; WX 500 ; N q ; B 21 -213 474 441 ; 
+C 114 ; WX 389 ; N r ; B 18 0 402 441 ; 
+C 115 ; WX 389 ; N s ; B -9 -11 362 441 ; 
+C 116 ; WX 278 ; N t ; B 42 -11 299 562 ; 
+C 117 ; WX 500 ; N u ; B 29 -11 470 441 ; 
+C 118 ; WX 444 ; N v ; B 21 -11 442 441 ; 
+C 119 ; WX 667 ; N w ; B 17 -11 661 441 ; 
+C 120 ; WX 444 ; N x ; B -33 -11 439 441 ; 
+C 121 ; WX 444 ; N y ; B -78 -215 440 441 ; 
+C 122 ; WX 389 ; N z ; B -29 0 392 430 ; 
+C 123 ; WX 400 ; N braceleft ; B 109 -215 515 694 ; 
+C 124 ; WX 275 ; N bar ; B 78 -215 119 694 ; 
+C 125 ; WX 400 ; N braceright ; B -34 -215 371 694 ; 
+C 126 ; WX 541 ; N asciitilde ; B 21 194 542 331 ; 
+C 130 ; WX 333 ; N quotesinglbase ; B 31 -125 174 87 ; 
+C 131 ; WX 500 ; N florin ; B 0 -210 487 677 ; 
+C 132 ; WX 556 ; N quotedblbase ; B 14 -127 381 88 ; 
+C 133 ; WX 889 ; N ellipsis ; B 129 -13 754 94 ; 
+C 134 ; WX 500 ; N dagger ; B 107 -202 521 677 ; 
+C 135 ; WX 500 ; N daggerdbl ; B -14 -215 503 694 ; 
+C 136 ; WX 333 ; N circumflex ; B 124 522 385 677 ; 
+C 137 ; WX 1000 ; N perthousand ; B 62 -26 986 677 ; 
+C 138 ; WX 500 ; N Scaron ; B 6 -15 545 863 ; 
+C 139 ; WX 333 ; N guilsinglleft ; B 56 -15 311 449 ; 
+C 140 ; WX 944 ; N OE ; B 21 -6 969 667 ; 
+C 145 ; WX 333 ; N quoteleft ; B 211 463 354 677 ; 
+C 146 ; WX 333 ; N quoteright ; B 195 463 338 677 ; 
+C 147 ; WX 556 ; N quotedblleft ; B 192 461 559 677 ; 
+C 148 ; WX 556 ; N quotedblright ; B 182 461 548 677 ; 
+C 149 ; WX 350 ; N bullet ; B 55 208 300 453 ; 
+C 150 ; WX 500 ; N endash ; B -8 221 508 256 ; 
+C 151 ; WX 889 ; N emdash ; B -9 220 898 257 ; 
+C 152 ; WX 333 ; N tilde ; B 96 538 407 666 ; 
+C 153 ; WX 980 ; N trademark ; B 14 268 963 662 ; 
+C 154 ; WX 389 ; N scaron ; B -9 -11 411 677 ; 
+C 155 ; WX 333 ; N guilsinglright ; B 22 -15 277 449 ; 
+C 156 ; WX 667 ; N oe ; B 26 -12 648 441 ; 
+C 159 ; WX 556 ; N Ydieresis ; B 89 0 666 835 ; 
+C 160 ; WX 250 ; N nbspace ; B 0 0 0 0 ; 
+C 161 ; WX 611 ; N exclamdown ; B -48 -185 550 677 ; 
+C 162 ; WX 333 ; N cent ; B 143 542 421 686 ; 
+C 163 ; WX 556 ; N sterling ; B -28 0 523 662 ; 
+C 164 ; WX 500 ; N currency ; B 13 96 485 566 ; 
+C 165 ; WX 556 ; N yen ; B -32 0 601 677 ; 
+C 166 ; WX 500 ; N brokenbar ; B 6 -15 541 879 ; 
+C 167 ; WX 500 ; N section ; B -1 -203 509 683 ; 
+C 168 ; WX 333 ; N dieresis ; B 130 549 409 654 ; 
+C 169 ; WX 500 ; N copyright ; B 6 -15 545 863 ; 
+C 170 ; WX 500 ; N ordfeminine ; B 6 -180 541 677 ; 
+C 171 ; WX 556 ; N guillemotleft ; B 69 0 649 863 ; 
+C 172 ; WX 556 ; N logicalnot ; B -1 0 610 879 ; 
+C 173 ; WX 333 ; N minus ; B 26 184 299 249 ; 
+C 174 ; WX 556 ; N registered ; B -1 0 610 863 ; 
+C 175 ; WX 556 ; N macron ; B -1 0 610 835 ; 
+C 176 ; WX 400 ; N degree ; B 47 376 348 676 ; 
+C 177 ; WX 500 ; N plusminus ; B 23 -184 489 441 ; 
+C 178 ; WX 333 ; N twosuperior ; B 38 -184 262 0 ; 
+C 179 ; WX 278 ; N threesuperior ; B 24 -11 300 694 ; 
+C 180 ; WX 333 ; N acute ; B 199 517 359 684 ; 
+C 181 ; WX 364 ; N mu ; B 38 -11 452 694 ; 
+C 182 ; WX 389 ; N paragraph ; B -9 -11 376 684 ; 
+C 183 ; WX 333 ; N periodcentered ; B 165 522 426 677 ; 
+C 184 ; WX 333 ; N cedilla ; B -18 -180 165 14 ; 
+C 185 ; WX 389 ; N onesuperior ; B -9 -11 411 677 ; 
+C 186 ; WX 389 ; N ordmasculine ; B -9 -180 362 441 ; 
+C 187 ; WX 364 ; N guillemotright ; B 41 -11 452 694 ; 
+C 188 ; WX 389 ; N onequarter ; B -29 0 392 684 ; 
+C 189 ; WX 333 ; N onehalf ; B 147 516 450 684 ; 
+C 190 ; WX 389 ; N threequarters ; B -29 0 411 677 ; 
+C 191 ; WX 389 ; N questiondown ; B -29 0 392 654 ; 
+C 192 ; WX 611 ; N Agrave ; B -22 0 579 879 ; 
+C 193 ; WX 611 ; N Aacute ; B -48 0 618 879 ; 
+C 194 ; WX 611 ; N Acircumflex ; B -48 0 620 863 ; 
+C 195 ; WX 611 ; N Atilde ; B -48 0 689 863 ; 
+C 196 ; WX 611 ; N Adieresis ; B -48 0 668 835 ; 
+C 197 ; WX 556 ; N Aring ; B -32 0 522 879 ; 
+C 198 ; WX 667 ; N AE ; B 67 -15 703 879 ; 
+C 199 ; WX 667 ; N Ccedilla ; B 67 -180 703 677 ; 
+C 200 ; WX 667 ; N Egrave ; B 67 -15 703 863 ; 
+C 201 ; WX 611 ; N Eacute ; B -22 0 632 879 ; 
+C 202 ; WX 611 ; N Ecircumflex ; B -22 -184 632 662 ; 
+C 203 ; WX 611 ; N Edieresis ; B -22 0 632 835 ; 
+C 204 ; WX 611 ; N Igrave ; B -22 0 632 863 ; 
+C 205 ; WX 333 ; N Iacute ; B -31 0 410 879 ; 
+C 206 ; WX 333 ; N Icircumflex ; B -31 0 420 863 ; 
+C 207 ; WX 722 ; N Idieresis ; B -29 0 704 863 ; 
+C 208 ; WX 722 ; N Eth ; B -23 0 711 662 ; 
+C 209 ; WX 667 ; N Ntilde ; B -27 -15 761 879 ; 
+C 210 ; WX 667 ; N Ograve ; B -27 -15 761 863 ; 
+C 211 ; WX 722 ; N Oacute ; B 59 -15 717 879 ; 
+C 212 ; WX 722 ; N Ocircumflex ; B 59 -15 717 863 ; 
+C 213 ; WX 722 ; N Otilde ; B 59 -15 719 879 ; 
+C 214 ; WX 722 ; N Odieresis ; B 59 -15 717 835 ; 
+C 215 ; WX 675 ; N multiply ; B 80 131 481 532 ; 
+C 216 ; WX 611 ; N Oslash ; B -22 0 579 863 ; 
+C 217 ; WX 722 ; N Ugrave ; B 105 -15 813 883 ; 
+C 218 ; WX 722 ; N Uacute ; B 105 -15 813 879 ; 
+C 219 ; WX 722 ; N Ucircumflex ; B 105 -15 813 879 ; 
+C 220 ; WX 722 ; N Udieresis ; B 105 -15 813 835 ; 
+C 221 ; WX 556 ; N Yacute ; B 89 0 666 879 ; 
+C 222 ; WX 556 ; N Thorn ; B 69 -216 649 662 ; 
+C 223 ; WX 500 ; N germandbls ; B -160 -215 498 694 ; 
+C 224 ; WX 389 ; N agrave ; B 18 0 402 684 ; 
+C 225 ; WX 500 ; N aacute ; B 23 -11 469 684 ; 
+C 226 ; WX 500 ; N acircumflex ; B 23 -11 469 677 ; 
+C 227 ; WX 500 ; N atilde ; B 23 -11 480 686 ; 
+C 228 ; WX 500 ; N adieresis ; B 23 -11 494 654 ; 
+C 229 ; WX 278 ; N aring ; B 38 -11 367 879 ; 
+C 230 ; WX 444 ; N ae ; B 29 -11 428 684 ; 
+C 231 ; WX 444 ; N ccedilla ; B 29 -180 427 441 ; 
+C 232 ; WX 444 ; N egrave ; B 29 -11 513 677 ; 
+C 233 ; WX 444 ; N eacute ; B 31 -11 430 684 ; 
+C 234 ; WX 444 ; N ecircumflex ; B 31 -184 430 441 ; 
+C 235 ; WX 444 ; N edieresis ; B 31 -11 467 654 ; 
+C 236 ; WX 444 ; N igrave ; B 31 -11 507 677 ; 
+C 237 ; WX 278 ; N iacute ; B 42 -11 333 684 ; 
+C 238 ; WX 278 ; N icircumflex ; B 42 -11 341 677 ; 
+C 239 ; WX 608 ; N idieresis ; B 19 -11 696 694 ; 
+C 240 ; WX 500 ; N eth ; B 19 -11 587 694 ; 
+C 241 ; WX 500 ; N ntilde ; B 19 -11 459 684 ; 
+C 242 ; WX 500 ; N ograve ; B 19 -11 459 677 ; 
+C 243 ; WX 500 ; N oacute ; B 29 -11 462 684 ; 
+C 244 ; WX 500 ; N ocircumflex ; B 29 -11 468 677 ; 
+C 245 ; WX 500 ; N otilde ; B 29 -11 541 684 ; 
+C 246 ; WX 500 ; N odieresis ; B 29 -11 494 654 ; 
+C 247 ; WX 549 ; N divide ; B 11 136 537 524 ; 
+C 248 ; WX 389 ; N oslash ; B 18 0 428 677 ; 
+C 249 ; WX 500 ; N ugrave ; B 29 -11 470 693 ; 
+C 250 ; WX 500 ; N uacute ; B 29 -11 470 684 ; 
+C 251 ; WX 500 ; N ucircumflex ; B 29 -11 522 684 ; 
+C 252 ; WX 500 ; N udieresis ; B 29 -11 482 654 ; 
+C 253 ; WX 444 ; N yacute ; B -78 -215 440 684 ; 
+C 254 ; WX 278 ; N thorn ; B -17 -216 299 562 ; 
+C 255 ; WX 333 ; N ydieresis ; B 241 291 343 393 ; 
+C 274 ; WX 333 ; N c274 ; B 241 291 343 393 ; 
+EndCharMetrics
+StartKernData
+StartKernPairs 112
+KPX space A -18
+KPX one one -74
+KPX A space -18
+KPX A T -37
+KPX A V -50
+KPX A W -37
+KPX A Y -55
+KPX A v -55
+KPX A w -55
+KPX A y -55
+KPX A quoteright -37
+KPX F comma -129
+KPX F period -129
+KPX F A -129
+KPX L space -18
+KPX L T -20
+KPX L V -37
+KPX L W -37
+KPX L Y -20
+KPX L y -30
+KPX L quoteright -37
+KPX P space -18
+KPX P comma -129
+KPX P period -129
+KPX P A -129
+KPX R V -18
+KPX R W -18
+KPX R Y -18
+KPX R y -18
+KPX T space -18
+KPX T comma -74
+KPX T hyphen -74
+KPX T period -74
+KPX T colon -55
+KPX T semicolon -65
+KPX T A -74
+KPX T O -18
+KPX T a -92
+KPX T c -92
+KPX T e -92
+KPX T i -55
+KPX T o -92
+KPX T r -55
+KPX T s -92
+KPX T u -55
+KPX T w -74
+KPX T y -74
+KPX V space -18
+KPX V comma -129
+KPX V hyphen -55
+KPX V period -129
+KPX V colon -65
+KPX V semicolon -74
+KPX V A -74
+KPX V O -30
+KPX V a -111
+KPX V e -111
+KPX V i -74
+KPX V o -111
+KPX V r -74
+KPX V u -74
+KPX V y -92
+KPX W comma -92
+KPX W hyphen -37
+KPX W period -92
+KPX W colon -65
+KPX W semicolon -65
+KPX W A -70
+KPX W a -92
+KPX W e -92
+KPX W i -55
+KPX W o -92
+KPX W r -55
+KPX W u -55
+KPX W y -92
+KPX Y comma -92
+KPX Y hyphen -74
+KPX Y period -92
+KPX Y colon -65
+KPX Y semicolon -65
+KPX Y A -70
+KPX Y a -92
+KPX Y e -92
+KPX Y i -74
+KPX Y o -92
+KPX Y p -92
+KPX Y q -111
+KPX Y u -92
+KPX Y v -92
+KPX f quoteright 92
+KPX r comma -111
+KPX r hyphen -20
+KPX r period -111
+KPX r c -37
+KPX r d -37
+KPX r e -37
+KPX r g -37
+KPX r h -18
+KPX r o -37
+KPX r q -37
+KPX r quoteright 37
+KPX v comma -74
+KPX v period -74
+KPX w comma -74
+KPX w period -74
+KPX y comma -55
+KPX y period -55
+KPX quoteleft quoteleft -111
+KPX quoteright space -111
+KPX quoteright s -129
+KPX quoteright t -111
+KPX quoteright quoteright -111
+EndKernPairs
+EndKernData
+EndFontMetrics
Binary files ../siag-3.4.1/common/fonts/tnrl2i__.pfb and ./common/fonts/tnrl2i__.pfb differ
diff -urNP ../siag-3.4.1/common/fonts.c ./common/fonts.c
--- ../siag-3.4.1/common/fonts.c	Tue Aug 15 11:25:10 2000
+++ ./common/fonts.c	Wed Oct 25 15:55:14 2000
@@ -437,7 +437,7 @@
 	char fn[1024];
 	int state = 0, w, g;
 	char b[256], n[256], *p;
-	int *widths = ccalloc(256, sizeof *widths);
+	int *widths = ccalloc(512, sizeof *widths);
 	FILE *fp;
 
 	if (q[0] == '/') strcpy(fn, q);
@@ -477,6 +477,10 @@
 	fontname_table[nfontname].afm[1] = NULL;
 	fontname_table[nfontname].afm[2] = NULL;
 	fontname_table[nfontname].afm[3] = NULL;
+	fontname_table[nfontname].pfb[0] = NULL;
+	fontname_table[nfontname].pfb[1] = NULL;
+	fontname_table[nfontname].pfb[2] = NULL;
+	fontname_table[nfontname].pfb[3] = NULL;
 	fontname_table[nfontname].x_name[0] = NULL;
 	fontname_table[nfontname].x_name[1] = NULL;
 	fontname_table[nfontname].x_name[2] = NULL;
@@ -529,6 +533,16 @@
 	return i;
 }
 
+static void register_encoding(char *name)
+{
+	int i;
+
+	for (i = 0; i < nfontname; i++) {
+		if (!cstrcasecmp(name, fontname_table[i].name)) break;
+	}
+	if (i < nfontname) fontname_table[i].iso8859_1 = 0;
+}
+
 /* ---
 As above but for Postscript.
 */
@@ -551,6 +565,26 @@
 }
 
 /* ---
+As above but for pfb files.
+*/
+
+int register_pfb(char *name, char *ps, char *psi, char *psb, char *psbi)
+{
+	int i;
+
+	for (i = 0; i < nfontname; i++) {
+		if (!cstrcasecmp(name, fontname_table[i].name)) break;
+	}
+	if (i == nfontname) grow_fontname_table(name);
+	fontname_table[i].pfb[0] = cstrdup(ps);
+	fontname_table[i].pfb[1] = cstrdup(psi);
+	fontname_table[i].pfb[2] = cstrdup(psb);
+	fontname_table[i].pfb[3] = cstrdup(psbi);
+	fontname_table[i].iso8859_1 = 0;
+	return i;
+}
+
+/* ---
 As above but for Type 1 (T1lib).
 */
 
@@ -658,6 +692,14 @@
 			} else {
 				register_afm(n, nr, ni, nb, nbi);
 			}
+		} else if (!strncmp(s, "PFB=", 4)) {
+			i = sscanf(s, "PFB=%[^|]|%[^|]|%[^|]|%[^\n]",
+				nr, ni, nb, nbi);
+			if (i != 4) {
+				fprintf(stderr, "Error in %s\n", s);
+			} else {
+				register_pfb(n, nr, ni, nb, nbi);
+			}
 		} else if (!strncmp(s, "X=", 2)) {
 			i = sscanf(s, "X=%[^|]|%[^|]|%[^|]|%[^\n]",
 				nr, ni, nb, nbi);
@@ -689,6 +731,9 @@
 			} else {
 				font_alias(nr, n);
 			}
+		} else if (!strncmp(s, "ENC=", 4)) {
+			/* tell us it's not Latin1 */
+			register_encoding(n);
 		}
 	}
 	fclose(fp);
diff -urNP ../siag-3.4.1/common/fonts.h ./common/fonts.h
--- ../siag-3.4.1/common/fonts.h	Tue Aug 15 11:24:10 2000
+++ ./common/fonts.h	Wed Oct 25 15:37:29 2000
@@ -115,6 +115,7 @@
 typedef struct {
 	char *name;
 	int *afm[4];
+	char *pfb[4];
 	char *x_name[4];
 	char *ps_name[4];
 	char *t1_name[4];
diff -urNP ../siag-3.4.1/common/fonts.txt ./common/fonts.txt
--- ../siag-3.4.1/common/fonts.txt	Tue Aug 15 18:00:11 2000
+++ ./common/fonts.txt	Fri Oct 27 02:28:15 2000
@@ -1,6 +1,8 @@
 # The format of this file:
 #
 # [Font Name]	Name as it appears to the user
+# AFM=roman|italic|bold|italicbold	AFM filename
+# PFB=roman|italic|bold|italicbold	PFB filename
 # X=roman|italic|bold|italicbold	X fonts
 # PS=roman|italic|bold|italicbold	PS fonts for printing
 # T1=roman|italic|bold|italicbold	T1 fonts (used by libt1)
@@ -76,11 +78,19 @@
 X=-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-*
 PS=ZapfDingbats|ZapfDingbats|ZapfDingbats|ZapfDingbats
 
-[Nimbus Sans]
-AFM=uhvr8a.afm|uhvro8a.afm|uhvb8a.afm|uhvbo8a.afm
-T1=NimbusSanL-Regu|NimbusSanL-ReguItal|NimbusSanL-Bold|NimbusSanL-BoldItal
-
-[Nimbus Roman]
-AFM=utmr8a.afm|utmri8a.afm|utmb8a.afm|utmbi8a.afm
-T1=NimbusRomNo9L-Regu|NimbusRomNo9L-ReguItal|NimbusRomNo9L-Medi|NimbusRomNo9L-MediItal
+# To use these fonts, the pfb files must be added
+#[Nimbus Sans]
+#AFM=uhvr8a.afm|uhvro8a.afm|uhvb8a.afm|uhvbo8a.afm
+#T1=NimbusSanL-Regu|NimbusSanL-ReguItal|NimbusSanL-Bold|NimbusSanL-BoldItal
+#
+#[Nimbus Roman]
+#AFM=utmr8a.afm|utmri8a.afm|utmb8a.afm|utmbi8a.afm
+#T1=NimbusRomNo9L-Regu|NimbusRomNo9L-ReguItal|NimbusRomNo9L-Medi|NimbusRomNo9L-MediItal
+
+# Example of a Latin2 font.
+[Times2]
+AFM=tnrl2___.afm|tnrl2i__.afm|tnrl2b__.afm|tnrl2bi_.afm
+X=-*-times-medium-r-*--*-%d-%d-%d-*-*-*-2|-*-times-medium-i-*--*-%d-%d-%d-*-*-*-2|-*-times-bold-r-*--*-%d-%d-%d-*-*-*-2|-*-times-bold-i-*--*-%d-%d-%d-*-*-*-2
+PS=TimesNewRomanL2|TimesNewRomanL2-Italic|TimesNewRomanL2-Bold|TimesNewRomanL2-BoldItalic
+PFB=tnrl2___.pfb|tnrl2i__.pfb|tnrl2b__.pfb|tnrl2bi_.pfb
 
diff -urNP ../siag-3.4.1/common/pfb2ps.c ./common/pfb2ps.c
--- ../siag-3.4.1/common/pfb2ps.c	Thu Jan  1 01:00:00 1970
+++ ./common/pfb2ps.c	Fri Oct 27 00:32:10 2000
@@ -0,0 +1,62 @@
+/* This translates ps fonts in .pfb format to ASCII ps files. */
+
+/* 2000-10-26 Snarfed from Groff by Ulric */
+
+#include <stdio.h>
+
+/* Binary bytes per output line. */
+#define BYTES_PER_LINE (64/2)
+#define HEX_DIGITS "0123456789abcdef"
+
+static void error(char *p)
+{
+	fprintf(stderr, "%s\n", p);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	for (;;) {
+		int type, c, i;
+		long n;
+
+		c = getchar();
+		if (c != 0x80) error("first byte of packet not 0x80");
+		type = getchar();
+		if (type == 3) break;
+		if (type != 1 && type != 2) error("bad packet type");
+		n = 0;
+		for (i = 0; i < 4; i++) {
+			c = getchar();
+			if (c == EOF) error("end of file in packet header");
+			n |= (long) c << (i << 3);
+		}
+		if (n < 0) error("negative packet length");
+		if (type == 1) {
+			while (--n >= 0) {
+				c = getchar();
+				if (c == EOF)
+					error("end of file in text packet");
+				if (c == '\r') c = '\n';
+				putchar(c);
+			}
+			if (c != '\n') putchar('\n');
+		} else {
+			int count = 0;
+			while (--n >= 0) {
+				c = getchar();
+				if (c == EOF)
+					error("end of file in binary packet");
+				if (count >= BYTES_PER_LINE) {
+					putchar('\n');
+					count = 0;
+				}
+				count++;
+				putchar(HEX_DIGITS[(c >> 4) & 0xf]);
+				putchar(HEX_DIGITS[c & 0xf]);
+			}
+			putchar('\n');
+		}
+	}
+	exit(0);
+}
diff -urNP ../siag-3.4.1/common/readpfa ./common/readpfa
--- ../siag-3.4.1/common/readpfa	Tue Mar 30 00:28:30 1999
+++ ./common/readpfa	Thu Jan  1 01:00:00 1970
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# This script finds a Type 1 font file (pfa or pfb) and dumps it on stdout.
-# Binary files are converted to ascii; requires t1ascii from t1utils.
-
-IFS=:
-
-for d in $1; do
-	if [ -f $d/$2 ]; then
-		f=$d/$2
-	fi
-done
-
-case `file "$f"` in
-*data* )
-	t1ascii $f
-	;;
-*text* )
-	cat $f
-	;;
-* )
-	echo No such file 1>&2
-	;;
-esac
-
diff -urNP ../siag-3.4.1/configure ./configure
--- ../siag-3.4.1/configure	Thu Oct 12 21:57:37 2000
+++ ./configure	Thu Oct 26 13:44:31 2000
@@ -716,7 +716,7 @@
 
 PACKAGE=siag
 
-VERSION=3.4.1
+VERSION=3.4.2
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff -urNP ../siag-3.4.1/configure.in ./configure.in
--- ../siag-3.4.1/configure.in	Sat Sep 16 22:21:57 2000
+++ ./configure.in	Fri Oct 20 09:52:43 2000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(README)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(siag, 3.4.1)
+AM_INIT_AUTOMAKE(siag, 3.4.2)
 
 dnl Set of available languages
 dnl ALL_LINGUAS=""
diff -urNP ../siag-3.4.1/gvu/main.c ./gvu/main.c
--- ../siag-3.4.1/gvu/main.c	Mon Sep 18 19:03:55 2000
+++ ./gvu/main.c	Fri Oct 27 01:37:09 2000
@@ -25,6 +25,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include <X11/Intrinsic.h>
 #include <X11/cursorfont.h>
diff -urNP ../siag-3.4.1/pw/pw.scm ./pw/pw.scm
--- ../siag-3.4.1/pw/pw.scm	Mon Aug 28 17:56:54 2000
+++ ./pw/pw.scm	Fri Oct 20 16:38:06 2000
@@ -538,7 +538,8 @@
 ; If wvHtml is available, use it for all Word versions
   (if (executable-file "wvHtml")
     (register-converter "MS Word (*.doc)"
-			"*.html" "wvHtml -c iso-8859-15 %s > %s"
+;			"*.html" "wvHtml -c iso-8859-15 %s > %s"
+			"*.html" "wvHtml %s %s"
 			nil nil)
 ; otherwise look for catdoc and mswordview
     (begin
diff -urNP ../siag-3.4.1/siag/Makefile.in ./siag/Makefile.in
--- ../siag-3.4.1/siag/Makefile.in	Thu Oct 19 14:44:56 2000
+++ ./siag/Makefile.in	Fri Oct 27 12:49:53 2000
@@ -322,8 +322,7 @@
 buffer.o: buffer.c ../common/common.h ../common/cmalloc.h \
 	../common/fonts.h ../common/plugin.h calc.h ../common/traceme.h \
 	user_interface.h
-ccmath.o: ccmath.c ../config.h ../siod/siod.h calc.h ../common/traceme.h \
-	user_interface.h
+ccmath.o: ccmath.c ../config.h
 ci.o: ci.c ../common/cmalloc.h ../common/common.h calc.h \
 	../common/traceme.h user_interface.h
 cmds.o: cmds.c ../siod/siod.h ../common/cmalloc.h ../common/fonts.h \
diff -urNP ../siag-3.4.1/siag/mathwrap.c ./siag/mathwrap.c
--- ../siag-3.4.1/siag/mathwrap.c	Wed Oct  4 18:39:39 2000
+++ ./siag/mathwrap.c	Wed Oct 25 23:10:06 2000
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <ctype.h>
 #include "../siod/siod.h"
 #include "../config.h"
 
@@ -415,7 +416,7 @@
 ;@roman(x)
 ;@Converts between roman and decimal numbers. If x is a number or
 ; a string where the first character is a digit, converts to roman.
-; Otherwise converts to decimal string.
+; Otherwise converts to number.
 ;@
 ;@
 */
@@ -431,7 +432,10 @@
 	} else {
 		p = get_c_string(x);
 	}
-	if (do_roman(p, c)) return strcons(-1, c);
+	if (do_roman(p, c)) {
+		if (isdigit(c[0])) return flocons(strtol(c, NULL, 10));
+		else return strcons(-1, c);
+	}
 	return NIL;
 }
 
diff -urNP ../siag-3.4.1/siag/siag.scm ./siag/siag.scm
--- ../siag-3.4.1/siag/siag.scm	Sun Sep 17 10:41:17 2000
+++ ./siag/siag.scm	Wed Oct 25 22:02:22 2000
@@ -1040,7 +1040,7 @@
     (first-page-set buf (extract-number "first" new))))
 
 ; This is used by menu.scm and docs/menus.scm
-(define (add-pseudo-menu name) nil)
+(define (add_pseudo_menu name) nil)
 
 ;@totalheight(r1, r2)
 ;@ Return the total height (in pixels)
diff -urNP ../siag-3.4.1/xcommon/Ruler.c ./xcommon/Ruler.c
--- ../siag-3.4.1/xcommon/Ruler.c	Sat Sep 23 18:46:00 2000
+++ ./xcommon/Ruler.c	Wed Oct 25 22:08:40 2000
@@ -176,6 +176,7 @@
 tabtab RulerNextTab(Widget w, int t)
 {
 	RulerWidget rw = (RulerWidget)w;
+	if (w == None) return next_tab(NULL, t+1);
 	return next_tab(rw->ruler.tt, t);
 }
 
@@ -249,8 +250,6 @@
 	unsigned long mask = 0;
 	XGCValues values;
 	Display *dpy = XtDisplay(w);
-	Screen *s = XtScreen(w);
-	unsigned long white = WhitePixelOfScreen(s);
 	unsigned long grey;
 	(*superclass->core_class.realize)(w, v, a);
 	values.font = rw->ruler.font->fid;
diff -urNP ../siag-3.4.1/xcommon/fonts.c ./xcommon/fonts.c
--- ../siag-3.4.1/xcommon/fonts.c	Mon Aug 21 18:42:21 2000
+++ ./xcommon/fonts.c	Fri Oct 27 01:54:11 2000
@@ -548,7 +548,8 @@
 	struct done *next;
 } *done_fonts;
 
-static void ps_makefont(FILE *fp, int id, char *ps_name, int pfab, char *enc)
+static void ps_makefont(FILE *fp, int id, char *ps_name, int pfab,
+			char *enc, char *pfb)
 {
 	struct done *df;
 
@@ -560,8 +561,33 @@
 	df->next = done_fonts;
 	done_fonts = df;
 
+	if (pfab == 0 && pfb != NULL) {
+		FILE *fpin;
+		char b[1024];
+
+		sprintf(b, "%s/common/fonts/%s", datadir, pfb);
+		fpin = fopen(b, "r");
+		if (fpin) {
+			pfb2ps(fpin, fp);
+			fclose(fpin);
+		}
+	}
+
 #ifdef HAVE_LIB_T1X
 	if (pfab) {	/* dump font into ps file */
+#if 1
+		FILE *fpin;
+		char b[1024];
+
+		if (id == -1) return;
+		sprintf(b, "%s/common/fonts/%s", datadir,
+			T1_GetFontFileName(id));
+		fpin = fopen(b, "r");
+		if (fpin) {
+			pfb2ps(fpin, fp);
+			fclose(fpin);
+		}
+#else
 		char b[1024], cmd[10000];
 		FILE *ffp;
 		if (id == -1) return;
@@ -577,6 +603,7 @@
 			fputs(b, fp);
 		pclose(ffp);
 		/* and presto, we have a font */
+#endif
 	}
 #endif
 	if (!enc) return;	/* don't bother */
@@ -613,11 +640,14 @@
 		else enc = NULL;
 
 		ps_name = fontname_table[name].ps_name[j];
-		if (ps_name) ps_makefont(fp, id, ps_name, 0, enc);
-		else {
+		if (ps_name) {
+			ps_makefont(fp, id, ps_name, 0, enc,
+				fontname_table[name].pfb[j]);
+		} else {
 			ps_name = fontname_table[name].t1_name[j];
 			if (!ps_name) continue;		/* give up */
-			ps_makefont(fp, id, ps_name, 1, enc);
+			ps_makefont(fp, id, ps_name, 1, enc,
+				fontname_table[name].pfb[j]);
 		}
 	}
 	while (done_fonts) {
diff -urNP ../siag-3.4.1/xegon/window.c ./xegon/window.c
--- ../siag-3.4.1/xegon/window.c	Mon Sep 18 19:10:44 2000
+++ ./xegon/window.c	Thu Oct 26 17:49:43 2000
@@ -877,7 +877,6 @@
 The_end:
 
 	if (w->ui->ani_shell) {
-
 		XtVaSetValues(w->ui->stage,
 			XtNanimatorCast, b->sht[sht].cast,
 			XtNanimatorDelta, b->sht[sht].delta,
@@ -987,6 +986,8 @@
 	if (w == NULL) return NULL;
 
 	w->ui = (egon_ui *)cmalloc(sizeof(egon_ui));
+	w->ui->stage = w->ui->ani_shell = None;
+	w->sht = 0;
 	if (w->ui == NULL) {
 		cfree(w);
 		return NULL;
@@ -1397,6 +1398,8 @@
 	stderr_redir(topLevel);
 
         plugin_init(topLevel, handle_plugin_exit, handle_plugin_cmd);
+
+	stage_init(w_list);
 
 	activate_window(w_list);
 
diff -urNP ../siag-3.4.1/xsiag/window.c ./xsiag/window.c
--- ../siag-3.4.1/xsiag/window.c	Mon Sep 25 00:41:27 2000
+++ ./xsiag/window.c	Wed Oct 25 22:06:14 2000
@@ -1911,13 +1911,13 @@
 static void popup_shortcuts(Widget w, XEvent *event,
 		String *p, Cardinal *n)
 {
-#if 0
+#if 1
 	XButtonEvent *bev = (XButtonEvent *)event;
 
 	activate_window(find_window_by_widget(w));
 #endif
 	if (!XtIsRealized(shortcuts)) XtRealizeWidget(shortcuts);
-#if 0
+#if 1
 	XtVaSetValues(shortcuts,
 		XtNx, bev->x_root,
 		XtNy, bev->y_root,