From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 6 Dec 2020 21:33:00 +0000 (-0800)
Subject: cairo: Remove "emphasis" font option because it had no real effect.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29b4620d4ae2cbcd796447b0c27604bad2f60431;p=pspp

cairo: Remove "emphasis" font option because it had no real effect.
---

diff --git a/doc/invoking.texi b/doc/invoking.texi
index 65605e2522..016659377d 100644
--- a/doc/invoking.texi
+++ b/doc/invoking.texi
@@ -255,15 +255,13 @@ Sets the margins around the page.  See
 below for the allowed forms of @var{dimension} Default: @code{0.5in}.
 
 @item @option{-O prop-font=@var{font-name}}
-@itemx @option{-O emph-font=@var{font-name}}
 @itemx @option{-O fixed-font=@var{font-name}}
-Sets the font used for proportional, emphasized, or fixed-pitch text.
-Most systems support CSS-like font names such as ``serif'' and
+Sets the font used for proportional, or fixed-pitch text.  Most
+systems support CSS-like font names such as ``serif'' and
 ``monospace'', but a wide range of system-specific font are likely to
 be supported as well.
 
-Default: proportional font @code{serif}, emphasis font @code{serif
-italic}, fixed-pitch font @code{monospace}.
+Default: proportional font @code{serif}, fixed-pitch font @code{monospace}.
 
 @item @option{-O font-size=@var{font-size}}
 Sets the size of the default fonts, in thousandths of a point.  Default:
diff --git a/src/output/cairo.c b/src/output/cairo.c
index 3cb66b6e44..b02e8974f8 100644
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -109,7 +109,6 @@ enum xr_output_type
 enum xr_font_type
   {
     XR_FONT_PROPORTIONAL,
-    XR_FONT_EMPHASIS,
     XR_FONT_FIXED,
     XR_N_FONTS
   };
@@ -288,8 +287,6 @@ apply_options (struct xr_driver *xr, struct string_map *o)
     (d, o, "fixed-font", "monospace", font_size, false, false);
   xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font_option (
     d, o, "prop-font", "sans serif", font_size, false, false);
-  xr->fonts[XR_FONT_EMPHASIS].desc = parse_font_option (
-    d, o, "emph-font", "sans serif", font_size, false, true);
 
   xr->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
   xr->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));