Merge pull request #264 from Merck/font-type-df

Author: wangben718

R/content_create.R

@@ -48,13 +48,14 @@ as_rtf_init <- function() {
 #' @noRd
 as_rtf_font <- function() {
   font_type <- font_type()
-  font_rtf <- factor(c(1:10), levels = font_type$type, labels = font_type$rtf_code)
-  font_style <- factor(c(1:10), levels = font_type$type, labels = font_type$style)
-  font_name <- factor(c(1:10), levels = font_type$type, labels = font_type$name)
+  font_rtf <- factor(seq_along(font_type$type), levels = font_type$type, labels = font_type$rtf_code)
+  font_style <- factor(seq_along(font_type$type), levels = font_type$type, labels = font_type$style)
+  font_name <- factor(seq_along(font_type$type), levels = font_type$type, labels = font_type$name)
+  font_charset <- factor(seq_along(font_type$type), levels = font_type$type, labels = font_type$charset)
 
   font_table <- paste0(
     "{\\fonttbl",
-    paste(paste0("{", font_rtf, font_style, "\\fcharset161\\fprq2 ", font_name, ";}\n"), collapse = ""),
+    paste(paste0("{", font_rtf, font_style, font_charset, "\\fprq2 ", font_name, ";}\n"), collapse = ""),
     "}\n"
   )
 

R/dictionary.R

@@ -52,6 +52,12 @@ font_type <- function() {
       "Times", "Times", "ArialMT", "ArialMT", "Helvetica",
       "Calibri", "Georgia", "Cambria", "Courier", "Times"
     ),
+    charset = c(
+      "\\fcharset1", "\\fcharset161", "\\fcharset161", "\\fcharset0",
+      "\\fcharset1", "\\fcharset1", "\\fcharset1", "\\fcharset1",
+      "\\fcharset0", "\\fcharset2"
+    ),
+    width_group = c(1, 1, 4, 4, 4, 1, 9, 4, 9, 9),
     stringsAsFactors = FALSE
   )
 }

R/rtf_strwidth.R

@@ -66,11 +66,14 @@ rtf_strwidth <- function(tbl) {
     text_format <- 1
   }
 
+  # Font type
+  font_type_df <- font_type()
+
   # Font family
   font_num <- as.numeric(attr(tbl, "text_font"))
 
   # Group font with same style
-  font_num <- factor(font_num, levels = 1:10, labels = c(1, 1, 4, 4, 4, 1, 9, 4, 9, 9))
+  font_num <- factor(font_num, levels = seq_along(font_type_df$type), labels = font_type_df$width_group)
   font_num <- as.numeric(as.character(font_num))
 
   text_family <- font_type()[font_num, "family"]

tests/testthat/_snaps/independent-testing-content_create.md

@@ -1,6 +1,6 @@
 # RTF font type encode
 
-    [1] "{\\fonttbl{\\f0\\froman\\fcharset161\\fprq2 Times New Roman;}\n{\\f1\\froman\\fcharset161\\fprq2 Times New Roman Greek;}\n{\\f2\\fswiss\\fcharset161\\fprq2 Arial Greek;}\n{\\f3\\fswiss\\fcharset161\\fprq2 Arial;}\n{\\f4\\fswiss\\fcharset161\\fprq2 Helvetica;}\n{\\f5\\fswiss\\fcharset161\\fprq2 Calibri;}\n{\\f6\\froman\\fcharset161\\fprq2 Georgia;}\n{\\f7\\ffroman\\fcharset161\\fprq2 Cambria;}\n{\\f8\\fmodern\\fcharset161\\fprq2 Courier New;}\n{\\f9\\ftech\\fcharset161\\fprq2 Symbol;}\n}\n"
+    [1] "{\\fonttbl{\\f0\\froman\\fcharset1\\fprq2 Times New Roman;}\n{\\f1\\froman\\fcharset161\\fprq2 Times New Roman Greek;}\n{\\f2\\fswiss\\fcharset161\\fprq2 Arial Greek;}\n{\\f3\\fswiss\\fcharset0\\fprq2 Arial;}\n{\\f4\\fswiss\\fcharset1\\fprq2 Helvetica;}\n{\\f5\\fswiss\\fcharset1\\fprq2 Calibri;}\n{\\f6\\froman\\fcharset1\\fprq2 Georgia;}\n{\\f7\\ffroman\\fcharset1\\fprq2 Cambria;}\n{\\f8\\fmodern\\fcharset0\\fprq2 Courier New;}\n{\\f9\\ftech\\fcharset2\\fprq2 Symbol;}\n}\n"
 
 # RTF font color encode with color not NULL
 

tests/testthat/_snaps/independent-testing-dictionary.md

@@ -1,16 +1,27 @@
 # text font
 
-       type                  name     style rtf_code    family
-    1     1       Times New Roman  \\froman     \\f0     Times
-    2     2 Times New Roman Greek  \\froman     \\f1     Times
-    3     3           Arial Greek  \\fswiss     \\f2   ArialMT
-    4     4                 Arial  \\fswiss     \\f3   ArialMT
-    5     5             Helvetica  \\fswiss     \\f4 Helvetica
-    6     6               Calibri  \\fswiss     \\f5   Calibri
-    7     7               Georgia  \\froman     \\f6   Georgia
-    8     8               Cambria \\ffroman     \\f7   Cambria
-    9     9           Courier New \\fmodern     \\f8   Courier
-    10   10                Symbol   \\ftech     \\f9     Times
+       type                  name     style rtf_code    family       charset
+    1     1       Times New Roman  \\froman     \\f0     Times   \\fcharset1
+    2     2 Times New Roman Greek  \\froman     \\f1     Times \\fcharset161
+    3     3           Arial Greek  \\fswiss     \\f2   ArialMT \\fcharset161
+    4     4                 Arial  \\fswiss     \\f3   ArialMT   \\fcharset0
+    5     5             Helvetica  \\fswiss     \\f4 Helvetica   \\fcharset1
+    6     6               Calibri  \\fswiss     \\f5   Calibri   \\fcharset1
+    7     7               Georgia  \\froman     \\f6   Georgia   \\fcharset1
+    8     8               Cambria \\ffroman     \\f7   Cambria   \\fcharset1
+    9     9           Courier New \\fmodern     \\f8   Courier   \\fcharset0
+    10   10                Symbol   \\ftech     \\f9     Times   \\fcharset2
+       width_group
+    1            1
+    2            1
+    3            4
+    4            4
+    5            4
+    6            1
+    7            9
+    8            4
+    9            9
+    10           9
 
 # border type
 

tests/testthat/_snaps/independent-testing-rtf_encode.md

@@ -1,7 +1,7 @@
 # Test if content is converted to RTF correctly when tbl class is list
 
     $start
-    [1] "{\\rtf1\\ansi\n\\deff0\\deflang1033\n{\\fonttbl{\\f0\\froman\\fcharset161\\fprq2 Times New Roman;}\n{\\f1\\froman\\fcharset161\\fprq2 Times New Roman Greek;}\n{\\f2\\fswiss\\fcharset161\\fprq2 Arial Greek;}\n{\\f3\\fswiss\\fcharset161\\fprq2 Arial;}\n{\\f4\\fswiss\\fcharset161\\fprq2 Helvetica;}\n{\\f5\\fswiss\\fcharset161\\fprq2 Calibri;}\n{\\f6\\froman\\fcharset161\\fprq2 Georgia;}\n{\\f7\\ffroman\\fcharset161\\fprq2 Cambria;}\n{\\f8\\fmodern\\fcharset161\\fprq2 Courier New;}\n{\\f9\\ftech\\fcharset161\\fprq2 Symbol;}\n}\n\n"
+    [1] "{\\rtf1\\ansi\n\\deff0\\deflang1033\n{\\fonttbl{\\f0\\froman\\fcharset1\\fprq2 Times New Roman;}\n{\\f1\\froman\\fcharset161\\fprq2 Times New Roman Greek;}\n{\\f2\\fswiss\\fcharset161\\fprq2 Arial Greek;}\n{\\f3\\fswiss\\fcharset0\\fprq2 Arial;}\n{\\f4\\fswiss\\fcharset1\\fprq2 Helvetica;}\n{\\f5\\fswiss\\fcharset1\\fprq2 Calibri;}\n{\\f6\\froman\\fcharset1\\fprq2 Georgia;}\n{\\f7\\ffroman\\fcharset1\\fprq2 Cambria;}\n{\\f8\\fmodern\\fcharset0\\fprq2 Courier New;}\n{\\f9\\ftech\\fcharset2\\fprq2 Symbol;}\n}\n\n"
 
     $body
     [1] "\\paperw12240\\paperh15840\n\n\\margl1800\\margr1440\\margt2520\\margb1800\\headery2520\\footery1449\n\n\n\n\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrdb\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 X1}\\cell\n\\intbl\\row\\pard\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrs\\brdrw15\\clvertalt\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 1}\\cell\n\\intbl\\row\\pard\n\n\n\n\n\\paperw12240\\paperh15840\n\n\\margl1800\\margr1440\\margt2520\\margb1800\\headery2520\\footery1449\n\n\n\n\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 X1}\\cell\n\\intbl\\row\\pard\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrdb\\brdrw15\\clvertalt\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 1}\\cell\n\\intbl\\row\\pard\n\n\n\n"
@@ -13,7 +13,7 @@
 # Test if content is converted to RTF correctly when tbl class is data.frame
 
     $start
-    [1] "{\\rtf1\\ansi\n\\deff0\\deflang1033\n{\\fonttbl{\\f0\\froman\\fcharset161\\fprq2 Times New Roman;}\n{\\f1\\froman\\fcharset161\\fprq2 Times New Roman Greek;}\n{\\f2\\fswiss\\fcharset161\\fprq2 Arial Greek;}\n{\\f3\\fswiss\\fcharset161\\fprq2 Arial;}\n{\\f4\\fswiss\\fcharset161\\fprq2 Helvetica;}\n{\\f5\\fswiss\\fcharset161\\fprq2 Calibri;}\n{\\f6\\froman\\fcharset161\\fprq2 Georgia;}\n{\\f7\\ffroman\\fcharset161\\fprq2 Cambria;}\n{\\f8\\fmodern\\fcharset161\\fprq2 Courier New;}\n{\\f9\\ftech\\fcharset161\\fprq2 Symbol;}\n}\n\n"
+    [1] "{\\rtf1\\ansi\n\\deff0\\deflang1033\n{\\fonttbl{\\f0\\froman\\fcharset1\\fprq2 Times New Roman;}\n{\\f1\\froman\\fcharset161\\fprq2 Times New Roman Greek;}\n{\\f2\\fswiss\\fcharset161\\fprq2 Arial Greek;}\n{\\f3\\fswiss\\fcharset0\\fprq2 Arial;}\n{\\f4\\fswiss\\fcharset1\\fprq2 Helvetica;}\n{\\f5\\fswiss\\fcharset1\\fprq2 Calibri;}\n{\\f6\\froman\\fcharset1\\fprq2 Georgia;}\n{\\f7\\ffroman\\fcharset1\\fprq2 Cambria;}\n{\\f8\\fmodern\\fcharset0\\fprq2 Courier New;}\n{\\f9\\ftech\\fcharset2\\fprq2 Symbol;}\n}\n\n"
 
     $body
     [1] "\\paperw12240\\paperh15840\n\n\\margl1800\\margr1440\\margt2520\\margb1800\\headery2520\\footery1449\n\n\n\n\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrdb\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx1800\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrdb\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx3600\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrdb\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx5400\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrdb\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx7200\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrdb\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalb\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 Sepal.Length}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 Sepal.Width}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 Petal.Length}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 Petal.Width}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 Species}\\cell\n\\intbl\\row\\pard\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalt\\cellx1800\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalt\\cellx3600\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalt\\cellx5400\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalt\\cellx7200\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrs\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrw15\\clvertalt\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 5.1}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 3.5}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 1.4}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 0.2}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 setosa}\\cell\n\\intbl\\row\\pard\n\\trowd\\trgaph108\\trleft0\\trqc\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrw15\\clbrdrb\\brdrdb\\brdrw15\\clvertalt\\cellx1800\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrw15\\clbrdrb\\brdrdb\\brdrw15\\clvertalt\\cellx3600\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrw15\\clbrdrb\\brdrdb\\brdrw15\\clvertalt\\cellx5400\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrw15\\clbrdrb\\brdrdb\\brdrw15\\clvertalt\\cellx7200\n\\clbrdrl\\brdrs\\brdrw15\\clbrdrt\\brdrw15\\clbrdrr\\brdrs\\brdrw15\\clbrdrb\\brdrdb\\brdrw15\\clvertalt\\cellx9000\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 4.9}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 3}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 1.4}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 0.2}\\cell\n\\pard\\hyphpar0\\sb15\\sa15\\fi0\\li0\\ri0\\qc\\fs18{\\f0 setosa}\\cell\n\\intbl\\row\\pard\n\n\n"