Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.123 -r1.180.2.124
--- openacs-4/packages/xowiki/xowiki.info	5 Apr 2024 08:55:04 -0000	1.180.2.123
+++ openacs-4/packages/xowiki/xowiki.info	2 May 2024 14:06:47 -0000	1.180.2.124
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.1b10" url="http://openacs.org/repository/download/apm/xowiki-5.10.1b10.apm">
+    <version name="5.10.1b11" url="http://openacs.org/repository/download/apm/xowiki-5.10.1b11.apm">
 	<owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
 	<summary>A xotcl-based enterprise wiki system with multiple object types</summary>
 	<release-date>2023-07-11</release-date>
@@ -55,7 +55,7 @@
 	<license>BSD-Style</license>
 	<maturity>2</maturity>
 
-	<provides url="xowiki" version="5.10.1b10"/>
+	<provides url="xowiki" version="5.10.1b11"/>
 	<requires url="xotcl-core" version="5.10.1b4"/>
 	<requires url="acs-datetime" version="5.9.1"/>
 	<requires url="acs-kernel" version="5.10.1b1"/>
@@ -83,7 +83,7 @@
 	    <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackagePath"  description="Space delimited names of local URL paths pointing to xowiki instances from where this instance should inherit pages (example: /xowiki /public/wiki)"/>
 	    <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackageTitle"  description="Title of the Package; this title will appear for example in the default RSS feed for this package." section_name="Description"/>
 	    <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredCSSToolkit"  default="default" description="Use either &quot;yui&quot;, or &quot;bootstrap&quot;, or &quot;default&quot;. The latter one lets the value according to the theme."/>
-	    <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredRichtextEditor"  default="ckeditor4" description="Preferred richtext editor, such as: xinha, ckeditor, ckeditor4 (default) or wym"/>
+	    <parameter scope="global" datatype="string"  min_n_values="1"  max_n_values="1"  name="PreferredRichtextEditor"  default="ckeditor4" description="Preferred richtext editor, such as: xinha, ckeditor, ckeditor4 (default), wym or tinymce"/>
 	    <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="WidgetSpecs"  description="Specify pairs of &quot;pagename,fieldname&quot; followed by a Tcl list which is used as a widget spec for ad_form. &quot;pagename&quot; and &quot;fieldname&quot; can contain wild card characters. The following rather complex widget-specs are from OpenACS.org:
 
 *,text {richtext(richtext),nospell,optional
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.245 -r1.284.2.246
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	2 May 2024 12:47:47 -0000	1.284.2.245
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	2 May 2024 14:06:48 -0000	1.284.2.246
@@ -4096,6 +4096,212 @@
 
   ###########################################################
   #
+  # ::xowiki::formfield::richtext::tinymce
+  #
+  ###########################################################
+  Class create richtext::tinymce -superclass richtext -parameter {
+    {extraPlugins ""}
+    {customConfig ""}
+    {additionalConfig ""}
+  } -ad_doc {
+    TinyMCE XoWiki richtext-editor integration.
+
+    @param extraPlugins a list of couples 'pluginId' 'pluginURL'
+                        specifying additional plugins.
+
+    @param customConfig a configuration dict that will completely
+                        override configuration coming from the
+                        parameters.
+    @param additionalConfig a configuration dict that will be merged
+                            with configuration coming from the
+                            parameters. Values specified here will
+                            take precedence on the parameter values.
+
+    @see https://www.tiny.cloud/docs/tinymce/latest/
+  }
+
+  richtext::tinymce set editor_mixin 1
+
+  richtext::tinymce instproc initialize {} {
+    next
+    set :widget_type richtext
+  }
+
+  richtext::tinymce instproc compute_config {} {
+    #
+    # Here we compute the editor config, mergin explicit one with
+    # systems configurations.
+    #
+    # @return a dict
+    #
+    if {${:customConfig} ne ""} {
+      set default_config ${:customConfig}
+    } else {
+      set default_config [::richtext::tinymce::default_config]
+    }
+
+    set config [list]
+
+    if {${:extraPlugins} ne ""} {
+      set extra_plugins [::richtext::tinymce::serialize_options ${:extraPlugins}]
+      lappend config external_plugins "{$extra_plugins}"
+    }
+
+    #
+    # Inline means the editor will not be displayed unless we click on
+    # its content. We also supported an inplace mode, where the editor
+    # does something similar, but with explicit save and cancel
+    # buttons underneath.
+    #
+    # As the difference is subtle and there is currently not a
+    # requirement for inplace mode, we treat both mode the same as
+    # "inline".
+    #
+    set inline_p [expr {${:displayMode} in {"inplace" "inline"} ? true : false}]
+    lappend config inline $inline_p
+
+    set config [dict merge \
+                    [list language [ad_conn language]] \
+                    $default_config \
+                    ${:additionalConfig} \
+                    $config]
+  }
+
+  richtext::tinymce instproc render_input {} {
+    set disabled [:is_disabled]
+    set is_repeat_template [:is_repeat_template_p]
+
+    #
+    # Field is disabled. We simply render as a div.
+    #
+    if {$disabled && !$is_repeat_template} {
+      :render_richtext_as_div
+      return
+    }
+
+    set config [:compute_config]
+    set inline_p [dict get $config inline]
+
+    set config [::richtext::tinymce::serialize_options $config]
+
+    #
+    # Include the relevant javascript.
+    #
+    ::richtext::tinymce::add_editor -init=false
+
+    if {$is_repeat_template} {
+      #
+      # A repeated field. We use a MutationObserver to detect whenever
+      # a new field has been appended and we enhance it on the fly.
+      #
+      ::template::add_body_handler \
+          -identifier richtext_tinymce_editor_init_repeat \
+          -event load \
+          -script {
+            function richtext_tinymce_editor_init_repeat(id, containerId, editorConfig) {
+              const repeatSelector = `[id^='${containerId}']`;
+              const compoundRepeatSelector = `[data-repeat-template-id='${id}']`
+              const targetNode = document.getElementById(containerId);
+              const config = { childList: true };
+              const callback = (mutationList, observer) => {
+                for (const mutation of mutationList) {
+                  for (const repeatedField of mutation.addedNodes) {
+                    const inputField = repeatedField.querySelector(compoundRepeatSelector) ||
+                                       repeatedField.querySelector(repeatSelector);
+                    if (!inputField) { continue; }
+                    const fieldId = inputField.id;
+                    const repeatInfo = JSON.parse(repeatedField.getAttribute('data-repeat'));
+                    const fieldName = repeatInfo ? repeatInfo.name : null;
+                    editorConfig.selector = `[id='${fieldId}']`;
+                    tinyMCE.init(editorConfig).then((editors) => {
+                      let replacedField;
+                      let fieldNum = 1;
+                      for (const hiddenField of targetNode.
+                           querySelectorAll('input[type=hidden]')) {
+                        if (hiddenField.name === fieldId) {
+                          replacedField = hiddenField;
+                          replacedField.name = `${fieldName}.${fieldNum}`;
+                          break;
+                        }
+                        fieldNum++;
+                      }
+                      replacedField?.form.addEventListener('submit', (evt) => {
+                        replacedField.value = editors[0].getContent();
+                      });
+                    });
+                  }
+                }
+              };
+              const observer = new MutationObserver(callback);
+              observer.observe(targetNode, config);
+            }
+          }
+
+      #
+      # Hook to locate our richtext template when repeated.
+      #
+      set :data-repeat-template-id ${:id}
+
+      #
+      # The repeat container is the topmost ancestor of this
+      # formfield. This is true both for regular and compound repeated
+      # fields.
+      #
+      set obj [self]
+      while {[$obj exists parent_field]} {
+        set parent_field [$obj set parent_field]
+        set obj $parent_field
+      }
+      set repeat_container_id [$parent_field id]
+
+      ::template::add_body_handler -event load -script [subst -nocommands {
+        richtext_tinymce_editor_init_repeat('${:id}', '${repeat_container_id}', {$config});
+      }]
+    } else {
+      #
+      # A regular non-repeated field.
+      #
+      ::template::add_body_handler \
+          -identifier richtext_tinymce_editor_init \
+          -event load \
+          -script {
+            function richtext_tinymce_editor_init(elementId, fieldName, editorConfig) {
+              editorConfig.selector = `[id='${elementId}']`;
+              tinyMCE.init(editorConfig).then((editors) => {
+                const replacedField = document.querySelector(`input[type=hidden][name='${elementId}']`);
+                replacedField?.form.addEventListener('submit', (evt) => {
+                  replacedField.name = fieldName;
+                  replacedField.value = editors[0].getContent();
+                });
+              });
+            }
+          }
+
+      ::template::add_body_handler -event load -script [subst -nocommands {
+        richtext_tinymce_editor_init('${:id}', '${:name}', {$config});
+      }]
+    }
+
+    if {$inline_p} {
+      #
+      # In inline mode, the markup we send is a div, that TinyMCE
+      # replaces with an editor + a hidden input field with our same id,
+      # but no name attribute.
+      #
+      # Before the form is submitted, we get the content from the
+      # editor and store it as the hidden field value, then set the
+      # name attibute as XoWiki expects it. This logic is found in
+      # both the promise handler for TinyMCE.init up in the js
+      # functions.
+      #
+      :render_richtext_as_div
+    } else {
+      next
+    }
+  }
+
+  ###########################################################
+  #
   # ::xowiki::formfield::ShuffleField
   #
   ###########################################################