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

Spacing (#169) 

* feat: Add spacing

* rename

* feat: Add run spacing

* spec: update snaps

* fix: lint error
main
bokuweb 2020-10-14 10:16:13 +09:00 committed by GitHub
parent 47ce734119
commit 454556606b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 503 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docx-core/src/documents/elements/a_graphic.rs
View File

@ -59,7 +59,7 @@ mod tests {
);
assert_eq!(
serde_json::to_string(&graphic).unwrap(),
r#"{"children":[{"dataType":"wpShape","children":[{"type":"shape","data":{"children":[{"type":"textbox","data":{"children":[{"children":[{"type":"paragraph","data":{"id":"12345678","children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"pattern1"}}]}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null},"hasNumbering":false}}],"has_numbering":false}],"hasNumbering":false}}]}}]}]}"#
r#"{"children":[{"dataType":"wpShape","children":[{"type":"shape","data":{"children":[{"type":"textbox","data":{"children":[{"children":[{"type":"paragraph","data":{"id":"12345678","children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"pattern1"}}]}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null,"lineHeight":null},"hasNumbering":false}}],"has_numbering":false}],"hasNumbering":false}}]}}]}]}"#
);
}
}

2
docx-core/src/documents/elements/abstract_numbering.rs
View File

@ -90,7 +90,7 @@ mod tests {
.num_style_link("style1");
assert_eq!(
serde_json::to_string(&c).unwrap(),
r#"{"id":0,"styleLink":null,"numStyleLink":"style1","levels":[{"level":1,"start":1,"format":"decimal","text":"%4.","jc":"left","pstyle":null,"paragraphProperty":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null},"suffix":"tab"}]}"#
r#"{"id":0,"styleLink":null,"numStyleLink":"style1","levels":[{"level":1,"start":1,"format":"decimal","text":"%4.","jc":"left","pstyle":null,"paragraphProperty":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null,"lineHeight":null},"suffix":"tab"}]}"#
);
}
}

2
docx-core/src/documents/elements/mod.rs
View File

@ -52,6 +52,7 @@ mod run_property;
mod run_property_default;
mod section;
mod section_property;
mod spacing;
mod start;
mod style;
mod sz;
@ -135,6 +136,7 @@ pub use run_property::*;
pub use run_property_default::*;
pub use section::*;
pub use section_property::*;
pub use spacing::*;
pub use start::*;
pub use style::*;
pub use sz::*;

9
docx-core/src/documents/elements/paragraph.rs
View File

@ -197,6 +197,11 @@ impl Paragraph {
self.property.run_property = p;
self
}
pub fn line_height(mut self, h: u32) -> Self {
self.property = self.property.line_height(h);
self
}
}
impl BuildXML for Paragraph {
@ -279,7 +284,7 @@ mod tests {
let p = Paragraph::new().add_run(run);
assert_eq!(
serde_json::to_string(&p).unwrap(),
r#"{"id":"12345678","children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"Hello"}}]}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null},"hasNumbering":false}"#
r#"{"id":"12345678","children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"Hello"}}]}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null,"lineHeight":null},"hasNumbering":false}"#
);
}
@ -290,7 +295,7 @@ mod tests {
let p = Paragraph::new().add_insert(ins);
assert_eq!(
serde_json::to_string(&p).unwrap(),
r#"{"id":"12345678","children":[{"type":"insert","data":{"children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"Hello"}}]}}],"author":"unnamed","date":"1970-01-01T00:00:00Z"}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null},"hasNumbering":false}"#
r#"{"id":"12345678","children":[{"type":"insert","data":{"children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"Hello"}}]}}],"author":"unnamed","date":"1970-01-01T00:00:00Z"}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null,"lineHeight":null},"hasNumbering":false}"#
);
}
}

19
docx-core/src/documents/elements/paragraph_property.rs
View File

@ -13,6 +13,7 @@ pub struct ParagraphProperty {
pub numbering_property: Option<NumberingProperty>,
pub alignment: Option<Justification>,
pub indent: Option<Indent>,
pub line_height: Option<u32>,
}
impl Default for ParagraphProperty {
@ -23,6 +24,7 @@ impl Default for ParagraphProperty {
numbering_property: None,
alignment: None,
indent: None,
line_height: None,
}
}
}
@ -62,17 +64,28 @@ impl ParagraphProperty {
self.numbering_property = Some(NumberingProperty::new().add_num(id, level));
self
}
pub fn line_height(mut self, h: u32) -> Self {
self.line_height = Some(h);
self
}
}
impl BuildXML for ParagraphProperty {
fn build(&self) -> Vec<u8> {
let spacing = if let Some(s) = self.line_height {
Some(Spacing::new(crate::SpacingType::Line(s)))
} else {
None
};
XMLBuilder::new()
.open_paragraph_property()
.add_child(&self.run_property)
.open_paragraph_property()
.add_child(&self.run_property)
.add_optional_child(&self.style)
.add_optional_child(&self.numbering_property)
.add_optional_child(&self.alignment)
.add_optional_child(&self.indent)
.add_optional_child(&spacing)
.close()
.build()
}
@ -119,7 +132,7 @@ mod tests {
let b = c.indent(Some(20), Some(SpecialIndentType::FirstLine(10)), None, None);
assert_eq!(
serde_json::to_string(&b).unwrap(),
r#"{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":{"start":20,"startChars":null,"end":null,"specialIndent":{"type":"firstLine","val":10}}}"#
r#"{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":{"start":20,"startChars":null,"end":null,"specialIndent":{"type":"firstLine","val":10}},"lineHeight":null}"#
);
}
}

8
docx-core/src/documents/elements/run.rs
View File

@ -128,6 +128,11 @@ impl Run {
self
}
pub fn spacing(mut self, v: u32) -> Run {
self.run_property = self.run_property.spacing(v);
self
}
pub fn color(mut self, color: impl Into<String>) -> Run {
self.run_property = self.run_property.color(color);
self
@ -236,12 +241,13 @@ mod tests {
italic: Some(Italic::new()),
italic_cs: Some(ItalicCs::new()),
vanish: Some(Vanish::new()),
spacing: Some(100),
fonts: None,
},
};
assert_eq!(
serde_json::to_string(&run).unwrap(),
r#"{"runProperty":{"sz":30,"szCs":30,"color":"C9211E","highlight":"yellow","underline":"single","bold":true,"boldCs":true,"italic":true,"italicCs":true,"vanish":true,"fonts":null},"children":[{"type":"tab"},{"type":"text","data":{"preserveSpace":true,"text":"Hello"}},{"type":"break","data":{"breakType":"page"}},{"type":"deleteText","data":{"text":"deleted","preserveSpace":true}}]}"#
r#"{"runProperty":{"sz":30,"szCs":30,"color":"C9211E","highlight":"yellow","underline":"single","bold":true,"boldCs":true,"italic":true,"italicCs":true,"vanish":true,"spacing":100,"fonts":null},"children":[{"type":"tab"},{"type":"text","data":{"preserveSpace":true,"text":"Hello"}},{"type":"break","data":{"breakType":"page"}},{"type":"deleteText","data":{"text":"deleted","preserveSpace":true}}]}"#
);
}
}

13
docx-core/src/documents/elements/run_property.rs
View File

@ -17,6 +17,7 @@ pub struct RunProperty {
pub italic: Option<Italic>,
pub italic_cs: Option<ItalicCs>,
pub vanish: Option<Vanish>,
pub spacing: Option<u32>,
pub fonts: Option<RunFonts>,
}
@ -31,6 +32,11 @@ impl RunProperty {
self
}
pub fn spacing(mut self, spacing: u32) -> RunProperty {
self.spacing = Some(spacing as u32);
self
}
pub fn color(mut self, color: impl Into<String>) -> RunProperty {
self.color = Some(Color::new(color));
self
@ -83,6 +89,7 @@ impl Default for RunProperty {
italic_cs: None,
vanish: None,
fonts: None,
spacing: None,
}
}
}
@ -90,6 +97,11 @@ impl Default for RunProperty {
impl BuildXML for RunProperty {
fn build(&self) -> Vec<u8> {
let b = XMLBuilder::new();
let spacing = if let Some(s) = self.spacing {
Some(Spacing::new(crate::SpacingType::Value(s)))
} else {
None
};
b.open_run_property()
.add_optional_child(&self.sz)
.add_optional_child(&self.sz_cs)
@ -102,6 +114,7 @@ impl BuildXML for RunProperty {
.add_optional_child(&self.underline)
.add_optional_child(&self.vanish)
.add_optional_child(&self.fonts)
.add_optional_child(&spacing)
.close()
.build()
}

50
docx-core/src/documents/elements/spacing.rs 100644
View File

@ -0,0 +1,50 @@
use crate::documents::BuildXML;
use crate::types::*;
use crate::xml_builder::*;
use serde::*;
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
#[serde(rename_all = "camelCase")]
pub struct Spacing {
spacing_type: SpacingType,
}
impl Spacing {
pub fn new(s: SpacingType) -> Spacing {
Self { spacing_type: s }
}
}
impl BuildXML for Spacing {
fn build(&self) -> Vec<u8> {
let b = XMLBuilder::new();
b.spacing(self.spacing_type).build()
}
}
#[cfg(test)]
mod tests {
use super::*;
#[cfg(test)]
use pretty_assertions::assert_eq;
use std::str;
#[test]
fn test_spacing() {
let b = Spacing::new(SpacingType::Value(200)).build();
assert_eq!(str::from_utf8(&b).unwrap(), r#"<w:spacing w:val="200" />"#);
}
#[test]
fn test_spacing_json() {
let s = Spacing {
spacing_type: SpacingType::Value(100),
};
assert_eq!(
serde_json::to_string(&s).unwrap(),
r#"{"spacingType":{"type":"value","data":100}}"#
);
}
}

2
docx-core/src/documents/elements/table_cell.rs
View File

@ -146,7 +146,7 @@ mod tests {
.grid_span(2);
assert_eq!(
serde_json::to_string(&c).unwrap(),
r#"{"children":[{"type":"paragraph","data":{"id":"12345678","children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"Hello"}}]}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null},"hasNumbering":false}}],"property":{"width":null,"borders":null,"gridSpan":2,"verticalMerge":null,"verticalAlign":null},"hasNumbering":false}"#
r#"{"children":[{"type":"paragraph","data":{"id":"12345678","children":[{"type":"run","data":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"children":[{"type":"text","data":{"preserveSpace":true,"text":"Hello"}}]}}],"property":{"runProperty":{"sz":null,"szCs":null,"color":null,"highlight":null,"underline":null,"bold":null,"boldCs":null,"italic":null,"italicCs":null,"vanish":null,"spacing":null,"fonts":null},"style":null,"numberingProperty":null,"alignment":null,"indent":null,"lineHeight":null},"hasNumbering":false}}],"property":{"width":null,"borders":null,"gridSpan":2,"verticalMerge":null,"verticalAlign":null},"hasNumbering":false}"#
);
}
}

25
docx-core/src/reader/paragraph.rs
View File

@ -9,6 +9,16 @@ use super::*;
use super::attributes::*;
use crate::types::*;
fn read_lineheight(attributes: &[OwnedAttribute]) -> Option<u32> {
for a in attributes {
let local_name = &a.name.local_name;
if let "line" = local_name.as_str() {
return f32::from_str(&a.value).ok().map(|l| l as u32);
}
}
None
}
impl ElementReader for Paragraph {
fn read<R: Read>(
r: &mut EventReader<R>,
@ -64,6 +74,12 @@ impl ElementReader for Paragraph {
p = p.indent(start, special, end, start_chars);
continue;
}
XMLElement::Spacing => {
if let Some(line) = read_lineheight(&attributes) {
p = p.line_height(line);
}
continue;
}
XMLElement::Justification => {
p = p.align(AlignmentType::from_str(&attributes[0].value)?);
continue;
@ -140,6 +156,7 @@ mod tests {
Some(1270),
None,
)),
line_height: None,
},
has_numbering: false,
}
@ -174,6 +191,7 @@ mod tests {
numbering_property: None,
alignment: None,
indent: Some(Indent::new(None, None, None, Some(100))),
line_height: None,
},
has_numbering: false,
}
@ -203,6 +221,7 @@ mod tests {
numbering_property: None,
alignment: Some(Justification::new(AlignmentType::Left.to_string())),
indent: None,
line_height: None,
},
has_numbering: false,
}
@ -236,6 +255,7 @@ mod tests {
),
alignment: None,
indent: None,
line_height: None,
},
has_numbering: true,
}
@ -271,6 +291,7 @@ mod tests {
numbering_property: None,
alignment: None,
indent: None,
line_height: None,
},
has_numbering: false,
}
@ -307,6 +328,7 @@ mod tests {
numbering_property: None,
alignment: None,
indent: None,
line_height: None,
},
has_numbering: false,
}
@ -343,6 +365,7 @@ mod tests {
numbering_property: None,
alignment: None,
indent: None,
line_height: None,
},
has_numbering: false,
}
@ -391,6 +414,7 @@ mod tests {
numbering_property: None,
alignment: None,
indent: None,
line_height: None,
},
has_numbering: false,
}
@ -431,6 +455,7 @@ mod tests {
numbering_property: None,
alignment: None,
indent: None,
line_height: None,
},
has_numbering: false,
}

5
docx-core/src/reader/run_property.rs
View File

@ -29,6 +29,11 @@ impl ElementReader for RunProperty {
XMLElement::Highlight => rp = rp.highlight(attributes[0].value.clone()),
XMLElement::Color => rp = rp.color(attributes[0].value.clone()),
XMLElement::Size => rp = rp.size(usize::from_str(&attributes[0].value)?),
XMLElement::Spacing => {
if let Some(v) = read_val(&attributes) {
rp = rp.spacing(u32::from_str(&v)?)
}
}
XMLElement::Underline => rp = rp.underline(&attributes[0].value.clone()),
XMLElement::Italic => {
if !read_bool(&attributes) {

2
docx-core/src/reader/xml_element.rs
View File

@ -16,6 +16,7 @@ pub enum XMLElement {
Underline,
Size,
SizeCs,
Spacing,
Vanish,
Italic,
ItalicCs,
@ -76,7 +77,6 @@ pub enum XMLElement {
BasedOn,
Next,
VertAlign,
Spacing,
Styles,
Relationship,
Relationships,

2
docx-core/src/types/mod.rs
View File

@ -8,6 +8,7 @@ pub mod font_pitch_type;
pub mod level_suffix_type;
pub mod page_margin;
pub mod section_type;
pub mod spacing;
pub mod special_indent_type;
pub mod style_type;
pub mod table_alignment_type;
@ -25,6 +26,7 @@ pub use font_pitch_type::*;
pub use level_suffix_type::*;
pub use page_margin::*;
pub use section_type::*;
pub use spacing::*;
pub use special_indent_type::*;
pub use style_type::*;
pub use table_alignment_type::*;

30
docx-core/src/types/spacing.rs 100644
View File

@ -0,0 +1,30 @@
use serde::ser::{SerializeStruct, Serializer};
use serde::*;
#[derive(Copy, Clone, Debug, PartialEq, Deserialize)]
pub enum SpacingType {
Value(u32),
Line(u32),
}
impl Serialize for SpacingType {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match self {
SpacingType::Value(ref s) => {
let mut t = serializer.serialize_struct("SpacingType", 2)?;
t.serialize_field("type", "value")?;
t.serialize_field("data", s)?;
t.end()
}
SpacingType::Line(ref s) => {
let mut t = serializer.serialize_struct("SpacingType", 2)?;
t.serialize_field("type", "line")?;
t.serialize_field("data", s)?;
t.end()
}
}
}
}

22
docx-core/src/xml_builder/elements.rs
View File

@ -146,6 +146,28 @@ impl XMLBuilder {
self.close()
}
// i.e. <w:spacing ... >
pub(crate) fn spacing(mut self, s: crate::types::SpacingType) -> Self {
match s {
SpacingType::Value(v) => {
self.writer
.write(XmlEvent::start_element("w:spacing").attr("w:val", &format!("{}", v)))
.expect(EXPECT_MESSAGE);
self.close()
}
SpacingType::Line(v) => {
self.writer
.write(
XmlEvent::start_element("w:spacing")
.attr("w:line", &format!("{}", v))
.attr("w:lineRule", "auto"),
)
.expect(EXPECT_MESSAGE);
self.close()
}
}
}
//
// Table elements
//

2
docx-core/tests/snapshots/lib__reader__read_bom.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_bookmark.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_decoration.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_from_doc.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_hello.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_highlight_and_underline.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_history.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_indent_word_online.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_insert_table.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_lvl_override.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_numbering.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_tab_and_break.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_table_docx.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_table_merged_libre_office.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/lib__reader__read_textbox.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_bom.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_bookmark.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_decoration.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_from_doc.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_hello.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_highlight_and_underline.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_history.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_indent_word_online.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_insert_table.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_lvl_override.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_numbering.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_tab_and_break.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_table_docx.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_table_merged_libre_office.snap
View File

File diff suppressed because one or more lines are too long

2
docx-core/tests/snapshots/reader__read_textbox.snap
View File

File diff suppressed because one or more lines are too long

8
docx-wasm/js/index.ts
View File

@ -155,6 +155,10 @@ export class Docx {
run = run.vanish();
}
if (r.property.spacing != null) {
run = run.spacing(r.property.spacing);
}
let f = wasm.createRunFonts();
if (r.property.fonts?._ascii) {
f = f.ascii(r.property.fonts._ascii);
@ -298,8 +302,8 @@ export class Docx {
paragraph = paragraph.bold();
}
if (p.property.runProperty.bold) {
paragraph = paragraph.bold();
if (p.property.lineHeight) {
paragraph = paragraph.line_height(p.property.lineHeight);
}
if (p.property.runProperty.italic) {

1
docx-wasm/js/json/paragraph.ts
View File

@ -19,6 +19,7 @@ export type ParagraphPropertyJSON = {
numberingProperty: NumberingPropertyJSON | null;
alignment: "left" | "center" | "right" | "justified" | "both";
indent: IndentJSON | null;
lineHeight: number | null;
};
export type ParagraphJSON = {

1
docx-wasm/js/json/run.ts
View File

@ -11,6 +11,7 @@ export type RunPropertyJSON = {
italic: boolean | null;
italicCs: boolean | null;
vanish: boolean | null;
spacing: number | null;
};
export type RunChildJSON =

6
docx-wasm/js/paragraph.ts
View File

@ -38,6 +38,7 @@ export type ParagraphProperty = {
id: number;
level: number;
};
lineHeight?: number;
runProperty: RunProperty;
};
@ -108,6 +109,11 @@ export class Paragraph {
return this;
}
lineHeight(lineHeight: number) {
this.property = { ...this.property, lineHeight };
return this;
}
// run property
size(size: number) {
this.property.runProperty = { ...this.property.runProperty, size };

6
docx-wasm/js/run.ts
View File

@ -14,6 +14,7 @@ export type RunProperty = {
underline?: string;
vanish?: boolean;
fonts?: RunFonts;
spacing?: number;
};
export class RunFonts {
@ -106,4 +107,9 @@ export class Run {
this.property = { ...this.property, fonts };
return this;
}
spacing(spacing: number) {
this.property = { ...this.property, spacing };
return this;
}
}

5
docx-wasm/src/paragraph.rs
View File

@ -111,6 +111,11 @@ impl Paragraph {
self.0 = self.0.fonts(f.take());
self
}
pub fn line_height(mut self, line_height: u32) -> Self {
self.0 = self.0.line_height(line_height);
self
}
}
impl Paragraph {

5
docx-wasm/src/run.rs
View File

@ -79,6 +79,11 @@ impl Run {
self.0 = self.0.fonts(f.take());
self
}
pub fn spacing(mut self, spacing: u32) -> Run {
self.0.run_property = self.0.run_property.spacing(spacing);
self
}
}
impl Run {

146
docx-wasm/test/__snapshots__/index.test.js.snap
View File

File diff suppressed because it is too large Load Diff

2
fixtures/image_in_textbox/docProps/core.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>植木智之</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>植木智之</cp:lastModifiedBy><cp:revision>1</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-05-11T05:44:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-05-11T05:45:00Z</dcterms:modified></cp:coreProperties>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>bokuweb</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>bokuweb</cp:lastModifiedBy><cp:revision>1</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-05-11T05:44:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-05-11T05:45:00Z</dcterms:modified></cp:coreProperties>

2
fixtures/image_output_resized/docProps/core.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:creator>unknown</dc:creator><cp:lastModifiedBy>植木智之</cp:lastModifiedBy><cp:revision>3</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">1970-01-01T00:00:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-05-12T10:02:00Z</dcterms:modified></cp:coreProperties>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:creator>unknown</dc:creator><cp:lastModifiedBy>bokuweb</cp:lastModifiedBy><cp:revision>3</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">1970-01-01T00:00:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-05-12T10:02:00Z</dcterms:modified></cp:coreProperties>

2
fixtures/nested_comments/word/people.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w15:people xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex wp14"><w15:person w15:author="植木智之"><w15:presenceInfo w15:providerId="AD" w15:userId="S::s.ueki@j-legalsystem.com::066659c7-926a-42c1-86b7-e849e2349e43"/></w15:person></w15:people>
<w15:people xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex wp14"><w15:person w15:author="bokuweb"><w15:presenceInfo w15:providerId="AD" w15:userId="S::s.ueki@j-legalsystem.com::066659c7-926a-42c1-86b7-e849e2349e43"/></w15:person></w15:people>

2
fixtures/section_current/docProps/core.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>植木智之</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>植木智之</cp:lastModifiedBy><cp:revision>1</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-08-14T13:10:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-08-14T13:11:00Z</dcterms:modified></cp:coreProperties>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>bokuweb</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>bokuweb</cp:lastModifiedBy><cp:revision>1</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-08-14T13:10:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-08-14T13:11:00Z</dcterms:modified></cp:coreProperties>

2
fixtures/section_even_page/docProps/core.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>植木智之</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>植木智之</cp:lastModifiedBy><cp:revision>6</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-08-14T13:10:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-08-19T16:25:00Z</dcterms:modified></cp:coreProperties>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>bokuweb</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>bokuweb</cp:lastModifiedBy><cp:revision>6</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-08-14T13:10:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-08-19T16:25:00Z</dcterms:modified></cp:coreProperties>

2
fixtures/spacing/[Content_Types].xml 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/><Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/><Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/><Override PartName="/word/webSettings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml"/><Override PartName="/word/fontTable.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml"/><Override PartName="/word/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>

2
fixtures/spacing/_rels/.rels 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="word/document.xml"/></Relationships>

2
fixtures/spacing/docProps/app.xml 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Template>Normal.dotm</Template><TotalTime>1</TotalTime><Pages>1</Pages><Words>1</Words><Characters>12</Characters><Application>Microsoft Office Word</Application><DocSecurity>0</DocSecurity><Lines>1</Lines><Paragraphs>1</Paragraphs><ScaleCrop>false</ScaleCrop><Company></Company><LinksUpToDate>false</LinksUpToDate><CharactersWithSpaces>12</CharactersWithSpaces><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>16.0000</AppVersion></Properties>

16
fixtures/spacing/docProps/core.xml 100644
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:dcterms="http://purl.org/dc/terms/"
xmlns:dcmitype="http://purl.org/dc/dcmitype/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dc:title></dc:title>
<dc:subject></dc:subject>
<dc:creator>bokuweb</dc:creator>
<cp:keywords></cp:keywords>
<dc:description></dc:description>
<cp:lastModifiedBy>bokuweb</cp:lastModifiedBy>
<cp:revision>2</cp:revision>
<dcterms:created xsi:type="dcterms:W3CDTF">2020-10-10T14:03:00Z</dcterms:created>
<dcterms:modified xsi:type="dcterms:W3CDTF">2020-10-10T15:04:00Z</dcterms:modified>
</cp:coreProperties>

2
fixtures/spacing/word/_rels/document.xml.rels 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings" Target="webSettings.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings" Target="settings.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/><Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable" Target="fontTable.xml"/></Relationships>

74
fixtures/spacing/word/document.xml 100644
View File

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"
xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex"
xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex"
xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex"
xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex"
xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex"
xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex"
xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex"
xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex"
xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink"
xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"
xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
xmlns:w10="urn:schemas-microsoft-com:office:word"
xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex"
xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid"
xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml"
xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex"
xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"
xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk"
xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex wp14">
<w:body>
<w:p w14:paraId="65E85140" w14:textId="4EA280F9" w:rsidR="006A55A7" w:rsidRDefault="00E62A7B">
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia"/>
</w:rPr>
<w:t>H</w:t>
</w:r>
<w:r>
<w:t>ello</w:t>
</w:r>
</w:p>
<w:p w14:paraId="4B3AA2E1" w14:textId="23876416" w:rsidR="00E62A7B" w:rsidRDefault="00E62A7B"/>
<w:p w14:paraId="1C176B5F" w14:textId="6B3DBA40" w:rsidR="00E62A7B" w:rsidRDefault="00E62A7B" w:rsidP="00E62A7B">
<w:pPr>
<w:spacing w:line="600" w:lineRule="auto"/>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia"/>
</w:rPr>
<w:t>W</w:t>
</w:r>
<w:r w:rsidRPr="003666BD">
<w:rPr>
<w:rFonts w:cs="Times New Roman (本文のフォント - コンプレ"/>
<w:spacing w:val="400"/>
</w:rPr>
<w:t>orl</w:t>
</w:r>
<w:r>
<w:t>d</w:t>
</w:r>
</w:p>
<w:sectPr w:rsidR="00E62A7B" w:rsidSect="00733037">
<w:pgSz w:w="11900" w:h="16840"/>
<w:pgMar w:top="1985" w:right="1701" w:bottom="1701" w:left="1701" w:header="851" w:footer="992" w:gutter="0"/>
<w:cols w:space="425"/>
<w:docGrid w:type="lines" w:linePitch="360"/>
</w:sectPr>
</w:body>
</w:document>

2
fixtures/spacing/word/fontTable.xml 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:fonts xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex"><w:font w:name="游明朝"><w:panose1 w:val="02020400000000000000"/><w:charset w:val="80"/><w:family w:val="roman"/><w:pitch w:val="variable"/><w:sig w:usb0="800002E7" w:usb1="2AC7FCFF" w:usb2="00000012" w:usb3="00000000" w:csb0="0002009F" w:csb1="00000000"/></w:font><w:font w:name="Times New Roman"><w:panose1 w:val="02020603050405020304"/><w:charset w:val="00"/><w:family w:val="roman"/><w:pitch w:val="variable"/><w:sig w:usb0="E0002EFF" w:usb1="C000785B" w:usb2="00000009" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/></w:font><w:font w:name="Times New Roman (本文のフォント - コンプレ"><w:panose1 w:val="020B0604020202020204"/><w:charset w:val="80"/><w:family w:val="roman"/><w:notTrueType/><w:pitch w:val="default"/></w:font><w:font w:name="游ゴシック Light"><w:panose1 w:val="020B0300000000000000"/><w:charset w:val="80"/><w:family w:val="swiss"/><w:pitch w:val="variable"/><w:sig w:usb0="E00002FF" w:usb1="2AC7FDFF" w:usb2="00000016" w:usb3="00000000" w:csb0="0002009F" w:csb1="00000000"/></w:font></w:fonts>

2
fixtures/spacing/word/settings.xml 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:settings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex"><w:zoom w:percent="99"/><w:bordersDoNotSurroundHeader/><w:bordersDoNotSurroundFooter/><w:proofState w:spelling="clean" w:grammar="clean"/><w:defaultTabStop w:val="840"/><w:displayHorizontalDrawingGridEvery w:val="0"/><w:displayVerticalDrawingGridEvery w:val="2"/><w:characterSpacingControl w:val="compressPunctuation"/><w:compat><w:spaceForUL/><w:balanceSingleByteDoubleByteWidth/><w:doNotLeaveBackslashAlone/><w:ulTrailSpace/><w:doNotExpandShiftReturn/><w:adjustLineHeightInTable/><w:useFELayout/><w:compatSetting w:name="compatibilityMode" w:uri="http://schemas.microsoft.com/office/word" w:val="15"/><w:compatSetting w:name="overrideTableStyleFontSizeAndJustification" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/><w:compatSetting w:name="enableOpenTypeFeatures" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/><w:compatSetting w:name="doNotFlipMirrorIndents" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/><w:compatSetting w:name="differentiateMultirowTableHeaders" w:uri="http://schemas.microsoft.com/office/word" w:val="1"/><w:compatSetting w:name="useWord2013TrackBottomHyphenation" w:uri="http://schemas.microsoft.com/office/word" w:val="0"/></w:compat><w:rsids><w:rsidRoot w:val="00E62A7B"/><w:rsid w:val="003666BD"/><w:rsid w:val="00723E87"/><w:rsid w:val="00733037"/><w:rsid w:val="00E62A7B"/></w:rsids><m:mathPr><m:mathFont m:val="Cambria Math"/><m:brkBin m:val="before"/><m:brkBinSub m:val="--"/><m:smallFrac m:val="0"/><m:dispDef/><m:lMargin m:val="0"/><m:rMargin m:val="0"/><m:defJc m:val="centerGroup"/><m:wrapIndent m:val="1440"/><m:intLim m:val="subSup"/><m:naryLim m:val="undOvr"/></m:mathPr><w:themeFontLang w:val="en-US" w:eastAsia="ja-JP"/><w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/><w:decimalSymbol w:val="."/><w:listSeparator w:val=","/><w14:docId w14:val="3E4E7D39"/><w15:chartTrackingRefBased/><w15:docId w15:val="{74AE8939-706E-D74D-B874-AFB24994EB06}"/></w:settings>

2
fixtures/spacing/word/styles.xml 100644
View File

File diff suppressed because one or more lines are too long

2
fixtures/spacing/word/theme/theme1.xml 100644
View File

File diff suppressed because one or more lines are too long

2
fixtures/spacing/word/webSettings.xml 100644
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<w:webSettings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" mc:Ignorable="w14 w15 w16se w16cid w16 w16cex"><w:optimizeForBrowser/><w:allowPNG/></w:webSettings>

2
fixtures/table_border/docProps/core.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>植木智之</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>植木智之</cp:lastModifiedBy><cp:revision>1</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-04-27T15:49:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-04-27T15:50:00Z</dcterms:modified></cp:coreProperties>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><dc:creator>bokuweb</dc:creator><cp:keywords></cp:keywords><dc:description></dc:description><cp:lastModifiedBy>bokuweb</cp:lastModifiedBy><cp:revision>1</cp:revision><dcterms:created xsi:type="dcterms:W3CDTF">2020-04-27T15:49:00Z</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">2020-04-27T15:50:00Z</dcterms:modified></cp:coreProperties>