commit a1cf6e43bda11d68a0f1b60ac4a85445c34ba42b
parent 74d4efc66417b001c64d85695e976b089eeea5f8
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Tue, 29 Jan 2013 22:49:43 +0100
more sonnet types
Diffstat:
6 files changed, 104 insertions(+), 26 deletions(-)
diff --git a/static/tpl/french_abab.tpl b/static/tpl/french_abab.tpl
@@ -0,0 +1,18 @@
+6/6 A x
+6/6 B X
+6/6 A X
+6/6 B x
+
+6/6 A x
+6/6 B X
+6/6 A X
+6/6 B x
+
+6/6 C y
+6/6 C y
+6/6 D w
+
+6/6 E z
+6/6 D z
+6/6 E w
+
diff --git a/static/tpl/french_abba.tpl b/static/tpl/french_abba.tpl
@@ -0,0 +1,18 @@
+6/6 A x
+6/6 B X
+6/6 B X
+6/6 A x
+
+6/6 A x
+6/6 B X
+6/6 B X
+6/6 A x
+
+6/6 C y
+6/6 C y
+6/6 D w
+
+6/6 E z
+6/6 D z
+6/6 E w
+
diff --git a/static/tpl/italian_abab.tpl b/static/tpl/italian_abab.tpl
@@ -0,0 +1,18 @@
+6/6 A x
+6/6 B X
+6/6 A X
+6/6 B x
+
+6/6 A x
+6/6 B X
+6/6 A X
+6/6 B x
+
+6/6 C y
+6/6 C y
+6/6 D w
+
+6/6 E z
+6/6 E z
+6/6 D w
+
diff --git a/static/tpl/italian_abba.tpl b/static/tpl/italian_abba.tpl
@@ -0,0 +1,18 @@
+6/6 A x
+6/6 B X
+6/6 B X
+6/6 A x
+
+6/6 A x
+6/6 B X
+6/6 B X
+6/6 A x
+
+6/6 C y
+6/6 C y
+6/6 D w
+
+6/6 E z
+6/6 E z
+6/6 D w
+
diff --git a/static/tpl/sonnet.tpl b/static/tpl/sonnet.tpl
@@ -1,18 +0,0 @@
-6/6 A x
-6/6 B X
-6/6 B X
-6/6 A x
-
-6/6 A x
-6/6 B X
-6/6 B X
-6/6 A x
-
-6/6 E y
-6/6 E y
-6/6 G w
-
-6/6 F z
-6/6 F z
-6/6 G w
-
diff --git a/views/index.html b/views/index.html
@@ -37,16 +37,40 @@
<dd>Classical alexandrine verse with <em>hémistiche</em>, flat rhymes, alternate
rhyme genres.</dd>
{% endif %}
- <dt><input type="radio" name="template" value="sonnet" id="sonnet" />
- <label for="sonnet"><span class="template">sonnet</span></label></dt>
+ <dt><input type="radio" name="template" value="italian_abba" id="italian_abba" />
+ <label for="italian_abba"><span class="template">italian_abba</span></label></dt>
{% if lang == 'fr' %}
- <dd>Sonnet classique : deux quatrains d'alexandrins
- classiques en rimes embrassées et genres alternés, deux tercets d'alexandrins
- classiques en rimes AAC BBC.</dd>
+ <dd>Sonnet italien classique d'alexandrins à rimes embrassées : deux quatrains
+ en rimes embrassées, deux tercets en rimes CCD EED.</dd>
{% else %}
- <dd>Classical sonnet: two <em>quatrains</em> of classical alexandrine verse
- with <em>rimes embrassées</em> and alternate genres, two <em>tercets</em> of
- classical alexandrine verse with rhyme pattern AAC BBC.</dd>
+ <dd>Classical Italian sonnet of alexandrine verse with <em>rimes
+ embrassées</em>: two <em>quatrains</em> with <em>rimes embrassées</em>, two
+ <em>tercets</em> with rhyme pattern CCD EED.</dd>
+ {% endif %}
+ <dt><input type="radio" name="template" value="italian_abab" id="italian_abab" />
+ <label for="italian_abab"><span class="template">italian_abab</span></label></dt>
+ {% if lang == 'fr' %}
+ <dd>Sonnet italien classique d'alexandrins à rimes croisées.</dd>
+ {% else %}
+ <dd>Classical Italian sonnet of alexandrine verse with <em>rimes croisées</em>.</dd>
+ {% endif %}
+ <dt><input type="radio" name="template" value="french_abba" id="french_abba" />
+ <label for="french_abba"><span class="template">french_abba</span></label></dt>
+ {% if lang == 'fr' %}
+ <dd>Sonnet français classique d'alexandrins à rimes embrassées : deux
+ quatrains en rimes embrassées, deux tercets en rimes CCD
+ EDE.</dd>
+ {% else %}
+ <dd>Classical French sonnet of alexandrine verse with <em>rimes
+ embrassées</em>: two <em>quatrains</em> with <em>rimes embrassées</em>, two
+ <em>tercets</em> with rhyme pattern CCD EDE.</dd>
+ {% endif %}
+ <dt><input type="radio" name="template" value="french_abab" id="french_abab" />
+ <label for="french_abab"><span class="template">french_abab</span></label></dt>
+ {% if lang == 'fr' %}
+ <dd>Sonnet français classique d'alexandrins à rimes croisées.</dd>
+ {% else %}
+ <dd>Classical French sonnet of alexandrine verse with <em>rimes croisées</em>.</dd>
{% endif %}
<dt><input type="radio" name="template" value="alexandrin" id="alexandrin" />
<label for="alexandrin"><span class="template">alexandrin</span></label></dt>
