From 2a76f2dde6533c09f8e93b44d1f214a105d9c5c2 Mon Sep 17 00:00:00 2001 From: Philipp A Date: Thu, 28 Dec 2023 15:29:19 +0100 Subject: Format (#38) --- document_tree/src/extra_attributes.rs | 126 +++++++++++++++++----------------- 1 file changed, 63 insertions(+), 63 deletions(-) (limited to 'document_tree/src/extra_attributes.rs') diff --git a/document_tree/src/extra_attributes.rs b/document_tree/src/extra_attributes.rs index 45fcf32..9dcabd7 100644 --- a/document_tree/src/extra_attributes.rs +++ b/document_tree/src/extra_attributes.rs @@ -1,62 +1,60 @@ use serde_derive::Serialize; -use crate::url::Url; use crate::attribute_types::{ - CanBeEmpty, - FixedSpace, - ID,NameToken, - AlignHV,AlignH,AlignV, - TableAlignH,TableBorder,TableGroupCols, - Measure, - EnumeratedListType, + AlignH, AlignHV, AlignV, CanBeEmpty, EnumeratedListType, FixedSpace, Measure, NameToken, + TableAlignH, TableBorder, TableGroupCols, ID, }; +use crate::url::Url; pub trait ExtraAttributes { - fn with_extra(extra: A) -> Self; - fn extra (& self) -> & A; - fn extra_mut(&mut self) -> &mut A; + fn with_extra(extra: A) -> Self; + fn extra(&self) -> &A; + fn extra_mut(&mut self) -> &mut A; } macro_rules! impl_extra { - ( $name:ident { $( $(#[$pattr:meta])* $param:ident : $type:ty ),* $(,)* } ) => ( - impl_extra!( - #[derive(Default,Debug,PartialEq,Serialize,Clone)] - $name { $( $(#[$pattr])* $param : $type, )* } - ); - ); - ( $(#[$attr:meta])+ $name:ident { $( $(#[$pattr:meta])* $param:ident : $type:ty ),* $(,)* } ) => ( - $(#[$attr])+ - pub struct $name { $( - $(#[$pattr])* - #[serde(skip_serializing_if = "CanBeEmpty::is_empty")] - pub $param : $type, - )* } - ); + ( $name:ident { $( $(#[$pattr:meta])* $param:ident : $type:ty ),* $(,)* } ) => ( + impl_extra!( + #[derive(Default,Debug,PartialEq,Serialize,Clone)] + $name { $( $(#[$pattr])* $param : $type, )* } + ); + ); + ( $(#[$attr:meta])+ $name:ident { $( $(#[$pattr:meta])* $param:ident : $type:ty ),* $(,)* } ) => ( + $(#[$attr])+ + pub struct $name { $( + $(#[$pattr])* + #[serde(skip_serializing_if = "CanBeEmpty::is_empty")] + pub $param : $type, + )* } + ); } impl_extra!(Address { space: FixedSpace }); impl_extra!(LiteralBlock { space: FixedSpace }); impl_extra!(DoctestBlock { space: FixedSpace }); -impl_extra!(SubstitutionDefinition { ltrim: bool, rtrim: bool }); +impl_extra!(SubstitutionDefinition { + ltrim: bool, + rtrim: bool +}); impl_extra!(Comment { space: FixedSpace }); impl_extra!(Target { - /// External reference to a URI/URL - refuri: Option, - /// References to ids attributes in other elements - refid: Option, - /// Internal reference to the names attribute of another element. May resolve to either an internal or external reference. - refname: Vec, - anonymous: bool, + /// External reference to a URI/URL + refuri: Option, + /// References to ids attributes in other elements + refid: Option, + /// Internal reference to the names attribute of another element. May resolve to either an internal or external reference. + refname: Vec, + anonymous: bool, }); impl_extra!(Raw { space: FixedSpace, format: Vec }); impl_extra!(#[derive(Debug,PartialEq,Serialize,Clone)] Image { - uri: Url, - align: Option, - alt: Option, - height: Option, - width: Option, - scale: Option, - target: Option, // Not part of the DTD but a valid argument + uri: Url, + align: Option, + alt: Option, + height: Option, + width: Option, + scale: Option, + target: Option, // Not part of the DTD but a valid argument }); //bools usually are XML yesorno. “auto” however either exists and is set to something random like “1” or doesn’t exist @@ -81,13 +79,13 @@ impl_extra!(TableColspec { colnum: Option, colname: Option, co impl_extra!(OptionArgument { delimiter: Option }); impl_extra!(Reference { - name: Option, //TODO: is CDATA in the DTD, so maybe no nametoken? - /// External reference to a URI/URL - refuri: Option, - /// References to ids attributes in other elements - refid: Option, - /// Internal reference to the names attribute of another element - refname: Vec, + name: Option, //TODO: is CDATA in the DTD, so maybe no nametoken? + /// External reference to a URI/URL + refuri: Option, + /// References to ids attributes in other elements + refid: Option, + /// Internal reference to the names attribute of another element + refname: Vec, }); impl_extra!(FootnoteReference { refid: Option, refname: Vec, auto: bool }); impl_extra!(CitationReference { refid: Option, refname: Vec }); @@ -96,25 +94,27 @@ impl_extra!(Problematic { refid: Option }); //also have non-inline versions. Inline image is no figure child, inline target has content impl_extra!(TargetInline { - /// External reference to a URI/URL - refuri: Option, - /// References to ids attributes in other elements - refid: Option, - /// Internal reference to the names attribute of another element. May resolve to either an internal or external reference. - refname: Vec, - anonymous: bool, + /// External reference to a URI/URL + refuri: Option, + /// References to ids attributes in other elements + refid: Option, + /// Internal reference to the names attribute of another element. May resolve to either an internal or external reference. + refname: Vec, + anonymous: bool, }); impl_extra!(RawInline { space: FixedSpace, format: Vec }); pub type ImageInline = Image; impl Image { - pub fn new(uri: Url) -> Image { Image { - uri, - align: None, - alt: None, - height: None, - width: None, - scale: None, - target: None, - } } + pub fn new(uri: Url) -> Image { + Image { + uri, + align: None, + alt: None, + height: None, + width: None, + scale: None, + target: None, + } + } } -- cgit v1.2.3