Merge branch 'main' into allow-rst-to-read-from-stdin

1 files changed, 63 insertions, 63 deletions

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<A> {
-	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<Url>,
-	/// References to ids attributes in other elements
-	refid: Option<ID>,
-	/// Internal reference to the names attribute of another element. May resolve to either an internal or external reference.
-	refname: Vec<NameToken>,
-	anonymous: bool,
+    /// External reference to a URI/URL
+    refuri: Option<Url>,
+    /// References to ids attributes in other elements
+    refid: Option<ID>,
+    /// Internal reference to the names attribute of another element. May resolve to either an internal or external reference.
+    refname: Vec<NameToken>,
+    anonymous: bool,
 });
 impl_extra!(Raw { space: FixedSpace, format: Vec<NameToken> });
 impl_extra!(#[derive(Debug,PartialEq,Serialize,Clone)] Image {
-	uri: Url,
-	align: Option<AlignHV>,
-	alt: Option<String>,
-	height: Option<Measure>,
-	width: Option<Measure>,
-	scale: Option<u8>,
-	target: Option<Url>,  // Not part of the DTD but a valid argument
+    uri: Url,
+    align: Option<AlignHV>,
+    alt: Option<String>,
+    height: Option<Measure>,
+    width: Option<Measure>,
+    scale: Option<u8>,
+    target: Option<Url>,  // 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<usize>, colname: Option<NameToken>, co
 impl_extra!(OptionArgument { delimiter: Option<String> });
 
 impl_extra!(Reference {
-	name: Option<NameToken>,  //TODO: is CDATA in the DTD, so maybe no nametoken?
-	/// External reference to a URI/URL
-	refuri: Option<Url>,
-	/// References to ids attributes in other elements
-	refid: Option<ID>,
-	/// Internal reference to the names attribute of another element
-	refname: Vec<NameToken>,
+    name: Option<NameToken>,  //TODO: is CDATA in the DTD, so maybe no nametoken?
+    /// External reference to a URI/URL
+    refuri: Option<Url>,
+    /// References to ids attributes in other elements
+    refid: Option<ID>,
+    /// Internal reference to the names attribute of another element
+    refname: Vec<NameToken>,
 });
 impl_extra!(FootnoteReference { refid: Option<ID>, refname: Vec<NameToken>, auto: bool });
 impl_extra!(CitationReference { refid: Option<ID>, refname: Vec<NameToken> });
@@ -96,25 +94,27 @@ impl_extra!(Problematic { refid: Option<ID> });
 
 //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<Url>,
-	/// References to ids attributes in other elements
-	refid: Option<ID>,
-	/// Internal reference to the names attribute of another element. May resolve to either an internal or external reference.
-	refname: Vec<NameToken>,
-	anonymous: bool,
+    /// External reference to a URI/URL
+    refuri: Option<Url>,
+    /// References to ids attributes in other elements
+    refid: Option<ID>,
+    /// Internal reference to the names attribute of another element. May resolve to either an internal or external reference.
+    refname: Vec<NameToken>,
+    anonymous: bool,
 });
 impl_extra!(RawInline { space: FixedSpace, format: Vec<NameToken> });
 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,
+        }
+    }
 }