Merge pull request #10 from satamame/fix/issue-9

Fix/issue 9

Author: Tagirijus

.gitignore

@@ -3,3 +3,4 @@
 .eggs*
 build/
 dist/
+.venv/

fountain/fountain.py

@@ -7,9 +7,33 @@
 Further Edited by Manuel Senfft
 """
 
+import re
+import string
 
 COMMON_TRANSITIONS = {'FADE OUT.', 'CUT TO BLACK.', 'FADE TO BLACK.'}
-UPPER_ALPHABETS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ ÄÖÜ1234567890'
+UPPER_ALPHABETS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜ1234567890'
+CHAR_NAME_LETTERS = UPPER_ALPHABETS + string.punctuation + ' '
+
+paren_ptn = re.compile(r'\(.*?\)')
+
+
+def _is_character(line: str) -> bool:
+    '''Test if line is valid as character name
+    '''
+    if line[0] == '@':
+        return True
+
+    if line[0] in ['[', ']', ',', '(', ')']:
+        return False
+
+    if line[0] not in UPPER_ALPHABETS:
+        return False
+
+    # Remove parenthesis-enclosed parts in which any character is valid
+    concise_line = paren_ptn.sub('', line)
+
+    # Remaining part should consist of uppercases and punctuation
+    return all([(c in CHAR_NAME_LETTERS) for c in concise_line])
 
 
 class FountainElement:
@@ -305,9 +329,7 @@ def _parse_body(self, script_body):
                 newlines_before > 0
                 and index + 1 < len(script_body)
                 and script_body[index + 1]
-                and not line[0] in ['[', ']', ',', '(', ')']
-                and (all([(c in UPPER_ALPHABETS) for c in full_strip])
-                     or full_strip[0] == '@')
+                and _is_character(full_strip)
             ):
                 newlines_before = 0
                 if full_strip[-1] == '^':

requirements_dev.txt

@@ -0,0 +1,2 @@
+-e .
+pytest==8.3.3

tests/test_charname.py

@@ -0,0 +1,53 @@
+import pytest
+from fountain import fountain
+
+
+def ftext2test(charname):
+    '''Fountain text with a Character name for testing
+    '''
+    text = '\n'.join([
+        'INT. CASINO - NIGHT',
+        '',
+        'THE DEALER eyes the new player warily.',
+        '',
+        charname,
+        'Where is that pit boss?'
+    ])
+    return text
+
+
+def test_normal():
+    '''Normal parse process should not be broken
+    '''
+    text = ftext2test('JOHN')
+    fobj = fountain.Fountain(text)
+
+    el = fobj.elements[0]
+    assert el.element_type == 'Scene Heading'
+
+    el = fobj.elements[2]
+    assert el.element_type == 'Action'
+
+
+charnames2test = [
+    'JANE DOE',
+    '@naomi',
+    'BILL (O.S.)',
+    'C-3PO',
+    'GROUPIE #1',
+    "SARAH'S FRIEND",
+    'BILL / THE MONSTER',
+    'MICHAEL (as DOROTHY)',
+]
+
+
+@pytest.mark.parametrize('charname', charnames2test)
+def test_charname(charname: str):
+    '''Test various Character names (issue #9)
+    '''
+    text = ftext2test(charname)
+    fobj = fountain.Fountain(text)
+
+    el = fobj.elements[4]
+    assert el.element_type == 'Character'
+    assert el.element_text == charname.removeprefix('@')