diff --git a/grammars/resource/english/Paradigms.gf b/grammars/resource/english/Paradigms.gf index d2eeca49d..62eadfd0a 100644 --- a/grammars/resource/english/Paradigms.gf +++ b/grammars/resource/english/Paradigms.gf @@ -9,7 +9,7 @@ -- Closed categories (determiners, pronouns, conjunctions) are -- accessed through the resource syntax API, $resource.Abs.gf$. -- --- The main difference with $morpho.Eng.gf$ is that the types +-- The main difference with $MorphoEng.gf$ is that the types -- referred to are compiled resource grammar types. We have moreover -- had the design principle of always having existing forms as string -- arguments of the paradigms, not stems. diff --git a/src/GF/Canon/CMacros.hs b/src/GF/Canon/CMacros.hs index e782d977a..17433e48b 100644 --- a/src/GF/Canon/CMacros.hs +++ b/src/GF/Canon/CMacros.hs @@ -57,6 +57,7 @@ markSubterm :: (String,String) -> Term -> Term markSubterm (beg, end) t = case t of R rs -> R $ map markField rs T ty cs -> T ty [Cas p (mark v) | Cas p v <- cs] + FV ts -> FV $ map mark ts _ -> foldr1 C [tK beg, t, tK end] -- t : Str guaranteed? where mark = markSubterm (beg, end) diff --git a/src/Today.hs b/src/Today.hs index b9c8c4106..3e96c4560 100644 --- a/src/Today.hs +++ b/src/Today.hs @@ -1 +1 @@ -module Today where today = "Tue Nov 4 09:25:56 CET 2003" +module Today where today = "Tue Nov 4 13:55:38 CET 2003"