From afc81572068c015b54e1e3937c92f8f64c244dbf Mon Sep 17 00:00:00 2001
From: Fabio Tesser <fabio.tesser@gmail.com>
Date: Sat, 15 Dec 2012 18:51:12 +0100
Subject: [PATCH] Added some comma and puntutaution rules (Issue
 marytts-it/marytts#21)

---
 .../marytts/language/it/ProsodyGeneric.java   |  2 +-
 .../it/prosody/tobipredparams_italian.xml     | 63 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/marytts-lang-it/src/main/java/marytts/language/it/ProsodyGeneric.java b/marytts-lang-it/src/main/java/marytts/language/it/ProsodyGeneric.java
index 933ceea452..075e24e8b1 100644
--- a/marytts-lang-it/src/main/java/marytts/language/it/ProsodyGeneric.java
+++ b/marytts-lang-it/src/main/java/marytts/language/it/ProsodyGeneric.java
@@ -884,7 +884,7 @@ protected synchronized void getAccentPosition(Element token, NodeList tokens, in
     protected synchronized boolean getAccentShape(Element token, NodeList tokens, int position, String sentenceType,
     	String specialPositionType, boolean nucleusAssigned)
     {
-    	System.out.println("getAccentShape");
+    	//System.out.println("getAccentShape");
         String tokenText = MaryDomUtils.tokenText(token); // text of current token
           
         // prosodic position (prenuclear, nuclear, postnuclear)
diff --git a/marytts-lang-it/src/main/resources/marytts/language/it/prosody/tobipredparams_italian.xml b/marytts-lang-it/src/main/resources/marytts/language/it/prosody/tobipredparams_italian.xml
index 88e265b733..7d8b5d6665 100644
--- a/marytts-lang-it/src/main/resources/marytts/language/it/prosody/tobipredparams_italian.xml
+++ b/marytts-lang-it/src/main/resources/marytts/language/it/prosody/tobipredparams_italian.xml
@@ -118,7 +118,8 @@ Possible values are only: "enfofpar"(end of paragraph) and "endofvorfeld"(end of
   <!-- R1: è, ho, ha, TOCHECK ma anche coniugazioni: erano sono avevano-->
   <list name="verbs0" items="è:ho:ha"/>
   
-  
+  <list name="openFB" items="«:(:{:["/>
+    
   <!-- R2: DE, DQ, PQ ad inizio frase ricevono accento  -->
   <list name="det0" items="DE:DQ:PQ"/>
   
@@ -394,14 +395,72 @@ Possible values are only: "enfofpar"(end of paragraph) and "endofvorfeld"(end of
   (chi, che, cosa, perché, quale, quali, quanto, come, dove, ...) (PR,PQ,DQ,E,B,CS) allora -> L-L% altrimenti (non inizia con: ...) -> L-H% -->
   
   
+
+  <rule> <!-- comma or ellipsis (FF , ...) after al leats 5 token of not punctuation 
+    type major boundary after a punctuation mark in the middle of the sentence -->
+    <attributes pos="FF"/>
+    <folTokens num="1+"/>
+    <prevTokens num="1+"/>
+    <nextAttributes pos="!INLIST:pos_punctuation"/>
+    <previousAttributes pos="!INLIST:pos_punctuation"/>
+    <previousMinus1Attributes pos="!INLIST:pos_punctuation"/>
+    <previousMinus2Attributes pos="!INLIST:pos_punctuation"/>
+    <previousMinus3Attributes pos="!INLIST:pos_punctuation"/>
+    <previousMinus4Attributes pos="!INLIST:pos_punctuation"/>
+    <previousMinus5Attributes pos="!INLIST:pos_punctuation"/>
+    <action bi="4" tone="H-L%"/>
+  </rule>
+
+  <rule> <!-- comma or ellipsis (FF , ...) after al leats 5 token of not punctuation 
+    type major boundary after a punctuation mark in the middle of the sentence -->
+    <attributes pos="FF"/>
+    <nextAttributes pos="!INLIST:pos_punctuation"/>
+    <previousAttributes pos="!INLIST:pos_punctuation"/>
+    <folTokens num="1+"/>
+    <prevTokens num="1+"/>
+    <action bi="3" tone="H-"/>
+  </rule>
+  
+  <!-- Not used 
+  <rule>  (FB « » ( ) " ') minor boundary after  in the middle of the sentence
+    <attributes pos="FB"/>
+    <text word="INLIST:openFB"/>
+    <nextAttributes pos="!INLIST:pos_punctuation"/>
+    <previousAttributes pos="!INLIST:pos_punctuation"/>
+    <folTokens num="1+"/>
+    <prevTokens num="1+"/>
+    <action bi="3" tone="H-"/>
+  </rule>
+   -->
+   
+  <rule> <!-- (FB « » ( ) " ') sentence type major boundary after a punctuation mark in the middle of the sentence -->
+    <attributes pos="FB"/>
+    <folTokens num="1+"/>
+    <prevTokens num="1+"/>
+    <action bi="4" tone="H-L%"/>
+  </rule>
+  
+  
+  <rule> <!-- (FC : ; -) sentence type major boundary after a punctuation mark in the middle of the sentence -->
+    <attributes pos="FC"/>
+    <folTokens num="1+"/>
+    <prevTokens num="1+"/>
+    <nextAttributes pos="!INLIST:pos_punctuation"/>
+    <previousAttributes pos="!INLIST:pos_punctuation"/>
+    <previousMinus1Attributes pos="!INLIST:pos_punctuation"/>
+    <action bi="4" tone="H-L%"/>
+  </rule>
   
   
-  <rule> <!-- major boundary after a punctuation mark in the middle of the sentence -->
+  <rule> <!-- others major boundary after a punctuation mark in the middle of the sentence -->
     <attributes pos="INLIST:pos_punctuation"/>
     <folTokens num="1+"/>
     <prevTokens num="1+"/>
     <action bi="4" tone="H-L%"/>
   </rule>
+  
+  
+  
 
 <!-- TOCHECK: insert the , ; : rules -->