notroff 0.3.1 → 0.3.2

data/bin/notroff

@@ -3,7 +3,7 @@ require 'pp'
 require "notroff"
 
 options={}
-formatter_class = HtmlFormatter
+formatter_class = OdtFormatter
 
 while true
   if ARGV.first == '-o'

data/lib/yesroff/nr_writer.rb

@@ -3,6 +3,7 @@ class NRWriter
 
   def initialize
     @para_style = :body
+    @text_style = :normal
     @single_line = false
   end
 
@@ -19,6 +20,24 @@ class NRWriter
     @single_line = single_line
   end
 
+  def switch_text_style(new_style)
+    debug " <<switching to new style #{new_style}>>  "
+    return if @text_style == new_style
+    if @text_style != :normal
+      toggle_text_style(@text_style)
+    end
+    if new_style != :normal
+      toggle_text_style(new_style)
+    end
+    @text_style = new_style
+  end
+
+  def toggle_text_style(style)
+    toggle_bold if style == :bold
+    toggle_italic if style == :italic
+    toggle_code if style == :code    
+  end
+
   def end_paragraph
     puts
     if @single_line

data/lib/yesroff/odt_parser.rb

@@ -2,13 +2,27 @@ require 'rexml/document'
 require 'pp'
 require 'zip/zipfilesystem'
 
+DEBUG=true
+
+def log(*args)
+  $stderr.puts args.join(' ')
+end
+
+def debug(*args)
+  #return unless DEBUG
+  puts args.join(' ')
+end
+ 
 class OdtParser
+
   def initialize(odt_path)
+    log "Reading #{odt_path}..."
     Zip::ZipFile.open(odt_path ) do |zipfile|
       zipfile.file.open("content.xml") do |content|
         @doc = REXML::Document.new(content.read)
       end
     end
+    log "Done"
 
     @writer = NRWriter.new
     @paras = []
@@ -39,23 +53,44 @@ class OdtParser
     ParagraphStyle.new('FT', nil, :body, false),
     ParagraphStyle.new('IT', nil, :body, false),
     ParagraphStyle.new('Quotation', nil, :quote, true),
+
     ParagraphStyle.new('CDT1', nil, :code, false),
     ParagraphStyle.new('CDT', nil, :code, false),
+    ParagraphStyle.new('CDTX', nil, :code, false),
+    ParagraphStyle.new('C1', nil, :c1, true),
+    ParagraphStyle.new('C2', nil, :c1, true),
+    ParagraphStyle.new('TB', nil, :c1, true),
+    ParagraphStyle.new('Free_20_Form', nil, :c1, true),
+
+
+    ParagraphStyle.new('NLC1', nil, :code, false),
+    ParagraphStyle.new('NLC', nil, :code, false),
+    ParagraphStyle.new('NLCX', nil, :code, false),
+    ParagraphStyle.new('NLPara', nil, :code, false),
+
+    ParagraphStyle.new('TX', nil, :code, false),
+
     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),
     ParagraphStyle.new('LX', nil, :listing, false),
-    ParagraphStyle.new('C1', nil, :c1, true),
+
     ParagraphStyle.new('BL1', nil, :bullet, true),
     ParagraphStyle.new('BL', nil, :bullet, true),
     ParagraphStyle.new('BX', nil, :bullet, true),
+
+    ParagraphStyle.new('NL1', nil, :list, true),
+    ParagraphStyle.new('NL', nil, :list, true),
+    ParagraphStyle.new('NX', nil, :list, true),
+
     ParagraphStyle.new('BLPara', nil, :bullet, true),
-    ParagraphStyle.new('Quotation_20_Attribution', nil, :attribution, true),
-    ParagraphStyle.new('CDTX', nil, :code, false)
+    ParagraphStyle.new('Quotation_20_Attribution', nil, :attribution, true)
+
     ]
 
     hash = {}
@@ -74,6 +109,7 @@ class OdtParser
   end
 
   def parse_text_styles
+    log "Parsing text styles"
     styles = REXML::XPath.match(@doc, "//style:style[@style:family='text']")
     styles.each do |s|
       attrs = s.attributes
@@ -89,6 +125,7 @@ class OdtParser
   end
 
   def parse_paragraph_styles
+    log "Parsing paragraph styles"
     styles = REXML::XPath.match(@doc, "//style:style[@style:family='paragraph']")
     styles.each do |s|
       attrs = s.attributes
@@ -99,6 +136,7 @@ class OdtParser
   end
 
   def parse_paragraphs
+    log "Parsing paragraphs"
     results = []
     paras = REXML::XPath.match(@doc, '//text:p')
     paras.each do |p|
@@ -109,12 +147,13 @@ class OdtParser
 
   def lookup_para_style(name)
     s = @para_styles[name]
-    raise "No such para style #{name}" unless s
+    log "No such para style #{name}" unless s
+    #raise "No such para style #{name}" unless s
     s
   end
 
   def find_or_create_para_style(name)
-#    return lookup_para_style(name)
+    return lookup_para_style(name)
     s = @para_styles[name]
     unless s
       STDERR.puts "Warning: no paragraph style named #{name}"

data/lib/yesroff/text.rb

@@ -32,9 +32,17 @@ class TextStyle < Style
   end
 
   def render(w)
-    w.toggle_bold if @bold
-    w.toggle_code if @code
-    w.toggle_italic if @italic
+    puts "Rendering style #{self}"
+
+    if @bold
+      w.switch_text_style(:bold)
+    elsif @italic
+      w.switch_text_style(:italic)
+    elsif @code
+      w.switch_text_style(:code)
+    else
+      w.switch_text_style(:normal)
+    end
   end
 end
 
@@ -66,6 +74,12 @@ class Container
     @contents << content
   end
 
+  def length
+    l = 0
+    @contents.each {|kid| l += kid.length}
+    l
+  end
+
   def render(w)
     #puts "========= rendering #{self.class} size: #{contents.size}"
     #pp contents
@@ -78,6 +92,8 @@ class Span < Container
   attr_accessor :indent
 
   def render(w)
+    debug "\nrendering span #{self} length #{self.length}"
+    return if self.length == 0
     style.render(w)
     w.indent(@indent) if @indent
     super(w)
@@ -101,7 +117,14 @@ class Text
   end
 
   def render(w)
-    w.text(@text)
+    text = @text.gsub(/@@/, '\@\@')
+    text = text.gsub(/~~/, '\~\~')
+    text = text.gsub(/!!/, '\!\!')
+    w.text(text)
+  end
+
+  def length
+    @text.length
   end
 
   def to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notroff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-09-03 00:00:00.000000000Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &70333341691900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70333341691900
 description: NotRoff A simple text to openoffice filter
 email: russ@russolsen.com
 executables:
@@ -33,7 +44,6 @@ 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

data/lib/notroff/#filter.rb#

@@ -1,27 +0,0 @@
-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