Fix font names and pdf creation

DSE-Western-Thessaloniki · Jun 23, 2023 · db9bbbe · db9bbbe
1 parent 9ccc218
commit db9bbbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/extraText.cpp b/src/extraText.cpp
@@ -37,15 +37,15 @@ ExtraText::ExtraText(std::string text) {
 
         if (std::regex_match(token, match, style_r)) {
             if (match[1].str() == "i") {
-                m_style = "Italic";
+                m_style = "Oblique";
             }
 
             if (match[1].str() == "b") {
                 m_style = "Bold";
             }
 
             if (match[1].str() == "bi" || match[1].str() == "ib") {
-                m_style = "BoldItalic";
+                m_style = "BoldOblique";
             }
 
             logger << "ExtraText.style = " << m_style << "\n";

diff --git a/src/pdfProcessor.cpp b/src/pdfProcessor.cpp
@@ -378,13 +378,12 @@ void PDFProcessor::addExtraText(std::string text, float x, float y,
         new_font_name = found_name;
     }
 
-    // TODO: Position text
     m_firstPage.addPageContents(
         QPDFObjectHandle::newStream(
-            &m_pdf, new_font_name + std::to_string(font_name_increment) + " " +
-                        std::to_string(font_size) + " Tf 1 0 0 1 " +
-                        std::to_string(x) + " " + std::to_string(y) + " Tm (" +
-                        text + ") Tj"),
+            &m_pdf,
+            "BT " + new_font_name + std::to_string(font_name_increment) + " " +
+                std::to_string(font_size) + " Tf 1 0 0 1 " + std::to_string(x) +
+                " " + std::to_string(y) + " Tm (" + text + ") Tj ET"),
         false);
     logger << "Adding text...\n";
 }