forked from GitHub/gf-core
factored out RET in letter grammars
This commit is contained in:
@@ -66,6 +66,7 @@ oper
|
||||
cgen cg => cg
|
||||
} ;
|
||||
|
||||
RET = "" ; -- &-
|
||||
|
||||
lincat
|
||||
Letter = SS ;
|
||||
@@ -81,8 +82,8 @@ Position = SSDep ;
|
||||
|
||||
lin
|
||||
MkLetter head mess end =
|
||||
ss (head.s ++ "," ++ "&-" ++
|
||||
mess.s ! end.n ! end.g ! head.n ! head.g ++ "." ++ "&-" ++
|
||||
ss (head.s ++ "," ++ RET ++
|
||||
mess.s ! end.n ! end.g ! head.n ! head.g ++ "." ++ RET ++
|
||||
end.s ! head.n ! head.g) ;
|
||||
|
||||
DearRec rec = {s = cher ! rec.n ! rec.g ++ rec.s ; n = rec.n ; g = rec.g} ;
|
||||
@@ -101,10 +102,10 @@ FormalEnding auth =
|
||||
{s =
|
||||
table {n => table {g =>
|
||||
"avec" ++ mes ! dep2num auth.n n ++
|
||||
["salutations distinguées &-"] ++ auth.s ! n ! g}} ;
|
||||
["salutations distinguées"] ++ RET ++ auth.s ! n ! g}} ;
|
||||
n = auth.n ; g = auth.g} ;
|
||||
InformalEnding auth =
|
||||
{s = table {n => table {g => ["Amicalement &-"] ++ auth.s ! n ! g}} ;
|
||||
{s = table {n => table {g => ["Amicalement"] ++ RET ++ auth.s ! n ! g}} ;
|
||||
n = auth.n ; g = auth.g} ;
|
||||
|
||||
ColleaguesHe = {s = regNom "collègue" ! pl ; n = pl ; g = masc} ;
|
||||
|
||||
Reference in New Issue
Block a user