diff -crNP ../siag-3.3.2/ChangeLog ./ChangeLog *** ../siag-3.3.2/ChangeLog Mon Mar 27 21:13:59 2000 --- ./ChangeLog Wed Apr 12 19:42:11 2000 *************** *** 1,4 **** --- 1,39 ---- + 000412 Check in kdeinst that installation directories are writable. + Fixed a bug that caused a crash when inserting or removing + columns in empty documents. Found by Rob Lahaye + Released 3.3.3. + + 000411 Removed installation instructions for Xaw3d and GV, since they + are no longer used. Updated Guile version number. + + 000409 German translation updated by Theodor Willax + . + + 000407 Czech translation updated. + + 000406 Moved cchar from pw/fileio_html.c to common/common.c + and added the functions from_cchar and to_cchar which + convert between HTML entities and character codes. + Modified siag/fileio_html.c to use those functions. + + 000405 Czech translation by Petr Klíma and Martin Klozik, + klima.petr@post.cz. + Updated Danish translation by Birger Langkjer. + Read Excel files using xlHtml and Powerpoint files + using pptHtml. + + 000404 Removed colors.scm and rgb.c. New function init_colors in + fonts.c reads colors directly from rgb.txt, using the code + from rgb.c. + Replaced fonts.scm with fonts.txt, which is read by init_fonts + in fonts.c. + + 000402 Updated fileio_csv.c to load files correctly when using xls2csv + as external converter. + + 000330 Removed highlight and unhighlight args from tooltip_init. + 000327 PW: New Ruler widget. Removed rulerframe. Combo pops down if mouse button is clicked outside list. Russian translation by Sergey Korepanov . diff -crNP ../siag-3.3.2/INSTALL ./INSTALL *** ../siag-3.3.2/INSTALL Mon Feb 21 07:44:11 2000 --- ./INSTALL Tue Apr 11 23:34:40 2000 *************** *** 3,13 **** 1. Untar the archive: ! gzip -cd siag-3.2.0.tar.gz | tar xfv - 2. Enter the top-level directory: ! cd siag-3.2.0 3. Compile and install everything: --- 3,13 ---- 1. Untar the archive: ! gzip -cd siag-3.3.3.tar.gz | tar xfv - 2. Enter the top-level directory: ! cd siag-3.3.3 3. Compile and install everything: *************** *** 150,200 **** perhaps not as enjoyable. Guile: A Scheme interpreter - GV: A Postscript viewer Other things you will enjoy having include Netscape, Gnuplot and Netpbm. - Xaw3d - ----- - - 1. Untar the archive: - - gzip -cd Xaw3d-1.3.tar.gz | tar xfv - - - 2. Change into the source directory: - - cd xc/lib/Xaw3d - - 3. Edit the Imakefile and uncomment the following lines: - - # EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY - # EXTRA_INCLUDES = -I. - - 4. Copy the headers into their rightful place: - - mkdir /usr/X11/include/X11/Xaw3d - cp *.h /usr/X11/include/X11/Xaw3d - - 5. Compile and install the thing: - - xmkmf - make depend - make - make install - ldconfig - - Guile ----- 1. Untar the archive: ! gzip -cd guile-1.2.tar.gz | tar xfv - 2. Change into the main directory: ! cd guile-1.2 3. Configure: --- 150,169 ---- perhaps not as enjoyable. Guile: A Scheme interpreter Other things you will enjoy having include Netscape, Gnuplot and Netpbm. Guile ----- 1. Untar the archive: ! gzip -cd guile-1.3.tar.gz | tar xfv - 2. Change into the main directory: ! cd guile-1.3 3. Configure: *************** *** 206,233 **** make install ldconfig - - GV - -- - - 1. Untar the archive: - - gzip -cd gv-3.5.8.tar.gz | tar xfv - - - 2. Change directory: - - cd gv-3.5.8 - - 3. Read GV's installation instructions in INSTALL.Unix - - 4. Compile and install: - - xmkmf - make Makefiles - make depend - make - make install - make install.man ================================================================== --- 175,180 ---- diff -crNP ../siag-3.3.2/NLS ./NLS *** ../siag-3.3.2/NLS Mon Mar 27 21:05:10 2000 --- ./NLS Tue Apr 11 21:48:50 2000 *************** *** 4,13 **** --- 4,16 ---- Language Code Translator -------- ---- ---------- Croatian cr Matej Vela + Czech cs Petr Klíma and Martin Klozik + . Danish da Birger Langkjer French fr and Xavier Henne Galician gl Ramon Flores German de Matthias Warkus + Theodor Willax Norwegian no Bjřrn-Ove Heimsund Polish pl Przemek Borys Russian ru Sergey Korepanov *************** *** 23,29 **** By default, Siag Office produces Postscript in Latin1 encoding for printed output. According to Przemek Borys, who did the Polish ! translation, the oginkify program can be used to convert into Latin2. Is your language not supported? You can make a difference! Take one of --- 26,32 ---- By default, Siag Office produces Postscript in Latin1 encoding for printed output. According to Przemek Borys, who did the Polish ! translation, the ogonkify program can be used to convert into Latin2. Is your language not supported? You can make a difference! Take one of diff -crNP ../siag-3.3.2/TODO ./TODO *** ../siag-3.3.2/TODO Mon Mar 27 17:49:24 2000 --- ./TODO Wed Apr 12 08:31:40 2000 *************** *** 1,4 **** --- 1,63 ---- + Replace applications.scm with applications.sh, which looks like: + + viewer=gvu + lpr=lpr + editor=kedit + help=kdehelp + filer=xfiler + terminal=konsole + calculator=kcalc + + Then create the program siagrun.sh, which looks like: + + #!/bin/sh + if [ ! -f $HOME/.siag/applications.sh ]; then + cat > $HOME/.siag/applications.sh << EOF + viewer=gvu + lpr=lpr + editor=xedplus + help=siaghelp + filer=xfiler + terminal=xterm + calculator=xcalc + EOF + + . $HOME/.siag/applications.sh + + + + Update fileio_html to deal with the features in xlHtml: + - Convert HTML entities like   (should be done anyway) + - Recognize expressions as such + - Adjust line widths automatically + - Grok some of the formatting: + +
+ + + Look for this line: + But just converting   would actually make a whole lot of difference. + + + + The font/format handling code has an api that is much too wide: + too many fuctions and too many datastructures. It should be possible + to keep encode_format and decode_format and remove everything else. + Remove all datastructures from public view. font_list and color_list + are necessary for the user interface. font_ascent and font_descent are + needed too, as are font_height and font_width. + As an example, let's say we are developing a widget which will display + scaled multifont text. We would like to do something like: + for (i = 0; text[i].c; i++) { + adjust_gc(gc, text[i].f, zoom); + print_char(x, y, gc, text[i].c); + x += char_width(text[i], zoom); + } + Note: this does not take into account line wrapping, white space, + adjustment, line height and so on. We'll graft that on later. + + PW: transfer control over the data from the application to the Richtext widget. This so that Richtext can be used on its own. Changes required: enormous. The sheet datastructure must be encapsulated *************** *** 20,25 **** --- 79,105 ---- OTOH, use one Richtext widget for each sheet. It looks like I'm about to wreck the "device independence". + + PW: Bootstrap in this order: + 1. Initialize the window system. This creates the main application + window, but no document window. It will work fine thanks to the + Rudegrid. + 2. Create a single application window, with no buffer associated. + There will never be more than one such window. I'm scrapping + that functionality. + 2a. Load pw.scm and any other Scheme code that needs X. Must rewrite + siodi.c so it can run without the presence of buffers. + 3. If there are command line arguments, use them to load files. + For each document, create a buffer. For each sheet, create a Richtext. + The parent of the widget must be the single application window. + 4. If no files were loaded, create a dummy "Noname" document using + a single sheet in a single buffer. + I'll be better off rewriting the whole thing from scratch, starting + with a dummy application. Scrap the nspw directory, get rid of legacy + code and write a word processor that does not attempt to be "device + independent" or use widgets that are so general purpose that nothing + else can use them. + Change plugin coordinates to use pixels rather than cells. diff -crNP ../siag-3.3.2/common/Makefile.am ./common/Makefile.am *** ../siag-3.3.2/common/Makefile.am Mon Mar 27 20:19:45 2000 --- ./common/Makefile.am Thu Apr 6 15:15:38 2000 *************** *** 17,27 **** CLEANFILES = rgb comments commondir = $(datadir)/siag/common ! common_DATA = colors.scm common.scm position.scm fonts.scm tools.scm \ ! t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc \ dictionary.sv dictionary.es dictionary.de dictionary.fr \ dictionary.no dictionary.hr dictionary.da dictionary.pl \ ! dictionary.gl dictionary.ru common_SCRIPTS = any2xpm readpfa --- 17,27 ---- CLEANFILES = rgb comments commondir = $(datadir)/siag/common ! common_DATA = common.scm position.scm tools.scm \ ! fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc \ dictionary.sv dictionary.es dictionary.de dictionary.fr \ dictionary.no dictionary.hr dictionary.da dictionary.pl \ ! dictionary.gl dictionary.ru dictionary.cs common_SCRIPTS = any2xpm readpfa *************** *** 33,42 **** comments: comments.c $(CC) -o comments comments.c - - rgb: rgb.c - $(CC) -o rgb $(srcdir)/rgb.c - - colors.scm: rgb rgb.txt - ./rgb < $(srcdir)/rgb.txt > colors.scm --- 33,36 ---- diff -crNP ../siag-3.3.2/common/Makefile.in ./common/Makefile.in *** ../siag-3.3.2/common/Makefile.in Mon Mar 27 21:14:21 2000 --- ./common/Makefile.in Wed Apr 12 19:42:43 2000 *************** *** 98,104 **** CLEANFILES = rgb comments commondir = $(datadir)/siag/common ! common_DATA = colors.scm common.scm position.scm fonts.scm tools.scm t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc dictionary.sv dictionary.es dictionary.de dictionary.fr dictionary.no dictionary.hr dictionary.da dictionary.pl dictionary.gl dictionary.ru common_SCRIPTS = any2xpm readpfa --- 98,104 ---- CLEANFILES = rgb comments commondir = $(datadir)/siag/common ! common_DATA = common.scm position.scm tools.scm fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc dictionary.sv dictionary.es dictionary.de dictionary.fr dictionary.no dictionary.hr dictionary.da dictionary.pl dictionary.gl dictionary.ru dictionary.cs common_SCRIPTS = any2xpm readpfa *************** *** 430,441 **** comments: comments.c $(CC) -o comments comments.c - - rgb: rgb.c - $(CC) -o rgb $(srcdir)/rgb.c - - colors.scm: rgb rgb.txt - ./rgb < $(srcdir)/rgb.txt > colors.scm # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 430,435 ---- diff -crNP ../siag-3.3.2/common/colors.scm ./common/colors.scm *** ../siag-3.3.2/common/colors.scm Wed Mar 22 07:04:07 2000 --- ./common/colors.scm Thu Jan 1 01:00:00 1970 *************** *** 1,502 **** - (register-color "Alice Blue" 61680 63736 65535) - (register-color "Antique White" 64250 60395 55255) - (register-color "Antique White1" 65535 61423 56283) - (register-color "Antique White2" 61166 57311 52428) - (register-color "Antique White3" 52685 49344 45232) - (register-color "Antique White4" 35723 33667 30840) - (register-color "Aquamarine1" 32639 65535 54484) - (register-color "Aquamarine2" 30326 61166 50886) - (register-color "Aquamarine3" 26214 52685 43690) - (register-color "Aquamarine4" 17733 35723 29812) - (register-color "Azure1" 61680 65535 65535) - (register-color "Azure2" 57568 61166 61166) - (register-color "Azure3" 49601 52685 52685) - (register-color "Azure4" 33667 35723 35723) - (register-color "Beige" 62965 62965 56540) - (register-color "Bisque1" 65535 58596 50372) - (register-color "Bisque2" 61166 54741 47031) - (register-color "Bisque3" 52685 47031 40606) - (register-color "Bisque4" 35723 32125 27499) - (register-color "Blanched Almond" 65535 60395 52685) - (register-color "Blue Violet" 35466 11051 58082) - (register-color "Blue1" 0 0 65535) - (register-color "Blue2" 0 0 61166) - (register-color "Blue3" 0 0 52685) - (register-color "Brown" 42405 10794 10794) - (register-color "Brown1" 65535 16448 16448) - (register-color "Brown2" 61166 15163 15163) - (register-color "Brown3" 52685 13107 13107) - (register-color "Brown4" 35723 8995 8995) - (register-color "Burlywood" 57054 47288 34695) - (register-color "Burlywood1" 65535 54227 39835) - (register-color "Burlywood2" 61166 50629 37265) - (register-color "Burlywood3" 52685 43690 32125) - (register-color "Burlywood4" 35723 29555 21845) - (register-color "Cadet Blue" 24415 40606 41120) - (register-color "Cadet Blue1" 39064 62965 65535) - (register-color "Cadet Blue2" 36494 58853 61166) - (register-color "Cadet Blue3" 31354 50629 52685) - (register-color "Cadet Blue4" 21331 34438 35723) - (register-color "Chartreuse1" 32639 65535 0) - (register-color "Chartreuse2" 30326 61166 0) - (register-color "Chartreuse3" 26214 52685 0) - (register-color "Chartreuse4" 17733 35723 0) - (register-color "Chocolate" 53970 26985 7710) - (register-color "Chocolate1" 65535 32639 9252) - (register-color "Chocolate2" 61166 30326 8481) - (register-color "Chocolate3" 52685 26214 7453) - (register-color "Chocolate4" 35723 17733 4883) - (register-color "Coral" 65535 32639 20560) - (register-color "Coral1" 65535 29298 22102) - (register-color "Coral2" 61166 27242 20560) - (register-color "Coral3" 52685 23387 17733) - (register-color "Coral4" 35723 15934 12079) - (register-color "Cornflower Blue" 25700 38293 60909) - (register-color "Cornsilk1" 65535 63736 56540) - (register-color "Cornsilk2" 61166 59624 52685) - (register-color "Cornsilk3" 52685 51400 45489) - (register-color "Cornsilk4" 35723 34952 30840) - (register-color "Cyan1" 0 65535 65535) - (register-color "Cyan2" 0 61166 61166) - (register-color "Cyan3" 0 52685 52685) - (register-color "Dark Blue" 0 0 35723) - (register-color "Dark Cyan" 0 35723 35723) - (register-color "Dark Goldenrod" 47288 34438 2827) - (register-color "Dark Goldenrod1" 65535 47545 3855) - (register-color "Dark Goldenrod2" 61166 44461 3598) - (register-color "Dark Goldenrod3" 52685 38293 3084) - (register-color "Dark Goldenrod4" 35723 25957 2056) - (register-color "Dark Gray" 43433 43433 43433) - (register-color "Dark Green" 0 25700 0) - (register-color "Dark Khaki" 48573 47031 27499) - (register-color "Dark Magenta" 35723 0 35723) - (register-color "Dark Olive Green" 21845 27499 12079) - (register-color "Dark Olive Green1" 51914 65535 28784) - (register-color "Dark Olive Green2" 48316 61166 26728) - (register-color "Dark Olive Green3" 41634 52685 23130) - (register-color "Dark Olive Green4" 28270 35723 15677) - (register-color "Dark Orange" 65535 35980 0) - (register-color "Dark Orange1" 65535 32639 0) - (register-color "Dark Orange2" 61166 30326 0) - (register-color "Dark Orange3" 52685 26214 0) - (register-color "Dark Orange4" 35723 17733 0) - (register-color "Dark Orchid" 39321 12850 52428) - (register-color "Dark Orchid1" 49087 15934 65535) - (register-color "Dark Orchid2" 45746 14906 61166) - (register-color "Dark Orchid3" 39578 12850 52685) - (register-color "Dark Orchid4" 26728 8738 35723) - (register-color "Dark Red" 35723 0 0) - (register-color "Dark Salmon" 59881 38550 31354) - (register-color "Dark Sea Green" 36751 48316 36751) - (register-color "Dark Sea Green1" 49601 65535 49601) - (register-color "Dark Sea Green2" 46260 61166 46260) - (register-color "Dark Sea Green3" 39835 52685 39835) - (register-color "Dark Sea Green4" 26985 35723 26985) - (register-color "Dark Slate Blue" 18504 15677 35723) - (register-color "Dark Slate Gray1" 38807 65535 65535) - (register-color "Dark Slate Gray2" 36237 61166 61166) - (register-color "Dark Slate Gray3" 31097 52685 52685) - (register-color "Dark Slate Gray4" 21074 35723 35723) - (register-color "Dark Slate Grey" 12079 20303 20303) - (register-color "Dark Turquoise" 0 52942 53713) - (register-color "Dark Violet" 38036 0 54227) - (register-color "Deep Pink1" 65535 5140 37779) - (register-color "Deep Pink2" 61166 4626 35209) - (register-color "Deep Pink3" 52685 4112 30326) - (register-color "Deep Pink4" 35723 2570 20560) - (register-color "Deep Sky Blue1" 0 49087 65535) - (register-color "Deep Sky Blue2" 0 45746 61166) - (register-color "Deep Sky Blue3" 0 39578 52685) - (register-color "Deep Sky Blue4" 0 26728 35723) - (register-color "Dodger Blue1" 7710 37008 65535) - (register-color "Dodger Blue2" 7196 34438 61166) - (register-color "Dodger Blue3" 6168 29812 52685) - (register-color "Dodger Blue4" 4112 20046 35723) - (register-color "Firebrick" 45746 8738 8738) - (register-color "Firebrick1" 65535 12336 12336) - (register-color "Firebrick2" 61166 11308 11308) - (register-color "Firebrick3" 52685 9766 9766) - (register-color "Firebrick4" 35723 6682 6682) - (register-color "Floral White" 65535 64250 61680) - (register-color "Forest Green" 8738 35723 8738) - (register-color "Gainsboro" 56540 56540 56540) - (register-color "Ghost White" 63736 63736 65535) - (register-color "Gold1" 65535 55255 0) - (register-color "Gold2" 61166 51657 0) - (register-color "Gold3" 52685 44461 0) - (register-color "Gold4" 35723 30069 0) - (register-color "Goldenrod" 56026 42405 8224) - (register-color "Goldenrod1" 65535 49601 9509) - (register-color "Goldenrod2" 61166 46260 8738) - (register-color "Goldenrod3" 52685 39835 7453) - (register-color "Goldenrod4" 35723 26985 5140) - (register-color "Green Yellow" 44461 65535 12079) - (register-color "Green1" 0 65535 0) - (register-color "Green2" 0 61166 0) - (register-color "Green3" 0 52685 0) - (register-color "Green4" 0 35723 0) - (register-color "Grey" 48830 48830 48830) - (register-color "Grey0" 0 0 0) - (register-color "Grey1" 771 771 771) - (register-color "Grey10" 6682 6682 6682) - (register-color "Grey100" 65535 65535 65535) - (register-color "Grey11" 7196 7196 7196) - (register-color "Grey12" 7967 7967 7967) - (register-color "Grey13" 8481 8481 8481) - (register-color "Grey14" 9252 9252 9252) - (register-color "Grey15" 9766 9766 9766) - (register-color "Grey16" 10537 10537 10537) - (register-color "Grey17" 11051 11051 11051) - (register-color "Grey18" 11822 11822 11822) - (register-color "Grey19" 12336 12336 12336) - (register-color "Grey2" 1285 1285 1285) - (register-color "Grey20" 13107 13107 13107) - (register-color "Grey21" 13878 13878 13878) - (register-color "Grey22" 14392 14392 14392) - (register-color "Grey23" 15163 15163 15163) - (register-color "Grey24" 15677 15677 15677) - (register-color "Grey25" 16448 16448 16448) - (register-color "Grey26" 16962 16962 16962) - (register-color "Grey27" 17733 17733 17733) - (register-color "Grey28" 18247 18247 18247) - (register-color "Grey29" 19018 19018 19018) - (register-color "Grey3" 2056 2056 2056) - (register-color "Grey30" 19789 19789 19789) - (register-color "Grey31" 20303 20303 20303) - (register-color "Grey32" 21074 21074 21074) - (register-color "Grey33" 21588 21588 21588) - (register-color "Grey34" 22359 22359 22359) - (register-color "Grey35" 22873 22873 22873) - (register-color "Grey36" 23644 23644 23644) - (register-color "Grey37" 24158 24158 24158) - (register-color "Grey38" 24929 24929 24929) - (register-color "Grey39" 25443 25443 25443) - (register-color "Grey4" 2570 2570 2570) - (register-color "Grey40" 26214 26214 26214) - (register-color "Grey41" 26985 26985 26985) - (register-color "Grey42" 27499 27499 27499) - (register-color "Grey43" 28270 28270 28270) - (register-color "Grey44" 28784 28784 28784) - (register-color "Grey45" 29555 29555 29555) - (register-color "Grey46" 30069 30069 30069) - (register-color "Grey47" 30840 30840 30840) - (register-color "Grey48" 31354 31354 31354) - (register-color "Grey49" 32125 32125 32125) - (register-color "Grey5" 3341 3341 3341) - (register-color "Grey50" 32639 32639 32639) - (register-color "Grey51" 33410 33410 33410) - (register-color "Grey52" 34181 34181 34181) - (register-color "Grey53" 34695 34695 34695) - (register-color "Grey54" 35466 35466 35466) - (register-color "Grey55" 35980 35980 35980) - (register-color "Grey56" 36751 36751 36751) - (register-color "Grey57" 37265 37265 37265) - (register-color "Grey58" 38036 38036 38036) - (register-color "Grey59" 38550 38550 38550) - (register-color "Grey6" 3855 3855 3855) - (register-color "Grey60" 39321 39321 39321) - (register-color "Grey61" 40092 40092 40092) - (register-color "Grey62" 40606 40606 40606) - (register-color "Grey63" 41377 41377 41377) - (register-color "Grey64" 41891 41891 41891) - (register-color "Grey65" 42662 42662 42662) - (register-color "Grey66" 43176 43176 43176) - (register-color "Grey67" 43947 43947 43947) - (register-color "Grey68" 44461 44461 44461) - (register-color "Grey69" 45232 45232 45232) - (register-color "Grey7" 4626 4626 4626) - (register-color "Grey70" 46003 46003 46003) - (register-color "Grey71" 46517 46517 46517) - (register-color "Grey72" 47288 47288 47288) - (register-color "Grey73" 47802 47802 47802) - (register-color "Grey74" 48573 48573 48573) - (register-color "Grey75" 49087 49087 49087) - (register-color "Grey76" 49858 49858 49858) - (register-color "Grey77" 50372 50372 50372) - (register-color "Grey78" 51143 51143 51143) - (register-color "Grey79" 51657 51657 51657) - (register-color "Grey8" 5140 5140 5140) - (register-color "Grey80" 52428 52428 52428) - (register-color "Grey81" 53199 53199 53199) - (register-color "Grey82" 53713 53713 53713) - (register-color "Grey83" 54484 54484 54484) - (register-color "Grey84" 54998 54998 54998) - (register-color "Grey85" 55769 55769 55769) - (register-color "Grey86" 56283 56283 56283) - (register-color "Grey87" 57054 57054 57054) - (register-color "Grey88" 57568 57568 57568) - (register-color "Grey89" 58339 58339 58339) - (register-color "Grey9" 5911 5911 5911) - (register-color "Grey90" 58853 58853 58853) - (register-color "Grey91" 59624 59624 59624) - (register-color "Grey92" 60395 60395 60395) - (register-color "Grey93" 60909 60909 60909) - (register-color "Grey94" 61680 61680 61680) - (register-color "Grey95" 62194 62194 62194) - (register-color "Grey96" 62965 62965 62965) - (register-color "Grey97" 63479 63479 63479) - (register-color "Grey98" 64250 64250 64250) - (register-color "Grey99" 64764 64764 64764) - (register-color "Honeydew1" 61680 65535 61680) - (register-color "Honeydew2" 57568 61166 57568) - (register-color "Honeydew3" 49601 52685 49601) - (register-color "Honeydew4" 33667 35723 33667) - (register-color "Hot Pink" 65535 26985 46260) - (register-color "Hot Pink1" 65535 28270 46260) - (register-color "Hot Pink2" 61166 27242 42919) - (register-color "Hot Pink3" 52685 24672 37008) - (register-color "Hot Pink4" 35723 14906 25186) - (register-color "Indian Red" 52685 23644 23644) - (register-color "Indian Red1" 65535 27242 27242) - (register-color "Indian Red2" 61166 25443 25443) - (register-color "Indian Red3" 52685 21845 21845) - (register-color "Indian Red4" 35723 14906 14906) - (register-color "Ivory1" 65535 65535 61680) - (register-color "Ivory2" 61166 61166 57568) - (register-color "Ivory3" 52685 52685 49601) - (register-color "Ivory4" 35723 35723 33667) - (register-color "Khaki" 61680 59110 35980) - (register-color "Khaki1" 65535 63222 36751) - (register-color "Khaki2" 61166 59110 34181) - (register-color "Khaki3" 52685 50886 29555) - (register-color "Khaki4" 35723 34438 20046) - (register-color "Lavender" 59110 59110 64250) - (register-color "Lavender Blush1" 65535 61680 62965) - (register-color "Lavender Blush2" 61166 57568 58853) - (register-color "Lavender Blush3" 52685 49601 50629) - (register-color "Lavender Blush4" 35723 33667 34438) - (register-color "Lawn Green" 31868 64764 0) - (register-color "Lemon Chiffon1" 65535 64250 52685) - (register-color "Lemon Chiffon2" 61166 59881 49087) - (register-color "Lemon Chiffon3" 52685 51657 42405) - (register-color "Lemon Chiffon4" 35723 35209 28784) - (register-color "Light Blue" 44461 55512 59110) - (register-color "Light Blue1" 49087 61423 65535) - (register-color "Light Blue2" 45746 57311 61166) - (register-color "Light Blue3" 39578 49344 52685) - (register-color "Light Blue4" 26728 33667 35723) - (register-color "Light Coral" 61680 32896 32896) - (register-color "Light Cyan1" 57568 65535 65535) - (register-color "Light Cyan2" 53713 61166 61166) - (register-color "Light Cyan3" 46260 52685 52685) - (register-color "Light Cyan4" 31354 35723 35723) - (register-color "Light Goldenrod" 61166 56797 33410) - (register-color "Light Goldenrod Yellow" 64250 64250 53970) - (register-color "Light Goldenrod1" 65535 60652 35723) - (register-color "Light Goldenrod2" 61166 56540 33410) - (register-color "Light Goldenrod3" 52685 48830 28784) - (register-color "Light Goldenrod4" 35723 33153 19532) - (register-color "Light Gray" 54227 54227 54227) - (register-color "Light Green" 37008 61166 37008) - (register-color "Light Pink" 65535 46774 49601) - (register-color "Light Pink1" 65535 44718 47545) - (register-color "Light Pink2" 61166 41634 44461) - (register-color "Light Pink3" 52685 35980 38293) - (register-color "Light Pink4" 35723 24415 25957) - (register-color "Light Salmon1" 65535 41120 31354) - (register-color "Light Salmon2" 61166 38293 29298) - (register-color "Light Salmon3" 52685 33153 25186) - (register-color "Light Salmon4" 35723 22359 16962) - (register-color "Light Sea Green" 8224 45746 43690) - (register-color "Light Sky Blue" 34695 52942 64250) - (register-color "Light Sky Blue1" 45232 58082 65535) - (register-color "Light Sky Blue2" 42148 54227 61166) - (register-color "Light Sky Blue3" 36237 46774 52685) - (register-color "Light Sky Blue4" 24672 31611 35723) - (register-color "Light Slate Blue" 33924 28784 65535) - (register-color "Light Slate Grey" 30583 34952 39321) - (register-color "Light Steel Blue" 45232 50372 57054) - (register-color "Light Steel Blue1" 51914 57825 65535) - (register-color "Light Steel Blue2" 48316 53970 61166) - (register-color "Light Steel Blue3" 41634 46517 52685) - (register-color "Light Steel Blue4" 28270 31611 35723) - (register-color "Light Yellow1" 65535 65535 57568) - (register-color "Light Yellow2" 61166 61166 53713) - (register-color "Light Yellow3" 52685 52685 46260) - (register-color "Light Yellow4" 35723 35723 31354) - (register-color "Lime Green" 12850 52685 12850) - (register-color "Linen" 64250 61680 59110) - (register-color "Magenta1" 65535 0 65535) - (register-color "Magenta2" 61166 0 61166) - (register-color "Magenta3" 52685 0 52685) - (register-color "Maroon" 45232 12336 24672) - (register-color "Maroon1" 65535 13364 46003) - (register-color "Maroon2" 61166 12336 42919) - (register-color "Maroon3" 52685 10537 37008) - (register-color "Maroon4" 35723 7196 25186) - (register-color "Medium Orchid" 47802 21845 54227) - (register-color "Medium Orchid1" 57568 26214 65535) - (register-color "Medium Orchid2" 53713 24415 61166) - (register-color "Medium Orchid3" 46260 21074 52685) - (register-color "Medium Orchid4" 31354 14135 35723) - (register-color "Medium Purple" 37779 28784 56283) - (register-color "Medium Purple1" 43947 33410 65535) - (register-color "Medium Purple2" 40863 31097 61166) - (register-color "Medium Purple3" 35209 26728 52685) - (register-color "Medium Purple4" 23901 18247 35723) - (register-color "Medium Sea Green" 15420 46003 29041) - (register-color "Medium Slate Blue" 31611 26728 61166) - (register-color "Medium Spring Green" 0 64250 39578) - (register-color "Medium Turquoise" 18504 53713 52428) - (register-color "Medium Violet Red" 51143 5397 34181) - (register-color "Midnight Blue" 6425 6425 28784) - (register-color "Mint Cream" 62965 65535 64250) - (register-color "Misty Rose1" 65535 58596 57825) - (register-color "Misty Rose2" 61166 54741 53970) - (register-color "Misty Rose3" 52685 47031 46517) - (register-color "Misty Rose4" 35723 32125 31611) - (register-color "Moccasin" 65535 58596 46517) - (register-color "Navajo White1" 65535 57054 44461) - (register-color "Navajo White2" 61166 53199 41377) - (register-color "Navajo White3" 52685 46003 35723) - (register-color "Navajo White4" 35723 31097 24158) - (register-color "Navy Blue" 0 0 32896) - (register-color "Old Lace" 65021 62965 59110) - (register-color "Olive Drab" 27499 36494 8995) - (register-color "Olive Drab1" 49344 65535 15934) - (register-color "Olive Drab2" 46003 61166 14906) - (register-color "Olive Drab3" 39578 52685 12850) - (register-color "Olive Drab4" 26985 35723 8738) - (register-color "Orange Red1" 65535 17733 0) - (register-color "Orange Red2" 61166 16448 0) - (register-color "Orange Red3" 52685 14135 0) - (register-color "Orange Red4" 35723 9509 0) - (register-color "Orange1" 65535 42405 0) - (register-color "Orange2" 61166 39578 0) - (register-color "Orange3" 52685 34181 0) - (register-color "Orange4" 35723 23130 0) - (register-color "Orchid" 56026 28784 54998) - (register-color "Orchid1" 65535 33667 64250) - (register-color "Orchid2" 61166 31354 59881) - (register-color "Orchid3" 52685 26985 51657) - (register-color "Orchid4" 35723 18247 35209) - (register-color "Pale Goldenrod" 61166 59624 43690) - (register-color "Pale Green" 39064 64507 39064) - (register-color "Pale Green1" 39578 65535 39578) - (register-color "Pale Green3" 31868 52685 31868) - (register-color "Pale Green4" 21588 35723 21588) - (register-color "Pale Turquoise" 44975 61166 61166) - (register-color "Pale Turquoise1" 48059 65535 65535) - (register-color "Pale Turquoise2" 44718 61166 61166) - (register-color "Pale Turquoise3" 38550 52685 52685) - (register-color "Pale Turquoise4" 26214 35723 35723) - (register-color "Pale Violet Red" 56283 28784 37779) - (register-color "Pale Violet Red1" 65535 33410 43947) - (register-color "Pale Violet Red2" 61166 31097 40863) - (register-color "Pale Violet Red3" 52685 26728 35209) - (register-color "Pale Violet Red4" 35723 18247 23901) - (register-color "Papaya Whip" 65535 61423 54741) - (register-color "Peach Puff1" 65535 56026 47545) - (register-color "Peach Puff2" 61166 52171 44461) - (register-color "Peach Puff3" 52685 44975 38293) - (register-color "Peach Puff4" 35723 30583 25957) - (register-color "Pink" 65535 49344 52171) - (register-color "Pink1" 65535 46517 50629) - (register-color "Pink2" 61166 43433 47288) - (register-color "Pink3" 52685 37265 40606) - (register-color "Pink4" 35723 25443 27756) - (register-color "Plum" 56797 41120 56797) - (register-color "Plum1" 65535 48059 65535) - (register-color "Plum2" 61166 44718 61166) - (register-color "Plum3" 52685 38550 52685) - (register-color "Plum4" 35723 26214 35723) - (register-color "Powder Blue" 45232 57568 59110) - (register-color "Purple" 41120 8224 61680) - (register-color "Purple1" 39835 12336 65535) - (register-color "Purple2" 37265 11308 61166) - (register-color "Purple3" 32125 9766 52685) - (register-color "Purple4" 21845 6682 35723) - (register-color "Red1" 65535 0 0) - (register-color "Red2" 61166 0 0) - (register-color "Red3" 52685 0 0) - (register-color "Rosy Brown" 48316 36751 36751) - (register-color "Rosy Brown1" 65535 49601 49601) - (register-color "Rosy Brown2" 61166 46260 46260) - (register-color "Rosy Brown3" 52685 39835 39835) - (register-color "Rosy Brown4" 35723 26985 26985) - (register-color "Royal Blue" 16705 26985 57825) - (register-color "Royal Blue1" 18504 30326 65535) - (register-color "Royal Blue2" 17219 28270 61166) - (register-color "Royal Blue3" 14906 24415 52685) - (register-color "Royal Blue4" 10023 16448 35723) - (register-color "Salmon" 64250 32896 29298) - (register-color "Salmon1" 65535 35980 26985) - (register-color "Salmon2" 61166 33410 25186) - (register-color "Salmon3" 52685 28784 21588) - (register-color "Salmon4" 35723 19532 14649) - (register-color "Sandy Brown" 62708 42148 24672) - (register-color "Sea Green1" 21588 65535 40863) - (register-color "Sea Green2" 20046 61166 38036) - (register-color "Sea Green3" 17219 52685 32896) - (register-color "Sea Green4" 11822 35723 22359) - (register-color "Seashell1" 65535 62965 61166) - (register-color "Seashell2" 61166 58853 57054) - (register-color "Seashell3" 52685 50629 49087) - (register-color "Seashell4" 35723 34438 33410) - (register-color "Sienna" 41120 21074 11565) - (register-color "Sienna1" 65535 33410 18247) - (register-color "Sienna2" 61166 31097 16962) - (register-color "Sienna3" 52685 26728 14649) - (register-color "Sienna4" 35723 18247 9766) - (register-color "Sky Blue" 34695 52942 60395) - (register-color "Sky Blue1" 34695 52942 65535) - (register-color "Sky Blue2" 32382 49344 61166) - (register-color "Sky Blue3" 27756 42662 52685) - (register-color "Sky Blue4" 19018 28784 35723) - (register-color "Slate Blue" 27242 23130 52685) - (register-color "Slate Blue1" 33667 28527 65535) - (register-color "Slate Blue2" 31354 26471 61166) - (register-color "Slate Blue3" 26985 22873 52685) - (register-color "Slate Blue4" 18247 15420 35723) - (register-color "Slate Gray1" 50886 58082 65535) - (register-color "Slate Gray2" 47545 54227 61166) - (register-color "Slate Gray3" 40863 46774 52685) - (register-color "Slate Gray4" 27756 31611 35723) - (register-color "Slate Grey" 28784 32896 37008) - (register-color "Snow1" 65535 64250 64250) - (register-color "Snow2" 61166 59881 59881) - (register-color "Snow3" 52685 51657 51657) - (register-color "Snow4" 35723 35209 35209) - (register-color "Spring Green1" 0 65535 32639) - (register-color "Spring Green2" 0 61166 30326) - (register-color "Spring Green3" 0 52685 26214) - (register-color "Spring Green4" 0 35723 17733) - (register-color "Steel Blue" 17990 33410 46260) - (register-color "Steel Blue1" 25443 47288 65535) - (register-color "Steel Blue2" 23644 44204 61166) - (register-color "Steel Blue3" 20303 38036 52685) - (register-color "Steel Blue4" 13878 25700 35723) - (register-color "Tan" 53970 46260 35980) - (register-color "Tan1" 65535 42405 20303) - (register-color "Tan2" 61166 39578 18761) - (register-color "Tan3" 52685 34181 16191) - (register-color "Tan4" 35723 23130 11051) - (register-color "Thistle" 55512 49087 55512) - (register-color "Thistle1" 65535 57825 65535) - (register-color "Thistle2" 61166 53970 61166) - (register-color "Thistle3" 52685 46517 52685) - (register-color "Thistle4" 35723 31611 35723) - (register-color "Tomato1" 65535 25443 18247) - (register-color "Tomato2" 61166 23644 16962) - (register-color "Tomato3" 52685 20303 14649) - (register-color "Tomato4" 35723 13878 9766) - (register-color "Turquoise" 16448 57568 53456) - (register-color "Turquoise1" 0 62965 65535) - (register-color "Turquoise2" 0 58853 61166) - (register-color "Turquoise3" 0 50629 52685) - (register-color "Turquoise4" 0 34438 35723) - (register-color "Violet" 61166 33410 61166) - (register-color "Violet Red" 53456 8224 37008) - (register-color "Violet Red1" 65535 15934 38550) - (register-color "Violet Red2" 61166 14906 35980) - (register-color "Violet Red3" 52685 12850 30840) - (register-color "Violet Red4" 35723 8738 21074) - (register-color "Wheat" 62965 57054 46003) - (register-color "Wheat1" 65535 59367 47802) - (register-color "Wheat2" 61166 55512 44718) - (register-color "Wheat3" 52685 47802 38550) - (register-color "Wheat4" 35723 32382 26214) - (register-color "Yellow1" 65535 65535 0) - (register-color "Yellow2" 61166 61166 0) - (register-color "Yellow3" 52685 52685 0) - (register-color "Yellow4" 35723 35723 0) --- 0 ---- diff -crNP ../siag-3.3.2/common/common.c ./common/common.c *** ../siag-3.3.2/common/common.c Mon Mar 20 17:25:49 2000 --- ./common/common.c Thu Apr 6 18:27:52 2000 *************** *** 52,57 **** --- 52,120 ---- char *siag_tmpdir; /* $HOME/.siag/tmp */ char *version; /* version string */ + static struct { + char *name; + int value; + } cchar[] = { + {"quot", '"'}, {"amp", '&'}, {"lt", '<'}, {"gt", '>'}, + {"nbsp", 160}, {"iexcl", 161}, {"cent", 162}, {"pound", 163}, + {"curren", 164}, {"yen", 165}, {"brvbar", 166}, {"sect", 167}, + {"uml", 168}, {"copy", 169}, {"ordf", 170}, {"laquo", 171}, + {"not", 172}, {"shy", 173}, {"reg", 174}, {"macr", 175}, + {"deg", 176}, {"plusmn", 177}, {"sup2", 178}, {"sup3", 179}, + {"acute", 180}, {"micro", 181}, {"para", 182}, {"middot", 183}, + {"cedil", 184}, {"sup1", 185}, {"ordm", 186}, {"raquo", 187}, + {"frac14", 188}, {"frac12", 189}, {"frac34", 190}, {"iquest", 191}, + {"Agrave", 192}, {"Aacute", 193}, {"Acirc", 194}, {"Atilde", 195}, + {"Auml", 196}, {"Aring", 197}, {"AElig", 198}, {"Ccedil", 199}, + {"Egrave", 200}, {"Eacute", 201}, {"Ecirc", 202}, {"Euml", 203}, + {"Igrave", 204}, {"Iacute", 205}, {"Icirc", 206}, {"Euml", 207}, + {"ETH", 208}, {"Ntilde", 209}, {"Ograve", 210}, {"Oacute", 211}, + {"Ocirc", 212}, {"Otilde", 213}, {"Ouml", 214}, {"times", 215}, + {"Oslash", 216}, {"Ugrave", 217}, {"Uacute", 218}, {"Ucirc", 219}, + {"Uuml", 220}, {"Yacute", 221}, {"THORN", 222}, {"szlig", 223}, + {"agrave", 224}, {"aacute", 225}, {"acirc", 226}, {"atilde", 227}, + {"auml", 228}, {"aring", 229}, {"aelig", 230}, {"ccedil", 231}, + {"egrave", 232}, {"eacute", 233}, {"ecirc", 234}, {"euml", 235}, + {"igrave", 236}, {"iacute", 237}, {"icirc", 238}, {"iuml", 239}, + {"eth", 240}, {"ntilde", 241}, {"ograve", 242}, {"oacute", 243}, + {"ocirc", 244}, {"otilde", 245}, {"ouml", 246}, {"divide", 247}, + {"slash", 248}, {"ugrave", 249}, {"uacute", 250}, {"ucirc", 251}, + {"uuml", 252}, {"yacute", 253}, {"thorn", 254}, {"yuml", 255}, + {NULL, 0} + }; + + /* convert Auml to Ä and #33 to ! */ + int from_cchar(char *from) + { + int i; + + if (from[0] == '#') { + i = atoi(from+1); + if (i >= ' ' && i <= 255) return i; + return -1; + } + for (i = 0; cchar[i].name; i++) { + if (!strcmp(cchar[i].name, from)) return cchar[i].value; + } + return -1; + } + + /* convert Ä to Ä and so on */ + void to_cchar(char *to, int from) + { + int i; + + for (i = 0; cchar[i].value; i++) { + if (from == cchar[i].value) { + sprintf(to, "&%s;", cchar[i].name); + return; + } + } + to[0] = from; + to[1] = '\0'; + } + void common_init(char *fmt) { char *home = getenv("SIAGHOME"); diff -crNP ../siag-3.3.2/common/common.h ./common/common.h *** ../siag-3.3.2/common/common.h Thu Mar 23 10:09:18 2000 --- ./common/common.h Thu Apr 6 18:19:20 2000 *************** *** 30,35 **** --- 30,37 ---- extern char *siag_basedir; extern char *siag_tmpdir; extern char *version; + extern int from_cchar(char *); + extern void to_cchar(char *, int); extern void common_init(char *); extern void chomp(char *); extern int itsayes(char *); diff -crNP ../siag-3.3.2/common/dictionary.cs ./common/dictionary.cs *** ../siag-3.3.2/common/dictionary.cs Thu Jan 1 01:00:00 1970 --- ./common/dictionary.cs Fri Apr 7 05:56:43 2000 *************** *** 0 **** --- 1,680 ---- + #Czech localization of Siag Office + #Česká lokalizace pro Siag Office + # + #Authors: + #Autoři: + #LinArt Team, Petr Klíma, Martin Klozik + # + #Send comments to: + #Připomínky posílejte na adresy: + #xklima08@dcse.fee.vutbr.cz + #xklozi00@dcse.fee.vutbr.cz + + About Egon Animator O programu Egon Animator + About Egon Animator... O programu Egon Animator... + About Gvu... O programu Gvu... + About O + About Pathetic Writer O programu Pathetic Writer + About Pathetic Writer... O programu Pathetic Writer... + About Siag Office... O balíku Siag Office + About Siag O programu Siag + About Siag... O programu Siag... + About XedPlus... O programu XedPlus... + About Xfiler... O programu Xfiler... + Abstract Výtah + Acces Permissions Omezení přístupu + Accept Přijmout + Add Arc Vložit oblouk + Add Ellipse Vložit elipsu + Add Filled Arc Vložit plný oblouk + Add Filled Ellipse Vložit plnou elipsu + Add Filled Rectangle Vložit plný obdélník + Add Image Vložit obrázek + Add Vložit + Add Line Vložit čáru + Add Object Vložit objekt + Add Point Vložit bod + Add Property Vložit hodnotu + Add Rectangle Vložit obdélník + Address Adresa + Add Sheet Přidat list + Add String Vložit text + Add the contents of the block Vložit obsah bloku + Add Tick Vložit klíč + Add tick Vložit klíč + Adjustment Nastavení + Advanced Rozšířené + A file manager for X Správce souborů pro X + Alert Výstraha + All files (*) Libovolný (*) + Already defining kbd macro! Již se definuje klávesové makro! + Another Form Test Jiný test formuláře + Another Form Test Still Another Form Test Still + A postscript viewer for X Prohlížeč postscriptových dokumentů pro X + App Aplikace + Applets Aplety + Arc Oblouk + Archive Archív + A spreadsheet for X Tabulkový procesor pro X + Attempt to delete sole ordinary window Pokus o smazání jediného okna + Attributes Atributy + Authors: Autoři: + Autofill: Plnění: + Autoindent: Odsazování: + A word processor for X Textový procesor pro X + Background Color Barva pozadí + Backup Copies Záložní kopie + Backward Nahoru + Begin Empty Animation Začít prázdnou animaci + Beginning of buffer Začátek bufferu + Beginning of paragraph Začátek odstavce + Begin Začátek + Black Černá + black černá + Block Average Průměr bloku + Block Blok + Block Color Barva bloku + Block Format Formát bloku + Block Maximum Maximum bloku + Block Minimum Minimum bloku + Block Style Styl bloku + Block Sum Součet bloku + Blue Modrá + blue modrá + Bold text Tučný text + Bold Tučně + Borders Okraje + Both Oba + Bottom of buffer Dno bufferu + Bottom Spodek + Bottom: Spodek: + Box Animation Demo Ukázka animace krychle + Boxes Krychle + Box Krychle + Calculator Kalkulátor + Call Sed Spustit Sed + Cancel Zrušit + Cannot create backup file! Není možné vytvořit záložní kopii! + Cannot create file! Není možné vytvořit soubor! + Cannot open file for reading! Neni možné otevřít soubor pro čtení! + Cannot open file! Není možné otevřít soubor! + Cannot save file! Není možné uložit soubor! + Can't execute anonymous macro while defining one V průběhu definice makra nelze spustit anonymní makro + Can't make postscript Není možné vytvořit postscript + C Command Příkaz C + C command: Příkaz C: + Cell Buňka + Cell Color Barva buňky + Cell Format Formát buňky + Cell Protection Zamknutí buňky + Cell Style Styl buňky + Centered text Zarovnání na střed + Center page Vystředit stránku + Center Střed + C Expression Výraz v C + C expression: Výraz v C: + Circle Animation Demo Ukázka animace kruhu + Circle Kružnice + Cleanup Standardní formát + Close Buffer: Zavřít buffer: + Close Zavřít + Close Window: Zavřít okno: + Code: Kód: + Color: Barva: + color barva + Columns Ascending as Numbers Sloupce vzestupně jako čísla + Columns Ascending as Text Sloupce vzestupně jako text + Columns Descending as Numbers Sloupce sestupně jako čísla + Columns Descending as Text Sloupce sestupně jako text + Column Width Šířka sloupce + Combo Animation Demo Ukázka kombinované animace + Combo Kombinace + Comma Čárka + Command Příkaz + Command: Příkaz: + Commands Příkazy: + Command Window Příkazové okno + Compressed Archive Komprimovaný archív + Compressed File Komprimovaný soubor + Contents Obsah + Copy Block Kopie bloku + Copying Licence + Copy Kopírovat + Copy... Kopírovat... + Copyright... Copyright... + Copy to: Kam: + Couldn't kill last buffer Chyba při mazání posledního bufferu + Couldn't save Chyba při zápisu + Create file: Nový soubor: + Create folder Nový adresář + Create folder: Nový adresář: + Currency Měna + Cursor position Pozice kurzoru + Custom Vlastní + Cut Vyříznout + Cyan Modrozelená + cyan modrozelená + Data Data + Data Entry Vstup dat + Date Datum + Date: Datum: + Decrease magstep Zmenšit + Defaults Standardní + Default Standardní + Define Style Nastavit styl + Defining kbd macro... Definice klávesového makra... + Delete Block Smazat blok + Delete Buffer Smazat buffer + Delete Object Smazat objekt + Delete Odstranit + Delete Tick Smazat klíč + Delta Krok + Deselect all Odznačit vše + Direction: Směr: + Directories Adresáře + Directory: Adresář: + Disable Helptexts Zakázat pomocné texty + Disable Zakázat + Dismiss Zavřít + Display copyright information Zobrazení licenčních podmínek + Display online help Zobrazení on-line nápovědy + Display the Egon online documentation Zobrazení on-line dokumentace Egonu + Display the Gnu general public license Zobrazení licence GNU GPL. + Display the online documentation Zobrazení on-line dokumentace + Display the PW online documentation Zobrazení on-line dokumentace PW + Display the Siag online documentation Zobrazení on-line dokumentace Siagu + done. hotovo. + Dots Tečky + Down Dolů + Draw borders around the block Orámování bloku + Draw grid lines in the block Mřížka v bloku + Dump Words Zobraz slova + Duration Trvání + Edit Editace + Editor Editor + Edit Applications Editovat programy + Edit Properties Změnit vlastnosti + Edit Record Editovat záznam + Ellipse Elipsa + Embed Vnořit + Embed Object Vnořit objekt + EMPTY PRÁZDNÝ + Empty Prázdný + End Konec + End of buffer Konec bufferu + End of paragraph Konec odstavce + Enter Date Vložit datum + Enter Time Vložit čas + Enter user data Vložit uživatelská data + Environment Prostředí + ERROR CHYBA + Error in Print Command String Chyba v příkazu pro tisk + Examples Ukázky + Exit Ukončit + Export Export + Expression style: Styl výrazu: + Expression Výraz + External Program: Externí program: + External program failed Externí program selhal + Extra Extra + Family name: Příjmení: + File does not exist and directory is write protected! Soubor neexistuje a adresář je chráněn proti zápisu! + File has been modified by someone else! Soubor byl změněn někým jiným! + File Manager Správce souborů + File manager Správce souborů + File Name: Soubor: + File saved Soubor uložen + File Soubor + Filename pattern: Najdi soubor podle vzoru: + File opened READ ONLY Soubor oteřen POUZE PRO ČTENÍ + Files Soubory + Fill Block Vyplnit blok + Filled Arc Plný oblouk + Filled Ellipse Plná elipsa + Filled Rectangle Plný obdélník + Find Backward Hledat zpětně + Find Bracket Hledat závorku + Find Hledat + Find file Hledat soubor + Find pattern: Hledaný text: + First name Jméno + First Page Number Číslo první stránky + First page number: Číslo první stránky: + Fit Block Automaticky + Fit Block Height Automatická výška + Fit Block Width Automatická šířka + Fixed Pevná + Folder Adresář + Font Font + Footer: Zápatí: + Foreground Color Barva textu + Format Formát + Format: Formát: + Form Test Test formuláře + Forward Dolů + FTP Directory FTP adresář + Function A-F Funkce A-F + Function G-L Funkce G-L + Function M-S Funkce M-S + Function T-Z Funkce T-Z + Generic Všeobecný + Go to folder: Jít do adr.: + Go To Jít na + Go to... Jit na... + Go to: Jít na: + Go to home directory Jít do domovského adresáře + Go up one directory Jít o úroveň nahoru + Green Zelená + green zelená + Grid Lines Mřížka + Grid Mřížka + Group Skupina + Guile Command Příkaz Guile + Guile command: Příkaz Guile: + Guile Expression Výraz Guile + Guile expression: Výraz Guile: + Header and Footer Záhlaví a zápatí + Header on first page Záhlaví na první stránce + Has ticks Má klíče + Has titles Má názvy + Header: Záhlaví: + Header 1 Nadpis 1 + Header 2 Nadpis 2 + Header 3 Nadpis 3 + Header 4 Nadpis 4 + Header 5 Nadpis 5 + Header 6 Nadpis 6 + Height Výška + Height: Výška: + Help browser Prohlížeč nápovědy + Help for Help Nápověda nápovědy + Help Nápověda + Help... Nápověda... + Helptexts Pomocné texty + Hex Hexadecimální + Hide Editor Schovat editor + Hide editor Schovat editor + Hide folders Schovat adresáře + Hide Schovat + Home Domů + Change bg: Barva pozadí: + Change Buffer Změna bufferu + Change Buffer: Změna bufferu: + Change Default Interpreter Změnit standardní interpreter + Change default interpreter Změnit standardní interpreter + Change family: Změnit font: + Change fg: Barva textu: + Change Object Type Změnit typ objektu + Change %s: Změnit %s: + Change sort mode: Změnit styl řazení + Change style: Změnit styl: + Change the color Změna barvy + Change the display style Změna stylu + Change the font family Změna fontu + Change the font size Změna velikosti fontu + Change view mode Změnit styl vzhledu + Change Window Změnit okno + Changing access permissions for %s Mění se práva přístupu k %s + Check Brackets Kontrola závorek + Icons Ikony + Identify Cell Identifikovat buňku + Ignore Ignorovat + Image Obrázek + Import Import + Import Plugin Importuj plugin + Impulses Impulsy + Increase magstep Zvětšit + Input buffer overflow; macro execution terminated Přetečení vstupního bufferu; provádení makra ukončeno + Insert Column Vložit sloupec + Insert Line Vložit řádek + Insert Vložit + -Insert- -Vložit- + Integer Celé číslo + Integration Integrace + Invisible Neviditelné + Italic Kurzíva + Italic text Kurzíva + Jump Jít na + Keyboard macro defined Klávesové makro je nadefinováno + Key Klíč + Kill Buffer: Smaž buffer: + LABEL JMENOVKA + Label Jmenovka + Label: Jmenovka: + Landscape Naležato + Last Modification Poslední změna + Last name Příjmení + Last Status Change Poslední změna stavu + Left adjusted text Zarovnání vlevo + Left Levý + Left: Levý: + Length Délka + Line Animation Demo Ukázka animací čar + Line Color Barva čáry + Line Format Formát čáry + Line Height Výška řádky + Line in buffer Řádek bufferu + Line number? Číslo řádku? + Line Řádek + Line: Řádek: + Line Style Styl čáry + Lines Řádky + Linespoints Bodové čáry + Link Odkaz + Link... Odkaz... + Links Odkazy + Link to: Odkaz na: + List Selection Výběr listů + Load auto startup code? Nahrát samozaváděcí kód? + Load External Import dokumentu + Loading Nahrává se + Local File Lokální soubor + Logarithmic X axis Logaritmická x-ová osa + Logarithmic Y axis Logaritmická y-ová osa + Magenta Fialová + magenta Fialová + Magstep Lupa + Mail Pošta + Margins Okraje + Mark Označit + Media Papír + Misc Různe + Mix folders/files Míchat adresáře/soubory + Move Plugin Přesunout plugin + Move Přesunout + Move... Přesunout... + Move Sheet Přesunout list + Move to: Přesunout na: + Name: Jméno: + Name Jméno + Never Nikdy + New expression interpreter: Nový interpreter výrazů: + New file Nový soubor + New Nový dokument + New... Nový... + New Xedplus Nové okno programu Xedplus + Next animation frame Další snímek animace + Next Další + Next frame Další snímek + Next page Další stránka + No files found Nenalezeny žádné soubory + No file yet Zatím žádný soubor + No Ne + None Žádný + None selected Nic nevybráno + No object selected Není vybrán žádný objekt + No such buffer Žádný buffer + Not defining kbd macro Nedefinuje se klávesové makro + No warranty Bez záruky + Object file: Soubor objektu: + Objects Objekty + Object type: Typ objektu: + Okay OK + OK OK + One Window Jedno okno + Open an Egon Animator document Otevřít dokument programu Egon Animator + Open a Pathetic Writer document Otevřít dokument programu Pathetic Writer + Open a PostScript file Otevřít postscriptový soubor + Open a Siag document Otevřít dokument programu Siag + Open a text file Otevřít textový soubor + Open command window Otevřít příkazové okno + Open file Otevřít soubor + Open Object Otevřit objekt + Open Otevřít... + Open... Otevřít... + Open With... Čím otevřít... + Open with... Čím otevřít ... + Options Možnosti + Orientation Orientace + Orientation: Orientace: + Original: Originál: + Other Ostatní + Others Ostatní + Overwrite existing %s? Přepsat existující %s? + -Overwrite- -Přepsat- + Owner Vlastník + Page Stránka + Paper Size Velikost stránky + Parameters: Parametry: + Parametric Parametrický + Part of Siag Office Část balíku Siag Office + Paste Vložit + Pause the animation Pozastavit animaci + Percent Procent + Perform a stream-editor command (sed) Provést příkaz proudového editoru (sed) + Perform a User command Provést uživatelský příkaz + Perform a User pipe Provést uživatelskou rouru + Permissions... Omezení... + Pick one: Vyberte: + Pipe Roura + Pipes Roury + Pixmap Pixmapa + Play Animation Přehrát animaci + Play animation Přehrát animaci + Play the animation Přehrát animaci + Plot Graf + Plot the contents of the block using lines Čárový graf obsahu bloku + Plugin Plugin + Point Bod + Points Body + Pop down animation Schovat animaci + Portrait Nastojato + Preformatted Předformátováno + Previewer Prohlížeč + Preview Náhled + Preview the contents of the current buffer Zobrazit obsah bufferu + Previous animation frame Předchozí snímek animace + Previous frame Předchozí snímek + Previous page Předchozí stránka + Previous Předchozí + Print Command Příkaz pro tisk + Printer Tiskárna + Printer Name: Tiskárna: + Print Format Formát tisku + Print marked pages... Tisk vybraných stránek... + Print Selection Tisknout výběr + Print the contents of the current buffer Tisk aktuálního bufferu + Print the file Tisk souboru + Print the marked pages Tisk vybraných stránek + Print Tisk + Print... Tisk... + Properties Vlastnosti + Protect Cells Zamknout buňku + Quit animation Ukonči animaci + Quit Egon Ukonči Egona + Quit Konec + Recalculate Přepočítat + Rectangle Obdélník + Red Červená + Redo Znovu + Redisplay Překreslit + Reference Style Styl odkazu + Remove Column Odstranit sloupec + Remove grid lines from the block Odstranit mřížku z bloku + Remove Line Odstranit řádek + Remove Object Smazat objekt + Remove Protection Odemknout + Remove Sheet Odstranit list + Remove Window Zavřít okno + Remove Odstranit + Rename Sheet Přejmenovat list + Reopen Znovu otevřít + Replace all Nahradit vše + Replacement: Náhrada: + Replace Nahradit + Replace Selection Nahradit výběr + Replace veto Nechat + Replace with: Nahradit čím: + Resize Změnit velikost + Respect protection Respektovat zamknutí + Respect Respektovat + Restore Obnovit + Right adjusted text Zarovnání vpravo + Right Pravý + Right: Pravý: + Row Height Výška řádku: + Rows Ascending as Numbers Řádky vzestupně jako čísla + Rows Ascending as Text Řádky vzestupně jako text + Rows Descending as Numbers Řádky sestupně jako čísla + Rows Descending as Text Řádky sestupně jako text + [%s at %d] [size = %dx%d] [duration=%d delta=%d] [%s v %d] [velikost = %dx%d] [trvání=%d krok=%d] + Save Application Uložit program + Save As Uložit jako + Saved as %s Uložit jako %s + Saved %s Uložen: %s + Save External Export dokumentu + Save file Uložit soubor + Save marked pages... Uložit vybrané stránky... + Save Object Uložit objekt + Save Preferences Uložit nastavení + Save Selection Uložit výběr + Save %s ? Uložit %s ? + Save %s? Uložit %s? + Save the contents of the current buffer Uložení obsahu aktuálního bufferu + Save the file Uložit soubor + Save the marked pages Uložení vybraných stránek + Save Uložit + Saving Ukládá se + Scientific Vědecký + %s command: Příkaz %s: + Search at: Začátek: + Search for: Maska: + Search: Hledání: + Search Hledat + Search Selection Hledat výběr + Seascape Seascape + Segment Color Barva segmentu + Segment Format Formát segmentu + Segment Style Styl segmentu + Select All Vybrat vše + Select all Vybrat vše + Select everything Vybrat vše + Select File Vyberte soubor + Selection End Konec výběru + Selection Start Začátek výběru + Select Plugin: Vyberte plugin: + Select... Vybrat... + Set Background Nastavit pozadí + Set Block Označit blok + Set Default Format Standardní formát + Set Default Standard + Set Geometry Geometrie + Set Mark Začátek bloku + Set Nastavit + Settings Vlastnosti stránky + %s expression: Výraz %s: + Sheet %d List %d + Shift Selection Left Posunout výběr doleva + Shift Selection Right Posunout výběr doprava + Show Editor Ukázat editor + Show editor Ukázat editor + Show hidden files Ukázat skryté soubory + Show Ukázat + Scheme In A Grid SIAG + Siag Home Domovská stránka Siag Office + Siag (Scheme In A Grid) %s. No Warranty. Siag (Scheme In A Grid) %s. Bez záruky. + Siag-net Siag-net + SIOD Command Příkaz SIODu + SIOD command: Příkaz SIODu: + SIOD Expression Výraz SIODu + SIOD expression: Výraz SIODu: + Size Velikost + Size: Velikost: + Skip Přeskočit + Smart Fill Block Inteligentní vyplnění bloku + Sort ascending Setřídit vzestupně + Sort by date Seřadit podle data + Sort by name Seřadit podle jména + Sort by size Seřadit podle velikosti + Sort descending Setřídit sestupně + Sort Setřídit + Special Další + Special Char Vložit znak + Spelling checker Kontrola pravopisu + Spell Kontrola pravopisu + Spell Test Slovník + Split Window Rozdělit okno + Start another editor Nový editor + Start another instance of Egon Animator Nové okno programu Egon Animator + Start another instance of Pathetic Writer Nové okno programu Pathetic Writer + Start another instance of Siag Nové okno programu Siag + Start at: Začít na: + Steps Kroky + Stop animation Zastavit animaci + Stop Zastavit + String Retězec + Style %s changed Styl % změněn + Style Styl + Subscript Dolní index + Sum Součet + Superscript Horní index + Surface Povrch + Swap Landscape Ozrcadlit + Symbolic Lint To Symbolický odkaz + Tab Distance Tabulátory + Tab distance: Velikost tabulátoru: + Tab size: Tabulátor: + Tcl Command Příkaz Tcl + Tcl command: Příkaz Tcl: + Tcl Expression Výraz Tcl + Tcl expression: Výraz Tcl: + Terminal Terminál + Text editor Textový editor + Textbeginning Začátek + Textending Konec + Text Text + The interactive text editor for X Interaktivní textový editor pro X + This command does nothing Tento příkaz nedělá nic + This program is part of Siag Office,\nan effort to create a full-featured, free\noffice package for Unix and X. Tento program je částí Siag Office,\n pokusu vytvořit úplný, bezplatný\nkancelářský balík pro Unix a X. + This window is too small to split Příliš malé okno na rozdělení + Ticks Klíč + Time Difference Časový rozdíl + Time Čas + Time: Čas: + Timing Časování + Title Titul + To: Komu: + Toggle overwrite/insert Přepnout přepis/vkládání + Tools Nástroje + Top of buffer Vrchol bufferu + Top Vrchol + Top: Vrchol: + Type: Typ: + Tree Strom + Underlined text Podtržený text + Underline Podtržení + Underline the block Podtržení bloku + Undo it Zpět + Undo Zpět + Unmark Odznačit + Unsaved Changes! Neuložené změny! + Unset Block Odznačit blok + Update icons Obnovit ikony + Up Nahoru + Upside-down Vzhůru nohama + Use Použít + User 1 Uživatelský 1 + User 2 Uživatelský 2 + User 3 Uživatelský 3 + User 4 Uživatelský 4 + User 5 Uživatelský 5 + Value Hodnota + View Pohled + Visible Viditelný + Warning! Varování! + Web Server Server WWW + Which format? Vybrat formát + White Bílá + white bílá + Width Šířka + Width: Šířka: + Window Okno + Wizard Průvodce + Word Slovo + Word: Slovo: + Wrap mode: Zalamování + Yellow Žlutá + yellow žlutá + Yes Ano + Yet Another Form Test Ještě jiný test formuláře + zoom lupa diff -crNP ../siag-3.3.2/common/dictionary.da ./common/dictionary.da *** ../siag-3.3.2/common/dictionary.da Wed Feb 16 08:01:43 2000 --- ./common/dictionary.da Wed Apr 5 01:50:32 2000 *************** *** 1,11 **** Siag (Scheme In A Grid) %s. No Warranty. Siag (Scheme In A Grid) %s. Ingen garanti. File Filer ! Edit Rediger Block Blok Format Format Data Data ! Plugin Plugin Window Vindue Plot Diagram Tools Vćrktřj --- 1,11 ---- Siag (Scheme In A Grid) %s. No Warranty. Siag (Scheme In A Grid) %s. Ingen garanti. File Filer ! Edit Redigér Block Blok Format Format Data Data ! Plugin Indstik Window Vindue Plot Diagram Tools Vćrktřj *************** *** 13,37 **** Start another instance of Siag Start en ny Siag Open a Siag document Ĺbn et dokument Save the contents of the current buffer Gem det ĺbne dokument ! Preview the contents of the current buffer Forsmag pĺ det endelige resultat Print the contents of the current buffer Udskriv det ĺbne dokument Spelling checker Stavekontrol Cut Klip ! Copy Kopier Paste Indsćt Undo Fortryd ! Sort ascending Sorter stigende ! Sort descending Sorter faldende Plot the contents of the block using lines Plot indholdet af blokken ved hjćlp af linjer Add the contents of the block Tilfřj indholdet af blokken Display the Siag online documentation Vis onlinehjćlp for Siag Display the Gnu general public license Vis Gnu-licensvilkĺr ! Change the font family Vćlg skrifttype ! Change the font size Vćlg skriftstřrrelse Change the display style Vćlg stil ! Change the color Vćlg farve ! Bold text Fed ! Italic text Kursiv Left adjusted text Venstrejusteret Centered text Centreret Right adjusted text Hřjrejusteret --- 13,37 ---- Start another instance of Siag Start en ny Siag Open a Siag document Ĺbn et dokument Save the contents of the current buffer Gem det ĺbne dokument ! Preview the contents of the current buffer Eksempel pĺ det endelige resultat Print the contents of the current buffer Udskriv det ĺbne dokument Spelling checker Stavekontrol Cut Klip ! Copy Kopiér Paste Indsćt Undo Fortryd ! Sort ascending Sortér stigende ! Sort descending Sortér faldende Plot the contents of the block using lines Plot indholdet af blokken ved hjćlp af linjer Add the contents of the block Tilfřj indholdet af blokken Display the Siag online documentation Vis onlinehjćlp for Siag Display the Gnu general public license Vis Gnu-licensvilkĺr ! Change the font family Vćlg skrifttype ! Change the font size Vćlg skriftstřrrelse Change the display style Vćlg stil ! Change the color Vćlg farve ! Bold text Fed ! Italic text Kursiv Left adjusted text Venstrejusteret Centered text Centreret Right adjusted text Hřjrejusteret *************** *** 39,49 **** Draw borders around the block Vis kanter rundt om blokken Underline the block Understreg blokken Remove grid lines from the block Fjern alle linjer fra blokken ! Select everything Marker alt ! OK OK ! Cancel Afbryd File Name: Filnavn: ! Directory: Katalog: Select File Vćlg fil Find Sřg Extra Ekstra --- 39,49 ---- Draw borders around the block Vis kanter rundt om blokken Underline the block Understreg blokken Remove grid lines from the block Fjern alle linjer fra blokken ! Select everything Markér alt ! OK Ok ! Cancel Annullér File Name: Filnavn: ! Directory: Mappe: Select File Vćlg fil Find Sřg Extra Ekstra *************** *** 57,94 **** Misc Diverse List Selection Listevalg New Ny ! Open Ĺben... Save Gem Save As Gem som... ! Preview Smugkig Close Luk Backup Copies Sikkerhedskopier Settings Indstillinger Margins Marginer Paper Size Papirsstřrrelse ! Header and Footer Sidehoved och sidefod First Page Number Fřrste sidenummer Style Stil Foreground Color Forgrundsfarve Background Color Baggrundsfarve ! Enter Date Indtast Dato ! Enter Time Indtast Tid ! Move Sheet Flyt Ark Up Op Down Ned ! Edit Applications Rediger Programmer ! Save Applications Gem Programmer Applets Smĺ programmer ! Resize Ćndre střrrelse Print Udskriv Print Format Udskriftsformat Orientation Orientering Portrait Stĺende Landscape Liggende Cell Protection Celle-beskyttelse ! Respect Respekter ! Ignore Ignorer ! Load External Ĺben eksternt dokument Save External Gem eksternt dokument Exit Afslut Undo Fortryd --- 57,94 ---- Misc Diverse List Selection Listevalg New Ny ! Open Ĺbn... Save Gem Save As Gem som... ! Preview Vis udskrift Close Luk Backup Copies Sikkerhedskopier Settings Indstillinger Margins Marginer Paper Size Papirsstřrrelse ! Header and Footer Sidehoved og -fod First Page Number Fřrste sidenummer Style Stil Foreground Color Forgrundsfarve Background Color Baggrundsfarve ! Enter Date Indtast dato ! Enter Time Indtast tid ! Move Sheet Flyt ark Up Op Down Ned ! Edit Applications Redigér programmer ! Save Applications Gem programmer Applets Smĺ programmer ! Resize Ćndr střrrelse Print Udskriv Print Format Udskriftsformat Orientation Orientering Portrait Stĺende Landscape Liggende Cell Protection Celle-beskyttelse ! Respect Respektér ! Ignore Ignorér ! Load External Ĺbn eksternt dokument Save External Gem eksternt dokument Exit Afslut Undo Fortryd *************** *** 97,104 **** Remove Line Fjern linje Insert Column Indsćt kolonne Remove Column Fjern kolonne ! Select All Marker alle ! Select everything Marker alt Find Sřg Find Backward Sřg baglćns Label Etiket --- 97,104 ---- Remove Line Fjern linje Insert Column Indsćt kolonne Remove Column Fjern kolonne ! Select All Markér alt ! Select everything Markér alt Find Sřg Find Backward Sřg baglćns Label Etiket *************** *** 106,113 **** C Expression C-formel Guile Expression Guile-formel Tcl Expression Tcl-formel ! Change default interpreter Vćlg standardfortolker ! Change Default Interpreter Vćlg standardfortolker Other Andre Add Property Tilfřj egenskab Embed Object Indfćld i objekt --- 106,113 ---- C Expression C-formel Guile Expression Guile-formel Tcl Expression Tcl-formel ! Change default interpreter Ćndr standardfortolker ! Change Default Interpreter Ćndr standardfortolker Other Andre Add Property Tilfřj egenskab Embed Object Indfćld i objekt *************** *** 115,135 **** Open Object Ĺbn objekt Save Object Gem objekt Set Mark Sćt mćrke ! Set Block Marker blok Unset Block Fjern markering ! Copy Block Kopier blok Delete Block Slet blok Fill Block Fyld blok Smart Fill Block Fyld blok smart ! Sort Sorter Rows Ascending as Text Rćkker stigende som tekst Rows Ascending as Numbers Rćkker stigende som tal Rows Descending as Text Rćkker faldende som tekst Rows Descending as Numbers Rćkker faldende som tal ! Columns Ascending as Text kolonner stigende som tekst ! Columns Ascending as Numbers kolonner stigende som tal ! Columns Descending as Text kolonner faldende som tekst ! Columns Descending as Numbers kolonner faldende som tal Block Sum Sum af blok Block Minimum Mindste vćrdi Block Maximum Střrste vćrdi --- 115,135 ---- Open Object Ĺbn objekt Save Object Gem objekt Set Mark Sćt mćrke ! Set Block Markér blok Unset Block Fjern markering ! Copy Block Kopiér blok Delete Block Slet blok Fill Block Fyld blok Smart Fill Block Fyld blok smart ! Sort Sortér Rows Ascending as Text Rćkker stigende som tekst Rows Ascending as Numbers Rćkker stigende som tal Rows Descending as Text Rćkker faldende som tekst Rows Descending as Numbers Rćkker faldende som tal ! Columns Ascending as Text Kolonner stigende som tekst ! Columns Ascending as Numbers Kolonner stigende som tal ! Columns Descending as Text Kolonner faldende som tekst ! Columns Descending as Numbers Kolonner faldende som tal Block Sum Sum af blok Block Minimum Mindste vćrdi Block Maximum Střrste vćrdi *************** *** 150,162 **** Block Format Blokformat Cell Style Cellestil Block Style Blokstil ! Define Style Definier stil Cell Color Cellefarve Block Color Blokfarve ! Edit Record Rediger post ! Data Entry Indtast data Siag-net Siag-netvćrk ! Identify Cell Identificer celle Recalculate Regn om igen Change Buffer Skift buffer Delete Buffer Slet buffer --- 150,162 ---- Block Format Blokformat Cell Style Cellestil Block Style Blokstil ! Define Style Definiér stil Cell Color Cellefarve Block Color Blokfarve ! Edit Record Redigér post ! Data Entry Datapost Siag-net Siag-netvćrk ! Identify Cell Identificér celle Recalculate Regn om igen Change Buffer Skift buffer Delete Buffer Slet buffer *************** *** 177,183 **** Grid Lines Gittermřnster Show Vis Hide Skjul ! Reference Style Reference stil Disable Helptexts Sluk for hjćlpetekster Helptexts Hjćlpetekster Disable Sluk --- 177,183 ---- Grid Lines Gittermřnster Show Vis Hide Skjul ! Reference Style Referencestil Disable Helptexts Sluk for hjćlpetekster Helptexts Hjćlpetekster Disable Sluk *************** *** 191,205 **** Steps Trindiagram Boxes Kasser Surface Overflade ! Advanced Advanceret Contents Indhold Search Sřg Copying Ophavsret About Siag Om Siag Help for Help Hjćlp om Hjćlp ! Links Links Siag Home Siags hjemmeside ! FTP Directory FTP-katalog SIOD Command SIOD-kommando C Command C-kommando Guile Command Guile-kommando --- 191,212 ---- Steps Trindiagram Boxes Kasser Surface Overflade ! Advanced Avanceret Contents Indhold Search Sřg Copying Ophavsret About Siag Om Siag + About Siag... Om Siag... + About Siag Office... Om Siag Office... + About Pathetic Writer... Om Pathetic Writer... + About Egon Animator... Om Egon Animator... + About Xfiler... Om Xfiler... + About XedPlus... Om XedPlus... + About Gvu... Om Gvu... Help for Help Hjćlp om Hjćlp ! Links Henvisninger Siag Home Siags hjemmeside ! FTP Directory FTP-mappe SIOD Command SIOD-kommando C Command C-kommando Guile Command Guile-kommando *************** *** 211,225 **** Another Form Test En anden test af formular Yet Another Form Test Endnu en test af formular Another Form Test Still Yderligere en test af formular ! Import Importer ! Export Exporter ! Link Link Move Flyt Expression Formel Command Kommando Sum Summering ! Import Plugin Importer plugin ! Move Plugin Flyt plugin Quit Afslut External Program: Eksternt program: Local File Lokal fil --- 218,232 ---- Another Form Test En anden test af formular Yet Another Form Test Endnu en test af formular Another Form Test Still Yderligere en test af formular ! Import Importér ! Export Exportér ! Link Henvisning Move Flyt Expression Formel Command Kommando Sum Summering ! Import Plugin Importér indstik ! Move Plugin Flyt instik Quit Afslut External Program: Eksternt program: Local File Lokal fil *************** *** 237,243 **** Key Nřgle Value Vćrdi Object file: Objektfil: ! Width: Bredd: Height: Hřjde: Bold Fed Italic Kursiv --- 244,250 ---- Key Nřgle Value Vćrdi Object file: Objektfil: ! Width: Bredde: Height: Hřjde: Bold Fed Italic Kursiv *************** *** 245,251 **** Bottom Bund Left Venstre Right Hřjre ! Center Centrer Expression style: Udtryksstil: Color: Farve: color farve --- 252,258 ---- Bottom Bund Left Venstre Right Hřjre ! Center Center Expression style: Udtryksstil: Color: Farve: color farve *************** *** 257,264 **** Magenta Magenta Cyan Cyan White Hvid ! Select Plugin: Vćlg plugin: ! Change Buffer: Byt buffer: Kill Buffer: Drćb buffer: SIOD command: SIOD-kommando: C command: C-kommando: --- 264,271 ---- Magenta Magenta Cyan Cyan White Hvid ! Select Plugin: Vćlg indstik: ! Change Buffer: Ćndr buffer: Kill Buffer: Drćb buffer: SIOD command: SIOD-kommando: C command: C-kommando: *************** *** 276,294 **** No Nej Replace Erstat Spell Stavning ! Tab Distance Tabulator lćngde Beginning of paragraph Begyndelse af afsnit End of paragraph Slutning af afsnit Line Height Linjehřjde Segment Format Segmentsformat Line Format Linjeformat ! Copy Kopier Use Anvend ! Cleanup Rens ud Segment Style Segmentstil Line Style Linjestil Segment Color Segmentfarve ! Line Color Rćkkefarve About Pathetic Writer Om Pathetic Writer Spell Test Stavetest Dump Words Dump ordliste --- 283,301 ---- No Nej Replace Erstat Spell Stavning ! Tab Distance Tabulatorlćngde Beginning of paragraph Begyndelse af afsnit End of paragraph Slutning af afsnit Line Height Linjehřjde Segment Format Segmentsformat Line Format Linjeformat ! Copy Kopiér Use Anvend ! Cleanup Ryd op Segment Style Segmentstil Line Style Linjestil Segment Color Segmentfarve ! Line Color Linjefarve About Pathetic Writer Om Pathetic Writer Spell Test Stavetest Dump Words Dump ordliste *************** *** 316,331 **** Header 6 Overskrift 6 Title Titel Abstract Uddrag ! Preformatted Preformateret Embed Indfćld Start another instance of Pathetic Writer Start en ny Pathetic Writer ! Open a Pathetic Writer document Ĺbn et Pathetic Writer-dokument ! Display the PW online documentation Onlinehjćlp for PW Underlined text Understreget tekst Superscript Forhřjet tekst Subscript Sćnket tekst ! Show Editor Vis Editor ! Hide Editor Skjul Editor Show editor Vis editor Hide editor Skjul editor Begin Empty Animation Start ny animation --- 323,338 ---- Header 6 Overskrift 6 Title Titel Abstract Uddrag ! Preformatted Prćformateret Embed Indfćld Start another instance of Pathetic Writer Start en ny Pathetic Writer ! Open a Pathetic Writer document Ĺbn et Pathetic Writer-dokument ! Display the PW online documentation Onlinehjćlp for PW Underlined text Understreget tekst Superscript Forhřjet tekst Subscript Sćnket tekst ! Show Editor Vis editor ! Hide Editor Skjul editor Show editor Vis editor Hide editor Skjul editor Begin Empty Animation Start ny animation *************** *** 333,347 **** Line Linje Image Billede Delete Object Slet objekt ! Change Object Type Ćndre objektstype Add tick Tilfřj tidspunkt Delete Tick Slet tidspunkt ! Edit Properties Rediger egenskaber Set Background Vćlg baggrund Timing Timing Set Geometry Vćlg geometri Play Animation Afspil animation ! Box Animation Demo Demo af boxanimation Circle Animation Demo Demo af cirkelanimation Line Animation Demo Demo af linjeanimation Combo Animation Demo Kombinationsdemo --- 340,354 ---- Line Linje Image Billede Delete Object Slet objekt ! Change Object Type Ćndr objektstype Add tick Tilfřj tidspunkt Delete Tick Slet tidspunkt ! Edit Properties Redigér egenskaber Set Background Vćlg baggrund Timing Timing Set Geometry Vćlg geometri Play Animation Afspil animation ! Box Animation Demo Demo af boksanimation Circle Animation Demo Demo af cirkelanimation Line Animation Demo Demo af linjeanimation Combo Animation Demo Kombinationsdemo *************** *** 410,412 **** --- 417,737 ---- Add Filled Ellipse Tilfřj udfyldt ellips Add Filled Arc Tilfřj udfyldt bue Sheet %d Ark %d + Sheet %d Ark %d + -Insert- -Indsćt- + -Overwrite- -Overskriv- + About Om + Access Permissions Lćserettigheder + Add Tilfřj + Alert Advarsel + All files (*) Alle filer (*) + Autofill: Autoudfyld: + Autoindent: Autoindryk: + Backward Baglćns + Begin Begynd + Bottom: Bund: + Call Sed Kald Sed + Can't make postscript Kan ikke oprette postscript + Cannot create backup file! Kan ikke oprette sikkerhedskopi! + Cannot create file! Kan ikke oprette fil! + Cannot open file for reading! Kan ikke ĺbne fil for lćsning! + Cannot open file! Kan ikke ĺbne fil! + Cannot save file! Kan ikke gemme fil! + Center page Centrér side + Change %s: Ćndr %s: + Change sort mode Ćndr sorteringsmĺde + Change view mode Ćndr visningsmĺde + Changing access permissions for %s Ćndr lćserettigheder for %s + Check Brackets Tjek firkantede paranteser + Clear Ryd + Close window Luk vindue + Code: Kode: + Command Window Kommandovindue + Command: Kommando: + Commands Kommandoer + Copy to: Kopiér til: + Copy... Kopiér... + Copyright... Ophavsret... + Create file: Opret fil: + Create folder Opret mappe + Create folder: Opret mappe: + Cursor position Markřrplacering + Date: Dato: + Decrease magstep Forřg zoom + Deselect all Umarkér alt + Direction: Retning: + Directories Mapper + Display copyright information Vis ophavsretsinformation + Display online help Vis onlinehjćlp + Display the online documentation Vis onlinedokumentation + Do it Gřr det + Do it Selection Gřr det for det markerede + Don't know how to handle this drop! Ved ikke hvordan 'slip' skal behandles! + Duration Varighed + EMPTY TOM + ERROR FEJL + Editor Editor + Empty Tom + End Slut + Error in Print Command String Fejl i udskrivningskommando + File does not exist and directory is write protected! Filen eksisterer ikke og mappen er skrivebeskyttet! + File has been modified by someone else! Filen er blevet ćndret af en anden! + File manager Filhĺndtering + File opened READ ONLY Fil ĺbnet som skrivebeskyttet + Filename pattern: Filnavnsmřnster: + Files Filer + Find Bracket Find firkantet parantes + Find file Find fil + First page number: Fřrste side nummer: + Folder Mappe + Font Skrifttype + Footer: Sidefod: + Forward Fremad + Go to folder: Gĺ til mappe: + Go to home directory Gĺ til hjemmemappe + Go to... Gĺ til... + Go up one directory Gĺ en mappe op + Group Gruppe + Has ticks Har tik + Has titles Har titler + Header on first page Sidehoved pĺ fřrste side + Header: Sidehoved: + Height Hřjde + Help browser Hjćlpebrowser + Help... Hjćlp... + Hide folders Skjul mapper + Icons Ikoner + Increase magstep Forřg zoom + Information... Information... + Insert Indsćt + Integration Integration + Jump Spring + LABEL ETIKET + Last Modification Sidste ćndring + Last Status Change Sidste status ćndring + Left: Venstre: + Length Lćngde + Line in buffer Linje i buffer + Line number? Linjenummer? + Line: Linje: + Link to: Lćnke til: + Link... Lćnke... + Logarithmic X axis Logaritmisk X-akse + Logarithmic Y axis Logaritmisk Y-akse + Magstep Zoomniveau + Mark Mćrke + Mix folders/files Bland mapper/filer + Move to: Flyt til: + Move... Flyt... + Name Navn + Name: Navn: + Never Aldrig + New Xedplus Ny Xedplus + New... Ny... + Next Nćste + Next page Nćste side + No object selected Intet objekt valgt + No warranty Ingen garanti + None selected Ingen valgt + Object type: Objekttype: + Objects Objekter + Okay Okay + Open With... Ĺbn med... + Open a PostScript file Ĺbn en postscript fil + Open a text file Ĺbn en tekstfil + Open command window Ĺbn kommandovindue + Open with: Ĺbn med: + Open... Ĺbn... + Options Indstillinger + Orientation: Orientering: + Others Andre + Owner Ejer + Page Side + Parametric Parametrisk + Perform a User command Udfřr en brugerkommando + Perform a User pipe Udfřr en brugerpibe + Perform a stream editor command (sed) Udfřr en stream editor kommando (sed) + Permissions... Tilladelser + Pipe Pibe + Pipes Piber + Previewer Vis udskrift + Previous Forrige + Previous page Forrige side + Print Command Udskriv kommando + Print Selection Udskriv markering + Print marked pages... Udskriv mćrkede sider... + Print the file Udskriv filen + Print the marked pages Udskriv de mćrkede sider... + Print... Udskriv + Printer Printer + Printer Name: Printernavn: + Properties Egenskaber + Redisplay Gentag visning + Redo Gentag + Remove Fjern + Reopen Genĺbn + Replace Selection Erstat markering + Replace all Erstat alt + Replace veto Erstatningsveto + Replace with: Erstat med: + Respect protection Respekter beskyttelse + Restore Gendan + Right: Hřjre: + Save %s ? Gem %s ? + Save Selection Gem markering + Save marked pages... Gem mćrkede sider... + Save the file Gem filen + Save the marked pages Gem de mćrkede sider + Saved %s Gemte %s + Saved as %s Gemte som %s + Saving Gemmer + Search Selection Sřg i det markerede + Search for: Sřg efter: + Seascape Panorama + Select all Vćlg alle + Select... Vćlg... + Selection End Slut pĺ markering + Selection Start Start af markering + Shift Selection Left Flyt markering til venstre + Shift Selection Right Flyt markering til hřjre + Show hidden files Vis skjulte filer + Size: Střrrelse: + Sort by date Sortér efter dato + Sort by name Sortér efter navn + Sort by size Sortér efter střrrelse + Special Char Specialtegn + Start another editor Start en anden editor + Start at: Start ved: + Stop Stop + Style %s changed Stil %s ćndret + Swap Landscape Ćndr orientering + Symbolic Link To Symbolsk lćnke til + Tab distance: Tabulatorafstand: + Tab size: Tabulatorstřrrelse: + Text Tekst + Text editor Teksteditor + Textbeginning Tekstbegyndelse + Textending Tekstslutning + This command does nothing Denne kommando gřr intet + Ticks Tik + Time Difference Tidsforskel + Time: Tid: + Top: Top: + Tree Trć + Type Type + Type: Type: + Undo it Fortryd det + Unmark Umarkér + Unsaved Changes! Ugemte ćndringer + Update icons Opdatér ikoner + Upside-down Pĺ hovedet + View Vis + Visible Synlig + Width Bredde + Word Ord + Word: Ord: + Wrap mode: Tekstombrydning: + [%s at %d] [size = %dx%d] [duration=%d delta=%d] [%s ved %d] [střrrelse = %dx%d] [varighed=%d delta=%d] + black sort + blue blĺ + cyan cyan + done. fćrdig. + green grřn + magenta magenta + no file yet ingen fil endnu + white hvid + yellow gul + yes ja + A file manager for X En filhĺndtering til X + A postscript viewer for X En postscriptviser til X + A spreadsheet for X Et regneark til X + A word processor for X En tekstbehandler til X + Abort Afbryd + An animation program for X Et animationsprogram til X + App App + Authors: Udviklere: + BMP image BMP-billede + Can't exec GV Kan ikke křre GV + Can't exec lpr Kan ikke křre lpr + Can't open header file Kan ikke ĺbne hovedfil + Can't overwrite embedded object Kan ikke overskrive indlejret objekt + Cell Celle + Change the font family Ćndr skrifttypefamilien + Check Brakets Tjek klammer + Close Buffer Luk buffer + Confirm Bekrćft + Custom Personlig + Defaults Standard + Deleting %s item from Sletter %s element(er) fra + Delta Delta + Demo Demo + Dialog Dialogboks + Efternamn Efternavn + Egon Animator 3.1.3. No Warranty. Egon Animator 3.1.3. Ingen garanti. + Egon Animator 3.1.5. No Warranty. Egon Animator 3.1.5. Ingen garanti. + Egon Animator 3.1.6. No Warranty. Egon Animator 3.1.6. Ingen garanti. + Egon Animator %s. No Warranty. Egon Animator %s. Ingen garanti. + Egon Editor Egon Editor + Environment Miljř + Filter Filter + Filter... Filter... + Form Formular + Format: Format: + Function A-F Funktion A-F + Function G-L Funktion G-L + Function M-S Funktion M-S + Function T-Z Funktion T-Z + Förnamn Fornavn + Gatuadress Gadenavn + GIF image GIF-billede + Goto line Gĺ til linje + Jpeg image Jpeg-billede + Land Land + List Liste + Manual Manual + New folder Ny mappe + no nej + + Nummer Nummer + on pĺ + Open with... Ĺbn med... + Part of Siag Office En del af Siag Office + Pathetic Writer 3.1.3. No Warranty. Pathetic Writer 3.1.3. Ingen garanti. + Pathetic Writer 3.1.5. No Warranty. Pathetic Writer 3.1.5. Ingen garanti. + Pathetic Writer 3.1.6. No Warranty. Pathetic Writer 3.1.6. Ingen garanti. + Pathetic Writer %s. No Warranty. Pathetic Writer %s. Ingen garanti. + Popup Popop + Postadress Postadresse + Postnummer Postnummer + red rřd + Scheme Code (*.scm) Scheme-kode (*.scm) + Select Vćlg + Siag (Scheme In A Grid) 3.1.6. No Warranty. Siag (Scheme In A Grid) 3.1.6. Ingen garanti. + Special Speciel + Style Default changed Standardstil ćndret + Style Header 1 changed Stilhoved 1 ćndret + Style Header 2 changed Stilhoved 2 ćndret + Style Header 3 changed Stilhoved 3 ćndret + Style Header 4 changed Stilhoved 4 ćndret + Style Header 5 changed Stilhoved 5 ćndret + Style Header 6 changed Stilhoved 6 ćndret + Style User 1 changed Brugerstil 1 ćndret + Style User 2 changed Brugerstil 2 ćndret + Style User 3 changed Brugerstil 3 ćndret + Style User 4 changed Brugerstil 4 ćndret + Style User 5 changed Brugerstil 5 ćndret + Style User 6 changed Brugerstil 6 ćndret + Terminal Terminal + Test 1 Test 1 + Test 2 Test 2 + Test 3 Test 3 + Text (*.txt) Tekst (*.txt) + The interactive text editor for X Den interaktive teksteditor for X + This program is part of Siag Office,\nan effort to create a full-featured, free\noffice package for Unix and X. Dette program er en del af Siag Office,\net forsřg pĺ at lave en fuldt funktionsdygtig,\nfri kontorpakke for Unix og X. + Toggle overwrite/insert Skift m. overskriv/indsćt + Ulric Testar Ulric tester + (Undo) (Fortryd) + Warning! Advarsel! + Webserver Webserver + Which format? Hvilket format? + Calculator Lommeregner diff -crNP ../siag-3.3.2/common/dictionary.de ./common/dictionary.de *** ../siag-3.3.2/common/dictionary.de Wed Feb 16 08:01:43 2000 --- ./common/dictionary.de Mon Apr 10 07:00:45 2000 *************** *** 9,14 **** --- 9,18 ---- Plot Diagramm Tools Extras Help Hilfe + Calculator Taschenrechner + Environment Arbeitsumgebung + Defaults Standard + Custom Anpassen Start another instance of Siag Noch ein Siag starten Open a Siag document Ein Siag-Dokument öffnen Save the contents of the current buffer Inhalt des aktuellen Dokumentes speichern *************** *** 25,36 **** Add the contents of the block Inhalt des Blocks einfügen Display the Siag online documentation Onlinehilfe von Siag darstellen Display the Gnu general public license GNU-GPL-Lizenz darstellen ! Change the font family Schrift ändern ! Change the font size Schriftgröße ändern Change the display style Schriftstil ändern ! Change the color Farbe ändern ! Bold text Fett ! Italic text Kursiv Left adjusted text Linksbündig Centered text Zentriert Right adjusted text Rechtsbündig --- 29,40 ---- Add the contents of the block Inhalt des Blocks einfügen Display the Siag online documentation Onlinehilfe von Siag darstellen Display the Gnu general public license GNU-GPL-Lizenz darstellen ! Change the font family Schrift ändern ! Change the font size Schriftgröße ändern Change the display style Schriftstil ändern ! Change the color Farbe ändern ! Bold text Fett ! Italic text Kursiv Left adjusted text Linksbündig Centered text Zentriert Right adjusted text Rechtsbündig *************** *** 43,48 **** --- 47,54 ---- Cancel Abbruch File Name: Dateiname: Directory: Verzeichnis: + Directories Verzeichnisse + Files Dateien Select File Datei auswählen Find Suchen Extra Extra *************** *** 60,65 **** --- 66,81 ---- Save Speichern Save As Speichern unter Preview Seitenansicht + Close Schliessen + Backup Copies Sicherungskopien + Settings Einstellungen + Margins Ränder + Paper Size Papiergrösse + Size: Grösse: + Header and Footer Kopf- und Fusszeile + Header: Kopfzeile: + Footer: Fusszeile: + Header on first page Kopfzeile auf der ersten Seite Print Drucken Print Format Druckformat Orientation Ausrichtung *************** *** 118,123 **** --- 134,140 ---- Grid Gitter Underline Unterstreichen None Keine + First Page Number Nummer der ersten Seite Column Width Spaltenbreite Set Setzen Fit Block An Block anpassen *************** *** 126,141 **** --- 143,166 ---- Row Height Zeilenhöhe Fit Block Height An Blockhöhe anpassen Set Default Format Standardformat setzen + Font Font + Style Stil + List Liste + Change style: Stil ändern: Cell Format Zellenformat Block Format Blockformat Cell Style Zellenformat Block Style Blockformat Define Style Format definieren + Foreground Color Vordergrundfarbe + Background Color Hintergrundfarbe Cell Color Zellenfarbe Block Color Blockfarbe Edit Record Eintrag bearbeiten Data Entry Daten eintragen Siag-net Siag-Netz + Enter Date Datum eingeben + Enter Time Uhrzeit eingeben Identify Cell Zelle identifizieren Recalculate Neu berechnen Change Buffer Puffer wechseln *************** *** 145,150 **** --- 170,176 ---- One Window Ein Fenster Change Window Fenster ändern Add Sheet Blatt hinzufügen + Move Sheet Blatt verschieben Remove Sheet Blatt entfernen Rename Sheet Blatt umbenennen Protect Cells Zellen schützen *************** *** 153,159 **** --- 179,188 ---- Beginning of buffer Anfang des Puffers End of buffer Ende des Puffers Top of buffer Oberkante Puffer + Up Nach oben + Down Nach unten Bottom of buffer Unterkante Puffer + Cell Zelle Grid Lines Gitterlinien Show Zeigen Hide Verbergen *************** *** 176,181 **** --- 205,211 ---- Search Suche Copying Verbreitung About Siag Über Siag + About Siag Office... Über Siag Office Help for Help Hilfe zur Hilfe SIOD Command SIOD-Befehl C Command C-Befehl *************** *** 188,197 **** Another Form Test Noch ein Formulartest Yet Another Form Test Noch ein anderer Formulartest Another Form Test Still Und wieder ein anderer Formulartest ! Import Importierne Export Exportieren Link Verknüpfen Move Verschieben Expression Ausdruck Command Befehl Sum Summe --- 218,229 ---- Another Form Test Noch ein Formulartest Yet Another Form Test Noch ein anderer Formulartest Another Form Test Still Und wieder ein anderer Formulartest ! Import Importieren Export Exportieren Link Verknüpfen Move Verschieben + Resize Grösse ändern + App Anwendung Expression Ausdruck Command Befehl Sum Summe *************** *** 264,269 **** --- 296,302 ---- Segment Color Segmentfarbe Line Color Zeilenfarbe About Pathetic Writer Über Pathetic Writer + About Pathetic Writer... Über Pathetic Writer... Spell Test Rechtschreibprüfung Dump Words Wörter ausspucken Default Standard *************** *** 294,300 **** Embed Einbetten Start another instance of Pathetic Writer Neuen Pathetic Writer starten Open a Pathetic Writer document Ein Pathetic-Writer-Dokument öffnen ! Display the PW online documentation PW-Onlinedokumentation darstellen Underlined text Unterstrichener Text Superscript Hochgestellter Text Subscript Tiefgestellt --- 327,333 ---- Embed Einbetten Start another instance of Pathetic Writer Neuen Pathetic Writer starten Open a Pathetic Writer document Ein Pathetic-Writer-Dokument öffnen ! Display the PW online documentation PW-Onlinedokumentation anzeigen Underlined text Unterstrichener Text Superscript Hochgestellter Text Subscript Tiefgestellt *************** *** 323,332 **** Circle Kreis Combo Kombination About Egon Animator Über Egon Animator Start another instance of Egon Animator Neuen Egon Animator starten Open an Egon Animator document Ein Egon-Animator-Dokument öffnen Pop down animation Animation verbergen ! Pause the animation Animations anhalten Previous animation frame Vorheriges Einzelbild Play the animation Animation abspielen Next animation frame Nächstes Einzelbild --- 356,366 ---- Circle Kreis Combo Kombination About Egon Animator Über Egon Animator + About Egon Animator... Über Egon Animator Start another instance of Egon Animator Neuen Egon Animator starten Open an Egon Animator document Ein Egon-Animator-Dokument öffnen Pop down animation Animation verbergen ! Pause the animation Animation anhalten Previous animation frame Vorheriges Einzelbild Play the animation Animation abspielen Next animation frame Nächstes Einzelbild *************** *** 384,386 **** --- 418,513 ---- Add Filled Ellipse Gefüllte Ellipse hinzufügen Add Filled Arc Gefüllten Bogen hinzufügen Sheet %d Blatt %d + Dismiss Schliessen + Open a PostScript file PostScript Datei öffnen + Save the marked pages Markierte Seiten speichern + Print the marked pages Markierte Seiten drucken + Next page Nächste Seite + Previous page Vorherige Seite + Center page Seite zentrieren + Increase magstep Ansicht vergrössern + Decrease magstep Ansicht verkleinern + Open... Öffnen... + Reopen Neu laden + Print... Drucken... + Printer Name: Druckername: + Print marked pages... Drucken markierter Seiten... + Save marked pages... Speicheren markierter Seiten... + Display online help Onlinehilfe anzeigen + Display copyright information Copyright Information anzeigen + Page Seite + Next Nächste + Redisplay Erneut anzeigen + Previous Vorherige + Mark Markieren + Unmark Markierung aus + Magstep Ansicht + Media Medium + About Gvu... Über Gvu... + Start another editor Neuen Editor starten + Open a text file Textdatei öffnen + Save the file Datei speichern + Print the file Datei drucken + Toggle overwrite/insert Einfüge-/Überschreibmodus umschalten + Display the online documentation Onlinehilfe anzeigen + Warning Warnung + Unsaved Changes! Es gibt ungespeicherte Änderungen! + Insert Einfügen + Save Selection Auswahl speichern + Print Selection Auswahl drucken + Shift Selection Right Auswahl nach rechts schieben + Shift Selection Left Auswahl nach links schieben + Jump Springen + Begin Anfang + End Ende + Selection Start Anfang Auswahl + Selection End Ende Auswahl + Search Selection Suche in Auswahl + Replace Selection Ersetze in Auswahl + Find Bracket Suche Klammer + Check Brackets Überprüfe Klammern + Special Extras + Options Optionen + Call Sed Sed aufrufen + Commands Kommandos + Command: Kommando: + New Xedplus Neuen Xedplus starten + Pipes Pipes + About XedPlus... Über XedPlus... + Close window Fenster schliessen + Go to home directory Persönliches Verzeichnis + Go up one directory Ein Verzeichnis nach oben + Create Folder Neuer Ordner + Open command window Termianl öffnen + Change view mode Ansicht ändern + Change sort mode Sortierung ändern + Update icons Erneut laden + Text editor Texteditor starten + Find file Datei suchen + New... Neu... + Move... Verschieben... + Move to: Verschieben nach: + Copy... Kopieren... + Copy to: Kopieren nach: + Link... Verknüpfen... + Link to: Verknüpfen mit: + Select... Auswählen... + Filename pattern: Dateinamenmuster + Add Hinzufügen + Remove Entfernen + Select all Alles auswählen + Deselect all Alles abwählen + Folder Ordner + Go to... Gehe nach... + Go to folder: Gehe nach Verzeichnis: + Empty Ordner leeren + View Ansicht + Tree Verzeichnisbaum + Sort by name Nach Namen Sortieren + Sort by size Nach Grösse sortieren + Sort by date Nach Datum sortieren + Hide folders Ordner ausblenden + Mix folders/files Ordner/Dateien mischen + Show hidden files Versteckte Dateien anzeigen + Clear Leeren + About Xfiler... Über Xfiler... diff -crNP ../siag-3.3.2/common/fonts.c ./common/fonts.c *** ../siag-3.3.2/common/fonts.c Tue Feb 15 23:43:00 2000 --- ./common/fonts.c Fri Apr 7 23:21:12 2000 *************** *** 1,5 **** /* ! Copyright (C) 1996-1998 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,5 ---- /* ! Copyright (C) 1996-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 20,25 **** --- 20,26 ---- #include #include #include + #include #include "common.h" #include "oldfonts.h" #include "fonts.h" *************** *** 299,303 **** --- 300,445 ---- /* ignore anything we don't grok */ } return encode_format(~0, &fmt); + } + + static int tmpncolor; + static struct colors { + int r, g, b; + char *n; + } *tmpcolor; + + static void scan_name(char *from, char *to) + { + int c = ' '; + while (*from) { + if (isspace(c) && islower(*from)) { + *to++ = c = toupper(*from++); + } else if (isupper(*from)) { + if (!isspace(c)) *to++ = ' '; + *to++ = c = *from++; + } else { + *to++ = c = *from++; + } + } + *to = '\0'; + } + + static void insert_color(int r, int g, int b, char *n) + { + int i; + char n2[1000]; + scan_name(n, n2); + for (i = 0; i < tmpncolor; i++) { + if (!strcmp(n2, tmpcolor[i].n)) break; + } + if (i == tmpncolor) { + tmpncolor++; + tmpcolor = realloc(tmpcolor, tmpncolor*sizeof *tmpcolor); + } else { + free(tmpcolor[i].n); + } + tmpcolor[i].r = r; + tmpcolor[i].g = g; + tmpcolor[i].b = b; + tmpcolor[i].n = malloc(strlen(n2)+1); + strcpy(tmpcolor[i].n, n2); + } + + static int ccompar(const void *p, const void *q) + { + const struct colors *c1 = p; + const struct colors *c2 = q; + return strcmp(c1->n, c2->n); + } + + static int sc(int n) + { + return n*65535/255; + } + + void init_colors(void) + { + char fn[1000], s[1000], n[1000]; + FILE *fp; + int r, g, b, i; + + sprintf(fn, "%s/common/rgb.txt", datadir); + fp = fopen(fn, "r"); + if (fp == NULL) { + fprintf(stderr, "Can't read %s\n", fn); + return; + } + + while (fgets(s, sizeof s, fp)) { + if (s[0] != '!') { + i = sscanf(s, "%d %d %d %[^\n]", &r, &g, &b, n); + if (i == 4) { + insert_color(r, g, b, n); + } + } + } + fclose(fp); + qsort(tmpcolor, tmpncolor, sizeof *tmpcolor, ccompar); + for (i = 0; i < tmpncolor; i++) { + register_color(tmpcolor[i].n, sc(tmpcolor[i].r), + sc(tmpcolor[i].g), sc(tmpcolor[i].b)); + } + } + + void init_fonts(void) + { + char fn[1000], s[1000]; + char n[1000], nr[1000], ni[1000], nb[1000], nbi[1000]; + int i; + FILE *fp; + + sprintf(fn, "%s/common/fonts.txt", datadir); + fp = fopen(fn, "r"); + if (fp == NULL) { + fprintf(stderr, "Can't read %s\n", fn); + return; + } + + n[0] = '\0'; + while (fgets(s, sizeof s, fp)) { + if (s[0] == '[') { + i = sscanf(s, "[%[^]]", n); + if (i != 1) { + fprintf(stderr, "Error in %s\n", s); + } + } else if (!strncmp(s, "X=", 2)) { + i = sscanf(s, "X=%[^|]|%[^|]|%[^|]|%[^\n]", + nr, ni, nb, nbi); + if (i != 4) { + fprintf(stderr, "Error in %s\n", s); + } else { + register_x_font(n, nr, ni, nb, nbi); + } + } else if (!strncmp(s, "PS=", 3)) { + i = sscanf(s, "PS=%[^|]|%[^|]|%[^|]|%[^\n]", + nr, ni, nb, nbi); + if (i != 4) { + fprintf(stderr, "Error in %s\n", s); + } else { + register_ps_font(n, nr, ni, nb, nbi); + } + } else if (!strncmp(s, "T1=", 3)) { + i = sscanf(s, "T1=%[^|]|%[^|]|%[^|]|%[^\n]", + nr, ni, nb, nbi); + if (i != 4) { + fprintf(stderr, "Error in %s\n", s); + } else { + register_t1_font(n, nr, ni, nb, nbi); + } + } else if (!strncmp(s, "ALIAS=", 6)) { + i = sscanf(s, "ALIAS=%[^\n]", nr); + if (i != 1) { + fprintf(stderr, "Error in %s\n", s); + } else { + font_alias(nr, n); + } + } + } + fclose(fp); } diff -crNP ../siag-3.3.2/common/fonts.h ./common/fonts.h *** ../siag-3.3.2/common/fonts.h Fri Mar 24 07:16:17 2000 --- ./common/fonts.h Thu Apr 6 15:24:32 2000 *************** *** 1,5 **** /* ! Copyright (C) 1996-1998 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,5 ---- /* ! Copyright (C) 1996-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 136,141 **** --- 136,143 ---- extern char *lookup_fontalias(char *); extern int register_color(char *, unsigned short, unsigned short, unsigned short); + extern void init_colors(void); + extern void init_fonts(void); extern int fmt_old2new(long); extern long fmt_new2old(int); extern void save_formats(FILE *, int); diff -crNP ../siag-3.3.2/common/fonts.scm ./common/fonts.scm *** ../siag-3.3.2/common/fonts.scm Tue Jul 6 03:58:04 1999 --- ./common/fonts.scm Thu Jan 1 01:00:00 1970 *************** *** 1,176 **** - ; This is tedious and boring... - - ; Some of the X fonts don't match the PS fonts very well. - - (register-x-font "Avant Garde" - "-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Avant Garde" - "AvantGarde-Book" - "AvantGarde-BookOblique" - "AvantGarde-Demi" - "AvantGarde-DemiOblique") - - (register-x-font "Bookman" - "-*-new century schoolbook-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-new century schoolbook-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-new century schoolbook-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-new century schoolbook-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Bookman" - "Bookman-Light" - "Bookman-LightItalic" - "Bookman-Demi" - "Bookman-DemiItalic") - - (register-x-font "Courier" - "-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Courier" - "Courier" - "Courier-Oblique" - "Courier-Bold" - "Courier-BoldOblique") - - (register-x-font "Helvetica" - "-*-helvetica-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-helvetica-medium-o-*--*-%d-%d-%d-*-*-*-*" - "-*-helvetica-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-helvetica-bold-o-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Helvetica" - "Helvetica" - "Helvetica-Oblique" - "Helvetica-Bold" - "Helvetica-BoldOblique") - - (register-x-font "Helvetica Narrow" - "-*-helvetica-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-helvetica-medium-o-*--*-%d-%d-%d-*-*-*-*" - "-*-helvetica-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-helvetica-bold-o-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Helvetica Narrow" - "Helvetica-Narrow" - "Helvetica-Narrow-Oblique" - "Helvetica-Narrow-Bold" - "Helvetica-Narrow-BoldOblique") - - (register-x-font "New Century Schoolbook" - "-*-new century schoolbook-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-new century schoolbook-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-new century schoolbook-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-new century schoolbook-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "New Century Schoolbook" - "NewCenturySchlbk" - "NewCenturySchlbk-Italic" - "NewCenturySchlbk-Bold" - "NewCenturySchlbk-BoldItalic") - - (register-x-font "Palatino" - "-*-times-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-times-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-times-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-times-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Palatino" - "Palatino-Roman" - "Palatino-Italic" - "Palatino-Bold" - "Palatino-BoldItalic") - - (register-x-font "Times" - "-*-times-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-times-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-times-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-times-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Times" - "Times" - "Times-Italic" - "Times-Bold" - "Times-BoldItalic") - - (register-x-font "Symbol" - "-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Symbol" - "Symbol" - "Symbol" - "Symbol" - "Symbol") - - (register-x-font "Zapf Chancery" - "-*-times-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-times-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-times-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-times-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Zapf Chancery" - "ZapfChancery-MediumItalic" - "ZapfChancery-MediumItalic" - "ZapfChancery-MediumItalic" - "ZapfChancery-MediumItalic") - - (register-x-font "Zapf Dingbats" - "-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*" - "-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-*") - - (register-ps-font "Zapf Dingbats" - "ZapfDingbats" - "ZapfDingbats" - "ZapfDingbats" - "ZapfDingbats") - - (register-t1-font "Nimbus Sans" - "NimbusSanL-Regu" - "NimbusSanL-ReguItal" - "NimbusSanL-Bold" - "NimbusSanL-BoldItal") - - (register-t1-font "Nimbus Roman" - "NimbusRomNo9L-Regu" - "NimbusRomNo9L-ReguItal" - "NimbusRomNo9L-Medi" - "NimbusRomNo9L-MediItal") - - ; A bit of translation helps when loading RTF from MS applications. - ; Perhaps we should use wildcards, e.g. "Arial*"? - (font-alias "MS Sans Serif" "Helvetica") - (font-alias "Arial" "Helvetica") - (font-alias "Arial Black" "Helvetica") - (font-alias "Arial Narrow" "Helvetica Narrow") - (font-alias "Bookman Old Style" "Bookman") - (font-alias "Garamond" "New Century Schoolbook") - (font-alias "Times New Roman" "Times") - (font-alias "Courier New" "Courier") - (font-alias "Chicago" "Helvetica") - (font-alias "New York" "Times") - (font-alias "Monaco" "New Century Schoolbook") ; is this right? - - ; Register these now to make sure they are present - (register-color "Black" 0 0 0) - (register-color "Red" 65535 0 0) - (register-color "Green" 0 65535 0) - (register-color "Blue" 0 0 65535) - (register-color "Yellow" 65535 65535 0) - (register-color "Magenta" 65535 0 65535) - (register-color "Cyan" 0 65535 65535) - (register-color "White" 65535 65535 65535) - (register-color "Grey" 32767 32767 32767) - - ; colors.scm is auto-generated from rgb.txt - (require (string-append datadir "/common/colors.scm")) - --- 0 ---- diff -crNP ../siag-3.3.2/common/fonts.txt ./common/fonts.txt *** ../siag-3.3.2/common/fonts.txt Thu Jan 1 01:00:00 1970 --- ./common/fonts.txt Tue Apr 4 20:15:12 2000 *************** *** 0 **** --- 1,68 ---- + # The format of this file: + # + # [Font Name] Name as it appears to the user + # X=roman|italic|bold|italicbold X fonts + # PS=roman|italic|bold|italicbold PS fonts for printing + # T1=roman|italic|bold|italicbold T1 fonts (used by libt1) + + [Avant Garde] + X=-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=AvantGarde-Book|AvantGarde-BookOblique|AvantGarde-Demi|AvantGarde-DemiOblique + + [Bookman] + X=-*-new century schoolbook-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=Bookman-Light|Bookman-LightItalic|Bookman-Demi|Bookman-DemiItalic + ALIAS=Bookman Old Style + + [Courier] + X=-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=Courier|Courier-Oblique|Courier-Bold|Courier-BoldOblique + ALIAS=Courier New + + [Helvetica] + X=-*-helvetica-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-helvetica-medium-o-*--*-%d-%d-%d-*-*-*-*|-*-helvetica-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-helvetica-bold-o-*--*-%d-%d-%d-*-*-*-* + PS=Helvetica|Helvetica-Oblique|Helvetica-Bold|Helvetica-BoldOblique + ALIAS=MS Sans Serif + ALIAS=Arial + ALIAS=Arial Black + ALIAS=Chicago + + [Helvetica Narrow] + X=-*-helvetica-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-helvetica-medium-o-*--*-%d-%d-%d-*-*-*-*|-*-helvetica-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-helvetica-bold-o-*--*-%d-%d-%d-*-*-*-* + PS=Helvetica-Narrow|Helvetica-Narrow-Oblique|Helvetica-Narrow-Bold|Helvetica-Narrow-BoldOblique + ALIAS=Arial Narrow + + [New Century Schoolbook] + X=-*-new century schoolbook-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-new century schoolbook-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=NewCenturySchlbk|NewCenturySchlbk-Italic|NewCenturySchlbk-Bold|NewCenturySchlbk-BoldItalic + ALIAS=Garamond + ALIAS=Monaco + + [Palatino] + X=-*-times-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-times-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-times-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-times-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=Palatino-Roman|Palatino-Italic|Palatino-Bold|Palatino-BoldItalic + + [Times] + X=-*-times-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-times-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-times-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-times-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=Times|Times-Italic|Times-Bold|Times-BoldItalic + ALIAS=Times New Roman + ALIAS=New York + + [Symbol] + X=-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-symbol-medium-r-*--*-%d-%d-%d-*-*-*-* + PS=Symbol|Symbol|Symbol|Symbol + + [Zapf Chancery] + X=-*-times-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-times-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-times-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-times-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=ZapfChancery-MediumItalic|ZapfChancery-MediumItalic|ZapfChancery-MediumItalic|ZapfChancery-MediumItalic + + [Zapf Dingbats] + X=-*-courier-medium-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-medium-i-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-r-*--*-%d-%d-%d-*-*-*-*|-*-courier-bold-i-*--*-%d-%d-%d-*-*-*-* + PS=ZapfDingbats|ZapfDingbats|ZapfDingbats|ZapfDingbats + + [Nimbus Sans] + T1=NimbusSanL-Regu|NimbusSanL-ReguItal|NimbusSanL-Bold|NimbusSanL-BoldItal + + [Nimbus Roman] + T1=NimbusRomNo9L-Regu|NimbusRomNo9L-ReguItal|NimbusRomNo9L-Medi|NimbusRomNo9L-MediItal + diff -crNP ../siag-3.3.2/common/kdeinst ./common/kdeinst *** ../siag-3.3.2/common/kdeinst Thu Jul 15 16:49:13 1999 --- ./common/kdeinst Wed Apr 12 08:20:22 2000 *************** *** 50,63 **** shift done ! if [ "$KDEDIR" = "" ]; then ! if [ -d /opt/kde ]; then KDEDIR=/opt/kde # SUSE, Slackware ! elif [ -d /usr/local/kde ]; then KDEDIR=/usr/local/kde # YGIAGAM ! elif [ -d /usr/kde ]; then KDEDIR=/usr/kde # Another guess ! elif [ -d "$HOME/.kde" ]; then KDEDIR="$HOME/.kde" # Home directory else if [ $VERBOSE = yes ]; then --- 50,63 ---- shift done ! if [ "$KDEDIR" = "" -o ! -w "$KDEDIR" ]; then ! if [ -d /opt/kde -a -w /opt/kde ]; then KDEDIR=/opt/kde # SUSE, Slackware ! elif [ -d /usr/local/kde -a -w /usr/local/kde ]; then KDEDIR=/usr/local/kde # YGIAGAM ! elif [ -d /usr/kde -a -w /usr/kde ]; then KDEDIR=/usr/kde # Another guess ! elif [ -d "$HOME/.kde" -a -w "$HOME/.kde" ]; then KDEDIR="$HOME/.kde" # Home directory else if [ $VERBOSE = yes ]; then diff -crNP ../siag-3.3.2/configure ./configure *** ../siag-3.3.2/configure Mon Mar 27 14:01:58 2000 --- ./configure Thu Apr 6 18:11:40 2000 *************** *** 706,712 **** PACKAGE=siag ! VERSION=3.3.2 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } --- 706,712 ---- PACKAGE=siag ! VERSION=3.3.3 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff -crNP ../siag-3.3.2/configure.in ./configure.in *** ../siag-3.3.2/configure.in Mon Mar 27 14:01:15 2000 --- ./configure.in Thu Apr 6 18:06:25 2000 *************** *** 1,7 **** dnl Process this file with autoconf to produce a configure script. AC_INIT(README) AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(siag, 3.3.2) dnl Set of available languages dnl ALL_LINGUAS="" --- 1,7 ---- dnl Process this file with autoconf to produce a configure script. AC_INIT(README) AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(siag, 3.3.3) dnl Set of available languages dnl ALL_LINGUAS="" diff -crNP ../siag-3.3.2/egon/egon.scm ./egon/egon.scm *** ../siag-3.3.2/egon/egon.scm Sun May 23 16:07:25 1999 --- ./egon/egon.scm Tue Apr 4 20:17:35 2000 *************** *** 1,6 **** ;; ;; Runtime Library for Egon Animator ! ;; Copyright 1996-1998 Ulric Eriksson ;; ; Load the runtime library from SIOD --- 1,6 ---- ;; ;; Runtime Library for Egon Animator ! ;; Copyright 1996-2000 Ulric Eriksson ;; ; Load the runtime library from SIOD *************** *** 204,210 **** (define (change-type) (set-type (form-ask-for-number "Type:" ""))) ! (require (string-append datadir "/common/fonts.scm")) (define (add-pseudo-menu name) nil) --- 204,210 ---- (define (change-type) (set-type (form-ask-for-number "Type:" ""))) ! ;(require (string-append datadir "/common/fonts.scm")) (define (add-pseudo-menu name) nil) diff -crNP ../siag-3.3.2/egon/main.c ./egon/main.c *** ../siag-3.3.2/egon/main.c Wed Mar 22 13:07:38 2000 --- ./egon/main.c Thu Apr 6 15:21:34 2000 *************** *** 1,6 **** /* Egon Animator ! Copyright (C) 1997-1998 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,6 ---- /* Egon Animator ! Copyright (C) 1997-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 106,111 **** --- 106,114 ---- init_position(); init_cmds(); + + init_colors(); + init_fonts(); buf = new_buffer("noname.egon", "noname.egon"); diff -crNP ../siag-3.3.2/gvu/main.c ./gvu/main.c *** ../siag-3.3.2/gvu/main.c Sat Mar 18 08:30:24 2000 --- ./gvu/main.c Thu Apr 6 14:53:16 2000 *************** *** 435,441 **** static String nothing = ""; static XawTextSelectType sarry[] = {XawselectLine, XawselectAll, XawselectNull}; - unsigned long highlight_color, unhighlight_color; common_init("Gvu %s. No Warranty."); --- 435,440 ---- *************** *** 491,500 **** tie_fighter_bitmap = X_XpmDataToIcon(XtDisplay(toplevel), dot_xpm); } ! highlight_color = WhitePixel(XtDisplay(toplevel), ! DefaultScreen(XtDisplay(toplevel))); ! XtVaGetValues(toplevel, XtNbackground, &unhighlight_color, (char *)0); ! tooltip_init(toplevel, highlight_color, unhighlight_color); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, toplevel, (char *)0); --- 490,496 ---- tie_fighter_bitmap = X_XpmDataToIcon(XtDisplay(toplevel), dot_xpm); } ! tooltip_init(toplevel); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, toplevel, (char *)0); diff -crNP ../siag-3.3.2/pw/Makefile.in ./pw/Makefile.in *** ../siag-3.3.2/pw/Makefile.in Mon Mar 27 21:14:56 2000 --- ./pw/Makefile.in Thu Apr 6 18:22:16 2000 *************** *** 313,360 **** || exit 1; \ fi; \ done - buffer.o: buffer.c ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h - cmds.o: cmds.c ../common/cmalloc.h ../common/common.h ../common/plugin.h \ - pw.h ../common/richchar.h ../common/fonts.h ../common/traceme.h \ - user_interface.h ../siod/siod.h - fileio.o: fileio.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - pw.h ../common/richchar.h ../common/fonts.h ../common/traceme.h \ - user_interface.h - fileio_html.o: fileio_html.c ../common/common.h pw.h \ - ../common/richchar.h ../common/fonts.h ../common/traceme.h \ - user_interface.h - fileio_ps.o: fileio_ps.c pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h ../common/common.h \ - ../common/cmalloc.h ../common/plugin.h - fileio_pw.o: fileio_pw.c ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h - fileio_rtf.o: fileio_rtf.c pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h ../common/common.h \ - ../common/cmalloc.h - fileio_txt.o: fileio_txt.c pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h ../common/common.h \ - ../common/cmalloc.h - guilei.o: guilei.c - main.o: main.c ../common/common.h ../common/cmalloc.h pw.h \ - ../common/richchar.h ../common/fonts.h ../common/traceme.h \ - user_interface.h ../siod/siod.h - matrix.o: matrix.c ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h - position.o: position.c pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h - pythoni.o: pythoni.c - railway.o: railway.c ../siod/siod.h ../common/common.h \ - ../common/cmalloc.h pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h - siodi.o: siodi.c pw.h ../common/richchar.h ../common/fonts.h \ - ../common/traceme.h user_interface.h ../siod/siod.h \ - ../common/common.h - tcli.o: tcli.c - info-am: info: info-recursive dvi-am: --- 313,318 ---- diff -crNP ../siag-3.3.2/pw/fileio_html.c ./pw/fileio_html.c *** ../siag-3.3.2/pw/fileio_html.c Wed Mar 22 12:47:38 2000 --- ./pw/fileio_html.c Thu Apr 6 18:29:14 2000 *************** *** 1,6 **** /* Pathetic Writer ! Copyright (C) 1997-1999 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,6 ---- /* Pathetic Writer ! Copyright (C) 1997-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 31,77 **** #include "../common/common.h" #include "pw.h" - static struct { - char *name; - int value; - } cchar[] = { - {"quot", '"'}, {"amp", '&'}, {"lt", '<'}, {"gt", '>'}, - {"nbsp", 160}, {"iexcl", 161}, {"cent", 162}, {"pound", 163}, - {"curren", 164}, {"yen", 165}, {"brvbar", 166}, {"sect", 167}, - {"uml", 168}, {"copy", 169}, {"ordf", 170}, {"laquo", 171}, - {"not", 172}, {"shy", 173}, {"reg", 174}, {"macr", 175}, - {"deg", 176}, {"plusmn", 177}, {"sup2", 178}, {"sup3", 179}, - {"acute", 180}, {"micro", 181}, {"para", 182}, {"middot", 183}, - {"cedil", 184}, {"sup1", 185}, {"ordm", 186}, {"raquo", 187}, - {"frac14", 188}, {"frac12", 189}, {"frac34", 190}, {"iquest", 191}, - {"Agrave", 192}, {"Aacute", 193}, {"Acirc", 194}, {"Atilde", 195}, - {"Auml", 196}, {"Aring", 197}, {"AElig", 198}, {"Ccedil", 199}, - {"Egrave", 200}, {"Eacute", 201}, {"Ecirc", 202}, {"Euml", 203}, - {"Igrave", 204}, {"Iacute", 205}, {"Icirc", 206}, {"Euml", 207}, - {"ETH", 208}, {"Ntilde", 209}, {"Ograve", 210}, {"Oacute", 211}, - {"Ocirc", 212}, {"Otilde", 213}, {"Ouml", 214}, {"times", 215}, - {"Oslash", 216}, {"Ugrave", 217}, {"Uacute", 218}, {"Ucirc", 219}, - {"Uuml", 220}, {"Yacute", 221}, {"THORN", 222}, {"szlig", 223}, - {"agrave", 224}, {"aacute", 225}, {"acirc", 226}, {"atilde", 227}, - {"auml", 228}, {"aring", 229}, {"aelig", 230}, {"ccedil", 231}, - {"egrave", 232}, {"eacute", 233}, {"ecirc", 234}, {"euml", 235}, - {"igrave", 236}, {"iacute", 237}, {"icirc", 238}, {"iuml", 239}, - {"eth", 240}, {"ntilde", 241}, {"ograve", 242}, {"oacute", 243}, - {"ocirc", 244}, {"otilde", 245}, {"ouml", 246}, {"divide", 247}, - {"slash", 248}, {"ugrave", 249}, {"uacute", 250}, {"ucirc", 251}, - {"uuml", 252}, {"yacute", 253}, {"thorn", 254}, {"yuml", 255}, - {NULL, 0} - }; - static void save_line(FILE *fp, rich_char *line) { ! int i, c; if (!line) return; while ((c = line->c)) { ! for (i = 0; cchar[i].name; i++) ! if (cchar[i].value == c) break; ! if (cchar[i].name) fprintf(fp, "&%s;", cchar[i].name); ! else putc(c, fp); line++; } } --- 31,44 ---- #include "../common/common.h" #include "pw.h" static void save_line(FILE *fp, rich_char *line) { ! int c; ! char b[100]; if (!line) return; while ((c = line->c)) { ! to_cchar(b, c); ! fprintf(fp, b); line++; } } *************** *** 225,238 **** static void emitcchar(char *p) { int i; ! if (p[0] == '#') { ! i = atoi(p+1); ! if (i >= ' ' && i <= 255) emitchar(atoi(p+1)); ! } else { ! for (i = 0; cchar[i].name; i++) ! if (!strcmp(p, cchar[i].name)) break; ! if (cchar[i].name) emitchar(cchar[i].value); ! } } static void tag_ignore(void) --- 192,199 ---- static void emitcchar(char *p) { int i; ! i = from_cchar(p); ! if (i != -1) emitchar(i); } static void tag_ignore(void) diff -crNP ../siag-3.3.2/pw/main.c ./pw/main.c *** ../siag-3.3.2/pw/main.c Wed Mar 22 12:46:15 2000 --- ./pw/main.c Tue Apr 4 20:16:39 2000 *************** *** 1,6 **** /* Pathetic Writer ! Copyright (C) 1997-1999 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,6 ---- /* Pathetic Writer ! Copyright (C) 1997-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 92,97 **** --- 92,100 ---- waitforchild(0); init_position(); init_cmds(); + + init_colors(); + init_fonts(); buf = new_buffer("noname.pw", "noname.pw"); diff -crNP ../siag-3.3.2/pw/pw.scm ./pw/pw.scm *** ../siag-3.3.2/pw/pw.scm Fri Feb 18 00:36:29 2000 --- ./pw/pw.scm Thu Apr 6 20:04:52 2000 *************** *** 361,367 **** (set! lpr-command printcmd)))) ; load the fonts ! (require (string-append datadir "/common/fonts.scm")) ; and the styles (define (register-style . ap) --- 361,367 ---- (set! lpr-command printcmd)))) ; load the fonts ! ;(require (string-append datadir "/common/fonts.scm")) ; and the styles (define (register-style . ap) *************** *** 549,554 **** --- 549,558 ---- (register-converter "MS Word 97 (*.doc)" "*.html" "mswordview -n %s -o %s" nil nil)))) + (if (executable-file "pptHtml") + (register-converter "MS Powerpoint (*.ppt)" + "*.html" "pptHtml %s > %s" + nil nil)) (if (executable-file "groff") (register-converter "Man page (*.[0-9])" "*.txt" "groff -Tascii -mandoc %s > %s" diff -crNP ../siag-3.3.2/siag/Makefile.in ./siag/Makefile.in *** ../siag-3.3.2/siag/Makefile.in Mon Mar 27 21:14:44 2000 --- ./siag/Makefile.in Wed Apr 12 19:43:07 2000 *************** *** 347,354 **** ../common/traceme.h user_interface.h globals.o: globals.c calc.h ../common/traceme.h user_interface.h guilei.o: guilei.c ! main.o: main.c ../common/cmalloc.h ../common/common.h calc.h \ ! ../common/traceme.h user_interface.h ../siod/siod.h mathwrap.o: mathwrap.c ../siod/siod.h ../config.h matrix.o: matrix.c ../common/common.h ../common/cmalloc.h \ ../common/fonts.h calc.h ../common/traceme.h user_interface.h --- 347,354 ---- ../common/traceme.h user_interface.h globals.o: globals.c calc.h ../common/traceme.h user_interface.h guilei.o: guilei.c ! main.o: main.c ../common/cmalloc.h ../common/common.h ../common/fonts.h \ ! calc.h ../common/traceme.h user_interface.h ../siod/siod.h mathwrap.o: mathwrap.c ../siod/siod.h ../config.h matrix.o: matrix.c ../common/common.h ../common/cmalloc.h \ ../common/fonts.h calc.h ../common/traceme.h user_interface.h diff -crNP ../siag-3.3.2/siag/fileio_html.c ./siag/fileio_html.c *** ../siag-3.3.2/siag/fileio_html.c Tue Feb 15 23:54:01 2000 --- ./siag/fileio_html.c Thu Apr 6 19:49:30 2000 *************** *** 1,6 **** /* Siag, Scheme In A Grid ! Copyright (C) 1996, 1997 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,6 ---- /* Siag, Scheme In A Grid ! Copyright (C) 1996-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 79,86 **** --- 79,96 ---- if (ret_type(buf, s, i, j) != ERROR) { + #if 0 fprintf(fp, "%s", ret_pvalue(NULL, buf, s, i, j, -1)); + #else + char *p, b[100]; + int n; + p = ret_pvalue(NULL, buf, s, i, j, -1); + for (n = 0; p[n]; n++) { + to_cchar(b, p[n]); + fprintf(fp, "%s", b); + } + #endif } fprintf(fp, "\n"); *************** *** 235,240 **** --- 245,251 ---- FILE *fp; int c; int inatag = 0; + int inachar = 0; char tag[256]; cval value; value.number = 0; *************** *** 264,272 **** --- 275,294 ---- } else { if (i < 1020) tag[i++] = c; } + } else if (inachar) { + if (c == ';') { + inachar = 0; + tag[i] = '\0'; + emitchar(buf, s, from_cchar(tag)); + } else { + if (i < 1020) tag[i++] = c; + } } else { if (c == '<') { inatag = 1; + i = 0; + } else if (c == '&') { + inachar = 1; i = 0; } else { emitchar(buf, s, c); diff -crNP ../siag-3.3.2/siag/fileio_txt.c ./siag/fileio_txt.c *** ../siag-3.3.2/siag/fileio_txt.c Tue Feb 15 23:54:01 2000 --- ./siag/fileio_txt.c Thu Apr 6 14:53:20 2000 *************** *** 61,67 **** --- 61,71 ---- strcpy(ifs, ","); if (!ask_for_str("Field separator(s):", ifs)) + #if 0 return 1; + #else + strcpy(ifs, ","); + #endif if ((fp = fopen(fn, "w")) == (FILE *) 0) return 1; *************** *** 212,222 **** int n; strcpy(ifs, ","); ! if (!ask_for_str("Field separator(s):", ifs)) return 1; ! if ((fp = fopen(fn, "r")) == NULL) return 1; n = csv_loader(fp, buf); --- 216,228 ---- int n; strcpy(ifs, ","); ! if (!ask_for_str("Field separator(s):", ifs)) { return 1; + } ! if ((fp = fopen(fn, "r")) == NULL) { return 1; + } n = csv_loader(fp, buf); diff -crNP ../siag-3.3.2/siag/main.c ./siag/main.c *** ../siag-3.3.2/siag/main.c Tue Feb 15 23:54:02 2000 --- ./siag/main.c Thu Apr 6 15:22:16 2000 *************** *** 1,6 **** /* Siag, Scheme In A Grid ! Copyright (C) 1996, 1997 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,6 ---- /* Siag, Scheme In A Grid ! Copyright (C) 1996-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 27,32 **** --- 27,33 ---- #include "../common/cmalloc.h" #include "../common/common.h" + #include "../common/fonts.h" #include "../siag/calc.h" *************** *** 54,61 **** int siod_interpreter, C_interpreter; - extern char *siag_format; /* fileio.siag.c */ - #ifdef TCL extern int init_tcl_parser(Tcl_Interp *); /* tcli.c */ --- 55,60 ---- *************** *** 114,119 **** --- 113,121 ---- init_position(); init_cmds(); + + init_colors(); + init_fonts(); buf = new_buffer("noname.siag", "noname.siag"); diff -crNP ../siag-3.3.2/siag/matrix.c ./siag/matrix.c *** ../siag-3.3.2/siag/matrix.c Tue Feb 15 23:54:02 2000 --- ./siag/matrix.c Wed Apr 12 19:30:59 2000 *************** *** 560,565 **** --- 560,567 ---- { int i; + alloc_cell(b, s, 1, 1); /* magic */ + /* free the last line, if there is anything in it */ if (b->sht[s].alloc_lines > BUFFER_ROWS && b->sht[s].matrix[BUFFER_ROWS]) cfree(b->sht[s].matrix[BUFFER_ROWS]); *************** *** 610,615 **** --- 612,619 ---- { int i; + alloc_cell(b, s, 1, 1); /* magic */ + /* free the first line, if there is anything in it */ if (b->sht[s].alloc_lines > row && b->sht[s].matrix[row]) cfree(b->sht[s].matrix[row]); *************** *** 647,652 **** --- 651,659 ---- { int i, j; empty_cell.format = std_fmt_get(b); + + alloc_cell(b, s, 1, 1); /* magic */ + /* extend the width table if necessary */ if (b->sht[s].used_cols >= col && b->sht[s].used_cols < BUFFER_COLS) { b->sht[s].used_cols++; *************** *** 695,700 **** --- 702,710 ---- empty_cell.format = std_fmt_get(b); /* do not shrink the width table */ + + alloc_cell(b, s, 1, 1); /* magic */ + for (j = col; j < b->sht[s].used_cols; j++) b->sht[s].width[j] = b->sht[s].width[j + 1]; if (b->sht[s].used_cols >= col) diff -crNP ../siag-3.3.2/siag/siag.scm ./siag/siag.scm *** ../siag-3.3.2/siag/siag.scm Mon Mar 20 07:10:07 2000 --- ./siag/siag.scm Thu Apr 6 15:22:38 2000 *************** *** 1,6 **** ;; ;; Runtime library for Siag ! ;; Copyright 1996-1999 Ulric Eriksson ;; ; Load the runtime library from Siod --- 1,6 ---- ;; ;; Runtime library for Siag ! ;; Copyright 1996-2000 Ulric Eriksson ;; ; Load the runtime library from Siod *************** *** 867,873 **** (require (string-append datadir "/siag/sort.scm")) ; load the fonts ! (require (string-append datadir "/common/fonts.scm")) ; and the styles (require (string-append datadir "/siag/styles.scm")) --- 867,873 ---- (require (string-append datadir "/siag/sort.scm")) ; load the fonts ! ;(require (string-append datadir "/common/fonts.scm")) ; and the styles (require (string-append datadir "/siag/styles.scm")) *************** *** 1019,1029 **** (dirs (strbreakup path ":"))) (try-executable dirs fn))) (define (register-converters) ! (if (executable-file "xls2csv") (register-converter "MS Excel (*.xls)" ! "*.csv" "xls2csv '%s' > '%s'" ! nil nil)) (if (executable-file "blaha") (register-converter "Blaha (*.blaha)" "*.txt" "blaha < '%s' > '%s'" --- 1019,1034 ---- (dirs (strbreakup path ":"))) (try-executable dirs fn))) + ; Use xlHtml if it is available, otherwise xls2csv if *it* is available (define (register-converters) ! (if (executable-file "xlHtml") (register-converter "MS Excel (*.xls)" ! "*.html" "xlHtml '%s' > '%s'" ! nil nil) ! (if (executable-file "xls2csv") ! (register-converter "MS Excel (*.xls)" ! "*.csv" "xls2csv '%s' > '%s'" ! nil nil))) (if (executable-file "blaha") (register-converter "Blaha (*.blaha)" "*.txt" "blaha < '%s' > '%s'" diff -crNP ../siag-3.3.2/xcommon/Handle.c ./xcommon/Handle.c *** ../siag-3.3.2/xcommon/Handle.c Wed Mar 22 12:17:42 2000 --- ./xcommon/Handle.c Thu Apr 6 14:53:29 2000 *************** *** 248,253 **** --- 248,254 ---- XtNwidth, width, XtNheight, height, (char *)0); + XtRealizeWidget(hw->handle.shell); XtPopup(hw->handle.shell, XtGrabNone); *************** *** 274,279 **** --- 275,281 ---- XtGrabPointer(w, owner_events, event_mask, pointer_mode, keyboard_mode, None, cursor, now); hw->handle.detached = 1; + } else { XtVaSetValues(hw->handle.shell, XtNx, root_x, diff -crNP ../siag-3.3.2/xcommon/Makefile.in ./xcommon/Makefile.in *** ../siag-3.3.2/xcommon/Makefile.in Mon Mar 27 21:14:37 2000 --- ./xcommon/Makefile.in Thu Apr 6 18:19:36 2000 *************** *** 314,323 **** || exit 1; \ fi; \ done - Combo.o: Combo.c TextField.h ComboP.h Combo.h combo.xpm - Ruler.o: Ruler.c xfonts.h ../config.h ../common/richchar.h RulerP.h \ - Ruler.h - info-am: info: info-recursive dvi-am: --- 314,319 ---- diff -crNP ../siag-3.3.2/xcommon/dialogs.c ./xcommon/dialogs.c *** ../siag-3.3.2/xcommon/dialogs.c Wed Feb 16 15:45:43 2000 --- ./xcommon/dialogs.c Thu Apr 6 15:23:02 2000 *************** *** 113,119 **** command = add_button(buttonbox, "command", buttons[i], alert_clicked, (XtPointer)i); } ! status = -1; XtRealizeWidget(alert); XtUnrealizeWidget(alert); XtVaGetValues(pw, --- 113,119 ---- command = add_button(buttonbox, "command", buttons[i], alert_clicked, (XtPointer)i); } ! status = WAITING; XtRealizeWidget(alert); XtUnrealizeWidget(alert); XtVaGetValues(pw, *************** *** 130,136 **** XtNy, y, (char *)0); XtPopup(alert, XtGrabNonexclusive); wm_del(alert); ! while (status < 0) { XEvent event_return; XtAppNextEvent(app_context, &event_return); XtDispatchEvent(&event_return); --- 130,136 ---- XtNy, y, (char *)0); XtPopup(alert, XtGrabNonexclusive); wm_del(alert); ! while (status == WAITING) { XEvent event_return; XtAppNextEvent(app_context, &event_return); XtDispatchEvent(&event_return); *************** *** 196,202 **** (char *)0); XtAddCallback(command, XtNcallback, alert_clicked, 0); ! status = -1; XtRealizeWidget(alert); XtUnrealizeWidget(alert); XtVaGetValues(pw, --- 196,202 ---- (char *)0); XtAddCallback(command, XtNcallback, alert_clicked, 0); ! status = WAITING; XtRealizeWidget(alert); XtUnrealizeWidget(alert); XtVaGetValues(pw, *************** *** 213,219 **** XtNy, y, (char *)0); XtPopup(alert, XtGrabNonexclusive); wm_del(alert); ! while (status < 0) { XEvent event_return; XtAppNextEvent(app_context, &event_return); XtDispatchEvent(&event_return); --- 213,219 ---- XtNy, y, (char *)0); XtPopup(alert, XtGrabNonexclusive); wm_del(alert); ! while (status == WAITING) { XEvent event_return; XtAppNextEvent(app_context, &event_return); XtDispatchEvent(&event_return); *************** *** 308,326 **** "OK", listsel_clicked, (XtPointer)1); cancelbutton = add_button(buttonbox, "lsel_cancelbutton", "Cancel", listsel_clicked, (XtPointer)0); ! status = -1; center(pw, listshell); XtPopup(listshell, XtGrabNonexclusive); XawListChange(list, choices, nchoices, 0, True); ! while (status < 0) { XEvent event_return; XtAppNextEvent(app_context, &event_return); XtDispatchEvent(&event_return); } n = XawListShowCurrent(list)->list_index; XtDestroyWidget(listshell); ! if (status) /* clicked OK */ return n; else /* clicked Cancel */ return -1; --- 308,326 ---- "OK", listsel_clicked, (XtPointer)1); cancelbutton = add_button(buttonbox, "lsel_cancelbutton", "Cancel", listsel_clicked, (XtPointer)0); ! status = WAITING; center(pw, listshell); XtPopup(listshell, XtGrabNonexclusive); XawListChange(list, choices, nchoices, 0, True); ! while (status == WAITING) { XEvent event_return; XtAppNextEvent(app_context, &event_return); XtDispatchEvent(&event_return); } n = XawListShowCurrent(list)->list_index; XtDestroyWidget(listshell); ! if (status != ABORT) /* clicked OK */ return n; else /* clicked Cancel */ return -1; *************** *** 374,379 **** --- 374,381 ---- String string; static int init_done = 0; + status = WAITING; + if (!init_done) { XpmAttributes xpm_attr; static XpmColorSymbol none_color = { NULL, "None", (Pixel)0 }; *************** *** 425,432 **** dialogCancel = add_button(dialog, "dialogCancel", "Cancel", DialogAbort, NULL); - status = WAITING; - if (icon == None) icon = default_icon; XtVaSetValues(dialogIcon, --- 427,432 ---- *************** *** 483,489 **** fd_set rfds; struct timeval tv; ! if (active || (status < 0)) return; active = 1; FD_ZERO(&rfds); FD_SET(fd[0], &rfds); --- 483,489 ---- fd_set rfds; struct timeval tv; ! if (active || (status == WAITING)) return; active = 1; FD_ZERO(&rfds); FD_SET(fd[0], &rfds); diff -crNP ../siag-3.3.2/xcommon/fonts.c ./xcommon/fonts.c *** ../siag-3.3.2/xcommon/fonts.c Fri Mar 24 07:21:45 2000 --- ./xcommon/fonts.c Tue Apr 11 22:22:01 2000 *************** *** 27,32 **** --- 27,33 ---- #include #include #include + #include #include #include #include *************** *** 367,373 **** t1_name may be NULL. The caller must then use the X font. */ ! static void encode_font(Display *dpy, int font, int size, int bold, int italic, char *x_name, char **t1_name, char **ps_name) { char *x_fmt; --- 368,375 ---- t1_name may be NULL. The caller must then use the X font. */ ! static void encode_font(Display *dpy, ! int font, int size, int bold, int italic, float zoom, char *x_name, char **t1_name, char **ps_name) { char *x_fmt; *************** *** 379,388 **** res_x = DisplayWidth(dpy, screen)/(DisplayWidthMM(dpy, screen)/25.4); res_y = DisplayHeight(dpy, screen)/(DisplayHeightMM(dpy, screen)/25.4); #else /* cheat to get ps right */ ! res_x = res_y = 72; #endif - res_x = res_x*scale/1000; - res_y = res_y*scale/1000; if (bold) i += 2; if (italic) i += 1; --- 381,388 ---- res_x = DisplayWidth(dpy, screen)/(DisplayWidthMM(dpy, screen)/25.4); res_y = DisplayHeight(dpy, screen)/(DisplayHeightMM(dpy, screen)/25.4); #else /* cheat to get ps right */ ! res_x = res_y = 72*zoom; #endif if (bold) i += 2; if (italic) i += 1; *************** *** 394,399 **** --- 394,432 ---- *ps_name = fontname_table[font].ps_name[i]; } + static struct { + char *name; + XFontStruct *fs; + } *loaded_fonts = NULL; + + XFontStruct *load_cached_font(char *result, char *family, int size, + int bold, int italic, float zoom) + { + char *t1_name, *ps_name; + int i; + XFontStruct *fs; + + encode_font(dpy, lookup_fontname(family), + size, bold, italic, zoom, result, &t1_name, &ps_name); + if (loaded_fonts == NULL) { + loaded_fonts = cmalloc(1*sizeof *loaded_fonts); + loaded_fonts[0].name = NULL; + } + for (i = 0; loaded_fonts[i].name; i++) { + if (!strcmp(loaded_fonts[i].name, result)) + return loaded_fonts[i].fs; + } + loaded_fonts = crealloc(loaded_fonts, (i+1)*sizeof(*loaded_fonts)); + loaded_fonts[i].name = cstrdup(result); + fs = XLoadQueryFont(dpy, result); + if (fs == NULL) { + fs = XLoadQueryFont(dpy, "fixed"); + } + loaded_fonts[i++].fs = fs; + loaded_fonts[i].name = 0; + return fs; + } + /* --- return index into font table or -1 for failure. Load font if necessary. This function is wasteful in that it always loads an X font, even if *************** *** 420,426 **** font_table[i].size = size; font_table[i].bold = bold; font_table[i].italic = italic; ! encode_font(dpy, name, size, bold, italic, x_name, &t1_name, &ps_name); font_table[i].x_name = cstrdup(x_name); if (ps_name) font_table[i].ps_name = cstrdup(ps_name); else font_table[i].ps_name = NULL; --- 453,459 ---- font_table[i].size = size; font_table[i].bold = bold; font_table[i].italic = italic; ! encode_font(dpy, name, size, bold, italic, 1.0, x_name, &t1_name, &ps_name); font_table[i].x_name = cstrdup(x_name); if (ps_name) font_table[i].ps_name = cstrdup(ps_name); else font_table[i].ps_name = NULL; *************** *** 599,604 **** --- 632,638 ---- return i; } + /* --- fmt is an index into fontname_table */ *************** *** 647,653 **** int ps_fontsize(int fmt) { ! return font_table[format_table[fmt].font].size / 10 * 1000 / scale; } static int lastfont; --- 681,687 ---- int ps_fontsize(int fmt) { ! return font_table[format_table[fmt].font].size / 10; } static int lastfont; *************** *** 983,988 **** --- 1017,1023 ---- return 0; } + /* BOGOSITY */ int scale_set(int s) { int old = scale; diff -crNP ../siag-3.3.2/xcommon/tooltip.c ./xcommon/tooltip.c *** ../siag-3.3.2/xcommon/tooltip.c Tue Feb 15 23:54:04 2000 --- ./xcommon/tooltip.c Thu Apr 6 15:23:47 2000 *************** *** 1,5 **** /* ! Copyright (C) 1996-1999 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,5 ---- /* ! Copyright (C) 1996-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 103,109 **** Set the highlighting and unhighlighting colours. */ ! void tooltip_init(Widget pw, unsigned long hl, unsigned long uhl) { XtAppAddActions(XtWidgetToApplicationContext(pw), actions, XtNumber(actions)); --- 103,109 ---- Set the highlighting and unhighlighting colours. */ ! void tooltip_init(Widget pw) { XtAppAddActions(XtWidgetToApplicationContext(pw), actions, XtNumber(actions)); diff -crNP ../siag-3.3.2/xcommon/xcommon.h ./xcommon/xcommon.h *** ../siag-3.3.2/xcommon/xcommon.h Mon Mar 20 17:30:16 2000 --- ./xcommon/xcommon.h Thu Apr 6 15:24:46 2000 *************** *** 1,5 **** /* ! Copyright (C) 1996-1999 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 1,5 ---- /* ! Copyright (C) 1996-2000 Ulric Eriksson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 29,34 **** extern Pixmap load_pixmap(Widget, char *); /* tooltip.c */ ! extern void tooltip_init(Widget, unsigned long, unsigned long); extern void tooltip_mode_set(int, Widget); --- 29,34 ---- extern Pixmap load_pixmap(Widget, char *); /* tooltip.c */ ! extern void tooltip_init(Widget); extern void tooltip_mode_set(int, Widget); diff -crNP ../siag-3.3.2/xcommon/xfonts.h ./xcommon/xfonts.h *** ../siag-3.3.2/xcommon/xfonts.h Mon Mar 20 17:30:29 2000 --- ./xcommon/xfonts.h Sat Apr 8 00:45:24 2000 *************** *** 87,90 **** --- 87,91 ---- extern char *t1_getfontname(int); extern int t1_init(Widget); extern int t1_exit(void); + extern XFontStruct *load_cached_font(char *, char *, int, int, int, float); diff -crNP ../siag-3.3.2/xed/xedit.c ./xed/xedit.c *** ../siag-3.3.2/xed/xedit.c Sat Mar 18 20:08:43 2000 --- ./xed/xedit.c Thu Apr 6 14:53:36 2000 *************** *** 1168,1174 **** char c; char workdir[MAXPATHLEN], completename[MAXPATHLEN]; XtAppContext app_context; - unsigned long highlight_color, unhighlight_color; common_init("XedPlus %s. No Warranty."); --- 1168,1173 ---- *************** *** 1188,1199 **** rudegridWidgetClass, top, (char *) 0); ! highlight_color = WhitePixel(XtDisplay(top), ! DefaultScreen(XtDisplay(top))); ! XtVaGetValues(top, ! XtNbackground, &unhighlight_color, ! (char *) 0); ! tooltip_init(top, highlight_color, unhighlight_color); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, top, (char *)0); --- 1187,1193 ---- rudegridWidgetClass, top, (char *) 0); ! tooltip_init(top); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, top, (char *)0); diff -crNP ../siag-3.3.2/xegon/window.c ./xegon/window.c *** ../siag-3.3.2/xegon/window.c Mon Mar 20 17:31:43 2000 --- ./xegon/window.c Thu Apr 6 14:53:37 2000 *************** *** 1214,1220 **** static void init_windows1(int *argc, char **argv) { - unsigned long highlight_color, unhighlight_color; XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); topLevel = XtVaAppInitialize( --- 1214,1219 ---- *************** *** 1243,1255 **** XtNanimatorNow, 0, (char *)0); editor_init(); - highlight_color = WhitePixel(XtDisplay(topLevel), - DefaultScreen(XtDisplay(topLevel))); ! XtVaGetValues(edit_shell, /* or any widget with grey bg */ ! XtNbackground, &unhighlight_color, ! (char *)0); ! tooltip_init(edit_shell, highlight_color, unhighlight_color); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, topLevel, (char *)0); --- 1242,1249 ---- XtNanimatorNow, 0, (char *)0); editor_init(); ! tooltip_init(edit_shell); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, topLevel, (char *)0); diff -crNP ../siag-3.3.2/xfiler/Main.c ./xfiler/Main.c *** ../siag-3.3.2/xfiler/Main.c Tue Nov 30 00:08:24 1999 --- ./xfiler/Main.c Thu Mar 30 00:24:05 2000 *************** *** 399,405 **** XtArgVal iconic; Window files; Display *dpy; - unsigned long highlight_color, unhighlight_color; char cwd[1024]; progname = argv[0]; --- 399,404 ---- *************** *** 453,463 **** (Cardinal) 0, XtCacheAll, NULL); #endif /* XPM */ ! highlight_color = WhitePixel(dpy, DefaultScreen(dpy)); ! XtVaGetValues(toplevel, ! XtNbackground, &unhighlight_color, ! (char *)0); ! tooltip_init(toplevel, highlight_color, unhighlight_color); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, toplevel, (char *)0); --- 452,458 ---- (Cardinal) 0, XtCacheAll, NULL); #endif /* XPM */ ! tooltip_init(toplevel); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, toplevel, (char *)0); diff -crNP ../siag-3.3.2/xfiler/runcmd.c ./xfiler/runcmd.c *** ../siag-3.3.2/xfiler/runcmd.c Fri Sep 24 00:52:38 1999 --- ./xfiler/runcmd.c Thu Mar 30 00:24:48 2000 *************** *** 74,80 **** { int i; Dimension Height; - unsigned long highlight_color, unhighlight_color; Display *dpy; progname = argv[0]; --- 74,79 ---- *************** *** 88,98 **** fallback_resources,NULL); dpy = XtDisplay(toplevel); ! highlight_color = WhitePixel(dpy, DefaultScreen(dpy)); ! XtVaGetValues(toplevel, ! XtNbackground, &unhighlight_color, ! (char *)0); ! tooltip_init(toplevel, highlight_color, unhighlight_color); if (argc<2) { --- 87,93 ---- fallback_resources,NULL); dpy = XtDisplay(toplevel); ! tooltip_init(toplevel); if (argc<2) { diff -crNP ../siag-3.3.2/xpw/Makefile.in ./xpw/Makefile.in *** ../siag-3.3.2/xpw/Makefile.in Mon Mar 27 21:15:02 2000 --- ./xpw/Makefile.in Thu Apr 6 18:29:27 2000 *************** *** 234,267 **** || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - selection.o: selection.c ../common/common.h ../common/cmalloc.h \ - ../pw/pw.h ../pw/../common/richchar.h ../pw/../common/fonts.h \ - ../pw/../common/traceme.h ../pw/user_interface.h xpw.h - window.o: window.c ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h ../Nws/SubME.h \ - ../common/common.h ../common/cmalloc.h ../common/bitmaps/pw.xpm \ - ../xcommon/xcommon.h ../xcommon/xfonts.h ../xcommon/../config.h \ - ../xcommon/../common/richchar.h ../xcommon/embed.h \ - ../xcommon/Ruler.h ../xcommon/Richtext.h ../xcommon/Combo.h \ - ../xcommon/Frame.h ../xcommon/Tabbing.h ../xcommon/Rudegrid.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h \ - ../xcommon/plugin.h ../xcommon/../common/plugin.h \ - ../xcommon/icon.h ../xcommon/Tooltip.h ../xcommon/Handle.h \ - ../xcommon/../XawM/Label.h ../xcommon/dialogs.h ../pw/pw.h \ - ../pw/../common/richchar.h ../pw/../common/fonts.h \ - ../pw/../common/traceme.h ../pw/user_interface.h xpw.h \ - ../siod/siod.h ../xcommon/xcommon-ad.h ../xcommon/dialogs-ad.h \ - ../xcommon/filesel-ad.h ../xcommon/nws-ad.h app-defaults.h - xpw.o: xpw.c ../siod/siod.h ../pw/pw.h ../pw/../common/richchar.h \ - ../pw/../common/fonts.h ../pw/../common/traceme.h \ - ../pw/user_interface.h ../common/cmalloc.h ../common/common.h \ - ../xcommon/xfonts.h ../xcommon/../config.h \ - ../xcommon/../common/richchar.h ../xcommon/dialogs.h \ - ../xcommon/embed.h ../xcommon/plugin.h \ - ../xcommon/../common/plugin.h ../xcommon/filesel.h \ - ../xcommon/xcommon.h xpw.h - info-am: info: info-am dvi-am: --- 234,239 ---- diff -crNP ../siag-3.3.2/xpw/window.c ./xpw/window.c *** ../siag-3.3.2/xpw/window.c Mon Mar 27 13:21:57 2000 --- ./xpw/window.c Thu Mar 30 00:20:52 2000 *************** *** 1439,1447 **** static void init_windows1(int *argc, char **argv) { - unsigned long highlight_color; - unsigned long unhighlight_color; - XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); topLevel = XtVaAppInitialize( --- 1439,1444 ---- *************** *** 1470,1481 **** topbox = XtCreateManagedWidget("topbox", rudegridWidgetClass, topLevel, NULL, 0); ! highlight_color = WhitePixel(XtDisplay(topLevel), ! DefaultScreen(XtDisplay(topLevel))); ! XtVaGetValues(topbox, /* or any old widget with a grey background */ ! XtNbackground, &unhighlight_color, ! (char *)0); ! tooltip_init(topLevel, highlight_color, unhighlight_color); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, topLevel, (char *)0); --- 1467,1473 ---- topbox = XtCreateManagedWidget("topbox", rudegridWidgetClass, topLevel, NULL, 0); ! tooltip_init(topLevel); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, topLevel, (char *)0); diff -crNP ../siag-3.3.2/xsiag/window.c ./xsiag/window.c *** ../siag-3.3.2/xsiag/window.c Fri Mar 24 15:04:20 2000 --- ./xsiag/window.c Thu Apr 6 14:53:41 2000 *************** *** 1873,1880 **** static void init_windows1(int *argc, char **argv) { - unsigned long highlight_color, unhighlight_color; - XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); topLevel = XtVaAppInitialize( --- 1873,1878 ---- *************** *** 1907,1918 **** (char *)0); } ! highlight_color = WhitePixel(XtDisplay(topLevel), ! DefaultScreen(XtDisplay(topLevel))); ! XtVaGetValues(topLevel, /* or any widget with grey bg */ ! XtNbackground, &unhighlight_color, ! (char *)0); ! tooltip_init(topLevel, highlight_color, unhighlight_color); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, topLevel, (char *)0); --- 1905,1911 ---- (char *)0); } ! tooltip_init(topLevel); tooltip = XtVaCreatePopupShell("tooltip", tooltipWidgetClass, topLevel, (char *)0);