aboutsummaryrefslogtreecommitdiffstats
path: root/src/document_tree
diff options
context:
space:
mode:
Diffstat (limited to 'src/document_tree')
-rw-r--r--src/document_tree/attribute_types.rs4
-rw-r--r--src/document_tree/extra_attributes.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/document_tree/attribute_types.rs b/src/document_tree/attribute_types.rs
index 1f3c466..9ad66be 100644
--- a/src/document_tree/attribute_types.rs
+++ b/src/document_tree/attribute_types.rs
@@ -16,8 +16,8 @@ impl Default for FixedSpace { fn default() -> FixedSpace { FixedSpace::Preserve
#[derive(Debug,Serialize)] pub enum AlignH { Left, Center, Right}
#[derive(Debug,Serialize)] pub enum AlignHV { Top, Middle, Bottom, Left, Center, Right }
-#[derive(Debug,Serialize)] pub struct ID(String);
-#[derive(Debug,Serialize)] pub struct NameToken(String);
+#[derive(Debug,Serialize)] pub struct ID(pub String);
+#[derive(Debug,Serialize)] pub struct NameToken(pub String);
#[derive(Debug,Serialize)]
pub enum Measure {
diff --git a/src/document_tree/extra_attributes.rs b/src/document_tree/extra_attributes.rs
index 9cd097d..80fe045 100644
--- a/src/document_tree/extra_attributes.rs
+++ b/src/document_tree/extra_attributes.rs
@@ -54,7 +54,7 @@ impl_extra!(LiteralBlock { space: FixedSpace });
impl_extra!(DoctestBlock { space: FixedSpace });
impl_extra!(SubstitutionDefinition { ltrim: Option<bool>, rtrim: Option<bool> });
impl_extra!(Comment { space: FixedSpace });
-impl_extra!(Target { refuri: Option<Url>, refid: Option<ID>, refname: Vec<NameToken>, anonymous: Option<bool> });
+impl_extra!(Target { refuri: Option<Url>, refid: Option<ID>, refname: Vec<NameToken>, anonymous: bool });
impl_extra!(Raw { space: FixedSpace, format: Vec<NameToken> });
impl_extra!(#[derive(Debug)] Image {
align: Option<AlignHV>,
@@ -85,7 +85,7 @@ impl_extra!(SubstitutionReference { refname: Vec<NameToken> });
impl_extra!(Problematic { refid: Option<ID> });
//also have non-inline versions. Inline image is no figure child, inline target has content
-impl_extra!(TargetInline { refuri: Option<Url>, refid: Option<ID>, refname: Vec<NameToken>, anonymous: Option<bool> });
+impl_extra!(TargetInline { refuri: Option<Url>, refid: Option<ID>, refname: Vec<NameToken>, anonymous: bool });
impl_extra!(RawInline { space: FixedSpace, format: Vec<NameToken> });
impl_extra!(#[derive(Debug)] ImageInline {
align: Option<AlignHV>,