>From 2eea43d84687259633f847bd17883e5fe578b6bc Mon Sep 17 00:00:00 2001 From: Jens Lechtenboerger Date: Sun, 1 Dec 2019 21:17:43 +0100 Subject: [PATCH] Use bullet as non-standard counter * lisp/org-list.el: New variable org-list-use-first-bullet-as-non-standard-counter and new function org-list-struct-maybe-add-counters to assign counters from bullets that indicate non-standard start values. (org-list-struct): Use new variable and function. * lisp/org-element.el (org-element-item-parser): Use new variable and mirror behavior of org-list.el. --- lisp/org-element.el | 19 ++++++++++++++++++- lisp/org-list.el | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index 56b3cc413..80b7cab99 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -1269,6 +1269,8 @@ Assume point is at the beginning of the item." (beginning-of-line) (looking-at org-list-full-item-re) (let* ((begin (point)) + (prevs (org-list-prevs-alist struct)) + (prev-item (org-list-get-prev-item begin struct prevs)) (bullet (match-string-no-properties 1)) (checkbox (let ((box (match-string 3))) (cond ((equal "[ ]" box) 'off) @@ -1277,7 +1279,22 @@ Assume point is at the beginning of the item." (counter (let ((c (match-string 2))) (save-match-data (cond - ((not c) nil) + ((not c) + (and + org-list-use-first-bullet-as-non-standard-counter + ;; As in org-list-struct-maybe-add-counters, + ;; assign non-standard counter from bullet of + ;; first list item. To exclude "A", check range + ;; from "B". + (not prev-item) + (or (and (string-match "[B-Zb-z]" bullet) + (- (string-to-char + (upcase (match-string 0 bullet))) + 64)) + (and (string-match "[0-9]+" bullet) + (string< "1" (match-string 0 bullet)) + (string-to-number + (match-string 0 bullet)))))) ((string-match "[A-Za-z]" c) (- (string-to-char (upcase (match-string 0 c))) 64)) diff --git a/lisp/org-list.el b/lisp/org-list.el index c4aef32fc..fe8742f42 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -336,6 +336,14 @@ clearly distinguish sub-items in a list." :version "24.1" :type 'integer) +(defcustom org-list-use-first-bullet-as-non-standard-counter nil + "Non-nil means to use first bullet of an ordered list as counter. +Then, you can start an ordered list with \"42. Answer\" instead of +\"42. [@42] Answer\"." + :group 'org-plain-lists + :package-version '(Org . "9.3") + :type 'boolean) + (defvar org-list-forbidden-blocks '("example" "verse" "src" "export") "Names of blocks where lists are not allowed. Names must be in lower case.") @@ -731,7 +739,30 @@ Assume point is at an item." ;; 3. Associate each item to its end position. (org-list-struct-assoc-end struct end-lst) ;; 4. Return STRUCT - struct))) + (if org-list-use-first-bullet-as-non-standard-counter + (org-list-struct-maybe-add-counters struct) + struct)))) + +(defun org-list-struct-maybe-add-counters (struct) + "Maybe add counters to first list items of STRUCT. +For the first list items in STRUCT (those without previous item) that +1. do not specify a counter, +2. has an alphanumeric bullet, and +3. do not have a default start value (1, a, A), +set the counter to the item's bullet." + (let ((prevs (org-list-prevs-alist struct))) + (dolist (item struct) + (let ((prev-item (org-list-get-prev-item (nth 0 item) struct prevs))) + (unless prev-item + (let ((key (nth 0 item)) + (fbullet (nth 2 item)) + (fcounter (nth 3 item))) + (when (and (not fcounter) + (string-match "[[:alnum:]]" fbullet)) + (let ((cand (match-string 0 fbullet))) + (unless (member cand '("1" "a" "A")) + (org-list-set-nth 3 key struct cand)))))))) + struct)) (defun org-list-struct-assoc-end (struct end-list) "Associate proper ending point to items in STRUCT. -- 2.17.1