summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2007-05-14 22:57:11 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2007-05-14 22:57:11 +0000
commit00377eec585fe17887e43e6c0c1380112c2743d6 (patch)
tree7531476824c2207741d03448c0e47dfcc3977e78
parent7f88d46d988d883d1054206f6c459a24411b1f78 (diff)
downloadnetsurf-00377eec585fe17887e43e6c0c1380112c2743d6.tar.gz
netsurf-00377eec585fe17887e43e6c0c1380112c2743d6.tar.bz2
Import font containing symbols we need for list items.
(Un)Install font appropriately at runtime. Make list markers use the right characters. svn path=/trunk/netsurf/; revision=3280
-rw-r--r--!NetSurf/!Run,feb9
-rw-r--r--!NetSurf/Resources/Fonts/NSSymbol/Encoding39
-rw-r--r--!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6bin0 -> 344 bytes
-rw-r--r--!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6bin0 -> 904 bytes
-rw-r--r--render/box_construct.c8
5 files changed, 51 insertions, 5 deletions
diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index 5f5305680..1629c42a2 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -95,5 +95,12 @@ Unset Alias$NetSurfRMLoad
CDir <Wimp$ScrapDir>.WWW
CDir <Wimp$ScrapDir>.WWW.NetSurf
+| Install NetSurf-specific fonts
+| NB: trailing dot is required
+FontInstall NetSurf:Resources.Fonts.
+
WimpSlot -min 2240k -max 2240k
-Run <NetSurf$Dir>.!RunImage %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log \ No newline at end of file
+Run <NetSurf$Dir>.!RunImage %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log
+
+| Uninstall NetSurf-specific fonts
+FontRemove NetSurf:Resources.Fonts. \ No newline at end of file
diff --git a/!NetSurf/Resources/Fonts/NSSymbol/Encoding b/!NetSurf/Resources/Fonts/NSSymbol/Encoding
new file mode 100644
index 000000000..c92dad17a
--- /dev/null
+++ b/!NetSurf/Resources/Fonts/NSSymbol/Encoding
@@ -0,0 +1,39 @@
+% Encoding vector for NSSymbol
+
+% Codes 0-31
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+/.notdef
+
+% Codes 32-33
+/H18543
+/circle
diff --git a/!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6 b/!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6
new file mode 100644
index 000000000..4dcbc625d
--- /dev/null
+++ b/!NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6
Binary files differ
diff --git a/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6 b/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6
new file mode 100644
index 000000000..d2e624132
--- /dev/null
+++ b/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6
Binary files differ
diff --git a/render/box_construct.c b/render/box_construct.c
index 2e59d1912..9006e9ecc 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -426,13 +426,13 @@ bool box_construct_element(xmlNode *n, struct content *content,
marker->length = 3;
break;
case CSS_LIST_STYLE_TYPE_CIRCLE:
- /* 2742 CIRCLED OPEN CENTRE EIGHT POINTED STAR*/
- marker->text = "\342\235\202";
+ /* 25CB WHITE CIRCLE */
+ marker->text = "\342\227\213";
marker->length = 3;
break;
case CSS_LIST_STYLE_TYPE_SQUARE:
- /* 25A0 BLACK SQUARE */
- marker->text = "\342\226\240";
+ /* 25AA BLACK SMALL SQUARE */
+ marker->text = "\342\226\252";
marker->length = 3;
break;
case CSS_LIST_STYLE_TYPE_DECIMAL: