Skip to content

Fix issue with encoding/decoding some html entities #20

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.

Sign up for GitHub

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

Merged
MohamedRejeb merged 2 commits into from
Aug 31, 2023
Merged

Fix issue with encoding/decoding some html entities #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5616bbf
Fix issue with encoding some html entities
MohamedRejeb Aug 31, 2023
28e2210
Merge remote-tracking branch 'origin/main' into improvements
MohamedRejeb Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,498 changes: 2,249 additions & 2,249 deletions ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/EntityMaps.kt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/KsoupEntities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public object KsoupEntities {
* as the foundation for a custom translator.
*/
private val ENCODE_XML: StringTranslator = run {
val encodeXml11Map = mapOf(
val encodeXml11Map = listOf(
"\u0000" to "",
"\u000b" to "",
"\u000c" to "",
Expand Down
2 changes: 1 addition & 1 deletion ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/LookupTranslator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package com.mohamedrejeb.ksoup.entities
* @param lookupMap Map<String, String> table of translator
* mappings
*/
internal class LookupTranslator(lookupMap: Map<String, String>) : StringTranslator() {
internal class LookupTranslator(lookupMap: List<Pair<String, String>>) : StringTranslator() {
/** The mapping to be used in translation. */
private val lookupMap: MutableMap<String, String> = mutableMapOf()

Expand Down
1 change: 0 additions & 1 deletion ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/utils/CharsUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ internal object CharsUtils {
* {@code codePoint} is not a valid Unicode code point.
*/
fun toChars(codePoint: Int): CharArray {

return if (isBmpCodePoint(codePoint)) {
charArrayOf(codePoint.toChar())
} else if (isValidCodePoint(codePoint)) {
Expand Down
10 changes: 10 additions & 0 deletions ksoup-entites/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ class KsoupEntitesTest {
testDecodeHtml5("&nbsp;&nbsp;&nbsp;", "   ")
}

@Test
fun testDecodeHtml5_6() {
testDecodeHtml5("&Aring;", "Å")
}

// Encode Test

@Test
Expand Down Expand Up @@ -75,4 +80,9 @@ class KsoupEntitesTest {
testEncodeHtml5("   ", "&nbsp;&nbsp;&nbsp;")
}

@Test
fun testEncodeHtml5_6() {
testEncodeHtml5("Å", "&angst;")
}

}
9 changes: 9 additions & 0 deletions ksoup-html/src/commonTest/kotlin/com/mohamedrejeb/ksoup/html/KsoupHtmlParserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,13 @@ class KsoupHtmlParserTest {
expectedString = "&ampa hhhdude test",
)
}

@Test
fun testWrongHtml3() {
runHtmlTest(
input = """<html><body>First line<br/>Second line</body></html>""",
expectedOpenTags = listOf("html", "body", "br"),
expectedString = "First lineSecond line",
)
}
}