Add import of strikethrough and underlined text from PDF

story-apps · Oct 24, 2024 · 3e914ac · 3e914ac
1 parent 1163741
commit 3e914ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/3rd_party/pdftextextraction b/src/3rd_party/pdftextextraction
diff --git a/src/corelib/business_layer/import/abstract_document_importer.cpp b/src/corelib/business_layer/import/abstract_document_importer.cpp
@@ -420,7 +420,7 @@ QString AbstractDocumentImporter::parseDocument(const ImportOptions& _options,
                     writer.writeStartElement(xml::kFormatsTag);
                     for (const auto& range : currentBlock.textFormats()) {
                         if (range.format.fontWeight() != QFont::Normal || range.format.fontItalic()
-                            || range.format.fontUnderline()) {
+                            || range.format.fontUnderline() || range.format.fontStrikeOut()) {
                             writer.writeEmptyElement(xml::kFormatTag);
                             writer.writeAttribute(xml::kFromAttribute,
                                                   QString::number(range.start));
@@ -429,13 +429,13 @@ QString AbstractDocumentImporter::parseDocument(const ImportOptions& _options,
                             if (range.format.fontWeight() != QFont::Normal) {
                                 writer.writeAttribute(xml::kBoldAttribute, "true");
                             }
-                            if (range.format.boolProperty(QTextFormat::FontItalic)) {
+                            if (range.format.fontItalic()) {
                                 writer.writeAttribute(xml::kItalicAttribute, "true");
                             }
-                            if (range.format.boolProperty(QTextFormat::TextUnderlineStyle)) {
+                            if (range.format.fontUnderline()) {
                                 writer.writeAttribute(xml::kUnderlineAttribute, "true");
                             }
-                            if (range.format.boolProperty(QTextFormat::FontStrikeOut)) {
+                            if (range.format.fontStrikeOut()) {
                                 writer.writeAttribute(xml::kStrikethroughAttribute, "true");
                             }
                         }
+6 −14		TextExtraction/lib/graphic-content-parsing/GraphicContentInterpreter.cpp
+117 −81		TextExtraction/lib/text-composition/TextComposer.cpp
+4 −3		TextExtraction/lib/text-parsing/ParsedTextPlacement.h