notes.md created

Add workaround for Emacs 26 async network-server-process issues

.gitignore

@@ -1,5 +1,6 @@
 # Compiled
 *.elc
+*~
 
 # Packaging
 .cask

README.md

@@ -1,9 +1,20 @@
 Markdown preview mode
 ===========================
 
+
+*This is my private fork of https://github.com/ancane/markdown-preview-mode* 
+
+
+**!the contents of this readme may still apply or not!**
+
+-------
+
+
 [![MELPA Stable](http://stable.melpa.org/packages/markdown-preview-mode-badge.svg)](http://stable.melpa.org/#/markdown-preview-mode)
 [![MELPA](http://melpa.org/packages/markdown-preview-mode-badge.svg)](http://melpa.org/#/markdown-preview-mode)
 
+
+
 Markdown preview in emacs features:
 
 * on save/idle preview update
@@ -75,4 +86,3 @@ Markdown preview in emacs features:
 * [markdown-mode.el](https://github.com/defunkt/markdown-mode)
 * [websocket.el](https://github.com/ahyatt/emacs-websocket)
 * [web-server.el](https://github.com/eschulte/emacs-web-server)
-* [uuidgen](https://github.com/kanru/uuidgen-el)

markdown-preview-mode.el

@@ -5,8 +5,8 @@
 ;; Author: Igor Shymko <igor.shimko@gmail.com>
 ;; URL: https://github.com/ancane/markdown-preview-mode
 ;; Keywords: markdown, gfm, convenience
-;; Version: 0.9
-;; Package-Requires: ((emacs "24.3") (websocket "1.6") (markdown-mode "2.0") (cl-lib "0.5") (web-server "0.1.1") (uuidgen "0.3"))
+;; Version: 0.9.2
+;; Package-Requires: ((emacs "24.3") (websocket "1.6") (markdown-mode "2.0") (cl-lib "0.5") (web-server "0.1.1") )
 
 ;; This file is not part of GNU Emacs.
 
@@ -30,11 +30,11 @@
 ;;
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'cl-lib)
 (require 'websocket)
 (require 'markdown-mode)
 (require 'web-server)
-(require 'uuidgen)
 
 (defgroup markdown-preview nil
   "Markdown preview mode."
@@ -96,7 +96,7 @@
   "`markdown-preview' local client.")
 
 (defvar markdown-preview--remote-clients (make-hash-table :test 'equal)
-  "Remote clients hashtable. UUID -> WS")
+  "Remote clients hashtable. UUID -> WS.")
 
 (defvar markdown-preview--home-dir (file-name-directory load-file-name)
   "`markdown-preview-mode' home directory.")
@@ -108,21 +108,23 @@
   "Unique preview identifier.")
 
 (defvar markdown-preview--preview-buffers (make-hash-table :test 'equal)
-  "Preview buffers hashtable. UUID -> buffer-name.")
+  "Preview buffers hashtable. UUID -> buffer name.")
 
 (defun markdown-preview--stop-idle-timer ()
   "Stop the `markdown-preview' idle timer."
   (when (timerp markdown-preview--idle-timer)
     (cancel-timer markdown-preview--idle-timer)))
 
-(defun markdown-preview--css-links ()
+(defun markdown-preview--css ()
   "Get list of styles for preview in backward compatible way."
   (let* ((custom-style (list markdown-preview-style))
          (all-styles
           (mapc (lambda (x) (add-to-list 'custom-style x t)) markdown-preview-stylesheets)))
     (mapconcat
      (lambda (x)
-       (concat "<link rel=\"stylesheet\" type=\"text/css\" href=\"" x "\">"))
+       (if (string-match-p "^[\n\t ]*<style" x)
+           x
+         (concat "<link rel=\"stylesheet\" type=\"text/css\" href=\"" x "\">")))
      all-styles
      "\n")))
 
@@ -130,20 +132,21 @@
   "Get list of javascript script tags for preview."
   (mapconcat
    (lambda (x)
-     (concat
-      "<script src=\"" (if (consp x) (car x) x) "\""
-      (if (consp x) (format " %s" (cdr x)))
-      "></script>"))
+     (if (string-match-p "^[\n\t ]*<script" x)
+         x
+       (concat
+        "<script src=\"" (if (consp x) (car x) x) "\""
+        (if (consp x) (format " %s" (cdr x)))
+        "></script>")))
    markdown-preview-javascript
    "\n"))
 
 (defun markdown-preview--read-preview-template (preview-uuid preview-file)
-  "Read preview template and writes identified by PREVIEW-UUID
-rendered copy to PREVIEW-FILE, ready to be open in browser."
+  "Read preview template and writes identified by PREVIEW-UUID rendered copy to PREVIEW-FILE, ready to be open in browser."
   (with-temp-file preview-file
     (insert-file-contents (expand-file-name "preview.html" markdown-preview--home-dir))
     (when (search-forward "${MD_STYLE}" nil t)
-        (replace-match (markdown-preview--css-links) t))
+        (replace-match (markdown-preview--css) t))
     (when (search-forward "${MD_JS}" nil t)
         (replace-match (markdown-preview--scripts) t))
     (when (search-forward "${WS_HOST}" nil t)
@@ -154,10 +157,21 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
         (replace-match (format "%s" preview-uuid) t))
     (buffer-string)))
 
+;; Emacs 26 async network workaround
+(defun markdown-preview--fix-network-process-wait (plist)
+  "Ensure PLIST contain :nowait nil."
+  (if (and (>= emacs-major-version 26)
+	   (equal (plist-get plist :name) "ws-server")
+	   (plist-get plist :server)
+	   (plist-get plist :nowait))
+      (plist-put plist :nowait nil)
+	plist))
+
 (defun markdown-preview--start-http-server (port)
   "Start http server at PORT to serve preview file via http."
   (unless markdown-preview--http-server
     (lexical-let ((docroot default-directory))
+      (advice-add 'make-network-process :filter-args #'markdown-preview--fix-network-process-wait)
       (setq markdown-preview--http-server
             (ws-start
              (lambda (request)
@@ -181,7 +195,8 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
                            (ws-send-file process filename)
                          (ws-send-404 process)
                          ))))))
-             markdown-preview-http-port nil :host markdown-preview-http-host)))))
+             markdown-preview-http-port nil :host markdown-preview-http-host))
+      (advice-remove 'make-network-process #'my-filter))))
 
 (defun markdown-preview--parse-uuid (headers)
   "Find uuid query param in HEADERS."
@@ -267,12 +282,12 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
                        (setq markdown-preview--local-client nil))))))
 
 (defun markdown-preview--send-preview (preview-uuid)
-  "Send the `markdown-preview' preview to clients."
+  "Send the `markdown-preview' with PREVIEW-UUID preview to clients."
   (when (bound-and-true-p markdown-preview-mode)
     (markdown-preview--send-preview-to markdown-preview--local-client preview-uuid)))
 
 (defun markdown-preview--send-preview-to (websocket preview-uuid)
-  "Send the `markdown-preview' to a specific WEBSOCKET."
+  "Send the `markdown-preview' with PREVIEW-UUID to a specific WEBSOCKET."
   (let ((mark-position-percent
          (number-to-string
           (truncate
@@ -302,7 +317,7 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
 
 (defun markdown-preview--start ()
   "Start `markdown-preview' mode."
-  (setq-local markdown-preview--uuid (uuidgen-1))
+  (setq-local markdown-preview--uuid (markdown-preview--random-uuid))
   (puthash markdown-preview--uuid (buffer-name) markdown-preview--preview-buffers)
   ;;  (gethash markdown-preview--uuid markdown-preview--preview-buffers)
   (markdown-preview--read-preview-template
@@ -328,6 +343,37 @@ rendered copy to PREVIEW-FILE, ready to be open in browser."
     (if (file-exists-p preview-file)
         (delete-file preview-file))))
 
+(defun markdown-preview--random-uuid ()
+  "Insert a UUID using a simple hashing of variable data.
+Example of a UUID: 1df63142-a513-c850-31a3-535fc3520c3d
+Note: this code uses https://en.wikipedia.org/wiki/Md5,
+which is not cryptographically safe. I'm not sure what's
+the implication of its use here.
+Version 2015-01-30
+URL `http://ergoemacs.org/emacs/elisp_generate_uuid.html'"
+  ;; by Christopher Wellons, 2011-11-18. Editted by Xah Lee.
+  ;; Edited by Hideki Saito further to generate all valid variants for "N" in xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx format.
+  ;; (interactive)
+  (let ((myStr (md5 (format "%s%s%s%s%s%s%s%s%s%s"
+                            (user-uid)
+                            (emacs-pid)
+                            (system-name)
+                            (user-full-name)
+                            (current-time)
+                            (emacs-uptime)
+                            (garbage-collect)
+                            (buffer-string)
+                            (random)
+                            (recent-keys)))))
+
+    (format "%s-%s-4%s-%s%s-%s"
+            (substring myStr 0 8)
+            (substring myStr 8 12)
+            (substring myStr 13 16)
+            (format "%x" (+ 8 (random 4)))
+            (substring myStr 17 20)
+            (substring myStr 20 32))))
+
 ;;;###autoload
 (defun markdown-preview-open-browser ()
   "Open the `markdown-preview' in the browser."

notes.md

@@ -0,0 +1,39 @@
+
+
+* aus .emacs:
+
+``` elisp
+(autoload 'markdown-mode "markdown-mode.el"
+  "Major mode for editing Markdown files" t)
+(setq auto-mode-alist
+      (cons '("\\.text" . markdown-mode) auto-mode-alist))
+(setq markdown-enable-math t)
+;;(setq markdown-split-window-direction 'right)
+(setq browse-url-browser-function #'browse-url-chromium)
+(setq markdown-command
+      (concat
+       "/usr/bin/pandoc --to=html"
+       " --from markdown+tex_math_dollars+yaml_metadata_block+autolink_bare_uris"
+       " --mathjax --highlight-style=pygments"))
+    ;;   " --standalone --toc"
+;;M-x package-refresh-contents
+;;M-x package-install Ret web-server
+;;(require 'markdown-preview-mode)
+
+```
+
+
+* dann
+
+``` elisp
+M-x package-install markdown-preview-mode
+```
+
+* dann `preview.html` in `.emacs.d/elpa/m-p-m`   ersetzen,
+
+* dann in einem md-buffer:   `M-x markdown-preview-mode`
+
+
+(Zum unterschied: `M-x markdown-preview` macht auch ein chrome-buffer
+auf, aber ohne live-update)
+

preview.html

@@ -2,11 +2,21 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui, user-scalable=yes">
     <title>Markdown preview</title>
+    <!--
     ${MD_STYLE}
+    -->
+    <!-- apt install libjs-mathjax node-jquery 
+    <script src="file:///usr/share/nodejs/jquery/dist/jquery.min.js"></script>
+    chromium doesn't load file:/// -->
     <script src="http://code.jquery.com/jquery-1.12.4.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.js" type="text/javascript"></script>
+    <!--
+    <script src="file:///usr/share/javascript/mathjax/config/TeX-AMS_CHTML-full.js"></script>
+    -->
     ${MD_JS}
+    
     <script>
      (function($, undefined) {
          var socket = new WebSocket("ws://${WS_HOST}:${WS_PORT}");
@@ -23,8 +33,10 @@
              console.log('Code: ' + event.code + ' reason: ' + event.reason);
          };
          socket.onmessage = function(event) {
-             $("#markdown-body").html($(event.data).find("#content").html());
-             var scroll = $(document).height() * ($(event.data).find("#position-percentage").html() / 100);
+             $("#markdown-body").html($(event.data).find("#content").html()).trigger('mdContentChange');
+             var scroll = $(document).height() *
+                 ($(event.data).find("#position-percentage").html() / 100);
+             MathJax.typeset();
              $("html, body").animate({ scrollTop: scroll }, 600);
          };
          socket.onerror = function(error) {
@@ -32,6 +44,191 @@
          };
      })(jQuery);
     </script>
+<!-- from pandoc --standalone --html  -->
+<!-- was: line-height: 1.7;  max-width: 40em;     -->    
+    <style>
+      html {
+      line-height: 1.3;
+      font-family: Georgia, serif;
+      font-size: 20px;
+      color: #1a1a1a;
+      background-color: #fdfdfd;
+    }
+    body {
+      margin: 0 auto;
+      max-width: 50em;       
+      padding-left: 50px;
+      padding-right: 50px;
+      padding-top: 50px;
+      padding-bottom: 50px;
+      hyphens: auto;
+      word-wrap: break-word;
+      text-rendering: optimizeLegibility;
+      font-kerning: normal;
+    }
+    @media (max-width: 600px) {
+      body {
+        font-size: 0.9em;
+        padding: 1em;
+      }
+    }
+    @media print {
+      body {
+        background-color: transparent;
+        color: black;
+      }
+      p, h2, h3 {
+        orphans: 3;
+        widows: 3;
+      }
+      h2, h3, h4 {
+        page-break-after: avoid;
+      }
+    }
+    p {
+      margin-top: .8em;
+    }
+    a {
+      color: #1a1a1a;
+    }
+    a:visited {
+      color: #1a1a1a;
+    }
+    img {
+      max-width: 100%;
+    }
+    h1, h2, h3, h4, h5, h6 {
+      margin-top: 1.7em;
+    }
+    h1 { font-size: 34px; }
+    h2 { font-size: 28px; }
+    h3 { font-size: 26px; }
+    h4 { font-size: 23px; }
+    ol, ul {
+      padding-left: 1.7em;
+      margin-top: 1.7em;
+    }
+    li > ol, li > ul {
+      margin-top: 0;
+    }
+    blockquote {
+      margin: 1.7em 0 1.7em 1.7em;
+      padding-left: 1em;
+      border-left: 2px solid #e6e6e6;
+      font-style: italic;
+    }
+    code {
+      font-family: Menlo, Monaco, 'Lucida Console', Consolas, monospace;
+      background-color: #f0f0f0;
+      font-size: 85%;
+      margin: 0;
+      padding: .2em .4em;
+      line-height: 1.0;
+    }
+    pre {
+      line-height: 1.0;
+      padding: 1em;
+      background-color: #f0f0f0;
+      overflow: auto;
+    }
+    pre code {
+      padding: 0;
+      overflow: visible;
+    }
+    hr {
+      background-color: #1a1a1a;
+      border: none;
+      height: 1px;
+      margin-top: 1.7em;
+    }
+    table {
+      border-collapse: collapse;
+      width: 100%;
+      overflow-x: auto;
+      display: block;
+    }
+    th, td {
+      border-bottom: 1px solid lightgray;
+      padding: 1em 3em 1em 0;
+    }
+    header {
+      margin-bottom: 6em;
+      text-align: center;
+    }
+    nav a:not(:hover) {
+      text-decoration: none;
+    }
+    code{white-space: pre-wrap;}
+    span.smallcaps{font-variant: small-caps;}
+    span.underline{text-decoration: underline;}
+    div.column{display: inline-block; vertical-align: top; width: 50%;}
+    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+    ul.task-list{list-style: none;}
+    pre > code.sourceCode { white-space: pre; position: relative; }
+    pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
+    pre > code.sourceCode > span:empty { height: 1.2em; }
+    code.sourceCode > span { color: inherit; text-decoration: inherit; }
+    div.sourceCode { margin: 1em 0; }
+    pre.sourceCode { margin: 0; }
+    @media screen {
+    div.sourceCode { overflow: auto; }
+    }
+    @media print {
+    pre > code.sourceCode { white-space: pre-wrap; }
+    pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
+    }
+    pre.numberSource code
+      { counter-reset: source-line 0; }
+    pre.numberSource code > span
+      { position: relative; left: -4em; counter-increment: source-line; }
+    pre.numberSource code > span > a:first-child::before
+      { content: counter(source-line);
+        position: relative; left: -1em; text-align: right; vertical-align: baseline;
+        border: none; display: inline-block;
+        -webkit-touch-callout: none; -webkit-user-select: none;
+        -khtml-user-select: none; -moz-user-select: none;
+        -ms-user-select: none; user-select: none;
+        padding: 0 4px; width: 4em;
+        color: #aaaaaa;
+      }
+    pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa;  padding-left: 4px; }
+    div.sourceCode
+      {   }
+    @media screen {
+    pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
+    }
+    code span.al { color: #ff0000; font-weight: bold; } /* Alert */
+    code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+    code span.at { color: #7d9029; } /* Attribute */
+    code span.bn { color: #40a070; } /* BaseN */
+    code span.bu { } /* BuiltIn */
+    code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+    code span.ch { color: #4070a0; } /* Char */
+    code span.cn { color: #880000; } /* Constant */
+    code span.co { color: #60a0b0; font-style: italic; } /* Comment */
+    code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
+    code span.do { color: #ba2121; font-style: italic; } /* Documentation */
+    code span.dt { color: #902000; } /* DataType */
+    code span.dv { color: #40a070; } /* DecVal */
+    code span.er { color: #ff0000; font-weight: bold; } /* Error */
+    code span.ex { } /* Extension */
+    code span.fl { color: #40a070; } /* Float */
+    code span.fu { color: #06287e; } /* Function */
+    code span.im { } /* Import */
+    code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+    code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+    code span.op { color: #666666; } /* Operator */
+    code span.ot { color: #007020; } /* Other */
+    code span.pp { color: #bc7a00; } /* Preprocessor */
+    code span.sc { color: #4070a0; } /* SpecialChar */
+    code span.ss { color: #bb6688; } /* SpecialString */
+    code span.st { color: #4070a0; } /* String */
+    code span.va { color: #19177c; } /* Variable */
+    code span.vs { color: #4070a0; } /* VerbatimString */
+    code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+  </style>
+
+    
   </head>
   <body>
     <article id="markdown-body" class="markdown-body">