Kaydet (Commit) 3d654071 authored tarafından László Németh's avatar László Németh Kaydeden (comit) Miklos Vajna

fdo#54843 righthyphenmin fix (patch by Steven Dickson)

Change-Id: I42747dffef099f3806178af76e20335f5f033379
Reviewed-on: https://gerrit.libreoffice.org/606Reviewed-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
Tested-by: 's avatarMiklos Vajna <vmiklos@suse.cz>
üst 73c6ec2e
--- misc//hyphen-2.8.4/hyphen.c
+++ misc/build/hyphen-2.8.4/hyphen.c
@@ -734,13 +734,13 @@
int hnj_hyphen_rhmin(int utf8, const char *word, int word_size, char * hyphens,
char *** rep, int ** pos, int ** cut, int rhmin)
{
- int i = 1;
+ int i = 0;
int j;
// ignore numbers
for (j = word_size - 1; j > 0 && word[j] <= '9' && word[j] >= '0'; j--) i--;
- for (j = word_size - 2; i < rhmin && j > 0; j--) {
+ for (j = word_size - 1; i < rhmin && j > 0; j--) {
// check length of the non-standard part
if (*rep && *pos && *cut && (*rep)[j]) {
char * rh = strchr((*rep)[j], '=');
@@ -753,7 +753,7 @@
} else {
hyphens[j] = '0';
}
- if (!utf8 || (word[j] & 0xc0) != 0xc0) i++;
+ if (!utf8 || (word[j] & 0xc0) == 0xc0 || (word[j] & 0x80) != 0x80) i++;
}
return 0;
}
......@@ -45,7 +45,8 @@ PATCH_FILES= \
hyphen-build.patch \
hyphen-android.patch \
hyphen-fdo43931.patch \
hyphen-lenwaswrong.patch
hyphen-lenwaswrong.patch \
hyphen-rhmin.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment