From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 Oct 1995 10:58:06 +0000 (+0000)
Subject: More work on presentation formats.
X-Git-Tag: IRTCL.1.4~201
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=a15a80e995220dc483d5c997e74ec0fb4ec4a225;p=ir-tcl-moved-to-github.git

More work on presentation formats.
---

diff --git a/client.tcl b/client.tcl
index 1bb1466..74db9a0 100644
--- a/client.tcl
+++ b/client.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: client.tcl,v $
-# Revision 1.72  1995-10-16 17:00:52  adam
+# Revision 1.73  1995-10-17 10:58:06  adam
+# More work on presentation formats.
+#
+# Revision 1.72  1995/10/16  17:00:52  adam
 # New setting: elementSetNames.
 # Various client improvements. Medium presentation format looks better.
 #
@@ -1799,9 +1802,17 @@ proc protocol-setup {target} {
     global RPNCheck
     global CCLCheck
     global ResultSetCheck
-
-    set wno [lindex $profile($target) 12]
-    set w .setup-${wno}
+    
+    if {1} {
+        set wno [lindex $profile($target) 12]
+        set w .setup-${wno}
+    } else {
+        set b 0
+        while {[winfo exists .setup-$b]} {
+            incr b
+        }
+        set w .setup-$b
+    }
 
     toplevelG $w
 
@@ -3168,7 +3179,8 @@ if {! $monoFlag} {
 .data.record tag configure marc-data -foreground black
 .data.record tag configure marc-head \
         -font -Adobe-Times-Medium-R-Normal-*-140-* \
-        -foreground white -background black
+        -foreground brown -relief raised -borderwidth 1
+.data.record tag configure marc-small-head -foreground brown
 .data.record tag configure marc-pref \
         -font -Adobe-Times-Medium-R-Normal-*-140-* \
         -foreground blue
diff --git a/formats/line.tcl b/formats/line.tcl
index c513740..faf09c0 100644
--- a/formats/line.tcl
+++ b/formats/line.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: line.tcl,v $
-# Revision 1.7  1995-09-20 11:37:06  adam
+# Revision 1.8  1995-10-17 10:58:08  adam
+# More work on presentation formats.
+#
+# Revision 1.7  1995/09/20  11:37:06  adam
 # Work on GRS.
 #
 # Revision 1.6  1995/06/29  12:34:20  adam
@@ -68,7 +71,7 @@ proc display-line {sno no w hflag} {
     }
     if {$hflag} {
         set nostr [format "%5d " $no]
-        insertWithTags $w $nostr marc-tag
+        insertWithTags $w $nostr marc-small-head
     }
     if {$type == "DB"} {
         set rtype [z39.$sno recordType $no]
@@ -80,7 +83,8 @@ proc display-line {sno no w hflag} {
             if {[catch {
                 set title [lindex [z39.$sno getMarc $no field 245 * a] 0]
                 set year  [lindex [z39.$sno getMarc $no field 260 * c] 0]
-                insertWithTags $w "$title - $year\n" marc-data
+                insertWithTags $w "$title - " marc-text
+                insertWithTags $w "$year\n" marc-it
             }]} {
                 insertWithTags $w "Unknown record type: $rtype\n" marc-id
             }
diff --git a/formats/medium.tcl b/formats/medium.tcl
index 0c89d29..189d509 100644
--- a/formats/medium.tcl
+++ b/formats/medium.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: medium.tcl,v $
-# Revision 1.7  1995-10-16 17:01:03  adam
+# Revision 1.8  1995-10-17 10:58:09  adam
+# More work on presentation formats.
+#
+# Revision 1.7  1995/10/16  17:01:03  adam
 # Medium presentation format looks better.
 #
 # Revision 1.6  1995/09/20  11:37:06  adam
@@ -29,14 +32,14 @@
 proc display-grs-medium {w r i} {
     foreach e $r {
         for {set j 0} {$j < $i} {incr j} {
-            insertWithTags $w "  " {}
+            insertWithTags $w "  " marc-tag
         }
-        insertWithTags $w "([lindex $e 0]:[lindex $e 2])" marc-tag
+        insertWithTags $w "([lindex $e 0]:[lindex $e 2]) " marc-tag
         if {[lindex $e 3] == "string"} {
-            insertWithTags $w [lindex $e 4] {}
-            insertWithTags $w "\n" {}
+            insertWithTags $w [lindex $e 4] marc-text
+            insertWithTags $w "\n" marc-text
         } elseif {[lindex $e 3] == "subtree"} {
-            insertWithTags $w "\n" {}
+            insertWithTags $w "\n" marc-text
             display-grs-medium $w [lindex $e 4] [expr $i+1]
         } else {
             insertWithTags [lindex $e 4] {}
@@ -47,7 +50,8 @@ proc display-grs-medium {w r i} {
 
 proc display-medium {sno no w hflag} {
     if {$hflag} {
-        insertWithTags $w "\n$no\n" marc-data
+        insertWithTags $w " $no " marc-head
+        insertWithTags $w "\n"
     } else {
         $w delete 0.0 end
     }
diff --git a/formats/raw.tcl b/formats/raw.tcl
index eefc5e7..8aa9162 100644
--- a/formats/raw.tcl
+++ b/formats/raw.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: raw.tcl,v $
-# Revision 1.7  1995-10-12 14:46:58  adam
+# Revision 1.8  1995-10-17 10:58:09  adam
+# More work on presentation formats.
+#
+# Revision 1.7  1995/10/12  14:46:58  adam
 # The record position in the raw format is much more visible.
 #
 # Revision 1.6  1995/09/20  11:37:07  adam
@@ -46,7 +49,8 @@ proc display-grs-raw {w r i} {
 
 proc display-raw {sno no w hflag} {
     if {$hflag} {
-        insertWithTags $w "$no\n" marc-head
+        insertWithTags $w " $no " marc-head
+        insertWithTags $w "\n"
     } else {
         $w delete 0.0 end
     }