Fixed writing of forced scene headings, removed FADE IN: from Transit…

…ion regex (should be an Action)

Fountain/FountainRegexes.m

@@ -35,7 +35,7 @@
 NSString * const CHARACTER_CUE_PATTERN      = @"(?<=\\n)([ \\t]*[^<>a-z\\s\\/\\n][^<>a-z:!\\?\\n]*[^<>a-z\\(!\\?:,\\n\\.][ \\t]?)\\n{1}";
 NSString * const DIALOGUE_PATTERN           = @"(<(Character|Parenthetical)>[^<>\\n]+<\\/(Character|Parenthetical)>)([^<>]*?)(?=\\n{2}|\\n{1}<Parenthetical>)";
 NSString * const PARENTHETICAL_PATTERN      = @"(\\([^<>]*?\\)[\\s]?)\n";
-NSString * const TRANSITION_PATTERN         = @"\\n([\\*_]*([^<>\\na-z]*TO:|FADE IN:|FADE TO BLACK\\.|FADE OUT\\.|CUT TO BLACK\\.)[\\*_]*)\\n";
+NSString * const TRANSITION_PATTERN         = @"\\n([\\*_]*([^<>\\na-z]*TO:|FADE TO BLACK\\.|FADE OUT\\.|CUT TO BLACK\\.)[\\*_]*)\\n";
 NSString * const FORCED_TRANSITION_PATTERN  = @"\\n((&gt;|>)\\s*[^<>\\n]+)\\n";     // need to look for &gt; pattern because we run this regex against marked up content
 NSString * const PAGE_BREAK_PATTERN         = @"(?<=\\n)(\\s*[\\=\\-\\_]{3,8}\\s*)\\n{1}";
 NSString * const CLEANUP_PATTERN            = @"<Action>\\s*<\\/Action>";

Fountain/FountainWriter.m

@@ -73,11 +73,24 @@ + (NSString *)bodyFromScript:(FNScript *)script
             textToWrite = [NSString stringWithFormat:@"=%@", element.elementText];
         }        
         else if ([element.elementType isEqualToString:@"Scene Heading"]) {
-            if (!script.suppressSceneNumbers && element.sceneNumber) {
-                textToWrite = [NSString stringWithFormat:@"%@ #%@#", element.elementText, element.sceneNumber];
+            textToWrite = element.elementText;
+
+            /*
+             We need to determine if the scene heading was a forced scene 
+             heading, and if it was, we'll add a dot to the front of the text.
+             This is most easily done by checking to see if the text still
+             matches the SCENE_HEADER_PATTERN. Because we removed the preceeding
+             dot when in the parser, forced scene headings won't match the
+             original regular expression, while non-forced (unaltered) scene
+             headings will.
+             */            
+            if (![[NSString stringWithFormat:@"\n%@\n", element.elementText] isMatchedByRegex:SCENE_HEADER_PATTERN]) {
+                textToWrite = [NSString stringWithFormat:@".%@", textToWrite];
             }
-            else {
-                textToWrite = element.elementText;
+
+            // Append a scene number if needed
+            if (!script.suppressSceneNumbers && element.sceneNumber) {
+                textToWrite = [NSString stringWithFormat:@"%@ #%@#", textToWrite, element.sceneNumber];
             }
         }
         else if ([element.elementType isEqualToString:@"Page Break"]) {

FountainTests/BigFishTests.m

@@ -97,7 +97,7 @@ - (void)testParentheticals
 
 - (void)testTransitions
 {
-    NSInteger indexes[] = {2};
+    NSInteger indexes[] = {209};
     NSInteger maxIndexes = sizeof(indexes)/sizeof(NSInteger);
     for (int i=0; i < maxIndexes; i++) {
         FNElement *element = [self.script.elements objectAtIndex:indexes[i]];

FountainTests/Simple.fountain

@@ -37,4 +37,6 @@ This is in section one.
 
 ## Section 1-1
 
-This should be at a higher depth than the previous section.
+This should be at a higher depth than the previous section.
+
+.FORCED SCENE HEADING

FountainTests/SyntaxTests.m

@@ -63,12 +63,22 @@ - (void)testSceneHeadings
 
 - (void)testTransitions
 {
-    NSInteger indexes[] = {0, 9};
+    NSInteger indexes[] = {9};
     NSInteger maxIndexes = sizeof(indexes)/sizeof(NSInteger);
     for (int i=0; i < maxIndexes; i++) {
         FNElement *element = [self.script.elements objectAtIndex:indexes[i]];
         STAssertEqualObjects(element.elementType, @"Transition", @"Index %d: [%@] %@", indexes[i], element.elementType, element.elementText);
     }
 }
 
+- (void)testForcedSceneHeadings
+{
+    NSInteger indexes[] = {18};
+    NSInteger maxIndexes = sizeof(indexes)/sizeof(NSInteger);
+    for (int i=0; i < maxIndexes; i++) {
+        FNElement *element = [self.script.elements objectAtIndex:indexes[i]];
+        STAssertEqualObjects(element.elementType, @"Scene Heading", @"Index %d: [%@] %@", indexes[i], element.elementType, element.elementText);
+    }
+}
+
 @end