From 16d4a9f7df876be5b795e31c41c42d91907cb8b6 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 18 Oct 2013 17:24:15 +0100 Subject: [PATCH] mobi: blockquote tag support --- ChangeLog | 1 + .../fbreader/formats/html/HtmlReader.java | 2 ++ .../fbreader/formats/html/HtmlTag.java | 30 ++++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a40dff1a..54496daea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ ===== 1.9.1 (Oct ??, 2013) ===== * Updated Czech localization (by Marek Pavelka) +* mobi: blockquote tag support ===== 1.9 (Oct 14, 2013) ===== * Dictionary support diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlReader.java b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java index ad8812c79..ae4f2567a 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlReader.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java @@ -178,6 +178,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader { case HtmlTag.STYLE: case HtmlTag.P: case HtmlTag.DIV: + case HtmlTag.BLOCKQUOTE: startNewParagraph(); break; @@ -251,6 +252,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader { case HtmlTag.P: case HtmlTag.DIV: + case HtmlTag.BLOCKQUOTE: if (mySectionStarted) { mySectionStarted = false; } else if (myInsideTitle) { diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlTag.java b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java index ac8fe42d6..5b80f7dae 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlTag.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java @@ -49,24 +49,25 @@ public final class HtmlTag { public static final byte TR = 24; public static final byte STYLE = 25; - public static final byte S = 26; - public static final byte SUB = 27; - public static final byte SUP = 28; - public static final byte PRE = 29; - public static final byte CODE = 30; - public static final byte EM = 31; - public static final byte DFN = 32; - public static final byte CITE = 33; - public static final byte FONT = 34; + public static final byte BLOCKQUOTE = 26; + public static final byte S = 27; + public static final byte SUB = 28; + public static final byte SUP = 29; + public static final byte PRE = 30; + public static final byte CODE = 31; + public static final byte EM = 32; + public static final byte DFN = 33; + public static final byte CITE = 34; + public static final byte FONT = 35; - public static final byte HR = 35; + public static final byte HR = 36; // mobipocket specific tags - public static final byte REFERENCE = 36; - public static final byte GUIDE = 37; - public static final byte MBP_PAGEBREAK = 38; + public static final byte REFERENCE = 37; + public static final byte GUIDE = 38; + public static final byte MBP_PAGEBREAK = 39; - public static final byte TAG_NUMBER = 39; + public static final byte TAG_NUMBER = 40; private static final HashMap ourTagByName = new HashMap(256, 0.2f); private static final Byte ourUnknownTag; @@ -99,6 +100,7 @@ public final class HtmlTag { ourTagByName.put("select", SELECT); ourTagByName.put("tr", TR); ourTagByName.put("style", STYLE); + ourTagByName.put("blockquote", BLOCKQUOTE); ourTagByName.put("s", S); ourTagByName.put("sub", SUB); ourTagByName.put("sup", SUP);