update of packages
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
This repository contains add-ons to Org.
|
||||
|
||||
You can use them by installing the `org-contrib' NonGNU ELPA package
|
||||
from <https://elpa.nongnu.org/nongnu/>.
|
||||
from [https://elpa.nongnu.org/nongnu/].
|
||||
|
||||
|
||||
1 Please help maintaining these add-ons
|
||||
@@ -25,8 +25,7 @@ from <https://elpa.nongnu.org/nongnu/>.
|
||||
at `bzg@gnu.org' once you set up a separate repository for them.
|
||||
|
||||
|
||||
[the Worg repository]
|
||||
<https://code.orgmode.org/bzg/worg/src/master/code>
|
||||
[the Worg repository] https://code.orgmode.org/bzg/worg/src/master/code
|
||||
|
||||
|
||||
2 License
|
||||
@@ -37,20 +36,29 @@ from <https://elpa.nongnu.org/nongnu/>.
|
||||
later version. See [COPYING].
|
||||
|
||||
|
||||
[COPYING] <file:COPYING>
|
||||
[COPYING] file:COPYING
|
||||
|
||||
|
||||
3 Files to remove from the next release
|
||||
3 Contribute
|
||||
════════════
|
||||
|
||||
You can send patches to `~bzg/dev@lists.sr.ht' and configure your
|
||||
local copy of the repository like this:
|
||||
|
||||
`git config format.subjectPrefix 'PATCH org-contrib''
|
||||
|
||||
|
||||
4 Files to remove from the next release
|
||||
═══════════════════════════════════════
|
||||
|
||||
If a file has a "Homepage:" keyword, it will be removed from the next
|
||||
minor or major release.
|
||||
|
||||
|
||||
4 Other files
|
||||
5 Other files
|
||||
═════════════
|
||||
|
||||
4.1 Org utils
|
||||
5.1 Org utils
|
||||
─────────────
|
||||
|
||||
org-annotate-file.el
|
||||
@@ -113,7 +121,7 @@ from <https://elpa.nongnu.org/nongnu/>.
|
||||
CamelCase wiki-like links for Org
|
||||
|
||||
|
||||
4.2 Org exporters
|
||||
5.2 Org exporters
|
||||
─────────────────
|
||||
|
||||
ox-bibtex.el
|
||||
@@ -134,7 +142,7 @@ from <https://elpa.nongnu.org/nongnu/>.
|
||||
TaskJuggler exporter
|
||||
|
||||
|
||||
4.3 Org link
|
||||
5.3 Org link
|
||||
────────────
|
||||
|
||||
ol-bookmark.el
|
||||
@@ -151,7 +159,7 @@ from <https://elpa.nongnu.org/nongnu/>.
|
||||
Support for links to Wanderlust messages
|
||||
|
||||
|
||||
4.4 Org Babel languages
|
||||
5.4 Org Babel languages
|
||||
───────────────────────
|
||||
|
||||
ob-abc.el
|
||||
|
||||
@@ -26,6 +26,13 @@ All files in this repository are licensed under the GNU General Public
|
||||
License, either version 3 of the License, or (at your option) any
|
||||
later version. See [[file:COPYING][COPYING]].
|
||||
|
||||
** Contribute
|
||||
|
||||
You can send patches to =~bzg/dev@lists.sr.ht= and configure your local
|
||||
copy of the repository like this:
|
||||
|
||||
=git config format.subjectPrefix 'PATCH org-contrib'=
|
||||
|
||||
** Files to remove from the next release
|
||||
|
||||
If a file has a "Homepage:" keyword, it will be removed from the next
|
||||
|
||||
@@ -1,182 +0,0 @@
|
||||
;;; ob-spice.el --- org-babel functions for spice evaluation
|
||||
;;; -*- coding: utf-8 -*-
|
||||
|
||||
;; Author: Tiago Oliveira Weber
|
||||
;; Maintainer: stardiviner <numbchild@gmail.com>
|
||||
;; Homepage: https://git.sr.ht/~bzg/org-contrib
|
||||
;; Version: 0.4
|
||||
;; Package-Requires: ((spice-mode "0.0.1") (org "8"))
|
||||
|
||||
;; License: GPL v3, or any later version
|
||||
;;
|
||||
;; This file is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation; either version 3, or (at your option)
|
||||
;; any later version.
|
||||
;;
|
||||
;; This file is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
;;
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; Org-Babel support for evaluating spice script.
|
||||
;; Inspired by Ian Yang's org-export-blocks-format-plantuml (https://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el)
|
||||
|
||||
;;; Requirements:
|
||||
;;
|
||||
;; - ngspice
|
||||
|
||||
;;; Code:
|
||||
(require 'ob)
|
||||
|
||||
(add-to-list 'org-babel-tangle-lang-exts '("spice" . "cir"))
|
||||
|
||||
(defun ob-spice-concat (wordlist)
|
||||
"Concatenate elements of a `WORDLIST' into a string separated by spaces."
|
||||
;; example of usage
|
||||
;; (ob-spice-concat '("This" "is" "a" "long" "journey"))
|
||||
(setq newtext (car wordlist)) ; first word is without space before
|
||||
(setq wordlist (rest wordlist)) ; exclude the first word from the list
|
||||
(dolist (word wordlist newtext) ; loop through the list and concatenate the values
|
||||
(setq newtext (concat newtext " " word))))
|
||||
|
||||
(defun org-babel-expand-body:spice (body params)
|
||||
"Expand BODY according to PARAMS, return the expanded body."
|
||||
(let* ((vars (mapcar #'cdr (org-babel-get-header params :var))))
|
||||
(setq newbody "");
|
||||
(setq bodylinelist (split-string body "\n"))
|
||||
(dolist (line bodylinelist newbody)
|
||||
(progn ;loop through list of lines
|
||||
(setq wordlist (split-string line " "))
|
||||
(setq firstword 1)
|
||||
(dolist (word wordlist)
|
||||
(progn ;loop through the words
|
||||
(if (string-match "\\$\\(.*\\)\\[\\(.*\\)\\]" word)
|
||||
(progn
|
||||
;; if matches a vector variable format
|
||||
(setq varname (match-string 1 word))
|
||||
(setq varindex (match-string 2 word))
|
||||
;; search varname in vars and use the value of varindex to word
|
||||
(setq newword
|
||||
(nth (string-to-number varindex)
|
||||
(car (assoc-default varname vars
|
||||
(lambda (key candidate)
|
||||
(string= key candidate))))))
|
||||
(if (not (eq newword nil))
|
||||
(if (not (stringp newword))
|
||||
(setq word (number-to-string newword))
|
||||
(setq word newword)))
|
||||
)
|
||||
) ; end of (if (string-match "\\$\\(.*\\)\\[\\(.*\\)\\]" word))
|
||||
(if (string-match "\\$\\(.*\\)\\." word) ; if variable has a dot in the end
|
||||
(progn
|
||||
;; if matches a non-vector variable format
|
||||
(setq varname (match-string 1 word))
|
||||
(setq newword
|
||||
(assoc-default varname vars
|
||||
(lambda (key candidate)
|
||||
(string= key candidate))))
|
||||
(if (not (eq newword nil))
|
||||
(progn
|
||||
(if (not (stringp newword))
|
||||
(setq newword (number-to-string newword)))
|
||||
(setq word (replace-match (concat newword ".") nil nil word))
|
||||
;(setq word word)
|
||||
)
|
||||
))
|
||||
);; end of (if (string-match "\\$\\(.*\\)\\." word)
|
||||
(if (string-match "\\$\\(.*\\)" word)
|
||||
(progn
|
||||
;; if matches a non-vector variable format
|
||||
(setq varname (match-string 1 word))
|
||||
(setq newword
|
||||
(assoc-default varname vars
|
||||
(lambda (key candidate)
|
||||
(string= key candidate))))
|
||||
(if (not (eq newword nil))
|
||||
(if (not (stringp newword))
|
||||
(setq word (number-to-string newword))
|
||||
(setq word newword)
|
||||
))
|
||||
)
|
||||
) ; end of (if (string-match "\\$\\(.*\\)" word)
|
||||
|
||||
|
||||
(setq newbody (concat newbody
|
||||
(if (not (eq firstword 1)) " ")
|
||||
word))
|
||||
(setq firstword 0)
|
||||
) ; end of (progn
|
||||
) ; end of (dolist (word wordlist))
|
||||
|
||||
(setq newbody (concat newbody "\n"))
|
||||
) ; end of (progn ;; loop through list of lines ... )
|
||||
) ; end of (dolist (line bodylinelist) ...function ...)
|
||||
))
|
||||
|
||||
;;;###autoload
|
||||
(defun org-babel-execute:spice (body params)
|
||||
"Execute a block of Spice code `BODY' with org-babel and `PARAMS'."
|
||||
(let ((body (org-babel-expand-body:spice body params))
|
||||
(vars (mapcar #'cdr (org-babel-get-header params :var))))
|
||||
|
||||
;;******************************
|
||||
;; clean temporary files
|
||||
(mapc (lambda (pair)
|
||||
(when (string= (car pair) "file")
|
||||
(setq textfile (concat (cdr pair) ".txt"))
|
||||
(setq imagefile (concat (cdr pair) ".png"))
|
||||
)
|
||||
)
|
||||
vars)
|
||||
;; (if (file-readable-p textfile) (delete-file textfile))
|
||||
;; (if (file-readable-p imagefile) (delete-file imagefile))
|
||||
;;*******************************
|
||||
|
||||
(org-babel-eval "ngspice -b " body)
|
||||
|
||||
;; loop through all pairs (elements) of the list vars and set text and image file if finds "file" var
|
||||
(mapc (lambda (pair)
|
||||
(when (string= (car pair) "file")
|
||||
(setq textfile (concat (cdr pair) ".txt"))
|
||||
(setq imagefile (concat (cdr pair) ".png"))))
|
||||
vars)
|
||||
;; produce results
|
||||
;; THE FOLLOWING WAS COMMENTED TEMPORARILY
|
||||
;; (concat
|
||||
;; (if (file-readable-p textfile)
|
||||
;; (get-string-from-file textfile))
|
||||
;; (if (file-readable-p imagefile)
|
||||
;; (concat '"#+ATTR_HTML: :width 600px \n [[file:./" imagefile "]]")
|
||||
;; )
|
||||
;; )
|
||||
|
||||
;; ;; Get measurement values from text-file by splitting comma separated values
|
||||
(if (file-readable-p textfile)
|
||||
(progn
|
||||
(setq rawtext (get-string-from-file textfile))
|
||||
;;(setq rawtext (replace-regexp-in-string "\n" "" rawtext))
|
||||
(setq rawtext (replace-regexp-in-string "\n" "" rawtext))
|
||||
(setq result (split-string rawtext ","))))
|
||||
(if (file-readable-p imagefile)
|
||||
(progn
|
||||
;; test if result exist already
|
||||
;;(if (boundp 'result)
|
||||
(add-to-list 'result (concat '"[[file:./" imagefile "]]") t) ;; add imagefile to last entry
|
||||
;;(concat '"[[file:./" imagefile "]]")
|
||||
;;)
|
||||
))
|
||||
result
|
||||
;; Produce output like '(test test2)
|
||||
;;'(test test2)
|
||||
|
||||
)
|
||||
)
|
||||
|
||||
(provide 'ob-spice)
|
||||
;;; ob-spice.el ends here
|
||||
@@ -1,2 +1,2 @@
|
||||
;; Generated package description from org-contrib.el -*- no-byte-compile: t -*-
|
||||
(define-package "org-contrib" "0.4.1" "Unmaintained add-ons for Org-mode" '((emacs "25.1") (org "9.4.6")) :commit "d0cebebb301b5de93e9c5228a91e3e4f5d41902b" :authors '(("Bastien Guerry" . "bzg@gnu.org")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :keywords '("org") :url "https://git.sr.ht/~bzg/org-contrib")
|
||||
(define-package "org-contrib" "0.4.2" "Unmaintained add-ons for Org-mode" '((emacs "25.1") (org "9.4.6")) :commit "dce101b4612e6deef814516779ce216e8eace569" :authors '(("Bastien Guerry" . "bzg@gnu.org")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :keywords '("org") :url "https://git.sr.ht/~bzg/org-contrib")
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
;; Author: Bastien Guerry <bzg@gnu.org>
|
||||
;; Homepage: https://git.sr.ht/~bzg/org-contrib
|
||||
;; Package-Requires: ((emacs "25.1") (org "9.4.6"))
|
||||
;; Version: 0.4.1
|
||||
;; Version: 0.4.2
|
||||
;; Keywords: org
|
||||
;; SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
|
||||
@@ -54,6 +54,8 @@
|
||||
:group 'org-eldoc
|
||||
:type 'string)
|
||||
|
||||
(eldoc-add-command 'org-self-insert-command)
|
||||
|
||||
(defun org-eldoc-get-breadcrumb ()
|
||||
"Return breadcrumb if on a headline or nil."
|
||||
(let ((case-fold-search t) cur)
|
||||
|
||||
@@ -302,16 +302,13 @@ update the date."
|
||||
(setq d-hour (format-time-string "%H:%M" d-time))
|
||||
(setq timestr
|
||||
;; two C-u prefixes will call org-read-date
|
||||
(concat "<"
|
||||
(if (equal arg '(16))
|
||||
(org-read-date nil nil nil nil d-time d-hour)
|
||||
(format-time-string
|
||||
(replace-regexp-in-string "\\(^<\\|>$\\)" ""
|
||||
(cdr org-time-stamp-formats))))
|
||||
">"))
|
||||
;; maybe transform to inactive timestamp
|
||||
(if org-expiry-inactive-timestamps
|
||||
(setq timestr (concat "[" (substring timestr 1 -1) "]")))
|
||||
(org-expiry-format-timestamp
|
||||
(if (equal arg '(16))
|
||||
(org-read-date nil nil nil nil d-time d-hour)
|
||||
(format-time-string
|
||||
(replace-regexp-in-string "\\(^<\\|>$\\)" ""
|
||||
(cdr org-time-stamp-formats))))
|
||||
org-expiry-inactive-timestamps))
|
||||
(save-excursion
|
||||
(org-entry-put
|
||||
(point) org-expiry-created-property-name timestr)))))
|
||||
@@ -326,13 +323,13 @@ and insert today's date."
|
||||
(setq d-time (if d (org-time-string-to-time d)
|
||||
(current-time)))
|
||||
(setq d-hour (format-time-string "%H:%M" d-time))
|
||||
(setq timestr (concat "<"
|
||||
(if today
|
||||
(format-time-string
|
||||
(replace-regexp-in-string "\\(^<\\|>$\\)" ""
|
||||
(cdr org-time-stamp-formats)))
|
||||
(org-read-date nil nil nil nil d-time d-hour))
|
||||
">"))
|
||||
(setq timestr (org-expiry-format-timestamp
|
||||
(if today
|
||||
(format-time-string
|
||||
(replace-regexp-in-string "\\(^<\\|>$\\)" ""
|
||||
(cdr org-time-stamp-formats)))
|
||||
(org-read-date nil nil nil nil d-time d-hour))
|
||||
org-expiry-inactive-timestamps))
|
||||
;; maybe transform to inactive timestamp
|
||||
(if org-expiry-inactive-timestamps
|
||||
(setq timestr (concat "[" (substring timestr 1 -1) "]")))
|
||||
|
||||
@@ -108,10 +108,12 @@
|
||||
(org-trim (org-element-property :value fixed-width))))
|
||||
|
||||
(defun org-confluence-verbatim (verbatim contents info)
|
||||
(format "\{\{%s\}\}" (org-element-property :value verbatim)))
|
||||
(let ((content (org-element-property :value verbatim)))
|
||||
(format "\{\{%s\}\}" (string-replace "{" "\\{" content))))
|
||||
|
||||
(defun org-confluence-code (code contents info)
|
||||
(format "\{\{%s\}\}" (org-element-property :value code)))
|
||||
(let ((content (org-element-property :value code)))
|
||||
(format "\{\{%s\}\}" (string-replace "{" "\\{" content))))
|
||||
|
||||
(defun org-confluence-headline (headline contents info)
|
||||
(let* ((low-level-rank (org-export-low-level-p headline info))
|
||||
|
||||
Reference in New Issue
Block a user