Index: FontShorthandProperty.java
===================================================================
--- FontShorthandProperty.java	(revision 815368)
+++ FontShorthandProperty.java	(working copy)
@@ -96,6 +96,19 @@
                          */
                         boolean fontFamilyParsed = false;
                         int commaIndex = value.indexOf(',');
+                        // no quotes and commas in font family is a special case
+                        if (quoteIndex == -1 && commaIndex == -1) {
+                            /* font family name will be last token when tokens viewed in left to right order
+                            *  as long as not comma-separated as well.*/
+                            fromIndex = specVal.lastIndexOf(' ');
+                            if (fromIndex == -1) {
+                                // font shorthand cannot be single token
+                                throw new PropertyException("Invalid property value: "
+                                    + "font=\"" + value + "\"");
+                            }
+                            fromIndex += 1;
+                        }
+
                         while (!fontFamilyParsed) {
                             /* value contains a (list of) possibly quoted
                              * font-family name(s)
@@ -123,6 +136,7 @@
                                     quoteIndex = -1;
                                 } else {
                                     fromIndex = value.lastIndexOf(' ', commaIndex) + 1;
+                                    quoteIndex = -1;
                                 }
                                 commaIndex = -1;
                             }