erbook 7.1.1 → 7.3.0

data/lib/erbook/document.rb

@@ -75,29 +75,27 @@ module ERBook
             :@stack         => [], # stack for all nodes
           }.each_pair {|k,v| sandbox.instance_variable_set(k, v) }
 
+          #:stopdoc:
+
           ##
           # Handles the method call from a node
           # placeholder in the input document.
           #
           def sandbox.__node_impl__ node_type, *node_args, &node_content
             node = Node.new(
-              :type => node_type,
-              :defn => @format['nodes'][node_type],
-              :args => node_args,
-              :children => [],
-
-              # omit erbook internals from the stack trace
-              :trace => caller.reject {|t|
-                [$0, ERBook::INSTALL].any? {|f| t.index(f) == 0 }
-              }
+              :type     => node_type,
+              :defn     => @format['nodes'][node_type],
+              :args     => node_args,
+              :trace    => caller,
+              :children => []
             )
             @nodes << node
             @nodes_by_type[node.type] << node
 
             # calculate occurrence number for this node
             if node.defn['number']
-              @count ||= Hash.new {|h,k| h[k] = []}
-              node.number = (@count[node.type] << node).length
+              @count_by_type ||= Hash.new {|h,k| h[k] = 0 }
+              node.number = (@count_by_type[node.type] += 1)
             end
 
             # assign node family
@@ -138,6 +136,8 @@ module ERBook
             nil
           end
 
+          #:startdoc:
+
           @node_defs.each_key do |type|
             # XXX: using a string because define_method()
             #      does not accept a block until Ruby 1.9

data/lib/erbook/rdoc.rb

@@ -142,14 +142,19 @@ module RDoc
   class DummyOptions #:nodoc:
     include DummyMixin
 
-    def quiet # supress '...c..m...' output on STDERR
+    # supress '...c..m...' output on STDERR
+    def quiet
       true
     end
   end
 
   class DummyMarkup #:nodoc:
-    require 'rdoc/generators/html_generator'
-    include Generators::MarkUp
-    include DummyMixin
+    require 'rdoc/generator/markup'
+    include Generator::Markup
+
+    def formatter
+      require 'rdoc/markup/to_html'
+      Markup::ToHtml.new
+    end
   end
 end

data/lib/erbook/to_xhtml.rb

@@ -69,6 +69,11 @@ class String
       while html.gsub! %r{(<pre>)<code>(.*?)</code>(</pre>)}m, '\1\2\3'
       end
 
+      # allow "code spans" annotated with Maruku's IAL (Inline
+      # Attribute List) Markdown extension to be syntax colored
+      while html.gsub! %r{<pre[^>]+>(<code[^>]+>.*?</code>)</pre>}m, '\1'
+      end
+
       # allow user to type <pre> blocks on single lines
       # without affecting the display of their content
       html.gsub! %r{(<pre>)[ \t]*\r?\n|\r?\n[ \t]*(</pre>)}, '\1\2'

data/lib/erbook.rb

@@ -9,15 +9,14 @@ require 'inochi'
 
 Inochi.init :ERBook,
   :program => 'erbook',
-  :version => '7.1.1',
-  :release => '2009-09-06',
+  :version => '7.3.0',
+  :release => '2009-10-09',
   :website => 'http://snk.tuxfamily.org/lib/erbook/',
   :tagline => 'Write books, manuals, and documents in eRuby',
   :require => {
     'ember'      => '~> 0',     # for eRuby template processing
     'maruku'     => '~> 0.5',   # for Markdown to XHTML conversion
     'coderay'    => '>= 0.8',   # for syntax coloring of source code
-    'rainpress'  => '~> 1',     # for minifying CSS
     'haml'       => '>= 2.2.2', # for generating HTML and CSS
     'mime-types' => '>= 1.16',  # for detecting MIME types
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erbook
 version: !ruby/object:Gem::Version 
-  version: 7.1.1
+  version: 7.3.0
 platform: ruby
 authors: 
 - Suraj N. Kurapati
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 -07:00
+date: 2009-10-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,44 +33,34 @@ dependencies:
         version: "0.5"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: coderay
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: "0.8"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: haml
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.16"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rainpress
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
+        version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: coderay
+  name: mime-types
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: "1.16"
     version: 
 - !ruby/object:Gem::Dependency 
   name: inochi
@@ -92,9 +82,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1"
     version: 
-description: "                           ERBook 7.1.1\n\n           Write books, manuals, and documents in eRuby\n\n               http://snk.tuxfamily.org/lib/erbook/\n\n   ERBook is an extensible document processor that emits [1]any\n   document you can imagine from [2]eRuby templates, which allow\n   scripting and dynamic content generation.\n\n\
-  Version 7.1.1 (2009-09-06)\n\n   This release improves support for Microsoft, Opera, and\n   Webkit web browsers in the XHTML format, revises the code and\n   documentation, and fixes some bugs.\n\n     * [3]Bug fixes\n\n     * [4]Housekeeping\n\n   Bug fixes\n\n     * Restore support for Microsoft web browsers by removing\n       the optimization of storing image data URIs in XML\n       entities. See [5]Serve XHTML as HTML for Microsoft web\n       browsers for the consequences of this change.\n\n     * The screen did not scroll during reveal_hash() in Webkit\n       browsers.\n\n     * The prevent_jump option of set_hash() did not work for\n       Opera and Microsoft browsers.\n\n     * Use text descriptions instead of graphical symbols in the\n       ALT fields of navigation menu images.\n\n     * The Abstract was not in the prev/next navigation chain.\n\n   Housekeeping\n\n     * Open source is for fun, so [6]be nice: speak of \"related\n       works\" instead of \"competitors\".\n\n     * Fix warning about $logo and $feeds being used when not\n       defined.\n\n     * Include project website URL in \"generator\" HTML meta\n       field.\n\n     * Emit project license above JavaScript code in XHTML\n       output.\n\n     * Lots of other clean up in the documentation and the XHTML\n       format.\n\n\
-  References\n\n   1. http://snk.tuxfamily.org/lib/erbook/#HelloWorld\n   2. http://en.wikipedia.org/wiki/ERuby\n   3. http://snk.tuxfamily.org/lib/erbook/#Bug-fixes\n   4. http://snk.tuxfamily.org/lib/erbook/#Housekeeping\n   5. http://snk.tuxfamily.org/lib/erbook/#Serve-XHTML-as-HTML-for-Microsoft-web-browsers\n   6. http://loiclemeur.com/english/2009/03/never-criticize-your-competitors.html\n"
+description: "                           ERBook 7.3.0\n\n           Write books, manuals, and documents in eRuby\n\n               http://snk.tuxfamily.org/lib/erbook/\n\n   ERBook is an extensible document processor that emits [1]any\n   document you can imagine from [2]eRuby templates, which allow\n   scripting and dynamic content generation.\n\n\
+  Version 7.3.0 (2009-10-09)\n\n   This release improves the printer friendliness of the XHTML\n   format.\n\n     * [3]New features\n\n     * [4]Bug fixes\n\n     * [5]Housekeeping\n\n   New features\n\n     * Do not omit ERBook internals from node stack traces.\n\n     * Hide \"printer friendly\" toggle checkbox when printing\n       (but not when viewing the \"printer friendly\" mode on the\n       computer screen).\n\n     * Hide the \"About\" section in \"printer friendly\" mode.\n\n   Bug fixes\n\n     * Page scrolled to wrong location when links in the table\n       of contents in the \"printer friendly\" mode were clicked.\n\n     * Print style was not used when printing from \"printer\n       friendly\" mode.\n\n     * Sans-serif font was not used in headings in print style.\n\n   Housekeeping\n\n     * Use Ember syntax in [6]Input document for HelloWorld\n       format example.\n\n\
+  References\n\n   1. http://snk.tuxfamily.org/lib/erbook/#HelloWorld\n   2. http://en.wikipedia.org/wiki/ERuby\n   3. http://snk.tuxfamily.org/lib/erbook/#New-features\n   4. http://snk.tuxfamily.org/lib/erbook/#Bug-fixes\n   5. http://snk.tuxfamily.org/lib/erbook/#Housekeeping\n   6. http://snk.tuxfamily.org/lib/erbook/#HelloWorld-input\n"
 email: sunaku@gmail.com
 executables: 
 - erbook
@@ -218,7 +208,9 @@ files:
 - doc/api/i/arrows.png
 - doc/api/i/tree_bg.png
 - doc/api/i/results_bg.png
+- doc/api/apple-touch-icon.png
 - doc/api/created.rid
+- doc/api/favicon.ico
 - doc/api/index.html
 - doc/usage.erb
 - doc/history.erb