diff options
| -rw-r--r-- | grammars/health/healthExceptEng.gf | 2 | ||||
| -rw-r--r-- | src/GF/Canon/CMacros.hs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/grammars/health/healthExceptEng.gf b/grammars/health/healthExceptEng.gf index db0ec86b8..1ba7751d8 100644 --- a/grammars/health/healthExceptEng.gf +++ b/grammars/health/healthExceptEng.gf @@ -1,4 +1,4 @@ ---# -path=.:../resource/abstract:../prelude:../resource/english +--# -path=.:../newresource/abstract:../prelude:../newresource/english concrete healthExceptEng of healthExcept = StructuralEng ** open ParadigmsEng, TypesEng in { diff --git a/src/GF/Canon/CMacros.hs b/src/GF/Canon/CMacros.hs index 7390a3af9..e075821b2 100644 --- a/src/GF/Canon/CMacros.hs +++ b/src/GF/Canon/CMacros.hs @@ -37,11 +37,12 @@ markFocus n p b = if b then ("[*","*]") else ("","") markXML :: Marker markXML n i b = if b - then ("<focus" +++ p +++ c ++ ">", "</focus>") - else ("<subtree" +++ p +++ c ++ ">", "</subtree>") + then ("<focus" +++ p +++ c ++ s ++ ">", "</focus>") + else ("<subtree" +++ p +++ c ++ s ++ ">", "</subtree>") where c = "type=" ++ prt (M.valNode n) p = "position=" ++ (show $ reverse i) + s = "" ---- if (null (M.constrsNode n)) then "" else " status=incorrect" -- for XML in JGF 1, use markXMLjgf :: Marker |