File difference report generated by CSDiff by ComponentSoftware on 4/27/04 11:45 AM

Base file: C:\WINDOWS\Desktop\Jelske\nextens-win-bin-1.0-beta\lib\voices\dutch\net_nl_ib_mbrola\festvox\net_nl_int_todi.scm
Compared file: C:\WINDOWS\Desktop\Jelske\nextens-win-bin-1.0-beta\lib\voices\frisian\net_fy_ib_mbrola\festvox\net_fy_int_todi.scm

1c1,3
< ;;; $Id: net_nl_int_todi.scm,v 1.17 2003/04/01 14:38:04 emarsi Exp $
---
> ;;; $Id: net_fy_int_todi.scm, Jelske Dijkstra 2003/10/27
> ;;; copy of betarelease nextens, net_nl_int_todi.scm,v 1.17 2003/04/01 14:38:04 
> ;;; emarsi Exp $
19c21
< ;;;-----------------------------------------------------------------------------
---
> ;;;----------------------------------------------------------------------------
21c23
< ;;;-----------------------------------------------------------------------------
---
> ;;;----------------------------------------------------------------------------
68a71,74
> ;;; // used for debugging if you don't want to use ToDI-rules. 
> 
> ;;; // -----
> 
86a93,95
> ;;; // Make-TargetSymbols, Timing-AD-boundaries, Star-Targets, No-Star-Targets,
> ;;; // Target_Modifications, Locate-Targets-Phoneme, defined below. 
> ;;; // -----
90a100,102
> ;;; // Timing_AD-boundaries called in ToDI-intonation (begin)
> ;;; // calculate the begin and end times of AD's
> 
97c109
< 
---
> ;;; // Target is item van ToneTarget-relatie => zie Make-TargetSymbols
102a115,120
> ;;; // if TargetSymbol is LB1, HB1, XB1, then 
> ;;; // star parent Target and item Syl-Int-relation. 
> ;;; // syl is parent star 
> ;;; // word is parent.parent.parent ("ProsWord1"-niveau) of syl in ProsTree 
> ;;; // segm: follow left daughter of word until the level Segment. 
> ;;; // begin_dur: end of segm minus dur of segm
114a133
> ;;; // time AD begin?
116a136,148
> ;;; // if TargetSymbol is given, then
> ;;; // star parent Target and item Syl-Int
> ;;; // syl parent Target
> ;;; // word parent.parent.parent of syl (ProsWord1)
> ;;; // segm follow left daughter of word until level Segment
> ;;; // as long segm is voiced: segm is previous segm
> ;;; // JD: WHY PREVIOUS? AREN'T YOU GOING THE WRONG WAY (YOU WANT THE NEXT, OR 
> ;;; // DON'T YOU? Answer: The final boundary-tone is lined up and the last  
> ;;; // segment of the phrase. Now you look backwards to the first voiced segment  
> ;;; // So you're going the right way.  
> ;;; // end_dur is feature end on segm
> ;;; // TADE is feature Target and gets end_dur 
> 
124c156
<                (set! segm (item.prev segm)))
---
>                (set! segm (item.prev segm)));;endwhile
130a163,170
> ;;; // (doc utt.relation.leafs UTT RELATIONNAME)
> ;;; // Returns a list of all the leafs in this relation.
> ;;; // DIFFERENCE UTT.RELATION.LEAFS AND UTT.RELATION.ITEMS Answer: You only see  
> ;;; // this at relations which contain parent-daughter relations, like 
> ;;; // ProsTree. With (utt.relation.items 'ProsTree) you get all items back, 
> ;;; // non-terminal and terminal nodes (=leafs). With (utt.relation.leafs 
> ;;; // 'ProsTree) you only get the terminal nodes back (in this case the
> ;;; //  segments). 
133a174,181
> ;;; // the leafs are read now from right to left (reverse)
> ;;; // if Target has a "TADE"-feature then variable TADE becomes this feature. 
> ;;; // The feature itself gets the value of TADE (back).
> ;;; // WHY DO YOU GIVE BACK THE SAME VALUE? WHAT'S THE USE?
> ;;; // Answer: The feature TADE is only set when it isn't there yet. 
> ;;; // This is that confusing if-then-else construction again.
> ;;; // + reverse can be left out.
>  
149a198,208
> ;;; // -----
> ;;; // Make-TargetSymbols is called in ToDI-intonation (begin)
> ;;; // convert ToDISymbols in targets (symbols)
> ;;; // Question: Where were the ToDISymbols as item ToDISymbol joined to words? 
> ;;; // According to me it happens in the Intonation-relation (net_nl_
> ;;; // tune.scm) or in nl::associate_int_to_syls (net_nl_lex.scm), in which one?  
> ;;; // Because it isn't explicitly mentioned as ToDISymbol.
> ;;; // Answer: In net_nl_tune.scm, nl::basic_tune_choice ToDI accents and     ;;; // bounderies are assigned. In Make-TargetSymbols they get translated to  
> ;;; // symbols at an even more detailed level, that stands for seperated  
> ;;; // F0 Targets. E.g. %L gets two targets: LB1 en LB2, which are assigned to ;;; // the ToneTarget relation. 
> 
151a211
> ;;; // creates relation ToneTargets
157a218
> ;;; // TargetSymbol gets ToDISymbol, ToDISymbol of Intonation-relatie
205a267
> ;;; // -----
209a272,274
> ;;; // Star-Targets is called in ToDI-intonation (begin)
> ;;; // calculate F0 and Timing Stars
> 
240c305
<    (if (member_string TargetSymbol '(LB1 HB1 XB1))			; %lL, %H, or %HL
---
>    (if (member_string TargetSymbol '(LB1 HB1 XB1))			; %L, %H, or %HL
260a326,337
> ;;; // star is parent Target and item Syl-Int
> ;;; // syl is parent star
> ;;; // target is left daughter of syl in ProsTree (SylPart)
> ;;; // if feature target is Onset, then next item target
> ;;; // ==> target is nucleus!!
> ;;; // tsegm is left daughter of target (first segm of nucleus) and in 
> ;;; // relation ProsTree
> ;;; // psegm is segm before tsegm (=last segm of onset)
> ;;; // begin_dur is feature end of psegm (=begin nucleus)
> ;;; // this_seg_dur is feature dur van tseg
> ;;; // StarPos from ToDI-Intonation; StarTime is StarPos*this_seg_dur+begin_dur
> ;;; // ===> declare position of accent
273a351
> ;;; // if TargetSymbol is given, then begin
275a354,360
> ;;; // If TargetSymbol is !H, then begin: 
> ;;; // AccentDown is (AccentDown +1) = 2
> ;;; // F0High with new parameters
> ;;; // Range F0Hign - F0Low
> ;;; // Now as wel before H as !H:
> ;;; // NextTarget is next leaf
> ;;; // data 
281c366
< 	      ))
---
> 	      ));;end if
286a372,373
> 
> ;;; // if TargetSymbol is L, then other data
296a384
> ;;; // if TargetSymbol is punctuation, then begin
309a398,401
> ;;; // If TargetSymbol is given, then TADE is given under TADE
> ;;; // if LE2, then calculation, if XE1, then begin with as previous symbol H !H
> ;;; // or HH: calculation
> ;;; // if HE2, then begin
320a413,415
> ;;; // WHAT IF PREVSYMBOL BEFORE % ISN'T H !H OF HH? Answer: this is such an if-
> ;;; // then-else construction again. if member_string then item.set FOHigh, else  
> ;;; // calculation
335a431
> ;;; // -----
341a438,440
> ;;; // No-Star-Targets is called in ToDI-intonation (begin)
> ;;; // calculate F0 and Timing No Stars
> 
366a466,478
> ;;; // L*HL  L*!HL
> ;;; // Question: where is PrevTarget getting set?. Answer: at the bottom of the  
> ;;; // function. The first time this function is passed through PrevTarget
> ;;; // hasn't got a value yet, and lid1 of d (and ...) could thus lead to an  
> ;;; // "unbound variable" error. The fact that this doesn't happen probably is 
> ;;; // because Joop wasn't really neatly with the scope 
> ;;; // of variables. Actually the function should begin with a "(let 
> ;;; // (PrevTarget ...) ...)" in which all local variables are defined
> ;;; // Because of it's lack Scheme assumes that PrevTarget is a global 
> ;;; // variable. If the function after booting of Festival is called once, 
> ;;; // then PrevTarget thus always has a value in further use.  
> ;;; // Only, maybe it's a value from a previous utterance. 
>  
381c493
<                (set! NextTime (item.feat NextTarget "Time"))))
---
>                (set! NextTime (item.feat NextTarget "Time"))));;endwhile
386a499
> ;;; // OLAPT defined on the bottom of file
389c502
<       ))
---
>       ));;endif
390a504
> ;;; // %L, %H, %HL, H*L, !H*L, H*+L, !H*+L, L*HL, L*!HL, H*LH, !H*LH, L%, H%
410a525
> ;;; // OLAPF defined on bottom of file
428a544
> ;;; // H*L, !H*L, L*HL, L*!HL, 
448a565
> ;;; // L*H, H*LH, !H*LH
493a611
> ;;; // -----
497a616,619
> 
> ;;; // Target_Modifications is called in ToDI-intonation (begin)
> ;;; // small modifications of previous calculations
> 
552a675,677
> ;;; // -----
> ;;; // Locate-Targets-Phoneme is called in ToDI-intonation (begin)
> ;;; // locate targets on phonemes
559c684
<   
---
> ;;; //relation Target, segm is second segm in Segment, EndTime endtime of segm  
577c702
< ))
---
> ));;endif
581c706
<       
---
> ;;; // find phoneme on which TargetSymbol is linked to       
586c711
<         
---
> ;;; // TFtargets is list TargetName (item) of Target        
595c720
< 
---
> ;;; // segm is daughter TFtargets in Target-relation
603c728,729
< 
---
> ;;; // -----
> ;;; // JD: WHERE IS THIS BEING CALLED? Answer: in Make_TargetSymbols
635c761
< 
---
> ;;; // -----
676c802
< 
---
> ;;; // -----
684a811
> ;;; // called in No Star Targets
710c837,838
< 
---
> ;;; // -----
> ;;; // SLOPE called OLAPF under this definition
742c870,871
< 
---
> ;;; // ----- 
> ;;; // OLAPF is called in No Star Targets
794a924
> ;;; // -----
796a927,928
> ;;; // old command that shouldn't be here any more. These are parts of F0
> ;;; // scalingsfunction, see article. 
808a941
> ;;; // -----
820a954
> ;;; // -----
840a975
> ;;; // -----
846a982
> ;;; // -----
855a992
> ;;; // -----
873a1011
> ;;; // -----
887a1026
> ;;; // -----
909c1048,1049
< (provide 'net_nl_int_todi)
---
> 
> (provide 'net_fy_int_todi)


<---------------------  End of report  --------------------->

