Merge pull request #166 from odanoburu/iberic-clause-inversion

(Por,Spa) don't invert word order in questions most of the time

src/portuguese/DiffPor.gf

@@ -1,6 +1,6 @@
 --# -path=.:../romance:../abstract:../common:../prelude
 
-instance DiffPor of DiffRomance - [chooseTA,partAgr,vpAgrSubj,vpAgrClits] = open CommonRomance, PhonoPor, BeschPor, Prelude in {
+instance DiffPor of DiffRomance - [iAdvQuestionInv,chooseTA,otherInv,partAgr,vpAgrSubj,vpAgrClits] = open CommonRomance, PhonoPor, BeschPor, Prelude in {
 
   flags optimize=noexpand ;
         coding=utf8 ;
@@ -96,6 +96,10 @@ instance DiffPor of DiffRomance - [chooseTA,partAgr,vpAgrSubj,vpAgrClits] = open
     estarCopula = EstarCop ;
     ficarCopula = FicarCop ;
 
+  oper
+    iAdvQuestionInv : Direct = DDir ;
+    otherInv : Direct = DDir ;
+
   oper
     -- the other Cases are defined in ResRomance
     dative   : Case = CPrep P_a ;

src/romance/DiffRomance.gf

@@ -63,6 +63,10 @@ interface DiffRomance = open CommonRomance, Prelude in {
 
   oper iAdvQuestionInv : Direct = DInv ; -- except Fre
 
+  oper iCompQuestionInv : Direct = DInv ; -- for Cat,Por,Spa where otherInv will be DDir
+
+  oper otherInv : Direct = DInv ; -- except Cat, Por, Spa
+
 --2 Constants that must derivatively depend on language
 
   param NPForm = Ton Case | Aton Case | Poss {g : Gender ; n : Number} ; --- AAgr

src/romance/QuestionRomance.gf

@@ -29,7 +29,7 @@ incomplete concrete QuestionRomance of Question =
                     \d -> slash.s ! ip.a ! d ! t ! a ! p ! Indic ;
               who = slash.c2.s ++ ip.s ! slash.c2.c
             in table {
-              QDir   => who ++ cls DInv ;
+              QDir   => who ++ cls otherInv ;
               QIndir => who ++ cls DDir
               }
       } ;
@@ -39,7 +39,7 @@ incomplete concrete QuestionRomance of Question =
             let 
               ord = case q of {
                 QDir   => iAdvQuestionInv ;
-                QIndir => iAdvQuestionInv 
+                QIndir => iAdvQuestionInv
               } ;
               cls = cl.s ! ord ! t ! a ! p ! Indic ;
               why = iadv.s
@@ -51,7 +51,7 @@ incomplete concrete QuestionRomance of Question =
             let 
               vp  = predV (selectCopula icomp.cop) ;
               cls = (mkClause (np.s ! Nom).comp np.hasClit np.isPol np.a vp).s ! 
-                       DInv ! t ! a ! p ! Indic ;
+                       iCompQuestionInv ! t ! a ! p ! Indic ;
               why = icomp.s ! complAgr np.a ;
             in why ++ cls
       } ;

src/spanish/DiffSpa.gf

@@ -1,6 +1,6 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
-instance DiffSpa of DiffRomance - [partAgr,vpAgrSubj,vpAgrClits,contractInf] = open CommonRomance, PhonoSpa, BeschSpa, Prelude in {
+instance DiffSpa of DiffRomance - [iAdvQuestionInv,otherInv,partAgr,vpAgrSubj,vpAgrClits,contractInf] = open CommonRomance, PhonoSpa, BeschSpa, Prelude in {
 
   flags optimize=noexpand ;
     coding=utf8 ;
@@ -139,6 +139,9 @@ instance DiffSpa of DiffRomance - [partAgr,vpAgrSubj,vpAgrClits,contractInf] = o
     serCopula = False ;
     estarCopula = True ;
 
+    iAdvQuestionInv : Direct = DDir ;
+    otherInv : Direct = DDir ;
+
     negation : RPolarity => (Str * Str) = table {
       RPos => <[],[]> ;
       RNeg _ => <"no",[]>