notroff 0.3.0 → 0.3.1

data/lib/notroff/#filter.rb#

@@ -0,0 +1,27 @@
+class Filter
+  def process(paragraphs)
+    paragraphs.find_all {|p| included?(p)}
+  end
+
+  def included?(paragraph)
+    true
+  end
+end
+
+class IncludedFilter < Filter
+  def included?(paragraph)
+    paragraph[:included]
+  end
+end
+
+class RegularExpressionExcludeFilter
+ < Filter
+  def initialize(exclude_re)
+    @exclude_re = exclude_re
+  end
+
+  def included?(paragraph)
+    @exclude_re !~ paragraph    
+  end
+  
+end

data/lib/notroff/filter.rb

@@ -13,3 +13,14 @@ class IncludedFilter < Filter
     paragraph[:included]
   end
 end
+
+class RegularExpressionExcludeFilter < Filter
+  def initialize(exclude_re)
+    @exclude_re = exclude_re
+  end
+
+  def included?(paragraph)
+    @exclude_re !~ paragraph    
+  end
+  
+end

data/lib/notroff/formatter.rb

@@ -36,7 +36,9 @@ end
 class OdtFormatter < Formatter
   def initialize(input, output)
     super()
+    prepend_processor RegularExpressionExcludeFilter.new(/^--.*$/)
     prepend_processor FileReader.new(input)
+
     add_processor BodyTypeRefiner.new
     add_processor CodeTypeRefiner.new
     add_processor CodeTypeRefiner.new(:listing, :first_listing, :middle_listing, :end_listing)

data/lib/notroff/odt_renderer.rb

@@ -41,7 +41,7 @@ class OdtRenderer < Processor
       new_element = format( paragraph )
       elements << new_element if new_element
     end
-    elements
+    {:body => elements}
   end
 
   def format( para )

data/lib/notroff/template_expander.rb

@@ -9,17 +9,23 @@ class TemplateExpander < Processor
   def initialize
   end
 
-  def process( elements )
-    puts "reading file: #{TEMPLATE}"
+  def process( content_map )
     doc = REXML::Document.new(File.new(TEMPLATE))
+    insert_body(doc, content_map[:body])
+    doc.to_s
+  end
+   
+  def insert_body(doc, body_elements)
+    puts "reading file: #{TEMPLATE}"
+
     text_element = REXML::XPath.first(doc, PATH)
     n = text_element.elements.size
     puts "deleting #{n} elements"
     n.times {|i| text_element.delete_element(1)}
-    puts "ELs: #{elements.size}"
-    puts "ELs: #{elements}"
-    elements.each {|el| text_element.add_element(el)}
-    puts "OUtput: #{doc.to_s}"
-    doc.to_s
+    puts "ELs: #{body_elements.size}"
+    puts "ELs: #{body_elements}"
+    body_elements.each {|el| text_element.add_element(el)}
+
+    doc
   end
 end

data/lib/yesroff/odt_parser.rb

@@ -44,7 +44,7 @@ class OdtParser
     ParagraphStyle.new('HA', nil, :title, true),
     ParagraphStyle.new('HB', nil, :subtitle, true),
     ParagraphStyle.new('HC', nil, :sec, true),
-    ParagraphStyle.new('HD', nil, :subsec, true),
+    ParagraphStyle.new('TH', nil, :theading, true),
     ParagraphStyle.new('LH', nil, :ltitle, true),
     ParagraphStyle.new('LC', nil, :listing, false),
     ParagraphStyle.new('LC2', nil, :listing, false),
@@ -53,6 +53,7 @@ class OdtParser
     ParagraphStyle.new('BL1', nil, :bullet, true),
     ParagraphStyle.new('BL', nil, :bullet, true),
     ParagraphStyle.new('BX', nil, :bullet, true),
+    ParagraphStyle.new('BLPara', nil, :bullet, true),
     ParagraphStyle.new('Quotation_20_Attribution', nil, :attribution, true),
     ParagraphStyle.new('CDTX', nil, :code, false)
     ]
@@ -92,7 +93,7 @@ class OdtParser
     styles.each do |s|
       attrs = s.attributes
       style = ParagraphStyle.new(attrs['style:name'])
-      style.parent = lookup_para_style(attrs['parent-style-name'])
+      style.parent = find_or_create_para_style(attrs['parent-style-name'])
       @para_styles[style.name] = style
     end
   end
@@ -112,6 +113,17 @@ class OdtParser
     s
   end
 
+  def find_or_create_para_style(name)
+#    return lookup_para_style(name)
+    s = @para_styles[name]
+    unless s
+      STDERR.puts "Warning: no paragraph style named #{name}"
+      s = ParagraphStyle.new(name, nil, :body, false)
+      @para_styles[s.name] = s
+      s
+    end
+  end
+
   def lookup_text_style(name)
     name = "Default" if name.nil? or name.empty?
     s = @text_styles[name]
@@ -119,11 +131,21 @@ class OdtParser
     s
   end
 
+  def find_or_create_text_style(name)
+    s = @text_styles[name]
+    unless s
+      STDERR.puts "Warning: no character style named #{name}"
+      s = TextStyle.new(name)
+      @text_styles[s.name] = s
+    end
+    s
+  end
+
   def parse_paragraph(p)
     attrs = p.attributes
 #    puts "Parsing paragraph, attrs #{attrs}"
 #    puts "==> style-name: [[#{attrs['text:style-name']}]]"
-    style = lookup_para_style(attrs['text:style-name'])
+    style = find_or_create_para_style(attrs['text:style-name'])
 
     para = Paragraph.new(style)
     para.contents = parse_contents(para, p)
@@ -132,7 +154,7 @@ class OdtParser
 
   def parse_span(el)
     attrs = el.attributes
-    style = lookup_text_style(attrs['text:style-name'])
+    style = find_or_create_text_style(attrs['text:style-name'])
     indent = attrs['text:c'] ? attrs['text:c'].to_i : 0
     span = Span.new(style)
     span.indent = indent

data/lib/yesroff/text.rb

@@ -87,7 +87,7 @@ end
 
 class Paragraph < Container
   def render(w)
-    style.render(w)
+    style.render(w) if style
     super(w)
     w.end_paragraph
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notroff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -33,6 +33,7 @@ files:
 - spec/text_spec.rb
 - spec/type_assigner_spec.rb
 - spec/with_commands.nr
+- lib/notroff/#filter.rb#
 - lib/notroff/#io.rb#
 - lib/notroff/code_scrubber.rb
 - lib/notroff/command_processor.rb