Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.47.2.4 -r1.47.2.5
--- openacs-4/packages/acs-templating/acs-templating.info	25 May 2009 18:19:57 -0000	1.47.2.4
+++ openacs-4/packages/acs-templating/acs-templating.info	26 May 2009 14:51:27 -0000	1.47.2.5
@@ -66,7 +66,8 @@
 {theme_openacs_buttons2_add_before "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator"} 
 {theme_openacs_buttons3_add_before "tablecontrols,separator"} 
 {theme_openacs_buttons3_add "iespell,media,separator,print,separator,fullscreen"} 
-{extended_valid_elements "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"}" description="This is a tcl list of default tinymce config options as found in http://wiki.moxiecode.com/index.php/TinyMCE:Configuration "/>
+{extended_valid_elements "img[id|class|style|title|lang|onmouseover|onmouseout|src|alt|name|width|height],hr[id|class|style|title],span[id|class|style|title|lang]"}
+{element_format "html"}" description="This is a tcl list of default tinymce config options as found in http://wiki.moxiecode.com/index.php/TinyMCE:Configuration "/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseHtmlAreaForRichtextP"  default="0" description="Should the richtext widget use the htmlArea widget for richtext editing. 1 = yes, 0 = no. We will also check the browser's User-Agent header to find out if htmlArea works with the given browser."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="XinhaDefaultPlugins"  default="GetHtml CharacterMap ContextMenu ListType TableOperations EditTag LangMarks Abbreviation" description="When xinha is specified as richtext editor (see parameter RichTextEditor) then use the following xinha plugins per default."/>
         </parameters>
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -r1.47.2.1 -r1.47.2.2
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	15 May 2009 17:13:48 -0000	1.47.2.1
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	26 May 2009 14:51:27 -0000	1.47.2.2
@@ -521,8 +521,9 @@
                     {theme_openacs_buttons2_add "oacslink,separator,preview,separator,forecolor,backcolor"} 
                     {theme_openacs_buttons2_add_before "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator"} 
                     {theme_openacs_buttons3_add_before "tablecontrols,separator"} 
-                    {theme_openacs_buttons3_add "iespell,media,separator,print,separator,fullscreen"} 
-                    {extended_valid_elements "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"}}
+                    {theme_openacs_buttons3_add "iespell,media,separator,print,separator,fullscreen"}
+                    {extended_valid_elements "img[id|class|style|title|lang|onmouseover|onmouseout|src|alt|name|width|height],hr[id|class|style|title],span[id|class|style|title|lang]"}
+                    {element_format "html"}}
                 set tinymce_configs_list [parameter::get \
                                               -package_id [apm_package_id_from_key "acs-templating"] \
                                               -parameter "TinyMCEDefaultConfig" \