coradoc 1.1.5 → 1.1.7

data/lib/coradoc/element/base.rb

@@ -39,18 +39,30 @@ module Coradoc
 
       def self.declare_children(*children)
         @children = (@children || []).dup + children
+        access_children
+      end
+
+      # Make each child available for access
+      def self.access_children
+        @children.each do |child|
+          attr_accessor child
+        end
       end
 
       def self.visit(element, &block)
+        return element if element.nil?
+
         element = yield element, :pre
         element = if element.respond_to? :visit
                     element.visit(&block)
                   elsif element.is_a? Array
                     element.map { |child| visit(child, &block) }.flatten.compact
                   elsif element.is_a? Hash
-                    element.to_h do |k, v|
-                      [visit(k, &block), visit(v, &block)]
+                    result = {}
+                    element.each do |k, v|
+                      result[k] = visit(v, &block)
                     end
+                    result
                   else
                     element
                   end

data/lib/coradoc/element/bibliography.rb

@@ -7,7 +7,7 @@ module Coradoc
         @id = options.fetch(:id, nil)
         @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
         @title = options.fetch(:title, nil)
-        @entries = options.fetch(:entries,nil)
+        @entries = options.fetch(:entries, nil)
       end
 
       def to_adoc

data/lib/coradoc/element/bibliography_entry.rb

@@ -15,7 +15,7 @@ module Coradoc
         adoc = "* [[[#{@anchor_name}"
         adoc << ",#{@document_id}" if @document_id
         adoc << "]]]"
-        adoc << "#{text}" if @ref_text
+        adoc << text.to_s if @ref_text
         adoc << @line_break
         adoc
       end

data/lib/coradoc/element/block/open.rb

@@ -19,4 +19,4 @@ module Coradoc
       end
     end
   end
-end
+end

data/lib/coradoc/element/block.rb

@@ -14,4 +14,4 @@ require_relative "block/pass"
 require_relative "block/quote"
 require_relative "block/side"
 require_relative "block/sourcecode"
-require_relative "block/reviewer_comment"
+require_relative "block/reviewer_comment"

data/lib/coradoc/element/document_attributes.rb

@@ -12,13 +12,19 @@ module Coradoc
 
       def to_hash
         @data.to_h do |attribute|
-          [attribute.key.to_s, attribute.value.to_s.gsub("'", "")]
+          [attribute.key, attribute.value]
         end
       end
 
       def to_adoc
         to_hash.map do |key, value|
-          v = value.to_s.empty? ? "" : " #{value}"
+          v = if value.to_s.empty?
+                ""
+              elsif value.is_a? Array
+                " #{value.join(',')}"
+              else
+                " #{value}"
+              end
           ":#{key}:#{v}\n"
         end.join + "\n"
       end

data/lib/coradoc/element/image/block_image.rb

@@ -12,7 +12,8 @@ module Coradoc
           anchor = @anchor.nil? ? "" : "#{@anchor.to_adoc}\n"
           title = ".#{@title}\n" unless @title.to_s.empty?
           attrs = @attributes.to_adoc
-          [missing, anchor, title, "image", @colons, @src, attrs, @line_break].join("")
+          [missing, anchor, title, "image", @colons, @src, attrs,
+           @line_break].join("")
         end
 
         def validate_named
@@ -24,7 +25,7 @@ module Coradoc
           caption: String,
           align: one("left", "center", "right"),
           float: one("left", "right"),
-        }
+        }.freeze
       end
     end
   end

data/lib/coradoc/element/image/core.rb

@@ -13,7 +13,7 @@ module Coradoc
           @src = src
           @attributes = options.fetch(:attributes, AttributeList.new)
           @annotate_missing = options.fetch(:annotate_missing, nil)
-          @title = options.fetch(:title, nil) unless @title
+          @title ||= options.fetch(:title, nil)
           if @attributes.any?
             @attributes.validate_positional(VALIDATORS_POSITIONAL)
             @attributes.validate_named(VALIDATORS_NAMED)
@@ -26,7 +26,8 @@ module Coradoc
           anchor = @anchor.nil? ? "" : "#{@anchor.to_adoc}\n"
           title = ".#{@title}\n" unless @title.to_s.empty?
           attrs = @attributes_macro.to_adoc
-          [missing, anchor, title, "image", @colons, @src, attrs, @line_break].join("")
+          [missing, anchor, title, "image", @colons, @src, attrs,
+           @line_break].join("")
         end
 
         extend AttributeList::Matchers
@@ -34,7 +35,7 @@ module Coradoc
           [:alt, String],
           [:width, Integer],
           [:height, Integer],
-        ]
+        ].freeze
 
         VALIDATORS_NAMED = {
           id: String,
@@ -50,7 +51,7 @@ module Coradoc
           pdfwidth: /\A[0-9]+vw\z/,
           role: many(/.*/, "left", "right", "th", "thumb", "related", "rel"),
           opts: many("nofollow", "noopener", "inline", "interactive"),
-        }
+        }.freeze
       end
     end
   end

data/lib/coradoc/element/inline/attribute_reference.rb

@@ -0,0 +1,19 @@
+module Coradoc
+  module Element
+    module Inline
+      class AttributeReference < Base
+        attr_accessor :name
+
+        declare_children :name
+
+        def initialize(name)
+          @name = name
+        end
+
+        def to_adoc
+          "{#{@name}}"
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/inline/cross_reference.rb

@@ -15,8 +15,9 @@ module Coradoc
 
         def to_adoc
           if @args
-            args = @args.map{|a|
-              Coradoc::Generator.gen_adoc(a)}.join(',')
+            args = @args.map do |a|
+              Coradoc::Generator.gen_adoc(a)
+            end.join(",")
             if args.empty?
               return "<<#{@href}>>"
             else
@@ -37,7 +38,7 @@ module Coradoc
         end
 
         def to_adoc
-          [@key,@delimiter,@value].join
+          [@key, @delimiter, @value].join
         end
       end
     end

data/lib/coradoc/element/inline/footnote.rb

@@ -0,0 +1,24 @@
+module Coradoc
+  module Element
+    module Inline
+      class Footnote < Base
+        attr_accessor :text, :id
+
+        declare_children :text, :id
+
+        def initialize(text, id = nil)
+          @text = text
+          @id = id
+        end
+
+        def to_adoc
+          if @id
+            "footnote:#{@id}[#{@text}]"
+          else
+            "footnote:[#{@text}]"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/inline/small.rb

@@ -0,0 +1,19 @@
+module Coradoc
+  module Element
+    module Inline
+      class Small < Base
+        attr_accessor :text
+
+        declare_children :text
+
+        def initialize(text, _options = {})
+          @text = text
+        end
+
+        def to_adoc
+          "[.small]##{@text}#"
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/inline/span.rb

@@ -0,0 +1,37 @@
+module Coradoc
+  module Element
+    module Inline
+      class Span < Base
+        attr_accessor :text, :role, :attributes, :unconstrained
+
+        declare_children :text, :attributes
+
+        def initialize(text, options = {})
+          @text = text
+          @role = options.fetch(:role, nil)
+          @attributes = options.fetch(:attributes, nil)
+          @unconstrained = options.fetch(:unconstrained, false)
+        end
+
+        def to_adoc
+          if @attributes
+            attr_string = @attributes.to_adoc
+            if @unconstrained
+              "#{attr_string}###{@text}##"
+            else
+              "#{attr_string}##{@text}#"
+            end
+          elsif @role
+            if @unconstrained
+              "[.#{@role}]###{@text}##"
+            else
+              "[.#{@role}]##{@text}#"
+            end
+          else
+            @text.to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/inline/underline.rb

@@ -0,0 +1,19 @@
+module Coradoc
+  module Element
+    module Inline
+      class Underline < Base
+        attr_accessor :text
+
+        declare_children :text
+
+        def initialize(text, _options = {})
+          @text = text
+        end
+
+        def to_adoc
+          "[.underline]##{@text}#"
+        end
+      end
+    end
+  end
+end

data/lib/coradoc/element/inline.rb

@@ -6,14 +6,18 @@ module Coradoc
 end
 
 require_relative "inline/anchor"
+require_relative "inline/attribute_reference"
 require_relative "inline/bold"
 require_relative "inline/cross_reference"
-require_relative "inline/citation"
 require_relative "inline/hard_line_break"
 require_relative "inline/highlight"
 require_relative "inline/italic"
 require_relative "inline/link"
 require_relative "inline/monospace"
 require_relative "inline/quotation"
+require_relative "inline/span"
 require_relative "inline/subscript"
 require_relative "inline/superscript"
+require_relative "inline/footnote"
+require_relative "inline/underline"
+require_relative "inline/small"

data/lib/coradoc/element/list/core.rb

@@ -16,10 +16,10 @@ module Coradoc
           @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
           @ol_count = options.fetch(:ol_count, nil)
           if @ol_count.nil?
-            m = @items.select do |i|
+            m = @items.find do |i|
               i.is_a?(Coradoc::Element::ListItem) &&
                 !i.marker.nil?
-            end.first&.marker.to_s
+            end&.marker.to_s
             @ol_count = m.size
           end
           @ol_count = 1 if @ol_count.nil?

data/lib/coradoc/element/list/ordered.rb

@@ -8,6 +8,7 @@ module Coradoc
 
         def prefix
           return @marker if @marker
+
           "." * [@ol_count, 1].max
         end
       end

data/lib/coradoc/element/list/unordered.rb

@@ -8,6 +8,7 @@ module Coradoc
 
         def prefix
           return @marker if @marker
+
           "*" * [@ol_count, 1].max
         end
       end

data/lib/coradoc/element/list_item.rb

@@ -10,6 +10,7 @@ module Coradoc
         @id = options.fetch(:id, nil)
         @anchor = @id.nil? ? nil : Inline::Anchor.new(@id)
         @content = content
+        # @content = [@content] unless @content.class == Array
         @attached = options.fetch(:attached, [])
         @nested = options.fetch(:nested, nil)
         @line_break = options.fetch(:line_break, "\n")
@@ -19,7 +20,7 @@ module Coradoc
         case elem
         when Inline::HardLineBreak
           :hardbreak
-        when ->(i){ i.class.name.to_s.include? "::Inline::" }
+        when ->(i) { i.class.name.to_s.include? "::Inline::" }
           true
         when String, TextElement, Image::InlineImage
           true
@@ -29,8 +30,8 @@ module Coradoc
       end
 
       def to_adoc
-        anchor = @anchor.nil? ? "" : " #{@anchor.to_adoc.to_s} "
-        # text = Coradoc::Generator.gen_adoc(@content)
+        anchor = @anchor.nil? ? "" : " #{@anchor.to_adoc} "
+
         content = Array(@content).flatten.compact
         out = ""
         prev_inline = :init
@@ -42,9 +43,8 @@ module Coradoc
 
         content.each_with_index do |subitem, idx|
           subcontent = Coradoc::Generator.gen_adoc(subitem)
-
           inline = inline?(subitem)
-          next_inline = idx+1 == content.length ? :end : inline?(content[idx+1])
+          next_inline = idx + 1 == content.length ? :end : inline?(content[idx + 1])
 
           # Only try to postprocess elements that are text,
           # otherwise we could strip markup.
@@ -59,20 +59,20 @@ module Coradoc
 
           case inline
           when true
-            if prev_inline == false
-              out += "\n+\n" + subcontent
-            else
-              out += subcontent
-            end
+            out += if prev_inline == false
+                     "\n+\n#{subcontent}"
+                   else
+                     subcontent
+                   end
           when false
-            case prev_inline
-            when :hardbreak
-              out += subcontent.strip
-            when :init
-              out += "{empty}\n+\n" + subcontent.strip
-            else
-              out += "\n+\n" + subcontent.strip
-            end
+            out += case prev_inline
+                   when :hardbreak
+                     subcontent.strip
+                   when :init
+                     "{empty}\n+\n#{subcontent.to_s.strip}"
+                   else
+                     "\n+\n#{subcontent.to_s.strip}"
+                   end
           when :hardbreak
             if %i[hardbreak init].include? prev_inline
               # can't have two hard breaks in a row; can't start with a hard break
@@ -86,9 +86,8 @@ module Coradoc
         out += "{empty}" if prev_inline == :hardbreak
         out = "{empty}" if out.empty?
 
-        # attach = Coradoc::Generator.gen_adoc(@attached)
         attach = @attached.map do |elem|
-          "+\n" + Coradoc::Generator.gen_adoc(elem)
+          "+\n#{Coradoc::Generator.gen_adoc(elem)}"
         end.join
         nest = Coradoc::Generator.gen_adoc(@nested)
         out = " #{anchor}#{out}#{@line_break}"

data/lib/coradoc/element/table.rb

@@ -37,12 +37,14 @@ module Coradoc
         end
 
         def asciidoc?
-          @columns.any?(&:asciidoc?)
+          @columns.any? { |c| c.respond_to?(:asciidoc?) && c.asciidoc? }
         end
 
         def to_adoc
           delim = asciidoc? ? "\n" : " "
-          content = @columns.map { |col| Coradoc::Generator.gen_adoc(col) }.join(delim)
+          content = @columns.map do |col|
+            Coradoc::Generator.gen_adoc(col)
+          end.join(delim)
           result  = "#{content}\n"
           result << "\n" if asciidoc?
           table_header_row? ? result + underline_for : result

data/lib/coradoc/element/term.rb

@@ -14,6 +14,7 @@ module Coradoc
 
       def to_adoc
         return "#{@type}:[#{@term}]#{@line_break}" if @lang == :en
+
         "[#{@type}]##{@term}##{@line_break}"
       end
     end

data/lib/coradoc/element/text_element.rb

@@ -25,7 +25,10 @@ module Coradoc
       end
 
       def to_adoc
-        Coradoc::Generator.gen_adoc(@content) + @line_break
+        str = ""
+        str += "[[#{@id}]] " if @id
+        str += Coradoc::Generator.gen_adoc(@content) + @line_break.to_s
+        str
       end
 
       def treat_text_to_adoc(text)

data/lib/coradoc/element/title.rb

@@ -24,7 +24,7 @@ module Coradoc
         content = Coradoc.strip_unicode(Coradoc::Generator.gen_adoc(@content))
         <<~HERE
 
-        #{anchor}#{style_str}#{level_str} #{content}
+          #{anchor}#{style_str}#{level_str} #{content}
         HERE
       end
 

data/lib/coradoc/element/video.rb

@@ -29,7 +29,7 @@ module Coradoc
         [:alt, String],
         [:width, Integer],
         [:height, Integer],
-      ]
+      ].freeze
 
       VALIDATORS_NAMED = {
         title: String,
@@ -44,7 +44,7 @@ module Coradoc
         playlist: String,
         options: many("autoplay", "loop", "modest",
                       "nocontrols", "nofullscreen", "muted"),
-      }
+      }.freeze
     end
   end
 end

data/lib/coradoc/input/adoc.rb

@@ -1,28 +1,30 @@
 require "coradoc/input"
 
 module Coradoc
-  module Input::Adoc
-    def self.processor_id
-      :adoc
-    end
+  module Input
+    module Adoc
+      def self.processor_id
+        :adoc
+      end
 
-    def self.processor_match?(filename)
-      %w[.adoc].any? { |i| filename.downcase.end_with?(i) }
-    end
+      def self.processor_match?(filename)
+        %w[.adoc].any? { |i| filename.downcase.end_with?(i) }
+      end
 
-    def self.processor_execute(input, _options = {})
-      ast = Coradoc::Parser::Base.new.parse(input)
-      Coradoc::Transformer.transform(ast[:document])
-    end
+      def self.processor_execute(input, _options = {})
+        ast = Coradoc::Parser::Base.new.parse(input)
+        Coradoc::Transformer.transform(ast[:document])
+      end
 
-    def self.processor_postprocess(input, options)
-      if options[:output_processor] == :adoc
-        Coradoc::Input::HTML::Cleaner.new.tidy(input)
-      else
-        input
+      def self.processor_postprocess(input, options)
+        if options[:output_processor] == :adoc
+          Coradoc::Input::Html::Cleaner.new.tidy(input)
+        else
+          input
+        end
       end
-    end
 
-    Coradoc::Input.define(self)
+      Coradoc::Input.define(self)
+    end
   end
 end

data/lib/coradoc/input/docx.rb

@@ -3,33 +3,35 @@ require "coradoc/input/html"
 require "fileutils"
 
 module Coradoc
-  module Input::Docx
-    def self.processor_id
-      :docx
-    end
+  module Input
+    module Docx
+      def self.processor_id
+        :docx
+      end
 
-    def self.processor_match?(filename)
-      %w[.docx .doc].any? { |i| filename.downcase.end_with?(i) }
-    end
+      def self.processor_match?(filename)
+        %w[.docx .doc].any? { |i| filename.downcase.end_with?(i) }
+      end
 
-    def self.processor_execute(input, options = {})
-      image_dir = Dir.mktmpdir
-      options = options.merge(sourcedir: image_dir)
-      doc = WordToMarkdown.new(input, image_dir)
-      doc = Coradoc::Input::HTML.cleaner.preprocess_word_html(doc.document.html)
-      options = WordToMarkdown::REVERSE_MARKDOWN_OPTIONS.merge(options)
-      Coradoc::Input::HTML.to_coradoc(doc, options)
-    ensure
-      FileUtils.rm_rf(image_dir)
-    end
+      def self.processor_execute(input, options = {})
+        image_dir = Dir.mktmpdir
+        options = options.merge(sourcedir: image_dir)
+        doc = WordToMarkdown.new(input, image_dir)
+        doc = Coradoc::Input::Html.cleaner.preprocess_word_html(doc.document.html)
+        options = WordToMarkdown::REVERSE_MARKDOWN_OPTIONS.merge(options)
+        Coradoc::Input::Html.to_coradoc(doc, options)
+      ensure
+        FileUtils.rm_rf(image_dir)
+      end
 
-    def self.processor_postprocess(data, options)
-      Coradoc::Input::HTML.processor_postprocess(data, options)
-    end
+      def self.processor_postprocess(data, options)
+        Coradoc::Input::Html.processor_postprocess(data, options)
+      end
 
-    # This processor prefers to work on original files.
-    def self.processor_wants_filenames; true; end
+      # This processor prefers to work on original files.
+      def self.processor_wants_filenames; true; end
 
-    Coradoc::Input.define(self)
+      Coradoc::Input.define(self)
+    end
   end
 end

data/lib/coradoc/input/html/README.adoc

@@ -293,7 +293,7 @@ end
 require 'coradoc/input/html'
 
 # Options can be supplied as keyword arguments
-Coradoc::Input::HTML::HtmlConverter.to_coradoc("<b><i>Some input</i></b>")
+Coradoc::Input::Html::HtmlConverter.to_coradoc("<b><i>Some input</i></b>")
 ----