Fossil

Check-in [b912690fc4]
Login

Check-in [b912690fc4]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove 'display: inline-block' from insertion and deletion marks to get more natural word-wrapping. Try whether the previous, precisely calculated line height and padding values also work to extend the background color to the entire line height.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | diff-word-wrap
Files: files | file ages | folders
SHA3-256: b912690fc4479057651ac2436368a8b757dc385c149ccc9524e498d19e8b114d
User & Date: florian 2024-08-23 06:02:00.000
Context
2024-08-25
05:17
Exempt diff line numbers and diff marks (separators) from text selections and have click-and-drag selection include only the most recently clicked side for side-by-side (split) diffs. ... (check-in: abd3bca70e user: florian tags: diff-word-wrap)
2024-08-23
06:02
Remove 'display: inline-block' from insertion and deletion marks to get more natural word-wrapping. Try whether the previous, precisely calculated line height and padding values also work to extend the background color to the entire line height. ... (check-in: b912690fc4 user: florian tags: diff-word-wrap)
05:21
Fix a JS ternary operator precedence bug to mess up later loaded diff context. ... (check-in: 18c5117b11 user: florian tags: diff-word-wrap)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/default.css.
563
564
565
566
567
568
569
570
571
572
573
574





575
576
577
578
579
580
581
table.diff td {
  vertical-align: top;
  text-align: left;
  margin: 0;
  padding: 0;
  border: 0;
  font-family: monospace;
  line-height: 1.2;
  text-size-adjust: none;
  white-space: pre-wrap;
  word-wrap: break-word;
}





table.diff td.diffln {
  width: 0%;
  text-align: right;
  padding: 0 0.16em 0 0.32em;
}
table.diff td.difflne {
  text-align: left;







|




>
>
>
>
>







563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
table.diff td {
  vertical-align: top;
  text-align: left;
  margin: 0;
  padding: 0;
  border: 0;
  font-family: monospace;
  line-height: 1.275;
  text-size-adjust: none;
  white-space: pre-wrap;
  word-wrap: break-word;
}
table.diff td del,
table.diff td ins {
  padding: 0.062em 0 0.062em 0;
  text-decoration: none;
}
table.diff td.diffln {
  width: 0%;
  text-align: right;
  padding: 0 0.16em 0 0.32em;
}
table.diff td.difflne {
  text-align: left;
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
td.diffln.ins,
td.diffsep.ins,
td.difftxt.ins {
  background-color: #dafbe1;
}
td.difftxt.del del {
  background-color: #ffc0c0;
  text-decoration: none;
  display: inline-block;
}
td.difftxt.del del.edit {
  background-color: #c0c0ff;
}
td.difftxt.ins ins {
  background-color: #a0e4b2;
  text-decoration: none;
  display: inline-block;
}
td.difftxt.ins ins.edit {
  background-color: #c0c0ff;
}
body.tkt div.content li > table.udiff {
  margin-left: 1.5em;
  margin-top: 0.5em;







<
<






<
<







680
681
682
683
684
685
686


687
688
689
690
691
692


693
694
695
696
697
698
699
td.diffln.ins,
td.diffsep.ins,
td.difftxt.ins {
  background-color: #dafbe1;
}
td.difftxt.del del {
  background-color: #ffc0c0;


}
td.difftxt.del del.edit {
  background-color: #c0c0ff;
}
td.difftxt.ins ins {
  background-color: #a0e4b2;


}
td.difftxt.ins ins.edit {
  background-color: #c0c0ff;
}
body.tkt div.content li > table.udiff {
  margin-left: 1.5em;
  margin-top: 0.5em;
Changes to src/diffcmd.c.
241
242
243
244
245
246
247
248
249
250
251
252





253
254
255
256
257
258
259
@ table.diff td {
@   vertical-align: top;
@   text-align: left;
@   margin: 0;
@   padding: 0;
@   border: 0;
@   font-family: monospace;
@   line-height: 1.2;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }





@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;







|




>
>
>
>
>







241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
@ table.diff td {
@   vertical-align: top;
@   text-align: left;
@   margin: 0;
@   padding: 0;
@   border: 0;
@   font-family: monospace;
@   line-height: 1.275;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }
@ table.diff td del,
@ table.diff td ins {
@   padding: 0.062em 0 0.062em 0;
@   text-decoration: none;
@ }
@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
@ td.diffln.ins,
@ td.diffsep.ins,
@ td.difftxt.ins {
@   background-color: #dafbe1;
@ }
@ td.difftxt.del del {
@   background-color: #ffc0c0;
@   text-decoration: none;
@   display: inline-block;
@ }
@ td.difftxt.del del.edit {
@   background-color: #c0c0ff;
@ }
@ td.difftxt.ins ins {
@   background-color: #a0e4b2;
@   text-decoration: none;
@   display: inline-block;
@ }
@ td.difftxt.ins ins.edit {
@   background-color: #c0c0ff;
@ }
@ @media (prefers-color-scheme: dark) {
@   body {
@     color: #fff;







<
<






<
<







291
292
293
294
295
296
297


298
299
300
301
302
303


304
305
306
307
308
309
310
@ td.diffln.ins,
@ td.diffsep.ins,
@ td.difftxt.ins {
@   background-color: #dafbe1;
@ }
@ td.difftxt.del del {
@   background-color: #ffc0c0;


@ }
@ td.difftxt.del del.edit {
@   background-color: #c0c0ff;
@ }
@ td.difftxt.ins ins {
@   background-color: #a0e4b2;


@ }
@ td.difftxt.ins ins.edit {
@   background-color: #c0c0ff;
@ }
@ @media (prefers-color-scheme: dark) {
@   body {
@     color: #fff;
359
360
361
362
363
364
365
366
367
368
369
370





371
372
373
374
375
376
377
@ table.diff td {
@   vertical-align: top;
@   text-align: left;
@   margin: 0;
@   padding: 0;
@   border: 0;
@   font-family: monospace;
@   line-height: 1.2;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }





@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;







|




>
>
>
>
>







360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
@ table.diff td {
@   vertical-align: top;
@   text-align: left;
@   margin: 0;
@   padding: 0;
@   border: 0;
@   font-family: monospace;
@   line-height: 1.275;
@   text-size-adjust: none;
@   white-space: pre-wrap;
@   word-wrap: break-word;
@ }
@ table.diff td del,
@ table.diff td ins {
@   padding: 0.062em 0 0.062em 0;
@   text-decoration: none;
@ }
@ table.diff td.diffln {
@   width: 0%;
@   text-align: right;
@   padding: 0 0.16em 0 0.32em;
@ }
@ table.diff td.difflne {
@   text-align: left;
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
@ td.difftxt.ins {
@   color: #000;
@   background-color: #a2dbb2;
@ }
@ td.difftxt.del del {
@   color: #000;
@   background-color: #cc5555;
@   text-decoration: none;
@   display: inline-block;
@ }
@ td.difftxt.del del.edit {
@   background-color: #c0c0ff;
@ }
@ td.difftxt.ins ins {
@   background-color: #559855;
@   text-decoration: none;
@   display: inline-block;
@ }
@ td.difftxt.ins ins.edit {
@   background-color: #c0c0ff;
@ }
@ </style>
@ </head>
@ <body>







<
<






<
<







413
414
415
416
417
418
419


420
421
422
423
424
425


426
427
428
429
430
431
432
@ td.difftxt.ins {
@   color: #000;
@   background-color: #a2dbb2;
@ }
@ td.difftxt.del del {
@   color: #000;
@   background-color: #cc5555;


@ }
@ td.difftxt.del del.edit {
@   background-color: #c0c0ff;
@ }
@ td.difftxt.ins ins {
@   background-color: #559855;


@ }
@ td.difftxt.ins ins.edit {
@   background-color: #c0c0ff;
@ }
@ </style>
@ </head>
@ <body>