feat: Add cell
parent
e387c29edf
commit
23b422c25f
|
@ -1,7 +1,7 @@
|
|||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Color {
|
||||
val: String,
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ use crate::documents::BuildXML;
|
|||
use crate::types::*;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Indent {
|
||||
left: usize,
|
||||
special_indent: Option<SpecialIndentType>,
|
||||
|
|
|
@ -9,7 +9,7 @@ use crate::xml_builder::*;
|
|||
// present without the val attribute, the default of the val attribute is centerGroup . This means that the instances
|
||||
// of mathematical text can be aligned with respect to each other, but the entire group of mathematical text is
|
||||
// centered as a whole.
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Justification {
|
||||
val: String,
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ mod style;
|
|||
mod sz;
|
||||
mod sz_cs;
|
||||
mod table_borders;
|
||||
mod table_cell;
|
||||
mod table_cell_borders;
|
||||
mod table_cell_margins;
|
||||
mod table_cell_property;
|
||||
|
@ -44,6 +45,7 @@ pub use style::*;
|
|||
pub use sz::*;
|
||||
pub use sz_cs::*;
|
||||
pub use table_borders::*;
|
||||
pub use table_cell::*;
|
||||
pub use table_cell_borders::*;
|
||||
pub use table_cell_margins::*;
|
||||
pub use table_cell_property::*;
|
||||
|
|
|
@ -3,7 +3,7 @@ use crate::documents::BuildXML;
|
|||
use crate::types::*;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Paragraph {
|
||||
runs: Vec<Run>,
|
||||
property: ParagraphProperty,
|
||||
|
|
|
@ -3,7 +3,7 @@ use crate::documents::BuildXML;
|
|||
use crate::types::{AlignmentType, SpecialIndentType};
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ParagraphProperty {
|
||||
run_property: RunProperty,
|
||||
style: ParagraphStyle,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ParagraphStyle {
|
||||
val: String,
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ use super::{RunProperty, Text};
|
|||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Run {
|
||||
run_property: RunProperty,
|
||||
text: Text,
|
||||
|
|
|
@ -2,7 +2,7 @@ use super::{Color, Sz, SzCs};
|
|||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct RunProperty {
|
||||
sz: Option<Sz>,
|
||||
sz_cs: Option<SzCs>,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Sz {
|
||||
val: usize,
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct SzCs {
|
||||
val: usize,
|
||||
}
|
||||
|
|
|
@ -0,0 +1,69 @@
|
|||
use super::{Paragraph, Run, TableCellProperty};
|
||||
use crate::documents::BuildXML;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct TableCell {
|
||||
property: TableCellProperty,
|
||||
contents: Vec<TableCellContent>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum TableCellContent {
|
||||
Paragraph(Paragraph),
|
||||
}
|
||||
|
||||
impl TableCell {
|
||||
pub fn new(w: usize) -> TableCell {
|
||||
let property = TableCellProperty::new(w);
|
||||
let contents = vec![];
|
||||
Self { property, contents }
|
||||
}
|
||||
|
||||
pub fn add_paragraph(mut self, p: Paragraph) -> TableCell {
|
||||
self.contents.push(TableCellContent::Paragraph(p));
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl BuildXML for TableCell {
|
||||
fn build(&self) -> Vec<u8> {
|
||||
let b = XMLBuilder::new();
|
||||
let mut b = b.open_table_cell().add_child(&self.property);
|
||||
for c in &self.contents {
|
||||
match c {
|
||||
TableCellContent::Paragraph(p) => b = b.add_child(p),
|
||||
}
|
||||
}
|
||||
b.close().build()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
||||
use super::*;
|
||||
#[cfg(test)]
|
||||
use pretty_assertions::assert_eq;
|
||||
use std::str;
|
||||
|
||||
#[test]
|
||||
fn test_cell() {
|
||||
let b = TableCell::new(200).build();
|
||||
assert_eq!(
|
||||
str::from_utf8(&b).unwrap(),
|
||||
r#"<w:tc><w:tcPr><w:tcW w:w="200" w:type="dxa" /><w:tcBorders><w:top w:val="single" w:sz="2" w:space="0" w:color="000000" /><w:left w:val="single" w:sz="2" w:space="0" w:color="000000" /><w:bottom w:val="single" w:sz="2" w:space="0" w:color="000000" /><w:insideH w:val="single" w:sz="2" w:space="0" w:color="000000" /></w:tcBorders></w:tcPr></w:tc>"#
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cell_add_p() {
|
||||
let b = TableCell::new(200)
|
||||
.add_paragraph(Paragraph::new().add_run(Run::new("Hello")))
|
||||
.build();
|
||||
assert_eq!(
|
||||
str::from_utf8(&b).unwrap(),
|
||||
r#"<w:tc><w:tcPr><w:tcW w:w="200" w:type="dxa" /><w:tcBorders><w:top w:val="single" w:sz="2" w:space="0" w:color="000000" /><w:left w:val="single" w:sz="2" w:space="0" w:color="000000" /><w:bottom w:val="single" w:sz="2" w:space="0" w:color="000000" /><w:insideH w:val="single" w:sz="2" w:space="0" w:color="000000" /></w:tcBorders></w:tcPr><w:p><w:pPr><w:pStyle w:val="Normal" /><w:rPr /></w:pPr><w:r><w:rPr /><w:t xml:space="preserve">Hello</w:t></w:r></w:p></w:tc>"#
|
||||
);
|
||||
}
|
||||
}
|
|
@ -3,7 +3,7 @@ use crate::documents::BuildXML;
|
|||
use crate::types::*;
|
||||
use crate::xml_builder::*;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct TableCellProperty {
|
||||
width: TableCellWidth,
|
||||
borders: TableCellBorders,
|
||||
|
|
Loading…
Reference in New Issue