[elpa] master 1a9c542 2/4: [org-translate] New command ogt-term-display-translations
branch: master commit 1a9c542f4c6e8d06b8e69466e99735cb6676fe4b Author: Eric Abrahamsen Commit: Eric Abrahamsen [org-translate] New command ogt-term-display-translations * packages/org-translate/org-translate.el (ogt-term-display-translations): Bound in the translation link keymap, for echoing the original and translation of the term link under point. --- packages/org-translate/org-translate.el | 14 ++ 1 file changed, 14 insertions(+) diff --git a/packages/org-translate/org-translate.el b/packages/org-translate/org-translate.el index 66c9bca..0b908c1 100644 --- a/packages/org-translate/org-translate.el +++ b/packages/org-translate/org-translate.el @@ -293,6 +293,7 @@ fragilely, and deleted and re-set with abandon.") (defvar ogt-link-keymap (let ((map (make-sparse-keymap))) (define-key map (kbd "o") #'ogt-term-occur) +(define-key map (kbd "d") #'ogt-term-display-translations) map) "Keymap active on \"trans:\" type Org links.") @@ -422,6 +423,19 @@ terms." ;; correctly in the sparse tree context. (occur (concat "trans:" id +(defun ogt-term-display-translations () + "Display original and translations for link under point." + (interactive) + (let ((bits (gethash + (org-element-property :path (org-element-context)) + ogt-glossary-table))) +(message + (format + (concat + (mapconcat #'identity (alist-get 'source bits) ", ") + " : " + (mapconcat #'identity (alist-get 'translation bits) ", ")) + (defun ogt-prettify-segmenters (&optional begin end) "Add a display face to all segmentation characters. If BEGIN and END are given, prettify segmenters between those
[elpa] master fd0901b 4/4: [org-translate] Improve segmentation of subtree headings, bump 0.1.2
branch: master commit fd0901b4d48e09fce45d8b3d4180ece1e498e9a9 Author: Eric Abrahamsen Commit: Eric Abrahamsen [org-translate] Improve segmentation of subtree headings, bump 0.1.2 * packages/org-translate/org-translate.el (ogt-segment-project): This was incorrectly inserting segmentation characters before heading stars. --- packages/org-translate/org-translate.el | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/org-translate/org-translate.el b/packages/org-translate/org-translate.el index 588ab77..465b93a 100644 --- a/packages/org-translate/org-translate.el +++ b/packages/org-translate/org-translate.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2020 Free Software Foundation, Inc. -;; Version: 0.1.1 +;; Version: 0.1.2 ;; Package-Requires: ((emacs "25.1") (org "9.1")) ;; Author: Eric Abrahamsen @@ -610,8 +610,9 @@ the beginning of each segment." (end (make-marker)) current) (while (< (point) (point-max)) - (insert ogt-segmentation-character) (setq current (org-element-at-point)) + (unless (eql (org-element-type current) 'headline) + (insert ogt-segmentation-character)) (move-marker end (org-element-property :contents-end current)) ;; TODO: Do segmentation in plain lists and tables. (while (and (< (point) end) @@ -622,7 +623,8 @@ the beginning of each segment." ((eql (org-element-type current) 'headline) (skip-chars-forward "[:blank:]\\*") (insert ogt-segmentation-character) - (org-end-of-meta-data t)) + (org-end-of-meta-data t) + (move-marker end (point))) ((null (eql (org-element-type current) 'paragraph)) (goto-char end))
[elpa] master 4a1935c 1/4: [org-translate] Remove ogt-follow-link
branch: master commit 4a1935c34368ee901d371708a5be5bc993f566c6 Author: Eric Abrahamsen Commit: Eric Abrahamsen [org-translate] Remove ogt-follow-link * packages/org-translate/org-translate.el: Just use `org-id-open' directly. --- packages/org-translate/org-translate.el | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/org-translate/org-translate.el b/packages/org-translate/org-translate.el index f9ecf3c..66c9bca 100644 --- a/packages/org-translate/org-translate.el +++ b/packages/org-translate/org-translate.el @@ -298,13 +298,10 @@ fragilely, and deleted and re-set with abandon.") (org-link-set-parameters "trans" - :follow #'ogt-follow-link + :follow #'org-id-open :keymap ogt-link-keymap :export #'ogt-export-link) -(defun ogt-follow-link (link arg) - (org-id-open link arg)) - (defun ogt-export-link (_path desc _backend) "Export a translation link. By default, just remove it."
[elpa] master 3745d8b 3/4: [org-translate] Do a better job of reporting errors at startup
branch: master commit 3745d8bc09765607e69af1031f3f7690360a303b Author: Eric Abrahamsen Commit: Eric Abrahamsen [org-translate] Do a better job of reporting errors at startup * packages/org-translate/org-translate.el (org-translate-mode): If the mode fails to start because the buffer is not set up correctly, which is highly likely, the user needs to know that. --- packages/org-translate/org-translate.el | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/org-translate/org-translate.el b/packages/org-translate/org-translate.el index 0b908c1..588ab77 100644 --- a/packages/org-translate/org-translate.el +++ b/packages/org-translate/org-translate.el @@ -330,9 +330,10 @@ By default, just remove it." ogt-glossary-heading nil ogt-segmentation-strategy nil ogt-segmentation-character nil - ogt-glossary-table nil) - (move-marker ogt-probable-source-location nil) - (delete-overlay ogt-source-segment-overlay)) + ogt-glossary-table nil + ogt-probable-source-location nil) + (when (overlayp ogt-source-segment-overlay) + (delete-overlay ogt-source-segment-overlay))) (unless (derived-mode-p 'org-mode) (user-error "Only applicable in Org files.")) (let* ((this-project (or ogt-this-project-name @@ -345,7 +346,7 @@ By default, just remove it." ogt-translation-projects) (this-plist (when this-project (alist-get this-project ogt-translation-projects - (condition-case nil + (condition-case err (setq ogt-source-heading (or (plist-get this-plist :source) (ogt-locate-heading ogt-default-source-locator)) @@ -362,7 +363,8 @@ By default, just remove it." ogt-glossary-table (make-hash-table :size 500 :test #'equal) ogt-probable-source-location (make-marker) ogt-source-segment-overlay (make-overlay (point) (point))) - (error (org-translate-mode -1))) + (error (org-translate-mode -1) + (signal (car err) (cdr err (push #'ogt-export-remove-segmenters org-export-filter-body-functions) (overlay-put ogt-source-segment-overlay 'face 'highlight)
[elpa] master updated (590c951 -> fd0901b)
girzel pushed a change to branch master. from 590c951 copyright_exceptions: Update new 4a1935c [org-translate] Remove ogt-follow-link new 1a9c542 [org-translate] New command ogt-term-display-translations new 3745d8b [org-translate] Do a better job of reporting errors at startup new fd0901b [org-translate] Improve segmentation of subtree headings, bump 0.1.2 Summary of changes: packages/org-translate/org-translate.el | 39 +++-- 1 file changed, 27 insertions(+), 12 deletions(-)
