diff -uNr garfield-6.33.orig/html/datimh_.c garfield-6.33/html/datimh_.c --- garfield-6.33.orig/html/datimh_.c Thu Jan 1 09:00:00 1970 +++ garfield-6.33/html/datimh_.c Mon Dec 6 15:51:53 1999 @@ -0,0 +1,21 @@ +#include +time_t time(); + +void datimh_(char *datec, char *timec) +{ + const struct tm *timeptr; + time_t timer; + int yy, mm, dd, hr, mn, sc; + + timer = time((void *)0); + timeptr = localtime(&timer); + yy = (timeptr->tm_year); + mm = (timeptr->tm_mon) + 1; + dd = (timeptr->tm_mday); + sprintf(datec,"%4.4d-%2.2d-%2.2d",yy,mm,dd); + hr = (timeptr->tm_hour); + mn = (timeptr->tm_min); + sc = (timeptr->tm_sec); + sprintf(timec,"%2.2d:%2.2d:%2.2d",hr,mn,sc); +} + diff -uNr garfield-6.33.orig/html/hlp_html.f garfield-6.33/html/hlp_html.f --- garfield-6.33.orig/html/hlp_html.f Mon Dec 6 14:50:26 1999 +++ garfield-6.33/html/hlp_html.f Tue Dec 7 13:01:47 1999 @@ -55,7 +55,8 @@ CHARACTER*80 word, words(MAXLEVEL) CHARACTER*34 part, parts(MAXLEVEL) CHARACTER*7 ref - CHARACTER*8 DATE,TIME + CHARACTER*10 DATE + CHARACTER*8 TIME CHARACTER*1 pre_flag INTEGER wns(MAXLEVEL) INTEGER ios, level, prev_level, k, j @@ -263,6 +264,7 @@ *** Initialisation for tables, lists. (RV 11/11/98) table=.false. list=.false. + deflist=.false. list_indent=3 list_level=0 nref=0 @@ -615,11 +617,11 @@ call datimh(date,time) time(3:3)=':' if(k.ne.0)then - write(10+k,'(''

''/''Formatted on '',A8,'' at '', + write(10+k,'(''

''/''Formatted on '',A10,'' at '', - A5,''.'')') date,time(1:5) else write(10+k,'(''

''/''''/ - - ''Formatted on '',A8,''.'')') date + - ''Formatted on '',A10,''.'')') date endif * End of the HTML file and close. write(10+k,'(''''/'''')') @@ -850,7 +852,7 @@ call datimh(date,time) time(3:3)=':' write(10+k,'(''

''/ - - ''Formatted on '',A8,'' at '',A5,''.'')') + - ''Formatted on '',A10,'' at '',A5,''.'')') - date,time(1:5) else write(10,'(''

''/ @@ -860,7 +862,7 @@ call datimh(date,time) time(3:3)=':' write(10,'(''

''/''''/ - - ''Formatted on '',A8,'' at '',A5,''.'')') + - ''Formatted on '',A10,'' at '',A5,''.'')') - date,time(1:5) endif *** Close intermediate files. @@ -876,11 +878,11 @@ call datimh(date,time) time(3:3)=':' write(3,'(''

''/ - - ''Formatted on '',A8,'' at '',A5,''.'')') date,time(1:5) + - ''Formatted on '',A10,'' at '',A5,''.'')') date,time(1:5) write(3,'(''''/'''')') close(3) write(4,'(''

''/ - - ''Formatted on '',A8,'' at '',A5,''.'')') date,time(1:5) + - ''Formatted on '',A10,'' at '',A5,''.'')') date,time(1:5) write(4,'(''''/'''')') close(4) *** Remember input lines. @@ -1164,7 +1166,7 @@ endif * See whether the icon exists. jnext=1 - inquire(file='labels/'//aux(1:naux)//'.gif', + inquire(file='./labels/'//aux(1:naux)//'.gif', - exist=exist) if(.not.exist)then print *,' Generating ',aux(1:naux) diff -uNr garfield-6.33.orig/html/labels/t2g garfield-6.33/html/labels/t2g --- garfield-6.33.orig/html/labels/t2g Wed Jan 27 22:24:47 1999 +++ garfield-6.33/html/labels/t2g Tue Dec 7 06:03:04 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # converts text to gif-button # @@ -65,8 +65,8 @@ $tb = 5; $fn = '-adobe-helvetica-bold-r-normal--14-100-100-100-p-82-iso8859-1'; $fontheight = 14; -$canvas = '/afs/cern.ch/user/a/awagner/www/ittest/t2g/canvas_14_cccccc.gif'; -$background = '/afs/cern.ch/user/a/awagner/www/ittest/t2g/canvas_cccccc_24_l.gif'; +$canvas = 'labels/canvas_14_cccccc.gif'; +$background = 'labels/canvas_cccccc_24_l.gif'; #$pencolor = '#003300' ; $boxcolor= '#000100' ; if ( $#ARGV == 2 ) { if ($ARGV[2] == 'red') { $pencolor = "#660000" }; }; @@ -77,9 +77,9 @@ # # evaluating lenght of text # -system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -font '$fn' -pen '$pencolor' -draw \"text +15+$tb '$text'\" -crop 0x0 $canvas temp_0_0_a.gif;"; +system "convert -font '$fn' -pen '$pencolor' -draw \"text +15+$tb '$text'\" -crop 0x0 $canvas temp_0_0_a.gif;"; #system "xv temp_0_0_a.gif &"; -open(test,"/afs/cern.ch/user/a/awagner/public/bin/gifinfo temp_0_0_a.gif | grep ' width' | sed 's/\| *[wW]idth: *//' |"); +open(test,"identify -verbose temp_0_0_a.gif | grep ' geometry' | sed -e 's; *geometry: *;;' | sed -e 's;x.*;;' |"); read(test,$var,100000); close(test); # @@ -90,14 +90,15 @@ $twt=6; # $twrc=$twc[0]-5; # print stdout "$ucll $twc[0]"; flush(stdout); -system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -font '$fn' -pen '$pencolor' -draw \"text $twt+4 '$text'\" $background $file;"; +system "convert -font '$fn' -pen '$pencolor' -draw \"text $twt+4 '$text'\" $background $file;"; if ($silent=~/no/) {print stdout "."; flush(stdout); }; # -system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -crop $twc[0]x24 $file $file ; "; +system "convert -crop $twc[0]x24 $file $file ; "; if ($silent=~/no/) {print stdout "."; flush(stdout); }; # -system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -bordercolor '#000000' -border 2x2 $file $file "; -system "/afs/cern.ch/user/a/awagner/www/ittest/ImageMagick-4.0.4/convert -crop $twc[1]x28 $file $file ; "; +system "convert -bordercolor '#000000' -border 2x2 $file $file ; "; +if ($silent=~/no/) {print stdout "."; flush(stdout); }; +system "convert -crop $twc[1]x28-9-0 $file $file ; "; if ($silent=~/no/) {print stdout "."; flush(stdout); }; # system "convert $file temp-0-0.xpm "; @@ -108,8 +109,9 @@ system "rm -rf temp_0_0_a.gif* temp-0-0.xpm*"; if ($silent=~/no/) {print stdout "."; flush(stdout); }; # -open(test,"/afs/cern.ch/user/a/awagner/public/bin/gifinfo $file | grep ' width' | sed 's/\| *[wW]idth: *//' |"); +open(test,"identify -verbose $file | grep ' geometry' | sed -e 's; *geometry: *;;' | sed -e 's;x.*;;' |"); read(test,$var,100000); close(test); # print stdout "$file $var" + diff -uNr garfield-6.33.orig/html/labels/t2g_old garfield-6.33/html/labels/t2g_old --- garfield-6.33.orig/html/labels/t2g_old Wed Jan 27 09:06:19 1999 +++ garfield-6.33/html/labels/t2g_old Mon Dec 6 16:06:59 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # converts text to gif-button # diff -uNr garfield-6.33.orig/html/make_html garfield-6.33/html/make_html --- garfield-6.33.orig/html/make_html Mon Dec 6 14:50:35 1999 +++ garfield-6.33/html/make_html Mon Dec 6 16:37:53 1999 @@ -1,16 +1,20 @@ # --------------------------------------------------------------------------- # # Make file for HTML help file. # # ---------------------------------------------------------------------------- -garfield.html: garfield.hlp hlp_html headers top tail + +garfield.html: garfield.hlp hlp_html html_headers html_top html_tail -rm *.html *.href *.temp - hlp_html + ./hlp_html ln -s garfield.html Welcome.html -# ref.html: garfield.href - cat headers >>garfield.href - gsort -f -t \> -k 3 garfield.href > temp - cat top temp tail >ref.html + cat html_headers >>garfield.href + sort -f -t \> -k 3 garfield.href > temp + cat html_top temp html_tail >ref.html rm temp + garfield.href: garfield.html -hlp_html: hlp_html.f - ff77 hlp_html - -rm hlp_html.o + +hlp_html: hlp_html.f datimh_.o + g77 -o hlp_html hlp_html.f datimh_.o + +clean: + rm -f *.o *.href *.temp *.html hlp_html fort.10