some fixes

src/GF/API.hs

@@ -189,7 +189,7 @@ optLinearizeTree opts0 gr t = case getOptVal opts transferFun of
   Just m -> useByTransfer flin g (I.identC m) t
   _ -> flin t
  where
-  opts = addOptions (stateOptions gr) opts0
+  opts = addOptions opts0 (stateOptions gr)
   flin = case getOptVal opts markLin of
     Just mk
      | mk == markOptXML    -> lin markXML

src/GF/Source/SourceToGrammar.hs

@@ -557,13 +557,15 @@ transInclude x = case x of
  where
    trans f = case f of
      FString s  -> s
-     FIdent (IC s) -> let s' = init s ++ [toLower (last s)] in 
-                      if elem s' newReservedWords then s' else s 
-                      --- unsafe hack ; cf. GetGrammar.oldLexer
+     FIdent (IC s) -> modif s
      FSlash filename  -> '/' : trans filename
      FDot filename  -> '.' : trans filename
      FMinus filename  -> '-' : trans filename
-     FAddId (IC s) filename  -> s ++ trans filename
+     FAddId (IC s) filename  -> modif s ++ trans filename
+   modif s = let s' = init s ++ [toLower (last s)] in 
+             if elem s' newReservedWords then s' else s 
+                      --- unsafe hack ; cf. GetGrammar.oldLexer
+
 
 newReservedWords = 
   words $ "abstract concrete interface incomplete " ++