blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

UI: Recognize CJK punctuation when selecting text #112852

Merged
Harley Acheson merged 4 commits from ChengduLittleA/blender:chinese_punctuations into blender-v4.0-release 2023-10-04 21:08:21 +02:00
Conversation 3 Commits 4 Files Changed 1 +27 -3
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/blenlib/intern/string_cursor_utf8.c
View File

@ -44,6 +44,10 @@ static eStrCursorDelimType cursor_delim_type_unicode(const uint uch)
switch (uch) {
case ',':
case '.':
case 0x2026: /* Horizontal elipsis. */
case 0x3002: /* CJK full width full stop. */
case 0xFF0C: /* CJK full width comma. */
case 0xFF61: /* CJK half width full stop. */
return STRCUR_DELIM_PUNCT;
case '{':
@ -52,6 +56,10 @@ static eStrCursorDelimType cursor_delim_type_unicode(const uint uch)
case ']':
case '(':
case ')':
case 0x3010: /* CJK full width left black lenticular bracket. */
case 0x3011: /* CJK full width right black lenticular bracket. */
case 0xFF08: /* CJK full width left parenthesis. */
case 0xFF09: /* CJK full width right parenthesis. */
return STRCUR_DELIM_BRACE;
case '+':
@ -66,12 +74,21 @@ static eStrCursorDelimType cursor_delim_type_unicode(const uint uch)
case '*':
case '&':
case '|':
case 0x2014: /* Em dash. */
case 0x300A: /* CJK full width left double angle bracket. */
case 0x300B: /* CJK full width right double angle bracket. */
case 0xFF0F: /* CJK full width solidus (forward slash). */
case 0xFF5E: /* CJK full width tilde. */
return STRCUR_DELIM_OPERATOR;
case '\'':
case '\"':
case '`':
case 0xB4: /* Acute accent. */
case 0xB4: /* Acute accent. */
case 0x2018: /* Left single quotation mark. */
case 0x2019: /* Right single quotation mark. */
case 0x201C: /* Left double quotation mark. */
case 0x201D: /* Right double quotation mark. */
return STRCUR_DELIM_QUOTE;
case ' ':
@ -87,8 +104,15 @@ static eStrCursorDelimType cursor_delim_type_unicode(const uint uch)
case ';':
case '?':
case '!':
Harley marked this conversation as resolved Outdated
Harley Acheson commented 2023-09-25 22:02:48 +02:00
Outdated
Review
Copy Link

You've accidentally duplicated the two lines above

You've accidentally duplicated the two lines above
case 0xA3: /* pound */
case 0x80: /* euro */
case 0xA3: /* Pound sign. */
case 0x80: /* Euro sign. */
case 0x3001: /* CJK ideographic comma. */
case 0xFF01: /* CJK full width exclamation mark. */
case 0xFF64: /* CJK half width ideographic comma. */
case 0xFF65: /* Katakana half width middle dot. */
case 0xFF1A: /* CJK full width colon. */
case 0xFF1B: /* CJK full width semicolon. */
case 0xFF1F: /* CJK full width question mark. */
/* case '_': */ /* special case, for python */
return STRCUR_DELIM_OTHER;