author | Drew Fisher <drew.fisher@oracle.com> |
Thu, 29 Sep 2016 07:48:57 -0700 | |
changeset 7089 | bb4d7431eea3 |
parent 1883 | bb9b7c4fd9b7 |
permissions | -rw-r--r-- |
1883
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Fix for disabling Unicode Box Drawing character (CR #18159500). |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
This fix is not integrated into the groff git repository upstream yet, |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
but has been passed upstream. |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- groff-1.22.2/src/devices/grotty/tty.cpp.orig 2014-02-03 05:20:27.696842116 -0800 |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ groff-1.22.2/src/devices/grotty/tty.cpp 2014-02-03 05:26:26.723872248 -0800 |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -275,10 +275,17 @@ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
tty_printer::tty_printer() : cached_v(0) |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
{ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+#if 0 |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+ // Disable Unicode Box Drawing character because width definition |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+ // of this area is ambiguous so some fonts has half width but some |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
+ // fonts has full width. See the following link for more details: |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
+ // http://unicode.org/reports/tr11/ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
if (font::is_unicode) { |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
hline_char = 0x2500; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
vline_char = 0x2502; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
} |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
+#endif |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
schar dummy; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
// black, white |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
(void)tty_color(0, 0, 0, &dummy, 0); |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
@@ -652,6 +659,9 @@ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
} |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
} |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
+#if 0 |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
+// Disable Unicode Box Drawing character |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
+ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
// The possible Unicode combinations for crossing characters. |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
// |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
// ` ' = 0, ` -' = 4, `- ' = 8, `--' = 12, |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
@@ -665,6 +675,7 @@ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
0x2574, 0x2510, 0x2518, 0x2524, |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
0x2500, 0x252C, 0x2534, 0x253C |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
}; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
+#endif |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
void tty_printer::end_page(int page_length) |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
43 |
{ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
44 |
@@ -713,11 +724,15 @@ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
45 |
if (nextp && p->hpos == nextp->hpos) { |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
46 |
if (p->draw_mode() == HDRAW_MODE && |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
47 |
nextp->draw_mode() == VDRAW_MODE) { |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
48 |
+ |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
49 |
+#if 0 |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
50 |
+ // Disable Unicode Box Drawing character |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
51 |
if (font::is_unicode) |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
52 |
nextp->code = |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
53 |
crossings[((p->mode & (START_LINE|END_LINE)) >> 4) |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
54 |
+ ((nextp->mode & (START_LINE|END_LINE)) >> 6)]; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
55 |
else |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
56 |
+#endif |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
57 |
nextp->code = '+'; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
58 |
continue; |
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
59 |
} |