[AQT-commit] CVS: aquaterm AQTStringDrawingAdditions.m,1.7,1.8 Demo.m,1.10,1.11

[Per P. <per...@us...>]

Update of /cvsroot/aquaterm/aquaterm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30366

Modified Files:
	AQTStringDrawingAdditions.m Demo.m 
Log Message:
Nudging sub/superscript size. Adding example to demo.m


Index: AQTStringDrawingAdditions.m
===================================================================
RCS file: /cvsroot/aquaterm/aquaterm/AQTStringDrawingAdditions.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- AQTStringDrawingAdditions.m	18 Oct 2004 18:38:19 -0000	1.7
+++ AQTStringDrawingAdditions.m	19 Oct 2004 08:52:31 -0000	1.8
@@ -201,7 +201,7 @@
          else
             baseline = pos.y + glyphHeight * 0.7 + baselineOffset; 
          extendsRight = YES;
-         subPos = recurse(path, attrString, defaultFontName, defaultFontSize, i, attributedSublevel, NSMakePoint(pos.x, baseline), fontScale * 0.65);
+         subPos = recurse(path, attrString, defaultFontName, defaultFontSize, i, attributedSublevel, NSMakePoint(pos.x, baseline), fontScale * 0.75);
          maxRight = MAX(subPos.x, maxRight);
       }
    }

Index: Demo.m
===================================================================
RCS file: /cvsroot/aquaterm/aquaterm/Demo.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Demo.m	9 Jun 2004 07:54:38 -0000	1.10
+++ Demo.m	19 Oct 2004 08:52:31 -0000	1.11
@@ -300,6 +300,38 @@
 [adapter addLabel:@"Middle" atPoint:NSMakePoint(410, 45.5) angle:0.0 align:(AQTAlignLeft | AQTAlignMiddle)];
 [adapter addLabel:@"Baseline" atPoint:NSMakePoint(460, 45.5) angle:0.0 align:(AQTAlignLeft | AQTAlignBaseline)];
 
+// Equations
+{
+   NSMutableAttributedString *attrStr;
+   [adapter setFontname:@"Helvetica"];
+   [adapter setFontsize:12.0];
+   [adapter addLabel:@"Equation style" atPoint:NSMakePoint(260, 95) angle:0.0 align:AQTAlignCenter];
+
+   [adapter setFontname:@"Times-Roman"];
+   [adapter setFontsize:14.0];
+
+   attrStr = [[[NSMutableAttributedString alloc] initWithString:@"e-ip+1= 0"] autorelease];
+   [attrStr addAttribute:@"AQTFontname" value:@"Symbol" range:NSMakeRange(3,1)]; // Greek
+   [attrStr addAttribute:@"NSSuperScript" value:[NSNumber numberWithInt:1] range:NSMakeRange(1,3)]; // eponent
+   [attrStr addAttribute:@"AQTFontsize" value:[NSNumber numberWithFloat:6.0] range:NSMakeRange(7,1)]; // extra spacing
+   
+   [adapter addLabel:attrStr atPoint:NSMakePoint(260, 75) angle:0.0 align:AQTAlignCenter];
+
+   attrStr = [[[NSMutableAttributedString alloc] initWithString:@"mSke-wk2"] autorelease];
+   [attrStr addAttribute:@"AQTFontname" value:@"Symbol" range:NSMakeRange(0,2)];
+   [attrStr addAttribute:@"AQTFontsize" value:[NSNumber numberWithFloat:20.0] range:NSMakeRange(1,1)];
+   [attrStr addAttribute:@"AQTBaselineAdjust" value:[NSNumber numberWithFloat:-0.25] range:NSMakeRange(1,1)]; // Lower symbol 25%
+   [attrStr addAttribute:@"NSSuperScript" value:[NSNumber numberWithInt:-1] range:NSMakeRange(2,1)];
+   [attrStr addAttribute:@"AQTFontname" value:@"Times-Roman" range:NSMakeRange(3,1)];
+   [attrStr addAttribute:@"NSSuperScript" value:[NSNumber numberWithInt:1] range:NSMakeRange(4,2)];
+   [attrStr addAttribute:@"AQTFontname" value:@"Symbol" range:NSMakeRange(5,1)];
+   [attrStr addAttribute:@"NSSuperScript" value:[NSNumber numberWithInt:-2] range:NSMakeRange(6,1)];
+   [attrStr addAttribute:@"NSSuperScript" value:[NSNumber numberWithInt:2] range:NSMakeRange(7,1)];
+
+   [adapter addLabel:attrStr atPoint:NSMakePoint(260, 45) angle:0.0 align:AQTAlignCenter];
+
+}
+
 [adapter renderPlot];
 // [NSException raise:@"AQTFatalException" format:@"Testing"];