handle light dark mode (#418)

Author: andiwand

conanfile.py

@@ -44,7 +44,7 @@ def requirements(self):
         self.requires("uchardet/0.0.8")
         self.requires("utfcpp/4.0.4")
         if self.options.get_safe("with_pdf2htmlEX", False):
-            self.requires("pdf2htmlex/0.18.8.rc1-odr-pr1")
+            self.requires("pdf2htmlex/0.18.8.rc1-odr-git-eb5d291")
         if self.options.get_safe("with_wvWare", False):
             self.requires("wvware/1.2.9-odr")
         self.requires("cpp-httplib/0.16.3")

src/odr/internal/html/document.cpp

@@ -22,24 +22,26 @@
 #include <mutex>
 
 namespace odr::internal::html {
-
 namespace {
 
 void front(const Document &document, const WritingState &state) {
+  HtmlWriter &out = state.out();
+
   bool paged_content = ((document.document_type() == DocumentType::text) &&
                         state.config().text_document_margin) ||
                        document.document_type() == DocumentType::presentation ||
                        document.document_type() == DocumentType::drawing;
 
-  state.out().write_begin();
-  state.out().write_header_begin();
-  state.out().write_header_charset("UTF-8");
-  state.out().write_header_target("_blank");
-  state.out().write_header_title("odr");
+  out.write_begin();
+  out.write_header_begin();
+  out.write_header_charset("UTF-8");
+  out.write_header_target("_blank");
+  out.write_header_title("odr");
+  out.write_header_meta("color-scheme", "light dark");
   if (paged_content) {
-    state.out().write_header_viewport("width=device-width,user-scalable=yes");
+    out.write_header_viewport("width=device-width,user-scalable=yes");
   } else {
-    state.out().write_header_viewport(
+    out.write_header_viewport(
         "width=device-width,initial-scale=1.0,user-scalable=yes");
   }
 
@@ -52,11 +54,11 @@ void front(const Document &document, const WritingState &state) {
       state.config().resource_locator(odr_css_resource, state.config());
   state.resources().emplace_back(std::move(odr_css_resource), odr_css_location);
   if (odr_css_location.has_value()) {
-    state.out().write_header_style(odr_css_location.value());
+    out.write_header_style(odr_css_location.value());
   } else {
-    state.out().write_header_style_begin();
-    util::stream::pipe(*odr_css_file.stream(), state.out().out());
-    state.out().write_header_style_end();
+    out.write_header_style_begin();
+    util::stream::pipe(*odr_css_file.stream(), out.out());
+    out.write_header_style_end();
   }
 
   if (document.document_type() == DocumentType::spreadsheet) {
@@ -72,15 +74,15 @@ void front(const Document &document, const WritingState &state) {
     state.resources().emplace_back(std::move(odr_spreadsheet_css_resource),
                                    odr_spreadsheet_css_location);
     if (odr_spreadsheet_css_location.has_value()) {
-      state.out().write_header_style(odr_spreadsheet_css_location.value());
+      out.write_header_style(odr_spreadsheet_css_location.value());
     } else {
-      state.out().write_header_style_begin();
-      util::stream::pipe(*odr_spreadsheet_css_file.stream(), state.out().out());
-      state.out().write_header_style_end();
+      out.write_header_style_begin();
+      util::stream::pipe(*odr_spreadsheet_css_file.stream(), out.out());
+      out.write_header_style_end();
     }
   }
 
-  state.out().write_header_end();
+  out.write_header_end();
 
   std::string body_clazz = "odr-body";
   if (paged_content) {
@@ -101,22 +103,23 @@ void front(const Document &document, const WritingState &state) {
     }
   }
 
-  state.out().write_body_begin(HtmlElementOptions().set_class(body_clazz));
+  out.write_body_begin(HtmlElementOptions().set_class(body_clazz));
 
   if (paged_content) {
-    state.out().write_element_begin(
-        "div", HtmlElementOptions().set_class("odr-pages"));
+    out.write_element_begin("div", HtmlElementOptions().set_class("odr-pages"));
   }
 }
 
 void back(const Document &document, const WritingState &state) {
+  HtmlWriter &out = state.out();
+
   bool paged_content = ((document.document_type() == DocumentType::text) &&
                         state.config().text_document_margin) ||
                        document.document_type() == DocumentType::presentation ||
                        document.document_type() == DocumentType::drawing;
 
   if (paged_content) {
-    state.out().write_element_end("div");
+    out.write_element_end("div");
   }
 
   auto odr_js_file = File(
@@ -128,15 +131,15 @@ void back(const Document &document, const WritingState &state) {
       state.config().resource_locator(odr_js_resource, state.config());
   state.resources().emplace_back(std::move(odr_js_resource), odr_js_location);
   if (odr_js_location.has_value()) {
-    state.out().write_script(odr_js_location.value());
+    out.write_script(odr_js_location.value());
   } else {
-    state.out().write_script_begin();
-    util::stream::pipe(*odr_js_file.stream(), state.out().out());
-    state.out().write_script_end();
+    out.write_script_begin();
+    util::stream::pipe(*odr_js_file.stream(), out.out());
+    out.write_script_end();
   }
 
-  state.out().write_body_end();
-  state.out().write_end();
+  out.write_body_end();
+  out.write_end();
 }
 
 std::string fill_path_variables(const std::string &path,
@@ -407,7 +410,6 @@ class PageHtmlFragment final : public HtmlFragmentBase {
 };
 
 } // namespace
-
 } // namespace odr::internal::html
 
 namespace odr::internal {

src/odr/internal/html/filesystem.cpp

@@ -71,6 +71,7 @@ class HtmlServiceImpl : public HtmlService {
     out.write_header_charset("UTF-8");
     out.write_header_target("_blank");
     out.write_header_title("odr");
+    out.write_header_meta("color-scheme", "light dark");
     out.write_header_viewport(
         "width=device-width,initial-scale=1.0,user-scalable=yes");
     out.write_header_style_begin();

src/odr/internal/html/html_writer.cpp

@@ -158,12 +158,19 @@ void HtmlWriter::write_header_title(const std::string &title) {
   out() << "<title>" << title << "</title>";
 }
 
-void HtmlWriter::write_header_viewport(const std::string &viewport) {
+void HtmlWriter::write_header_meta(const std::string &name,
+                                   const std::string &content) {
   write_new_line();
 
-  out() << R"(<meta name="viewport" content=")";
-  out() << viewport;
-  out() << "\"/>";
+  out() << R"(<meta name=")";
+  out() << name;
+  out() << R"(" content=")";
+  out() << content;
+  out() << R"("/>)";
+}
+
+void HtmlWriter::write_header_viewport(const std::string &viewport) {
+  write_header_meta("viewport", viewport);
 }
 
 void HtmlWriter::write_header_target(const std::string &target) {

src/odr/internal/html/html_writer.hpp

@@ -57,6 +57,7 @@ class HtmlWriter {
   void write_header_begin();
   void write_header_end();
   void write_header_title(const std::string &title);
+  void write_header_meta(const std::string &name, const std::string &content);
   void write_header_viewport(const std::string &viewport);
   void write_header_target(const std::string &target);
   void write_header_charset(const std::string &charset);

src/odr/internal/html/image_file.cpp

@@ -70,6 +70,7 @@ class HtmlServiceImpl : public HtmlService {
     out.write_header_begin();
     out.write_header_charset("UTF-8");
     out.write_header_target("_blank");
+    out.write_header_meta("color-scheme", "light dark");
     out.write_header_title("odr");
     out.write_header_viewport(
         "width=device-width,initial-scale=1.0,user-scalable=yes");

src/odr/internal/html/pdf_file.cpp

@@ -98,6 +98,7 @@ class HtmlServiceImpl : public HtmlService {
     out.write_header_charset("UTF-8");
     out.write_header_target("_blank");
     out.write_header_title("odr");
+    out.write_header_meta("color-scheme", "light dark");
     out.write_header_viewport(
         "width=device-width,initial-scale=1.0,user-scalable=yes");
     out.write_header_end();

src/odr/internal/html/text_file.cpp

@@ -71,6 +71,7 @@ class HtmlServiceImpl : public HtmlService {
     out.write_header_begin();
     out.write_header_charset("UTF-8");
     out.write_header_target("_blank");
+    out.write_header_meta("color-scheme", "light dark");
     out.write_header_title("odr");
     out.write_header_viewport(
         "width=device-width,initial-scale=1.0,user-scalable=yes");

src/odr/internal/html/wvware_wrapper.cpp

@@ -866,6 +866,7 @@ class HtmlServiceImpl : public HtmlService {
     out.write_header_charset("UTF-8");
     out.write_header_target("_blank");
     out.write_header_title("odr");
+    out.write_header_meta("color-scheme", "light dark");
     out.write_header_viewport(
         "width=device-width,initial-scale=1.0,user-scalable=yes");
     out.write_header_end();