mirror of
https://github.com/storytold/designcraft.git
synced 2026-11-14 14:22:39 +00:00
Use shared IDML ACE codes in text import
This commit is contained in:
3 files changed
+17
-17
No files matched your search
Generated
+9
-9
@@ -1242,10 +1242,10 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-idml"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930#4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783#5f5c5b6ba483bc9aff5810ea43492264c4112783"
|
||||
dependencies = [
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930)",
|
||||
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930)",
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783)",
|
||||
"craft-zip 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783)",
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
@@ -1656,7 +1656,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-xml"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930#4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783#5f5c5b6ba483bc9aff5810ea43492264c4112783"
|
||||
dependencies = [
|
||||
"quick-xml 0.41.0",
|
||||
"thiserror 2.0.21",
|
||||
@@ -1730,7 +1730,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-zip"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930#4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783#5f5c5b6ba483bc9aff5810ea43492264c4112783"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"thiserror 2.0.21",
|
||||
@@ -2021,7 +2021,7 @@ dependencies = [
|
||||
"craft-prepress",
|
||||
"craft-print",
|
||||
"craft-svg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=cc23ffd4d26f3074808e2187d332564817624f8f)",
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930)",
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783)",
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f23b0f33f0d00b157476533a43cbbcfd901aa1f1)",
|
||||
"designcraft-color",
|
||||
"designcraft-compose",
|
||||
@@ -2103,9 +2103,9 @@ name = "designcraft-idml"
|
||||
version = "0.20.1"
|
||||
dependencies = [
|
||||
"craft-file-formats",
|
||||
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930)",
|
||||
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783)",
|
||||
"craft-svg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=cc23ffd4d26f3074808e2187d332564817624f8f)",
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930)",
|
||||
"craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783)",
|
||||
"designcraft-color",
|
||||
"designcraft-compose",
|
||||
"designcraft-doc",
|
||||
@@ -2222,7 +2222,7 @@ version = "0.20.1"
|
||||
dependencies = [
|
||||
"craft-docx",
|
||||
"craft-file-formats",
|
||||
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930)",
|
||||
"craft-idml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5f5c5b6ba483bc9aff5810ea43492264c4112783)",
|
||||
"craft-rtf",
|
||||
"craft-wordmodel",
|
||||
"craft-xlsx",
|
||||
|
||||
+2
-2
@@ -16,10 +16,10 @@ craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "4052591363
|
||||
craft-designcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "19692b6190465671e41967c75d0cd4c439d0c84c", version = "=0.1.0" }
|
||||
craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" }
|
||||
craft-epub = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" }
|
||||
craft-idml = { git = "https://github.com/storytold/craft-libs", rev = "4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930", version = "=0.1.0" }
|
||||
craft-idml = { git = "https://github.com/storytold/craft-libs", rev = "5f5c5b6ba483bc9aff5810ea43492264c4112783", version = "=0.1.0" }
|
||||
craft-indd = { git = "https://github.com/storytold/craft-libs", rev = "47bf5650b0d503b97bfb5e841746c4957897d11f", version = "=0.1.0" }
|
||||
craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "cc23ffd4d26f3074808e2187d332564817624f8f", version = "=0.1.0", features = ["tree-render", "tree-text"] }
|
||||
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "4bb95f34d6e0e6345b7eefd9dbfb9eb7bb619930", version = "=0.1.0" }
|
||||
craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "5f5c5b6ba483bc9aff5810ea43492264c4112783", version = "=0.1.0" }
|
||||
craft-xml-dtd = { package = "craft-xml", git = "https://github.com/storytold/craft-libs", rev = "f23b0f33f0d00b157476533a43cbbcfd901aa1f1", version = "=0.1.0" }
|
||||
craft-rtf = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" }
|
||||
craft-xlsx = { git = "https://github.com/storytold/craft-libs", rev = "ba24fe2435adb3c81ad6057faf36365fbba736cf", version = "=0.1.0" }
|
||||
|
||||
@@ -412,12 +412,12 @@ impl<'r> Importer<'r> {
|
||||
}
|
||||
|
||||
pub(super) fn ace_char(v: &str) -> Option<char> {
|
||||
match v.trim() {
|
||||
"18" => Some(st::PAGE_NUMBER),
|
||||
"19" => Some(st::SECTION_MARKER),
|
||||
"7" => Some(st::INDENT_HERE),
|
||||
"8" => Some(st::RIGHT_INDENT_TAB),
|
||||
_ => None,
|
||||
match craft_idml::model::Ace::from_decimal(v)? {
|
||||
craft_idml::model::Ace::PageNumber => Some(st::PAGE_NUMBER),
|
||||
craft_idml::model::Ace::SectionMarker => Some(st::SECTION_MARKER),
|
||||
craft_idml::model::Ace::IndentToHere => Some(st::INDENT_HERE),
|
||||
craft_idml::model::Ace::RightIndentTab => Some(st::RIGHT_INDENT_TAB),
|
||||
craft_idml::model::Ace::FootnoteNumber | craft_idml::model::Ace::Other(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user