Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v
diff -u -r1.72.2.49 -r1.72.2.50
--- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	18 Jul 2024 14:38:28 -0000	1.72.2.49
+++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	28 Jul 2024 17:00:03 -0000	1.72.2.50
@@ -1258,7 +1258,7 @@
         # make parsable XML, replace "partialquery" by "fullquery"
         set prepared_content [db_qd_prepare_queryfile_content $content]
 
-        dom parse -simple $prepared_content doc
+        dom parse -simple -- $prepared_content doc
         $doc documentElement root
         set result ""
         foreach q [$root selectNodes //fullquery] {
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.79.2.75 -r1.79.2.76
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	18 Jul 2024 10:05:03 -0000	1.79.2.75
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	28 Jul 2024 17:00:03 -0000	1.79.2.76
@@ -1701,7 +1701,7 @@
     } {
         upvar $var root
         try {
-            dom parse -html $html doc
+            dom parse -html -- $html doc
         } on error {errorMsg} {
             ns_log error "Failed to parse the following HTML text with message: $errorMsg\n$html"
         }
Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -r1.28.2.29 -r1.28.2.30
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	20 Apr 2023 13:57:37 -0000	1.28.2.29
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	28 Jul 2024 17:00:03 -0000	1.28.2.30
@@ -1223,7 +1223,7 @@
             set rfd [open $f r]
             set xml [read $rfd]
             close $rfd
-            aa_false "Catalog file '$f' apears to be valid XML" [catch {dom parse $xml doc}]
+            aa_false "Catalog file '$f' apears to be valid XML" [catch {dom parse -- $xml doc}]
         }
     }
 
Index: openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl,v
diff -u -r1.12.2.6 -r1.12.2.7
--- openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl	28 Oct 2020 15:39:19 -0000	1.12.2.6
+++ openacs-4/packages/acs-tcl/tcl/30-xml-utils-procs.tcl	28 Jul 2024 17:00:04 -0000	1.12.2.7
@@ -46,9 +46,9 @@
     @return parsed document object handle
 } {
     if {$persist_p} {
-        return [dom parse -simple $xml]
+        return [dom parse -simple -- $xml]
     } else {
-        dom parse -simple $xml doc
+        dom parse -simple -- $xml doc
         return $doc
     }
 }
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.126.2.26 -r1.126.2.27
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	8 Feb 2024 18:43:41 -0000	1.126.2.26
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	28 Jul 2024 17:00:04 -0000	1.126.2.27
@@ -2214,7 +2214,7 @@
     }
     set repositories ""
 
-    dom parse -html -simple [dict get $result page] doc
+    dom parse -html -simple -- [dict get $result page] doc
     $doc documentElement root
     foreach node [$root selectNodes {//ul/li/a}] {
         set href [$node getAttribute href]
Index: openacs-4/packages/acs-tcl/tcl/html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/html-procs.tcl,v
diff -u -r1.5.2.5 -r1.5.2.6
--- openacs-4/packages/acs-tcl/tcl/html-procs.tcl	4 Jun 2024 13:18:26 -0000	1.5.2.5
+++ openacs-4/packages/acs-tcl/tcl/html-procs.tcl	28 Jul 2024 17:00:04 -0000	1.5.2.6
@@ -35,7 +35,7 @@
     @return Form specification as a nested list of lists in array get form
 } {
     # Parse document
-    dom parse -html -keepEmpties $html doc
+    dom parse -html -keepEmpties -- $html doc
     set root [$doc documentElement]
 
     set forms [list]
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.109.2.60 -r1.109.2.61
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	18 Jul 2024 10:05:03 -0000	1.109.2.60
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	28 Jul 2024 17:00:04 -0000	1.109.2.61
@@ -1618,7 +1618,7 @@
     set rmarker "</root>"
 
     try {
-        dom parse -html "${lmarker}${html}${rmarker}" doc
+        dom parse -html -- "${lmarker}${html}${rmarker}" doc
 
     } on error {errorMsg} {
         set severity [expr {$validate_p ? "notice" : "warning"}]
Index: openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl,v
diff -u -r1.1.2.25 -r1.1.2.26
--- openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl	17 Jul 2024 12:34:56 -0000	1.1.2.25
+++ openacs-4/packages/acs-tcl/tcl/test/http-client-procs.tcl	28 Jul 2024 17:00:04 -0000	1.1.2.26
@@ -192,7 +192,7 @@
 
                 aa_log "Server responded with: $json_response"
 
-                set root [dom parse -json $json_response]
+                set root [dom parse -json -- $json_response]
                 set resp_key ""
                 set resp_value ""
                 foreach node [$root childNodes] {
@@ -221,7 +221,7 @@
 
                 aa_log "Server responded with: $json_response"
 
-                set root [dom parse -json $json_response]
+                set root [dom parse -json -- $json_response]
                 set resp_key ""
                 set resp_value ""
                 foreach node [$root childNodes] {
Index: openacs-4/packages/assessment/tcl/as-qti-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-qti-procs.tcl,v
diff -u -r1.50.2.5 -r1.50.2.6
--- openacs-4/packages/assessment/tcl/as-qti-procs.tcl	13 Dec 2022 14:47:13 -0000	1.50.2.5
+++ openacs-4/packages/assessment/tcl/as-qti-procs.tcl	28 Jul 2024 17:00:04 -0000	1.50.2.6
@@ -127,7 +127,7 @@
 
     # Parser
     # XML => DOM document
-    dom parse [::tdom::xmlReadFile $xmlfile] document
+    dom parse -- [::tdom::xmlReadFile $xmlfile] document
     # DOM document => DOM root
     $document documentElement root
     # XPath v1.0
Index: openacs-4/packages/caldav/tcl/caldav-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/caldav/tcl/caldav-procs.tcl,v
diff -u -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/caldav/tcl/caldav-procs.tcl	17 Mar 2023 17:47:15 -0000	1.1.2.7
+++ openacs-4/packages/caldav/tcl/caldav-procs.tcl	28 Jul 2024 17:00:04 -0000	1.1.2.8
@@ -355,7 +355,7 @@
         # Special case allprop: return all properties
         #
         if {$elementName eq "allprop"} {
-            dom parse {
+            dom parse -- {
                 <A:prop xmlns:A="DAV:">
                 <A:getcontenttype/>
                 <A:getetag/>
@@ -1201,7 +1201,7 @@
     CalDAV instproc parseRequest {content} {
         try {
             #dom setResultEncoding utf-8
-            set document [dom parse $content]
+            set document [dom parse -- $content]
         } on error {errorMsg} {
             ns_log error "CalDAV: parsing of request lead to error: $errorMsg!\n$content"
             throw {DOM PARSE {dom parse triggered exception}} $errorMsg
Index: openacs-4/packages/caldav/tcl/test/caldav-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/caldav/tcl/test/caldav-test-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/caldav/tcl/test/caldav-test-procs.tcl	21 Apr 2023 11:25:23 -0000	1.1.2.5
+++ openacs-4/packages/caldav/tcl/test/caldav-test-procs.tcl	28 Jul 2024 17:00:04 -0000	1.1.2.6
@@ -368,7 +368,7 @@
 
     ad_proc -private ::caldav::test::foreach_response {var xml body} {
         upvar $var response
-	dom parse $xml doc
+	dom parse -- $xml doc
 	$doc documentElement root
         try {
             set responses [$root selectNodes //d:response]
@@ -988,7 +988,7 @@
 
             incr nr_responses
         }
-        dom parse $xml doc
+        dom parse -- $xml doc
 	$doc documentElement root
         ::acs::test::xpath::non_empty $root {
             d:sync-token
Index: openacs-4/packages/categories/tcl/category-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-xml-procs.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/categories/tcl/category-xml-procs.tcl	15 Nov 2019 08:24:10 -0000	1.6.2.1
+++ openacs-4/packages/categories/tcl/category-xml-procs.tcl	28 Jul 2024 17:00:04 -0000	1.6.2.2
@@ -34,7 +34,7 @@
     # recode site_wide_p to DB-style boolean
     if {$site_wide_p} { set site_wide_p t } else { set site_wide_p f }
 
-    set doc [dom parse $xml]
+    set doc [dom parse -- $xml]
     if {[catch {set root [$doc documentElement]} err]} {
         error "Error parsing XML: $err"
     }
Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v
diff -u -r1.19.2.6 -r1.19.2.7
--- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl	27 Nov 2022 10:52:26 -0000	1.19.2.6
+++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl	28 Jul 2024 17:00:04 -0000	1.19.2.7
@@ -530,7 +530,7 @@
 
     set xml [tdav::read_xml]
 
-    if {[catch {dom parse $xml} xd]} {
+    if {[catch {dom parse -- $xml} xd]} {
     # xml body is not well formed
         ns_returnbadrequest
         return filter_return
@@ -740,7 +740,7 @@
     regsub {^/} [ns_conn url] {} uri
     set entry [file join $::acs::pageroot $uri]
     # parse the xml body to check if its valid
-    if {"" ne $xml && [catch {dom parse $xml} xd]} {
+    if {"" ne $xml && [catch {dom parse -- $xml} xd]} {
         ns_return 400 text/plain "XML request not well-formed."
         return filter_return
     }
@@ -1067,7 +1067,7 @@
     set body {}
 
     set xml [tdav::read_xml]
-    set d [[dom parse $xml] documentElement]
+    set d [[dom parse -- $xml] documentElement]
     set l [$d childNodes]
     set scope [[[lindex $l 0] childNodes] nodeName]
     set type [[[lindex $l 1] childNodes] nodeName]
Index: openacs-4/packages/xowf/tcl/test-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test-item-procs.tcl,v
diff -u -r1.7.2.288 -r1.7.2.289
--- openacs-4/packages/xowf/tcl/test-item-procs.tcl	18 Jul 2024 15:24:39 -0000	1.7.2.288
+++ openacs-4/packages/xowf/tcl/test-item-procs.tcl	28 Jul 2024 17:00:04 -0000	1.7.2.289
@@ -3597,7 +3597,7 @@
       # @return HTML block
 
       #ns_log notice "QF=$question_form"
-      dom parse -simple -html $question_form doc
+      dom parse -html -simple -- $question_form doc
       $doc documentElement root
       if {$root eq ""} {
         error "form '$form' is not valid"
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.284.2.258 -r1.284.2.259
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	18 Jul 2024 10:02:29 -0000	1.284.2.258
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	28 Jul 2024 17:00:04 -0000	1.284.2.259
@@ -6746,7 +6746,7 @@
     # All other forms must start with a <form> tag.
     #
     try {
-      dom parse -simple $value doc
+      dom parse -simple -- $value doc
     } on ok {r} {
       $doc documentElement root
       set rootNodeName ""
Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -r1.51.2.12 -r1.51.2.13
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	19 Oct 2021 08:19:13 -0000	1.51.2.12
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	28 Jul 2024 17:00:04 -0000	1.51.2.13
@@ -400,7 +400,7 @@
   }
 
   RSS-client instproc parse {data} {
-    set doc [ dom parse $data ]
+    set doc [ dom parse -- $data ]
     set root [ $doc documentElement ]
 
     switch [RSS-client getRSSVersion $doc] {
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.147.2.36 -r1.147.2.37
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	16 Feb 2024 10:31:38 -0000	1.147.2.36
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	28 Jul 2024 17:00:04 -0000	1.147.2.37
@@ -872,7 +872,7 @@
   proc ::xowiki::validate_form_form {} {
     upvar form form
     if {$form eq ""} {return 1}
-    dom parse -simple [lindex $form 0] doc
+    dom parse -simple -- [lindex $form 0] doc
     $doc documentElement root
     return [expr {$root ne "" && [$root nodeName] eq "form"}]
   }
@@ -901,7 +901,7 @@
     # provide unique ids and names, if form is provided
     #     set form [${:data} set form]
     #     if {$form ne ""} {
-    #       dom parse -simple [lindex $form 0] doc
+    #       dom parse -simple -- [lindex $form 0] doc
     #       $doc documentElement root
     #       set id ID$item_id
     #       $root setAttribute id $id
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.542.2.178 -r1.542.2.179
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 Jun 2024 14:08:58 -0000	1.542.2.178
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	28 Jul 2024 17:00:04 -0000	1.542.2.179
@@ -3467,7 +3467,7 @@
     #:msg status=[$r set status]
     if {$status == 200} {
       #:msg data=$data
-      dom parse -html -simple $data doc
+      dom parse -html -simple -- $data doc
       $doc documentElement root
       set n [$root selectNodes {//*[@id="result_box"]}]
       :msg "$text $from=>$to node '$n'"
@@ -3714,7 +3714,7 @@
     regsub -all -- "/span>\n<span " $data "/span><br><span " data
     regsub -all -- "/span>\n\n<span " $data "/span><br><br><span " data
 
-    dom parse -simple $data doc
+    dom parse -simple -- $data doc
     $doc documentElement root
 
     #
@@ -4271,7 +4271,7 @@
   }
 
   Form proc disable_input_fields {{-with_submit 0} form} {
-    dom parse -simple -html $form doc
+    dom parse -html -simple -- $form doc
     $doc documentElement root
     if {$root ne ""} {
       :dom_disable_input_fields -with_submit $with_submit $root
@@ -4315,7 +4315,7 @@
       #
       # The method "disable_input_fields" consists essentially of
       #
-      #     dom parse -simple $form doc
+      #     dom parse -simple -- $form doc
       #     ...
       #     return [$root asHTML]
       #
@@ -5172,7 +5172,7 @@
         lappend field_names $att
       }
       #ns_log notice "field_names_from_form: [:serialize]"
-      dom parse -html -simple $form doc
+      dom parse -html -simple -- $form doc
       $doc documentElement root
       set fields [$root selectNodes "//*\[@name != ''\]"]
       foreach field $fields {
@@ -5316,7 +5316,7 @@
                     {:form_field_as_html -mode display "\\\1" "\2" $form_fields}]
 
       # we parse the form just for the margin-form.... maybe regsub?
-      dom parse -html -simple $form :doc
+      dom parse -html -simple -- $form :doc
       ${:doc} documentElement :root
       set form_node [lindex [${:root} selectNodes //form] 0]
 
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.368.2.156 -r1.368.2.157
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	15 Jul 2024 12:04:50 -0000	1.368.2.156
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	28 Jul 2024 17:00:04 -0000	1.368.2.157
@@ -1335,7 +1335,7 @@
     set form [string map [list @ \x03] $form]
     #:msg form=$form
 
-    dom parse -simple -html $form :doc
+    dom parse -html -simple -- $form :doc
     ${:doc} documentElement :root
 
     if {${:root} eq ""} {