The R Project SVN R

Rev

Rev 21062 | Rev 26060 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 21062 Rev 24735
Line 124... Line 124...
124 
    CurrentY = y;
 124 
    CurrentY = y;
125 
}
 125 
}
126 
 
 126 
 
127 
/* Basic Font Properties */
 127 
/* Basic Font Properties */
128 
 
 128 
 
129 
#ifdef OLD
 - 
 
130 
static double FontHeight()
 - 
 
131 
{
 - 
 
132 
    double height, depth, width;
 - 
 
133 
    /*
- 
 
134 
     * FIXME:  When fontfamily is passed to GEMetricInfo,
 - 
 
135 
     * this will need updating (times many in this file)
 - 
 
136 
     */
 - 
 
137 
    GEMetricInfo(0,
- 
 
138 
		MathFont, MathCex, MathPs,
 - 
 
139 
		&height, &depth, &width, MathDevice);
 - 
 
140 
    return fromDeviceHeight(height + depth, MetricUnit, MathDevice);
 - 
 
141 
}
 - 
 
142 
#endif
 - 
 
143 
 
 - 
 
144 
static double xHeight()
 129 
static double xHeight()
145 
{
 130 
{
146 
    double height, depth, width;
 131 
    double height, depth, width;
147 
    GEMetricInfo('x',
132 
    GEMetricInfo('x',
148 
		MathFont, MathCex, MathPs,
 133 
		MathFont, MathCex, MathPs,
Line 195... Line 180...
195 
		MathFont, MathCex, MathPs,
 180 
		MathFont, MathCex, MathPs,
196 
		&height, &depth, &width, MathDevice);
 181 
		&height, &depth, &width, MathDevice);
197 
    return fromDeviceHeight(depth, MetricUnit, MathDevice);
 182 
    return fromDeviceHeight(depth, MetricUnit, MathDevice);
198 
}
 183 
}
199 
 
 184 
 
200 
#ifdef NOT_used_currently/*-- out 'def'	 (-Wall) --*/
 - 
 
201 
static double AscHeight()
 - 
 
202 
{
 - 
 
203 
    double height, depth, width, save;
 - 
 
204 
    GEMetricInfo('d',
- 
 
205 
		MathFont, MathCex, MathPs,
 - 
 
206 
		&height, &depth, &width, MathDevice);
 - 
 
207 
    save = height;
 - 
 
208 
    GEMetricInfo('a',
- 
 
209 
		MathFont, MathCex, MathPs,
 - 
 
210 
		&height, &depth, &width, MathDevice);
 - 
 
211 
    return fromDeviceHeight(save - height, MetricUnit, MathDevice);
 - 
 
212 
}
 - 
 
213 
#endif
 - 
 
214 
/* Thickness of rules */
 185 
/* Thickness of rules */
215 
static double RuleThickness()
 186 
static double RuleThickness()
216 
{
 187 
{
217 
    return 0.015;
 188 
    return 0.015;
218 
}
 189 
}
Line 2741... Line 2712...
2741 
    n = length(expr);
 2712 
    n = length(expr);
2742 
    for (i = 0; i < n; i++) {
 2713 
    for (i = 0; i < n; i++) {
2743 
	if (NameAtom(CAR(expr)) && NameMatch(CAR(expr), "...")) {
 2714 
	if (NameAtom(CAR(expr)) && NameMatch(CAR(expr), "...")) {
2744 
	    if (i > 0) {
 2715 
	    if (i > 0) {
2745 
		bbox = CombineBBoxes(bbox, RenderSymbolChar(S_COMMA, draw));
 2716 
		bbox = CombineBBoxes(bbox, RenderSymbolChar(S_COMMA, draw));
2746 
#ifdef OLD
 - 
 
2747 
		bbox = CombineBBoxes(bbox, RenderGap(small, draw));
 - 
 
2748 
#else
 - 
 
2749 
		bbox = CombineBBoxes(bbox, RenderSymbolChar(S_SPACE, draw));
 2717 
		bbox = CombineBBoxes(bbox, RenderSymbolChar(S_SPACE, draw));
2750 
#endif
 - 
 
2751 
	    }
 2718 
	    }
2752 
	    bbox = CombineBBoxes(bbox, RenderSymbolChar(S_ELLIPSIS, draw));
 2719 
	    bbox = CombineBBoxes(bbox, RenderSymbolChar(S_ELLIPSIS, draw));
2753 
	    bbox = CombineBBoxes(bbox, RenderGap(small, draw));
 2720 
	    bbox = CombineBBoxes(bbox, RenderGap(small, draw));
2754 
	}
 2721 
	}
2755 
	else {
 2722 
	else {