Changeset 841

Timestamp:

03/31/08 14:37:29 (4 months ago)

Author:

astrange

Message:

Redo r838 in a better way. Add anotther -description.

Files:

• trunk/Subtitles/SubATSUIRenderer.m (modified) (1 diff)
• trunk/Subtitles/SubContext.m (modified) (1 diff)
• trunk/Subtitles/SubParsing.h (modified) (1 diff)
• trunk/Subtitles/SubParsing.m.rl (modified) (3 diffs)

trunk/Subtitles/SubATSUIRenderer.m

@@ -991 +991 @@
-                ATSUTextMeasurement imageWidth, imageHeight;
-
-X != kSubPositionNone
-
-div->posX == kSubPositionNone
+itioned
+
+!div->positioned
-                        penX = FloatToFixed(NSMinX(marginRect));
-

trunk/Subtitles/SubContext.m

@@ -141 +141 @@
-}
-
+static NSString *yes(int i) {return i ? @"yes" : @"no";}
+
+static NSString *ColorString(SubRGBAColor *c)
+{
+        return [NSString stringWithFormat:@"{R: %d G: %d B: %d A: %d}", (int)(c->red * 255),
+                                         (int)(c->green * 255), (int)(c->blue * 255), (int)(c->alpha * 255)];
+}
+
+-(NSString *)description
+{
+        static const NSString *alignHStr[] = {@"left", @"center", @"right"};
+        static const NSString *alignVStr[] = {@"bottom", @"middle", @"top"};
+        static const NSString *bstyle[] = {@"normal", @"box"};
+        
+        return [NSString stringWithFormat:@""
+                                         "SubStyle named \"%@\"\n"
+                                         "-Font: %f pt %@\n"
+                                         "-Primary color: %@\n"
+                                         "-Secondary color: %@\n"
+                                         "-Outline: %f px %@\n"
+                                         "-Shadow: %f px %@\n"
+                                         "-Margin: %d px left, %d px right, %d px vertical\n"
+                                         "-Bold: %@ Italic: %@ Underline: %@ Strikeout: %@\n"
+                                         "-Alignment: %@ %@\n"
+                                         "-Border style: %@\n"
+                                         "-Per-font scale: %f\n",
+                                         name, size, fontname, ColorString(&primaryColor),
+                                         ColorString(&secondaryColor), outlineRadius, ColorString(&outlineColor),
+                                         shadowDist, ColorString(&shadowColor), marginL, marginR, marginV,
+                                         yes(bold), yes(italic), yes(underline), yes(strikeout), alignHStr[alignH],
+                                         alignVStr[alignV], bstyle[borderStyle], platformSizeScale];
+}
+
--(void)dealloc
-{

trunk/Subtitles/SubParsing.h

@@ -27 +27 @@
-        int posX, posY;
-        UInt8 alignH, alignV, wrapStyle, render_complexity;
-
+, positioned
-        
-        unsigned layer;

trunk/Subtitles/SubParsing.m.rl

@@ -62 +62 @@
-                spans = nil;
-                
-kSubPositionNone
+0
-                alignH = kSubAlignmentMiddle; alignV = kSubAlignmentBottom;
-                
-
+positioned = 
-                render_complexity = 0;
-        }
@@ -92 +92 @@
-  
-    div->is_shape = NO;
+        div->positioned = positioned;
-        div->render_complexity = render_complexity;
-        
@@ -333 +334 @@
-                                        div->posX = curX;
-                                        div->posY = curY;
+                                        div->positioned = YES;
-                                }
-