Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/formatting/border/insideh_border.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
use std::borrow::Cow;
use strong_xml::{XmlRead, XmlWrite};

use crate::{__setter, __xml_test_suites, formatting::BorderStyle};

#[derive(Debug, Default, XmlRead, XmlWrite)]
#[cfg_attr(test, derive(PartialEq))]
#[xml(tag = "w:insideH")]
pub struct InsideHBorder<'a> {
#[xml(attr = "w:color")]
pub color: Option<Cow<'a, str>>,
#[xml(attr = "w:shadow")]
pub shadow: Option<bool>,
#[xml(attr = "w:space")]
pub space: Option<usize>,
#[xml(attr = "w:sz")]
pub size: Option<usize>,
#[xml(attr = "w:val")]
pub style: Option<BorderStyle>,
}

impl<'a> InsideHBorder<'a> {
__setter!(color: Option<Cow<'a, str>>);
__setter!(shadow: Option<bool>);
__setter!(space: Option<usize>);
__setter!(size: Option<usize>);
__setter!(style: Option<BorderStyle>);
}

__xml_test_suites!(
InsideHBorder,
InsideHBorder::default(),
r#"<w:insideH/>"#,
InsideHBorder::default().color("000000"),
r#"<w:insideH w:color="000000"/>"#,
InsideHBorder::default().shadow(false),
r#"<w:insideH w:shadow="false"/>"#,
InsideHBorder::default().space(40usize),
r#"<w:insideH w:space="40"/>"#,
InsideHBorder::default().size(20usize),
r#"<w:insideH w:sz="20"/>"#,
InsideHBorder::default().style(BorderStyle::Dotted),
r#"<w:insideH w:val="dotted"/>"#,
);
44 changes: 44 additions & 0 deletions src/formatting/border/insidev_border.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
use std::borrow::Cow;
use strong_xml::{XmlRead, XmlWrite};

use crate::{__setter, __xml_test_suites, formatting::BorderStyle};

#[derive(Debug, Default, XmlRead, XmlWrite)]
#[cfg_attr(test, derive(PartialEq))]
#[xml(tag = "w:insideV")]
pub struct InsideVBorder<'a> {
#[xml(attr = "w:color")]
pub color: Option<Cow<'a, str>>,
#[xml(attr = "w:shadow")]
pub shadow: Option<bool>,
#[xml(attr = "w:space")]
pub space: Option<usize>,
#[xml(attr = "w:sz")]
pub size: Option<usize>,
#[xml(attr = "w:val")]
pub style: Option<BorderStyle>,
}

impl<'a> InsideVBorder<'a> {
__setter!(color: Option<Cow<'a, str>>);
__setter!(shadow: Option<bool>);
__setter!(space: Option<usize>);
__setter!(size: Option<usize>);
__setter!(style: Option<BorderStyle>);
}

__xml_test_suites!(
InsideVBorder,
InsideVBorder::default(),
r#"<w:insideV/>"#,
InsideVBorder::default().color("000000"),
r#"<w:insideV w:color="000000"/>"#,
InsideVBorder::default().shadow(false),
r#"<w:insideV w:shadow="false"/>"#,
InsideVBorder::default().space(40usize),
r#"<w:insideV w:space="40"/>"#,
InsideVBorder::default().size(20usize),
r#"<w:insideV w:sz="20"/>"#,
InsideVBorder::default().style(BorderStyle::Dotted),
r#"<w:insideV w:val="dotted"/>"#,
);
4 changes: 3 additions & 1 deletion src/formatting/border/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ mod bottom_border;
mod left_border;
mod right_border;
mod top_border;
mod insideh_border;
mod insidev_border;

pub use self::{
between_border::*, border_style::*, bottom_border::*, left_border::*, right_border::*,
top_border::*,
top_border::*, insideh_border::*, insidev_border::*,
};
12 changes: 11 additions & 1 deletion src/formatting/borders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use strong_xml::{XmlRead, XmlWrite};

use crate::{
__setter, __xml_test_suites,
formatting::{BetweenBorder, BottomBorder, LeftBorder, RightBorder, TopBorder},
formatting::{BetweenBorder, BottomBorder, LeftBorder, RightBorder, TopBorder, InsideHBorder, InsideVBorder},
};

/// Borders
Expand All @@ -20,6 +20,10 @@ pub struct Borders<'a> {
pub right: Option<RightBorder<'a>>,
#[xml(child = "w:between")]
pub between: Option<BetweenBorder<'a>>,
#[xml(child = "w:insideH")]
pub insideH: Option<InsideHBorder<'a>>,
#[xml(child = "w:insideV")]
pub insideV: Option<InsideVBorder<'a>>,
}

impl<'a> Borders<'a> {
Expand All @@ -28,6 +32,8 @@ impl<'a> Borders<'a> {
__setter!(left: Option<LeftBorder<'a>>);
__setter!(right: Option<RightBorder<'a>>);
__setter!(between: Option<BetweenBorder<'a>>);
__setter!(insideH: Option<InsideHBorder<'a>>);
__setter!(insideV: Option<InsideVBorder<'a>>);
}

__xml_test_suites!(
Expand All @@ -44,4 +50,8 @@ __xml_test_suites!(
r#"<w:pBdr><w:right/></w:pBdr>"#,
Borders::default().between(BetweenBorder::default()),
r#"<w:pBdr><w:between/></w:pBdr>"#,
Borders::default().insideH(InsideHBorder::default()),
r#"<w:pBdr><w:insideH/></w:pBdr>"#,
Borders::default().insideV(InsideVBorder::default()),
r#"<w:pBdr><w:insideV/></w:pBdr>"#,
);
22 changes: 21 additions & 1 deletion src/formatting/table_borders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use strong_xml::{XmlRead, XmlWrite};

use crate::{
__setter, __xml_test_suites,
formatting::{BottomBorder, TopBorder},
formatting::{BottomBorder, TopBorder, LeftBorder, RightBorder, InsideHBorder, InsideVBorder},
};

#[derive(Debug, Default, XmlRead, XmlWrite)]
Expand All @@ -13,11 +13,23 @@ pub struct TableBorders<'a> {
pub top: Option<TopBorder<'a>>,
#[xml(child = "w:bottom")]
pub bottom: Option<BottomBorder<'a>>,
#[xml(child = "w:left")]
pub left: Option<LeftBorder<'a>>,
#[xml(child = "w:right")]
pub right: Option<RightBorder<'a>>,
#[xml(child = "w:insideH")]
pub insideH: Option<InsideHBorder<'a>>,
#[xml(child = "w:insideV")]
pub insideV: Option<InsideVBorder<'a>>,
}

impl<'a> TableBorders<'a> {
__setter!(top: Option<TopBorder<'a>>);
__setter!(bottom: Option<BottomBorder<'a>>);
__setter!(left: Option<LeftBorder<'a>>);
__setter!(right: Option<RightBorder<'a>>);
__setter!(insideH: Option<InsideHBorder<'a>>);
__setter!(insideV: Option<InsideVBorder<'a>>);
}

__xml_test_suites!(
Expand All @@ -28,4 +40,12 @@ __xml_test_suites!(
r#"<w:tblBorders><w:top/></w:tblBorders>"#,
TableBorders::default().bottom(BottomBorder::default()),
r#"<w:tblBorders><w:bottom/></w:tblBorders>"#,
TableBorders::default().left(LeftBorder::default()),
r#"<w:tblBorders><w:left/></w:tblBorders>"#,
TableBorders::default().right(RightBorder::default()),
r#"<w:tblBorders><w:right/></w:tblBorders>"#,
TableBorders::default().insideH(InsideHBorder::default()),
r#"<w:tblBorders><w:right/></w:tblBorders>"#,
TableBorders::default().insideV(InsideVBorder::default()),
r#"<w:tblBorders><w:right/></w:tblBorders>"#,
);