date:[] macro: #371

Author: opoudjis

lib/metanorma/standoc/converter.rb

@@ -26,6 +26,7 @@ class Converter
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
+        inline_macro Metanorma::Standoc::DateInlineMacro
         inline_macro Metanorma::Standoc::SpanInlineMacro
         inline_macro Metanorma::Standoc::AltTermInlineMacro
         inline_macro Metanorma::Standoc::AdmittedTermInlineMacro

lib/metanorma/standoc/isodoc.rng

@@ -1012,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1053,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

lib/metanorma/standoc/macros_inline.rb

@@ -27,7 +27,7 @@ def preprocess_attrs(attrs)
 
       def process(_parent, target, attr)
         args = preprocess_attrs(attr) or return
-        ret = "<index-xref also='#{target == 'also'}'>"\
+        ret = "<index-xref also='#{target == 'also'}'>" \
               "<primary>#{args[:primary]}</primary>"
         ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]
         ret += "<tertiary>#{args[:tertiary]}</tertiary>" if args[:tertiary]
@@ -69,7 +69,7 @@ def process(_parent, target, attributes)
           rpend = attributes["rpend"]
         end
 
-        "<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt>"\
+        "<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt>" \
           "<rp>#{rpend}</rp></ruby>"
       end
     end
@@ -101,6 +101,18 @@ def process(parent, target, attrs)
       end
     end
 
+    class DateInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :date
+      using_format :short
+
+      def process(_parent, _target, attrs)
+        format = "%F"
+        attrs.size >= 2 and format = attrs[2]
+        %{<date format='#{format}' value='#{attrs[1]}'/>}
+      end
+    end
+
     class AddMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :add

spec/metanorma/macros_spec.rb

@@ -14,6 +14,8 @@
       add:[a <<clause>>] del:[B]
       identifier:[a http://example.com]
       span:category[text]
+      date:[2012-03-04,%a-%b%s]
+      date:[2012-03-04]
 
       [bibliography]
       == Bibliography
@@ -40,6 +42,8 @@
                     <del>B</del>
                     <identifier>a http://example.com</identifier>
                     <span class='category'>text</span>
+                    <date format="%a-%b%s" value="2012-03-04"/>
+                    <date format="%F" value="2012-03-04"/>
         </foreword>
       </preface>
       <sections> </sections>