GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix punctuation to use SOFT_BIND and BIND in the whole RGL

Browse Source
This commit is contained in:
Inari Listenmaa
2017-06-30 15:28:27 +02:00
parent f79e27c688
commit a49ce31f8d
26 changed files with 57 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/afrikaans/SymbolAfr.gf
View File

@@ -29,7 +29,7 @@ lin
SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_,_ => n.s ; n = Pl ; isNum = True} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ;
SymbOrd n = {s = \\_ => glue n.s "."} ;
lincat

8
lib/src/bulgarian/TextBul.gf
View File

@@ -1,5 +1,5 @@
--# -coding=cp1251
concrete TextBul of Text = CatBul ** {
concrete TextBul of Text = CatBul ** open Prelude in {
flags coding=cp1251 ;
@@ -7,8 +7,8 @@ concrete TextBul of Text = CatBul ** {
lin
TEmpty = {s = []} ;
TFullStop x xs = {s = x.s ++ "." ++ xs.s} ;
TQuestMark x xs = {s = x.s ++ "?" ++ xs.s} ;
TExclMark x xs = {s = x.s ++ "!" ++ xs.s} ;
TFullStop x xs = {s = x.s ++ SOFT_BIND ++ "." ++ xs.s} ;
TQuestMark x xs = {s = x.s ++ SOFT_BIND ++ "?" ++ xs.s} ;
TExclMark x xs = {s = x.s ++ SOFT_BIND ++ "!" ++ xs.s} ;
}

2
lib/src/catalan/CompatibilityCat.gf
View File

@@ -6,6 +6,6 @@ concrete CompatibilityCat of Compatibility = CatCat ** open Prelude, CommonRoman
lin
NumInt n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
OrdInt n = {s = \\_ => n.s ++ "."} ; ---
OrdInt n = {s = \\_ => n.s ++ SOFT_BIND ++ "."} ; ---
}

11
lib/src/chunk/ChunkCat.gf
View File

@@ -41,16 +41,5 @@ lin
perfect_neg_Chunk = ss "no ha" ;
past_perfect_Chunk = ss "havia" ;
past_perfect_neg_Chunk = ss "no havia" ;
fullstop_Chunk = ss "." ;
exclmark_Chunk = ss "!" ;
questmark_Chunk = ss "?" ;
comma_Chunk = ss "," ;
colon_Chunk = ss ":" ;
semicolon_Chunk = ss ";" ;
quote_Chunk = ss "\"" ;
lpar_Chunk = ss "(" ;
rpar_Chunk = ss ")" ;
dash_Chunk = ss "-" ;
}

18
lib/src/chunk/ChunkFre.gf
View File

@@ -1,5 +1,5 @@
concrete ChunkFre of Chunk = CatFre, ExtensionsFre [VPS,VPI] **
ChunkFunctor - [AP_Chunk, SSlash_Chunk]
ChunkFunctor - [AP_Chunk, SSlash_Chunk, quote_Chunk]
with (Syntax = SyntaxFre), (Extensions = ExtensionsFre) **
open
SyntaxFre, (E = ExtensionsFre), Prelude,
@@ -10,6 +10,11 @@ lin
SSlash_Chunk s = mkUtt <lin S {s = s.s ! {g = Masc ; n = Sg}} : S> ;
quote_Chunk = variants { ss (SOFT_BIND ++ "\"") ;
ss ("\"" ++ SOFT_BIND) ;
ss ("«" ++ SOFT_BIND) ;
ss (SOFT_BIND ++ "»") } ;
lin
NP_Acc_Chunk np = ss (np.s ! Acc).ton ;
NP_Gen_Chunk np = ss (np.s ! genitive).comp ;
@@ -42,15 +47,4 @@ lin
past_perfect_Chunk = ss "avait" ;
past_perfect_neg_Chunk = ss "n'avait pas" ;
fullstop_Chunk = ss "." ;
exclmark_Chunk = ss "!" ;
questmark_Chunk = ss "?" ;
comma_Chunk = ss "," ;
colon_Chunk = ss ":" ;
semicolon_Chunk = ss ";" ;
quote_Chunk = ss "\"" ;
lpar_Chunk = ss "(" ;
rpar_Chunk = ss ")" ;
dash_Chunk = ss "-" ;
}

21
lib/src/chunk/ChunkFunctor.gf
View File

@@ -67,18 +67,19 @@ lin
Symb_Chunk s = lin Utt s ;
fullstop_Chunk = ss "." ;
exclmark_Chunk = ss "!" ;
questmark_Chunk = ss "?" ;
comma_Chunk = ss "," ;
colon_Chunk = ss ":" ;
semicolon_Chunk = ss ";" ;
quote_Chunk = ss "\"" ;
lpar_Chunk = ss "(" ;
rpar_Chunk = ss ")" ;
dash_Chunk = ss "-" ;
fullstop_Chunk = sbSS "." ;
exclmark_Chunk = sbSS "!" ;
questmark_Chunk = sbSS "?" ;
comma_Chunk = sbSS "," ;
colon_Chunk = sbSS ":" ;
semicolon_Chunk = sbSS ";" ;
quote_Chunk = variants {sbSS "\"" ; ss ("\"" ++ SOFT_BIND) } ;
lpar_Chunk = ss ("(" ++ SOFT_BIND) ;
rpar_Chunk = sbSS ")" ;
dash_Chunk = sbSS "-" ;
oper
emptyNP : NP = Syntax.mkNP (P.mkPN []) ;
sbSS : Str -> SS = \s -> ss (SOFT_BIND ++ s) ;
}

11
lib/src/chunk/ChunkIta.gf
View File

@@ -42,15 +42,4 @@ oper
past_perfect_Chunk = ss "aveva" ;
past_perfect_neg_Chunk = ss "non aveva" ;
fullstop_Chunk = ss "." ;
exclmark_Chunk = ss "!" ;
questmark_Chunk = ss "?" ;
comma_Chunk = ss "," ;
colon_Chunk = ss ":" ;
semicolon_Chunk = ss ";" ;
quote_Chunk = ss "\"" ;
lpar_Chunk = ss "(" ;
rpar_Chunk = ss ")" ;
dash_Chunk = ss "-" ;
}

11
lib/src/chunk/ChunkSpa.gf
View File

@@ -40,16 +40,5 @@ lin
perfect_neg_Chunk = ss "no ha" ;
past_perfect_Chunk = ss "había" ;
past_perfect_neg_Chunk = ss "no había" ;
fullstop_Chunk = ss "." ;
exclmark_Chunk = ss "!" ;
questmark_Chunk = ss "?" ;
comma_Chunk = ss "," ;
colon_Chunk = ss ":" ;
semicolon_Chunk = ss ";" ;
quote_Chunk = ss "\"" ;
lpar_Chunk = ss "(" ;
rpar_Chunk = ss ")" ;
dash_Chunk = ss "-" ;
}

8
lib/src/common/TextX.gf
View File

@@ -1,11 +1,11 @@
concrete TextX of Text = CommonX ** {
concrete TextX of Text = CommonX ** open Prelude in {
-- This will work for almost all languages except Spanish.
lin
TEmpty = {s = []} ;
TFullStop x xs = {s = x.s ++ "." ++ xs.s} ;
TQuestMark x xs = {s = x.s ++ "?" ++ xs.s} ;
TExclMark x xs = {s = x.s ++ "!" ++ xs.s} ;
TFullStop x xs = {s = x.s ++ SOFT_BIND ++ "." ++ xs.s} ;
TQuestMark x xs = {s = x.s ++ SOFT_BIND ++ "?" ++ xs.s} ;
TExclMark x xs = {s = x.s ++ SOFT_BIND ++ "!" ++ xs.s} ;
}

2
lib/src/dutch/SymbolDut.gf
View File

@@ -29,7 +29,7 @@ lin
SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_,_ => n.s ; n = Pl ; isNum = True} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ;
SymbOrd n = {s = \\_ => glue n.s "."} ;
lincat

2
lib/src/estonian/SymbolEst.gf
View File

@@ -27,7 +27,7 @@ lin
SymbS sy = sy ;
SymbNum n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ;
SymbOrd n = {s = \\_ => glue n.s "."} ;
lincat

2
lib/src/finnish/CompatibilityFin.gf
View File

@@ -6,6 +6,6 @@ concrete CompatibilityFin of Compatibility = CatFin ** open Prelude, ResFin in {
lin
NumInt n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ;
OrdInt n = {s = \\_ => n.s ++ "."} ;
OrdInt n = {s = \\_ => n.s ++ SOFT_BIND ++ "."} ;
}

2
lib/src/finnish/SymbolFin.gf
View File

@@ -27,7 +27,7 @@ lin
SymbS sy = sy ;
SymbNum n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ;
SymbOrd n = {s = \\_ => glue n.s "."} ;
lincat

2
lib/src/french/CompatibilityFre.gf
View File

@@ -6,6 +6,6 @@ concrete CompatibilityFre of Compatibility = CatFre ** open Prelude, CommonRoman
lin
NumInt n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
OrdInt n = {s = \\_ => n.s ++ "."} ; ---
OrdInt n = {s = \\_ => n.s ++ SOFT_BIND ++ "."} ; ---
}

2
lib/src/german/SymbolGer.gf
View File

@@ -31,7 +31,7 @@ lin
SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_,_ => n.s ; n = Pl ; isNum = True} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ;
SymbOrd n = {s = \\_ => glue n.s "."} ;
lincat

2
lib/src/greek/SymbolGre.gf
View File

@@ -32,7 +32,7 @@ lin
SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_,_ => n.s ; isNum = True ; n = Pl} ;
SymbOrd n = {s = \\_,_,_,_ => n.s ++ "." ; adv= table { Posit => " " ; Compar => " " ; Superl => " "}} ;
SymbOrd n = {s = \\_,_,_,_ => glue n.s "." ; adv= table { Posit => " " ; Compar => " " ; Superl => " "}} ;
lincat

8
lib/src/greek/TextGre.gf
View File

@@ -1,11 +1,11 @@
concrete TextGre of Text = CatGre ** {
concrete TextGre of Text = CatGre ** open Prelude in {
flags coding=utf8 ;
lin
TEmpty = {s = []} ;
TFullStop x xs = {s = x.s ++ "." ++ xs.s} ;
TQuestMark x xs = {s = x.s ++ ";" ++ xs.s} ;
TExclMark x xs = {s = x.s ++ "!" ++ xs.s} ;
TFullStop x xs = {s = x.s ++ SOFT_BIND ++ "." ++ xs.s} ;
TQuestMark x xs = {s = x.s ++ SOFT_BIND ++ ";" ++ xs.s} ;
TExclMark x xs = {s = x.s ++ SOFT_BIND ++ "!" ++ xs.s} ;
}

2
lib/src/italian/CompatibilityIta.gf
View File

@@ -6,6 +6,6 @@ concrete CompatibilityIta of Compatibility = CatIta ** open Prelude, CommonRoman
lin
NumInt n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
OrdInt n = {s = \\_ => n.s ++ "."} ; ---
OrdInt n = {s = \\_ => n.s ++ SOFT_BIND ++ "."} ; ---
}

2
lib/src/latvian/CompatibilityLav.gf
View File

@@ -11,6 +11,6 @@ flags
lin
-- TODO: kāpēc citās valodās (piem., Eng, Bul) kategorijai Num (NumInt) ir lauks isNum (= True)?
NumInt n = { s = \\_,_ => n.s ; num = Pl ; hasCard = False } ;
OrdInt n = { s = \\_,_ => n.s ++ "." } ;
OrdInt n = { s = \\_,_ => n.s ++ SOFT_BIND ++ "." } ;
}

2
lib/src/latvian/SymbolLav.gf
View File

@@ -48,7 +48,7 @@ lin
SymbS sy = sy ;
SymbNum sy = { s = \\_,_ => sy.s ; num = Pl } ;
SymbOrd sy = { s = \\_,_ => sy.s ++ "."} ;
SymbOrd sy = { s = \\_,_ => glue sy.s "."} ;
lincat

8
lib/src/mongolian/TextMon.gf
View File

@@ -1,10 +1,10 @@
concrete TextMon of Text = CatMon ** {
concrete TextMon of Text = CatMon ** open Prelude in {
flags coding=utf8 ;
lin
TEmpty = {s = []} ;
TFullStop p t = {s = p.s ++ "." ++ t.s} ;
TQuestMark p t = {s = p.s ++ "?" ++ t.s} ;
TExclMark p t = {s = p.s ++ "!" ++ t.s} ;
TFullStop p t = {s = p.s ++ SOFT_BIND ++ "." ++ t.s} ;
TQuestMark p t = {s = p.s ++ SOFT_BIND ++ "?" ++ t.s} ;
TExclMark p t = {s = p.s ++ SOFT_BIND ++ "!" ++ t.s} ;
}

2
lib/src/portuguese/CompatibilityPor.gf
View File

@@ -6,6 +6,6 @@ concrete CompatibilityPor of Compatibility = CatPor ** open Prelude, CommonRoman
lin
NumInt n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
OrdInt n = {s = \\_ => n.s ++ "."} ; ---
OrdInt n = {s = \\_ => n.s ++ SOFT_BIND ++ "."} ; ---
}

10
lib/src/portuguese/TextPor.gf
View File

@@ -1,12 +1,12 @@
concrete TextPor of Text = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** {
concrete TextPor of Text = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** open Prelude in {
flags coding=utf8 ;
-- This works for the special punctuation marks of Pornish.
-- This works for the special punctuation marks of Portuguese.
lin
TEmpty = {s = []} ;
TFullStop x xs = {s = x.s ++ "." ++ xs.s} ;
TQuestMark x xs = {s = "¿" ++ x.s ++ "?" ++ xs.s} ;
TExclMark x xs = {s = "¡" ++ x.s ++ "!" ++ xs.s} ;
TFullStop x xs = {s = x.s ++ SOFT_BIND ++ "." ++ xs.s} ;
TQuestMark x xs = {s = "¿" ++ SOFT_BIND ++ x.s ++ SOFT_BIND ++ "?" ++ xs.s} ;
TExclMark x xs = {s = "¡" ++ SOFT_BIND ++ x.s ++ SOFT_BIND ++ "!" ++ xs.s} ;
}

2
lib/src/romance/SymbolRomance.gf
View File

@@ -25,7 +25,7 @@ lin
SymbS sy = {s = \\_ => sy.s} ;
SymbNum n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
SymbOrd n = {s = \\_ => n.s ++ "."} ; ---
SymbOrd n = {s = \\_ => n.s ++ BIND ++ "º"} ; -- feminine variant ª, also variants 1.º and 1.ª
lincat

2
lib/src/spanish/CompatibilitySpa.gf
View File

@@ -6,6 +6,6 @@ concrete CompatibilitySpa of Compatibility = CatSpa ** open Prelude, CommonRoman
lin
NumInt n = {s = \\_ => n.s ; isNum = True ; n = Pl} ;
OrdInt n = {s = \\_ => n.s ++ "."} ; ---
OrdInt n = {s = \\_ => n.s ++ SOFT_BIND ++ "."} ; ---
}

8
lib/src/spanish/TextSpa.gf
View File

@@ -1,12 +1,12 @@
concrete TextSpa of Text = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** {
concrete TextSpa of Text = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** open Prelude in {
flags coding=utf8 ;
-- This works for the special punctuation marks of Spanish.
lin
TEmpty = {s = []} ;
TFullStop x xs = {s = x.s ++ "." ++ xs.s} ;
TQuestMark x xs = {s = "¿" ++ x.s ++ "?" ++ xs.s} ;
TExclMark x xs = {s = "¡" ++ x.s ++ "!" ++ xs.s} ;
TFullStop x xs = {s = x.s ++ SOFT_BIND ++ "." ++ xs.s} ;
TQuestMark x xs = {s = "¿" ++ SOFT_BIND ++ x.s ++ SOFT_BIND ++ "?" ++ xs.s} ;
TExclMark x xs = {s = "¡" ++ SOFT_BIND ++ x.s ++ SOFT_BIND ++ "!" ++ xs.s} ;
}