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