emacs
/
plantuml-mode
mirror of https://github.com/skuro/plantuml-mode.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added preview region functionality

This commit is contained in:
Carlo Sciolla 2016-10-10 20:05:27 +02:00
parent b7be36f6d2
commit bbbb5c58ae
1 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
puml-mode.el
View File

@ -69,7 +69,7 @@
(defvar puml-run-command "java -jar %s") (defvar puml-run-command "java -jar %s")
(defun puml-render-command (&rest arguments) (defun puml-render-command (&rest arguments)
"Returns a nicely escaped command string for executing the plantuml JAR file." "Create a command line to execute PlantUML with arguments (as ARGUMENTS)."
;; (shell-command (format "") (concat plantuml-run-command " " buffer-file-name)) ;; (shell-command (format "") (concat plantuml-run-command " " buffer-file-name))
(let ((cmd (format puml-run-command (shell-quote-argument puml-plantuml-jar-path))) (let ((cmd (format puml-run-command (shell-quote-argument puml-plantuml-jar-path)))
@ -133,30 +133,30 @@
(forward-char) (forward-char)
(setq word (current-word)) (setq word (current-word))
(if (string= word "EOF") (setq found nil) (if (string= word "EOF") (setq found nil)
;; else ;; else
(forward-line) (forward-line)
(setq count (string-to-number (current-word))) (setq count (string-to-number (current-word)))
(beginning-of-line 2) (beginning-of-line 2)
(setq pos (point)) (setq pos (point))
(forward-line count) (forward-line count)
(cond ((string= word "type") (cond ((string= word "type")
(setq puml-plantuml-types (setq puml-plantuml-types
(split-string (split-string
(buffer-substring-no-properties pos (point))))) (buffer-substring-no-properties pos (point)))))
((string= word "keyword") ((string= word "keyword")
(setq puml-plantuml-keywords (setq puml-plantuml-keywords
(split-string (split-string
(buffer-substring-no-properties pos (point))))) (buffer-substring-no-properties pos (point)))))
((string= word "preprocessor") ((string= word "preprocessor")
(setq puml-plantuml-preprocessors (setq puml-plantuml-preprocessors
(split-string (split-string
(buffer-substring-no-properties pos (point))))) (buffer-substring-no-properties pos (point)))))
(t (setq puml-plantuml-builtins (t (setq puml-plantuml-builtins
(append (append
puml-plantuml-builtins puml-plantuml-builtins
(split-string (split-string
(buffer-substring-no-properties pos (point))))))) (buffer-substring-no-properties pos (point)))))))
(setq found (search-forward ";" nil nil))))))) (setq found (search-forward ";" nil nil)))))))
(defconst puml-preview-buffer "*PUML Preview*") (defconst puml-preview-buffer "*PUML Preview*")
@ -200,12 +200,12 @@ default output type for new buffers."
"Create the flag to pass to PlantUML to produce the selected output format." "Create the flag to pass to PlantUML to produce the selected output format."
(concat "-t" puml-output-type)) (concat "-t" puml-output-type))
(defun puml-preview (prefix) (defun puml-preview-string (prefix string)
"Preview diagram, using prefix (as PREFIX) to choose where to display it: "Preview diagram from PlantUML sources (as STRING), using prefix (as PREFIX)
to choose where to display it:
- 4 (when prefixing the command with C-u) -> new window - 4 (when prefixing the command with C-u) -> new window
- 16 (when prefixing the command with C-u C-u) -> new frame. - 16 (when prefixing the command with C-u C-u) -> new frame.
- else -> new buffer" - else -> new buffer"
(interactive "p")
(let ((b (get-buffer puml-preview-buffer))) (let ((b (get-buffer puml-preview-buffer)))
(when b (when b
(kill-buffer b))) (kill-buffer b)))
@ -220,7 +220,7 @@ default output type for new buffers."
(let ((ps (start-process "PUML" buf (let ((ps (start-process "PUML" buf
"java" "-jar" (shell-quote-argument puml-plantuml-jar-path) "java" "-jar" (shell-quote-argument puml-plantuml-jar-path)
(puml-output-type-opt) "-p"))) (puml-output-type-opt) "-p")))
(process-send-region ps (point-min) (point-max)) (process-send-string ps string)
(process-send-eof ps) (process-send-eof ps)
(set-process-sentinel ps (set-process-sentinel ps
(lambda (_ps event) (lambda (_ps event)
@ -236,6 +236,39 @@ default output type for new buffers."
(image-mode) (image-mode)
(set-buffer-multibyte t))))))) (set-buffer-multibyte t)))))))
(defun puml-preview-buffer (prefix)
"Preview diagram from the PlantUML sources in the current buffer.
Uses prefix (as PREFIX) to choose where to display it:
- 4 (when prefixing the command with C-u) -> new window
- 16 (when prefixing the command with C-u C-u) -> new frame.
- else -> new buffer"
(interactive "p")
(puml-preview-string prefix (buffer-string)))
(defun puml-preview-region (prefix)
"Preview diagram from the PlantUML sources in the current region.
Uses prefix (as PREFIX) to choose where to display it:
- 4 (when prefixing the command with C-u) -> new window
- 16 (when prefixing the command with C-u C-u) -> new frame.
- else -> new buffer"
(interactive "p")
(puml-preview-string prefix (concat "@startuml\n"
(buffer-substring-no-properties
(region-beginning) (region-end))
"\n@enduml")))
(defun puml-preview (prefix)
"Preview diagram from the PlantUML sources.
Uses the current region if one is active, or the entire buffer otherwise.
Uses prefix (as PREFIX) to choose where to display it:
- 4 (when prefixing the command with C-u) -> new window
- 16 (when prefixing the command with C-u C-u) -> new frame.
- else -> new buffer"
(interactive "p")
(if (mark)
(puml-preview-region prefix)
(puml-preview-buffer prefix)))
(unless puml-plantuml-kwdList (unless puml-plantuml-kwdList
(puml-init) (puml-init)
(defvar puml-plantuml-types-regexp (concat "^\\s *\\(" (regexp-opt puml-plantuml-types 'words) "\\|\\<\\(note\\s +over\\|note\\s +\\(left\\|right\\|bottom\\|top\\)\\s +\\(of\\)?\\)\\>\\|\\<\\(\\(left\\|center\\|right\\)\\s +\\(header\\|footer\\)\\)\\>\\)")) (defvar puml-plantuml-types-regexp (concat "^\\s *\\(" (regexp-opt puml-plantuml-types 'words) "\\|\\<\\(note\\s +over\\|note\\s +\\(left\\|right\\|bottom\\|top\\)\\s +\\(of\\)?\\)\\>\\|\\<\\(\\(left\\|center\\|right\\)\\s +\\(header\\|footer\\)\\)\\>\\)"))