|
Lines 1625-1631
Link Here
|
| 1625 |
set_color(env->col); |
1625 |
set_color(env->col); |
| 1626 |
int code = f->get_code(g); |
1626 |
int code = f->get_code(g); |
| 1627 |
+#ifdef NIPPON |
1627 |
+#ifdef NIPPON |
| 1628 |
+ const char *sf = f->get_subfont_name(g); |
1628 |
+ const char *sf = f->get_subfont_name(g->index); |
| 1629 |
+ if (env->size != cur_point_size || f != cur_font || |
1629 |
+ if (env->size != cur_point_size || f != cur_font || |
| 1630 |
+ (sf != cur_subfont && strcmp(sf, cur_subfont))) { |
1630 |
+ (sf != cur_subfont && strcmp(sf, cur_subfont))) { |
| 1631 |
+#else |
1631 |
+#else |
|
Lines 3001-3007
Link Here
|
| 3001 |
+#ifdef NIPPON |
3001 |
+#ifdef NIPPON |
| 3002 |
+ else if (strcmp(p, "fixedkanji") == 0) { |
3002 |
+ else if (strcmp(p, "fixedkanji") == 0) { |
| 3003 |
+ font_char_metric metric; |
3003 |
+ font_char_metric metric; |
| 3004 |
+ int last_index; |
3004 |
+ glyph *last_glyph = NULL; |
| 3005 |
+ |
3005 |
+ |
| 3006 |
+ had_fixedkanji = 1; |
3006 |
+ had_fixedkanji = 1; |
| 3007 |
+ |
3007 |
+ |
|
Lines 3046-3054
Link Here
|
| 3046 |
+ |
3046 |
+ |
| 3047 |
+ for (encoding->wchar_iter_first(&wc); encoding->wchar_iter_next(&wc);) { |
3047 |
+ for (encoding->wchar_iter_first(&wc); encoding->wchar_iter_next(&wc);) { |
| 3048 |
+ metric.code = wc; |
3048 |
+ metric.code = wc; |
| 3049 |
+ last_index = wchar_index(wc); |
3049 |
+ last_glyph = number_to_glyph(wchar_index(wc)); |
| 3050 |
+ add_entry(last_index, metric); |
3050 |
+ last_glyph->index = wchar_index(wc); |
| 3051 |
+ copy_entry(number_to_index(metric.code), last_index); |
3051 |
+ add_entry(last_glyph, metric); |
| 3052 |
+ } |
3052 |
+ } |
| 3053 |
+ } |
3053 |
+ } |
| 3054 |
+#endif |
3054 |
+#endif |
|
Lines 3219-3225
Link Here
|
| 3219 |
+ int i = 1; |
3219 |
+ int i = 1; |
| 3220 |
+ wchar wc = encoding->make_wchar(s[0], (const unsigned char *)s, &i); |
3220 |
+ wchar wc = encoding->make_wchar(s[0], (const unsigned char *)s, &i); |
| 3221 |
+ if (encoding->is_wchar_code(wc)) { |
3221 |
+ if (encoding->is_wchar_code(wc)) { |
| 3222 |
+ return indexer.wchar_index(wc); |
3222 |
+ return indexer.numbered_char_glyph(indexer.wchar_index(wc)); |
| 3223 |
+ } |
3223 |
+ } |
| 3224 |
+ } |
3224 |
+ } |
| 3225 |
+#endif |
3225 |
+#endif |
|
Lines 4258-4264
Link Here
|
| 4258 |
+#ifdef NIPPON |
4258 |
+#ifdef NIPPON |
| 4259 |
+int font::wchar_index(wchar wc) |
4259 |
+int font::wchar_index(wchar wc) |
| 4260 |
+{ |
4260 |
+{ |
| 4261 |
+ return(wcharset_table_entry(wc)->get_index()); |
4261 |
+ return(wcharset_table_entry(wc)->as_glyph()->index); |
| 4262 |
+} |
4262 |
+} |
| 4263 |
+#endif |
4263 |
+#endif |
| 4264 |
diff -Naur groff-1.20.1.orig/src/roff/troff/node.cpp groff-1.20.1/src/roff/troff/node.cpp |
4264 |
diff -Naur groff-1.20.1.orig/src/roff/troff/node.cpp groff-1.20.1/src/roff/troff/node.cpp |
