ydocx 1.0.0 → 1.0.1

data/Manifest.txt

@@ -10,3 +10,4 @@ lib/docx2html/lib/docx2html/document.rb
 lib/docx2html/lib/docx2html/html_methods.rb
 lib/docx2html/lib/docx2html/parser.rb
 lib/fachinfo.rb
+lib/version.rb

data/bin/docx2html

@@ -1,18 +1,19 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
-require 'pathname'
-
-VERSION = "1.0.0"
-
-root = Pathname.new(__FILE__).realpath.parent.parent
-%w(
-  lib/docx2html/lib
-  lib
-).each do |lib|
-  $:.unshift root.join(lib) if $0 == __FILE__
+if $0 == __FILE__
+  require 'pathname'
+  root = Pathname.new(__FILE__).realpath.parent.parent
+  %w(
+    lib/docx2html/lib
+    lib
+  ).each do |lib|
+    $:.unshift root.join(lib)
+  end
+  require 'docx2html'
+else
+  require 'docx2html/lib/docx2html'
 end
-require 'docx2html'
 
 if file = ARGV.first
   unless File.exist?(file)
@@ -22,6 +23,9 @@ if file = ARGV.first
     if true
       require 'fachinfo'
     end
-    Docx2html::Document.open(file).to_html file, :style => true
+    options = {
+      :style => :frame
+    }
+    Docx2html::Document.open(file).to_html file, options
   end
 end

data/lib/docx2html/lib/docx2html/builder.rb

@@ -2,12 +2,13 @@
 # encoding: utf-8
 
 require 'nokogiri'
-require 'docx2html/html_methods'
+require 'docx2html/lib/docx2html/html_methods'
 
 module Docx2html
   class Builder
     include HtmlMethods
-    attr_accessor :body, :indecies, :style, :title
+    attr_accessor :body, :indecies, :title,
+                  :frame, :style
     def initialize(body)
       @body = body
       @container = {}

data/lib/docx2html/lib/docx2html/document.rb

@@ -3,8 +3,8 @@
 
 require 'pathname'
 require 'zip/zip'
-require 'docx2html/parser'
-require 'docx2html/builder'
+require 'docx2html/lib/docx2html/parser'
+require 'docx2html/lib/docx2html/builder'
 
 module Docx2html
   class Document
@@ -21,7 +21,7 @@ module Docx2html
       html = ''
       Builder.new(@contents) do |builder|
         builder.title = @path
-        builder.style = options[:style]
+        builder.style = options[:style] if options.has_key?(:style)
         if @indecies
           builder.indecies = @indecies
         end

data/lib/docx2html/lib/docx2html/parser.rb

@@ -3,7 +3,7 @@
 
 require 'nokogiri'
 require 'htmlentities'
-require 'docx2html/html_methods'
+require 'docx2html/lib/docx2html/html_methods'
 
 module Docx2html
   class Parser

data/lib/docx2html/lib/docx2html.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'docx2html/document'
+require 'docx2html/lib/docx2html/document'
 
 module Docx2html
 end

data/lib/fachinfo.rb

@@ -8,7 +8,9 @@ module Docx2html
     private
     def parse_as_block(r, text)
       if r.parent.previous.nil?
-        # first line is package name
+        # The first line as package name
+        link = tag(:a, text, {:href => ''})
+        @indecies << tag(:h2, link)
         return tag(:h2, text)
       end
       text = text.strip
@@ -58,8 +60,13 @@ module Docx2html
     def build_before_content
       if @indecies
         indices = []
+        if @indecies.first.has_key?(:tag) and @indecies.first[:tag] == :h2
+          indices << @indecies.shift
+        end
         @indecies.each do |index|
-          indices << tag(:li, tag(:a, index[:text], {:href => "#" + index[:id]}))
+          if index.has_key?(:id)
+            indices << tag(:li, tag(:a, index[:text], {:href => "#" + index[:id]}))
+          end
         end
         tag(:div, tag(:ul, indices), {:id => 'indecies'})
       end
@@ -68,7 +75,7 @@ module Docx2html
       style = <<-CSS
 table, tr, td {
   border-collapse: collapse;
-  border: 1px solid gray;
+  border:          1px solid gray;
 }
 table {
   margin: 5px 0 5px 0;
@@ -78,7 +85,7 @@ td {
 }
 body {
   position: relative;
-  padding:  0 0 20px 0;
+  padding:  0 0 25px 0;
   margin:   0px;
   width:    100%;
   height:   auto;
@@ -86,26 +93,59 @@ body {
 div#indecies {
   position: relative;
   padding:  0px;
+  margin:   0px;
   float:    left;
   width:    200px;
 }
 div#indecies ul {
   margin:  0;
-  padding: 0 0 0 25px;
+  padding: 5px 0 0 25px;
 }
 div#container {
-  position:    relative;
-  padding:     0px;
-  float:       top left;
-  margin-left: 200px;
+  position: relative;
+  padding:  5px 0 0 0;
+  float:    top left;
+  margin:   0 0 0 200px;
 }
 div#footer {
-  position:      relative;
-  float:         bottom right;
-  text-align:    right;
-  padding-right: 25px;
+  position:   relative;
+  float:      bottom right;
+  text-align: right;
+  padding:    0 25px 0 0;
 }
       CSS
+      if @style == :frame
+        style << <<-FRAME
+html {
+  overflow: hidden;
+  height:   100%;
+  width:    100%;
+}
+body{
+  position: absolute;
+  overflow: hidden;
+  padding:  0;
+  height:   100%;
+  width:    100%;
+}
+div#indecies {
+  position: absolute;
+  osition:  fixed;
+  height:   100%;
+  left:     0;
+  top:      0;
+}
+div#container {
+  position: absolute;
+  padding:  0;
+  height:   100%;
+  overflow: auto;
+}
+div#footer {
+  padding: 10px 30px 0 0;
+}
+        FRAME
+      end
       style.gsub(/\s\s+|\n/, ' ')
     end
   end

data/lib/version.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Docx2html
+  VERSION = "1.0.1"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydocx
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21539280 !ruby/object:Gem::Requirement
+  requirement: &23006340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *21539280
+  version_requirements: *23006340
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21538860 !ruby/object:Gem::Requirement
+  requirement: &23005920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *21538860
+  version_requirements: *23005920
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com
@@ -56,6 +56,7 @@ files:
 - lib/docx2html/lib/docx2html/html_methods.rb
 - lib/docx2html/lib/docx2html/parser.rb
 - lib/fachinfo.rb
+- lib/version.rb
 homepage: https://github.com/zdavatz/ydocx
 licenses: []
 post_install_message: