aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorEli Zaretskii2011-08-25 13:45:33 +0300
committerEli Zaretskii2011-08-25 13:45:33 +0300
commit0c95fcf739dbfbae70f4e4700fdafedb4497e8df (patch)
treef27c148c083aa9a6d290053b26ac8e45bfdcb07a /doc/lispref
parenta2ebe600c947152c10bf657dfb9dfabdb601c766 (diff)
downloademacs-0c95fcf739dbfbae70f4e4700fdafedb4497e8df.tar.gz
emacs-0c95fcf739dbfbae70f4e4700fdafedb4497e8df.zip
Handle `(space ...)' display spec as paragraph separator.
src/xdisp.c (compute_display_string_pos): Return 2 in DISP_PROP when the display spec is of the form `(space ...)'. (handle_display_spec): Return the value returned by handle_single_display_spec, not just 1 or zero. (handle_single_display_spec): If the display spec is of the form `(space ...)', and specifies display in the text area, return 2 rather than 1. src/dispextern.h (struct bidi_it): Rename the disp_prop_p member into disp_prop; all users changed. src/bidi.c (bidi_fetch_char): If compute_display_string_pos returns DISP_PROP = 2, substitute the u+2029 PARAGRAPH SEPARATOR character for the text covered by the display property. lisp/buff-menu.el (Buffer-menu-buffer+size): Remove calls to bidi-string-mark-left-to-right; they are unnecessary now. doc/lispref/display.texi (Specified Space): Mention that `space' specs influence bidi reordering. (Bidirectional Display): Explain how to use `(space . PROPS)' for separating fields with bidirectional content.
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog7
-rw-r--r--doc/lispref/display.texi17
2 files changed, 22 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4bf615328b1..ca9c93b563d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
12011-08-25 Eli Zaretskii <eliz@gnu.org>
2
3 * display.texi (Specified Space): Mention that `space' specs
4 influence bidi reordering.
5 (Bidirectional Display): Explain how to use `(space . PROPS)' for
6 separating fields with bidirectional content.
7
12011-08-24 Eli Zaretskii <eliz@gnu.org> 82011-08-24 Eli Zaretskii <eliz@gnu.org>
2 9
3 * display.texi (Bidirectional Display): Document return value in 10 * display.texi (Bidirectional Display): Document return value in
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 0593eba8f05..bf7cd126a26 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3794,6 +3794,10 @@ with a @dfn{pixel ascent} specification (@pxref{Pixel Specification}).
3794non-graphic terminals, but the other space properties in this section 3794non-graphic terminals, but the other space properties in this section
3795are not. 3795are not.
3796 3796
3797 Note that space properties are treated as paragraph separators for
3798the purposes of reordering bidirectional text for display.
3799@xref{Bidirectional Display}, for the details.
3800
3797@node Pixel Specification 3801@node Pixel Specification
3798@subsection Pixel Specification for Spaces 3802@subsection Pixel Specification for Spaces
3799@cindex spaces, pixel specification 3803@cindex spaces, pixel specification
@@ -6126,8 +6130,8 @@ with bidirectional content can be displayed @emph{to the left} of the
6126preceding field, producing a jumbled display and messing up the 6130preceding field, producing a jumbled display and messing up the
6127expected layout. 6131expected layout.
6128 6132
6129 To countermand this, you can use one of the following techniques for 6133 To countermand this, we recommend that you use one of the following
6130forcing correct order of fields on display: 6134techniques for forcing correct order of fields on display:
6131 6135
6132@itemize @minus 6136@itemize @minus
6133@item 6137@item
@@ -6146,6 +6150,15 @@ Include the tab character in the field separator. The tab character
6146plays the role of @dfn{segment separator} in the @acronym{UBA} 6150plays the role of @dfn{segment separator} in the @acronym{UBA}
6147reordering, whose effect is to make each field a separate segment, and 6151reordering, whose effect is to make each field a separate segment, and
6148thus reorder them separately. 6152thus reorder them separately.
6153
6154@cindex @code{space} display spec, and bidirectional text
6155@item
6156Separate fields with a @code{display} property or overlay with the
6157property value of the form @code{(space . PROPS)} (@pxref{Specified
6158Space}). This display specification is treated by Emacs as a
6159@dfn{paragraph separator}; the text before and after the separator is
6160reordered separately, which avoids the influence of any field on its
6161neighboring fields.
6149@end itemize 6162@end itemize
6150 6163
6151@defun bidi-string-mark-left-to-right string 6164@defun bidi-string-mark-left-to-right string