Skip to content

Commit 52ed4e8

Browse files
guustysebieiText-CI
guustysebie
authored and
iText-CI
committed
Support column-rule-width, column-rule-style and column-rule-color
DEVSIX-7562 Autoported commit. Original commit hash: [f065c06c3]
1 parent 5a11bd9 commit 52ed4e8

File tree

52 files changed

+340
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+340
-8
lines changed

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/multicol/ColumnRuleTest.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf;
25+
using iText.Html2pdf.Logs;
26+
using iText.Test.Attributes;
2527

2628
namespace iText.Html2pdf.Css.Multicol {
2729
[NUnit.Framework.Category("IntegrationTest")]
@@ -98,6 +100,7 @@ public virtual void ConvertRuleWidthHugeColumnsTest() {
98100
}
99101

100102
[NUnit.Framework.Test]
103+
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 2)]
101104
public virtual void ConvertRuleWidthIncorrectValuesTest() {
102105
RunTest("ruleWidthIncorrectValuesTest");
103106
}
@@ -113,6 +116,7 @@ public virtual void ConvertRuleColorRgbTest() {
113116
}
114117

115118
[NUnit.Framework.Test]
119+
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 5)]
116120
public virtual void ConvertRuleColorHslaTest() {
117121
RunTest("ruleColorHslaTest");
118122
}
@@ -127,6 +131,26 @@ public virtual void ConvertRuleShorthandTest() {
127131
RunTest("ruleShorthandTest");
128132
}
129133

134+
[NUnit.Framework.Test]
135+
public virtual void BasicWidthTest() {
136+
RunTest("basicWidthTest");
137+
}
138+
139+
[NUnit.Framework.Test]
140+
public virtual void ThinMediumThickTest() {
141+
RunTest("thinMediumThick");
142+
}
143+
144+
[NUnit.Framework.Test]
145+
public virtual void BasicColorTest() {
146+
RunTest("basicColorTest");
147+
}
148+
149+
[NUnit.Framework.Test]
150+
public virtual void BasicStyleTest() {
151+
RunTest("basicStyleTest");
152+
}
153+
130154
private void RunTest(String testName) {
131155
ConvertToPdfAndCompare(testName, SOURCE_FOLDER, DESTINATION_FOLDER, false, new ConverterProperties().SetBaseUri
132156
(SOURCE_FOLDER));

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/css/w3c/css_multicol/MulticolRulePercent001Test.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using iText.Html2pdf.Css.W3c;
25+
using iText.Html2pdf.Logs;
26+
using iText.Test.Attributes;
2527

2628
namespace iText.Html2pdf.Css.W3c.Css_multicol {
29+
[LogMessage(Html2PdfLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, Count = 1)]
2730
public class MulticolRulePercent001Test : W3CCssTest {
2831
protected internal override String GetHtmlFileName() {
2932
return "multicol-rule-percent-001.xht";

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/basicColorTest.html‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head></head>
4+
<body>
5+
<h2>Basic column-gap test</h2>
6+
<br>
7+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: solid;border: solid">
8+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
9+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
10+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
11+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
12+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
13+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
14+
est laborum.
15+
</div>
16+
<br>
17+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: currentColor; column-rule-style: solid;border: solid">
18+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
19+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
20+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
21+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
22+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
23+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
24+
est laborum.
25+
</div>
26+
<br>
27+
<div style="column-count: 3; column-rule-width: 30px;column-rule-color: rgb(20,22,200); column-rule-style: solid;border: solid">
28+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
29+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
30+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
31+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
32+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
33+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
34+
est laborum.
35+
</div>
36+
37+
<br>
38+
<div style="column-count: 3; column-rule-width: 1em;column-rule-color:#00b0f0; column-rule-style: solid;border: solid">
39+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
40+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
41+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
42+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
43+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
44+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
45+
est laborum.
46+
</div>
47+
<br>
48+
<div style="column-count: 3; column-rule-width: 2em; column-rule-style: solid;border: solid">
49+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
50+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
51+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
52+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
53+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
54+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
55+
est laborum.
56+
</div>
57+
58+
<div style="column-count: 3; column-rule-width: 500px;column-rule-style: solid;column-rule-color: transparent; border: solid">
59+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
60+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
61+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
62+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
63+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
64+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
65+
est laborum.
66+
</div>
67+
68+
69+
<div style="column-count: 3; column-rule-width: 500px;column-rule-style: solid;column-rule-color: yellow; border: solid">
70+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
71+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
72+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
73+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
74+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
75+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
76+
est laborum.
77+
</div>
78+
<!--
79+
80+
-->
81+
</body>
82+
</html>

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/basicStyleTest.html‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head></head>
4+
<body>
5+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: hidden;border: solid;">
6+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
7+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
8+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
9+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
10+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
11+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
12+
est laborum.
13+
</div>
14+
<br>
15+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: dotted;border: solid;">
16+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
17+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
18+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
19+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
20+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
21+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
22+
est laborum.
23+
</div>
24+
<br>
25+
26+
27+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: dashed;border: solid;">
28+
lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
29+
tempor incididunt ut labore et dolore magna aliqua. ut enim ad minim
30+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
31+
commodo consequat. duis aute irure dolor in reprehenderit in voluptate
32+
velit esse cillum dolore eu fugiat nulla pariatur. excepteur sint occaecat
33+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
34+
est laborum.
35+
</div>
36+
asdf
37+
<br>
38+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: solid;border: solid;">
39+
lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
40+
tempor incididunt ut labore et dolore magna aliqua. ut enim ad minim
41+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
42+
commodo consequat. duis aute irure dolor in reprehenderit in voluptate
43+
velit esse cillum dolore eu fugiat nulla pariatur. excepteur sint occaecat
44+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
45+
est laborum.
46+
</div>
47+
<br>
48+
49+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: double;border: solid;">
50+
lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
51+
tempor incididunt ut labore et dolore magna aliqua. ut enim ad minim
52+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
53+
commodo consequat. duis aute irure dolor in reprehenderit in voluptate
54+
velit esse cillum dolore eu fugiat nulla pariatur. excepteur sint occaecat
55+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
56+
est laborum.
57+
</div>
58+
<br>
59+
60+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: groove;border: solid;">
61+
lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
62+
tempor incididunt ut labore et dolore magna aliqua. ut enim ad minim
63+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
64+
commodo consequat. duis aute irure dolor in reprehenderit in voluptate
65+
velit esse cillum dolore eu fugiat nulla pariatur. excepteur sint occaecat
66+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
67+
est laborum.
68+
</div>
69+
<br>
70+
71+
72+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: ridge;border: solid;">
73+
lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
74+
tempor incididunt ut labore et dolore magna aliqua. ut enim ad minim
75+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
76+
commodo consequat. duis aute irure dolor in reprehenderit in voluptate
77+
velit esse cillum dolore eu fugiat nulla pariatur. excepteur sint occaecat
78+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
79+
est laborum.
80+
</div>
81+
<br>
82+
83+
<div style="column-count: 3; column-rule-width: 6px;column-rule-color: green; column-rule-style: inset;border: solid;">
84+
lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
85+
tempor incididunt ut labore et dolore magna aliqua. ut enim ad minim
86+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
87+
commodo consequat. duis aute irure dolor in reprehenderit in voluptate
88+
velit esse cillum dolore eu fugiat nulla pariatur. excepteur sint occaecat
89+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
90+
est laborum.
91+
</div>
92+
<br>
93+
</body>
94+
</html>

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/basicWidthTest.html‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head></head>
4+
<body>
5+
<h2>Basic column-gap test</h2>
6+
<br>
7+
<div style="column-count: 3; column-rule-width: 6px;column-rule-style: solid;border: solid">
8+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
9+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
10+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
11+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
12+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
13+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
14+
est laborum.
15+
</div>
16+
17+
<br>
18+
<div style="column-count: 3; column-rule-width: 30px;column-rule-style: solid;border: solid">
19+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
20+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
21+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
22+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
23+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
24+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
25+
est laborum.
26+
</div>
27+
28+
<br>
29+
<div style="column-count: 3; column-rule-width: 1em;column-rule-style: solid;border: solid">
30+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
31+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
32+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
33+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
34+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
35+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
36+
est laborum.
37+
</div>
38+
<br>
39+
<div style="column-count: 3; column-rule-width: 2em;column-rule-style: solid;border: solid">
40+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
41+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
42+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
43+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
44+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
45+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
46+
est laborum.
47+
</div>
48+
49+
<div style="column-count: 3; column-rule-width: 500px;column-rule-style: solid;border: solid">
50+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
51+
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
52+
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
53+
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
54+
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat
55+
cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id
56+
est laborum.
57+
</div>
58+
<!--
59+
60+
-->
61+
</body>
62+
</html>

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/cmp_basicColorTest.pdf‎

3.08 KB
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/cmp_basicStyleTest.pdf‎

3.09 KB
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/cmp_basicWidthTest.pdf‎

2.57 KB
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/cmp_ruleColorCurrentColorTest.pdf‎

175 Bytes
Binary file not shown.

‎itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/css/multicol/ColumnRuleTest/cmp_ruleColorHslaTest.pdf‎

405 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)