From 00377eec585fe17887e43e6c0c1380112c2743d6 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Mon, 14 May 2007 22:57:11 +0000
Subject: [PATCH] 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
---
 !NetSurf/!Run,feb                             |   9 +++-
 !NetSurf/Resources/Fonts/NSSymbol/Encoding    |  39 ++++++++++++++++++
 .../Resources/Fonts/NSSymbol/IntMetrics,ff6   | Bin 0 -> 344 bytes
 .../Resources/Fonts/NSSymbol/Outlines,ff6     | Bin 0 -> 904 bytes
 render/box_construct.c                        |   8 ++--
 5 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 !NetSurf/Resources/Fonts/NSSymbol/Encoding
 create mode 100644 !NetSurf/Resources/Fonts/NSSymbol/IntMetrics,ff6
 create mode 100644 !NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6

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 0000000000000000000000000000000000000000..4dcbc625d329cf8105d1313243443c36108b294b
GIT binary patch
literal 344
zcmeYZ4zA2i%Fp2?00bBq7(kdAhzS8kCPFHPy1W#F2+#|k7!CkQHO3A`28Mr(MnGRX
KFwOz8K>z@*NeO=d

literal 0
HcmV?d00001

diff --git a/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6 b/!NetSurf/Resources/Fonts/NSSymbol/Outlines,ff6
new file mode 100644
index 0000000000000000000000000000000000000000..d2e624132eb337ae5ee0b90ad52b8bc71737fea2
GIT binary patch
literal 904
zcmZ?s_X}ZQ|H8<{kif8uVJAZb69X7`Ff%aV!a_hblmSMHO`y#FQQee;fCNx88=El0
zzugS~1sMNlGW_!k4zA2i%Fki&FD=Q*%u6i>8Q;(hB<6!y0|huaIe90rw<T~e0x71+
zApC)!i5G+?urqLSF|h5L!0l=qz^SgjflK`XkF5ircE|?)stx=T9r(PLKj2xufooy_
zr+d`{_K*kcKy|LF8`!-)3s_qVSXXXf*FO7!^XvlNl@IvUTNQ*n6@*kD@VhfE;AQ;4
z2~@|TIah$+d$$4a?gXy64IJ+E3)uV@uo*URs0$}>2^;Vl3h-<DKM<(@AOKXy008Pd
BNB{r;

literal 0
HcmV?d00001

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: