aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Vilcans <martin@librador.com>2014-03-03 15:33:01 +0100
committerMartin Vilcans <martin@librador.com>2014-03-03 15:33:01 +0100
commit25b790b14bc0965664d4e1580dd685b9fe920a04 (patch)
tree5563503a6af7dfeba86600650f9cbd93e90cae21
parente19078c702e81b443ab65acf67ae3e61c1b0c06c (diff)
parent8b0e94fb16b45632dc1f57ffdf9e76768a8aa656 (diff)
downloadscreenplain-25b790b14bc0965664d4e1580dd685b9fe920a04.tar.gz
Merge branch 'master' into python3
-rw-r--r--screenplain/export/html.py2
-rw-r--r--tests/files/parenthetical.fountain3
-rw-r--r--tests/files/parenthetical.fountain.fdx14
-rw-r--r--tests/files/parenthetical.fountain.html1
4 files changed, 19 insertions, 1 deletions
diff --git a/screenplain/export/html.py b/screenplain/export/html.py
index fa02acd..b987d81 100644
--- a/screenplain/export/html.py
+++ b/screenplain/export/html.py
@@ -115,7 +115,7 @@ class Formatter(object):
self.out.write(to_html(dialog.character))
for parenthetical, text in dialog.blocks:
- classes = 'parenthetical' if parenthetical else None
+ classes = ['parenthetical'] if parenthetical else None
with self._tag('p', classes=classes):
self.out.write(to_html(text))
diff --git a/tests/files/parenthetical.fountain b/tests/files/parenthetical.fountain
new file mode 100644
index 0000000..9072cf8
--- /dev/null
+++ b/tests/files/parenthetical.fountain
@@ -0,0 +1,3 @@
+JOHN DOE
+(screaming)
+Hello!!! \ No newline at end of file
diff --git a/tests/files/parenthetical.fountain.fdx b/tests/files/parenthetical.fountain.fdx
new file mode 100644
index 0000000..b9eaad0
--- /dev/null
+++ b/tests/files/parenthetical.fountain.fdx
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<FinalDraft DocumentType="Script" Template="No" Version="1">
+<Content>
+<Paragraph Type="Character">
+<Text>JOHN DOE</Text>
+</Paragraph>
+<Paragraph Type="Parenthetical">
+<Text>(screaming)</Text>
+</Paragraph>
+<Paragraph Type="Dialogue">
+<Text>Hello!!!</Text>
+</Paragraph>
+</Content>
+</FinalDraft>
diff --git a/tests/files/parenthetical.fountain.html b/tests/files/parenthetical.fountain.html
new file mode 100644
index 0000000..d233d53
--- /dev/null
+++ b/tests/files/parenthetical.fountain.html
@@ -0,0 +1 @@
+<div class="dialog"><p class="character">JOHN DOE</p><p class="parenthetical">(screaming)</p><p>Hello!!!</p></div>