[fractal] Update html2pango to 0.5
- From: Kévin Commaille <kcommaille src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] Update html2pango to 0.5
- Date: Sat, 24 Sep 2022 09:53:20 +0000 (UTC)
commit 49c868c680f467965a36dfc1a9b490ea025c8036
Author: Paul van Tilburg <paul luon net>
Date: Fri Sep 23 23:17:22 2022 +0200
Update html2pango to 0.5
This adds support for more types of markup:
* Superscript (`<sup>`) and subscript `<sub>`
* Horizontal rules (`<hr>`)
* Text foreground (`data-mx-color`) and background (`data-mx-bg-color`)
color
It also fixes space collapsing in block elements such that newlines in
HTML are no longer rendered as line breaks and fixes support for `<br>`.
Cargo.lock | 52 +++++++---------------
Cargo.toml | 2 +-
.../content/room_history/message_row/text.rs | 1 +
3 files changed, 19 insertions(+), 36 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 35889f7a6..8d4a5da9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,9 +88,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
+checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
[[package]]
name = "anymap2"
@@ -1907,17 +1907,17 @@ dependencies = [
[[package]]
name = "html2pango"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a7f65103a4da1b629f519474a51ae89077c61f88954eb9e6df7b22e1a7fd98"
+checksum = "e22f189d26bf7cf4652dbe49da86f3a27628f745469365f1d2575ea8caf54eaf"
dependencies = [
"ammonia",
"anyhow",
- "html5ever 0.25.2",
- "lazy_static",
+ "html5ever 0.26.0",
"linkify",
"maplit",
"markup5ever_rcdom",
+ "once_cell",
"regex",
]
@@ -2325,9 +2325,9 @@ dependencies = [
[[package]]
name = "linkify"
-version = "0.4.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03951527dd24d2c59f407502e7d88e0948ef06fac23335b556a4c2bc03c22096"
+checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5"
dependencies = [
"memchr",
]
@@ -2433,12 +2433,12 @@ dependencies = [
[[package]]
name = "markup5ever_rcdom"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
+checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2"
dependencies = [
- "html5ever 0.25.2",
- "markup5ever 0.10.1",
+ "html5ever 0.26.0",
+ "markup5ever 0.11.0",
"tendril",
"xml5ever",
]
@@ -2881,9 +2881,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.14.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
[[package]]
name = "opaque-debug"
@@ -4269,17 +4269,6 @@ dependencies = [
"weezl",
]
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
[[package]]
name = "tinyvec"
version = "1.6.0"
@@ -4679,12 +4668,6 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -4913,14 +4896,13 @@ dependencies = [
[[package]]
name = "xml5ever"
-version = "0.16.2"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865"
+checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650"
dependencies = [
"log",
"mac",
- "markup5ever 0.10.1",
- "time",
+ "markup5ever 0.11.0",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 9a2f18e2a..91b495ec6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ serde_json = "1.0"
tokio = { version = "1.15", features = ["rt", "rt-multi-thread", "sync"] }
url = "2.2"
libsecret = { version = "0.1.4", features = ["v0_19"] }
-html2pango = "0.4"
+html2pango = "0.5.0"
futures = "0.3"
rand = "0.8"
indexmap = "1.6.2"
diff --git a/src/session/content/room_history/message_row/text.rs
b/src/session/content/room_history/message_row/text.rs
index 0a3446e7a..b12eb8beb 100644
--- a/src/session/content/room_history/message_row/text.rs
+++ b/src/session/content/room_history/message_row/text.rs
@@ -332,6 +332,7 @@ fn create_widget_for_html_block(
w.set_ellipsize(ellipsize);
w.upcast::<gtk::Widget>()
}
+ HtmlBlock::Separator => gtk::Separator::new(gtk::Orientation::Horizontal).upcast(),
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]