diff --git a/intl/lwbrk/src/jisx4501class.h b/intl/lwbrk/src/jisx4501class.h
index 9e7441ebebdf..5f6483813c69 100644
--- a/intl/lwbrk/src/jisx4501class.h
+++ b/intl/lwbrk/src/jisx4501class.h
@@ -60,7 +60,7 @@ static const PRUint32 gLBClass00[32] = {
0x77777777, // U+0090 - U+0097
0x77777777, // U+0098 - U+009F
0xAA9A9AAB, // U+00A0 - U+00A7
-0x77A9777A, // U+00A8 - U+00AF
+0x77A9A77A, // U+00A8 - U+00AF
0xAAAAAAAA, // U+00B0 - U+00B7
0xAAAAAAAA, // U+00B8 - U+00BF
0x77777777, // U+00C0 - U+00C7
@@ -77,7 +77,7 @@ static const PRUint32 gLBClass20[32] = {
0xB5555555, // U+2000 - U+2007
0x77775555, // U+2008 - U+200F
0x777277B7, // U+2010 - U+2017
-0x77A777A7, // U+2018 - U+201F
+0x77777777, // U+2018 - U+201F
0xAAAA7777, // U+2020 - U+2027
0xB7777777, // U+2028 - U+202F
0x77744444, // U+2030 - U+2037
diff --git a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
index 14043a0b3fa1..7ef2cadc7b18 100644
--- a/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
+++ b/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
@@ -307,7 +307,7 @@ static const PRUint16 gPair[MAX_CLASSES] = {
18 0000 1111 1101 1111 = 0x0FDF
COMPLEX 0000 1111 1100 0010 = 0x0FC2
[c] 0000 1111 1111 1111 = 0x0FFF
- [d] 0000 1111 1101 1111 = 0x0FDF
+ [d] 0000 1111 1101 1111 = 0x0EDF
[e] 0000 1111 1111 1111 = 0x0FFF
*/
@@ -322,7 +322,7 @@ static const PRUint16 gPairConservative[MAX_CLASSES] = {
0x0FDF,
0x0FC2,
0x0FFF,
- 0x0FDF,
+ 0x0EDF,
0x0FFF
};
@@ -384,19 +384,13 @@ static const PRUint16 gPairConservative[MAX_CLASSES] = {
#define U_AMPERSAND PRUnichar('&')
#define U_SEMICOLON PRUnichar(';')
#define U_BACKSLASH PRUnichar('\\')
-#define U_OPEN_SINGLE_QUOTE PRUnichar(0x2018)
-#define U_OPEN_DOUBLE_QUOTE PRUnichar(0x201C)
-#define U_OPEN_GUILLEMET PRUnichar(0x00AB)
#define NEED_CONTEXTUAL_ANALYSIS(c) (IS_HYPHEN(c) || \
(c) == U_SLASH || \
(c) == U_PERCENT || \
(c) == U_AMPERSAND || \
(c) == U_SEMICOLON || \
- (c) == U_BACKSLASH || \
- (c) == U_OPEN_SINGLE_QUOTE || \
- (c) == U_OPEN_DOUBLE_QUOTE || \
- (c) == U_OPEN_GUILLEMET)
+ (c) == U_BACKSLASH)
#define IS_ASCII_DIGIT(u) (0x0030 <= (u) && (u) <= 0x0039)
@@ -725,14 +719,6 @@ ContextualAnalysis(PRUnichar prev, PRUnichar cur, PRUnichar next,
if (!aState.UseConservativeBreaking(1) &&
aState.HasCharacterAlready(U_EQUAL))
return CLASS_CLOSE;
- } else if (cur == U_OPEN_SINGLE_QUOTE ||
- cur == U_OPEN_DOUBLE_QUOTE ||
- cur == U_OPEN_GUILLEMET) {
- // for CJK usage, we treat these as openers to allow a break before them,
- // but otherwise treat them as normal characters because quote mark usage
- // in various Western languages varies too much; see bug #450088 discussion.
- if (!aState.UseConservativeBreaking() && IS_CJK_CHAR(next))
- return CLASS_OPEN;
} else {
NS_ERROR("Forgot to handle the current character!");
}
diff --git a/intl/lwbrk/tools/anzx4501.html b/intl/lwbrk/tools/anzx4501.html
index 88812d91b787..9e5f900cf43e 100644
--- a/intl/lwbrk/tools/anzx4501.html
+++ b/intl/lwbrk/tools/anzx4501.html
@@ -326,10 +326,10 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
| 157 |
|
33 |
-56 |
+57 |
125 |
3 |
-393 |
+394 |
|
19 |
|
@@ -348,8 +348,8 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
4 |
5 |
2 |
- |
-5 |
+2 |
+4 |
36 |
4 |
|
@@ -443,10 +443,10 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
2 |
|
6 |
-26 |
+25 |
16 |
|
-51 |
+50 |
|
1 |
|
@@ -465,8 +465,8 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
|
|
3 |
-3 |
- |
+1 |
+1 |
20 |
|
2 |
@@ -580,10 +580,10 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
|
33 |
10 |
-127 |
+126 |
|
7 |
-44 |
+45 |
2 |
|
@@ -610,10 +610,10 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
5 |
12 |
|
-102 |
+104 |
|
|
-7 |
+5 |
3 |
|
diff --git a/intl/lwbrk/tools/jisx4501class.txt b/intl/lwbrk/tools/jisx4501class.txt
index f9aab927d52d..ac1e19bee013 100644
--- a/intl/lwbrk/tools/jisx4501class.txt
+++ b/intl/lwbrk/tools/jisx4501class.txt
@@ -24,7 +24,6 @@
00A5;;22
00A9;;18
00AA;;18
-00AB;;18
00AC;;22
00AE;;18
00AF;;18
@@ -50,8 +49,6 @@
2014;;7
2015;;18
2016;2017;18
-2019;;23
-201D;;23
2018;201F;18
2020;2023;18
2024;2026;23
diff --git a/layout/reftests/line-breaking/quotationmarks-cjk-1-ref.html b/layout/reftests/line-breaking/quotationmarks-cjk-1-ref.html
deleted file mode 100644
index b20854168b71..000000000000
--- a/layout/reftests/line-breaking/quotationmarks-cjk-1-ref.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-字
‘字’
字
“字”
字
-字，
‘字，’
字，
“字，”
字
-字．
‘字．’
字．
“字．”
字
-字：
‘字：’
字：
“字：”
字
-字；
‘字；’
字；
“字；”
字
-字！
‘字！’
字！
“字！”
字
-字？
‘字？’
字？
“字？”
字
-字
‘（字）’
字
“（字）”
字
-字
（‘字’）
字
（“字”）
字
-
-
-
diff --git a/layout/reftests/line-breaking/quotationmarks-cjk-1.html b/layout/reftests/line-breaking/quotationmarks-cjk-1.html
deleted file mode 100644
index b033f5ee822d..000000000000
--- a/layout/reftests/line-breaking/quotationmarks-cjk-1.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-字‘字’字“字”字
-字，‘字，’字，“字，”字
-字．‘字．’字．“字．”字
-字：‘字：’字：“字：”字
-字；‘字；’字；“字；”字
-字！‘字！’字！“字！”字
-字？‘字？’字？“字？”字
-字‘（字）’字“（字）”字
-字（‘字’）字（“字”）字
-
-
-
diff --git a/layout/reftests/line-breaking/reftest.list b/layout/reftests/line-breaking/reftest.list
index 459dc109a444..2529ff5e904a 100644
--- a/layout/reftests/line-breaking/reftest.list
+++ b/layout/reftests/line-breaking/reftest.list
@@ -12,7 +12,6 @@
== numerics-1.html numerics-1-ref.html
== parentheses-1.html parentheses-1-ref.html
== quotationmarks-1.html quotationmarks-1-ref.html
-== quotationmarks-cjk-1.html quotationmarks-cjk-1-ref.html
== smileys-1.html smileys-1-ref.html
== smileys-2.html smileys-2-ref.html
== url-1.html url-1-ref.html