add option to force insert line breaks to highlighting code.

contributors/dindinw.md

@@ -0,0 +1,9 @@
+2024-11-27
+
+I hereby agree to the terms of the "Markdown Here Individual Contributor License Agreement", with MD5 checksum dda72cea89d55de9fda0a102494134b4.
+
+I furthermore declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Alex Wu https://github.com/dindinw

src/common/markdown-render.js

@@ -85,6 +85,7 @@ function markdownRender(mdText, userprefs, marked, hljs) {
     // so we'll add it by sneaking it into this config field.
     langPrefix: 'hljs language-',
     math: userprefs['math-enabled'] ? mathify : null,
+    highlightForceBreaks: userprefs['highlight-line-breaks-enabled'],
     highlight: function(codeText, codeLanguage) {
         if (codeLanguage &&
             hljs.getLanguage(codeLanguage.toLowerCase())) {

src/common/marked.js

@@ -778,6 +778,9 @@ Renderer.prototype.code = function(code, lang, escaped) {
     var out = this.options.highlight(code, lang);
     if (out != null && out !== code) {
       escaped = true;
+      if (this.options.highlightForceBreaks) {
+         out = out.replace(/\n/g, '<br>');
+      }
       code = out;
     }
   }
@@ -1248,6 +1251,7 @@ marked.defaults = {
   smartLists: false,
   silent: false,
   highlight: null,
+  highlightForceBreaks: false,
   langPrefix: 'lang-',
   smartypants: false,
   headerPrefix: '',

src/common/options-store.js

@@ -22,7 +22,8 @@ var DEFAULTS = {
   'hotkey': { shiftKey: false, ctrlKey: true, altKey: true, key: 'M' },
   'forgot-to-render-check-enabled': false,
   'header-anchors-enabled': false,
-  'gfm-line-breaks-enabled': true
+  'gfm-line-breaks-enabled': true,
+  'highlight-line-breaks-enabled': false 
 };
 
 /*? if(platform!=='thunderbird'){ */
@@ -130,6 +131,7 @@ var ChromeOptionsStore = {
     'hotkey': DEFAULTS['hotkey'],
     'forgot-to-render-check-enabled': DEFAULTS['forgot-to-render-check-enabled'],
     'header-anchors-enabled': DEFAULTS['header-anchors-enabled'],
+    'highlight-line-breaks-enabled': DEFAULTS['highlight-line-breaks-enabled'],
     'gfm-line-breaks-enabled': DEFAULTS['gfm-line-breaks-enabled']
   },
 
@@ -294,6 +296,7 @@ var MozillaOptionsStore = {
     'hotkey': DEFAULTS['hotkey'],
     'forgot-to-render-check-enabled': DEFAULTS['forgot-to-render-check-enabled'],
     'header-anchors-enabled': DEFAULTS['header-anchors-enabled'],
+    'highlight-line-breaks-enabled': DEFAULTS['highlight-line-breaks-enabled'],
     'gfm-line-breaks-enabled': DEFAULTS['gfm-line-breaks-enabled']
   },
 
@@ -469,6 +472,7 @@ var SafariOptionsStore = {
     'hotkey': DEFAULTS['hotkey'],
     'forgot-to-render-check-enabled': DEFAULTS['forgot-to-render-check-enabled'],
     'header-anchors-enabled': DEFAULTS['header-anchors-enabled'],
+    'highlight-line-breaks-enabled': DEFAULTS['highlight-line-breaks-enabled'],
     'gfm-line-breaks-enabled': DEFAULTS['gfm-line-breaks-enabled']
   }
 };

src/common/options.html

@@ -638,6 +638,18 @@ <h1>
           </label>
         </div>
         <hr/>
+        <div>
+          <input type="checkbox" id="highlight-line-breaks-enabled"/>
+          <label for="highlight-line-breaks-enabled" data-i18n="highlight_line_breaks_enabled_label">
+            <b>Enable line breaks in Syntax Highlighting.</b>
+          </label>
+          <div class="extra-description">
+            <p data-i18n="highlight_line_breaks_enabled_1">
+              try to add line breaks &lt;br&gt; when in some case CSS "white-space:pre" not work.
+            </p>
+         </div>
+        </div>
+        <hr/>
       </div>
 
       <div class="control-group">

src/common/options.js

@@ -14,9 +14,10 @@
  */
 
 var cssEdit, cssSyntaxEdit, cssSyntaxSelect, rawMarkdownIframe, savedMsg,
-  mathEnable, mathEdit, hotkeyShift, hotkeyCtrl, hotkeyAlt, hotkeyKey,
-  forgotToRenderCheckEnabled, headerAnchorsEnabled, gfmLineBreaksEnabled;
-var loaded = false;
+    mathEnable, mathEdit, hotkeyShift, hotkeyCtrl, hotkeyAlt, hotkeyKey,
+    forgotToRenderCheckEnabled, headerAnchorsEnabled, gfmLineBreaksEnabled,
+    highlightLineBreaksEnabled,
+    loaded = false;
 
 function onLoad() {
   var xhr;
@@ -41,6 +42,7 @@ function onLoad() {
   forgotToRenderCheckEnabled = document.getElementById('forgot-to-render-check-enabled');
   headerAnchorsEnabled = document.getElementById('header-anchors-enabled');
   gfmLineBreaksEnabled = document.getElementById('gfm-line-breaks-enabled');
+  highlightLineBreaksEnabled = document.getElementById('highlight-line-breaks-enabled');
 
   //
   // Syntax highlighting styles and selection
@@ -86,6 +88,8 @@ function onLoad() {
 
     gfmLineBreaksEnabled.checked = prefs['gfm-line-breaks-enabled'];
 
+    highlightLineBreaksEnabled.checked = prefs['highlight-line-breaks-enabled'];
+
     // Start watching for changes to the styles.
     setInterval(checkChange, 100);
 
@@ -233,7 +237,7 @@ function checkChange() {
         mathEnable.checked + mathEdit.value +
         hotkeyShift.checked + hotkeyCtrl.checked + hotkeyAlt.checked + hotkeyKey.value +
         forgotToRenderCheckEnabled.checked + headerAnchorsEnabled.checked +
-        gfmLineBreaksEnabled.checked;
+        gfmLineBreaksEnabled.checked + highlightLineBreaksEnabled.checked;
 
   if (newOptions !== lastOptions) {
     // CSS has changed.
@@ -264,7 +268,8 @@ function checkChange() {
                     },
           'forgot-to-render-check-enabled': forgotToRenderCheckEnabled.checked,
           'header-anchors-enabled': headerAnchorsEnabled.checked,
-          'gfm-line-breaks-enabled': gfmLineBreaksEnabled.checked
+          'gfm-line-breaks-enabled': gfmLineBreaksEnabled.checked,
+          'highlight-line-breaks-enabled': highlightLineBreaksEnabled.checked
         },
         function() {
           updateMarkdownRender();