Eskil

Check-in [668aeaacc3]
Login

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

Overview
Comment:Use tablelist 5.14 that includes -colorizecommand, for table diff.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 668aeaacc32f16795c929b8af2fe4aa0cbc90ba9
User & Date: peter 2015-10-12 22:29:39.836
Context
2015-10-14
16:56
Page break between files when printing in patch mode. check-in: b3d1b3f369 user: peter tags: trunk
2015-10-12
22:29
Use tablelist 5.14 that includes -colorizecommand, for table diff. check-in: 668aeaacc3 user: peter tags: trunk
2015-07-02
07:48
Printing followed by redo diff closed Eskil. Fixed this. check-in: 4400d4437f user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes. 



1
2
3
4
5
6
7




2015-07-02
 Printing followed by redo diff closed Eskil. Fixed this.

2015-06-02
 Made a patched version of tablelist for table diff. Patch stored in src dir.
 Table diff works reasonable now


>
>
>








1
2
3
4
5
6
7
8
9
10

2015-10-12
 Use tablelist 5.14 that includes -colorizecommand, for table diff.
  
2015-07-02
 Printing followed by redo diff closed Eskil. Fixed this.

2015-06-02
 Made a patched version of tablelist for table diff. Patch stored in src dir.
 Table diff works reasonable now
︙︙
Changes to Makefile.
︙︙
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

# If you do not have access to all these, you can get them from an Eskil kit
# as explained below.
TEXTSEARCH = /home/peter/src/textsearch
DIFFUTIL   = /home/peter/src/DiffUtilTcl/lib.vfs/DiffUtil
WCB        = /home/peter/src/packages/wcb3.4
PDF4TCL    = /home/peter/src/pdf4tcl/pkg
SNIT       = /home/peter/src/packages/tcllib/modules/snit
TABLELIST  = /home/peter/src/packages/tablelist5.13
TWAPI      = /home/peter/src/packages/twapi
TKDND      = /home/peter/src/packages/tkdnd/lib/tkdnd2.4
EMBEDFONT  = /usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf

# Tools
NAGELFAR    = nagelfar









|








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29

# If you do not have access to all these, you can get them from an Eskil kit
# as explained below.
TEXTSEARCH = /home/peter/src/textsearch
DIFFUTIL   = /home/peter/src/DiffUtilTcl/lib.vfs/DiffUtil
WCB        = /home/peter/src/packages/wcb3.4
PDF4TCL    = /home/peter/src/pdf4tcl/pkg
SNIT       = /home/peter/src/packages/tcllib/modules/snit
TABLELIST  = /home/peter/src/packages/tablelist5.14
TWAPI      = /home/peter/src/packages/twapi
TKDND      = /home/peter/src/packages/tkdnd/lib/tkdnd2.4
EMBEDFONT  = /usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf

# Tools
NAGELFAR    = nagelfar
︙︙
Changes to src/eskil.tcl.
︙︙
487
488
489
490
491
492
493

494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510

    #puts "COLOR UPDATE W $win K $key R $row C $col TB1 $tabIdx1 TB2 $tabIdx2"
    #puts "   [string length $xxx] '$xxx'"
    #puts "   CHANGEME"

    # Currently the displayed string is just $w1$w2
    # The table might have cut of display of a cell so make sure to stay
    # within the boundaries.

    set l1 [string length $w1]
    set mid "$tabIdx1 + $l1 char"
    if {[$w compare $mid >= $tabIdx2]} {
        set mid $tabIdx2
    }
    $w tag add new1 $tabIdx1 $mid
    $w tag add new2 $mid     $tabIdx2

    # Get the displayed string
    set xxx [$w get $tabIdx1 $tabIdx2]
    if {$xxx ne "$w1$w2"} {
        # Make sure dots are coloured
        $w tag add change "$tabIdx2 - 3c" $tabIdx2
    }
}

# Insert one line in each text widget.








>

|



|
|


|








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

    #puts "COLOR UPDATE W $win K $key R $row C $col TB1 $tabIdx1 TB2 $tabIdx2"
    #puts "   [string length $xxx] '$xxx'"
    #puts "   CHANGEME"

    # Currently the displayed string is just $w1$w2
    # The table might have cut of display of a cell so make sure to stay
    # within the boundaries.
    set txIdx1 [$w index $tabIdx1+1c]
    set l1 [string length $w1]
    set mid "$txIdx1 + $l1 char"
    if {[$w compare $mid >= $tabIdx2]} {
        set mid $tabIdx2
    }
    $w tag add new1 $txIdx1 $mid
    $w tag add new2 $mid    $tabIdx2

    # Get the displayed string
    set xxx [$w get $txIdx1 $tabIdx2]
    if {$xxx ne "$w1$w2"} {
        # Make sure dots are coloured
        $w tag add change "$tabIdx2 - 3c" $tabIdx2
    }
}

# Insert one line in each text widget.
︙︙
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554


        # Lap 2, collect cell changes once we have the row id
        set col -1
        foreach w1 $words1 w2 $words2 r $rs {
            incr col
            # Equal? Skip
            if {[llength $r] <= 2} continue
            dict set ::eskil($top,tablechanges) $id,$col w1 $w1 
            dict set ::eskil($top,tablechanges) $id,$col w2 $w2
            dict set ::eskil($top,tablechanges) $id,$col r  $r
        }

        incr doingLine1
        incr doingLine2
        return
    }









|
|
|








539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555


        # Lap 2, collect cell changes once we have the row id
        set col -1
        foreach w1 $words1 w2 $words2 r $rs {
            incr col
            # Equal? Skip
            if {[llength $r] <= 2} continue
            dict set ::eskil($top,tablechanges) $id,$col "w1" $w1 
            dict set ::eskil($top,tablechanges) $id,$col "w2" $w2
            dict set ::eskil($top,tablechanges) $id,$col "r"  $r
        }

        incr doingLine1
        incr doingLine2
        return
    }
︙︙