Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 87: Add arabic numbers to custom counter style #89

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

jex-novatec
Copy link

No description provided.

@@ -62,6 +62,7 @@ public class IdentValue implements FSDerivedValue {

public final static IdentValue ABSOLUTE = addValue("absolute");
public final static IdentValue ALWAYS = addValue("always");
public final static IdentValue ARABIC = addValue("arabic-indic");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for coherence, should be named, ARABIC_INDIC .

Additionally, I think you should add it to the LIST_STYLE_TYPE BitSet: https://github.com/openhtmltopdf/openhtmltopdf/blob/main/openhtmltopdf-core/src/main/java/com/openhtmltopdf/css/parser/property/PrimitivePropertyBuilders.java#L73 .

And a visual test should be added for good measure (see VisualRegressionTest.java , you can have a look at the various PR that add a new test file + expected pdf)

Copy link
Author

@jex-novatec jex-novatec Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have updated the code and added a visual text, but the pdf looks wrong (a # appears instead of the correct number). The code itself seems to work correctly as I'm obtaining the correct number when debugging on CounterFunction.createCounterText(getListStyleType(function), value); but not on the file rendered.
I attach the PDF with the incorrect content:
arabic-indic-counter-style.pdf

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, the arabic font was missing in the template and also the TestSupport.WITH_ARABIC in the visual test.

@@ -371,6 +371,8 @@ void finish(AbstractStructualElement parent) {
listType = "UpperAlpha";
} else if (listStyleType == IdentValue.LOWER_ALPHA) {
listType = "LowerAlpha";
} else if (listStyleType == IdentValue.ARABIC_INDIC) {
listType = "ArabicIndic";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To check if we should simply go to the fallback like the others, I'm not sure the PDF spec support this list type.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So here you propose to remove this code block and just go to fallback for arabic?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but first we should check the pdf specs about what values are permitted.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood, so would you check it on your side?

Copy link

@syjer syjer Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From

https://developer.adobe.com/document-services/docs/assets/5b15559b96303194340b99820d3a70fa/PDF_ISO_32000-2.pdf -> Table 382:

The possible values are:

None No numbering system; Lbl elements (if present) contain arbitrary
text not subject to any numbering scheme
Unordered (PDF 2.0) Unordered list with unspecified bullets
Disc Solid circular bullet
Circle Open circular bullet
Square Solid square
Ordered (PDF 2.0) Ordered lists with unspecified numbering
Decimal Decimal Arabic numerals (1–9, 10–99, … )
UpperRoman Uppercase Roman numerals (I, II, III, IV, … )
LowerRoman Lowercase Roman numerals (i, ii, iii, iv, … )
UpperAlpha Uppercase letters (A, B, C, .. )
LowerAlpha Lowercase letters (a, b, c, … )

technically, Ordered would have been a better fallback. But for sure, "ArabicIndic" is not a valid value.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to Ordered

@@ -1546,6 +1546,11 @@ public void testFormFieldOnSecondPage() throws IOException {
assertTrue(vt.runTest("form-control-on-second-page"));
}

@Test
public void testArabicIndicCounterStyle() throws IOException {
assertTrue(vt.runTest("arabic-indic-counter-style", TestSupport.WITH_ARABIC));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add a test that check at least from 0 to 11 ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test is already done, each div appears in a new page, from page 1 to 11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants