From: Yuan Fu <casouri@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Lars Ingebrigtsen <larsi@gnus.org>, emacs-devel@gnu.org
Subject: Re: Line wrap reconsidered
Date: Tue, 26 May 2020 18:29:04 -0400 [thread overview]
Message-ID: <9766BA3D-B8F9-456B-9F59-60D21B86E390@gmail.com> (raw)
In-Reply-To: <4895C6EE-5E1F-44BF-93C1-CC5F7C096F73@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
> On May 26, 2020, at 4:31 PM, Yuan Fu <casouri@gmail.com> wrote:
>
>
>
>> On May 26, 2020, at 3:50 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>>
>>> From: Yuan Fu <casouri@gmail.com>
>>> Date: Tue, 26 May 2020 13:34:01 -0400
>>> Cc: larsi@gnus.org,
>>> emacs-devel@gnu.org
>>>
>>> I fixed the problems and it now works. If you apply the patch below and load kinsaku.el, open the test.txt and M-x toggle-word-wrap. You should see the text properly wrapped: wrapping between CJK characters and whitespaces but not between ASCII characters. Also according to kinsoku rules, CJK comma will not be placed at the beginning of a line; CJK “《” will not be place at the end of a line, etc.
>>>
>>> It determines whether we can wrap before/after a character by looking at “<“, “>” and “|” categories, roughly corresponding to “don’t wrap before”, “don’t wrap after” and “wrap before and after”.
>>
>> Thanks.
>>
>> This still doesn't support strings, only buffer text.
>>
>> Also, why are you putting a text property, instead of just examining
>> the category as part of IT_CAN_WRAP? What do you need the property
>> for?
>>
>
> I don’t really know which way is better/more efficient and just took one to implement. Plus text property might allow some user customizations. I can change it to only use category table.
Here is the version that doesn’t use text properties. I assume by string you mean display properties? I checked with display property and it wraps fine in this version.
Yuan
[-- Attachment #2.1: Type: text/html, Size: 4840 bytes --]
[-- Attachment #2.2: new-wrap.patch --]
[-- Type: application/octet-stream, Size: 8388 bytes --]
diff --git a/src/xdisp.c b/src/xdisp.c
index cf15f579b5..105b6b175a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -447,6 +447,7 @@ Copyright (C) 1985-1988, 1993-1995, 1997-2020 Free Software Foundation,
#include "termchar.h"
#include "dispextern.h"
#include "character.h"
+#include "category.h"
#include "buffer.h"
#include "charset.h"
#include "indent.h"
@@ -508,6 +509,37 @@ #define IT_DISPLAYING_WHITESPACE(it) \
&& (*BYTE_POS_ADDR (IT_BYTEPOS (*it)) == ' ' \
|| *BYTE_POS_ADDR (IT_BYTEPOS (*it)) == '\t'))))
+/* These are the category sets we use. */
+#define NOT_AT_EOL 60 /* < */
+#define NOT_AT_BOL 62 /* > */
+#define LINE_BREAKABLE 124 /* | */
+
+/* Return true if the current character allows wrapping before it. */
+static bool char_can_wrap_before (struct it *it)
+{
+ /* We used to only check for whitespace for wrapping, hence this
+ macro. You cannot wrap before a whitespace. */
+ return ((it->what == IT_CHARACTER
+ && !CHAR_HAS_CATEGORY(it->c, NOT_AT_BOL))
+ /* There used to be */
+ && !IT_DISPLAYING_WHITESPACE (it));
+}
+
+/* Return true if the current character allows wrapping after it. */
+static bool char_can_wrap_after (struct it *it)
+{
+ return ((it->what == IT_CHARACTER
+ && CHAR_HAS_CATEGORY (it->c, LINE_BREAKABLE)
+ && !CHAR_HAS_CATEGORY(it->c, NOT_AT_EOL))
+ /* We used to only check for whitespace for wrapping, hence
+ this macro. Obviously you can wrap after a space. */
+ || IT_DISPLAYING_WHITESPACE (it));
+}
+
+#undef NOT_AT_BOL
+#undef NOT_AT_BOL
+#undef LINE_BREAKABLE
+
/* If all the conditions needed to print the fill column indicator are
met, return the (nonnegative) column number, else return a negative
value. */
@@ -9185,13 +9217,13 @@ #define IT_RESET_X_ASCENT_DESCENT(IT) \
{
if (it->line_wrap == WORD_WRAP && it->area == TEXT_AREA)
{
- if (IT_DISPLAYING_WHITESPACE (it))
- may_wrap = true;
- else if (may_wrap)
+ /* Can we wrap here? */
+ if (may_wrap && char_can_wrap_before(it))
{
/* We have reached a glyph that follows one or more
- whitespace characters. If the position is
- already found, we are done. */
+ whitespace characters (or a character that allows
+ wrapping after it). If the position is already
+ found, we are done. */
if (atpos_it.sp >= 0)
{
RESTORE_IT (it, &atpos_it, atpos_data);
@@ -9206,8 +9238,14 @@ #define IT_RESET_X_ASCENT_DESCENT(IT) \
}
/* Otherwise, we can wrap here. */
SAVE_IT (wrap_it, *it, wrap_data);
- may_wrap = false;
}
+ /* This has to run after the previous block. */
+ if (char_can_wrap_after (it))
+ /* may_wrap basically means "previous char allows
+ wrapping after it". */
+ may_wrap = true;
+ else
+ may_wrap = false;
}
}
@@ -9335,10 +9373,10 @@ #define IT_RESET_X_ASCENT_DESCENT(IT) \
{
bool can_wrap = true;
- /* If we are at a whitespace character
- that barely fits on this screen line,
- but the next character is also
- whitespace, we cannot wrap here. */
+ /* If the previous character says we can
+ wrap after it, but the current
+ character says we can't wrap before
+ it, then we can't wrap here. */
if (it->line_wrap == WORD_WRAP
&& wrap_it.sp >= 0
&& may_wrap
@@ -9350,7 +9388,7 @@ #define IT_RESET_X_ASCENT_DESCENT(IT) \
SAVE_IT (tem_it, *it, tem_data);
set_iterator_to_next (it, true);
if (get_next_display_element (it)
- && IT_DISPLAYING_WHITESPACE (it))
+ && !char_can_wrap_before(it))
can_wrap = false;
RESTORE_IT (it, &tem_it, tem_data);
}
@@ -9429,19 +9467,18 @@ #define IT_RESET_X_ASCENT_DESCENT(IT) \
else
IT_RESET_X_ASCENT_DESCENT (it);
- /* If the screen line ends with whitespace, and we
- are under word-wrap, don't use wrap_it: it is no
- longer relevant, but we won't have an opportunity
- to update it, since we are done with this screen
- line. */
+ /* If the screen line ends with whitespace (or
+ wrap-able character), and we are under word-wrap,
+ don't use wrap_it: it is no longer relevant, but
+ we won't have an opportunity to update it, since
+ we are done with this screen line. */
if (may_wrap && IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)
/* If the character after the one which set the
- may_wrap flag is also whitespace, we can't
- wrap here, since the screen line cannot be
- wrapped in the middle of whitespace.
- Therefore, wrap_it _is_ relevant in that
- case. */
- && !(moved_forward && IT_DISPLAYING_WHITESPACE (it)))
+ may_wrap flag says we can't wrap before it,
+ we can't wrap here. Therefore, wrap_it
+ (previously found wrap-point) _is_ relevant
+ in that case. */
+ && !(moved_forward && char_can_wrap_before(it)))
{
/* If we've found TO_X, go back there, as we now
know the last word fits on this screen line. */
@@ -23292,9 +23329,8 @@ #define RECORD_MAX_MIN_POS(IT) \
if (it->line_wrap == WORD_WRAP && it->area == TEXT_AREA)
{
- if (IT_DISPLAYING_WHITESPACE (it))
- may_wrap = true;
- else if (may_wrap)
+ /* Can we wrap here? */
+ if (may_wrap && char_can_wrap_before(it))
{
SAVE_IT (wrap_it, *it, wrap_data);
wrap_x = x;
@@ -23308,9 +23344,13 @@ #define RECORD_MAX_MIN_POS(IT) \
wrap_row_min_bpos = min_bpos;
wrap_row_max_pos = max_pos;
wrap_row_max_bpos = max_bpos;
- may_wrap = false;
}
- }
+ /* This has to run after the previous block. */
+ if (char_can_wrap_after (it))
+ may_wrap = true;
+ else
+ may_wrap = false;
+ }
}
PRODUCE_GLYPHS (it);
@@ -23433,14 +23473,18 @@ #define RECORD_MAX_MIN_POS(IT) \
/* If line-wrap is on, check if a previous
wrap point was found. */
if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)
- && wrap_row_used > 0
+ && wrap_row_used > 0 /* Found. */
/* Even if there is a previous wrap
point, continue the line here as
usual, if (i) the previous character
- was a space or tab AND (ii) the
- current character is not. */
- && (!may_wrap
- || IT_DISPLAYING_WHITESPACE (it)))
+ allows wrapping after it, AND (ii)
+ the current character allows wrapping
+ before it. Because this is a valid
+ break point, we can just continue to
+ the next line at here, there is no
+ need to wrap early at the previous
+ wrap point. */
+ && (!may_wrap || !char_can_wrap_before(it)))
goto back_to_wrap;
/* Record the maximum and minimum buffer
@@ -23468,13 +23512,16 @@ #define RECORD_MAX_MIN_POS(IT) \
/* If line-wrap is on, check if a
previous wrap point was found. */
else if (wrap_row_used > 0
- /* Even if there is a previous wrap
- point, continue the line here as
- usual, if (i) the previous character
- was a space or tab AND (ii) the
- current character is not. */
- && (!may_wrap
- || IT_DISPLAYING_WHITESPACE (it)))
+ /* Even if there is a previous
+ wrap point, continue the
+ line here as usual, if (i)
+ the previous character was a
+ space or tab AND (ii) the
+ current character is not,
+ AND (iii) the current
+ character allows wrapping
+ before it. */
+ && (!may_wrap || !char_can_wrap_before(it)))
goto back_to_wrap;
}
@@ -34349,6 +34396,10 @@ syms_of_xdisp (void)
DEFSYM (QCfile, ":file");
DEFSYM (Qfontified, "fontified");
DEFSYM (Qfontification_functions, "fontification-functions");
+ DEFSYM (Qword_wrap, "word-wrap");
+ DEFSYM (Qonly_before, "only-before");
+ DEFSYM (Qonly_after, "only-after");
+ DEFSYM (Qno_wrap, "no-wrap");
/* Name of the symbol which disables Lisp evaluation in 'display'
properties. This is used by enriched.el. */
[-- Attachment #2.3: Type: text/html, Size: 259 bytes --]
next prev parent reply other threads:[~2020-05-26 22:29 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 18:13 Line wrap reconsidered Yuan Fu
2020-05-25 19:23 ` Eli Zaretskii
2020-05-25 19:31 ` Yuan Fu
2020-05-26 1:55 ` Ihor Radchenko
2020-05-26 12:55 ` Joost Kremers
2020-05-26 13:35 ` Yuan Fu
2020-05-26 14:47 ` Eli Zaretskii
2020-05-26 15:01 ` Ihor Radchenko
2020-05-26 15:29 ` Eli Zaretskii
2020-05-26 15:46 ` Ihor Radchenko
2020-05-26 16:29 ` Eli Zaretskii
2020-05-26 15:59 ` Stefan Monnier
2020-05-26 16:31 ` Eli Zaretskii
2020-05-26 16:43 ` Yuan Fu
2020-05-26 16:43 ` Ihor Radchenko
2020-05-26 18:57 ` Eli Zaretskii
2020-05-26 19:10 ` Yuan Fu
2020-05-26 19:59 ` Eli Zaretskii
2020-05-26 19:12 ` Ihor Radchenko
2020-05-26 20:04 ` Eli Zaretskii
2020-05-26 21:01 ` Stefan Monnier
2020-05-25 19:31 ` Stefan Monnier
2020-05-25 19:51 ` Yuan Fu
2020-05-25 20:43 ` Lars Ingebrigtsen
2020-05-25 23:26 ` Yuan Fu
2020-05-25 23:32 ` Yuan Fu
2020-05-26 2:15 ` Yuan Fu
2020-05-26 3:30 ` Yuan Fu
2020-05-26 4:46 ` Yuan Fu
2020-05-26 15:14 ` Eli Zaretskii
2020-05-26 15:00 ` Eli Zaretskii
2020-05-26 14:54 ` Eli Zaretskii
2020-05-26 17:34 ` Yuan Fu
2020-05-26 19:50 ` Eli Zaretskii
2020-05-26 20:31 ` Yuan Fu
2020-05-26 22:29 ` Yuan Fu [this message]
2020-05-27 17:29 ` Eli Zaretskii
2020-05-28 17:31 ` Yuan Fu
2020-05-28 18:05 ` Eli Zaretskii
2020-05-28 19:34 ` Yuan Fu
2020-05-28 20:42 ` Yuan Fu
2020-05-29 7:17 ` Eli Zaretskii
2020-05-29 6:56 ` Eli Zaretskii
2020-05-29 21:20 ` Yuan Fu
2020-05-30 6:14 ` Eli Zaretskii
2020-05-31 17:39 ` Yuan Fu
2020-05-31 17:55 ` Eli Zaretskii
2020-05-31 18:23 ` Yuan Fu
2020-05-31 18:47 ` Eli Zaretskii
2020-06-18 21:46 ` Yuan Fu
2020-06-19 6:17 ` Eli Zaretskii
2020-06-19 12:04 ` Yuan Fu
2020-06-19 12:38 ` Eli Zaretskii
2020-06-19 17:22 ` Yuan Fu
2020-06-19 17:47 ` Eli Zaretskii
2020-06-19 18:03 ` Yuan Fu
2020-06-19 18:34 ` Eli Zaretskii
2020-07-12 17:25 ` Yuan Fu
2020-07-12 18:27 ` Eli Zaretskii
2020-07-12 19:28 ` Yuan Fu
2020-07-13 19:46 ` Yuan Fu
2020-07-18 8:15 ` Eli Zaretskii
2020-07-18 17:14 ` Yuan Fu
2020-07-18 19:49 ` Yuan Fu
2020-07-18 20:25 ` Stefan Monnier
2020-07-19 14:52 ` Eli Zaretskii
2020-07-19 16:16 ` Yuan Fu
2020-07-19 16:17 ` Yuan Fu
2020-08-13 19:35 ` Yuan Fu
2020-08-14 5:55 ` Eli Zaretskii
2020-08-14 15:08 ` Yuan Fu
2020-08-15 9:10 ` Eli Zaretskii
2020-08-15 13:10 ` Fu Yuan
2020-08-15 14:56 ` Eli Zaretskii
2020-08-15 17:34 ` Yuan Fu
2020-08-15 17:46 ` Eli Zaretskii
2020-08-15 18:00 ` Yuan Fu
2020-08-15 18:47 ` Eli Zaretskii
2020-08-16 3:22 ` Yuan Fu
2020-08-16 14:15 ` Eli Zaretskii
2020-08-16 17:31 ` Yuan Fu
2020-08-22 7:42 ` Eli Zaretskii
2020-08-22 20:58 ` Yuan Fu
2020-08-23 7:12 ` Eli Zaretskii
2020-08-24 14:00 ` Yuan Fu
2020-05-27 15:20 ` Eli Zaretskii
2020-05-26 8:02 ` martin rudalics
2020-05-26 12:38 ` Yuan Fu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9766BA3D-B8F9-456B-9F59-60D21B86E390@gmail.com \
--to=casouri@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).