[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/greader 62f81b5e81 22/23: cleanup and restiling.
From: |
ELPA Syncer |
Subject: |
[elpa] externals/greader 62f81b5e81 22/23: cleanup and restiling. |
Date: |
Wed, 26 Oct 2022 05:57:49 -0400 (EDT) |
branch: externals/greader
commit 62f81b5e817e0affae0d46310e63b96d3634e719
Author: Michelangelo Rodriguez <michelangelo.rodriguez@gmail.com>
Commit: Michelangelo Rodriguez <michelangelo.rodriguez@gmail.com>
cleanup and restiling.
---
greader.el | 112 ++++++++++++++++++++++++-------------------------------------
1 file changed, 43 insertions(+), 69 deletions(-)
diff --git a/greader.el b/greader.el
index 831c740b25..e11f5da90a 100644
--- a/greader.el
+++ b/greader.el
@@ -56,7 +56,7 @@
(defvar greader-tired-flag nil)
(defvar greader-filter-enabled nil)
(defvar greader-debug-buffer "spd-output"
-"Contains the buffer name for debugging purposes.")
+ "Contains the buffer name for debugging purposes.")
(defvar greader-backend-action #'greader--default-action)
(defvar greader-status 'paused)
(defvar greader-synth-process nil)
@@ -216,7 +216,7 @@ if set to t, when you call function `greader-read', that
function sets a
(defvar-local greader--reading nil
"If non-nil, `greader-reading-map' is active.")
-;###autoload
+ ;###autoload
(define-minor-mode greader-mode
nil
:lighter " greader"
@@ -226,7 +226,7 @@ if set to t, when you call function `greader-read', that
function sets a
(greader-mode
(add-to-list 'minor-mode-map-alist
`(greader--reading . ,greader-reading-map))
- (greader-load-backends))))
+ (greader-load-backends))))
(defun greader-set-register ()
"Set the `?G' register to the point in current buffer."
@@ -447,30 +447,30 @@ if `GOTO-MARKER' is t and if you pass a prefix to this
(when (called-interactively-p 'any)
(greader-set-register))
-(if (and greader-tired-flag (= greader-elapsed-time 0))
- (progn
- (if greader-tired-timer
- (cancel-timer greader-tired-timer))
- (setq-local greader-last-point (point))))
-
-(cond
- ((and (greader-timer-flag-p) (not (timerp greader-stop-timer)))
- (greader-setup-timers)))
-(let ((chunk (funcall greader-read-chunk-of-text)))
- (if chunk
+ (if (and greader-tired-flag (= greader-elapsed-time 0))
(progn
- ;; This extra verification is necessary because espeak has a bug that,
- ;; when we pass a string containing a vocal plus only 2 .. it reads
- ;; garbage.
- (if (string-suffix-p ".." chunk)
- (setq chunk (concat chunk ".")))
- (greader-set-reading-keymap)
- (setq-local greader-backend-action #'greader-next-action)
- (greader-read-asynchronous chunk))
- (progn
- (setq-local greader-backend-action 'greader--default-action)
- (greader-set-greader-keymap)
- (greader-read-asynchronous ". end")))))
+ (if greader-tired-timer
+ (cancel-timer greader-tired-timer))
+ (setq-local greader-last-point (point))))
+
+ (cond
+ ((and (greader-timer-flag-p) (not (timerp greader-stop-timer)))
+ (greader-setup-timers)))
+ (let ((chunk (funcall greader-read-chunk-of-text)))
+ (if chunk
+ (progn
+ ;; This extra verification is necessary because espeak has a bug that,
+ ;; when we pass a string containing a vocal plus only 2 .. it reads
+ ;; garbage.
+ (if (string-suffix-p ".." chunk)
+ (setq chunk (concat chunk ".")))
+ (greader-set-reading-keymap)
+ (setq-local greader-backend-action #'greader-next-action)
+ (greader-read-asynchronous chunk))
+ (progn
+ (setq-local greader-backend-action 'greader--default-action)
+ (greader-set-greader-keymap)
+ (greader-read-asynchronous ". end")))))
(defun greader-stop ()
"Stops reading of document."
@@ -485,39 +485,13 @@ if `GOTO-MARKER' is t and if you pass a prefix to this
(greader-set-greader-keymap)
(greader-tts-stop))
-(defun greader-next-sentence (&optional direction)
- "Get next sentence to read.
-Optional argument DIRECTION used for determining the direction in
-which search for."
- (if (not direction)
- (setq direction 1))
- (if (< direction 0)
- (progn
- (setq point-limit 'point-min)
- (setq direction '-)
- (setq greader-differs '>))
- (progn
- (setq point-limit 'point-max)
- (setq direction '+)
- (setq greader-differs '<)))
- (catch 'afterloop
- (save-excursion
- (while (funcall greader-differs (point) (funcall point-limit))
- (cond
- ((greader-end-sentence-p)
- (goto-char (funcall direction (point) 1))
- (while (member (string (following-char))
greader-not-start-of-sentence)
- (goto-char (funcall direction 1 (point))))
- (throw 'afterloop (point))))
- (goto-char (funcall direction (point) 1))))
- (funcall point-limit)))
(defun greader-debug (arg)
- "Used to get some fast debugging.
+ "Used to get some fast debugging.
Argument ARG is not used."
- (save-current-buffer
- (get-buffer-create greader-debug-buffer)
- (set-buffer greader-debug-buffer)
- (insert arg)))
+ (save-current-buffer
+ (get-buffer-create greader-debug-buffer)
+ (set-buffer greader-debug-buffer)
+ (insert arg)))
(defun greader-forward-sentence ()
(forward-sentence))
@@ -536,7 +510,6 @@ which search for."
"Get sentence starting from point."
(greader-get-sentence))
-
(defun greader-process-filter (_process string)
"Process filter.
Optional argument STRING contains the string passed to
@@ -871,7 +844,7 @@ In general you should specify an alternative path for
espeak voice
:tag "greader compile extra parameters"
:type '(repeat :tag "extra parameter" string))
-;###autoload
+ ;###autoload
(define-minor-mode greader-compile-mode
"Questo minor-mode globale di greader permette il salvataggio di un
@@ -1009,16 +982,17 @@ If `nil', you can not use `greader-compile-at-point'."
(setq dst (read-string (concat "Redefine " src " to: ") nil
history)))
-(let ((lang-file
- (if (string-prefix-p "/" greader-compile-default-source)
- greader-compile-default-source
- (concat (car greader-compile-dictsource) (substring
greader-espeak-language 0 2) "_" greader-compile-default-source))))
- (with-current-buffer (find-file-noselect lang-file)
- (goto-char (point-max))
- (insert (concat src " " dst "\n"))
- (save-buffer)
- (unless greader-compile-mode
- (greader-compile))))))
+ (let ((lang-file
+ (if (string-prefix-p "/" greader-compile-default-source)
+ greader-compile-default-source
+ (concat (car greader-compile-dictsource) (substring
greader-espeak-language 0 2) "_" greader-compile-default-source))))
+ (with-current-buffer (find-file-noselect lang-file)
+ (goto-char (point-max))
+ (insert (concat src " " dst "\n"))
+ (save-buffer)
+ (unless greader-compile-mode
+ (greader-compile))))))
+
(defun greader-compile-goto-source ()
"Visit default dictsource currently used by
`greader-compile-at-point.'"
- [elpa] externals/greader 54c0a2b6b5 16/23: General cleanup and restiling., (continued)
- [elpa] externals/greader 54c0a2b6b5 16/23: General cleanup and restiling., ELPA Syncer, 2022/10/26
- [elpa] externals/greader 63de204419 14/23: Removed handling of auto-tired-mode in greader-minor-mode definition, ELPA Syncer, 2022/10/26
- [elpa] externals/greader 68c694f9f6 10/23: Changed references from "chung" to "chunk"., ELPA Syncer, 2022/10/26
- [elpa] externals/greader e17dbbf002 09/23: Revert "Aggiunto il diario a .gitignore", ELPA Syncer, 2022/10/26
- [elpa] externals/greader f13b963692 03/23: More work on last commit., ELPA Syncer, 2022/10/26
- [elpa] externals/greader 976d1b11d3 06/23: greader-dehyphenate rewritten., ELPA Syncer, 2022/10/26
- [elpa] externals/greader c926c9d48a 11/23: Changed `actual-backend' definitions to `current-backend'., ELPA Syncer, 2022/10/26
- [elpa] externals/greader 9b95142531 19/23: More restiling and minor fixes on new features., ELPA Syncer, 2022/10/26
- [elpa] externals/greader 9da8bcf54e 18/23: General cleanup and rehorganization., ELPA Syncer, 2022/10/26
- [elpa] externals/greader bb6990c384 13/23: Removed some unused variables, ELPA Syncer, 2022/10/26
- [elpa] externals/greader 62f81b5e81 22/23: cleanup and restiling.,
ELPA Syncer <=
- [elpa] externals/greader 484ef1a836 17/23: New feature added: greader-compile., ELPA Syncer, 2022/10/26
- [elpa] externals/greader fe403c8ea1 05/23: Variable `greader-hyphen-regex' added., ELPA Syncer, 2022/10/26
- [elpa] externals/greader ae6e7524b9 23/23: Merge branch 'experimental', ELPA Syncer, 2022/10/26
- [elpa] externals/greader 1397216a72 08/23: Aggiunto il diario a .gitignore, ELPA Syncer, 2022/10/26
- [elpa] externals/greader 3e35f1ec72 01/23: Echo filtering of espeak process output disabled., ELPA Syncer, 2022/10/26
- [elpa] externals/greader e59b4b1d17 20/23: function greader-end-sentence-p removed, ELPA Syncer, 2022/10/26
- [elpa] externals/greader 80c0de7c66 02/23: function `greader-sentence-needs-dehyphenation' rewritten, ELPA Syncer, 2022/10/26