Bump to 1.14.1

[platform/upstream/augeas.git] / lenses / xml.aug

diff --git a/lenses/xml.aug b/lenses/xml.aug
index 23ee002..342b13b 100644 (file)
--- a/lenses/xml.aug
+++ b/lenses/xml.aug
@@ -78,7 +78,13 @@ let att_def       = counter "att_id" .
 
 let att_list_def = decl_def /!ATTLIST/ att_def
 
-let entity_def    = decl_def /!ENTITY/ ([sep_spc . label "#decl" . sto_dquote ])
+let entity_def   =
+  let literal (lbl:string) = [ sep_spc . label lbl . sto_dquote ] in
+  decl_def /!ENTITY/
+    ( literal "#decl"
+    | [ sep_spc . key /SYSTEM/ . literal "#systemliteral" ]
+    | [ sep_spc . key /PUBLIC/ . literal "#pubidliteral"
+                               . literal "#systemliteral" ] )
 
 let decl_def_item = elem_def | entity_def | att_list_def | notation_def
 
@@ -154,7 +160,7 @@ let doc = (sep_osp . (prolog  | comment | doctype | pi_instruction))* .
           ((sep_osp . content) | (sep_osp . empty_element)) .
           (sep_osp . (comment | pi_instruction ))* . sep_osp
 
-let lns = doc
+let lns = doc | Util.empty?
 
 let filter = (incl "/etc/xml/*.xml")
     . (incl "/etc/xml/catalog")