Ver código fonte

Change internal list end marker to avoid confusing special blocks

* lisp/org-exp.el (org-export-mark-list-end): change end marker
* lisp/org-docbook.el (org-export-docbook-list-line): use new marker.
* lisp/org-html.el (org-html-export-list-line): use new marker
* lisp/org-latex.el (org-export-latex-lists): use new marker
Nicolas Goaziou 14 anos atrás
pai
commit
83b782c916
4 arquivos alterados com 7 adições e 7 exclusões
  1. 1 1
      lisp/org-docbook.el
  2. 4 4
      lisp/org-exp.el
  3. 1 1
      lisp/org-html.el
  4. 1 1
      lisp/org-latex.el

+ 1 - 1
lisp/org-docbook.el

@@ -1416,7 +1416,7 @@ the alist of previous items."
 	;; Return modified line
 	body))
      ;; At a list ender:  normal text follows: need <para>.
-     ((equal "ORG-LIST-END" line)
+     ((equal "ORG-LIST-END-MARKER" line)
       (org-export-docbook-open-para)
       (throw 'nextline nil))
      ;; Not at an item: return line unchanged (side-effects only).

+ 4 - 4
lisp/org-exp.el

@@ -1705,7 +1705,7 @@ These special cookies will later be interpreted by the backend."
 	     ;; `org-list-struct' pays attention to it when reading a
 	     ;; list.
 	     (insert (org-add-props
-			 "ORG-LIST-END\n"
+			 "ORG-LIST-END-MARKER\n"
 			 (list 'original-indentation top-ind)))))))
      (cons nil org-list-export-context))))
 
@@ -1750,20 +1750,20 @@ These special properties will later be interpreted by the backend."
 	      ;; marked. Now mark every list ending and add properties
 	      ;; useful to line processing exporters.
 	      (goto-char bottom)
-	      (when (or (looking-at "^ORG-LIST-END\n")
+	      (when (or (looking-at "^ORG-LIST-END-MARKER\n")
 			(and (not (eq org-list-ending-method 'indent))
 			     (looking-at org-list-end-re)))
 		(replace-match ""))
 	      (unless (bolp) (insert "\n"))
 	      (insert
-	       (org-add-props "ORG-LIST-END\n" (list 'list-item bottom
+	       (org-add-props "ORG-LIST-END-MARKER\n" (list 'list-item bottom
 						     'list-struct struct
 						     'list-prevs prevs)))
 	      ;; Following property is used by LaTeX exporter.
 	      (add-text-properties top (point) (list 'list-context ctxt)))))))
     ;; Mark lists except for backends not interpreting them.
     (unless (eq backend 'ascii)
-      (let ((org-list-end-re "^ORG-LIST-END\n"))
+      (let ((org-list-end-re "^ORG-LIST-END-MARKER\n"))
 	(mapc
 	 (lambda (e)
 	   (goto-char (point-min))

+ 1 - 1
lisp/org-html.el

@@ -2473,7 +2473,7 @@ the alist of previous items."
 	;; Return modified line
 	body))
      ;; At a list ender: go to next line (side-effects only).
-     ((equal "ORG-LIST-END" line) (throw 'nextline nil))
+     ((equal "ORG-LIST-END-MARKER" line) (throw 'nextline nil))
      ;; Not at an item: return line unchanged (side-effects only).
      (t line))))
 

+ 1 - 1
lisp/org-latex.el

@@ -2465,7 +2465,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
   ;; org-exp.el. Make sure it is taken into account.
   (let ((org-list-ending-method
 	 (if (eq org-list-ending-method 'regexp) 'regexp 'both))
-	(org-list-end-re "^ORG-LIST-END\n"))
+	(org-list-end-re "^ORG-LIST-END-MARKER\n"))
     (mapc
      (lambda (e)
        ;; For each type of context allowed for list export (E), find