Merge branch 'upstream' into debian/sid

5 files changed, 218 insertions, 0 deletions

diff --git a/data/v2/samples/_sisu/image/won_benkler_7_2.png b/data/v2/samples/_sisu/image/won_benkler_7_2.png
new file mode 100644
index 0000000..fe2ac37
--- /dev/null
+++ b/data/v2/samples/_sisu/image/won_benkler_7_2.png
diff --git a/data/v2/samples/_sisu/skin/doc/skin_for_the_win.rb b/data/v2/samples/_sisu/skin/doc/skin_for_the_win.rb
new file mode 100644
index 0000000..6d82e6c
--- /dev/null
+++ b/data/v2/samples/_sisu/skin/doc/skin_for_the_win.rb
@@ -0,0 +1,94 @@
+# coding: utf-8
+=begin
+ * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
+ * Author: Ralph Amissah
+   * http://www.jus.uio.no/sisu
+   * http://www.jus.uio.no/sisu/SiSU/download
+ * Description: Skin prepared for Little Brother, Cory Doctorow
+ * License: Same as SiSU see http://www.jus.uio.no/sisu
+ * Notes: Site default appearance variables set in defaults.rb
+     Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
+=end
+module SiSU_Viz
+  require SiSU_lib + '/defaults'
+  class Skin
+    #% path
+    def path_root                                                                     # the only parameter that cannot be changed here
+      './sisu/'
+    end
+    def path_rel
+      '../'
+    end
+    #% url
+    def url_home
+      'http://craphound.com/ftw'
+    end
+    def url_author
+      'http://craphound.com'
+    end
+    def url_txt                                                                      # text to go with url usually stripped url
+      'craphound.com/ftw'
+    end
+    #% color
+    def color_band1
+      '"#ffffff"'
+    end
+    #% text
+    def text_hp
+      'craphound.com/ftw'
+    end
+    def text_home
+      'For The Win'
+    end
+    #% icon
+    def icon_home_button
+      'for_the_win_doctorow.png'
+    end
+    def icon_home_banner
+      icon_home_button
+    end
+    #% banner
+    def banner_home_button
+      %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}">#{png_home}</a></td></tr></table>\n}
+    end
+    def banner_home_and_index_buttons
+      %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a></td><td width="40%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc.html" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
+    end
+    def banner_band
+      %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff">
+      <p class="tiny_left"><a href="#{url_home}/" target="_top">For The Win</a></p>
+      <p class="tiny_left"><a href="#{url_author}/" target="_top">Cory Doctorow</a></p>
+      #{table_close}}
+    end
+    #def banner_band
+    #  %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a>#{table_close}}
+    #end
+    #% credits
+    def credits_splash
+      %{<table summary="credits" align="center" bgcolor="#ffffff"><tr><td><font color="black"><center>
+<a href="http://craphound.com/ftw">The author's original pdf is available</a> at<br /><a href="http://craphound.com/ftw">craphound.com/ftw</a><br />
+available at<br /><a href="http://www.amazon.com/Win-Cory-Doctorow/dp/0765322161">Amazon.com</a> and <br />
+<a href="http://search.barnesandnoble.com/For-the-Win/Cory-Doctorow/e/9780765322166">Barnes & Noble</a><br />
+This book is Copyright Cory Doctorow © 2010<br />
+Under a Creative Commons License,<br />
+Attribution-NonCommercial-NoDerivs 3.0:<br />
+&lt;<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">http://creativecommons.org/licenses/by-nc-sa/3.0/</a>&gt;<br />
+</center></font></td></tr></table>}
+    end
+  end
+  class TeX
+    def header_center
+	    "\\chead{\\href{#{@vz.url_home}}{craphound.com/ftw}}"
+    end
+    def home_url
+	    "\\href{#{@vz.url_home}}{craphound.com/ftw}"
+    end
+    def home
+	    "\\href{#{@vz.url_home}}{For The Win}"
+    end
+    def owner_chapter
+      "Document owner details"
+    end
+  end
+end
+__END__
diff --git a/data/v2/samples/_sisu/skin/doc/skin_magic_kingdom.rb b/data/v2/samples/_sisu/skin/doc/skin_magic_kingdom.rb
new file mode 100644
index 0000000..b000239
--- /dev/null
+++ b/data/v2/samples/_sisu/skin/doc/skin_magic_kingdom.rb
@@ -0,0 +1,94 @@
+# coding: utf-8
+=begin
+ * Name: SiSU - Simple information Structuring Universe - Structured information, Serialized Units
+ * Author: Ralph Amissah
+   * http://www.jus.uio.no/sisu
+   * http://www.jus.uio.no/sisu/SiSU/download
+ * Description: Skin prepared for Little Brother, Cory Doctorow
+ * License: Same as SiSU see http://www.jus.uio.no/sisu
+ * Notes: Site default appearance variables set in defaults.rb
+     Generic site wide modifications set here scribe_skin.rb, and this file required by other "scribes" instead of defaults.rb
+=end
+module SiSU_Viz
+  require SiSU_lib + '/defaults'
+  class Skin
+    #% path
+    def path_root                                                                     # the only parameter that cannot be changed here
+      './sisu/'
+    end
+    def path_rel
+      '../'
+    end
+    #% url
+    def url_home
+      'http://craphound.com/down'
+    end
+    def url_author
+      'http://craphound.com'
+    end
+    def url_txt                                                                      # text to go with url usually stripped url
+      'craphound.com/down'
+    end
+    #% color
+    def color_band1
+      '"#ffffff"'
+    end
+    #% text
+    def text_hp
+      'craphound.com/down'
+    end
+    def text_home
+      'Down and Out in the Magic Kingdom'
+    end
+    #% icon
+    def icon_home_button
+      'magic_kingdom_doctorow.png'
+    end
+    def icon_home_banner
+      icon_home_button
+    end
+    #% banner
+    def banner_home_button
+      %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}">#{png_home}</a></td></tr></table>\n}
+    end
+    def banner_home_and_index_buttons
+      %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a></td><td width="40%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc.html" target="_top">&nbsp;This&nbsp;text&nbsp;sub-&nbsp;<br />&nbsp;Table&nbsp;of&nbsp;Contents&nbsp;</a></font>#{table_close}</center></td><td width="20%">&nbsp;#{table_close}}
+    end
+    def banner_band
+      %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff">
+      <p class="tiny_left"><a href="#{url_home}/" target="_top">Down and Out in the Magic Kingdom</a></p>
+      <p class="tiny_left"><a href="#{url_author}/" target="_top">Cory Doctorow</a></p>
+      #{table_close}}
+    end
+    #def banner_band
+    #  %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor=#{color_white}><a href="#{url_home}" target="_top">#{png_home}</a>#{table_close}}
+    #end
+    #% credits
+    def credits_splash
+      %{<table summary="credits" align="center" bgcolor="#ffffff"><tr><td><font color="black"><center>
+<a href="http://craphound.com/down">The author's original pdf is available</a> at<br /><a href="http://craphound.com/down">craphound.com/down</a><br />
+available at<br /><a href="http://www.amazon.com/Down-Magic-Kingdom-Cory-Doctorow/dp/076530953X">Amazon.com</a> and <br />
+<a href="http://search.barnesandnoble.com/Down-and-Out-in-the-Magic-Kingdom/Cory-Doctorow/e/9780765309532">Barnes & Noble</a><br />
+This book is Copyright Cory Doctorow © 2003<br />
+Under a Creative Commons License,<br />
+Attribution-NonCommercial-ShareAlike 1.0<br />
+&lt;<a href="http://creativecommons.org/licenses/by-nc-sa/1.0/">http://creativecommons.org/licenses/by-nc-sa/1.0/</a>&gt;<br />
+</center></font></td></tr></table>}
+    end
+  end
+  class TeX
+    def header_center
+	    "\\chead{\\href{#{@vz.url_home}}{craphound.com/down}}"
+    end
+    def home_url
+	    "\\href{#{@vz.url_home}}{craphound.com/down}"
+    end
+    def home
+	    "\\href{#{@vz.url_home}}{Down and Out in the Magic Kingdom}"
+    end
+    def owner_chapter
+      "Document owner details"
+    end
+  end
+end
+__END__
diff --git a/data/v2/samples/_sisu/skin/yml/list.yml b/data/v2/samples/_sisu/skin/yml/list.yml
index 388ef36..e02a153 100644
--- a/data/v2/samples/_sisu/skin/yml/list.yml
+++ b/data/v2/samples/_sisu/skin/yml/list.yml
@@ -13,9 +13,14 @@ open_society:
   - ffa
   - catb
   - littlebrother
+  - magickingdom
+  - ftw
 sisu_icon:
   site:
   - sisu_icon
+ruby:
+  site:
+  - ruby_logo
 fsf:
   site:
   - fsf
diff --git a/data/v2/samples/_sisu/skin/yml/promo.yml b/data/v2/samples/_sisu/skin/yml/promo.yml
index 9b9e3da..a52f874 100644
--- a/data/v2/samples/_sisu/skin/yml/promo.yml
+++ b/data/v2/samples/_sisu/skin/yml/promo.yml
@@ -49,6 +49,7 @@ site:
       url:      http://raa.ruby-lang.org/project/sisu/
   vs:
     title:      Viral Spiral
+    subtitle:   How the Commoners Built a Digital Republic of Their Own
     author:     David Bollier
     year:       2009
     url:        viral_spiral.david_bollier
@@ -194,6 +195,18 @@ site:
     -
       title:   Wikipedia entry
       url:     http://en.wikipedia.org/wiki/Cory_Doctorow
+  magickingdom:
+    title:      Down and Out in the Magic Kingdom
+    author:     Cory Doctorow
+    year:       2003
+    url:        down_and_out_in_the_magic_kingdom.cory_doctorow
+    links:
+    -
+      title:    Home
+      url:      http://craphound.com/down
+    -
+      title:   Wikipedia entry
+      url:     http://en.wikipedia.org/wiki/Down_and_Out_in_the_Magic_Kingdom
   littlebrother:
     title:      Little Brother
     author:     Cory Doctorow
@@ -206,6 +219,18 @@ site:
     -
       title:   Wikipedia entry
       url:     http://en.wikipedia.org/wiki/Little_Brother_(Cory_Doctorow_novel)
+  ftw:
+    title:      For the Win
+    author:     Cory Doctorow
+    year:       2008
+    url:        for_the_win.cory_doctorow
+    links:
+    -
+      title:    Home
+      url:      http://craphound.com/ftw
+    -
+      title:   Wikipedia entry
+      url:     http://en.wikipedia.org/wiki/For_The_Win_(Cory_Doctorow_novel)
 search:
   sisu_books_libre_sisusearch:
     type:      sisusearch