Carry mona patch forward

[netsurf-overlay.git] / www-client / netsurf / files / netsurf-9999-add-mona-family.patch

diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c
index 1ad188cb8..7da1c6a0f 100644
--- a/content/handlers/css/dump.c
+++ b/content/handlers/css/dump.c
@@ -896,6 +896,9 @@ void nscss_dump_computed_style(FILE *stream, const css_computed_style *style)
                case CSS_FONT_FAMILY_MONOSPACE:
                        fprintf(stream, " monospace ");
                        break;
+               case CSS_FONT_FAMILY_MONA:
+                       fprintf(stream, " mona ");
+                       break;
                }
        }
 
diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c
index daa3b4087..d8a84b83e 100644
--- a/content/handlers/css/select.c
+++ b/content/handlers/css/select.c
@@ -1794,6 +1794,9 @@ css_error ua_default_for_property(void *pw, uint32_t property, css_hint *hint)
                case PLOT_FONT_FAMILY_FANTASY:
                        hint->status = CSS_FONT_FAMILY_FANTASY;
                        break;
+               case PLOT_FONT_FAMILY_MONA:
+                       hint->status = CSS_FONT_FAMILY_MONA;
+                       break;
                }
        } else if (property == CSS_PROP_QUOTES) {
                /** \todo Not exactly useful :) */
diff --git a/desktop/options.h b/desktop/options.h
index d91898c6e..7c077b4dc 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -82,6 +82,9 @@ NSOPTION_STRING(font_cursive, NULL)
 /** Default fantasy font */
 NSOPTION_STRING(font_fantasy, NULL)
 
+/** Default mona font */
+NSOPTION_STRING(font_mona, NULL)
+
 /** Accept-Language header. */
 NSOPTION_STRING(accept_language, NULL)
 
diff --git a/docs/building-Framebuffer.md b/docs/building-Framebuffer.md
index 3c8858a32..f3683a249 100644
--- a/docs/building-Framebuffer.md
+++ b/docs/building-Framebuffer.md
@@ -242,6 +242,7 @@
   NETSURF_FB_FONT_MONOSPACE_BOLD
   NETSURF_FB_FONT_CURSIVE
   NETSURF_FB_FONT_FANTASY
+  NETSURF_FB_FONT_MONA
   
   The font selection may be changed by placing truetype font files
   in the resources path. The resource files will be the generic names
@@ -264,6 +265,7 @@
   fb_face_monospace_bold - The bold monospaced font
   fb_face_cursive - The cursive font
   fb_face_fantasy - The fantasy font
+  fb_face_mona - The mona font
 
   Old Freetype
 --------------
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index e4c310075..dd7837b5c 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -80,6 +80,9 @@ Family name of the cursive font.
 .B \-\-font_fantasy
 Family name of the fantasy font.
 .TP
+.B \-\-font_mona
+Family name of the mona font.
+.TP
 .B \-\-accept_language
 Languages to accept.
 .TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index 7b2f4f4f3..adcdbdeb1 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -57,6 +57,8 @@ Family name of the monospace font.
 Family name of the cursive font.
 .It Fl -font_fantasy
 Family name of the fantasy font.
+.It Fl -font_mona
+Family name of the mona font.
 .It Fl -accept_language
 Languages to accept.
 .It Fl -accept_charset
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 553813842..5f233d982 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -37,6 +37,7 @@ General Options
  font_mono            | string |  NULL     | Default monospace font           
  font_cursive         | string |  NULL     | Default cursive font             
  font_fantasy         | string |  NULL     | Default fantasy font             
+ font_mona            | string |  NULL     | Default mona font                
  accept_language      | string |  NULL     | Accept-Language header.          
  accept_charset       | string |  NULL     | Accept-Charset header.           
  memory_cache_size    | int    | 12MiB     | Preferred maximum size of memory cache in bytes. 
diff --git a/docs/using-framebuffer.md b/docs/using-framebuffer.md
index 3af8f983f..b846b1821 100644
--- a/docs/using-framebuffer.md
+++ b/docs/using-framebuffer.md
@@ -205,3 +205,4 @@ Configuring
   fb_face_monospace_bold - The bold monospaced font
   fb_face_cursive - The cursive font
   fb_face_fantasy - The fantasy font
+  fb_face_mona - The mona font
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 760e85b25..e687933f0 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -19,6 +19,7 @@ CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE="$(NETSURF_FB_FONT_MONOSPACE)"'
 CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
 CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
 CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
+CFLAGS += '-DNETSURF_FB_FONT_MONA="$(NETSURF_FB_FONT_MONA)"'
 
 CFLAGS += -std=c99 -g -Dsmall \
          -D_BSD_SOURCE \
diff --git a/frontends/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults
index cc712e992..aa18b2738 100644
--- a/frontends/framebuffer/Makefile.defaults
+++ b/frontends/framebuffer/Makefile.defaults
@@ -36,6 +36,7 @@ NETSURF_FB_FONT_MONOSPACE := DejaVuSansMono.ttf
 NETSURF_FB_FONT_MONOSPACE_BOLD := DejaVuSansMono-Bold.ttf
 NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf
 NETSURF_FB_FONT_FANTASY := Impact.ttf
+NETSURF_FB_FONT_MONA := ipagp-mona.ttf
 
 # Default binary install path
 NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index e7c07f5ff..b5b95e443 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -67,6 +67,7 @@ enum fb_face_e {
        FB_FACE_MONOSPACE_BOLD,
        FB_FACE_CURSIVE,
        FB_FACE_FANTASY,
+       FB_FACE_MONA,
        FB_FACE_COUNT
 };
 
@@ -297,6 +298,17 @@ bool fb_font_init(void)
                fb_faces[FB_FACE_FANTASY] = fb_face;
        }
 
+        /* mona face */
+       fb_face = fb_new_face(nsoption_charp(fb_face_mona),
+                             "ipagp-mona.ttf",
+                             NETSURF_FB_FONT_MONA);
+       if (fb_face == NULL) {
+               /* mona face unavailable use the default */
+               fb_faces[FB_FACE_MONA] = fb_faces[FB_FACE_SANS_SERIF];
+       } else {
+               fb_faces[FB_FACE_MONA] = fb_face;
+       }
+
         
         /* set the default render mode */
         if (nsoption_bool(fb_font_monochrome) == true)
@@ -367,6 +379,10 @@ static void fb_fill_scalar(const plot_font_style_t *fstyle, FTC_Scaler srec)
                 selected_face = FB_FACE_FANTASY;
                break;
 
+       case PLOT_FONT_FAMILY_MONA:
+               selected_face = FB_FACE_MONA;
+               break;
+
        case PLOT_FONT_FAMILY_SANS_SERIF:
        default:
                if ((fstyle->flags & FONTF_ITALIC) || 
diff --git a/frontends/framebuffer/options.h b/frontends/framebuffer/options.h
index eee6f4bc6..c3a565a1f 100644
--- a/frontends/framebuffer/options.h
+++ b/frontends/framebuffer/options.h
@@ -62,6 +62,7 @@ NSOPTION_STRING(fb_face_monospace, NULL)
 NSOPTION_STRING(fb_face_monospace_bold, NULL)
 NSOPTION_STRING(fb_face_cursive, NULL)
 NSOPTION_STRING(fb_face_fantasy, NULL)
+NSOPTION_STRING(fb_face_mona, NULL)
 
 /*
  * Local Variables:
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index a183e521f..d63a8738e 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -218,6 +218,7 @@ static nserror set_defaults(struct nsoption_s *defaults)
        nsoption_set_charp(font_mono, strdup("Monospace"));
        nsoption_set_charp(font_cursive, strdup("Serif"));
        nsoption_set_charp(font_fantasy, strdup("Serif"));
+       nsoption_set_charp(font_mona, strdup("IPAMonaPGothic"));
 
        return NSERROR_OK;
 }
diff --git a/frontends/gtk/layout_pango.c b/frontends/gtk/layout_pango.c
index fb065b127..f58984cca 100644
--- a/frontends/gtk/layout_pango.c
+++ b/frontends/gtk/layout_pango.c
@@ -269,6 +269,9 @@ nsfont_style_to_description(const plot_font_style_t *fstyle)
        case PLOT_FONT_FAMILY_FANTASY:
                desc = pango_font_description_from_string(nsoption_charp(font_fantasy));
                break;
+       case PLOT_FONT_FAMILY_MONA:
+               desc = pango_font_description_from_string(nsoption_charp(font_mona));
+               break;
        case PLOT_FONT_FAMILY_SANS_SERIF:
        default:
                desc = pango_font_description_from_string(nsoption_charp(font_sans));
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index d5542ba5d..b4a6c2d31 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
@@ -2862,6 +2862,9 @@
       <row>
         <col id="0" translatable="yes">preferencesFonttypeFantasy</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">preferencesFonttypeMona</col>
+      </row>
     </data>
   </object>
   <object class="GtkImage" id="image1">
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index 2a3516f09..4a989710c 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
@@ -2881,6 +2881,9 @@
       <row>
         <col id="0" translatable="yes">preferencesFonttypeFantasy</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">preferencesFonttypeMona</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="liststore_developer_view">
diff --git a/include/netsurf/plot_style.h b/include/netsurf/plot_style.h
index 30db3663e..b39154f7f 100644
--- a/include/netsurf/plot_style.h
+++ b/include/netsurf/plot_style.h
@@ -71,6 +71,7 @@ typedef enum {
        PLOT_FONT_FAMILY_MONOSPACE,
        PLOT_FONT_FAMILY_CURSIVE,
        PLOT_FONT_FAMILY_FANTASY,
+       PLOT_FONT_FAMILY_MONA,
        PLOT_FONT_FAMILY_COUNT /**< Number of generic families */
 } plot_font_generic_family_t;
 
diff --git a/render/font.c b/render/font.c
index 94ef877c7..6136ad33b 100644
--- a/render/font.c
+++ b/render/font.c
@@ -52,6 +52,9 @@ static plot_font_generic_family_t plot_font_generic_family(
        case CSS_FONT_FAMILY_FANTASY:
                plot = PLOT_FONT_FAMILY_FANTASY;
                break;
+       case CSS_FONT_FAMILY_MONA:
+               plot = PLOT_FONT_FAMILY_MONA;
+               break;
        case CSS_FONT_FAMILY_SANS_SERIF:
        default:
                plot = PLOT_FONT_FAMILY_SANS_SERIF;
diff --git a/resources/FatMessages b/resources/FatMessages
index 99189dbe5..e847c7c2f 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -2559,6 +2559,9 @@ nl.gtk.preferencesFonttypeCursive:Cursief
 en.gtk.preferencesFonttypeFantasy:Fantasy
 fr.gtk.preferencesFonttypeFantasy:Fantasy
 nl.gtk.preferencesFonttypeFantasy:Fantasie
+en.gtk.preferencesFonttypeMona:Mona
+fr.gtk.preferencesFonttypeMona:Mona
+nl.gtk.preferencesFonttypeMona:Mona
 en.gtk.preferencesPrivacyTabtitle:Privacy
 fr.gtk.preferencesPrivacyTabtitle:Confidentialité
 nl.gtk.preferencesPrivacyTabtitle:Privacy
@@ -6146,6 +6149,11 @@ de.all.FontFantasy:Fantasy
 fr.all.FontFantasy:Fantaisie
 it.all.FontFantasy:Fantasia
 nl.all.FontFantasy:Fantasie
+en.all.FontMona:Mona
+de.all.FontMona:Mona
+fr.all.FontMona:Mona
+it.all.FontMona:Mona
+nl.all.FontMona:Mona
 en.ami.FontFallback:Preferred fallback
 de.ami.FontFallback:Preferred fallback
 fr.ami.FontFallback:Police de caractères de secour préférée