summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--groups.txt1
-rw-r--r--init.el28
-rw-r--r--lisp/acdw-modeline.el20
-rw-r--r--lisp/acdw-org.el142
4 files changed, 93 insertions, 98 deletions
diff --git a/groups.txt b/groups.txt index 08c604c..1fda266 100644 --- a/groups.txt +++ b/groups.txt
@@ -23,6 +23,7 @@ nntp+news.gwene.org:gwene.com.realbakingwith.month
23nntp+news.gwene.org:gwene.com.usesthis 23nntp+news.gwene.org:gwene.com.usesthis
24nntp+news.gwene.org:gwene.com.wflewis 24nntp+news.gwene.org:gwene.com.wflewis
25nntp+news.gwene.org:gwene.com.whyarentyoucod 25nntp+news.gwene.org:gwene.com.whyarentyoucod
26nntp+news.gwene.org:gwene.com.wordpress.filledwithcrea
26nntp+news.gwene.org:gwene.com.xkcd 27nntp+news.gwene.org:gwene.com.xkcd
27nntp+news.gwene.org:gwene.dance.hamster.blog 28nntp+news.gwene.org:gwene.dance.hamster.blog
28nntp+news.gwene.org:gwene.de.uninformativ.blog.feeds.en 29nntp+news.gwene.org:gwene.de.uninformativ.blog.feeds.en
diff --git a/init.el b/init.el index 17fac5b..867f5a0 100644 --- a/init.el +++ b/init.el
@@ -996,19 +996,21 @@ if ripgrep is installed, otherwise `consult-grep'."
996 996
997(setup (:straight simple-modeline) 997(setup (:straight simple-modeline)
998 (setup (:straight minions)) 998 (setup (:straight minions))
999 (:option simple-modeline-segments 999 (:option
1000 '((acdw-modeline/modified 1000 ;; `acdw-org/count-words' is too slow to use in the modeline.
1001 acdw-modeline/buffer-name 1001 ;; (prepend acdw-modeline/word-count-modes) '(org-mode . acdw-org/count-words)
1002 acdw-modeline/vc-branch 1002 simple-modeline-segments '((acdw-modeline/modified
1003 simple-modeline-segment-position 1003 acdw-modeline/buffer-name
1004 simple-modeline-segment-word-count) 1004 acdw-modeline/vc-branch
1005 (simple-modeline-segment-misc-info 1005 simple-modeline-segment-position)
1006 acdw-modeline/winum 1006 (simple-modeline-segment-misc-info
1007 acdw-modeline/text-scale 1007 acdw-modeline/word-count
1008 simple-modeline-segment-process 1008 acdw-modeline/winum
1009 acdw-modeline/god-mode-indicator 1009 acdw-modeline/text-scale
1010 acdw-modeline/minions 1010 simple-modeline-segment-process
1011 simple-modeline-segment-major-mode))) 1011 acdw-modeline/god-mode-indicator
1012 acdw-modeline/minions
1013 simple-modeline-segment-major-mode)))
1012 1014
1013 (require 'acdw-modeline) 1015 (require 'acdw-modeline)
1014 (simple-modeline-mode +1)) 1016 (simple-modeline-mode +1))
diff --git a/lisp/acdw-modeline.el b/lisp/acdw-modeline.el index 81b808d..4f78816 100644 --- a/lisp/acdw-modeline.el +++ b/lisp/acdw-modeline.el
@@ -93,4 +93,24 @@ indicator in the mode-line."
93 (> winum--window-count 1)) 93 (> winum--window-count 1))
94 (format winum-format (winum-get-number-string)))) 94 (format winum-format (winum-get-number-string))))
95 95
96(defcustom acdw-modeline/word-count-modes
97 (mapcar (lambda (m) (cons m nil)) simple-modeline-word-count-modes)
98 "Alist of modes to functions that `acdw-modeline/word-count' should dispatch.
99If the cdr of the cons cell is nil, use the default function (`count-words').
100Otherwise, cdr should be a function that takes two points (see `count-words')."
101 :type '(alist :key-type (symbol :tag "Major-Mode")
102 :value-type function)
103 :group 'simple-modeline)
104
105(defun acdw-modeline/word-count ()
106 "Display a buffer word count, depending on the major mode.
107Uses `acdw-modeline/word-count-modes' to determine which function to use."
108 (when-let ((modefun
109 (assoc major-mode acdw-modeline/word-count-modes #'equal)))
110 (let ((fn (or (cdr modefun)
111 #'count-words))
112 (min (if (region-active-p) (region-beginning) (point-min)))
113 (max (if (region-active-p) (region-end) (point-max))))
114 (format "%dW" (funcall fn min max)))))
115
96(provide 'acdw-modeline) 116(provide 'acdw-modeline)
diff --git a/lisp/acdw-org.el b/lisp/acdw-org.el index 3f0c4ea..7e68712 100644 --- a/lisp/acdw-org.el +++ b/lisp/acdw-org.el
@@ -243,91 +243,63 @@ the deletion might narrow the column."
243 (org-table-copy-down n) 243 (org-table-copy-down n)
244 (acdw-org/return-dwim n))) 244 (acdw-org/return-dwim n)))
245 245
246(defun acdw-org/word-count (beg end 246(defun acdw-org/count-words (start end)
247 &optional count-latex-macro-args? 247 "Count words between START and END, respecting `org-mode' conventions."
248 count-footnotes?) 248 (interactive (list nil nil))
249 "Report the number of words in the Org mode buffer or selected region. 249 (cond ((not (called-interactively-p 'any))
250Ignores: 250 (let ((words 0))
251- comments 251 (save-excursion
252- tables 252 (save-restriction
253- source code blocks (#+BEGIN_SRC ... #+END_SRC, and inline blocks) 253 (narrow-to-region start end)
254- hyperlinks (but does count words in hyperlink descriptions) 254 (goto-char (point-min))
255- tags, priorities, and TODO keywords in headers 255 (while (< (point) (point-max))
256- sections tagged as 'not for export'. 256 (cond
257 ;; Ignore comments
258 ((or (org-at-comment-p)
259 (org-in-commented-heading-p)) nil)
260 ;; Ignore tables
261 ((org-at-table-p) nil)
262 ;; Ignore hyperlinks, but count the descriptions
263 ((looking-at org-bracket-link-analytic-regexp)
264 (when-let ((desc (match-string-no-properties 5)))
265 (save-match-data
266 (setq words (+ words
267 (length (remove ""
268 (org-split-string
269 desc "\\W")))))))
270 (goto-char (match-end 0)))
271 ;; Ignore source code blocks
272 ((org-in-src-block-p) nil)
273 ;; Ignore footnotes
274 ((or (org-footnote-at-definition-p)
275 (org-footnote-at-reference-p))
276 nil)
277 ;; else... check the context
278 (t (let ((contexts (org-context)))
279 (cond
280 ;; Ignore tags, TODO keywords, etc.
281 ((or (assoc :todo-keyword contexts)
282 (assoc :priority contexts)
283 (assoc :keyword contexts)
284 (assoc :checkbox contexts))
285 nil)
286 ;; Ignore sections tagged :no-export
287 ((assoc :tags contexts)
288 (if (intersection (org-get-tags-at)
289 org-export-exclude-tags
290 :test 'equal)
291 (org-forward-same-level 1)
292 nil))
293 ;; else... count the word
294 (t (setq words (1+ words)))))))
295 (re-search-forward "\\w+\\W*")))
296 words)))
297 ((use-region-p)
298 (message "%d words in region"
299 (acdw-org/count-words (region-beginning) (region-end))))
300 (t
301 (message "%d words in buffer"
302 (acdw-org/count-words (point-min) (point-max))))))
257 303
258The text of footnote definitions is ignored, unless the optional argument
259COUNT-FOOTNOTES? is non-nil.
260
261If the optional argument COUNT-LATEX-MACRO-ARGS? is non-nil, the word count
262includes LaTeX macro arguments (the material between {curly braces}).
263Otherwise, and by default, every LaTeX macro counts as 1 word regardless
264of its arguments."
265 (interactive "r")
266 (unless mark-active
267 (setf beg (point-min)
268 end (point-max)))
269 (let ((wc 0)
270 (latex-macro-regexp "\\\\[A-Za-z]+\\(\\[[^]]*\\]\\|\\){\\([^}]*\\)}"))
271 (save-excursion
272 (goto-char beg)
273 (while (< (point) end)
274 (cond
275 ;; Ignore comments.
276 ((or (org-in-commented-line) (org-at-table-p))
277 nil)
278 ;; Ignore hyperlinks. But if link has a description, count
279 ;; the words within the description.
280 ((looking-at org-bracket-link-analytic-regexp)
281 (when (match-string-no-properties 5)
282 (let ((desc (match-string-no-properties 5)))
283 (save-match-data
284 (incf wc (length (remove "" (org-split-string
285 desc "\\W")))))))
286 (goto-char (match-end 0)))
287 ((looking-at org-any-link-re)
288 (goto-char (match-end 0)))
289 ;; Ignore source code blocks.
290 ((org-in-regexps-block-p "^#\\+BEGIN_SRC\\W" "^#\\+END_SRC\\W")
291 nil)
292 ;; Ignore inline source blocks, counting them as 1 word.
293 ((save-excursion
294 (backward-char)
295 (looking-at org-babel-inline-src-block-regexp))
296 (goto-char (match-end 0))
297 (setf wc (+ 2 wc)))
298 ;; Count latex macros as 1 word, ignoring their arguments.
299 ((save-excursion
300 (backward-char)
301 (looking-at latex-macro-regexp))
302 (goto-char (if count-latex-macro-args?
303 (match-beginning 2)
304 (match-end 0)))
305 (setf wc (+ 2 wc)))
306 ;; Ignore footnotes.
307 ((and (not count-footnotes?)
308 (or (org-footnote-at-definition-p)
309 (org-footnote-at-reference-p)))
310 nil)
311 (t
312 (let ((contexts (org-context)))
313 (cond
314 ;; Ignore tags and TODO keywords, etc.
315 ((or (assoc :todo-keyword contexts)
316 (assoc :priority contexts)
317 (assoc :keyword contexts)
318 (assoc :checkbox contexts))
319 nil)
320 ;; Ignore sections marked with tags that are
321 ;; excluded from export.
322 ((assoc :tags contexts)
323 (if (intersection (org-get-tags-at) org-export-exclude-tags
324 :test 'equal)
325 (org-forward-same-level 1)
326 nil))
327 (t
328 (incf wc))))))
329 (re-search-forward "\\w+\\W*")))
330 (message (format "%d words in %s." wc
331 (if mark-active "region" "buffer")))))
332 304
333(provide 'acdw-org) 305(provide 'acdw-org)