Update cmp files

DEVSIX-2050

Author: pavel-alay

src/test/java/com/itextpdf/html2pdf/css/CssStylesResolvingTest.java

@@ -88,7 +88,7 @@ public void collectStylesDeclarationsTest01() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -100,7 +100,7 @@ public void collectStylesDeclarationsTest02() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -112,37 +112,37 @@ public void collectStylesDeclarationsTest03() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
     public void stylesInheritanceTest01() throws IOException {
         test("stylesInheritanceTest01.html", "html body p span",
-                "color: blue", "text-align: center", "font-style: italic", "font-size: 11.25pt", "font-family: times-roman");
+                "color: blue", "text-align: center", "font-style: italic", "font-size: 11.25pt", "font-family: times");
     }
 
     @Test
     public void stylesInheritanceTest02() throws IOException {
         test("stylesInheritanceTest02.html", "html body p span",
-                "color: black", "text-align: center", "font-style: italic", "font-size: 11.25pt", "font-family: times-roman");
+                "color: black", "text-align: center", "font-style: italic", "font-size: 11.25pt", "font-family: times");
     }
 
     @Test
     public void stylesInheritanceTest03() throws IOException {
         test("stylesInheritanceTest03.html", "html body p span",
-                "color: green", "font-size: 12.0pt", "font-family: times-roman");
+                "color: green", "font-size: 12.0pt", "font-family: times");
     }
 
     @Test
     public void stylesInheritanceTest04() throws IOException {
         test("stylesInheritanceTest04.html", "html body p span",
-                "color: blue", "font-size: 12.0pt", "font-family: times-roman");
+                "color: blue", "font-size: 12.0pt", "font-family: times");
     }
 
     @Test
     public void stylesInheritanceTest05() throws IOException {
         test("stylesInheritanceTest05.html", "html body p span",
-                "color: black", "font-size: 12.0pt", "font-family: times-roman");
+                "color: black", "font-size: 12.0pt", "font-family: times");
     }
 
     @Test
@@ -151,7 +151,7 @@ public void stylesInheritanceTest06() throws IOException {
                 "margin-left: 20px",
                 "margin-right: 0",
                 "background-color: yellow",
-                "font-size: 12.0pt", "font-family: times-roman");
+                "font-size: 12.0pt", "font-family: times");
     }
 
     @Test
@@ -160,7 +160,7 @@ public void stylesInheritanceTest07() throws IOException {
                 "margin-left: 0",
                 "padding-top: 10px",
                 "background-color: yellow",
-                "font-size: 12.0pt", "font-family: times-roman");
+                "font-size: 12.0pt", "font-family: times");
     }
 
     @Test
@@ -184,7 +184,7 @@ public void stylesShorthandsTest01() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -197,7 +197,7 @@ public void htmlStylesConvertingTest01() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -210,7 +210,7 @@ public void htmlStylesConvertingTest02() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -223,7 +223,7 @@ public void htmlStylesConvertingTest03() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -236,7 +236,7 @@ public void htmlStylesConvertingTest04() throws IOException {
                 "margin-right: 0",
                 "margin-top: 1em",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -252,7 +252,7 @@ public void htmlStylesConvertingTest05() throws IOException {
                 "text-indent: 0",
                 "display: table",
                 "border-spacing: 2px",
-                "font-family: times-roman",
+                "font-family: times",
                 "border-bottom-color: currentcolor",
                 "border-left-color: currentcolor",
                 "border-right-color: currentcolor",
@@ -268,7 +268,7 @@ public void htmlStylesConvertingTest06() throws IOException {
                 "vertical-align: middle",
                 "display: table-row",
                 "border-spacing: 2px",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -289,7 +289,7 @@ public void htmlStylesConvertingTest09() throws IOException {
                 "text-align: center",
                 "display: block",
                 "font-size: 12.0pt",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     @Test
@@ -304,7 +304,7 @@ public void htmlStylesConvertingTest11() throws IOException {
                 "background-color: yellow",
                 "font-size: 12.0pt",
                 "display: block",
-                "font-family: times-roman");
+                "font-family: times");
     }
 
     private void resolveStylesForTree(INode node, ICssResolver cssResolver, CssContext context) {

src/test/resources/com/itextpdf/html2pdf/css/CssOpacityTest/cmp_nestedInSpanTest.pdf

@@ -1,5 +1,5 @@
 html {
-    font-family: times-roman
+    font-family: times
 }
 pre {
     font-family: monospace;
@@ -366,7 +366,9 @@ input {
     display: inline-block;
     text-align: start;
     margin: 0em 0em 0em 0em;
-    font: 13.3333px arial
+    font-size: 13.3333px;
+    font-family: arial,helvetica;
+    font-weight: normal
 }
 textarea {
     color: initial;
@@ -378,7 +380,9 @@ textarea {
     display: inline-block;
     text-align: start;
     margin: 0em 0em 0em 0em;
-    font: 13.3333px arial
+    font-size: 13.3333px;
+    font-family: arial,helvetica;
+    font-weight: normal
 }
 select {
     color: initial;
@@ -390,7 +394,9 @@ select {
     display: inline-block;
     text-align: start;
     margin: 0em 0em 0em 0em;
-    font: 13.3333px arial
+    font-size: 13.3333px;
+    font-family: arial,helvetica;
+    font-weight: normal
 }
 button {
     color: initial;
@@ -402,7 +408,9 @@ button {
     display: inline-block;
     text-align: start;
     margin: 0em 0em 0em 0em;
-    font: 13.3333px arial
+    font-size: 13.3333px;
+    font-family: arial,helvetica;
+    font-weight: normal
 }
 input {
     background-color: white;