Simplified docx.css

Author: pkb

cr3qt/data/docx.css

@@ -1,6 +1,6 @@
 body { text-align: left; margin: 0; text-indent: 0px }
 
-p { $def.all } 
+p { $def.all }
 
 empty-line { height: 1em }
 
@@ -14,45 +14,45 @@ li image { display: inline }
 li { display: list-item; text-indent: 0em;  }
 ol { display: block; list-style-type: decimal; margin-left: 1em }
 
-title.h1 p, title.h2 p { 
+.h1, .h2 {
     $title.all
 }
 
-title.h3 p, title.h4 p, title.h5 p, title.h6 p { 
+.h3, .h4, .h5, .h6 p {
     $subtitle.all
 }
 
-title.h1, title.h2, title.h3, title.h4, title.h5, title.h6 { 
-	hyphenate: none; 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+	hyphenate: none;
 }
 
-title.h1, title.h2, title.h3, title.h4, title.h5, title.h6 {    
-	display: block; 
-   	margin-top: 0.5em; 
-   	margin-bottom: 0.3em; 
-     	padding: 10px ; 
-     	margin-top: 0.5em; 
-     	margin-bottom: 0.5em; 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+        display: block;
+        margin-top: 0.5em;
+        margin-bottom: 0.3em;
+        padding: 10px ;
+        margin-top: 0.5em;
+        margin-bottom: 0.5em;
 }
-title.h1, title.h2 { 
-	page-break-inside: avoid; 
-	page-break-after: avoid; 
+.h1, .h2 {
+	page-break-inside: avoid;
+	page-break-after: avoid;
 }
 
-title.h3, title.h4, title.h5, title.h6 {
-	page-break-inside: avoid; 
-	page-break-after: avoid; 
+.h3, .h4, .h5, .h6 {
+	page-break-inside: avoid;
+	page-break-after: avoid;
 }
 
-title.h1 { font-size: 150% }
-title.h2 { font-size: 140% }
-title.h3 { font-size: 130% }
-title.h4 { font-size: 120% }
-title.h5 { font-size: 110% }
+.h1 { font-size: 150% }
+.h2 { font-size: 140% }
+.h3 { font-size: 130% }
+.h4 { font-size: 120% }
+.h5 { font-size: 110% }
 
 table { font-size: 80% }
 td, th { text-indent: 0px; padding: 3px }
-th {  font-weight: bold; text-align: center; background-color: #DDD  } 
+th {  font-weight: bold; text-align: center; background-color: #DDD  }
 /* #808080; */
 table caption { text-indent: 0px; padding: 4px; background-color: #EEE }
 

crengine/src/docxfmt.cpp

@@ -3143,9 +3143,9 @@ void docx_fb2TitleHandler::onTitleStart(int level, bool noSection)
         m_writer->OnTagOpen(L"", L"title");
         lString16 headingName = cs16("h") +  lString16::itoa(level);
         if( m_useClassName ) {
-            m_writer->OnAttribute(L"", L"class", headingName.c_str());
             m_writer->OnTagBody();
             m_writer->OnTagOpen(L"", L"p");
+            m_writer->OnAttribute(L"", L"class", headingName.c_str());
         } else {
             m_writer->OnTagBody();
             m_writer->OnTagOpen(L"", headingName.c_str());