Fresco/Fresco-IDL/share/idl/Fresco Font.idl,1.6,1.7 FontKit.idl,1.2,1.3
Nick Lewycky <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco
In directory purcel:/tmp/cvs-serv6529/Fresco-IDL/share/idl/Fresco
Modified Files:
Font.idl FontKit.idl
Log Message:
Make it compile again after Tobias' scene graph debugging patch.
Preliminary (untested) implementation of decompose.
Size now means point size, an unsigned long.
Index: Font.idl
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco/Font.idl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Font.idl 17 Feb 2003 02:10:33 -0000 1.6
+++ Font.idl 2 Mar 2003 15:13:01 -0000 1.7
@@ -42,6 +42,12 @@
// horizontally to the center line of vertical
// fonts.
Coord underline_offset, underline_thickness;
+ unsigned long point_size;
+ // PANOSE: classification (latin, kanji...), genre (text, decorative)
+ // variation (normal, italic), weight, serif-type (panose1 lists
+ // 13 possible styles while panose2 has ten measurments to make)
+ // proportion (monospace, expanded), contrast, stroke variation,
+ // arm style, letterform, midline, x-height...
};
enum SegmentType { move, line, conic, cubic };
@@ -71,7 +77,7 @@
interface Glyph : RefCountBase, Identifiable
{
- Raster bitmap(in unsigned short xdpi, in unsigned short ydpi);
+ Raster bitmap(in unsigned long xdpi, in unsigned long ydpi);
FontShape decompose();
void char_info(out GlyphMetrics gm);
void transformation(in Transform t);
@@ -94,8 +100,6 @@
void font_metrics(out FontMetrics fm);
Unistring font_style();
Unistring fullname();
- //. font size
- Coord height();
Vertex kerning(in Unichar first, //.< first in visual order
in Unichar second); //.< second in visual order
Index: FontKit.idl
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-IDL/share/idl/Fresco/FontKit.idl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FontKit.idl 16 Feb 2003 03:47:46 -0000 1.2
+++ FontKit.idl 2 Mar 2003 15:13:01 -0000 1.3
@@ -46,14 +46,16 @@
//. supply the One True Font.
Font _default();
//. inform the FontKit of a new Font
- Font filename(in string file, in Unistring style, in Coord size);
+ Font filename(in string file, in Unistring style,
+ in unsigned long point_size);
//. look up font from list of known fonts.
- Font provide(in Unistring family, in Unistring style, in Coord size);
+ Font provide(in Unistring family, in Unistring style,
+ in unsigned long point_size);
Graphic set_font(in Graphic g, in Font f);
- Graphic size(in Graphic g, in Coord s);
+ Graphic size(in Graphic g, in unsigned long s);
Graphic style(in Graphic g, in Unistring s);
- Graphic delta_size(in Graphic g, in Coord ds);
+ Graphic delta_size(in Graphic g, in long ds);
Graphic delta_style(in Graphic g, in Unistring ds);
FontIterator first_font();