summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-12-04 17:47:20 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2008-12-04 17:47:20 +0000
commitef8a15f3dd5dc483376ac4a9fe5acc5acc1e9122 (patch)
tree167331009bfe0770f1730d312ce5d43ab64f6431
parentb620a4e40f3a81b78fe43902cceff0c5943df509 (diff)
downloadlibcss-ef8a15f3dd5dc483376ac4a9fe5acc5acc1e9122.tar.gz
libcss-ef8a15f3dd5dc483376ac4a9fe5acc5acc1e9122.tar.bz2
Clarify font-family
svn path=/trunk/libcss/; revision=5881
-rw-r--r--docs/Bytecode13
-rw-r--r--src/parse/properties.c5
2 files changed, 12 insertions, 6 deletions
diff --git a/docs/Bytecode b/docs/Bytecode
index 1cbcf55..4f4dcf9 100644
--- a/docs/Bytecode
+++ b/docs/Bytecode
@@ -497,8 +497,10 @@ Opcodes
<value> (14bits) :
bits 8-13: MBZ
bits 0-7 :
- bit 7 set => string follows
- bits 0-6: MBZ
+ bit 7 set => data follows
+ bits 1-6: MBZ
+ bit 0 : clear => string,
+ set => ident list (as string)
bit 7 clear => keywords:
bits 0-6: 0000000 => Reserved.
0000001 => serif,
@@ -508,10 +510,9 @@ Opcodes
0000101 => monospace,
other => rffe.
- If the value indicates that a string is present, then there is a
- parameter list. Each item is preceded by a <value> word which declares
- the type of the next item. The list is terminated by a word with
- all bits clear.
+ If the value indicates that data follows, then there is a parameter
+ list. Each item is preceded by a <value> word which declares the type
+ of the next item. The list is terminated by a word with all bits clear.
1c - font-size
<value> (14bits) :
diff --git a/src/parse/properties.c b/src/parse/properties.c
index 2ad769d..bcab556 100644
--- a/src/parse/properties.c
+++ b/src/parse/properties.c
@@ -2561,6 +2561,11 @@ css_error parse_font_family(css_language *c,
const parserutils_vector *vector, int *ctx,
css_style **result)
{
+ /* [ IDENT+ | STRING ] [ ','? [ IDENT+ | STRING ] ]*
+ *
+ * In the case of IDENT+, any whitespace between tokens is collapsed to
+ * a single space
+ */
/** \todo font-family */
UNUSED(c);