Emit text style changed in child

Text styles like `font-weight`, `font-style` and `font-family` are automatically inherited in CSS. This commit makes the HTML export code only emit these styles when - the text style of the cell changes in comparison to the parent cell or - there is no parent cell. To not disturb the inheritance, this commit also removes the default CSS text styles from the header section.
aardappel · Sep 8, 2023 · ff701c5 · ff701c5
1 parent a077adb
commit ff701c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/cell.h b/src/cell.h
@@ -257,9 +257,12 @@ struct Cell {
             str.Append(L"</cell>\n");
         } else if (format == A_EXPHTMLT) {
             wxString style;
-            if (text.stylebits & STYLE_BOLD) style += L"font-weight: bold;";
-            if (text.stylebits & STYLE_ITALIC) style += L"font-style: italic;";
-            if (text.stylebits & STYLE_FIXED) style += L"font-family: monospace;";
+            if (parent ? (text.stylebits & STYLE_BOLD) != (parent->text.stylebits & STYLE_BOLD) : true)
+                style += (text.stylebits & STYLE_BOLD) ? L"font-weight: bold;" : L"font-weight: normal;";
+            if (parent ? (text.stylebits & STYLE_ITALIC) != (parent->text.stylebits & STYLE_ITALIC) : true)
+                style += (text.stylebits & STYLE_ITALIC) ? L"font-style: italic;" : L"font-style: normal;";
+            if (parent ? (text.stylebits & STYLE_FIXED) != (parent->text.stylebits & STYLE_FIXED) : true)
+                style += (text.stylebits & STYLE_FIXED) ? L"font-family: monospace;" : L"font-family: sans-serif;";
             if (cellcolor != (parent ? parent->cellcolor : doc->Background()))
                 style += wxString::Format(L"background-color: #%06X;", SwapColor(cellcolor));
             if (textcolor != (parent ? parent->textcolor : 0x000000))

diff --git a/src/document.h b/src/document.h
@@ -879,8 +879,7 @@ struct Document {
                         L"<html>\n<head>\n<style>\n"
                         L"body { font-family: sans-serif; }\n"
                         L"table, th, td { border: 1px solid #A0A0A0; border-collapse: collapse;"
-                        L" padding: 3px; vertical-align: top; font-weight: normal;"
-                        L" font-style: normal; font-family: sans-serif; }\n"
+                        L" padding: 3px; vertical-align: top; }\n"
                         L"li { }\n</style>\n"
                         L"<title>export of TreeSheets file ");
                     dos.WriteString(filename);