11 files changed, 16 insertions, 18 deletions
diff --git a/screenplain/main.py b/screenplain/main.py
index 7916fe7..b8923b1 100644
--- a/screenplain/main.py
+++ b/screenplain/main.py
@@ -9,7 +9,7 @@ import sys
 import codecs
 from optparse import OptionParser
 
-from screenplain.parsers.spmd import parse
+from screenplain.parsers.fountain import parse
 
 output_formats = (
     'fdx', 'html'
diff --git a/screenplain/parsers/spmd.py b/screenplain/parsers/fountain.py
index 4083725..4083725 100644
--- a/screenplain/parsers/spmd.py
+++ b/screenplain/parsers/fountain.py
diff --git a/tests/files/scene-numbers.spmd b/tests/files/scene-numbers.fountain
index 51064d2..51064d2 100644
--- a/tests/files/scene-numbers.spmd
+++ b/tests/files/scene-numbers.fountain
diff --git a/tests/files/scene-numbers.spmd.html b/tests/files/scene-numbers.fountain.html
index 4b8d051..4b8d051 100644
--- a/tests/files/scene-numbers.spmd.html
+++ b/tests/files/scene-numbers.fountain.html
diff --git a/tests/files/sections.spmd b/tests/files/sections.fountain
index 96a2266..96a2266 100644
--- a/tests/files/sections.spmd
+++ b/tests/files/sections.fountain
diff --git a/tests/files/sections.spmd.html b/tests/files/sections.fountain.html
index d06decb..d06decb 100644
--- a/tests/files/sections.spmd.html
+++ b/tests/files/sections.fountain.html
diff --git a/tests/files/simple.spmd b/tests/files/simple.fountain
index 07d488d..07d488d 100644
--- a/tests/files/simple.spmd
+++ b/tests/files/simple.fountain
diff --git a/tests/files/simple.spmd.fdx b/tests/files/simple.fountain.fdx
index 2e56d82..2e56d82 100644
--- a/tests/files/simple.spmd.fdx
+++ b/tests/files/simple.fountain.fdx
diff --git a/tests/files/simple.spmd.html b/tests/files/simple.fountain.html
index abcc55a..abcc55a 100644
--- a/tests/files/simple.spmd.html
+++ b/tests/files/simple.fountain.html
diff --git a/tests/files_test.py b/tests/files_test.py
index 41d17bb..0f0cba0 100644
--- a/tests/files_test.py
+++ b/tests/files_test.py
@@ -49,24 +49,24 @@ class ParseTests(unittest2.TestCase):
         expected = read_file(self.source(expected_results_file))
         return actual, expected
 
-    def test_spmd_to_fdx(self):
+    def test_fountain_to_fdx(self):
         actual, expected = self.convert(
-            'simple.spmd', 'simple.fdx', 'simple.spmd.fdx')
+            'simple.fountain', 'simple.fdx', 'simple.fountain.fdx')
         self.assertMultiLineEqual(expected, actual)
 
-    def test_spmd_to_html(self):
+    def test_fountain_to_html(self):
         actual, expected = self.convert(
-            'simple.spmd', 'simple.html', 'simple.spmd.html', '--bare')
+            'simple.fountain', 'simple.html', 'simple.fountain.html', '--bare')
         self.assertMultiLineEqual(expected, actual)
 
     def test_scene_numbers(self):
         actual, expected = self.convert(
-            'scene-numbers.spmd', 'scene-numbers.html',
-            'scene-numbers.spmd.html', '--bare')
+            'scene-numbers.fountain', 'scene-numbers.html',
+            'scene-numbers.fountain.html', '--bare')
         self.assertMultiLineEqual(expected, actual)
 
     def test_sections(self):
         actual, expected = self.convert(
-            'sections.spmd', 'sections.html',
-            'sections.spmd.html', '--bare')
+            'sections.fountain', 'sections.html',
+            'sections.fountain.html', '--bare')
         self.assertMultiLineEqual(expected, actual)
diff --git a/tests/spmd_test.py b/tests/fountain_test.py
index bbd03b6..99578cf 100644
--- a/tests/spmd_test.py
+++ b/tests/fountain_test.py
@@ -3,8 +3,8 @@
 # http://www.opensource.org/licenses/mit-license.php
 
 import unittest2
-from screenplain.parsers.spmd import parse
-from screenplain.parsers import spmd
+from screenplain.parsers.fountain import parse
+from screenplain.parsers import fountain
 from screenplain.types import (
     Slug, Action, Dialog, DualDialog, Transition, Section
 )
@@ -105,7 +105,7 @@ class DialogTests(unittest2.TestCase):
         self.assertEquals(Dialog, type(dialog))
         self.assertEquals(plain('SOME GUY'), dialog.character)
 
-    # SPMD would not be able to support a character named "23". We
+    # Fountain would not be able to support a character named "23". We
     # might need a syntax to force a character element.
     def test_nonalpha_character(self):
         paras = list(parse([
@@ -114,8 +114,6 @@ class DialogTests(unittest2.TestCase):
         ]))
         self.assertEquals([Action], [type(p) for p in paras])
 
-    # See
-    # http://prolost.com/storage/downloads/spmd/SPMD_proposal.html#section-br
     def test_twospaced_line_is_not_character(self):
         paras = list(parse([
             'SCANNING THE AISLES...  ',
@@ -395,7 +393,7 @@ class TitlePageTests(unittest2.TestCase):
                 'Title': ['_**BRICK & STEEL**_', '_**FULL RETIRED**_'],
                 'Author': ['Stu Maschwitz'],
             },
-            spmd.parse_title_page(lines)
+            fountain.parse_title_page(lines)
         )
 
     def test_multiple_values(self):
@@ -413,7 +411,7 @@ class TitlePageTests(unittest2.TestCase):
                     '(which happens to be true)'
                 ]
             },
-            spmd.parse_title_page(lines)
+            fountain.parse_title_page(lines)
         )
 
     def test_empty_value_ignored(self):
@@ -423,7 +421,7 @@ class TitlePageTests(unittest2.TestCase):
         ]
         self.assertDictEqual(
             {'Author': ['John August']},
-            spmd.parse_title_page(lines)
+            fountain.parse_title_page(lines)
         )
 
     def test_unparsable_title_page_returns_none(self):
@@ -431,7 +429,7 @@ class TitlePageTests(unittest2.TestCase):
             'Title: Inception',
             '    additional line',
         ]
-        self.assertIsNone(spmd.parse_title_page(lines))
+        self.assertIsNone(fountain.parse_title_page(lines))
 
 if __name__ == '__main__':
     unittest2.main()