Changeset 1208

Timestamp:

11/23/09 23:25:15 (4 months ago)

Author:

astrange

Message:

SSA: Implement vertical text properly and fix it being badly misplaced.
\an5 used a completely wrong origin calculation.
Also try to put rotated vertical text in vaguely the right place - this probably won't work outside this file.
Fixes the rest of [Mazui]_To_Aru_Kagaku_no_Railgun_-_07_[D0494691].mkv.

Files:

• trunk/Subtitles/SubATSUIRenderer.m (modified) (17 diffs)
• trunk/Subtitles/SubContext.h (modified) (1 diff)
• trunk/Subtitles/SubContext.m (modified) (2 diffs)

trunk/Subtitles/SubATSUIRenderer.m

@@ -30 +30 @@
-static float GetWinFontSizeScale(ATSFontRef font);
-static void FindAllPossibleLineBreaks(TextBreakLocatorRef breakLocator, const unichar *uline, UniCharArrayOffset lineLen, unsigned char *breakOpportunities);
+static ATSUFontID GetFontIDForSSAName(NSString *name);
-
-#define declare_bitfield(name, bits) unsigned char name[bits / 8 + 1]; bzero(name, sizeof(name));
@@ -40 +41 @@
-        CGColorRef primaryColor, outlineColor, shadowColor;
-        Float32 outlineRadius, shadowDist, scaleX, scaleY, primaryAlpha, outlineAlpha, angle, platformSizeScale, fontSize;
-
+, vertical
-        ATSUFontID font;
-        ATSUVerticalCharacterType fontVertical;
-}
--(SubATSUISpanEx*)initWithStyle:(ATSUStyle)style_ subStyle:(SubStyle*)sstyle colorSpace:(CGColorSpaceRef)cs;
@@ -89 +89 @@
-
--(SubATSUISpanEx*)initWithStyle:(ATSUStyle)style_ subStyle:(SubStyle*)sstyle colorSpace:(CGColorSpaceRef)cs
-
-
-
+
-        if (self = [super init]) {
-                ATSUCreateAndCopyStyle(style_, &style);
@@ -107 +105 @@
-                platformSizeScale = sstyle->platformSizeScale;
-                fontSize = sstyle->size;
-ATSUGetAttribute(style, kATSUFontTag, sizeof(ATSUFontID), &font, &unused)
-ATSUGetAttribute(style, kATSUVerticalCharacterTag, sizeof(ATSUVerticalCharacterType), &fontVertical, &unused
+vertical = sstyle->vertical
+font = GetFontIDForSSAName(sstyle->fontname
-        }
-        
@@ -132 +130 @@
-        ret->fontSize = fontSize;
-        ret->font = font;
-
+
+
-        
-        return ret;
@@ -342 +341 @@
--(void*)completedStyleParsing:(SubStyle*)s
-{
-, kATSUVerticalCharacterTag
-, sizeof(ATSUVerticalCharacterType)
+
+
-        
-        NSString *fn = s->fontname;
-        ATSUVerticalCharacterType vertical = ParseFontVerticality(&fn) ? kATSUStronglyVertical : kATSUStronglyHorizontal;
-        ATSUFontID font = GetFontIDForSSAName(fn);
-        ATSFontRef fontRef = font;
@@ -354 +352 @@
-        ATSUStyle style;
-                
-, &vertical
+
-        
-        if (!s->platformSizeScale) s->platformSizeScale = GetWinFontSizeScale(fontRef);
@@ -413 +411 @@
-        Fixed fSize = FloatToFixed(spanEx->fontSize * spanEx->platformSizeScale * screenScale);
-        SetATSUStyleOther(spanEx->style, kATSUFontTag, sizeof(ATSUFontID), &spanEx->font);
-        SetATSUStyleOther(spanEx->style, kATSUVerticalCharacterTag, sizeof(ATSUVerticalCharacterType), &spanEx->fontVertical);
-        SetATSUStyleOther(spanEx->style, kATSUSizeTag, sizeof(Fixed), &fSize);
-}
@@ -471 +468 @@
-                        sv();
-                        oldFont = spanEx->font;
-fontVertical = ParseFontVerticality(&sval) ? kATSUStronglyVertical : kATSUStronglyHorizontal
+vertical = ParseFontVerticality(&sval)
-                        spanEx->font = GetFontIDForSSAName(sval);
-                        if (oldFont != spanEx->font) spanEx->platformSizeScale = GetWinFontSizeScale(spanEx->font);
@@ -695 +692 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        unsigned span_count = [div->spans count];
@@ -702 +734 @@
-        for (i = 0; i < span_count; i++) {
-                SubRenderSpan *span = [div->spans objectAtIndex:i];
-
-
+
+
+
+
+
+
+
+
-        }
-}
@@ -1052 +1090 @@
-                unsigned textLen = [div->text length];
-                if (!textLen || ![div->spans count]) continue;
-
+, resetGState = NO
-                NSData *ubufferData;
-                const unichar *ubuffer = STUnicodeForString(div->text, &ubufferData);
@@ -1062 +1100 @@
-                
-                //NSLog(@"%@", div);
-               
+
-                NSRect marginRect = NSMakeRect(div->marginL, div->marginV, context->resX - div->marginL - div->marginR, context->resY - div->marginV - div->marginV);
-                
@@ -1077 +1115 @@
-                
-                SetLayoutPositioning(layout, breakingWidth, div->alignH);
-
+, ubuffer
-                
-                breakbuffer = FindLineBreaks(layout, div, breakLocator, breakbuffer, &breakCount, breakingWidth, ubuffer, textLen);
@@ -1114 +1152 @@
-                                case kSubAlignmentMiddle:
-                                        if (!centerPen || resetPens) {
-(FloatToFixed(NSMidY(marginRect)) / 2) + (imageHeight / 2)
+FloatToFixed(NSMidY(marginRect)) - (imageHeight / 2) + descent
-                                        } else penY = centerPen;
-                                        
@@ -1147 +1185 @@
-                }
-                
-
-
+
+
+
+
-                        Fixed fangle = FloatToFixed(firstspan->angle);
+                        SetATSULayoutOther(layout, kATSULineRotationTag, sizeof(Fixed), &fangle);
-                        
-
+
+
+
+
+
+
+
+
-                }
-                
@@ -1161 +1209 @@
-                
-                penY = DrawOneTextDiv(c, layout, div, breakc, penX, penY);
+                
+                if (resetGState)
+                        CGContextRestoreGState(c);
-                
-                [ubufferData release];

trunk/Subtitles/SubContext.h

@@ -45 +45 @@
-        unsigned marginL, marginR, marginV;
-        Float32 weight; // 0/1 = not bold/bold, > 1 is a font weight
-
+, vertical
-        UInt8 alignH, alignV, borderStyle;
-        __strong void* ex;

trunk/Subtitles/SubContext.m

@@ -83 +83 @@
-        if ([*fontname characterAtIndex:0] == '@') {
-                *fontname = [*fontname substringFromIndex:1];
-//return YES; // XXX vertical
+return YES;
-        }
-        return NO;
@@ -160 +160 @@
-                ParseASSAlignment(align, &alignH, &alignV);
-                
+                tmp = fontname;
+                vertical = ParseFontVerticality(&tmp);
+                if (vertical)
+                        fontname = [tmp retain];
+                
-                platformSizeScale = 0;
-                ex = [delegate completedStyleParsing:self];