erbook 4.0.0 → 5.0.0

data/fmt/xhtml.icons/tango-icon-theme-0.8.1/48x48/README

@@ -0,0 +1,2 @@
+The 48x48 images in this subtree were generated from their SVG
+sources in ../scalable/ using Inkscape <http://inkscape.org>.

data/fmt/xhtml.icons/tango-icon-theme-0.8.1/README

@@ -0,0 +1,12 @@
+Tango Icon Theme
+----------------
+
+This is an icon theme that follows the Tango visual guidelines [1]. Currently
+it depends on Imagemagick for creation of 24x24 bitmaps by adding a 1px padding
+around the 22x22px version. For GNOME and KDE you will also need
+icon-naming-utils that allow the theme to work in these environments before
+they follow the new naming scheme [2].
+
+
+[1] http://tango-project.org/Tango_Icon_Theme_Guidelines
+[2] http://tango-project.org/Standard_Icon_Naming_Specification

data/fmt/{html.yaml → xhtml.yaml}

@@ -1,19 +1,19 @@
 desc: web page for the Internet
 
 code: |
-  # load the String#to_html and String#to_inline_html methods
-  require 'erbook/html'
+  # load the String#to_xhtml and String#to_inline_xhtml methods
+  require 'erbook/to_xhtml'
 
   class String
-    # Transforms this UTF-8 string into HTML entities.
-    def to_html_entities
+    # Transforms this UTF-8 string into XML entities.
+    def to_xml_entities
       unpack('U*').map! {|c| "&##{c};"}.join
     end
 
     # Transforms this string into a valid URI fragment.
     # See http://www.nmt.edu/tcc/help/pubs/xhtml/id-type.html
     def to_uri_fragment
-      # remove HTML tags from the input
+      # remove XML tags from the input
       buf = gsub(/<.*?>/, '')
 
       # The first or only character must be a letter.
@@ -32,168 +32,230 @@ code: |
   end
 
   class Hash
-    # Transforms this hash into a string of HTML attribute key=value pairs.
-    def to_html_atts
+    # Transforms this hash into a string of XML attribute key="value" pairs.
+    def to_xml_atts
       inject([]) {|s,(k,v)| s << %( #{k}="#{v}") }.join
     end
   end
 
-  class Node
-    # Returns the user-defined title for this node's content.
-    def title
-      @title ||= args[0]
-    end
+  module ERBook
+    class Template
+      # Protects the given content from the text-to-XHTML conversion process.
+      def verbatim aContent
+        ERB::Util.html_escape aContent
+      end
 
-    # Returns the user-defined indentifer for this node.
-    def id
-      @id ||= args[1]
-    end
+      # Returns XHTML for a hyperlink to the given
+      # URL of the given label and mouse-hover title.
+      def hyperlink aUrl, aLabel = aUrl, aTitle = nil
+        %{<a href="#{aUrl}"#{%{ title="#{aTitle}"} if aTitle}>#{aLabel}</a>}
+      end
 
-    def type_label
-      type.to_s.capitalize
-    end
+      # Returns an <img/> tag that embeds the given image file.
+      #
+      # aPath:: path to the image file
+      # aFormat:: format of the image file (e.g. PNG, JPEG, GIF, etc.)
+      # aAtts:: additional attributes for the <img> tag
+      #
+      def embed_image_file aPath, aFormat = aPath[/\w+/], aAtts = {}
+        data = ERBook.base_64_encode File.read(aPath)
+        embed_image_data data, aFormat, aAtts
+      end
 
-    def type_atts
-      { :class => type }.to_html_atts
+      # Returns an <img/> tag that embeds the given raw image data.
+      #
+      # aData:: raw image data
+      # aFormat:: format of the image file (e.g. PNG, JPEG, GIF, etc.)
+      # aAtts:: additional attributes for the <img> tag
+      #
+      def embed_image_data aData, aFormat, aAtts = {}
+        aAtts[:src] = ERBook.base_64_embed_image_data(aData, aFormat)
+        "<img#{aAtts.to_xml_atts}/>"
+      end
     end
 
-    def title_atts
-      { :class => :title, :id => here_frag }.to_html_atts
-    end
+    class Node
+      # Returns the user-defined title for this node's content.
+      def title
+        @title ||= args[0]
+      end
 
-    def title_html
-      title.to_s.to_inline_html
-    end
+      # Returns the user-defined indentifer for this node.
+      def id
+        @id ||= args[1]
+      end
 
-    def content_html
-      content.to_s.to_html
-    end
 
-    def title_link aTitle = nil
-      here_link here_frag, aTitle || title_html
-      # %{#{aTitle || title_html}&nbsp;&nbsp;&nbsp;&nbsp;#{here_link here_frag, '&para;'}&nbsp;#{list_link here_frag, list_frag, '&equiv;'}}
-    end
+      ##
+      # utility methods
+      #
 
-    def index_link
-      list_link here_frag, list_frag, index
-      # %{<span id="#{here_frag}">#{index}</span>}
-    end
+      def type_label #:nodoc:
+        type.to_s.capitalize
+      end
 
-    def number_link
-      list_link here_frag, list_frag, [type_label, number].compact.join(' ')
-      # %{<span id="#{here_frag}">#{[type_label, number].compact.join(' ')}</span>}
-    end
+      def type_label_here_link #:nodoc:
+        s = type_label
+        here_link s, s
+      end
 
-    def number_and_title_link
-      "#{number_link}.&nbsp;&nbsp;#{title_link}"
-    end
+      # Returns the title of this node as XHTML.
+      def title_xhtml
+        title.to_s.to_inline_xhtml
+      end
 
-    def index_and_title_link
-      "#{index_link}&nbsp;&nbsp;#{title_link}"
-    end
+      # Returns the content of this node as XHTML.
+      def content_xhtml
+        content.to_s.to_xhtml
+      end
 
-    def content_div
-      %{<div class="content">#{content_html}</div>}
-    end
+      # Returns the content of this node as XHTML inside a <div/>.
+      def content_xhtml_div #:nodoc:
+        %{<div class="content">#{content_xhtml}</div>}
+      end
+
+      # Returns a hyperlink to this node containing its title.
+      def title_link aTitle = nil
+        here_link here_frag, aTitle || title_xhtml
+      end
 
-    @@frags = []
+      # Returns a hyperlink to this node
+      # containing its LaTeX-style index number.
+      def index_link
+        list_link here_frag, list_frag, index
+      end
 
-    # Returns a unique URI fragment for this node.
-    def here_frag
-      unless defined? @here_frag
-        salt = object_id.abs
-        frag = (id || title || salt).to_s.to_uri_fragment
+      # Returns a hyperlink to this node containing its occurrence number.
+      def number_link
+        list_link here_frag, list_frag, [type_label, number].compact.join(' ')
+      end
 
-        # make it unique
-        while @@frags.include? frag
-          frag << '-' << (index || number || salt).to_s
+      # Returns a hyperlink to this node containing
+      # its ocurrence number and its title.
+      def number_and_title_link #:nodoc:
+        "#{number_link}.&nbsp;&nbsp;#{title_link}"
+      end
+
+      # Returns a hyperlink to this node containing
+      # its LaTeX-style index number and its title.
+      def index_and_title_link #:nodoc:
+        "#{index_link}&nbsp;&nbsp;#{title_link}"
+      end
+
+
+      ##
+      # URI fragments
+      #
+
+      @@frags = []
+
+      # Returns a unique URI fragment for this node.
+      def here_frag #:nodoc:
+        unless defined? @here_frag
+          salt = object_id.abs
+          frag = (id || title || salt).to_s.to_uri_fragment
+
+          # make it unique
+          while @@frags.include? frag
+            frag << '-' << (index || number || salt).to_s
+          end
+
+          @@frags << frag
+          @here_frag = frag
         end
 
-        @@frags << frag
-        @here_frag = frag
+        @here_frag
+      end
+
+      # Returns the URI fragment for the location in the table
+      # of contents / list of figures that points this node.
+      def list_frag #:nodoc:
+        @list_frag ||= "rev:#{here_frag}"
       end
 
-      @here_frag
-    end
 
-    # Returns the URI fragment for the location in the table
-    # of contents / list of figures that points this node.
-    def list_frag
-      @list_frag ||= "rev:#{here_frag}"
+      private
+
+      def here_link aHereFrag, aLabel #:nodoc:
+        %{<a class="here" title="Permanent link to this section" href="##{aHereFrag}">#{aLabel}</a>}
+      end
+
+      def list_link aHereFrag, aListFrag, aLabel #:nodoc:
+        %{<a class="list" title="Return to table of contents" id="#{aHereFrag}" href="##{aListFrag}">#{aLabel}</a>}
+      end
     end
-  end
 
-  def here_link aHereFrag, aLabel
-    %{<a class="here" title="Permanent link to this section" href="##{aHereFrag}">#{aLabel}</a>}
-  end
+    # Encodes the given input in base64 format.
+    def ERBook.base_64_encode aInput #:nodoc:
+      [aInput].pack('m')
+    end
 
-  def list_link aHereFrag, aListFrag, aLabel
-    %{<a class="list" title="Return to table of contents" href="##{aListFrag}">#{aLabel}</a>}
-  end
+    # Returns a string denoting embedded, base64 encoded data.
+    def ERBook.base_64_embed aData, aFormat #:nodoc:
+      "data:#{aFormat.to_s.downcase};base64,#{aData.tr("\n", '')}"
+    end
 
-  # Returns a hyperlink to the given URL of
-  # the given label and mouse-hover title.
-  def link aUrl, aLabel = aUrl, aTitle = nil
-    %{<a href="#{h aUrl}"#{%{ title="#{aTitle}"} if aTitle}>#{aLabel}</a>}
-  end
+    # Returns a string denoting embedded, base64 encoded image data.
+    # aFormat:: format of the image data (e.g. PNG, JPEG, GIF, etc.)
+    def ERBook.base_64_embed_image_data aData, aFormat #:nodoc:
+      base_64_embed aData, "image/#{aFormat}"
+    end
 
-  # Encodes the given input in base64 format.
-  def base_64_encode aInput
-    [aInput].pack('m')
-  end
+    ##
+    # load admonition icons
+    #
 
-  # Returns a string denoting embedded, base64 encoded data.
-  def base_64_embed aData, aFormat
-    "data:#{aFormat.to_s.downcase};base64,#{aData.tr("\n", '')}"
-  end
+    ICONS_DIR = File.join(ERBook::FORMATS_DIR, 'xhtml.icons')
+    ICON_DEFS = YAML.load_file File.join(ICONS_DIR, 'index.yaml')
 
-  # Returns a string denoting embedded, base64 encoded image data.
-  # aFormat:: format of the image data (e.g. PNG, JPG, GIF, etc.)
-  def base_64_embed_image_data aData, aFormat
-    base_64_embed aData, "image/#{aFormat}"
-  end
+    Icon = Struct.new(:origin, :path, :name, :format, :data)
+    class Icon #:nodoc:
+      # Returns a data URI containing embedded image data.
+      def data_uri
+        ERBook.base_64_embed_image_data self.data, self.format
+      end
 
-  # Returns a HTML <img> tag that embeds the given image file.
-  #
-  # aPath:: path to the image file
-  # aFormat:: format of the image file (e.g. PNG, JPG, GIF, etc.)
-  # aAtts:: additional attributes for the <img> tag
-  #
-  def embed_image_file aPath, aFormat = aPath[/\w+/], aAtts = {}
-    data = base_64_encode File.read(aPath)
-    aAtts['src'] = base_64_embed_image_data(data, aFormat)
-    "<img#{aAtts.to_html_atts}/>"
-  end
+      # Returns a CSS url() containing embedded image data.
+      def data_css
+        %{url("#{data_uri}")}
+      end
 
-  ##
-  # load admonition icons
-  #
+      # Returns a XML entity reference (to this icon's
+      # embedded image data) ready for insertion into XML.
+      def entity_xml
+        "&#{entity_name};"
+      end
 
-  Icon = Struct.new(:path, :name, :format, :data)
+      # Returns the name of the XML entity whose
+      # value contains embedded image data.
+      def entity_name
+        "icon_#{name}"
+      end
 
-  class Icon
-    # Returns the CSS class for this icon.
-    def css_class
-      @css_class ||= "icon-#{name}"
+      # Returns an <img/> tag that renders the image
+      # data embedded as an ENTITY in the html DOCTYPE.
+      def to_xhtml aAtts = {}
+        aAtts[:alt] ||= name
+        aAtts[:src] = entity_xml
+        aAtts[:class] = :icon
+        "<img#{aAtts.to_xml_atts}/>"
+      end
     end
 
-    # Returns a CSS url() containing embedded image data.
-    def css_image
-      "url(#{base_64_embed_image_data self.data, self.format})"
-    end
-  end
+    ICON_BY_NAME = {}
 
-  ICONS = {}
+    ICON_DEFS.each_pair do |name, path|
+      format = File.extname(path).sub('.', '')
+      origin = path[/^\w+/]
 
-  Dir[File.join(ERBook::FORMATS_DIR, 'html.icons', '*.*')].each do |path|
-    ext = File.extname(path)
-    name = File.basename(path, ext)
-    data = base_64_encode File.open(path, 'rb') {|f| f.read }
+      path = File.join(ICONS_DIR, path) # make the path absolute
+      data = base_64_encode File.open(path, 'rb') {|f| f.read }
 
-    ICONS[name] = Icon.new(path, name, ext.sub('.', ''), data)
-  end
+      ICON_BY_NAME[name] = Icon.new(origin, path, name, format, data)
+    end
 
-  # STDERR.puts ICONS.inspect
+    ICONS = ICON_BY_NAME.values
+  end
 
 
 nodes:
@@ -207,7 +269,7 @@ nodes:
     index: false
     number: false
     silent: true
-    output: <%= @node.content_html %>
+    output: <%= @node.content_xhtml %>
 
   header_outside_above: &header_insert
     toc: false
@@ -215,7 +277,7 @@ nodes:
     index: false
     number: false
     silent: true
-    output: <div class="<%= @node.type %>"><%= @node.content_html %></div>
+    output: <div class="<%= @node.type %>"><%= @node.content_xhtml %></div>
 
   header_inside_above:  *header_insert
   header_inside_below:  *header_insert
@@ -234,10 +296,9 @@ nodes:
     number: false
     silent: true
     output: |
-      <% label = @node.type_label %>
-      <div id="<%= label %>">
-        <h1 class="title"><%= here_link label, label %></h1>
-        <%= @node.content_div %>
+      <div id="<%= @node.type_label %>">
+        <h1 class="title"><%= @node.type_label_here_link %></h1>
+        <%= @node.content_xhtml_div %>
       </div>
 
 
@@ -252,12 +313,12 @@ nodes:
     number: true
     output: |
       <div class="<%= @node.type %>">
-        <h1<%= @node.title_atts %>>
+        <h1 class="title">
           <%= @node.type_label %>&nbsp;<%= @node.index_link %>
           <br/>
           <big><%= @node.title_link %></big>
         </h1>
-        <%= @node.content_div %>
+        <%= @node.content_xhtml_div %>
       </div>
 
   chapter: *latex
@@ -270,10 +331,10 @@ nodes:
     output: |
       <% depth = [6, @node.depth + 1].min %>
       <div class="<%= @node.type %>">
-        <h<%= depth %><%= @node.title_atts %>>
+        <h<%= depth %> class="title">
           <%= @node.index_and_title_link %>
         </h<%= depth %>>
-        <%= @node.content_div %>
+        <%= @node.content_xhtml_div %>
       </div>
 
   paragraph:
@@ -282,9 +343,9 @@ nodes:
     index: false
     number: false
     output: |
-      <div<%= @node.type_atts %>>
-        <p<%= @node.title_atts %>><%= @node.title_link %></p>
-        <%= @node.content_div %>
+      <div class="<%= @node.type %>">
+        <p class="title"><%= @node.title_link %></p>
+        <%= @node.content_xhtml_div %>
       </div>
 
 
@@ -298,16 +359,9 @@ nodes:
     index: false
     number: true
     output: |
-      <div<%= @node.type_atts %>>
-        <p<%= @node.title_atts %>><%= @node.number_and_title_link %></p>
-        <div class="content <%=
-          $use_icons = true unless defined? $use_icons
-
-          if $use_icons and icon = ICONS[@node.type]
-            ($icons_used ||= []) << icon
-            icon.css_class
-          end
-        %>"><%= @node.content_html %></div>
+      <div class="<%= @node.type %>">
+        <p class="title"><%= @node.number_and_title_link %></p>
+        <div class="content"><%= ICON_BY_NAME[@node.type].to_xhtml %><%= @node.content_xhtml %></div>
       </div>
 
   note: *admonition
@@ -329,7 +383,7 @@ nodes:
     output: |
       <div class="<%= @node.type %>">
         <p class="title"><%= @node.number_and_title_link %></p>
-        <%= @node.content_div %>
+        <%= @node.content_xhtml_div %>
       </div>
 
   table: *formal
@@ -366,16 +420,16 @@ nodes:
 
           title_auto = @node.args.length < 2
 
-          title_html =
+          title_xhtml =
             if title_auto
               title_text
             else
               @node.args[1].to_s
-            end.to_inline_html
+            end.to_inline_xhtml
 
           %{<a class="#{@node.type}" href="##{target.here_frag}"#{
             %( title="#{title_text}") unless title_auto
-          }>#{title_html}</a>}
+          }>#{title_xhtml}</a>}
         else
           raise ArgumentError, "invalid cross-reference to #{@node.title.inspect}", @node.trace
         end
@@ -440,7 +494,7 @@ output: |
             (n.index.to_s + '&nbsp;&nbsp;' if n.index),
             n.list_frag,
             n.here_frag,
-            n.title.to_s.to_inline_html
+            n.title.to_s.to_inline_xhtml
           ]
           nested = n.children.inject('') {|s,c| s << toc_builder[c] }
 
@@ -466,7 +520,7 @@ output: |
 
       lof = lof_enums.sort.map do |(type, nodes)|
         nested = nodes.map do |n|
-          %{<li><a id="#{n.list_frag}" href="##{n.here_frag}">#{n.title.to_s.to_inline_html}</a></li>}
+          %{<li><a id="#{n.list_frag}" href="##{n.here_frag}">#{n.title.to_s.to_inline_xhtml}</a></li>}
         end
 
         label = type.capitalize << 's' # TODO: pluralize this properly
@@ -475,76 +529,56 @@ output: |
         %{<h2 id="#{label}" class="title"><a class="here" href="##{label}">#{label}</a></h2> <ol>#{nested}</ol>}
       end
   %>
+  <?xml version="1.0" encoding="utf-8"?>
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+    <% ICONS.each do |icon| %>
+      <!ENTITY <%= icon.entity_name %> "<%= icon.data_uri %>">
+    <% end %>
+  ]>
   <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
       <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
       <meta name="date" content="<%= $date %>"/>
       <meta name="author" content="<%= $authors.keys.join(', ') %>"/>
       <meta name="generator" content="<%= ERBook::DISPLAY %>"/>
-      <% $feeds.each_pair do |here_frag, fmt| %>
-      <link rel="alternate" type="application/<%= fmt %>+xml" href="<%= here_frag %>"/>
-      <% end if $feeds %>
-      <title><%= $title.to_s.to_inline_html %></title>
-
-      <% if $use_icons %>
-        <style type="text/css" media="screen">
-          blockquote {
-            background-image  : <%= ICONS['quote'].css_image %>;
-            background-repeat : no-repeat;
-            padding-left      : 65px;
-            min-height        : 40px;
-            margin-left       : 0;
-          }
-        </style>
-      <% end %>
+      <title><%= $title.to_s.to_inline_xhtml %></title>
 
-      <% if defined? $icons_used and not $icons_used.empty?  %>
-        <style type="text/css" media="screen">
-          <% $icons_used.each do |icon| %>
-          .<%= icon.css_class %> {
-            background-image: <%= icon.css_image %>;
-            background-repeat: no-repeat;
-            padding-left: 4em;
-          }
-          <% end %>
-        </style>
+      <% if $feeds %>
+        <% $feeds.each_pair do |url, fmt| %>
+          <link rel="alternate" type="application/<%= fmt %>+xml" href="<%= url %>"/>
+        <% end %>
+      <% end %>
 
-        <style type="text/css" media="print">
-          <% $icons_used.each do |icon| %>
-            .<%= icon.css_class %> {
-              <%
-                # we use list-style-image instead of
-                # background-image because the latter is
-                # neither printable nor shown in print
-                # preview by default in most browsers
-                #
-                # see http://www.web-graphics.com/mtarchive/001703.php
-              %>
-              display: list-item;
-              list-style-image: <%= icon.css_image %>;
-              list-style-position: inside;
-            }
-
-            .<%= icon.css_class %> li {
-              list-style-image: none;
-            }
-          <% end %>
+      <% @spec['styles'].each_pair do |media, style| %>
+        <style type="text/css" media="<%= media %>">
+        <![CDATA[<%= style %>]]>
         </style>
       <% end %>
 
-      <%
-        styles = @spec['styles']
-        (styles.keys - %w[common]).each do |media|
-      %>
-      <style type="text/css" media="<%= media %>">
-      <!--
-        <%= styles['common'] %>
-        <%= styles[media] %>
-      -->
+      <style type="text/css" media="screen">
+      <![CDATA[
+        /* decorate external hyperlinks with a visual indicator */
+        a:not([href^="#"])
+        {
+            color               : #3366BB;
+            background          : <%= ICON_BY_NAME['link'].data_css %>;
+            background-position : center right;
+            background-repeat   : no-repeat;
+            padding-right       : 13px;
+        }
+
+        /* display icon for blockquote elements */
+        blockquote
+        {
+            background-image    : <%= ICON_BY_NAME['quote'].data_css %>;
+            background-repeat   : no-repeat;
+            margin-left         : 0;
+            padding-left        : 65px;
+            min-height          : 50px;
+        }
+      ]]>
       </style>
-      <% end %>
     </head>
     <body>
       <%
@@ -578,11 +612,11 @@ output: |
         <%= header.output %>
       <% else %>
         <%= $logo if defined? $logo %>
-        <h1 class="title"><%= $title.to_s.to_inline_html %></h1>
+        <h1 class="title"><%= $title.to_s.to_inline_xhtml %></h1>
         <h2 class="authors"><%=
-          $authors.map do |(name, here_frag)|
-            if here_frag
-              %{<a href="#{here_frag}">#{name}</a>}
+          $authors.map do |(name, url)|
+            if url
+              %{<a href="#{url}">#{name}</a>}
             else
               name
             end
@@ -628,7 +662,7 @@ output: |
         <h1 class="title" id="References"><a class="here" href="#References">References</a></h1>
         <ol>
         <% references.each do |n| %>
-          <li id="<%= n.here_frag %>"><%= n.content_html %></li>
+          <li id="<%= n.here_frag %>"><%= n.content_xhtml %></li>
         <% end %>
         </ol>
       </div>
@@ -642,16 +676,32 @@ output: |
       <div id="footer">
       <%= node = @types['footer_inside_above'].first and node.output %>
       <% if footer = @types['footer'].first %>
-        <%= footer.content.to_s.to_html %>
+        <%= footer.content.to_s.to_xhtml %>
       <% else %>
         Generated by <a href="<%= ERBook::WEBSITE %>"><%= ERBook::DISPLAY %></a> on <%= Time.now %>.
       <% end %>
 
-      <% if $icons_used %>
-        <div id="footer-credits">
-          The icons used in this document are &copy; 2005 <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. They are part of the <a href="http://tango.freedesktop.org/Tango_Icon_Library">Tango Icon Theme</a> set, which is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License Agreement</a>.
-        </div>
-      <% end %>
+      <div id="footer-credits">
+        <p>
+          <% ICONS.select {|i| i.origin == 'tango' }.each do |icon| %>
+            <%= icon.to_xhtml %>
+          <% end %>
+
+          <br/>
+
+          The icons shown above are &copy; 2005 <a href="http://tango.freedesktop.org">Tango Desktop Project</a>. They are part of the <a href="http://tango.freedesktop.org/Tango_Icon_Library">Tango Icon Theme</a> set, which is distributed under the <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-ShareAlike 2.5 License Agreement</a>.
+        </p>
+
+        <p>
+          <% ICONS.select {|i| i.origin == 'mediawiki' }.each do |icon| %>
+            <%= icon.to_xhtml %>
+          <% end %>
+
+          <br/>
+
+          The icons shown above are &copy; 2007 <a href="https://www.ohloh.net/projects/mediawiki/contributors">MediaWiki contributors</a>. They are part of the <a href="http://www.mediawiki.org/wiki/MediaWiki">MediaWiki</a> software, which is distributed under the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, version 2</a>.
+        </p>
+      </div>
       <%= node = @types['footer_inside_below'].first and node.output %>
       </div>
       <%= node = @types['footer_outside_below'].first and node.output %>
@@ -659,7 +709,7 @@ output: |
   </html>
 
 styles:
-  common: |
+  all: |
     body
     {
         color               : #000000;
@@ -672,8 +722,8 @@ styles:
 
       blockquote
       {
-          font-family       : Georgia, serif;
-          color             : #444;
+          color             : #333;
+          font-style        : italic;
       }
 
       em
@@ -890,7 +940,7 @@ styles:
 
       #footer-credits
       {
-          margin-top        : 1em;
+          margin-top        : 2em;
           margin-bottom     : 2em;
       }
 
@@ -964,21 +1014,35 @@ styles:
           margin            : 3em;
       }
 
-      .tip       > .icon,
-      .note      > .icon,
-      .caution   > .icon,
-      .warning   > .icon,
-      .important > .icon
+      .tip       > .content,
+      .note      > .content,
+      .caution   > .content,
+      .warning   > .content,
+      .important > .content,
+      .figure    > .content,
+      .table     > .content,
+      .example   > .content,
+      .equation  > .content,
+      .procedure > .content
+      {
+          min-height        : 48px; /* 48px is height of icon */
+      }
+
+      .tip       > .content > .icon,
+      .note      > .content > .icon,
+      .caution   > .content > .icon,
+      .warning   > .content > .icon,
+      .important > .content > .icon
       {
           float             : left;
           margin            : 0 1em 1em 0; /* top right bottom left */
       }
 
-      .tip       .icon,
-      .note      .icon,
-      .caution   .icon,
-      .warning   .icon,
-      .important .icon
+      .tip       .content .icon,
+      .note      .content .icon,
+      .caution   .content .icon,
+      .warning   .content .icon,
+      .important .content .icon
       {
           _display          : none; /* IE6 cannot display embedded images */
       }
@@ -1008,9 +1072,9 @@ styles:
   screen: |
     body
     {
-        margin              : auto;
-        max-width           : 36em;
-        padding             : 0.5em;
+          margin            : auto;
+          max-width         : 36em;
+          padding           : 0.5em;
     }
 
     /* source code */
@@ -1051,18 +1115,12 @@ styles:
 
       a:link
       {
-          color             : #0000FF;
+          color             : #002BB8;
       }
 
       a:visited
       {
-          color             : #C71585;
-      }
-
-      /* external hyperlinks */
-      a:not([href^="#"]):before
-      {
-          content           : "\2660"; /* &spades; */
+          color             : #5A3696;
       }
 
       a.here,