daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2025-06-22 17:08:08 +02:00
parent 54e5633369
commit 16a0a6db93
558 changed files with 68349 additions and 26568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/plantuml-mode/plantuml-mode-pkg.el
View File

@@ -1,8 +1,9 @@
(define-package "plantuml-mode" "20191102.2056" "Major mode for PlantUML"
'((dash "2.0.0")
;; -*- no-byte-compile: t; lexical-binding: nil -*-
(define-package "plantuml-mode" "20250613.1438"
"Major mode for PlantUML."
'((dash "2.0.0")
(emacs "25.0"))
:commit "ea45a13707abd2a70df183f1aec6447197fc9ccc" :keywords
'("uml" "plantuml" "ascii"))
;; Local Variables:
;; no-byte-compile: t
;; End:
:url "https://github.com/skuro/plantuml-mode"
:commit "dc0f497a67ee9b3d2e437e16023011780d0e8b05"
:revdesc "dc0f497a67ee"
:keywords '("uml" "plantuml" "ascii"))

53
lisp/plantuml-mode/plantuml-mode.el
View File

@@ -6,8 +6,8 @@
;; Author: Zhang Weize (zwz)
;; Maintainer: Carlo Sciolla (skuro)
;; Keywords: uml plantuml ascii
;; Version: 1.2.9
;; Package-Version: 1.2.9
;; Package-Version: 20250613.1438
;; Package-Revision: dc0f497a67ee
;; Package-Requires: ((dash "2.0.0") (emacs "25.0"))
;; This file is free software; you can redistribute it and/or modify
@@ -37,6 +37,8 @@
;;; Change log:
;;
;; version 1.6.0, 2025-05-15 Fix server exec mode; various indentation enhancements and bug fixes; better preview buffer management
;; version 1.5.0, 2025-05-14 Fixed warnings with new Java versions #157; updated versions to let CI work again
;; version 1.4.1, 2019-09-03 Better indentation; more bugfixing; actually adding `executable' mode
;; version 1.4.0, 2019-08-21 Added `executable' exec mode to use locally installed `plantuml' binaries, various bugfixes
;; version 1.3.1, 2019-08-02 Fixed interactive behavior of `plantuml-set-exec-mode'
@@ -76,8 +78,7 @@
(require 'dash)
(require 'xml)
(defgroup plantuml-mode nil
"Major mode for editing plantuml file."
(defgroup plantuml-mode nil "Major mode for editing plantuml file."
:group 'languages)
(defcustom plantuml-jar-path
@@ -94,7 +95,7 @@
(defvar plantuml-mode-hook nil "Standard hook for plantuml-mode.")
(defconst plantuml-mode-version "20190905.838" "The plantuml-mode version string.")
(defconst plantuml-mode-version "1.5.0" "The plantuml-mode version string.")
(defvar plantuml-mode-debug-enabled nil)
@@ -144,7 +145,9 @@
:group 'plantuml)
(defcustom plantuml-indent-level 8
"Indentation level of PlantUML lines")
"Indentation level of PlantUML lines"
:type 'natnum
:group 'plantuml)
(defun plantuml-jar-render-command (&rest arguments)
"Create a command line to execute PlantUML with arguments (as ARGUMENTS)."
@@ -176,7 +179,7 @@
;; PlantUML execution mode
(defvar-local plantuml-exec-mode nil
"The Plantuml execution mode override. See `plantuml-default-exec-mode' for acceptable values.")
"The Plantuml execution mode override. See `plantuml-default-exec-mode' for acceptable values.")
(defun plantuml-set-exec-mode (mode)
"Set the execution mode MODE for PlantUML."
@@ -404,7 +407,8 @@ Window is selected according to PREFIX:
(when imagep
(with-current-buffer buf
(image-mode)
(set-buffer-multibyte t)))))
(set-buffer-multibyte t)))
(set-window-point (get-buffer-window buf 'visible) (point-min))))
(defun plantuml-jar-preview-string (prefix string buf)
"Preview the diagram from STRING by running the PlantUML JAR.
@@ -426,8 +430,9 @@ Put the result into buffer BUF. Window is selected according to PREFIX:
"Encode the string STRING into a URL suitable for PlantUML server interactions."
(let* ((coding-system (or buffer-file-coding-system
"utf8"))
(encoded-string (base64-encode-string (encode-coding-string string coding-system) t)))
(concat plantuml-server-url "/" plantuml-output-type "/-base64-" encoded-string)))
(str (encode-coding-string string coding-system))
(encoded-string (mapconcat (lambda(x)(format "%02X" x)) str)))
(concat plantuml-server-url "/" plantuml-output-type "/~h" encoded-string)))
(defun plantuml-server-preview-string (prefix string buf)
"Preview the diagram from STRING as rendered by the PlantUML server.
@@ -482,9 +487,10 @@ Put the result into buffer BUF, selecting the window according to PREFIX:
(defun plantuml-preview-string (prefix string)
"Preview diagram from PlantUML sources (as STRING), using prefix (as PREFIX)
to choose where to display it."
(let ((b (get-buffer plantuml-preview-buffer)))
(when b
(kill-buffer b)))
(when-let ((b (get-buffer plantuml-preview-buffer))
(inhibit-read-only t))
(with-current-buffer b
(erase-buffer)))
(let* ((imagep (and (display-images-p)
(plantuml-is-image-output-p)))
@@ -516,8 +522,9 @@ Uses prefix (as PREFIX) to choose where to display it:
"\n@enduml")))
(defun plantuml-preview-current-block (prefix)
"Preview diagram from the PlantUML sources from the previous @startuml to the next @enduml.
Uses prefix (as PREFIX) to choose where to display it:
"Preview diagram from the PlantUML sources for the current block.
The block is defined as starting from the previous @startuml to the next
@enduml. 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"
@@ -573,7 +580,7 @@ Uses prefix (as PREFIX) to choose where to display it:
Plantuml elements like skinparam, rectangle, sprite, package, etc.
The opening { has to be the last visible character in the line (whitespace
might follow).")
(defvar plantuml-indent-regexp-note-start "^\s*\\(floating\s+\\)?[hr]?note\s+\\(right\\|left\\|top\\|bottom\\|over\\)[^:]*?$" "simplyfied regex; note syntax is especially inconsistent across diagrams")
(defvar plantuml-indent-regexp-note-start "^\s*\\(floating\s+\\)?[hr]?note\s+\\(right\\|left\\|top\\|bottom\\|over\\|as\\)[^:]*\\(\\:\\:[^:]+\\)?$" "simplyfied regex; note syntax is especially inconsistent across diagrams")
(defvar plantuml-indent-regexp-group-start "^\s*\\(alt\\|else\\|opt\\|loop\\|par\\|break\\|critical\\|group\\)\\(?:\s+.+\\|$\\)"
"Indentation regex for plantuml group elements that are defined for sequence diagrams.
Two variants for groups: keyword is either followed by whitespace and some text
@@ -589,6 +596,7 @@ or it is followed by line end.")
(defvar plantuml-indent-regexp-newif-start "^\s*\\(?:else\\)?if\s+(.*)\s+then\s*.*$")
(defvar plantuml-indent-regexp-loop-start "^\s*\\(?:repeat\s*\\|while\s+(.*).*\\)$")
(defvar plantuml-indent-regexp-fork-start "^\s*\\(?:fork\\|split\\)\\(?:\s+again\\)?\s*$")
(defvar plantuml-indent-regexp-case-start "^\s*\\(?:switch\\|case\\)\s-*(.*)\s*$")
(defvar plantuml-indent-regexp-macro-start "^\s*!definelong.*$")
(defvar plantuml-indent-regexp-user-control-start "^.*'.*\s*PLANTUML_MODE_INDENT_INCREASE\s*.*$")
(defvar plantuml-indent-regexp-start (list plantuml-indent-regexp-block-start
@@ -601,6 +609,7 @@ or it is followed by line end.")
plantuml-indent-regexp-newif-start
plantuml-indent-regexp-loop-start
plantuml-indent-regexp-fork-start
plantuml-indent-regexp-case-start
plantuml-indent-regexp-title-start
plantuml-indent-regexp-header-start
plantuml-indent-regexp-footer-start
@@ -620,7 +629,8 @@ or it is followed by line end.")
(defvar plantuml-indent-regexp-oldif-end "^\s*\\(endif\\|else\\)\s*\\('.*\\)?$")
(defvar plantuml-indent-regexp-newif-end "^\s*\\(endif\\|elseif\\|else\\)\s*.*$")
(defvar plantuml-indent-regexp-loop-end "^\s*\\(repeat\s*while\\|endwhile\\)\s*.*$")
(defvar plantuml-indent-regexp-fork-end "^\s*\\(\\(fork\\|split\\)\s+again\\|end\s+\\(fork\\|split\\)\\)\s*$")
(defvar plantuml-indent-regexp-fork-end "^\s*\\(\\(fork\\|split\\)\s+again\\|end\s+\\(fork\\|split\\)\\)\s*\\(\{.*\}\\)?\s*$")
(defvar plantuml-indent-regexp-case-end "^\s*\\(case\s-*(.*)\\|endswitch\\)\s*\\('.*\\)?$")
(defvar plantuml-indent-regexp-macro-end "^\s*!enddefinelong\s*\\('.*\\)?$")
(defvar plantuml-indent-regexp-user-control-end "^.*'.*\s*PLANTUML_MODE_INDENT_DECREASE\s*.*$")
(defvar plantuml-indent-regexp-end (list plantuml-indent-regexp-block-end
@@ -633,6 +643,7 @@ or it is followed by line end.")
plantuml-indent-regexp-newif-end
plantuml-indent-regexp-loop-end
plantuml-indent-regexp-fork-end
plantuml-indent-regexp-case-end
plantuml-indent-regexp-title-end
plantuml-indent-regexp-header-end
plantuml-indent-regexp-footer-end
@@ -723,12 +734,14 @@ Restore point to same position in text of the line as before indentation."
(beginning-of-line)
(indent-line-to (* plantuml-indent-level (plantuml-current-block-depth))))
;; restore position in text of line
(goto-char (- (line-end-position) original-position-eol))))
;; restore position in text of line, but not before the beginning of the
;; current line
(goto-char (max (line-beginning-position)
(- (line-end-position) original-position-eol)))))
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.\\(plantuml\\|pum\\|plu\\)\\'" . plantuml-mode))
(add-to-list 'auto-mode-alist '("\\.\\(pu\\|uml\\|plantuml\\|pum\\|plu\\)\\'" . plantuml-mode))
;;;###autoload
(define-derived-mode plantuml-mode prog-mode "plantuml"