-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathmc-3531-nroff-bold-underlined.patch
639 lines (591 loc) · 25.6 KB
/
mc-3531-nroff-bold-underlined.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
commit 3e3c0f259cc515ba99a4a9551caae8fab0749121
Author: Egmont Koblinger <egmont@gmail.com>
Date: Thu Oct 1 23:50:13 2015 +0200
3531
diff --git a/lib/skin.h b/lib/skin.h
index 8d32180..6c0ad33 100644
--- a/lib/skin.h
+++ b/lib/skin.h
@@ -13,101 +13,102 @@
See color-slang.h (A_*) */
/* cache often used colors */
-#define DEFAULT_COLOR mc_skin_color__cache[0]
-#define NORMAL_COLOR mc_skin_color__cache[1]
-#define MARKED_COLOR mc_skin_color__cache[2]
-#define SELECTED_COLOR mc_skin_color__cache[3]
-#define MARKED_SELECTED_COLOR mc_skin_color__cache[4]
-#define DISABLED_COLOR mc_skin_color__cache[5]
-#define REVERSE_COLOR mc_skin_color__cache[6]
-#define COMMAND_MARK_COLOR mc_skin_color__cache[7]
-#define HEADER_COLOR mc_skin_color__cache[8]
+#define DEFAULT_COLOR mc_skin_color__cache[0]
+#define NORMAL_COLOR mc_skin_color__cache[1]
+#define MARKED_COLOR mc_skin_color__cache[2]
+#define SELECTED_COLOR mc_skin_color__cache[3]
+#define MARKED_SELECTED_COLOR mc_skin_color__cache[4]
+#define DISABLED_COLOR mc_skin_color__cache[5]
+#define REVERSE_COLOR mc_skin_color__cache[6]
+#define COMMAND_MARK_COLOR mc_skin_color__cache[7]
+#define HEADER_COLOR mc_skin_color__cache[8]
/* Dialog colors */
-#define COLOR_NORMAL mc_skin_color__cache[9]
-#define COLOR_FOCUS mc_skin_color__cache[10]
-#define COLOR_HOT_NORMAL mc_skin_color__cache[11]
-#define COLOR_HOT_FOCUS mc_skin_color__cache[12]
-#define COLOR_TITLE mc_skin_color__cache[13]
+#define COLOR_NORMAL mc_skin_color__cache[9]
+#define COLOR_FOCUS mc_skin_color__cache[10]
+#define COLOR_HOT_NORMAL mc_skin_color__cache[11]
+#define COLOR_HOT_FOCUS mc_skin_color__cache[12]
+#define COLOR_TITLE mc_skin_color__cache[13]
/* Error dialog colors */
-#define ERROR_COLOR mc_skin_color__cache[14]
-#define ERROR_FOCUS mc_skin_color__cache[15]
-#define ERROR_HOT_NORMAL mc_skin_color__cache[16]
-#define ERROR_HOT_FOCUS mc_skin_color__cache[17]
-#define ERROR_TITLE mc_skin_color__cache[18]
+#define ERROR_COLOR mc_skin_color__cache[14]
+#define ERROR_FOCUS mc_skin_color__cache[15]
+#define ERROR_HOT_NORMAL mc_skin_color__cache[16]
+#define ERROR_HOT_FOCUS mc_skin_color__cache[17]
+#define ERROR_TITLE mc_skin_color__cache[18]
/* Menu colors */
-#define MENU_ENTRY_COLOR mc_skin_color__cache[19]
-#define MENU_SELECTED_COLOR mc_skin_color__cache[20]
-#define MENU_HOT_COLOR mc_skin_color__cache[21]
-#define MENU_HOTSEL_COLOR mc_skin_color__cache[22]
-#define MENU_INACTIVE_COLOR mc_skin_color__cache[23]
+#define MENU_ENTRY_COLOR mc_skin_color__cache[19]
+#define MENU_SELECTED_COLOR mc_skin_color__cache[20]
+#define MENU_HOT_COLOR mc_skin_color__cache[21]
+#define MENU_HOTSEL_COLOR mc_skin_color__cache[22]
+#define MENU_INACTIVE_COLOR mc_skin_color__cache[23]
/* Popup menu colors */
-#define PMENU_ENTRY_COLOR mc_skin_color__cache[24]
-#define PMENU_SELECTED_COLOR mc_skin_color__cache[25]
-#define PMENU_HOT_COLOR mc_skin_color__cache[26] /* unused: not implemented yet */
-#define PMENU_HOTSEL_COLOR mc_skin_color__cache[27] /* unused: not implemented yet */
-#define PMENU_TITLE_COLOR mc_skin_color__cache[28]
+#define PMENU_ENTRY_COLOR mc_skin_color__cache[24]
+#define PMENU_SELECTED_COLOR mc_skin_color__cache[25]
+#define PMENU_HOT_COLOR mc_skin_color__cache[26] /* unused: not implemented yet */
+#define PMENU_HOTSEL_COLOR mc_skin_color__cache[27] /* unused: not implemented yet */
+#define PMENU_TITLE_COLOR mc_skin_color__cache[28]
-#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[29]
-#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[30]
+#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[29]
+#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[30]
-#define STATUSBAR_COLOR mc_skin_color__cache[31]
+#define STATUSBAR_COLOR mc_skin_color__cache[31]
/*
* This should be selectable independently. Default has to be black background
* foreground does not matter at all.
*/
-#define GAUGE_COLOR mc_skin_color__cache[32]
-#define INPUT_COLOR mc_skin_color__cache[33]
-#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[34]
-#define INPUT_MARK_COLOR mc_skin_color__cache[35]
-#define INPUT_HISTORY_COLOR mc_skin_color__cache[36]
-#define COMMAND_HISTORY_COLOR mc_skin_color__cache[37]
-
-#define HELP_NORMAL_COLOR mc_skin_color__cache[38]
-#define HELP_ITALIC_COLOR mc_skin_color__cache[39]
-#define HELP_BOLD_COLOR mc_skin_color__cache[40]
-#define HELP_LINK_COLOR mc_skin_color__cache[41]
-#define HELP_SLINK_COLOR mc_skin_color__cache[42]
-#define HELP_TITLE_COLOR mc_skin_color__cache[43]
-
-
-#define VIEW_NORMAL_COLOR mc_skin_color__cache[44]
-#define VIEW_BOLD_COLOR mc_skin_color__cache[45]
-#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[46]
-#define VIEW_SELECTED_COLOR mc_skin_color__cache[47]
+#define GAUGE_COLOR mc_skin_color__cache[32]
+#define INPUT_COLOR mc_skin_color__cache[33]
+#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[34]
+#define INPUT_MARK_COLOR mc_skin_color__cache[35]
+#define INPUT_HISTORY_COLOR mc_skin_color__cache[36]
+#define COMMAND_HISTORY_COLOR mc_skin_color__cache[37]
+
+#define HELP_NORMAL_COLOR mc_skin_color__cache[38]
+#define HELP_ITALIC_COLOR mc_skin_color__cache[39]
+#define HELP_BOLD_COLOR mc_skin_color__cache[40]
+#define HELP_LINK_COLOR mc_skin_color__cache[41]
+#define HELP_SLINK_COLOR mc_skin_color__cache[42]
+#define HELP_TITLE_COLOR mc_skin_color__cache[43]
+
+
+#define VIEW_NORMAL_COLOR mc_skin_color__cache[44]
+#define VIEW_BOLD_COLOR mc_skin_color__cache[45]
+#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[46]
+#define VIEW_BOLD_UNDERLINED_COLOR mc_skin_color__cache[47]
+#define VIEW_SELECTED_COLOR mc_skin_color__cache[48]
/*
* editor colors - only 4 for normal, search->found, select, and whitespace
* respectively
* Last is defined to view color.
*/
-#define EDITOR_NORMAL_COLOR mc_skin_color__cache[48]
-#define EDITOR_BOLD_COLOR mc_skin_color__cache[49]
-#define EDITOR_MARKED_COLOR mc_skin_color__cache[50]
-#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[51]
-#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[52]
-#define EDITOR_BACKGROUND mc_skin_color__cache[53]
-#define EDITOR_FRAME mc_skin_color__cache[54]
-#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[55]
-#define EDITOR_FRAME_DRAG mc_skin_color__cache[56]
+#define EDITOR_NORMAL_COLOR mc_skin_color__cache[49]
+#define EDITOR_BOLD_COLOR mc_skin_color__cache[50]
+#define EDITOR_MARKED_COLOR mc_skin_color__cache[51]
+#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[52]
+#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[53]
+#define EDITOR_BACKGROUND mc_skin_color__cache[54]
+#define EDITOR_FRAME mc_skin_color__cache[55]
+#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[56]
+#define EDITOR_FRAME_DRAG mc_skin_color__cache[57]
/* color of left 8 char status per line */
-#define LINE_STATE_COLOR mc_skin_color__cache[57]
-#define BOOK_MARK_COLOR mc_skin_color__cache[58]
-#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[59]
+#define LINE_STATE_COLOR mc_skin_color__cache[58]
+#define BOOK_MARK_COLOR mc_skin_color__cache[59]
+#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[60]
/* Diff colors */
-#define DFF_ADD_COLOR mc_skin_color__cache[60]
-#define DFF_CHG_COLOR mc_skin_color__cache[61]
-#define DFF_CHH_COLOR mc_skin_color__cache[62]
-#define DFF_CHD_COLOR mc_skin_color__cache[63]
-#define DFF_DEL_COLOR mc_skin_color__cache[64]
-#define DFF_ERROR_COLOR mc_skin_color__cache[65]
-
-#define MC_SKIN_COLOR_CACHE_COUNT 66
+#define DFF_ADD_COLOR mc_skin_color__cache[61]
+#define DFF_CHG_COLOR mc_skin_color__cache[62]
+#define DFF_CHH_COLOR mc_skin_color__cache[63]
+#define DFF_CHD_COLOR mc_skin_color__cache[64]
+#define DFF_DEL_COLOR mc_skin_color__cache[65]
+#define DFF_ERROR_COLOR mc_skin_color__cache[66]
+
+#define MC_SKIN_COLOR_CACHE_COUNT 67
/*** enums ***************************************************************************************/
diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c
index 5294b20..9f09baf 100644
--- a/lib/skin/colors-old.c
+++ b/lib/skin/colors-old.c
@@ -99,7 +99,8 @@ static const mc_skin_colors_old_t old_colors[] = {
{"viewbold", "viewer", "viewbold"},
{"viewnormal", "viewer", "_default_"},
{"viewselected", "viewer", "viewselected"},
- {"viewunderline", "viewer", "viewunderline"}
+ {"viewunderline", "viewer", "viewunderline"},
+ {"viewboldunderline", "viewer", "viewboldunderline"},
};
static const size_t num_old_colors = G_N_ELEMENTS (old_colors);
diff --git a/lib/skin/colors.c b/lib/skin/colors.c
index 61e3a80..e7bbe2f 100644
--- a/lib/skin/colors.c
+++ b/lib/skin/colors.c
@@ -236,6 +236,7 @@ mc_skin_color_cache_init (void)
VIEW_NORMAL_COLOR = mc_skin_color_get ("viewer", "_default_");
VIEW_BOLD_COLOR = mc_skin_color_get ("viewer", "viewbold");
VIEW_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewunderline");
+ VIEW_BOLD_UNDERLINED_COLOR = mc_skin_color_get ("viewer", "viewboldunderline");
VIEW_SELECTED_COLOR = mc_skin_color_get ("viewer", "viewselected");
EDITOR_NORMAL_COLOR = mc_skin_color_get ("editor", "_default_");
diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini
index d3717d5..9e3fc81 100644
--- a/misc/skins/dark.ini
+++ b/misc/skins/dark.ini
@@ -118,6 +118,7 @@
_default_ = lightgray;black
viewbold = yellow;black
viewunderline = brightred;black
+ viewboldunderline = yellow;black
viewselected = yellow;cyan
[diffviewer]
diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini
index a34de67..410b8a1 100644
--- a/misc/skins/darkfar.ini
+++ b/misc/skins/darkfar.ini
@@ -118,6 +118,7 @@
_default_ = lightgray;black
viewbold = yellow;black
viewunderline = brightred;black
+ viewboldunderline = yellow;black
viewselected = yellow;cyan
[diffviewer]
diff --git a/misc/skins/default.ini b/misc/skins/default.ini
index 625188e..9504c52 100644
--- a/misc/skins/default.ini
+++ b/misc/skins/default.ini
@@ -118,6 +118,7 @@
_default_ = lightgray;blue
viewbold = yellow;blue
viewunderline = brightred;blue
+ viewboldunderline = yellow;blue
viewselected = yellow;cyan
[diffviewer]
diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini
index 172442e..d924ecc 100644
--- a/misc/skins/double-lines.ini
+++ b/misc/skins/double-lines.ini
@@ -118,6 +118,7 @@
_default_ = lightgray;blue
viewbold = yellow;blue
viewunderline = brightred;blue
+ viewboldunderline = yellow;blue
viewselected = yellow;cyan
[diffviewer]
diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini
index 47a1a23..b53f566 100644
--- a/misc/skins/featured.ini
+++ b/misc/skins/featured.ini
@@ -120,6 +120,7 @@
_default_ = lightgray;blue
viewbold = yellow;blue
viewunderline = brightred;blue
+ viewboldunderline = yellow;blue
viewselected = yellow;cyan
[diffviewer]
diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini
index fc65bb2..1291da7 100644
--- a/misc/skins/gotar.ini
+++ b/misc/skins/gotar.ini
@@ -115,6 +115,7 @@
_default_ = lightgray;black
viewbold = brightred;black
viewunderline = brightgreen;black
+ viewboldunderline = brightred;black
viewselected = yellow;black
[diffviewer]
diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini
index 964b26f..fd89a0c 100644
--- a/misc/skins/gray-green-purple256.ini
+++ b/misc/skins/gray-green-purple256.ini
@@ -119,6 +119,7 @@
# "black" might change color when going bold, so use "rgb000" instead
viewbold = rgb000;;bold
viewunderline = ;;underline
+ viewboldunderline = rgb000;;bold+underline
viewselected = rgb303;rgb141;bold
[diffviewer]
diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini
index f8426f1..7ddc5e9 100644
--- a/misc/skins/gray-orange-blue256.ini
+++ b/misc/skins/gray-orange-blue256.ini
@@ -119,6 +119,7 @@
# "black" might change color when going bold, so use "rgb000" instead
viewbold = rgb000;;bold
viewunderline = ;;underline
+ viewboldunderline = rgb000;;bold+underline
viewselected = rgb004;rgb530;bold
[diffviewer]
diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini
index 39e4363..c120921 100644
--- a/misc/skins/mc46.ini
+++ b/misc/skins/mc46.ini
@@ -109,6 +109,7 @@
_default_ = lightgray;blue
viewbold = yellow;blue
viewunderline = brightred;blue
+ viewboldunderline = yellow;blue
viewselected = yellow;cyan
[diffviewer]
diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini
index b4b5b43..5475db4 100644
--- a/misc/skins/modarcon16-defbg.ini
+++ b/misc/skins/modarcon16-defbg.ini
@@ -154,6 +154,7 @@
_default_ = color7;default
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color11;color2;bold
[diffviewer]
diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini
index 9381d37..a86d2d8 100644
--- a/misc/skins/modarcon16.ini
+++ b/misc/skins/modarcon16.ini
@@ -154,6 +154,7 @@
_default_ = color7;color0
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color11;color2;bold
[diffviewer]
diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini
index b910c81..dd13f8e 100644
--- a/misc/skins/modarcon16root-defbg.ini
+++ b/misc/skins/modarcon16root-defbg.ini
@@ -154,6 +154,7 @@
_default_ = color7;default
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color11;color1;bold
[diffviewer]
diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini
index 498a40c..fdf32ef 100644
--- a/misc/skins/modarcon16root.ini
+++ b/misc/skins/modarcon16root.ini
@@ -154,6 +154,7 @@
_default_ = color7;color0
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color11;color1;bold
[diffviewer]
diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini
index 4e86e62..4cb69f5 100644
--- a/misc/skins/modarin256-defbg.ini
+++ b/misc/skins/modarin256-defbg.ini
@@ -154,6 +154,7 @@
_default_ = color250;default
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color228;color23;bold
[diffviewer]
diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini
index 6d3415e..100998f 100644
--- a/misc/skins/modarin256.ini
+++ b/misc/skins/modarin256.ini
@@ -154,6 +154,7 @@
_default_ = color252;color237
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color228;color23;bold
[diffviewer]
diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini
index 6f32ca4..8d6ad70 100644
--- a/misc/skins/modarin256root-defbg.ini
+++ b/misc/skins/modarin256root-defbg.ini
@@ -154,6 +154,7 @@
_default_ = color250;default
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color228;color88;bold
[diffviewer]
diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini
index ef36965..743f52c 100644
--- a/misc/skins/modarin256root.ini
+++ b/misc/skins/modarin256root.ini
@@ -154,6 +154,7 @@
_default_ = color252;color237
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color228;color88;bold
[diffviewer]
diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini
index a40e561..76439c3 100644
--- a/misc/skins/nicedark.ini
+++ b/misc/skins/nicedark.ini
@@ -118,6 +118,7 @@
_default_ = lightgray;black
viewbold = brown;blue
viewunderline = brightred;blue
+ viewboldunderline = brown;blue
viewselected = brown;cyan
[diffviewer]
diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini
index 83af5d1..08bf6e2 100644
--- a/misc/skins/sand256.ini
+++ b/misc/skins/sand256.ini
@@ -176,6 +176,7 @@
# "black" might change color when going bold, so use "rgb000" instead
viewbold = rgb000;;bold
viewunderline = ;;underline
+ viewboldunderline = rgb000;;bold+underline
viewselected = rgb400;rgb452
[diffviewer]
diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini
index 9a41a39..352fd38 100644
--- a/misc/skins/xoria256.ini
+++ b/misc/skins/xoria256.ini
@@ -160,6 +160,7 @@
_default_ = color250;color234
viewbold = ;;bold
viewunderline = ;;underline
+ viewboldunderline = ;;bold+underline
viewselected = color228;color60
[diffviewer]
diff --git a/src/viewer/ascii.c b/src/viewer/ascii.c
index d04a544..39268ca 100644
--- a/src/viewer/ascii.c
+++ b/src/viewer/ascii.c
@@ -397,8 +397,9 @@ static gboolean
mcview_get_next_maybe_nroff_char (mcview_t * view, mcview_state_machine_t * state, int *c,
int *color)
{
- mcview_state_machine_t state_after_nroff;
- int c2, c3;
+ mcview_state_machine_t state_after_three_chars;
+ mcview_state_machine_t state_after_five_chars;
+ int c2, c3, c4, c5;
if (color != NULL)
*color = VIEW_NORMAL_COLOR;
@@ -412,28 +413,40 @@ mcview_get_next_maybe_nroff_char (mcview_t * view, mcview_state_machine_t * stat
if (!mcview_isprint (view, *c))
return TRUE;
- state_after_nroff = *state;
+ state_after_three_chars = *state;
- if (!mcview_get_next_char (view, &state_after_nroff, &c2))
+ if (!mcview_get_next_char (view, &state_after_three_chars, &c2))
return TRUE;
if (c2 != '\b')
return TRUE;
- if (!mcview_get_next_char (view, &state_after_nroff, &c3))
+ if (!mcview_get_next_char (view, &state_after_three_chars, &c3))
return TRUE;
if (!mcview_isprint (view, c3))
return TRUE;
- if (*c == '_' && c3 == '_')
+ state_after_five_chars = state_after_three_chars;
+
+ /* Bold underlined is denoted by _ ^H x ^H x */
+ if (*c == '_' &&
+ mcview_get_next_char (view, &state_after_five_chars, &c4) &&
+ c4 == '\b' && mcview_get_next_char (view, &state_after_five_chars, &c5) && c3 == c5)
+ {
+ *c = c3;
+ *state = state_after_five_chars;
+ if (color != NULL)
+ *color = VIEW_BOLD_UNDERLINED_COLOR;
+ }
+ else if (*c == '_' && c3 == '_')
{
- *state = state_after_nroff;
+ *state = state_after_three_chars;
if (color != NULL)
*color =
state->nroff_underscore_is_underlined ? VIEW_UNDERLINED_COLOR : VIEW_BOLD_COLOR;
}
else if (*c == c3)
{
- *state = state_after_nroff;
+ *state = state_after_three_chars;
state->nroff_underscore_is_underlined = FALSE;
if (color != NULL)
*color = VIEW_BOLD_COLOR;
@@ -441,7 +454,7 @@ mcview_get_next_maybe_nroff_char (mcview_t * view, mcview_state_machine_t * stat
else if (*c == '_')
{
*c = c3;
- *state = state_after_nroff;
+ *state = state_after_three_chars;
state->nroff_underscore_is_underlined = TRUE;
if (color != NULL)
*color = VIEW_UNDERLINED_COLOR;
diff --git a/src/viewer/internal.h b/src/viewer/internal.h
index 9a507ad..1352d77 100644
--- a/src/viewer/internal.h
+++ b/src/viewer/internal.h
@@ -48,7 +48,8 @@ typedef enum
{
NROFF_TYPE_NONE = 0,
NROFF_TYPE_BOLD = 1,
- NROFF_TYPE_UNDERLINE = 2
+ NROFF_TYPE_UNDERLINE = 2,
+ NROFF_TYPE_BOLD_UNDERLINE = 3,
} nroff_type_t;
/*** structures declarations (and typedefs of structures)*****************************************/
diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c
index 1f9b80d..ab06f78 100644
--- a/src/viewer/nroff.c
+++ b/src/viewer/nroff.c
@@ -114,6 +114,9 @@ mcview__get_nroff_real_len (mcview_t * view, off_t start, off_t length)
case NROFF_TYPE_UNDERLINE:
ret += 2; /* underline symbol and ox8 */
break;
+ case NROFF_TYPE_BOLD_UNDERLINE:
+ ret += 3 + nroff->char_length; /* underline, 0x8, real char, 0x8 */
+ break;
default:
break;
}
@@ -166,7 +169,7 @@ mcview_nroff_seq_free (mcview_nroff_t ** nroff)
nroff_type_t
mcview_nroff_seq_info (mcview_nroff_t * nroff)
{
- int next, next2;
+ int next, next2, next3, next4;
if (nroff == NULL)
return NROFF_TYPE_NONE;
@@ -181,7 +184,16 @@ mcview_nroff_seq_info (mcview_nroff_t * nroff)
if (!mcview_nroff_get_char (nroff, &next2, nroff->index + 1 + nroff->char_length))
return nroff->type;
- if (nroff->current_char == '_' && next2 == '_')
+ if (nroff->current_char == '_' &&
+ mcview_get_byte (nroff->view, nroff->index + 2 + nroff->char_length, &next3) &&
+ next3 == '\b' &&
+ mcview_nroff_get_char (nroff, &next4, nroff->index + 3 + nroff->char_length) &&
+ next2 == next4)
+ {
+ nroff->current_char = next2;
+ nroff->type = NROFF_TYPE_BOLD_UNDERLINE;
+ }
+ else if (nroff->current_char == '_' && next2 == '_')
{
nroff->type = (nroff->prev_type == NROFF_TYPE_BOLD)
? NROFF_TYPE_BOLD : NROFF_TYPE_UNDERLINE;
@@ -196,10 +208,6 @@ mcview_nroff_seq_info (mcview_nroff_t * nroff)
nroff->current_char = next2;
nroff->type = NROFF_TYPE_UNDERLINE;
}
- else if (nroff->current_char == '+' && next2 == 'o')
- {
- /* ??? */
- }
return nroff->type;
}
@@ -221,6 +229,9 @@ mcview_nroff_seq_next (mcview_nroff_t * nroff)
case NROFF_TYPE_UNDERLINE:
nroff->index += 2;
break;
+ case NROFF_TYPE_BOLD_UNDERLINE:
+ nroff->index += 3 + nroff->char_length;
+ break;
default:
break;
}
diff --git a/src/viewer/search.c b/src/viewer/search.c
index 50255d2..e68775e 100644
--- a/src/viewer/search.c
+++ b/src/viewer/search.c
@@ -223,6 +223,9 @@ mcview_search_cmd_callback (const void *user_data, gsize char_offset, int *curre
case NROFF_TYPE_UNDERLINE:
view->search_numNeedSkipChar = 2; /* underline symbol and ox8 */
break;
+ case NROFF_TYPE_BOLD_UNDERLINE:
+ view->search_numNeedSkipChar = 3 + view->search_nroff_seq->char_length; /* underline, 0x8, real char, 0x8 */
+ break;
default:
break;
}
diff --git a/tests/src/viewer/viewertest.txt b/tests/src/viewer/viewertest.txt
index add6284..ecb94fd 100644
--- a/tests/src/viewer/viewertest.txt
+++ b/tests/src/viewer/viewertest.txt
@@ -60,15 +60,15 @@ c:x̀ ccccc:x̀́̂̃̄ s:xो sssss:xोोोोो sssccc:xोोो̀́
c:の̀ ccccc:の̀́̂̃̄ s:のो sssss:のोोोोो sssccc:のोोो̀́̂ cccsss:の̀́̂ोोो scscsc:のो̀ो́ो̂ cscscs:の̀ो́ो̂ो|
* Nroff
---------------- 一一一一 - - - - 一 一 一 一 -----------------|
-_Hello,_World!_ のイプサ à́ b̀́ c̀́ d̀́ हो हि हो हि __b___u___b___u__|
-__HHeelllloo,,___W_o_r_l_d_!__ ののイイ_プ_サ aà̀́́ bb̀̀́́ _c_̀_́ _d_̀_́ हहोो हहिि _ह_ो _ह_ि ____bb_______u______bb_______u____|
+-------------------- 一一一一一一 - - - - - - 一 一 一 一 一 一 ----------------------|
+_Hello,_Nice_World!_ のイプサム嘆 à́ b̀́ c̀́ d̀́ è́ f̀́ हो हि हो हि हो हि __b___u___bu___b___u__|
+__HHeelllloo,,___N_i_c_e____WW_oo_rr_ll_dd_!!___ ののイイ_プ_サ_ムム_嘆嘆 aà̀́́ bb̀̀́́ _c_̀_́ _d_̀_́ _ee_̀̀_́́ _ff_̀̀_́́ हहोो हहिि _ह_ो _ह_ि _हह_ोो _हह_िि ____bb_______u_______bb_uu_________bb_______u____|
______ <- should be bold again
-* Invalid nroff (a backspace b tab backspace tab underscore backspace newline,
- reference rendering in the first row)
-a.b . _.
-ab _
+* Invalid nroff (a ^H b (tab) ^H (tab) _ ^H a ^H b (tab) a ^H a ^H a (tab) _ ^H EOL,
+ reference rendering (including some valid nroff) in the first row)
+a.b . _a.b aa.a _.
+ab _ab aaa _
* Control characters (00-1F except tab/lf/cr, 7F, 80-9F), should all be replaced by dots
@ABCDEFGH--KL-NOPQRSTUVWXYZ[\]^_|?|@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_|