Changeset 1013

Timestamp:

01/17/09 16:07:06 (1 year ago)

Author:

astrange

Message:

- Workaround ATS bug where newlines in the rendered text show up as other characters
- Adjust \ escape handling so I understand it
- Comment some parts of subtitles
- Fix NSArray exception on sub parse error
- Don't malloc() the breaks array every time

Files:

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

trunk/Subtitles/SubATSUIRenderer.h

@@ -19 +19 @@
-        SubContext *context;
-        unichar *ubuffer;
+        UniCharArrayOffset *breakbuffer;
-        ATSUTextLayout layout;
-        float screenScaleX, screenScaleY, videoWidth, videoHeight;

trunk/Subtitles/SubATSUIRenderer.m

@@ -216 +216 @@
-                ATSUCreateTextLayout(&layout);
-                ubuffer = malloc(sizeof(unichar) * 128);
+                breakbuffer = malloc(sizeof(UniCharArrayOffset) * 2);
+                
-                srgbCSpace = GetSRGBColorSpace();
-                
@@ -243 +245 @@
-                
-                ubuffer = malloc(sizeof(unichar) * 128);
+                breakbuffer = malloc(sizeof(UniCharArrayOffset) * 2);
-                
-                videoWidth = width;
@@ -260 +263 @@
-{
-        [context release];
+        free(breakbuffer);
-        free(ubuffer);
-        CGColorSpaceRelease(srgbCSpace);
@@ -269 +273 @@
--(void)finalize
-{
+        free(breakbuffer);
-        free(ubuffer);
-        UCDisposeTextBreakLocator(&breakLocator);
@@ -315 +320 @@
-        ATSUFontID font;
-        
+        // should be kFontMicrosoftPlatform for the platform code
+        // but isn't for bug workarounds
-        ATSUFindFontFromName(uname, nlen * sizeof(unichar), kFontFamilyName, kFontNoPlatformCode, kFontNoScript, kFontNoLanguage, &font);
-        
@@ -381 +388 @@
-                SetATSUStyleOther(style, kATSUFontMatrixTag, sizeof(CGAffineTransform), &mat);
-        }
-
+
-        const ATSUFontFeatureType ftypes[] = {kLigaturesType, kTypographicExtrasType, kTypographicExtrasType, kTypographicExtrasType};
-        const ATSUFontFeatureSelector fsels[] = {kCommonLigaturesOnSelector, kSmartQuotesOnSelector, kPeriodsToEllipsisOnSelector, kHyphenToEnDashOnSelector};
-        
-        ATSUSetFontFeatures(style, sizeof(ftypes) / sizeof(ATSUFontFeatureType), ftypes, fsels);
-
+
-        return style;
-}
@@ -785 +792 @@
-}
-
-
-
-
+
+
-        ItemCount breakCount=0;
-        
@@ -807 +813 @@
-        }
-                
-malloc(
+realloc(breaks, 
-        ATSUGetSoftLineBreaks(layout, kATSUFromTextBeginning, kATSUToTextEnd, breakCount, &breaks[1], NULL);
-        
-        breaks[0] = 0;
-        breaks[breakCount+1] = textLen;
-       
+
-        *nbreaks = breakCount;
-        return breaks;
@@ -878 +884 @@
-
-static void RenderActualLine(ATSUTextLayout layout, UniCharArrayOffset thisBreak, UniCharArrayOffset lineLen, Fixed penX, Fixed penY, CGContextRef c, SubRenderDiv *div, SubATSUISpanEx *spanEx, int textType)
-
+
+
+
+
+
+
+
+
+
-        if (textType == kTextLayerOutline && div->styleLine->borderStyle == kSubBorderStyleBox) {
-                ATSUTextMeasurement lineWidth, lineHeight, lineX, lineY;
@@ -917 +931 @@
-                } else {
-                        int j, spans = [div->spans count];
+                        
+                        //linear search for the next span to draw
-                        for (j = 0; j < spans; j++) {
-                                SubRenderSpan *span = [div->spans objectAtIndex:j];
@@ -928 +944 @@
-                                
-                                if (spanLen == 0) continue;
-
-
+ // too early
+ // too far ahead
-                                
-
+ // text spans a newline
-                                        drawStart = thisBreak;
-                                        drawLen = spanLen - (thisBreak - span->offset);
@@ -938 +954 @@
-                                        drawLen = spanLen;
-                                }
-
+
-                                endLayer = SetupCGForSpan(c, spanEx, lastSpanEx, div, textType, endLayer);
-                                RenderActualLine(layout, drawStart, drawLen, (textType == kTextLayerShadow) ? (penX + FloatToFixed(spanEx->shadowDist)) : penX, 
@@ -1005 +1021 @@
-                unsigned textLen = [div->text length];
-                BOOL resetPens = NO;
-
-
+ || ![div->spans count]
+                               
-                if (div->layer != lastLayer) {
-                        resetPens = YES;
@@ -1019 +1035 @@
-                marginRect.size.height *= screenScaleY;
-
-
+
+
-
-                [div->text getCharacters:ubuffer];
@@ -1029 +1046 @@
-                SetStyleSpanRuns(layout, div);
-                
-ItemCount breakCount
-
+breakbuffer = FindLineBreaks(layout, div, breakLocator, breakbuffer, &breakCount, breakingWidth, ubuffer, textLen)
+
-                ATSUTextMeasurement imageWidth, imageHeight;
-
-
+
+
+
+
-
-                if (!div->positioned) {
@@ -1099 +1118 @@
-                
-                if (storePen) *storePen = penY;
-                
-                free(breaks);
-        }
-        

trunk/Subtitles/SubParsing.m.rl

@@ -397 +397 @@
-
-                                action backslash_handler {
-
+
+
-                                        unichar c = *(p+1), o=c;
-                                        
@@ -408 +409 @@
-                                                                o = 0xA0; //non-breaking space
-                                                                break;
-                                                        default:
-                                                                o = c;
-                                                }
-}
-
-[div->text appendFormat:@"%C",o];
+       
+       [div->text appendFormat:@"%C",o];
+}
-                                        
-                                        chars_deleted++;
-                                        
-
+
+
-                                }
-                                
@@ -449 +449 @@
-                                }
-                                                                
-any) >
+:> any) @
-                                sub_text_char = [^\\{];
-                                sub_text = sub_text_char*;