--- tinymce.module	25 Apr 2006 11:23:47 -0000	1.90
+++ tinymce.module	15 Sep 2006 16:19:40 -0000
@@ -498,7 +498,9 @@
   $init['verify_html']        = $settings['verify_html'] ? $settings['verify_html'] : 'false';
   $init['preformatted']       = $settings['preformatted'] ? $settings['preformatted'] : 'false';
   $init['convert_fonts_to_styles'] = $settings['convert_fonts_to_styles'] ? $settings['convert_fonts_to_styles'] : 'false';
-
+  $init['remove_linebreaks'] = $settings['remove_linebreaks'] ? $settings['remove_linebreaks'] : 'true';
+    $init['apply_source_formatting'] = $settings['apply_source_formatting'] ? $settings['apply_source_formatting'] : 'true';
+  
   $tinymce_mod_path = drupal_get_path('module', 'tinymce');
   if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/imagemanager/') && user_access('access tinymce imagemanager')) {
     // we probably need more security than this
@@ -900,6 +902,22 @@
     '#options' => array('true' => 'true', 'false' => 'false'), 
     '#description' => t('If you set this option to true, font size, font family, font color and font background color will be replaced by inline styles.')
   );
+  
+  $form['output']['remove_linebreaks'] = array(
+     '#type' => 'select',
+     '#title' => t('Remove Linebreaks'),
+     '#default_value' => $edit->settings['remove_linebreaks'],
+     '#options' => array('true' => 'true', 'false' => 'false'),
+     '#description' => t('Set this option to false to prevent TinyMCE from removing linebreaks from existing nodes.  True avoids conflicts with some filters.')
+  );
+
+  $form['output']['apply_source_formatting'] = array(
+     '#type' => 'select',
+     '#title' => t('Apply Source Formatting'),
+     '#default_value' => $edit->settings['apply_source_formatting'],
+     '#options' => array('true' => 'true', 'false' => 'false'),
+     '#description' => t('This option makes TinyMCE apply source formatting.  Set this to true for a cleaner HTML source.  Choose false to avoid conflicts with some filters.')
+  );
 
   $form['css'] = array(
     '#type' => 'fieldset',