*** color.c.orig Sat Feb 20 17:17:54 1999 --- color.c Sat Feb 20 17:17:54 1999 *************** *** 1934,1938 **** if (newColormapUsed) { struct PageRec *page_ptr=NULL; ! int saved_color_layers=FALSE, new_alloc=FALSE; for (page_ptr=firstPage; page_ptr != NULL; page_ptr=page_ptr->next) { --- 1934,1938 ---- if (newColormapUsed) { struct PageRec *page_ptr=NULL; ! int saved_color_layers=FALSE; for (page_ptr=firstPage; page_ptr != NULL; page_ptr=page_ptr->next) { *************** *** 2048,2052 **** void SetAltEditTextBgColor() { - int new_alloc=FALSE, index=0; char spec[MAXSTRING+1]; --- 2048,2051 ---- *************** *** 2084,2088 **** void SetAltEditTextHighlightColor() { - int new_alloc=FALSE, index=0; char spec[MAXSTRING+1]; --- 2083,2086 ---- *** font.c.orig Sat Feb 20 17:18:00 1999 --- font.c Sat Feb 20 17:18:01 1999 *************** *** 1790,1795 **** *fontFamilies[fmly_index].choice_char = '\0'; sprintf(gszMsgBox, "%sShowFontChar", font_name); ! if ((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,gszMsgBox)) != ! NULL) { int len; --- 1790,1794 ---- *fontFamilies[fmly_index].choice_char = '\0'; sprintf(gszMsgBox, "%sShowFontChar", font_name); ! if ((c_ptr=XGetDefault(mainDisplay,TOOL_NAME,gszMsgBox)) != NULL) { int len; *** miniline.c.orig Sat Feb 20 17:18:05 1999 --- miniline.c Sat Feb 20 17:18:05 1999 *************** *** 960,966 **** --- 960,969 ---- rmi.baseline_y = rmi.orig_baseline_y = orig_baseline_y; + PushCurFont(); if (!RecalcMiniLinesMetrics(minilines, &rmi)) { read_only = TRUE; } + PopCurFont(); + text_ptr->w = minilines->w; text_ptr->h = minilines->h; *************** *** 4236,4241 **** --- 4239,4246 ---- if (double_byte) { + #ifdef _PS_USE_EUC_FONT int euc_font=FALSE; char combined_font_str[MAXSTRING]; + #endif /* _PS_USE_EUC_FONT */ if (PRTGIF && font_name != NULL) { *************** *** 4244,4252 **** GetPSFontStr(font, style, font_str); } euc_font = (strstr(font_str, "-EUC-") != NULL); if (euc_font) { - #ifndef _NO_EUC if (preDumpSetup) PSUseEucFont(); - #endif /* ~_NO_EUC */ sprintf(combined_font_str, "/Courier-%s", &font_str[1]); fprintf(FP, "%s /Courier %s eucfont\n", combined_font_str, font_str); --- 4249,4256 ---- GetPSFontStr(font, style, font_str); } + #ifdef _PS_USE_EUC_FONT euc_font = (strstr(font_str, "-EUC-") != NULL); if (euc_font) { if (preDumpSetup) PSUseEucFont(); sprintf(combined_font_str, "/Courier-%s", &font_str[1]); fprintf(FP, "%s /Courier %s eucfont\n", combined_font_str, font_str); *************** *** 4258,4261 **** --- 4262,4269 ---- UpdateDocumentFonts(&font_str[1]); } + #else /* ~_PS_USE_EUC_FONT */ + fprintf(FP, "%s ", font_str); + UpdateDocumentFonts(&font_str[1]); + #endif /* _PS_USE_EUC_FONT */ } else { if (PRTGIF && font_name != NULL) { *************** *** 4275,4280 **** FormatFloat(&fSize, buf); ! fprintf(FP, "%s [%s 0 0 -%s 0 0] %s\n", ! gPsCmd[PS_FINDFONT], buf, buf, gPsCmd[PS_MAKESETFONT]); } --- 4283,4298 ---- FormatFloat(&fSize, buf); ! fprintf(FP, "%s ", gPsCmd[PS_FINDFONT]); ! #ifndef _PS_USE_EUC_FONT ! if (double_byte) { ! fprintf(FP, "dup /WMode known {dup /WMode get 1 eq "); ! #ifdef _VERT_FONT_OFFSET_POINT_4 ! fprintf(FP, "{[0 1 -1 0 0 0.4] makefont} if} if\n"); ! #else /* ~_VERT_FONT_OFFSET_POINT_4 */ ! fprintf(FP, "{[0 1 -1 0 0 0.3] makefont} if} if\n"); ! #endif /* _VERT_FONT_OFFSET_POINT_4 */ ! } ! #endif /* ~_PS_USE_EUC_FONT */ ! fprintf(FP, "[%s 0 0 -%s 0 0] %s\n", buf, buf, gPsCmd[PS_MAKESETFONT]); } *** ps.c.orig Sat Feb 20 17:18:13 1999 --- ps.c Sat Feb 20 17:18:13 1999 *************** *** 64,70 **** static int psUseReencode=FALSE; ! #ifndef _NO_EUC static int psUseEucFont=FALSE; ! #endif /* ~_NO_EUC */ void PSUsePSAdobe() --- 64,70 ---- static int psUseReencode=FALSE; ! #ifdef _PS_USE_EUC_FONT static int psUseEucFont=FALSE; ! #endif /* _PS_USE_EUC_FONT */ void PSUsePSAdobe() *************** *** 322,326 **** } ! #ifndef _NO_EUC void PSUseEucFont() { --- 322,326 ---- } ! #ifdef _PS_USE_EUC_FONT void PSUseEucFont() { *************** *** 330,334 **** } } ! #endif /* ~_NO_EUC */ static --- 330,334 ---- } } ! #endif /* _PS_USE_EUC_FONT */ static *************** *** 369,375 **** psUseReencode = FALSE; psUseShortHand = FALSE; ! #ifndef _NO_EUC psUseEucFont = FALSE; ! #endif /* ~_NO_EUC */ CleanUpReEncodeInfo(); } --- 369,375 ---- psUseReencode = FALSE; psUseShortHand = FALSE; ! #ifdef _PS_USE_EUC_FONT psUseEucFont = FALSE; ! #endif /* _PS_USE_EUC_FONT */ CleanUpReEncodeInfo(); } *************** *** 813,817 **** }; ! #ifndef _NO_EUC static char *psEucFontMacro[] = { "%%Title: eucfont.ps", --- 813,817 ---- }; ! #ifdef _PS_USE_EUC_FONT static char *psEucFontMacro[] = { "%%Title: eucfont.ps", *************** *** 835,839 **** --- 835,843 ---- " 3 -1 roll { % pop direction info", " /WMode 1 def % vertical font", + #ifdef _VERT_FONT_OFFSET_POINT_4 + " 0 beginusematrix [ 0 1 -1 0 0 0.4 ] endusematrix", + #else /* ~_VERT_FONT_OFFSET_POINT_4 */ " 0 beginusematrix [ 0 1 -1 0 0 0.3 ] endusematrix", + #endif /* _VERT_FONT_OFFSET_POINT_4 */ " } if", " 1 usefont", *************** *** 867,871 **** --- 871,879 ---- " dup /WMode get /WMode exch def", " WMode 1 eq {", + #ifdef _VERT_FONT_OFFSET_POINT_4 + " [0.0 1.0 -1.0 0.0 0.0 0.40] makefont", + #else /* ~_VERT_FONT_OFFSET_POINT_4 */ " [0.0 1.0 -1.0 0.0 0.0 0.30] makefont", + #endif /* _VERT_FONT_OFFSET_POINT_4 */ " } if", " } if", *************** *** 910,914 **** NULL }; ! #endif /* ~_NO_EUC */ void DumpPSMacro(FP) --- 918,922 ---- NULL }; ! #endif /* _PS_USE_EUC_FONT */ void DumpPSMacro(FP) *************** *** 1006,1010 **** gPsCmd = gaszPsLongHand; } ! #ifndef _NO_EUC if (psUseEucFont) { for (i=0; psEucFontMacro[i] != NULL; i++) { --- 1014,1018 ---- gPsCmd = gaszPsLongHand; } ! #ifdef _PS_USE_EUC_FONT if (psUseEucFont) { for (i=0; psEucFontMacro[i] != NULL; i++) { *************** *** 1012,1016 **** } } ! #endif /* ~_NO_EUC */ } --- 1020,1024 ---- } } ! #endif /* _PS_USE_EUC_FONT */ } *** ps.e.orig Sat Feb 20 17:18:17 1999 --- ps.e Sat Feb 20 17:18:17 1999 *************** *** 60,66 **** extern void PSDontUseShortHand ARGS_DECL((void)); extern void PSUseShortHand ARGS_DECL((void)); ! #ifndef _NO_EUC extern void PSUseEucFont ARGS_DECL((void)); ! #endif /* ~_NO_EUC */ extern void ResetPSInfo ARGS_DECL((void)); --- 60,66 ---- extern void PSDontUseShortHand ARGS_DECL((void)); extern void PSUseShortHand ARGS_DECL((void)); ! #ifdef _PS_USE_EUC_FONT extern void PSUseEucFont ARGS_DECL((void)); ! #endif /* _PS_USE_EUC_FONT */ extern void ResetPSInfo ARGS_DECL((void)); *** patchlvl.h.orig Sat Feb 20 17:18:21 1999 --- patchlvl.h Sat Feb 20 17:18:21 1999 *************** *** 35,39 **** #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 16 #endif /*_TGIF_PATCHLEVEL_H_*/ --- 35,39 ---- #define _TGIF_PATCHLEVEL_H_ ! #define TGIF_PATCHLEVEL 17 #endif /*_TGIF_PATCHLEVEL_H_*/ *** Imakefile.orig Sat Feb 20 17:18:23 1999 --- Imakefile Sat Feb 20 17:18:23 1999 *************** *** 53,57 **** $(MOREDEFINES) ! TGIFVERSION = 4.0.16 XCOMM Things to try to add to the DEFINES line above: --- 53,57 ---- $(MOREDEFINES) ! TGIFVERSION = 4.0.17 XCOMM Things to try to add to the DEFINES line above: *** tgif.man.orig Sat Feb 20 17:18:25 1999 --- tgif.man Sat Feb 20 17:18:25 1999 *************** *** 265,269 **** .TP .B -dontcondense ! Preserve EPS Comment. Using option has the same effect as setting the Tgif.DontUseShortHandPS and Tgif.DontCondensePSFile X defaults to true. --- 265,269 ---- .TP .B -dontcondense ! Preserve EPS Comment. Using this option has the same effect as setting the Tgif.DontUseShortHandPS and Tgif.DontCondensePSFile X defaults to true. *** HISTORY.orig Sat Feb 20 17:18:28 1999 --- HISTORY Sat Feb 20 17:18:28 1999 *************** *** 1,2 **** --- 1,10 ---- + -----------------------> tgif-4.0.16 => tgif-4.0.17 <----------------------- + Here's a short list of added features/bug fixes. + + 1) Fix a bug in clicking over the font size button in the Choice Window. + 2) By default, don't use EUC PS fonts in printing/export PS files that + contains Japanese characters. Thanks to Shinta Sato + for the patch. + -----------------------> tgif-4.0.15 => tgif-4.0.16 <----------------------- Here's a short list of added features/bug fixes.