Explorar el Código

Show element <table>

Kandrashin Denis hace 12 años
padre
commit
910bab1e08
Se han modificado 5 ficheros con 17 adiciones y 7 borrados
  1. 5 1
      source/fb2read.cpp
  2. 1 1
      source/fb2read.hpp
  3. 6 4
      source/fb2save.cpp
  4. 1 1
      source/fb2save.hpp
  5. 4 0
      source/res/style.css

+ 5 - 1
source/fb2read.cpp

@@ -114,8 +114,11 @@ void FbReadHandler::RootHandler::EndTag(const QString &name)
 
 FB2_BEGIN_KEYHASH(FbReadHandler::TextHandler)
     FB2_KEY( Anchor  , "a"             );
-    FB2_KEY( Table   , "table"         );
     FB2_KEY( Image   , "image"         );
+    FB2_KEY( Origin  , "table"         );
+    FB2_KEY( Origin  , "td"            );
+    FB2_KEY( Origin  , "th"            );
+    FB2_KEY( Origin  , "tr"            );
 
     FB2_KEY( Parag   , "empty-line"    );
     FB2_KEY( Parag   , "p"             );
@@ -173,6 +176,7 @@ FbXmlHandler::NodeHandler * FbReadHandler::TextHandler::NewTag(const QString &na
     m_empty = false;
     QString tag;
     switch (toKeyword(name)) {
+        case Origin : tag = name;   break;
         case Anchor : tag = "a";    break;
         case Image  : tag = "img";  break;
         case Parag  : tag = "p";    break;

+ 1 - 1
source/fb2read.hpp

@@ -79,8 +79,8 @@ private:
     class TextHandler : public BaseHandler
     {
         FB2_BEGIN_KEYLIST
+            Origin,
             Anchor,
-            Table,
             Image,
             Parag,
             Style,

+ 6 - 4
source/fb2save.cpp

@@ -255,10 +255,12 @@ void FbSaveWriter::writeContentType(const QString &name, QByteArray &data)
 //---------------------------------------------------------------------------
 
 FB2_BEGIN_KEYHASH(FbSaveHandler::TextHandler)
-    FB2_KEY( Section , "div"    );
     FB2_KEY( Anchor  , "a"      );
-    FB2_KEY( Image   , "img"  );
-    FB2_KEY( Table   , "table"  );
+    FB2_KEY( Image   , "img"    );
+    FB2_KEY( Origin  , "table"  );
+    FB2_KEY( Origin  , "td"     );
+    FB2_KEY( Origin  , "th"     );
+    FB2_KEY( Origin  , "tr"     );
     FB2_KEY( Parag   , "p"      );
     FB2_KEY( Strong  , "b"      );
     FB2_KEY( Emphas  , "i"      );
@@ -304,7 +306,7 @@ FbXmlHandler::NodeHandler * FbSaveHandler::TextHandler::NewTag(const QString &na
     m_hasChild = true;
     QString tag = QString();
     switch (toKeyword(name)) {
-        case Section   : tag = atts.value("class") ; break;
+        case Origin    : tag = name; break;
         case Anchor    : return new AnchorHandler(this, name, atts);
         case Image     : return new ImageHandler(this, name, atts);
         case Parag     : return new ParagHandler(this, name, atts);

+ 1 - 1
source/fb2save.hpp

@@ -95,7 +95,7 @@ private:
     class TextHandler : public NodeHandler
     {
         FB2_BEGIN_KEYLIST
-            Section,
+            Origin,
             Anchor,
             Table,
             Image,

+ 4 - 0
source/res/style.css

@@ -110,3 +110,7 @@ fb\:body[name=notes] fb\:section[id] fb\:title p {
   margin-top: 0;
   margin-bottom: 0;
 }
+
+table, td, th {
+  border: 1 solid gray; 
+}