Changeset 324

Timestamp:

02/02/07 16:35:22 (2 years ago)

Author:

astrange

Message:

* Remove temporary file from Ragel build phase, since it results in race conditions and silly errors.
* Support SSA style tags used for comments, and fix a crash from tags at the end of lines.

Files:

• trunk/Perian.xcodeproj/project.pbxproj (modified) (1 diff)
• trunk/SSATagParsing.m.rl (modified) (4 diffs)

trunk/Perian.xcodeproj/project.pbxproj

@@ -257 +257 @@
-                                "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).dot",
-                        );
--o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.ragel ${INPUT_FILE_PATH} || exit\n${RLCODEGEN} -T1 -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE} ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.ragel || exit\n
+${INPUT_FILE_PATH} | ${RLCODEGEN} -T1 -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE} || exit\n#
-                };
-/* End PBXBuildRule section */

trunk/SSATagParsing.m.rl

@@ -75 +75 @@
-        
-        return (ATSURGBAlphaColor){r/255.,g/255.,b/255.,a};
+}
+
+static void PruneEmptyStyleSpans(SSARenderEntity *re)
+{
+        SSAStyleSpan *styles_new[re->style_count];
+        size_t style_count_new = 0;
+        int i;
+        
+        for (i = 0; i < re->style_count; i++) {
+                if (re->styles[i]->range.length == 0) {
+                        [re->styles[i] release];
+                } else {
+                        styles_new[style_count_new++] = re->styles[i];
+                }
+        }
+        
+        if (style_count_new != re->style_count) {
+                re->styles = realloc(re->styles, sizeof(SSAStyleSpan*) * style_count_new); 
+                memcpy(re->styles, styles_new, sizeof(SSAStyleSpan*) * style_count_new);
+                
+                re->style_count = style_count_new;
+        }
-}
-
@@ -374 +396 @@
-                                }
-                                
-[01]? > {flag = 1;} % {flag = *(p-1) - '0'
+([01] % {unichar fl = *(p-1); if (flag == '0' || flag == '1') flag = fl - '0';})? > {flag = 1
-                                num_ = digit+ ('.' digit*)?;
-                                num = num_ > {numbegin = p;} % {num = [[NSString stringWithCharacters:numbegin length:p-numbegin] doubleValue];};
@@ -400 +422 @@
-                                                                );
-                                
-cmd_specific
-
-cmd*
+ cmd_specific 
+
+((cmd*) | ([^\\}]*))
-                                
-                                nl = "\\" [Nn];
@@ -417 +439 @@
-                        %%write eof;
-                        
+                        if (re->text[len-1] == '}') skipbegin = p; // make up for how exit_tag isn't called if the } is the last char in the line
+
-                        end_re;
-
-
-
-
-
-
+
+
-
-                        free(pb);