X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpostscript.c;h=d65162dad4c3e1bd8fd0cb2b687b4fef0276f283;hb=b021d5d4e83d3ac52ae1eb0490a75a561b0d7228;hp=7fea637426da3388ff679f7d2f6c74a8c0edca4a;hpb=5f168bf8465ae50ba5c2c761b52f29a0500c0658;p=pspp-builds.git diff --git a/src/output/postscript.c b/src/output/postscript.c index 7fea6374..d65162da 100644 --- a/src/output/postscript.c +++ b/src/output/postscript.c @@ -129,7 +129,7 @@ static void setup_font (struct outp_driver *this, struct font *, int index); /* Driver initialization. */ static bool -ps_open_driver (struct outp_driver *this, const struct string *options) +ps_open_driver (struct outp_driver *this, struct substring options) { struct ps_driver_ext *x; size_t i; @@ -300,7 +300,7 @@ handle_option (struct outp_driver *this, const char *key, { struct ps_driver_ext *x = this->ext; int subcat; - char *value = ds_c_str (val); + char *value = ds_cstr (val); switch (outp_match_keyword (key, option_tab, &subcat)) { @@ -424,7 +424,7 @@ handle_option (struct outp_driver *this, const char *key, } /* Looks for a PostScript font file or config file in all the - appropriate places. Returns the filename on success, NULL on + appropriate places. Returns the file name on success, NULL on failure. */ static char * find_ps_file (const char *name) @@ -433,7 +433,7 @@ find_ps_file (const char *name) return xstrdup (name); else { - char *base_name = xasprintf ("psfonts%c%s", DIR_SEPARATOR, name); + char *base_name = xasprintf ("psfonts/%s", name); char *file_name = fn_search_path (base_name, config_path, NULL); free (base_name); return file_name; @@ -542,15 +542,15 @@ quote_ps_name (const char *string) if (!isalpha (c) && strchr ("^_|!$&:;.,-+", c) == NULL && (cp == string || !isdigit (c))) { - struct string out = DS_INITIALIZER; - ds_putc (&out, '<'); + struct string out = DS_EMPTY_INITIALIZER; + ds_put_char (&out, '<'); for (cp = string; *cp != '\0'; cp++) { c = *cp; - ds_printf (&out, "%02x", c); + ds_put_format (&out, "%02x", c); } - ds_puts (&out, ">cvn"); - return ds_c_str (&out); + ds_put_cstr (&out, ">cvn"); + return ds_cstr (&out); } } return xasprintf ("/%s", string); @@ -674,35 +674,35 @@ ps_line (struct outp_driver *this, enum outp_line_style top, enum outp_line_style left, enum outp_line_style bottom, enum outp_line_style right) { -/* The algorithm here is somewhat subtle, to allow it to handle - all the kinds of intersections that we need. - - Three additional ordinates are assigned along the x axis. The - first is xc, midway between x0 and x3. The others are x1 and - x2; for a single vertical line these are equal to xc, and for - a double vertical line they are the ordinates of the left and - right half of the double line. - - yc, y1, and y2 are assigned similarly along the y axis. - - The following diagram shows the coordinate system and output - for double top and bottom lines, single left line, and no - right line: - - x0 x1 xc x2 x3 - y0 ________________________ - | # # | - | # # | - | # # | - | # # | - | # # | - y1 = y2 = yc |######### # | - | # # | - | # # | - | # # | - | # # | - y3 |________#_____#_______| -*/ + /* The algorithm here is somewhat subtle, to allow it to handle + all the kinds of intersections that we need. + + Three additional ordinates are assigned along the x axis. The + first is xc, midway between x0 and x3. The others are x1 and + x2; for a single vertical line these are equal to xc, and for + a double vertical line they are the ordinates of the left and + right half of the double line. + + yc, y1, and y2 are assigned similarly along the y axis. + + The following diagram shows the coordinate system and output + for double top and bottom lines, single left line, and no + right line: + + x0 x1 xc x2 x3 + y0 ________________________ + | # # | + | # # | + | # # | + | # # | + | # # | + y1 = y2 = yc |######### # | + | # # | + | # # | + | # # | + | # # | + y3 |________#_____#_______| + */ struct ps_driver_ext *ext = this->ext; /* Offset from center of each line in a pair of double lines. */ @@ -784,7 +784,7 @@ draw_text (struct outp_driver *this, text.font = OUTP_PROPORTIONAL; text.justification = justification; - ls_init (&text.string, (char *) string, strlen (string)); + text.string = ss_cstr (string); text.h = max_width; text.v = this->font_height; text.x = x; @@ -874,7 +874,7 @@ write_text (struct outp_driver *this, fprintf (ext->file, "F%d setfont\n", font); } - ds_init (&out, 0); + ds_init_empty (&out); for (i = 0; i < char_cnt; i = j) { for (j = i + 1; j < char_cnt; j++) @@ -888,7 +888,7 @@ write_text (struct outp_driver *this, size_t encoded = afm_encode_string (afm, chars + i, j - i, &out); if (encoded > 0) { - fprintf (ext->file, "%sS\n", ds_c_str (&out)); + fprintf (ext->file, "%sS\n", ds_cstr (&out)); ds_clear (&out); i += encoded; } @@ -990,8 +990,8 @@ text (struct outp_driver *this, const struct outp_text *text, bool draw, s.max_width = 0; - cp = ls_c_str (&s.text->string); - while (s.height_left >= this->font_height && cp < ls_end (&s.text->string)) + cp = ss_data (s.text->string); + while (s.height_left >= this->font_height && cp < ss_end (s.text->string)) { const struct afm_character *cur; int char_width; @@ -1006,7 +1006,7 @@ text (struct outp_driver *this, const struct outp_text *text, bool draw, /* Get character and resolve ligatures. */ cur = afm_get_character (afm, *cp); - while (++cp < ls_end (&s.text->string)) + while (++cp < ss_end (s.text->string)) { const struct afm_character *next = afm_get_character (afm, *cp); const struct afm_character *ligature = afm_get_ligature (cur, next); @@ -1024,7 +1024,7 @@ text (struct outp_driver *this, const struct outp_text *text, bool draw, kern_adjust = 0; /* Record the current status if this is a space character. */ - if (cur->code == ' ' && cp > ls_c_str (&s.text->string)) + if (cur->code == ' ' && cp > ss_data (s.text->string)) { s.space_char = cp; s.space_glyph_cnt = s.glyph_cnt; @@ -1145,7 +1145,7 @@ ps_chart_finalise (struct outp_driver *this UNUSED, struct chart *ch UNUSED) continue; fclose (ch->file); - fputs ("%%%%EndDocument\n" + fputs ("%%EndDocument\n" "end\n" "sp restore\n", x->file); @@ -1382,8 +1382,8 @@ reencode_font (struct outp_driver *this, struct font *font) line_number = 0; - ds_init (&line, 0); - while (ds_get_config_line (file, &line, &line_number)) + ds_init_empty (&line); + while (ds_read_config_line (&line, &line_number, file)) { char *pschar, *code; char *save_ptr, *tail; @@ -1392,7 +1392,7 @@ reencode_font (struct outp_driver *this, struct font *font) if (ds_is_empty (&line) == 0) continue; - pschar = strtok_r (ds_c_str (&line), " \t\r\n", &save_ptr); + pschar = strtok_r (ds_cstr (&line), " \t\r\n", &save_ptr); code = strtok_r (NULL, " \t\r\n", &save_ptr); if (pschar == NULL || code == NULL) continue;