diff options
| author | Roman Kennke <roman@kennke.org> | 2006-11-30 13:43:05 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-11-30 13:43:05 +0000 |
| commit | a0022fdf8ebe3311225cb2bc3a1d9fbba9cb26e1 (patch) | |
| tree | c75e1648dc5ad758d357ce8bfd0e62ccb035af26 /gnu | |
| parent | 58bbb4ac7e73952968767fe86fdfa1047843f342 (diff) | |
| download | classpath-a0022fdf8ebe3311225cb2bc3a1d9fbba9cb26e1.tar.gz | |
2006-11-30 Roman Kennke <kennke@aicas.com>
* javax/swing/text/html/FrameSetView.java: New class. Implements
HTML framesets.
* javax/swing/text/html/FrameView.java: New class. Implements
HTML frames.
* javax/swing/text/html/HTMLDocument.java:
(HTMLReader.addSpecialElement): Only add one artificial space.
* javax/swing/text/html/HTMLEditorKit.java
(HTMLFactory.create): Uncomment code for FrameSetView and FrameView.
* gnu/javax/swing/text/html/parser/support/Parser.java
(_handleEmptyTag): Also consume whitespace after frame tags.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/javax/swing/text/html/css/FontSize.java | 8 | ||||
| -rw-r--r-- | gnu/javax/swing/text/html/parser/support/Parser.java | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gnu/javax/swing/text/html/css/FontSize.java b/gnu/javax/swing/text/html/css/FontSize.java index 7dc8d46c6..2795b6784 100644 --- a/gnu/javax/swing/text/html/css/FontSize.java +++ b/gnu/javax/swing/text/html/css/FontSize.java @@ -255,13 +255,13 @@ public class FontSize private int mapRelative(int par) { - if (value.contains("%")) + if (value.indexOf('%') != -1) size = mapPercent(par); - else if (value.contains("em")) + else if (value.indexOf("em") != -1) size = mapEM(par); - else if (value.contains("larger")) + else if (value.indexOf("larger") != -1) size = mapLarger(par); - else if (value.contains("smaller")) + else if (value.indexOf("smaller") != -1) size = mapSmaller(par); return size; } diff --git a/gnu/javax/swing/text/html/parser/support/Parser.java b/gnu/javax/swing/text/html/parser/support/Parser.java index 98058e503..f6747ef84 100644 --- a/gnu/javax/swing/text/html/parser/support/Parser.java +++ b/gnu/javax/swing/text/html/parser/support/Parser.java @@ -1181,6 +1181,13 @@ public class Parser { validator.validateTag(tag, attributes); handleEmptyTag(tag); + HTML.Tag h = tag.getHTMLTag(); + // When a block tag is closed, consume whitespace that follows after + // it. + // For some unknown reason a FRAME tag is not treated as block element. + // However in this case it should be treated as such. + if (h.isBlock() || h == HTML.Tag.FRAME) + optional(WS); } catch (ChangedCharSetException ex) { |