Permalink
Browse files

Introduce the muse-no-paragraph property.

* lisp/muse-docbook.el (muse-docbook-markup-paragraph):

* lisp/muse-html.el (muse-html-markup-paragraph):

* lisp/muse-xml.el (muse-xml-markup-paragraph): Honor the
  muse-no-paragraph property.
  • Loading branch information...
1 parent 7d3a987 commit 3e3210676bfc3d29d8df074005ca205fbad98669 @mwolson mwolson committed Nov 23, 2008
Showing with 18 additions and 3 deletions.
  1. +6 −1 lisp/muse-docbook.el
  2. +6 −1 lisp/muse-html.el
  3. +6 −1 lisp/muse-xml.el
@@ -217,7 +217,9 @@ found in `muse-docbook-encoding-map'."
(goto-char (match-beginning 0))
(when (save-excursion
(save-match-data
- (and (re-search-backward
+ (and (not (get-text-property (max (point-min) (1- (point)))
+ 'muse-no-paragraph))
+ (re-search-backward
"<\\(/?\\)\\(para\\|footnote\\|literallayout\\)[ >]"
nil t)
(cond ((string= (match-string 2) "literallayout")
@@ -241,6 +243,9 @@ found in `muse-docbook-encoding-map'."
((eobp)
(unless (bolp)
(insert "\n")))
+ ((get-text-property (point) 'muse-no-paragraph)
+ (forward-char 1)
+ nil)
((eq (char-after) ?\<)
(when (looking-at (concat "<\\(emphasis\\|systemitem\\|inlinemediaobject"
"\\|u?link\\|anchor\\|email\\)[ >]"))
View
@@ -457,7 +457,9 @@ mode instead."
(goto-char (match-beginning 0))
(when (save-excursion
(save-match-data
- (and (re-search-backward "<\\(/?\\)p[ >]" nil t)
+ (and (not (get-text-property (max (point-min) (1- (point)))
+ 'muse-no-paragraph))
+ (re-search-backward "<\\(/?\\)p[ >]" nil t)
(not (string-equal (match-string 1) "/")))))
(when (get-text-property (1- (point)) 'muse-end-list)
(goto-char (previous-single-property-change (1- (point))
@@ -468,6 +470,9 @@ mode instead."
((eobp)
(unless (bolp)
(insert "\n")))
+ ((get-text-property (point) 'muse-no-paragraph)
+ (forward-char 1)
+ nil)
((eq (char-after) ?\<)
(cond
((looking-at "<\\(em\\|strong\\|code\\|span\\)[ >]")
View
@@ -226,7 +226,9 @@ found in `muse-xml-encoding-map'."
(goto-char (match-beginning 0))
(when (save-excursion
(save-match-data
- (and (re-search-backward "<\\(/?\\)p[ >]" nil t)
+ (and (not (get-text-property (max (point-min) (1- (point)))
+ 'muse-no-paragraph))
+ (re-search-backward "<\\(/?\\)p[ >]" nil t)
(not (string-equal (match-string 1) "/")))))
(when (get-text-property (1- (point)) 'muse-end-list)
(goto-char (previous-single-property-change (1- (point))
@@ -237,6 +239,9 @@ found in `muse-xml-encoding-map'."
((eobp)
(unless (bolp)
(insert "\n")))
+ ((get-text-property (point) 'muse-no-paragraph)
+ (forward-char 1)
+ nil)
((eq (char-after) ?\<)
(when (looking-at (concat "<\\(format\\|code\\|link\\|image"
"\\|anchor\\|footnote\\)[ >]"))

0 comments on commit 3e32106

Please sign in to comment.