From 2b8d7943093ff8c103fd439fc07cebb3c8e8cd32 Mon Sep 17 00:00:00 2001 From: janna Date: Mon, 2 Feb 2004 22:37:51 +0000 Subject: [PATCH] *** empty log message *** --- grammars/health/ExtraIta.gf | 12 +--- grammars/health/HealthResourceIta.gf | 51 ++++++++--------- src/JavaGUI/GFEditor2.java | 82 +++++++++++++++++++++++----- 3 files changed, 97 insertions(+), 48 deletions(-) diff --git a/grammars/health/ExtraIta.gf b/grammars/health/ExtraIta.gf index 68b5d40c2..11bbeba29 100644 --- a/grammars/health/ExtraIta.gf +++ b/grammars/health/ExtraIta.gf @@ -2,20 +2,16 @@ -- -- Aarne Ranta, Janna Khegai 2003 -resource ExtraIta = open ResourceIta, Prelude, SyntaxIta, MorphoIta in { +resource ExtraIta = open PredicationIta, Prelude, SyntaxIta, MorphoIta, ResourceIta in { oper - NPLock = NounPhrase ** {lock_NP : {}} ; - CNLock = CommNounPhrase ** {lock_CN : {}} ; - SLock = Sentence ** {lock_S : {}} ; -oper averBisogno : CN -> VP = \cn -> PosVG (PredTV (mkTransVerbPrep (verbPres avere) "bisogno"** {lock_TV = <>}) (IndefOneNP cn)) ; -- the following are too low-level and should be provided by the resources - injuredBody: AP -> NPLock -> CNLock -> SLock = \injured, patient, head -> + injuredBody: AP -> NP -> CN -> S = \injured, patient, head -> (PredVP patient {s = \\g,v => pronRefl patient.n patient.p ++ verbEssere.s ! v ++ @@ -29,10 +25,6 @@ oper datAdv : NP -> AdV = \np -> {s = np.s ! Aton dative; lock_AdV = <> } ; - --- from Predication: - predV2: TransVerb -> NPLock -> NounPhrase -> SLock = \F, x, y -> - predVerbPhrase x ((predVerbGroup True) (complTransVerb F y)) ** { lock_S = <>} ; }; diff --git a/grammars/health/HealthResourceIta.gf b/grammars/health/HealthResourceIta.gf index 25003dcf7..b125aac4d 100644 --- a/grammars/health/HealthResourceIta.gf +++ b/grammars/health/HealthResourceIta.gf @@ -1,11 +1,21 @@ -- use this path to read the grammar from the same directory --# -path=.:../newresource/abstract:../prelude:../newresource/italian:../newresource/romance -concrete HealthIta of Health = open ResourceIta, Prelude, SyntaxIta, ExtraIta, MorphoIta in { +concrete HealthIta of Health = open ResourceIta, Prelude, SyntaxIta, ExtraIta, MorphoIta, ParadigmsIta, ResourceExtIta, PredicationIta in { flags startcat=Phr ; lexer=text ; parser=chart ; unlexer=text ; - +lincat + Patient = NP ; + BodyPart = CN ; + Symptom = NP ; + SymptomDegree = AP ; + Prop = S ; + Illness = CN ; + Condition = VP ; + Specialization = CN ; + Medicine = CN ; + lin ShePatient = SheNP ; TheyPatient = TheyNP ; @@ -17,31 +27,14 @@ lin illness) ; BeInCondition = PredVP ; - - CatchCold = - PosTV (tvDir vAvere) (IndefOneNP (mkCN (nSale "raffreddore" -masculine))) ; - + CatchCold = PosTV (tvDir vAvere) (IndefOneNP (mkCN (nSale "raffreddore" masculine))) ; Pregnant = PosA (apSolo "gravido" postpos) ; - Complain = predV2 (tvDir vAvere) ; - PainInMod pat loc deg = - PredVP pat - (AdvVP (PosTV (tvDir vAvere) - (IndefOneNP (ModAdj deg (mkCN (nSale "dolore" -masculine))))) - (datAdv (DefOneNP loc))) ; - - FeverMod deg = partitNP (ModAdj deg (mkCN (nSale "febbre" feminine))); - PainIn pat loc = PredVP pat (AdvVP (PosV (averCosa "male")) (datAdv (DefOneNP loc))) ; - Fever = partitNP (mkCNomReg (nSale "febbre" feminine)) ; - - High = apSolo "alto" postpos ; - Terrible = apTale "terribile" postpos ; + Fever = partitNP (mkCN (nSale "febbre" feminine)) ; Head = mkCN (nRana "testa") ; Leg = mkCN (nRana "gamba") ; @@ -49,14 +42,22 @@ masculine))))) PainKiller = mkCN (nSale "calmante" masculine) ; NeedDoctor pat doc = PredVP pat (averBisogno doc) ; NeedMedicine pat med = PredVP pat (averBisogno med) ; - TakeMedicine pat med = predV2 (tvDir (vCorrere "prendere")) pat -(IndefOneNP med) ; + TakeMedicine pat med = predV2 (tvDir (vCorrere "prendere" "")) pat (IndefOneNP med) ; - Injured = injuredBody (mkAdjective (adjSolo "ferito") True) ; - Broken = injuredBody (mkAdjective (adjSolo "rotto") True) ; + Injured = injuredBody (apSolo "ferito" prepos) ; + Broken = injuredBody (apSolo "rotto" prepos) ; And = conjS ; +-- FeverMod deg = partitNP (ModAdj deg (mkCN (nSale "febbre" feminine))); +-- High = apSolo "alto" postpos ; +-- Terrible = apTale "terribile" postpos ; +-- PainInMod pat loc deg = +-- PredVP pat +-- (AdvVP (PosTV (tvDir vAvere) +-- (IndefOneNP (ModAdj deg (mkCN (nSale "dolore" masculine))))) +-- (datAdv (DefOneNP loc))) ; + }; diff --git a/src/JavaGUI/GFEditor2.java b/src/JavaGUI/GFEditor2.java index 0acd1fdf2..7043ec8a6 100644 --- a/src/JavaGUI/GFEditor2.java +++ b/src/JavaGUI/GFEditor2.java @@ -30,7 +30,7 @@ public class GFEditor2 extends JFrame implements ActionListener, CaretListener, public MouseEvent m2; public static String selectedText=""; - public static boolean debug = false; + public static boolean debug = true; public static boolean debug3 = false; public static boolean debug2 = false; public static boolean selectionCheck = false; @@ -941,6 +941,20 @@ System.out.println("encoding "+defaultEncoding); } } + public void recursion(JMenu subMenu, Font font) + { + for (int i = 0; i0) { for (Enumeration e = languageGroup.getElements(); e.hasMoreElements() ;) { ab = (AbstractButton)e.nextElement(); - System.out.println("more to remove ! "+ab.getText()); + if (debug) System.out.println("more to remove ! "+ab.getText()); languageGroup.remove(ab); } - System.out.println("languageGroupElement after import removal "+ + if (debug) System.out.println("languageGroupElement after import removal "+ languageGroup.getButtonCount()); } - submenu.removeAll(); - - menu.removeAllItems(); + submenu.removeAll(); + //menu.removeAllItems(); + System.out.println("importing: "+ file.getPath().replace('\\','/')); menu.addItem("New"); fileString =""; - send("i "+ file.getPath().replace('\\','/')); + send("i "+ file.getPath().replace('\\','/')); } } @@ -1207,6 +1262,7 @@ System.out.println("encoding "+defaultEncoding); parseInput = s; //s = "gf "+s; This is for debugging, otherwise shift the comment to the next line. treeChanged = true; + System.out.println("sending: "+ s); send(s); } } @@ -1824,7 +1880,7 @@ System.out.println("encoding "+defaultEncoding); } //if selectionStart>-1 else { - System.out.println("NO SELECTION IN THE TEXT TO BE APPENDED!"); + if (debug2) System.out.println("NO SELECTION IN THE TEXT TO BE APPENDED!"); //cutting tags from previous focuses if any: int r = restString.indexOf(""); while (r>-1)