vim: src/ex_cmds2.c comparison

comparison src/ex_cmds2.c @ 20:4ac1dce8dd5e v7.0012

updated for version 7.0012

author	vimboss
date	Mon, 26 Jul 2004 12:53:41 +0000
parents	3ba373b54370
children	cc049b00ee70

comparison

equal deleted inserted replaced

-:a81bc802c17c
+:4ac1dce8dd5e
 -100, 50,
 -250, 805,
 {"Courier", "Courier-Bold", "Courier-Oblique", "Courier-BoldOblique"}
 };
+#ifdef FEAT_MBYTE
 /* Generic font metrics for multi-byte fonts */
 static struct prt_ps_font_S prt_ps_mb_font =
 {
 1000,
 -100, 50,
 -250, 805,
 {NULL, NULL, NULL, NULL}
 };
+#endif
 /* Pointer to current font set being used */
 static struct prt_ps_font_S* prt_ps_font;
 /* Structures to map user named encoding and mapping to PS equivalents for
 * building CID font name */
 struct prt_ps_encoding_S
 {
-char_u	*encoding;
+char	*encoding;
-char_u	*cmap_encoding;
+char	*cmap_encoding;
 int		needs_charset;
 };
 struct prt_ps_charset_S
 {
 char	*charset;
 char	*cmap_charset;
 int		has_charset;
 };
+#ifdef FEAT_MBYTE
 #define CS_JIS_C_1978   (0x01)
 #define CS_JIS_X_1983   (0x02)
 #define CS_JIS_X_1990   (0x04)
 #define CS_NEC          (0x08)
 k_charsets,
 "ks_roman",
 "KS_X_1992"
 }
 };
+#endif /* FEAT_MBYTE */
 struct prt_ps_resource_S
 {
 char_u  name[64];
 char_u  filename[MAXPATHL + 1];
 #define PRT_DSC_VERSION	            "%%Version:"
 #define PRT_DSC_ENDCOMMENTS         "%%EndComments:"
 struct prt_dsc_comment_S
 {
-char_u	*string;
+char	*string;
 int		len;
 int		type;
 };
 struct prt_dsc_line_S
 #define SIZEOF_CSTR(s)      (sizeof(s) - 1)
 struct prt_dsc_comment_S prt_dsc_table[] =
 {
-{PRT_DSC_TITLE,       SIZEOF_CSTR(PRT_DSC_TITLE),       PRT_DSC_TITLE_TYPE},
+{PRT_DSC_TITLE,       SIZEOF_CSTR(PRT_DSC_TITLE),     PRT_DSC_TITLE_TYPE},
 {PRT_DSC_VERSION,     SIZEOF_CSTR(PRT_DSC_VERSION),
-PRT_DSC_VERSION_TYPE},
+							PRT_DSC_VERSION_TYPE},
 {PRT_DSC_ENDCOMMENTS, SIZEOF_CSTR(PRT_DSC_ENDCOMMENTS),
-PRT_DSC_ENDCOMMENTS_TYPE}
+						     PRT_DSC_ENDCOMMENTS_TYPE}
 };
 static void prt_write_file_raw_len __ARGS((char_u *buffer, int bytes));
 static void prt_write_file __ARGS((char_u *buffer));
 static void prt_write_file_len __ARGS((char_u *buffer, int bytes));
 static int prt_resfile_strncmp __ARGS((int offset, char *string, int len));
 static int prt_resfile_skip_nonws __ARGS((int offset));
 static int prt_resfile_skip_ws __ARGS((int offset));
 static int prt_next_dsc __ARGS((struct prt_dsc_line_S *p_dsc_line));
 #ifdef FEAT_MBYTE
+static int prt_build_cid_fontname __ARGS((int font, char_u *name, int name_len));
 static void prt_def_cidfont __ARGS((char *new_name, int height, char *cidfont));
 static int prt_match_encoding __ARGS((char *p_encoding, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_encoding_S **pp_mbenc));
 static int prt_match_charset __ARGS((char *p_charset, struct prt_ps_mbfont_S *p_cmap, struct prt_ps_charset_S **pp_mbchar));
 #endif
 	prt_number_width = 0.0;
 return (int)((prt_right_margin - prt_left_margin) / prt_char_width);
 }
+#ifdef FEAT_MBYTE
 static int
 prt_build_cid_fontname(font, name, name_len)
 int     font;
-char    *name;
+char_u  *name;
 int     name_len;
 {
 char    *fontname;
-fontname = alloc(name_len + 1);
+fontname = (char *)alloc(name_len + 1);
 if (fontname == NULL)
 return FALSE;
 STRNCPY(fontname, name, name_len);
 fontname[name_len] = '\0';
 prt_ps_mb_font.ps_fontname[font] = fontname;
 return TRUE;
 }
+#endif
 /*
 * Get number of lines of text that fit on a page (excluding the header).
 */
 static int
 }
 #ifdef FEAT_MBYTE
 static int
 prt_match_encoding(p_encoding, p_cmap, pp_mbenc)
-char    *p_encoding;
+char			*p_encoding;
-struct prt_ps_mbfont_S *p_cmap;
+struct prt_ps_mbfont_S	*p_cmap;
-struct prt_ps_encoding_S **pp_mbenc;
+struct prt_ps_encoding_S	**pp_mbenc;
 {
-int     mbenc;
+int				mbenc;
-int     enc_len;
+int				enc_len;
-struct prt_ps_encoding_S *p_mbenc;
+struct prt_ps_encoding_S	*p_mbenc;
 *pp_mbenc = NULL;
 /* Look for recognised encoding */
 enc_len = STRLEN(p_encoding);
 p_mbenc = p_cmap->encodings;
 return FALSE;
 }
 static int
 prt_match_charset(p_charset, p_cmap, pp_mbchar)
-char    *p_charset;
+char		    *p_charset;
-struct prt_ps_mbfont_S *p_cmap;
+struct prt_ps_mbfont_S  *p_cmap;
 struct prt_ps_charset_S **pp_mbchar;
 {
-int     mbchar;
+int			    mbchar;
-int     char_len;
+int			    char_len;
 struct prt_ps_charset_S *p_mbchar;
 /* Look for recognised character set, using default if one is not given */
 if (*p_charset == NUL)
 p_charset = p_cmap->defcs;
 int         cmap;
 int         pmcs_len;
 char_u	*p_encoding;
 struct prt_ps_encoding_S *p_mbenc;
 struct prt_ps_encoding_S *p_mbenc_first;
-struct prt_ps_charset_S *p_mbchar;
+struct prt_ps_charset_S  *p_mbchar;
 #endif
 #if 0
 /*
 * TODO:
 * supported in more than one of CJK. */
 p_mbenc = NULL;
 p_mbenc_first = NULL;
 p_mbchar = NULL;
 for (cmap = 0; cmap < NUM_ELEMENTS(prt_ps_mbfonts); cmap++)
-if (prt_match_encoding(p_encoding, &prt_ps_mbfonts[cmap], &p_mbenc))
+if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap],
+								    &p_mbenc))
 {
 if (p_mbenc_first == NULL)
 p_mbenc_first = p_mbenc;
-if (prt_match_charset(p_pmcs, &prt_ps_mbfonts[cmap], &p_mbchar))
+if (prt_match_charset((char *)p_pmcs, &prt_ps_mbfonts[cmap],
+								   &p_mbchar))
 break;
 }
 /* Use first encoding matched if no charset matched */
 if (p_mbchar == NULL && p_mbenc_first != NULL)
 mbfont_opts[OPT_MBFONT_OBLIQUE].string,
 mbfont_opts[OPT_MBFONT_OBLIQUE].strlen))
 return FALSE;
 if (mbfont_opts[OPT_MBFONT_BOLDOBLIQUE].present)
 if (!prt_build_cid_fontname(PRT_PS_FONT_BOLDOBLIQUE,
-mbfont_opts[OPT_MBFONT_BOLDOBLIQUE].string,
+				   mbfont_opts[OPT_MBFONT_BOLDOBLIQUE].string,
-mbfont_opts[OPT_MBFONT_BOLDOBLIQUE].strlen))
+				  mbfont_opts[OPT_MBFONT_BOLDOBLIQUE].strlen))
 return FALSE;
 /* Check if need to use Courier for ASCII code range, and if so pick up
 * the encoding to use */
 prt_use_courier = mbfont_opts[OPT_MBFONT_USECOURIER].present &&
 if (fd_resource == NULL)
 {
 	EMSG2(_("E456: Can't open file \"%s\""), resource->filename);
 	return FALSE;
 }
-prt_dsc_resources("BeginResource",
+prt_dsc_resources("BeginResource", prt_resource_types[resource->type],
-prt_resource_types[resource->type], resource->title);
+						     (char *)resource->title);
 prt_dsc_textline("BeginDocument", (char *)resource->filename);
 for (;;)
 {
 double      right;
 double      top;
 double      bottom;
 struct prt_ps_resource_S res_prolog;
 struct prt_ps_resource_S res_encoding;
-char_u      buffer[256];
+char	buffer[256];
 char_u      *p_encoding;
 #ifdef FEAT_MBYTE
 struct prt_ps_resource_S res_cidfont;
 struct prt_ps_resource_S res_cmap;
 #endif
 /*
 * PS DSC Header comments - no PS code!
 */
 prt_dsc_start();
 prt_dsc_textline("Title", (char *)psettings->jobname);
-if (!get_user_name(buffer, 256))
+if (!get_user_name((char_u *)buffer, 256))
 STRCPY(buffer, "Unknown");
 prt_dsc_textline("For", buffer);
 prt_dsc_textline("Creator", VIM_VERSION_LONG);
 /* Note: to ensure Clean8bit I don't think we can use LC_TIME */
 now = time(NULL);
 {
 /* Include ASCII range encoding vector */
 if (!prt_find_resource(prt_ascii_encoding, &res_encoding))
 {
 EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),
-prt_ascii_encoding);
+							  prt_ascii_encoding);
 return FALSE;
 }
 if (!prt_open_resource(&res_encoding))
 return FALSE;
 /* For the moment there are no checks on encoding resource files to
 {
 /* Find user supplied CMap */
 if (!prt_find_resource(prt_cmap, &res_cmap))
 {
 EMSG2(_("E456: Can't find PostScript resource file \"%s.ps\""),
-prt_cmap);
+								    prt_cmap);
 return FALSE;
 }
 if (!prt_open_resource(&res_cmap))
 return FALSE;
 }
 if (!prt_out_mbyte || prt_use_courier)
 {
 /* When using Courier for ASCII range when printing multi-byte, need to
 * pick up ASCII encoding to use with it. */
 if (prt_use_courier)
-p_encoding = prt_ascii_encoding;
+p_encoding = (char_u *)prt_ascii_encoding;
 #endif
 prt_dsc_resources("IncludeResource", "font",
 prt_ps_courier_font.ps_fontname[PRT_PS_FONT_ROMAN]);
 prt_def_font("F0", (char *)p_encoding, (int)prt_line_height,
 prt_ps_courier_font.ps_fontname[PRT_PS_FONT_ROMAN]);
 prt_dsc_noarg("EOF");
 /* Write CTRL-D to close serial communication link if used.
 * NOTHING MUST BE WRITTEN AFTER THIS! */
-prt_write_file(IF_EB("\004", "\067"));
+prt_write_file((char_u *)IF_EB("\004", "\067"));
 if (!prt_file_error && psettings->outfile == NULL
 					&& !got_int && !psettings->user_abort)
 {
 	/* Close the file first. */
 /* Multi-byte character strings are represented more efficiently as hex
 * strings when outputting clean 8 bit PS.
 */
 do
 {
-ch = prt_hexchar[(*p) >> 4];
+ch = prt_hexchar[(unsigned)(*p) >> 4];
 ga_append(&prt_ps_buffer, ch);
 ch = prt_hexchar[(*p) & 0xf];
 ga_append(&prt_ps_buffer, ch);
 p++;
 }

Mercurial > vim

comparison src/ex_cmds2.c @ 20:4ac1dce8dd5e v7.0012