gv/gv-3.5.8-I18N-mb.patch

829 lines
38 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

diff -Nru gv-3.5.8.orig/README.I18N gv-3.5.8/README.I18N
--- gv-3.5.8.orig/README.I18N 1970-01-01 01:00:00.000000000 +0100
+++ gv-3.5.8/README.I18N 2005-05-23 19:45:33.000000000 +0200
@@ -0,0 +1,28 @@
+GV I18N Fontset Patch for Japanese
+ Keio University in Japan
+ 1998 Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>
+
+This patch make gv to support Japanese NLS.
+
+ if you can not see Japanese GV, please install
+ 10/12pt kanji fonts to X Window System, or edit
+ file `$(SRC)/source/gv_font_res-I18N_mb.dat' and
+ recompile.
+
+NEED:
+ Xaw3d 1.4, 1.5 has a fatal bug in MultiSrc.c line 735-740.
+ This GV's patch need Xaw3d library patched follow:
+
+diff -Ncr xc/lib/Xaw3d/MultiSrc.c xc-fix/lib/Xaw3d/MultiSrc.c
+*** xc/lib/Xaw3d/MultiSrc.c Fri May 15 04:03:23 1998
+--- xc-fix/lib/Xaw3d/MultiSrc.c Fri Dec 18 09:59:52 1998
+*** 735,740 ****
+--- 735,741 ----
+
+ if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) {
+ RemoveOldStringOrFile(old_src, string_set);
++ src->multi_src.allocated_string = old_src->multi_src.allocated_string;
+ file = InitStringOrFile(src, string_set);
+
+ /* Load pieces does this logic for us, but it shouldn't. Its messy.*/
+
diff -Nru gv-3.5.8.orig/config.Unix gv-3.5.8/config.Unix
--- gv-3.5.8.orig/config.Unix 1997-06-07 00:00:00.000000000 +0200
+++ gv-3.5.8/config.Unix 2005-05-23 19:45:33.000000000 +0200
@@ -115,6 +115,13 @@
#endif
XCOMM --------------------------------------------------------------------
+XCOMM --- Fontset support for I18N (multibyte charactor)
+XCOMM --------------------------------------------------------------------
+#define I18N_MB
+#define NLS
+LINGUAS = ja_JP.eucJP
+
+XCOMM --------------------------------------------------------------------
XCOMM --- Compiler flags.
XCOMM --------------------------------------------------------------------
XCOMM CC = gcc
diff -Nru gv-3.5.8.orig/source/Imakefile gv-3.5.8/source/Imakefile
--- gv-3.5.8.orig/source/Imakefile 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/Imakefile 2005-05-23 19:45:33.000000000 +0200
@@ -154,12 +154,19 @@
USER_DEFS_9 = -DUSE_FALLBACK_STYLES
#endif
+#ifdef I18N_MB
+ I18NMB = -I18N_mb
+ I18N_DEFS = -DI18N_MB
+#else
+#undef NLS
+#endif
+
SYS_LIBS_1 = -lm XawClientLibs
USER_DEFINES = $(USER_DEFS_0) $(USER_DEFS_1) $(USER_DEFS_2) $(USER_DEFS_3)\
$(USER_DEFS_4) $(USER_DEFS_5) $(USER_DEFS_6) $(USER_DEFS_7)\
$(USER_DEFS_8) $(USER_DEFS_9) $(USER_DEFS_10) $(USER_DEFS_11)\
- $(USER_DEFS_12) $(USER_DEFS_13) $(USER_DEFS_14) $(USER_DEFS_15)
+ $(USER_DEFS_12) $(USER_DEFS_13) $(USER_DEFS_14) $(USER_DEFS_15) $(I18N_DEFS)
SRCS = $(SRCS_0) $(SRCS_1) $(SRCS_2) $(SRCS_3) $(SRCS_4) $(SRCS_5)\
$(SRCS_6) $(SRCS_7) $(SRCS_8) $(SRCS_9) $(SRCS_10) $(SRCS_11)\
$(SRCS_12) $(SRCS_13) $(SRCS_14) $(SRCS_15)
@@ -175,7 +182,11 @@
DEPLIBS = XawClientDepLibs
INSTDATFLAGS = -m 0644
+#ifdef I18N_MB
+GV_FONT_RES_DAT = gv_font_res-I18N_mb.dat
+#else
GV_FONT_RES_DAT = gv_font_res.dat
+#endif
GV_MAKE_RES_DAT = gv_make_res.dat
GV_MISC_RES_DAT = gv_misc_res.dat
GV_USER_RES_DAT = gv_user_res.dat
@@ -216,6 +227,26 @@
InstallNonExec($(GV_USER_AD),$(GV_LIBDIR))
InstallNonExec($(GV_CLASS_AD),$(GV_LIBDIR))
InstallAppDefaults($(GV_CLASS_NAME))
+
+#ifdef NLS
+install:: $(GV_SYSTEM_AD)
+ @for LNG in $(LINGUAS);do \
+ [ -f gv_nls_$$LNG.dat ] || continue; \
+ cat $(GV_SYSTEM_AD) > GV_$$LNG.ad; \
+ cat gv_nls_$$LNG.dat >> GV_$$LNG.ad; \
+ [ -d $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults ] || \
+ $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults; \
+ $(INSTALL) $(INSTALLFLAGS) \
+ GV_$$LNG.ad $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults/GV; \
+ done
+
+clean::
+ @for LNG in $(LINGUAS);do \
+ [ -f GV_$$LNG.ad ] && rm -f GV_$$LNG.ad; \
+ done
+
+#endif
+
#ifndef USE_FALLBACK_STYLES
InstallNonExec($(GV_STYLE_1_DAT),$(GV_LIBDIR))
#endif
diff -Nru gv-3.5.8.orig/source/Vlist.c gv-3.5.8/source/Vlist.c
--- gv-3.5.8.orig/source/Vlist.c 1997-06-07 00:00:00.000000000 +0200
+++ gv-3.5.8/source/Vlist.c 2005-05-23 19:45:33.000000000 +0200
@@ -317,12 +317,21 @@
if (s) {
char *nl = strchr(s,'\n');
if (nl) *nl = '\0';
+#ifdef I18N_MB
+ XmbDrawString(XtDisplay(w), XtWindow(w),
+ vw->label.fontset, vw->label.normal_GC,
+ vw->label.label_x,
+ vw->label.label_y+entry*vw->label.label_height/vw->vlist.entries
+ - XExtentsOfFontSet(vw->label.fontset)->max_logical_extent.y +1,
+ s, (int)strlen(s));
+#else
XDrawString(XtDisplay(w), XtWindow(w), vw->label.normal_GC,
vw->label.label_x,
vw->label.label_y+entry*(vw->label.font->max_bounds.ascent +
vw->label.font->max_bounds.descent) +
vw->label.font->max_bounds.ascent,
s, (int)strlen(s));
+#endif
if (nl) *nl = '\n';
}
ENDMESSAGE1(PaintEntryString)
diff -Nru gv-3.5.8.orig/source/callbacks.c gv-3.5.8/source/callbacks.c
--- gv-3.5.8.orig/source/callbacks.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/callbacks.c 2005-05-23 19:45:33.000000000 +0200
@@ -764,12 +764,6 @@
BEGINMESSAGE(cb_openFile)
XawFileSelectionRemoveButton(FileSel, 3);
- n=0;
- XtSetArg(args[n], XtNtitle, "Open File"); ++n;
- XtSetValues(FileSel_popup, args, n);
- n=0;
- XtSetArg(args[n], XtNlabel, "Open File"); ++n;
- XtSetValues(button, args, n);
XtRemoveAllCallbacks(button, XtNcallback);
XtAddCallback(button, XtNcallback,cb_doOpenFile,NULL);
diff -Nru gv-3.5.8.orig/source/dialog.c gv-3.5.8/source/dialog.c
--- gv-3.5.8.orig/source/dialog.c 1997-06-07 00:00:00.000000000 +0200
+++ gv-3.5.8/source/dialog.c 2005-05-23 19:45:33.000000000 +0200
@@ -271,7 +271,11 @@
# define DIALOG_POPUP_TEXT_MIN_WIDTH 100
String os;
Dimension lm,rm,bw,nw;
+#ifdef I18N_MB
+ XFontSet fontset;
+#else
XFontStruct *font;
+#endif
BEGINMESSAGE(DialogPopupSetText)
if (!s) {INFMESSAGE(no text) ENDMESSAGE(DialogPopupSetText) return;}
@@ -279,7 +283,11 @@
response = XtNameToWidget(DIALOG_POPUP, "*dialog_text");
n=0;
+#ifdef I18N_MB
+ XtSetArg(args[n], XtNfontSet, &fontset); n++;
+#else
XtSetArg(args[n], XtNfont, &font); n++;
+#endif
XtSetArg(args[n], XtNleftMargin, &lm); n++;
XtSetArg(args[n], XtNrightMargin, &rm); n++;
XtSetArg(args[n], XtNborderWidth, &bw); n++;
@@ -287,8 +295,13 @@
XtSetArg(args[n], XtNwidth, &width); n++;
XtGetValues(response, args, n);
n=0;
+#ifdef I18N_MB
+ nw= XmbTextEscapement( fontset, s, strlen(s))
+#else
nw= ((font->max_bounds.width+font->min_bounds.width)*((Dimension)strlen(s))+1)/2
+#endif
+lm+rm+DIALOG_POPUP_FREE_SPACE+2*bw;
+
if (nw<DIALOG_POPUP_TEXT_MIN_WIDTH) nw=DIALOG_POPUP_TEXT_MIN_WIDTH;
if (nw>width) {
INFIMESSAGE(new width,nw)
diff -Nru gv-3.5.8.orig/source/gv_font_res-I18N_mb.dat gv-3.5.8/source/gv_font_res-I18N_mb.dat
--- gv-3.5.8.orig/source/gv_font_res-I18N_mb.dat 1970-01-01 01:00:00.000000000 +0100
+++ gv-3.5.8/source/gv_font_res-I18N_mb.dat 2005-05-23 19:46:28.000000000 +0200
@@ -0,0 +1,52 @@
+
+!########## gv_font_res_linux.dat
+GV*international: True
+
+!##### Fonts
+
+GV*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*SmeBSB.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.processButton.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.Label*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.Button*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.locator*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.dateButton*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.titleButton*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.prevPage*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV.?.nextPage*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*newtoc.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*fileSel*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*fileSel*button1.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*fileSel*button2.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*fileSel*button3.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*fileSel*button4.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*fileSel*pathtext*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionsetupPopup*Label*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionsetupPopup*confirmButton.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionsetupPopup*Switch*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionsetupPopup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionsetupPopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongvPopup*Label*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongvPopup*Switch*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongvPopup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongvPopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionfsPopup*Label*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionfsPopup*Switch*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionfsPopup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optionfsPopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongsPopup*Label*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongsPopup*Switch*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongsPopup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*optiongsPopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*dialogPopup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*dialogPopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*dialogPopup*message*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*notePopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*notePopup*message*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*confirmPopup*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*confirmPopup*Button.fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*versionPopup*Label*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*versionPopup*versionTexta*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*versionPopup*versionTextb*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
+GV*infoPopup*Text*fontSet: -efont-biwidth-medium-r-normal--16-*-*-*-*-*-iso10646-1,-gnu-unifont-medium-r-normal--16-*-*-*-*-*-iso10646-1,-adobe-helvetica-medium-r-normal--14-*-*-*-*-*-*-*,-jis-fixed-medium-r-*--16-*-*-*-*-*-jisx0208.1983-0,-*-*-medium-r-*--16-*-*-*-*-*-*-*,*
diff -Nru gv-3.5.8.orig/source/gv_misc_res.dat gv-3.5.8/source/gv_misc_res.dat
--- gv-3.5.8.orig/source/gv_misc_res.dat 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/gv_misc_res.dat 2005-05-23 19:45:33.000000000 +0200
@@ -220,6 +220,10 @@
GV*optionsetupPopup*mediasFrame.forcedWidth: 240
GV*optionsetupPopup*mediasFrame.forcedHeight: 400
+!##### FileSet Popup
+
+GV*fileSelPopup.title: Open File
+
!##### Panner
GV*pannerFrame.frameType: sunken
@@ -317,6 +321,7 @@
GV*filters.label: Filters:
GV*dirs.label: Directories
GV*button1.label: Cancel
+GV*button2.label: Open File
GV*rescan.label: Rescan Directory
GV*screenSizeLabel.label: Screen Size (mm)
diff -Nru gv-3.5.8.orig/source/gv_nls_ja_JP.eucJP.dat gv-3.5.8/source/gv_nls_ja_JP.eucJP.dat
--- gv-3.5.8.orig/source/gv_nls_ja_JP.eucJP.dat 1970-01-01 01:00:00.000000000 +0100
+++ gv-3.5.8/source/gv_nls_ja_JP.eucJP.dat 2005-05-23 19:45:33.000000000 +0200
@@ -0,0 +1,202 @@
+!
+!** Copyright (C) 1995, 1996, 1997 Johannes Plass
+!
+! 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
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with this program; if not, write to the Free Software
+! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+!
+! Author: Johannes Plass (plass@thep.physik.uni-mainz.de)
+! Department of Physics
+! Johannes Gutenberg-University
+! Mainz, Germany
+!
+!
+! gv_ja_JP.eucJP.ad
+! Japanese NLS label for gv by
+! 1998 Yasuyuki Furukawa (yasu@on.cs.keio.ac.jp)
+!
+
+
+!##### Zoom Popup
+
+GV*zoomPopup.title: GV - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+!##### Info Popup
+
+GV*infoPopup.title: GhostScript<70><74><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD>
+
+!##### Dialog Popup
+
+GV*dialogPopup.title: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+!##### Note Popup
+
+GV*notePopup.title: <09><><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD>
+
+!##### Confirm Popup
+
+GV*confirmPopup.title: <09><>ǧ
+
+!##### OptionsSetup Popup
+
+GV*optionfsPopup.title: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򥪥ץ<F2A5AAA5><D7A5><EFBFBD><EFBFBD><EFBFBD>
+
+!##### OptionsGS Popup
+
+GV*optiongsPopup.title: Ghostscript<70><74><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>
+
+!##### OptionsGV Popup
+
+GV*optiongvPopup.title: GV<47><56><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>
+
+!##### OptionsSetup Popup
+
+GV*optionsetupPopup.title: <09><><EFBFBD>åȥ<C3A5><C8A5>åץ<C3A5><D7A5>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>
+
+!##### FileSet Popup
+
+GV*fileSelPopup.title: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򳫤<EFBFBD>
+
+!################################################
+!##### Labels
+!################################################
+
+GV*cancel.Label: <09><><EFBFBD><EFBFBD><EFBFBD>󥻥<EFBFBD>
+GV*dismiss.Label: <09>Ĥ<EFBFBD><C4A4><EFBFBD>
+GV*apply.label: Ŭ<><C5AC>
+GV*copyright.Label: <09><><EFBFBD>
+GV*quit.Label: <09><>λ
+GV*fileButton.Label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>
+GV*open.Label: <09><><EFBFBD><EFBFBD> ...
+GV*reopen.Label: <09>ƥ<EFBFBD><C6A5><EFBFBD><EFBFBD>ץ<EFBFBD>
+GV*update.Label: <09><><EFBFBD><EFBFBD>
+GV*printAllPages.Label: ʸ<>ϰ<EFBFBD><CFB0><EFBFBD> ...
+GV*printMarkedPages.Label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD>ΰ<EFBFBD><CEB0><EFBFBD>...
+GV*saveAllPages.Label: ʸ<><CAB8><EFBFBD><EFBFBD>¸ ...
+GV*saveMarkedPages.Label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸...
+GV*stateButton.Label: <09>Ķ<EFBFBD><C4B6><EFBFBD><EFBFBD><EFBFBD>
+GV*stop.Label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*dsc.Label: ʸ<><CAB8><EFBFBD><EFBFBD>¤<EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD>ڥ<EFBFBD><DAA5><EFBFBD>Ĵ<EFBFBD><C4B4>
+GV*eof.Label: EOF<4F><46><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD>̵<EFBFBD><CCB5>
+GV*antialias.Label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAA5A2>
+GV*watchFile.Label: <09><>ư<EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EBB9B9>
+GV*showTitle.Label: <09><><EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD>ɽ<EFBFBD><C9BD>
+GV*pixmap.Label: Backing Pixmap
+GV*size.Label: <09><>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD>
+GV*watch.Label: <09><>ư<EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EBB9B9>
+GV*optionsgv.Label: GV<47><56><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>...
+GV*optionsfs.Label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򥪥ץ<F2A5AAA5><D7A5><EFBFBD><EFBFBD><EFBFBD>...
+GV*optionsgs.Label: Ghostscript<70><74><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>...
+GV*optionssetup.Label: <09><><EFBFBD>åȥ<C3A5><C8A5>åץ<C3A5><D7A5>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>...
+GV*pageButton.Label: <09>ڡ<EFBFBD><DAA1><EFBFBD>
+GV*next.Label: <09><><EFBFBD><EFBFBD>
+GV*show.Label: <09><>ɽ<EFBFBD><C9BD>
+GV*prev.Label: <09><><EFBFBD><EFBFBD>
+GV*center.Label: <09><><EFBFBD><EFBFBD>
+GV*pageButton*current.Label: <09><><EFBFBD>ߤΥڡ<CEA5><DAA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*pageButton*even.Label: <09><><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*pageButton*odd.Label: <09><><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*pageButton*unmark.Label: <09><><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*processButton.Label: \ <20>¹<EFBFBD>
+GV*mark.Label: <09>ޡ<EFBFBD><DEA1><EFBFBD>
+GV*prevPage.Label: <<
+GV*nextPage.Label: >>
+GV*unmark.Label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*automatic.Label: <09><>ư
+GV*portrait.Label: <09>ݡ<EFBFBD><DDA1>ȥ졼<C8A5><ECA1BC>
+GV*landscape.Label: <09><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*upsidedown.Label: <09>岼ȿž
+GV*seascape.Label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*swap.Label: <09><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD>
+GV*toggleCurrent.label: <09><><EFBFBD>ߤΥڡ<CEA5><DAA1><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*toggleEven.label: <09><><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*toggleOdd.label: <09><><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*unmarkAll.label: <09><><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*printAll.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*printMarked.label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD><CAAC><EFBFBD><EFBFBD>
+GV*saveAll.label: <09><><EFBFBD><EFBFBD>¸
+GV*saveMarked.label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD><CAAC>¸
+GV*openFile.label: <09><><EFBFBD><EFBFBD>
+GV*redisplay.label: <09><>ɽ<EFBFBD><C9BD>
+GV*updateFile.label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EBB9B9>
+GV*checkFile.label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD>
+
+GV*filters.label: <09>ե<EFBFBD><D5A5>륿:
+GV*dirs.label: <09>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD>
+GV*button1.label: <09><><EFBFBD><EFBFBD><EFBFBD>󥻥<EFBFBD>
+GV*button2.label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򳫤<EFBFBD>
+GV*rescan.label: <09>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD><EFBFBD>ɹ<EFBFBD>
+GV*screenSizeLabel.label: <09><><EFBFBD>̥<EFBFBD><CCA5><EFBFBD><EFBFBD><EFBFBD>[mm]
+
+GV*versionPopup*versionDone*label: <09>Ĥ<EFBFBD><C4A4><EFBFBD>
+GV*dialogPopup*cancel.label: <09><><EFBFBD><EFBFBD><EFBFBD>󥻥<EFBFBD>
+GV*notePopup*done.label: λ<><CEBB>
+
+GV*confirmPopup*cancel.label: <09><><EFBFBD><EFBFBD><EFBFBD>󥻥<EFBFBD>
+GV*confirmPopup*done.label: <09><>λ
+GV*save.label: <09><>¸
+
+GV*optiongvPopup*mediaLabel.label: \ <20>ѻ極<D1BB><E6A5B5><EFBFBD><EFBFBD> \
+GV*optiongvPopup*fmediaLabel.label: Ƚ<><C8BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѻ極<D1BB><E6A5B5><EFBFBD><EFBFBD>
+GV*optiongvPopup*orientLabel.label: \ <20>ѻ<EFBFBD><D1BB>θ<EFBFBD><CEB8><EFBFBD> \
+GV*optiongvPopup*forientLabel.label: Ƚ<><C8BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѻ<EFBFBD><D1BB><EFBFBD><EFBFBD><EFBFBD>
+GV*optiongvPopup*magLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>
+GV*optiongvPopup*antialias.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAA5A2>
+GV*optiongvPopup*respectDSC.label: DSC<53><43>ͭ<EFBFBD><CDAD>
+GV*optiongvPopup*eof.label: EOF<4F><46>̵<EFBFBD><CCB5>
+GV*optiongvPopup*autoResize.label: <09><><EFBFBD>ѥ<EFBFBD><D1A5><EFBFBD><EFBFBD><EFBFBD>
+GV*optiongvPopup*swapLandscape.label: <09><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD>
+GV*optiongvPopup*scalesLabel.label: \ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \
+
+GV*miscmenuLabel.label: <09><><EFBFBD><EFBFBD>¾<EFBFBD><C2BE><EFBFBD>˥塼<CBA5><E5A1BC><EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD>
+GV*magmenuLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˥塼<CBA5><E5A1BC><EFBFBD><EFBFBD><EFBFBD>ȥ<EFBFBD>
+GV*mediasLabel.label: <09><><EFBFBD>ǥ<EFBFBD><C7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E7A4AD>
+GV*confirmLabel.label: <09><>λ<EFBFBD><CEBB><EFBFBD>γ<EFBFBD>ǧ
+GV*misc.label: <09><><EFBFBD><EFBFBD>¾
+GV*scrolling.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȿž
+GV*eyeGuide.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EBA5AC><EFBFBD><EFBFBD>
+GV*confirmPrint.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>γ<EFBFBD>ǧ
+GV*uncompressLabel.label: <09><><EFBFBD><EFBFBD>Ÿ<EFBFBD><C5B8>
+GV*autoCenter.label: <09><>ưŪ<C6B0><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*printCommandLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޥ<EFBFBD><DEA5><EFBFBD>
+GV*scratchDirLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><C3A5>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD>
+GV*saveDirLabel.label: <09><>¸<EFBFBD>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD>
+GV*scalesLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*scaleBaseLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>١<EFBFBD><D9A1><EFBFBD>
+
+GV*safer.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*quiet.label: <09><>λ
+GV*defaults.label: <09><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD>ɸ<EFBFBD><C9B8><EFBFBD><EFBFBD>
+GV*scanLabel.label: PDF<44>ɤ߹<C9A4><DFB9><EFBFBD>
+GV*convLabel.label: PDF<44>Ѵ<EFBFBD>
+GV*gsLabel.label: Postscript<70><74><EFBFBD>󥸥<EFBFBD>
+GV*x11devLabel.label: <09>ǥХ<C7A5><D0A5><EFBFBD>
+GV*x11alphadevLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EAA5A2><EFBFBD>ǥХ<C7A5><D0A5><EFBFBD>
+GV*argumentsLabel.label: <09><><EFBFBD><EFBFBD>
+
+GV*filtersLabel.label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5>륿
+GV*dirsLabel.label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5><EFBFBD>ȥ<EFBFBD>
+GV*filterLabel.label: ɸ<><C9B8><EFBFBD>ե<EFBFBD><D5A5>륿
+
+GV*miscMenu.update.label: <09>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EBB9B9>
+GV*miscMenu.redisplay.label: <09><>ɽ<EFBFBD><C9BD>
+GV*miscMenu.stop.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*miscMenu.toggle_current.label: <09><><EFBFBD>ߤΥڡ<CEA5><DAA1><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*miscMenu.toggle_odd.label: <09><><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*miscMenu.toggle_even.label: <09><><EFBFBD><EFBFBD><EFBFBD>ڡ<EFBFBD><DAA1><EFBFBD><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD>/<2F><><EFBFBD><EFBFBD>
+GV*miscMenu.unmark.label: <09><><EFBFBD>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*miscMenu.print_all.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*miscMenu.print_marked.label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD><CAAC><EFBFBD><EFBFBD>
+GV*miscMenu.save_all.label: <09><><EFBFBD><EFBFBD>¸
+GV*miscMenu.save_marked.label: <09>ޡ<EFBFBD><DEA1><EFBFBD><EFBFBD><EFBFBD>ʬ<EFBFBD><CAAC>¸
+
diff -Nru gv-3.5.8.orig/source/gv_nls_ko.dat gv-3.5.8/source/gv_nls_ko.dat
--- gv-3.5.8.orig/source/gv_nls_ko.dat 1970-01-01 01:00:00.000000000 +0100
+++ gv-3.5.8/source/gv_nls_ko.dat 2005-05-23 19:45:33.000000000 +0200
@@ -0,0 +1,202 @@
+!
+!** Copyright (C) 1995, 1996, 1997 Johannes Plass
+!
+! 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
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License
+! along with this program; if not, write to the Free Software
+! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+!
+! Author: Johannes Plass (plass@thep.physik.uni-mainz.de)
+! Department of Physics
+! Johannes Gutenberg-University
+! Mainz, Germany
+!
+!
+! gv_euc-kr.ad
+! Korean NLS label for gv by
+! 1999 Sang-Jin Hwang, (hsjlinux@netian.com)
+!
+
+
+!##### Zoom Popup
+
+GV*zoomPopup.title: GV - Ȯ<><C8AE>
+
+!##### Info Popup
+
+GV*infoPopup.title: <09><><EFBFBD><EFBFBD>Ʈ <20><>ũ<EFBFBD><C5A9>Ʈ <20>޽<EFBFBD><DEBD><EFBFBD>
+
+!##### Dialog Popup
+
+GV*dialogPopup.title: <09><><EFBFBD>̾˷α<CBB7>
+
+!##### Note Popup
+
+GV*notePopup.title: <09>޽<EFBFBD><DEBD><EFBFBD>
+
+!##### Confirm Popup
+
+GV*confirmPopup.title: Ȯ<><C8AE>
+
+!##### OptionsSetup Popup
+
+GV*optionfsPopup.title: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ɼ<EFBFBD>
+
+!##### OptionsGS Popup
+
+GV*optiongsPopup.title: <09><><EFBFBD><EFBFBD>Ʈ <20><>ũ<EFBFBD><C5A9>Ʈ <20>ɼ<EFBFBD>
+
+!##### OptionsGV Popup
+
+GV*optiongvPopup.title: GV <20>ɼ<EFBFBD>
+
+!##### OptionsSetup Popup
+
+GV*optionsetupPopup.title: <09><><EFBFBD><EFBFBD> <20>ɼ<EFBFBD>
+
+!##### FileSet Popup
+
+GV*fileSelPopup.title: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+
+!################################################
+!##### Labels
+!################################################
+
+GV*cancel.Label: <09><><EFBFBD><EFBFBD>
+GV*dismiss.Label: <09>ݱ<EFBFBD>
+GV*apply.label: <09><><EFBFBD><EFBFBD>
+GV*copyright.Label: <09><><EFBFBD>۱<EFBFBD>
+GV*quit.Label: <09><><EFBFBD><EFBFBD>
+GV*fileButton.Label: <09><><EFBFBD><EFBFBD>
+GV*open.Label: <09><><EFBFBD><EFBFBD> ...
+GV*reopen.Label: <09><EFBFBD><E7BFAD>
+GV*update.Label: <09><><EFBFBD><EFBFBD>
+GV*printAllPages.Label: <09><><EFBFBD><EFBFBD> <20>μ<EFBFBD> ...
+GV*printMarkedPages.Label: <09><>ũ<EFBFBD><C5A9> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>μ<EFBFBD> ...
+GV*saveAllPages.Label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ...
+GV*saveMarkedPages.Label: <09><>ũ<EFBFBD><C5A9> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ...
+GV*stateButton.Label: ȯ<><C8AF> <20><><EFBFBD><EFBFBD>
+GV*stop.Label: <09><><EFBFBD><EFBFBD>
+GV*dsc.Label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ȭ
+GV*eof.Label: EOF <20>ּ<EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*antialias.Label: <09>Ų<EFBFBD><C5B2><EFBFBD><EFBFBD><EFBFBD> ȭ<><C8AD> ó<><C3B3>
+GV*watchFile.Label: <09>ڵ<EFBFBD> <20><><EFBFBD>ϰ<EFBFBD><CFB0><EFBFBD>
+GV*showTitle.Label: Ÿ<><C5B8>Ʋ ǥ<><C7A5>
+GV*pixmap.Label: Backing Pixmap
+GV*size.Label: <09>ڵ<EFBFBD> ũ<><C5A9> <20><><EFBFBD><EFBFBD>
+GV*watch.Label: <09>ڵ<EFBFBD> <20><><EFBFBD>ϰ<EFBFBD><CFB0><EFBFBD>
+GV*optionsgv.Label: GV <20>ɼ<EFBFBD> ...
+GV*optionsfs.Label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ɼ<EFBFBD> ...
+GV*optionsgs.Label: <09><><EFBFBD><EFBFBD>Ʈ <20><>ũ<EFBFBD><C5A9>Ʈ <20>ɼ<EFBFBD> ...
+GV*optionssetup.Label: <09><><EFBFBD><EFBFBD> <20>ɼ<EFBFBD> ...
+GV*pageButton.Label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*next.Label: <09><><EFBFBD><EFBFBD>
+GV*show.Label: ȭ<><C8AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*prev.Label: <09><><EFBFBD><EFBFBD>
+GV*center.Label: <09>߰<EFBFBD>
+GV*pageButton*current.Label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*pageButton*even.Label: ¦<><C2A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*pageButton*odd.Label: Ȧ<><C8A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*pageButton*unmark.Label: <09><> <20><>ũ <20><><EFBFBD><EFBFBD>
+GV*processButton.Label: \ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*mark.Label: <09>޸<EFBFBD>ũ
+GV*prevPage.Label: <<
+GV*nextPage.Label: >>
+GV*unmark.Label: ǥ<><C7A5> <20><><EFBFBD><EFBFBD>
+GV*automatic.Label: <09>ڵ<EFBFBD>
+GV*portrait.Label: Portrait
+GV*landscape.Label: Landscape
+GV*upsidedown.Label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*seascape.Label: Seascape
+GV*swap.Label: Landscape<70><65>ȯ
+GV*toggleCurrent.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*toggleEven.label: ¦<><C2A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*toggleOdd.label: Ȧ<><C8A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*unmarkAll.label: <09><><EFBFBD><EFBFBD> ǥ<><C7A5> <20><><EFBFBD><EFBFBD>
+GV*printAll.label: <09><><EFBFBD><EFBFBD> <20>μ<EFBFBD>
+GV*printMarked.label: <09><>ũ<EFBFBD>κ<EFBFBD> <20>μ<EFBFBD>
+GV*saveAll.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*saveMarked.label: ǥ<><C7A5> <20><><EFBFBD><EFBFBD>
+GV*openFile.label: <09><><EFBFBD><EFBFBD>
+GV*redisplay.label: ȭ<><C8AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*updateFile.label: <09><><EFBFBD>ϰ<EFBFBD><CFB0><EFBFBD>
+GV*checkFile.label: <09><><EFBFBD><EFBFBD> Ȯ<>Υ<EFBFBD>
+
+GV*filters.label: <09><><EFBFBD>Ϳ:
+GV*dirs.label: <09><><EFBFBD><EFBFBD><EFBFBD>
+GV*button1.label: <09><><EFBFBD><EFBFBD>
+GV*button2.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*rescan.label: <09><><EFBFBD><EFBFBD><EFBFBD><20>˻<EFBFBD>
+GV*screenSizeLabel.label: ȸ<><C8B8> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[mm]
+
+GV*versionPopup*versionDone*label: <09><><EFBFBD><EFBFBD>
+GV*dialogPopup*cancel.label: <09><><EFBFBD><EFBFBD>
+GV*notePopup*done.label: <09><>
+
+GV*confirmPopup*cancel.label: <09><><EFBFBD><EFBFBD>
+GV*confirmPopup*done.label: <09><><EFBFBD><EFBFBD>
+GV*save.label: <09><><EFBFBD><EFBFBD>
+
+GV*optiongvPopup*mediaLabel.label: \ <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \
+GV*optiongvPopup*fmediaLabel.label: <09><><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*optiongvPopup*orientLabel.label: \ <20> <20><> <20><><EFBFBD><EFBFBD> \
+GV*optiongvPopup*forientLabel.label: <09><> <20><><EFBFBD>·<EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*optiongvPopup*magLabel.label: Ȯ<><C8AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*optiongvPopup*antialias.label: <09>ٵ<EFBFBD><D9B5><EFBFBD>
+GV*optiongvPopup*respectDSC.label: DSC<53><43> <20><>ȿ
+GV*optiongvPopup*eof.label: EOF<4F><46> <20><><EFBFBD><EFBFBD>
+GV*optiongvPopup*autoResize.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*optiongvPopup*swapLandscape.label: Landscape<70><65>ȯ
+GV*optiongvPopup*scalesLabel.label: \ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \
+
+GV*miscmenuLabel.label: <09><>Ÿ <20>޴<EFBFBD>
+GV*magmenuLabel.label: Ȯ<><C8AE> <20>޴<EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*mediasLabel.label: <09>̵<EFBFBD><CCB5><EFBFBD> ũ<><C5A9>
+GV*confirmLabel.label: Ȯ<><C8AE> <20><><EFBFBD><EFBFBD>
+GV*misc.label: <09><>Ÿ
+GV*scrolling.label: <09><>ũ<EFBFBD><C5A9> <20><><EFBFBD><EFBFBD>
+GV*eyeGuide.label: <09><>ũ<EFBFBD><C5A9> <20><><EFBFBD>̵<EFBFBD>
+GV*confirmPrint.label: <09>μ<EFBFBD><CEBC><EFBFBD> Ȯ<><C8AE>
+GV*uncompressLabel.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*autoCenter.label: <09>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>߾<EFBFBD><DFBE><EFBFBD><EFBFBD><EFBFBD>
+GV*printCommandLabel.label: <09>μ<EFBFBD> <20><><EFBFBD>ɾ<EFBFBD>
+GV*scratchDirLabel.label: <09><>ũ<EFBFBD><C5A9>ġ <20><><EFBFBD><EFBFBD><EFBFBD>
+GV*saveDirLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><20><><EFBFBD><EFBFBD>
+GV*scalesLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*scaleBaseLabel.label: <09><20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+GV*safer.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD>
+GV*quiet.label: <09><><EFBFBD><EFBFBD>
+GV*defaults.label: <09>ý<EFBFBD><C3BD><EFBFBD> ǥ<>ذ<EFBFBD>
+GV*scanLabel.label: PDF <20>˻<EFBFBD>
+GV*convLabel.label: PDF <20><>ȯ
+GV*gsLabel.label: <09><><EFBFBD>ͷ<EFBFBD>Ʈ
+GV*x11devLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD>̽<EFBFBD>
+GV*x11alphadevLabel.label: <09><><EFBFBD><EFBFBD><EFBFBD>̽<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+GV*argumentsLabel.label: <09>μ<EFBFBD>
+
+GV*filtersLabel.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>ͥ<EFBFBD>
+GV*dirsLabel.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+GV*filterLabel.label: <09><20><><EFBFBD><EFBFBD>
+
+GV*miscMenu.update.label: <09><><EFBFBD>ϰ<EFBFBD><CFB0><EFBFBD>
+GV*miscMenu.redisplay.label: ȭ<><C8AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+GV*miscMenu.stop.label: <09><><EFBFBD>ͷ<EFBFBD>Ʈ <20><><EFBFBD><EFBFBD>
+GV*miscMenu.toggle_current.label: <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*miscMenu.toggle_odd.label: Ȧ<><C8A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*miscMenu.toggle_even.label: ¦<><C2A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ũ/<2F><><EFBFBD><EFBFBD>
+GV*miscMenu.unmark.label: <09><><EFBFBD><EFBFBD> ǥ<><C7A5> <20><><EFBFBD><EFBFBD>
+GV*miscMenu.print_all.label: <09><><EFBFBD><EFBFBD> <20>μ<EFBFBD>
+GV*miscMenu.print_marked.label: <09><>ũ <20>κ<EFBFBD> <20>μ<EFBFBD>
+GV*miscMenu.save_all.label: <09><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+GV*miscMenu.save_marked.label: ǥ<><C7A5> <20><><EFBFBD><EFBFBD>
+
diff -Nru gv-3.5.8.orig/source/info.c gv-3.5.8/source/info.c
--- gv-3.5.8.orig/source/info.c 1997-04-26 00:00:00.000000000 +0200
+++ gv-3.5.8/source/info.c 2005-05-23 19:45:33.000000000 +0200
@@ -64,6 +64,22 @@
static Bool infoPopupVisible = False;
static int info_length;
+#ifdef I18N_MB
+static int FontSetWidth( XFontSet fnt ) {
+ XRectangle ink_array_return, logical_array_return;
+ XRectangle overall_ink_return, overall_logical_return;
+ int num_chars_return;
+ XmbTextPerCharExtents( fnt, "A", 1,
+ &ink_array_return,
+ &logical_array_return, 1,
+ &num_chars_return,
+ &overall_ink_return,
+ &overall_logical_return );
+ return( overall_logical_return.width );
+}
+#define FontSetHeight(fnt) (XExtentsOfFontSet(fnt)->max_logical_extent.height)
+#endif
+
/*###############################################################################
cb_popupInfoPopup
###############################################################################*/
@@ -178,7 +194,11 @@
Cardinal n;
Dimension bottomMargin, leftMargin, rightMargin, topMargin;
Dimension width, height;
+#ifdef I18N_MB
+ XFontSet fontset;
+#else
XFontStruct *font;
+#endif
BEGINMESSAGE(makeInfoPopup)
@@ -209,15 +229,24 @@
XtAddCallback(infodismiss, XtNcallback, cb_popdownInfoPopup,NULL);
n=0;
+#ifdef I18N_MB
+ XtSetArg(args[n], XtNfontSet, &fontset); n++;
+#else
XtSetArg(args[n], XtNfont, &font); n++;
+#endif
XtSetArg(args[n], XtNbottomMargin, &bottomMargin); n++;
XtSetArg(args[n], XtNleftMargin, &leftMargin); n++;
XtSetArg(args[n], XtNrightMargin, &rightMargin); n++;
XtSetArg(args[n], XtNtopMargin, &topMargin); n++;
XtGetValues(infotext,args,n);
+#ifdef I18N_MB
+ width = FontSetWidth(fontset) * 80 + leftMargin + rightMargin;
+ height = FontSetHeight(fontset) * 22 + topMargin + bottomMargin;
+#else
width = font->max_bounds.width * 80 + leftMargin + rightMargin;
height = (font->ascent + font->descent) * 22 + topMargin + bottomMargin;
+#endif
n=0;
XtSetArg(args[0], XtNwidth, width); n++;
diff -Nru gv-3.5.8.orig/source/main.c gv-3.5.8/source/main.c
--- gv-3.5.8.orig/source/main.c 1997-06-21 00:00:00.000000000 +0200
+++ gv-3.5.8/source/main.c 2005-05-23 19:45:33.000000000 +0200
@@ -257,6 +257,33 @@
/*### initializing toolkit and the application context #################*/
+#ifdef I18N_MB
+ /*
+ Make sure that LC_NUMERIC is POSIX.
+ LC_NUMERIC must not use locales like de_DE.UTF-8 or de_DE@eurowhere
+ the decimal separator is ',' or gv will fail with the
+ message "**** Unable to open the initial device, quitting."
+ */
+ if (getenv("LC_ALL")) {
+ char *locale;
+ locale = getenv("LC_ALL");
+ unsetenv("LC_ALL");
+ setenv("LC_CTYPE", locale, 1);
+ setenv("LC_NUMERIC", locale, 1);
+ setenv("LC_TIME", locale, 1);
+ setenv("LC_COLLATE", locale, 1);
+ setenv("LC_MONETARY", locale, 1);
+ setenv("LC_MESSAGES", locale, 1);
+ setenv("LC_PAPER", locale, 1);
+ setenv("LC_NAME", locale, 1);
+ setenv("LC_ADDRESS", locale, 1);
+ setenv("LC_TELEPHONE", locale, 1);
+ setenv("LC_MEASUREMENT", locale, 1);
+ setenv("LC_IDENTIFICATION", locale, 1);
+ }
+ setenv("LC_NUMERIC", "POSIX", 1);
+ XtSetLanguageProc(NULL, NULL, NULL);
+#endif
INFMESSAGE(initializing toolkit and the application context)
XtToolkitInitialize();
app_con = XtCreateApplicationContext();
diff -Nru gv-3.5.8.orig/source/misc_private.c gv-3.5.8/source/misc_private.c
--- gv-3.5.8.orig/source/misc_private.c 1997-06-07 00:00:00.000000000 +0200
+++ gv-3.5.8/source/misc_private.c 2005-05-23 19:45:33.000000000 +0200
@@ -72,18 +72,32 @@
if (text) { /* most of the following comes from X11/Xaw/Label.c */
Position x,y;
INFSMESSAGE(update_label,text)
+#ifdef I18N_MB
+ y = w->label.label_y - XExtentsOfFontSet(w->label.fontset)->max_logical_extent.y;
+#else
y = w->label.label_y + w->label.font->max_bounds.ascent;
+#endif
if (w->label.justify == XtJustifyCenter) {
unsigned int width;
int len = (int) strlen(text);
+#ifdef I18N_MB
+ XFontSet fs = w->label.fontset;
+ width = XmbTextEscapement(fs, text, (int)len );
+#else
XFontStruct *fs = w->label.font;
if (w->label.encoding) width = XTextWidth16 (fs, (XChar2b*)text, (int)(len/2) );
else width = XTextWidth (fs, text , (int)(len) );
+#endif
x = (Position) ((w->core.width-width)/2);
} else {
x = w->label.internal_width + w->threeD.shadow_width;
}
+#ifdef I18N_MB
+ XmbDrawString(XtDisplay(widget), XtWindow(widget),
+ w->label.fontset, w->label.normal_GC,
+ x, y, text, (int)(strlen(text)));
+#else
if (w->label.encoding) {
XDrawString16(XtDisplay(widget), XtWindow(widget),
w->label.normal_GC,
@@ -93,6 +107,7 @@
w->label.normal_GC,
x, y, text, (int)(strlen(text)));
}
+#endif
}
ENDMESSAGE1(update_label)