wynd
/
docx-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape style name (#779) 

* fix: escape some feild

* rc18
main
bokuweb 2024-11-01 13:08:31 +09:00 committed by GitHub
parent 4c7bd61ce9
commit 55961d6f9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docx-core/src/documents/elements/based_on.rs
View File

@ -1,6 +1,7 @@
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
use crate::documents::BuildXML; use crate::documents::BuildXML;
use crate::escape::escape;
use crate::xml_builder::*; use crate::xml_builder::*;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -10,7 +11,9 @@ pub struct BasedOn {
impl BasedOn { impl BasedOn {
pub fn new(val: impl Into<String>) -> BasedOn { pub fn new(val: impl Into<String>) -> BasedOn {
BasedOn { val: val.into() } BasedOn {
val: escape(&val.into()),
}
} }
} }

5
docx-core/src/documents/elements/link.rs
View File

@ -1,6 +1,7 @@
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
use crate::documents::BuildXML; use crate::documents::BuildXML;
use crate::escape::escape;
use crate::xml_builder::*; use crate::xml_builder::*;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -10,7 +11,9 @@ pub struct Link {
impl Link { impl Link {
pub fn new(val: impl Into<String>) -> Link { pub fn new(val: impl Into<String>) -> Link {
Link { val: val.into() } Link {
val: escape(&val.into()),
}
} }
} }

5
docx-core/src/documents/elements/paragraph_style.rs
View File

@ -1,6 +1,7 @@
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
use crate::documents::BuildXML; use crate::documents::BuildXML;
use crate::escape::escape;
use crate::xml_builder::*; use crate::xml_builder::*;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -25,7 +26,9 @@ impl Default for ParagraphStyle {
impl ParagraphStyle { impl ParagraphStyle {
pub fn new(val: Option<impl Into<String>>) -> ParagraphStyle { pub fn new(val: Option<impl Into<String>>) -> ParagraphStyle {
if let Some(v) = val { if let Some(v) = val {
ParagraphStyle { val: v.into() } ParagraphStyle {
val: escape(&v.into()),
}
} else { } else {
Default::default() Default::default()
} }

5
docx-core/src/documents/elements/run_style.rs
View File

@ -1,6 +1,7 @@
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
use crate::documents::BuildXML; use crate::documents::BuildXML;
use crate::escape::escape;
use crate::xml_builder::*; use crate::xml_builder::*;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -18,7 +19,9 @@ impl Default for RunStyle {
impl RunStyle { impl RunStyle {
pub fn new(val: impl Into<String>) -> RunStyle { pub fn new(val: impl Into<String>) -> RunStyle {
RunStyle { val: val.into() } RunStyle {
val: escape(&val.into()),
}
} }
} }

3
docx-core/src/documents/elements/style.rs
View File

@ -1,6 +1,7 @@
use serde::Serialize; use serde::Serialize;
use crate::documents::BuildXML; use crate::documents::BuildXML;
use crate::escape::escape;
use crate::types::*; use crate::types::*;
use crate::xml_builder::*; use crate::xml_builder::*;
use crate::StyleType; use crate::StyleType;
@ -47,7 +48,7 @@ impl Style {
pub fn new(style_id: impl Into<String>, style_type: StyleType) -> Self { pub fn new(style_id: impl Into<String>, style_type: StyleType) -> Self {
let default = Default::default(); let default = Default::default();
Style { Style {
style_id: style_id.into(), style_id: escape(&style_id.into()),
style_type, style_type,
..default ..default
} }

2
docx-wasm/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "docx-wasm", "name": "docx-wasm",
"version": "0.4.18-rc16", "version": "0.4.18-rc18",
"main": "dist/node/index.js", "main": "dist/node/index.js",
"browser": "dist/web/index.js", "browser": "dist/web/index.js",
"author": "bokuweb <bokuweb12@gmail.com>", "author": "bokuweb <bokuweb12@gmail.com>",