gerbil 2.0.0 → 2.1.0

data/fmt/html.yaml

@@ -7,26 +7,6 @@ code: |
   # load the String#to_html method
   require 'gerbil/html'
 
-  # load admonition icons
-    Icon = Struct.new(:path, :name, :format, :data)
-    class Icon
-      # Returns a HTML image tag containing embedded image data.  The given
-      # attributes (name => value) are applied to the HTML tag declaration.
-      def to_html aAttributes = {}
-        atts = aAttributes.inject('') {|s,(k,v)| s << %( #{k}="#{v}") }
-        %{<img src="data:image/#{format};base64,#{data}" alt="#{name}"#{atts}/>}
-      end
-    end
-
-    ICONS = {}
-    Dir[File.join(Gerbil[:format_home], 'html.icons', '*.*')].each do |path|
-      ext = File.extname(path)
-      name = File.basename(path, ext)
-      data = [File.read(path)].pack('m')
-
-      ICONS[name] = Icon.new(path, name, ext.sub('.', ''), data)
-    end
-
   class String
     # Transforms this UTF-8 string into HTML entities.
     def to_html_entities
@@ -48,7 +28,7 @@ code: |
         if code > 0xFF or code.chr =~ /[[:alnum:]\-_:\.]/
           code
         else
-          ?\s
+          32 # ASCII character code for a single space
         end
       end.pack('U*').strip.gsub(/[[:space:]-]+/, '-')
     end
@@ -93,6 +73,54 @@ code: |
     %{<a href="#{h aUrl}"#{%{ title="#{aTitle}"} if aTitle}>#{aName}</a>}
   end
 
+  # Encodes the given input in base64 format.
+  def encode_base_64 aInput
+    [aInput].pack('m')
+  end
+
+  # Returns a HTML <img> tag that embeds the given image data.
+  #
+  # aData:: raw image image data in base64 encoding
+  # aFormat:: format of the image data (e.g. PNG, JPG, GIF, etc.)
+  # aAttrs:: additional attributes for the <img> tag
+  #
+  def embed_image_data aData, aFormat, aAttrs
+    atts = aAttrs.inject('') {|s,(k,v)| s << %( #{k}="#{v}") }
+    %{<img src="data:image/#{aFormat};base64,#{aData}"#{atts}/>}
+  end
+
+  # Returns a HTML <img> tag that embeds the given image file.
+  #
+  # aPath:: path to the image file
+  # aFormat:: format of the image data (e.g. PNG, JPG, GIF, etc.)
+  # aAttrs:: additional attributes for the <img> tag
+  #
+  def embed_image_file aPath, aFormat = aPath[/\w+$/], aAttrs = {}
+    data = encode_base_64 File.read(aPath)
+    embed_image_data data, aFormat, aAttrs
+  end
+
+  # load admonition icons
+    Icon = Struct.new(:path, :name, :format, :data)
+
+    class Icon
+      # Returns a HTML image tag containing embedded image data.  The given
+      # attributes (name => value) are applied to the HTML tag declaration.
+      def to_html aAttributes = {}
+        embed_image_data data, format, aAttributes
+      end
+    end
+
+    ICONS = {}
+
+    Dir[File.join(Gerbil[:format_home], 'html.icons', '*.*')].each do |path|
+      ext = File.extname(path)
+      name = File.basename(path, ext)
+      data = encode_base_64 File.read(path)
+
+      ICONS[name] = Icon.new(path, name, ext.sub('.', ''), data)
+    end
+
 
 nodes:
   ##
@@ -461,6 +489,18 @@ styles:
         font-family      : Cambria, Georgia, serif;
       }
 
+    /* lists */
+
+      #content li:first-child
+      {
+        margin-top       : 1em;
+      }
+
+      #content li
+      {
+        margin-bottom    : 1em;
+      }
+
     /* headings */
 
       h1,
@@ -541,7 +581,7 @@ styles:
         padding          : 1em;
         border           : 1px solid #C0C0C0;
         vertical-align   : top;
-        background-color : #FFFFFF;
+        background-color : inherit;
       }
 
       th
@@ -716,55 +756,20 @@ styles:
       max-width          : 36em;
     }
 
-    /* hyperlinks */
-
-      a
-      {
-        color            : #0000FF;
-        text-decoration  : none;
-      }
-
-      a:visited
-      {
-        color            : #800080;
-      }
-
-      a:hover
-      {
-        color            : #FF0000;
-        text-decoration  : underline;
-      }
-
-      a:target
-      {
-        color            : #FF0000;
-        text-decoration  : underline;
-      }
-
-      a.toc:link,
-      a.toc:visited
-      {
-        text-decoration  : none;
-        z-index          : 1;
-      }
-
-      a img
-      {
-        border           : none;
-      }
+    /* emphasis */
 
-      /*
-        mark external links with a symbol to help the user
-        distinguish between internal and external links
-      */
-      a:after
+      blockquote
       {
-        content: "∗";
+        margin           : 1em;
+        border           : 5px dotted #C0C0C0;
+        padding          : 1em;
+        color            : #444;
       }
 
-      a[href^="#"]:after
+      hr
       {
-        content: "";
+        color            : #FF0000; /* for IE6 */
+        background-color : #FF0000; /* for Firefox */
       }
 
     /* source code */
@@ -783,7 +788,7 @@ styles:
         background-color : #FFFAF0;
       }
 
-      /* output of syntax colorizer */
+      /* output of the syntax coloring library */
       .code
       {
         background-color : #FFFFF0;
@@ -791,12 +796,12 @@ styles:
 
       pre
       {
+        cursor           : text;
         line-height      : normal;
         border           : 1px dashed #C0C0C0;
         background-color : #F5FFDF;
         padding          : 1em;
         overflow         : auto;
-        cursor           : text;
       }
 
       /*
@@ -815,23 +820,62 @@ styles:
       }
       */
 
-    /* emphasis */
+    /* hyperlinks */
 
-      blockquote
+      a > img
       {
-        margin           : 1em;
-        border           : 5px dotted #C0C0C0;
-        padding          : 1em;
-        color            : #444;
+        border           : none;
       }
 
-      hr
+      a:link
       {
-        color            : #FF0000; /* for IE6 */
-        background-color : #FF0000; /* for Firefox */
+        color            : #0000FF;
+        text-decoration  : none;
+      }
+
+      a:visited
+      {
+        color            : #9400D3;
+        text-decoration  : none;
+      }
+
+      a:hover
+      {
+        color            : #FF0000;
+        text-decoration  : underline;
+      }
+
+      a:target
+      {
+        color            : #FF0000;
+        font-weight      : bold;
+      }
+
+      a.toc:link,
+      a.toc:visited
+      {
+        text-decoration  : none;
+        z-index          : 1;
       }
 
   print: |
+    /* source code */
+
+      tt
+      {
+        color            : inherit;
+        background-color : inherit;
+        font-weight      : normal;
+      }
+
+      pre,
+      .code
+      {
+        border           : none;
+        overflow         : visible;
+        background-color : inherit;
+      }
+
     /* headings */
 
       h1,
@@ -857,8 +901,8 @@ styles:
 
       a:after
       {
-        content          : " (" attr(href) ")";
-        font-family      : sans-serif;
+        content          : " " attr(href);
+        font-family      : Consolas, "Lucida Console", monospace;
         font-weight      : normal;
         font-size        : 90%;
       }
@@ -886,23 +930,6 @@ styles:
         font-style       : normal;
       }
 
-    /* source code */
-
-      tt
-      {
-        color            : inherit;
-        background-color : inherit;
-        font-weight      : normal;
-      }
-
-      pre,
-      .code
-      {
-        border           : none;
-        overflow         : visible;
-        background-color : inherit;
-      }
-
     /* document structure */
 
       #lof
@@ -923,3 +950,5 @@ styles:
       {
         _padding-bottom  : 0.5em; /* for IE6 */
       }
+
+

data/lib/gerbil.rb

@@ -2,8 +2,8 @@
 
 Gerbil = {
   :name    => 'Gerbil',
-  :version => '2.0.0',
-  :release => '2008-02-03',
+  :version => '2.1.0',
+  :release => '2008-05-29',
   :website => 'http://gerbil.rubyforge.org',
   :home    => File.expand_path(File.join(File.dirname(__FILE__), '..'))
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gerbil
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-03 00:00:00 -08:00
+date: 2008-05-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency