Use the "patch" program to apply this patch file to xfig 3.2.3b to
convert it to version 3.2.3c. E.g. "patch < thisfile".
diff -cr xfig.3.2.3b/CHANGES xfig.3.2.3c/CHANGES
*** xfig.3.2.3b/CHANGES Tue Jul 18 09:45:17 2000
--- xfig.3.2.3c/CHANGES Mon Jul 24 09:52:04 2000
***************
*** 3,8 ****
--- 3,28 ----
Version 3.2
=============================================================================
+ Patchlevel 3c (July 26, 2000)
+
+ NEW FEATURES:
+ o New export shortcut Shift-Alt-x or Shift-Meta-x to export using
+ current settings without popping up the panel
+ o New print shortcut Shift-Alt-p or Shift-Meta-p to print using current
+ settings without popping up the panel
+
+ BUGS FIXED:
+ o Added -m 644 to "install" directives in Imakefile to make updates
+ easier in future (no read-only files)
+ o I18N text handling fixed (bug introduced in 3.2.3b)
+ o If a filename with an absolute path was given when starting xfig, it
+ prepended the current path to the path given thus generating a path
+ that didn't exist.
+ o "Film digitizer" in Fig object library of computers had an illegal
+ Fig object
+ o Pixmap bits for sm_check_bits should be unsigned in w_util.c
+
+ ----------------------------
Patchlevel 3b (Jul 19, 2000)
NEW FEATURES:
***************
*** 108,114 ****
o Certain files are now opened in binary mode ("wb" or "rb") for DOS
compatibility
! -----------------------
Patchlevel 3a (Jan 19, 2000)
NEW FEATURES:
--- 128,134 ----
o Certain files are now opened in binary mode ("wb" or "rb") for DOS
compatibility
! ----------------------------
Patchlevel 3a (Jan 19, 2000)
NEW FEATURES:
diff -cr xfig.3.2.3b/Doc/html/bugs_fixed.html xfig.3.2.3c/Doc/html/bugs_fixed.html
*** xfig.3.2.3b/Doc/html/bugs_fixed.html Tue Jul 18 09:45:31 2000
--- xfig.3.2.3c/Doc/html/bugs_fixed.html Mon Jul 24 09:54:02 2000
***************
*** 10,15 ****
--- 10,37 ----
+
+
+
+ 
+ Added -m 644 to "install" directives in Imakefile to make updates
+ easier in future (no read-only files)
+
+
+ I18N text handling fixed (bug introduced in 3.2.3b)
+
+
+ If a filename with an absolute path was given when starting xfig, it
+ prepended the current path to the path given thus generating a path
+ that didn't exist.
+
+
+ "Film digitizer" in Fig object library of computers had an illegal
+ Fig object
+
+
+ Pixmap bits for sm_check_bits should be unsigned in w_util.c
+
diff -cr xfig.3.2.3b/Doc/html/contents.html xfig.3.2.3c/Doc/html/contents.html
*** xfig.3.2.3b/Doc/html/contents.html Wed Jan 19 11:41:58 2000
--- xfig.3.2.3c/Doc/html/contents.html Mon Jul 24 09:56:12 2000
***************
*** 168,177 ****
!
New Features in xfig 3.2.3a
!
Bugs Fixed in xfig 3.2.3a
Getting and Installing Xfig
--- 168,177 ----
!
New Features in xfig 3.2.3c
!
Bugs Fixed in xfig 3.2.3c
Getting and Installing Xfig
diff -cr xfig.3.2.3b/Doc/html/drawing.html xfig.3.2.3c/Doc/html/drawing.html
*** xfig.3.2.3b/Doc/html/drawing.html Fri Jul 14 09:25:58 2000
--- xfig.3.2.3c/Doc/html/drawing.html Tue Jul 25 09:34:53 2000
***************
*** 640,646 ****
enter local text such as Japanese
with this.
- 
A simplistic superscript/subscript facility is provided. While entering
text, if Ctrl-^ (control caret) is pressed, a new, smaller
string is started above the baseline
--- 640,645 ----
***************
*** 813,819 ****
ERD (Chen's model of Entity Relations)
-
Flags of Europe, Japan and U.S.A.
--- 812,817 ----
***************
*** 823,829 ****
GUI widgets (buttons, sliders, etc.)
-
Hospital equipment
--- 821,826 ----
***************
*** 830,836 ****
Knitting symbols
-
Logic symbols
--- 827,832 ----
***************
*** 844,850 ****
Networking devices
There are a few
-
ones since the last version
--- 840,845 ----
diff -cr xfig.3.2.3b/Doc/html/i18n.html xfig.3.2.3c/Doc/html/i18n.html
*** xfig.3.2.3b/Doc/html/i18n.html Wed Jan 19 11:42:57 2000
--- xfig.3.2.3c/Doc/html/i18n.html Mon Jul 24 09:56:37 2000
***************
*** 75,86 ****
! - Get xfig.3.2.3a.tar.gz
and gunzip and untar it.
- Uncomment ``#define I18N''
! in xfig.3.2.3a/Imakefile (remove the XCOMM comment).
- If your C library supports the required locale,
--- 75,86 ----
! - Get xfig.3.2.3c.tar.gz
and gunzip and untar it.
- Uncomment ``#define I18N''
! in xfig.3.2.3c/Imakefile (remove the XCOMM comment).
- If your C library supports the required locale,
***************
*** 97,108 ****
! - Get transfig.3.2.3a.tar.gz
and gunzip and untar it.
- Uncomment ``#define I18N''
! in transfig.3.2.3a/fig2dev/Imakefile (remove the XCOMM comment).
- If you want to install files like japanese.ps
--- 97,108 ----
! - Get transfig.3.2.3c.tar.gz
and gunzip and untar it.
- Uncomment ``#define I18N''
! in transfig.3.2.3c/fig2dev/Imakefile (remove the XCOMM comment).
- If you want to install files like japanese.ps
diff -cr xfig.3.2.3b/Doc/html/installation.html xfig.3.2.3c/Doc/html/installation.html
*** xfig.3.2.3b/Doc/html/installation.html Tue Jul 11 16:45:16 2000
--- xfig.3.2.3c/Doc/html/installation.html Mon Jul 24 09:55:44 2000
***************
*** 40,55 ****
! - Get the source of xfig (xfig.3.2.3b.tar.gz)
and gunzip and untar the file:
Either do:
! - gunzip -c xfig.3.2.3b.tar.gz | tar xvf -
or
! - gunzip xfig.3.2.3b.tar.gz
! tar xvf xfig.3.2.3b.tar
You can get the source from
--- 40,55 ----
! - Get the source of xfig (xfig.3.2.3c.tar.gz)
and gunzip and untar the file:
Either do:
! - gunzip -c xfig.3.2.3c.tar.gz | tar xvf -
or
! - gunzip xfig.3.2.3c.tar.gz
! tar xvf xfig.3.2.3c.tar
You can get the source from
***************
*** 201,207 ****
see also Internationalization.
! - Get the source of TransFig (transfig.3.2.3b.tar.gz),
and untar the file.
It should be available at the same site as xfig.
--- 201,207 ----
see also Internationalization.
! - Get the source of TransFig (transfig.3.2.3c.tar.gz),
and untar the file.
It should be available at the same site as xfig.
diff -cr xfig.3.2.3b/Doc/html/introduction.html xfig.3.2.3c/Doc/html/introduction.html
*** xfig.3.2.3b/Doc/html/introduction.html Tue Jul 11 16:14:51 2000
--- xfig.3.2.3c/Doc/html/introduction.html Tue Jul 25 09:23:50 2000
***************
*** 21,27 ****
platforms. It is freeware, and available
via anonymous ftp.
! This release, 3.2.3b is mainly a bug-fix release, but with a few new features, mentioned
the New Features section.
To see which bugs were fixed, please see the
Bugs Fixed section.
--- 21,27 ----
platforms. It is freeware, and available
via anonymous ftp.
! This release, 3.2.3c is mainly a bug-fix release, but with a few new features, mentioned
the New Features section.
To see which bugs were fixed, please see the
Bugs Fixed section.
diff -cr xfig.3.2.3b/Doc/html/japanese/drawing.html xfig.3.2.3c/Doc/html/japanese/drawing.html
*** xfig.3.2.3b/Doc/html/japanese/drawing.html Fri Jul 14 09:26:56 2000
--- xfig.3.2.3c/Doc/html/japanese/drawing.html Tue Jul 25 09:25:50 2000
***************
*** 700,706 ****
- ![[ NEW! (3.2.3b) ]](../images/pict-new.gif)
Control-^ によって上付き添字を、
Control-_ によって下付き添字を入力することが可能です。
これは、添字のために適切な大きさと位置の新しい文字列を生成します。
--- 700,705 ----
***************
*** 742,748 ****
![[Library Panel]](../images/library-panel.gif)
-
このパネルには使用可能なライブラリ
のリストを示す Library メニューが置かれています。
その中からいずれかのライブラリを選択するとそのライブラリがロードされ、
--- 741,746 ----
***************
*** 817,830 ****
- Physical Electrical - electrical objects, e.g. connectors
- Schematic Electrical - symbols for creating electronic schematics
- ERD (Chen's model of Entity Relations)
-
- Flags of Europe, Japan, and U.S.A.
- Flowchart symbols
- GUI widgets (buttons, sliders, etc.)
-
- Hospital equipment
- Knitting symbols
-
- Logic symbols
- DIN Mechanical symbols
- Music symbols
--- 815,825 ----
diff -cr xfig.3.2.3b/Doc/html/japanese/i18n.html xfig.3.2.3c/Doc/html/japanese/i18n.html
*** xfig.3.2.3b/Doc/html/japanese/i18n.html Thu Jul 13 05:58:52 2000
--- xfig.3.2.3c/Doc/html/japanese/i18n.html Mon Jul 24 08:10:29 2000
***************
*** 77,87 ****
! - xfig.3.2.3b.tar.gz
を入手し、展開します。
!
- xfig.3.2.3b/Imakefile の、
``#define I18N'' のコメント・アウトを解除
(XCOMM を削除) します。
--- 77,87 ----
! - xfig.3.2.3x.full.tar.gz
を入手し、展開します。
!
- xfig.3.2.3x/Imakefile の、
``#define I18N'' のコメント・アウトを解除
(XCOMM を削除) します。
***************
*** 101,111 ****
! - transfig.3.2.3b.tar.gz
を入手し、展開します。
!
- transfig.3.2.3b/fig2dev/Imakefile の、
``#define I18N'' のコメント・アウトを解除
(XCOMM を削除) します。
--- 101,111 ----
! - transfig.3.2.3x.tar.gz
を入手し、展開します。
!
- transfig.3.2.3x/fig2dev/Imakefile の、
``#define I18N'' のコメント・アウトを解除
(XCOMM を削除) します。
diff -cr xfig.3.2.3b/Doc/html/japanese/installation.html xfig.3.2.3c/Doc/html/japanese/installation.html
*** xfig.3.2.3b/Doc/html/japanese/installation.html Thu Jul 13 05:59:04 2000
--- xfig.3.2.3c/Doc/html/japanese/installation.html Mon Jul 24 08:10:29 2000
***************
*** 38,54 ****
国際化 も参照して下さい。
! - xfig のソース (xfig.3.2.3b.tar.gz) を入手して、展開します。
ソースの展開は、
! gunzip -c xfig.3.2.3b.tar.gz | tar xvf -
あるいは、
! gunzip xfig.3.2.3b.tar.gz; tar xvf xfig.3.2.3b.tar
のような方法で行なうことができます。
--- 38,55 ----
国際化 も参照して下さい。
! - xfig のソース (xfig.3.2.3x.full.tar.gz)
! を入手して、展開します。
ソースの展開は、
! gunzip -c xfig.3.2.3x.full.tar.gz | tar xvf -
あるいは、
! gunzip xfig.3.2.3x.tar.gz; tar xvf xfig.3.2.3x.tar
のような方法で行なうことができます。
***************
*** 62,67 ****
--- 63,80 ----
(例えば
ftp://ftp.tex.ac.uk/pub/archive/graphics)
から入手することができます。
+ 日本国内では Ring Server
+ や SunSITE などにも
+ ミラーされていますので、
+ できるだけ近くのサイトから入手するようにして下さい。
+
+ xfig.3.2.3x.full.tar.gz 以外に、
+ xfig.3.2.3x.code_only.tar.gz、
+ xfig.3.2.3x.docs_only.tar.gz、
+ 及び
+ xfig.3.2.3x.libraries_only.tar.gz
+ として、それぞれソース・コード、ドキュメント、
+ 及びライブラリのみを含んだものも用意されています。
- 必要に応じて Imakefile を編集します。
***************
*** 181,188 ****
国際化 も参照して下さい。
! - transfig のソース (transfig.3.2.3b.tar.gz) を入手して、
! 展開します。
これは、xfig
と同じサイトから入手することができます。
--- 194,201 ----
国際化 も参照して下さい。
! - transfig のソース (transfig.3.2.3x.tar.gz)
! を入手して、展開します。
これは、xfig
と同じサイトから入手することができます。
diff -cr xfig.3.2.3b/Doc/html/japanese/new_features.html xfig.3.2.3c/Doc/html/japanese/new_features.html
*** xfig.3.2.3b/Doc/html/japanese/new_features.html Fri Jul 14 04:09:47 2000
--- xfig.3.2.3c/Doc/html/japanese/new_features.html Mon Jul 24 08:10:29 2000
***************
*** 12,17 ****
--- 12,22 ----
新しい機能
+ xfig 3.2.3c の新しい機能
+
+ xfig 3.2.3c は問題の修正のためのリリースであり、
+ 新しい機能は追加されていません。
+
xfig 3.2.3b の新しい機能
diff -cr xfig.3.2.3b/Doc/html/new_features.html xfig.3.2.3c/Doc/html/new_features.html
*** xfig.3.2.3b/Doc/html/new_features.html Tue Jul 11 16:10:02 2000
--- xfig.3.2.3c/Doc/html/new_features.html Mon Jul 24 09:53:51 2000
***************
*** 10,15 ****
--- 10,26 ----
+
+
+
+
+ New export shortcut Shift-Alt-x or Shift-Meta-x to export using
+ current settings without popping up the panel
+
+
+ New print shortcut Shift-Alt-p or Shift-Meta-p to print using current
+ settings without popping up the panel
+
diff -cr xfig.3.2.3b/Doc/xfig.html xfig.3.2.3c/Doc/xfig.html
*** xfig.3.2.3b/Doc/xfig.html Thu Jul 13 09:55:39 2000
--- xfig.3.2.3c/Doc/xfig.html Mon Jul 24 09:57:39 2000
***************
*** 1,7 ****
Manpage of XFIG
XFIG
! Section: User Commands (1)
Updated: Xfig 3.2.3b (July 19, 2000)
Index
--- 1,7 ----
Manpage of XFIG
XFIG
! Section: User Commands (1)
Updated: Xfig 3.2.3c (July 25, 2000)
Index
diff -cr xfig.3.2.3b/Doc/xfig.man xfig.3.2.3c/Doc/xfig.man
*** xfig.3.2.3b/Doc/xfig.man Thu Jul 13 09:54:57 2000
--- xfig.3.2.3c/Doc/xfig.man Mon Jul 24 09:59:48 2000
***************
*** 108,114 ****
.PD
..
.\"-------
! .TH XFIG 1 "Xfig 3.2.3b (July 19, 2000)"
.SH NAME
xfig - Facility for Interactive Generation of figures under X11
.SH SYNOPSIS
--- 108,114 ----
.PD
..
.\"-------
! .TH XFIG 1 "Xfig 3.2.3c (July 25, 2000)"
.SH NAME
xfig - Facility for Interactive Generation of figures under X11
.SH SYNOPSIS
diff -cr xfig.3.2.3b/Examples/Libraries/Computers/film_digitizer.fig xfig.3.2.3c/Examples/Libraries/Computers/film_digitizer.fig
*** xfig.3.2.3b/Examples/Libraries/Computers/film_digitizer.fig Wed Dec 1 08:42:22 1999
--- xfig.3.2.3c/Examples/Libraries/Computers/film_digitizer.fig Mon Jul 24 08:19:26 2000
***************
*** 46,53 ****
2 3 0 1 -1 -1 2 0 3 0.000 0 0 -1 0 0 5
690 4245 780 4200 1470 4200 1515 4245 690 4245
-6
- 2 2 0 1 -1 -1 2 0 -1 0.000 0 0 0 0 0 1
- 1650 5775
2 2 0 1 -1 -1 2 0 -1 0.000 0 0 0 0 0 5
1650 5250 1650 5775 600 5775 600 5250 1650 5250
2 3 0 1 -1 -1 2 0 5 0.000 0 0 -1 0 0 5
--- 46,51 ----
diff -cr xfig.3.2.3b/Fig.ad xfig.3.2.3c/Fig.ad
*** xfig.3.2.3b/Fig.ad Thu Jul 6 14:43:19 2000
--- xfig.3.2.3c/Fig.ad Mon Jul 24 10:28:49 2000
***************
*** 1,7 ****
!Don't change the following string - xfig uses it to determine
! if you have the newest app-defaults files installed
! Fig.version: 3.2.3b
! some sample settings you may want to change
--- 1,7 ----
!Don't change the following string - xfig uses it to determine
! if you have the newest app-defaults files installed
! Fig.version: 3.2.3c
! some sample settings you may want to change
***************
*** 193,198 ****
--- 193,202 ----
Altt: Paste() \n\
Metaa: SaveAs() \n\
Alta: SaveAs() \n\
+ Shift Metap: PrintFile() \n\
+ Shift Altp: PrintFile() \n\
+ Shift Metax: ExportFile() \n\
+ Shift Altx: ExportFile() \n\
Metas: SaveFile() \n\
Alts: SaveFile() \n\
Metam: MergeFile() \n\
diff -cr xfig.3.2.3b/Imakefile xfig.3.2.3c/Imakefile
*** xfig.3.2.3b/Imakefile Wed Jul 19 10:30:29 2000
--- xfig.3.2.3c/Imakefile Wed Jul 19 11:14:27 2000
***************
*** 336,342 ****
@if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ; set +x; ); fi
chmod a+x,u+w $(DESTDIR)$(XFIGLIBDIR)
! $(INSTALL) -c CompKeyDB $(DESTDIR)$(XFIGLIBDIR)
$(MAKE) install.libs
$(MAKE) install.doc
--- 336,342 ----
@if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ; set +x; ); fi
chmod a+x,u+w $(DESTDIR)$(XFIGLIBDIR)
! $(INSTALL) -m 644 -c CompKeyDB $(DESTDIR)$(XFIGLIBDIR)
$(MAKE) install.libs
$(MAKE) install.doc
***************
*** 349,361 ****
#endif
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGLIBDIR) ; \
! $(INSTALL) -c xfig.html $(DESTDIR)$(XFIGLIBDIR) ; \
! $(INSTALL) -c xfig-howto.pdf $(DESTDIR)$(XFIGLIBDIR) ; \
if [ -d $(DESTDIR)$(XFIGLIBDIR)/html ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html ); fi ; \
(cd html ; \
for f in *.* ; do \
! $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html ; \
done) ; \
echo " Copying image files for html" ; \
if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/images ]; then set +x; \
--- 349,361 ----
#endif
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGLIBDIR) ; \
! $(INSTALL) -m 644 -c xfig.html $(DESTDIR)$(XFIGLIBDIR) ; \
! $(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGLIBDIR) ; \
if [ -d $(DESTDIR)$(XFIGLIBDIR)/html ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html ); fi ; \
(cd html ; \
for f in *.* ; do \
! $(INSTALL) -m 644 -c $$f $(DESTDIR)$(XFIGLIBDIR)/html ; \
done) ; \
echo " Copying image files for html" ; \
if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/images ]; then set +x; \
***************
*** 362,368 ****
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/images ); fi ; \
(cd html/images ; \
for f in * ; do \
! $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/images ; \
done) ; \
) ;
--- 362,368 ----
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/images ); fi ; \
(cd html/images ; \
for f in * ; do \
! $(INSTALL) -m 644 -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/images ; \
done) ; \
) ;
***************
*** 373,379 ****
if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/japanese ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/japanese ); fi ; \
for f in * ; do \
! $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/japanese ; \
done) ;
#endif
--- 373,379 ----
if [ -d $(DESTDIR)$(XFIGLIBDIR)/html/japanese ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/html/japanese ); fi ; \
for f in * ; do \
! $(INSTALL) -m 644 -c $$f $(DESTDIR)$(XFIGLIBDIR)/html/japanese ; \
done) ;
#endif
***************
*** 405,417 ****
else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ); fi ; \
(cd $$l ; \
for m in * ; do \
! $(INSTALL) -c $$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
done ) ) ; \
! else ( $(INSTALL) -c $$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
done) ) ; \
! else ( $(INSTALL) -c $$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
done) ); \
! else ($(INSTALL) -c $$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
done ) ; \
done ; ) ; \
else echo No Object Libraries to install ; \
--- 405,417 ----
else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ); fi ; \
(cd $$l ; \
for m in * ; do \
! $(INSTALL) -m 644 -c $$m $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd/$$l ; \
done ) ) ; \
! else ( $(INSTALL) -m 644 -c $$l $(DESTDIR)$(OBJLIBDIR)/$$d/$$f/$$dd ) ; fi ; \
done) ) ; \
! else ( $(INSTALL) -m 644 -c $$dd $(DESTDIR)$(OBJLIBDIR)/$$d/$$f ) ; fi ; \
done) ); \
! else ($(INSTALL) -m 644 -c $$f $(DESTDIR)$(OBJLIBDIR)/$$d ) ; fi ; \
done ) ; \
done ; ) ; \
else echo No Object Libraries to install ; \
diff -cr xfig.3.2.3b/d_text.c xfig.3.2.3c/d_text.c
*** xfig.3.2.3b/d_text.c Mon Jul 3 14:36:47 2000
--- xfig.3.2.3c/d_text.c Thu Jul 20 09:57:54 2000
***************
*** 852,857 ****
--- 852,858 ----
if (leng_prefix > 0
&& appres.international && is_i18n_font(canvas_font)) {
int len;
+ erase_char_string();
len = i18n_prefix_tail(NULL);
for (i=leng_suffix+len; i>0; i--) /* copies null too */
suffix[i]=suffix[i-len];
***************
*** 860,865 ****
--- 861,867 ----
prefix[leng_prefix-len]='\0';
leng_prefix-=len;
leng_suffix+=len;
+ draw_char_string();
} else
#endif /* I18N */
if (leng_prefix > 0) {
***************
*** 881,886 ****
--- 883,889 ----
if (leng_suffix > 0
&& appres.international && is_i18n_font(canvas_font)) {
int len;
+ erase_char_string();
len = i18n_suffix_head(NULL);
for (i=0; i 0) {
***************
*** 908,914 ****
} else if (keysym == XK_Home || c == CTRL_A) {
if (leng_prefix > 0) {
#ifdef I18N
! if (!appres.international || !is_i18n_font(canvas_font))
#endif /* I18N */
for (i=leng_prefix-1; i>=0; i--)
move_cur(-1, prefix[i], 1.0);
--- 912,920 ----
} else if (keysym == XK_Home || c == CTRL_A) {
if (leng_prefix > 0) {
#ifdef I18N
! if (appres.international && is_i18n_font(canvas_font))
! erase_char_string();
! else
#endif /* I18N */
for (i=leng_prefix-1; i>=0; i--)
move_cur(-1, prefix[i], 1.0);
***************
*** 917,922 ****
--- 923,932 ----
prefix[0]='\0';
leng_prefix=0;
leng_suffix=strlen(suffix);
+ #ifdef I18N
+ if (appres.international && is_i18n_font(canvas_font))
+ draw_char_string();
+ #endif /* I18N */
}
/*********************************************************/
***************
*** 926,932 ****
} else if (keysym == XK_End || c == CTRL_E) {
if (leng_suffix > 0) {
#ifdef I18N
! if (!appres.international || !is_i18n_font(canvas_font))
#endif /* I18N */
for (i=0; i 0) {
#ifdef I18N
! if (appres.international && is_i18n_font(canvas_font))
! erase_char_string();
! else
#endif /* I18N */
for (i=0; i 0
&& appres.international && is_i18n_font(canvas_font)) {
int len;
len = i18n_prefix_tail(NULL);
- erase_suffix();
leng_prefix-=len;
erase_char(ch);
prefix[leng_prefix]='\0';
! draw_suffix();
} else
#endif /* I18N */
if (leng_prefix > 0) {
--- 961,972 ----
if (leng_prefix > 0
&& appres.international && is_i18n_font(canvas_font)) {
int len;
+ erase_char_string();
len = i18n_prefix_tail(NULL);
leng_prefix-=len;
erase_char(ch);
prefix[leng_prefix]='\0';
! draw_char_string();
} else
#endif /* I18N */
if (leng_prefix > 0) {
***************
*** 996,1007 ****
if (leng_suffix > 0
&& appres.international && is_i18n_font(canvas_font)) {
int len;
len = i18n_suffix_head(NULL);
- erase_suffix();
for (i=0; i<=leng_suffix-len; i++) /* copies null too */
suffix[i]=suffix[i+len];
leng_suffix-=len;
! draw_suffix();
} else
#endif /* I18N */
if (leng_suffix > 0) {
--- 1012,1023 ----
if (leng_suffix > 0
&& appres.international && is_i18n_font(canvas_font)) {
int len;
+ erase_char_string();
len = i18n_suffix_head(NULL);
for (i=0; i<=leng_suffix-len; i++) /* copies null too */
suffix[i]=suffix[i+len];
leng_suffix-=len;
! draw_char_string();
} else
#endif /* I18N */
if (leng_suffix > 0) {
***************
*** 1045,1051 ****
} else if (c == CTRL_X) {
if (leng_prefix > 0) {
#ifdef I18N
! if (!appres.international || !is_i18n_font(canvas_font))
#endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
--- 1061,1069 ----
} else if (c == CTRL_X) {
if (leng_prefix > 0) {
#ifdef I18N
! if (appres.international && is_i18n_font(canvas_font))
! erase_char_string();
! else
#endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
***************
*** 1089,1094 ****
--- 1107,1116 ----
break;
}
move_blinking_cursor(cur_x, cur_y);
+ #ifdef I18N
+ if (appres.international && is_i18n_font(canvas_font))
+ draw_char_string();
+ #endif /* I18N */
}
/*************************/
***************
*** 1097,1103 ****
} else if (c == CTRL_K) {
if (leng_suffix > 0) {
#ifdef I18N
! if (!appres.international || !is_i18n_font(canvas_font))
#endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
--- 1119,1127 ----
} else if (c == CTRL_K) {
if (leng_suffix > 0) {
#ifdef I18N
! if (appres.international && is_i18n_font(canvas_font))
! erase_char_string();
! else
#endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
***************
*** 1122,1127 ****
--- 1146,1156 ----
leng_suffix = 0;
*suffix = '\0';
/* redraw stuff */
+ #ifdef I18N
+ if (appres.international && is_i18n_font(canvas_font))
+ draw_char_string();
+ else
+ #endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
break;
***************
*** 1143,1148 ****
--- 1172,1182 ----
/*************************/
} else {
/* move pointer */
+ #ifdef I18N
+ if (appres.international && is_i18n_font(canvas_font))
+ erase_char_string();
+ else
+ #endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
erase_suffix(); /* erase any string after cursor */
***************
*** 1163,1168 ****
--- 1197,1207 ----
prefix[leng_prefix] = '\0';
move_blinking_cursor(cur_x, cur_y);
/* redraw stuff */
+ #ifdef I18N
+ if (appres.international && is_i18n_font(canvas_font))
+ draw_char_string();
+ else
+ #endif /* I18N */
switch (work_textjust) {
case T_LEFT_JUSTIFIED:
draw_suffix();
***************
*** 1580,1589 ****
unsigned char *str;
{
int i;
! erase_suffix(); /* erase chars after the cursor */
for (i = 0; str[i] != '\0'; i++)
prefix_append_char(str[i]);
! draw_suffix(); /* draw new suffix */
}
prefix_append_char(ch)
--- 1619,1628 ----
unsigned char *str;
{
int i;
! erase_char_string(); /* erase chars after the cursor */
for (i = 0; str[i] != '\0'; i++)
prefix_append_char(str[i]);
! draw_char_string(); /* draw new suffix */
}
prefix_append_char(ch)
diff -cr xfig.3.2.3b/main.c xfig.3.2.3c/main.c
*** xfig.3.2.3b/main.c Mon Jul 3 12:36:58 2000
--- xfig.3.2.3c/main.c Mon Jul 24 09:02:50 2000
***************
*** 92,97 ****
--- 92,98 ----
{"PopupExport", (XtActionProc) popup_export_panel},
{"ExportFile", (XtActionProc) do_export},
{"PopupPrint", (XtActionProc) popup_print_panel},
+ {"PrintFile", (XtActionProc) do_print},
{"PopupGlobals", (XtActionProc) show_global_settings},
{"Undo", (XtActionProc) undo},
{"Paste", (XtActionProc) paste},
***************
*** 1223,1236 ****
cur_filename[0] = '\0';
else
strcpy(cur_filename, arg_filename);
! /* strip off any preceding path */
if (dval=strrchr(cur_filename, '/')) {
! /* append it to the current directory */
! *dval = '\0'; /* terminate string at the last "/" */
! strcat(cur_file_dir,"/");
! strcat(cur_file_dir,cur_filename); /* append the path to the directory */
! strcpy(cur_filename,++dval); /* put the part after the last / in the name */
change_directory(cur_file_dir); /* go there */
}
/* update the name panel with the filename */
update_cur_filename(cur_filename);
--- 1224,1241 ----
cur_filename[0] = '\0';
else
strcpy(cur_filename, arg_filename);
!
! /* save path if specified in filename */
if (dval=strrchr(cur_filename, '/')) {
! strcpy(cur_file_dir, cur_filename);
! /* remove path from filename */
! strcpy(cur_filename, dval+1);
! if (dval=strrchr(cur_file_dir, '/'))
! *dval = '\0'; /* terminate path at the last "/" */
change_directory(cur_file_dir); /* go there */
+ /* and get back the canonical (absolute) path */
+ get_directory(cur_file_dir);
+ get_directory(cur_export_dir);
}
/* update the name panel with the filename */
update_cur_filename(cur_filename);
diff -cr xfig.3.2.3b/patchlevel.h xfig.3.2.3c/patchlevel.h
*** xfig.3.2.3b/patchlevel.h Wed Jul 19 10:04:35 2000
--- xfig.3.2.3c/patchlevel.h Wed Jul 19 11:07:31 2000
***************
*** 18,22 ****
#ifndef PATCHLEVEL_H
#define PATCHLEVEL_H
! #define PATCHLEVEL "3b"
#endif /* PATCHLEVEL_H */
--- 18,22 ----
#ifndef PATCHLEVEL_H
#define PATCHLEVEL_H
! #define PATCHLEVEL "3c"
#endif /* PATCHLEVEL_H */
diff -cr xfig.3.2.3b/u_print.c xfig.3.2.3c/u_print.c
*** xfig.3.2.3b/u_print.c Mon Jul 3 11:31:43 2000
--- xfig.3.2.3c/u_print.c Thu Jul 20 09:57:54 2000
***************
*** 281,287 ****
} else if (!strcmp(lang, "jpeg")) {
/* set the image quality for JPEG export */
sprintf(tmpcmd, "-b %d -q %d -S %d",
! border, appres.jpeg_quality, smooth);
strcat(prcmd, tmpcmd);
strcat(prcmd," ");
--- 281,287 ----
} else if (!strcmp(lang, "jpeg")) {
/* set the image quality for JPEG export */
sprintf(tmpcmd, "-b %d -q %d -S %d",
! border, appres.jpeg_quality, smooth ? 2 : 0);
strcat(prcmd, tmpcmd);
strcat(prcmd," ");
***************
*** 296,302 ****
/* GIF */
} else if (!strcmp(lang, "gif")) {
sprintf(tmpcmd, "-b %d -S %d",
! border, smooth);
strcat(prcmd, tmpcmd);
/* select the transparent color, if any */
--- 296,302 ----
/* GIF */
} else if (!strcmp(lang, "gif")) {
sprintf(tmpcmd, "-b %d -S %d",
! border, smooth ? 2 : 0);
strcat(prcmd, tmpcmd);
/* select the transparent color, if any */
***************
*** 329,335 ****
!strcmp(lang, "xbm") || !strcmp(lang, "xpm") || !strcmp(lang, "ppm")) {
/* bitmap formats need border option */
sprintf(tmpcmd, "-b %d -S %d",
! border, smooth);
strcat(prcmd, tmpcmd);
if (backgrnd[0]) {
--- 329,335 ----
!strcmp(lang, "xbm") || !strcmp(lang, "xpm") || !strcmp(lang, "ppm")) {
/* bitmap formats need border option */
sprintf(tmpcmd, "-b %d -S %d",
! border, smooth ? 2 : 0);
strcat(prcmd, tmpcmd);
if (backgrnd[0]) {
diff -cr xfig.3.2.3b/w_indpanel.c xfig.3.2.3c/w_indpanel.c
*** xfig.3.2.3b/w_indpanel.c Tue Jan 18 17:23:48 2000
--- xfig.3.2.3c/w_indpanel.c Fri Jul 21 11:02:49 2000
***************
*** 2929,2936 ****
{
if (cur_fontsize < MIN_FONT_SIZE)
cur_fontsize = MIN_FONT_SIZE;
! else if (cur_fontsize > 1000)
! cur_fontsize = 1000;
put_msg("Font size %d", cur_fontsize);
/* write the font size in the background pixmap */
--- 2929,2936 ----
{
if (cur_fontsize < MIN_FONT_SIZE)
cur_fontsize = MIN_FONT_SIZE;
! else if (cur_fontsize > MAX_FONT_SIZE)
! cur_fontsize = MAX_FONT_SIZE;
put_msg("Font size %d", cur_fontsize);
/* write the font size in the background pixmap */
diff -cr xfig.3.2.3b/w_util.c xfig.3.2.3c/w_util.c
*** xfig.3.2.3b/w_util.c Mon Jul 3 14:20:55 2000
--- xfig.3.2.3c/w_util.c Sun Jul 23 11:25:22 2000
***************
*** 57,63 ****
/* smaller checkmark */
/* sm_check_width and _height are defined in w_util.c so w_layers.c can use them */
! static char sm_check_bits[] = {
0x00, 0x00, 0x80, 0x01, 0xc0, 0x01, 0xe0, 0x01, 0x76, 0x00, 0x3e, 0x00,
0x1c, 0x00, 0x18, 0x00, 0x08, 0x00, 0x00, 0x00};
Pixmap sm_check_pm, sm_null_check_pm;
--- 57,63 ----
/* smaller checkmark */
/* sm_check_width and _height are defined in w_util.c so w_layers.c can use them */
! static unsigned char sm_check_bits[] = {
0x00, 0x00, 0x80, 0x01, 0xc0, 0x01, 0xe0, 0x01, 0x76, 0x00, 0x3e, 0x00,
0x1c, 0x00, 0x18, 0x00, 0x08, 0x00, 0x00, 0x00};
Pixmap sm_check_pm, sm_null_check_pm;